diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-11 09:49:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-15 12:25:38 +0200 |
commit | d90e15400df5beabc7704e7c23f36834c011bc96 (patch) | |
tree | 57873f88942f73a5047ee3fc30c2b9a4b0d9e7aa /sw/source/ui/app/docsh2.cxx | |
parent | 84a36663052a0089516aa0eeae18811317f78cd7 (diff) |
convert sw/inc/docsh.hxx from String to OUString
and remove a dead method definition
Change-Id: I8b07d5143d6e6eaa260cd312f7a7907738a5a7a8
Diffstat (limited to 'sw/source/ui/app/docsh2.cxx')
-rw-r--r-- | sw/source/ui/app/docsh2.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 6422f0c26a3e..cb3a4474fd74 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -1276,7 +1276,7 @@ class SwReloadFromHtmlReader : public SwReader } }; -void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView ) +void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcView ) { sal_Bool bModified = IsModified(); @@ -1382,7 +1382,7 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView pDoc->ResetModified(); } -sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL, +sal_uLong SwDocShell::LoadStylesFromFile( const OUString& rURL, SwgReaderOption& rOpt, sal_Bool bUnoCall ) { sal_uLong nErr = 0; |