diff options
| -rw-r--r-- | include/sfx2/docfile.hxx | 10 | ||||
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index 7aa06a6b20b6..d9ab7f16fd79 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -74,7 +74,7 @@ public: /** * @param pSet Takes ownership */ - SfxMedium( const String &rName, + SfxMedium( const OUString &rName, StreamMode nOpenMode, const SfxFilter *pFilter = 0, SfxItemSet *pSet = 0 ); @@ -94,14 +94,14 @@ public: * @param pSet does NOT take ownership */ SfxMedium( const css::uno::Reference< css::embed::XStorage >& xStorage, - const String& rBaseURL, + const OUString& rBaseURL, const SfxItemSet* pSet=0 ); /** * @param pSet does NOT take ownership */ SfxMedium( const css::uno::Reference< css::embed::XStorage >& xStorage, - const String& rBaseURL, - const String& rTypeName, + const OUString& rBaseURL, + const OUString& rTypeName, const SfxItemSet* pSet=0 ); SfxMedium( const css::uno::Sequence< css::beans::PropertyValue >& aArgs ); @@ -175,7 +175,7 @@ public: sal_Bool UsesCache() const; void SetUsesCache( sal_Bool ); sal_Bool IsExpired() const; - void SetName( const String& rName, sal_Bool bSetOrigURL = sal_False ); + void SetName( const OUString& rName, sal_Bool bSetOrigURL = sal_False ); sal_Bool IsAllowedForExternalBrowser() const; long GetFileVersion() const; diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 9e36e71a22a8..d92d826b8936 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2753,7 +2753,7 @@ void SfxMedium::SetIsRemote_Impl() -void SfxMedium::SetName( const String& aNameP, sal_Bool bSetOrigURL ) +void SfxMedium::SetName( const OUString& aNameP, sal_Bool bSetOrigURL ) { if (pImp->aOrigURL.isEmpty()) pImp->aOrigURL = pImp->m_aLogicName; @@ -2841,7 +2841,7 @@ void SfxMedium::CompleteReOpen() pImp->bUseInteractionHandler = bUseInteractionHandler; } -SfxMedium::SfxMedium(const String &rName, StreamMode nOpenMode, const SfxFilter *pFlt, SfxItemSet *pInSet) : +SfxMedium::SfxMedium(const OUString &rName, StreamMode nOpenMode, const SfxFilter *pFlt, SfxItemSet *pInSet) : pImp(new SfxMedium_Impl(this)) { pImp->m_pSet = pInSet; @@ -2920,7 +2920,7 @@ SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) : //------------------------------------------------------------------ -SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const String& rBaseURL, const SfxItemSet* p ) : +SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUString& rBaseURL, const SfxItemSet* p ) : pImp(new SfxMedium_Impl(this)) { OUString aType = SfxFilter::GetTypeFromStorage(rStor); @@ -2939,7 +2939,7 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const Str //------------------------------------------------------------------ -SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const String& rBaseURL, const String &rTypeName, const SfxItemSet* p ) : +SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUString& rBaseURL, const OUString &rTypeName, const SfxItemSet* p ) : pImp(new SfxMedium_Impl(this)) { pImp->m_pFilter = SFX_APP()->GetFilterMatcher().GetFilter4EA( rTypeName ); |