[Libreoffice-commits] .: sc/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Nov 11 02:10:48 PST 2010
sc/source/core/tool/addincfg.cxx | 2 -
sc/source/core/tool/addincol.cxx | 39 +++++++++++++++++------------------
sc/source/core/tool/appoptio.cxx | 14 ++++++------
sc/source/core/tool/cellkeywords.inl | 6 ++---
sc/source/core/tool/charthelper.cxx | 2 -
sc/source/core/tool/docoptio.cxx | 24 ++++++++++-----------
sc/source/core/tool/filtopt.cxx | 2 -
sc/source/core/tool/inputopt.cxx | 2 -
sc/source/core/tool/interpr1.cxx | 4 +--
sc/source/core/tool/navicfg.cxx | 2 -
sc/source/core/tool/printopt.cxx | 2 -
sc/source/core/tool/unitconv.cxx | 8 +++----
sc/source/core/tool/viewopti.cxx | 14 ++++++------
13 files changed, 60 insertions(+), 61 deletions(-)
New commits:
commit 3d60733843710a0282a3db9e5334f681b458139c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Thu Nov 11 10:10:14 2010 +0000
use RTL_CONSTASCII_USTRINGPARAM
diff --git a/sc/source/core/tool/addincfg.cxx b/sc/source/core/tool/addincfg.cxx
index 1735d4f..f41ecc1 100644
--- a/sc/source/core/tool/addincfg.cxx
+++ b/sc/source/core/tool/addincfg.cxx
@@ -48,7 +48,7 @@ using namespace com::sun::star;
#define CFGPATH_ADDINS "Office.CalcAddIns/AddInInfo"
ScAddInCfg::ScAddInCfg() :
- ConfigItem( rtl::OUString::createFromAscii( CFGPATH_ADDINS ) )
+ ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_ADDINS )) )
{
uno::Sequence<rtl::OUString> aNames(1); // one entry: empty string
EnableNotification( aNames );
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index e44946b..16891aa 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -294,7 +294,7 @@ uno::Reference<uno::XComponentContext> getContext(uno::Reference<lang::XMultiSer
try {
uno::Reference<beans::XPropertySet> xPropset(xMSF, uno::UNO_QUERY);
xPropset->getPropertyValue(
- ::rtl::OUString::createFromAscii("DefaultContext")) >>= xCtx;
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))) >>= xCtx;
}
catch ( uno::Exception & ) {
}
@@ -311,7 +311,7 @@ void ScUnoAddInCollection::Initialize()
{
uno::Reference<container::XEnumeration> xEnum =
xEnAc->createContentEnumeration(
- rtl::OUString::createFromAscii(SCADDINSUPPLIER_SERVICE) );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCADDINSUPPLIER_SERVICE)) );
if ( xEnum.is() )
{
// loop through all AddIns
@@ -411,7 +411,7 @@ void ScUnoAddInCollection::ReadConfiguration()
ScAddInCfg& rAddInConfig = SC_MOD()->GetAddInCfg();
// additional, temporary config item for the compatibility names
- ScLinkConfigItem aAllLocalesConfig( rtl::OUString::createFromAscii( CFGPATH_ADDINS ), CONFIG_MODE_ALL_LOCALES );
+ ScLinkConfigItem aAllLocalesConfig( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_ADDINS )), CONFIG_MODE_ALL_LOCALES );
// CommitLink is not used (only reading values)
const rtl::OUString sSlash('/');
@@ -428,7 +428,7 @@ void ScUnoAddInCollection::ReadConfiguration()
rtl::OUString aFunctionsPath = aServiceName;
aFunctionsPath += sSlash;
- aFunctionsPath += rtl::OUString::createFromAscii( CFGSTR_ADDINFUNCTIONS );
+ aFunctionsPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_ADDINFUNCTIONS) );
uno::Sequence<rtl::OUString> aFunctionNames = rAddInConfig.GetNodeNames( aFunctionsPath );
sal_Int32 nNewCount = aFunctionNames.getLength();
@@ -486,11 +486,11 @@ void ScUnoAddInCollection::ReadConfiguration()
uno::Sequence<rtl::OUString> aFuncPropNames(CFG_FUNCPROP_COUNT);
rtl::OUString* pNameArray = aFuncPropNames.getArray();
pNameArray[CFG_FUNCPROP_DISPLAYNAME] = aFuncPropPath;
- pNameArray[CFG_FUNCPROP_DISPLAYNAME] += rtl::OUString::createFromAscii( CFGSTR_DISPLAYNAME );
+ pNameArray[CFG_FUNCPROP_DISPLAYNAME] += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_DISPLAYNAME) );
pNameArray[CFG_FUNCPROP_DESCRIPTION] = aFuncPropPath;
- pNameArray[CFG_FUNCPROP_DESCRIPTION] += rtl::OUString::createFromAscii( CFGSTR_DESCRIPTION );
+ pNameArray[CFG_FUNCPROP_DESCRIPTION] += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_DESCRIPTION ));
pNameArray[CFG_FUNCPROP_CATEGORY] = aFuncPropPath;
- pNameArray[CFG_FUNCPROP_CATEGORY] += rtl::OUString::createFromAscii( CFGSTR_CATEGORY );
+ pNameArray[CFG_FUNCPROP_CATEGORY] += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_CATEGORY) );
uno::Sequence<uno::Any> aFuncProperties = rAddInConfig.GetProperties( aFuncPropNames );
if ( aFuncProperties.getLength() == CFG_FUNCPROP_COUNT )
@@ -508,7 +508,7 @@ void ScUnoAddInCollection::ReadConfiguration()
uno::Sequence<sheet::LocalizedName> aCompNames;
rtl::OUString aCompPath = aFuncPropPath;
- aCompPath += rtl::OUString::createFromAscii( CFGSTR_COMPATIBILITYNAME );
+ aCompPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_COMPATIBILITYNAME ));
uno::Sequence<rtl::OUString> aCompPropNames( &aCompPath, 1 );
uno::Sequence<uno::Any> aCompProperties = aAllLocalesConfig.GetProperties( aCompPropNames );
@@ -553,7 +553,7 @@ void ScUnoAddInCollection::ReadConfiguration()
long nCallerPos = SC_CALLERPOS_NONE;
rtl::OUString aArgumentsPath = aFuncPropPath;
- aArgumentsPath += rtl::OUString::createFromAscii( CFGSTR_PARAMETERS );
+ aArgumentsPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_PARAMETERS) );
uno::Sequence<rtl::OUString> aArgumentNames = rAddInConfig.GetNodeNames( aArgumentsPath );
sal_Int32 nArgumentCount = aArgumentNames.getLength();
@@ -574,9 +574,9 @@ void ScUnoAddInCollection::ReadConfiguration()
aOneArgPath += sSlash;
pPropNameArray[nIndex] = aOneArgPath;
- pPropNameArray[nIndex++] += rtl::OUString::createFromAscii( CFGSTR_DISPLAYNAME );
+ pPropNameArray[nIndex++] += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_DISPLAYNAME ));
pPropNameArray[nIndex] = aOneArgPath;
- pPropNameArray[nIndex++] += rtl::OUString::createFromAscii( CFGSTR_DESCRIPTION );
+ pPropNameArray[nIndex++] += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_DESCRIPTION ));
}
uno::Sequence<uno::Any> aArgProperties = rAddInConfig.GetProperties( aArgPropNames );
@@ -826,8 +826,8 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
if ( xManager.is() )
{
uno::Reference<beans::XIntrospection> xIntro(
- xManager->createInstance(rtl::OUString::createFromAscii(
- "com.sun.star.beans.Introspection" )),
+ xManager->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.beans.Introspection" ))),
uno::UNO_QUERY );
if ( xIntro.is() )
{
@@ -946,7 +946,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
}
catch(uno::Exception&)
{
- aLocalU = rtl::OUString::createFromAscii( "###" );
+ aLocalU = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "###" ));
}
String aLocalName = String( aLocalU );
@@ -958,7 +958,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
}
catch(uno::Exception&)
{
- aDescU = rtl::OUString::createFromAscii( "###" );
+ aDescU = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "###" ));
}
String aDescription = String( aDescU );
@@ -983,7 +983,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
}
catch(uno::Exception&)
{
- aArgName = rtl::OUString::createFromAscii( "###" );
+ aArgName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "###" ));
}
rtl::OUString aArgDesc;
try
@@ -993,7 +993,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
}
catch(uno::Exception&)
{
- aArgName = rtl::OUString::createFromAscii( "###" );
+ aArgName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "###" ));
}
BOOL bOptional =
@@ -1097,8 +1097,8 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface
if ( xManager.is() )
{
uno::Reference<beans::XIntrospection> xIntro(
- xManager->createInstance(rtl::OUString::createFromAscii(
- "com.sun.star.beans.Introspection" )),
+ xManager->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.beans.Introspection" ))),
uno::UNO_QUERY );
if ( xIntro.is() )
{
@@ -1786,5 +1786,4 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes )
//------------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 0382314..ec2369b 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -309,7 +309,7 @@ Sequence<OUString> ScAppCfg::GetLayoutPropertyNames()
// adjust for metric system
if (ScOptionsUtil::IsMetricSystem())
- pNames[SCLAYOUTOPT_MEASURE] = OUString::createFromAscii( "Other/MeasureUnit/Metric" );
+ pNames[SCLAYOUTOPT_MEASURE] = OUString(RTL_CONSTASCII_USTRINGPARAM( "Other/MeasureUnit/Metric") );
return aNames;
}
@@ -393,12 +393,12 @@ Sequence<OUString> ScAppCfg::GetMiscPropertyNames()
ScAppCfg::ScAppCfg() :
- aLayoutItem( OUString::createFromAscii( CFGPATH_LAYOUT ) ),
- aInputItem( OUString::createFromAscii( CFGPATH_INPUT ) ),
- aRevisionItem( OUString::createFromAscii( CFGPATH_REVISION ) ),
- aContentItem( OUString::createFromAscii( CFGPATH_CONTENT ) ),
- aSortListItem( OUString::createFromAscii( CFGPATH_SORTLIST ) ),
- aMiscItem( OUString::createFromAscii( CFGPATH_MISC ) )
+ 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 )) )
{
sal_Int32 nIntVal = 0;
diff --git a/sc/source/core/tool/cellkeywords.inl b/sc/source/core/tool/cellkeywords.inl
index 9fb58c0..5060b36 100644
--- a/sc/source/core/tool/cellkeywords.inl
+++ b/sc/source/core/tool/cellkeywords.inl
@@ -3,7 +3,7 @@
// ---------------------------------------------------------------------------
// French language locale (automatically generated)
// ---------------------------------------------------------------------------
-static const Locale aFr(OUString::createFromAscii("fr"), OUString(), OUString());
+static const Locale aFr(OUString(RTL_CONSTASCII_USTRINGPARAM("fr")), OUString(), OUString());
// pre instantiations of localized function names
static const sal_Unicode cell_address_fr[] = {
@@ -58,7 +58,7 @@ addToMap(pFr, aFr);
// ---------------------------------------------------------------------------
// Hungarian language locale (automatically generated)
// ---------------------------------------------------------------------------
-static const Locale aHu(OUString::createFromAscii("hu"), OUString(), OUString());
+static const Locale aHu(OUString(RTL_CONSTASCII_USTRINGPARAM("hu")), OUString(), OUString());
// pre instantiations of localized function names
static const sal_Unicode cell_address_hu[] = {
@@ -128,7 +128,7 @@ addToMap(pHu, aHu);
// ---------------------------------------------------------------------------
// German language locale (automatically generated)
// ---------------------------------------------------------------------------
-static const Locale aDe(OUString::createFromAscii("de"), OUString(), OUString());
+static const Locale aDe(OUString(RTL_CONSTASCII_USTRINGPARAM("de")), OUString(), OUString());
// pre instantiations of localized function names
static const sal_Unicode cell_row_de[] = {
diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx
index a6b3e72..5c5879d 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -244,7 +244,7 @@ void ScChartHelper::SetChartRanges( const uno::Reference< chart2::XChartDocument
try
{
- rtl::OUString aPropertyNameRole( ::rtl::OUString::createFromAscii("Role") );
+ rtl::OUString aPropertyNameRole( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Role")) );
uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aLabeledDataSequences( xDataSource->getDataSequences() );
sal_Int32 nRange=0;
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index 1b87ae6..70486dc 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -148,9 +148,9 @@ void ScDocOptions::ResetDocOptions()
void ScDocOptions::ResetFormulaSeparators()
{
// Defaults to the old separator values.
- aFormulaSepArg = OUString::createFromAscii(";");
- aFormulaSepArrayCol = OUString::createFromAscii(";");
- aFormulaSepArrayRow = OUString::createFromAscii("|");
+ aFormulaSepArg = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
+ aFormulaSepArrayCol = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
+ aFormulaSepArrayRow = OUString(RTL_CONSTASCII_USTRINGPARAM("|"));
const Locale& rLocale = *ScGlobal::GetLocale();
const OUString& rLang = rLocale.Language;
@@ -189,12 +189,12 @@ void ScDocOptions::ResetFormulaSeparators()
// 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.
- aFormulaSepArg = OUString::createFromAscii(";");
+ aFormulaSepArg = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
- aFormulaSepArrayCol = OUString::createFromAscii(",");
+ aFormulaSepArrayCol = OUString(RTL_CONSTASCII_USTRINGPARAM(","));
if (cDecSep == sal_Unicode(','))
- aFormulaSepArrayCol = OUString::createFromAscii(".");
- aFormulaSepArrayRow = OUString::createFromAscii(";");
+ aFormulaSepArrayCol = OUString(RTL_CONSTASCII_USTRINGPARAM("."));
+ aFormulaSepArrayRow = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
}
const LocaleDataWrapper& ScDocOptions::GetLocaleDataWrapper()
@@ -346,7 +346,7 @@ Sequence<OUString> ScDocCfg::GetLayoutPropertyNames()
// adjust for metric system
if (ScOptionsUtil::IsMetricSystem())
- pNames[SCDOCLAYOUTOPT_TABSTOP] = OUString::createFromAscii( "TabStop/Metric" );
+ pNames[SCDOCLAYOUTOPT_TABSTOP] = OUString(RTL_CONSTASCII_USTRINGPARAM( "TabStop/Metric") );
return aNames;
}
@@ -366,10 +366,10 @@ Sequence<OUString> ScDocCfg::GetCompatPropertyNames()
}
ScDocCfg::ScDocCfg() :
- aCalcItem( OUString::createFromAscii( CFGPATH_CALC ) ),
- aFormulaItem(OUString::createFromAscii(CFGPATH_FORMULA)),
- aLayoutItem(OUString::createFromAscii(CFGPATH_DOCLAYOUT)),
- aCompatItem(OUString::createFromAscii(CFGPATH_COMPAT))
+ aCalcItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_CALC )) ),
+ aFormulaItem(OUString(RTL_CONSTASCII_USTRINGPARAM(CFGPATH_FORMULA))),
+ aLayoutItem(OUString(RTL_CONSTASCII_USTRINGPARAM(CFGPATH_DOCLAYOUT))),
+ aCompatItem(OUString(RTL_CONSTASCII_USTRINGPARAM(CFGPATH_COMPAT)))
{
sal_Int32 nIntVal = 0;
double fDoubleVal = 0;
diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx
index 61e22c8..d62a905 100644
--- a/sc/source/core/tool/filtopt.cxx
+++ b/sc/source/core/tool/filtopt.cxx
@@ -71,7 +71,7 @@ Sequence<OUString> ScFilterOptions::GetPropertyNames()
}
ScFilterOptions::ScFilterOptions() :
- ConfigItem( OUString::createFromAscii( CFGPATH_FILTER ) ),
+ ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_FILTER )) ),
bWK3Flag( FALSE ),
fExcelColScale( 0 ),
fExcelRowScale( 0 )
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index 25c4b35..25ca758 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -155,7 +155,7 @@ Sequence<OUString> ScInputCfg::GetPropertyNames()
}
ScInputCfg::ScInputCfg() :
- ConfigItem( OUString::createFromAscii( CFGPATH_INPUT ) )
+ ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_INPUT )) )
{
sal_Int32 nIntVal = 0;
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index ee317f2..ba60d26 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2759,7 +2759,7 @@ static ::rtl::OUString lcl_convertIntoHalfWidth( const ::rtl::OUString & rStr )
if( bFirstASCCall )
{
- aTrans.loadModuleByImplName( ::rtl::OUString::createFromAscii( "FULLWIDTH_HALFWIDTH_LIKE_ASC" ), LANGUAGE_SYSTEM );
+ aTrans.loadModuleByImplName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FULLWIDTH_HALFWIDTH_LIKE_ASC" )), LANGUAGE_SYSTEM );
bFirstASCCall = false;
}
@@ -2774,7 +2774,7 @@ static ::rtl::OUString lcl_convertIntoFullWidth( const ::rtl::OUString & rStr )
if( bFirstJISCall )
{
- aTrans.loadModuleByImplName( ::rtl::OUString::createFromAscii( "HALFWIDTH_FULLWIDTH_LIKE_JIS" ), LANGUAGE_SYSTEM );
+ aTrans.loadModuleByImplName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HALFWIDTH_FULLWIDTH_LIKE_JIS" )), LANGUAGE_SYSTEM );
bFirstJISCall = false;
}
diff --git a/sc/source/core/tool/navicfg.cxx b/sc/source/core/tool/navicfg.cxx
index 1e9faff..e00f9fc 100644
--- a/sc/source/core/tool/navicfg.cxx
+++ b/sc/source/core/tool/navicfg.cxx
@@ -42,7 +42,7 @@
//------------------------------------------------------------------
ScNavipiCfg::ScNavipiCfg() :
-//! ConfigItem( OUString::createFromAscii( CFGPATH_NAVIPI ) ),
+//! ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( 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 86e36bf..7af77de 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -147,7 +147,7 @@ Sequence<OUString> ScPrintCfg::GetPropertyNames()
}
ScPrintCfg::ScPrintCfg() :
- ConfigItem( OUString::createFromAscii( CFGPATH_PRINT ) )
+ ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( 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 42b5921..22f6205 100644
--- a/sc/source/core/tool/unitconv.cxx
+++ b/sc/source/core/tool/unitconv.cxx
@@ -109,7 +109,7 @@ ScUnitConverter::ScUnitConverter( USHORT nInit, USHORT nDeltaP ) :
// read from configuration - "convert.ini" is no longer used
//! config item as member to allow change of values
- ScLinkConfigItem aConfigItem( OUString::createFromAscii( CFGPATH_UNIT ) );
+ ScLinkConfigItem aConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_UNIT )) );
// empty node name -> use the config item's path itself
OUString aEmptyString;
@@ -130,11 +130,11 @@ ScUnitConverter::ScUnitConverter( USHORT nInit, USHORT nDeltaP ) :
sPrefix += sSlash;
pValNameArray[nIndex] = sPrefix;
- pValNameArray[nIndex++] += OUString::createFromAscii( CFGSTR_UNIT_FROM );
+ pValNameArray[nIndex++] += OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_UNIT_FROM ));
pValNameArray[nIndex] = sPrefix;
- pValNameArray[nIndex++] += OUString::createFromAscii( CFGSTR_UNIT_TO );
+ pValNameArray[nIndex++] += OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_UNIT_TO ));
pValNameArray[nIndex] = sPrefix;
- pValNameArray[nIndex++] += OUString::createFromAscii( CFGSTR_UNIT_FACTOR );
+ pValNameArray[nIndex++] += OUString(RTL_CONSTASCII_USTRINGPARAM( 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 1d0ab55..091e003 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -406,10 +406,10 @@ Sequence<OUString> ScViewCfg::GetGridPropertyNames()
// adjust for metric system
if (ScOptionsUtil::IsMetricSystem())
{
- pNames[SCGRIDOPT_RESOLU_X] = OUString::createFromAscii( "Resolution/XAxis/Metric" );
- pNames[SCGRIDOPT_RESOLU_Y] = OUString::createFromAscii( "Resolution/YAxis/Metric" );
- pNames[SCGRIDOPT_OPTION_X] = OUString::createFromAscii( "Option/XAxis/Metric" );
- pNames[SCGRIDOPT_OPTION_Y] = OUString::createFromAscii( "Option/YAxis/Metric" );
+ 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" ));
}
return aNames;
@@ -417,9 +417,9 @@ Sequence<OUString> ScViewCfg::GetGridPropertyNames()
ScViewCfg::ScViewCfg() :
- aLayoutItem( OUString::createFromAscii( CFGPATH_LAYOUT ) ),
- aDisplayItem( OUString::createFromAscii( CFGPATH_DISPLAY ) ),
- aGridItem( OUString::createFromAscii( CFGPATH_GRID ) )
+ aLayoutItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_LAYOUT )) ),
+ aDisplayItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_DISPLAY )) ),
+ aGridItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_GRID )) )
{
sal_Int32 nIntVal = 0;
More information about the Libreoffice-commits
mailing list