diff options
Diffstat (limited to 'sc')
64 files changed, 286 insertions, 286 deletions
diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx index 9c6cbcbc4f18..f455259de688 100644 --- a/sc/qa/extras/regression-test.cxx +++ b/sc/qa/extras/regression-test.cxx @@ -143,7 +143,7 @@ void ScChartRegressionTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); + getMultiServiceFactory()->createInstance("com.sun.star.comp.Calc.SpreadsheetDocument"); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ); } diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx index 527497bfeaf8..6721918ebc01 100644 --- a/sc/qa/extras/scdatabaserangeobj.cxx +++ b/sc/qa/extras/scdatabaserangeobj.cxx @@ -63,7 +63,7 @@ uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const OUString& rDBN uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); uno::Reference< beans::XPropertySet > xPropSet(xDoc, UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue(OUString("DatabaseRanges")), UNO_QUERY_THROW); + uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue("DatabaseRanges"), UNO_QUERY_THROW); uno::Reference< sheet::XDatabaseRange > xDBRange( xNameAccess->getByName(rDBName), UNO_QUERY_THROW); CPPUNIT_ASSERT(xDBRange.is()); return xDBRange; diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx index 637dadad64f8..dea89587885c 100644 --- a/sc/qa/extras/scdatapilotfieldobj.cxx +++ b/sc/qa/extras/scdatapilotfieldobj.cxx @@ -76,7 +76,7 @@ uno::Reference< uno::XInterface > ScDataPilotFieldObj::init() CPPUNIT_ASSERT(xDPT.is()); uno::Sequence<OUString> aElementNames = xDPT->getElementNames(); - uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName(OUString("DataPilot1")),UNO_QUERY_THROW); + uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName("DataPilot1"),UNO_QUERY_THROW); CPPUNIT_ASSERT(xDPDsc.is()); uno::Reference< container::XIndexAccess > xIA( xDPDsc->getDataPilotFields(), UNO_QUERY_THROW); uno::Reference< uno::XInterface > xReturnValue( xIA->getByIndex(0), UNO_QUERY_THROW); diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx index 55ea705ce842..e0eed8476bfb 100644 --- a/sc/qa/extras/scdatapilottableobj.cxx +++ b/sc/qa/extras/scdatapilottableobj.cxx @@ -96,7 +96,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::init() uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables(); CPPUNIT_ASSERT(xDPT.is()); - uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(OUString("DataPilotTable")),UNO_QUERY_THROW); + uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName("DataPilotTable"),UNO_QUERY_THROW); CPPUNIT_ASSERT(xDPTable.is()); return xDPTable; @@ -133,7 +133,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2() uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables(); CPPUNIT_ASSERT(xDPT.is()); - uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(OUString("DataPilotTable2")),UNO_QUERY_THROW); + uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName("DataPilotTable2"),UNO_QUERY_THROW); CPPUNIT_ASSERT(xDPTable.is()); return xDPTable; diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index a0244374302d..f82f1eb5e68f 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -454,7 +454,7 @@ void ScFiltersTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); + getMultiServiceFactory()->createInstance("com.sun.star.comp.Calc.SpreadsheetDocument"); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); } diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 5dbadba82182..20699208d48b 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -304,7 +304,7 @@ void ScExportTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); + getMultiServiceFactory()->createInstance("com.sun.star.comp.Calc.SpreadsheetDocument"); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); } diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 8861a9d2d8a2..f53a4302d2d2 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -2028,7 +2028,7 @@ void ScFiltersTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); + getMultiServiceFactory()->createInstance("com.sun.star.comp.Calc.SpreadsheetDocument"); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); } diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx index 38a1ffdf0804..5498ee62b095 100644 --- a/sc/source/core/tool/charthelper.cxx +++ b/sc/source/core/tool/charthelper.cxx @@ -317,7 +317,7 @@ void ScChartHelper::AddRangesIfProtectedChart( ScRangeListVector& rRangesVector, svt::EmbeddedObjectRef::TryRunningState( xEmbeddedObj ); uno::Reference< beans::XPropertySet > xProps( xEmbeddedObj->getComponent(), uno::UNO_QUERY ); if ( xProps.is() && - ( xProps->getPropertyValue( OUString( "DisableDataTableDialog" ) ) >>= bDisableDataTableDialog ) && + ( xProps->getPropertyValue("DisableDataTableDialog") >>= bDisableDataTableDialog ) && bDisableDataTableDialog ) { ScChartListenerCollection* pCollection = pDocument->GetChartListenerCollection(); @@ -407,7 +407,7 @@ void ScChartHelper::CreateProtectedChartListenersAndNotify( ScDocument* pDoc, Sd svt::EmbeddedObjectRef::TryRunningState( xEmbeddedObj ); uno::Reference< beans::XPropertySet > xProps( xEmbeddedObj->getComponent(), uno::UNO_QUERY ); if ( xProps.is() && - ( xProps->getPropertyValue( OUString( "DisableDataTableDialog" ) ) >>= bDisableDataTableDialog ) && + ( xProps->getPropertyValue("DisableDataTableDialog") >>= bDisableDataTableDialog ) && bDisableDataTableDialog ) { if ( bSameDoc ) @@ -424,9 +424,9 @@ void ScChartHelper::CreateProtectedChartListenersAndNotify( ScDocument* pDoc, Sd } else { - xProps->setPropertyValue( OUString( "DisableDataTableDialog" ), + xProps->setPropertyValue("DisableDataTableDialog", uno::makeAny( sal_False ) ); - xProps->setPropertyValue( OUString( "DisableComplexChartTypes" ), + xProps->setPropertyValue("DisableComplexChartTypes", uno::makeAny( sal_False ) ); } } diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 9a3b02ed9a72..926866d094cb 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -3079,7 +3079,7 @@ static uno::Any lcl_getSheetModule( const uno::Reference<table::XCellRange>& xCe uno::Reference< sheet::XSheetCellRange > xSheetRange( xCellRange, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProps( xSheetRange->getSpreadsheet(), uno::UNO_QUERY_THROW ); OUString sCodeName; - xProps->getPropertyValue( OUString( "CodeName" ) ) >>= sCodeName; + xProps->getPropertyValue("CodeName") >>= sCodeName; // #TODO #FIXME ideally we should 'throw' here if we don't get a valid parent, but... it is possible // to create a module ( and use 'Option VBASupport 1' ) for a calc document, in this scenario there // are *NO* special document module objects ( of course being able to switch between vba/non vba mode at diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index e8f88282b614..f28f3da458d4 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -3325,7 +3325,7 @@ static void lcl_getChartSubTitle(const Reference<XChartDocument>& xChartDoc, return; OUString aTitle; - Any any = xProp->getPropertyValue( OUString("String") ); + Any any = xProp->getPropertyValue("String"); if (any >>= aTitle) rSubTitle = aTitle; } diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index d078272470d7..5dcd7dcc21fb 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -158,7 +158,7 @@ bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelp uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW ); WString& name = tb.getName(); // set UI name for toolbar - xProps->setPropertyValue( OUString("UIName"), uno::makeAny( name.getString() ) ); + xProps->setPropertyValue("UIName", uno::makeAny( name.getString() ) ); OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); for ( std::vector< ScTBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 3dcb8ba8697f..0062479be778 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -1749,7 +1749,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); + uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance("com.sun.star.sheet.Defaults"), uno::UNO_QUERY); if (xProperties.is()) aStylesExp.exportDefaultStyle(xProperties, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME), xCellStylesExportPropertySetMapper); if (pSharedData->HasShapes()) @@ -1763,7 +1763,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) uno::Reference <container::XNameAccess> xStylesFamilies(xStyleFamiliesSupplier->getStyleFamilies()); if (xStylesFamilies.is()) { - uno::Reference <container::XIndexAccess> xCellStyles(xStylesFamilies->getByName(OUString("CellStyles")), uno::UNO_QUERY); + uno::Reference <container::XIndexAccess> xCellStyles(xStylesFamilies->getByName("CellStyles"), uno::UNO_QUERY); if (xCellStyles.is()) { sal_Int32 nCount(xCellStyles->getCount()); @@ -3009,7 +3009,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, if (xShapeProps.is()) { sal_Int32 nZOrder = 0; - if (xShapeProps->getPropertyValue(OUString("ZOrder")) >>= nZOrder) + if (xShapeProps->getPropertyValue("ZOrder") >>= nZOrder) { OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nZOrder); @@ -4490,7 +4490,7 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(OUString("com.sun.star.comp.SpreadsheetSettings")), uno::UNO_QUERY); + uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance("com.sun.star.comp.SpreadsheetSettings"), uno::UNO_QUERY); if (xProperties.is()) SvXMLUnitConverter::convertPropertySet(rProps, xProperties); diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 3e80d97194a8..972d990d82b0 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -2585,7 +2585,7 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa } } } - uno::Reference <uno::XInterface> xInterface = xMultiServiceFactory->createInstance(OUString("com.sun.star.comp.SpreadsheetSettings")); + uno::Reference <uno::XInterface> xInterface = xMultiServiceFactory->createInstance("com.sun.star.comp.SpreadsheetSettings"); uno::Reference <beans::XPropertySet> xProperties(xInterface, uno::UNO_QUERY); if (xProperties.is()) SvXMLUnitConverter::convertPropertySet(xProperties, aConfigProps); @@ -2765,7 +2765,7 @@ void ScXMLImport::AddStyleRange(const table::CellRangeAddress& rCellRange) { uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) - xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>(xMultiServiceFactory->createInstance(OUString("com.sun.star.sheet.SheetCellRanges")), uno::UNO_QUERY)); + xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>(xMultiServiceFactory->createInstance("com.sun.star.sheet.SheetCellRanges"), uno::UNO_QUERY)); OSL_ENSURE(xSheetCellRanges.is(), "didn't get SheetCellRanges"); } diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 477f151cbba6..e96a1ecc8f9e 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -577,7 +577,7 @@ void XMLTableStyleContext::SetDefaults() uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetImport().GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); + uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance("com.sun.star.sheet.Defaults"), uno::UNO_QUERY); if (xProperties.is()) FillPropertySet(xProperties); } diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 1df21c52dfe9..b09d16932a37 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -134,7 +134,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo aParserInput.aInputStream = xDocStream->getInputStream(); uno::Reference < beans::XPropertySet > xSet( xDocStream, uno::UNO_QUERY ); - uno::Any aAny = xSet->getPropertyValue( OUString("Encrypted") ); + uno::Any aAny = xSet->getPropertyValue("Encrypted"); aAny >>= bEncrypted; } catch( const packages::WrongPasswordException& ) @@ -381,7 +381,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) { sal_Int32 nProgressRange(1000000); xStatusIndicator->start(ScGlobal::GetRscString(STR_LOAD_DOC), nProgressRange); - xInfoSet->setPropertyValue(OUString("ProgressRange"), uno::makeAny(nProgressRange)); + xInfoSet->setPropertyValue("ProgressRange", uno::makeAny(nProgressRange)); } // Set base URI @@ -601,14 +601,14 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) } // Set Code Names - uno::Any aAny = xInfoSet->getPropertyValue(OUString("ScriptConfiguration")); + uno::Any aAny = xInfoSet->getPropertyValue("ScriptConfiguration"); uno::Reference <container::XNameAccess> xCodeNameAccess; if( aAny >>= xCodeNameAccess ) XMLCodeNameProvider::set( xCodeNameAccess, &rDoc ); // VBA compatibility bool bVBACompat = false; - if ( (xInfoSet->getPropertyValue(OUString("VBACompatibilityMode")) >>= bVBACompat) && bVBACompat ) + if ( (xInfoSet->getPropertyValue("VBACompatibilityMode") >>= bVBACompat) && bVBACompat ) { /* Set library container to VBA compatibility mode, this forces loading the Basic project, which in turn creates the @@ -673,7 +673,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(const uno::Reference<uno::XCompon uno::Reference < beans::XPropertySet > xSet( xStream, uno::UNO_QUERY ); if (xSet.is()) { - xSet->setPropertyValue(OUString("MediaType"), uno::makeAny(sMediaType)); + xSet->setPropertyValue("MediaType", uno::makeAny(sMediaType)); OUString aUseCommonPassPropName("UseCommonStoragePasswordEncryption"); // advise storage impl to use common encryption diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index eec20b57ae7c..ac0749b9101a 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1040,7 +1040,7 @@ void ScChildrenShapes::AddShape(const uno::Reference<drawing::XShape>& xShape, s uno::Reference< beans::XPropertySet > xShapeProp(xShape, uno::UNO_QUERY); if (xShapeProp.is()) { - uno::Any aPropAny = xShapeProp->getPropertyValue(OUString( "LayerID" )); + uno::Any aPropAny = xShapeProp->getPropertyValue("LayerID"); sal_Int16 nLayerID = 0; if( aPropAny >>= nLayerID ) { diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 919d59e35bff..795902e4d4c7 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1088,7 +1088,7 @@ void ScInputBarGroup::TriggerToolboxLayout() if ( xPropSet.is() ) { - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); + com::sun::star::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; } diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 2f1f0e2e8855..c272a2729e97 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2851,7 +2851,7 @@ uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, St uno::Reference< uno::XInterface > xDocModuleApiObject; if ( xSF.is() ) { - xVBACodeNamedObjectAccess.set( xSF->createInstance( OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY ); + xVBACodeNamedObjectAccess.set( xSF->createInstance("ooo.vba.VBAObjectModuleObjectProvider"), uno::UNO_QUERY ); xDocModuleApiObject.set( xVBACodeNamedObjectAccess->getByName( sCodeName ), uno::UNO_QUERY ); } return xDocModuleApiObject; diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 5673502d6599..695cbda432cc 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -289,7 +289,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - xSet->setPropertyValue( OUString("PluginURL"), + xSet->setPropertyValue("PluginURL", uno::makeAny( OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) ); } } @@ -685,7 +685,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* { //get dialog size: awt::Size aDialogAWTSize; - if( xDialogProps->getPropertyValue( OUString("Size") ) + if( xDialogProps->getPropertyValue("Size") >>= aDialogAWTSize ) { Size aDialogSize( aDialogAWTSize.Width, aDialogAWTSize.Height ); @@ -693,12 +693,12 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* { //calculate and set new position Point aDialogPos = pViewShell->GetChartDialogPos( aDialogSize, aRect ); - xDialogProps->setPropertyValue( OUString("Position"), + xDialogProps->setPropertyValue("Position", uno::makeAny( awt::Point(aDialogPos.getX(),aDialogPos.getY()) ) ); } } //tell the dialog to unlock controller - xDialogProps->setPropertyValue( OUString("UnlockControllersOnExecute"), + xDialogProps->setPropertyValue("UnlockControllersOnExecute", uno::makeAny( sal_True ) ); } diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index e2265717498e..356c65923ae6 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -211,7 +211,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { try { - aCaller = xProps->getPropertyValue( OUString("Name") ); + aCaller = xProps->getPropertyValue("Name"); } catch( uno::Exception& ) {} } diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 4efb484410aa..0a2ff0debffc 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -254,7 +254,7 @@ namespace calc if ( xProp.is() ) { CellContentType eResultType; - if ( (xProp->getPropertyValue(OUString( "FormulaResultType" ) ) >>= eResultType) && eResultType == CellContentType_VALUE ) + if ( (xProp->getPropertyValue("FormulaResultType") >>= eResultType) && eResultType == CellContentType_VALUE ) bHasValue = sal_True; } } @@ -417,10 +417,10 @@ namespace calc if ( xOldFormat.is() ) { // use the locale of the existing format - xOldFormat->getPropertyValue( OUString( "Locale" ) ) >>= aLocale; + xOldFormat->getPropertyValue("Locale") >>= aLocale; sal_Int16 nOldType = ::comphelper::getINT16( - xOldFormat->getPropertyValue( OUString( "Type" ) ) ); + xOldFormat->getPropertyValue("Type") ); if ( nOldType & NumberFormat::LOGICAL ) bWasBoolean = sal_True; } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 635fa1af9713..81e4953c2bcb 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -1802,7 +1802,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum { Reference< beans::XPropertySet > xSeqProp( xLS->getValues(), uno::UNO_QUERY ); OUString aRole; - if( xSeqProp.is() && (xSeqProp->getPropertyValue(OUString("Role")) >>= aRole) && + if( xSeqProp.is() && (xSeqProp->getPropertyValue("Role") >>= aRole) && aRole.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("categories")) ) bThisIsCategories = bHasCategories = true; } diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 31038d8c41e7..2fa6324264c0 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -85,7 +85,7 @@ public: { ScDocument* pDoc = mpDocShell->GetDocument(); if ( !pDoc ) - throw uno::RuntimeException( OUString(""), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("", uno::Reference< uno::XInterface >() ); uno::Sequence< uno::Any > aArgs(2); // access the application object ( parent for workbook ) diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index fe9a594a8534..8c71f3f74112 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -278,7 +278,7 @@ static sal_Bool lcl_GetCaptionPoint( uno::Reference< drawing::XShape >& xShape, uno::Reference < beans::XPropertySet > xShapeProp (xShape, uno::UNO_QUERY); if (xShapeProp.is()) { - xShapeProp->getPropertyValue( OUString( "CaptionPoint" ) ) >>= rCaptionPoint; + xShapeProp->getPropertyValue("CaptionPoint") >>= rCaptionPoint; bReturn = sal_True; } } @@ -446,7 +446,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( } } else - throw lang::IllegalArgumentException(OUString("only XCell or XSpreadsheet objects allowed"), static_cast<cppu::OWeakObject*>(this), 0); + throw lang::IllegalArgumentException("only XCell or XSpreadsheet objects allowed", static_cast<cppu::OWeakObject*>(this), 0); } else if ( aNameString.EqualsAscii( SC_UNONAME_IMAGEMAP ) ) { diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index d8eb7f321e67..0d6d94e99f51 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -52,7 +52,7 @@ GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException ) if ( pShell ) xModel.set( pShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xModelProps( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( xModelProps->getPropertyValue( OUString("UnnamedDatabaseRanges") ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( xModelProps->getPropertyValue("UnnamedDatabaseRanges"), uno::UNO_QUERY_THROW ); return xUnnamedDBRanges; } @@ -68,7 +68,7 @@ GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( uno::RuntimeExc uno::Reference< sheet::XDatabaseRange > xDBRange( xUnnamedDBRanges->getByTable( nSheet ) , uno::UNO_QUERY_THROW ); sal_Bool bHasAuto = false; uno::Reference< beans::XPropertySet > xProps( xDBRange, uno::UNO_QUERY_THROW ); - xProps->getPropertyValue( OUString("AutoFilter") ) >>= bHasAuto; + xProps->getPropertyValue("AutoFilter") >>= bHasAuto; if ( bHasAuto ) { xDataBaseRange=xDBRange; @@ -82,7 +82,7 @@ ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRang ScCellRangesBase* pScCellRangesBase = ScCellRangesBase::getImplementation( xRange ); if ( !pScCellRangesBase ) { - throw uno::RuntimeException( OUString( "Failed to access underlying doc shell uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Failed to access underlying doc shell uno range object", uno::Reference< uno::XInterface >() ); } return pScCellRangesBase->GetDocShell(); } @@ -262,7 +262,7 @@ getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) thro { uno::Reference< beans::XPropertySet > xProps( xSheet, uno::UNO_QUERY_THROW ); OUString sCodeName; - xProps->getPropertyValue( OUString("CodeName") ) >>= sCodeName; + xProps->getPropertyValue("CodeName") >>= sCodeName; // #TODO #FIXME ideally we should 'throw' here if we don't get a valid parent, but... it is possible // to create a module ( and use 'Option VBASupport 1' ) for a calc document, in this scenario there // are *NO* special document module objects ( of course being able to switch between vba/non vba mode at @@ -324,7 +324,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& { uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW ); uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance("ooo.vba.VBAObjectModuleObjectProvider"), uno::UNO_QUERY_THROW ); // set up the module info for the workbook and sheets in the nealy created // spreadsheet ScDocument* pDoc = pShell->GetDocument(); diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 12208dde8812..aa3114d0fde7 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -79,7 +79,7 @@ template < typename ImplObject > if ( xTunnel.is() ) pObj = reinterpret_cast<ImplObject*>( xTunnel->getSomething(ImplObject::getUnoTunnelId())); if ( bThrow && !pObj ) - throw css::uno::RuntimeException( OUString( "Internal error, can't exctract implementation object" ), rxWrapperIf ); + throw css::uno::RuntimeException("Internal error, can't exctract implementation object", rxWrapperIf ); return pObj; } // ============================================================================ diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 13c62fe16826..bc19d9f4b200 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -282,15 +282,15 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) if ( ScVbaShape::getType( xShape ) == office::MsoShapeType::msoAutoShape ) { uno::Reference< lang::XServiceInfo > xShapeServiceInfo( xShape, uno::UNO_QUERY_THROW ); - if ( xShapeServiceInfo->supportsService( OUString( "com.sun.star.drawing.Text" ) ) ) + if ( xShapeServiceInfo->supportsService("com.sun.star.drawing.Text") ) { return uno::makeAny( uno::Reference< msforms::XTextBoxShape >(new ScVbaTextBoxShape( mxContext, xShape, xShapes, xModel ) ) ); } } return uno::makeAny( uno::Reference< msforms::XShape >(new ScVbaShape( this, mxContext, xShape, xShapes, xModel, ScVbaShape::getType( xShape ) ) ) ); } - else if( xServiceInfo->supportsService( OUString("com.sun.star.sheet.SheetCellRange") ) || - xServiceInfo->supportsService( OUString("com.sun.star.sheet.SheetCellRanges") ) ) + else if( xServiceInfo->supportsService("com.sun.star.sheet.SheetCellRange") || + xServiceInfo->supportsService("com.sun.star.sheet.SheetCellRanges") ) { uno::Reference< table::XCellRange > xRange( aSelection, ::uno::UNO_QUERY); if ( !xRange.is() ) @@ -316,10 +316,10 @@ ScVbaApplication::getActiveCell() throw (uno::RuntimeException ) uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW); ScTabViewShell* pViewShell = excel::getCurrentBestViewShell(mxContext); if ( !pViewShell ) - throw uno::RuntimeException( OUString("No ViewShell available"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("No ViewShell available", uno::Reference< uno::XInterface >() ); ScViewData* pTabView = pViewShell->GetViewData(); if ( !pTabView ) - throw uno::RuntimeException( OUString("No ViewData available"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("No ViewData available", uno::Reference< uno::XInterface >() ); sal_Int32 nCursorX = pTabView->GetCurX(); sal_Int32 nCursorY = pTabView->GetCurY(); @@ -438,7 +438,7 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime } } else - throw uno::RuntimeException( OUString( "Invalid prarameter. It should be a string or False" ), + throw uno::RuntimeException("Invalid prarameter. It should be a string or False", uno::Reference< uno::XInterface >() ); } @@ -539,7 +539,7 @@ ScVbaApplication::getActiveSheet() throw (uno::RuntimeException) if ( !result.is() ) { // Fixme - check if this is reasonable/desired behavior - throw uno::RuntimeException( OUString( "No activeSheet available" ), + throw uno::RuntimeException("No activeSheet available", uno::Reference< uno::XInterface >() ); } return result; @@ -571,7 +571,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro bScroll = aScroll; } else - throw uno::RuntimeException( OUString( "second parameter should be boolean" ), + throw uno::RuntimeException("second parameter should be boolean", uno::Reference< uno::XInterface >() ); } @@ -617,7 +617,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro //and the createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) to get a root browse::XBrowseNode. //for query XInvocation interface. //but how to directly get the XInvocation? - throw uno::RuntimeException( OUString( "invalid reference for range name, it should be procedure name" ), + throw uno::RuntimeException("invalid reference for range name, it should be procedure name", uno::Reference< uno::XInterface >() ); } return; @@ -652,7 +652,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro } return; } - throw uno::RuntimeException( OUString( "invalid reference or name" ), + throw uno::RuntimeException("invalid reference or name", uno::Reference< uno::XInterface >() ); } @@ -705,7 +705,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) break; } default: - throw uno::RuntimeException( OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Unknown value for Cursor pointer", uno::Reference< uno::XInterface >() ); // TODO: isn't this a flaw in the API? It should be allowed to throw an // IllegalArgumentException, or so } @@ -803,8 +803,8 @@ ScVbaApplication::setDisplayScrollBars( sal_Bool bSet ) throw (uno::RuntimeExce // use uno here as it does all he repainting etc. magic uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProps( xView, uno::UNO_QUERY ); - xProps->setPropertyValue( OUString("HasVerticalScrollBar"), uno::makeAny( bSet ) ); - xProps->setPropertyValue( OUString("HasHorizontalScrollBar"), uno::makeAny( bSet ) ); + xProps->setPropertyValue("HasVerticalScrollBar", uno::makeAny( bSet ) ); + xProps->setPropertyValue("HasHorizontalScrollBar", uno::makeAny( bSet ) ); } sal_Bool SAL_CALL diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 4e59d1b3dce7..e8d006e66c89 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -64,7 +64,7 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno: { ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() ); if ( !pChart ) - throw uno::RuntimeException( OUString( "Object failure, can't access chart implementation" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Object failure, can't access chart implementation", uno::Reference< uno::XInterface >() ); uno::Reference< beans::XPropertySet > xAxisPropertySet; if (((nType == xlCategory) || (nType == xlSeriesAxis) || (nType == xlValue))) @@ -96,18 +96,18 @@ public: // primary sal_Bool bBool = false; uno::Reference< beans::XPropertySet > xDiagramPropertySet( pChart->xDiagramPropertySet() ); - if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasXAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue("HasXAxis") >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlCategory ) ); - if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasYAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue("HasYAxis") >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlSeriesAxis ) ); if ( pChart->is3D() ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlValue ) ); // secondary - if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasSecondaryXAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue("HasSecondaryXAxis") >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlSecondary, xlCategory ) ); - if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasSecondaryYAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue("HasSecondaryYAxis") >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlSecondary, xlSeriesAxis ) ); } @@ -160,7 +160,7 @@ ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) sal_Int32 nAxisGroup = xlPrimary; sal_Int32 nType = -1; if ( !_nType.hasValue() || ( ( _nType >>= nType ) == false ) ) - throw uno::RuntimeException( OUString( "Axes::Item Failed to extract type" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Axes::Item Failed to extract type", uno::Reference< uno::XInterface >() ); if ( _oAxisGroup.hasValue() ) _oAxisGroup >>= nAxisGroup ; diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index f52eec90a38b..242d877213e8 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -38,7 +38,7 @@ ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) { ScVbaChart* pChart = static_cast< ScVbaChart* >( moChartParent.get() ); if ( !pChart ) - throw uno::RuntimeException( OUString("Can't access parent chart impl"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Can't access parent chart impl", uno::Reference< uno::XInterface >() ); return pChart; } @@ -232,13 +232,13 @@ ScVbaAxis::setHasTitle( ::sal_Bool _bHasTitle ) throw (script::BasicErrorExcepti switch(nType) { case xlCategory: - pChart->mxDiagramPropertySet->setPropertyValue( OUString("HasXAxisTitle"), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue("HasXAxisTitle", uno::makeAny(_bHasTitle)); break; case xlSeriesAxis: - pChart->mxDiagramPropertySet->setPropertyValue( OUString("HasZAxisTitle"), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue("HasZAxisTitle", uno::makeAny(_bHasTitle)); break; default: // xlValue: - pChart->mxDiagramPropertySet->setPropertyValue( OUString("HasYAxisTitle"), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue("HasYAxisTitle", uno::makeAny(_bHasTitle)); } } @@ -259,13 +259,13 @@ ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExcep switch(nType) { case xlCategory: - pChart->mxDiagramPropertySet->getPropertyValue( OUString("HasXAxisTitle") ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue("HasXAxisTitle") >>= bHasTitle; break; case xlSeriesAxis: - pChart->mxDiagramPropertySet->getPropertyValue( OUString("HasZAxisTitle") ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue("HasZAxisTitle") >>= bHasTitle; break; default: // xlValue: - pChart->mxDiagramPropertySet->getPropertyValue( OUString("HasYAxisTitle") ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue("HasYAxisTitle") >>= bHasTitle; } } catch (const uno::Exception& e) @@ -281,7 +281,7 @@ ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException try { if (isValueAxis()) - mxPropertySet->setPropertyValue( OUString("StepHelp"), uno::makeAny(_fMinorUnit)); + mxPropertySet->setPropertyValue("StepHelp", uno::makeAny(_fMinorUnit)); } catch (uno::Exception& ) { @@ -296,7 +296,7 @@ ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce try { if (isValueAxis()) - mxPropertySet->getPropertyValue( OUString("StepHelp")) >>= fMinor; + mxPropertySet->getPropertyValue("StepHelp") >>= fMinor; } catch (uno::Exception& ) { @@ -311,7 +311,7 @@ ScVbaAxis::setMinorUnitIsAuto( ::sal_Bool _bMinorUnitIsAuto ) throw (script::Bas try { if (isValueAxis()) - mxPropertySet->setPropertyValue( OUString( "AutoStepHelp" ), uno::makeAny(_bMinorUnitIsAuto)); + mxPropertySet->setPropertyValue("AutoStepHelp", uno::makeAny(_bMinorUnitIsAuto)); } catch (uno::Exception& ) { @@ -327,7 +327,7 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti { if (isValueAxis()) { - mxPropertySet->getPropertyValue( OUString( "AutoStepHelp") ) >>= bIsAuto; + mxPropertySet->getPropertyValue("AutoStepHelp") >>= bIsAuto; } } catch (uno::Exception& ) @@ -357,7 +357,7 @@ ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException { if (isValueAxis()) { - mxPropertySet->setPropertyValue( OUString("StepMain"), uno::makeAny(_fMajorUnit)); + mxPropertySet->setPropertyValue("StepMain", uno::makeAny(_fMajorUnit)); } } catch (uno::Exception& ) @@ -373,7 +373,7 @@ ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce try { if (isValueAxis()) - mxPropertySet->getPropertyValue( OUString("StepMain")) >>= fMax; + mxPropertySet->getPropertyValue("StepMain") >>= fMax; } catch (uno::Exception& ) { @@ -389,7 +389,7 @@ ScVbaAxis::setMajorUnitIsAuto( ::sal_Bool _bMajorUnitIsAuto ) throw (script::Bas { if (isValueAxis()) { - mxPropertySet->setPropertyValue( OUString( "AutoStepMain" ), uno::makeAny( _bMajorUnitIsAuto )); + mxPropertySet->setPropertyValue("AutoStepMain", uno::makeAny( _bMajorUnitIsAuto )); } } catch (uno::Exception& ) @@ -406,7 +406,7 @@ ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti { if (isValueAxis()) { - mxPropertySet->getPropertyValue( OUString( "AutoStepMain")) >>= bIsAuto; + mxPropertySet->getPropertyValue("AutoStepMain") >>= bIsAuto; } } catch (uno::Exception& ) @@ -423,7 +423,7 @@ ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorExc { if ( isValueAxis() ) { - mxPropertySet->setPropertyValue( OUString( "Max" ), uno::makeAny(_fMaximumScale)); + mxPropertySet->setPropertyValue("Max", uno::makeAny(_fMaximumScale)); } } catch ( uno::Exception& ) @@ -440,7 +440,7 @@ ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeE { if (isValueAxis()) { - mxPropertySet->getPropertyValue( OUString( "Max" )) >>= fMax; + mxPropertySet->getPropertyValue("Max") >>= fMax; } } catch (uno::Exception& ) @@ -457,7 +457,7 @@ ScVbaAxis::setMaximumScaleIsAuto( ::sal_Bool _bMaximumScaleIsAuto ) throw (scrip try { if ( isValueAxis() ) - mxPropertySet->setPropertyValue( OUString( "AutoMax" ), uno::makeAny( _bMaximumScaleIsAuto )); + mxPropertySet->setPropertyValue("AutoMax", uno::makeAny( _bMaximumScaleIsAuto )); } catch ( uno::Exception& ) @@ -474,7 +474,7 @@ ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru try { if (isValueAxis()) - mxPropertySet->getPropertyValue( OUString( "AutoMax" ) ) >>= bIsAuto; + mxPropertySet->getPropertyValue("AutoMax") >>= bIsAuto; } catch ( uno::Exception& ) { @@ -489,7 +489,7 @@ ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorExc try { if (isValueAxis()) - mxPropertySet->setPropertyValue( OUString("Min"), uno::makeAny( _fMinimumScale ) ); + mxPropertySet->setPropertyValue("Min", uno::makeAny( _fMinimumScale ) ); } catch ( uno::Exception& ) { @@ -504,7 +504,7 @@ ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeE try { if (isValueAxis()) - mxPropertySet->getPropertyValue( OUString( "Min")) >>= fMin; + mxPropertySet->getPropertyValue("Min") >>= fMin; } catch (const uno::Exception& e) { @@ -520,7 +520,7 @@ ScVbaAxis::setMinimumScaleIsAuto( ::sal_Bool _bMinimumScaleIsAuto ) throw (scrip { if (isValueAxis()) { - mxPropertySet->setPropertyValue( OUString("AutoMin"), uno::makeAny(_bMinimumScaleIsAuto)); + mxPropertySet->setPropertyValue("AutoMin", uno::makeAny(_bMinimumScaleIsAuto)); } } catch (uno::Exception& ) @@ -537,7 +537,7 @@ ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru { if (isValueAxis()) { - mxPropertySet->getPropertyValue( OUString("AutoMin") ) >>= bIsAuto; + mxPropertySet->getPropertyValue("AutoMin") >>= bIsAuto; } } catch (uno::Exception& ) @@ -563,10 +563,10 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce switch (_nScaleType) { case xlScaleLinear: - mxPropertySet->setPropertyValue( OUString( "Logarithmic" ), uno::makeAny( sal_False ) ); + mxPropertySet->setPropertyValue("Logarithmic", uno::makeAny( sal_False ) ); break; case xlScaleLogarithmic: - mxPropertySet->setPropertyValue( OUString( "Logarithmic" ), uno::makeAny( sal_True ) ); + mxPropertySet->setPropertyValue("Logarithmic", uno::makeAny( sal_True ) ); break; default: // According to MS the paramenter is ignored and no Error is thrown diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index 38ee47e8c919..1e2a223bd90e 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -167,7 +167,7 @@ public: table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) ); - throw uno::RuntimeException( OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("No Implementation available", uno::Reference< uno::XInterface >() ); } void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException) { @@ -180,7 +180,7 @@ public: setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("No Implementation available", uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException) @@ -231,7 +231,7 @@ public: break; } } - throw uno::RuntimeException( OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Method failed", uno::Reference< uno::XInterface >() ); } void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException) { @@ -255,12 +255,12 @@ public: aBorderLine.OuterLineWidth = OOLineHairline; break; default: - throw uno::RuntimeException( OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Bad param", uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Method failed", uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException) @@ -289,12 +289,12 @@ public: case XlLineStyle::xlSlantDashDot: break; default: - throw uno::RuntimeException( OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Bad param", uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Method failed", uno::Reference< uno::XInterface >() ); } }; diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx index 496c8d6d2cec..6d398cdfdddc 100644 --- a/sc/source/ui/vba/vbacharacters.cxx +++ b/sc/source/ui/vba/vbacharacters.cxx @@ -87,7 +87,7 @@ void SAL_CALL ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) throw (css::uno::RuntimeException) { // #TODO #FIXME needs implementation, or can't be done? - throw uno::RuntimeException( OUString( "Not Implemented"), uno::Reference< XInterface >() ); + throw uno::RuntimeException("Not Implemented", uno::Reference< XInterface >() ); } diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx index 81904861106a..578b5a26cf1b 100644 --- a/sc/source/ui/vba/vbachartobjects.cxx +++ b/sc/source/ui/vba/vbachartobjects.cxx @@ -74,10 +74,10 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException ScCellRangesBase* pUno= dynamic_cast< ScCellRangesBase* >( xIf.get() ); ScDocShell* pDocShell = NULL; if ( !pUno ) - throw uno::RuntimeException( OUString("Failed to obtain the impl class from the drawpage"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Failed to obtain the impl class from the drawpage", uno::Reference< uno::XInterface >() ); pDocShell = pUno->GetDocShell(); if ( !pDocShell ) - throw uno::RuntimeException( OUString("Failed to obtain the docshell implclass"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Failed to obtain the docshell implclass", uno::Reference< uno::XInterface >() ); uno::Reference< sheet::XSpreadsheetDocument > xSpreadsheetDocument( pDocShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheets > xSpreadsheets = xSpreadsheetDocument->getSheets(); diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index d6f18cc40bbc..6f801d3dd757 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -47,7 +47,7 @@ ScVbaComment::ScVbaComment( mxRange( xRange ) { if ( !xRange.is() ) - throw lang::IllegalArgumentException( OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); + throw lang::IllegalArgumentException("range is not set ", uno::Reference< uno::XInterface >() , 1 ); uno::Reference< text::XSimpleText > xAnnoText( getAnnotation(), uno::UNO_QUERY ); } @@ -200,7 +200,7 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An xAnnoText->insertString( xRange, sText, bOverwrite ); return xAnnoText->getString(); } - throw uno::RuntimeException( OUString( "ScVbaComment::Text - bad Start value " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("ScVbaComment::Text - bad Start value ", uno::Reference< uno::XInterface >() ); } else if ( aText.hasValue() ) { diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 1f6ce312547b..292171658082 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -105,8 +105,8 @@ ScVbaFont::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeExceptio nValue = SUPERSCRIPT; nValue2 = SUPERSCRIPTHEIGHT; } - xProps->setPropertyValue( OUString( "CharEscapement" ), ( uno::Any )nValue ); - xProps->setPropertyValue( OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); + xProps->setPropertyValue("CharEscapement", ( uno::Any )nValue ); + xProps->setPropertyValue("CharEscapementHeight", ( uno::Any )nValue2 ); } uno::Any SAL_CALL @@ -138,7 +138,7 @@ ScVbaFont::getSuperscript() throw ( uno::RuntimeException ) xCell.set( xCellRange->getCellByPosition( 0,0 ) ); uno::Reference< beans::XPropertySet > xProps = lcl_TextProperties( xCell ); short nValue = 0; - xProps->getPropertyValue( OUString( "CharEscapement" ) ) >>= nValue; + xProps->getPropertyValue("CharEscapement") >>= nValue; return uno::makeAny( ( nValue == SUPERSCRIPT ) ); } @@ -178,8 +178,8 @@ ScVbaFont::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException nValue2 = SUBSCRIPTHEIGHT; } - xProps->setPropertyValue( OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); - xProps->setPropertyValue( OUString( "CharEscapement" ), ( uno::Any )nValue ); + xProps->setPropertyValue("CharEscapementHeight", ( uno::Any )nValue2 ); + xProps->setPropertyValue("CharEscapement", ( uno::Any )nValue ); } @@ -213,7 +213,7 @@ ScVbaFont::getSubscript() throw ( uno::RuntimeException ) uno::Reference< beans::XPropertySet > xProps = lcl_TextProperties( xCell ); short nValue = NORMAL; - xProps->getPropertyValue( OUString( "CharEscapement" ) ) >>= nValue; + xProps->getPropertyValue("CharEscapement") >>= nValue; return uno::makeAny( ( nValue == SUBSCRIPT ) ); } @@ -258,7 +258,7 @@ void SAL_CALL ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException ) { //XXX #TODO# #FIXME# - //mxFont->setPropertyValue( OUString( "CharSize" ), ( uno::Any )fValue ); + //mxFont->setPropertyValue("CharSize", ( uno::Any )fValue ); throw uno::RuntimeException( OUString("setStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); } @@ -379,10 +379,10 @@ ScVbaFont::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException nValue = awt::FontUnderline::DOUBLE; break; default: - throw uno::RuntimeException( OUString("Unknown value for Underline"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Unknown value for Underline", uno::Reference< uno::XInterface >() ); } - mxFont->setPropertyValue( OUString( "CharUnderline" ), ( uno::Any )nValue ); + mxFont->setPropertyValue("CharUnderline", ( uno::Any )nValue ); } @@ -394,7 +394,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException ) return aNULL(); sal_Int32 nValue = awt::FontUnderline::NONE; - mxFont->getPropertyValue( OUString( "CharUnderline" ) ) >>= nValue; + mxFont->getPropertyValue("CharUnderline") >>= nValue; switch ( nValue ) { case awt::FontUnderline::DOUBLE: @@ -407,7 +407,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException ) nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone; break; default: - throw uno::RuntimeException( OUString("Unknown value retrieved for Underline"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Unknown value retrieved for Underline", uno::Reference< uno::XInterface >() ); } return uno::makeAny( nValue ); @@ -454,14 +454,14 @@ ScVbaFont::getColor() throw (uno::RuntimeException) { // #TODO #FIXME - behave like getXXX above ( wrt. GetDataSet ) uno::Any aAny; - aAny = OORGBToXLRGB( mxFont->getPropertyValue( OUString( "CharColor" ) ) ); + aAny = OORGBToXLRGB( mxFont->getPropertyValue("CharColor") ); return aAny; } void SAL_CALL ScVbaFont::setOutlineFont( const uno::Any& aValue ) throw ( uno::RuntimeException ) { - mxFont->setPropertyValue( OUString( "CharContoured" ), aValue ); + mxFont->setPropertyValue("CharContoured", aValue ); } uno::Any SAL_CALL @@ -470,7 +470,7 @@ ScVbaFont::getOutlineFont() throw (uno::RuntimeException) if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_CONTOUR, sal_True, NULL) == SFX_ITEM_DONTCARE ) return aNULL(); - return mxFont->getPropertyValue( OUString( "CharContoured" ) ); + return mxFont->getPropertyValue("CharContoured"); } OUString diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index e6de881b81e4..abe63a30ccb7 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -803,7 +803,7 @@ ScVbaFormat<Ifc1>::getCurrentDataSet( ) throw ( uno::RuntimeException ) { SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() ); if ( !pDataSet ) - throw uno::RuntimeException( OUString( "Can't access Itemset for XPropertySet" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Can't access Itemset for XPropertySet", uno::Reference< uno::XInterface >() ); return pDataSet; } diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index ce4f8969538d..5ffec53ee5da 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -140,7 +140,7 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException ) { try { - mxParentRangePropertySet->setPropertyValue( OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries) ); + mxParentRangePropertySet->setPropertyValue("ConditionalFormat", uno::makeAny( mxSheetConditionalEntries) ); } catch (uno::Exception& ) { diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index e0bf2411bada..3824cf0e4e22 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -203,7 +203,7 @@ ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException ) { try { - mxParentRangePropertySet->setPropertyValue( OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries )); + mxParentRangePropertySet->setPropertyValue("ConditionalFormat", uno::makeAny( mxSheetConditionalEntries )); } catch (uno::Exception& ) { diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx index 197b311a4f88..9af64aab38f2 100644 --- a/sc/source/ui/vba/vbahelper.cxx +++ b/sc/source/ui/vba/vbahelper.cxx @@ -517,7 +517,7 @@ OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeExcepti break; } default: - throw uno::RuntimeException( OUString( "Invalid type, can't convert" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Invalid type, can't convert", uno::Reference< uno::XInterface >() ); } return sString; } diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx index cd261d3a0704..f88ebb600b84 100644 --- a/sc/source/ui/vba/vbahyperlink.cxx +++ b/sc/source/ui/vba/vbahyperlink.cxx @@ -53,7 +53,7 @@ ScVbaHyperlink::ScVbaHyperlink( const uno::Reference< XHelperInterface >& rxAnch UrlComponents aUrlComp; OUString aTextToDisplay; if( !(rAddress >>= aUrlComp.first) || aUrlComp.first.isEmpty() ) - throw uno::RuntimeException( OUString( "Cannot get address" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Cannot get address", uno::Reference< uno::XInterface >() ); rSubAddress >>= aUrlComp.second; rScreenTip >>= maScreenTip; rTextToDisplay >>= aTextToDisplay; @@ -82,7 +82,7 @@ ScVbaHyperlink::ScVbaHyperlink( const uno::Reference< XHelperInterface >& rxAnch } // create and initialize a new URL text field uno::Reference< lang::XMultiServiceFactory > xFactory( ScVbaRange::getUnoModel( xAnchorRange ), uno::UNO_QUERY_THROW ); - uno::Reference< text::XTextContent > xUrlField( xFactory->createInstance( OUString( "com.sun.star.text.TextField.URL" ) ), uno::UNO_QUERY_THROW ); + uno::Reference< text::XTextContent > xUrlField( xFactory->createInstance("com.sun.star.text.TextField.URL"), uno::UNO_QUERY_THROW ); mxTextField.set( xUrlField, uno::UNO_QUERY_THROW ); setUrlComponents( aUrlComp ); setTextToDisplay( aTextToDisplay ); @@ -153,14 +153,14 @@ OUString ScVbaHyperlink::getTextToDisplay() throw (uno::RuntimeException) { ensureTextField(); OUString aTextToDisplay; - mxTextField->getPropertyValue( OUString( "Representation" ) ) >>= aTextToDisplay; + mxTextField->getPropertyValue("Representation") >>= aTextToDisplay; return aTextToDisplay; } void ScVbaHyperlink::setTextToDisplay( const OUString& rTextToDisplay ) throw (uno::RuntimeException) { ensureTextField(); - mxTextField->setPropertyValue( OUString( "Representation" ), uno::Any( rTextToDisplay ) ); + mxTextField->setPropertyValue("Representation", uno::Any( rTextToDisplay ) ); } sal_Int32 SAL_CALL ScVbaHyperlink::getType() throw (uno::RuntimeException) @@ -207,7 +207,7 @@ ScVbaHyperlink::UrlComponents ScVbaHyperlink::getUrlComponents() throw (uno::Run { ensureTextField(); OUString aUrl; - mxTextField->getPropertyValue( OUString( "URL" ) ) >>= aUrl; + mxTextField->getPropertyValue("URL") >>= aUrl; sal_Int32 nHashPos = aUrl.indexOf( '#' ); if( nHashPos < 0 ) return UrlComponents( aUrl, OUString() ); @@ -220,7 +220,7 @@ void ScVbaHyperlink::setUrlComponents( const UrlComponents& rUrlComp ) throw (un OUStringBuffer aUrl( rUrlComp.first ); if( !rUrlComp.second.isEmpty() ) aUrl.append( sal_Unicode( '#' ) ).append( rUrlComp.second ); - mxTextField->setPropertyValue( OUString( "URL" ), uno::Any( aUrl.makeStringAndClear() ) ); + mxTextField->setPropertyValue("URL", uno::Any( aUrl.makeStringAndClear() ) ); } namespace hyperlink diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index 8004e3c9eb6a..dc93fc3357db 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -37,7 +37,7 @@ bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRan { const ScRangeList& rScInner = ScVbaRange::getScRangeList( rxInner ); if( rScInner.empty() || rScOuter.empty() ) - throw uno::RuntimeException( OUString( "Empty range objects" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Empty range objects", uno::Reference< uno::XInterface >() ); for( size_t nIndex = 0, nCount = rScInner.size(); nIndex < nCount; ++nIndex ) if( !rScOuter.In( *rScInner[ nIndex ] ) ) diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 3782a100b7ee..840c7956ad67 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -86,7 +86,7 @@ ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, m_aPattColor.SetColor( (sal_uInt32)0x0 ); m_nPattern = 0L; if ( !m_xProps.is() ) - throw lang::IllegalArgumentException( OUString( "properties"), uno::Reference< uno::XInterface >(), 2 ); + throw lang::IllegalArgumentException("properties", uno::Reference< uno::XInterface >(), 2 ); } uno::Any @@ -250,7 +250,7 @@ ScVbaInterior::GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 n uno::Reference< container::XNameContainer > ScVbaInterior::GetAttributeContainer() { - return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( OUString( "UserDefinedAttributes" ) ), uno::UNO_QUERY_THROW ); + return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue("UserDefinedAttributes"), uno::UNO_QUERY_THROW ); } sal_Int32 ScVbaInterior::GetAttributeData( uno::Any aValue ) @@ -289,7 +289,7 @@ ScVbaInterior::SetUserDefinedAttributes( const OUString& sName, const uno::Any& if( xNameContainer->hasByName( sName ) ) xNameContainer->removeByName( sName ); xNameContainer->insertByName( sName, aValue ); - m_xProps->setPropertyValue( OUString( "UserDefinedAttributes" ), uno::makeAny( xNameContainer ) ); + m_xProps->setPropertyValue("UserDefinedAttributes", uno::makeAny( xNameContainer ) ); } } // OOo do not support below API @@ -311,7 +311,7 @@ ScVbaInterior::setPattern( const uno::Any& _pattern ) throw (uno::RuntimeExcepti SetMixedColor(); } else - throw uno::RuntimeException( OUString( "Invalid Pattern index" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Invalid Pattern index", uno::Reference< uno::XInterface >() ); } Color ScVbaInterior::GetBackColor() @@ -359,7 +359,7 @@ ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::Runt SetMixedColor(); } else - throw uno::RuntimeException( OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Invalid Pattern Color", uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException) @@ -382,7 +382,7 @@ ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw setPatternColor( uno::makeAny( OORGBToXLRGB( nPattColor ) ) ); } else - throw uno::RuntimeException( OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Invalid Pattern Color", uno::Reference< uno::XInterface >() ); } OUString diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index 5ee50155c401..9ed7663143c3 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -93,7 +93,7 @@ ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw return uno::makeAny( xMenuBar ); } - throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Not implemented", uno::Reference< uno::XInterface >() ); } // XHelperInterface diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx index 0db97d234915..0a93da53089e 100644 --- a/sc/source/ui/vba/vbaoleobject.cxx +++ b/sc/source/ui/vba/vbaoleobject.cxx @@ -43,7 +43,7 @@ ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParen xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW ); uno::Reference<frame::XModel> xModel( xChild->getParent(), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext("ooo.vba.ControlProvider", mxContext ), uno::UNO_QUERY_THROW ); m_xControl.set( xControlProvider->createControl( xControlShape, xModel ) ); } diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx index 780ed0e5467a..64ae5ce2254a 100644 --- a/sc/source/ui/vba/vbapagebreak.cxx +++ b/sc/source/ui/vba/vbapagebreak.cxx @@ -36,7 +36,7 @@ ScVbaPageBreak<Ifc1>::ScVbaPageBreak( const uno::Reference< XHelperInterface >& template< typename Ifc1 > sal_Int32 ScVbaPageBreak<Ifc1>::getType() throw (uno::RuntimeException) { - uno::Any aValue = mxRowColPropertySet->getPropertyValue( OUString( "IsStartOfNewPage" )); + uno::Any aValue = mxRowColPropertySet->getPropertyValue("IsStartOfNewPage"); sal_Bool hasPageBreak = false; aValue >>= hasPageBreak; @@ -61,11 +61,11 @@ void ScVbaPageBreak<Ifc1>::setType(sal_Int32 type) throw (uno::RuntimeException) if( type == excel::XlPageBreak::xlPageBreakNone ) { - mxRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); + mxRowColPropertySet->setPropertyValue("IsStartOfNewPage", uno::makeAny(sal_False)); return; } - mxRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); + mxRowColPropertySet->setPropertyValue("IsStartOfNewPage", uno::makeAny(sal_True)); if( type == excel::XlPageBreak::xlPageBreakManual ) maTablePageBreakData.ManualBreak = sal_True; else @@ -75,7 +75,7 @@ void ScVbaPageBreak<Ifc1>::setType(sal_Int32 type) throw (uno::RuntimeException) template< typename Ifc1 > void ScVbaPageBreak<Ifc1>::Delete() throw ( script::BasicErrorException, uno::RuntimeException) { - mxRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); + mxRowColPropertySet->setPropertyValue("IsStartOfNewPage", uno::makeAny(sal_False)); } template< typename Ifc1 > diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index 09100e25062e..6456cdb0c7e5 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -171,7 +171,7 @@ uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) throw ( css::script sal_Int32 nAPIRowColIndex = getAPIStartofRange( xRange ); uno::Reference< container::XIndexAccess > xIndexAccess = getRowColContainer(); uno::Reference< beans::XPropertySet > xRowColPropertySet( xIndexAccess->getByIndex(nAPIRowColIndex), uno::UNO_QUERY_THROW ); - xRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); + xRowColPropertySet->setPropertyValue("IsStartOfNewPage", uno::makeAny(sal_True)); sheet::TablePageBreakData aTablePageBreakData; aTablePageBreakData.ManualBreak = sal_True; aTablePageBreakData.Position = nAPIRowColIndex; diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx index 465467dd9f74..cefd6b24b999 100644 --- a/sc/source/ui/vba/vbapagesetup.cxx +++ b/sc/source/ui/vba/vbapagesetup.cxx @@ -51,13 +51,13 @@ ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent // query for current page style mxModel.set( xModel, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xSheetProps( mxSheet, uno::UNO_QUERY_THROW ); - uno::Any aValue = xSheetProps->getPropertyValue( OUString( "PageStyle" )); + uno::Any aValue = xSheetProps->getPropertyValue("PageStyle"); OUString aStyleName; aValue >>= aStyleName; uno::Reference< style::XStyleFamiliesSupplier > xStyleFamiliesSup( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xStyleFamilies = xStyleFamiliesSup->getStyleFamilies(); - uno::Reference< container::XNameAccess > xPageStyle( xStyleFamilies->getByName(OUString( "PageStyles")), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xPageStyle( xStyleFamilies->getByName("PageStyles"), uno::UNO_QUERY_THROW ); mxPageProps.set( xPageStyle->getByName(aStyleName), uno::UNO_QUERY_THROW ); mnOrientLandscape = excel::XlPageOrientation::xlLandscape; mnOrientPortrait = excel::XlPageOrientation::xlPortrait; @@ -140,7 +140,7 @@ void SAL_CALL ScVbaPageSetup::setFooterMargin( double margin ) throw (css::uno:: uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesTall() throw (css::uno::RuntimeException) { - return mxPageProps->getPropertyValue( OUString( "ScaleToPagesY")); + return mxPageProps->getPropertyValue("ScaleToPagesY"); } void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) throw (css::uno::RuntimeException) @@ -154,7 +154,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) fitToPagesTall >>= scaleToPageY; } - mxPageProps->setPropertyValue( OUString( "ScaleToPagesY"), uno::makeAny( scaleToPageY )); + mxPageProps->setPropertyValue("ScaleToPagesY", uno::makeAny( scaleToPageY )); } catch( uno::Exception& ) { @@ -163,7 +163,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesWide() throw (css::uno::RuntimeException) { - return mxPageProps->getPropertyValue( OUString( "ScaleToPagesX")); + return mxPageProps->getPropertyValue("ScaleToPagesX"); } void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) throw (css::uno::RuntimeException) @@ -177,7 +177,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) fitToPagesWide >>= scaleToPageX; } - mxPageProps->setPropertyValue( OUString( "ScaleToPagesX"), uno::makeAny( scaleToPageX )); + mxPageProps->setPropertyValue("ScaleToPagesX", uno::makeAny( scaleToPageX )); } catch( uno::Exception& ) { @@ -186,7 +186,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) uno::Any SAL_CALL ScVbaPageSetup::getZoom() throw (css::uno::RuntimeException) { - return mxPageProps->getPropertyValue( OUString( "PageScale")); + return mxPageProps->getPropertyValue("PageScale"); } void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::RuntimeException) @@ -214,9 +214,9 @@ void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::Ru // these only exist in S08 sal_uInt16 nScale = 0; - mxPageProps->setPropertyValue( OUString( "ScaleToPages"), uno::makeAny( nScale )); - mxPageProps->setPropertyValue( OUString( "ScaleToPagesX"), uno::makeAny( nScale )); - mxPageProps->setPropertyValue( OUString( "ScaleToPagesY"), uno::makeAny( nScale )); + mxPageProps->setPropertyValue("ScaleToPages", uno::makeAny( nScale )); + mxPageProps->setPropertyValue("ScaleToPagesX", uno::makeAny( nScale )); + mxPageProps->setPropertyValue("ScaleToPagesY", uno::makeAny( nScale )); } catch( beans::UnknownPropertyException& ) { @@ -229,7 +229,7 @@ void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::Ru { } - mxPageProps->setPropertyValue( OUString( "PageScale"), uno::makeAny( pageScale )); + mxPageProps->setPropertyValue("PageScale", uno::makeAny( pageScale )); } OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeException) @@ -237,7 +237,7 @@ OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeExcept OUString leftHeader; try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue("RightPageHeaderContent"), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getLeftText(); @@ -255,12 +255,12 @@ void SAL_CALL ScVbaPageSetup::setLeftHeader( const OUString& leftHeader) throw ( { try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue("RightPageHeaderContent"), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getLeftText(); xText->setString( leftHeader ); - mxPageProps->setPropertyValue( OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); + mxPageProps->setPropertyValue("RightPageHeaderContent", uno::makeAny(xHeaderContent) ); } } catch( uno::Exception& ) @@ -273,7 +273,7 @@ OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::RuntimeExce OUString centerHeader; try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue("RightPageHeaderContent"), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getCenterText(); @@ -291,12 +291,12 @@ void SAL_CALL ScVbaPageSetup::setCenterHeader( const OUString& centerHeader) thr { try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue("RightPageHeaderContent"), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getCenterText(); xText->setString( centerHeader ); - mxPageProps->setPropertyValue( OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); + mxPageProps->setPropertyValue("RightPageHeaderContent", uno::makeAny(xHeaderContent) ); } } catch( uno::Exception& ) @@ -309,7 +309,7 @@ OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::RuntimeExcep OUString rightHeader; try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue("RightPageHeaderContent"), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getRightText(); @@ -327,12 +327,12 @@ void SAL_CALL ScVbaPageSetup::setRightHeader( const OUString& rightHeader) throw { try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue("RightPageHeaderContent"), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getRightText(); xText->setString( rightHeader ); - mxPageProps->setPropertyValue( OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); + mxPageProps->setPropertyValue("RightPageHeaderContent", uno::makeAny(xHeaderContent) ); } } catch( uno::Exception& ) @@ -345,7 +345,7 @@ OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeExcept OUString leftFooter; try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue("RightPageFooterContent"), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getLeftText(); @@ -363,12 +363,12 @@ void SAL_CALL ScVbaPageSetup::setLeftFooter( const OUString& leftFooter) throw ( { try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue("RightPageFooterContent"), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getLeftText(); xText->setString( leftFooter ); - mxPageProps->setPropertyValue( OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); + mxPageProps->setPropertyValue("RightPageFooterContent", uno::makeAny(xFooterContent) ); } } catch( uno::Exception& ) @@ -381,7 +381,7 @@ OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::RuntimeExce OUString centerFooter; try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue("RightPageFooterContent"), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getCenterText(); @@ -399,12 +399,12 @@ void SAL_CALL ScVbaPageSetup::setCenterFooter( const OUString& centerFooter) thr { try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue("RightPageFooterContent"), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getCenterText(); xText->setString( centerFooter ); - mxPageProps->setPropertyValue( OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); + mxPageProps->setPropertyValue("RightPageFooterContent", uno::makeAny(xFooterContent) ); } } catch( uno::Exception& ) @@ -418,7 +418,7 @@ OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::RuntimeExcep OUString rightFooter; try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue("RightPageFooterContent"), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getRightText(); @@ -436,12 +436,12 @@ void SAL_CALL ScVbaPageSetup::setRightFooter( const OUString& rightFooter) throw { try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue("RightPageFooterContent"), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getRightText(); xText->setString( rightFooter ); - mxPageProps->setPropertyValue( OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); + mxPageProps->setPropertyValue("RightPageFooterContent", uno::makeAny(xFooterContent) ); } } catch( uno::Exception& ) @@ -454,7 +454,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getOrder() throw (css::uno::RuntimeException) sal_Int32 order = excel::XlOrder::xlDownThenOver; try { - uno::Any aValue = mxPageProps->getPropertyValue( OUString( "PrintDownFirst")); + uno::Any aValue = mxPageProps->getPropertyValue("PrintDownFirst"); sal_Bool bPrintDownFirst = false; aValue >>= bPrintDownFirst; if( !bPrintDownFirst ) @@ -483,7 +483,7 @@ void SAL_CALL ScVbaPageSetup::setOrder( sal_Int32 order) throw (css::uno::Runtim try { - mxPageProps->setPropertyValue( OUString( "PrintDownFirst"), uno::makeAny( bOrder )); + mxPageProps->setPropertyValue("PrintDownFirst", uno::makeAny( bOrder )); } catch( uno::Exception& ) { @@ -495,7 +495,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::Runtime sal_Int16 number = 0; try { - uno::Any aValue = mxPageProps->getPropertyValue( OUString( "FirstPageNumber")); + uno::Any aValue = mxPageProps->getPropertyValue("FirstPageNumber"); aValue >>= number; } catch( uno::Exception& ) @@ -521,7 +521,7 @@ void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) thr { uno::Any aValue; aValue <<= (sal_Int16)firstPageNumber; - mxPageProps->setPropertyValue( OUString( "FirstPageNumber"), aValue ); + mxPageProps->setPropertyValue("FirstPageNumber", aValue ); } catch( uno::Exception& ) { @@ -533,7 +533,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterVertically() throw (css::uno::Runtime sal_Bool centerVertically = false; try { - uno::Any aValue = mxPageProps->getPropertyValue( OUString( "CenterVertically")); + uno::Any aValue = mxPageProps->getPropertyValue("CenterVertically"); aValue >>= centerVertically; } catch( uno::Exception& ) @@ -546,7 +546,7 @@ void SAL_CALL ScVbaPageSetup::setCenterVertically( sal_Bool centerVertically) th { try { - mxPageProps->setPropertyValue( OUString( "CenterVertically"), uno::makeAny( centerVertically )); + mxPageProps->setPropertyValue("CenterVertically", uno::makeAny( centerVertically )); } catch( uno::Exception& ) { @@ -558,7 +558,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterHorizontally() throw (css::uno::Runti sal_Bool centerHorizontally = false; try { - uno::Any aValue = mxPageProps->getPropertyValue( OUString( "CenterHorizontally")); + uno::Any aValue = mxPageProps->getPropertyValue("CenterHorizontally"); aValue >>= centerHorizontally; } catch( uno::Exception& ) @@ -571,7 +571,7 @@ void SAL_CALL ScVbaPageSetup::setCenterHorizontally( sal_Bool centerHorizontally { try { - mxPageProps->setPropertyValue( OUString( "CenterHorizontally"), uno::makeAny( centerHorizontally )); + mxPageProps->setPropertyValue("CenterHorizontally", uno::makeAny( centerHorizontally )); } catch( uno::Exception& ) { @@ -583,7 +583,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getPrintHeadings() throw (css::uno::RuntimeExc sal_Bool printHeadings = false; try { - uno::Any aValue = mxPageProps->getPropertyValue( OUString( "PrintHeaders")); + uno::Any aValue = mxPageProps->getPropertyValue("PrintHeaders"); aValue >>= printHeadings; } catch( uno::Exception& ) @@ -596,7 +596,7 @@ void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) throw (c { try { - mxPageProps->setPropertyValue( OUString( "PrintHeaders"), uno::makeAny( printHeadings )); + mxPageProps->setPropertyValue("PrintHeaders", uno::makeAny( printHeadings )); } catch( uno::Exception& ) { diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx index b9fa93374473..97712de6077d 100644 --- a/sc/source/ui/vba/vbapalette.cxx +++ b/sc/source/ui/vba/vbapalette.cxx @@ -97,8 +97,8 @@ ScVbaPalette::getPalette() const if ( m_pShell ) xProps.set( m_pShell->GetModel(), uno::UNO_QUERY_THROW ); else - throw uno::RuntimeException( OUString( "Can't extract palette, no doc shell" ), uno::Reference< uno::XInterface >() ); - xIndex.set( xProps->getPropertyValue( OUString("ColorPalette") ), uno::UNO_QUERY ); + throw uno::RuntimeException("Can't extract palette, no doc shell", uno::Reference< uno::XInterface >() ); + xIndex.set( xProps->getPropertyValue("ColorPalette"), uno::UNO_QUERY ); if ( !xIndex.is() ) return new DefaultPalette(); return xIndex; diff --git a/sc/source/ui/vba/vbapane.cxx b/sc/source/ui/vba/vbapane.cxx index 01734f6649ec..085de1731084 100644 --- a/sc/source/ui/vba/vbapane.cxx +++ b/sc/source/ui/vba/vbapane.cxx @@ -48,7 +48,7 @@ ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeExcepti { if( _scrollcolumn < 1 ) { - throw uno::RuntimeException( OUString( "Column number should not less than 1" ), + throw uno::RuntimeException("Column number should not less than 1", uno::Reference< uno::XInterface >() ); } m_xViewPane->setFirstVisibleColumn( _scrollcolumn - 1 ); @@ -65,7 +65,7 @@ ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) throw (uno::RuntimeException) { if( _scrollrow < 1 ) { - throw uno::RuntimeException( OUString( "Row number should not less than 1" ), + throw uno::RuntimeException("Row number should not less than 1", uno::Reference< uno::XInterface >() ); } m_xViewPane->setFirstVisibleRow( _scrollrow - 1 ); diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 7c6af046efb3..348e8b7371e4 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -249,7 +249,7 @@ ScCellRangesBase* ScVbaRange::getCellRangesBase() throw ( uno::RuntimeException return ScCellRangesBase::getImplementation( mxRanges ); if( mxRange.is() ) return ScCellRangesBase::getImplementation( mxRange ); - throw uno::RuntimeException( OUString("General Error creating range - Unknown" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("General Error creating range - Unknown", uno::Reference< uno::XInterface >() ); } ScCellRangeObj* ScVbaRange::getCellRangeObj() throw ( uno::RuntimeException ) @@ -261,7 +261,7 @@ SfxItemSet* ScVbaRange::getCurrentDataSet( ) throw ( uno::RuntimeException ) { SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() ); if ( !pDataSet ) - throw uno::RuntimeException( OUString( "Can't access Itemset for range" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Can't access Itemset for range", uno::Reference< uno::XInterface >() ); return pDataSet; } @@ -390,7 +390,7 @@ getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::R { ScCellRangesBase* pUno = ScCellRangesBase::getImplementation( xIf ); if ( !pUno ) - throw uno::RuntimeException( OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Failed to access underlying uno range object", uno::Reference< uno::XInterface >() ); return pUno->GetDocShell(); } @@ -428,7 +428,7 @@ getDocumentFromRange( const uno::Reference< table::XCellRange >& xRange ) { ScDocShell* pDocShell = getDocShellFromRange( xRange ); if ( !pDocShell ) - throw uno::RuntimeException( OUString( "Failed to access underlying docshell from uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Failed to access underlying docshell from uno range object", uno::Reference< uno::XInterface >() ); ScDocument* pDoc = pDocShell->GetDocument(); return pDoc; } @@ -481,14 +481,14 @@ const ScRangeList& ScVbaRange::getScRangeList() throw (uno::RuntimeException) { if( ScCellRangesBase* pScRangesBase = getCellRangesBase() ) return pScRangesBase->GetRangeList(); - throw uno::RuntimeException( OUString( "Cannot obtain UNO range implementation object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Cannot obtain UNO range implementation object", uno::Reference< uno::XInterface >() ); } const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) { if( ScVbaRange* pScVbaRange = getImplementation( rxRange ) ) return pScVbaRange->getScRangeList(); - throw uno::RuntimeException( OUString( "Cannot obtain VBA range implementation object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Cannot obtain VBA range implementation object", uno::Reference< uno::XInterface >() ); } @@ -1311,10 +1311,10 @@ uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::Reference< sheet::XSheetCellRangeContainer >& rxCellRanges, bool bRecursive ) throw (uno::RuntimeException) { if( !rxCellRanges.is() ) - throw uno::RuntimeException( OUString( "Missing cell ranges object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Missing cell ranges object", uno::Reference< uno::XInterface >() ); sal_Int32 nCount = rxCellRanges->getCount(); if( nCount < 1 ) - throw uno::RuntimeException( OUString( "Missing cell ranges object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Missing cell ranges object", uno::Reference< uno::XInterface >() ); ScRangeList aScRanges; for( sal_Int32 nIndex = 0; nIndex < nCount; ++nIndex ) @@ -1418,7 +1418,7 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, break; } default: - throw uno::RuntimeException( OUString( "Can't extact CellRangeAddress from type" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Can't extact CellRangeAddress from type", uno::Reference< uno::XInterface >() ); } return lclGetRangeAddress( xRangeParam ); } @@ -1429,7 +1429,7 @@ lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno uno::Reference< XHelperInterface > xParent( xParentRange, uno::UNO_QUERY_THROW ); ScDocument* pDoc = getDocumentFromRange(xRange); if ( !pDoc ) - throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Failed to access document from shell", uno::Reference< uno::XInterface >() ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); uno::Reference< XCollection > borders( new ScVbaBorders( xParent, xContext, xRange, aPalette ) ); return borders; @@ -1458,9 +1458,9 @@ ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const mbIsColumns( bIsColumns ) { if ( !xContext.is() ) - throw lang::IllegalArgumentException( OUString( "context is not set " ), uno::Reference< uno::XInterface >() , 1 ); + throw lang::IllegalArgumentException("context is not set ", uno::Reference< uno::XInterface >() , 1 ); if ( !xRange.is() ) - throw lang::IllegalArgumentException( OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); + throw lang::IllegalArgumentException("range is not set ", uno::Reference< uno::XInterface >() , 1 ); uno::Reference< container::XIndexAccess > xIndex( new SingleRangeIndexAccess( mxParent, mxContext, xRange ) ); m_Areas = new ScVbaRangeAreas( mxParent, mxContext, xIndex, mbIsRows, mbIsColumns ); @@ -2116,7 +2116,7 @@ ScVbaRange::Font() throw ( script::BasicErrorException, uno::RuntimeException) else if ( mxRanges.is() ) xProps.set(mxRanges, ::uno::UNO_QUERY ); if ( !pDoc ) - throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Failed to access document from shell", uno::Reference< uno::XInterface >() ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); ScCellRangeObj* pRangeObj = NULL; @@ -2238,7 +2238,7 @@ ScVbaRange::Select() throw (uno::RuntimeException) { ScCellRangesBase* pUnoRangesBase = getCellRangesBase(); if ( !pUnoRangesBase ) - throw uno::RuntimeException( OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Failed to access underlying uno range object", uno::Reference< uno::XInterface >() ); ScDocShell* pShell = pUnoRangesBase->GetDocShell(); if ( pShell ) { @@ -2372,10 +2372,10 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException) aRange.aEnd.SetRow( aRange.aStart.Row() + ( nEndRow - nStartRow )); } else - throw uno::RuntimeException( OUString( "Illegal param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Illegal param", uno::Reference< uno::XInterface >() ); if ( aRange.aStart.Row() < 0 || aRange.aEnd.Row() < 0 ) - throw uno::RuntimeException( OUString("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Internal failure, illegal param", uno::Reference< uno::XInterface >() ); // return a normal range ( even for multi-selection uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) ); return new ScVbaRange( mxParent, mxContext, xRange, true ); @@ -2416,10 +2416,10 @@ ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException) aRange.aEnd.SetCol( aRange.aStart.Col() + ( nEndCol - nStartCol )); } else - throw uno::RuntimeException( OUString( "Illegal param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Illegal param", uno::Reference< uno::XInterface >() ); if ( aRange.aStart.Col() < 0 || aRange.aEnd.Col() < 0 ) - throw uno::RuntimeException( OUString("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Internal failure, illegal param", uno::Reference< uno::XInterface >() ); } // Columns() - no params uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) ); @@ -2493,7 +2493,7 @@ void ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( OUString("That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("That command cannot be used on multiple selections", uno::Reference< uno::XInterface >() ); if ( Destination.hasValue() ) { uno::Reference< excel::XRange > xRange( Destination, uno::UNO_QUERY_THROW ); @@ -2523,7 +2523,7 @@ void ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("That command cannot be used on multiple selections", uno::Reference< uno::XInterface >() ); if (Destination.hasValue()) { uno::Reference< excel::XRange > xRange( Destination, uno::UNO_QUERY_THROW ); @@ -2850,7 +2850,7 @@ void SAL_CALL ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) throw (::com::sun::star::uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("That command cannot be used on multiple selections", uno::Reference< uno::XInterface >() ); ScDocShell* pShell = getScDocShell(); uno::Reference< frame::XModel > xModel( ( pShell ? pShell->GetModel() : NULL ), uno::UNO_QUERY_THROW ); @@ -2983,7 +2983,7 @@ ScVbaRange::getHidden() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = getRowOrColumnProps( mxRange, mbIsRows ); if ( !( xProps->getPropertyValue( ISVISIBLE ) >>= bIsVisible ) ) - throw uno::RuntimeException( OUString( "Failed to get IsVisible property"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Failed to get IsVisible property", uno::Reference< uno::XInterface >() ); } catch( const uno::Exception& e ) { @@ -3033,7 +3033,7 @@ ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const un // sanity check required params if ( What.isEmpty() ) - throw uno::RuntimeException( OUString( "Range::Replace, missing params" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Range::Replace, missing params", uno::Reference< uno::XInterface >() ); OUString sWhat = VBAToRegexp( What); // #TODO #FIXME SearchFormat & ReplacesFormat are not processed // What do we do about MatchByte.. we don't seem to support that @@ -3063,7 +3063,7 @@ ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const un else if ( nLook == excel::XlLookAt::xlWhole ) bSearchWords = sal_True; else - throw uno::RuntimeException( OUString( "Range::Replace, illegal value for LookAt" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Range::Replace, illegal value for LookAt", uno::Reference< uno::XInterface >() ); // set global search props ( affects the find dialog // and of course the defaults for this method newOptions.SetWordOnly( bSearchWords ); @@ -3079,7 +3079,7 @@ ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const un else if ( nSearchOrder == excel::XlSearchOrder::xlByRows ) bSearchByRow = sal_True; else - throw uno::RuntimeException( OUString( "Range::Replace, illegal value for SearchOrder" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Range::Replace, illegal value for SearchOrder", uno::Reference< uno::XInterface >() ); newOptions.SetRowDirection( bSearchByRow ); xDescriptor->setPropertyValue( SC_UNO_SRCHBYROW, uno::makeAny( bSearchByRow ) ); @@ -3134,7 +3134,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L if( What >>= sWhat ) { if( sWhat.isEmpty() ) - throw uno::RuntimeException( OUString( "Range::Find, missing params" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Range::Find, missing params", uno::Reference< uno::XInterface >() ); } else if( What >>= nWhat ) { @@ -3145,7 +3145,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L sWhat = OUString::valueOf( fWhat ); } else - throw uno::RuntimeException( OUString( "Range::Find, missing params" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Range::Find, missing params", uno::Reference< uno::XInterface >() ); OUString sSearch = VBAToRegexp( sWhat ); @@ -3168,10 +3168,10 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L { // After must be a single cell in the range if( xAfterRange->getCount() > 1 ) - throw uno::RuntimeException( OUString( "After must be a single cell." ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("After must be a single cell.", uno::Reference< uno::XInterface >() ); uno::Reference< excel::XRange > xCell( Cells( uno::makeAny( xAfterRange->getRow() ), uno::makeAny( xAfterRange->getColumn() ) ), uno::UNO_QUERY ); if( !xCell.is() ) - throw uno::RuntimeException( OUString( "After must be in range." ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("After must be in range.", uno::Reference< uno::XInterface >() ); xStartCell.set( xAfterRange->getCellRange(), uno::UNO_QUERY_THROW ); } @@ -3194,7 +3194,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L nSearchType = SVX_SEARCHIN_VALUE; break; default: - throw uno::RuntimeException( OUString( "Range::Replace, illegal value for LookIn." ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Range::Replace, illegal value for LookIn.", uno::Reference< uno::XInterface >() ); } newOptions.SetCellType( nSearchType ); xDescriptor->setPropertyValue( "SearchType", uno::makeAny( nSearchType ) ); @@ -3211,7 +3211,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L else if ( nLookAt == excel::XlLookAt::xlWhole ) bSearchWords = sal_True; else - throw uno::RuntimeException( OUString( "Range::Replace, illegal value for LookAt" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Range::Replace, illegal value for LookAt", uno::Reference< uno::XInterface >() ); newOptions.SetWordOnly( bSearchWords ); xDescriptor->setPropertyValue( SC_UNO_SRCHWORDS, uno::makeAny( bSearchWords ) ); } @@ -3226,7 +3226,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L else if ( nSearchOrder == excel::XlSearchOrder::xlByRows ) bSearchByRow = sal_True; else - throw uno::RuntimeException( OUString( "Range::Replace, illegal value for SearchOrder" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Range::Replace, illegal value for SearchOrder", uno::Reference< uno::XInterface >() ); newOptions.SetRowDirection( bSearchByRow ); xDescriptor->setPropertyValue( SC_UNO_SRCHBYROW, uno::makeAny( bSearchByRow ) ); @@ -3244,7 +3244,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L else if( nSearchDirection == excel::XlSearchDirection::xlPrevious ) bSearchBackwards = sal_True; else - throw uno::RuntimeException( OUString( "Range::Replace, illegal value for SearchDirection" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Range::Replace, illegal value for SearchDirection", uno::Reference< uno::XInterface >() ); newOptions.SetBackward( bSearchBackwards ); xDescriptor->setPropertyValue( "SearchBackwards", uno::makeAny( bSearchBackwards ) ); } @@ -3256,7 +3256,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L { // SearchCaseSensitive if( !( MatchCase >>= bMatchCase ) ) - throw uno::RuntimeException( OUString( "Range::Replace, illegal value for MatchCase" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Range::Replace, illegal value for MatchCase", uno::Reference< uno::XInterface >() ); } xDescriptor->setPropertyValue( SC_UNO_SRCHCASE, uno::makeAny( bMatchCase ) ); @@ -3303,11 +3303,11 @@ uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Refere OUString sRangeName = ::comphelper::getString( Key ); table::CellRangeAddress aRefAddr; if ( !pDocSh ) - throw uno::RuntimeException( OUString("Range::Sort no docshell to calculate key param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Range::Sort no docshell to calculate key param", uno::Reference< uno::XInterface >() ); xKeyRange = getRangeForName( xContext, sRangeName, pDocSh, aRefAddr ); } else - throw uno::RuntimeException( OUString("Range::Sort illegal type value for key param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Range::Sort illegal type value for key param", uno::Reference< uno::XInterface >() ); uno::Reference< table::XCellRange > xKey; xKey.set( xKeyRange->getCellRange(), uno::UNO_QUERY_THROW ); return xKey; @@ -3325,7 +3325,7 @@ const OUString& sPropName ) throw( uno::RuntimeException ) if ( pProp->Name.equals( sPropName ) ) return count; if ( count == nItems ) - throw uno::RuntimeException( OUString("Range::Sort unknown sort property"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Range::Sort unknown sort property", uno::Reference< uno::XInterface >() ); return -1; //should never reach here ( satisfy compiler ) } @@ -3361,7 +3361,7 @@ void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRan aTableField.IsAscending = false; } else - throw uno::RuntimeException( OUString( "Illegal Key param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Illegal Key param", uno::Reference< uno::XInterface >() ); } @@ -3371,7 +3371,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& { // #TODO# #FIXME# can we do something with Type if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("That command cannot be used on multiple selections", uno::Reference< uno::XInterface >() ); sal_Int16 nDataOption1 = excel::XlSortDataOption::xlSortNormal; sal_Int16 nDataOption2 = excel::XlSortDataOption::xlSortNormal; @@ -3379,7 +3379,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& ScDocument* pDoc = getScDocument(); if ( !pDoc ) - throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Failed to access document from shell", uno::Reference< uno::XInterface >() ); RangeHelper thisRange( mxRange ); table::CellRangeAddress thisRangeAddress = thisRange.getCellRangeAddressable()->getRangeAddress(); @@ -3503,7 +3503,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& ScDocShell* pDocShell = getScDocShell(); xKey1 = processKey( Key1, mxContext, pDocShell ); if ( !xKey1.is() ) - throw uno::RuntimeException( OUString("Range::Sort needs a key1 param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Range::Sort needs a key1 param", uno::Reference< uno::XInterface >() ); if ( Key2.hasValue() ) xKey2 = processKey( Key2, mxContext, pDocShell ); @@ -3598,7 +3598,7 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException) nSID = SID_CURSORBLKRIGHT; break; default: - throw uno::RuntimeException( OUString( ": Invalid ColumnIndex" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException(": Invalid ColumnIndex", uno::Reference< uno::XInterface >() ); } if ( pDispatcher ) { @@ -3638,11 +3638,11 @@ uno::Reference< excel::XCharacters > SAL_CALL ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException) { if ( !isSingleCellRange() ) - throw uno::RuntimeException( OUString( "Can't create Characters property for multicell range " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Can't create Characters property for multicell range ", uno::Reference< uno::XInterface >() ); uno::Reference< text::XSimpleText > xSimple(mxRange->getCellByPosition(0,0) , uno::UNO_QUERY_THROW ); ScDocument* pDoc = getDocumentFromRange(mxRange); if ( !pDoc ) - throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Failed to access document from shell", uno::Reference< uno::XInterface >() ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); return new ScVbaCharacters( this, mxContext, aPalette, xSimple, Start, Length ); @@ -3677,7 +3677,7 @@ ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException) mode = sheet::CellDeleteMode_LEFT; break; default: - throw uno::RuntimeException( OUString( "Illegal parameter " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Illegal parameter ", uno::Reference< uno::XInterface >() ); } } else @@ -3872,7 +3872,7 @@ uno::Reference< excel::XRange > ScVbaRange::getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException ) { if ( !m_Areas.is() ) - throw uno::RuntimeException( OUString("No areas available"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("No areas available", uno::Reference< uno::XInterface >() ); uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( ++nIndex ), uno::Any() ), uno::UNO_QUERY_THROW ); return xRange; } @@ -4409,7 +4409,7 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const if ( pRange ) { if ( pRange->isSingleCellRange() ) - throw uno::RuntimeException( OUString( "Can't create AutoFilter" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Can't create AutoFilter", uno::Reference< uno::XInterface >() ); RangeHelper currentRegion( pRange->mxRange ); autoFiltAddress = currentRegion.getCellRangeAddressable()->getRangeAddress(); } @@ -4444,7 +4444,7 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const xDataBaseRange.set( xDBRanges->getByTable(nSheet ), uno::UNO_QUERY_THROW ); } if ( !xDataBaseRange.is() ) - throw uno::RuntimeException( OUString( "Failed to find the autofilter placeholder range" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Failed to find the autofilter placeholder range", uno::Reference< uno::XInterface >() ); uno::Reference< beans::XPropertySet > xDBRangeProps( xDataBaseRange, uno::UNO_QUERY_THROW ); // set autofilt @@ -4556,7 +4556,7 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const nConn = sheet::FilterConnection_AND; break; default: - throw uno::RuntimeException( OUString( "UnknownOption" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("UnknownOption", uno::Reference< uno::XInterface >() ); } @@ -4651,7 +4651,7 @@ ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /*CopyOrigin*/ ) thro mode = sheet::CellInsertMode_DOWN; break; default: - throw uno::RuntimeException( OUString( "Illegal parameter " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Illegal parameter ", uno::Reference< uno::XInterface >() ); } } else @@ -4730,7 +4730,7 @@ ScVbaRange::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeException) uno::Reference< excel::XHyperlinks > xSheetHlinks( xWorksheet->Hyperlinks( uno::Any() ), uno::UNO_QUERY_THROW ); ScVbaHyperlinksRef xScSheetHlinks( dynamic_cast< ScVbaHyperlinks* >( xSheetHlinks.get() ) ); if( !xScSheetHlinks.is() ) - throw uno::RuntimeException( OUString( "Cannot obtain hyperlinks implementation object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Cannot obtain hyperlinks implementation object", uno::Reference< uno::XInterface >() ); // create a new local hyperlinks object based on the sheet hyperlinks ScVbaHyperlinksRef xHlinks( new ScVbaHyperlinks( getParent(), mxContext, xScSheetHlinks, getScRangeList() ) ); @@ -4835,7 +4835,7 @@ uno::Any SAL_CALL ScVbaRange::getPrefixCharacter() throw (uno::RuntimeException) return lclGetPrefixVariant( lclGetPrefixChar( mxRange ) ); if( mxRanges.is() ) return lclGetPrefixVariant( lclGetPrefixChar( mxRanges ) ); - throw uno::RuntimeException( OUString( "Unexpected empty Range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Unexpected empty Range object", uno::Reference< uno::XInterface >() ); } uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException) @@ -4844,7 +4844,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException) // In MSO VBA, the specified range must be a single summary column or row in an outline. otherwise throw exception if( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( OUString( "Can not get Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Can not get Range.ShowDetail attribute ", uno::Reference< uno::XInterface >() ); sal_Bool bShowDetail = false; @@ -4876,7 +4876,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException) } else { - throw uno::RuntimeException( OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Can not set Range.ShowDetail attribute ", uno::Reference< uno::XInterface >() ); } return aNULL(); } @@ -4887,7 +4887,7 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru // In MSO VBA, the specified range must be a single summary column or row in an outline. otherwise throw exception if( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Can not set Range.ShowDetail attribute ", uno::Reference< uno::XInterface >() ); bool bShowDetail = extractBoolFromAny( aShowDetail ); @@ -4912,7 +4912,7 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru } else { - throw uno::RuntimeException( OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Can not set Range.ShowDetail attribute ", uno::Reference< uno::XInterface >() ); } } @@ -5077,7 +5077,7 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const eCmd = FILL_GROWTH; break; case excel::XlAutoFillType::xlFillFormats: - throw uno::RuntimeException( OUString( "xlFillFormat not supported for AutoFill" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("xlFillFormat not supported for AutoFill", uno::Reference< uno::XInterface >() ); case excel::XlAutoFillType::xlFillValues: case excel::XlAutoFillType::xlFillSeries: case excel::XlAutoFillType::xlLinearTrend: diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 03196a46ba5f..82eaebaf717f 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -31,7 +31,7 @@ uno::Reference< container::XNameAccess > ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) { uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( xModel, uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( OUString( "CellStyles" ) ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName("CellStyles"), uno::UNO_QUERY_THROW ); return xStylesAccess; } @@ -49,7 +49,7 @@ void ScVbaStyle::initialise() throw ( uno::RuntimeException ) if (!mxModel.is() ) DebugHelper::exception(SbERR_METHOD_FAILED, OUString( "XModel Interface could not be retrieved") ); uno::Reference< lang::XServiceInfo > xServiceInfo( mxPropertySet, uno::UNO_QUERY_THROW ); - if ( !xServiceInfo->supportsService( OUString( "com.sun.star.style.CellStyle" ) ) ) + if ( !xServiceInfo->supportsService("com.sun.star.style.CellStyle") ) { DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index df854d17d593..869490b58d27 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -121,7 +121,7 @@ ScVbaStyles::Add( const OUString& _sName, const uno::Any& _aBasedOn ) throw (scr } } - uno::Reference< style::XStyle > xStyle( mxMSF->createInstance( OUString("com.sun.star.style.CellStyle")), uno::UNO_QUERY_THROW ); + uno::Reference< style::XStyle > xStyle( mxMSF->createInstance("com.sun.star.style.CellStyle"), uno::UNO_QUERY_THROW ); if (!mxNameContainerCellStyles->hasByName(_sName)) { diff --git a/sc/source/ui/vba/vbatextboxshape.cxx b/sc/source/ui/vba/vbatextboxshape.cxx index 994ca2971f73..be666a2e7376 100644 --- a/sc/source/ui/vba/vbatextboxshape.cxx +++ b/sc/source/ui/vba/vbatextboxshape.cxx @@ -50,7 +50,7 @@ ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) t ScDocument* pDoc = pDocShell ? pDocShell->GetDocument() : NULL; if ( !pDoc ) - throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Failed to access document from shell", uno::Reference< uno::XInterface >() ); uno::Reference< text::XSimpleText > xSimple( m_xTextRange, uno::UNO_QUERY_THROW ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx index 3f4d105c3808..e4fbd1fcc08a 100644 --- a/sc/source/ui/vba/vbatitle.hxx +++ b/sc/source/ui/vba/vbatitle.hxx @@ -68,7 +68,7 @@ public: { try { - xShapePropertySet->setPropertyValue( OUString("String"), css::uno::makeAny( Text )); + xShapePropertySet->setPropertyValue("String", css::uno::makeAny( Text )); } catch ( css::uno::Exception& ) { @@ -80,7 +80,7 @@ public: OUString sText; try { - xShapePropertySet->getPropertyValue( OUString("String") ) >>= sText; + xShapePropertySet->getPropertyValue("String") >>= sText; } catch ( css::uno::Exception& ) { @@ -117,7 +117,7 @@ public: { try { - xShapePropertySet->setPropertyValue(OUString("TextRotation"), css::uno::makeAny(_nOrientation*100)); + xShapePropertySet->setPropertyValue("TextRotation", css::uno::makeAny(_nOrientation*100)); } catch (css::uno::Exception& ) { @@ -129,7 +129,7 @@ public: sal_Int32 nSOOrientation = 0; try { - xShapePropertySet->getPropertyValue( OUString("TextRotation")) >>= nSOOrientation; + xShapePropertySet->getPropertyValue("TextRotation") >>= nSOOrientation; } catch (css::uno::Exception& ) { diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index 51332f5d4f5f..807118617b3e 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -233,10 +233,10 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un sheet::ValidationType nValType = sheet::ValidationType_ANY; xProps->getPropertyValue( STYPE ) >>= nValType; if ( nValType != sheet::ValidationType_ANY ) - throw uno::RuntimeException( OUString( "validation object already exists" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("validation object already exists", uno::Reference< uno::XInterface >() ); sal_Int32 nType = -1; if ( !Type.hasValue() || !( Type >>= nType ) ) - throw uno::RuntimeException( OUString( "missing required param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("missing required param", uno::Reference< uno::XInterface >() ); Delete(); // set up defaults OUString sFormula1; @@ -250,7 +250,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un // for validate list // at least formula1 is required if ( !Formula1.hasValue() ) - throw uno::RuntimeException( OUString( "missing param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("missing param", uno::Reference< uno::XInterface >() ); nValType = sheet::ValidationType_LIST; xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); // #TODO validate required params @@ -262,7 +262,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); break; default: - throw uno::RuntimeException( OUString( "unsupported operation..." ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("unsupported operation...", uno::Reference< uno::XInterface >() ); } sheet::ValidationAlertStyle eStyle = sheet::ValidationAlertStyle_STOP; @@ -283,7 +283,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un eStyle = sheet::ValidationAlertStyle_INFO; break; default: - throw uno::RuntimeException( OUString( "bad param..." ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("bad param...", uno::Reference< uno::XInterface >() ); } } diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 99ec6ebe5704..9b7e9c6cb437 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -103,13 +103,13 @@ public: { ScModelObj* pModel = static_cast< ScModelObj* >( m_xModel.get() ); if ( !pModel ) - throw uno::RuntimeException( OUString( "Cannot obtain current document" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Cannot obtain current document", uno::Reference< uno::XInterface >() ); ScDocShell* pDocShell = (ScDocShell*)pModel->GetEmbeddedObject(); if ( !pDocShell ) - throw uno::RuntimeException( OUString( "Cannot obtain docshell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Cannot obtain docshell", uno::Reference< uno::XInterface >() ); ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); if ( !pViewShell ) - throw uno::RuntimeException( OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Cannot obtain view shell", uno::Reference< uno::XInterface >() ); SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount(); uno::Sequence<sal_Int32> aSheets( nTabCount ); @@ -290,7 +290,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P /* sal_Int32 nSheets = 0; sal_Int32 nPosition = 0; - throw uno::RuntimeException( OUString("No Implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("No Implemented", uno::Reference< uno::XInterface >() ); sal_Bool bSheets = ( Sheets >>= nSheets ); sal_Bool bPosition = ( Position >>= nPosition ); if ( bSheets || bPosition ) // at least one param specified @@ -444,7 +444,7 @@ ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE else if (nwindowState == xlNormal) pWork -> Restore(); else - throw uno::RuntimeException( OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Invalid Parameter", uno::Reference< uno::XInterface >() ); } } diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index 3a36112d4a2a..02bbc1491bce 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -371,7 +371,7 @@ ScVbaWorkbook::Names( const uno::Any& aIndex ) throw (uno::RuntimeException) { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_SET_THROW ); uno::Reference< beans::XPropertySet > xProps( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue("NamedRanges"), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xNames( new ScVbaNames( this, mxContext, xNamedRanges, xModel ) ); if ( aIndex.hasValue() ) return uno::Any( xNames->Item( aIndex, uno::Any() ) ); @@ -400,7 +400,7 @@ OUString SAL_CALL ScVbaWorkbook::getCodeName() throw (css::uno::RuntimeException) { uno::Reference< beans::XPropertySet > xModelProp( getModel(), uno::UNO_QUERY_THROW ); - return xModelProp->getPropertyValue( OUString( "CodeName" ) ).get< OUString >(); + return xModelProp->getPropertyValue("CodeName").get< OUString >(); } sal_Int64 diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 5198fc8b53ff..5c5d4c96e0a5 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -88,7 +88,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& { uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW ); uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance("ooo.vba.VBAObjectModuleObjectProvider"), uno::UNO_QUERY_THROW ); // set up the module info for the workbook and sheets in the nealy created // spreadsheet ScDocument* pDoc = pShell->GetDocument(); @@ -266,7 +266,7 @@ ScVbaWorkbooks::isSpreadSheetFile( const OUString& sType ) OUString ScVbaWorkbooks::getFileFilterType( const OUString& rFileName ) { - uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.document.TypeDetection"), mxContext), uno::UNO_QUERY_THROW ); + uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", mxContext), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > aMediaDesc(1); aMediaDesc[ 0 ].Name = OUString("URL" ); aMediaDesc[ 0 ].Value <<= rFileName; @@ -317,7 +317,7 @@ ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/ Format >>= nFormat; // val of nFormat overwritten if extracted // validate param if ( nFormat < 1 || nFormat > 6 ) - throw uno::RuntimeException( OUString( "Illegal value for Format" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Illegal value for Format", uno::Reference< uno::XInterface >() ); } sal_Int16 nDelim = getCurrentDelim(); @@ -330,14 +330,14 @@ ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/ { // Need to check Delimiter param if ( !Delimiter.hasValue() ) - throw uno::RuntimeException( OUString( "Expected value for Delimiter" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Expected value for Delimiter", uno::Reference< uno::XInterface >() ); OUString sStr; Delimiter >>= sStr; String aUniStr( sStr ); if ( aUniStr.Len() ) nDelim = aUniStr.GetChar(0); else - throw uno::RuntimeException( OUString( "Incorrect value for Delimiter" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Incorrect value for Delimiter", uno::Reference< uno::XInterface >() ); } getCurrentDelim() = nDelim; //set new current @@ -352,7 +352,7 @@ ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/ sProps[ nIndex ].Value <<= OUString("com.sun.star.sheet.SpreadsheetDocument"); } else if ( !isSpreadSheetFile( sType ) ) - throw uno::RuntimeException( OUString("Bad Format"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Bad Format", uno::Reference< uno::XInterface >() ); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( openDocument( rFileName, ReadOnly, sProps ), uno::UNO_QUERY_THROW ); uno::Any aRet = getWorkbook( mxContext, xSpreadDoc, mxParent ); diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index f96df2ffc0ac..b31a0abe28e5 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -362,7 +362,7 @@ ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException) return excel::XlEnableSelection::xlNoSelection; } else - throw uno::RuntimeException(OUString( "Sheet Name does not exist. "), + throw uno::RuntimeException("Sheet Name does not exist. ", uno::Reference< XInterface >() ); } @@ -403,7 +403,7 @@ ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeEx } } else - throw uno::RuntimeException(OUString( "Sheet Name does not exist. "), + throw uno::RuntimeException("Sheet Name does not exist. ", uno::Reference< XInterface >() ); } @@ -802,7 +802,7 @@ ScVbaWorksheet::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeExceptio // #163498# initialize Names object with correct parent (this worksheet) // TODO: real sheet-local names... uno::Reference< beans::XPropertySet > xProps( mxModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue("NamedRanges"), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xNames( new ScVbaNames( this, mxContext, xNamedRanges, mxModel ) ); if ( aIndex.hasValue() ) return uno::Any( xNames->Item( aIndex, uno::Any() ) ); @@ -950,7 +950,7 @@ ScVbaWorksheet::getValue( const OUString& aPropertyName ) throw (beans::UnknownP uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext("ooo.vba.ControlProvider", mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< msforms::XControl > xControl( xControlProvider->createControl( xControlShape, getModel() ) ); return uno::makeAny( xControl ); } @@ -1062,7 +1062,7 @@ OUString SAL_CALL ScVbaWorksheet::getCodeName() throw (css::uno::RuntimeException) { uno::Reference< beans::XPropertySet > xSheetProp( mxSheet, uno::UNO_QUERY_THROW ); - return xSheetProp->getPropertyValue( OUString( "CodeName" ) ).get< OUString >(); + return xSheetProp->getPropertyValue("CodeName").get< OUString >(); } sal_Int16 diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index bb6d23ee6b3e..bc04f26df62e 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -361,7 +361,7 @@ ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeExcep } } else - throw uno::RuntimeException( OUString( "Visible property doesn't support non boolean #FIXME" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Visible property doesn't support non boolean #FIXME", uno::Reference< uno::XInterface >() ); } void SAL_CALL @@ -369,7 +369,7 @@ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException) { ScTabViewShell* pViewShell = excel::getBestViewShell( mxModel ); if ( !pViewShell ) - throw uno::RuntimeException( OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("Cannot obtain view shell", uno::Reference< uno::XInterface >() ); ScMarkData& rMarkData = pViewShell->GetViewData()->GetMarkData(); sal_Bool bReplace = sal_True; diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx index e629922fe88f..ae5a1f4285cc 100644 --- a/sc/source/ui/vba/vbawsfunction.cxx +++ b/sc/source/ui/vba/vbawsfunction.cxx @@ -182,7 +182,7 @@ ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno:: OUString( "com.sun.star.sheet.FunctionAccess" ), mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropSet( xFunctionAccess, uno::UNO_QUERY_THROW ); - xPropSet->setPropertyValue( OUString( "IsArrayFunction" ), uno::Any( bAsArray ) ); + xPropSet->setPropertyValue("IsArrayFunction", uno::Any( bAsArray ) ); aRet = xFunctionAccess->callFunction( FunctionName, aParamTemp ); } diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 6e4aadb9a508..6073baf1abce 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1633,9 +1633,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { try { - xProp->getPropertyValue( OUString("IsDirectionToSimplified") ) >>= bToSimplified; - xProp->getPropertyValue( OUString("IsUseCharacterVariants") ) >>= bUseVariants; - xProp->getPropertyValue( OUString("IsTranslateCommonTerms") ) >>= bCommonTerms; + xProp->getPropertyValue("IsDirectionToSimplified") >>= bToSimplified; + xProp->getPropertyValue("IsUseCharacterVariants") >>= bUseVariants; + xProp->getPropertyValue("IsTranslateCommonTerms") >>= bCommonTerms; } catch( Exception& ) { diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 4749116dd446..b15ff3e6ccc1 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -344,7 +344,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xInfo; xStyles->getByName( pNameItem->GetValue() ) >>= xInfo; OUString aUIName; - xInfo->getPropertyValue( OUString("DisplayName") ) >>= aUIName; + xInfo->getPropertyValue("DisplayName") >>= aUIName; if ( !aUIName.isEmpty() ) rReq.AppendItem( SfxStringItem( SID_STYLE_APPLY, aUIName ) ); } diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 7edc66a4240a..554d7370e986 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -464,7 +464,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu( const ScDPLabelData& rLabelData = pDPData->maLabels; mpDPFieldPopup.reset(new ScCheckListMenuWindow(this, pViewData->GetDocument())); - mpDPFieldPopup->setName(OUString("DataPilot field member popup")); + mpDPFieldPopup->setName("DataPilot field member popup"); mpDPFieldPopup->setExtendedData(pDPData.release()); mpDPFieldPopup->setOKAction(new DPFieldPopupOKAction(this)); { diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index b477f0d1dba3..c695605abf0f 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -72,26 +72,26 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL, uno::Any aAny; aAny <<= OUString(rName); - xPropSet->setPropertyValue( OUString( "Label" ), aAny ); + xPropSet->setPropertyValue("Label", aAny ); OUString aTmp = INetURLObject::GetAbsURL( pDoc->GetDocumentShell()->GetMedium()->GetBaseURL(), rURL ); aAny <<= aTmp; - xPropSet->setPropertyValue( OUString( "TargetURL" ), aAny ); + xPropSet->setPropertyValue("TargetURL", aAny ); if( rTarget.Len() ) { aAny <<= OUString(rTarget); - xPropSet->setPropertyValue( OUString( "TargetFrame" ), aAny ); + xPropSet->setPropertyValue("TargetFrame", aAny ); } form::FormButtonType eButtonType = form::FormButtonType_URL; aAny <<= eButtonType; - xPropSet->setPropertyValue( OUString( "ButtonType" ), aAny ); + xPropSet->setPropertyValue("ButtonType", aAny ); if ( ::avmedia::MediaWindow::isMediaURL( rURL ) ) { aAny <<= sal_True; - xPropSet->setPropertyValue( OUString( "DispatchURLInternal" ), aAny ); + xPropSet->setPropertyValue("DispatchURLInternal", aAny ); } Point aPos; |