[Libreoffice-commits] .: binfilter/bf_forms binfilter/bf_sc binfilter/bf_sch
Gert Faller
gfaller at kemper.freedesktop.org
Tue Nov 30 14:39:32 PST 2010
binfilter/bf_forms/source/component/forms_Image.cxx | 2
binfilter/bf_sc/source/core/data/sc_documen6.cxx | 2
binfilter/bf_sc/source/core/data/sc_dpobject.cxx | 34 +++++-----
binfilter/bf_sc/source/core/data/sc_dpsave.cxx | 26 +++----
binfilter/bf_sc/source/core/tool/sc_addincol.cxx | 6 -
binfilter/bf_sc/source/core/tool/sc_appoptio.cxx | 12 +--
binfilter/bf_sc/source/core/tool/sc_docoptio.cxx | 4 -
binfilter/bf_sc/source/core/tool/sc_inputopt.cxx | 2
binfilter/bf_sc/source/core/tool/sc_printopt.cxx | 2
binfilter/bf_sc/source/core/tool/sc_unitconv.cxx | 8 +-
binfilter/bf_sc/source/core/tool/sc_viewopti.cxx | 6 -
binfilter/bf_sc/source/filter/xml/sc_XMLTableHeaderFooterContext.cxx | 8 +-
binfilter/bf_sc/source/filter/xml/sc_xmlsorti.cxx | 14 ++--
binfilter/bf_sc/source/ui/app/sc_sclib.cxx | 2
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx | 16 ++--
binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx | 2
binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx | 2
binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx | 2
18 files changed, 75 insertions(+), 75 deletions(-)
New commits:
commit 2464181b8c0e3fe80103b146eb678f7a52ca3273
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Tue Nov 30 23:38:13 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in filters 17
diff --git a/binfilter/bf_forms/source/component/forms_Image.cxx b/binfilter/bf_forms/source/component/forms_Image.cxx
index a2af775..afaad63 100644
--- a/binfilter/bf_forms/source/component/forms_Image.cxx
+++ b/binfilter/bf_forms/source/component/forms_Image.cxx
@@ -372,7 +372,7 @@ void OImageControl::actionPerformed_Impl(sal_Bool bNotifyListener, const ::com::
if ( bDispatchUrlInternal )
{
if ( xTransformer.is() )
- xTransformer->parseSmart( aURL, ::rtl::OUString::createFromAscii(INET_FILE_SCHEME) );
+ xTransformer->parseSmart( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(INET_FILE_SCHEME)) );
::rtl::OUString aTargetFrame;
xSet->getPropertyValue(PROPERTY_TARGET_FRAME) >>= aTargetFrame;
diff --git a/binfilter/bf_sc/source/core/data/sc_documen6.cxx b/binfilter/bf_sc/source/core/data/sc_documen6.cxx
index 898b72f..30a49d7 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen6.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen6.cxx
@@ -67,7 +67,7 @@ using namespace ::com::sun::star;
/*N*/ if ( !pScriptTypeData->xBreakIter.is() )
/*N*/ {
/*N*/ uno::Reference< uno::XInterface > xInterface = xServiceManager->createInstance(
-/*N*/ ::rtl::OUString::createFromAscii( SC_BREAKITER_SERVICE ) );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_BREAKITER_SERVICE )) );
/*N*/ pScriptTypeData->xBreakIter = uno::Reference< i18n::XBreakIterator >( xInterface, uno::UNO_QUERY );
/*N*/ DBG_ASSERT( pScriptTypeData->xBreakIter.is(), "can't get BreakIterator" );
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
index 77554d3..b4c128f 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
@@ -111,11 +111,11 @@ using namespace ::com::sun::star;
/*N*/ if ( xDimProp.is() )
/*N*/ {
/*N*/ bFound = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISDATALAYOUT)) );
/*N*/ //! error checking -- is "IsDataLayoutDimension" property required??
/*N*/ if (bFound)
/*N*/ nRet = ScUnoHelpFunctions::GetEnumProperty(
-/*N*/ xDimProp, ::rtl::OUString::createFromAscii(DP_PROP_ORIENTATION),
+/*N*/ xDimProp, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIENTATION)),
/*N*/ sheet::DataPilotFieldOrientation_HIDDEN );
/*N*/ }
/*N*/ }
@@ -329,7 +329,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc )
/*N*/ {
/*N*/ uno::Reference<container::XIndexAccess> xHiers = new ScNameToIndexAccess( xDimSupp->getHierarchies() );
/*N*/ long nHierarchy = ScUnoHelpFunctions::GetLongProperty( xDimProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_USEDHIERARCHY) );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_USEDHIERARCHY)) );
/*N*/ if ( nHierarchy >= xHiers->getCount() )
/*N*/ nHierarchy = 0;
/*N*/
@@ -348,7 +348,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc )
/*N*/ try
/*N*/ {
/*N*/ aSubAny = xLevProp->getPropertyValue(
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_SUBTOTALS) );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_SUBTOTALS)) );
/*N*/ }
/*N*/ catch(uno::Exception&)
/*N*/ {
@@ -407,7 +407,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc )
/*N*/ ScUnoHelpFunctions::AnyToInterface( xDims->getByIndex(nDim) );
/*N*/ uno::Reference<beans::XPropertySet> xDimProp( xIntDim, uno::UNO_QUERY );
/*N*/ long nDimOrient = ScUnoHelpFunctions::GetEnumProperty(
-/*N*/ xDimProp, ::rtl::OUString::createFromAscii(DP_PROP_ORIENTATION),
+/*N*/ xDimProp, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIENTATION)),
/*N*/ sheet::DataPilotFieldOrientation_HIDDEN );
/*N*/ if ( xDimProp.is() && nDimOrient == nOrient )
/*N*/ {
@@ -415,7 +415,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc )
/*N*/ if ( nOrient == sheet::DataPilotFieldOrientation_DATA )
/*N*/ {
/*N*/ sheet::GeneralFunction eFunc = (sheet::GeneralFunction)ScUnoHelpFunctions::GetEnumProperty(
-/*N*/ xDimProp, ::rtl::OUString::createFromAscii(DP_PROP_FUNCTION),
+/*N*/ xDimProp, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_FUNCTION)),
/*N*/ sheet::GeneralFunction_NONE );
/*N*/ if ( eFunc == sheet::GeneralFunction_AUTO )
/*N*/ {
@@ -428,12 +428,12 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc )
/*N*/ nMask = lcl_FirstSubTotal( xDimProp ); // from first hierarchy
/*N*/
/*N*/ BOOL bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISDATALAYOUT)) );
/*N*/ uno::Any aOrigAny;
/*N*/ try
/*N*/ {
/*N*/ aOrigAny = xDimProp->getPropertyValue(
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_ORIGINAL) );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIGINAL)) );
/*N*/ }
/*N*/ catch(uno::Exception&)
/*N*/ {
@@ -487,7 +487,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc )
/*N*/ pFields[nOutCount].nFuncMask = nMask;
/*N*/ pFields[nOutCount].nFuncCount = lcl_CountBits( nMask );
/*N*/ nPos[nOutCount] = ScUnoHelpFunctions::GetLongProperty( xDimProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_POSITION) );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_POSITION)) );
/*N*/ ++nOutCount;
/*N*/ }
/*N*/ }
@@ -697,15 +697,15 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc )
/*N*/ if (xProp.is())
/*N*/ {
/*N*/ bColumnGrand = ScUnoHelpFunctions::GetBoolProperty( xProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_COLUMNGRAND), TRUE );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_COLUMNGRAND)), TRUE );
/*N*/ bRowGrand = ScUnoHelpFunctions::GetBoolProperty( xProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_ROWGRAND), TRUE );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ROWGRAND)), TRUE );
/*N*/
/*N*/ // following properties may be missing for external sources
/*N*/ bIgnoreEmpty = ScUnoHelpFunctions::GetBoolProperty( xProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_IGNOREEMPTY) );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_IGNOREEMPTY)) );
/*N*/ bRepeatIfEmpty = ScUnoHelpFunctions::GetBoolProperty( xProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_REPEATIFEMPTY) );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_REPEATIFEMPTY)) );
/*N*/ }
/*N*/
/*N*/ rStream << bIgnoreEmpty; // bIgnoreEmpty
@@ -757,15 +757,15 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc )
/*N*/ try
/*N*/ {
/*N*/ rParam.bMakeTotalCol = ScUnoHelpFunctions::GetBoolProperty( xProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_COLUMNGRAND), TRUE );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_COLUMNGRAND)), TRUE );
/*N*/ rParam.bMakeTotalRow = ScUnoHelpFunctions::GetBoolProperty( xProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_ROWGRAND), TRUE );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ROWGRAND)), TRUE );
/*N*/
/*N*/ // following properties may be missing for external sources
/*N*/ rParam.bIgnoreEmptyRows = ScUnoHelpFunctions::GetBoolProperty( xProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_IGNOREEMPTY) );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_IGNOREEMPTY)) );
/*N*/ rParam.bDetectCategories = ScUnoHelpFunctions::GetBoolProperty( xProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_REPEATIFEMPTY) );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_REPEATIFEMPTY)) );
/*N*/ }
/*N*/ catch(uno::Exception&)
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/data/sc_dpsave.cxx b/binfilter/bf_sc/source/core/data/sc_dpsave.cxx
index e7f80ea..5c9c923 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpsave.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpsave.cxx
@@ -164,11 +164,11 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ if ( nVisibleMode != SC_DPSAVEMODE_DONTKNOW )
/*N*/ lcl_SetBoolProperty( xMembProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_ISVISIBLE), (BOOL)nVisibleMode );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISVISIBLE)), (BOOL)nVisibleMode );
/*N*/
/*N*/ if ( nShowDetailsMode != SC_DPSAVEMODE_DONTKNOW )
/*N*/ lcl_SetBoolProperty( xMembProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_SHOWDETAILS), (BOOL)nShowDetailsMode );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_SHOWDETAILS)), (BOOL)nShowDetailsMode );
/*N*/ }
/*N*/ }
/*N*/
@@ -412,16 +412,16 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ sheet::DataPilotFieldOrientation eOrient = (sheet::DataPilotFieldOrientation)nOrientation;
/*N*/ aAny <<= eOrient;
-/*N*/ xDimProp->setPropertyValue( ::rtl::OUString::createFromAscii(DP_PROP_ORIENTATION), aAny );
+/*N*/ xDimProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIENTATION)), aAny );
/*N*/
/*N*/ sheet::GeneralFunction eFunc = (sheet::GeneralFunction)nFunction;
/*N*/ aAny <<= eFunc;
-/*N*/ xDimProp->setPropertyValue( ::rtl::OUString::createFromAscii(DP_PROP_FUNCTION), aAny );
+/*N*/ xDimProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_FUNCTION)), aAny );
/*N*/
/*N*/ if ( nUsedHierarchy >= 0 )
/*N*/ {
/*N*/ aAny <<= (INT32)nUsedHierarchy;
-/*N*/ xDimProp->setPropertyValue( ::rtl::OUString::createFromAscii(DP_PROP_USEDHIERARCHY), aAny );
+/*N*/ xDimProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_USEDHIERARCHY)), aAny );
/*N*/ }
/*N*/ }
/*N*/
@@ -472,11 +472,11 @@ using namespace ::com::sun::star;
/*N*/ pArray[i] = (sheet::GeneralFunction)pSubTotalFuncs[i];
/*N*/ uno::Any aAny;
/*N*/ aAny <<= aSeq;
-/*N*/ xLevProp->setPropertyValue( ::rtl::OUString::createFromAscii(DP_PROP_SUBTOTALS), aAny );
+/*N*/ xLevProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_SUBTOTALS)), aAny );
/*N*/ }
/*N*/ if ( nShowEmptyMode != SC_DPSAVEMODE_DONTKNOW )
/*N*/ lcl_SetBoolProperty( xLevProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_SHOWEMPTY), (BOOL)nShowEmptyMode );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_SHOWEMPTY)), (BOOL)nShowEmptyMode );
/*N*/
/*N*/ // exceptions are caught at ScDPSaveData::WriteToSource
/*N*/ }
@@ -677,7 +677,7 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ uno::Any aAny;
/*N*/ aAny <<= eOrient;
-/*N*/ xDimProp->setPropertyValue( ::rtl::OUString::createFromAscii(DP_PROP_ORIENTATION), aAny );
+/*N*/ xDimProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIENTATION)), aAny );
/*N*/ }
/*N*/ }
/*N*/ }
@@ -700,10 +700,10 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ if ( nIgnoreEmptyMode != SC_DPSAVEMODE_DONTKNOW )
/*N*/ lcl_SetBoolProperty( xSourceProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_IGNOREEMPTY), (BOOL)nIgnoreEmptyMode );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_IGNOREEMPTY)), (BOOL)nIgnoreEmptyMode );
/*N*/ if ( nRepeatEmptyMode != SC_DPSAVEMODE_DONTKNOW )
/*N*/ lcl_SetBoolProperty( xSourceProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_REPEATIFEMPTY), (BOOL)nRepeatEmptyMode );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_REPEATIFEMPTY)), (BOOL)nRepeatEmptyMode );
/*N*/ }
/*N*/ catch(uno::Exception&)
/*N*/ {
@@ -742,7 +742,7 @@ using namespace ::com::sun::star;
/*N*/ if ( xDimProp.is() )
/*N*/ {
/*N*/ bFound = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISDATALAYOUT)) );
/*N*/ //! error checking -- is "IsDataLayoutDimension" property required??
/*N*/ }
/*N*/ }
@@ -787,10 +787,10 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ if ( nColumnGrandMode != SC_DPSAVEMODE_DONTKNOW )
/*N*/ lcl_SetBoolProperty( xSourceProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_COLUMNGRAND), (BOOL)nColumnGrandMode );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_COLUMNGRAND)), (BOOL)nColumnGrandMode );
/*N*/ if ( nRowGrandMode != SC_DPSAVEMODE_DONTKNOW )
/*N*/ lcl_SetBoolProperty( xSourceProp,
-/*N*/ ::rtl::OUString::createFromAscii(DP_PROP_ROWGRAND), (BOOL)nRowGrandMode );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ROWGRAND)), (BOOL)nRowGrandMode );
/*N*/ }
/*N*/ }
/*N*/ catch(uno::Exception&)
diff --git a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
index 4545b9b..650a378 100644
--- a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
@@ -244,7 +244,7 @@ public:
/*N*/ {
/*N*/ uno::Reference<container::XEnumeration> xEnum =
/*N*/ xEnAc->createContentEnumeration(
-/*N*/ ::rtl::OUString::createFromAscii(SCADDINSUPPLIER_SERVICE) );
+/*N*/ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCADDINSUPPLIER_SERVICE)) );
/*N*/ if ( xEnum.is() )
/*N*/ {
/*N*/ // loop through all AddIns
@@ -407,8 +407,8 @@ public:
/*N*/ if ( xManager.is() )
/*N*/ {
/*N*/ uno::Reference<beans::XIntrospection> xIntro(
-/*N*/ xManager->createInstance(::rtl::OUString::createFromAscii(
-/*N*/ "com.sun.star.beans.Introspection" )),
+/*N*/ xManager->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+/*N*/ "com.sun.star.beans.Introspection" ))),
/*N*/ uno::UNO_QUERY );
/*N*/ if ( xIntro.is() )
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx b/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx
index ece23e1..4bc2c05 100644
--- a/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx
@@ -455,12 +455,12 @@ using namespace ::com::sun::star::uno;
/*N*/ ScAppCfg::ScAppCfg() :
-/*N*/ aLayoutItem( OUString::createFromAscii( CFGPATH_LAYOUT ) ),
-/*N*/ aInputItem( OUString::createFromAscii( CFGPATH_INPUT ) ),
-/*N*/ aRevisionItem( OUString::createFromAscii( CFGPATH_REVISION ) ),
-/*N*/ aContentItem( OUString::createFromAscii( CFGPATH_CONTENT ) ),
-/*N*/ aSortListItem( OUString::createFromAscii( CFGPATH_SORTLIST ) ),
-/*N*/ aMiscItem( OUString::createFromAscii( CFGPATH_MISC ) )
+/*N*/ aLayoutItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_LAYOUT )) ),
+/*N*/ aInputItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_INPUT )) ),
+/*N*/ aRevisionItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_REVISION )) ),
+/*N*/ aContentItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_CONTENT )) ),
+/*N*/ aSortListItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_SORTLIST )) ),
+/*N*/ aMiscItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_MISC )) )
/*N*/ {
/*N*/ sal_Int32 nIntVal;
/*N*/
diff --git a/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx b/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx
index a87d53c..72d8d4f 100644
--- a/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx
@@ -292,8 +292,8 @@ inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
/*N*/ }
/*N*/ ScDocCfg::ScDocCfg() :
-/*N*/ aCalcItem( OUString::createFromAscii( CFGPATH_CALC ) ),
-/*N*/ aLayoutItem( OUString::createFromAscii( CFGPATH_DOCLAYOUT ) )
+/*N*/ aCalcItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_CALC )) ),
+/*N*/ aLayoutItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_DOCLAYOUT )) )
/*N*/ {
/*N*/ sal_Int32 nIntVal;
/*N*/ double fDoubleVal;
diff --git a/binfilter/bf_sc/source/core/tool/sc_inputopt.cxx b/binfilter/bf_sc/source/core/tool/sc_inputopt.cxx
index 53a2189..2b4e93b 100644
--- a/binfilter/bf_sc/source/core/tool/sc_inputopt.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_inputopt.cxx
@@ -200,7 +200,7 @@ using namespace ::com::sun::star::uno;
/*N*/ }
/*N*/ ScInputCfg::ScInputCfg() :
-/*N*/ ConfigItem( OUString::createFromAscii( CFGPATH_INPUT ) )
+/*N*/ ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_INPUT )) )
/*N*/ {
/*N*/ sal_Int32 nIntVal;
/*N*/
diff --git a/binfilter/bf_sc/source/core/tool/sc_printopt.cxx b/binfilter/bf_sc/source/core/tool/sc_printopt.cxx
index b9a4e55..b7c98cc 100644
--- a/binfilter/bf_sc/source/core/tool/sc_printopt.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_printopt.cxx
@@ -86,7 +86,7 @@ using namespace ::com::sun::star::uno;
/*N*/ ScPrintCfg::ScPrintCfg() :
-/*N*/ ConfigItem( OUString::createFromAscii( CFGPATH_PRINT ) )
+/*N*/ ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_PRINT )) )
/*N*/ {
DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetPropertyNames();
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_unitconv.cxx b/binfilter/bf_sc/source/core/tool/sc_unitconv.cxx
index f06952c..eb0e8ba 100644
--- a/binfilter/bf_sc/source/core/tool/sc_unitconv.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_unitconv.cxx
@@ -106,7 +106,7 @@ using namespace ::com::sun::star::uno;
/*N*/ // read from configuration - "convert.ini" is no longer used
/*N*/ //! config item as member to allow change of values
/*N*/
-/*N*/ ScLinkConfigItem aConfigItem( OUString::createFromAscii( CFGPATH_UNIT ) );
+/*N*/ ScLinkConfigItem aConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_UNIT )) );
/*N*/
/*N*/ // empty node name -> use the config item's path itself
/*N*/ OUString aEmptyString;
@@ -127,11 +127,11 @@ using namespace ::com::sun::star::uno;
/*N*/ sPrefix += sSlash;
/*N*/
/*N*/ pValNameArray[nIndex] = sPrefix;
-/*N*/ pValNameArray[nIndex++] += OUString::createFromAscii( CFGSTR_UNIT_FROM );
+/*N*/ pValNameArray[nIndex++] += OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_UNIT_FROM ));
/*N*/ pValNameArray[nIndex] = sPrefix;
-/*N*/ pValNameArray[nIndex++] += OUString::createFromAscii( CFGSTR_UNIT_TO );
+/*N*/ pValNameArray[nIndex++] += OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_UNIT_TO ));
/*N*/ pValNameArray[nIndex] = sPrefix;
-/*N*/ pValNameArray[nIndex++] += OUString::createFromAscii( CFGSTR_UNIT_FACTOR );
+/*N*/ pValNameArray[nIndex++] += OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_UNIT_FACTOR ));
/*N*/ }
/*N*/
/*N*/ Sequence<Any> aProperties = aConfigItem.GetProperties(aValNames);
diff --git a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
index 475097a..5bfcbff 100644
--- a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
@@ -486,9 +486,9 @@ using namespace ::com::sun::star::uno;
/*N*/ ScViewCfg::ScViewCfg() :
-/*N*/ aLayoutItem( OUString::createFromAscii( CFGPATH_LAYOUT ) ),
-/*N*/ aDisplayItem( OUString::createFromAscii( CFGPATH_DISPLAY ) ),
-/*N*/ aGridItem( OUString::createFromAscii( CFGPATH_GRID ) )
+/*N*/ aLayoutItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_LAYOUT )) ),
+/*N*/ aDisplayItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_DISPLAY )) ),
+/*N*/ aGridItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_GRID )) )
/*N*/ {
/*N*/ sal_Int32 nIntVal;
/*N*/
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLTableHeaderFooterContext.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLTableHeaderFooterContext.cxx
index d3efe18..def99d6 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLTableHeaderFooterContext.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLTableHeaderFooterContext.cxx
@@ -53,10 +53,10 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport,
sal_Bool bFooter, sal_Bool bLft ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
xPropSet( rPageStylePropSet ),
- sOn( OUString::createFromAscii( bFooter ? SC_UNO_PAGE_FTRON : SC_UNO_PAGE_HDRON ) ),
- sShareContent( OUString::createFromAscii( bFooter ? SC_UNO_PAGE_FTRSHARED : SC_UNO_PAGE_HDRSHARED ) ),
- sContent( OUString::createFromAscii( bFooter ? SC_UNO_PAGE_RIGHTFTRCON : SC_UNO_PAGE_RIGHTHDRCON ) ),
- sContentLeft( OUString::createFromAscii( bFooter ? SC_UNO_PAGE_LEFTFTRCONT : SC_UNO_PAGE_LEFTHDRCONT ) ),
+ sOn( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRON )): OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_HDRON )) ),
+ sShareContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRSHARED) ) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_HDRSHARED )) ),
+ sContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTFTRCON )) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON )) ),
+ sContentLeft( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTFTRCONT )) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_LEFTHDRCONT)) ),
bInsertContent( sal_True ),
bLeft( bLft ),
bDisplay( sal_True ),
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlsorti.cxx b/binfilter/bf_sc/source/filter/xml/sc_xmlsorti.cxx
index 01e2907..63fcce9 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlsorti.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlsorti.cxx
@@ -156,31 +156,31 @@ void ScXMLSortContext::EndElement()
uno::Any aTemp;
beans::PropertyValue aPropertyValue;
aTemp = ::cppu::bool2any(bBindFormatsToContent);
- aPropertyValue.Name = ::rtl::OUString::createFromAscii(SC_UNONAME_BINDFMT);
+ aPropertyValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT));
aPropertyValue.Value = aTemp;
aSortDescriptor[0] = aPropertyValue;
aTemp = ::cppu::bool2any(bCopyOutputData);
- aPropertyValue.Name = ::rtl::OUString::createFromAscii(SC_UNONAME_COPYOUT);
+ aPropertyValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COPYOUT));
aPropertyValue.Value = aTemp;
aSortDescriptor[1] = aPropertyValue;
aTemp = ::cppu::bool2any(bIsCaseSensitive);
- aPropertyValue.Name = ::rtl::OUString::createFromAscii(SC_UNONAME_ISCASE);
+ aPropertyValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE));
aPropertyValue.Value = aTemp;
aSortDescriptor[2] = aPropertyValue;
aTemp = ::cppu::bool2any(bEnabledUserList);
- aPropertyValue.Name = ::rtl::OUString::createFromAscii(SC_UNONAME_ISULIST);
+ aPropertyValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISULIST));
aPropertyValue.Value = aTemp;
aSortDescriptor[3] = aPropertyValue;
aTemp <<= aOutputPosition;
- aPropertyValue.Name = ::rtl::OUString::createFromAscii(SC_UNONAME_OUTPOS);
+ aPropertyValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_OUTPOS));
aPropertyValue.Value = aTemp;
aSortDescriptor[4] = aPropertyValue;
aTemp <<= nUserListIndex;
- aPropertyValue.Name = ::rtl::OUString::createFromAscii(SC_UNONAME_UINDEX);
+ aPropertyValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_UINDEX));
aPropertyValue.Value = aTemp;
aSortDescriptor[5] = aPropertyValue;
aTemp <<= aSortFields;
- aPropertyValue.Name = ::rtl::OUString::createFromAscii(SC_UNONAME_SORTFLD);
+ aPropertyValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SORTFLD));
aPropertyValue.Value = aTemp;
aSortDescriptor[6] = aPropertyValue;
if (nLangLength || nCountryLength)
diff --git a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
index 2356c2a..0181420 100644
--- a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
@@ -111,7 +111,7 @@ void ScLibOptions::Commit() {}
#define ENTRYSTR_WK3 "WK3"
/*N*/ ScLibOptions::ScLibOptions() :
-/*N*/ ConfigItem( ::rtl::OUString::createFromAscii( CFGPATH_LIBFILTER ) ),
+/*N*/ ConfigItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_LIBFILTER )) ),
/*N*/ bWK3Flag( FALSE )
/*N*/ {
/*N*/ ::com::sun::star::uno::Sequence<rtl::OUString> aNames(1);
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
index 9b88261..5a3e86e 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
@@ -462,14 +462,14 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ChXChartDocument::getAvailableServiceN
::std::vector< OUString > aServices;
// chart types
- aServices.push_back( OUString::createFromAscii( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_LINE ));
- aServices.push_back( OUString::createFromAscii( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_AREA ));
- aServices.push_back( OUString::createFromAscii( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_BAR ));
- aServices.push_back( OUString::createFromAscii( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_PIE ));
- aServices.push_back( OUString::createFromAscii( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_XY ));
- aServices.push_back( OUString::createFromAscii( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_NET ));
- aServices.push_back( OUString::createFromAscii( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_DONUT ));
- aServices.push_back( OUString::createFromAscii( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_STOCK ));
+ aServices.push_back( OUString(RTL_CONSTASCII_USTRINGPARAM( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_LINE )));
+ aServices.push_back( OUString(RTL_CONSTASCII_USTRINGPARAM( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_AREA )));
+ aServices.push_back( OUString(RTL_CONSTASCII_USTRINGPARAM( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_BAR )));
+ aServices.push_back( OUString(RTL_CONSTASCII_USTRINGPARAM( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_PIE )));
+ aServices.push_back( OUString(RTL_CONSTASCII_USTRINGPARAM( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_XY )));
+ aServices.push_back( OUString(RTL_CONSTASCII_USTRINGPARAM( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_NET )));
+ aServices.push_back( OUString(RTL_CONSTASCII_USTRINGPARAM( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_DONUT )));
+ aServices.push_back( OUString(RTL_CONSTASCII_USTRINGPARAM( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_STOCK )));
// style tables (for XML)
aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DashTable" )));
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx
index 25f6aab..0014186 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx
@@ -466,7 +466,7 @@ uno::Any SAL_CALL ChXDataPoint::getPropertyValue( const ::rtl::OUString& Propert
((const SvxBrushItem &)(pSet->Get( nWID ))).GetGraphicObject();
if( pGraphObj )
{
- aURL = ::rtl::OUString::createFromAscii( UNO_NAME_GRAPHOBJ_URLPREFIX );
+ aURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_GRAPHOBJ_URLPREFIX ));
aURL += ::rtl::OUString::createFromAscii( pGraphObj->GetUniqueID().GetBuffer());
}
aAny <<= aURL;
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx
index 42a1632..a58ad5c 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx
@@ -520,7 +520,7 @@ uno::Any SAL_CALL ChXDataRow::getPropertyValue( const ::rtl::OUString& PropertyN
((const SvxBrushItem &)(pSet->Get( nWID ))).GetGraphicObject();
if( pGraphObj )
{
- aURL = ::rtl::OUString::createFromAscii( UNO_NAME_GRAPHOBJ_URLPREFIX );
+ aURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_GRAPHOBJ_URLPREFIX ));
aURL += ::rtl::OUString::createFromAscii( pGraphObj->GetUniqueID().GetBuffer());
}
aAny <<= aURL;
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
index 0606e39..21ca8ac 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
@@ -309,7 +309,7 @@ uno::Any ChXDiagram::GetAnyByItem( SfxItemSet& aSet, const SfxItemPropertyMap* p
((const SvxBrushItem &)(aSet.Get( SCHATTR_SYMBOL_BRUSH ))).GetGraphicObject();
if( pGraphObj )
{
- aURL = ::rtl::OUString::createFromAscii( UNO_NAME_GRAPHOBJ_URLPREFIX );
+ aURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_GRAPHOBJ_URLPREFIX ));
aURL += ::rtl::OUString::createFromAscii( pGraphObj->GetUniqueID().GetBuffer());
}
aAny <<= aURL;
More information about the Libreoffice-commits
mailing list