diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-24 01:19:21 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-08-24 04:24:15 +0000 |
| commit | e680d71b75f18be9b99b13a3a2f63e5f54e42d3f (patch) | |
| tree | 34585ecfd19cf9b085f59a9545d9ea4c60af3f28 | |
| parent | d422eeed14f34e8595f795135be847fe5b6c5556 (diff) | |
fdo#68319: sw: fix Chinese Conversion
... and perhaps other things too: the SwScriptIterator constructor gets
passed a temporary String created by implicit conversion from OUString
and retains a reference to that; don't convert it to OUString like on
master but just cast to String.
(regression from 0295c8a34e39326414c1b98cf4da905802f061b0)
Change-Id: I30c7309c14ec8f9e41ee5fe89eed513ddad154fe
Reviewed-on: https://gerrit.libreoffice.org/5600
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -rw-r--r-- | sw/source/core/txtnode/txatritr.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx index 00e007afe99d..b9a15b6266c6 100644 --- a/sw/source/core/txtnode/txatritr.cxx +++ b/sw/source/core/txtnode/txatritr.cxx @@ -94,7 +94,7 @@ bool SwScriptIterator::Next() SwTxtAttrIterator::SwTxtAttrIterator( const SwTxtNode& rTNd, sal_uInt16 nWhchId, xub_StrLen nStt, bool bUseGetWhichOfScript ) - : aSIter( rTNd.GetTxt(), nStt ), rTxtNd( rTNd ), + : aSIter( reinterpret_cast<const String&>(rTNd.GetTxt()), nStt ), rTxtNd( rTNd ), pParaItem( 0 ), nChgPos( nStt ), nAttrPos( 0 ), nWhichId( nWhchId ), bIsUseGetWhichOfScript( bUseGetWhichOfScript ) { |