[Libreoffice-commits] core.git: 3 commits - download.lst external/xmlsec sd/IwyuFilter_sd.yaml sd/source sw/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Oct 30 08:05:07 UTC 2018 

 download.lst                                                 |    4 
 external/xmlsec/UnpackedTarball_xmlsec.mk                    |    6 
 external/xmlsec/mscng-fixes.patch.1                          |   70 ----------
 external/xmlsec/xmlsec1-macos.patch.1                        |   41 ------
 external/xmlsec/xmlsec1-vc.patch.1                           |   73 -----------
 sd/IwyuFilter_sd.yaml                                        |   53 +++++++
 sd/source/ui/framework/configuration/Configuration.cxx       |    2 
 sd/source/ui/framework/module/ModuleController.cxx           |    3 
 sd/source/ui/inc/MasterPageObserver.hxx                      |    1 
 sd/source/ui/inc/framework/Configuration.hxx                 |    5 
 sd/source/ui/inc/framework/ConfigurationController.hxx       |   14 --
 sd/source/ui/inc/framework/DrawModule.hxx                    |    5 
 sd/source/ui/inc/framework/FrameworkHelper.hxx               |   10 -
 sd/source/ui/inc/framework/ImpressModule.hxx                 |    5 
 sd/source/ui/inc/framework/ModuleController.hxx              |    8 -
 sd/source/ui/inc/framework/Pane.hxx                          |    2 
 sd/source/ui/inc/framework/PresentationFactory.hxx           |    7 -
 sd/source/ui/inc/framework/PresentationModule.hxx            |    5 
 sd/source/ui/inc/framework/ResourceId.hxx                    |    5 
 sd/source/ui/inc/framework/ViewShellWrapper.hxx              |    4 
 sd/source/ui/inc/tools/ConfigurationAccess.hxx               |   10 -
 sd/source/ui/inc/tools/IdleDetection.hxx                     |    1 
 sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx         |    8 -
 sd/source/ui/inc/tools/SlotStateListener.hxx                 |    9 -
 sd/source/ui/inc/view/viewoverlaymanager.hxx                 |   10 +
 sd/source/ui/sidebar/LayoutMenu.cxx                          |    1 
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |    1 
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx       |    1 
 sd/source/ui/table/tablefunction.cxx                         |    1 
 sd/source/ui/tools/ConfigurationAccess.cxx                   |    1 
 sd/source/ui/tools/EventMultiplexer.cxx                      |    1 
 sd/source/ui/tools/SdGlobalResourceContainer.cxx             |    1 
 sd/source/ui/view/ViewShellBase.cxx                          |    1 
 sd/source/ui/view/ViewTabBar.cxx                             |    1 
 sd/source/ui/view/drviews2.cxx                               |    1 
 sd/source/ui/view/drviewse.cxx                               |    1 
 sd/source/ui/view/frmview.cxx                                |    1 
 sd/source/ui/view/viewoverlaymanager.cxx                     |    1 
 sw/source/filter/ww8/docxtablestyleexport.cxx                |   20 ++-
 39 files changed, 147 insertions(+), 247 deletions(-)

New commits:
commit da02b574b4b077ba819350eec76a37eaf0ceeeb0
Author:     Gabor Kelemen <kelemeng at ubuntu.com>
AuthorDate: Tue Oct 23 21:36:14 2018 +0200
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Tue Oct 30 08:39:23 2018 +0100

    tdf#42949 Fix IWYU warnings in sd/source/ui/inc/{framework,tools,view}/*
    
    Found with bin/find-unneeded-includes
    Only removal proposals are dealt with here.
    
    Also a typo fix :)
    
    Change-Id: I7c96e8459f6fb75b07f6447715e8165800ecba53
    Reviewed-on: https://gerrit.libreoffice.org/62259
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index dbae85a63152..0e1203fbe981 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -134,4 +134,55 @@ blacklist:
     - com/sun/star/drawing/framework/XTabBar.hpp
     - com/sun/star/drawing/framework/XToolBar.hpp
     - com/sun/star/lang/XUnoTunnel.hpp
-
+    sd/source/ui/inc/framework/Configuration.hxx:
+    # base class has to be a complete type
+    - com/sun/star/container/XNamed.hpp
+    - com/sun/star/drawing/framework/XConfiguration.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    sd/source/ui/inc/framework/ConfigurationController.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/framework/XConfigurationController.hpp
+    - com/sun/star/lang/XInitialization.hpp
+    sd/source/ui/inc/framework/DrawModule.hxx:
+    # Needed for css shortcut
+    - sal/types.h
+    sd/source/ui/inc/framework/ImpressModule.hxx:
+    # Needed for css shortcut
+    - sal/types.h
+    sd/source/ui/inc/framework/ModuleController.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/framework/XModuleController.hpp
+    - com/sun/star/lang/XInitialization.hpp
+    sd/source/ui/inc/framework/Pane.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/framework/XPane.hpp
+    - com/sun/star/drawing/framework/XPane2.hpp
+    - com/sun/star/lang/XUnoTunnel.hpp
+    sd/source/ui/inc/framework/PresentationModule.hxx:
+    # Needed for css shortcut
+    - sal/types.h
+    sd/source/ui/inc/framework/PresentationFactory.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/framework/XResourceFactory.hpp
+    - com/sun/star/drawing/framework/XConfigurationChangeListener.hpp
+    sd/source/ui/inc/framework/ResourceId.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/framework/XResourceId.hpp
+    - com/sun/star/lang/XInitialization.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    sd/source/ui/inc/framework/ViewShellWrapper.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/XWindowListener.hpp
+    - com/sun/star/drawing/framework/XRelocatableResource.hpp
+    - com/sun/star/drawing/framework/XView.hpp
+    - com/sun/star/lang/XUnoTunnel.hpp
+    - com/sun/star/view/XSelectionSupplier.hpp
+    sd/source/ui/inc/tools/IdleDetection.hxx:
+    # Needed for template
+    - o3tl/typed_flags_set.hxx
+    sd/source/ui/inc/tools/PropertySet.hxx:
+    # base class has to be a complete type
+    - com/sun/star/beans/XPropertySet.hpp
+    sd/source/ui/inc/tools/SlotStateListener.hxx:
+    # base class has to be a complete type
+    - com/sun/star/frame/XStatusListener.hpp
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index 86729c8879b8..1d9639c611b1 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -21,6 +21,8 @@
 
 #include <framework/FrameworkHelper.hxx>
 
+#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.hpp>
+#include <com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.hpp>
 #include <comphelper/sequence.hxx>
 #include <facreg.hxx>
 #include <sal/log.hxx>
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 762a3fffb980..eefe774dd8a9 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -18,6 +18,9 @@
  */
 
 #include <framework/ModuleController.hxx>
+#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
 
 #include <tools/ConfigurationAccess.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx
index 8bbef2859690..927cfbf4cda4 100644
--- a/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/sd/source/ui/inc/MasterPageObserver.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SD_SOURCE_UI_INC_MASTERPAGEOBSERVER_HXX
 
 #include <rtl/ustring.hxx>
+#include <tools/link.hxx>
 #include "tools/SdGlobalResourceContainer.hxx"
 #include <memory>
 #include <set>
diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx
index 8ebb6340bbcf..18b2eeccec3a 100644
--- a/sd/source/ui/inc/framework/Configuration.hxx
+++ b/sd/source/ui/inc/framework/Configuration.hxx
@@ -22,14 +22,15 @@
 
 #include <MutexOwner.hxx>
 #include <com/sun/star/drawing/framework/XConfiguration.hpp>
-#include <com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <cppuhelper/compbase.hxx>
 
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace util { class XCloneable; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationControllerBroadcaster; } } } } }
+
 namespace sd { namespace framework {
 
 typedef ::cppu::WeakComponentImplHelper <
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx
index 7fee8dc12b0a..3b0bfd669b2a 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -23,21 +23,17 @@
 #include <MutexOwner.hxx>
 
 #include <com/sun/star/drawing/framework/XConfigurationController.hpp>
-#include <com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp>
-#include <com/sun/star/drawing/framework/XConfiguration.hpp>
-#include <com/sun/star/drawing/framework/XControllerManager.hpp>
-#include <com/sun/star/drawing/framework/XResourceFactoryManager.hpp>
-#include <com/sun/star/drawing/framework/XResourceId.hpp>
-#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <cppuhelper/compbase.hxx>
-#include <rtl/ref.hxx>
 
 #include <memory>
 
-namespace sd { class ViewShellBase; }
+
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationChangeRequest; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { struct ConfigurationChangeEvent; } } } } }
 
 namespace sd { namespace framework {
 
diff --git a/sd/source/ui/inc/framework/DrawModule.hxx b/sd/source/ui/inc/framework/DrawModule.hxx
index 40d834726626..0870c963e637 100644
--- a/sd/source/ui/inc/framework/DrawModule.hxx
+++ b/sd/source/ui/inc/framework/DrawModule.hxx
@@ -20,7 +20,10 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_FRAMEWORK_DRAWMODULE_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_FRAMEWORK_DRAWMODULE_HXX
 
-#include <com/sun/star/frame/XController.hpp>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
 
 namespace sd { namespace framework {
 
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index d56514065f96..f4e44fab22db 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -24,16 +24,16 @@
 
 #include <tools/SdGlobalResourceContainer.hxx>
 
-#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
-#include <com/sun/star/drawing/framework/XView.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-
 #include <functional>
 #include <map>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XView; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { struct ConfigurationChangeEvent; } } } } }
+
 namespace sd {
-class ViewShell;
 class ViewShellBase;
 }
 
diff --git a/sd/source/ui/inc/framework/ImpressModule.hxx b/sd/source/ui/inc/framework/ImpressModule.hxx
index 5446a6d09929..b8d51d0cfb06 100644
--- a/sd/source/ui/inc/framework/ImpressModule.hxx
+++ b/sd/source/ui/inc/framework/ImpressModule.hxx
@@ -20,7 +20,10 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_FRAMEWORK_IMPRESSMODULE_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_FRAMEWORK_IMPRESSMODULE_HXX
 
-#include <com/sun/star/frame/XController.hpp>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
 
 namespace sd { namespace framework {
 
diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx
index 934b582e1a08..40d998013fae 100644
--- a/sd/source/ui/inc/framework/ModuleController.hxx
+++ b/sd/source/ui/inc/framework/ModuleController.hxx
@@ -23,13 +23,13 @@
 #include <MutexOwner.hxx>
 
 #include <com/sun/star/drawing/framework/XModuleController.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/frame/XController.hpp>
 #include <cppuhelper/compbase.hxx>
 
 #include <memory>
-#include <set>
+
+namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
 namespace sd { namespace framework {
 
@@ -38,7 +38,7 @@ typedef ::cppu::WeakComponentImplHelper <
     css::lang::XInitialization
     > ModuleControllerInterfaceBase;
 
-/** The ModuleController has to tasks:
+/** The ModuleController has two tasks:
 
     1. It reads the
     org.openoffice.Office.Impress/MultiPaneGUI/Framework/ResourceFactories
diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx
index d40e1b1db403..e2441474e6f7 100644
--- a/sd/source/ui/inc/framework/Pane.hxx
+++ b/sd/source/ui/inc/framework/Pane.hxx
@@ -24,11 +24,9 @@
 
 #include <com/sun/star/drawing/framework/XPane.hpp>
 #include <com/sun/star/drawing/framework/XPane2.hpp>
-#include <com/sun/star/drawing/framework/TabBarButton.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <vcl/vclptr.hxx>
-#include <memory>
 
 namespace vcl { class Window; }
 
diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx
index 3b042b8e09ab..48971540a148 100644
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@@ -24,13 +24,10 @@
 
 #include <com/sun/star/drawing/framework/XResourceFactory.hpp>
 #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
-#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/compbase.hxx>
 
-#include <memory>
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
 
 namespace sd { namespace framework {
 
diff --git a/sd/source/ui/inc/framework/PresentationModule.hxx b/sd/source/ui/inc/framework/PresentationModule.hxx
index 13e4595d923f..05919b0987da 100644
--- a/sd/source/ui/inc/framework/PresentationModule.hxx
+++ b/sd/source/ui/inc/framework/PresentationModule.hxx
@@ -20,7 +20,10 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_FRAMEWORK_PRESENTATIONMODULE_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_FRAMEWORK_PRESENTATIONMODULE_HXX
 
-#include <com/sun/star/frame/XController.hpp>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
 
 namespace sd { namespace framework {
 
diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx
index a31a7568d675..34043890d6c6 100644
--- a/sd/source/ui/inc/framework/ResourceId.hxx
+++ b/sd/source/ui/inc/framework/ResourceId.hxx
@@ -27,12 +27,13 @@
 #include <com/sun/star/drawing/framework/XResourceId.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/weakref.hxx>
 
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace util { class XURLTransformer; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class WeakReference; } } } }
+
 namespace sd { namespace framework {
 
 typedef ::cppu::WeakImplHelper <
diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
index 9b2c612e099c..cea58ad4d9df 100644
--- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx
+++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
@@ -24,15 +24,15 @@
 #include <com/sun/star/drawing/framework/XView.hpp>
 #include <com/sun/star/drawing/framework/XRelocatableResource.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/awt/XWindowListener.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/compbase.hxx>
-#include <cppuhelper/implbase.hxx>
 
 #include <memory>
 
 namespace sd { class ViewShell; }
 namespace sd { namespace slidesorter { class SlideSorterViewShell; } }
+namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
 
 namespace sd { namespace framework {
 
diff --git a/sd/source/ui/inc/tools/ConfigurationAccess.hxx b/sd/source/ui/inc/tools/ConfigurationAccess.hxx
index c7bf620609c9..03973e77bf43 100644
--- a/sd/source/ui/inc/tools/ConfigurationAccess.hxx
+++ b/sd/source/ui/inc/tools/ConfigurationAccess.hxx
@@ -21,14 +21,16 @@
 #define INCLUDED_SD_SOURCE_UI_INC_TOOLS_CONFIGURATIONACCESS_HXX
 
 #include <rtl/ustring.hxx>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
 
 #include <vector>
 #include <functional>
 
+namespace com { namespace sun { namespace star { namespace container { class XHierarchicalNameAccess; } } } }
+namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 namespace sd { namespace tools {
 
 /** This class gives access to the configuration.  Create an object of this
diff --git a/sd/source/ui/inc/tools/IdleDetection.hxx b/sd/source/ui/inc/tools/IdleDetection.hxx
index 3289db47fd11..54234d09df99 100644
--- a/sd/source/ui/inc/tools/IdleDetection.hxx
+++ b/sd/source/ui/inc/tools/IdleDetection.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_TOOLS_IDLEDETECTION_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_TOOLS_IDLEDETECTION_HXX
 
-#include <sal/types.h>
 #include <o3tl/typed_flags_set.hxx>
 
 namespace vcl { class Window; }
diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
index 6409bff17d07..2fb0b61747fd 100644
--- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
+++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
@@ -20,10 +20,12 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_TOOLS_SDGLOBALRESOURCECONTAINER_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_TOOLS_SDGLOBALRESOURCECONTAINER_HXX
 
-#include <sdmod.hxx>
 #include <memory>
-#include <o3tl/deleter.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace o3tl { template <typename T> struct default_delete; }
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx
index 0cbf94dd0180..b644254e1315 100644
--- a/sd/source/ui/inc/tools/SlotStateListener.hxx
+++ b/sd/source/ui/inc/tools/SlotStateListener.hxx
@@ -22,13 +22,14 @@
 
 #include <MutexOwner.hxx>
 #include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/FeatureStateEvent.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <tools/link.hxx>
 
+namespace com { namespace sun { namespace star { namespace frame { class XDispatch; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XDispatchProvider; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XStatusListener; } } } }
+namespace com { namespace sun { namespace star { namespace frame { struct FeatureStateEvent; } } } }
+
 namespace sd { namespace tools {
 
 typedef cppu::WeakComponentImplHelper<
diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx
index 49fbef2a42ea..3189e1cdaa47 100644
--- a/sd/source/ui/inc/view/viewoverlaymanager.hxx
+++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx
@@ -20,12 +20,16 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_VIEW_VIEWOVERLAYMANAGER_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_VIEW_VIEWOVERLAYMANAGER_HXX
 
-#include <vcl/image.hxx>
+#include <rtl/ref.hxx>
+#include <tools/link.hxx>
 #include <svl/lstner.hxx>
-#include <EventMultiplexer.hxx>
-#include <ViewShellBase.hxx>
+
+#include <vector>
 
 namespace sd { class SmartTag; }
+namespace sd { namespace tools { class EventMultiplexerEvent; } }
+namespace sd { class ViewShellBase; }
+struct ImplSVEvent;
 
 namespace sd
 {
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index a3c50ad1a044..13c554acd919 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -26,6 +26,7 @@
 #include <glob.hxx>
 #include <helpids.h>
 #include <pres.hxx>
+#include <sdmod.hxx>
 
 #include <sdpage.hxx>
 #include <sdresid.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 202ed5cd2c4c..002c924916fe 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -62,6 +62,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svxids.hrc>
 #include <boost/optional.hpp>
+#include <sdmod.hxx>
 
 namespace {
 static const sal_uInt32 SINGLE_CLICK             (0x00000001);
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index e46dd4ed1e95..d336a312ecab 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -65,6 +65,7 @@
 #include <unmodpg.hxx>
 #include <DrawViewShell.hxx>
 #include <sdabstdlg.hxx>
+#include <sdmod.hxx>
 
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index 9e71eeeaaaed..dfb5933926c8 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -61,6 +61,7 @@
 #include <Window.hxx>
 #include <drawview.hxx>
 #include <undo/undoobjects.hxx>
+#include <sdmod.hxx>
 
 #include <memory>
 
diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx
index 0857a1766f42..8db7f7594181 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index c99ea434a22b..61434853df2e 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
+#include <com/sun/star/drawing/framework/XView.hpp>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
index 3eab1474f43d..2eb9d1b75190 100644
--- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx
+++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
@@ -26,6 +26,7 @@
 
 #include <com/sun/star/frame/Desktop.hpp>
 
+#include <o3tl/deleter.hxx>
 #include <rtl/instance.hxx>
 #include <sal/log.hxx>
 
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index a5c135d6e645..680bf5c16dd3 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -52,6 +52,7 @@
 #include <DocumentRenderer.hxx>
 #include <sdattr.hxx>
 #include <optsitem.hxx>
+#include <sdmod.hxx>
 
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/document/XViewDataSupplier.hpp>
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index d3caaa0fecb1..c2ebaa71e3a1 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/drawing/framework/ResourceId.hpp>
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/drawing/framework/XView.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 8366b9911579..90ae9fbb5896 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -182,6 +182,7 @@
 #include <unmodpg.hxx>
 #include <sfx2/sidebar/Sidebar.hxx>
 #include <sfx2/classificationhelper.hxx>
+#include <sdmod.hxx>
 
 #include <ViewShellBase.hxx>
 #include <memory>
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 05f8b041be60..4645d63f6212 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -96,6 +96,7 @@
 #include <Window.hxx>
 #include <fuformatpaintbrush.hxx>
 #include <fuzoom.hxx>
+#include <sdmod.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index da4bf1bb4e88..aadd9820f7ec 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -22,6 +22,7 @@
 #include <svx/svxids.hrc>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/drawing/framework/ResourceId.hpp>
+#include <com/sun/star/drawing/framework/XView.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <unokywds.hxx>
 #include <vcl/settings.hxx>
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index e774bdff8a03..e17f3f820421 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -46,6 +46,7 @@
 #include <bitmaps.hlst>
 #include <sdresid.hxx>
 #include <EventMultiplexer.hxx>
+#include <ViewShellBase.hxx>
 #include <ViewShellManager.hxx>
 #include <sdpage.hxx>
 #include <drawdoc.hxx>
commit f3a40a66e3150bf0d60a8ea0f9e7c10450e508ac
Author:     Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Mon Oct 29 21:39:16 2018 +0100
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Tue Oct 30 08:38:17 2018 +0100

    sw: make members of DocxTableStyleExport::Impl private
    
    Change-Id: I1d2a1ac7c651a706e4ef03d04df4222d4e2aaba5
    Reviewed-on: https://gerrit.libreoffice.org/62525
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 210be3546852..e6a2ebee8316 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -23,11 +23,21 @@ using namespace oox;
 /// Methods in this class handle values in a table style.
 struct DocxTableStyleExport::Impl
 {
+private:
     SwDoc* m_pDoc;
     sax_fastparser::FSHelperPtr m_pSerializer;
 
+public:
     void TableStyle(uno::Sequence<beans::PropertyValue>& rStyle);
 
+    void setSerializer(sax_fastparser::FSHelperPtr pSerializer) { m_pSerializer = pSerializer; }
+
+    sax_fastparser::FSHelperPtr getSerializer() const { return m_pSerializer; }
+
+    void setDoc(SwDoc* pDoc) { m_pDoc = pDoc; }
+
+    SwDoc* getDoc() const { return m_pDoc; }
+
     /// Handles a boolean value.
     void handleBoolean(const OUString& aValue, sal_Int32 nToken);
 
@@ -101,13 +111,13 @@ void DocxTableStyleExport::CnfStyle(uno::Sequence<beans::PropertyValue>& rAttrib
     }
 
     sax_fastparser::XFastAttributeListRef xAttributeList(pAttributeList);
-    m_pImpl->m_pSerializer->singleElementNS(XML_w, XML_cnfStyle, xAttributeList);
+    m_pImpl->getSerializer()->singleElementNS(XML_w, XML_cnfStyle, xAttributeList);
 }
 
 void DocxTableStyleExport::TableStyles(sal_Int32 nCountStylesToWrite)
 {
     // Do we have table styles from InteropGrabBag available?
-    uno::Reference<beans::XPropertySet> xPropertySet(m_pImpl->m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW);
+    uno::Reference<beans::XPropertySet> xPropertySet(m_pImpl->getDoc()->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW);
     uno::Sequence<beans::PropertyValue> aInteropGrabBag;
     xPropertySet->getPropertyValue("InteropGrabBag") >>= aInteropGrabBag;
     uno::Sequence<beans::PropertyValue> aTableStyles;
@@ -681,14 +691,14 @@ void DocxTableStyleExport::Impl::TableStyle(uno::Sequence<beans::PropertyValue>&
 
 void DocxTableStyleExport::SetSerializer(const sax_fastparser::FSHelperPtr& pSerializer)
 {
-    m_pImpl->m_pSerializer = pSerializer;
+    m_pImpl->setSerializer(pSerializer);
 }
 
 DocxTableStyleExport::DocxTableStyleExport(SwDoc* pDoc, const sax_fastparser::FSHelperPtr& pSerializer)
     : m_pImpl(o3tl::make_unique<Impl>())
 {
-    m_pImpl->m_pDoc = pDoc;
-    m_pImpl->m_pSerializer = pSerializer;
+    m_pImpl->setDoc(pDoc);
+    m_pImpl->setSerializer(pSerializer);
 }
 
 DocxTableStyleExport::~DocxTableStyleExport() = default;
commit 9630a2dfc79b08e3417e6e69b083f5124614499c
Author:     Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Mon Oct 29 21:42:19 2018 +0100
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Tue Oct 30 08:38:05 2018 +0100

    external: upgrade libxmlsec to 1.2.27
    
    Allows dropping 3 upstreamed patches.
    
    Change-Id: I0dd739817b507eb5993ad18e8c4a128e0be7254a
    Reviewed-on: https://gerrit.libreoffice.org/62526
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/download.lst b/download.lst
index 46afd8e9cd89..ac10b6cb3e00 100644
--- a/download.lst
+++ b/download.lst
@@ -154,8 +154,8 @@ export LIBNUMBERTEXT_SHA256SUM := e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dd
 export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.5.tar.xz
 export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
-export XMLSEC_SHA256SUM := 8d8276c9c720ca42a3b0023df8b7ae41a2d6c5f9aa8d20ed1672d84cc8982d50
-export XMLSEC_TARBALL := xmlsec1-1.2.26.tar.gz
+export XMLSEC_SHA256SUM := 97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6
+export XMLSEC_TARBALL := xmlsec1-1.2.27.tar.gz
 export LIBXML_SHA256SUM := 0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732
 export LIBXML_VERSION_MICRO := 8
 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk b/external/xmlsec/UnpackedTarball_xmlsec.mk
index 53af3b1f1e8c..12d32a05bb1a 100644
--- a/external/xmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/xmlsec/UnpackedTarball_xmlsec.mk
@@ -9,12 +9,6 @@
 
 xmlsec_patches :=
 xmlsec_patches += xmlsec1-configure.patch.1
-# Backport of <https://github.com/lsh123/xmlsec/pull/223>.
-xmlsec_patches += xmlsec1-vc.patch.1
-# Backport of <https://github.com/lsh123/xmlsec/pull/192>.
-xmlsec_patches += mscng-fixes.patch.1
-# Backport of <https://github.com/lsh123/xmlsec/pull/197>.
-xmlsec_patches += xmlsec1-macos.patch.1
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
 
diff --git a/external/xmlsec/mscng-fixes.patch.1 b/external/xmlsec/mscng-fixes.patch.1
deleted file mode 100644
index c93a0812210c..000000000000
--- a/external/xmlsec/mscng-fixes.patch.1
+++ /dev/null
@@ -1,70 +0,0 @@
-From c97803e20287c189e37b5a737e84ed02b510949f Mon Sep 17 00:00:00 2001
-Subject: [PATCH] mscng: fix use-after-free, implement adoption of private key
- as part of key extraction (#192)
-
----
- src/mscng/signatures.c | 18 +++++++++++++-----
- src/mscng/x509.c       |  8 ++++++--
- src/xmltree.c          |  2 +-
- 3 files changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/src/mscng/signatures.c b/src/mscng/signatures.c
-index 365c484a..a7e0fbb7 100644
---- a/src/mscng/signatures.c
-+++ b/src/mscng/signatures.c
-@@ -258,20 +258,28 @@ static void xmlSecMSCngSignatureFinalize(xmlSecTransformPtr transform) {
-         xmlSecKeyDataDestroy(ctx->data);
-     }
- 
--    if(ctx->pbHash != NULL) {
--        xmlFree(ctx->pbHash);
--    }
-+    // MSDN documents at
-+    // https://msdn.microsoft.com/en-us/library/windows/desktop/aa376217(v=vs.85).aspx
-+    // that the order of cleanup should be:
-+    // - algo handle
-+    // - hash handle
-+    // - hash object pointer
-+    // - hash pointer
- 
-     if(ctx->hHashAlg != 0) {
-         BCryptCloseAlgorithmProvider(ctx->hHashAlg, 0);
-     }
- 
-+    if(ctx->hHash != 0) {
-+        BCryptDestroyHash(ctx->hHash);
-+    }
-+
-     if(ctx->pbHashObject != NULL) {
-         xmlFree(ctx->pbHashObject);
-     }
- 
--    if(ctx->hHash != 0) {
--        BCryptDestroyHash(ctx->hHash);
-+    if(ctx->pbHash != NULL) {
-+        xmlFree(ctx->pbHash);
-     }
- 
-     memset(ctx, 0, sizeof(xmlSecMSCngSignatureCtx));
-diff --git a/src/mscng/x509.c b/src/mscng/x509.c
-index 492193af..3ab62c5c 100644
---- a/src/mscng/x509.c
-+++ b/src/mscng/x509.c
-@@ -785,8 +785,12 @@ xmlSecMSCngKeyDataX509VerifyAndExtractKey(xmlSecKeyDataPtr data,
-         }
- 
-         if((keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePrivate) != 0) {
--            xmlSecNotImplementedError(NULL);
--            return(-1);
-+            keyValue = xmlSecMSCngCertAdopt(certCopy, xmlSecKeyDataTypePrivate);
-+            if(keyValue == NULL) {
-+                xmlSecInternalError("xmlSecMSCngCertAdopt",
-+                    xmlSecKeyDataGetName(data));
-+                return(-1);
-+            }
-         } else if((keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePublic) != 0) {
-             keyValue = xmlSecMSCngCertAdopt(certCopy, xmlSecKeyDataTypePublic);
-             if(keyValue == NULL) {
--- 
-2.16.4
-
diff --git a/external/xmlsec/xmlsec1-macos.patch.1 b/external/xmlsec/xmlsec1-macos.patch.1
deleted file mode 100644
index 1740fef65f5f..000000000000
--- a/external/xmlsec/xmlsec1-macos.patch.1
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9626654fa60825b5dc09a35bdfba6cb53d45e618 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos at vmiklos.hu>
-Date: Mon, 25 Jun 2018 19:49:54 +0200
-Subject: [PATCH] configure: macOS improvement (#197)
-
-* configure: fix shared library suffix on macOS
-
-See <https://lists.gnu.org/archive/html/libtool/2010-04/msg00020.html>,
-shrext_cmds is a command to be evaluated. Linux uses .so for both
-loadable and shared libraries (in terms of libtool), so the problem is
-not visible there, but on macOS this caused configure to literally look
-for
-
-libnspr4`test .$module = .yes && echo .so || echo .dylib`
-
-for the nss backend, while nss provides libnspr4.dylib.
----
- configure.ac  |  5 ++++-
- src/xmldsig.c | 10 +++++-----
- src/xmlenc.c  |  4 ++--
- 3 files changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2eb3f444..2adc625d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -175,7 +175,10 @@ dnl ==========================================================================
- dnl Hack for autoconf version mismatch
- dnl ==========================================================================
- if test "z$shrext" = "z" ; then
--    shrext=$shrext_cmds
-+    AC_MSG_CHECKING(for shared library suffix)
-+    module=no
-+    eval shrext=$shrext_cmds
-+    AC_MSG_RESULT($shrext)
- fi
- 
- dnl ==========================================================================
--- 
-2.16.4
-
diff --git a/external/xmlsec/xmlsec1-vc.patch.1 b/external/xmlsec/xmlsec1-vc.patch.1
deleted file mode 100644
index 5c8bcd6db19a..000000000000
--- a/external/xmlsec/xmlsec1-vc.patch.1
+++ /dev/null
@@ -1,73 +0,0 @@
-From a2077431caf7950b1174cbc03e36bfb2916a9dc1 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos at collabora.co.uk>
-Date: Sat, 22 Sep 2018 16:03:18 +0200
-Subject: [PATCH] win32: allow custom compiler flags (#223)
-
-Use-case is e.g. wanting to build the code with -arch:SSE. And this improves
-consistency, autotools allows custom compiler flags as well.
----
- win32/Makefile.msvc | 2 +-
- win32/configure.js  | 6 ++++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
-index 7eb02efc..9c9673bf 100644
---- a/win32/Makefile.msvc
-+++ b/win32/Makefile.msvc
-@@ -347,7 +347,7 @@
- #
- # The compiler and its options.
- #
--CFLAGS 			= /nologo /D "WIN32" /D "_WINDOWS" /D inline=__inline
-+CFLAGS 			= $(CFLAGS) /nologo /D "WIN32" /D "_WINDOWS" /D inline=__inline
- # C4130: '!=': logical operation on address of string constant:
- #     this generates a false warning inside macros
- CFLAGS 			= $(CFLAGS) /D "_MBCS" /D "_REENTRANT"  /W4 /wd4130
-diff --git a/win32/configure.js b/win32/configure.js
-index 9773617c..854a46af 100644
---- a/win32/configure.js
-+++ b/win32/configure.js
-@@ -57,6 +57,7 @@ var buildUnicode = 1;
- var buildDebug = 0;
- var buildWerror = 0;
- var buildCc = "cl.exe";
-+var buildCflags = "";
- var buildStatic = 1;
- var buildWithDLSupport = 1;
- var buildPrefix = ".";
-@@ -116,6 +117,7 @@ function usage()
- 	txt += "  debug:      Build unoptimised debug executables (" + (buildDebug? "yes" : "no")  + ")\n";
- 	txt += "  werror:     Build with warnings as errors(" + (buildWerror? "yes" : "no")  + ")\n";
- 	txt += "  cc:         Build with the specified compiler(" + buildCc  + ")\n";
-+	txt += "  cflags:     Build with the specified compiler flags('" + buildCflags  + "')\n";
- 	txt += "  static:     Link libxmlsec statically to xmlsec (" + (buildStatic? "yes" : "no")  + ")\n";
- 	txt += "  with-dl:    Enable dynamic loading of xmlsec-crypto libraries (" + (buildWithDLSupport? "yes" : "no")  + ")\n";
- 	txt += "  prefix:     Base directory for the installation (" + buildPrefix + ")\n";
-@@ -181,6 +183,7 @@ function discoverVersion()
- 	vf.WriteLine("DEBUG=" + (buildDebug? "1" : "0"));
- 	vf.WriteLine("WERROR=" + (buildWerror? "1" : "0"));
- 	vf.WriteLine("CC=" + buildCc);
-+	vf.WriteLine("CFLAGS=" + buildCflags);
- 	vf.WriteLine("STATIC=" + (buildStatic? "1" : "0"));
- 	vf.WriteLine("WITH_DL=" + (buildWithDLSupport ? "1" : "0"));
- 	vf.WriteLine("PREFIX=" + buildPrefix);
-@@ -317,6 +320,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) {
- 			buildWerror = strToBool(arg.substring(opt.length + 1, arg.length));
- 		else if (opt == "cc")
- 			buildCc = arg.substring(opt.length + 1, arg.length);
-+		else if (opt == "cflags")
-+			buildCflags = arg.substring(opt.length + 1, arg.length);
- 		else if (opt == "static")
- 			buildStatic = strToBool(arg.substring(opt.length + 1, arg.length));
- 		else if (opt == "with-dl")
-@@ -444,6 +449,7 @@ txtOut += "           Unicode: " + boolToStr(buildUnicode) + "\n";
- txtOut += "     Debug symbols: " + boolToStr(buildDebug) + "\n";
- txtOut += "Warnings as errors: " + boolToStr(buildWerror) + "\n";
- txtOut += "        C compiler: " + buildCc + "\n";
-+txtOut += "  C compiler flags: " + buildCflags + "\n";
- txtOut += "     Static xmlsec: " + boolToStr(buildStatic) + "\n";
- txtOut += " Enable DL support: " + boolToStr(buildWithDLSupport) + "\n";
- txtOut += "    Install prefix: " + buildPrefix + "\n";
--- 
-2.16.3
-

More information about the Libreoffice-commits mailing list