diff options
Diffstat (limited to 'reportdesign/source/ui')
5 files changed, 14 insertions, 14 deletions
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 9de12edf5fb6..6dad9740dcd4 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -136,11 +136,11 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface try { uno::Reference< container::XNameContainer > xNameCont(Component,uno::UNO_QUERY); - const ::rtl::OUString sFormComponent(RTL_CONSTASCII_USTRINGPARAM("FormComponent")); + const ::rtl::OUString sFormComponent("FormComponent"); if ( xNameCont->hasByName(sFormComponent) ) { uno::Reference<beans::XPropertySet> xProp(xNameCont->getByName(sFormComponent),uno::UNO_QUERY); - const ::rtl::OUString sModel(RTL_CONSTASCII_USTRINGPARAM("Model")); + const ::rtl::OUString sModel("Model"); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(sModel) ) { m_xChartModel.set(xProp->getPropertyValue(sModel),uno::UNO_QUERY); diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index c06edad3aec6..6a3bdca05eee 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -139,7 +139,7 @@ struct PropertyCompare : public ::std::binary_function< beans::Property, OUStrin // ----------------------------------------------------------------------------- OUString lcl_getQuotedFunctionName(const OUString& _sFunction) { - OUString sQuotedFunctionName(RTL_CONSTASCII_USTRINGPARAM("[")); + OUString sQuotedFunctionName("["); sQuotedFunctionName += _sFunction + OUString("]"); return sQuotedFunctionName; } @@ -347,7 +347,7 @@ void SAL_CALL GeometryHandler::inspect( const uno::Reference< uno::XInterface > const uno::Reference< container::XNameContainer > xObjectAsContainer( _rxInspectee, uno::UNO_QUERY ); m_xReportComponent.set( xObjectAsContainer->getByName( OUString( "ReportComponent" ) ), uno::UNO_QUERY ); - const OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet")); + const OUString sRowSet("RowSet"); if ( xObjectAsContainer->hasByName( sRowSet ) ) { const uno::Any aRowSet( xObjectAsContainer->getByName(sRowSet) ); diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index 8c9fdd892029..13f179165c81 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -115,10 +115,10 @@ void SAL_CALL ReportComponentHandler::inspect(const uno::Reference< uno::XInterf try { uno::Reference< container::XNameContainer > xNameCont(Component,uno::UNO_QUERY); - const ::rtl::OUString sFormComponent(RTL_CONSTASCII_USTRINGPARAM("FormComponent")); + const ::rtl::OUString sFormComponent("FormComponent"); if ( xNameCont->hasByName(sFormComponent) ) xNameCont->getByName(sFormComponent) >>= m_xFormComponent; - const ::rtl::OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet")); + const ::rtl::OUString sRowSet("RowSet"); if ( xNameCont->hasByName(sRowSet) ) { uno::Reference<beans::XPropertySet> xProp(m_xFormComponentHandler,uno::UNO_QUERY); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index c8b4a2c5aba9..3f6f77262ca4 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1788,7 +1788,7 @@ void OReportController::doOpenHelpAgent() { if (getFrame().is()) { - rtl::OUString suURL(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter")); + rtl::OUString suURL("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter"); openHelpAgent(suURL); } else @@ -2846,7 +2846,7 @@ Reference<XFrame> OReportController::getXFrame() m_xFrameLoader.set( frame::Desktop::create(m_xContext) ); } const sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE; - const ::rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("_blank")); + const ::rtl::OUString sTarget("_blank"); Reference<XFrame> xFrame = m_xFrameLoader->findFrame(sTarget,nFrameSearchFlag); return xFrame; } @@ -3969,7 +3969,7 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert if ( xSection.is() ) { - const ::rtl::OUString sKeyModifier(RTL_CONSTASCII_USTRINGPARAM("KeyModifier")); + const ::rtl::OUString sKeyModifier("KeyModifier"); const beans::PropertyValue* pIter = _aArgs.getConstArray(); const beans::PropertyValue* pEnd = pIter + _aArgs.getLength(); const beans::PropertyValue* pKeyModifier = ::std::find_if(pIter,pEnd,::std::bind2nd(PropertyValueCompare(),boost::cref(sKeyModifier))); @@ -3993,8 +3993,8 @@ void OReportController::checkChartEnabled() if ( !m_bChartEnabledAsked ) { m_bChartEnabledAsked = true; - const ::rtl::OUString sConfigName( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.ReportDesign" ) ); - const ::rtl::OUString sPropertyName( RTL_CONSTASCII_USTRINGPARAM( "UserData/Chart" ) ); + const ::rtl::OUString sConfigName( "/org.openoffice.Office.ReportDesign" ); + const ::rtl::OUString sPropertyName( "UserData/Chart" ); try { diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 73bfcd6aba6b..a804d872b292 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -72,8 +72,8 @@ namespace { static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext ) { - const ::rtl::OUString sConfigName( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.ReportDesign/PropertyBrowser/" ) ); - const ::rtl::OUString sPropertyName( RTL_CONSTASCII_USTRINGPARAM( "DirectHelp" ) ); + const ::rtl::OUString sConfigName( "/org.openoffice.Office.ReportDesign/PropertyBrowser/" ); + const ::rtl::OUString sPropertyName( "DirectHelp" ); ::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithComponentContext( _rxContext, sConfigName ) ); @@ -145,7 +145,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen m_xBrowserController = inspection::ObjectInspector::createWithModel(m_xInspectorContext, xInspectorModel); if ( !m_xBrowserController.is() ) { - const ::rtl::OUString sServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.inspection.ObjectInspector" ) ); + const ::rtl::OUString sServiceName( "com.sun.star.inspection.ObjectInspector" ); ShowServiceNotAvailableError(pParent, sServiceName, sal_True); } else |