summaryrefslogtreecommitdiffstats
path: root/include/sfx2/sfxhtml.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-08-22 15:58:07 +0200
committerNoel Grandin <noel@peralex.com>2013-08-29 09:30:01 +0200
commit2265b25e8fdbb3d93d9862fdc776f9b69a998eea (patch)
tree1d4e49c242562ed6653f34c96630872dfdf0a50a /include/sfx2/sfxhtml.hxx
parentconvert include/sfx2/progress.hxx from String to OUString (diff)
downloadcore-2265b25e8fdbb3d93d9862fdc776f9b69a998eea.tar.gz
core-2265b25e8fdbb3d93d9862fdc776f9b69a998eea.zip
convert include/sfx2/sfxhtml.hxx from String to OUString
Change-Id: I8c3ffa5add610d859091ef5f9251247a3dd0b6b7
Diffstat (limited to 'include/sfx2/sfxhtml.hxx')
-rw-r--r--include/sfx2/sfxhtml.hxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx
index 1c93b5da831f..77035ce0ba75 100644
--- a/include/sfx2/sfxhtml.hxx
+++ b/include/sfx2/sfxhtml.hxx
@@ -34,7 +34,7 @@ class SfxObjectShell;
class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser
{
- String aScriptType;
+ OUString aScriptType;
SfxMedium* pMedium;
SfxMedium *pDLMedium; // Medium for Download Files
@@ -56,18 +56,18 @@ public:
static bool ParseMapOptions(ImageMap* pImageMap, const HTMLOptions& rOptions);
bool ParseMapOptions(ImageMap * pImageMap)
{ return ParseMapOptions(pImageMap, GetOptions()); }
- static bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+ static bool ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL,
const HTMLOptions& rOptions,
sal_uInt16 nEventMouseOver = 0,
sal_uInt16 nEventMouseOut = 0 );
- inline sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+ inline sal_Bool ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL,
sal_uInt16 nEventMouseOver = 0,
sal_uInt16 nEventMouseOut = 0);
// <TD SDVAL="..." SDNUM="...">
static double GetTableDataOptionsValNum( sal_uInt32& nNumForm,
- LanguageType& eNumLang, const String& aValStr,
- const String& aNumStr, SvNumberFormatter& rFormatter );
+ LanguageType& eNumLang, const OUString& aValStr,
+ const OUString& aNumStr, SvNumberFormatter& rFormatter );
protected:
// Start a file download. This is done asynchronously or synchronously.
@@ -95,10 +95,10 @@ protected:
// Default (without iterator) is JavaScript
ScriptType GetScriptType( SvKeyValueIterator* ) const;
- const String& GetScriptTypeString( SvKeyValueIterator* ) const;
+ const OUString& GetScriptTypeString( SvKeyValueIterator* ) const;
};
-inline sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+inline sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL,
sal_uInt16 nEventMouseOver,
sal_uInt16 nEventMouseOut)
{