fdo#46808, Convert ui::UIConfigurationManager to new-style

Change-Id: I62c37eb6d0e0b2a681a84e1fa0067d0a9f967cf2

2 files changed, 14 insertions, 10 deletions

diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index caa054e392df..c923f1d940a9 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/report/XReportDefinition.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <com/sun/star/ui/XUIConfigurationManager2.hpp>
 
 #include <comphelper/embeddedobjectcontainer.hxx>
 #include <comphelper/uno3.hxx>
@@ -395,6 +396,8 @@ namespace reportdesign
         virtual bool isEnableSetModified() const;
 
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getContext() const;
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager2 > getUIConfigurationManager2(  ) throw (::com::sun::star::uno::RuntimeException);
       };
 // =============================================================================
 } // namespace reportdesign
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index d5abf5202343..09bf83fbdc74 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -74,6 +74,7 @@
 #include <com/sun/star/task/ErrorCodeIOException.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
+#include <com/sun/star/ui/UIConfigurationManager.hpp>
 #include <com/sun/star/ui/XUIConfigurationStorage.hpp>
 #include <com/sun/star/util/NumberFormatsSupplier.hpp>
 #include <com/sun/star/xml/AttributeData.hpp>
@@ -573,7 +574,7 @@ struct OReportDefinitionImpl
     uno::Reference< container::XNameAccess>                 m_xDashTable;
     uno::Reference< container::XNameAccess>                 m_xMarkerTable;
     uno::Reference< report::XFunctions >                    m_xFunctions;
-    uno::Reference< ui::XUIConfigurationManager>            m_xUIConfigurationManager;
+    uno::Reference< ui::XUIConfigurationManager2>           m_xUIConfigurationManager;
     uno::Reference< util::XNumberFormatsSupplier>           m_xNumberFormatsSupplier;
     uno::Reference< sdbc::XConnection>                      m_xActiveConnection;
     uno::Reference< frame::XTitle >                         m_xTitleHelper;
@@ -2071,21 +2072,21 @@ uno::Reference< report::XFunctions > SAL_CALL OReportDefinition::getFunctions()
 // -----------------------------------------------------------------------------
 uno::Reference< ui::XUIConfigurationManager > SAL_CALL OReportDefinition::getUIConfigurationManager(  ) throw (uno::RuntimeException)
 {
+    return uno::Reference< ui::XUIConfigurationManager >( getUIConfigurationManager2(), uno::UNO_QUERY_THROW );
+}
+// -----------------------------------------------------------------------------
+uno::Reference< ui::XUIConfigurationManager2 > OReportDefinition::getUIConfigurationManager2(  ) throw (uno::RuntimeException)
+{
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
 
     if ( !m_pImpl->m_xUIConfigurationManager.is() )
     {
-        m_pImpl->m_xUIConfigurationManager.set(m_aProps->m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.UIConfigurationManager")),m_aProps->m_xContext),
-            uno::UNO_QUERY);
+        m_pImpl->m_xUIConfigurationManager = ui::UIConfigurationManager::create(m_aProps->m_xContext);
 
-        uno::Reference< ui::XUIConfigurationStorage > xUIConfigStorage( m_pImpl->m_xUIConfigurationManager, uno::UNO_QUERY );
-        if ( xUIConfigStorage.is() )
-        {
-            uno::Reference< embed::XStorage > xConfigStorage;
-            // initialize ui configuration manager with document substorage
-            xUIConfigStorage->setStorage( xConfigStorage );
-        }
+        uno::Reference< embed::XStorage > xConfigStorage;
+        // initialize ui configuration manager with document substorage
+        m_pImpl->m_xUIConfigurationManager->setStorage( xConfigStorage );
     }
 
     return m_pImpl->m_xUIConfigurationManager;