Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2483
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/2483/1
RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals
Change-Id: Ica78f316d481130c28da83f92561206518342eaa
---
M sc/source/core/data/bcaslot.cxx
M sc/source/core/data/documen2.cxx
M sc/source/core/data/documen3.cxx
M sc/source/core/data/documen5.cxx
M sc/source/core/data/document.cxx
M sc/source/core/data/dpobject.cxx
M sc/source/core/data/dpsave.cxx
M sc/source/core/data/dptabsrc.cxx
M sc/source/core/data/funcdesc.cxx
M sc/source/core/data/table3.cxx
M sc/source/core/data/tabprotection.cxx
M sc/source/core/tool/addincfg.cxx
M sc/source/core/tool/appoptio.cxx
M sc/source/core/tool/autoform.cxx
M sc/source/core/tool/cellform.cxx
M sc/source/core/tool/charthelper.cxx
M sc/source/core/tool/compiler.cxx
M sc/source/core/tool/consoli.cxx
M sc/source/core/tool/dbdata.cxx
M sc/source/core/tool/defaultsoptions.cxx
M sc/source/core/tool/docoptio.cxx
M sc/source/core/tool/filtopt.cxx
M sc/source/core/tool/formulaopt.cxx
M sc/source/core/tool/formulaparserpool.cxx
M sc/source/core/tool/inputopt.cxx
M sc/source/core/tool/interpr1.cxx
M sc/source/core/tool/interpr2.cxx
M sc/source/core/tool/interpr4.cxx
M sc/source/core/tool/interpr5.cxx
M sc/source/core/tool/navicfg.cxx
M sc/source/core/tool/printopt.cxx
M sc/source/core/tool/unitconv.cxx
M sc/source/core/tool/viewopti.cxx
M sc/source/core/tool/zforauto.cxx
34 files changed, 276 insertions(+), 276 deletions(-)
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 2a0ca67..0f5b657 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -147,7 +147,7 @@
OSL_ENSURE( pShell, "Missing DocShell :-/" );
if ( pShell )
- pShell->SetError( SCWARN_CORE_HARD_RECALC, ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ pShell->SetError( SCWARN_CORE_HARD_RECALC, OUString( OSL_LOG_PREFIX ) );
pDoc->SetAutoCalc( false );
pDoc->SetHardRecalcState( true );
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index b034bbf..f4f8b2b 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -564,7 +564,7 @@
maTabs.resize(nTab+1, NULL );
}
maTabs[nTab] = new ScTable(this, nTab,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("baeh")));
+ rtl::OUString("baeh"));
if (nTab < static_cast<SCTAB>(pSourceDoc->maTabs.size()) && pSourceDoc->maTabs[nTab])
maTabs[nTab]->SetLayoutRTL( pSourceDoc->maTabs[nTab]->IsLayoutRTL() );
}
@@ -587,7 +587,7 @@
maTabs.resize( nTab + 1, NULL );
}
maTabs.at(nTab) = new ScTable(this, nTab,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("temp")),
+ rtl::OUString("temp"),
bExtras, bExtras);
}
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 9145356..965c003 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -118,7 +118,7 @@
void ScDocument::SetAllRangeNames( const boost::ptr_map<rtl::OUString, ScRangeName>& rRangeMap)
{
- rtl::OUString aGlobalStr(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME));
+ rtl::OUString aGlobalStr(STR_GLOBAL_RANGE_NAME);
boost::ptr_map<rtl::OUString,ScRangeName>::const_iterator itr = rRangeMap.begin(), itrEnd =
rRangeMap.end();
for (; itr!=itrEnd; ++itr)
{
@@ -169,7 +169,7 @@
{
pRangeName = new ScRangeName();
}
- rtl::OUString aGlobal(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME));
+ rtl::OUString aGlobal(STR_GLOBAL_RANGE_NAME);
aRangeNameMap.insert(std::pair<rtl::OUString, ScRangeName*>(aGlobal, pRangeName));
}
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index d2bcac1..a147b95 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -91,16 +91,16 @@
{
uno::Sequence< beans::PropertyValue > aArgs( 4 );
aArgs[0] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1,
+ OUString("CellRangeRepresentation"), -1,
uno::makeAny( rRanges ), beans::PropertyState_DIRECT_VALUE );
aArgs[1] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1,
+ OUString("HasCategories"), -1,
uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE );
aArgs[2] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1,
+ OUString("FirstCellAsLabel"), -1,
uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE );
aArgs[3] = beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1,
+ OUString("DataRowSource"), -1,
uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE );
xReceiver->setArguments( aArgs );
}
@@ -136,7 +136,7 @@
uno::Reference< embed::XEmbeddedObject > xIPObj =
((SdrOle2Obj*)pObject)->GetObjRef();
if ( xIPObj.is() )
{
- ::rtl::OUString aIPName = ((SdrOle2Obj*)pObject)->GetPersistName();
+ OUString aIPName = ((SdrOle2Obj*)pObject)->GetPersistName();
for (size_t nPos = 0; nPos < nDataCount; ++nPos)
{
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index c580635..cd56b53 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2904,7 +2904,7 @@
if (nTab >= static_cast<SCTAB>(maTabs.size()))
maTabs.resize(nTab + 1,NULL);
maTabs[nTab] = new ScTable(this, nTab,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("temp")),
+ rtl::OUString("temp"),
bExtras, bExtras);
}
@@ -2924,7 +2924,7 @@
if (nTab >= static_cast<SCTAB>(maTabs.size()))
maTabs.resize(nTab + 1,NULL);
maTabs[nTab] = new ScTable(this, nTab,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("temp")),
+ rtl::OUString("temp"),
bExtras, bExtras);
}
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index e75e1d5..f29fce2 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -273,11 +273,11 @@
if ( xDimProp.is() )
{
bFound = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)) );
+ rtl::OUString(SC_UNO_DP_ISDATALAYOUT) );
//! error checking -- is "IsDataLayoutDimension" property required??
if (bFound)
nRet = ScUnoHelpFunctions::GetEnumProperty(
- xDimProp,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION)),
+ xDimProp, rtl::OUString(SC_UNO_DP_ORIENTATION),
sheet::DataPilotFieldOrientation_HIDDEN );
}
}
@@ -1000,11 +1000,11 @@
Reference<beans::XPropertySet> xMemProp(xMember, UNO_QUERY);
if (xMemProp.is())
{
- aMem.mbVisible = ScUnoHelpFunctions::GetBoolProperty(xMemProp,
OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISVISIBLE)));
- aMem.mbShowDetails = ScUnoHelpFunctions::GetBoolProperty(xMemProp,
OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_SHOWDETAILS)));
+ aMem.mbVisible = ScUnoHelpFunctions::GetBoolProperty(xMemProp,
OUString(SC_UNO_DP_ISVISIBLE));
+ aMem.mbShowDetails = ScUnoHelpFunctions::GetBoolProperty(xMemProp,
OUString(SC_UNO_DP_SHOWDETAILS));
aMem.maLayoutName = ScUnoHelpFunctions::GetStringProperty(
- xMemProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_LAYOUTNAME)), OUString());
+ xMemProp, OUString(SC_UNO_DP_LAYOUTNAME), OUString());
}
aMembers.push_back(aMem);
@@ -1158,7 +1158,7 @@
continue;
OUString aLayoutName = ScUnoHelpFunctions::GetStringProperty(
- xPropSet, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_LAYOUTNAME)), OUString());
+ xPropSet, OUString(SC_UNO_DP_LAYOUTNAME), OUString());
if (aLayoutName.equalsIgnoreAsciiCase(rName))
return true;
}
@@ -1184,7 +1184,7 @@
if ( xDimName.is() && xDimProp.is() )
{
sal_Bool bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT))
);
+ rtl::OUString(SC_UNO_DP_ISDATALAYOUT) );
//! error checking -- is "IsDataLayoutDimension" property required??
rtl::OUString aName;
@@ -1202,7 +1202,7 @@
if (pFlags)
*pFlags = ScUnoHelpFunctions::GetLongProperty( xDimProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_FLAGS)), 0 );
+ rtl::OUString(SC_UNO_DP_FLAGS), 0 );
}
}
}
@@ -1228,7 +1228,7 @@
try
{
uno::Any aOrigAny = xDimProp->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIGINAL)) );
+ rtl::OUString(SC_UNO_DP_ORIGINAL) );
uno::Reference<uno::XInterface> xIntOrig;
if ( (aOrigAny >>= xIntOrig) && xIntOrig.is() )
bDuplicated = true;
@@ -1567,9 +1567,9 @@
uno::Reference<beans::XPropertySet> xDimProp( xDim, uno::UNO_QUERY );
uno::Reference<sheet::XHierarchiesSupplier> xDimSupp( xDim, uno::UNO_QUERY );
sal_Bool bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)) );
+ rtl::OUString(SC_UNO_DP_ISDATALAYOUT) );
sal_Int32 nOrient = ScUnoHelpFunctions::GetEnumProperty(
- xDimProp,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION)),
+ xDimProp, rtl::OUString(SC_UNO_DP_ORIENTATION),
sheet::DataPilotFieldOrientation_HIDDEN );
if ( !bDataLayout )
{
@@ -1587,7 +1587,7 @@
uno::Reference<container::XIndexAccess> xHiers = new ScNameToIndexAccess(
xDimSupp->getHierarchies() );
sal_Int32 nHierarchy = ScUnoHelpFunctions::GetLongProperty( xDimProp,
-
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_USEDHIERARCHY)) );
+ rtl::OUString(SC_UNO_DP_USEDHIERARCHY) );
if ( nHierarchy >= xHiers->getCount() )
nHierarchy = 0;
@@ -1777,7 +1777,7 @@
uno::Reference<beans::XPropertySet> xDimProp( xDim, uno::UNO_QUERY );
sal_Bool bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)) );
+ rtl::OUString(SC_UNO_DP_ISDATALAYOUT) );
if (bDataLayout)
{
// the elements of the data layout dimension can't be found by their names
@@ -1835,7 +1835,7 @@
if ( xMbrProp.is() )
{
bShowDetails = ScUnoHelpFunctions::GetBoolProperty( xMbrProp,
-
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_SHOWDETAILS)) );
+ rtl::OUString(SC_UNO_DP_SHOWDETAILS) );
//! don't set bFound if property is unknown?
bFound = sal_True;
}
@@ -1870,7 +1870,7 @@
{
uno::Reference<container::XIndexAccess> xHiers = new ScNameToIndexAccess(
xDimSupp->getHierarchies() );
long nHierarchy = ScUnoHelpFunctions::GetLongProperty( xDimProp,
-
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_USEDHIERARCHY)) );
+ rtl::OUString(SC_UNO_DP_USEDHIERARCHY) );
if ( nHierarchy >= xHiers->getCount() )
nHierarchy = 0;
@@ -1889,7 +1889,7 @@
try
{
aSubAny = xLevProp->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_SUBTOTAL)) );
+ rtl::OUString(SC_UNO_DP_SUBTOTAL) );
}
catch(uno::Exception&)
{
@@ -1955,7 +1955,7 @@
// dimension orientation, hidden by default.
long nDimOrient = ScUnoHelpFunctions::GetEnumProperty(
- xDimProp,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION)),
+ xDimProp, rtl::OUString(SC_UNO_DP_ORIENTATION),
sheet::DataPilotFieldOrientation_HIDDEN );
if ( xDimProp.is() && nDimOrient == nOrient )
@@ -1967,7 +1967,7 @@
if ( nOrient == sheet::DataPilotFieldOrientation_DATA )
{
sheet::GeneralFunction eFunc =
(sheet::GeneralFunction)ScUnoHelpFunctions::GetEnumProperty(
- xDimProp,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_FUNCTION)),
+ xDimProp, rtl::OUString(SC_UNO_DP_FUNCTION),
sheet::GeneralFunction_NONE );
if ( eFunc == sheet::GeneralFunction_AUTO )
{
@@ -1981,14 +1981,14 @@
// is this data layout dimension?
bool bDataLayout = ScUnoHelpFunctions::GetBoolProperty(
- xDimProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)));
+ xDimProp, OUString(SC_UNO_DP_ISDATALAYOUT));
// is this dimension cloned?
long nDupSource = -1;
try
{
uno::Any aOrigAny = xDimProp->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIGINAL_POS)));
+ OUString(SC_UNO_DP_ORIGINAL_POS));
sal_Int32 nTmp = 0;
if (aOrigAny >>= nTmp)
nDupSource = static_cast<sal_Int32>(nTmp);
@@ -2029,13 +2029,13 @@
rField.nFuncMask = nMask;
rField.mnDupCount = nDupCount;
long nPos = ScUnoHelpFunctions::GetLongProperty(
- xDimProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_POSITION)));
+ xDimProp, OUString(SC_UNO_DP_POSITION));
aPos.push_back(nPos);
try
{
if (nOrient == sheet::DataPilotFieldOrientation_DATA)
-
xDimProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_REFVALUE)))
+ xDimProp->getPropertyValue(OUString(SC_UNO_DP_REFVALUE))
>>= rField.maFieldRef;
}
catch (uno::Exception&)
@@ -2096,15 +2096,15 @@
try
{
rParam.bMakeTotalCol = ScUnoHelpFunctions::GetBoolProperty( xProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_COLGRAND)), true );
+ rtl::OUString(SC_UNO_DP_COLGRAND), true );
rParam.bMakeTotalRow = ScUnoHelpFunctions::GetBoolProperty( xProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ROWGRAND)), true );
+ rtl::OUString(SC_UNO_DP_ROWGRAND), true );
// following properties may be missing for external sources
rParam.bIgnoreEmptyRows = ScUnoHelpFunctions::GetBoolProperty( xProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_IGNOREEMPTY)) );
+ rtl::OUString(SC_UNO_DP_IGNOREEMPTY) );
rParam.bDetectCategories = ScUnoHelpFunctions::GetBoolProperty( xProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_REPEATEMPTY)) );
+ rtl::OUString(SC_UNO_DP_REPEATEMPTY) );
}
catch(uno::Exception&)
{
@@ -2122,7 +2122,7 @@
uno::Reference<container::XIndexAccess> xHiers = new ScNameToIndexAccess(
xDimSupp->getHierarchies() );
long nHierarchy = ScUnoHelpFunctions::GetLongProperty(
- xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_USEDHIERARCHY)));
+ xDimProp, rtl::OUString(SC_UNO_DP_USEDHIERARCHY));
if ( nHierarchy >= xHiers->getCount() )
nHierarchy = 0;
rData.mnUsedHier = nHierarchy;
@@ -2144,15 +2144,15 @@
return;
rData.mbShowAll = ScUnoHelpFunctions::GetBoolProperty(
- xLevProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_SHOWEMPTY)));
+ xLevProp, rtl::OUString(SC_UNO_DP_SHOWEMPTY));
try
{
- xLevProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_SORTING
) ) )
+ xLevProp->getPropertyValue( rtl::OUString( SC_UNO_DP_SORTING ) )
>>= rData.maSortInfo;
- xLevProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_LAYOUT )
) )
+ xLevProp->getPropertyValue( rtl::OUString( SC_UNO_DP_LAYOUT ) )
>>= rData.maLayoutInfo;
- xLevProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_AUTOSHOW
) ) )
+ xLevProp->getPropertyValue( rtl::OUString( SC_UNO_DP_AUTOSHOW ) )
>>= rData.maShowInfo;
}
catch(uno::Exception&)
@@ -2172,7 +2172,7 @@
return false;
bool bData = ScUnoHelpFunctions::GetBoolProperty(
- xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)));
+ xDimProp, rtl::OUString(SC_UNO_DP_ISDATALAYOUT));
//! error checking -- is "IsDataLayoutDimension" property required??
sal_Int32 nOrigPos = -1;
@@ -2181,7 +2181,7 @@
{
aFieldName = xDimName->getName();
uno::Any aOrigAny = xDimProp->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIGINAL_POS)));
+ rtl::OUString(SC_UNO_DP_ORIGINAL_POS));
aOrigAny >>= nOrigPos;
}
catch(uno::Exception&)
@@ -2189,10 +2189,10 @@
}
OUString aLayoutName = ScUnoHelpFunctions::GetStringProperty(
- xDimProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_LAYOUTNAME)), OUString());
+ xDimProp, OUString(SC_UNO_DP_LAYOUTNAME), OUString());
OUString aSubtotalName = ScUnoHelpFunctions::GetStringProperty(
- xDimProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_FIELD_SUBTOTALNAME)), OUString());
+ xDimProp, OUString(SC_UNO_DP_FIELD_SUBTOTALNAME), OUString());
bool bIsValue = true; //! check
aFieldName = ScDPUtil::getSourceDimensionName(aFieldName);
@@ -2214,7 +2214,7 @@
GetMembers(nDim, GetUsedHierarchy(nDim), rLabelData.maMembers);
lcl_FillLabelData(rLabelData, xDimProp);
rLabelData.mnFlags = ScUnoHelpFunctions::GetLongProperty(
- xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_FLAGS)), 0);
+ xDimProp, rtl::OUString(SC_UNO_DP_FLAGS), 0);
}
return true;
}
@@ -2294,7 +2294,7 @@
uno::Reference<container::XIndexAccess> xIntDims(new ScNameToIndexAccess( xDimsName ));
uno::Reference<beans::XPropertySet> xDim(xIntDims->getByIndex( nDim ), uno::UNO_QUERY);
if (xDim.is())
- nHier = ScUnoHelpFunctions::GetLongProperty( xDim,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_USEDHIERARCHY ) ) );
+ nHier = ScUnoHelpFunctions::GetLongProperty( xDim, rtl::OUString( SC_UNO_DP_USEDHIERARCHY
) );
return nHier;
}
@@ -2536,7 +2536,7 @@
if ( xEnAc.is() )
{
uno::Reference<container::XEnumeration> xEnum = xEnAc->createContentEnumeration(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
SCDPSOURCE_SERVICE )) );
+ rtl::OUString( SCDPSOURCE_SERVICE ) );
if ( xEnum.is() && xEnum->hasMoreElements() )
bFound = true;
}
@@ -2555,7 +2555,7 @@
if ( xEnAc.is() )
{
uno::Reference<container::XEnumeration> xEnum = xEnAc->createContentEnumeration(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
SCDPSOURCE_SERVICE )) );
+ rtl::OUString( SCDPSOURCE_SERVICE ) );
if ( xEnum.is() )
{
long nCount = 0;
@@ -2597,7 +2597,7 @@
return xRet;
uno::Reference<container::XEnumeration> xEnum =
-
xEnAc->createContentEnumeration(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCDPSOURCE_SERVICE)));
+ xEnAc->createContentEnumeration(rtl::OUString(SCDPSOURCE_SERVICE));
if (!xEnum.is())
return xRet;
@@ -2978,14 +2978,14 @@
}
uno::Reference<sdbc::XRowSet> ScDPCollection::DBCaches::createRowSet(
- sal_Int32 nSdbType, const ::rtl::OUString& rDBName, const ::rtl::OUString& rCommand)
+ sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand)
{
uno::Reference<sdbc::XRowSet> xRowSet;
try
{
xRowSet = uno::Reference<sdbc::XRowSet>(
comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SERVICE_ROWSET))),
+ rtl::OUString(SC_SERVICE_ROWSET)),
UNO_QUERY);
uno::Reference<beans::XPropertySet> xRowProp(xRowSet, UNO_QUERY);
@@ -3002,15 +3002,15 @@
uno::Any aAny;
aAny <<= rDBName;
xRowProp->setPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_DATASOURCENAME)), aAny );
+ rtl::OUString(SC_DBPROP_DATASOURCENAME), aAny );
aAny <<= rCommand;
xRowProp->setPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny );
+ rtl::OUString(SC_DBPROP_COMMAND), aAny );
aAny <<= nSdbType;
xRowProp->setPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny );
+ rtl::OUString(SC_DBPROP_COMMANDTYPE), aAny );
uno::Reference<sdb::XCompletedExecution> xExecute( xRowSet, uno::UNO_QUERY );
if ( xExecute.is() )
@@ -3419,12 +3419,12 @@
OUString ScDPCollection::CreateNewName( sal_uInt16 nMin ) const
{
- OUString aBase(RTL_CONSTASCII_USTRINGPARAM("DataPilot"));
+ OUString aBase("DataPilot");
size_t n = maTables.size();
for (size_t nAdd = 0; nAdd <= n; ++nAdd) // nCount+1 tries
{
- ::rtl::OUStringBuffer aBuf;
+ OUStringBuffer aBuf;
aBuf.append(aBase);
aBuf.append(static_cast<sal_Int32>(nMin + nAdd));
OUString aNewName = aBuf.makeStringAndClear();
@@ -3585,7 +3585,7 @@
}
void ScDPCollection::GetAllTables(
- sal_Int32 nSdbType, const ::rtl::OUString& rDBName, const ::rtl::OUString& rCommand,
+ sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand,
std::set<ScDPObject*>& rRefs) const
{
std::set<ScDPObject*> aRefs;
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 981eace..15c20d8 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -70,7 +70,7 @@
xProp->setPropertyValue( rName, uno::Any( &bValue, getBooleanCppuType() ) );
}
-ScDPSaveMember::ScDPSaveMember(const ::rtl::OUString& rName) :
+ScDPSaveMember::ScDPSaveMember(const OUString& rName) :
aName( rName ),
mpLayoutName(NULL),
nVisibleMode( SC_DPSAVEMODE_DONTKNOW ),
@@ -122,7 +122,7 @@
nShowDetailsMode = bSet;
}
-void ScDPSaveMember::SetName( const ::rtl::OUString& rNew )
+void ScDPSaveMember::SetName( const OUString& rNew )
{
// Used only if the source member was renamed (groups).
// For UI renaming of members, a layout name must be used.
@@ -155,11 +155,11 @@
if ( nVisibleMode != SC_DPSAVEMODE_DONTKNOW )
lcl_SetBoolProperty( xMembProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISVISIBLE)),
(bool)nVisibleMode );
+ rtl::OUString(SC_UNO_DP_ISVISIBLE), (bool)nVisibleMode );
if ( nShowDetailsMode != SC_DPSAVEMODE_DONTKNOW )
lcl_SetBoolProperty( xMembProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_SHOWDETAILS)),
(bool)nShowDetailsMode );
+ rtl::OUString(SC_UNO_DP_SHOWDETAILS), (bool)nShowDetailsMode );
if (mpLayoutName)
ScUnoHelpFunctions::SetOptionalPropertyValue(xMembProp, SC_UNO_DP_LAYOUTNAME,
*mpLayoutName);
@@ -169,7 +169,7 @@
}
}
-ScDPSaveDimension::ScDPSaveDimension(const ::rtl::OUString& rName, bool bDataLayout) :
+ScDPSaveDimension::ScDPSaveDimension(const OUString& rName, bool bDataLayout) :
aName( rName ),
mpLayoutName(NULL),
mpSubtotalName(NULL),
@@ -212,7 +212,7 @@
for (MemberList::const_iterator i=r.maMemberList.begin(); i != r.maMemberList.end() ; ++i)
{
- const ::rtl::OUString& rName = (*i)->GetName();
+ const OUString& rName = (*i)->GetName();
ScDPSaveMember* pNew = new ScDPSaveMember( **i );
maMemberHash[rName] = pNew;
maMemberList.push_back( pNew );
@@ -319,11 +319,11 @@
void ScDPSaveDimension::AddMember(ScDPSaveMember* pMember)
{
- const ::rtl::OUString & rName = pMember->GetName();
+ const OUString & rName = pMember->GetName();
MemberHash::iterator aExisting = maMemberHash.find( rName );
if ( aExisting == maMemberHash.end() )
{
- std::pair< const ::rtl::OUString, ScDPSaveMember *> key( rName, pMember );
+ std::pair< const OUString, ScDPSaveMember *> key( rName, pMember );
maMemberHash.insert ( key );
}
else
@@ -335,7 +335,7 @@
maMemberList.push_back( pMember );
}
-void ScDPSaveDimension::SetName( const ::rtl::OUString& rNew )
+void ScDPSaveDimension::SetName( const OUString& rNew )
{
// Used only if the source dim was renamed (groups).
// For UI renaming of dimensions, the layout name must be used.
@@ -467,7 +467,7 @@
pLayoutInfo = NULL;
}
-void ScDPSaveDimension::SetCurrentPage( const ::rtl::OUString* pPage )
+void ScDPSaveDimension::SetCurrentPage( const OUString* pPage )
{
// We use member's visibility attribute to filter by page dimension.
@@ -481,7 +481,7 @@
}
}
-ScDPSaveMember* ScDPSaveDimension::GetExistingMemberByName(const ::rtl::OUString& rName)
+ScDPSaveMember* ScDPSaveDimension::GetExistingMemberByName(const OUString& rName)
{
MemberHash::const_iterator res = maMemberHash.find (rName);
if (res != maMemberHash.end())
@@ -489,7 +489,7 @@
return NULL;
}
-ScDPSaveMember* ScDPSaveDimension::GetMemberByName(const ::rtl::OUString& rName)
+ScDPSaveMember* ScDPSaveDimension::GetMemberByName(const OUString& rName)
{
MemberHash::const_iterator res = maMemberHash.find (rName);
if (res != maMemberHash.end())
@@ -501,7 +501,7 @@
return pNew;
}
-void ScDPSaveDimension::SetMemberPosition( const ::rtl::OUString& rName, sal_Int32 nNewPos )
+void ScDPSaveDimension::SetMemberPosition( const OUString& rName, sal_Int32 nNewPos )
{
ScDPSaveMember* pMember = GetMemberByName( rName ); // make sure it exists and is in the hash
@@ -524,22 +524,22 @@
sheet::DataPilotFieldOrientation eOrient = (sheet::DataPilotFieldOrientation)nOrientation;
aAny <<= eOrient;
- xDimProp->setPropertyValue(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION)), aAny );
+ xDimProp->setPropertyValue( rtl::OUString(SC_UNO_DP_ORIENTATION), aAny );
sheet::GeneralFunction eFunc = (sheet::GeneralFunction)nFunction;
aAny <<= eFunc;
- xDimProp->setPropertyValue(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_FUNCTION)), aAny );
+ xDimProp->setPropertyValue( rtl::OUString(SC_UNO_DP_FUNCTION), aAny );
if ( nUsedHierarchy >= 0 )
{
aAny <<= (sal_Int32)nUsedHierarchy;
- xDimProp->setPropertyValue(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_USEDHIERARCHY)), aAny );
+ xDimProp->setPropertyValue( rtl::OUString(SC_UNO_DP_USEDHIERARCHY), aAny );
}
if ( pReferenceValue )
{
aAny <<= *pReferenceValue;
- xDimProp->setPropertyValue(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_REFVALUE)), aAny );
+ xDimProp->setPropertyValue( rtl::OUString(SC_UNO_DP_REFVALUE), aAny );
}
if (mpLayoutName)
@@ -600,11 +600,11 @@
for (long i=0; i<nSubTotalCount; i++)
pArray[i] = (sheet::GeneralFunction)pSubTotalFuncs[i];
aAny <<= aSeq;
- xLevProp->setPropertyValue(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_SUBTOTAL)), aAny );
+ xLevProp->setPropertyValue( rtl::OUString(SC_UNO_DP_SUBTOTAL), aAny );
}
if ( nShowEmptyMode != SC_DPSAVEMODE_DONTKNOW )
lcl_SetBoolProperty( xLevProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_SHOWEMPTY)),
(bool)nShowEmptyMode );
+ rtl::OUString(SC_UNO_DP_SHOWEMPTY), (bool)nShowEmptyMode );
if ( pSortInfo )
ScUnoHelpFunctions::SetOptionalPropertyValue(xLevProp, SC_UNO_DP_SORTING,
*pSortInfo);
@@ -664,7 +664,7 @@
for (; itrMem != itrMemEnd; ++itrMem)
{
ScDPSaveMember* pMem = *itrMem;
- const ::rtl::OUString& rMemName = pMem->GetName();
+ const OUString& rMemName = pMem->GetName();
DataMap::const_iterator itr = rData.find(rMemName);
if (itr != rData.end())
pMem->SetIsVisible(itr->second);
@@ -831,7 +831,7 @@
aDimList.push_back(pDim);
}
-ScDPSaveDimension* ScDPSaveData::GetDimensionByName(const ::rtl::OUString& rName)
+ScDPSaveDimension* ScDPSaveData::GetDimensionByName(const OUString& rName)
{
boost::ptr_vector<ScDPSaveDimension>::const_iterator iter;
for (iter = aDimList.begin(); iter != aDimList.end(); ++iter)
@@ -843,7 +843,7 @@
return AppendNewDimension(rName, false);
}
-ScDPSaveDimension* ScDPSaveData::GetExistingDimensionByName(const ::rtl::OUString& rName) const
+ScDPSaveDimension* ScDPSaveData::GetExistingDimensionByName(const OUString& rName) const
{
boost::ptr_vector<ScDPSaveDimension>::const_iterator iter;
for (iter = aDimList.begin(); iter != aDimList.end(); ++iter)
@@ -854,7 +854,7 @@
return NULL; // don't create new
}
-ScDPSaveDimension* ScDPSaveData::GetNewDimensionByName(const ::rtl::OUString& rName)
+ScDPSaveDimension* ScDPSaveData::GetNewDimensionByName(const OUString& rName)
{
boost::ptr_vector<ScDPSaveDimension>::const_iterator iter;
for (iter = aDimList.begin(); iter != aDimList.end(); ++iter)
@@ -886,7 +886,7 @@
return NULL;
}
-ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const ::rtl::OUString& rName)
+ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const OUString& rName)
{
// always insert new
@@ -899,7 +899,7 @@
return pNew;
}
-void ScDPSaveData::RemoveDimensionByName(const ::rtl::OUString& rName)
+void ScDPSaveData::RemoveDimensionByName(const OUString& rName)
{
boost::ptr_vector<ScDPSaveDimension>::iterator iter;
for (iter = aDimList.begin(); iter != aDimList.end(); ++iter)
@@ -1036,7 +1036,7 @@
{
uno::Any aAny;
aAny <<= eOrient;
- xDimProp->setPropertyValue(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION)), aAny );
+ xDimProp->setPropertyValue( rtl::OUString(SC_UNO_DP_ORIENTATION), aAny );
}
}
}
@@ -1059,10 +1059,10 @@
{
if ( nIgnoreEmptyMode != SC_DPSAVEMODE_DONTKNOW )
lcl_SetBoolProperty( xSourceProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_IGNOREEMPTY)),
(bool)nIgnoreEmptyMode );
+ rtl::OUString(SC_UNO_DP_IGNOREEMPTY), (bool)nIgnoreEmptyMode );
if ( nRepeatEmptyMode != SC_DPSAVEMODE_DONTKNOW )
lcl_SetBoolProperty( xSourceProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_REPEATEMPTY)),
(bool)nRepeatEmptyMode );
+ rtl::OUString(SC_UNO_DP_REPEATEMPTY), (bool)nRepeatEmptyMode );
}
catch(uno::Exception&)
{
@@ -1110,7 +1110,7 @@
if ( xDimProp.is() )
{
bFound = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
-
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)) );
+ rtl::OUString(SC_UNO_DP_ISDATALAYOUT) );
//! error checking -- is "IsDataLayoutDimension" property required??
}
}
@@ -1149,10 +1149,10 @@
{
if ( nColumnGrandMode != SC_DPSAVEMODE_DONTKNOW )
lcl_SetBoolProperty( xSourceProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_COLGRAND)),
(bool)nColumnGrandMode );
+ rtl::OUString(SC_UNO_DP_COLGRAND), (bool)nColumnGrandMode );
if ( nRowGrandMode != SC_DPSAVEMODE_DONTKNOW )
lcl_SetBoolProperty( xSourceProp,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ROWGRAND)),
(bool)nRowGrandMode );
+ rtl::OUString(SC_UNO_DP_ROWGRAND), (bool)nRowGrandMode );
}
}
catch(uno::Exception&)
@@ -1231,7 +1231,7 @@
return;
// First, build a dimension name-to-index map.
- typedef boost::unordered_map<OUString, long, ::rtl::OUStringHash> NameIndexMap;
+ typedef boost::unordered_map<OUString, long, OUStringHash> NameIndexMap;
NameIndexMap aMap;
long nColCount = pData->GetColumnCount();
for (long i = 0; i < nColCount; ++i)
@@ -1242,7 +1242,7 @@
boost::ptr_vector<ScDPSaveDimension>::iterator iter;
for (iter = aDimList.begin(); iter != aDimList.end(); ++iter)
{
- const ::rtl::OUString& rDimName = iter->GetName();
+ const OUString& rDimName = iter->GetName();
if (rDimName.isEmpty())
// empty dimension name. It must be data layout.
continue;
@@ -1287,7 +1287,7 @@
DimsType::iterator it = aDimList.begin(), itEnd = aDimList.end();
for (it = aDimList.begin(); it != itEnd; ++it)
{
- const ::rtl::OUString& rDimName = it->GetName();
+ const OUString& rDimName = it->GetName();
if (rDimName.isEmpty())
// empty dimension name. It must be data layout.
continue;
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index db21a6b..855a1da 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -141,7 +141,7 @@
delete pResData;
}
-const ::rtl::OUString* ScDPSource::GetGrandTotalName() const
+const OUString* ScDPSource::GetGrandTotalName() const
{
return mpGrandTotalName.get();
}
@@ -1366,7 +1366,7 @@
return GetHierarchiesObject();
}
-::rtl::OUString SAL_CALL ScDPDimension::getName() throw(uno::RuntimeException)
+OUString SAL_CALL ScDPDimension::getName() throw(uno::RuntimeException)
{
if (!aName.isEmpty())
return aName;
@@ -1374,7 +1374,7 @@
return pSource->GetData()->getDimensionName( nDim );
}
-void SAL_CALL ScDPDimension::setName( const ::rtl::OUString& rNewName )
throw(uno::RuntimeException)
+void SAL_CALL ScDPDimension::setName( const OUString& rNewName ) throw(uno::RuntimeException)
{
// used after cloning
aName = rNewName;
@@ -1667,9 +1667,9 @@
aRet <<= uno::Sequence<sheet::TableFilterField>(0);
}
else if (aPropertyName.equalsAscii(SC_UNO_DP_LAYOUTNAME))
- aRet <<= mpLayoutName.get() ? *mpLayoutName : OUString(RTL_CONSTASCII_USTRINGPARAM(""));
+ aRet <<= mpLayoutName.get() ? *mpLayoutName : OUString("");
else if (aPropertyName.equalsAscii(SC_UNO_DP_FIELD_SUBTOTALNAME))
- aRet <<= mpSubtotalName.get() ? *mpSubtotalName :
OUString(RTL_CONSTASCII_USTRINGPARAM(""));
+ aRet <<= mpSubtotalName.get() ? *mpSubtotalName : OUString("");
else if (aPropertyName.equalsAscii(SC_UNO_DP_HAS_HIDDEN_MEMBER))
aRet <<= static_cast<sal_Bool>(mbHasHiddenMember);
else if (aPropertyName.equalsAscii(SC_UNO_DP_FLAGS))
@@ -1830,19 +1830,19 @@
return GetLevelsObject();
}
-::rtl::OUString SAL_CALL ScDPHierarchy::getName() throw(uno::RuntimeException)
+OUString SAL_CALL ScDPHierarchy::getName() throw(uno::RuntimeException)
{
rtl::OUString aRet; //! globstr-ID !!!!
switch (nHier)
{
case SC_DAPI_HIERARCHY_FLAT:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("flat"));
+ aRet = rtl::OUString("flat");
break; //! name ???????
case SC_DAPI_HIERARCHY_QUARTER:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Quarter"));
+ aRet = rtl::OUString("Quarter");
break; //! name ???????
case SC_DAPI_HIERARCHY_WEEK:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Week"));
+ aRet = rtl::OUString("Week");
break; //! name ???????
default:
OSL_FAIL( "ScDPHierarchy::getName: unexpected hierarchy" );
@@ -1851,7 +1851,7 @@
return aRet;
}
-void SAL_CALL ScDPHierarchy::setName( const ::rtl::OUString& /* rNewName */ )
throw(uno::RuntimeException)
+void SAL_CALL ScDPHierarchy::setName( const OUString& /* rNewName */ ) throw(uno::RuntimeException)
{
OSL_FAIL("not implemented"); //! exception?
}
@@ -2118,7 +2118,7 @@
return uno::Sequence<sheet::MemberResult>(0); //! Error?
}
-::rtl::OUString SAL_CALL ScDPLevel::getName() throw(uno::RuntimeException)
+OUString SAL_CALL ScDPLevel::getName() throw(uno::RuntimeException)
{
long nSrcDim = pSource->GetSourceDim( nDim );
if ( pSource->IsDateDimension( nSrcDim ) )
@@ -2130,16 +2130,16 @@
switch ( nLev )
{
case SC_DAPI_LEVEL_YEAR:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Year"));
+ aRet = rtl::OUString("Year");
break;
case SC_DAPI_LEVEL_QUARTER:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Quarter"));
+ aRet = rtl::OUString("Quarter");
break;
case SC_DAPI_LEVEL_MONTH:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Month"));
+ aRet = rtl::OUString("Month");
break;
case SC_DAPI_LEVEL_DAY:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Day"));
+ aRet = rtl::OUString("Day");
break;
default:
OSL_FAIL( "ScDPLevel::getName: unexpected level" );
@@ -2151,13 +2151,13 @@
switch ( nLev )
{
case SC_DAPI_LEVEL_YEAR:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Year"));
+ aRet = rtl::OUString("Year");
break;
case SC_DAPI_LEVEL_WEEK:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Week"));
+ aRet = rtl::OUString("Week");
break;
case SC_DAPI_LEVEL_WEEKDAY:
- aRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Weekday"));
+ aRet = rtl::OUString("Weekday");
break;
default:
OSL_FAIL( "ScDPLevel::getName: unexpected level" );
@@ -2175,7 +2175,7 @@
return pDim->getName();
}
-void SAL_CALL ScDPLevel::setName( const ::rtl::OUString& /* rNewName */ )
throw(uno::RuntimeException)
+void SAL_CALL ScDPLevel::setName( const OUString& /* rNewName */ ) throw(uno::RuntimeException)
{
OSL_FAIL("not implemented"); //! exception?
}
@@ -2362,7 +2362,7 @@
// XNameAccess implementation using getCount/getByIndex
-sal_Int32 ScDPMembers::GetIndexFromName( const ::rtl::OUString& rName ) const
+sal_Int32 ScDPMembers::GetIndexFromName( const OUString& rName ) const
{
if ( aHashMap.empty() )
{
@@ -2646,12 +2646,12 @@
return rtl::OUString();
}
-::rtl::OUString SAL_CALL ScDPMember::getName() throw(uno::RuntimeException)
+OUString SAL_CALL ScDPMember::getName() throw(uno::RuntimeException)
{
return GetNameStr();
}
-void SAL_CALL ScDPMember::setName( const ::rtl::OUString& /* rNewName */ )
throw(uno::RuntimeException)
+void SAL_CALL ScDPMember::setName( const OUString& /* rNewName */ ) throw(uno::RuntimeException)
{
OSL_FAIL("not implemented"); //! exception?
}
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 32500ee..4ece942 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -117,11 +117,11 @@
bHasSuppressedArgs = false;
}
-::rtl::OUString ScFuncDesc::GetParamList() const
+OUString ScFuncDesc::GetParamList() const
{
- ::rtl::OUString sep(ScCompiler::GetNativeSymbol(ocSep));
+ OUString sep(ScCompiler::GetNativeSymbol(ocSep));
- ::rtl::OUStringBuffer aSig;
+ OUStringBuffer aSig;
if ( nArgCount > 0 )
{
@@ -208,15 +208,15 @@
return aSig.makeStringAndClear();
}
-::rtl::OUString ScFuncDesc::getSignature() const
+OUString ScFuncDesc::getSignature() const
{
- ::rtl::OUStringBuffer aSig;
+ OUStringBuffer aSig;
if(pFuncName)
{
aSig.append(*pFuncName);
- ::rtl::OUString aParamList = GetParamList();
+ OUString aParamList = GetParamList();
if( !aParamList.isEmpty() )
{
aSig.appendAscii( "( " );
@@ -231,19 +231,19 @@
return aSig.makeStringAndClear();
}
-::rtl::OUString ScFuncDesc::getFormula( const ::std::vector< ::rtl::OUString >& _aArguments ) const
+OUString ScFuncDesc::getFormula( const ::std::vector< OUString >& _aArguments ) const
{
- ::rtl::OUString sep = ScCompiler::GetNativeSymbol(ocSep);
+ OUString sep = ScCompiler::GetNativeSymbol(ocSep);
- ::rtl::OUStringBuffer aFormula;
+ OUStringBuffer aFormula;
if(pFuncName)
{
aFormula.append( *pFuncName );
aFormula.appendAscii( "(" );
- ::std::vector< ::rtl::OUString >::const_iterator aIter = _aArguments.begin();
- ::std::vector< ::rtl::OUString >::const_iterator aEnd = _aArguments.end();
+ ::std::vector< OUString >::const_iterator aIter = _aArguments.begin();
+ ::std::vector< OUString >::const_iterator aEnd = _aArguments.end();
if ( nArgCount > 0 && aIter != aEnd )
{
@@ -291,9 +291,9 @@
return nCount;
}
-::rtl::OUString ScFuncDesc::getFunctionName() const
+OUString ScFuncDesc::getFunctionName() const
{
- ::rtl::OUString sRet;
+ OUString sRet;
if ( pFuncName )
sRet = *pFuncName;
return sRet;
@@ -304,9 +304,9 @@
return ScGlobal::GetStarCalcFunctionMgr()->getCategory(nCategory);
}
-::rtl::OUString ScFuncDesc::getDescription() const
+OUString ScFuncDesc::getDescription() const
{
- ::rtl::OUString sRet;
+ OUString sRet;
if ( pFuncDesc )
sRet = *pFuncDesc;
return sRet;
@@ -349,7 +349,7 @@
if ( bIncomplete && pFuncName )
{
ScUnoAddInCollection& rAddIns = *ScGlobal::GetAddInCollection();
- ::rtl::OUString aIntName(rAddIns.FindFunction( *pFuncName, true )); // pFuncName
is upper-case
+ OUString aIntName(rAddIns.FindFunction( *pFuncName, true )); // pFuncName is
upper-case
if ( !aIntName.isEmpty() )
{
@@ -377,12 +377,12 @@
return nArgCount;
}
-::rtl::OUString ScFuncDesc::getParameterName(sal_uInt32 _nPos) const
+OUString ScFuncDesc::getParameterName(sal_uInt32 _nPos) const
{
return *(ppDefArgNames[_nPos]);
}
-::rtl::OUString ScFuncDesc::getParameterDescription(sal_uInt32 _nPos) const
+OUString ScFuncDesc::getParameterDescription(sal_uInt32 _nPos) const
{
return *(ppDefArgDescs[_nPos]);
}
@@ -453,20 +453,20 @@
sal_uInt16 nNextId = SC_OPCODE_LAST_OPCODE_ID + 1; // FuncID for AddIn functions
// Interpretation of AddIn list
- ::rtl::OUString aDefArgNameValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"));
- ::rtl::OUString aDefArgNameString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("string"));
- ::rtl::OUString aDefArgNameValues = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("values"));
- ::rtl::OUString aDefArgNameStrings = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("strings"));
- ::rtl::OUString aDefArgNameCells = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cells"));
- ::rtl::OUString aDefArgNameNone = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("none"));
- ::rtl::OUString aDefArgDescValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a value"));
- ::rtl::OUString aDefArgDescString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a string"));
- ::rtl::OUString aDefArgDescValues = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("array of
values"));
- ::rtl::OUString aDefArgDescStrings = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("array of
strings"));
- ::rtl::OUString aDefArgDescCells = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("range of
cells"));
- ::rtl::OUString aDefArgDescNone = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("none"));
+ OUString aDefArgNameValue = OUString("value");
+ OUString aDefArgNameString = OUString("string");
+ OUString aDefArgNameValues = OUString("values");
+ OUString aDefArgNameStrings = OUString("strings");
+ OUString aDefArgNameCells = OUString("cells");
+ OUString aDefArgNameNone = OUString("none");
+ OUString aDefArgDescValue = OUString("a value");
+ OUString aDefArgDescString = OUString("a string");
+ OUString aDefArgDescValues = OUString("array of values");
+ OUString aDefArgDescStrings = OUString("array of strings");
+ OUString aDefArgDescCells = OUString("range of cells");
+ OUString aDefArgDescNone = OUString("none");
- ::rtl::OUString aArgName, aArgDesc;
+ OUString aArgName, aArgDesc;
const FuncCollection& rFuncColl = *ScGlobal::GetFuncCollection();
FuncCollection::const_iterator it = rFuncColl.begin(), itEnd = rFuncColl.end();
for (; it != itEnd; ++it)
@@ -479,73 +479,73 @@
pDesc->nCategory = ID_FUNCTION_GRP_ADDINS;
pDesc->pFuncName = new OUString(pAddInFuncData->GetInternalName().toAsciiUpperCase());
- ::rtl::OUStringBuffer aBuf(aArgDesc);
+ OUStringBuffer aBuf(aArgDesc);
aBuf.append(sal_Unicode('\n'));
aBuf.appendAscii("( AddIn: ");
aBuf.append(pAddInFuncData->GetModuleName());
aBuf.appendAscii(" )");
- pDesc->pFuncDesc = new ::rtl::OUString(aBuf.makeStringAndClear());
+ pDesc->pFuncDesc = new OUString(aBuf.makeStringAndClear());
pDesc->nArgCount = nArgs;
if (nArgs)
{
pDesc->pDefArgFlags = new ScFuncDesc::ParameterFlags[nArgs];
- pDesc->ppDefArgNames = new ::rtl::OUString*[nArgs];
- pDesc->ppDefArgDescs = new ::rtl::OUString*[nArgs];
+ pDesc->ppDefArgNames = new OUString*[nArgs];
+ pDesc->ppDefArgDescs = new OUString*[nArgs];
for (sal_uInt16 j = 0; j < nArgs; ++j)
{
pDesc->pDefArgFlags[j].bOptional = false;
pDesc->pDefArgFlags[j].bSuppress = false;
pAddInFuncData->getParamDesc( aArgName, aArgDesc, j+1 );
if ( !aArgName.isEmpty() )
- pDesc->ppDefArgNames[j] = new ::rtl::OUString( aArgName );
+ pDesc->ppDefArgNames[j] = new OUString( aArgName );
else
{
switch (pAddInFuncData->GetParamType(j+1))
{
case PTR_DOUBLE:
- pDesc->ppDefArgNames[j] = new ::rtl::OUString( aDefArgNameValue );
+ pDesc->ppDefArgNames[j] = new OUString( aDefArgNameValue );
break;
case PTR_STRING:
- pDesc->ppDefArgNames[j] = new ::rtl::OUString( aDefArgNameString );
+ pDesc->ppDefArgNames[j] = new OUString( aDefArgNameString );
break;
case PTR_DOUBLE_ARR:
- pDesc->ppDefArgNames[j] = new ::rtl::OUString( aDefArgNameValues );
+ pDesc->ppDefArgNames[j] = new OUString( aDefArgNameValues );
break;
case PTR_STRING_ARR:
- pDesc->ppDefArgNames[j] = new ::rtl::OUString( aDefArgNameStrings );
+ pDesc->ppDefArgNames[j] = new OUString( aDefArgNameStrings );
break;
case PTR_CELL_ARR:
- pDesc->ppDefArgNames[j] = new ::rtl::OUString( aDefArgNameCells );
+ pDesc->ppDefArgNames[j] = new OUString( aDefArgNameCells );
break;
default:
- pDesc->ppDefArgNames[j] = new ::rtl::OUString( aDefArgNameNone );
+ pDesc->ppDefArgNames[j] = new OUString( aDefArgNameNone );
break;
}
}
if ( !aArgDesc.isEmpty() )
- pDesc->ppDefArgDescs[j] = new ::rtl::OUString( aArgDesc );
+ pDesc->ppDefArgDescs[j] = new OUString( aArgDesc );
else
{
switch (pAddInFuncData->GetParamType(j+1))
{
case PTR_DOUBLE:
- pDesc->ppDefArgDescs[j] = new ::rtl::OUString( aDefArgDescValue );
+ pDesc->ppDefArgDescs[j] = new OUString( aDefArgDescValue );
break;
case PTR_STRING:
- pDesc->ppDefArgDescs[j] = new ::rtl::OUString( aDefArgDescString );
+ pDesc->ppDefArgDescs[j] = new OUString( aDefArgDescString );
break;
case PTR_DOUBLE_ARR:
- pDesc->ppDefArgDescs[j] = new ::rtl::OUString( aDefArgDescValues );
+ pDesc->ppDefArgDescs[j] = new OUString( aDefArgDescValues );
break;
case PTR_STRING_ARR:
- pDesc->ppDefArgDescs[j] = new ::rtl::OUString( aDefArgDescStrings );
+ pDesc->ppDefArgDescs[j] = new OUString( aDefArgDescStrings );
break;
case PTR_CELL_ARR:
- pDesc->ppDefArgDescs[j] = new ::rtl::OUString( aDefArgDescCells );
+ pDesc->ppDefArgDescs[j] = new OUString( aDefArgDescCells );
break;
default:
- pDesc->ppDefArgDescs[j] = new ::rtl::OUString( aDefArgDescNone );
+ pDesc->ppDefArgDescs[j] = new OUString( aDefArgDescNone );
break;
}
}
@@ -641,7 +641,7 @@
return m_pMgr;
}
-::rtl::OUString ScFunctionCategory::getName() const
+OUString ScFunctionCategory::getName() const
{
if ( m_sName.isEmpty() )
m_sName = ScFunctionMgr::GetCategoryName(m_nCategory+1);
@@ -712,13 +712,13 @@
delete aCatLists[i];
}
-const ScFuncDesc* ScFunctionMgr::Get( const ::rtl::OUString& rFName ) const
+const ScFuncDesc* ScFunctionMgr::Get( const OUString& rFName ) const
{
const ScFuncDesc* pDesc = NULL;
if (rFName.getLength() <= pFuncList->GetMaxFuncNameLen())
{
::boost::scoped_ptr<ScFuncDesc> dummy(new ScFuncDesc);
- dummy->pFuncName = new ::rtl::OUString(rFName);
+ dummy->pFuncName = new OUString(rFName);
::std::vector<const ScFuncDesc*>::iterator lower =
::std::lower_bound(aCatLists[0]->begin(), aCatLists[0]->end(),
static_cast<const ScFuncDesc*>(dummy.get()), ScFuncDesc::compareByName);
@@ -784,7 +784,7 @@
return pRet;
}
-const formula::IFunctionDescription* ScFunctionMgr::getFunctionByName(const ::rtl::OUString&
_sFunctionName) const
+const formula::IFunctionDescription* ScFunctionMgr::getFunctionByName(const OUString&
_sFunctionName) const
{
return Get(_sFunctionName);
}
@@ -802,12 +802,12 @@
}
}
-::rtl::OUString ScFunctionMgr::GetCategoryName(sal_uInt32 _nCategoryNumber )
+OUString ScFunctionMgr::GetCategoryName(sal_uInt32 _nCategoryNumber )
{
if ( _nCategoryNumber > SC_FUNCGROUP_COUNT )
{
OSL_FAIL("Invalid category number!");
- return ::rtl::OUString();
+ return OUString();
}
SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -898,17 +898,17 @@
}
}
- pDesc->pFuncName = new ::rtl::OUString( ScCompiler::GetNativeSymbol( static_cast<OpCode>(
aRes.GetId())));
- pDesc->pFuncDesc = new ::rtl::OUString( SC_RESSTR(1) );
+ pDesc->pFuncName = new OUString( ScCompiler::GetNativeSymbol( static_cast<OpCode>(
aRes.GetId())));
+ pDesc->pFuncDesc = new OUString( SC_RESSTR(1) );
if (nArgs)
{
- pDesc->ppDefArgNames = new ::rtl::OUString*[nArgs];
- pDesc->ppDefArgDescs = new ::rtl::OUString*[nArgs];
+ pDesc->ppDefArgNames = new OUString*[nArgs];
+ pDesc->ppDefArgDescs = new OUString*[nArgs];
for (sal_uInt16 i = 0; i < nArgs; ++i)
{
- pDesc->ppDefArgNames[i] = new ::rtl::OUString(SC_RESSTR(2*(i+1) ));
- pDesc->ppDefArgDescs[i] = new ::rtl::OUString(SC_RESSTR(2*(i+1)+1));
+ pDesc->ppDefArgNames[i] = new OUString(SC_RESSTR(2*(i+1) ));
+ pDesc->ppDefArgDescs[i] = new OUString(SC_RESSTR(2*(i+1)+1));
}
}
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 52c45a8..2c79995 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -86,7 +86,7 @@
i18n::LocaleDataItem aLocaleItem = ScGlobal::pLocaleData->getLocaleItem();
// Get prefix element
- rtl::OUString sEmpty, sUser = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-" ));
+ rtl::OUString sEmpty, sUser = rtl::OUString( "-" );
ParseResult aPRPre = ScGlobal::pCharClass->parsePredefinedToken(
KParseType::IDENTNAME, sWhole, 0,
KParseTokens::ANY_LETTER, sUser, KParseTokens::ANY_LETTER, sUser );
diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
index 28bd99b..cdde218 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -66,9 +66,9 @@
switch (eHash)
{
case PASSHASH_SHA1:
- return OUString(RTL_CONSTASCII_USTRINGPARAM(URI_SHA1));
+ return OUString(URI_SHA1);
case PASSHASH_XL:
- return OUString(RTL_CONSTASCII_USTRINGPARAM(URI_XLS_LEGACY));
+ return OUString(URI_XLS_LEGACY);
case PASSHASH_UNSPECIFIED:
default:
;
diff --git a/sc/source/core/tool/addincfg.cxx b/sc/source/core/tool/addincfg.cxx
index 9ed7749..c58b398 100644
--- a/sc/source/core/tool/addincfg.cxx
+++ b/sc/source/core/tool/addincfg.cxx
@@ -33,7 +33,7 @@
#define CFGPATH_ADDINS "Office.CalcAddIns/AddInInfo"
ScAddInCfg::ScAddInCfg() :
- ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_ADDINS )) )
+ ConfigItem( rtl::OUString( CFGPATH_ADDINS ) )
{
uno::Sequence<rtl::OUString> aNames(1); // one entry: empty string
EnableNotification( aNames );
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 084cef2..7090127 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -289,7 +289,7 @@
// adjust for metric system
if (ScOptionsUtil::IsMetricSystem())
- pNames[SCLAYOUTOPT_MEASURE] = OUString(RTL_CONSTASCII_USTRINGPARAM(
"Other/MeasureUnit/Metric") );
+ pNames[SCLAYOUTOPT_MEASURE] = OUString( "Other/MeasureUnit/Metric" );
return aNames;
}
@@ -386,13 +386,13 @@
}
ScAppCfg::ScAppCfg() :
- aLayoutItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_LAYOUT )) ),
- aInputItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_INPUT )) ),
- aRevisionItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_REVISION )) ),
- aContentItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_CONTENT )) ),
- aSortListItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_SORTLIST )) ),
- aMiscItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_MISC )) ),
- aCompatItem( OUString(RTL_CONSTASCII_USTRINGPARAM(CFGPATH_COMPAT )) )
+ aLayoutItem( OUString( CFGPATH_LAYOUT ) ),
+ aInputItem( OUString( CFGPATH_INPUT ) ),
+ aRevisionItem( OUString( CFGPATH_REVISION ) ),
+ aContentItem( OUString( CFGPATH_CONTENT ) ),
+ aSortListItem( OUString( CFGPATH_SORTLIST ) ),
+ aMiscItem( OUString( CFGPATH_MISC ) ),
+ aCompatItem( OUString(CFGPATH_COMPAT ) )
{
sal_Int32 nIntVal = 0;
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 4e14754..c2bed56 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -1019,7 +1019,7 @@
SvtPathOptions aPathOpt;
aURL.SetSmartURL( aPathOpt.GetUserConfigPath() );
aURL.setFinalSlash();
- aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( sAutoTblFmtName ) ) );
+ aURL.Append( String( sAutoTblFmtName ) );
SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_READ );
SvStream* pStream = aMedium.GetInStream();
@@ -1080,7 +1080,7 @@
SvtPathOptions aPathOpt;
aURL.SetSmartURL( aPathOpt.GetUserConfigPath() );
aURL.setFinalSlash();
- aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( sAutoTblFmtName ) ) );
+ aURL.Append( String( sAutoTblFmtName ) );
SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_WRITE );
SvStream* pStream = aMedium.GetOutStream();
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index 4a3ecc6..823e9bb 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -105,7 +105,7 @@
(!pFCell->GetDocument()->GetMacroInterpretLevel()
|| pFCell->IsRunning()) )
{
- rString = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..."));
+ rString = rtl::OUString("...");
}
else
{
diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx
index 5c7d9be..9277c7e 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -253,7 +253,7 @@
try
{
- rtl::OUString aPropertyNameRole( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Role")) );
+ rtl::OUString aPropertyNameRole( OUString("Role") );
uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > >
aLabeledDataSequences( xDataSource->getDataSequences() );
sal_Int32 nRange=0;
@@ -317,13 +317,13 @@
svt::EmbeddedObjectRef::TryRunningState( xEmbeddedObj );
uno::Reference< beans::XPropertySet > xProps( xEmbeddedObj->getComponent(),
uno::UNO_QUERY );
if ( xProps.is() &&
- ( xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"DisableDataTableDialog" ) ) ) >>= bDisableDataTableDialog ) &&
+ ( xProps->getPropertyValue( OUString( "DisableDataTableDialog" ) ) >>=
bDisableDataTableDialog ) &&
bDisableDataTableDialog )
{
ScChartListenerCollection* pCollection =
pDocument->GetChartListenerCollection();
if (pCollection)
{
- ::rtl::OUString aChartName = pSdrOle2Obj->GetPersistName();
+ OUString aChartName = pSdrOle2Obj->GetPersistName();
const ScChartListener* pListener = pCollection->findByName(aChartName);
if (pListener)
{
@@ -358,7 +358,7 @@
}
}
-void ScChartHelper::GetChartNames( ::std::vector< ::rtl::OUString >& rChartNames, SdrPage* pPage )
+void ScChartHelper::GetChartNames( ::std::vector< OUString >& rChartNames, SdrPage* pPage )
{
if ( pPage )
{
@@ -380,7 +380,7 @@
}
void ScChartHelper::CreateProtectedChartListenersAndNotify( ScDocument* pDoc, SdrPage* pPage,
ScModelObj* pModelObj, SCTAB nTab,
- const ScRangeListVector& rRangesVector, const ::std::vector< ::rtl::OUString >&
rExcludedChartNames, bool bSameDoc )
+ const ScRangeListVector& rRangesVector, const ::std::vector< OUString >& rExcludedChartNames,
bool bSameDoc )
{
if ( pDoc && pPage && pModelObj )
{
@@ -395,9 +395,9 @@
SdrOle2Obj* pSdrOle2Obj = dynamic_cast< SdrOle2Obj* >( pObject );
if ( pSdrOle2Obj && pSdrOle2Obj->IsChart() )
{
- ::rtl::OUString aChartName = pSdrOle2Obj->GetPersistName();
- ::std::vector< ::rtl::OUString >::const_iterator aEnd =
rExcludedChartNames.end();
- ::std::vector< ::rtl::OUString >::const_iterator aFound = ::std::find(
rExcludedChartNames.begin(), aEnd, aChartName );
+ OUString aChartName = pSdrOle2Obj->GetPersistName();
+ ::std::vector< OUString >::const_iterator aEnd = rExcludedChartNames.end();
+ ::std::vector< OUString >::const_iterator aFound = ::std::find(
rExcludedChartNames.begin(), aEnd, aChartName );
if ( aFound == aEnd )
{
uno::Reference< embed::XEmbeddedObject > xEmbeddedObj =
pSdrOle2Obj->GetObjRef();
@@ -407,7 +407,7 @@
svt::EmbeddedObjectRef::TryRunningState( xEmbeddedObj );
uno::Reference< beans::XPropertySet > xProps(
xEmbeddedObj->getComponent(), uno::UNO_QUERY );
if ( xProps.is() &&
- ( xProps->getPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ) ) >>= bDisableDataTableDialog ) &&
+ ( xProps->getPropertyValue( OUString( "DisableDataTableDialog" )
) >>= bDisableDataTableDialog ) &&
bDisableDataTableDialog )
{
if ( bSameDoc )
@@ -424,9 +424,9 @@
}
else
{
- xProps->setPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ),
+ xProps->setPropertyValue( OUString( "DisableDataTableDialog" ),
uno::makeAny( sal_False ) );
- xProps->setPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "DisableComplexChartTypes" ) ),
+ xProps->setPropertyValue( OUString( "DisableComplexChartTypes"
),
uno::makeAny( sal_False ) );
}
}
@@ -440,10 +440,10 @@
aChangeRanges.Append( aRange );
uno::Sequence< beans::PropertyValue > aProperties( 1 );
- aProperties[ 0 ].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"Name" ) );
+ aProperties[ 0 ].Name = OUString( "Name" );
aProperties[ 0 ].Value <<= aChartName;
- pModelObj->NotifyChanges( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "insert-chart" ) ), aChangeRanges, aProperties );
+ pModelObj->NotifyChanges( OUString( "insert-chart" ), aChangeRanges,
aProperties );
}
}
}
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index ef7b7ed..82ca90e 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -155,7 +155,7 @@
const ScUnoAddInFuncData* pFuncData = pColl->GetFuncData(i);
if (pFuncData)
{
- ::rtl::OUString aName;
+ OUString aName;
if (pFuncData->GetExcelName( LANGUAGE_ENGLISH_US, aName))
xMap->putExternalSoftly( aName, pFuncData->GetOriginalName());
else
@@ -635,7 +635,7 @@
static String lcl_makeExternalNameStr( const String& rFile, const String& rName,
const sal_Unicode cSep, bool bODF )
{
- String aFile( rFile), aName( rName), aEscQuote( RTL_CONSTASCII_USTRINGPARAM("''"));
+ String aFile( rFile), aName( rName), aEscQuote( "''");
aFile.SearchAndReplaceAllAscii( "'", aEscQuote);
if (bODF)
aName.SearchAndReplaceAllAscii( "'", aEscQuote);
@@ -872,7 +872,7 @@
return lcl_makeExternalNameStr( rFile, rName, sal_Unicode('#'), false);
}
- bool makeExternalSingleRefStr( ::rtl::OUStringBuffer& rBuffer, sal_uInt16 nFileId,
+ bool makeExternalSingleRefStr( OUStringBuffer& rBuffer, sal_uInt16 nFileId,
const String& rTabName, const ScSingleRefData& rRef,
ScExternalRefManager* pRefMgr, bool bDisplayTabName, bool
bEncodeUrl ) const
{
@@ -911,7 +911,7 @@
return true;
}
- void makeExternalRefStrImpl( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ void makeExternalRefStrImpl( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const
ScSingleRefData& rRef,
ScExternalRefManager* pRefMgr, bool bODF ) const
{
@@ -941,14 +941,14 @@
rBuffer.append( sal_Unicode(']'));
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const
ScSingleRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
makeExternalRefStrImpl( rBuffer, rCompiler, nFileId, rTabName, rRef, pRefMgr, false);
}
- void makeExternalRefStrImpl( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ void makeExternalRefStrImpl( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const
ScComplexRefData& rRef,
ScExternalRefManager* pRefMgr, bool bODF ) const
{
@@ -1008,7 +1008,7 @@
rBuffer.append( sal_Unicode(']'));
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const
ScComplexRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
@@ -1038,14 +1038,14 @@
return lcl_makeExternalNameStr( rFile, rName, sal_Unicode('#'), true);
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const
ScSingleRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
makeExternalRefStrImpl( rBuffer, rCompiler, nFileId, rTabName, rRef, pRefMgr, true);
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const
ScComplexRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
@@ -1163,7 +1163,7 @@
return lcl_makeExternalNameStr( rFile, rName, sal_Unicode('!'), false);
}
- static void makeExternalDocStr( ::rtl::OUStringBuffer& rBuffer, const String& rFullName, bool
bEncodeUrl )
+ static void makeExternalDocStr( OUStringBuffer& rBuffer, const String& rFullName, bool
bEncodeUrl )
{
// Format that is easier to deal with inside OOo, because we use file
// URL, and all characetrs are allowed. Check if it makes sense to do
@@ -1193,7 +1193,7 @@
rBuffer.append(sal_Unicode(']'));
}
- static void makeExternalTabNameRange( ::rtl::OUStringBuffer& rBuf, const OUString& rTabName,
+ static void makeExternalTabNameRange( OUStringBuffer& rBuf, const OUString& rTabName,
const vector<OUString>& rTabNames,
const ScComplexRefData& rRef )
{
@@ -1271,7 +1271,7 @@
ConventionXL_A1() : Convention_A1( FormulaGrammar::CONV_XL_A1 ) { }
ConventionXL_A1( FormulaGrammar::AddressConvention eConv ) : Convention_A1( eConv ) { }
- void makeSingleCellStr( ::rtl::OUStringBuffer& rBuf, const ScSingleRefData& rRef ) const
+ void makeSingleCellStr( OUStringBuffer& rBuf, const ScSingleRefData& rRef ) const
{
if (!rRef.IsColRel())
rBuf.append(sal_Unicode('$'));
@@ -1377,7 +1377,7 @@
return ConventionXL::makeExternalNameStr(rFile, rName);
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const
ScSingleRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
@@ -1402,7 +1402,7 @@
makeSingleCellStr(rBuffer, aRef);
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const
ScComplexRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
@@ -1577,7 +1577,7 @@
return ConventionXL::makeExternalNameStr(rFile, rName);
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const
ScSingleRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
@@ -1603,7 +1603,7 @@
r1c1_add_col(rBuffer, aRef);
}
- virtual void makeExternalRefStr( ::rtl::OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
+ virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScCompiler& rCompiler,
sal_uInt16 nFileId, const String& rTabName, const
ScComplexRefData& rRef,
ScExternalRefManager* pRefMgr ) const
{
@@ -5205,7 +5205,7 @@
// -----------------------------------------------------------------------------
void ScCompiler::LocalizeString( String& rName )
{
- ::rtl::OUString aName(rName);
+ OUString aName(rName);
ScGlobal::GetAddInCollection()->LocalizeString( aName );
rName = aName;
}
@@ -5251,7 +5251,7 @@
{
if ( _bIsEnglish )
{
- ::rtl::OUString aName;
+ OUString aName;
if (pFuncData->GetExcelName( LANGUAGE_ENGLISH_US, aName))
aEntry.Name = aName;
else
@@ -5259,7 +5259,7 @@
}
else
aEntry.Name = pFuncData->GetUpperLocal();
- aEntry.Token.Data <<= ::rtl::OUString( pFuncData->GetOriginalName());
+ aEntry.Token.Data <<= OUString( pFuncData->GetOriginalName());
_rVec.push_back( aEntry);
}
}
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index 56cd5a7..c8a6384 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -793,7 +793,7 @@
if (ppTitlePos && ppTitles && ppRowHeaders)
{
- String aDelim( RTL_CONSTASCII_USTRINGPARAM(" / ") );
+ String aDelim( " / " );
for (SCSIZE nPos=0; nPos<nDataCount; nPos++)
{
SCSIZE nTPos = ppTitlePos[nArrY][nPos];
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 6b773c3..c153a9e 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -47,7 +47,7 @@
return ScGlobal::GetpTransliteration()->compareString(left.GetUpperName(),
right.GetUpperName()) < 0;
}
-ScDBData::ScDBData( const ::rtl::OUString& rName,
+ScDBData::ScDBData( const OUString& rName,
SCTAB nTab,
SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
bool bByR, bool bHasH) :
@@ -103,7 +103,7 @@
{
}
-ScDBData::ScDBData( const ::rtl::OUString& rName, const ScDBData& rData ) :
+ScDBData::ScDBData( const OUString& rName, const ScDBData& rData ) :
ScRefreshTimer ( rData ),
mpSortParam(new ScSortParam(*rData.mpSortParam)),
mpQueryParam(new ScQueryParam(*rData.mpQueryParam)),
@@ -210,9 +210,9 @@
}
-::rtl::OUString ScDBData::GetSourceString() const
+OUString ScDBData::GetSourceString() const
{
- ::rtl::OUStringBuffer aBuf;
+ OUStringBuffer aBuf;
if (mpImportParam->bImport)
{
aBuf.append(mpImportParam->aDBName);
@@ -222,9 +222,9 @@
return aBuf.makeStringAndClear();
}
-::rtl::OUString ScDBData::GetOperations() const
+OUString ScDBData::GetOperations() const
{
- ::rtl::OUStringBuffer aBuf;
+ OUStringBuffer aBuf;
if (mpQueryParam->GetEntryCount())
{
const ScQueryEntry& rEntry = mpQueryParam->GetEntry(0);
@@ -636,9 +636,9 @@
class FindByUpperName : public unary_function<ScDBData, bool>
{
- const ::rtl::OUString& mrName;
+ const OUString& mrName;
public:
- FindByUpperName(const ::rtl::OUString& rName) : mrName(rName) {}
+ FindByUpperName(const OUString& rName) : mrName(rName) {}
bool operator() (const ScDBData& r) const
{
return r.GetUpperName() == mrName;
@@ -680,7 +680,7 @@
return itr == maDBs.end() ? NULL : &(*itr);
}
-ScDBData* ScDBCollection::NamedDBs::findByUpperName(const ::rtl::OUString& rName)
+ScDBData* ScDBCollection::NamedDBs::findByUpperName(const OUString& rName)
{
DBsType::iterator itr = find_if(
maDBs.begin(), maDBs.end(), FindByUpperName(rName));
@@ -770,7 +770,7 @@
if (!pData)
{
// Insert a new db data. They all have identical names.
- rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_GLOBAL_NONAME));
+ rtl::OUString aName(STR_DB_GLOBAL_NONAME);
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDBData> pNew(new ScDBData(
aName, rRange.aStart.Tab(), rRange.aStart.Col(), rRange.aStart.Row(),
diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx
index 9c3e39d..bc51a29 100644
--- a/sc/source/core/tool/defaultsoptions.cxx
+++ b/sc/source/core/tool/defaultsoptions.cxx
@@ -145,7 +145,7 @@
}
ScDefaultsCfg::ScDefaultsCfg() :
- ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_FORMULA )) )
+ ConfigItem( OUString( CFGPATH_FORMULA ) )
{
OUString aPrefix;
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index efbd8b9..51d608e 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -229,14 +229,14 @@
// adjust for metric system
if (ScOptionsUtil::IsMetricSystem())
- pNames[SCDOCLAYOUTOPT_TABSTOP] = OUString(RTL_CONSTASCII_USTRINGPARAM( "TabStop/Metric") );
+ pNames[SCDOCLAYOUTOPT_TABSTOP] = OUString( "TabStop/Metric" );
return aNames;
}
ScDocCfg::ScDocCfg() :
- aCalcItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_CALC )) ),
- aLayoutItem(OUString(RTL_CONSTASCII_USTRINGPARAM(CFGPATH_DOCLAYOUT)))
+ aCalcItem( OUString( CFGPATH_CALC ) ),
+ aLayoutItem(OUString(CFGPATH_DOCLAYOUT))
{
sal_Int32 nIntVal = 0;
diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx
index 072cec3..a825dda 100644
--- a/sc/source/core/tool/filtopt.cxx
+++ b/sc/source/core/tool/filtopt.cxx
@@ -54,7 +54,7 @@
}
ScFilterOptions::ScFilterOptions() :
- ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_FILTER )) ),
+ ConfigItem( OUString( CFGPATH_FILTER ) ),
bWK3Flag( false ),
fExcelColScale( 0 ),
fExcelRowScale( 0 )
diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx
index 3dc9938..2367b06 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -90,9 +90,9 @@
rtl::OUString& rSepArg, rtl::OUString& rSepArrayCol, rtl::OUString& rSepArrayRow)
{
// Defaults to the old separator values.
- rSepArg = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
- rSepArrayCol = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
- rSepArrayRow = OUString(RTL_CONSTASCII_USTRINGPARAM("|"));
+ rSepArg = OUString(";");
+ rSepArrayCol = OUString(";");
+ rSepArrayRow = OUString("|");
const Locale& rLocale = *ScGlobal::GetLocale();
const OUString& rLang = rLocale.Language;
@@ -131,12 +131,12 @@
// if the decimal and list separators are equal, set the
// parameter separator to be ';', unless they are both
// semicolon in which case don't change the decimal separator.
- rSepArg = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
+ rSepArg = OUString(";");
- rSepArrayCol = OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+ rSepArrayCol = OUString(",");
if (cDecSep == sal_Unicode(','))
- rSepArrayCol = OUString(RTL_CONSTASCII_USTRINGPARAM("."));
- rSepArrayRow = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
+ rSepArrayCol = OUString(".");
+ rSepArrayRow = OUString(";");
}
const LocaleDataWrapper& ScFormulaOptions::GetLocaleDataWrapper()
@@ -249,7 +249,7 @@
}
ScFormulaCfg::ScFormulaCfg() :
- ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_FORMULA )) )
+ ConfigItem( OUString( CFGPATH_FORMULA ) )
{
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(aNames);
diff --git a/sc/source/core/tool/formulaparserpool.cxx b/sc/source/core/tool/formulaparserpool.cxx
index 53969be..0c0231c 100644
--- a/sc/source/core/tool/formulaparserpool.cxx
+++ b/sc/source/core/tool/formulaparserpool.cxx
@@ -66,7 +66,7 @@
{
// enumerate all implementations of the FormulaParser service
Reference< XContentEnumerationAccess > xFactoryEA( mxContext->getServiceManager(),
UNO_QUERY_THROW );
- Reference< XEnumeration > xEnum( xFactoryEA->createContentEnumeration( OUString(
RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.FilterFormulaParser" ) ) ), UNO_SET_THROW );
+ Reference< XEnumeration > xEnum( xFactoryEA->createContentEnumeration( OUString(
"com.sun.star.sheet.FilterFormulaParser" ) ), UNO_SET_THROW );
while( xEnum->hasMoreElements() ) try // single try/catch for every element
{
// create an instance of the formula parser implementation
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index b5e25dd..9e535d2 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -138,7 +138,7 @@
}
ScInputCfg::ScInputCfg() :
- ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_INPUT )) )
+ ConfigItem( OUString( CFGPATH_INPUT ) )
{
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(aNames);
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 1f0206c..ffaa82d 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3538,14 +3538,14 @@
* Takashi Nakamoto <bluedwarf@ooo>
* erAck: added Excel compatibility conversions as seen in issue's test case. */
-static ::rtl::OUString lcl_convertIntoHalfWidth( const ::rtl::OUString & rStr )
+static OUString lcl_convertIntoHalfWidth( const OUString & rStr )
{
static bool bFirstASCCall = true;
static utl::TransliterationWrapper aTrans( ::comphelper::getProcessComponentContext(), 0 );
if( bFirstASCCall )
{
- aTrans.loadModuleByImplName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"FULLWIDTH_HALFWIDTH_LIKE_ASC" )), LANGUAGE_SYSTEM );
+ aTrans.loadModuleByImplName( OUString( "FULLWIDTH_HALFWIDTH_LIKE_ASC" ), LANGUAGE_SYSTEM );
bFirstASCCall = false;
}
@@ -3553,14 +3553,14 @@
}
-static ::rtl::OUString lcl_convertIntoFullWidth( const ::rtl::OUString & rStr )
+static OUString lcl_convertIntoFullWidth( const OUString & rStr )
{
static bool bFirstJISCall = true;
static utl::TransliterationWrapper aTrans( ::comphelper::getProcessComponentContext(), 0 );
if( bFirstJISCall )
{
- aTrans.loadModuleByImplName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"HALFWIDTH_FULLWIDTH_LIKE_JIS" )), LANGUAGE_SYSTEM );
+ aTrans.loadModuleByImplName( OUString( "HALFWIDTH_FULLWIDTH_LIKE_JIS" ), LANGUAGE_SYSTEM );
bFirstJISCall = false;
}
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 9279c18..97ef4df 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2851,7 +2851,7 @@
double fToRate;
int nFromDec;
int nToDec;
- String aEur( RTL_CONSTASCII_USTRINGPARAM("EUR"));
+ String aEur( "EUR");
if ( lclConvertMoney( aFromUnit, fFromRate, nFromDec )
&& lclConvertMoney( aToUnit, fToRate, nToDec ) )
{
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index e428749..3a7b482 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -294,7 +294,7 @@
SetError( mnStringNoValueError);
return fValue;
}
- ::rtl::OUString aStr( rStr);
+ OUString aStr( rStr);
rtl_math_ConversionStatus eStatus;
sal_Int32 nParseEnd;
// Decimal and group separator 0 => only integer and possibly exponent,
@@ -3116,7 +3116,7 @@
uno::Reference< sheet::XSheetCellRange > xSheetRange( xCellRange, uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xProps( xSheetRange->getSpreadsheet(),
uno::UNO_QUERY_THROW );
rtl::OUString sCodeName;
- xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CodeName") ) ) >>=
sCodeName;
+ xProps->getPropertyValue( rtl::OUString( "CodeName" ) ) >>= sCodeName;
// #TODO #FIXME ideally we should 'throw' here if we don't get a valid parent, but... it is
possible
// to create a module ( and use 'Option VBASupport 1' ) for a calc document, in this scenario
there
// are *NO* special document module objects ( of course being able to switch between vba/non
vba mode at
@@ -3127,7 +3127,7 @@
uno::Reference< uno::XInterface > xIf;
if ( pBasMgr && !pBasMgr->GetName().isEmpty() )
{
- String sProj = String( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
+ String sProj = String( "Standard" );
if ( !pDok->GetDocumentShell()->GetBasicManager()->GetName().isEmpty() )
{
sProj = pDok->GetDocumentShell()->GetBasicManager()->GetName();
@@ -3158,7 +3158,7 @@
xVBARange = ooo::vba::createVBAUnoAPIServiceWithArgs( pDok->GetDocumentShell(),
"ooo.vba.excel.Range", aArgs );
if ( xVBARange.is() )
{
- String sDummy(RTL_CONSTASCII_USTRINGPARAM("A-Range") );
+ String sDummy("A-Range");
SbxObjectRef aObj = GetSbUnoObject( sDummy, uno::Any( xVBARange ) );
SetSbUnoObjectDfltPropName( aObj );
bOk = pPar->PutObject( aObj );
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index b3f80c9..d536daa 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -3318,11 +3318,11 @@
String aStr = GetString();
ScCellKeywordTranslator::transKeyword(aStr, ScGlobal::GetLocale(), ocInfo);
if( aStr.EqualsAscii( "SYSTEM" ) )
- PushString( String( RTL_CONSTASCII_USTRINGPARAM( SC_INFO_OSVERSION ) ) );
+ PushString( String( SC_INFO_OSVERSION ) );
else if( aStr.EqualsAscii( "OSVERSION" ) )
- PushString( String( RTL_CONSTASCII_USTRINGPARAM( "Windows (32-bit) NT 5.01" ) ) );
+ PushString( String( "Windows (32-bit) NT 5.01" ) );
else if( aStr.EqualsAscii( "RELEASE" ) )
- PushString( ::utl::Bootstrap::getBuildIdData( ::rtl::OUString() ) );
+ PushString( ::utl::Bootstrap::getBuildIdData( OUString() ) );
else if( aStr.EqualsAscii( "NUMFILE" ) )
PushDouble( 1 );
else if( aStr.EqualsAscii( "RECALC" ) )
diff --git a/sc/source/core/tool/navicfg.cxx b/sc/source/core/tool/navicfg.cxx
index baf752b..6ea645a 100644
--- a/sc/source/core/tool/navicfg.cxx
+++ b/sc/source/core/tool/navicfg.cxx
@@ -26,7 +26,7 @@
//------------------------------------------------------------------
ScNavipiCfg::ScNavipiCfg() :
-//! ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_NAVIPI )) ),
+//! ConfigItem( OUString( CFGPATH_NAVIPI ) ),
nListMode(0),
nDragMode(0),
nRootType(0)
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index f5d6a2c..cd99cc0 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -134,7 +134,7 @@
}
ScPrintCfg::ScPrintCfg() :
- ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_PRINT )) )
+ ConfigItem( OUString( CFGPATH_PRINT ) )
{
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(aNames);
diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx
index 76457e6..d00927b 100644
--- a/sc/source/core/tool/unitconv.cxx
+++ b/sc/source/core/tool/unitconv.cxx
@@ -78,7 +78,7 @@
// read from configuration - "convert.ini" is no longer used
//! config item as member to allow change of values
- ScLinkConfigItem aConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_UNIT )) );
+ ScLinkConfigItem aConfigItem( OUString( CFGPATH_UNIT ) );
// empty node name -> use the config item's path itself
OUString aEmptyString;
@@ -99,11 +99,11 @@
sPrefix += sSlash;
pValNameArray[nIndex] = sPrefix;
- pValNameArray[nIndex++] += OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_UNIT_FROM ));
+ pValNameArray[nIndex++] += OUString( CFGSTR_UNIT_FROM );
pValNameArray[nIndex] = sPrefix;
- pValNameArray[nIndex++] += OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_UNIT_TO ));
+ pValNameArray[nIndex++] += OUString( CFGSTR_UNIT_TO );
pValNameArray[nIndex] = sPrefix;
- pValNameArray[nIndex++] += OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_UNIT_FACTOR ));
+ pValNameArray[nIndex++] += OUString( CFGSTR_UNIT_FACTOR );
}
Sequence<Any> aProperties = aConfigItem.GetProperties(aValNames);
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 64a4fec..5874b15 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -388,10 +388,10 @@
// adjust for metric system
if (ScOptionsUtil::IsMetricSystem())
{
- pNames[SCGRIDOPT_RESOLU_X] = OUString(RTL_CONSTASCII_USTRINGPARAM(
"Resolution/XAxis/Metric" ));
- pNames[SCGRIDOPT_RESOLU_Y] = OUString(RTL_CONSTASCII_USTRINGPARAM(
"Resolution/YAxis/Metric" ));
- pNames[SCGRIDOPT_OPTION_X] = OUString(RTL_CONSTASCII_USTRINGPARAM( "Option/XAxis/Metric"
));
- pNames[SCGRIDOPT_OPTION_Y] = OUString(RTL_CONSTASCII_USTRINGPARAM( "Option/YAxis/Metric"
));
+ pNames[SCGRIDOPT_RESOLU_X] = OUString( "Resolution/XAxis/Metric" );
+ pNames[SCGRIDOPT_RESOLU_Y] = OUString( "Resolution/YAxis/Metric" );
+ pNames[SCGRIDOPT_OPTION_X] = OUString( "Option/XAxis/Metric" );
+ pNames[SCGRIDOPT_OPTION_Y] = OUString( "Option/YAxis/Metric" );
}
return aNames;
@@ -399,9 +399,9 @@
ScViewCfg::ScViewCfg() :
- aLayoutItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_LAYOUT )) ),
- aDisplayItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_DISPLAY )) ),
- aGridItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_GRID )) )
+ aLayoutItem( OUString( CFGPATH_LAYOUT ) ),
+ aDisplayItem( OUString( CFGPATH_DISPLAY ) ),
+ aGridItem( OUString( CFGPATH_GRID ) )
{
sal_Int32 nIntVal = 0;
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index aecdcdd..2ffc0f6 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -30,7 +30,7 @@
//------------------------------------------------------------------------
ScNumFormatAbbrev::ScNumFormatAbbrev() :
- sFormatstring ( RTL_CONSTASCII_USTRINGPARAM( pStandardName ) ),
+ sFormatstring ( pStandardName ),
eLnge (LANGUAGE_SYSTEM),
eSysLnge (LANGUAGE_GERMAN) // sonst passt "Standard" nicht
{
--
To view, visit https://gerrit.libreoffice.org/2483
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica78f316d481130c28da83f92561206518342eaa
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Krisztian Pinter <pin.terminator@gmail.com>
Context
- [PATCH] RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals · Krisztian Pinter (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.