[Libreoffice-commits] .: binfilter/bf_sc
Gert Faller
gfaller at kemper.freedesktop.org
Tue Nov 30 14:57:04 PST 2010
binfilter/bf_sc/source/ui/app/sc_sclib.cxx | 4 -
binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx | 10 ++--
binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx | 16 +++----
binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx | 44 ++++++++++-----------
binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx | 4 -
binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx | 4 -
binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx | 28 ++++++-------
binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx | 6 +-
binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx | 8 +--
binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx | 6 +-
binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx | 6 +-
binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx | 18 ++++----
14 files changed, 79 insertions(+), 79 deletions(-)
New commits:
commit 9412493d89765389292b881a8fb8a501bff4dc80
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Tue Nov 30 23:56:36 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in filters 18
diff --git a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
index 0181420..406dc66 100644
--- a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
@@ -131,8 +131,8 @@ extern "C" { static void SAL_CALL thisModule() {} }
/*N*/ String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ))
/*N*/ {
/*N*/ ((SfxObjectFactory&)Factory()).
-/*N*/ SetDocumentServiceName( ::rtl::OUString::createFromAscii(
-/*N*/ "com.sun.star.sheet.SpreadsheetDocument" ) );
+/*N*/ SetDocumentServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+/*N*/ "com.sun.star.sheet.SpreadsheetDocument" )) );
/*N*/
/*N*/ const String aEmptyStr;
/*N*/ // Clipboard-IDs:
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
index 254b209..09f6e90 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
@@ -167,7 +167,7 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/ bDispose = sal_True;
/*M*/ xRowSet = uno::Reference<sdbc::XRowSet>(
/*M*/ ::legacy_binfilters::getLegacyProcessServiceFactory()->createInstance(
-/*M*/ ::rtl::OUString::createFromAscii( SC_SERVICE_ROWSET ) ),
+/*M*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ),
/*M*/ uno::UNO_QUERY);
/*M*/ uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY );
/*M*/ DBG_ASSERT( xRowProp.is(), "can't get RowSet" );
@@ -184,22 +184,22 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/
/*M*/ aAny <<= ::rtl::OUString( rParam.aDBName );
/*M*/ xRowProp->setPropertyValue(
-/*M*/ ::rtl::OUString::createFromAscii(SC_DBPROP_DATASOURCENAME), aAny );
+/*M*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_DATASOURCENAME)), aAny );
/*M*/
/*M*/ aAny <<= ::rtl::OUString( rParam.aStatement );
/*M*/ xRowProp->setPropertyValue(
-/*M*/ ::rtl::OUString::createFromAscii(SC_DBPROP_COMMAND), aAny );
+/*M*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny );
/*M*/
/*M*/ aAny <<= nType;
/*M*/ xRowProp->setPropertyValue(
-/*M*/ ::rtl::OUString::createFromAscii(SC_DBPROP_COMMANDTYPE), aAny );
+/*M*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny );
/*M*/
/*M*/ uno::Reference<sdb::XCompletedExecution> xExecute( xRowSet, uno::UNO_QUERY );
/*M*/ if ( xExecute.is() )
/*M*/ {
/*M*/ uno::Reference<task::XInteractionHandler> xHandler(
/*M*/ ::legacy_binfilters::getLegacyProcessServiceFactory()->createInstance(
-/*M*/ ::rtl::OUString::createFromAscii( SC_SERVICE_INTHANDLER ) ),
+/*M*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_INTHANDLER )) ),
/*M*/ uno::UNO_QUERY);
/*M*/ xExecute->executeWithCompletion( xHandler );
/*M*/ }
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx
index 6bd3f65..13b3ff7 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx
@@ -188,7 +188,7 @@ uno::Sequence< ::rtl::OUString> ScAutoFormatsObj::getSupportedServiceNames_Stati
{
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/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
index 8f2c918..b21d5ba 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
@@ -440,7 +440,7 @@ uno::Sequence< ::rtl::OUString> ScSpreadsheetSettings::getSupportedServiceNames_
{
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;
}
@@ -699,7 +699,7 @@ uno::Sequence< ::rtl::OUString> ScRecentFunctionsObj::getSupportedServiceNames_S
{
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;
}
@@ -780,7 +780,7 @@ uno::Sequence< ::rtl::OUString> ScFunctionListObj::getSupportedServiceNames_Stat
{
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;
}
@@ -791,21 +791,21 @@ void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, const ScF
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.aDefArgNames && rDesc.aDefArgDescs && rDesc.aDefArgOpt )
{
USHORT nCount = rDesc.nArgCount;
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
index 36123aa..7d4ff85 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
@@ -4158,10 +4158,10 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNam
{
uno::Sequence< ::rtl::OUString> aRet(4);
::rtl::OUString* pArray = aRet.getArray();
- pArray[0] = ::rtl::OUString::createFromAscii( SCSHEETCELLRANGES_SERVICE );
- pArray[1] = ::rtl::OUString::createFromAscii( SCCELLPROPERTIES_SERVICE );
- pArray[2] = ::rtl::OUString::createFromAscii( SCCHARPROPERTIES_SERVICE );
- pArray[3] = ::rtl::OUString::createFromAscii( SCPARAPROPERTIES_SERVICE );
+ pArray[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGES_SERVICE ));
+ pArray[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
+ pArray[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
+ pArray[3] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
return aRet;
}
@@ -5352,11 +5352,11 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScCellRangeObj::getSupportedServiceName
{
uno::Sequence< ::rtl::OUString> aRet(5);
::rtl::OUString* pArray = aRet.getArray();
- pArray[0] = ::rtl::OUString::createFromAscii( SCSHEETCELLRANGE_SERVICE );
- pArray[1] = ::rtl::OUString::createFromAscii( SCCELLRANGE_SERVICE );
- pArray[2] = ::rtl::OUString::createFromAscii( SCCELLPROPERTIES_SERVICE );
- pArray[3] = ::rtl::OUString::createFromAscii( SCCHARPROPERTIES_SERVICE );
- pArray[4] = ::rtl::OUString::createFromAscii( SCPARAPROPERTIES_SERVICE );
+ pArray[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE ));
+ pArray[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE ));
+ pArray[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
+ pArray[3] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
+ pArray[4] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
return aRet;
}
@@ -5968,13 +5968,13 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScCellObj::getSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString> aRet(7);
::rtl::OUString* pArray = aRet.getArray();
- pArray[0] = ::rtl::OUString::createFromAscii( SCSHEETCELL_SERVICE );
- pArray[1] = ::rtl::OUString::createFromAscii( SCCELL_SERVICE );
- pArray[2] = ::rtl::OUString::createFromAscii( SCCELLPROPERTIES_SERVICE );
- pArray[3] = ::rtl::OUString::createFromAscii( SCCHARPROPERTIES_SERVICE );
- pArray[4] = ::rtl::OUString::createFromAscii( SCPARAPROPERTIES_SERVICE );
- pArray[5] = ::rtl::OUString::createFromAscii( SCSHEETCELLRANGE_SERVICE );
- pArray[6] = ::rtl::OUString::createFromAscii( SCCELLRANGE_SERVICE );
+ pArray[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELL_SERVICE ));
+ pArray[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELL_SERVICE ));
+ pArray[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
+ pArray[3] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
+ pArray[4] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
+ pArray[5] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE ));
+ pArray[6] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE ));
return aRet;
}
@@ -7403,12 +7403,12 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNam
{
uno::Sequence< ::rtl::OUString> aRet(6);
::rtl::OUString* pArray = aRet.getArray();
- pArray[0] = ::rtl::OUString::createFromAscii( SCSPREADSHEET_SERVICE );
- pArray[1] = ::rtl::OUString::createFromAscii( SCSHEETCELLRANGE_SERVICE );
- pArray[2] = ::rtl::OUString::createFromAscii( SCCELLRANGE_SERVICE );
- pArray[3] = ::rtl::OUString::createFromAscii( SCCELLPROPERTIES_SERVICE );
- pArray[4] = ::rtl::OUString::createFromAscii( SCCHARPROPERTIES_SERVICE );
- pArray[5] = ::rtl::OUString::createFromAscii( SCPARAPROPERTIES_SERVICE );
+ pArray[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEET_SERVICE ));
+ pArray[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE ));
+ pArray[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE ));
+ pArray[3] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
+ pArray[4] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
+ pArray[5] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
return aRet;
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx
index d9d64c5..a8aa708 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx
@@ -394,8 +394,8 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScDocumentConfiguration::getSupportedSe
{
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/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx
index df6a643..0964716 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx
@@ -484,8 +484,8 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNam
// 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/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
index 2ffb1b2..b8ebcab 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
@@ -212,16 +212,16 @@ void ScImportDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rS
eMode = sheet::DataImportMode_TABLE; // Type ist immer ScDbQuery oder ScDbTable
}
- 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 );
- 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_NATIVE );
+ pArray[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_NATIVE ));
ScUnoHelpFunctions::SetBoolInAny( pArray[3].Value, rParam.bNative );
}
@@ -327,31 +327,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;
}
@@ -1872,7 +1872,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScDatabaseRangeObj::getSupportedService
{
uno::Sequence< ::rtl::OUString> aRet(1);
::rtl::OUString* pArray = aRet.getArray();
- pArray[0] = ::rtl::OUString::createFromAscii( SCDATABASERANGEOBJ_SERVICE );
+ pArray[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDATABASERANGEOBJ_SERVICE ));
return aRet;
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
index 203bcd9..a3d4fe4 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
@@ -1094,9 +1094,9 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScModelObj::getSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString> aRet(3);
::rtl::OUString* pArray = aRet.getArray();
- pArray[0] = ::rtl::OUString::createFromAscii( SCMODELOBJ_SERVICE );
- pArray[1] = ::rtl::OUString::createFromAscii( SCDOCSETTINGS_SERVICE );
- pArray[2] = ::rtl::OUString::createFromAscii( SCDOC_SERVICE );
+ pArray[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCMODELOBJ_SERVICE ));
+ pArray[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE ));
+ pArray[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOC_SERVICE ));
return aRet;
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx
index 97218b9..f11fd00 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx
@@ -860,8 +860,8 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScCellFieldObj::getSupportedServiceName
{
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;
}
@@ -1525,8 +1525,8 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScHeaderFieldObj::getSupportedServiceNa
{
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/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx
index c0fe0f7..f9b58fc 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx
@@ -80,14 +80,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;
}
@@ -98,7 +98,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/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx
index eee8f75..3e77cef 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx
@@ -235,7 +235,7 @@ uno::Sequence< ::rtl::OUString> ScFunctionAccess::getSupportedServiceNames_Stati
{
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;
}
@@ -259,8 +259,8 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNa
{
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/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx
index b68911a..1dcd704 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx
@@ -352,7 +352,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNam
{
uno::Sequence< ::rtl::OUString> aRet(1);
::rtl::OUString* pArray = aRet.getArray();
- pArray[0] = ::rtl::OUString::createFromAscii( SCNAMEDRANGEOBJ_SERVICE );
+ pArray[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCNAMEDRANGEOBJ_SERVICE ));
return aRet;
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
index 2fef796..edfb9e0 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
@@ -648,8 +648,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;
}
@@ -711,13 +711,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;
@@ -1846,7 +1846,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const ::rtl::OUString& aProperty
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();
@@ -1907,9 +1907,9 @@ 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[1] = ::rtl::OUString::createFromAscii( bPage ? SCPAGESTYLE_SERVICE
- : SCCELLSTYLE_SERVICE );
+ pArray[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSTYLE_SERVICE ));
+ pArray[1] = bPage ? ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPAGESTYLE_SERVICE ))
+ : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLSTYLE_SERVICE ));
return aRet;
}
More information about the Libreoffice-commits
mailing list