diff options
Diffstat (limited to 'sc/source/filter')
23 files changed, 137 insertions, 137 deletions
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 8ac6a11ab531..5b849bea9ea4 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -764,7 +764,7 @@ void XclImpAutoFilterData::CreateScDBData() if( bActive || bCriteria) { ScDocument* pDoc = pExcRoot->pIR->GetDocPtr(); - String aNewName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + String aNewName = OUString(STR_DB_LOCAL_NONAME); pCurrDBData = new ScDBData(aNewName , Tab(), StartCol(),StartRow(), EndCol(),EndRow() ); if(bCriteria) diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index cab727e8b279..1cec3de46a9d 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -80,7 +80,7 @@ FltError ExportBiff5::Write() SvxImportMSVBasic aBasicImport( *pDocShell, *xRootStrg ); sal_uLong nErr = aBasicImport.SaveOrDelMSVBAStorage( sal_True, EXC_STORAGE_VBA_PROJECT ); if( nErr != ERRCODE_NONE ) - pDocShell->SetError( nErr, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + pDocShell->SetError( nErr, OUString( OSL_LOG_PREFIX ) ); } pExcDoc->ReadDoc(); // ScDoc -> ExcDoc diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 64e0ee7691a9..dacbb1dfd8f6 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -1150,7 +1150,7 @@ bool XclExpXmlStream::exportDocument() throw() OUString XlsxExport_getImplementationName() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME ) ); + return OUString( IMPL_NAME ); } ::oox::ole::VbaProject* XclExpXmlStream::implCreateVbaProject() const diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 1bb40c6f4a24..3538ddec7125 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -453,9 +453,9 @@ OUString XclTools::GetXclFontName( const OUString& rFontName ) // built-in defined names ----------------------------------------------------- -const OUString XclTools::maDefNamePrefix( RTL_CONSTASCII_USTRINGPARAM( "Excel_BuiltIn_" ) ); +const OUString XclTools::maDefNamePrefix( "Excel_BuiltIn_" ); -const OUString XclTools::maDefNamePrefixXml ( RTL_CONSTASCII_USTRINGPARAM( "_xlnm." ) ); +const OUString XclTools::maDefNamePrefixXml ( "_xlnm." ); static const sal_Char* const ppcDefNames[] = { @@ -524,8 +524,8 @@ sal_Unicode XclTools::GetBuiltInDefNameIndex( const OUString& rDefName ) // built-in style names ------------------------------------------------------- -const OUString XclTools::maStyleNamePrefix1( RTL_CONSTASCII_USTRINGPARAM( "Excel_BuiltIn_" ) ); -const OUString XclTools::maStyleNamePrefix2( RTL_CONSTASCII_USTRINGPARAM( "Excel Built-in " ) ); +const OUString XclTools::maStyleNamePrefix1( "Excel_BuiltIn_" ); +const OUString XclTools::maStyleNamePrefix2( "Excel Built-in " ); static const sal_Char* const ppcStyleNames[] = { @@ -647,8 +647,8 @@ bool XclTools::GetBuiltInStyleId( sal_uInt8& rnStyleId, sal_uInt8& rnLevel, cons // conditional formatting style names ----------------------------------------- -const OUString XclTools::maCFStyleNamePrefix1( RTL_CONSTASCII_USTRINGPARAM( "Excel_CondFormat_" ) ); -const OUString XclTools::maCFStyleNamePrefix2( RTL_CONSTASCII_USTRINGPARAM( "ConditionalStyle_" ) ); +const OUString XclTools::maCFStyleNamePrefix1( "Excel_CondFormat_" ); +const OUString XclTools::maCFStyleNamePrefix2( "ConditionalStyle_" ); OUString XclTools::GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition ) { @@ -688,8 +688,8 @@ void XclTools::SkipSubStream( XclImpStream& rStrm ) // Basic macro names ---------------------------------------------------------- -const OUString XclTools::maSbMacroPrefix( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:" ) ); -const OUString XclTools::maSbMacroSuffix( RTL_CONSTASCII_USTRINGPARAM( "?language=Basic&location=document" ) ); +const OUString XclTools::maSbMacroPrefix( "vnd.sun.star.script:" ); +const OUString XclTools::maSbMacroSuffix( "?language=Basic&location=document" ); OUString XclTools::GetSbMacroUrl( const OUString& rMacroName, SfxObjectShell* pDocShell ) { diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 703e7398919b..09c6947c1477 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -158,7 +158,7 @@ public: } } if ( !mpDoc ) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("Workbookhelper::getScDocument(): Failed to access ScDocument from model" ) ), Reference< XInterface >() ); + throw RuntimeException( OUString( "Workbookhelper::getScDocument(): Failed to access ScDocument from model" ), Reference< XInterface >() ); return *mpDoc; } diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index c1922811ffde..104707b4cf51 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -131,15 +131,15 @@ void ScXMLCalculationSettingsContext::EndElement() uno::Reference <beans::XPropertySet> xPropertySet (GetScImport().GetModel(), uno::UNO_QUERY); if (xPropertySet.is()) { - xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN)), uno::makeAny(bCalcAsShown) ); - xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE)), uno::makeAny(bIgnoreCase) ); - xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS)), uno::makeAny(bLookUpLabels) ); - xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE)), uno::makeAny(bMatchWholeCell) ); - xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED)), uno::makeAny(bUseRegularExpressions) ); - xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED)), uno::makeAny(bIsIterationEnabled) ); - xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT)), uno::makeAny(nIterationCount) ); - xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON)), uno::makeAny(fIterationEpsilon) ); - xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE)), uno::makeAny(aNullDate) ); + xPropertySet->setPropertyValue(OUString(SC_UNO_CALCASSHOWN), uno::makeAny(bCalcAsShown) ); + xPropertySet->setPropertyValue(OUString(SC_UNO_IGNORECASE), uno::makeAny(bIgnoreCase) ); + xPropertySet->setPropertyValue(OUString(SC_UNO_LOOKUPLABELS), uno::makeAny(bLookUpLabels) ); + xPropertySet->setPropertyValue(OUString(SC_UNO_MATCHWHOLE), uno::makeAny(bMatchWholeCell) ); + xPropertySet->setPropertyValue(OUString(SC_UNO_REGEXENABLED), uno::makeAny(bUseRegularExpressions) ); + xPropertySet->setPropertyValue(OUString(SC_UNO_ITERENABLED), uno::makeAny(bIsIterationEnabled) ); + xPropertySet->setPropertyValue( OUString(SC_UNO_ITERCOUNT), uno::makeAny(nIterationCount) ); + xPropertySet->setPropertyValue( OUString(SC_UNO_ITEREPSILON), uno::makeAny(fIterationEpsilon) ); + xPropertySet->setPropertyValue( OUString(SC_UNO_NULLDATE), uno::makeAny(aNullDate) ); if (GetScImport().GetDocument()) { ScXMLImport::MutexGuard aGuard(GetScImport()); diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index d4bcd4e0f2ff..d6b60eb60231 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -47,7 +47,7 @@ ScChangeTrackingExportHelper::ScChangeTrackingExportHelper(ScXMLExport& rTempExp pChangeTrack(NULL), pEditTextObj(NULL), pDependings(NULL), - sChangeIDPrefix(RTL_CONSTASCII_USTRINGPARAM(SC_CHANGE_ID_PREFIX)) + sChangeIDPrefix(SC_CHANGE_ID_PREFIX) { pChangeTrack = rExport.GetDocument() ? rExport.GetDocument()->GetChangeTrack() : NULL; pDependings = new ScChangeActionMap(); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index a28dd7725153..d585686c08a8 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -180,7 +180,7 @@ ScXMLChangeTrackingImportHelper::ScXMLChangeTrackingImportHelper() : pDoc(NULL), pTrack(NULL), pCurrentAction(NULL), - sIDPrefix(RTL_CONSTASCII_USTRINGPARAM(SC_CHANGE_ID_PREFIX)), + sIDPrefix(SC_CHANGE_ID_PREFIX), nMultiSpanned(0), nMultiSpannedSlaveCount(0), bChangeTrack(false) diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index 6493219cd46e..41036333bf03 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx @@ -50,8 +50,8 @@ sal_Bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, String& rCodeN XMLCodeNameProvider::XMLCodeNameProvider( ScDocument* pDoc ) : mpDoc( pDoc ), - msDocName( RTL_CONSTASCII_USTRINGPARAM("*doc*") ), - msCodeNameProp( RTL_CONSTASCII_USTRINGPARAM("CodeName") ) + msDocName( "*doc*" ), + msCodeNameProp( "CodeName" ) { } diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx b/sc/source/filter/xml/XMLExportDDELinks.cxx index 1b1626dc95c8..4c6cfdfde4bc 100644 --- a/sc/source/filter/xml/XMLExportDDELinks.cxx +++ b/sc/source/filter/xml/XMLExportDDELinks.cxx @@ -122,7 +122,7 @@ void ScXMLExportDDELinks::WriteDDELinks(uno::Reference<sheet::XSpreadsheetDocume uno::Reference <beans::XPropertySet> xPropertySet (xSpreadDoc, uno::UNO_QUERY); if (xPropertySet.is()) { - uno::Reference<container::XIndexAccess> xIndex(xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DDELINKS))), uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xIndex(xPropertySet->getPropertyValue(OUString(SC_UNO_DDELINKS)), uno::UNO_QUERY); if (xIndex.is()) { sal_Int32 nCount = xIndex->getCount(); diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index f83488a8a996..29b8ea6b1810 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -73,7 +73,7 @@ ScMyEmptyDatabaseRangesContainer ScXMLExportDatabaseRanges::GetEmptyDatabaseRang uno::Reference <beans::XPropertySet> xPropertySet (rExport.GetModel(), uno::UNO_QUERY); if (xPropertySet.is()) { - uno::Reference <sheet::XDatabaseRanges> xDatabaseRanges(xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DATABASERNG))), uno::UNO_QUERY); + uno::Reference <sheet::XDatabaseRanges> xDatabaseRanges(xPropertySet->getPropertyValue(OUString(SC_UNO_DATABASERNG)), uno::UNO_QUERY); rExport.CheckAttrList(); if (xDatabaseRanges.is()) { @@ -87,7 +87,7 @@ ScMyEmptyDatabaseRangesContainer ScXMLExportDatabaseRanges::GetEmptyDatabaseRang { uno::Reference <beans::XPropertySet> xDatabaseRangePropertySet (xDatabaseRange, uno::UNO_QUERY); if (xDatabaseRangePropertySet.is() && - ::cppu::any2bool(xDatabaseRangePropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_STRIPDAT))))) + ::cppu::any2bool(xDatabaseRangePropertySet->getPropertyValue(OUString(SC_UNONAME_STRIPDAT)))) { uno::Sequence <beans::PropertyValue> aImportProperties(xDatabaseRange->getImportDescriptor()); sal_Int32 nLength = aImportProperties.getLength(); diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 4f7a9375b965..b791e8195330 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -83,22 +83,22 @@ bool ScMyValidation::IsEqual(const ScMyValidation& aVal) const ScMyValidationsContainer::ScMyValidationsContainer() : aValidationVec(), sEmptyString(), - sERRALSTY(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ERRALSTY)), - sIGNOREBL(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_IGNOREBL)), - sSHOWLIST(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SHOWLIST)), - sTYPE(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_TYPE)), - sSHOWINP(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SHOWINP)), - sSHOWERR(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SHOWERR)), - sINPTITLE(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_INPTITLE)), - sINPMESS(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_INPMESS)), - sERRTITLE(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ERRTITLE)), - sERRMESS(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ERRMESS)), - sOnError(RTL_CONSTASCII_USTRINGPARAM("OnError")), - sEventType(RTL_CONSTASCII_USTRINGPARAM("EventType")), - sStarBasic(RTL_CONSTASCII_USTRINGPARAM("StarBasic")), - sScript(RTL_CONSTASCII_USTRINGPARAM("Script")), - sLibrary(RTL_CONSTASCII_USTRINGPARAM("Library")), - sMacroName(RTL_CONSTASCII_USTRINGPARAM("MacroName")) + sERRALSTY(SC_UNONAME_ERRALSTY), + sIGNOREBL(SC_UNONAME_IGNOREBL), + sSHOWLIST(SC_UNONAME_SHOWLIST), + sTYPE(SC_UNONAME_TYPE), + sSHOWINP(SC_UNONAME_SHOWINP), + sSHOWERR(SC_UNONAME_SHOWERR), + sINPTITLE(SC_UNONAME_INPTITLE), + sINPMESS(SC_UNONAME_INPMESS), + sERRTITLE(SC_UNONAME_ERRTITLE), + sERRMESS(SC_UNONAME_ERRMESS), + sOnError("OnError"), + sEventType("EventType"), + sStarBasic("StarBasic"), + sScript("Script"), + sLibrary("Library"), + sMacroName("MacroName") { } @@ -188,26 +188,26 @@ OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMy { //case sheet::ValidationType_CUSTOM case sheet::ValidationType_DATE : - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-date()")); + sCondition += OUString("cell-content-is-date()"); break; case sheet::ValidationType_DECIMAL : - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-decimal-number()")); + sCondition += OUString("cell-content-is-decimal-number()"); break; case sheet::ValidationType_LIST : sCondition += OUString("cell-content-is-in-list("); sCondition += aValidation.sFormula1; - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(")"); break; case sheet::ValidationType_TEXT_LEN : if (aValidation.aOperator != sheet::ConditionOperator_BETWEEN && aValidation.aOperator != sheet::ConditionOperator_NOT_BETWEEN) - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-text-length()")); + sCondition += OUString("cell-content-text-length()"); break; case sheet::ValidationType_TIME : - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-time()")); + sCondition += OUString("cell-content-is-time()"); break; case sheet::ValidationType_WHOLE : - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-whole-number()")); + sCondition += OUString("cell-content-is-whole-number()"); break; default: { @@ -226,7 +226,7 @@ OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMy aValidation.aOperator != sheet::ConditionOperator_NOT_BETWEEN) { if (aValidation.aValidationType != sheet::ValidationType_TEXT_LEN) - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); + sCondition += OUString("cell-content()"); switch (aValidation.aOperator) { case sheet::ConditionOperator_EQUAL : @@ -273,7 +273,7 @@ OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMy sCondition += aValidation.sFormula1; sCondition += OUString(","); sCondition += aValidation.sFormula2; - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(")"); } } else diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx index 528139318b7f..dcec6c88c0f6 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx @@ -109,13 +109,13 @@ void XMLTableMasterPageExport::exportMasterPageContent( const Reference < XPropertySet > & rPropSet, sal_Bool bAutoStyles ) { - Reference < sheet::XHeaderFooterContent > xHeader(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTHDRCON ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xHeader(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_RIGHTHDRCON ) ), uno::UNO_QUERY); - Reference < sheet::XHeaderFooterContent > xHeaderLeft(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTHDRCONT ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xHeaderLeft(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_LEFTHDRCONT ) ), uno::UNO_QUERY); - Reference < sheet::XHeaderFooterContent > xFooter(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTFTRCON ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xFooter(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_RIGHTFTRCON ) ), uno::UNO_QUERY); - Reference < sheet::XHeaderFooterContent > xFooterLeft(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTFTRCONT ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xFooterLeft(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_LEFTFTRCONT ) ), uno::UNO_QUERY); if( bAutoStyles ) { @@ -146,19 +146,19 @@ void XMLTableMasterPageExport::exportMasterPageContent( } else { - sal_Bool bHeader(::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRON ) ) ))); + sal_Bool bHeader(::cppu::any2bool(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_HDRON ) ))); exportHeaderFooter(xHeader, XML_HEADER, bHeader ); - sal_Bool bLeftHeader(!::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRSHARED ) ) )) && bHeader); + sal_Bool bLeftHeader(!::cppu::any2bool(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_HDRSHARED ) )) && bHeader); exportHeaderFooter( xHeaderLeft, XML_HEADER_LEFT, bLeftHeader ); - sal_Bool bFooter(::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRON ) ) ))); + sal_Bool bFooter(::cppu::any2bool(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_FTRON ) ))); exportHeaderFooter( xFooter, XML_FOOTER, bFooter ); - sal_Bool bLeftFooter = (!::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRSHARED ) ) )) && bFooter); + sal_Bool bLeftFooter = (!::cppu::any2bool(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_FTRSHARED ) )) && bFooter); exportHeaderFooter( xFooterLeft, XML_FOOTER_LEFT, bLeftFooter ); } diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index ea38a3047172..4d3010a5c584 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -61,7 +61,7 @@ void XMLTableShapeImportHelper::SetLayer(uno::Reference<drawing::XShape>& rShape { uno::Reference< beans::XPropertySet > xShapeProp( rShape, uno::UNO_QUERY ); if( xShapeProp.is() ) - xShapeProp->setPropertyValue(OUString( RTL_CONSTASCII_USTRINGPARAM( SC_LAYERID ) ), uno::makeAny(nLayerID) ); + xShapeProp->setPropertyValue(OUString( SC_LAYERID ), uno::makeAny(nLayerID) ); } } diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index 4102a685c7de..551b21e8c95e 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -145,7 +145,7 @@ void ScXMLTableColContext::EndElement() } } } - OUString sVisible(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLVIS)); + OUString sVisible(SC_UNONAME_CELLVIS); bool bValue(true); if (!IsXMLToken(sVisibility, XML_VISIBLE)) bValue = false; diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index 85f451bb7fc6..9e98d38a6c4d 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -111,7 +111,7 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport, ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), mpQueryParam(new ScQueryParam), - sDatabaseRangeName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)), + sDatabaseRangeName(STR_DB_LOCAL_NONAME), aSortSequence(), nRefresh(0), nSubTotalsUserListIndex(0), @@ -344,7 +344,7 @@ ScDBData* ScXMLDatabaseRangeContext::ConvertToDBData(const OUString& rName) size_t nOldSize = aSortSequence.getLength(); aSortSequence.realloc(nOldSize + 1); beans::PropertyValue aProperty; - aProperty.Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ORIENT)); + aProperty.Name = OUString(SC_UNONAME_ORIENT); table::TableOrientation eOrient = mpQueryParam->bByRow ? table::TableOrientation_ROWS : table::TableOrientation_COLUMNS; aProperty.Value <<= eOrient; @@ -448,7 +448,7 @@ void ScXMLDatabaseRangeContext::EndElement() if (meRangeType == ScDBCollection::SheetAnonymous) { - OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + OUString aName(STR_DB_LOCAL_NONAME); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDBData> pData(ConvertToDBData(aName)); SAL_WNODEPRECATED_DECLARATIONS_POP @@ -465,7 +465,7 @@ void ScXMLDatabaseRangeContext::EndElement() } else if (meRangeType == ScDBCollection::GlobalAnonymous) { - OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_GLOBAL_NONAME)); + OUString aName(STR_DB_GLOBAL_NONAME); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDBData> pData(ConvertToDBData(aName)); SAL_WNODEPRECATED_DECLARATIONS_POP diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 8a059e53c62c..c78c4df0ecb6 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -409,7 +409,7 @@ void ScXMLShapeExport::onExport( const uno::Reference < drawing::XShape >& xShap if( xShapeProp.is() ) { sal_Int16 nLayerID = 0; - if( (xShapeProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( SC_LAYERID ))) >>= nLayerID) && (nLayerID == SC_LAYER_BACK) ) + if( (xShapeProp->getPropertyValue(OUString( SC_LAYERID )) >>= nLayerID) && (nLayerID == SC_LAYER_BACK) ) GetExport().AddAttribute(XML_NAMESPACE_TABLE, XML_TABLE_BACKGROUND, XML_TRUE); } } @@ -456,8 +456,8 @@ ScXMLExport::ScXMLExport( pValidationsContainer(NULL), pCellsItr(NULL), pChangeTrackingExportHelper(NULL), - sLayerID(RTL_CONSTASCII_USTRINGPARAM( SC_LAYERID )), - sCaptionShape(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CaptionShape")), + sLayerID( SC_LAYERID ), + sCaptionShape("com.sun.star.drawing.CaptionShape"), nOpenRow(-1), nProgressCount(0), nCurrentTable(0), @@ -492,14 +492,14 @@ ScXMLExport::ScXMLExport( xRowStylesExportPropertySetMapper = new ScXMLRowExportPropertyMapper(xRowStylesPropertySetMapper); xTableStylesExportPropertySetMapper = new ScXMLTableExportPropertyMapper(xTableStylesPropertySetMapper); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), - xCellStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME)), - xColumnStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)), - xRowStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)), - xTableStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME), + xCellStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME), + xColumnStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX)); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME), + xRowStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX)); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME), + xTableStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX)); if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 ) { @@ -847,13 +847,13 @@ void ScXMLExport::GetAreaLinks( uno::Reference< sheet::XSpreadsheetDocument>& xS uno::Reference< beans::XPropertySet > xPropSet( xSpreadDoc, uno::UNO_QUERY ); if( !xPropSet.is() ) return; - uno::Reference< container::XIndexAccess > xLinksIAccess( xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_AREALINKS ) ) ), uno::UNO_QUERY); + uno::Reference< container::XIndexAccess > xLinksIAccess( xPropSet->getPropertyValue( OUString( SC_UNO_AREALINKS ) ), uno::UNO_QUERY); if( xLinksIAccess.is() ) { - const OUString sFilter( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FILTER ) ); - const OUString sFilterOpt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FILTOPT ) ); - const OUString sURL( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_LINKURL ) ); - const OUString sRefresh( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_REFDELAY ) ); + const OUString sFilter( SC_UNONAME_FILTER ); + const OUString sFilterOpt( SC_UNONAME_FILTOPT ); + const OUString sURL( SC_UNONAME_LINKURL ); + const OUString sRefresh( SC_UNONAME_REFDELAY ); sal_Int32 nCount(xLinksIAccess->getCount()); for( sal_Int32 nIndex = 0; nIndex < nCount; ++nIndex ) @@ -1099,7 +1099,7 @@ void ScXMLExport::ExportExternalRefCacheStyles() { bool bIsAuto; nIndex = pCellStyles->GetIndexOfStyleName( - aName, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)), bIsAuto); + aName, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX), bIsAuto); } // store the number format to index mapping for later use. @@ -1757,7 +1757,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) { uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); if (xProperties.is()) - aStylesExp.exportDefaultStyle(xProperties, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper); + aStylesExp.exportDefaultStyle(xProperties, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME), xCellStylesExportPropertySetMapper); if (pSharedData->HasShapes()) { GetShapeExport()->ExportGraphicDefaults(); @@ -1773,7 +1773,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) if (xCellStyles.is()) { sal_Int32 nCount(xCellStyles->getCount()); - OUString sNumberFormat(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); + OUString sNumberFormat(SC_UNONAME_NUMFMT); for (sal_Int32 i = 0; i < nCount; ++i) { uno::Reference <beans::XPropertySet> xCellProperties(xCellStyles->getByIndex(i), uno::UNO_QUERY); @@ -1791,7 +1791,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) exportDataStyles(); aStylesExp.exportStyleFamily(OUString("CellStyles"), - OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper, false, XML_STYLE_FAMILY_TABLE_CELL); + OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME), xCellStylesExportPropertySetMapper, false, XML_STYLE_FAMILY_TABLE_CELL); SvXMLExport::_ExportStyles(bUsed); } @@ -1803,8 +1803,8 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x //! pass xCellRanges instead uno::Reference<sheet::XSheetCellRanges> xCellRanges( xProperties, uno::UNO_QUERY ); - OUString SC_SCELLPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)); - OUString SC_NUMBERFORMAT(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); + OUString SC_SCELLPREFIX(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX); + OUString SC_NUMBERFORMAT(SC_UNONAME_NUMFMT); OUString sStyleName; sal_Int32 nNumberFormat(-1); @@ -1939,7 +1939,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>& xColumnProperties, const OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible) { - OUString SC_SCOLUMNPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX)); + OUString SC_SCOLUMNPREFIX(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX); std::vector<XMLPropertyState> xPropStates(xColumnStylesExportPropertySetMapper->Filter(xColumnProperties)); if(!xPropStates.empty()) @@ -1984,7 +1984,7 @@ void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>& void ScXMLExport::AddStyleFromRow(const uno::Reference<beans::XPropertySet>& xRowProperties, const OUString* pOldName, sal_Int32& rIndex) { - OUString SC_SROWPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX)); + OUString SC_SROWPREFIX(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX); std::vector<XMLPropertyState> xPropStates(xRowStylesExportPropertySetMapper->Filter(xRowProperties)); if(!xPropStates.empty()) @@ -3134,7 +3134,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, { uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); if ( xProps.is() ) - xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) >>= sHlink; + xProps->getPropertyValue( OUString( SC_UNONAME_HYPERLINK ) ) >>= sHlink; } catch ( const beans::UnknownPropertyException& ) { @@ -3532,19 +3532,19 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads uno::Reference<beans::XPropertySet> xPropertySet(xSpreadDoc, uno::UNO_QUERY); if (xPropertySet.is()) { - bool bCalcAsShown (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN))) )); - bool bIgnoreCase (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE))) )); - bool bLookUpLabels (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS))) )); - bool bMatchWholeCell (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE))) )); - bool bUseRegularExpressions (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED))) )); - bool bIsIterationEnabled (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED))) )); + bool bCalcAsShown (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(SC_UNO_CALCASSHOWN)) )); + bool bIgnoreCase (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(SC_UNO_IGNORECASE)) )); + bool bLookUpLabels (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(SC_UNO_LOOKUPLABELS)) )); + bool bMatchWholeCell (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(SC_UNO_MATCHWHOLE)) )); + bool bUseRegularExpressions (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(SC_UNO_REGEXENABLED)) )); + bool bIsIterationEnabled (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(SC_UNO_ITERENABLED)) )); sal_uInt16 nYear2000 (pDoc ? pDoc->GetDocOptions().GetYear2000() : 0); sal_Int32 nIterationCount(100); - xPropertySet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT))) >>= nIterationCount; + xPropertySet->getPropertyValue( OUString(SC_UNO_ITERCOUNT)) >>= nIterationCount; double fIterationEpsilon = 0; - xPropertySet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON))) >>= fIterationEpsilon; + xPropertySet->getPropertyValue( OUString(SC_UNO_ITEREPSILON)) >>= fIterationEpsilon; util::Date aNullDate; - xPropertySet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE))) >>= aNullDate; + xPropertySet->getPropertyValue( OUString(SC_UNO_NULLDATE)) >>= aNullDate; if (bCalcAsShown || bIgnoreCase || !bLookUpLabels || !bMatchWholeCell || !bUseRegularExpressions || bIsIterationEnabled || nIterationCount != 100 || !::rtl::math::approxEqual(fIterationEpsilon, 0.001) || aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899 || nYear2000 != 1930) @@ -3610,7 +3610,7 @@ void ScXMLExport::WriteTableSource() uno::Reference <beans::XPropertySet> xProps (GetModel(), uno::UNO_QUERY); if (xProps.is()) { - uno::Reference <container::XIndexAccess> xIndex(xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHEETLINKS))), uno::UNO_QUERY); + uno::Reference <container::XIndexAccess> xIndex(xProps->getPropertyValue(OUString(SC_UNO_SHEETLINKS)), uno::UNO_QUERY); if (xIndex.is()) { sal_Int32 nCount(xIndex->getCount()); @@ -3624,7 +3624,7 @@ void ScXMLExport::WriteTableSource() if (xLinkProps.is()) { OUString sNewLink; - if (xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_LINKURL))) >>= sNewLink) + if (xLinkProps->getPropertyValue(OUString(SC_UNONAME_LINKURL)) >>= sNewLink) bFound = sLink.equals(sNewLink); } } @@ -3634,9 +3634,9 @@ void ScXMLExport::WriteTableSource() OUString sFilterOptions; OUString sTableName (xLinkable->getLinkSheetName()); sal_Int32 nRefresh(0); - xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTER))) >>= sFilter; - xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTOPT))) >>= sFilterOptions; - xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_REFDELAY))) >>= nRefresh; + xLinkProps->getPropertyValue(OUString(SC_UNONAME_FILTER)) >>= sFilter; + xLinkProps->getPropertyValue(OUString(SC_UNONAME_FILTOPT)) >>= sFilterOptions; + xLinkProps->getPropertyValue(OUString(SC_UNONAME_REFDELAY)) >>= nRefresh; if (!sLink.isEmpty()) { AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE); @@ -3707,11 +3707,11 @@ void ScXMLExport::WriteTheLabelRanges( const uno::Reference< sheet::XSpreadsheet if( !xDocProp.is() ) return; sal_Int32 nCount(0); - uno::Reference< container::XIndexAccess > xColRangesIAccess(xDocProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLLABELRNG ) ) ), uno::UNO_QUERY); + uno::Reference< container::XIndexAccess > xColRangesIAccess(xDocProp->getPropertyValue( OUString( SC_UNO_COLLABELRNG ) ), uno::UNO_QUERY); if( xColRangesIAccess.is() ) nCount += xColRangesIAccess->getCount(); - uno::Reference< container::XIndexAccess > xRowRangesIAccess(xDocProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ROWLABELRNG ) ) ), uno::UNO_QUERY); + uno::Reference< container::XIndexAccess > xRowRangesIAccess(xDocProp->getPropertyValue( OUString( SC_UNO_ROWLABELRNG ) ), uno::UNO_QUERY); if( xRowRangesIAccess.is() ) nCount += xRowRangesIAccess->getCount(); diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 8a3bda1c8ab6..d1e5e47fc394 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -1946,11 +1946,11 @@ ScXMLImport::ScXMLImport( pDoc( NULL ), pChangeTrackingImportHelper(NULL), pStylesImportHelper(NULL), - sNumberFormat(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)), - sLocale(RTL_CONSTASCII_USTRINGPARAM(SC_LOCALE)), - sCellStyle(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLSTYL)), - sStandardFormat(RTL_CONSTASCII_USTRINGPARAM(SC_STANDARDFORMAT)), - sType(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_TYPE)), + sNumberFormat(SC_UNONAME_NUMFMT), + sLocale(SC_LOCALE), + sCellStyle(SC_UNONAME_CELLSTYL), + sStandardFormat(SC_STANDARDFORMAT), + sType(SC_UNONAME_TYPE), pDocElemTokenMap( 0 ), pStylesElemTokenMap( 0 ), pStylesAttrTokenMap( 0 ), @@ -2660,7 +2660,7 @@ bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString if (xNumberPropertySet.is()) { OUString sTemp; - if ( xNumberPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURRENCYSYMBOL))) >>= sTemp) + if ( xNumberPropertySet->getPropertyValue(OUString(SC_CURRENCYSYMBOL)) >>= sTemp) { if (sCurrentCurrency.equals(sTemp)) return true; @@ -2974,7 +2974,7 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE if (xPropertySetInfo.is()) { OUString const sOrganizerMode( - RTL_CONSTASCII_USTRINGPARAM("OrganizerMode")); + "OrganizerMode"); if (xPropertySetInfo->hasPropertyByName(sOrganizerMode)) { sal_Bool bStyleOnly(sal_False); @@ -3022,8 +3022,8 @@ void ScXMLImport::SetLabelRanges() uno::Reference <beans::XPropertySet> xPropertySet (GetModel(), uno::UNO_QUERY); if (xPropertySet.is()) { - uno::Any aColAny = xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COLLABELRNG))); - uno::Any aRowAny = xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ROWLABELRNG))); + uno::Any aColAny = xPropertySet->getPropertyValue(OUString(SC_UNO_COLLABELRNG)); + uno::Any aRowAny = xPropertySet->getPropertyValue(OUString(SC_UNO_ROWLABELRNG)); uno::Reference< sheet::XLabelRanges > xColRanges; uno::Reference< sheet::XLabelRanges > xRowRanges; @@ -3067,7 +3067,7 @@ class NamedRangesSwitch { public: NamedRangesSwitch(Reference<beans::XPropertySet>& xPropSet) : - mxPropSet(xPropSet), maPropName(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MODIFY_BROADCAST)) + mxPropSet(xPropSet), maPropName(SC_UNO_MODIFY_BROADCAST) { uno::Any any; any <<= false; diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index d1c1b4fec3a2..3fa6142091b3 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -204,9 +204,9 @@ void ScXMLTableRowContext::EndElement() bFiltered = true; } if (!bVisible) - xRowProperties->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISVISIBLE)), uno::makeAny(bVisible)); + xRowProperties->setPropertyValue(OUString(SC_ISVISIBLE), uno::makeAny(bVisible)); if (bFiltered) - xRowProperties->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISFILTERED)), uno::makeAny(bFiltered)); + xRowProperties->setPropertyValue(OUString(SC_ISFILTERED), uno::makeAny(bFiltered)); } } } diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index 129b87f38ad7..e87ba2387137 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.cxx @@ -139,31 +139,31 @@ void ScXMLSortContext::EndElement() if (nAlgoLength) ++i; uno::Sequence <beans::PropertyValue> aSortDescriptor(7 + i); - aSortDescriptor[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT)); + aSortDescriptor[0].Name = OUString(SC_UNONAME_BINDFMT); aSortDescriptor[0].Value = ::cppu::bool2any(bBindFormatsToContent); - aSortDescriptor[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COPYOUT)); + aSortDescriptor[1].Name = OUString(SC_UNONAME_COPYOUT); aSortDescriptor[1].Value = ::cppu::bool2any(bCopyOutputData); - aSortDescriptor[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE)); + aSortDescriptor[2].Name = OUString(SC_UNONAME_ISCASE); aSortDescriptor[2].Value = ::cppu::bool2any(bIsCaseSensitive); - aSortDescriptor[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISULIST)); + aSortDescriptor[3].Name = OUString(SC_UNONAME_ISULIST); aSortDescriptor[3].Value = ::cppu::bool2any(bEnabledUserList); - aSortDescriptor[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_OUTPOS)); + aSortDescriptor[4].Name = OUString(SC_UNONAME_OUTPOS); aSortDescriptor[4].Value <<= aOutputPosition; - aSortDescriptor[5].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_UINDEX)); + aSortDescriptor[5].Name = OUString(SC_UNONAME_UINDEX); aSortDescriptor[5].Value <<= nUserListIndex; - aSortDescriptor[6].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SORTFLD)); + aSortDescriptor[6].Name = OUString(SC_UNONAME_SORTFLD); aSortDescriptor[6].Value <<= aSortFields; if (nLangLength || nCountryLength) { lang::Locale aLocale; aLocale.Language = sLanguage; aLocale.Country = sCountry; - aSortDescriptor[7].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLLOC)); + aSortDescriptor[7].Name = OUString(SC_UNONAME_COLLLOC); aSortDescriptor[7].Value <<= aLocale; } if (nAlgoLength) { - aSortDescriptor[6 + i].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLALG)); + aSortDescriptor[6 + i].Name = OUString(SC_UNONAME_COLLALG); aSortDescriptor[6 + i].Value <<= sAlgorithm; } pDatabaseRangeContext->SetSortSequence(aSortDescriptor); diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index a331b0a2926a..6b4d8a1a154f 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -715,7 +715,7 @@ void ScXMLAutoStylePoolP::exportStyleContent( { OUString sCondition("is-true-formula("); sCondition += xSheetCondition->getFormula1(); - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(")"); rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_CONDITION, sCondition); rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_APPLY_STYLE_NAME, rScXMLExport.EncodeStyleName( sStyleName )); OUString sOUBaseAddress; @@ -738,11 +738,11 @@ void ScXMLAutoStylePoolP::exportStyleContent( sCondition += xSheetCondition->getFormula1(); sCondition += OUString(","); sCondition += xSheetCondition->getFormula2(); - sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(")"); } else { - sCondition = OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); + sCondition = OUString("cell-content()"); switch (aOperator) { case sheet::ConditionOperator_LESS: diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 7e024b7901b7..477f151cbba6 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -710,9 +710,9 @@ XMLTableStylesContext::XMLTableStylesContext( SvXMLImport& rImport, const bool bTempAutoStyles ) : SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ), sCellStyleServiceName( OUString( "com.sun.star.style.CellStyle" )), - sColumnStyleServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), - sRowStyleServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))), - sTableStyleServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))), + sColumnStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME )), + sRowStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME )), + sTableStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME )), nNumberFormatIndex(-1), nConditionalFormatIndex(-1), nCellStyleIndex(-1), @@ -1052,9 +1052,9 @@ void ScMasterPageContext::Finish( sal_Bool bOverwrite ) { XMLTextMasterPageContext::Finish(bOverwrite); if (!bContainsRightFooter) - ClearContent(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTFTRCON))); + ClearContent(OUString(SC_UNO_PAGE_RIGHTFTRCON)); if (!bContainsRightHeader) - ClearContent(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON))); + ClearContent(OUString(SC_UNO_PAGE_RIGHTHDRCON)); } // --------------------------------------------------------------------------- diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 7ba722d77061..0dcaf5ee9452 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -420,7 +420,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) if (bStylesOnly) { OUString const sOrganizerMode( - RTL_CONSTASCII_USTRINGPARAM("OrganizerMode")); + "OrganizerMode"); xInfoSet->setPropertyValue(sOrganizerMode, uno::makeAny(sal_True)); } |