diff options
Diffstat (limited to 'sc/source/ui/unoobj/styleuno.cxx')
-rw-r--r-- | sc/source/ui/unoobj/styleuno.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 9383816528ab..245bdd4237a2 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -671,8 +671,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamiliesObj::getElementNames() SolarMutexGuard aGuard; uno::Sequence<rtl::OUString> aNames(SC_STYLE_FAMILY_COUNT); rtl::OUString* pNames = aNames.getArray(); - pNames[0] = rtl::OUString::createFromAscii( SC_FAMILYNAME_CELL ); - pNames[1] = rtl::OUString::createFromAscii( SC_FAMILYNAME_PAGE ); + pNames[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_FAMILYNAME_CELL )); + pNames[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_FAMILYNAME_PAGE )); return aNames; } @@ -734,13 +734,13 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderO uno::Sequence<beans::PropertyValue> aSequence(3); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_OVERWSTL ); + pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_OVERWSTL )); ScUnoHelpFunctions::SetBoolInAny( pArray[0].Value, TRUE ); - pArray[1].Name = rtl::OUString::createFromAscii( SC_UNONAME_LOADCELL ); + pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_LOADCELL )); ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, TRUE ); - pArray[2].Name = rtl::OUString::createFromAscii( SC_UNONAME_LOADPAGE ); + pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_LOADPAGE )); ScUnoHelpFunctions::SetBoolInAny( pArray[2].Value, TRUE ); return aSequence; @@ -2039,7 +2039,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa BYTE nValue = ((const SvxPaperBinItem&)pItemSet->Get(nWhich)).GetValue(); rtl::OUString aName; if ( nValue == PAPERBIN_PRINTER_SETTINGS ) - aName = rtl::OUString::createFromAscii( SC_PAPERBIN_DEFAULTNAME ); + aName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_PAPERBIN_DEFAULTNAME )); else { Printer* pPrinter = pDocShell->GetPrinter(); @@ -2107,7 +2107,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScStyleObj ) rtl::OUString SAL_CALL ScStyleObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii( "ScStyleObj" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScStyleObj" )); } sal_Bool SAL_CALL ScStyleObj::supportsService( const rtl::OUString& rServiceName ) @@ -2125,7 +2125,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScStyleObj::getSupportedServiceNames() BOOL bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE ); uno::Sequence<rtl::OUString> aRet(2); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( SCSTYLE_SERVICE ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSTYLE_SERVICE )); pArray[1] = rtl::OUString::createFromAscii( bPage ? SCPAGESTYLE_SERVICE : SCCELLSTYLE_SERVICE ); return aRet; |