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

[Libreoffice Gerrit user]

 sc/source/ui/attrdlg/scabstdlg.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit a24b393dd584fe1bb6a9524c91a043fccf99e694
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Nov 5 13:09:46 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Nov 5 18:23:13 2018 +0100

    Make ScAbstractDialogFactory::Create() do its job also on non-DESKTOP
    
    Change-Id: Id97c9ead810f266239898cc559172b841bc6902f
    (cherry picked from commit 729af05280a5b1755f78eee4669e36e287048253)
    Reviewed-on: https://gerrit.libreoffice.org/62917
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx
index a75cbfb39de9..1cdc8b9bf42a 100644
--- a/sc/source/ui/attrdlg/scabstdlg.cxx
+++ b/sc/source/ui/attrdlg/scabstdlg.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_features.h>
-
 #include <scabstdlg.hxx>
 
 #include <osl/module.hxx>
@@ -39,7 +37,6 @@ extern "C" ScAbstractDialogFactory* ScCreateDialogFactory();
 ScAbstractDialogFactory* ScAbstractDialogFactory::Create()
 {
     ScFuncPtrCreateDialogFactory fp = nullptr;
-#if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
     static ::osl::Module aDialogLibrary;
 
@@ -53,7 +50,6 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create()
 #else
     fp = ScCreateDialogFactory;
 #endif
-#endif
     if ( fp )
         return fp();
     return nullptr;