diff options
| -rw-r--r-- | editeng/inc/editeng/numitem.hxx | 12 | ||||
| -rw-r--r-- | sw/source/core/doc/poolfmt.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/rtf/rtfnum.cxx | 8 | ||||
| -rw-r--r-- | sw/source/filter/ww8/rtfexport.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8num.cxx | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx index ea34a7f44d5e..cf7d34409056 100644 --- a/editeng/inc/editeng/numitem.hxx +++ b/editeng/inc/editeng/numitem.hxx @@ -117,8 +117,8 @@ public: }; private: - String sPrefix; - String sSuffix; + rtl::OUString sPrefix; + rtl::OUString sSuffix; SvxAdjust eNumAdjust; @@ -182,10 +182,10 @@ public: void SetNumAdjust(SvxAdjust eSet) {eNumAdjust = eSet;} SvxAdjust GetNumAdjust() const {return eNumAdjust;} - void SetPrefix(const String& rSet) { sPrefix = rSet;} - const String& GetPrefix() const { return sPrefix;} - void SetSuffix(const String& rSet) { sSuffix = rSet;} - const String& GetSuffix() const { return sSuffix;} + void SetPrefix(const rtl::OUString& rSet) { sPrefix = rSet;} + const rtl::OUString& GetPrefix() const { return sPrefix;} + void SetSuffix(const rtl::OUString& rSet) { sSuffix = rSet;} + const rtl::OUString& GetSuffix() const { return sSuffix;} void SetCharFmtName(const String& rSet){ sCharStyleName = rSet; } virtual const String& GetCharFmtName()const; diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index 7e30267eb0ae..44786d8e1e0c 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -1933,7 +1933,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId ) pNewRule->Set( 1, aFmt ); aFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER); - aFmt.SetSuffix( ')'); + aFmt.SetSuffix(rtl::OUString(static_cast<sal_Unicode>(')'))); aFmt.SetIncludeUpperLevels( 1 ); aFmt.SetStart( 3 ); diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx index dbd051c6d226..da74753db95f 100644 --- a/sw/source/filter/rtf/rtfnum.cxx +++ b/sw/source/filter/rtf/rtfnum.cxx @@ -1015,21 +1015,21 @@ NUMATTR_SETUNDERLINE: // Punkt ist, dann will RTF den Punkt als Trenner zwischen den Ebenen // haben - das haben wir aber schon als default if( 1 < pCurNumFmt->GetIncludeUpperLevels() && - 1 == pCurNumFmt->GetPrefix().Len() && - '.' == pCurNumFmt->GetPrefix().GetChar( 0 ) && + 1 == pCurNumFmt->GetPrefix().getLength() && + '.' == pCurNumFmt->GetPrefix()[0] && SVX_NUM_CHAR_SPECIAL != pCurNumFmt->GetNumberingType() ) pCurNumFmt->SetPrefix( aEmptyStr ); // falls das ein nicht numerierter Absatz mit ein Prefix-Text mit // einem Zeichen ist, dann setze den als Bulletzeichen if( pCurNumFmt->GetCharFmt() && SVX_NUM_NUMBER_NONE == pCurNumFmt->GetNumberingType() && - 3 == nListNo && 1 == pCurNumFmt->GetPrefix().Len() ) + 3 == nListNo && 1 == pCurNumFmt->GetPrefix().getLength() ) { SwCharFmt* pChFmt = pCurNumFmt->GetCharFmt(); pCurNumFmt->SetNumberingType(SVX_NUM_CHAR_SPECIAL); pCurNumFmt->SetBulletFont( FindFontOfItem( pChFmt->GetFont() ) ); - pCurNumFmt->SetBulletChar( pCurNumFmt->GetPrefix().GetChar( 0 ) ); + pCurNumFmt->SetBulletChar( pCurNumFmt->GetPrefix()[0] ); pCurNumFmt->SetPrefix( aEmptyStr ); // den Font oder sogar das gesamte CharFormat loeschen? diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 93f831365135..9d9cc373bd34 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -198,8 +198,8 @@ static bool IsExportNumRule( const SwNumRule& rRule, sal_uInt8* pEnd = 0 ) for( nLvl = 0; nLvl < nEnd; ++nLvl ) if( SVX_NUM_NUMBER_NONE != ( pNFmt = &rRule.Get( nLvl )) - ->GetNumberingType() || pNFmt->GetPrefix().Len() || - (pNFmt->GetSuffix().Len() && pNFmt->GetSuffix() != aDotStr )) + ->GetNumberingType() || !pNFmt->GetPrefix().isEmpty() || + (!pNFmt->GetSuffix().isEmpty() && !pNFmt->GetSuffix().equals(aDotStr)) ) break; if( pEnd ) diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index b1b4714e5c80..068a27db92c7 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -412,7 +412,7 @@ void MSWordExportBase::AbstractNumberingDefinitions() xub_StrLen nFnd = sNumStr.Search( sSrch ); if( STRING_NOTFOUND != nFnd ) { - *pLvlPos = (sal_uInt8)(nFnd + rFmt.GetPrefix().Len() + 1 ); + *pLvlPos = (sal_uInt8)(nFnd + rFmt.GetPrefix().getLength() + 1 ); ++pLvlPos; sNumStr.SetChar( nFnd, (char)i ); } @@ -429,7 +429,7 @@ void MSWordExportBase::AbstractNumberingDefinitions() } } - if( rFmt.GetPrefix().Len() ) + if( !rFmt.GetPrefix().isEmpty() ) sNumStr.Insert( rFmt.GetPrefix(), 0 ); sNumStr += rFmt.GetSuffix(); } |