[Libreoffice-commits] core.git: 3 commits - sc/Module_sc.mk sc/source

[Libreoffice Gerrit user]

 sc/Module_sc.mk                    |    2 +-
 sc/source/ui/attrdlg/scabstdlg.cxx |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 729af05280a5b1755f78eee4669e36e287048253
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 13:12:50 2018 +0200

    Make ScAbstractDialogFactory::Create() do its job also on non-DESKTOP
    
    Change-Id: Id97c9ead810f266239898cc559172b841bc6902f

diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx
index 76a9cde55131..1b5e0ddde237 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>
@@ -40,7 +38,6 @@ extern "C" ScAbstractDialogFactory* ScCreateDialogFactory();
 ScAbstractDialogFactory* ScAbstractDialogFactory::Create()
 {
     ScFuncPtrCreateDialogFactory fp = nullptr;
-#if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
     static ::osl::Module aDialogLibrary;
 
@@ -54,7 +51,6 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create()
 #else
     fp = ScCreateDialogFactory;
 #endif
-#endif
     if ( fp )
         return fp();
     return nullptr;
commit 1bfd9d0dd7e66ab7ab6aa888b45dceb6c1b34f7b
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Nov 5 12:42:07 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Nov 5 13:12:50 2018 +0200

    Build the scui library for non-DESKTOP, too
    
    In order to eventually get the Calc-specific dialogs in the mobile
    app, too.
    
    Change-Id: I30b64512b38d37ceab5706851c211ff5cf73764e

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 89b05bab9719..7cb0d64c8a0a 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Module_add_targets,sc,\
 	Library_sc \
 	Library_scd \
 	Library_scfilt \
-	$(call gb_Helper_optional,DESKTOP,Library_scui) \
+	Library_scui \
 	$(call gb_Helper_optional,OPENCL,Package_opencl) \
 	Package_res_xml \
 	UIConfig_scalc \
commit e5ccf0c141c8d75323623803a3ef21c48c8cd423
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Nov 5 11:31:00 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Nov 5 13:12:50 2018 +0200

    We want the function pointer here, but not call it yet
    
    We will call it just a few lines later.
    
    Change-Id: Id979fb7fdaebd05f2432d8917b921d1b1779d8a7

diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx
index 2829cbf5a833..76a9cde55131 100644
--- a/sc/source/ui/attrdlg/scabstdlg.cxx
+++ b/sc/source/ui/attrdlg/scabstdlg.cxx
@@ -52,7 +52,7 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create()
         fp = reinterpret_cast<ScAbstractDialogFactory* (SAL_CALL*)()>(
             aDialogLibrary.getFunctionSymbol( "ScCreateDialogFactory" ));
 #else
-    fp = ScCreateDialogFactory();
+    fp = ScCreateDialogFactory;
 #endif
 #endif
     if ( fp )