diff options
Diffstat (limited to 'sc')
43 files changed, 109 insertions, 109 deletions
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 85d4801519b7..906c49400784 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -84,7 +84,7 @@ void ScMacrosTest::testStarBasic() CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is()); - rtl::OUString aURL(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document")); + rtl::OUString aURL("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document"); String sUrl = aURL; Any aRet; Sequence< sal_Int16 > aOutParamIndex; diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx index d404d335c97c..771f7e33296b 100644 --- a/sc/qa/extras/regression-test.cxx +++ b/sc/qa/extras/regression-test.cxx @@ -103,7 +103,7 @@ private: void ScChartRegressionTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath) { - rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM("/")); + rtl::OUString aSep("/"); rtl::OUStringBuffer aBuffer( getSrcRootURL() ); aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension); aBuffer.append(aSep).append(aFileBase).append(aFileExtension); diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index a65a04878b9a..a3e925a17f12 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -88,7 +88,7 @@ ScCellRangeObj::ScCellRangeObj(): uno::Reference< uno::XInterface > ScCellRangeObj::init() { rtl::OUString aFileURL; - const rtl::OUString aFileBase(RTL_CONSTASCII_USTRINGPARAM("xcellrangesquery.ods")); + const rtl::OUString aFileBase("xcellrangesquery.ods"); createFileURL(aFileBase, aFileURL); std::cout << rtl::OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; if( !mxComponent.is()) @@ -108,7 +108,7 @@ uno::Reference< uno::XInterface > ScCellRangeObj::init() uno::Reference< uno::XInterface > ScCellRangeObj::getXCellRangeData() { rtl::OUString aFileURL; - const rtl::OUString aFileBase(RTL_CONSTASCII_USTRINGPARAM("xcellrangesquery.ods")); + const rtl::OUString aFileBase("xcellrangesquery.ods"); createFileURL(aFileBase, aFileURL); std::cout << rtl::OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; if( !mxComponent.is()) diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx index 8403c051b076..892db8e1ec64 100644 --- a/sc/qa/extras/scnamedrangeobj.cxx +++ b/sc/qa/extras/scnamedrangeobj.cxx @@ -88,7 +88,7 @@ uno::Reference< sheet::XNamedRanges > ScNamedRangeObj::init_impl() CPPUNIT_ASSERT(mxComponent.is()); uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW); - rtl::OUString aNamedRangesPropertyString(RTL_CONSTASCII_USTRINGPARAM("NamedRanges")); + rtl::OUString aNamedRangesPropertyString("NamedRanges"); uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(aNamedRangesPropertyString), UNO_QUERY_THROW); CPPUNIT_ASSERT(xNamedRanges.is()); diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index b52962d85115..05424366c59d 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -76,7 +76,7 @@ uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet) CPPUNIT_ASSERT(mxComponent.is()); uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW); - rtl::OUString aNamedRangesPropertyString(RTL_CONSTASCII_USTRINGPARAM("NamedRanges")); + rtl::OUString aNamedRangesPropertyString("NamedRanges"); uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(aNamedRangesPropertyString), UNO_QUERY_THROW); //set value from xnamedranges.hxx diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 3b23c60f19d5..191feb5ad7d1 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -242,7 +242,7 @@ void ScFiltersTest::testRangeNameODS() ScDocument* pDoc = xDocSh->GetDocument(); testRangeNameImpl(pDoc); - OUString aSheet2CSV(RTL_CONSTASCII_USTRINGPARAM("rangeExp_Sheet2.")); + OUString aSheet2CSV("rangeExp_Sheet2."); OUString aCSVPath; createCSVPath( aSheet2CSV, aCSVPath ); testFile( aCSVPath, pDoc, 1); diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index 5325bbc37850..8261358835d1 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -189,7 +189,7 @@ public: ScBootstrapFixture( const OUString& rsBaseString ) : m_aBaseString( rsBaseString ) {} void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath) { - OUString aSep(RTL_CONSTASCII_USTRINGPARAM("/")); + OUString aSep("/"); OUStringBuffer aBuffer( getSrcRootURL() ); aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension); aBuffer.append(aSep).append(aFileBase).append(aFileExtension); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 0bb7645944e5..d7cf013bee23 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -292,7 +292,7 @@ void ScFiltersTest::testRangeNameXLS() ScDocument* pDoc = xDocSh->GetDocument(); testRangeNameImpl(pDoc); - OUString aSheet2CSV(RTL_CONSTASCII_USTRINGPARAM("rangeExp_Sheet2.")); + OUString aSheet2CSV("rangeExp_Sheet2."); OUString aCSVPath; createCSVPath( aSheet2CSV, aCSVPath ); // fdo#44587 @@ -1152,7 +1152,7 @@ void ScFiltersTest::testDataValidityODS() void ScFiltersTest::testBrokenQuotesCSV() { - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("fdo48621_broken_quotes.")); + const OUString aFileNameBase("fdo48621_broken_quotes."); OUString aFileExtension(aFileFormats[CSV].pName, strlen(aFileFormats[CSV].pName), RTL_TEXTENCODING_UTF8 ); OUString aFilterName(aFileFormats[CSV].pFilterName, strlen(aFileFormats[CSV].pFilterName), RTL_TEXTENCODING_UTF8) ; OUString aFileName; @@ -1169,7 +1169,7 @@ void ScFiltersTest::testBrokenQuotesCSV() ScDocument* pDoc = xDocSh->GetDocument(); CPPUNIT_ASSERT_MESSAGE("No Document", pDoc); //remove with first test - OUString aSheet2CSV(RTL_CONSTASCII_USTRINGPARAM("fdo48621_broken_quotes_exported.")); + OUString aSheet2CSV("fdo48621_broken_quotes_exported."); OUString aCSVPath; createCSVPath( aSheet2CSV, aCSVPath ); // fdo#48621 @@ -1180,7 +1180,7 @@ void ScFiltersTest::testBrokenQuotesCSV() void ScFiltersTest::testSharedFormulaXLSX() { - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("shared-formula.")); + const OUString aFileNameBase("shared-formula."); OUString aFileExtension(aFileFormats[XLSX].pName, strlen(aFileFormats[XLSX].pName), RTL_TEXTENCODING_UTF8 ); OUString aFilterName(aFileFormats[XLSX].pFilterName, strlen(aFileFormats[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ; OUString aFileName; @@ -1215,7 +1215,7 @@ void ScFiltersTest::testSharedFormulaXLSX() void ScFiltersTest::testCellValueXLSX() { - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("cell-value.")); + const OUString aFileNameBase("cell-value."); OUString aFileExtension(aFileFormats[XLSX].pName, strlen(aFileFormats[XLSX].pName), RTL_TEXTENCODING_UTF8 ); OUString aFilterName(aFileFormats[XLSX].pFilterName, strlen(aFileFormats[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ; OUString aFileName; @@ -1276,14 +1276,14 @@ void ScFiltersTest::testPassword_Impl(const OUString& aFileNameBase) void ScFiltersTest::testPasswordNew() { //tests opening a file with new password algorithm - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("password.")); + const OUString aFileNameBase("password."); testPassword_Impl(aFileNameBase); } void ScFiltersTest::testPasswordOld() { //tests opening a file with old password algorithm - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("passwordOld.")); + const OUString aFileNameBase("passwordOld."); testPassword_Impl(aFileNameBase); } @@ -1777,7 +1777,7 @@ void testColorScale_Impl(ScDocument* pDoc, const OUString& aBaseString) void ScFiltersTest::testColorScaleODS() { - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("colorScale.")); + const OUString aFileNameBase("colorScale."); OUString aFileExtension(aFileFormats[ODS].pName, strlen(aFileFormats[ODS].pName), RTL_TEXTENCODING_UTF8 ); OUString aFilterName(aFileFormats[ODS].pFilterName, strlen(aFileFormats[ODS].pFilterName), RTL_TEXTENCODING_UTF8) ; OUString aFileName; @@ -1803,7 +1803,7 @@ void ScFiltersTest::testColorScaleODS() void ScFiltersTest::testColorScaleXLSX() { - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("colorScale.")); + const OUString aFileNameBase("colorScale."); OUString aFileExtension(aFileFormats[XLSX].pName, strlen(aFileFormats[XLSX].pName), RTL_TEXTENCODING_UTF8 ); OUString aFilterName(aFileFormats[XLSX].pFilterName, strlen(aFileFormats[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ; OUString aFileName; diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index c031418f6e92..0198db842c4f 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -1168,7 +1168,7 @@ OUString XclExpXmlStream::implGetImplementationName() const Sequence< OUString > SAL_CALL XlsxExport_getSupportedServiceNames() throw() { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportFilter" ) ); + const OUString aServiceName( "com.sun.star.document.ExportFilter" ); const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index 0c2f9c10b28a..fd02260ae039 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -167,7 +167,7 @@ bool ScCTB::ImportMenuTB( ScCTBWrapper& rWrapper, const css::uno::Reference< css bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelper& helper ) { - static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) ); + static rtl::OUString sToolbarPrefix( "private:resource/toolbar/custom_" ); bool bRes = false; try { diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 7982f1d378e5..83ea5bfd9cb4 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -2232,9 +2232,9 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo ) { // Pick up the number format associated with this class (if // any). - rtl::OUString aElem(RTL_CONSTASCII_USTRINGPARAM("td")); + rtl::OUString aElem("td"); rtl::OUString aClass = itr->GetString(); - rtl::OUString aProp(RTL_CONSTASCII_USTRINGPARAM("mso-number-format")); + rtl::OUString aProp("mso-number-format"); const ScHTMLStyles& rStyles = mpParser->GetStyles(); const rtl::OUString& rVal = rStyles.getPropertyValue(aElem, aClass, aProp); rtl::OUString aNumFmt = decodeNumberFormat(rVal); diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index 4e20ab3f3fe4..4f07cf772766 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -200,7 +200,7 @@ FltError ImportLotus::Read() SCTAB nCnt; rtl::OUString aTabName; rtl::OUString aBaseName; - rtl::OUString aRef( RTL_CONSTASCII_USTRINGPARAM( "temp" ) ); + rtl::OUString aRef( "temp" ); if( nTabs != 0 ) { if( nTabs > 1 ) diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index 2864b0ffeb36..790e2f6251e0 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx @@ -30,7 +30,7 @@ sal_Bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, String& rCodeN if( !(aAny >>= aProps) ) return false; - OUString sCodeNameProp( RTL_CONSTASCII_USTRINGPARAM("CodeName") ); + OUString sCodeNameProp("CodeName"); sal_Int32 nPropCount = aProps.getLength(); for( sal_Int32 i=0; i<nPropCount; i++ ) { @@ -165,7 +165,7 @@ uno::Type SAL_CALL XMLCodeNameProvider::getElementType( ) void XMLCodeNameProvider::set( const uno::Reference< container::XNameAccess>& xNameAccess, ScDocument *pDoc ) { uno::Any aAny; - OUString sDocName( RTL_CONSTASCII_USTRINGPARAM("*doc*") ); + OUString sDocName("*doc*"); String sCodeName; if( xNameAccess->hasByName( sDocName ) ) { diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 3ee937109f72..c8a1e084a80f 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -163,7 +163,7 @@ bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, { sal_Int32 nNameIndex(nCount + 1); rtl::OUString sCount(rtl::OUString::valueOf(nNameIndex)); - rtl::OUString sPrefix(RTL_CONSTASCII_USTRINGPARAM("val")); + rtl::OUString sPrefix("val"); aValidation.sName += sPrefix; aValidation.sName += sCount; aValidationVec.push_back(aValidation); diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx index 89c80bf6454f..33e0203dfecd 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.cxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx @@ -123,7 +123,7 @@ void ScMyOLEFixer::FixupOLEs() { if (!aShapes.empty() && rImport.GetModel().is()) { - rtl::OUString sPersistName (RTL_CONSTASCII_USTRINGPARAM("PersistName")); + rtl::OUString sPersistName ("PersistName"); ScMyToFixupOLEs::iterator aItr(aShapes.begin()); ScMyToFixupOLEs::iterator aEndItr(aShapes.end()); ScDocument* pDoc(rImport.GetDocument()); diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 091b66fd3d5c..3a0697b61e66 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -418,7 +418,7 @@ void ScXMLContentValidationContext::EndElement() // #i36650# event-listeners element moved up one level if (xEventContext.Is()) { - rtl::OUString sOnError(RTL_CONSTASCII_USTRINGPARAM("OnError")); + rtl::OUString sOnError("OnError"); XMLEventsImportContext* pEvents = (XMLEventsImportContext*)&xEventContext; uno::Sequence<beans::PropertyValue> aValues; diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 1d55a64526e9..3fd048b87040 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3006,9 +3006,9 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, { uno::Reference < beans::XPropertySet > xShapeProps ( xShape, uno::UNO_QUERY ); bool bIsChart( false ); - rtl::OUString sPropCLSID (RTL_CONSTASCII_USTRINGPARAM("CLSID")); - rtl::OUString sPropModel (RTL_CONSTASCII_USTRINGPARAM("Model")); - rtl::OUString sPersistName (RTL_CONSTASCII_USTRINGPARAM("PersistName")); + rtl::OUString sPropCLSID ("CLSID"); + rtl::OUString sPropModel ("Model"); + rtl::OUString sPersistName ("PersistName"); if (xShapeProps.is()) { sal_Int32 nZOrder = 0; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index c57810805c9f..14c022daf5b0 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -2528,9 +2528,9 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa if (xMultiServiceFactory.is()) { sal_Int32 nCount(aConfigProps.getLength()); - rtl::OUString sCTName(RTL_CONSTASCII_USTRINGPARAM("TrackedChangesProtectionKey")); - rtl::OUString sVBName(RTL_CONSTASCII_USTRINGPARAM("VBACompatibilityMode")); - rtl::OUString sSCName(RTL_CONSTASCII_USTRINGPARAM("ScriptConfiguration")); + rtl::OUString sCTName("TrackedChangesProtectionKey"); + rtl::OUString sVBName("VBACompatibilityMode"); + rtl::OUString sSCName("ScriptConfiguration"); for (sal_Int32 i = nCount - 1; i >= 0; --i) { if (aConfigProps[i].Name == sCTName) @@ -2613,7 +2613,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri } catch ( const util::MalformedNumberFormatException& rException ) { - rtl::OUString sErrorMessage(RTL_CONSTASCII_USTRINGPARAM("Fehler im Formatstring ")); + rtl::OUString sErrorMessage("Fehler im Formatstring "); sErrorMessage += sFormatString; sErrorMessage += rtl::OUString(" an Position "); sErrorMessage += rtl::OUString::valueOf(rException.CheckPos); diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index a0904fe90c1d..486f0b2911c0 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -714,7 +714,7 @@ void ScXMLAutoStylePoolP::exportStyleContent( { if (aOperator == sheet::ConditionOperator_FORMULA) { - rtl::OUString sCondition(RTL_CONSTASCII_USTRINGPARAM("is-true-formula(")); + rtl::OUString sCondition("is-true-formula("); sCondition += xSheetCondition->getFormula1(); sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_CONDITION, sCondition); @@ -812,7 +812,7 @@ void ScXMLStyleExport::exportStyleAttributes( if (xPropSet.is()) { uno::Reference< beans::XPropertySetInfo > xPropSetInfo(xPropSet->getPropertySetInfo()); - rtl::OUString sNumberFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")); + rtl::OUString sNumberFormat("NumberFormat"); if( xPropSetInfo->hasPropertyByName( sNumberFormat ) ) { uno::Reference< beans::XPropertyState > xPropState( xPropSet, uno::UNO_QUERY ); diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 2aca9fda70d4..02d88a38f128 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -163,7 +163,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe OSL_ENSURE( xInfoSet.is(), "missing property set" ); if( xInfoSet.is() ) { - rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("StreamName") ); + rtl::OUString sPropName("StreamName"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( sStream ) ); } @@ -374,7 +374,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) if( xParentSet.is() ) { uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xParentSet->getPropertySetInfo() ); - OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BuildId" ) ); + OUString sPropName("BuildId" ); if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(sPropName) ) { xInfoSet->setPropertyValue( sPropName, xParentSet->getPropertyValue(sPropName) ); @@ -395,7 +395,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) // Set base URI OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" ); ::rtl::OUString aBaseURL = pMedium ? pMedium->GetBaseURL() : ::rtl::OUString(); - rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BaseURI") ); + rtl::OUString sPropName("BaseURI"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) ); // TODO/LATER: do not do it for embedded links @@ -602,7 +602,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) if( xModelSet.is() ) { uno::Reference< beans::XPropertySetInfo > xModelSetInfo( xModelSet->getPropertySetInfo() ); - OUString sBuildPropName( RTL_CONSTASCII_USTRINGPARAM("BuildId" ) ); + OUString sBuildPropName("BuildId" ); if( xModelSetInfo.is() && xModelSetInfo->hasPropertyByName(sBuildPropName) ) { xModelSet->setPropertyValue( sBuildPropName, xInfoSet->getPropertyValue(sBuildPropName) ); @@ -683,7 +683,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic if (xSet.is()) { xSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(sMediaType)); - OUString aUseCommonPassPropName( RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") ); + OUString aUseCommonPassPropName("UseCommonStoragePasswordEncryption"); // advise storage impl to use common encryption xSet->setPropertyValue( aUseCommonPassPropName, uno::makeAny(sal_True) ); @@ -699,7 +699,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic OSL_ENSURE( xInfoSet.is(), "missing property set" ); if( xInfoSet.is() ) { - rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("StreamName") ); + rtl::OUString sPropName("StreamName"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( sName ) ); } @@ -788,7 +788,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) xStorage = pMedium->GetOutputStorage(); OUString sFileName; - OUString sTextMediaType(RTL_CONSTASCII_USTRINGPARAM("text/xml")); + OUString sTextMediaType("text/xml"); if (pMedium) sFileName = pMedium->GetName(); SfxObjectShell* pObjSh = rDoc.GetDocumentShell(); @@ -830,18 +830,18 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) sal_Bool bUsePrettyPrinting(aSaveOpt.IsPrettyPrinting()); xInfoSet->setPropertyValue("UsePrettyPrinting", uno::makeAny(bUsePrettyPrinting)); - const OUString sTargetStorage( RTL_CONSTASCII_USTRINGPARAM("TargetStorage") ); + const OUString sTargetStorage("TargetStorage"); xInfoSet->setPropertyValue( sTargetStorage, uno::Any( xStorage ) ); OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" ); ::rtl::OUString aBaseURL = pMedium ? pMedium->GetBaseURL( true ) : ::rtl::OUString(); - rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BaseURI") ); + rtl::OUString sPropName("BaseURI"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) ); // TODO/LATER: do not do it for embedded links if( SFX_CREATE_MODE_EMBEDDED == pObjSh->GetCreateMode() ) { - OUString aName(RTL_CONSTASCII_USTRINGPARAM("dummyObjectName")); + OUString aName("dummyObjectName"); if ( pMedium && pMedium->GetItemSet() ) { const SfxStringItem* pDocHierarchItem = static_cast<const SfxStringItem*>( diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 1fdd9e3933db..6ac43354cb71 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -152,9 +152,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropButtonType(RTL_CONSTASCII_USTRINGPARAM( "ButtonType" )); - rtl::OUString sPropTargetURL(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" )); - rtl::OUString sPropLabel(RTL_CONSTASCII_USTRINGPARAM( "Label" )); + rtl::OUString sPropButtonType( "ButtonType" ); + rtl::OUString sPropTargetURL( "TargetURL" ); + rtl::OUString sPropLabel( "Label" ); if(xInfo->hasPropertyByName( sPropButtonType )) { @@ -537,7 +537,7 @@ sal_Bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUse try { uno::Sequence < beans::PropertyValue > aSeq; - ::rtl::OUString aDummyName(RTL_CONSTASCII_USTRINGPARAM("Dummy")); + ::rtl::OUString aDummyName("Dummy"); xPers->storeToEntry( xWorkStore, aDummyName, aSeq, aSeq ); if ( xWorkStore->isStreamElement( aDummyName ) ) { diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index a136deff5334..5c84e26cbb6e 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -55,7 +55,7 @@ static sal_Bool lcl_IsURLButton( SdrObject* pObject ) uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropButtonType(RTL_CONSTASCII_USTRINGPARAM( "ButtonType" )); + rtl::OUString sPropButtonType( "ButtonType" ); if(xInfo->hasPropertyByName( sPropButtonType )) { uno::Any aAny = xPropSet->getPropertyValue( sPropButtonType ); diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index 540f5591d712..af9a1345dd58 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -68,7 +68,7 @@ void ScTbxInsertCtrl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, { nLastSlotId = pItem->GetValue(); sal_uInt16 nImageId = nLastSlotId ? nLastSlotId : GetSlotId(); - rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + rtl::OUString aSlotURL( "slot:" ); aSlotURL += rtl::OUString::valueOf( sal_Int32( nImageId )); Image aImage = GetImage( m_xFrame, aSlotURL, @@ -84,17 +84,17 @@ SfxPopupWindow* ScTbxInsertCtrl::CreatePopupWindow() sal_uInt16 nSlotId = GetSlotId(); if (nSlotId == SID_TBXCTL_INSERT) { - rtl::OUString aInsertBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertbar" )); + rtl::OUString aInsertBarResStr( "private:resource/toolbar/insertbar" ); createAndPositionSubToolBar( aInsertBarResStr ); } else if (nSlotId == SID_TBXCTL_INSCELLS) { - rtl::OUString aInsertCellsBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertcellsbar" )); + rtl::OUString aInsertCellsBarResStr( "private:resource/toolbar/insertcellsbar" ); createAndPositionSubToolBar( aInsertCellsBarResStr ); } else { - rtl::OUString aInsertObjectBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertobjectbar" )); + rtl::OUString aInsertObjectBarResStr( "private:resource/toolbar/insertobjectbar" ); createAndPositionSubToolBar( aInsertObjectBarResStr ); } return NULL; diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 3c3a53a98e9a..0d7264121f35 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -289,7 +289,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, } // Default options are set in officecfg/registry/schema/org/openoffice/Office/Calc.xcs - OUString sFieldSeparators(RTL_CONSTASCII_USTRINGPARAM(",;\t")); + OUString sFieldSeparators(",;\t"); OUString sTextSeparators(mcTextSep); bool bMergeDelimiters = false; bool bFixedWidth = false; diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 4dca12ab764e..92a38de54a96 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -461,7 +461,7 @@ bool ScImportExport::ExportStream( SvStream& rStrm, const String& rBaseURL, sal_ // extra bits are used to tell the client to prefer external // reference link. - ::rtl::OUString aExtraBits(RTL_CONSTASCII_USTRINGPARAM("calc:extref")); + ::rtl::OUString aExtraBits("calc:extref"); WriteUnicodeOrByteString( rStrm, aAppName, true ); WriteUnicodeOrByteString( rStrm, aDocName, true ); diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index fa4c2ece3824..5d4029de27c6 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -92,10 +92,10 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropButtonType(RTL_CONSTASCII_USTRINGPARAM( "ButtonType" )); - rtl::OUString sPropTargetURL(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" )); - rtl::OUString sPropTargetFrame(RTL_CONSTASCII_USTRINGPARAM( "TargetFrame" )); - rtl::OUString sPropLabel(RTL_CONSTASCII_USTRINGPARAM( "Label" )); + rtl::OUString sPropButtonType( "ButtonType" ); + rtl::OUString sPropTargetURL( "TargetURL" ); + rtl::OUString sPropTargetFrame( "TargetFrame" ); + rtl::OUString sPropLabel( "Label" ); if(xInfo->hasPropertyByName( sPropButtonType )) { @@ -179,16 +179,16 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropTargetURL(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" )); + rtl::OUString sPropTargetURL( "TargetURL" ); // Darf man eine URL an dem Objekt setzen? if (xInfo->hasPropertyByName( sPropTargetURL )) { // Ja! - rtl::OUString sPropButtonType(RTL_CONSTASCII_USTRINGPARAM( "ButtonType") ); - rtl::OUString sPropTargetFrame(RTL_CONSTASCII_USTRINGPARAM( "TargetFrame" )); - rtl::OUString sPropLabel(RTL_CONSTASCII_USTRINGPARAM( "Label" )); + rtl::OUString sPropButtonType( "ButtonType"); + rtl::OUString sPropTargetFrame( "TargetFrame" ); + rtl::OUString sPropLabel( "Label" ); uno::Any aAny; if ( xInfo->hasPropertyByName( sPropLabel ) ) diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index d5d973905c04..0e871117593f 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -284,7 +284,7 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos) // Get the "Delete Rows" commandimagelist images from sfx instead of // adding a second copy to sc (see ScTbxInsertCtrl::StateChanged) - rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + rtl::OUString aSlotURL( "slot:" ); aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_DEL_ROWS ) ); uno::Reference<frame::XFrame> xFrame = GetBindings().GetActiveFrame(); Image aDelNm = ::GetImage( xFrame, aSlotURL, false ); diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index b438d3b23973..09ef26331a80 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -392,7 +392,7 @@ namespace calc { // set boolean number format if not already set - ::rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( "NumberFormat" ) ); + ::rtl::OUString sPropName( "NumberFormat" ); Reference<XPropertySet> xCellProp( m_xCell, UNO_QUERY ); Reference<XNumberFormatsSupplier> xSupplier( m_xDocument, UNO_QUERY ); if ( xSupplier.is() && xCellProp.is() ) @@ -456,7 +456,7 @@ namespace calc OCellValueBinding* pNonConstThis = const_cast< OCellValueBinding* >( this ); if ( !pNonConstThis->supportsType( _rType ) ) { - ::rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM( "The given type (" ) ); + ::rtl::OUString sMessage( "The given type (" ); sMessage += _rType.getTypeName(); sMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ") is not supported by this binding." ) ); // TODO: localize this error message diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 6fa397e52f8c..bc33f4f28630 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -277,7 +277,7 @@ ScPrintUIOptions::ScPrintUIOptions() aPrintRangeOpt); // create a choice for the range to print - rtl::OUString aPrintRangeName( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) ); + rtl::OUString aPrintRangeName( "PrintRange" ); aChoices.realloc( 2 ); aHelpIds.realloc( 2 ); aWidgetIds.realloc( 2 ); diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index a0c9abf624ed..e5dcc7f7f882 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -423,7 +423,7 @@ sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() throw(uno::RuntimeExce static rtl::OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex ) { - rtl::OUString aRet( RTL_CONSTASCII_USTRINGPARAM( "Entry" ) ); + rtl::OUString aRet( "Entry" ); aRet += rtl::OUString::valueOf( nIndex ); return aRet; } diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index b4bf3ff4670b..f61239c37bf3 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -101,7 +101,7 @@ void implSetZoom( const uno::Reference< frame::XModel >& xModel, sal_Int16 nZoom pViewSh->RefreshZoom(); } -const ::rtl::OUString REPLACE_CELLS_WARNING( RTL_CONSTASCII_USTRINGPARAM( "ReplaceCellsWarning")); +const ::rtl::OUString REPLACE_CELLS_WARNING( "ReplaceCellsWarning"); class PasteCellsWarningReseter { diff --git a/sc/source/ui/vba/testvba/testvba.cxx b/sc/source/ui/vba/testvba/testvba.cxx index f3d32063b472..8e8729a31ae9 100644 --- a/sc/source/ui/vba/testvba/testvba.cxx +++ b/sc/source/ui/vba/testvba/testvba.cxx @@ -64,7 +64,7 @@ using ::rtl::OUString; using ::std::auto_ptr; -const OUString EXTN(RTL_CONSTASCII_USTRINGPARAM(".xls")); +const OUString EXTN(".xls"); OUString convertToURL( const OUString& rPath ) { diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 9afb8724653e..0d39fa37eead 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -707,7 +707,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) rtl::OUString SAL_CALL ScVbaApplication::getName() throw (uno::RuntimeException) { - static rtl::OUString appName( RTL_CONSTASCII_USTRINGPARAM("Microsoft Excel" ) ); + static rtl::OUString appName("Microsoft Excel" ); return appName; } diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index 035383a118c4..52f152ffd008 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -29,10 +29,10 @@ using namespace ::ooo::vba::excel::XlAxisCrosses; using namespace ::ooo::vba::excel::XlAxisType; using namespace ::ooo::vba::excel::XlScaleType; -const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") ); -const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") ); -const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("Max") ); -const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("Min") ); +const rtl::OUString ORIGIN("Origin"); +const rtl::OUString AUTOORIGIN("AutoOrigin"); +const rtl::OUString VBA_MIN("Max"); +const rtl::OUString VBA_MAX("Min"); ScVbaChart* ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) { diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index e792c6ea5418..a184897d9ef0 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -42,7 +42,7 @@ typedef InheritedHelperInterfaceImpl1<excel::XBorder > ScVbaBorder_Base; // borders, the enumeration will match the order in this list static const sal_Int16 supportedIndexTable[] = { XlBordersIndex::xlEdgeLeft, XlBordersIndex::xlEdgeTop, XlBordersIndex::xlEdgeBottom, XlBordersIndex::xlEdgeRight, XlBordersIndex::xlDiagonalDown, XlBordersIndex::xlDiagonalUp, XlBordersIndex::xlInsideVertical, XlBordersIndex::xlInsideHorizontal }; -const static rtl::OUString sTableBorder( RTL_CONSTASCII_USTRINGPARAM("TableBorder") ); +const static rtl::OUString sTableBorder("TableBorder"); // Equiv widths in in 1/100 mm const static sal_Int32 OOLineThin = 35; diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index a050d4f93553..760095a49bae 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -47,23 +47,23 @@ using namespace ::ooo::vba::excel::XlRowCol; using namespace ::ooo::vba::excel::XlAxisType; using namespace ::ooo::vba::excel::XlAxisGroup; -const rtl::OUString CHART_NAME( RTL_CONSTASCII_USTRINGPARAM("Name") ); +const rtl::OUString CHART_NAME("Name"); // #TODO move this constant to vbaseries.[ch]xx ( when it exists ) -const rtl::OUString DEFAULTSERIESPREFIX( RTL_CONSTASCII_USTRINGPARAM("Series") ); -const rtl::OUString DATAROWSOURCE( RTL_CONSTASCII_USTRINGPARAM("DataRowSource") ); -const rtl::OUString UPDOWN( RTL_CONSTASCII_USTRINGPARAM("UpDown") ); -const rtl::OUString VOLUME( RTL_CONSTASCII_USTRINGPARAM("Volume") ); -const rtl::OUString LINES( RTL_CONSTASCII_USTRINGPARAM("Lines") ); -const rtl::OUString SPLINETYPE( RTL_CONSTASCII_USTRINGPARAM("SplineType") ); -const rtl::OUString SYMBOLTYPE( RTL_CONSTASCII_USTRINGPARAM("SymbolType") ); -const rtl::OUString DEEP( RTL_CONSTASCII_USTRINGPARAM("Deep") ); -const rtl::OUString SOLIDTYPE( RTL_CONSTASCII_USTRINGPARAM("SolidType") ); -const rtl::OUString VERTICAL( RTL_CONSTASCII_USTRINGPARAM("Vertical") ); -const rtl::OUString PERCENT( RTL_CONSTASCII_USTRINGPARAM("Percent") ); -const rtl::OUString STACKED( RTL_CONSTASCII_USTRINGPARAM("Stacked") ); -const rtl::OUString DIM3D( RTL_CONSTASCII_USTRINGPARAM("Dim3D") ); -const rtl::OUString HASMAINTITLE( RTL_CONSTASCII_USTRINGPARAM("HasMainTitle") ); -const rtl::OUString HASLEGEND( RTL_CONSTASCII_USTRINGPARAM("HasLegend") ); +const rtl::OUString DEFAULTSERIESPREFIX("Series"); +const rtl::OUString DATAROWSOURCE("DataRowSource"); +const rtl::OUString UPDOWN("UpDown"); +const rtl::OUString VOLUME("Volume"); +const rtl::OUString LINES("Lines"); +const rtl::OUString SPLINETYPE("SplineType"); +const rtl::OUString SYMBOLTYPE("SymbolType"); +const rtl::OUString DEEP("Deep"); +const rtl::OUString SOLIDTYPE("SolidType"); +const rtl::OUString VERTICAL("Vertical"); +const rtl::OUString PERCENT("Percent"); +const rtl::OUString STACKED("Stacked"); +const rtl::OUString DIM3D("Dim3D"); +const rtl::OUString HASMAINTITLE("HasMainTitle"); +const rtl::OUString HASLEGEND("HasLegend"); ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::lang::XComponent >& _xChartComponent, const css::uno::Reference< css::table::XTableChart >& _xTableChart ) : ChartImpl_BASE( _xParent, _xContext ), mxTableChart( _xTableChart ) { diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index 07183cc036da..42cf8f1758f2 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -const rtl::OUString PERSIST_NAME( RTL_CONSTASCII_USTRINGPARAM("PersistName") ); +const rtl::OUString PERSIST_NAME("PersistName"); ScVbaChartObject::ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ) : ChartObjectImpl_BASE( _xParent, _xContext ), xTableChart( _xTableChart ), xDrawPageSupplier( _xDrawPageSupplier ) { diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index f0922d52f384..8e1989f6b2de 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -31,11 +31,11 @@ using namespace ::com::sun::star; typedef std::vector< beans::PropertyValue > VecPropValues; -static rtl::OUString OPERATOR( RTL_CONSTASCII_USTRINGPARAM("Operator") ); -static rtl::OUString FORMULA1( RTL_CONSTASCII_USTRINGPARAM("Formula1") ); -static rtl::OUString FORMULA2( RTL_CONSTASCII_USTRINGPARAM("Formula2") ); -static rtl::OUString STYLENAME( RTL_CONSTASCII_USTRINGPARAM("StyleName") ); -static rtl::OUString sStyleNamePrefix( RTL_CONSTASCII_USTRINGPARAM("Excel_CondFormat") ); +static rtl::OUString OPERATOR("Operator"); +static rtl::OUString FORMULA1("Formula1"); +static rtl::OUString FORMULA2("Formula2"); +static rtl::OUString STYLENAME("StyleName"); +static rtl::OUString sStyleNamePrefix("Excel_CondFormat"); void SAL_CALL ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 7b4d65d8496b..69b80b13d840 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -48,9 +48,9 @@ typedef std::pair< sal_Int32, sal_Int32 > PatternPair; using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel::XlPattern; -static const rtl::OUString BACKCOLOR( RTL_CONSTASCII_USTRINGPARAM( "CellBackColor" ) ); -static const rtl::OUString PATTERN( RTL_CONSTASCII_USTRINGPARAM( "Pattern" ) ); -static const rtl::OUString PATTERNCOLOR( RTL_CONSTASCII_USTRINGPARAM( "PatternColor" ) ); +static const rtl::OUString BACKCOLOR( "CellBackColor" ); +static const rtl::OUString PATTERN( "Pattern" ); +static const rtl::OUString PATTERNCOLOR( "PatternColor" ); static PatternMap lcl_getPatternMap() { diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 086dc8e322e4..427a70410722 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -23,7 +23,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static rtl::OUString DISPLAYNAME( RTL_CONSTASCII_USTRINGPARAM("DisplayName") ); +static rtl::OUString DISPLAYNAME("DisplayName"); diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index fa49f5f47819..2706440c972c 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -23,7 +23,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static rtl::OUString SDEFAULTCELLSTYLENAME( RTL_CONSTASCII_USTRINGPARAM("Default") ); +static rtl::OUString SDEFAULTCELLSTYLENAME("Default"); static css::uno::Any lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) { @@ -99,7 +99,7 @@ ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) thr uno::Reference< excel::XStyle > aRet; try { - rtl::OUString sParentCellStyleName( RTL_CONSTASCII_USTRINGPARAM("Default")); + rtl::OUString sParentCellStyleName("Default"); if ( _aBasedOn.hasValue() ) { uno::Reference< excel::XRange > oRange; diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index f56f3039987a..2ac13621ae32 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -305,7 +305,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P uno::Any SAL_CALL ScVbaWindow::getCaption() throw (uno::RuntimeException) { - static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - OpenOffice.org Calc" ) ); + static rtl::OUString sCrud(" - OpenOffice.org Calc" ); static sal_Int32 nCrudLen = sCrud.getLength(); rtl::OUString sTitle; @@ -330,7 +330,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) if ( !sTitle.equals( sName ) ) { - static rtl::OUString sDot( RTL_CONSTASCII_USTRINGPARAM(".") ); + static rtl::OUString sDot("."); // starts with title if ( sName.indexOf( sTitle ) == 0 ) // extention starts immediately after diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 70d3ab4968c4..a9357fae6194 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -306,7 +306,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi sProps.realloc( 3 ); sProps[ nIndex ].Name = rtl::OUString("FilterOptions" ); sal_Int16 delims[] = { 0 /*default not used*/, 9/*tab*/, 44/*comma*/, 32/*space*/, 59/*semicolon*/ }; - static rtl::OUString sRestOfFormat( RTL_CONSTASCII_USTRINGPARAM(",34,0,1" ) ); + static rtl::OUString sRestOfFormat(",34,0,1" ); rtl::OUString sFormat; sal_Int16 nFormat = 0; // default indicator |