diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-04 08:37:36 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-04 08:01:56 +0000 |
commit | be91a4725d851c05ea8a9ca2eb9ef01954aa06ec (patch) | |
tree | 0c13e06f0598bd84c958fb6851e69d608de2650d /sc/source/ui | |
parent | 81824d135987712b57e3c81a26f72ae4fabb4031 (diff) |
loplugin:stringconstant
Change-Id: I9d3b60bb9f0d8c09968e2be1035fb8e654ac9c95
Reviewed-on: https://gerrit.libreoffice.org/19769
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleCellBase.cxx | 14 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scabstdlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/dbdocimp.cxx | 11 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 18 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh8.cxx | 24 | ||||
-rw-r--r-- | sc/source/ui/docshell/impex.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/formdlg/formula.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/solverutil.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/unoobj/dapiuno.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaapplication.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaaxis.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaformat.cxx | 30 | ||||
-rw-r--r-- | sc/source/ui/vba/vbawindow.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaworksheet.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/cellsh2.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/dbfunc3.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun5.cxx | 2 |
18 files changed, 67 insertions, 70 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index b8d6f63d8084..65e9a547e366 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -118,7 +118,7 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getForeground() uno::Reference<beans::XPropertySet> xCellProps(xCell, uno::UNO_QUERY); if (xCellProps.is()) { - uno::Any aAny = xCellProps->getPropertyValue(OUString(SC_UNONAME_CCOLOR)); + uno::Any aAny = xCellProps->getPropertyValue(SC_UNONAME_CCOLOR); aAny >>= nColor; } } @@ -159,7 +159,7 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getBackground() uno::Reference<beans::XPropertySet> xCellProps(xCell, uno::UNO_QUERY); if (xCellProps.is()) { - uno::Any aAny = xCellProps->getPropertyValue(OUString(SC_UNONAME_CELLBACK)); + uno::Any aAny = xCellProps->getPropertyValue(SC_UNONAME_CELLBACK); aAny >>= nColor; } } @@ -392,7 +392,7 @@ OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs() uno::Reference<beans::XPropertySet> xCellProps(xCell, uno::UNO_QUERY); if (xCellProps.is()) { - uno::Any aAny = xCellProps->getPropertyValue(OUString(SC_UNONAME_SHADOW)); + uno::Any aAny = xCellProps->getPropertyValue(SC_UNONAME_SHADOW); aAny >>= aShadowFmt; } } @@ -478,13 +478,13 @@ OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs() uno::Reference<beans::XPropertySet> xCellProps(xCell, uno::UNO_QUERY); if (xCellProps.is()) { - uno::Any aAny = xCellProps->getPropertyValue(OUString(SC_UNONAME_TOPBORDER)); + uno::Any aAny = xCellProps->getPropertyValue(SC_UNONAME_TOPBORDER); aAny >>= aTopBorder; - aAny = xCellProps->getPropertyValue(OUString(SC_UNONAME_BOTTBORDER)); + aAny = xCellProps->getPropertyValue(SC_UNONAME_BOTTBORDER); aAny >>= aBottomBorder; - aAny = xCellProps->getPropertyValue(OUString(SC_UNONAME_LEFTBORDER)); + aAny = xCellProps->getPropertyValue(SC_UNONAME_LEFTBORDER); aAny >>= aLeftBorder; - aAny = xCellProps->getPropertyValue(OUString(SC_UNONAME_RIGHTBORDER)); + aAny = xCellProps->getPropertyValue(SC_UNONAME_RIGHTBORDER); aAny >>= aRightBorder; } } diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx index fa4d96623909..cd8d1b7ce54f 100644 --- a/sc/source/ui/attrdlg/scabstdlg.cxx +++ b/sc/source/ui/attrdlg/scabstdlg.cxx @@ -49,7 +49,7 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create() if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, aStrBuf.makeStringAndClear(), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = reinterpret_cast<ScAbstractDialogFactory* (SAL_CALL*)()>( - aDialogLibrary.getFunctionSymbol( OUString("ScCreateDialogFactory") )); + aDialogLibrary.getFunctionSymbol( "ScCreateDialogFactory" )); #else fp = ScCreateDialogFactory(); #endif diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index f2f9dcea364a..08499ef62a30 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -74,7 +74,7 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFram uno::Reference<frame::XDispatchProvider> xDP(xFrame, uno::UNO_QUERY); uno::Reference<frame::XFrame> xBeamerFrame = xFrame->findFrame( - OUString("_beamer"), + "_beamer", frame::FrameSearchFlag::CHILDREN); if (xBeamerFrame.is()) { @@ -217,16 +217,13 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, uno::Any aAny; aAny <<= rParam.aDBName; - xRowProp->setPropertyValue( - OUString(SC_DBPROP_DATASOURCENAME), aAny ); + xRowProp->setPropertyValue( SC_DBPROP_DATASOURCENAME, aAny ); aAny <<= rParam.aStatement; - xRowProp->setPropertyValue( - OUString(SC_DBPROP_COMMAND), aAny ); + xRowProp->setPropertyValue( SC_DBPROP_COMMAND, aAny ); aAny <<= nType; - xRowProp->setPropertyValue( - OUString(SC_DBPROP_COMMANDTYPE), aAny ); + xRowProp->setPropertyValue( SC_DBPROP_COMMANDTYPE, aAny ); uno::Reference<sdb::XCompletedExecution> xExecute( xRowSet, uno::UNO_QUERY ); if ( xExecute.is() ) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index f1eadfd177ef..9124f0769909 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -713,7 +713,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::UNO_QUERY_THROW ); uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xServiceManager, uno::UNO_QUERY_THROW ); uno::Reference< container::XEnumeration> xEnum = xEnumAccess->createContentEnumeration( - OUString( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ); + "com.sun.star.sheet.SpreadsheetDocumentJob" ); if ( xEnum.is() ) { while ( xEnum->hasMoreElements() ) @@ -2969,7 +2969,7 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType ) // Grab the Calc configuration. Reference<XUIConfigurationManager> xConfigMgr = xModuleCfgSupplier->getUIConfigurationManager( - OUString("com.sun.star.sheet.SpreadsheetDocument")); + "com.sun.star.sheet.SpreadsheetDocument"); if (!xConfigMgr.is()) return; @@ -3015,15 +3015,15 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType ) switch (eType) { case ScOptionsUtil::KEY_DEFAULT: - xScAccel->setKeyEvent(aDelete, OUString(".uno:ClearContents")); - xScAccel->setKeyEvent(aBackspace, OUString(".uno:Delete")); - xScAccel->setKeyEvent(aCtrlD, OUString(".uno:FillDown")); - xScAccel->setKeyEvent(aAltDown, OUString(".uno:DataSelect")); + xScAccel->setKeyEvent(aDelete, ".uno:ClearContents"); + xScAccel->setKeyEvent(aBackspace, ".uno:Delete"); + xScAccel->setKeyEvent(aCtrlD, ".uno:FillDown"); + xScAccel->setKeyEvent(aAltDown, ".uno:DataSelect"); break; case ScOptionsUtil::KEY_OOO_LEGACY: - xScAccel->setKeyEvent(aDelete, OUString(".uno:Delete")); - xScAccel->setKeyEvent(aBackspace, OUString(".uno:ClearContents")); - xScAccel->setKeyEvent(aCtrlD, OUString(".uno:DataSelect")); + xScAccel->setKeyEvent(aDelete, ".uno:Delete"); + xScAccel->setKeyEvent(aBackspace, ".uno:ClearContents"); + xScAccel->setKeyEvent(aCtrlD, ".uno:DataSelect"); break; default: ; diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 91e064a24636..e3fc6a37038b 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2375,7 +2375,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() } xModel.set( - xLoader->loadComponentFromURL( GetSharedFileURL(), OUString( "_blank" ), 0, aArgs ), + xLoader->loadComponentFromURL( GetSharedFileURL(), "_blank", 0, aArgs ), uno::UNO_QUERY_THROW ); SC_MOD()->SetInSharedDocLoading( false ); } diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 411dbefe5749..c708bdcc4ce5 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -329,16 +329,16 @@ sal_uLong ScDocShell::DBaseImport( const OUString& rFullFileName, rtl_TextEncodi uno::Any aAny; aAny <<= xConnection; - xRowProp->setPropertyValue( OUString(SC_DBPROP_ACTIVECONNECTION), aAny ); + xRowProp->setPropertyValue( SC_DBPROP_ACTIVECONNECTION, aAny ); aAny <<= nType; - xRowProp->setPropertyValue( OUString(SC_DBPROP_COMMANDTYPE), aAny ); + xRowProp->setPropertyValue( SC_DBPROP_COMMANDTYPE, aAny ); aAny <<= OUString( aTabName ); - xRowProp->setPropertyValue( OUString(SC_DBPROP_COMMAND), aAny ); + xRowProp->setPropertyValue( SC_DBPROP_COMMAND, aAny ); aAny <<= false; - xRowProp->setPropertyValue( OUString(SC_DBPROP_PROPCHANGE_NOTIFY), aAny ); + xRowProp->setPropertyValue( SC_DBPROP_PROPCHANGE_NOTIFY, aAny ); xRowSet->execute(); @@ -871,7 +871,7 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncodi if (!xTableDesc.is()) return SCERR_EXPORT_CONNECT; aAny <<= OUString( aTabName ); - xTableDesc->setPropertyValue( OUString(SC_DBPROP_NAME), aAny ); + xTableDesc->setPropertyValue( SC_DBPROP_NAME, aAny ); // create columns @@ -904,16 +904,16 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncodi if (!xColumnDesc.is()) return SCERR_EXPORT_CONNECT; aAny <<= pColNames[nCol]; - xColumnDesc->setPropertyValue( OUString(SC_DBPROP_NAME), aAny ); + xColumnDesc->setPropertyValue( SC_DBPROP_NAME, aAny ); aAny <<= pColTypes[nCol]; - xColumnDesc->setPropertyValue( OUString(SC_DBPROP_TYPE), aAny ); + xColumnDesc->setPropertyValue( SC_DBPROP_TYPE, aAny ); aAny <<= pColLengths[nCol]; - xColumnDesc->setPropertyValue( OUString(SC_DBPROP_PRECISION), aAny ); + xColumnDesc->setPropertyValue( SC_DBPROP_PRECISION, aAny ); aAny <<= pColScales[nCol]; - xColumnDesc->setPropertyValue( OUString(SC_DBPROP_SCALE), aAny ); + xColumnDesc->setPropertyValue( SC_DBPROP_SCALE, aAny ); xColumnsAppend->appendByDescriptor( xColumnDesc ); } @@ -930,13 +930,13 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncodi if (!xRowProp.is()) return SCERR_EXPORT_CONNECT; aAny <<= xConnection; - xRowProp->setPropertyValue( OUString(SC_DBPROP_ACTIVECONNECTION), aAny ); + xRowProp->setPropertyValue( SC_DBPROP_ACTIVECONNECTION, aAny ); aAny <<= (sal_Int32) sdb::CommandType::TABLE; - xRowProp->setPropertyValue( OUString(SC_DBPROP_COMMANDTYPE), aAny ); + xRowProp->setPropertyValue( SC_DBPROP_COMMANDTYPE, aAny ); aAny <<= OUString( aTabName ); - xRowProp->setPropertyValue( OUString(SC_DBPROP_COMMAND), aAny ); + xRowProp->setPropertyValue( SC_DBPROP_COMMAND, aAny ); xRowSet->execute(); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 6f2164f0d80b..bf3fe8f68916 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2257,7 +2257,7 @@ ScFormatFilterPlugin &ScFormatFilter::Get() bLoaded = aModule.load(sFilterLib); if (bLoaded) { - oslGenericFunction fn = aModule.getFunctionSymbol( OUString( "ScFilterCreate" ) ); + oslGenericFunction fn = aModule.getFunctionSymbol( "ScFilterCreate" ); if (fn != NULL) plugin = reinterpret_cast<FilterFn>(fn)(); } diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 4e51d2e1969d..0a26cd4d77f8 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -95,7 +95,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, pDoc = pViewData->GetDocument(); m_xParser.set(ScServiceProvider::MakeInstance(SC_SERVICE_FORMULAPARS, static_cast<ScDocShell*>(pDoc->GetDocumentShell())),uno::UNO_QUERY); uno::Reference< beans::XPropertySet> xSet(m_xParser,uno::UNO_QUERY); - xSet->setPropertyValue(OUString(SC_UNO_COMPILEFAP),uno::makeAny(sal_True)); + xSet->setPropertyValue(SC_UNO_COMPILEFAP, uno::makeAny(sal_True)); m_xOpCodeMapper.set(ScServiceProvider::MakeInstance(SC_SERVICE_OPCODEMAPPER, static_cast<ScDocShell*>(pDoc->GetDocumentShell())),uno::UNO_QUERY); diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index d62e63ed6f00..e047cb9f436a 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -48,7 +48,7 @@ void ScSolverUtil::GetImplementations( uno::Sequence<OUString>& rImplNames, if ( xEnAc.is() ) { uno::Reference<container::XEnumeration> xEnum = - xEnAc->createContentEnumeration( OUString(SCSOLVER_SERVICE) ); + xEnAc->createContentEnumeration( SCSOLVER_SERVICE ); if ( xEnum.is() ) { sal_Int32 nCount = 0; @@ -98,7 +98,7 @@ uno::Reference<sheet::XSolver> ScSolverUtil::GetSolver( const OUString& rImplNam if ( xEnAc.is() ) { uno::Reference<container::XEnumeration> xEnum = - xEnAc->createContentEnumeration( OUString(SCSOLVER_SERVICE) ); + xEnAc->createContentEnumeration( SCSOLVER_SERVICE ); if ( xEnum.is() ) { while ( xEnum->hasMoreElements() && !xSolver.is() ) diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index bad5abffc6f2..d054d8227862 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -357,7 +357,7 @@ static bool lcl_IsDuplicated(const Reference<XPropertySet>& rDimProps) { try { - Any aAny = rDimProps->getPropertyValue( OUString( SC_UNO_DP_ORIGINAL ) ); + Any aAny = rDimProps->getPropertyValue( SC_UNO_DP_ORIGINAL ); Reference< XNamed > xOriginal( aAny, UNO_QUERY ); return xOriginal.is(); } @@ -376,7 +376,7 @@ static OUString lcl_GetOriginalName(const Reference< XNamed >& rDim) { try { - Any aAny = xDimProps->getPropertyValue(OUString(SC_UNO_DP_ORIGINAL)); + Any aAny = xDimProps->getPropertyValue(SC_UNO_DP_ORIGINAL); aAny >>= xOriginal; } catch( Exception& ) @@ -1562,7 +1562,7 @@ static sal_Int32 lcl_GetFieldCount( const Reference<XDimensionsSupplier>& rSourc for (sal_Int32 i = 0; i < nIntCount; ++i) { xDim.set(xIntDims->getByIndex(i), UNO_QUERY); - if (xDim.is() && (xDim->getPropertyValue(OUString(SC_UNO_DP_ORIENTATION)) == rOrient)) + if (xDim.is() && (xDim->getPropertyValue(SC_UNO_DP_ORIENTATION) == rOrient)) ++nRet; } } @@ -1602,7 +1602,7 @@ static bool lcl_GetFieldDataByIndex( const Reference<XDimensionsSupplier>& rSour while (i < nIntCount && !bOk) { xDim.set(xIntDims->getByIndex(i), UNO_QUERY); - if (xDim.is() && (xDim->getPropertyValue(OUString(SC_UNO_DP_ORIENTATION)) == rOrient)) + if (xDim.is() && (xDim->getPropertyValue(SC_UNO_DP_ORIENTATION) == rOrient)) { if (nPos == nIndex) { @@ -3470,7 +3470,7 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName { Reference< XPropertySet > xMemberProps( xMember, UNO_QUERY ); if( xMemberProps.is() ) - aRet = xMemberProps->getPropertyValue( OUString( SC_UNO_DP_SHOWDETAILS ) ); + aRet = xMemberProps->getPropertyValue( SC_UNO_DP_SHOWDETAILS ); else aRet <<= true; } @@ -3485,7 +3485,7 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName { Reference< XPropertySet > xMemberProps( xMember, UNO_QUERY ); if( xMemberProps.is() ) - aRet <<= !cppu::any2bool( xMemberProps->getPropertyValue( OUString( SC_UNO_DP_ISVISIBLE ) ) ); + aRet <<= !cppu::any2bool( xMemberProps->getPropertyValue( SC_UNO_DP_ISVISIBLE ) ); else aRet <<= false; } diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 4f7d181b05ae..54cfc9defbc8 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -485,7 +485,7 @@ ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeExcep uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropertySet( xModel, uno::UNO_QUERY_THROW ); uno::Reference< sheet::XNamedRanges > xNamedRanges( xPropertySet->getPropertyValue( - OUString( "NamedRanges" ) ), uno::UNO_QUERY_THROW ); + "NamedRanges" ), uno::UNO_QUERY_THROW ); css::uno::Reference< excel::XNames > xNames ( new ScVbaNames( this , mxContext , xNamedRanges , xModel ) ); if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID ) diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index eeb830eee770..41ef215656dc 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -588,7 +588,7 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce if (isValueAxis()) { bool bisLogarithmic = false; - mxPropertySet->getPropertyValue( OUString( OUString("Logarithmic")) ) >>= bisLogarithmic; + mxPropertySet->getPropertyValue( "Logarithmic" ) >>= bisLogarithmic; if (bisLogarithmic) nScaleType = xlScaleLogarithmic; else diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index 342b0ce2cc1d..5f0a6f50c7d1 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -105,7 +105,7 @@ ScVbaFormat< Ifc... >::setVerticalAlignment( const uno::Any& _oAlignment) thro aVal = uno::makeAny( table::CellVertJustify2::STANDARD ); break; } - mxPropertySet->setPropertyValue( OUString( SC_UNONAME_CELLVJUS ), aVal ); + mxPropertySet->setPropertyValue( SC_UNONAME_CELLVJUS, aVal ); } catch (const uno::Exception&) { @@ -123,7 +123,7 @@ ScVbaFormat< Ifc... >::getVerticalAlignment( ) throw (script::BasicErrorExcepti if (!isAmbiguous( OUString( SC_UNONAME_CELLVJUS ) ) ) { sal_Int32 aAPIAlignment = table::CellVertJustify2::STANDARD; - mxPropertySet->getPropertyValue( OUString( SC_UNONAME_CELLVJUS ) ) >>= aAPIAlignment; + mxPropertySet->getPropertyValue( SC_UNONAME_CELLVJUS ) >>= aAPIAlignment; switch( aAPIAlignment ) { case table::CellVertJustify2::BOTTOM: @@ -181,7 +181,7 @@ ScVbaFormat< Ifc... >::setHorizontalAlignment( const uno::Any& HorizontalAlignme // #FIXME what about the default case above? // shouldn't need the test below if ( aVal.hasValue() ) - mxPropertySet->setPropertyValue( OUString( SC_UNONAME_CELLHJUS ), aVal ); + mxPropertySet->setPropertyValue( SC_UNONAME_CELLHJUS, aVal ); } catch (const uno::Exception& ) { @@ -248,7 +248,7 @@ ScVbaFormat< Ifc... >::setOrientation( const uno::Any& _aOrientation ) throw (sc break; case excel::XlOrientation::xlHorizontal: aVal = uno::makeAny( table::CellOrientation_STANDARD ); - mxPropertySet->setPropertyValue( OUString( SC_UNONAME_ROTANG ), uno::makeAny( sal_Int32(0) ) ); + mxPropertySet->setPropertyValue( SC_UNONAME_ROTANG, uno::makeAny( sal_Int32(0) ) ); break; case excel::XlOrientation::xlUpward: aVal = uno::makeAny( table::CellOrientation_BOTTOMTOP); @@ -260,7 +260,7 @@ ScVbaFormat< Ifc... >::setOrientation( const uno::Any& _aOrientation ) throw (sc // #FIXME what about the default case above? // shouldn't need the test below if ( aVal.hasValue() ) - mxPropertySet->setPropertyValue( OUString( SC_UNONAME_CELLORI ), aVal ); + mxPropertySet->setPropertyValue( SC_UNONAME_CELLORI, aVal ); } catch (const uno::Exception& ) @@ -278,7 +278,7 @@ ScVbaFormat< Ifc... >::getOrientation( ) throw (script::BasicErrorException, un if (!isAmbiguous(OUString( SC_UNONAME_CELLORI ))) { table::CellOrientation aOrientation = table::CellOrientation_STANDARD; - if ( !( mxPropertySet->getPropertyValue( OUString( SC_UNONAME_CELLORI ) ) >>= aOrientation ) ) + if ( !( mxPropertySet->getPropertyValue( SC_UNONAME_CELLORI ) >>= aOrientation ) ) throw uno::RuntimeException(); switch(aOrientation) @@ -313,7 +313,7 @@ ScVbaFormat< Ifc... >::setWrapText( const uno::Any& _aWrapText ) throw (script:: { try { - mxPropertySet->setPropertyValue( OUString( SC_UNONAME_WRAP ), _aWrapText); + mxPropertySet->setPropertyValue( SC_UNONAME_WRAP, _aWrapText); } catch (const uno::Exception& ) { @@ -388,7 +388,7 @@ ScVbaFormat< Ifc... >::getNumberFormatLocal( ) throw (script::BasicErrorExcepti throw uno::RuntimeException(); OUString sFormat; - xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( FORMATSTRING )) >>= sFormat; + xNumberFormats->getByKey(nFormat)->getPropertyValue( FORMATSTRING ) >>= sFormat; aRet = uno::makeAny( sFormat.toAsciiLowerCase() ); } @@ -417,7 +417,7 @@ ScVbaFormat< Ifc... >::setNumberFormatLocal( const uno::Any& _oLocalFormatString sLocalFormatString = sLocalFormatString.toAsciiUpperCase(); initializeNumberFormats(); lang::Locale aRangeLocale; - xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( LOCALE ) ) >>= aRangeLocale; + xNumberFormats->getByKey(nFormat)->getPropertyValue( LOCALE ) >>= aRangeLocale; sal_Int32 nNewFormat = xNumberFormats->queryKey(sLocalFormatString, aRangeLocale, sal_True); if (nNewFormat == -1) @@ -450,9 +450,9 @@ ScVbaFormat< Ifc... >::setNumberFormat( const uno::Any& _oFormatString ) throw ( nFormat = xNumberFormats->addNew(sFormatString, aDefaultLocale); lang::Locale aRangeLocale; - xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( LOCALE ) ) >>= aRangeLocale; + xNumberFormats->getByKey(nFormat)->getPropertyValue( LOCALE ) >>= aRangeLocale; sal_Int32 nNewFormat = xNumberFormatTypes->getFormatForLocale(nFormat, aRangeLocale); - mxPropertySet->setPropertyValue( OUString( SC_UNO_DP_NUMBERFO ), uno::makeAny( nNewFormat)); + mxPropertySet->setPropertyValue( SC_UNO_DP_NUMBERFO, uno::makeAny( nNewFormat)); } catch (const uno::Exception& ) { @@ -477,7 +477,7 @@ ScVbaFormat< Ifc... >::setIndentLevel( const uno::Any& _aLevel ) throw (script:: throw uno::RuntimeException(); if (aAPIAlignment == table::CellHoriJustify_STANDARD) mxPropertySet->setPropertyValue( sHoriJust, uno::makeAny( table::CellHoriJustify_LEFT) ) ; - mxPropertySet->setPropertyValue( OUString( SC_UNONAME_PINDENT ), uno::makeAny( sal_Int16(nLevel * 352.8) ) ); + mxPropertySet->setPropertyValue( SC_UNONAME_PINDENT, uno::makeAny( sal_Int16(nLevel * 352.8) ) ); } catch (const uno::Exception&) { @@ -623,7 +623,7 @@ ScVbaFormat< Ifc... >::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (scri { try { - mxPropertySet->setPropertyValue(OUString( SC_UNONAME_SHRINK_TO_FIT ), ShrinkToFit); + mxPropertySet->setPropertyValue( SC_UNONAME_SHRINK_TO_FIT, ShrinkToFit); } catch (const uno::Exception& ) { @@ -674,7 +674,7 @@ ScVbaFormat< Ifc... >::setReadingOrder( const uno::Any& ReadingOrder ) throw (sc default: DebugHelper::basicexception(ERRCODE_BASIC_METHOD_FAILED, OUString()); } - mxPropertySet->setPropertyValue( OUString( SC_UNONAME_WRITING ), aVal ); + mxPropertySet->setPropertyValue( SC_UNONAME_WRITING, aVal ); } catch (const uno::Exception& ) { @@ -731,7 +731,7 @@ ScVbaFormat< Ifc... >::getNumberFormat( ) throw (script::BasicErrorException, u sal_Int32 nNewFormat = xNumberFormatTypes->getFormatForLocale(nFormat, getDefaultLocale() ); OUString sFormat; - xNumberFormats->getByKey(nNewFormat)->getPropertyValue( OUString( FORMATSTRING )) >>= sFormat; + xNumberFormats->getByKey(nNewFormat)->getPropertyValue( FORMATSTRING ) >>= sFormat; aFormat = uno::makeAny( sFormat ); } } diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index bdbebac2f32a..b18184d78398 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -340,7 +340,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException, std::exception) void SAL_CALL ScVbaWindow::setCaption( const uno::Any& _caption ) throw (uno::RuntimeException, std::exception) { - getFrameProps()->setPropertyValue( OUString( SC_UNONAME_TITLE ), _caption ); + getFrameProps()->setPropertyValue( SC_UNONAME_TITLE, _caption ); } uno::Any SAL_CALL diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index e5e57307c682..f54360255d06 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -161,8 +161,8 @@ openNewDoc(const OUString& aSheetName ) uno::Reference <frame::XDesktop2 > xComponentLoader = frame::Desktop::create(xContext); uno::Reference<lang::XComponent > xComponent( xComponentLoader->loadComponentFromURL( - OUString( "private:factory/scalc" ), - OUString( "_blank" ), 0, + "private:factory/scalc", + "_blank", 0, uno::Sequence < css::beans::PropertyValue >() ) ); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xComponent, uno::UNO_QUERY_THROW ); if ( xSpreadDoc.is() ) diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 3000b759b54e..578f47e45bbf 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -219,7 +219,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame().GetFrameInterface(); uno::Reference<frame::XFrame> xBeamerFrame = xFrame->findFrame( - OUString("_beamer"), + "_beamer", frame::FrameSearchFlag::CHILDREN); if ( xBeamerFrame.is() ) bWasOpen = true; diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 2acb6b22b2af..4e48e43275bf 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -2029,7 +2029,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet if (!xPropSet.is()) continue; - Any any = xPropSet->getPropertyValue( OUString(SC_UNO_DP_NUMBERFO) ); + Any any = xPropSet->getPropertyValue( SC_UNO_DP_NUMBERFO ); sal_Int32 nNumFmt = 0; if (!(any >>= nNumFmt)) continue; diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index ee60d8c6370b..3e0f57302a82 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -227,7 +227,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, embed::InsertedObjectInfo aInfo = xClipboardCreator->createInstanceInitFromClipboard( xTmpStor, - OUString( "DummyName" ), + "DummyName", uno::Sequence< beans::PropertyValue >() ); // TODO/LATER: in future InsertedObjectInfo will be used to get container related information |