diff options
-rw-r--r-- | sc/source/ui/unoobj/addruno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/afmtuno.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/unoobj/appluno.cxx | 26 | ||||
-rw-r--r-- | sc/source/ui/unoobj/celllistsource.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/cellvaluebinding.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/unoobj/chart2uno.cxx | 16 | ||||
-rw-r--r-- | sc/source/ui/unoobj/chartuno.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/unoobj/confuno.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/cursuno.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/dapiuno.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/unoobj/datauno.cxx | 34 | ||||
-rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 14 | ||||
-rw-r--r-- | sc/source/ui/unoobj/eventuno.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/fielduno.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/unoobj/filtuno.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/funcuno.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/unoobj/linkuno.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/unoobj/miscuno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/scdetect.cxx | 18 | ||||
-rw-r--r-- | sc/source/ui/unoobj/srchuno.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/styleuno.cxx | 16 | ||||
-rw-r--r-- | sc/source/ui/unoobj/viewuno.cxx | 6 |
22 files changed, 114 insertions, 114 deletions
diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index eca77af856ec..3dafb940aef6 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -304,7 +304,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAddressConversionObj ) rtl::OUString SAL_CALL ScAddressConversionObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii( "ScAddressConversionObj" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScAddressConversionObj" )); } sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const rtl::OUString& rServiceName ) diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index bd1991203887..7cd6a99f922f 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -209,14 +209,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScAutoFormatsObj_CreateInstance( rtl::OUString ScAutoFormatsObj::getImplementationName_Static() { - return rtl::OUString::createFromAscii( "stardiv.StarCalc.ScAutoFormatsObj" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScAutoFormatsObj" )); } uno::Sequence<rtl::OUString> ScAutoFormatsObj::getSupportedServiceNames_Static() { uno::Sequence<rtl::OUString> aRet(1); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( SCAUTOFORMATSOBJ_SERVICE ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCAUTOFORMATSOBJ_SERVICE )); return aRet; } diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 6db804e0bb9f..d25baa50e8a0 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -189,9 +189,9 @@ static void lcl_WriteInfo( registry::XRegistryKey* pRegistryKey, const uno::Sequence< rtl::OUString >& rServices ) throw( registry::InvalidRegistryException ) { - rtl::OUString aImpl(rtl::OUString::createFromAscii( "/" )); + rtl::OUString aImpl(RTL_CONSTASCII_USTRINGPARAM( "/" )); aImpl += rImplementationName; - aImpl += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); + aImpl += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )); uno::Reference<registry::XRegistryKey> xNewKey(pRegistryKey->createKey(aImpl)); const rtl::OUString* pArray = rServices.getConstArray(); @@ -504,14 +504,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance( rtl::OUString ScSpreadsheetSettings::getImplementationName_Static() { - return rtl::OUString::createFromAscii( "stardiv.StarCalc.ScSpreadsheetSettings" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScSpreadsheetSettings" )); } uno::Sequence<rtl::OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static() { uno::Sequence<rtl::OUString> aRet(1); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( SCSPREADSHEETSETTINGS_SERVICE ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEETSETTINGS_SERVICE )); return aRet; } @@ -767,14 +767,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance( rtl::OUString ScRecentFunctionsObj::getImplementationName_Static() { - return rtl::OUString::createFromAscii( "stardiv.StarCalc.ScRecentFunctionsObj" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScRecentFunctionsObj" )); } uno::Sequence<rtl::OUString> ScRecentFunctionsObj::getSupportedServiceNames_Static() { uno::Sequence<rtl::OUString> aRet(1); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( SCRECENTFUNCTIONSOBJ_SERVICE ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCRECENTFUNCTIONSOBJ_SERVICE )); return aRet; } @@ -848,14 +848,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance( rtl::OUString ScFunctionListObj::getImplementationName_Static() { - return rtl::OUString::createFromAscii( "stardiv.StarCalc.ScFunctionListObj" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScFunctionListObj" )); } uno::Sequence<rtl::OUString> ScFunctionListObj::getSupportedServiceNames_Static() { uno::Sequence<rtl::OUString> aRet(1); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( SCFUNCTIONLISTOBJ_SERVICE ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONLISTOBJ_SERVICE )); return aRet; } @@ -868,21 +868,21 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co beans::PropertyValue* pArray = rSequence.getArray(); - pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_ID ); + pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ID )); pArray[0].Value <<= (sal_Int32) rDesc.nFIndex; - pArray[1].Name = rtl::OUString::createFromAscii( SC_UNONAME_CATEGORY ); + pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CATEGORY )); pArray[1].Value <<= (sal_Int32) rDesc.nCategory; - pArray[2].Name = rtl::OUString::createFromAscii( SC_UNONAME_NAME ); + pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_NAME )); if (rDesc.pFuncName) pArray[2].Value <<= rtl::OUString( *rDesc.pFuncName ); - pArray[3].Name = rtl::OUString::createFromAscii( SC_UNONAME_DESCRIPTION ); + pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DESCRIPTION )); if (rDesc.pFuncDesc) pArray[3].Value <<= rtl::OUString( *rDesc.pFuncDesc ); - pArray[4].Name = rtl::OUString::createFromAscii( SC_UNONAME_ARGUMENTS ); + pArray[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ARGUMENTS )); if (rDesc.ppDefArgNames && rDesc.ppDefArgDescs && rDesc.pDefArgFlags ) { USHORT nCount = rDesc.nArgCount; diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index c10fadccea7c..cf058b3bb6da 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -90,7 +90,7 @@ namespace calc // register our property at the base class CellRangeAddress aInitialPropValue; registerPropertyNoMember( - ::rtl::OUString::createFromAscii( "CellRange" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CellRange" )), PROP_HANDLE_RANGE_ADDRESS, PropertyAttribute::BOUND | PropertyAttribute::READONLY, ::getCppuType( &aInitialPropValue ), diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 9e3cae0756c1..c2a5f6987166 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -96,7 +96,7 @@ namespace calc // register our property at the base class CellAddress aInitialPropValue; registerPropertyNoMember( - ::rtl::OUString::createFromAscii( "BoundCell" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "BoundCell" )), PROP_HANDLE_BOUND_CELL, PropertyAttribute::BOUND | PropertyAttribute::READONLY, ::getCppuType( &aInitialPropValue ), @@ -266,7 +266,7 @@ namespace calc if ( xProp.is() ) { CellContentType eResultType; - if ( (xProp->getPropertyValue(::rtl::OUString::createFromAscii( "FormulaResultType" ) ) >>= eResultType) && eResultType == CellContentType_VALUE ) + if ( (xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FormulaResultType" )) ) >>= eResultType) && eResultType == CellContentType_VALUE ) bHasValue = sal_True; } } @@ -404,7 +404,7 @@ namespace calc { // set boolean number format if not already set - ::rtl::OUString sPropName( ::rtl::OUString::createFromAscii( "NumberFormat" ) ); + ::rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( "NumberFormat" ) ); Reference<XPropertySet> xCellProp( m_xCell, UNO_QUERY ); Reference<XNumberFormatsSupplier> xSupplier( m_xDocument, UNO_QUERY ); if ( xSupplier.is() && xCellProp.is() ) @@ -429,10 +429,10 @@ namespace calc if ( xOldFormat.is() ) { // use the locale of the existing format - xOldFormat->getPropertyValue( ::rtl::OUString::createFromAscii( "Locale" ) ) >>= aLocale; + xOldFormat->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Locale" )) ) >>= aLocale; sal_Int16 nOldType = ::comphelper::getINT16( - xOldFormat->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) ); + xOldFormat->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Type" )) ) ); if ( nOldType & NumberFormat::LOGICAL ) bWasBoolean = sal_True; } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 227869efe48e..de08f9671f3f 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -1810,7 +1810,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum func = ::std::for_each(aAllTokens.begin(), aAllTokens.end(), func); func.getList(aTableNumList); aResult.push_back( - beans::PropertyValue( ::rtl::OUString::createFromAscii("TableNumberList"), -1, + beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableNumberList")), -1, uno::makeAny( lcl_createTableNumberList( aTableNumList ) ), beans::PropertyState_DIRECT_VALUE )); } @@ -1819,7 +1819,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString::createFromAscii("DataRowSource"), -1, + beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1, uno::makeAny( eRowSource ), beans::PropertyState_DIRECT_VALUE )); } @@ -1827,7 +1827,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString::createFromAscii("HasCategories"), -1, + beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE )); } @@ -1835,7 +1835,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString::createFromAscii("FirstCellAsLabel"), -1, + beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE )); } @@ -1861,7 +1861,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum // add cell range property aResult.push_back( - beans::PropertyValue( ::rtl::OUString::createFromAscii("CellRangeRepresentation"), -1, + beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1, uno::makeAny( sRangeRep ), beans::PropertyState_DIRECT_VALUE )); //Sequence Mapping @@ -1931,7 +1931,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bDifferentIndexes && aSequenceMappingVector.size() ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString::createFromAscii("SequenceMapping"), -1, + beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SequenceMapping")), -1, uno::makeAny( lcl_VectorToSequence(aSequenceMappingVector) ) , beans::PropertyState_DIRECT_VALUE )); } @@ -2438,7 +2438,7 @@ ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc, // rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); // m_aIdentifier = ::rtl::OUString( aStr ); -// m_aIdentifier = ::rtl::OUString::createFromAscii( "ID_"); +// m_aIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ID_")); // static sal_Int32 nID = 0; // m_aIdentifier += ::rtl::OUString::valueOf( ++nID); } @@ -3572,7 +3572,7 @@ ScChart2EmptyDataSequence::ScChart2EmptyDataSequence( ScDocument* pDoc, // rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); // m_aIdentifier = ::rtl::OUString( aStr ); -// m_aIdentifier = ::rtl::OUString::createFromAscii( "ID_"); +// m_aIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ID_")); // static sal_Int32 nID = 0; // m_aIdentifier += ::rtl::OUString::valueOf( ++nID); } diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 0212ea15dff3..d50555029f0f 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -272,16 +272,16 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, // set arguments uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString::createFromAscii("CellRangeRepresentation"), -1, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1, uno::makeAny( ::rtl::OUString( sRangeStr )), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - ::rtl::OUString::createFromAscii("HasCategories"), -1, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1, uno::makeAny( bRowHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - ::rtl::OUString::createFromAscii("FirstCellAsLabel"), -1, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1, uno::makeAny( bColumnHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - ::rtl::OUString::createFromAscii("DataRowSource"), -1, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1, uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); } @@ -466,7 +466,7 @@ ScChartObj::ScChartObj(ScDocShell* pDocSh, SCTAB nT, const String& rN) pDocShell->GetDocument()->AddUnoObject(*this); uno::Sequence< table::CellRangeAddress > aInitialPropValue; - registerPropertyNoMember( ::rtl::OUString::createFromAscii( "RelatedCellRanges" ), + registerPropertyNoMember( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RelatedCellRanges" )), PROP_HANDLE_RELATED_CELLRANGES, beans::PropertyAttribute::MAYBEVOID, ::getCppuType( &aInitialPropValue ), &aInitialPropValue ); } diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 30ee4976bb69..5fbbe2a007f5 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -461,7 +461,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocumentConfiguration ) rtl::OUString SAL_CALL ScDocumentConfiguration::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii( "ScDocumentConfiguration" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScDocumentConfiguration" )); } sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const rtl::OUString& rServiceName ) @@ -477,8 +477,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDocumentConfiguration::getSupportedServi { uno::Sequence<rtl::OUString> aRet(2); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( SCCOMPSCPREADSHEETSETTINGS_SERVICE ); - pArray[1] = rtl::OUString::createFromAscii( SCDOCUMENTSETTINGS_SERVICE ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCOMPSCPREADSHEETSETTINGS_SERVICE )); + pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCUMENTSETTINGS_SERVICE )); return aRet; } diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index 4685a4137c15..96960bfabcac 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -473,7 +473,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName( rtl::OUString SAL_CALL ScCellCursorObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii( "ScCellCursorObj" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellCursorObj" )); } sal_Bool SAL_CALL ScCellCursorObj::supportsService( const rtl::OUString& rServiceName ) @@ -496,8 +496,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames( // SheetCellCursor should be first (?) uno::Sequence<rtl::OUString> aTotalSeq( nParentLen + 2 ); rtl::OUString* pTotalArr = aTotalSeq.getArray(); - pTotalArr[0] = rtl::OUString::createFromAscii( SCSHEETCELLCURSOR_SERVICE ); - pTotalArr[1] = rtl::OUString::createFromAscii( SCCELLCURSOR_SERVICE ); + pTotalArr[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLCURSOR_SERVICE )); + pTotalArr[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLCURSOR_SERVICE )); // append cell range services for (long i=0; i<nParentLen; i++) diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index fc3aa7583552..e704a4d0a7cd 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -1008,13 +1008,13 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope { uno::Sequence<beans::PropertyValue> aSeq( 4 ); beans::PropertyValue* pArray = aSeq.getArray(); - pArray[0].Name = rtl::OUString::createFromAscii( SC_UNO_SOURCENAME ); + pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SOURCENAME )); pArray[0].Value <<= rtl::OUString( pServiceDesc->aParSource ); - pArray[1].Name = rtl::OUString::createFromAscii( SC_UNO_OBJECTNAME ); + pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OBJECTNAME )); pArray[1].Value <<= rtl::OUString( pServiceDesc->aParName ); - pArray[2].Name = rtl::OUString::createFromAscii( SC_UNO_USERNAME ); + pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_USERNAME )); pArray[2].Value <<= rtl::OUString( pServiceDesc->aParUser ); - pArray[3].Name = rtl::OUString::createFromAscii( SC_UNO_PASSWORD ); + pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PASSWORD )); pArray[3].Value <<= rtl::OUString( pServiceDesc->aParPass ); aRet <<= aSeq; } diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 8cc00f714eab..9866c038b485 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -233,22 +233,22 @@ void ScImportDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rS aDescriptor.setDataSource(rParam.aDBName); if (aDescriptor.has( svx::daDataSource )) { - pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_DBNAME ); + pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DBNAME )); pArray[0].Value <<= rtl::OUString( rParam.aDBName ); } else if (aDescriptor.has( svx::daConnectionResource )) { - pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_CONRES ); + pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONRES )); pArray[0].Value <<= rtl::OUString( rParam.aDBName ); } - pArray[1].Name = rtl::OUString::createFromAscii( SC_UNONAME_SRCTYPE ); + pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCTYPE )); pArray[1].Value <<= eMode; - pArray[2].Name = rtl::OUString::createFromAscii( SC_UNONAME_SRCOBJ ); + pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCOBJ )); pArray[2].Value <<= rtl::OUString( rParam.aStatement ); - pArray[3].Name = rtl::OUString::createFromAscii( SC_UNONAME_ISNATIVE ); + pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISNATIVE )); ScUnoHelpFunctions::SetBoolInAny( pArray[3].Value, rParam.bNative ); } @@ -356,31 +356,31 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq // Sequence fuellen - pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_ISSORTCOLUMNS ); + pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISSORTCOLUMNS )); pArray[0].Value = ::cppu::bool2any(!rParam.bByRow); - pArray[1].Name = rtl::OUString::createFromAscii( SC_UNONAME_CONTHDR ); + pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONTHDR )); ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, rParam.bHasHeader ); - pArray[2].Name = rtl::OUString::createFromAscii( SC_UNONAME_MAXFLD ); + pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_MAXFLD )); pArray[2].Value <<= (sal_Int32) MAXSORT; - pArray[3].Name = rtl::OUString::createFromAscii( SC_UNONAME_SORTFLD ); + pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SORTFLD )); pArray[3].Value <<= aFields; - pArray[4].Name = rtl::OUString::createFromAscii( SC_UNONAME_BINDFMT ); + pArray[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_BINDFMT )); ScUnoHelpFunctions::SetBoolInAny( pArray[4].Value, rParam.bIncludePattern ); - pArray[5].Name = rtl::OUString::createFromAscii( SC_UNONAME_COPYOUT ); + pArray[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_COPYOUT )); ScUnoHelpFunctions::SetBoolInAny( pArray[5].Value, !rParam.bInplace ); - pArray[6].Name = rtl::OUString::createFromAscii( SC_UNONAME_OUTPOS ); + pArray[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_OUTPOS )); pArray[6].Value <<= aOutPos; - pArray[7].Name = rtl::OUString::createFromAscii( SC_UNONAME_ISULIST ); + pArray[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISULIST )); ScUnoHelpFunctions::SetBoolInAny( pArray[7].Value, rParam.bUserDef ); - pArray[8].Name = rtl::OUString::createFromAscii( SC_UNONAME_UINDEX ); + pArray[8].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_UINDEX )); pArray[8].Value <<= (sal_Int32) rParam.nUserIndex; } @@ -2148,7 +2148,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDatabaseRangeObj ) rtl::OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii( "ScDatabaseRangeObj" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScDatabaseRangeObj" )); } sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const rtl::OUString& rServiceName ) @@ -2164,8 +2164,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNam { uno::Sequence<rtl::OUString> aRet(2); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( SCDATABASERANGEOBJ_SERVICE ); - pArray[1] = rtl::OUString::createFromAscii( SCLINKTARGET_SERVICE ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDATABASERANGEOBJ_SERVICE )); + pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); return aRet; } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 41bf1a16859f..8da80e40f30c 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -998,7 +998,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 uno::Sequence<beans::PropertyValue> aSequence(1); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_PAGESIZE ); + pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); pArray[0].Value <<= aPageSize; if( ! pPrinterOptions ) @@ -1045,17 +1045,17 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 long nPropCount = bWasCellRange ? 3 : 2; uno::Sequence<beans::PropertyValue> aSequence(nPropCount); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_PAGESIZE ); + pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); pArray[0].Value <<= aPageSize; // #i111158# all positions are relative to the whole page, including non-printable area - pArray[1].Name = rtl::OUString::createFromAscii( SC_UNONAME_INC_NP_AREA ); + pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INC_NP_AREA )); pArray[1].Value = uno::makeAny( sal_True ); if ( bWasCellRange ) { table::CellRangeAddress aRangeAddress( nTab, aCellRange.aStart.Col(), aCellRange.aStart.Row(), aCellRange.aEnd.Col(), aCellRange.aEnd.Row() ); - pArray[2].Name = rtl::OUString::createFromAscii( SC_UNONAME_SOURCERANGE ); + pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SOURCERANGE )); pArray[2].Value <<= aRangeAddress; } @@ -1997,7 +1997,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames() rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii( "ScModelObj" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScModelObj" )); } sal_Bool SAL_CALL ScModelObj::supportsService( const rtl::OUString& rServiceName ) @@ -2014,8 +2014,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(2); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( SCMODELOBJ_SERVICE ); - pArray[1] = rtl::OUString::createFromAscii( SCDOCSETTINGS_SERVICE ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCMODELOBJ_SERVICE )); + pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); return aRet; } diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index 8f0b38c0eed9..4edd9b8fb801 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -155,10 +155,10 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) { uno::Sequence<beans::PropertyValue> aPropSeq( 2 ); aPropSeq[0] = beans::PropertyValue( - rtl::OUString::createFromAscii("EventType"), -1, - uno::makeAny( rtl::OUString::createFromAscii("Script") ), beans::PropertyState_DIRECT_VALUE ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EventType")), -1, + uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script")) ), beans::PropertyState_DIRECT_VALUE ); aPropSeq[1] = beans::PropertyValue( - rtl::OUString::createFromAscii("Script"), -1, + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script")), -1, uno::makeAny( *pScript ), beans::PropertyState_DIRECT_VALUE ); aRet <<= aPropSeq; } diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 3af71007dfcf..09155bb04f76 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -840,7 +840,7 @@ ScCellFieldObj* ScCellFieldObj::getImplementation( rtl::OUString SAL_CALL ScCellFieldObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii( "ScCellFieldObj" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellFieldObj" )); } sal_Bool SAL_CALL ScCellFieldObj::supportsService( const rtl::OUString& rServiceName ) @@ -856,8 +856,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellFieldObj::getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(2); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( SCTEXTFIELD_SERVICE ); - pArray[1] = rtl::OUString::createFromAscii( SCTEXTCONTENT_SERVICE ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCTEXTFIELD_SERVICE )); + pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCTEXTCONTENT_SERVICE )); return aRet; } @@ -1501,7 +1501,7 @@ ScHeaderFieldObj* ScHeaderFieldObj::getImplementation( rtl::OUString SAL_CALL ScHeaderFieldObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii( "ScHeaderFieldObj" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScHeaderFieldObj" )); } sal_Bool SAL_CALL ScHeaderFieldObj::supportsService( const rtl::OUString& rServiceName ) @@ -1517,8 +1517,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScHeaderFieldObj::getSupportedServiceNames { uno::Sequence<rtl::OUString> aRet(2); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( SCTEXTFIELD_SERVICE ); - pArray[1] = rtl::OUString::createFromAscii( SCTEXTCONTENT_SERVICE ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCTEXTFIELD_SERVICE )); + pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCTEXTCONTENT_SERVICE )); return aRet; } diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index ed1880380089..257489993850 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -91,14 +91,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScFilterOptionsObj_CreateInstance( rtl::OUString ScFilterOptionsObj::getImplementationName_Static() { - return rtl::OUString::createFromAscii( SCFILTEROPTIONSOBJ_IMPLNAME ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_IMPLNAME )); } uno::Sequence<rtl::OUString> ScFilterOptionsObj::getSupportedServiceNames_Static() { uno::Sequence<rtl::OUString> aRet(1); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( SCFILTEROPTIONSOBJ_SERVICE ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_SERVICE )); return aRet; } @@ -109,7 +109,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValu uno::Sequence<beans::PropertyValue> aRet(1); beans::PropertyValue* pArray = aRet.getArray(); - pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_FILTEROPTIONS ); + pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FILTEROPTIONS )); pArray[0].Value <<= aFilterOptions; return aRet; diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 7b1efbd8e20f..8e132848e4ad 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -262,14 +262,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance( rtl::OUString ScFunctionAccess::getImplementationName_Static() { - return rtl::OUString::createFromAscii( "stardiv.StarCalc.ScFunctionAccess" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScFunctionAccess" )); } uno::Sequence<rtl::OUString> ScFunctionAccess::getSupportedServiceNames_Static() { uno::Sequence<rtl::OUString> aRet(1); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( SCFUNCTIONACCESS_SERVICE ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); return aRet; } @@ -277,7 +277,7 @@ uno::Sequence<rtl::OUString> ScFunctionAccess::getSupportedServiceNames_Static() rtl::OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii( "ScFunctionAccess" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScFunctionAccess") ); } sal_Bool SAL_CALL ScFunctionAccess::supportsService( const rtl::OUString& rServiceName ) @@ -293,8 +293,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames { uno::Sequence<rtl::OUString> aRet(2); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( SCFUNCTIONACCESS_SERVICE ); - pArray[1] = rtl::OUString::createFromAscii( SCDOCSETTINGS_SERVICE ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); + pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); return aRet; } diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 9f5d7a5dd1c2..a2ee998d97ee 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -1687,8 +1687,8 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumer { SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( - new ScIndexEnumeration(this, OUString::createFromAscii( - "com.sun.star.sheet.ExternalDocLink"))); + new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.sheet.ExternalDocLink")))); return aRef; } @@ -1801,8 +1801,8 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnume { SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( - new ScIndexEnumeration(this, OUString::createFromAscii( - "com.sun.star.sheet.ExternalDocLinks"))); + new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.sheet.ExternalDocLinks")))); return aRef; } diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index f0c1798e8c73..fc963f493bfe 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -251,7 +251,7 @@ uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchEleme ::rtl::OUString SAL_CALL ScIndexEnumeration::getImplementationName() throw(::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString::createFromAscii("ScIndexEnumeration"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScIndexEnumeration")); } sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const ::rtl::OUString& ServiceName ) diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index d16edbbd9ea0..0d629b7f3a02 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -764,7 +764,7 @@ static BOOL lcl_MayBeDBase( SvStream& rStream ) { // if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice lDescriptor.realloc( nPropertyCount + 1 ); - lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("InputStream"); + lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")); lDescriptor[nPropertyCount].Value <<= xStream; nPropertyCount++; } @@ -773,7 +773,7 @@ static BOOL lcl_MayBeDBase( SvStream& rStream ) { // if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice lDescriptor.realloc( nPropertyCount + 1 ); - lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("UCBContent"); + lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UCBContent")); lDescriptor[nPropertyCount].Value <<= xContent; nPropertyCount++; } @@ -783,7 +783,7 @@ static BOOL lcl_MayBeDBase( SvStream& rStream ) if ( nIndexOfReadOnlyFlag == -1 ) { lDescriptor.realloc( nPropertyCount + 1 ); - lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("ReadOnly"); + lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")); lDescriptor[nPropertyCount].Value <<= bReadOnly; nPropertyCount++; } @@ -794,7 +794,7 @@ static BOOL lcl_MayBeDBase( SvStream& rStream ) if ( !bRepairPackage && bRepairAllowed ) { lDescriptor.realloc( nPropertyCount + 1 ); - lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("RepairPackage"); + lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RepairPackage")); lDescriptor[nPropertyCount].Value <<= bRepairAllowed; nPropertyCount++; @@ -808,7 +808,7 @@ static BOOL lcl_MayBeDBase( SvStream& rStream ) if ( nIndexOfTemplateFlag == -1 ) { lDescriptor.realloc( nPropertyCount + 1 ); - lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("AsTemplate"); + lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate")); lDescriptor[nPropertyCount].Value <<= bOpenAsTemplate; nPropertyCount++; } @@ -822,7 +822,7 @@ static BOOL lcl_MayBeDBase( SvStream& rStream ) if ( nIndexOfDocumentTitle == -1 ) { lDescriptor.realloc( nPropertyCount + 1 ); - lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("DocumentTitle"); + lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle")); lDescriptor[nPropertyCount].Value <<= aDocumentTitle; nPropertyCount++; } @@ -835,7 +835,7 @@ static BOOL lcl_MayBeDBase( SvStream& rStream ) if ( nIndexOfFilterName == -1 ) { lDescriptor.realloc( nPropertyCount + 1 ); - lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("FilterName"); + lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName")); lDescriptor[nPropertyCount].Value <<= rtl::OUString(pFilter->GetName()); nPropertyCount++; } @@ -884,14 +884,14 @@ UNOSEQUENCE< UNOOUSTRING > ScFilterDetect::impl_getStaticSupportedServiceNames() { UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() ); UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 ); - seqServiceNames.getArray() [0] = UNOOUSTRING::createFromAscii( "com.sun.star.frame.ExtendedTypeDetection" ); + seqServiceNames.getArray() [0] = UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ExtendedTypeDetection" )); return seqServiceNames ; } /* Helper for XServiceInfo */ UNOOUSTRING ScFilterDetect::impl_getStaticImplementationName() { - return UNOOUSTRING::createFromAscii( "com.sun.star.comp.calc.FormatDetector" ); + return UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.calc.FormatDetector" )); } /* Helper for registry */ diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 6402f60d91aa..b6b6d907fe0b 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -207,7 +207,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScCellSearchObj ) rtl::OUString SAL_CALL ScCellSearchObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii( "ScCellSearchObj" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellSearchObj" )); } sal_Bool SAL_CALL ScCellSearchObj::supportsService( const rtl::OUString& rServiceName ) @@ -223,8 +223,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames( { uno::Sequence<rtl::OUString> aRet(2); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( SCSEARCHDESCRIPTOR_SERVICE ); - pArray[1] = rtl::OUString::createFromAscii( SCREPLACEDESCRIPTOR_SERVICE ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSEARCHDESCRIPTOR_SERVICE )); + pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCREPLACEDESCRIPTOR_SERVICE )); return aRet; } 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; diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 297ae74b5de1..2713ca9da83f 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -2255,7 +2255,7 @@ void ScTabViewObj::RangeSelChanged( const String& rText ) rtl::OUString SAL_CALL ScTabViewObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii( "ScTabViewObj" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScTabViewObj" )); } sal_Bool SAL_CALL ScTabViewObj::supportsService( const rtl::OUString& rServiceName ) @@ -2271,8 +2271,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(2); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( SCTABVIEWOBJ_SERVICE ); - pArray[1] = rtl::OUString::createFromAscii( SCVIEWSETTINGS_SERVICE ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCTABVIEWOBJ_SERVICE )); + pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCVIEWSETTINGS_SERVICE )); return aRet; } |