diff options
Diffstat (limited to 'sc')
41 files changed, 82 insertions, 87 deletions
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index 3f619726f90c..95f94d52b81e 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -69,8 +69,8 @@ uno::Reference< lang::XComponent > ScCellRangeObj::mxComponent; ScCellRangeObj::ScCellRangeObj(): CalcUnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XSearchable(OUString("15"), 1), - apitest::XReplaceable(OUString("15"), OUString("35")) + apitest::XSearchable("15", 1), + apitest::XReplaceable("15", "35") { } diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index e41bb4276a8d..f154240d7ee6 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -47,8 +47,8 @@ private: ScTableSheetObj::ScTableSheetObj(): CalcUnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XSearchable(OUString("test"), 4), - apitest::XReplaceable(OUString("searchReplaceString"), OUString("replaceReplaceString")) + apitest::XSearchable("test", 4), + apitest::XReplaceable("searchReplaceString", "replaceReplaceString") { } diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index 6599fe18d31a..439df8af4328 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -530,7 +530,7 @@ ScDocShellRef ScBootstrapFixture::load( bool bReadWrite, std::shared_ptr<const SfxFilter> pFilter(new SfxFilter( rFilter, OUString(), nFilterFlags, nClipboardID, rTypeName, 0, OUString(), - rUserData, OUString("private:factory/scalc"))); + rUserData, "private:factory/scalc")); const_cast<SfxFilter*>(pFilter.get())->SetVersion(nFilterVersion); ScDocShellRef xDocShRef = new ScDocShell; @@ -622,7 +622,7 @@ ScDocShellRef ScBootstrapFixture::saveAndReload( std::shared_ptr<const SfxFilter> pExportFilter(new SfxFilter( rFilter, OUString(), nFormatType, nExportFormat, rTypeName, 0, OUString(), - rUserData, OUString("private:factory/scalc*") )); + rUserData, "private:factory/scalc*" )); const_cast<SfxFilter*>(pExportFilter.get())->SetVersion(SOFFICE_FILEFORMAT_CURRENT); aStoreMedium.SetFilter(pExportFilter); pShell->DoSaveAs( aStoreMedium ); @@ -668,7 +668,7 @@ std::shared_ptr<utl::TempFile> ScBootstrapFixture::exportTo( ScDocShell* pShell, std::shared_ptr<SfxFilter> pExportFilter(new SfxFilter( aFilterName, OUString(), nFormatType, nExportFormat, aFilterType, 0, OUString(), - OUString(), OUString("private:factory/scalc*") )); + OUString(), "private:factory/scalc*" )); pExportFilter.get()->SetVersion(SOFFICE_FILEFORMAT_CURRENT); aStoreMedium.SetFilter(pExportFilter); pShell->DoSaveAs( aStoreMedium ); diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index f448ee43fef7..b4cb9856eed7 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -329,7 +329,7 @@ ScDocShellRef ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const OUSt std::shared_ptr<const SfxFilter> pExportFilter(new SfxFilter( rFilter, OUString(), nFormatType, nExportFormat, rTypeName, 0, OUString(), - rUserData, OUString("private:factory/scalc*") )); + rUserData, "private:factory/scalc*" )); const_cast<SfxFilter*>(pExportFilter.get())->SetVersion(SOFFICE_FILEFORMAT_CURRENT); aStoreMedium.SetFilter(pExportFilter); SfxItemSet* pExportSet = aStoreMedium.GetItemSet(); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 7306a4a9354e..e7b436d90bb1 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -1552,7 +1552,7 @@ void ScFiltersTest::testPassword_Impl(const OUString& aFileNameBase) std::shared_ptr<const SfxFilter> pFilter(new SfxFilter( aFilterName, OUString(), getFileFormats()[0].nFormatType, nFormat, aFilterType, 0, OUString(), - OUString(), OUString("private:factory/scalc*") )); + OUString(), "private:factory/scalc*" )); const_cast<SfxFilter*>(pFilter.get())->SetVersion(SOFFICE_FILEFORMAT_CURRENT); ScDocShellRef xDocSh = new ScDocShell; diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx index 11c795e165a1..a7c503748f35 100644 --- a/sc/qa/unit/ucalc_pivottable.cxx +++ b/sc/qa/unit/ucalc_pivottable.cxx @@ -1251,7 +1251,7 @@ void Test::testPivotTableNumberGrouping() aInfo.mfStart = 30; aInfo.mfEnd = 60; aInfo.mfStep = 10; - ScDPSaveNumGroupDimension aGroup(OUString("Order"), aInfo); + ScDPSaveNumGroupDimension aGroup("Order", aInfo); pDimData->AddNumGroupDimension(aGroup); } diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 037678b8f687..dbac46b55e55 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -185,7 +185,7 @@ static_assert( ScDocumentPool::ScDocumentPool() - : SfxItemPool ( OUString("ScDocumentPool"), + : SfxItemPool ( "ScDocumentPool", ATTR_STARTINDEX, ATTR_ENDINDEX, aItemInfos, nullptr, false/*bLoadRefCounts*/ ), mnCurrentMaxKey(0) @@ -290,8 +290,7 @@ ScDocumentPool::ScDocumentPool() if ( ScGlobal::GetEmptyBrushItem() ) rPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); else - rPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, - OUString(STRING_STANDARD) ); // FIXME: without name? + rPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, STRING_STANDARD ); // FIXME: without name? rPoolDefaults[ ATTR_LRSPACE - ATTR_STARTINDEX ] = new SvxLRSpaceItem( ATTR_LRSPACE ); rPoolDefaults[ ATTR_ULSPACE - ATTR_STARTINDEX ] = new SvxULSpaceItem( ATTR_ULSPACE ); diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 64e7d10a4aa5..92d2c4abed54 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -578,8 +578,7 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB nTab ) { maTabs.resize(nTab+1, nullptr ); } - maTabs[nTab] = new ScTable(this, nTab, - OUString("baeh")); + maTabs[nTab] = new ScTable(this, nTab, "baeh"); if (nTab < static_cast<SCTAB>(pSourceDoc->maTabs.size()) && pSourceDoc->maTabs[nTab]) maTabs[nTab]->SetLayoutRTL( pSourceDoc->maTabs[nTab]->IsLayoutRTL() ); } diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index 595961851267..09a4162da72c 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -88,16 +88,16 @@ static void lcl_SetChartParameters( const uno::Reference< chart2::data::XDataRec { uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - OUString("CellRangeRepresentation"), -1, + "CellRangeRepresentation", -1, uno::makeAny( rRanges ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - OUString("HasCategories"), -1, + "HasCategories", -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - OUString("FirstCellAsLabel"), -1, + "FirstCellAsLabel", -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - OUString("DataRowSource"), -1, + "DataRowSource", -1, uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); } diff --git a/sc/source/core/tool/addincfg.cxx b/sc/source/core/tool/addincfg.cxx index d5a0e244525f..30243fe4cb4f 100644 --- a/sc/source/core/tool/addincfg.cxx +++ b/sc/source/core/tool/addincfg.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star; #define CFGPATH_ADDINS "Office.CalcAddIns/AddInInfo" ScAddInCfg::ScAddInCfg() : - ConfigItem( OUString( CFGPATH_ADDINS ) ) + ConfigItem( CFGPATH_ADDINS ) { uno::Sequence<OUString> aNames(1); // one entry: empty string EnableNotification( aNames ); diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 3eaa8155e01b..fdf92456c72e 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -359,7 +359,7 @@ void ScUnoAddInCollection::ReadConfiguration() ScAddInCfg& rAddInConfig = SC_MOD()->GetAddInCfg(); // additional, temporary config item for the compatibility names - ScLinkConfigItem aAllLocalesConfig( OUString(CFGPATH_ADDINS), ConfigItemMode::AllLocales ); + ScLinkConfigItem aAllLocalesConfig( CFGPATH_ADDINS, ConfigItemMode::AllLocales ); // CommitLink is not used (only reading values) const OUString sSlash('/'); diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index 6f287307a912..c7cb013de8aa 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -34,13 +34,13 @@ static rtl::Reference<ConfigurationListener> const & getMiscListener() bool ScCalcConfig::isOpenCLEnabled() { - static comphelper::ConfigurationListenerProperty<bool> gOpenCLEnabled(getMiscListener(), OUString("UseOpenCL")); + static comphelper::ConfigurationListenerProperty<bool> gOpenCLEnabled(getMiscListener(), "UseOpenCL"); return gOpenCLEnabled.get(); } bool ScCalcConfig::isSwInterpreterEnabled() { - static comphelper::ConfigurationListenerProperty<bool> gSwInterpreterEnabled(getMiscListener(), OUString("UseSwInterpreter")); + static comphelper::ConfigurationListenerProperty<bool> gSwInterpreterEnabled(getMiscListener(), "UseSwInterpreter"); return gSwInterpreterEnabled.get(); } diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index ceeba4ebbd33..2ae74582030d 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -95,7 +95,7 @@ Sequence<OUString> ScDefaultsCfg::GetPropertyNames() } ScDefaultsCfg::ScDefaultsCfg() : - ConfigItem( OUString( CFGPATH_FORMULA ) ) + ConfigItem( CFGPATH_FORMULA ) { OUString aPrefix; diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx index 06ab9010447e..05f112b9a4d2 100644 --- a/sc/source/core/tool/filtopt.cxx +++ b/sc/source/core/tool/filtopt.cxx @@ -34,7 +34,7 @@ using namespace css::uno; #define SCFILTOPT_WK3 2 ScFilterOptions::ScFilterOptions() : - ConfigItem( OUString( CFGPATH_FILTER ) ), + ConfigItem( CFGPATH_FILTER ), bWK3Flag( false ), fExcelColScale( 0 ), fExcelRowScale( 0 ) diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index beca64e37075..f536cb94686c 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -243,7 +243,7 @@ ScFormulaCfg::PropsToIds ScFormulaCfg::GetPropNamesToId() } ScFormulaCfg::ScFormulaCfg() : - ConfigItem( OUString( CFGPATH_FORMULA ) ) + ConfigItem( CFGPATH_FORMULA ) { Sequence<OUString> aNames = GetPropertyNames(); UpdateFromProperties( aNames ); diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx index 3e214e122bca..4337194a425a 100644 --- a/sc/source/core/tool/inputopt.cxx +++ b/sc/source/core/tool/inputopt.cxx @@ -115,7 +115,7 @@ Sequence<OUString> ScInputCfg::GetPropertyNames() } ScInputCfg::ScInputCfg() : - ConfigItem( OUString( CFGPATH_INPUT ) ) + ConfigItem( CFGPATH_INPUT ) { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index 82ced8321859..a42df78042a2 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -109,7 +109,7 @@ Sequence<OUString> ScPrintCfg::GetPropertyNames() } ScPrintCfg::ScPrintCfg() : - ConfigItem( OUString( CFGPATH_PRINT ) ) + ConfigItem( CFGPATH_PRINT ) { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 183185e0d427..8ecd71762587 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -1087,7 +1087,7 @@ sal_uInt16 XclExpExtNameBuffer::InsertDde( // create the leading 'StdDocumentName' EXTERNNAME record if( maNameList.IsEmpty() ) AppendNew( new XclExpExtNameDde( - GetRoot(), OUString("StdDocumentName"), EXC_EXTN_EXPDDE_STDDOC ) ); + GetRoot(), "StdDocumentName", EXC_EXTN_EXPDDE_STDDOC ) ); // try to find DDE result array, but create EXTERNNAME record without them too const ScMatrix* pScMatrix = GetDoc().GetDdeLinkResultMatrix( nPos ); diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 44caba742225..aa28b5bc913f 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -279,7 +279,7 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL aContentType += OUString::createFromAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); + xValues->Append( SvKeyValue( OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType ) ); pAttributes = xValues.get(); } } @@ -2856,7 +2856,7 @@ sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL ) aContentType += OUString::createFromAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); + xValues->Append( SvKeyValue( OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType ) ); pAttributes = xValues.get(); } } diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index 8555cc811af2..583ba8589701 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -40,7 +40,7 @@ static SfxItemInfo const aMsgItemInfos[] = }; ScMessagePool::ScMessagePool() - : SfxItemPool ( OUString("ScMessagePool"), + : SfxItemPool ( "ScMessagePool", MSGPOOL_START, MSGPOOL_END, aMsgItemInfos, nullptr ), diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index c50435b2935b..d76404bba990 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -832,8 +832,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck return; //! nichts zu tun - Fehlermeldung? // ab hier kein return mehr - ScProgress aProgress( this, OUString("..."), - nNewActionCount, true ); + ScProgress aProgress( this, "...", nNewActionCount, true ); sal_uLong nLastMergeAction = pSourceTrack->GetLast()->GetActionNumber(); // UpdateReference-Undo, gueltige Referenzen fuer den letzten gemeinsamen Zustand diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 41610a0ea11a..a94885005177 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -175,16 +175,16 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - OUString("CellRangeRepresentation"), -1, + "CellRangeRepresentation", -1, uno::makeAny( aRangeString ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - OUString("HasCategories"), -1, + "HasCategories", -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - OUString("FirstCellAsLabel"), -1, + "FirstCellAsLabel", -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - OUString("DataRowSource"), -1, + "DataRowSource", -1, uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx index 73157ea62805..2a871058e5dd 100644 --- a/sc/source/ui/undo/undoutil.cxx +++ b/sc/source/ui/undo/undoutil.cxx @@ -85,7 +85,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB pRet = pDoc->GetAnonymousDBData(nTab); if (!pRet) { - pRet = new ScDBData( OUString(STR_DB_LOCAL_NONAME), nTab, + pRet = new ScDBData( STR_DB_LOCAL_NONAME, nTab, nCol1,nRow1, nCol2,nRow2, 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 6e42bc44e8c5..d3b7d0070c81 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -283,7 +283,7 @@ void SAL_CALL ScAutoFormatsObj::removeByName( const OUString& aName ) uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.TableAutoFormatEnumeration"); } // container::XIndexAccess @@ -423,7 +423,7 @@ ScAutoFormatFieldObj* ScAutoFormatObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.TableAutoFormatEnumeration"); } // container::XIndexAccess diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index cdfcba7d8627..b50600bb2736 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -667,7 +667,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByIndex( sal_Int32 nIndex ) uno::Reference<container::XEnumeration> SAL_CALL ScFunctionListObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.FunctionDescriptionEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.FunctionDescriptionEnumeration"); } // XElementAccess diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index f387325c6faf..6e325a550e56 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -4646,7 +4646,7 @@ sal_Bool SAL_CALL ScCellRangesObj::hasByName( const OUString& aName ) uno::Reference<container::XEnumeration> SAL_CALL ScCellRangesObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetCellRangesEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.SheetCellRangesEnumeration"); } // XIndexAccess diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 4e751b3f6672..d8c03f47dbab 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -1919,7 +1919,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum func = ::std::for_each(aAllTokens.begin(), aAllTokens.end(), func); func.getList(aTableNumList); aResult.push_back( - beans::PropertyValue( OUString("TableNumberList"), -1, + beans::PropertyValue( "TableNumberList", -1, uno::makeAny( lcl_createTableNumberList( aTableNumList ) ), beans::PropertyState_DIRECT_VALUE )); } @@ -1928,7 +1928,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( OUString("DataRowSource"), -1, + beans::PropertyValue( "DataRowSource", -1, uno::makeAny( eRowSource ), beans::PropertyState_DIRECT_VALUE )); } @@ -1936,7 +1936,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( OUString("HasCategories"), -1, + beans::PropertyValue( "HasCategories", -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE )); } @@ -1944,7 +1944,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( OUString("FirstCellAsLabel"), -1, + beans::PropertyValue( "FirstCellAsLabel", -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE )); } @@ -1970,7 +1970,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum // add cell range property aResult.push_back( - beans::PropertyValue( OUString("CellRangeRepresentation"), -1, + beans::PropertyValue( "CellRangeRepresentation", -1, uno::makeAny( sRangeRep ), beans::PropertyState_DIRECT_VALUE )); //Sequence Mapping @@ -2031,7 +2031,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bDifferentIndexes && !aSequenceMappingVector.empty() ) { aResult.push_back( - beans::PropertyValue( OUString("SequenceMapping"), -1, + beans::PropertyValue( "SequenceMapping", -1, uno::makeAny( comphelper::containerToSequence(aSequenceMappingVector) ) , beans::PropertyState_DIRECT_VALUE )); } diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index b2c5bec2b25c..10d89ce5e6ab 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -259,16 +259,16 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName, // set arguments uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - OUString("CellRangeRepresentation"), -1, + "CellRangeRepresentation", -1, uno::makeAny( OUString( sRangeStr )), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - OUString("HasCategories"), -1, + "HasCategories", -1, uno::makeAny( bRowHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - OUString("FirstCellAsLabel"), -1, + "FirstCellAsLabel", -1, uno::makeAny( bColumnHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - OUString("DataRowSource"), -1, + "DataRowSource", -1, uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); } @@ -316,7 +316,7 @@ void SAL_CALL ScChartsObj::removeByName( const OUString& aName ) uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableChartsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.table.TableChartsEnumeration"); } // XIndexAccess diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index b5d0bccf66eb..fde3bba62f85 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -452,7 +452,7 @@ void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName ) Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotTablesEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.DataPilotTablesEnumeration"); } // XIndexAccess @@ -1013,7 +1013,7 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotDescriptorBase::getDataLayoutFi { if( pSaveData->GetDataLayoutDimension() ) { - ScFieldIdentifier aFieldId( OUString( SC_DATALAYOUT_NAME ), true ); + ScFieldIdentifier aFieldId( SC_DATALAYOUT_NAME, true ); return new ScDataPilotFieldObj( *this, aFieldId ); } } @@ -1669,7 +1669,7 @@ ScDataPilotFieldObj* ScDataPilotFieldsObj::GetObjectByName_Impl(const OUString& Reference<XEnumeration> SAL_CALL ScDataPilotFieldsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotFieldsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.DataPilotFieldsEnumeration"); } // XIndexAccess @@ -2951,7 +2951,7 @@ Any SAL_CALL ScDataPilotFieldGroupsObj::getByIndex( sal_Int32 nIndex ) Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupsEnumeration" ) ); + return new ScIndexEnumeration( this, "com.sun.star.sheet.DataPilotFieldGroupsEnumeration" ); } // XElementAccess @@ -3130,7 +3130,7 @@ Any SAL_CALL ScDataPilotFieldGroupObj::getByIndex( sal_Int32 nIndex ) Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupEnumeration" ) ); + return new ScIndexEnumeration( this, "com.sun.star.sheet.DataPilotFieldGroupEnumeration" ); } // XElementAccess @@ -3269,7 +3269,7 @@ sal_Bool SAL_CALL ScDataPilotItemsObj::hasByName( const OUString& aName ) Reference<XEnumeration> SAL_CALL ScDataPilotItemsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotItemsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.DataPilotItemsEnumeration"); } // XIndexAccess diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index a2a282e56c59..76e888b6e9f2 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -618,7 +618,7 @@ void SAL_CALL ScSubTotalDescriptorBase::addNew( uno::Reference<container::XEnumeration> SAL_CALL ScSubTotalDescriptorBase::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SubTotalFieldsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.SubTotalFieldsEnumeration"); } // XIndexAccess @@ -2215,7 +2215,7 @@ void SAL_CALL ScDatabaseRangesObj::removeByName( const OUString& aName ) uno::Reference<container::XEnumeration> SAL_CALL ScDatabaseRangesObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DatabaseRangesEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.DatabaseRangesEnumeration"); } // XIndexAccess diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 757cd8e71a07..fce78332c626 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -3370,7 +3370,7 @@ uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj: uno::Reference<container::XEnumeration> SAL_CALL ScTableSheetsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.SpreadsheetsEnumeration"); } // XIndexAccess @@ -3535,7 +3535,7 @@ void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCou uno::Reference<container::XEnumeration> SAL_CALL ScTableColumnsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableColumnsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.table.TableColumnsEnumeration"); } // XIndexAccess @@ -3773,7 +3773,7 @@ void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount uno::Reference<container::XEnumeration> SAL_CALL ScTableRowsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableRowsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.table.TableRowsEnumeration"); } // XIndexAccess @@ -4080,7 +4080,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumera //! iterate directly (more efficiently)? SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.CellAnnotationsEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.CellAnnotationsEnumeration"); } // XIndexAccess @@ -4235,7 +4235,7 @@ void SAL_CALL ScScenariosObj::removeByName( const OUString& aName ) uno::Reference<container::XEnumeration> SAL_CALL ScScenariosObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.ScenariosEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.ScenariosEnumeration"); } // XIndexAccess diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index c3e24180a8cd..1ab409416273 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -134,10 +134,10 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const OUString& aName ) { uno::Sequence<beans::PropertyValue> aPropSeq( 2 ); aPropSeq[0] = beans::PropertyValue( - OUString("EventType"), -1, + "EventType", -1, uno::makeAny( OUString("Script") ), beans::PropertyState_DIRECT_VALUE ); aPropSeq[1] = beans::PropertyValue( - OUString("Script"), -1, + "Script", -1, uno::makeAny( *pScript ), beans::PropertyState_DIRECT_VALUE ); aRet <<= aPropSeq; } diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 178ef7a17996..aa8dce00f17a 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -377,7 +377,7 @@ sal_Bool SAL_CALL ScCellFieldsObj::hasElements() uno::Reference<container::XEnumeration> SAL_CALL ScCellFieldsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.text.TextFieldEnumeration"); } void SAL_CALL ScCellFieldsObj::addContainerListener( @@ -533,7 +533,7 @@ sal_Bool SAL_CALL ScHeaderFieldsObj::hasElements() uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFieldsObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.text.TextFieldEnumeration"); } void SAL_CALL ScHeaderFieldsObj::addContainerListener( diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 0a74f29beecf..f6e971408b36 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -359,7 +359,7 @@ void SAL_CALL ScTableConditionalFormat::clear() uno::Reference<container::XEnumeration> SAL_CALL ScTableConditionalFormat::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableConditionalEntryEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.TableConditionalEntryEnumeration"); } // XIndexAccess diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 64528ab62133..831d87eee3c4 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -435,7 +435,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const OUString& aName) uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetLinksEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.SheetLinksEnumeration"); } // XIndexAccess @@ -945,7 +945,7 @@ void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.CellAreaLinksEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.CellAreaLinksEnumeration"); } // XIndexAccess @@ -1244,7 +1244,7 @@ ScDDELinkObj* ScDDELinksObj::GetObjectByName_Impl(const OUString& aName) uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DDELinksEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.DDELinksEnumeration"); } // XIndexAccess @@ -1579,8 +1579,7 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumer { SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( - new ScIndexEnumeration(this, OUString( - "com.sun.star.sheet.ExternalDocLink"))); + new ScIndexEnumeration(this, "com.sun.star.sheet.ExternalDocLink")); return aRef; } @@ -1681,8 +1680,7 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnume { SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( - new ScIndexEnumeration(this, OUString( - "com.sun.star.sheet.ExternalDocLinks"))); + new ScIndexEnumeration(this, "com.sun.star.sheet.ExternalDocLinks")); return aRef; } diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 5fc43a4c174a..d17763a743bb 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -574,7 +574,7 @@ void SAL_CALL ScNamedRangesObj::outputList( const table::CellAddress& aOutputPos uno::Reference<container::XEnumeration> SAL_CALL ScNamedRangesObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.NamedRangesEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.NamedRangesEnumeration"); } // container::XIndexAccess @@ -1122,7 +1122,7 @@ void SAL_CALL ScLabelRangesObj::removeByIndex( sal_Int32 nIndex ) uno::Reference<container::XEnumeration> SAL_CALL ScLabelRangesObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.LabelRangesEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.LabelRangesEnumeration"); } // container::XIndexAccess diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 11a76fcd020e..d7856471bc4f 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -959,7 +959,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() uno::Reference<container::XEnumeration> SAL_CALL ScTabViewObj::createEnumeration() { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetViewPanesEnumeration")); + return new ScIndexEnumeration(this, "com.sun.star.sheet.SpreadsheetViewPanesEnumeration"); } // XIndexAccess diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index e8b93b474614..e7c313d1040f 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -554,7 +554,7 @@ ScVbaChart::Activate() if ( pChartObj ) pChartObj->Activate(); else - throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString( "no ChartObject as parent" ) ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, "no ChartObject as parent" ); } void SAL_CALL diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index eec8cdd29c27..d512895f791c 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -99,7 +99,7 @@ ScVbaChartObject::Delete() if (pChartObjectsImpl) pChartObjectsImpl->removeByName( getPersistName() ); else - throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString( "Parent is not ChartObjects" ) ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, "Parent is not ChartObjects" ); } void @@ -116,7 +116,7 @@ ScVbaChartObject::Activate() } catch (uno::Exception& ) { - throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString( "ChartObject Activate internal error" ) ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, "ChartObject Activate internal error" ); } } diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index 0d07983d30fc..f9161b979335 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -57,7 +57,7 @@ ScVbaFormat< Ifc... >::ScVbaFormat( const uno::Reference< XHelperInterface >& xP const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) : ScVbaFormat_BASE( xParent, xContext ), - m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ), + m_aDefaultLocale( "en", "US", OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 29072585e656..76877a890ac1 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -302,7 +302,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) try { sfx2::FileDialogHelper aDlg(ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, - FileDialogFlags::NONE, OUString("com.sun.star.chart2.ChartDocument")); + FileDialogFlags::NONE, "com.sun.star.chart2.ChartDocument"); if(aDlg.Execute() == ERRCODE_NONE ) { INetURLObject aURLObj( aDlg.GetPath() ); |