Kaydet (Commit) af40ffdc authored tarafından Noel Grandin's avatar Noel Grandin

convert include/editeng/svxrtf.hxx from String to OUString

Change-Id: I4251db20727a987a36bbdb48e423aed95d3b9011
üst 74bea5b0
...@@ -140,7 +140,7 @@ SvParserState SvxRTFParser::CallParser() ...@@ -140,7 +140,7 @@ SvParserState SvxRTFParser::CallParser()
bNewGroup = sal_False; bNewGroup = sal_False;
nDfltFont = 0; nDfltFont = 0;
sBaseURL.Erase(); sBaseURL = "";
// generate the correct WhichId table from the set WhichIds. // generate the correct WhichId table from the set WhichIds.
BuildWhichTbl(); BuildWhichTbl();
...@@ -600,9 +600,9 @@ void SvxRTFParser::ReadOLEData() ...@@ -600,9 +600,9 @@ void SvxRTFParser::ReadOLEData()
SvRTFParser::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!! int _nOpenBrakets = 1, nToken; // the first was already detected earlier!!
while( _nOpenBrakets && IsParserWorking() ) while( _nOpenBrakets && IsParserWorking() )
...@@ -666,7 +666,7 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo ) ...@@ -666,7 +666,7 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo )
int _nOpenBrakets = 1, nToken; // the first was already detected earlier!! int _nOpenBrakets = 1, nToken; // the first was already detected earlier!!
DBG_ASSERT(m_xDocProps.is(), DBG_ASSERT(m_xDocProps.is(),
"SvxRTFParser::ReadInfo: no DocumentProperties"); "SvxRTFParser::ReadInfo: no DocumentProperties");
String sStr, sComment; OUString sStr, sComment;
long nVersNo = 0; long nVersNo = 0;
while( _nOpenBrakets && IsParserWorking() ) while( _nOpenBrakets && IsParserWorking() )
...@@ -758,7 +758,7 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo ) ...@@ -758,7 +758,7 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo )
} }
if( pChkForVerNo && if( pChkForVerNo &&
COMPARE_EQUAL == sComment.CompareToAscii( pChkForVerNo )) sComment == OUString::createFromAscii( pChkForVerNo ) )
nVersionNo = nVersNo; nVersionNo = nVersNo;
SkipToken( -1 ); // the closing brace is evaluated "above" SkipToken( -1 ); // the closing brace is evaluated "above"
......
...@@ -185,7 +185,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser ...@@ -185,7 +185,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
std::vector<sal_uInt16> aPlainMap; std::vector<sal_uInt16> aPlainMap;
std::vector<sal_uInt16> aPardMap; std::vector<sal_uInt16> aPardMap;
std::vector<sal_uInt16> aWhichMap; std::vector<sal_uInt16> aWhichMap;
String sBaseURL; OUString sBaseURL;
SvxPosition* pInsPos; SvxPosition* pInsPos;
SfxItemPool* pAttrPool; SfxItemPool* pAttrPool;
...@@ -262,7 +262,7 @@ protected: ...@@ -262,7 +262,7 @@ protected:
// Read Document-Info // Read Document-Info
::com::sun::star::util::DateTime GetDateTimeStamp( ); ::com::sun::star::util::DateTime GetDateTimeStamp( );
String& GetTextToEndGroup( String& rStr ); OUString& GetTextToEndGroup( OUString& rStr );
virtual void ReadInfo( const sal_Char* pChkForVerNo = 0 ); virtual void ReadInfo( const sal_Char* pChkForVerNo = 0 );
inline SfxItemSet& GetAttrSet(); inline SfxItemSet& GetAttrSet();
...@@ -319,7 +319,7 @@ protected: ...@@ -319,7 +319,7 @@ protected:
SvxRTFColorTbl& GetColorTbl() { return aColorTbl; } SvxRTFColorTbl& GetColorTbl() { return aColorTbl; }
SvxRTFFontTbl& GetFontTbl() { return aFontTbl; } SvxRTFFontTbl& GetFontTbl() { return aFontTbl; }
const String& GetBaseURL() const { return sBaseURL; } const OUString& GetBaseURL() const { return sBaseURL; }
public: public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment