diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-05-19 17:17:29 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-05-19 17:17:29 +0200 |
commit | dc4704ce1b067b62df0b0cf9cda3c4106d80292c (patch) | |
tree | 836d54ebc387cc58da0f7095dd3f79db4fb603e9 | |
parent | loplugin:stringcopy: sd (diff) | |
download | core-dc4704ce1b067b62df0b0cf9cda3c4106d80292c.tar.gz core-dc4704ce1b067b62df0b0cf9cda3c4106d80292c.zip |
loplugin:stringcopy: sc
Change-Id: Ic6cb5406d20e7e07b8e34514df71adf1c3a4e727
31 files changed, 60 insertions, 60 deletions
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 591a7f88c129..84cfa9c396b8 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -311,7 +311,7 @@ void ScMacrosTest::testVba() Any aRet; Sequence< sal_Int16 > aOutParamIndex; Sequence< Any > aOutParam; - bool bWorkbooksHandling = OUString( testInfo[i].sFileBaseName ) == "Workbooks." && !sTempDir.isEmpty() ; + bool bWorkbooksHandling = testInfo[i].sFileBaseName == "Workbooks." && !sTempDir.isEmpty() ; if ( bWorkbooksHandling ) { diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index 31eaf827911f..3c72a050ab66 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -240,7 +240,7 @@ uno::Reference< chart2::XChartDocument > ScDocument::GetChartByName( const OUStr while (pObject) { if ( pObject->GetObjIdentifier() == OBJ_OLE2 && - OUString(static_cast<SdrOle2Obj*>(pObject)->GetPersistName()) == rChartName ) + static_cast<SdrOle2Obj*>(pObject)->GetPersistName() == rChartName ) { xReturn.set( ScChartHelper::GetChartFromSdrObject( pObject ) ); return xReturn; @@ -305,7 +305,7 @@ void ScDocument::GetOldChartParameters( const OUString& rName, while (pObject) { if ( pObject->GetObjIdentifier() == OBJ_OLE2 && - OUString(static_cast<SdrOle2Obj*>(pObject)->GetPersistName()) == rName ) + static_cast<SdrOle2Obj*>(pObject)->GetPersistName() == rName ) { uno::Reference< chart2::XChartDocument > xChartDoc( ScChartHelper::GetChartFromSdrObject( pObject ) ); if ( xChartDoc.is() ) @@ -352,7 +352,7 @@ void ScDocument::UpdateChartArea( const OUString& rChartName, while (pObject) { if ( pObject->GetObjIdentifier() == OBJ_OLE2 && - OUString(static_cast<SdrOle2Obj*>(pObject)->GetPersistName()) == rChartName ) + static_cast<SdrOle2Obj*>(pObject)->GetPersistName() == rChartName ) { uno::Reference< chart2::XChartDocument > xChartDoc( ScChartHelper::GetChartFromSdrObject( pObject ) ); uno::Reference< chart2::data::XDataReceiver > xReceiver( xChartDoc, uno::UNO_QUERY ); @@ -587,7 +587,7 @@ void ScDocument::SetChartRangeList( const OUString& rChartName, while (pObject) { if ( pObject->GetObjIdentifier() == OBJ_OLE2 && - OUString(static_cast<SdrOle2Obj*>(pObject)->GetPersistName()) == rChartName ) + static_cast<SdrOle2Obj*>(pObject)->GetPersistName() == rChartName ) { uno::Reference< chart2::XChartDocument > xChartDoc( ScChartHelper::GetChartFromSdrObject( pObject ) ); uno::Reference< chart2::data::XDataReceiver > xReceiver( xChartDoc, uno::UNO_QUERY ); @@ -645,7 +645,7 @@ uno::Reference< embed::XEmbeddedObject > { SdrOle2Obj * pOleObject ( dynamic_cast< SdrOle2Obj * >( pObject )); if( pOleObject && - OUString(pOleObject->GetPersistName()) == rName ) + pOleObject->GetPersistName() == rName ) { return pOleObject->GetObjRef(); } diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 418de1e29fa1..9ad00a487c7a 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -918,9 +918,9 @@ ScDdeLink* lclGetDdeLink( ::sfx2::SvBaseLink* pLink = rLinks[ nIndex ].get(); if( ScDdeLink* pDdeLink = dynamic_cast<ScDdeLink*>( pLink ) ) { - if( (OUString(pDdeLink->GetAppl()) == rAppl) && - (OUString(pDdeLink->GetTopic()) == rTopic) && - (OUString(pDdeLink->GetItem()) == rItem) && + if( (pDdeLink->GetAppl() == rAppl) && + (pDdeLink->GetTopic() == rTopic) && + (pDdeLink->GetItem() == rItem) && ((nMode == SC_DDE_IGNOREMODE) || (nMode == pDdeLink->GetMode())) ) return pDdeLink; if( pnDdePos ) ++*pnDdePos; diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index e012d727a33d..b6e62a8c04d4 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -2862,10 +2862,10 @@ uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPS // initialize uno::Sequence<uno::Any> aSeq(4); uno::Any* pArray = aSeq.getArray(); - pArray[0] <<= OUString( rDesc.aParSource ); - pArray[1] <<= OUString( rDesc.aParName ); - pArray[2] <<= OUString( rDesc.aParUser ); - pArray[3] <<= OUString( rDesc.aParPass ); + pArray[0] <<= rDesc.aParSource; + pArray[1] <<= rDesc.aParName; + pArray[2] <<= rDesc.aParUser; + pArray[3] <<= rDesc.aParPass; xInit->initialize( aSeq ); } xRet.set( xInterface, uno::UNO_QUERY ); @@ -3295,7 +3295,7 @@ uno::Reference<sdbc::XRowSet> ScDPCollection::DBCaches::createRowSet( catch ( const sdbc::SQLException& rError ) { //! store error message - ScopedVclPtrInstance< InfoBox > aInfoBox( nullptr, OUString(rError.Message) ); + ScopedVclPtrInstance< InfoBox > aInfoBox( nullptr, rError.Message ); aInfoBox->Execute(); } catch ( uno::Exception& ) diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index d9d4f35a8cd1..f0bb00f03039 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -3460,7 +3460,7 @@ ScDPDataMember* ScDPResultDimension::GetColReferenceMember( #if DUMP_PIVOT_TABLE void ScDPResultDimension::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - OUString aDimName = bIsDataLayout ? OUString("(data layout)") : OUString(GetName()); + OUString aDimName = bIsDataLayout ? OUString("(data layout)") : GetName(); dumpRow("ScDPResultDimension", aDimName, nullptr, pDoc, rPos); SCROW nStartRow = rPos.Row(); diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index b59b215d21d7..8e552a878f81 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -5215,7 +5215,7 @@ void ScCompiler::fillAddInToken(::std::vector< css::sheet::FormulaOpCodeMapEntry } else aEntry.Name = pFuncData->GetUpperLocal(); - aEntry.Token.Data <<= OUString( pFuncData->GetOriginalName()); + aEntry.Token.Data <<= pFuncData->GetOriginalName(); _rVec.push_back( aEntry); } } diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index 22d3ebb77173..fe01b5c27477 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -735,7 +735,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico (aFontData.mbItalic != aNewData.mbItalic); if( bNewFont || (bNewStyle && pFontList) ) { - aParaText = "&\"" + OUString(aNewData.maName); + aParaText = "&\"" + aNewData.maName; if( pFontList ) { FontMetric aFontMetric( pFontList->Get( diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 37100699b3b2..515619c697bf 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -462,7 +462,7 @@ void ScXMLExportDataPilot::WriteMembers(ScDPSaveDimension* pDim) rExport.CheckAttrList(); for (ScDPSaveDimension::MemberList::const_iterator i=rMembers.begin(); i != rMembers.end() ; ++i) { - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, OUString((*i)->GetName())); + rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, (*i)->GetName()); if (rExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012) { diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index d7e4ef5b8ce6..4d6c02cf7528 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -4807,11 +4807,11 @@ void ScXMLExport::GetChangeTrackViewSettings(uno::Sequence<beans::PropertyValue> pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Name = "ShowChangesByAuthor"; pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Value <<= pViewSettings->HasAuthor(); pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Name = "ShowChangesByAuthorName"; - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Value <<= OUString (pViewSettings->GetTheAuthorToShow()); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Value <<= pViewSettings->GetTheAuthorToShow(); pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Name = "ShowChangesByComment"; pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Value <<= pViewSettings->HasComment(); pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Name = "ShowChangesByCommentText"; - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Value <<= OUString (pViewSettings->GetTheComment()); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Value <<= pViewSettings->GetTheComment(); pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = "ShowChangesByRanges"; pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Value <<= pViewSettings->HasRange(); OUString sRangeList; diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index e4d9bde6616d..ed0fca0877b0 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -741,12 +741,12 @@ void ScAccessibleCsvRuler::SendCaretEvent() OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleName() { - return OUString( ScResId( STR_ACC_CSVRULER_NAME ) ); + return ScResId( STR_ACC_CSVRULER_NAME ); } OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleDescription() { - return OUString( ScResId( STR_ACC_CSVRULER_DESCR ) ); + return ScResId( STR_ACC_CSVRULER_DESCR ); } void ScAccessibleCsvRuler::ensureValidIndex( sal_Int32 nIndex ) const @@ -1269,12 +1269,12 @@ void ScAccessibleCsvGrid::SendRemoveColumnEvent( sal_uInt32 nFirstColumn, sal_uI OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleName() { - return OUString( ScResId( STR_ACC_CSVGRID_NAME ) ); + return ScResId( STR_ACC_CSVGRID_NAME ); } OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleDescription() { - return OUString( ScResId( STR_ACC_CSVGRID_DESCR ) ); + return ScResId( STR_ACC_CSVGRID_DESCR ); } void ScAccessibleCsvGrid::ensureValidIndex( sal_Int32 nIndex ) const diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 872593d6bb36..448aad8cfdbd 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -392,7 +392,7 @@ void ScAccessiblePreviewHeaderCell::CreateTextHelper() mpTextHelper = new ::accessibility::AccessibleTextHelper( o3tl::make_unique<ScAccessibilityEditSource>( o3tl::make_unique<ScAccessiblePreviewHeaderCellTextData>( - mpViewShell, OUString(getAccessibleName()), maCellPos, + mpViewShell, getAccessibleName(), maCellPos, mbColumnHeader, mbRowHeader))); mpTextHelper->SetEventSource(this); } diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index d52452b6391c..4231d447ba58 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -514,7 +514,7 @@ void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc, SvxFontPrevWindow& rWdPre { for( sal_Int32 i = 1, n = rLbStyle.GetEntryCount(); i <= n && !bFound; ++i) { - OUString aStyleName = ScGlobal::pCharClass->uppercase(OUString(rLbStyle.GetEntry(i))); + OUString aStyleName = ScGlobal::pCharClass->uppercase(rLbStyle.GetEntry(i)); if( i == n ) { rLbStyle.InsertEntry(aName); diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index dfc50ffe40dc..4ab94073c79e 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -309,7 +309,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa load_Separators (sFieldSeparators, sTextSeparators, bMergeDelimiters, bQuotedFieldAsText, bDetectSpecialNum, bFixedWidth, nFromRow, nCharSet, nLanguage, meCall); // load from saved settings - maFieldSeparators = OUString(sFieldSeparators); + maFieldSeparators = sFieldSeparators; if( bMergeDelimiters && !bIsTSV ) pCkbAsOnce->Check(); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 2e79cf4d5cdf..20f61d069a02 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -3873,7 +3873,7 @@ bool ScDocFunc::Unprotect( SCTAB nTab, const OUString& rPassword, bool bApi ) { if (!bApi) { - ScopedVclPtrInstance< InfoBox > aBox( ScDocShell::GetActiveDialogParent(), OUString( ScResId( SCSTR_WRONGPASSWORD ) ) ); + ScopedVclPtrInstance< InfoBox > aBox( ScDocShell::GetActiveDialogParent(), ScResId( SCSTR_WRONGPASSWORD ) ); aBox->Execute(); } return false; @@ -3903,7 +3903,7 @@ bool ScDocFunc::Unprotect( SCTAB nTab, const OUString& rPassword, bool bApi ) { if (!bApi) { - ScopedVclPtrInstance< InfoBox > aBox( ScDocShell::GetActiveDialogParent(), OUString( ScResId( SCSTR_WRONGPASSWORD ) ) ); + ScopedVclPtrInstance< InfoBox > aBox( ScDocShell::GetActiveDialogParent(), ScResId( SCSTR_WRONGPASSWORD ) ); aBox->Execute(); } return false; diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 77db8cd073f4..03131b4be5cd 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -186,8 +186,8 @@ void ScDocShell::FillClass( SvGlobalName* pClassName, { *pClassName = SvGlobalName( SO3_SC_CLASSID_60 ); *pFormat = SotClipboardFormatId::STARCALC_60; - *pFullTypeName = OUString( ScResId( SCSTR_LONG_SCDOC_NAME ) ); - *pShortTypeName = OUString( ScResId( SCSTR_SHORT_SCDOC_NAME ) ); + *pFullTypeName = ScResId( SCSTR_LONG_SCDOC_NAME ); + *pShortTypeName = ScResId( SCSTR_SHORT_SCDOC_NAME ); } else if ( nFileFormat == SOFFICE_FILEFORMAT_8 ) { @@ -871,7 +871,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) // TODO/LATER: More entries from the MediaDescriptor might be interesting for the merge uno::Sequence< beans::PropertyValue > aValues(1); aValues[0].Name = "FilterName"; - aValues[0].Value <<= OUString( GetMedium()->GetFilter()->GetFilterName() ); + aValues[0].Value <<= GetMedium()->GetFilter()->GetFilterName(); const SfxStringItem* pPasswordItem = SfxItemSet::GetItem<SfxStringItem>(GetMedium()->GetItemSet(), SID_PASSWORD, false); if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() ) diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 1cd085e0b3aa..1121ce863554 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1183,7 +1183,7 @@ bool ScDocShell::ExecuteChangeProtectionDialog( bool bJustQueryIfProtected ) else { ScopedVclPtrInstance<InfoBox> aBox( GetActiveDialogParent(), - OUString( ScResId( SCSTR_WRONGPASSWORD ) ) ); + ScResId( SCSTR_WRONGPASSWORD ) ); aBox->Execute(); } } diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 725a8b906649..5ee969c56bc7 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -142,7 +142,7 @@ namespace uno::Sequence<beans::PropertyValue> aProps(2); aProps[0].Name = SC_DBPROP_EXTENSION; - aProps[0].Value <<= OUString( aExtension ); + aProps[0].Value <<= aExtension; aProps[1].Name = SC_DBPROP_CHARSET; aProps[1].Value <<= aCharSetStr; diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx b/sc/source/ui/docshell/documentlinkmgr.cxx index cdabc4674044..e1418d1d3422 100644 --- a/sc/source/ui/docshell/documentlinkmgr.cxx +++ b/sc/source/ui/docshell/documentlinkmgr.cxx @@ -210,9 +210,9 @@ void DocumentLinkManager::updateDdeLink( const OUString& rAppl, const OUString& if (!pDdeLink) continue; - if ( OUString(pDdeLink->GetAppl()) == rAppl && - OUString(pDdeLink->GetTopic()) == rTopic && - OUString(pDdeLink->GetItem()) == rItem ) + if ( pDdeLink->GetAppl() == rAppl && + pDdeLink->GetTopic() == rTopic && + pDdeLink->GetItem() == rItem ) { pDdeLink->TryUpdate(); // Could be multiple (Mode), so continue searching diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 3ac966fc708c..ea4c33c964e1 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -427,7 +427,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV { const SfxPoolItem* pItem; if( pReqArgs->HasItem( FN_PARAM_5, &pItem ) ) - aRangeString = OUString( static_cast<const SfxStringItem*>(pItem)->GetValue()); + aRangeString = static_cast<const SfxStringItem*>(pItem)->GetValue(); aPositionRange = pViewSh->GetViewData().GetCurPos(); } diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx index d7dedbc3de04..80544989e8a2 100644 --- a/sc/source/ui/drawfunc/mediash.cxx +++ b/sc/source/ui/drawfunc/mediash.cxx @@ -49,7 +49,7 @@ void ScMediaShell::InitInterface_Impl() ScMediaShell::ScMediaShell(ScViewData* pData) : ScDrawShell(pData) { - SetName( OUString( ScResId( SCSTR_MEDIASHELL ) ) ); + SetName( ScResId( SCSTR_MEDIASHELL ) ); SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Media)); } diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index 55d473ef9720..20b4bdb6f10a 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -25,7 +25,7 @@ #include "scres.hrc" ScReplaceWarnBox::ScReplaceWarnBox( vcl::Window* pParent ) : - WarningBox( pParent, WB_YES_NO | WB_DEF_YES, OUString( ScResId( STR_REPLCELLSWARN ) ) ) + WarningBox( pParent, WB_YES_NO | WB_DEF_YES, ScResId( STR_REPLCELLSWARN ) ) { // By default, the check box is ON, and the user needs to un-check it to // disable all future warnings. diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 0050bb6eeae3..193420cb3fa7 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -490,7 +490,7 @@ ScUndoPageBreak::~ScUndoPageBreak() OUString ScUndoPageBreak::GetComment() const { //"Column break" | "Row break" "insert" | "delete" - return OUString ( bColumn ? + return bColumn ? ( bInsert ? ScGlobal::GetRscString( STR_UNDO_INSCOLBREAK ) : ScGlobal::GetRscString( STR_UNDO_DELCOLBREAK ) @@ -498,7 +498,7 @@ OUString ScUndoPageBreak::GetComment() const ( bInsert ? ScGlobal::GetRscString( STR_UNDO_INSROWBREAK ) : ScGlobal::GetRscString( STR_UNDO_DELROWBREAK ) - ) ); + ); } void ScUndoPageBreak::DoChange( bool bInsertP ) const diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 9323e066978f..67d7eee929b1 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -1441,7 +1441,7 @@ ScUndoRenameObject::~ScUndoRenameObject() OUString ScUndoRenameObject::GetComment() const { // string resource shared with title for dialog - return OUString( ScResId(SCSTR_RENAMEOBJECT) ); + return ScResId(SCSTR_RENAMEOBJECT); } SdrObject* ScUndoRenameObject::GetObject() diff --git a/sc/source/ui/unoobj/PivotTableDataSequence.cxx b/sc/source/ui/unoobj/PivotTableDataSequence.cxx index 812ad94e7046..23b7fd82817b 100644 --- a/sc/source/ui/unoobj/PivotTableDataSequence.cxx +++ b/sc/source/ui/unoobj/PivotTableDataSequence.cxx @@ -81,7 +81,7 @@ uno::Sequence<uno::Any> SAL_CALL PivotTableDataSequence::getData() if (rItem.m_eType == ValueType::Numeric) aSeq[i] <<= double(rItem.m_fValue); else if (rItem.m_eType == ValueType::String) - aSeq[i] <<= OUString(rItem.m_aString); + aSeq[i] <<= rItem.m_aString; i++; } diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 420570abfea3..d37c2cc38710 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -535,11 +535,11 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co pArray[2].Name = SC_UNONAME_NAME; if (rDesc.pFuncName) - pArray[2].Value <<= OUString( *rDesc.pFuncName ); + pArray[2].Value <<= *rDesc.pFuncName; pArray[3].Name = SC_UNONAME_DESCRIPTION; if (rDesc.pFuncDesc) - pArray[3].Value <<= OUString( *rDesc.pFuncDesc ); + pArray[3].Value <<= *rDesc.pFuncDesc; pArray[4].Name = SC_UNONAME_ARGUMENTS; if (!rDesc.maDefArgNames.empty() && !rDesc.maDefArgDescs.empty() && rDesc.pDefArgFlags ) diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 70eb3beb33b0..768696981ee9 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -2061,8 +2061,8 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const OUString& aPropert aAny <<= false; break; case SC_WID_UNO_CELLSTYL: - aAny <<= OUString( ScStyleNameConversion::DisplayToProgrammaticName( - ScGlobal::GetRscString(STR_STYLENAME_STANDARD), SfxStyleFamily::Para ) ); + aAny <<= ScStyleNameConversion::DisplayToProgrammaticName( + ScGlobal::GetRscString(STR_STYLENAME_STANDARD), SfxStyleFamily::Para ); break; case SC_WID_UNO_TBLBORD: case SC_WID_UNO_TBLBORD2: @@ -2526,8 +2526,8 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE const ScStyleSheet* pStyle = pDocShell->GetDocument().GetSelectionStyle(*GetMarkData()); if (pStyle) aStyleName = pStyle->GetName(); - rAny <<= OUString( ScStyleNameConversion::DisplayToProgrammaticName( - aStyleName, SfxStyleFamily::Para ) ); + rAny <<= ScStyleNameConversion::DisplayToProgrammaticName( + aStyleName, SfxStyleFamily::Para ); } break; case SC_WID_UNO_TBLBORD: @@ -6564,7 +6564,7 @@ void ScCellObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, u if ( pEntry->nWID == SC_WID_UNO_FORMLOC ) { // sal_False = lokal - rAny <<= OUString( GetInputString_Impl(false) ); + rAny <<= GetInputString_Impl(false); } else if ( pEntry->nWID == SC_WID_UNO_FORMRT ) { @@ -8298,8 +8298,8 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn } else if ( pEntry->nWID == SC_WID_UNO_PAGESTL ) { - rAny <<= OUString( ScStyleNameConversion::DisplayToProgrammaticName( - rDoc.GetPageStyle( nTab ), SfxStyleFamily::Page ) ); + rAny <<= ScStyleNameConversion::DisplayToProgrammaticName( + rDoc.GetPageStyle( nTab ), SfxStyleFamily::Page ); } else if ( pEntry->nWID == SC_WID_UNO_CELLVIS ) { diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index d69751056a65..ea4fa66be20e 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -438,7 +438,7 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr // (as in SwXDocumentSettings) SfxPrinter* pPrinter = rDoc.GetPrinter( false ); if (pPrinter) - aRet <<= OUString ( pPrinter->GetName()); + aRet <<= pPrinter->GetName(); else aRet <<= OUString(); } diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 530ea3519afa..b4266155f859 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -1802,7 +1802,7 @@ uno::Any ScStyleObj::getPropertyValue_Impl( const OUString& aPropertyName ) { // core always has the display name if ( pStyle ) - aAny <<= OUString( pStyle->GetName() ); + aAny <<= pStyle->GetName(); } else { diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index 80b41cc4b5b4..fe072075925b 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -389,7 +389,7 @@ bool ScTokenConversion::ConvertToTokenSequence( const ScDocument& rDoc, case svExternal: // Function name is stored as string. // Byte (parameter count) is ignored. - rAPI.Data <<= OUString( rToken.GetExternal() ); + rAPI.Data <<= rToken.GetExternal(); break; case svSingleRef: { diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 82a812a4ae4a..d6d11f18c79e 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -854,8 +854,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) ScopedVclPtr<AbstractScShowTabDlg> pDlg(pFact->CreateScShowTabDlg(GetDialogParent())); OSL_ENSURE(pDlg, "Dialog create fail!"); pDlg->SetDescription( - OUString( ScResId( STR_DLG_SELECTTABLES_TITLE ) ), - OUString( ScResId( STR_DLG_SELECTTABLES_LBNAME ) ), + ScResId( STR_DLG_SELECTTABLES_TITLE ), + ScResId( STR_DLG_SELECTTABLES_LBNAME ), GetStaticInterface()->GetSlot(SID_SELECT_TABLES)->GetCommand(), HID_SELECTTABLES ); // fill all table names with selection state diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 37dd4b2ac28b..bc22f1f9caf5 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -702,7 +702,7 @@ bool ScViewFunc::PasteLink( const uno::Reference<datatransfer::XTransferable>& r // uses Calc A1 syntax even when another formula syntax is specified // in the UI. EnterMatrix("='" - + OUString(ScGlobal::GetAbsDocName(*pTopic, GetViewData().GetDocument()->GetDocumentShell())) + + ScGlobal::GetAbsDocName(*pTopic, GetViewData().GetDocument()->GetDocumentShell()) + "'#" + *pItem , ::formula::FormulaGrammar::GRAM_NATIVE); return true; @@ -712,7 +712,7 @@ bool ScViewFunc::PasteLink( const uno::Reference<datatransfer::XTransferable>& r // DDE in all other cases. // TODO: we could define ocQuote for " - EnterMatrix("=" + OUString(ScCompiler::GetNativeSymbol(ocDde)) + EnterMatrix("=" + ScCompiler::GetNativeSymbol(ocDde) + ScCompiler::GetNativeSymbol(ocOpen) + "\"" + *pApp + "\"" + ScCompiler::GetNativeSymbol(ocSep) |