diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-05 12:02:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-11 09:45:28 +0200 |
| commit | af40ffdcef60c65437df4749c8bb2ad24356d1c2 (patch) | |
| tree | ae6279c248489ff1fd956023635d4563b7752e26 | |
| parent | 74bea5b0ab6bcf0eaaa50c8f529f1ea2e96167cf (diff) | |
convert include/editeng/svxrtf.hxx from String to OUString
Change-Id: I4251db20727a987a36bbdb48e423aed95d3b9011
| -rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 10 | ||||
| -rw-r--r-- | include/editeng/svxrtf.hxx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index a62554438f68..893c2d10ae7e 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -140,7 +140,7 @@ SvParserState SvxRTFParser::CallParser() bNewGroup = sal_False; nDfltFont = 0; - sBaseURL.Erase(); + sBaseURL = ""; // generate the correct WhichId table from the set WhichIds. BuildWhichTbl(); @@ -600,9 +600,9 @@ void SvxRTFParser::ReadOLEData() SvRTFParser::ReadOLEData(); } -String& SvxRTFParser::GetTextToEndGroup( String& rStr ) +OUString& SvxRTFParser::GetTextToEndGroup( OUString& rStr ) { - rStr.Erase( 0 ); + rStr = ""; int _nOpenBrakets = 1, nToken; // the first was already detected earlier!! while( _nOpenBrakets && IsParserWorking() ) @@ -666,7 +666,7 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo ) int _nOpenBrakets = 1, nToken; // the first was already detected earlier!! DBG_ASSERT(m_xDocProps.is(), "SvxRTFParser::ReadInfo: no DocumentProperties"); - String sStr, sComment; + OUString sStr, sComment; long nVersNo = 0; while( _nOpenBrakets && IsParserWorking() ) @@ -758,7 +758,7 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo ) } if( pChkForVerNo && - COMPARE_EQUAL == sComment.CompareToAscii( pChkForVerNo )) + sComment == OUString::createFromAscii( pChkForVerNo ) ) nVersionNo = nVersNo; SkipToken( -1 ); // the closing brace is evaluated "above" diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index 50bf842f512c..4a5a83a147e9 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -185,7 +185,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser std::vector<sal_uInt16> aPlainMap; std::vector<sal_uInt16> aPardMap; std::vector<sal_uInt16> aWhichMap; - String sBaseURL; + OUString sBaseURL; SvxPosition* pInsPos; SfxItemPool* pAttrPool; @@ -262,7 +262,7 @@ protected: // Read Document-Info ::com::sun::star::util::DateTime GetDateTimeStamp( ); - String& GetTextToEndGroup( String& rStr ); + OUString& GetTextToEndGroup( OUString& rStr ); virtual void ReadInfo( const sal_Char* pChkForVerNo = 0 ); inline SfxItemSet& GetAttrSet(); @@ -319,7 +319,7 @@ protected: SvxRTFColorTbl& GetColorTbl() { return aColorTbl; } SvxRTFFontTbl& GetFontTbl() { return aFontTbl; } - const String& GetBaseURL() const { return sBaseURL; } + const OUString& GetBaseURL() const { return sBaseURL; } public: |