1 files changed, 17 insertions, 11 deletions

diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 6d39433a8f27..8cf6623d9676 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <utility>
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -31,7 +32,7 @@
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <osl/diagnose.h>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include "dp_gui_dialog2.hxx"
 #include "dp_gui_extensioncmdqueue.hxx"
@@ -40,7 +41,7 @@
 #include <dp_update.hxx>
 
 constexpr OUStringLiteral USER_PACKAGE_MANAGER = u"user";
-constexpr OUStringLiteral SHARED_PACKAGE_MANAGER = u"shared";
+constexpr OUString SHARED_PACKAGE_MANAGER = u"shared"_ustr;
 
 using namespace ::com::sun::star;
 
@@ -53,10 +54,10 @@ namespace dp_gui {
 //                             TheExtensionManager
 
 
-TheExtensionManager::TheExtensionManager( const uno::Reference< awt::XWindow > &xParent,
+TheExtensionManager::TheExtensionManager( uno::Reference< awt::XWindow > xParent,
                                           const uno::Reference< uno::XComponentContext > &xContext ) :
     m_xContext( xContext ),
-    m_xParent( xParent ),
+    m_xParent(std::move( xParent )),
     m_bModified(false),
     m_bExtMgrDialogExecuting(false)
 {
@@ -157,7 +158,8 @@ void TheExtensionManager::SetText( const OUString &rTitle )
 {
     const SolarMutexGuard guard;
 
-    getDialog()->set_title( rTitle );
+    if (weld::Window* pDialog = getDialog())
+        pDialog->set_title( rTitle );
 }
 
 
@@ -165,7 +167,8 @@ void TheExtensionManager::ToTop()
 {
     const SolarMutexGuard guard;
 
-    getDialog()->present();
+    if (weld::Window* pDialog = getDialog())
+        pDialog->present();
 }
 
 void TheExtensionManager::Close()
@@ -220,7 +223,7 @@ void TheExtensionManager::checkUpdates()
                         e.Context, anyEx );
     }
 
-    for ( auto const & i : std::as_const(xAllPackages) )
+    for (auto const& i : xAllPackages)
     {
         uno::Reference< deployment::XPackage > xPackage = dp_misc::getExtensionWithHighestVersion(i);
         OSL_ASSERT(xPackage.is());
@@ -303,7 +306,7 @@ void TheExtensionManager::createPackageList()
                         e.Context, anyEx );
     }
 
-    for ( uno::Sequence< uno::Reference< deployment::XPackage > > const & xPackageList : std::as_const(xAllPackages) )
+    for (uno::Sequence<uno::Reference<deployment::XPackage>> const& xPackageList : xAllPackages)
     {
         for ( uno::Reference< deployment::XPackage > const & xPackage : xPackageList )
         {
@@ -495,9 +498,12 @@ void TheExtensionManager::notifyTermination( ::lang::EventObject const & rEvt )
 void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ )
 {
     m_bModified = true;
-    getDialogHelper()->prepareChecking();
+    DialogHelper *pDialogHelper = getDialogHelper();
+    if (!pDialogHelper)
+        return;
+    pDialogHelper->prepareChecking();
     createPackageList();
-    getDialogHelper()->checkEntries();
+    pDialogHelper->checkEntries();
 }
 
 
@@ -519,7 +525,7 @@ void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ )
     if ( ! s_ExtMgr.is() )
     {
         OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
-        s_ExtMgr = that;
+        s_ExtMgr = std::move(that);
     }
 
     if ( !extensionURL.isEmpty() )