4 files changed, 11 insertions, 6 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index fe978cdc24ad..756173607afb 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -885,9 +885,9 @@ namespace
 #endif
 }
 
+#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
 IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, void)
 {
-#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
     guint xid = get_xid_for_dbus();
 
     if (!xid)
@@ -939,8 +939,8 @@ IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, voi
     g_free(fonts);
     g_object_unref(G_OBJECT (proxy));
     m_aCurrentRequests.clear();
-#endif
 }
+#endif
 
 bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes )
 {
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index 87027d41e8cb..d4782562622e 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -675,8 +675,10 @@ PrintFontManager::PrintFontManager()
         }
     }
 
+#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
     m_aFontInstallerTimer.SetTimeoutHdl(LINK(this, PrintFontManager, autoInstallFontLangSupport));
     m_aFontInstallerTimer.SetTimeout(5000);
+#endif
 }
 
 PrintFontManager::~PrintFontManager()
diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx
index 13bd05fd1622..fd0d13a2096c 100644
--- a/vcl/inc/fontmanager.hxx
+++ b/vcl/inc/fontmanager.hxx
@@ -327,8 +327,9 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
     std::vector<OString> m_aCurrentRequests;
     Timer m_aFontInstallerTimer;
 
+#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
     DECL_LINK_TYPED( autoInstallFontLangSupport, Timer*, void );
-
+#endif
     PrintFontManager();
     ~PrintFontManager();
 public:
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index f4c81ad02eff..d76063938fe3 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -941,9 +941,11 @@ void Dialog::EndDialog( long nResult )
         if ( mpDialogImpl->mbStartedModal )
         {
             ImplEndExecuteModal();
-            mpDialogImpl->maEndDialogHdl.Call( this );
-
-            mpDialogImpl->maEndDialogHdl = Link<>();
+            if (mpDialogImpl->maEndDialogHdl.IsSet())
+            {
+                mpDialogImpl->maEndDialogHdl.Call( this );
+                mpDialogImpl->maEndDialogHdl = Link<>();
+            }
             mpDialogImpl->mbStartedModal = false;
             mpDialogImpl->mnResult = -1;
         }