diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-07 08:23:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-08 10:03:09 +0200 |
| commit | 6bd2075b71146d0ec6ee44ba52800e2610ff4971 (patch) | |
| tree | be3a06eda802d02c353c81575af3384b213e1540 /sc/source/ui/unoobj/scdetect.cxx | |
| parent | 1d2f7047f2646394395749bbcfccf14f3753d55f (diff) | |
convert sc/source/ui/unoobj/*.cxx from String to OUString
Change-Id: If3d93c94b4a07a79585987a5d8a83344c088e805
Diffstat (limited to 'sc/source/ui/unoobj/scdetect.cxx')
| -rw-r--r-- | sc/source/ui/unoobj/scdetect.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index ffdb7ea5bf0a..401ee34a384a 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -290,8 +290,8 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l uno::Reference< XInteractionHandler > xInteraction; String aURL; OUString sTemp; - String aTypeName; // a name describing the type (from MediaDescriptor, usually from flat detection) - String aPreselectedFilterName; // a name describing the filter to use (from MediaDescriptor, usually from UI action) + OUString aTypeName; // a name describing the type (from MediaDescriptor, usually from flat detection) + OUString aPreselectedFilterName; // a name describing the filter to use (from MediaDescriptor, usually from UI action) OUString aDocumentTitle; // interesting only if set in this method @@ -323,7 +323,7 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l lDescriptor[nProperty].Value >>= sTemp; aURL = sTemp; } - else if( !aURL.Len() && lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName")) ) + else if( !aURL.Len() && lDescriptor[nProperty].Name == "FileName" ) { lDescriptor[nProperty].Value >>= sTemp; aURL = sTemp; @@ -374,21 +374,21 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l bWasReadOnly = pItem && pItem->GetValue(); const SfxFilter* pFilter = 0; - String aPrefix = OUString( "private:factory/" ); - if( aURL.Match( aPrefix ) == aPrefix.Len() ) + OUString aPrefix = OUString( "private:factory/" ); + if( aURL.Match( aPrefix ) == aPrefix.getLength() ) { - String aPattern( aPrefix ); - aPattern += OUString("scalc"); - if ( aURL.Match( aPattern ) >= aPattern.Len() ) + OUString aPattern( aPrefix ); + aPattern += "scalc"; + if ( aURL.Match( aPattern ) >= aPattern.getLength() ) pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL ); } else { // container for Calc filters SfxFilterMatcher aMatcher("scalc"); - if ( aPreselectedFilterName.Len() ) + if ( !aPreselectedFilterName.isEmpty() ) pFilter = SfxFilter::GetFilterByName( aPreselectedFilterName ); - else if( aTypeName.Len() ) + else if( !aTypeName.isEmpty() ) pFilter = aMatcher.GetFilter4EA( aTypeName ); // ctor of SfxMedium uses owner transition of ItemSet @@ -450,7 +450,7 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l packages::zip::ZipIOException aZipException; // repairing is done only if this type is requested from outside - if ( ( aWrap.TargetException >>= aZipException ) && aTypeName.Len() ) + if ( ( aWrap.TargetException >>= aZipException ) && !aTypeName.isEmpty() ) { if ( xInteraction.is() ) { @@ -477,7 +477,7 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l } if ( !bRepairAllowed ) - aTypeName.Erase(); + aTypeName = ""; } } catch( uno::RuntimeException& ) @@ -486,10 +486,10 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l } catch( uno::Exception& ) { - aTypeName.Erase(); + aTypeName = ""; } - if ( aTypeName.Len() ) + if ( !aTypeName.isEmpty() ) pFilter = SfxFilterMatcher("scalc").GetFilter4EA( aTypeName ); } } |