[Libreoffice-commits] core.git: vcl/source

Tor Lillqvist tml at collabora.com
Tue Feb 11 23:53:57 PST 2014


 vcl/source/window/abstdlg.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7e9ac5952711400ad856b3328c5cc00c05cec6f2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Feb 11 16:56:34 2014 +0200

    We don't need CreateDialogFactory() for non-DESKTOP, I think
    
    Change-Id: Iced798f51fc2a46ede0c8e67d63941eca69ad208

diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx
index 09f357d..7cb7cdc 100644
--- a/vcl/source/window/abstdlg.cxx
+++ b/vcl/source/window/abstdlg.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
 
 #include <rtl/ustring.hxx>
 #include <osl/module.hxx>
@@ -33,6 +34,7 @@ extern "C" VclAbstractDialogFactory* CreateDialogFactory();
 VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
 {
     FuncPtrCreateDialogFactory fp = 0;
+#if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
     static ::osl::Module aDialogLibrary;
     if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, OUString( CUI_DLL_NAME  ),
@@ -42,6 +44,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
 #else
     fp = CreateDialogFactory;
 #endif
+#endif
     if ( fp )
         return fp();
     return 0;


More information about the Libreoffice-commits mailing list