summaryrefslogtreecommitdiff
path: root/sc/source/ui/unoobj
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-05-06 16:32:22 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-05-06 16:51:45 +0200
commite2e2cc61144cb22227eebfadff0ea24b51ccfbd0 (patch)
tree8063275cabcdf32e30c37451a32d96db5929561a /sc/source/ui/unoobj
parentd01768c31a0658c8a74e0dd3a95b2d781639d18e (diff)
remove usage of RTL_CONSTASCII_USTRINGPARAM
Mechanical removal of usage together with OUString ctor, done by compiler plugin. Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5
Diffstat (limited to 'sc/source/ui/unoobj')
-rw-r--r--sc/source/ui/unoobj/afmtuno.cxx2
-rw-r--r--sc/source/ui/unoobj/appluno.cxx16
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx46
-rw-r--r--sc/source/ui/unoobj/cellvaluebinding.cxx2
-rw-r--r--sc/source/ui/unoobj/confuno.cxx4
-rw-r--r--sc/source/ui/unoobj/cursuno.cxx4
-rw-r--r--sc/source/ui/unoobj/dapiuno.cxx26
-rw-r--r--sc/source/ui/unoobj/datauno.cxx32
-rw-r--r--sc/source/ui/unoobj/docuno.cxx14
-rw-r--r--sc/source/ui/unoobj/filtuno.cxx6
-rw-r--r--sc/source/ui/unoobj/funcuno.cxx6
-rw-r--r--sc/source/ui/unoobj/nameuno.cxx4
-rw-r--r--sc/source/ui/unoobj/srchuno.cxx4
-rw-r--r--sc/source/ui/unoobj/viewuno.cxx4
14 files changed, 85 insertions, 85 deletions
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 4240c223fbec..4ebb1d2cbbf6 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -202,7 +202,7 @@ uno::Sequence<OUString> ScAutoFormatsObj::getSupportedServiceNames_Static()
{
uno::Sequence<OUString> aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCAUTOFORMATSOBJ_SERVICE ));
+ pArray[0] = OUString( SCAUTOFORMATSOBJ_SERVICE );
return aRet;
}
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 3135e9599fd2..07eb1156c484 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -374,7 +374,7 @@ uno::Sequence<OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static()
{
uno::Sequence<OUString> aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEETSETTINGS_SERVICE ));
+ pArray[0] = OUString( SCSPREADSHEETSETTINGS_SERVICE );
return aRet;
}
@@ -636,7 +636,7 @@ uno::Sequence<OUString> ScRecentFunctionsObj::getSupportedServiceNames_Static()
{
uno::Sequence<OUString> aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCRECENTFUNCTIONSOBJ_SERVICE ));
+ pArray[0] = OUString( SCRECENTFUNCTIONSOBJ_SERVICE );
return aRet;
}
@@ -717,7 +717,7 @@ uno::Sequence<OUString> ScFunctionListObj::getSupportedServiceNames_Static()
{
uno::Sequence<OUString> aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONLISTOBJ_SERVICE ));
+ pArray[0] = OUString( SCFUNCTIONLISTOBJ_SERVICE );
return aRet;
}
@@ -730,21 +730,21 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co
beans::PropertyValue* pArray = rSequence.getArray();
- pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ID ));
+ pArray[0].Name = OUString( SC_UNONAME_ID );
pArray[0].Value <<= (sal_Int32) rDesc.nFIndex;
- pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CATEGORY ));
+ pArray[1].Name = OUString( SC_UNONAME_CATEGORY );
pArray[1].Value <<= (sal_Int32) rDesc.nCategory;
- pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_NAME ));
+ pArray[2].Name = OUString( SC_UNONAME_NAME );
if (rDesc.pFuncName)
pArray[2].Value <<= OUString( *rDesc.pFuncName );
- pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DESCRIPTION ));
+ pArray[3].Name = OUString( SC_UNONAME_DESCRIPTION );
if (rDesc.pFuncDesc)
pArray[3].Value <<= OUString( *rDesc.pFuncDesc );
- pArray[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ARGUMENTS ));
+ pArray[4].Name = OUString( SC_UNONAME_ARGUMENTS );
if (rDesc.ppDefArgNames && rDesc.ppDefArgDescs && rDesc.pDefArgFlags )
{
sal_uInt16 nCount = rDesc.nArgCount;
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index dc4019301752..bb37ccfff29e 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -4823,10 +4823,10 @@ uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNames()
{
uno::Sequence<OUString> aRet(4);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGES_SERVICE ));
- pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
- pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
- pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
+ pArray[0] = OUString( SCSHEETCELLRANGES_SERVICE );
+ pArray[1] = OUString( SCCELLPROPERTIES_SERVICE );
+ pArray[2] = OUString( SCCHARPROPERTIES_SERVICE );
+ pArray[3] = OUString( SCPARAPROPERTIES_SERVICE );
return aRet;
}
@@ -6115,11 +6115,11 @@ uno::Sequence<OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames()
{
uno::Sequence<OUString> aRet(5);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE ));
- pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE ));
- pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
- pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
- pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
+ pArray[0] = OUString( SCSHEETCELLRANGE_SERVICE );
+ pArray[1] = OUString( SCCELLRANGE_SERVICE );
+ pArray[2] = OUString( SCCELLPROPERTIES_SERVICE );
+ pArray[3] = OUString( SCCHARPROPERTIES_SERVICE );
+ pArray[4] = OUString( SCPARAPROPERTIES_SERVICE );
return aRet;
}
@@ -6854,13 +6854,13 @@ uno::Sequence<OUString> SAL_CALL ScCellObj::getSupportedServiceNames()
{
uno::Sequence<OUString> aRet(7);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELL_SERVICE ));
- pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELL_SERVICE ));
- pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
- pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
- pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
- pArray[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE ));
- pArray[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE ));
+ pArray[0] = OUString( SCSHEETCELL_SERVICE );
+ pArray[1] = OUString( SCCELL_SERVICE );
+ pArray[2] = OUString( SCCELLPROPERTIES_SERVICE );
+ pArray[3] = OUString( SCCHARPROPERTIES_SERVICE );
+ pArray[4] = OUString( SCPARAPROPERTIES_SERVICE );
+ pArray[5] = OUString( SCSHEETCELLRANGE_SERVICE );
+ pArray[6] = OUString( SCCELLRANGE_SERVICE );
return aRet;
}
@@ -8769,13 +8769,13 @@ uno::Sequence<OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames()
{
uno::Sequence<OUString> aRet(7);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEET_SERVICE ));
- pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE ));
- pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE ));
- pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
- pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
- pArray[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
- pArray[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE ));
+ pArray[0] = OUString( SCSPREADSHEET_SERVICE );
+ pArray[1] = OUString( SCSHEETCELLRANGE_SERVICE );
+ pArray[2] = OUString( SCCELLRANGE_SERVICE );
+ pArray[3] = OUString( SCCELLPROPERTIES_SERVICE );
+ pArray[4] = OUString( SCCHARPROPERTIES_SERVICE );
+ pArray[5] = OUString( SCPARAPROPERTIES_SERVICE );
+ pArray[6] = OUString( SCLINKTARGET_SERVICE );
return aRet;
}
diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx
index bfa5bd806598..4efb484410aa 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.cxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.cxx
@@ -458,7 +458,7 @@ namespace calc
{
OUString sMessage( "The given type (" );
sMessage += _rType.getTypeName();
- sMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( ") is not supported by this binding." ) );
+ sMessage += OUString( ") is not supported by this binding." );
// TODO: localize this error message
throw IncompatibleTypesException( sMessage, *pNonConstThis );
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index d72a9c313165..a6aa3321b9b3 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -483,8 +483,8 @@ uno::Sequence<OUString> SAL_CALL ScDocumentConfiguration::getSupportedServiceNam
{
uno::Sequence<OUString> aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCOMPSCPREADSHEETSETTINGS_SERVICE ));
- pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCUMENTSETTINGS_SERVICE ));
+ pArray[0] = OUString( SCCOMPSCPREADSHEETSETTINGS_SERVICE );
+ pArray[1] = OUString( SCDOCUMENTSETTINGS_SERVICE );
return aRet;
}
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index d2c2f35e38ca..546d0fcfeaca 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -481,8 +481,8 @@ uno::Sequence<OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames()
// SheetCellCursor should be first (?)
uno::Sequence<OUString> aTotalSeq( nParentLen + 2 );
OUString* pTotalArr = aTotalSeq.getArray();
- pTotalArr[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLCURSOR_SERVICE ));
- pTotalArr[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLCURSOR_SERVICE ));
+ pTotalArr[0] = OUString( SCSHEETCELLCURSOR_SERVICE );
+ pTotalArr[1] = OUString( 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 bb6969e0b063..8e960e0d75bc 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -373,7 +373,7 @@ static bool lcl_IsDuplicated( const Reference<XPropertySet> xDimProps )
{
try
{
- Any aAny = xDimProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_ORIGINAL ) ) );
+ Any aAny = xDimProps->getPropertyValue( OUString( SC_UNO_DP_ORIGINAL ) );
Reference< XNamed > xOriginal( aAny, UNO_QUERY );
return xOriginal.is();
}
@@ -392,7 +392,7 @@ static OUString lcl_GetOriginalName( const Reference< XNamed > xDim )
{
try
{
- Any aAny = xDimProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIGINAL)));
+ Any aAny = xDimProps->getPropertyValue(OUString(SC_UNO_DP_ORIGINAL));
aAny >>= xOriginal;
}
catch( Exception& )
@@ -1001,13 +1001,13 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope
{
uno::Sequence<beans::PropertyValue> aSeq( 4 );
beans::PropertyValue* pArray = aSeq.getArray();
- pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_SOURCENAME ));
+ pArray[0].Name = OUString( SC_UNO_DP_SOURCENAME );
pArray[0].Value <<= pServiceDesc->aParSource;
- pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_OBJECTNAME ));
+ pArray[1].Name = OUString( SC_UNO_DP_OBJECTNAME );
pArray[1].Value <<= pServiceDesc->aParName;
- pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_USERNAME ));
+ pArray[2].Name = OUString( SC_UNO_DP_USERNAME );
pArray[2].Value <<= pServiceDesc->aParUser;
- pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_PASSWORD ));
+ pArray[3].Name = OUString( SC_UNO_DP_PASSWORD );
pArray[3].Value <<= pServiceDesc->aParPass;
aRet <<= aSeq;
}
@@ -1061,7 +1061,7 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotDescriptorBase::getDataLayoutFi
{
if( pSaveData->GetDataLayoutDimension() )
{
- ScFieldIdentifier aFieldId( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) ), 0, true );
+ ScFieldIdentifier aFieldId( OUString( SC_DATALAYOUT_NAME ), 0, true );
return new ScDataPilotFieldObj( *this, aFieldId );
}
}
@@ -1593,7 +1593,7 @@ static sal_Int32 lcl_GetFieldCount( const Reference<XDimensionsSupplier>& rSourc
for (sal_Int32 i = 0; i < nIntCount; ++i)
{
xDim.set(xIntDims->getByIndex(i), UNO_QUERY);
- if (xDim.is() && (xDim->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION))) == rOrient))
+ if (xDim.is() && (xDim->getPropertyValue(OUString(SC_UNO_DP_ORIENTATION)) == rOrient))
++nRet;
}
}
@@ -1633,7 +1633,7 @@ static sal_Bool lcl_GetFieldDataByIndex( const Reference<XDimensionsSupplier>& r
while (i < nIntCount && !bOk)
{
xDim.set(xIntDims->getByIndex(i), UNO_QUERY);
- if (xDim.is() && (xDim->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION))) == rOrient))
+ if (xDim.is() && (xDim->getPropertyValue(OUString(SC_UNO_DP_ORIENTATION)) == rOrient))
{
if (nPos == nIndex)
{
@@ -1675,7 +1675,7 @@ static sal_Bool lcl_GetFieldDataByIndex( const Reference<XDimensionsSupplier>& r
OUString sOriginalName( lcl_GetOriginalName( xDimName ) );
rFieldId.maFieldName = sOriginalName;
rFieldId.mbDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDim,
- OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)) );
+ OUString(SC_UNO_DP_ISDATALAYOUT) );
sal_Int32 nRepeat = 0;
if ( rOrient.hasValue() && lcl_IsDuplicated( xDim ) )
@@ -1853,7 +1853,7 @@ OUString SAL_CALL ScDataPilotFieldObj::getName() throw(RuntimeException)
if( ScDPSaveDimension* pDim = GetDPDimension() )
{
if( pDim->IsDataLayout() )
- aName = OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) );
+ aName = OUString( SC_DATALAYOUT_NAME );
else
{
const OUString* pLayoutName = pDim->GetLayoutName();
@@ -3490,7 +3490,7 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName
{
Reference< XPropertySet > xMemberProps( xMember, UNO_QUERY );
if( xMemberProps.is() )
- aRet = xMemberProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_SHOWDETAILS ) ) );
+ aRet = xMemberProps->getPropertyValue( OUString( SC_UNO_DP_SHOWDETAILS ) );
else
aRet <<= true;
}
@@ -3505,7 +3505,7 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName
{
Reference< XPropertySet > xMemberProps( xMember, UNO_QUERY );
if( xMemberProps.is() )
- aRet <<= !cppu::any2bool( xMemberProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_ISVISIBLE ) ) ) );
+ aRet <<= !cppu::any2bool( xMemberProps->getPropertyValue( OUString( SC_UNO_DP_ISVISIBLE ) ) );
else
aRet <<= false;
}
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index d41ffc85e052..079e97b5c002 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -217,22 +217,22 @@ void ScImportDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rS
aDescriptor.setDataSource(rParam.aDBName);
if (aDescriptor.has( svx::daDataSource ))
{
- pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DBNAME ));
+ pArray[0].Name = OUString( SC_UNONAME_DBNAME );
pArray[0].Value <<= rParam.aDBName;
}
else if (aDescriptor.has( svx::daConnectionResource ))
{
- pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONRES ));
+ pArray[0].Name = OUString( SC_UNONAME_CONRES );
pArray[0].Value <<= rParam.aDBName;
}
- pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCTYPE ));
+ pArray[1].Name = OUString( SC_UNONAME_SRCTYPE );
pArray[1].Value <<= eMode;
- pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCOBJ ));
+ pArray[2].Name = OUString( SC_UNONAME_SRCOBJ );
pArray[2].Value <<= rParam.aStatement;
- pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISNATIVE ));
+ pArray[3].Name = OUString( SC_UNONAME_ISNATIVE );
ScUnoHelpFunctions::SetBoolInAny( pArray[3].Value, rParam.bNative );
}
@@ -340,31 +340,31 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq
// Sequence fuellen
- pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISSORTCOLUMNS ));
+ pArray[0].Name = OUString( SC_UNONAME_ISSORTCOLUMNS );
pArray[0].Value = ::cppu::bool2any(!rParam.bByRow);
- pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONTHDR ));
+ pArray[1].Name = OUString( SC_UNONAME_CONTHDR );
ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, rParam.bHasHeader );
- pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_MAXFLD ));
+ pArray[2].Name = OUString( SC_UNONAME_MAXFLD );
pArray[2].Value <<= static_cast<sal_Int32>( rParam.GetSortKeyCount() );
- pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SORTFLD ));
+ pArray[3].Name = OUString( SC_UNONAME_SORTFLD );
pArray[3].Value <<= aFields;
- pArray[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_BINDFMT ));
+ pArray[4].Name = OUString( SC_UNONAME_BINDFMT );
ScUnoHelpFunctions::SetBoolInAny( pArray[4].Value, rParam.bIncludePattern );
- pArray[5].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_COPYOUT ));
+ pArray[5].Name = OUString( SC_UNONAME_COPYOUT );
ScUnoHelpFunctions::SetBoolInAny( pArray[5].Value, !rParam.bInplace );
- pArray[6].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_OUTPOS ));
+ pArray[6].Name = OUString( SC_UNONAME_OUTPOS );
pArray[6].Value <<= aOutPos;
- pArray[7].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISULIST ));
+ pArray[7].Name = OUString( SC_UNONAME_ISULIST );
ScUnoHelpFunctions::SetBoolInAny( pArray[7].Value, rParam.bUserDef );
- pArray[8].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_UINDEX ));
+ pArray[8].Name = OUString( SC_UNONAME_UINDEX );
pArray[8].Value <<= static_cast<sal_Int32>( rParam.nUserIndex );
}
@@ -2234,8 +2234,8 @@ uno::Sequence<OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames()
{
uno::Sequence<OUString> aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDATABASERANGEOBJ_SERVICE ));
- pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE ));
+ pArray[0] = OUString( SCDATABASERANGEOBJ_SERVICE );
+ pArray[1] = OUString( SCLINKTARGET_SERVICE );
return aRet;
}
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 4f66ccab159e..e089f3b96992 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1019,7 +1019,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 = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE ));
+ pArray[0].Name = OUString( SC_UNONAME_PAGESIZE );
pArray[0].Value <<= aPageSize;
if( ! pPrinterOptions )
@@ -1066,17 +1066,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 = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE ));
+ pArray[0].Name = OUString( SC_UNONAME_PAGESIZE );
pArray[0].Value <<= aPageSize;
// #i111158# all positions are relative to the whole page, including non-printable area
- pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INC_NP_AREA ));
+ pArray[1].Name = OUString( 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 = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SOURCERANGE ));
+ pArray[2].Name = OUString( SC_UNONAME_SOURCERANGE );
pArray[2].Value <<= aRangeAddress;
}
@@ -1559,7 +1559,7 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( )
OUString sName;
pDocShell->GetDocument()->GetName( pDocShell->GetDocument()->GetVisibleTab(), sName );
OUString sOUName(sName);
- aSeq[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVETABLE));
+ aSeq[0].Name = OUString(SC_ACTIVETABLE);
aSeq[0].Value <<= sOUName;
xCont->insertByIndex( 0, uno::makeAny( aSeq ) );
}
@@ -2029,8 +2029,8 @@ uno::Sequence<OUString> SAL_CALL ScModelObj::getSupportedServiceNames()
{
uno::Sequence<OUString> aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCMODELOBJ_SERVICE ));
- pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE ));
+ pArray[0] = OUString( SCMODELOBJ_SERVICE );
+ pArray[1] = OUString( SCDOCSETTINGS_SERVICE );
return aRet;
}
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 3e4e0883642d..a051c104aa30 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -134,14 +134,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScFilterOptionsObj_CreateInstance(
OUString ScFilterOptionsObj::getImplementationName_Static()
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_IMPLNAME ));
+ return OUString( SCFILTEROPTIONSOBJ_IMPLNAME );
}
uno::Sequence<OUString> ScFilterOptionsObj::getSupportedServiceNames_Static()
{
uno::Sequence<OUString> aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_SERVICE ));
+ pArray[0] = OUString( SCFILTEROPTIONSOBJ_SERVICE );
return aRet;
}
@@ -152,7 +152,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValu
uno::Sequence<beans::PropertyValue> aRet(1);
beans::PropertyValue* pArray = aRet.getArray();
- pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FILTEROPTIONS ));
+ pArray[0].Name = OUString( 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 61f2074e529c..22fbf0ecb091 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -253,7 +253,7 @@ uno::Sequence<OUString> ScFunctionAccess::getSupportedServiceNames_Static()
{
uno::Sequence<OUString> aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE ));
+ pArray[0] = OUString( SCFUNCTIONACCESS_SERVICE );
return aRet;
}
@@ -277,8 +277,8 @@ uno::Sequence<OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames()
{
uno::Sequence<OUString> aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE ));
- pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE ));
+ pArray[0] = OUString( SCFUNCTIONACCESS_SERVICE );
+ pArray[1] = OUString( SCDOCSETTINGS_SERVICE );
return aRet;
}
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 511c4677b515..659f6a49117f 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -443,8 +443,8 @@ uno::Sequence<OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames()
throw(uno::RuntimeException)
{
uno::Sequence<OUString> aRet(2);
- aRet[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SCNAMEDRANGEOBJ_SERVICE ) );
- aRet[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE ) );
+ aRet[0] = OUString( SCNAMEDRANGEOBJ_SERVICE );
+ aRet[1] = OUString( SCLINKTARGET_SERVICE );
return aRet;
}
diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx
index 0d0228b5e96d..db59a3444464 100644
--- a/sc/source/ui/unoobj/srchuno.cxx
+++ b/sc/source/ui/unoobj/srchuno.cxx
@@ -209,8 +209,8 @@ uno::Sequence<OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames()
{
uno::Sequence<OUString> aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSEARCHDESCRIPTOR_SERVICE ));
- pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCREPLACEDESCRIPTOR_SERVICE ));
+ pArray[0] = OUString( SCSEARCHDESCRIPTOR_SERVICE );
+ pArray[1] = OUString( SCREPLACEDESCRIPTOR_SERVICE );
return aRet;
}
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 651d3734dd2c..6fc5d69ad99c 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -2210,8 +2210,8 @@ uno::Sequence<OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames()
{
uno::Sequence<OUString> aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCTABVIEWOBJ_SERVICE ));
- pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCVIEWSETTINGS_SERVICE ));
+ pArray[0] = OUString( SCTABVIEWOBJ_SERVICE );
+ pArray[1] = OUString( SCVIEWSETTINGS_SERVICE );
return aRet;
}