From fdfd5c111de740456bc03df727b9c74a617237fc Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 5 Feb 2013 23:56:16 +0000 Subject: String->OUString Change-Id: I42193a40a0b5b905a721cb511d69836385bfcb40 --- sc/source/ui/docshell/tablink.cxx | 2 +- sc/source/ui/unoobj/scdetect.cxx | 4 ++-- sfx2/inc/sfx2/fcontnr.hxx | 2 +- sfx2/source/bastyp/fltfnc.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index f42810fc9a7b..e71e38763f05 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -482,7 +482,7 @@ bool ScDocumentLoader::GetFilterName( const String& rFileName, if ( bWithInteraction ) pMedium->UseInteractionHandler(true); // #i73992# no longer called from GuessFilter - SfxFilterMatcher aMatcher( rtl::OUString("scalc") ); + SfxFilterMatcher aMatcher("scalc"); if( bWithContent ) aMatcher.GuessFilter( *pMedium, &pSfxFilter ); else diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 998e2011446d..20cd22ce8b4a 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -320,7 +320,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) else { // container for Calc filters - SfxFilterMatcher aMatcher( rtl::OUString("scalc") ); + SfxFilterMatcher aMatcher("scalc"); if ( aPreselectedFilterName.Len() ) pFilter = SfxFilter::GetFilterByName( aPreselectedFilterName ); else if( aTypeName.Len() ) @@ -425,7 +425,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) } if ( aTypeName.Len() ) - pFilter = SfxFilterMatcher( rtl::OUString("scalc") ).GetFilter4EA( aTypeName ); + pFilter = SfxFilterMatcher("scalc").GetFilter4EA( aTypeName ); } } else diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx index 37a5777a2780..b2eb214f2cda 100644 --- a/sfx2/inc/sfx2/fcontnr.hxx +++ b/sfx2/inc/sfx2/fcontnr.hxx @@ -108,7 +108,7 @@ class SFX2_DLLPUBLIC SfxFilterMatcher : private boost::noncopyable friend class SfxFilterMatcherIter; SfxFilterMatcher_Impl &m_rImpl; public: - SfxFilterMatcher( const String& rFact ); + SfxFilterMatcher( const OUString& rFact ); SfxFilterMatcher(); ~SfxFilterMatcher(); diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 3bd1f58bad25..796ae0158c0f 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -297,7 +297,7 @@ namespace } } -SfxFilterMatcher::SfxFilterMatcher( const String& rName ) +SfxFilterMatcher::SfxFilterMatcher( const OUString& rName ) : m_rImpl( getSfxFilterMatcher_Impl(rName) ) { ++nSfxFilterMatcherCount; -- cgit