summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-09-30 13:01:29 +0200
committerNoel Grandin <noel@peralex.com>2013-10-04 08:49:02 +0200
commit81ea1b554de5d2d2b56a9e651b0ebd06bffc7289 (patch)
tree5b1518592db65aa1e6a4198f7fedc8080241830a
parentb0be20551ce024096615f20ea75f1dd92aa73c25 (diff)
convert sc/source/filter/inc/rtfparse.hxx from String to OUString
Change-Id: I8ec99823fd842dce9e275fc511cc9bcdf185ef7a
-rw-r--r--sc/source/filter/html/htmlpars.cxx4
-rw-r--r--sc/source/filter/inc/eeparser.hxx2
-rw-r--r--sc/source/filter/inc/htmlpars.hxx6
-rw-r--r--sc/source/filter/inc/rtfparse.hxx2
-rw-r--r--sc/source/filter/rtf/rtfparse.cxx2
5 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 1a1775a10b51..186427ebf7bf 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -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();
pEdit->SetImportHdl( LINK( this, ScHTMLLayoutParser, HTMLImportHdl ) );
@@ -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;
SvKeyValueIterator* pAttributes = 0;
diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx
index 62b0673059a9..7ef1583b19a5 100644
--- a/sc/source/filter/inc/eeparser.hxx
+++ b/sc/source/filter/inc/eeparser.hxx
@@ -121,7 +121,7 @@ public:
ScEEParser( EditEngine* );
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; }
ColWidthsMap& GetColWidths() { return maColWidths; }
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index cbae0643b5e8..978e94fcc4ef 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -88,7 +88,7 @@ public:
explicit ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc );
virtual ~ScHTMLParser();
- virtual sal_uLong Read( SvStream& rStrm, const String& rBaseURL ) = 0;
+ virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) = 0;
ScHTMLStyles& GetStyles();
ScDocument& GetDoc();
@@ -226,7 +226,7 @@ private:
public:
ScHTMLLayoutParser( EditEngine*, const String& rBaseURL, const Size& aPageSize, ScDocument* );
virtual ~ScHTMLLayoutParser();
- virtual sal_uLong Read( SvStream&, const String& rBaseURL );
+ virtual sal_uLong Read( SvStream&, const OUString& rBaseURL );
virtual const ScHTMLTable* GetGlobalTable() const;
};
@@ -621,7 +621,7 @@ public:
explicit ScHTMLQueryParser( EditEngine* pEditEngine, ScDocument* pDoc );
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. */
virtual const ScHTMLTable* GetGlobalTable() const;
diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx
index 50c2b845ec4d..c3cf2643e279 100644
--- a/sc/source/filter/inc/rtfparse.hxx
+++ b/sc/source/filter/inc/rtfparse.hxx
@@ -76,7 +76,7 @@ private:
public:
ScRTFParser( EditEngine* );
virtual ~ScRTFParser();
- virtual sal_uLong Read( SvStream&, const String& rBaseURL );
+ virtual sal_uLong Read( SvStream&, const OUString& rBaseURL );
};
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index 1fcabf24fe78..7ededf106e14 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -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();
pEdit->SetImportHdl( LINK( this, ScRTFParser, RTFImportHdl ) );