[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sd/source

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Fri Sep 20 09:46:23 UTC 2019


 sd/source/ui/dlg/sdabstdlg.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 67bac7a8469145c522e7c52a16123e55aa9d36ae
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Feb 25 15:34:13 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 11:45:19 2019 +0200

    Make SdAbstractDialogFactory::Create() do its job also on non-DESKTOP
    
    Change-Id: Ife76336dbdeaadf08f631e3542be73a8568f5368
    (cherry picked from commit 056be933ea041939401f945df7f6e0a23e53a616)
    Reviewed-on: https://gerrit.libreoffice.org/79170
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index 57dd6e3c53e4..4b56b82c61fd 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -39,7 +39,6 @@ extern "C" SdAbstractDialogFactory* SdCreateDialogFactory();
 SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
 {
     SdFuncPtrCreateDialogFactory fp = nullptr;
-#if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
     static ::osl::Module aDialogLibrary;
     static const OUString sLibName(SDUI_DLL_NAME);
@@ -49,7 +48,6 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
 #else
     fp = SdCreateDialogFactory;
 #endif
-#endif
     if ( fp )
         return fp();
     return nullptr;


More information about the Libreoffice-commits mailing list