[Libreoffice-commits] core.git: reportdesign/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Thu Jun 4 17:50:37 UTC 2020


 reportdesign/source/core/sdr/RptObject.cxx         |    3 +--
 reportdesign/source/ui/report/ReportController.cxx |    6 ++----
 reportdesign/source/ui/report/propbrw.cxx          |    3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 6f5943bb23853e65a93503c498bc30b57d9ec15f
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jun 4 15:13:03 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jun 4 19:49:59 2020 +0200

    Upcoming loplugin:elidestringvar: reportdesign
    
    Change-Id: I60637ad6c50aee618af48689885d44eca8eabcb5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95523
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 623758dcf788..df0062753b6f 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -615,8 +615,7 @@ void OUnoObject::impl_initializeModel_nothrow()
         if ( xFormatted.is() )
         {
             const Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW );
-            const OUString sTreatAsNumberProperty = "TreatAsNumber";
-            xModelProps->setPropertyValue( sTreatAsNumberProperty, makeAny( false ) );
+            xModelProps->setPropertyValue( "TreatAsNumber", makeAny( false ) );
             xModelProps->setPropertyValue( PROPERTY_VERTICALALIGN,m_xReportComponent->getPropertyValue(PROPERTY_VERTICALALIGN));
         }
     }
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 3bf9e9e072f7..087724e5f851 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2821,8 +2821,7 @@ Reference<XFrame> OReportController::getXFrame()
         m_xFrameLoader.set( frame::Desktop::create(m_xContext) );
     }
     const sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE;
-    const OUString sTarget("_blank");
-    Reference<XFrame> xFrame = m_xFrameLoader->findFrame(sTarget,nFrameSearchFlag);
+    Reference<XFrame> xFrame = m_xFrameLoader->findFrame("_blank",nFrameSearchFlag);
     return xFrame;
 }
 
@@ -3989,13 +3988,12 @@ void OReportController::checkChartEnabled()
         return;
 
     m_bChartEnabledAsked = true;
-    const OUString sConfigName( "/org.openoffice.Office.ReportDesign" );
     const OUString sPropertyName( "UserData/Chart" );
 
     try
     {
         ::utl::OConfigurationTreeRoot aConfiguration(
-            ::utl::OConfigurationTreeRoot::createWithComponentContext( m_xContext, sConfigName ) );
+            ::utl::OConfigurationTreeRoot::createWithComponentContext( m_xContext, "/org.openoffice.Office.ReportDesign" ) );
 
         bool bChartEnabled = false;
         if ( aConfiguration.hasByHierarchicalName(sPropertyName) )
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index edc4e78e665a..8afd92cc5979 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -135,8 +135,7 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pPare
             m_xBrowserController = inspection::ObjectInspector::createWithModel(m_xInspectorContext, xInspectorModel);
             if ( !m_xBrowserController.is() )
             {
-                const OUString sServiceName( "com.sun.star.inspection.ObjectInspector" );
-                ShowServiceNotAvailableError(pParent ? pParent->GetFrameWeld() : nullptr, sServiceName, true);
+                ShowServiceNotAvailableError(pParent ? pParent->GetFrameWeld() : nullptr, "com.sun.star.inspection.ObjectInspector", true);
             }
             else
             {


More information about the Libreoffice-commits mailing list