diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-05-06 16:32:22 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-05-06 16:51:45 +0200 |
| commit | e2e2cc61144cb22227eebfadff0ea24b51ccfbd0 (patch) | |
| tree | 8063275cabcdf32e30c37451a32d96db5929561a /sc | |
| parent | d01768c31a0658c8a74e0dd3a95b2d781639d18e (diff) | |
remove usage of RTL_CONSTASCII_USTRINGPARAM
Mechanical removal of usage together with OUString ctor, done
by compiler plugin.
Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5
Diffstat (limited to 'sc')
71 files changed, 422 insertions, 422 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)); } diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 831386a88e04..39e70a03ffad 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -113,7 +113,7 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getForeground() uno::Reference<beans::XPropertySet> xCellProps(xCell, uno::UNO_QUERY); if (xCellProps.is()) { - uno::Any aAny = xCellProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CCOLOR))); + uno::Any aAny = xCellProps->getPropertyValue(OUString(SC_UNONAME_CCOLOR)); aAny >>= nColor; } } @@ -154,7 +154,7 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getBackground() uno::Reference<beans::XPropertySet> xCellProps(xCell, uno::UNO_QUERY); if (xCellProps.is()) { - uno::Any aAny = xCellProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLBACK))); + uno::Any aAny = xCellProps->getPropertyValue(OUString(SC_UNONAME_CELLBACK)); aAny >>= nColor; } } diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index d22416ee542d..eec20b57ae7c 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -91,8 +91,8 @@ struct ScShapeDataLess OUString msLayerId; OUString msZOrder; ScShapeDataLess() - : msLayerId(RTL_CONSTASCII_USTRINGPARAM( "LayerID" )), - msZOrder(RTL_CONSTASCII_USTRINGPARAM( "ZOrder" )) + : msLayerId( "LayerID" ), + msZOrder( "ZOrder" ) { } void ConvertLayerId(sal_Int16& rLayerID) const // changes the number of the LayerId so it the accessibility order diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 7f6ac08c6f95..e06b4c8962d5 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2759,7 +2759,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) if (!aReplace.equalsAsciiL("\"", 1)) aString = aString.replaceAll( aReplace, - OUString(RTL_CONSTASCII_USTRINGPARAM("\""))); + OUString("\"")); aReplace = OUString(pAuto->GetEndDoubleQuote()); if (aReplace.isEmpty()) @@ -2767,7 +2767,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) if (!aReplace.equalsAsciiL("\"", 1)) aString = aString.replaceAll( aReplace, - OUString(RTL_CONSTASCII_USTRINGPARAM("\""))); + OUString("\"")); aReplace = OUString(pAuto->GetStartSingleQuote()); if (aReplace.isEmpty()) diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 311fab420650..a24296c7666a 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2098,7 +2098,7 @@ OUString createLocalRangeName(const OUString& rName, const OUString& rTableName) OUStringBuffer aString (rName); aString.append(OUString(" (")); aString.append(rTableName); - aString.append(OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + aString.append(OUString(")")); return aString.makeStringAndClear(); } diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx index 425a868b7e11..0a02cc6adeba 100644 --- a/sc/source/ui/app/scmod2.cxx +++ b/sc/source/ui/app/scmod2.cxx @@ -59,7 +59,7 @@ void ScModule::SetAutoSpellProperty( sal_Bool bSet ) uno::Any aAny; aAny <<= bSet; - aConfig.SetProperty( OUString(RTL_CONSTASCII_USTRINGPARAM( LINGUPROP_AUTOSPELL )), aAny ); + aConfig.SetProperty( OUString( LINGUPROP_AUTOSPELL ), aAny ); } diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 3d33e800e2a9..e32c03d75973 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -76,7 +76,7 @@ ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sa PopupMenuFloatingWindow(pParent), maOpenTimer(this), maCloseTimer(this), - maName(RTL_CONSTASCII_USTRINGPARAM("ScMenuFloatingWindow")), + maName("ScMenuFloatingWindow"), mnSelectedMenu(MENU_NOT_SELECTED), mnClickedMenu(MENU_NOT_SELECTED), mpDoc(pDoc), diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index 974225d4bf91..7267a41a8050 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -48,9 +48,9 @@ static void load_FixedWidthList(ScCsvSplits &aSplits) const Any *pProperties; Sequence<OUString> aNames(1); OUString* pNames = aNames.getArray(); - ScLinkConfigItem aItem( OUString(RTL_CONSTASCII_USTRINGPARAM( SEP_PATH )) ); + ScLinkConfigItem aItem( OUString( SEP_PATH ) ); - pNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( FIXED_WIDTH_LIST )); + pNames[0] = OUString( FIXED_WIDTH_LIST ); aValues = aItem.GetProperties( aNames ); pProperties = aValues.getConstArray(); @@ -83,9 +83,9 @@ static void save_FixedWidthList(ScCsvSplits aSplits) Any *pProperties; Sequence<OUString> aNames(1); OUString* pNames = aNames.getArray(); - ScLinkConfigItem aItem( OUString(RTL_CONSTASCII_USTRINGPARAM( SEP_PATH )) ); + ScLinkConfigItem aItem( OUString( SEP_PATH ) ); - pNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( FIXED_WIDTH_LIST )); + pNames[0] = OUString( FIXED_WIDTH_LIST ); aValues = aItem.GetProperties( aNames ); pProperties = aValues.getArray(); pProperties[0] <<= sFixedWidthLists; diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index 55b71790559c..5d31d1da530f 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -126,7 +126,7 @@ void ScFilterOptionsMgr::Init() pViewData->GetTabNo() ) ); ScDBCollection* pDBColl = pDoc->GetDBCollection(); OUStringBuffer theDbArea; - OUString theDbName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + OUString theDbName(STR_DB_LOCAL_NONAME); const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); theCurArea.Format( theAreaStr, SCR_ABS_3D, pDoc, eConv ); diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 58ba39f4890e..3f5f63e899a1 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -161,7 +161,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) theQueryData.nRow2, nSrcTab ) ); ScDBCollection* pDBColl = pDoc->GetDBCollection(); - OUString theDbName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + OUString theDbName = OUString(STR_DB_LOCAL_NONAME); /* * Ueberpruefen, ob es sich bei dem uebergebenen diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index e6ff9c0ff5bb..07d063a6f25d 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -129,17 +129,17 @@ static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparato } ScLinkConfigItem aItem( aSepPath ); - pNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( MERGE_DELIMITERS )); - pNames[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATORS )); - pNames[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( TEXT_SEPARATORS )); - pNames[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( FIXED_WIDTH )); + pNames[0] = OUString( MERGE_DELIMITERS ); + pNames[1] = OUString( SEPARATORS ); + pNames[2] = OUString( TEXT_SEPARATORS ); + pNames[3] = OUString( FIXED_WIDTH ); if (eCall != SC_TEXTTOCOLUMNS) { - pNames[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( FROM_ROW )); - pNames[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( CHAR_SET )); - pNames[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( QUOTED_AS_TEXT )); - pNames[7] = OUString(RTL_CONSTASCII_USTRINGPARAM( DETECT_SPECIAL_NUM )); - pNames[8] = OUString(RTL_CONSTASCII_USTRINGPARAM( LANGUAGE )); + pNames[4] = OUString( FROM_ROW ); + pNames[5] = OUString( CHAR_SET ); + pNames[6] = OUString( QUOTED_AS_TEXT ); + pNames[7] = OUString( DETECT_SPECIAL_NUM ); + pNames[8] = OUString( LANGUAGE ); } aValues = aItem.GetProperties( aNames ); pProperties = aValues.getConstArray(); @@ -202,17 +202,17 @@ static void save_Separators( } ScLinkConfigItem aItem( aSepPath ); - pNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( MERGE_DELIMITERS )); - pNames[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATORS )); - pNames[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( TEXT_SEPARATORS )); - pNames[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( FIXED_WIDTH )); + pNames[0] = OUString( MERGE_DELIMITERS ); + pNames[1] = OUString( SEPARATORS ); + pNames[2] = OUString( TEXT_SEPARATORS ); + pNames[3] = OUString( FIXED_WIDTH ); if (eCall != SC_TEXTTOCOLUMNS) { - pNames[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( FROM_ROW )); - pNames[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( CHAR_SET )); - pNames[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( QUOTED_AS_TEXT )); - pNames[7] = OUString(RTL_CONSTASCII_USTRINGPARAM( DETECT_SPECIAL_NUM )); - pNames[8] = OUString(RTL_CONSTASCII_USTRINGPARAM( LANGUAGE )); + pNames[4] = OUString( FROM_ROW ); + pNames[5] = OUString( CHAR_SET ); + pNames[6] = OUString( QUOTED_AS_TEXT ); + pNames[7] = OUString( DETECT_SPECIAL_NUM ); + pNames[8] = OUString( LANGUAGE ); } aValues = aItem.GetProperties( aNames ); pProperties = aValues.getArray(); diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index fd62073aa6ab..4499600e1f2d 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -596,7 +596,7 @@ void ScTabPageSortOptions::Init() String theArea; ScDBCollection* pDBColl = pDoc->GetDBCollection(); const SCTAB nCurTab = pViewData->GetTabNo(); - OUString theDbName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + OUString theDbName = OUString(STR_DB_LOCAL_NONAME); const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); m_pLbOutPos->Clear(); diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index a54b1f0b232d..f299c69c1e49 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -211,7 +211,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, bDispose = sal_True; xRowSet = uno::Reference<sdbc::XRowSet>( comphelper::getProcessServiceFactory()->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), + OUString( SC_SERVICE_ROWSET ) ), uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY ); OSL_ENSURE( xRowProp.is(), "can't get RowSet" ); @@ -228,15 +228,15 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, aAny <<= rParam.aDBName; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_DATASOURCENAME)), aAny ); + OUString(SC_DBPROP_DATASOURCENAME), aAny ); aAny <<= rParam.aStatement; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); + OUString(SC_DBPROP_COMMAND), aAny ); aAny <<= nType; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); + OUString(SC_DBPROP_COMMANDTYPE), aAny ); uno::Reference<sdb::XCompletedExecution> xExecute( xRowSet, uno::UNO_QUERY ); if ( xExecute.is() ) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index c99ca76ef4ab..4c5fcdc810a4 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -429,7 +429,7 @@ sal_Bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::un bRet = aImport.Import(sal_True, nError); if ( nError ) - pLoadMedium->SetError( nError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + pLoadMedium->SetError( nError, OUString( OSL_LOG_PREFIX ) ); //if the document was not generated by LibreOffice, do hard recalc in case some other document //generator saved cached formula results that differ from LibreOffice's calculated results or @@ -561,10 +561,10 @@ sal_Bool ScDocShell::Load( SfxMedium& rMedium ) } if (!bRet && !rMedium.GetError()) - rMedium.SetError( SVSTREAM_FILEFORMAT_ERROR, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + rMedium.SetError( SVSTREAM_FILEFORMAT_ERROR, OUString( OSL_LOG_PREFIX ) ); if (rMedium.GetError()) - SetError( rMedium.GetError(), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( rMedium.GetError(), OUString( OSL_LOG_PREFIX ) ); InitItems(); CalcOutputFactor(); @@ -904,7 +904,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) } if ( !bSuccess ) - SetError( ERRCODE_IO_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // this error code will produce no error message, but will break the further saving process + SetError( ERRCODE_IO_ABORT, OUString( OSL_LOG_PREFIX ) ); // this error code will produce no error message, but will break the further saving process } #endif @@ -921,7 +921,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if( RET_NO == aBox.Execute()) { - SetError( ERRCODE_IO_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // this error code will produce no error message, but will break the further saving process + SetError( ERRCODE_IO_ABORT, OUString( OSL_LOG_PREFIX ) ); // this error code will produce no error message, but will break the further saving process } } } // fall through @@ -1062,7 +1062,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); } else bRet = sal_True; @@ -1091,7 +1091,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1128,13 +1128,13 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError == SCWARN_IMPORT_RANGE_OVERFLOW) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); bRet = sal_True; } else if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); } else bRet = true; @@ -1194,7 +1194,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); } else if (!GetError() && (bOverflowRow || bOverflowCol || bOverflowCell)) { @@ -1202,7 +1202,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) FltError nWarn = (bOverflowRow ? SCWARN_IMPORT_ROW_OVERFLOW : (bOverflowCol ? SCWARN_IMPORT_COLUMN_OVERFLOW : SCWARN_IMPORT_CELL_OVERFLOW)); - SetError( nWarn, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError( nWarn, OUString( OSL_LOG_PREFIX )); } bSetColWidths = sal_True; bSetSimpleTextColWidths = sal_True; @@ -1234,7 +1234,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); bRet = ( eError == SCWARN_IMPORT_RANGE_OVERFLOW ); } else @@ -1272,7 +1272,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1307,7 +1307,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) } if ( eError != eERR_OK && !GetError() ) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); bSetColWidths = sal_True; bSetSimpleTextColWidths = sal_True; bSetRowHeights = sal_True; @@ -1318,7 +1318,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError( eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( eError, OUString( OSL_LOG_PREFIX ) ); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; } @@ -1344,7 +1344,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1363,7 +1363,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) } if ( eError != eERR_OK && !GetError() ) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); } else if (aFltName.EqualsAscii(pFilterHtml) || aFltName.EqualsAscii(pFilterHtmlWebQ)) { @@ -1395,7 +1395,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1412,12 +1412,12 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) } if ( eError != eERR_OK && !GetError() ) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); } else { if (!GetError()) - SetError(SCERR_IMPORT_NI, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(SCERR_IMPORT_NI, OUString( OSL_LOG_PREFIX )); } if (!bCalc3) @@ -2228,7 +2228,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) FltError eError = ScFormatFilter::Get().ScExportExcel5( rMed, &aDocument, eFormat, RTL_TEXTENCODING_MS_1252 ); if( eError && !GetError() ) - SetError( eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( eError, OUString( OSL_LOG_PREFIX ) ); // don't return false for warnings bRet = ((eError & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK) || (eError == eERR_OK); @@ -2236,7 +2236,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) else { // export aborted, i.e. "Save without password" warning - SetError( ERRCODE_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( ERRCODE_ABORT, OUString( OSL_LOG_PREFIX ) ); } } else if (aFltName.EqualsAscii(pFilterAscii)) @@ -2269,7 +2269,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) if (aDocument.GetTableCount() > 1) if (!rMed.GetError()) - rMed.SetError(SCWARN_EXPORT_ASCII, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + rMed.SetError(SCWARN_EXPORT_ASCII, OUString( OSL_LOG_PREFIX )); } } else if (aFltName.EqualsAscii(pFilterDBase)) @@ -2310,7 +2310,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) if ( eError != eERR_OK ) { if (!GetError()) - SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( OSL_LOG_PREFIX )); if ( bHasMemo && IsDocument( aTmpFile ) ) KillFile( aTmpFile ); } @@ -2331,7 +2331,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) { KillFile( aTmpFile ); if ( !GetError() ) - SetError( SCERR_EXPORT_DATA, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( SCERR_EXPORT_DATA, OUString( OSL_LOG_PREFIX ) ); } } } @@ -2365,7 +2365,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) if (aDocument.GetTableCount() > 1) if (!rMed.GetError()) - rMed.SetError(SCWARN_EXPORT_ASCII, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + rMed.SetError(SCWARN_EXPORT_ASCII, OUString( OSL_LOG_PREFIX )); } } else if (aFltName.EqualsAscii(pFilterSylk)) @@ -2398,13 +2398,13 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) SetError( *new StringErrorInfo( SCWARN_EXPORT_NONCONVERTIBLE_CHARS, aImExport.GetNonConvertibleChars(), - ERRCODE_BUTTON_OK | ERRCODE_MSG_INFO ), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + ERRCODE_BUTTON_OK | ERRCODE_MSG_INFO ), OUString( OSL_LOG_PREFIX ) ); } } else { if (GetError()) - SetError(SCERR_IMPORT_NI, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError(SCERR_IMPORT_NI, OUString( OSL_LOG_PREFIX ) ); } return bRet; } diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 2a18ea8fb652..d324df53ab2b 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -277,7 +277,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe } else { - aNewName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + aNewName = OUString(STR_DB_LOCAL_NONAME); pNoNameData = new ScDBData(aNewName , nTab, nStartCol,nStartRow, nEndCol,nEndRow, sal_True, bHasHeader ); diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 58ac3640122b..a0bd1d99d326 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -141,9 +141,9 @@ namespace } uno::Sequence<beans::PropertyValue> aProps(2); - aProps[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_EXTENSION)); + aProps[0].Name = OUString(SC_DBPROP_EXTENSION); aProps[0].Value <<= OUString( aExtension ); - aProps[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_CHARSET)); + aProps[1].Name = OUString(SC_DBPROP_CHARSET); aProps[1].Value <<= aCharSetStr; _rConnection = _rDrvMgr->getConnectionWithInfo( aConnUrl, aProps ); @@ -325,7 +325,7 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet ScProgress aProgress( this, ScGlobal::GetRscString( STR_LOAD_DOC ), 0 ); uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory(); uno::Reference<sdbc::XRowSet> xRowSet( xFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), + OUString( SC_SERVICE_ROWSET ) ), uno::UNO_QUERY); ::utl::DisposableComponent aRowSetHelper(xRowSet); uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY ); @@ -337,19 +337,19 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet aAny <<= xConnection; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_ACTIVECONNECTION)), aAny ); + OUString(SC_DBPROP_ACTIVECONNECTION), aAny ); aAny <<= nType; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); + OUString(SC_DBPROP_COMMANDTYPE), aAny ); aAny <<= OUString( aTabName ); xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); + OUString(SC_DBPROP_COMMAND), aAny ); aAny <<= false; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_PROPCHANGE_NOTIFY)), aAny ); + OUString(SC_DBPROP_PROPCHANGE_NOTIFY), aAny ); xRowSet->execute(); @@ -874,7 +874,7 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, CharSet eCharS if (!xTableDesc.is()) return SCERR_EXPORT_CONNECT; aAny <<= OUString( aTabName ); - xTableDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_NAME)), aAny ); + xTableDesc->setPropertyValue( OUString(SC_DBPROP_NAME), aAny ); // create columns @@ -907,16 +907,16 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, CharSet eCharS if (!xColumnDesc.is()) return SCERR_EXPORT_CONNECT; aAny <<= pColNames[nCol]; - xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_NAME)), aAny ); + xColumnDesc->setPropertyValue( OUString(SC_DBPROP_NAME), aAny ); aAny <<= pColTypes[nCol]; - xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_TYPE)), aAny ); + xColumnDesc->setPropertyValue( OUString(SC_DBPROP_TYPE), aAny ); aAny <<= pColLengths[nCol]; - xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_PRECISION)), aAny ); + xColumnDesc->setPropertyValue( OUString(SC_DBPROP_PRECISION), aAny ); aAny <<= pColScales[nCol]; - xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_SCALE)), aAny ); + xColumnDesc->setPropertyValue( OUString(SC_DBPROP_SCALE), aAny ); xColumnsAppend->appendByDescriptor( xColumnDesc ); } @@ -926,7 +926,7 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, CharSet eCharS // get row set for writing uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory(); uno::Reference<sdbc::XRowSet> xRowSet( xFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), + OUString( SC_SERVICE_ROWSET ) ), uno::UNO_QUERY); ::utl::DisposableComponent aRowSetHelper(xRowSet); uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY ); @@ -935,15 +935,15 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, CharSet eCharS aAny <<= xConnection; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_ACTIVECONNECTION)), aAny ); + OUString(SC_DBPROP_ACTIVECONNECTION), aAny ); aAny <<= (sal_Int32) sdb::CommandType::TABLE; xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); + OUString(SC_DBPROP_COMMANDTYPE), aAny ); aAny <<= OUString( aTabName ); xRowProp->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); + OUString(SC_DBPROP_COMMAND), aAny ); xRowSet->execute(); diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 84413a5e61ee..6b04dc3435b9 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -100,7 +100,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, pDoc = pViewData->GetDocument(); m_xParser.set(ScServiceProvider::MakeInstance(SC_SERVICE_FORMULAPARS,(ScDocShell*)pDoc->GetDocumentShell()),uno::UNO_QUERY); uno::Reference< beans::XPropertySet> xSet(m_xParser,uno::UNO_QUERY); - xSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COMPILEFAP)),uno::makeAny(sal_True)); + xSet->setPropertyValue(OUString(SC_UNO_COMPILEFAP),uno::makeAny(sal_True)); m_xOpCodeMapper.set(ScServiceProvider::MakeInstance(SC_SERVICE_OPCODEMAPPER,(ScDocShell*)pDoc->GetDocumentShell()),uno::UNO_QUERY); diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 0912abb57298..45809091a11b 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -105,7 +105,7 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pPa aStrChildContent (SC_RESSTR(STR_CHG_CHILD_CONTENT)), aStrChildOrgContent (SC_RESSTR(STR_CHG_CHILD_ORGCONTENT)), aStrEmpty (SC_RESSTR(STR_CHG_EMPTY)), - aUnknown(RTL_CONSTASCII_USTRINGPARAM("Unknown")), + aUnknown("Unknown"), bAcceptEnableFlag(true), bRejectEnableFlag(true), bNeedsUpdate(false), diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index c88bbf7f3477..284471cab820 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -118,7 +118,7 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl) // #i53241# replace HTML filter with DataQuery filter if (aFilter.equalsAscii(FILTERNAME_HTML)) - aFilter = OUString(RTL_CONSTASCII_USTRINGPARAM(FILTERNAME_QUERY)); + aFilter = OUString(FILTERNAME_QUERY); LoadDocument( aEntered, aFilter, aOptions ); @@ -213,8 +213,8 @@ IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg WaitObject aWait( this ); // replace HTML filter with DataQuery filter - const OUString aHTMLFilterName( RTL_CONSTASCII_USTRINGPARAM( FILTERNAME_HTML ) ); - const OUString aWebQFilterName( RTL_CONSTASCII_USTRINGPARAM( FILTERNAME_QUERY ) ); + const OUString aHTMLFilterName( FILTERNAME_HTML ); + const OUString aWebQFilterName( FILTERNAME_QUERY ); const SfxFilter* pFilter = pMed->GetFilter(); if (pFilter && aHTMLFilterName.equals(pFilter->GetFilterName())) diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index 3adfd8edef1f..57dddbe7b751 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -85,7 +85,7 @@ void ScSolverUtil::GetImplementations( uno::Sequence<OUString>& rImplNames, if ( xEnAc.is() ) { uno::Reference<container::XEnumeration> xEnum = - xEnAc->createContentEnumeration( OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); + xEnAc->createContentEnumeration( OUString(SCSOLVER_SERVICE) ); if ( xEnum.is() ) { sal_Int32 nCount = 0; @@ -135,7 +135,7 @@ uno::Reference<sheet::XSolver> ScSolverUtil::GetSolver( const OUString& rImplNam if ( xEnAc.is() ) { uno::Reference<container::XEnumeration> xEnum = - xEnAc->createContentEnumeration( OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); + xEnAc->createContentEnumeration( OUString(SCSOLVER_SERVICE) ); if ( xEnum.is() ) { while ( xEnum->hasMoreElements() && !xSolver.is() ) diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index fbb3c3d3eb16..3804fcac27f4 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -129,7 +129,7 @@ bool ScNameDefDlg::IsNameValid() ScRangeName* pRangeName = NULL; if(aScope == maGlobalNameStr) { - pRangeName = maRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + pRangeName = maRangeMap.find(OUString(STR_GLOBAL_RANGE_NAME))->second; } else { @@ -188,7 +188,7 @@ void ScNameDefDlg::AddPushed() ScRangeName* pRangeName = NULL; if(aScope == maGlobalNameStr) { - pRangeName = maRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + pRangeName = maRangeMap.find(OUString(STR_GLOBAL_RANGE_NAME))->second; } else { diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 4b715aece319..d3718a05c270 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -303,7 +303,7 @@ bool ScNameDlg::IsFormulaValid() ScRangeName* ScNameDlg::GetRangeName(const OUString& rScope) { if (rScope == maGlobalNameStr) - return maRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + return maRangeMap.find(OUString(STR_GLOBAL_RANGE_NAME))->second; else return maRangeMap.find(rScope)->second; } diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index ad314cff8da8..b7305fc16b08 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -148,7 +148,7 @@ const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine& rLi { const ScRangeName* pRangeName; if (rLine.aScope == maGlobalString) - pRangeName = mrRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + pRangeName = mrRangeMap.find(OUString(STR_GLOBAL_RANGE_NAME))->second; else pRangeName = mrRangeMap.find(rLine.aScope)->second; diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 2f3f2d44f73f..0d3dfedfad06 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -645,7 +645,7 @@ OUString createLocalRangeName(const OUString& rName, const OUString& rTableName) OUStringBuffer aString (rName); aString.append(OUString(" (")); aString.append(rTableName); - aString.append(OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + aString.append(OUString(")")); return aString.makeStringAndClear(); } } diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx index e36813751ada..4071e8574d93 100644 --- a/sc/source/ui/undo/undoutil.cxx +++ b/sc/source/ui/undo/undoutil.cxx @@ -89,7 +89,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB pRet = pDoc->GetAnonymousDBData(nTab); if (!pRet) { - pRet = new ScDBData( OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)), nTab, + pRet = new ScDBData( OUString(STR_DB_LOCAL_NONAME), nTab, nCol1,nRow1, nCol2,nRow2, sal_True, pDoc->HasColHeader( nCol1,nRow1,nCol2,nRow2,nTab ) ); pDoc->SetAnonymousDBData(nTab,pRet); diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 4240c223fbec..4ebb1d2cbbf6 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -202,7 +202,7 @@ uno::Sequence<OUString> ScAutoFormatsObj::getSupportedServiceNames_Static() { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCAUTOFORMATSOBJ_SERVICE )); + pArray[0] = OUString( SCAUTOFORMATSOBJ_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 3135e9599fd2..07eb1156c484 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -374,7 +374,7 @@ uno::Sequence<OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static() { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEETSETTINGS_SERVICE )); + pArray[0] = OUString( SCSPREADSHEETSETTINGS_SERVICE ); return aRet; } @@ -636,7 +636,7 @@ uno::Sequence<OUString> ScRecentFunctionsObj::getSupportedServiceNames_Static() { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCRECENTFUNCTIONSOBJ_SERVICE )); + pArray[0] = OUString( SCRECENTFUNCTIONSOBJ_SERVICE ); return aRet; } @@ -717,7 +717,7 @@ uno::Sequence<OUString> ScFunctionListObj::getSupportedServiceNames_Static() { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONLISTOBJ_SERVICE )); + pArray[0] = OUString( SCFUNCTIONLISTOBJ_SERVICE ); return aRet; } @@ -730,21 +730,21 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co beans::PropertyValue* pArray = rSequence.getArray(); - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ID )); + pArray[0].Name = OUString( SC_UNONAME_ID ); pArray[0].Value <<= (sal_Int32) rDesc.nFIndex; - pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CATEGORY )); + pArray[1].Name = OUString( SC_UNONAME_CATEGORY ); pArray[1].Value <<= (sal_Int32) rDesc.nCategory; - pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_NAME )); + pArray[2].Name = OUString( SC_UNONAME_NAME ); if (rDesc.pFuncName) pArray[2].Value <<= OUString( *rDesc.pFuncName ); - pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DESCRIPTION )); + pArray[3].Name = OUString( SC_UNONAME_DESCRIPTION ); if (rDesc.pFuncDesc) pArray[3].Value <<= OUString( *rDesc.pFuncDesc ); - pArray[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ARGUMENTS )); + pArray[4].Name = OUString( SC_UNONAME_ARGUMENTS ); if (rDesc.ppDefArgNames && rDesc.ppDefArgDescs && rDesc.pDefArgFlags ) { sal_uInt16 nCount = rDesc.nArgCount; diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index dc4019301752..bb37ccfff29e 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -4823,10 +4823,10 @@ uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(4); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGES_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + pArray[0] = OUString( SCSHEETCELLRANGES_SERVICE ); + pArray[1] = OUString( SCCELLPROPERTIES_SERVICE ); + pArray[2] = OUString( SCCHARPROPERTIES_SERVICE ); + pArray[3] = OUString( SCPARAPROPERTIES_SERVICE ); return aRet; } @@ -6115,11 +6115,11 @@ uno::Sequence<OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(5); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); - pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + pArray[0] = OUString( SCSHEETCELLRANGE_SERVICE ); + pArray[1] = OUString( SCCELLRANGE_SERVICE ); + pArray[2] = OUString( SCCELLPROPERTIES_SERVICE ); + pArray[3] = OUString( SCCHARPROPERTIES_SERVICE ); + pArray[4] = OUString( SCPARAPROPERTIES_SERVICE ); return aRet; } @@ -6854,13 +6854,13 @@ uno::Sequence<OUString> SAL_CALL ScCellObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(7); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELL_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELL_SERVICE )); - pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); - pArray[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); - pArray[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); + pArray[0] = OUString( SCSHEETCELL_SERVICE ); + pArray[1] = OUString( SCCELL_SERVICE ); + pArray[2] = OUString( SCCELLPROPERTIES_SERVICE ); + pArray[3] = OUString( SCCHARPROPERTIES_SERVICE ); + pArray[4] = OUString( SCPARAPROPERTIES_SERVICE ); + pArray[5] = OUString( SCSHEETCELLRANGE_SERVICE ); + pArray[6] = OUString( SCCELLRANGE_SERVICE ); return aRet; } @@ -8769,13 +8769,13 @@ uno::Sequence<OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(7); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEET_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); - pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); - pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); - pArray[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); + pArray[0] = OUString( SCSPREADSHEET_SERVICE ); + pArray[1] = OUString( SCSHEETCELLRANGE_SERVICE ); + pArray[2] = OUString( SCCELLRANGE_SERVICE ); + pArray[3] = OUString( SCCELLPROPERTIES_SERVICE ); + pArray[4] = OUString( SCCHARPROPERTIES_SERVICE ); + pArray[5] = OUString( SCPARAPROPERTIES_SERVICE ); + pArray[6] = OUString( SCLINKTARGET_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index bfa5bd806598..4efb484410aa 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -458,7 +458,7 @@ namespace calc { OUString sMessage( "The given type (" ); sMessage += _rType.getTypeName(); - sMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( ") is not supported by this binding." ) ); + sMessage += OUString( ") is not supported by this binding." ); // TODO: localize this error message throw IncompatibleTypesException( sMessage, *pNonConstThis ); diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index d72a9c313165..a6aa3321b9b3 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -483,8 +483,8 @@ uno::Sequence<OUString> SAL_CALL ScDocumentConfiguration::getSupportedServiceNam { uno::Sequence<OUString> aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCOMPSCPREADSHEETSETTINGS_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCUMENTSETTINGS_SERVICE )); + pArray[0] = OUString( SCCOMPSCPREADSHEETSETTINGS_SERVICE ); + pArray[1] = OUString( SCDOCUMENTSETTINGS_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index d2c2f35e38ca..546d0fcfeaca 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -481,8 +481,8 @@ uno::Sequence<OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames() // SheetCellCursor should be first (?) uno::Sequence<OUString> aTotalSeq( nParentLen + 2 ); OUString* pTotalArr = aTotalSeq.getArray(); - pTotalArr[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLCURSOR_SERVICE )); - pTotalArr[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLCURSOR_SERVICE )); + pTotalArr[0] = OUString( SCSHEETCELLCURSOR_SERVICE ); + pTotalArr[1] = OUString( SCCELLCURSOR_SERVICE ); // append cell range services for (long i=0; i<nParentLen; i++) diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index bb6969e0b063..8e960e0d75bc 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -373,7 +373,7 @@ static bool lcl_IsDuplicated( const Reference<XPropertySet> xDimProps ) { try { - Any aAny = xDimProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_ORIGINAL ) ) ); + Any aAny = xDimProps->getPropertyValue( OUString( SC_UNO_DP_ORIGINAL ) ); Reference< XNamed > xOriginal( aAny, UNO_QUERY ); return xOriginal.is(); } @@ -392,7 +392,7 @@ static OUString lcl_GetOriginalName( const Reference< XNamed > xDim ) { try { - Any aAny = xDimProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIGINAL))); + Any aAny = xDimProps->getPropertyValue(OUString(SC_UNO_DP_ORIGINAL)); aAny >>= xOriginal; } catch( Exception& ) @@ -1001,13 +1001,13 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope { uno::Sequence<beans::PropertyValue> aSeq( 4 ); beans::PropertyValue* pArray = aSeq.getArray(); - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_SOURCENAME )); + pArray[0].Name = OUString( SC_UNO_DP_SOURCENAME ); pArray[0].Value <<= pServiceDesc->aParSource; - pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_OBJECTNAME )); + pArray[1].Name = OUString( SC_UNO_DP_OBJECTNAME ); pArray[1].Value <<= pServiceDesc->aParName; - pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_USERNAME )); + pArray[2].Name = OUString( SC_UNO_DP_USERNAME ); pArray[2].Value <<= pServiceDesc->aParUser; - pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_PASSWORD )); + pArray[3].Name = OUString( SC_UNO_DP_PASSWORD ); pArray[3].Value <<= pServiceDesc->aParPass; aRet <<= aSeq; } @@ -1061,7 +1061,7 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotDescriptorBase::getDataLayoutFi { if( pSaveData->GetDataLayoutDimension() ) { - ScFieldIdentifier aFieldId( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) ), 0, true ); + ScFieldIdentifier aFieldId( OUString( SC_DATALAYOUT_NAME ), 0, true ); return new ScDataPilotFieldObj( *this, aFieldId ); } } @@ -1593,7 +1593,7 @@ static sal_Int32 lcl_GetFieldCount( const Reference<XDimensionsSupplier>& rSourc for (sal_Int32 i = 0; i < nIntCount; ++i) { xDim.set(xIntDims->getByIndex(i), UNO_QUERY); - if (xDim.is() && (xDim->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION))) == rOrient)) + if (xDim.is() && (xDim->getPropertyValue(OUString(SC_UNO_DP_ORIENTATION)) == rOrient)) ++nRet; } } @@ -1633,7 +1633,7 @@ static sal_Bool lcl_GetFieldDataByIndex( const Reference<XDimensionsSupplier>& r while (i < nIntCount && !bOk) { xDim.set(xIntDims->getByIndex(i), UNO_QUERY); - if (xDim.is() && (xDim->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIENTATION))) == rOrient)) + if (xDim.is() && (xDim->getPropertyValue(OUString(SC_UNO_DP_ORIENTATION)) == rOrient)) { if (nPos == nIndex) { @@ -1675,7 +1675,7 @@ static sal_Bool lcl_GetFieldDataByIndex( const Reference<XDimensionsSupplier>& r OUString sOriginalName( lcl_GetOriginalName( xDimName ) ); rFieldId.maFieldName = sOriginalName; rFieldId.mbDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDim, - OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISDATALAYOUT)) ); + OUString(SC_UNO_DP_ISDATALAYOUT) ); sal_Int32 nRepeat = 0; if ( rOrient.hasValue() && lcl_IsDuplicated( xDim ) ) @@ -1853,7 +1853,7 @@ OUString SAL_CALL ScDataPilotFieldObj::getName() throw(RuntimeException) if( ScDPSaveDimension* pDim = GetDPDimension() ) { if( pDim->IsDataLayout() ) - aName = OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) ); + aName = OUString( SC_DATALAYOUT_NAME ); else { const OUString* pLayoutName = pDim->GetLayoutName(); @@ -3490,7 +3490,7 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName { Reference< XPropertySet > xMemberProps( xMember, UNO_QUERY ); if( xMemberProps.is() ) - aRet = xMemberProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_SHOWDETAILS ) ) ); + aRet = xMemberProps->getPropertyValue( OUString( SC_UNO_DP_SHOWDETAILS ) ); else aRet <<= true; } @@ -3505,7 +3505,7 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName { Reference< XPropertySet > xMemberProps( xMember, UNO_QUERY ); if( xMemberProps.is() ) - aRet <<= !cppu::any2bool( xMemberProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_ISVISIBLE ) ) ) ); + aRet <<= !cppu::any2bool( xMemberProps->getPropertyValue( OUString( SC_UNO_DP_ISVISIBLE ) ) ); else aRet <<= false; } diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index d41ffc85e052..079e97b5c002 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -217,22 +217,22 @@ void ScImportDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rS aDescriptor.setDataSource(rParam.aDBName); if (aDescriptor.has( svx::daDataSource )) { - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DBNAME )); + pArray[0].Name = OUString( SC_UNONAME_DBNAME ); pArray[0].Value <<= rParam.aDBName; } else if (aDescriptor.has( svx::daConnectionResource )) { - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONRES )); + pArray[0].Name = OUString( SC_UNONAME_CONRES ); pArray[0].Value <<= rParam.aDBName; } - pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCTYPE )); + pArray[1].Name = OUString( SC_UNONAME_SRCTYPE ); pArray[1].Value <<= eMode; - pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCOBJ )); + pArray[2].Name = OUString( SC_UNONAME_SRCOBJ ); pArray[2].Value <<= rParam.aStatement; - pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISNATIVE )); + pArray[3].Name = OUString( SC_UNONAME_ISNATIVE ); ScUnoHelpFunctions::SetBoolInAny( pArray[3].Value, rParam.bNative ); } @@ -340,31 +340,31 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq // Sequence fuellen - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISSORTCOLUMNS )); + pArray[0].Name = OUString( SC_UNONAME_ISSORTCOLUMNS ); pArray[0].Value = ::cppu::bool2any(!rParam.bByRow); - pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONTHDR )); + pArray[1].Name = OUString( SC_UNONAME_CONTHDR ); ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, rParam.bHasHeader ); - pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_MAXFLD )); + pArray[2].Name = OUString( SC_UNONAME_MAXFLD ); pArray[2].Value <<= static_cast<sal_Int32>( rParam.GetSortKeyCount() ); - pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SORTFLD )); + pArray[3].Name = OUString( SC_UNONAME_SORTFLD ); pArray[3].Value <<= aFields; - pArray[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_BINDFMT )); + pArray[4].Name = OUString( SC_UNONAME_BINDFMT ); ScUnoHelpFunctions::SetBoolInAny( pArray[4].Value, rParam.bIncludePattern ); - pArray[5].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_COPYOUT )); + pArray[5].Name = OUString( SC_UNONAME_COPYOUT ); ScUnoHelpFunctions::SetBoolInAny( pArray[5].Value, !rParam.bInplace ); - pArray[6].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_OUTPOS )); + pArray[6].Name = OUString( SC_UNONAME_OUTPOS ); pArray[6].Value <<= aOutPos; - pArray[7].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISULIST )); + pArray[7].Name = OUString( SC_UNONAME_ISULIST ); ScUnoHelpFunctions::SetBoolInAny( pArray[7].Value, rParam.bUserDef ); - pArray[8].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_UINDEX )); + pArray[8].Name = OUString( SC_UNONAME_UINDEX ); pArray[8].Value <<= static_cast<sal_Int32>( rParam.nUserIndex ); } @@ -2234,8 +2234,8 @@ uno::Sequence<OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDATABASERANGEOBJ_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); + pArray[0] = OUString( SCDATABASERANGEOBJ_SERVICE ); + pArray[1] = OUString( SCLINKTARGET_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 4f66ccab159e..e089f3b96992 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1019,7 +1019,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 uno::Sequence<beans::PropertyValue> aSequence(1); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); + pArray[0].Name = OUString( SC_UNONAME_PAGESIZE ); pArray[0].Value <<= aPageSize; if( ! pPrinterOptions ) @@ -1066,17 +1066,17 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 long nPropCount = bWasCellRange ? 3 : 2; uno::Sequence<beans::PropertyValue> aSequence(nPropCount); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); + pArray[0].Name = OUString( SC_UNONAME_PAGESIZE ); pArray[0].Value <<= aPageSize; // #i111158# all positions are relative to the whole page, including non-printable area - pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INC_NP_AREA )); + pArray[1].Name = OUString( SC_UNONAME_INC_NP_AREA ); pArray[1].Value = uno::makeAny( sal_True ); if ( bWasCellRange ) { table::CellRangeAddress aRangeAddress( nTab, aCellRange.aStart.Col(), aCellRange.aStart.Row(), aCellRange.aEnd.Col(), aCellRange.aEnd.Row() ); - pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SOURCERANGE )); + pArray[2].Name = OUString( SC_UNONAME_SOURCERANGE ); pArray[2].Value <<= aRangeAddress; } @@ -1559,7 +1559,7 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( ) OUString sName; pDocShell->GetDocument()->GetName( pDocShell->GetDocument()->GetVisibleTab(), sName ); OUString sOUName(sName); - aSeq[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVETABLE)); + aSeq[0].Name = OUString(SC_ACTIVETABLE); aSeq[0].Value <<= sOUName; xCont->insertByIndex( 0, uno::makeAny( aSeq ) ); } @@ -2029,8 +2029,8 @@ uno::Sequence<OUString> SAL_CALL ScModelObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCMODELOBJ_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); + pArray[0] = OUString( SCMODELOBJ_SERVICE ); + pArray[1] = OUString( SCDOCSETTINGS_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index 3e4e0883642d..a051c104aa30 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -134,14 +134,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScFilterOptionsObj_CreateInstance( OUString ScFilterOptionsObj::getImplementationName_Static() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_IMPLNAME )); + return OUString( SCFILTEROPTIONSOBJ_IMPLNAME ); } uno::Sequence<OUString> ScFilterOptionsObj::getSupportedServiceNames_Static() { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_SERVICE )); + pArray[0] = OUString( SCFILTEROPTIONSOBJ_SERVICE ); return aRet; } @@ -152,7 +152,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValu uno::Sequence<beans::PropertyValue> aRet(1); beans::PropertyValue* pArray = aRet.getArray(); - pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FILTEROPTIONS )); + pArray[0].Name = OUString( SC_UNONAME_FILTEROPTIONS ); pArray[0].Value <<= aFilterOptions; return aRet; diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 61f2074e529c..22fbf0ecb091 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -253,7 +253,7 @@ uno::Sequence<OUString> ScFunctionAccess::getSupportedServiceNames_Static() { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); + pArray[0] = OUString( SCFUNCTIONACCESS_SERVICE ); return aRet; } @@ -277,8 +277,8 @@ uno::Sequence<OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames() { uno::Sequence<OUString> aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); + pArray[0] = OUString( SCFUNCTIONACCESS_SERVICE ); + pArray[1] = OUString( SCDOCSETTINGS_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 511c4677b515..659f6a49117f 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -443,8 +443,8 @@ uno::Sequence<OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames() throw(uno::RuntimeException) { uno::Sequence<OUString> aRet(2); - aRet[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SCNAMEDRANGEOBJ_SERVICE ) ); - aRet[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE ) ); + aRet[0] = OUString( SCNAMEDRANGEOBJ_SERVICE ); + aRet[1] = OUString( SCLINKTARGET_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 0d0228b5e96d..db59a3444464 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -209,8 +209,8 @@ uno::Sequence<OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSEARCHDESCRIPTOR_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCREPLACEDESCRIPTOR_SERVICE )); + pArray[0] = OUString( SCSEARCHDESCRIPTOR_SERVICE ); + pArray[1] = OUString( SCREPLACEDESCRIPTOR_SERVICE ); return aRet; } diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 651d3734dd2c..6fc5d69ad99c 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -2210,8 +2210,8 @@ uno::Sequence<OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames() { uno::Sequence<OUString> aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCTABVIEWOBJ_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCVIEWSETTINGS_SERVICE )); + pArray[0] = OUString( SCTABVIEWOBJ_SERVICE ); + pArray[1] = OUString( SCVIEWSETTINGS_SERVICE ); return aRet; } diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 5410437a5f5c..a15aeffa5034 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -246,7 +246,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) Reference< view::XSelectionSupplier > xSelSupp( xModel->getCurrentController(), UNO_QUERY_THROW ); Reference< beans::XPropertySet > xPropSet( xSelSupp, UNO_QUERY_THROW ); - OUString aPropName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_FILTERED_RANGE_SELECTION ) ); + OUString aPropName( SC_UNO_FILTERED_RANGE_SELECTION ); uno::Any aOldVal = xPropSet->getPropertyValue( aPropName ); uno::Any any; any <<= false; @@ -885,7 +885,7 @@ ScVbaApplication::getTemplatesPath() throw (uno::RuntimeException) OUString SAL_CALL ScVbaApplication::getPathSeparator() throw (uno::RuntimeException) { - static OUString sPathSep( RTL_CONSTASCII_USTRINGPARAM( FILE_PATH_SEPERATOR ) ); + static OUString sPathSep( FILE_PATH_SEPERATOR ); return sPathSep; } diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index 18ccafd8d979..bcc590bf522f 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.cxx @@ -30,7 +30,7 @@ using namespace ooo::vba; using namespace ooo::vba::office::MsoAnimationType; ScVbaAssistant::ScVbaAssistant( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext ): ScVbaAssistantImpl_BASE( xParent, xContext ), -m_sName( RTL_CONSTASCII_USTRINGPARAM( "Clippit" ) ) +m_sName( "Clippit" ) { m_bIsVisible = false; m_nPointsLeft = 795; diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index 24f230b30369..e6de881b81e4 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -95,7 +95,7 @@ ScVbaFormat<Ifc1>::setVerticalAlignment( const uno::Any& _oAlignment) throw (s aVal = uno::makeAny( table::CellVertJustify2::STANDARD ); break; } - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( SC_UNONAME_CELLVJUS ), aVal ); } catch (const uno::Exception& ) { @@ -110,10 +110,10 @@ ScVbaFormat<Ifc1>::getVerticalAlignment( ) throw (script::BasicErrorException, uno::Any aResult = aNULL(); try { - if (!isAmbiguous( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) ) + if (!isAmbiguous( OUString( SC_UNONAME_CELLVJUS ) ) ) { sal_Int32 aAPIAlignment = table::CellVertJustify2::STANDARD; - mxPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) >>= aAPIAlignment; + mxPropertySet->getPropertyValue( OUString( SC_UNONAME_CELLVJUS ) ) >>= aAPIAlignment; switch( aAPIAlignment ) { case table::CellVertJustify2::BOTTOM: @@ -171,7 +171,7 @@ ScVbaFormat<Ifc1>::setHorizontalAlignment( const uno::Any& HorizontalAlignment ) // #FIXME what about the default case above? // shouldn't need the test below if ( aVal.hasValue() ) - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( SC_UNONAME_CELLHJUS ), aVal ); } catch (const uno::Exception& ) { @@ -187,7 +187,7 @@ ScVbaFormat<Ifc1>::getHorizontalAlignment( ) throw (script::BasicErrorException uno::Any NRetAlignment = aNULL(); try { - OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); + OUString sHoriJust( SC_UNONAME_CELLHJUS ); if (!isAmbiguous(sHoriJust)) { table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_BLOCK; @@ -238,7 +238,7 @@ ScVbaFormat<Ifc1>::setOrientation( const uno::Any& _aOrientation ) throw (script break; case excel::XlOrientation::xlHorizontal: aVal = uno::makeAny( table::CellOrientation_STANDARD ); - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ROTANG ) ), uno::makeAny( sal_Int32(0) ) ); + mxPropertySet->setPropertyValue( OUString( SC_UNONAME_ROTANG ), uno::makeAny( sal_Int32(0) ) ); break; case excel::XlOrientation::xlUpward: aVal = uno::makeAny( table::CellOrientation_BOTTOMTOP); @@ -250,7 +250,7 @@ ScVbaFormat<Ifc1>::setOrientation( const uno::Any& _aOrientation ) throw (script // #FIXME what about the default case above? // shouldn't need the test below if ( aVal.hasValue() ) - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( SC_UNONAME_CELLORI ), aVal ); } catch (const uno::Exception& ) @@ -265,10 +265,10 @@ ScVbaFormat<Ifc1>::getOrientation( ) throw (script::BasicErrorException, uno::R uno::Any NRetOrientation = aNULL(); try { - if (!isAmbiguous(OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ))) + if (!isAmbiguous(OUString( SC_UNONAME_CELLORI ))) { table::CellOrientation aOrientation = table::CellOrientation_STANDARD; - if ( !( mxPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ) ) >>= aOrientation ) ) + if ( !( mxPropertySet->getPropertyValue( OUString( SC_UNONAME_CELLORI ) ) >>= aOrientation ) ) throw uno::RuntimeException(); switch(aOrientation) @@ -303,7 +303,7 @@ ScVbaFormat<Ifc1>::setWrapText( const uno::Any& _aWrapText ) throw (script::Basi { try { - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ), _aWrapText); + mxPropertySet->setPropertyValue( OUString( SC_UNONAME_WRAP ), _aWrapText); } catch (const uno::Exception& ) { @@ -318,7 +318,7 @@ ScVbaFormat<Ifc1>::getWrapText( ) throw (script::BasicErrorException, uno::Runt uno::Any aWrap = aNULL(); try { - OUString aPropName( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ) ); + OUString aPropName( OUString( SC_UNONAME_WRAP ) ); if (!isAmbiguous( aPropName )) { aWrap = mxPropertySet->getPropertyValue(aPropName); @@ -367,7 +367,7 @@ ScVbaFormat<Ifc1>::getNumberFormatLocal( ) throw (script::BasicErrorException, uno::Any aRet = uno::makeAny( OUString() ); try { - OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); + OUString sPropName( SC_UNO_DP_NUMBERFO ); if (!isAmbiguous( sPropName )) { @@ -378,7 +378,7 @@ ScVbaFormat<Ifc1>::getNumberFormatLocal( ) throw (script::BasicErrorException, throw uno::RuntimeException(); OUString sFormat; - xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; + xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( FORMATSTRING )) >>= sFormat; aRet = uno::makeAny( sFormat.toAsciiLowerCase() ); } @@ -399,7 +399,7 @@ ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t { OUString sLocalFormatString; sal_Int32 nFormat = -1; - OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); + OUString sNumFormat( SC_UNO_DP_NUMBERFO ); if ( !(_oLocalFormatString >>= sLocalFormatString ) || !( mxPropertySet->getPropertyValue(sNumFormat) >>= nFormat ) ) throw uno::RuntimeException(); @@ -407,7 +407,7 @@ ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t sLocalFormatString = sLocalFormatString.toAsciiUpperCase(); initializeNumberFormats(); lang::Locale aRangeLocale; - xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; + xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( LOCALE ) ) >>= aRangeLocale; sal_Int32 nNewFormat = xNumberFormats->queryKey(sLocalFormatString, aRangeLocale, sal_True); if (nNewFormat == -1) @@ -440,9 +440,9 @@ ScVbaFormat<Ifc1>::setNumberFormat( const uno::Any& _oFormatString ) throw (scri nFormat = xNumberFormats->addNew(sFormatString, aDefaultLocale); lang::Locale aRangeLocale; - xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; + xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( LOCALE ) ) >>= aRangeLocale; sal_Int32 nNewFormat = xNumberFormatTypes->getFormatForLocale(nFormat, aRangeLocale); - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ), uno::makeAny( nNewFormat)); + mxPropertySet->setPropertyValue( OUString( SC_UNO_DP_NUMBERFO ), uno::makeAny( nNewFormat)); } catch (const uno::Exception& ) { @@ -462,12 +462,12 @@ ScVbaFormat<Ifc1>::setIndentLevel( const uno::Any& _aLevel ) throw (script::Basi throw uno::RuntimeException(); table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_STANDARD; - OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); + OUString sHoriJust( SC_UNONAME_CELLHJUS ); if ( !( mxPropertySet->getPropertyValue(sHoriJust) >>= aAPIAlignment ) ) throw uno::RuntimeException(); if (aAPIAlignment == table::CellHoriJustify_STANDARD) mxPropertySet->setPropertyValue( sHoriJust, uno::makeAny( table::CellHoriJustify_LEFT) ) ; - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ), uno::makeAny( sal_Int16(nLevel * 352.8) ) ); + mxPropertySet->setPropertyValue( OUString( SC_UNONAME_PINDENT ), uno::makeAny( sal_Int16(nLevel * 352.8) ) ); } catch (const uno::Exception& ) { @@ -482,7 +482,7 @@ ScVbaFormat<Ifc1>::getIndentLevel( ) throw (script::BasicErrorException, uno::R uno::Any NRetIndentLevel = aNULL(); try { - OUString sParaIndent( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ); + OUString sParaIndent( SC_UNONAME_PINDENT ); if (!isAmbiguous(sParaIndent)) { sal_Int16 IndentLevel = 0; @@ -509,7 +509,7 @@ ScVbaFormat<Ifc1>::setLocked( const uno::Any& _aLocked ) throw (script::BasicErr if ( !( _aLocked >>= bIsLocked ) ) throw uno::RuntimeException(); util::CellProtection aCellProtection; - OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( SC_UNONAME_CELLPRO ); mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection; aCellProtection.IsLocked = bIsLocked; mxPropertySet->setPropertyValue(sCellProt, uno::makeAny( aCellProtection ) ); @@ -529,7 +529,7 @@ ScVbaFormat<Ifc1>::setFormulaHidden( const uno::Any& FormulaHidden ) throw (scri sal_Bool bIsFormulaHidden = false; FormulaHidden >>= bIsFormulaHidden; util::CellProtection aCellProtection; - OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( SC_UNONAME_CELLPRO ); mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection; aCellProtection.IsFormulaHidden = bIsFormulaHidden; mxPropertySet->setPropertyValue(sCellProt,uno::makeAny(aCellProtection)); @@ -547,7 +547,7 @@ ScVbaFormat<Ifc1>::getLocked( ) throw (script::BasicErrorException, uno::Runtim uno::Any aCellProtection = aNULL(); try { - OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( SC_UNONAME_CELLPRO ); if (!isAmbiguous(sCellProt)) { @@ -581,7 +581,7 @@ ScVbaFormat<Ifc1>::getFormulaHidden( ) throw (script::BasicErrorException, uno: uno::Any aBoolRet = aNULL(); try { - OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( SC_UNONAME_CELLPRO ); if (!isAmbiguous(sCellProt)) { SfxItemSet* pDataSet = getCurrentDataSet(); @@ -613,7 +613,7 @@ ScVbaFormat<Ifc1>::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (script:: { try { - mxPropertySet->setPropertyValue(OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ), ShrinkToFit); + mxPropertySet->setPropertyValue(OUString( SC_UNONAME_SHRINK_TO_FIT ), ShrinkToFit); } catch (const uno::Exception& ) { @@ -629,7 +629,7 @@ ScVbaFormat<Ifc1>::getShrinkToFit( ) throw (script::BasicErrorException, uno::R uno::Any aRet = aNULL(); try { - OUString sShrinkToFit( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ); + OUString sShrinkToFit( SC_UNONAME_SHRINK_TO_FIT ); if (!isAmbiguous(sShrinkToFit)) aRet = mxPropertySet->getPropertyValue(sShrinkToFit); } @@ -664,7 +664,7 @@ ScVbaFormat<Ifc1>::setReadingOrder( const uno::Any& ReadingOrder ) throw (script default: DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } - mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( SC_UNONAME_WRITING ), aVal ); } catch (const uno::Exception& ) { @@ -680,7 +680,7 @@ ScVbaFormat<Ifc1>::getReadingOrder( ) throw (script::BasicErrorException, uno:: uno::Any NRetReadingOrder = aNULL(); try { - OUString sWritingMode( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ); + OUString sWritingMode( SC_UNONAME_WRITING ); if (!isAmbiguous(sWritingMode)) { text::WritingMode aWritingMode = text::WritingMode_LR_TB; @@ -713,7 +713,7 @@ ScVbaFormat< Ifc1 >::getNumberFormat( ) throw (script::BasicErrorException, uno try { sal_Int32 nFormat = -1; - OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); + OUString sNumFormat( SC_UNO_DP_NUMBERFO ); if (!isAmbiguous(sNumFormat) && ( mxPropertySet->getPropertyValue(sNumFormat) >>= nFormat) ) { @@ -721,7 +721,7 @@ ScVbaFormat< Ifc1 >::getNumberFormat( ) throw (script::BasicErrorException, uno sal_Int32 nNewFormat = xNumberFormatTypes->getFormatForLocale(nFormat, getDefaultLocale() ); OUString sFormat; - xNumberFormats->getByKey(nNewFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; + xNumberFormats->getByKey(nNewFormat)->getPropertyValue( OUString( FORMATSTRING )) >>= sFormat; aFormat = uno::makeAny( sFormat ); } } diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index da9f0bb6b633..6d014547d5be 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -35,17 +35,17 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -const static OUString VALIDATION( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_VALIDAT ) ); -const static OUString IGNOREBLANK( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_IGNOREBL ) ); -const static OUString SHOWINPUT( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWINP ) ); -const static OUString SHOWERROR( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWERR ) ); -const static OUString ERRORTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRTITLE ) ); -const static OUString INPUTTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPTITLE ) ); -const static OUString INPUTMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPMESS ) ); -const static OUString ERRORMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRMESS ) ); -const static OUString STYPE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TYPE ) ); -const static OUString SHOWLIST( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWLIST ) ); -const static OUString ALERTSTYLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRALSTY ) ); +const static OUString VALIDATION( SC_UNONAME_VALIDAT ); +const static OUString IGNOREBLANK( SC_UNONAME_IGNOREBL ); +const static OUString SHOWINPUT( SC_UNONAME_SHOWINP ); +const static OUString SHOWERROR( SC_UNONAME_SHOWERR ); +const static OUString ERRORTITLE( SC_UNONAME_ERRTITLE ); +const static OUString INPUTTITLE( SC_UNONAME_INPTITLE ); +const static OUString INPUTMESS( SC_UNONAME_INPMESS ); +const static OUString ERRORMESS( SC_UNONAME_ERRMESS ); +const static OUString STYPE( SC_UNONAME_TYPE ); +const static OUString SHOWLIST( SC_UNONAME_SHOWLIST ); +const static OUString ALERTSTYLE( SC_UNONAME_ERRALSTY ); static void lcl_setValidationProps( const uno::Reference< table::XCellRange >& xRange, const uno::Reference< beans::XPropertySet >& xProps ) diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index dab52fa8b631..caf68a06c856 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -309,7 +309,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) static sal_Int32 nCrudLen = sCrud.getLength(); OUString sTitle; - getFrameProps()->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) ) >>= sTitle; + getFrameProps()->getPropertyValue( OUString( SC_UNONAME_TITLE ) ) >>= sTitle; sal_Int32 nCrudIndex = sTitle.indexOf( sCrud ); // adjust title ( by removing crud ) // sCrud string present @@ -345,7 +345,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setCaption( const uno::Any& _caption ) throw (uno::RuntimeException) { - getFrameProps()->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TITLE ) ), _caption ); + getFrameProps()->setPropertyValue( OUString( SC_UNONAME_TITLE ), _caption ); } uno::Any SAL_CALL @@ -495,7 +495,7 @@ ScVbaWindow::RangeSelection() throw (script::BasicErrorException, uno::RuntimeEx ::sal_Bool SAL_CALL ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); + OUString sName( SC_UNO_SHOWGRID ); sal_Bool bGrid = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bGrid; return bGrid; @@ -505,14 +505,14 @@ ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayGridlines( ::sal_Bool _displaygridlines ) throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); + OUString sName( SC_UNO_SHOWGRID ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _displaygridlines )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); + OUString sName( SC_UNO_COLROWHDR ); sal_Bool bHeading = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bHeading; return bHeading; @@ -521,14 +521,14 @@ ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayHeadings( ::sal_Bool _bDisplayHeadings ) throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); + OUString sName( SC_UNO_COLROWHDR ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHeadings )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); + OUString sName( SC_UNO_HORSCROLL ); sal_Bool bHorizontalScrollBar = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bHorizontalScrollBar; return bHorizontalScrollBar; @@ -537,14 +537,14 @@ ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayHorizontalScrollBar( ::sal_Bool _bDisplayHorizontalScrollBar ) throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); + OUString sName( SC_UNO_HORSCROLL ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHorizontalScrollBar )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); + OUString sName( SC_UNO_OUTLSYMB ); sal_Bool bOutline = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bOutline; return bOutline; @@ -553,14 +553,14 @@ ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayOutline( ::sal_Bool _bDisplayOutline ) throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); + OUString sName( SC_UNO_OUTLSYMB ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayOutline )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); + OUString sName( SC_UNO_VERTSCROLL ); sal_Bool bVerticalScrollBar = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bVerticalScrollBar; return bVerticalScrollBar; @@ -569,14 +569,14 @@ ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayVerticalScrollBar( ::sal_Bool _bDisplayVerticalScrollBar ) throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); + OUString sName( SC_UNO_VERTSCROLL ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayVerticalScrollBar )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); + OUString sName( SC_UNO_SHEETTABS ); sal_Bool bWorkbookTabs = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bWorkbookTabs; return bWorkbookTabs; @@ -585,7 +585,7 @@ ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (uno::RuntimeException) { - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); + OUString sName( SC_UNO_SHEETTABS ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayWorkbookTabs )); } @@ -731,7 +731,7 @@ uno::Any SAL_CALL ScVbaWindow::getZoom() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = getControllerProps(); - OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ZOOMTYPE ) ); + OUString sName( SC_UNO_ZOOMTYPE ); sal_Int16 nZoomType = view::DocumentZoomType::PAGE_WIDTH; xProps->getPropertyValue( sName ) >>= nZoomType; if( nZoomType == view::DocumentZoomType::PAGE_WIDTH ) @@ -740,7 +740,7 @@ ScVbaWindow::getZoom() throw (uno::RuntimeException) } else if( nZoomType == view::DocumentZoomType::BY_VALUE ) { - sName = OUString( RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ZOOMVALUE)); + sName = OUString( SC_UNO_ZOOMVALUE); sal_Int16 nZoom = 100; xProps->getPropertyValue( sName ) >>= nZoom; return uno::makeAny( nZoom ); diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 5f191ac70425..5198fc8b53ff 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -345,7 +345,7 @@ ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/ sFormat = OUString::valueOf( (sal_Int32)nDelim ) + sRestOfFormat; sProps[ nIndex++ ].Value <<= sFormat; sProps[ nIndex ].Name = OUString("FilterName"); - sProps[ nIndex++ ].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM("Text - txt - csv (StarCalc)") ); + sProps[ nIndex++ ].Value <<= OUString( "Text - txt - csv (StarCalc)" ); // Ensure WORKAROUND_CSV_TXT_BUG_i60158 gets called in typedetection.cxx so // csv is forced for deep detected 'writerxxx' types sProps[ nIndex ].Name = OUString("DocumentService"); diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 4c9a1fa96bb7..f96df2ffc0ac 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -111,7 +111,7 @@ using namespace ooo::vba; static void getNewSpreadsheetName (OUString &aNewName, OUString aOldName, uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc ) { if (!xSpreadDoc.is()) - throw lang::IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( "getNewSpreadsheetName() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); + throw lang::IllegalArgumentException( OUString( "getNewSpreadsheetName() xSpreadDoc is null" ), uno::Reference< uno::XInterface >(), 1 ); static OUString aUnderScore( "_" ); int currentNum =2; aNewName = aOldName + aUnderScore + OUString::number(currentNum) ; @@ -125,7 +125,7 @@ static void getNewSpreadsheetName (OUString &aNewName, OUString aOldName, uno::R static void removeAllSheets( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, OUString aSheetName) { if (!xSpreadDoc.is()) - throw lang::IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( "removeAllSheets() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); + throw lang::IllegalArgumentException( OUString( "removeAllSheets() xSpreadDoc is null" ), uno::Reference< uno::XInterface >(), 1 ); uno::Reference<sheet::XSpreadsheets> xSheets = xSpreadDoc->getSheets(); uno::Reference <container::XIndexAccess> xIndex( xSheets, uno::UNO_QUERY ); diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 581f14f030e3..bb6d23ee6b3e 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -491,7 +491,7 @@ ScVbaWorksheets::getServiceNames() bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException ) { if (!xSpreadDoc.is()) - throw lang::IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( "nameExists() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); + throw lang::IllegalArgumentException( OUString( "nameExists() xSpreadDoc is null" ), uno::Reference< uno::XInterface >(), 1 ); uno::Reference <container::XIndexAccess> xIndex( xSpreadDoc->getSheets(), uno::UNO_QUERY ); if ( xIndex.is() ) { diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 6338805a6617..96a08ce284f5 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -2048,7 +2048,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet if (!xPropSet.is()) continue; - Any any = xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_NUMBERFO)) ); + Any any = xPropSet->getPropertyValue( OUString(SC_UNO_DP_NUMBERFO) ); sal_Int32 nNumFmt = 0; if (!(any >>= nNumFmt)) continue; diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 7a4863bbbd36..f5d7e9ed200d 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -112,45 +112,45 @@ void ScViewDataTable::WriteUserDataSequence(uno::Sequence <beans::PropertyValue> beans::PropertyValue* pSettings = rSettings.getArray(); if (pSettings) { - pSettings[SC_CURSOR_X].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURSORPOSITIONX)); + pSettings[SC_CURSOR_X].Name = OUString(SC_CURSORPOSITIONX); pSettings[SC_CURSOR_X].Value <<= sal_Int32(nCurX); - pSettings[SC_CURSOR_Y].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURSORPOSITIONY)); + pSettings[SC_CURSOR_Y].Name = OUString(SC_CURSORPOSITIONY); pSettings[SC_CURSOR_Y].Value <<= sal_Int32(nCurY); - pSettings[SC_HORIZONTAL_SPLIT_MODE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSPLITMODE)); + pSettings[SC_HORIZONTAL_SPLIT_MODE].Name = OUString(SC_HORIZONTALSPLITMODE); pSettings[SC_HORIZONTAL_SPLIT_MODE].Value <<= sal_Int16(eHSplitMode); - pSettings[SC_VERTICAL_SPLIT_MODE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VERTICALSPLITMODE)); + pSettings[SC_VERTICAL_SPLIT_MODE].Name = OUString(SC_VERTICALSPLITMODE); pSettings[SC_VERTICAL_SPLIT_MODE].Value <<= sal_Int16(eVSplitMode); - pSettings[SC_HORIZONTAL_SPLIT_POSITION].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSPLITPOSITION)); + pSettings[SC_HORIZONTAL_SPLIT_POSITION].Name = OUString(SC_HORIZONTALSPLITPOSITION); if (eHSplitMode == SC_SPLIT_FIX) pSettings[SC_HORIZONTAL_SPLIT_POSITION].Value <<= sal_Int32(nFixPosX); else pSettings[SC_HORIZONTAL_SPLIT_POSITION].Value <<= sal_Int32(nHSplitPos); - pSettings[SC_VERTICAL_SPLIT_POSITION].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VERTICALSPLITPOSITION)); + pSettings[SC_VERTICAL_SPLIT_POSITION].Name = OUString(SC_VERTICALSPLITPOSITION); if (eVSplitMode == SC_SPLIT_FIX) pSettings[SC_VERTICAL_SPLIT_POSITION].Value <<= sal_Int32(nFixPosY); else pSettings[SC_VERTICAL_SPLIT_POSITION].Value <<= sal_Int32(nVSplitPos); - pSettings[SC_ACTIVE_SPLIT_RANGE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVESPLITRANGE)); + pSettings[SC_ACTIVE_SPLIT_RANGE].Name = OUString(SC_ACTIVESPLITRANGE); pSettings[SC_ACTIVE_SPLIT_RANGE].Value <<= sal_Int16(eWhichActive); - pSettings[SC_POSITION_LEFT].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONLEFT)); + pSettings[SC_POSITION_LEFT].Name = OUString(SC_POSITIONLEFT); pSettings[SC_POSITION_LEFT].Value <<= sal_Int32(nPosX[SC_SPLIT_LEFT]); - pSettings[SC_POSITION_RIGHT].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONRIGHT)); + pSettings[SC_POSITION_RIGHT].Name = OUString(SC_POSITIONRIGHT); pSettings[SC_POSITION_RIGHT].Value <<= sal_Int32(nPosX[SC_SPLIT_RIGHT]); - pSettings[SC_POSITION_TOP].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONTOP)); + pSettings[SC_POSITION_TOP].Name = OUString(SC_POSITIONTOP); pSettings[SC_POSITION_TOP].Value <<= sal_Int32(nPosY[SC_SPLIT_TOP]); - pSettings[SC_POSITION_BOTTOM].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONBOTTOM)); + pSettings[SC_POSITION_BOTTOM].Name = OUString(SC_POSITIONBOTTOM); pSettings[SC_POSITION_BOTTOM].Value <<= sal_Int32(nPosY[SC_SPLIT_BOTTOM]); sal_Int32 nZoomValue ((aZoomY.GetNumerator() * 100) / aZoomY.GetDenominator()); sal_Int32 nPageZoomValue ((aPageZoomY.GetNumerator() * 100) / aPageZoomY.GetDenominator()); - pSettings[SC_TABLE_ZOOM_TYPE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMTYPE)); + pSettings[SC_TABLE_ZOOM_TYPE].Name = OUString(SC_ZOOMTYPE); pSettings[SC_TABLE_ZOOM_TYPE].Value <<= sal_Int16(eZoomType); - pSettings[SC_TABLE_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMVALUE)); + pSettings[SC_TABLE_ZOOM_VALUE].Name = OUString(SC_ZOOMVALUE); pSettings[SC_TABLE_ZOOM_VALUE].Value <<= nZoomValue; - pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE)); + pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Name = OUString(SC_PAGEVIEWZOOMVALUE); pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue; - pSettings[SC_TABLE_SHOWGRID].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID)); + pSettings[SC_TABLE_SHOWGRID].Name = OUString(SC_UNO_SHOWGRID); pSettings[SC_TABLE_SHOWGRID].Value <<= static_cast<sal_Bool>(bShowGrid); } } @@ -2613,8 +2613,8 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe if (pSettings) { sal_uInt16 nViewID(pViewShell->GetViewFrame()->GetCurViewId()); - pSettings[SC_VIEW_ID].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VIEWID)); - OUStringBuffer sBuffer(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VIEW))); + pSettings[SC_VIEW_ID].Name = OUString(SC_VIEWID); + OUStringBuffer sBuffer(OUString(SC_VIEW)); ::sax::Converter::convertNumber(sBuffer, static_cast<sal_Int32>(nViewID)); pSettings[SC_VIEW_ID].Value <<= sBuffer.makeStringAndClear(); @@ -2646,61 +2646,61 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe } } } - pSettings[SC_TABLE_VIEWSETTINGS].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_TABLES)); + pSettings[SC_TABLE_VIEWSETTINGS].Name = OUString(SC_TABLES); pSettings[SC_TABLE_VIEWSETTINGS].Value <<= xNameContainer; OUString sName; GetDocument()->GetName( nTabNo, sName ); - pSettings[SC_ACTIVE_TABLE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVETABLE)); + pSettings[SC_ACTIVE_TABLE].Name = OUString(SC_ACTIVETABLE); pSettings[SC_ACTIVE_TABLE].Value <<= sName; - pSettings[SC_HORIZONTAL_SCROLL_BAR_WIDTH].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSCROLLBARWIDTH)); + pSettings[SC_HORIZONTAL_SCROLL_BAR_WIDTH].Name = OUString(SC_HORIZONTALSCROLLBARWIDTH); pSettings[SC_HORIZONTAL_SCROLL_BAR_WIDTH].Value <<= sal_Int32(pView->GetTabBarWidth()); sal_Int32 nZoomValue ((pThisTab->aZoomY.GetNumerator() * 100) / pThisTab->aZoomY.GetDenominator()); sal_Int32 nPageZoomValue ((pThisTab->aPageZoomY.GetNumerator() * 100) / pThisTab->aPageZoomY.GetDenominator()); - pSettings[SC_ZOOM_TYPE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMTYPE)); + pSettings[SC_ZOOM_TYPE].Name = OUString(SC_ZOOMTYPE); pSettings[SC_ZOOM_TYPE].Value <<= sal_Int16(pThisTab->eZoomType); - pSettings[SC_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMVALUE)); + pSettings[SC_ZOOM_VALUE].Name = OUString(SC_ZOOMVALUE); pSettings[SC_ZOOM_VALUE].Value <<= nZoomValue; - pSettings[SC_PAGE_VIEW_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE)); + pSettings[SC_PAGE_VIEW_ZOOM_VALUE].Name = OUString(SC_PAGEVIEWZOOMVALUE); pSettings[SC_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue; - pSettings[SC_PAGE_BREAK_PREVIEW].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SHOWPAGEBREAKPREVIEW)); + pSettings[SC_PAGE_BREAK_PREVIEW].Name = OUString(SC_SHOWPAGEBREAKPREVIEW); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_PAGE_BREAK_PREVIEW].Value, bPagebreak); if (pOptions) { - pSettings[SC_SHOWZERO].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWZERO)); + pSettings[SC_SHOWZERO].Name = OUString(SC_UNO_SHOWZERO); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWZERO].Value, pOptions->GetOption( VOPT_NULLVALS ) ); - pSettings[SC_SHOWNOTES].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWNOTES)); + pSettings[SC_SHOWNOTES].Name = OUString(SC_UNO_SHOWNOTES); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWNOTES].Value, pOptions->GetOption( VOPT_NOTES ) ); - pSettings[SC_SHOWGRID].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID)); + pSettings[SC_SHOWGRID].Name = OUString(SC_UNO_SHOWGRID); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWGRID].Value, pOptions->GetOption( VOPT_GRID ) ); - pSettings[SC_GRIDCOLOR].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_GRIDCOLOR)); + pSettings[SC_GRIDCOLOR].Name = OUString(SC_UNO_GRIDCOLOR); String aColorName; Color aColor = pOptions->GetGridColor(&aColorName); pSettings[SC_GRIDCOLOR].Value <<= static_cast<sal_Int64>(aColor.GetColor()); - pSettings[SC_SHOWPAGEBR].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWPAGEBR)); + pSettings[SC_SHOWPAGEBR].Name = OUString(SC_UNO_SHOWPAGEBR); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWPAGEBR].Value, pOptions->GetOption( VOPT_PAGEBREAKS ) ); - pSettings[SC_COLROWHDR].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COLROWHDR)); + pSettings[SC_COLROWHDR].Name = OUString(SC_UNO_COLROWHDR); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_COLROWHDR].Value, pOptions->GetOption( VOPT_HEADER ) ); - pSettings[SC_SHEETTABS].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHEETTABS)); + pSettings[SC_SHEETTABS].Name = OUString(SC_UNO_SHEETTABS); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHEETTABS].Value, pOptions->GetOption( VOPT_TABCONTROLS ) ); - pSettings[SC_OUTLSYMB].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_OUTLSYMB)); + pSettings[SC_OUTLSYMB].Name = OUString(SC_UNO_OUTLSYMB); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_OUTLSYMB].Value, pOptions->GetOption( VOPT_OUTLINER ) ); const ScGridOptions& aGridOpt = pOptions->GetGridOptions(); - pSettings[SC_SNAPTORASTER].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SNAPTORASTER)); + pSettings[SC_SNAPTORASTER].Name = OUString(SC_UNO_SNAPTORASTER); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SNAPTORASTER].Value, aGridOpt.GetUseGridSnap() ); - pSettings[SC_RASTERVIS].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERVIS)); + pSettings[SC_RASTERVIS].Name = OUString(SC_UNO_RASTERVIS); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERVIS].Value, aGridOpt.GetGridVisible() ); - pSettings[SC_RASTERRESX].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERRESX)); + pSettings[SC_RASTERRESX].Name = OUString(SC_UNO_RASTERRESX); pSettings[SC_RASTERRESX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawX() ); - pSettings[SC_RASTERRESY].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERRESY)); + pSettings[SC_RASTERRESY].Name = OUString(SC_UNO_RASTERRESY); pSettings[SC_RASTERRESY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawY() ); - pSettings[SC_RASTERSUBX].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSUBX)); + pSettings[SC_RASTERSUBX].Name = OUString(SC_UNO_RASTERSUBX); pSettings[SC_RASTERSUBX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionX() ); - pSettings[SC_RASTERSUBY].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSUBY)); + pSettings[SC_RASTERSUBY].Name = OUString(SC_UNO_RASTERSUBY); pSettings[SC_RASTERSUBY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionY() ); - pSettings[SC_RASTERSYNC].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSYNC)); + pSettings[SC_RASTERSYNC].Name = OUString(SC_UNO_RASTERSYNC); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERSYNC].Value, aGridOpt.GetSynchronize() ); } } |