Kaydet (Commit) fdfd5c11 authored tarafından Caolán McNamara's avatar Caolán McNamara

String->OUString

Change-Id: I42193a40a0b5b905a721cb511d69836385bfcb40
üst 8c34306b
...@@ -482,7 +482,7 @@ bool ScDocumentLoader::GetFilterName( const String& rFileName, ...@@ -482,7 +482,7 @@ bool ScDocumentLoader::GetFilterName( const String& rFileName,
if ( bWithInteraction ) if ( bWithInteraction )
pMedium->UseInteractionHandler(true); // #i73992# no longer called from GuessFilter pMedium->UseInteractionHandler(true); // #i73992# no longer called from GuessFilter
SfxFilterMatcher aMatcher( rtl::OUString("scalc") ); SfxFilterMatcher aMatcher("scalc");
if( bWithContent ) if( bWithContent )
aMatcher.GuessFilter( *pMedium, &pSfxFilter ); aMatcher.GuessFilter( *pMedium, &pSfxFilter );
else else
......
...@@ -320,7 +320,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) ...@@ -320,7 +320,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
else else
{ {
// container for Calc filters // container for Calc filters
SfxFilterMatcher aMatcher( rtl::OUString("scalc") ); SfxFilterMatcher aMatcher("scalc");
if ( aPreselectedFilterName.Len() ) if ( aPreselectedFilterName.Len() )
pFilter = SfxFilter::GetFilterByName( aPreselectedFilterName ); pFilter = SfxFilter::GetFilterByName( aPreselectedFilterName );
else if( aTypeName.Len() ) else if( aTypeName.Len() )
...@@ -425,7 +425,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) ...@@ -425,7 +425,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
} }
if ( aTypeName.Len() ) if ( aTypeName.Len() )
pFilter = SfxFilterMatcher( rtl::OUString("scalc") ).GetFilter4EA( aTypeName ); pFilter = SfxFilterMatcher("scalc").GetFilter4EA( aTypeName );
} }
} }
else else
......
...@@ -108,7 +108,7 @@ class SFX2_DLLPUBLIC SfxFilterMatcher : private boost::noncopyable ...@@ -108,7 +108,7 @@ class SFX2_DLLPUBLIC SfxFilterMatcher : private boost::noncopyable
friend class SfxFilterMatcherIter; friend class SfxFilterMatcherIter;
SfxFilterMatcher_Impl &m_rImpl; SfxFilterMatcher_Impl &m_rImpl;
public: public:
SfxFilterMatcher( const String& rFact ); SfxFilterMatcher( const OUString& rFact );
SfxFilterMatcher(); SfxFilterMatcher();
~SfxFilterMatcher(); ~SfxFilterMatcher();
......
...@@ -297,7 +297,7 @@ namespace ...@@ -297,7 +297,7 @@ namespace
} }
} }
SfxFilterMatcher::SfxFilterMatcher( const String& rName ) SfxFilterMatcher::SfxFilterMatcher( const OUString& rName )
: m_rImpl( getSfxFilterMatcher_Impl(rName) ) : m_rImpl( getSfxFilterMatcher_Impl(rName) )
{ {
++nSfxFilterMatcherCount; ++nSfxFilterMatcherCount;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment