Skip to content

C
core
Kaydet (Commit) 81ea1b55 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert sc/source/filter/inc/rtfparse.hxx from String to OUString 

Change-Id: I8ec99823fd842dce9e275fc511cc9bcdf185ef7a
üst b0be2055
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
sc/source/filter/html/htmlpars.cxx
Dosyayı görüntüle @ 81ea1b55
...@@ -279,7 +279,7 @@ ScHTMLLayoutParser::~ScHTMLLayoutParser() ...@@ -279,7 +279,7 @@ ScHTMLLayoutParser::~ScHTMLLayoutParser()
} }
sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const String& rBaseURL ) sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL )
{ {
Link aOldLink = pEdit->GetImportHdl(); Link aOldLink = pEdit->GetImportHdl();
pEdit->SetImportHdl( LINK( this, ScHTMLLayoutParser, HTMLImportHdl ) ); pEdit->SetImportHdl( LINK( this, ScHTMLLayoutParser, HTMLImportHdl ) );
...@@ -2932,7 +2932,7 @@ ScHTMLQueryParser::~ScHTMLQueryParser() ...@@ -2932,7 +2932,7 @@ ScHTMLQueryParser::~ScHTMLQueryParser()
{ {
} }
sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const String& rBaseURL ) sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL )
{ {
SvKeyValueIteratorRef xValues; SvKeyValueIteratorRef xValues;
SvKeyValueIterator* pAttributes = 0; SvKeyValueIterator* pAttributes = 0;
......
sc/source/filter/inc/eeparser.hxx
Dosyayı görüntüle @ 81ea1b55
...@@ -121,7 +121,7 @@ public: ...@@ -121,7 +121,7 @@ public:
ScEEParser( EditEngine* ); ScEEParser( EditEngine* );
virtual ~ScEEParser(); virtual ~ScEEParser();
virtual sal_uLong Read( SvStream&, const String& rBaseURL ) = 0; virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) = 0;
const ColWidthsMap& GetColWidths() const { return maColWidths; } const ColWidthsMap& GetColWidths() const { return maColWidths; }
ColWidthsMap& GetColWidths() { return maColWidths; } ColWidthsMap& GetColWidths() { return maColWidths; }
......
sc/source/filter/inc/htmlpars.hxx
Dosyayı görüntüle @ 81ea1b55
...@@ -88,7 +88,7 @@ public: ...@@ -88,7 +88,7 @@ public:
explicit ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ); explicit ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc );
virtual ~ScHTMLParser(); virtual ~ScHTMLParser();
virtual sal_uLong Read( SvStream& rStrm, const String& rBaseURL ) = 0; virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) = 0;
ScHTMLStyles& GetStyles(); ScHTMLStyles& GetStyles();
ScDocument& GetDoc(); ScDocument& GetDoc();
...@@ -226,7 +226,7 @@ private: ...@@ -226,7 +226,7 @@ private:
public: public:
ScHTMLLayoutParser( EditEngine*, const String& rBaseURL, const Size& aPageSize, ScDocument* ); ScHTMLLayoutParser( EditEngine*, const String& rBaseURL, const Size& aPageSize, ScDocument* );
virtual ~ScHTMLLayoutParser(); virtual ~ScHTMLLayoutParser();
virtual sal_uLong Read( SvStream&, const String& rBaseURL ); virtual sal_uLong Read( SvStream&, const OUString& rBaseURL );
virtual const ScHTMLTable* GetGlobalTable() const; virtual const ScHTMLTable* GetGlobalTable() const;
}; };
...@@ -621,7 +621,7 @@ public: ...@@ -621,7 +621,7 @@ public:
explicit ScHTMLQueryParser( EditEngine* pEditEngine, ScDocument* pDoc ); explicit ScHTMLQueryParser( EditEngine* pEditEngine, ScDocument* pDoc );
virtual ~ScHTMLQueryParser(); virtual ~ScHTMLQueryParser();
virtual sal_uLong Read( SvStream& rStrm, const String& rBaseURL ); virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL );
/** Returns the "global table" which contains the entire HTML document. */ /** Returns the "global table" which contains the entire HTML document. */
virtual const ScHTMLTable* GetGlobalTable() const; virtual const ScHTMLTable* GetGlobalTable() const;
......
sc/source/filter/inc/rtfparse.hxx
Dosyayı görüntüle @ 81ea1b55
...@@ -76,7 +76,7 @@ private: ...@@ -76,7 +76,7 @@ private:
public: public:
ScRTFParser( EditEngine* ); ScRTFParser( EditEngine* );
virtual ~ScRTFParser(); virtual ~ScRTFParser();
virtual sal_uLong Read( SvStream&, const String& rBaseURL ); virtual sal_uLong Read( SvStream&, const OUString& rBaseURL );
}; };
......
sc/source/filter/rtf/rtfparse.cxx
Dosyayı görüntüle @ 81ea1b55
...@@ -64,7 +64,7 @@ ScRTFParser::~ScRTFParser() ...@@ -64,7 +64,7 @@ ScRTFParser::~ScRTFParser()
} }
sal_uLong ScRTFParser::Read( SvStream& rStream, const String& rBaseURL ) sal_uLong ScRTFParser::Read( SvStream& rStream, const OUString& rBaseURL )
{ {
Link aOldLink = pEdit->GetImportHdl(); Link aOldLink = pEdit->GetImportHdl();
pEdit->SetImportHdl( LINK( this, ScRTFParser, RTFImportHdl ) ); pEdit->SetImportHdl( LINK( this, ScRTFParser, RTFImportHdl ) );
......
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