fix to apply with more removed include guards

6 files changed, 10 insertions, 14 deletions

diff --git a/patches/dev300/docx-vml-import.diff b/patches/dev300/docx-vml-import.diff
index d1663dc48..cae4e7cfb 100644
--- a/patches/dev300/docx-vml-import.diff
+++ b/patches/dev300/docx-vml-import.diff
@@ -295,7 +295,7 @@
 --- writerfilter/inc/ooxml/OOXMLDocument.hxx.old	2010-07-22 13:12:44.000000000 +0200
 +++ writerfilter/inc/ooxml/OOXMLDocument.hxx	2010-07-29 21:03:38.000000000 +0200
 @@ -41,6 +41,7 @@
- #endif
+ #include <com/sun/star/xml/sax/XParser.hpp>
  #include <com/sun/star/xml/sax/XFastParser.hpp>
  #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
 +#include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp>
diff --git a/patches/dev300/impressmedia-features.diff b/patches/dev300/impressmedia-features.diff
index e662cd7bc..679a634ad 100644
--- a/patches/dev300/impressmedia-features.diff
+++ b/patches/dev300/impressmedia-features.diff
@@ -4099,9 +4099,9 @@ index af921ac..203b233 100644
 -#include <cppuhelper/implbase5.hxx>
 +#include <com/sun/star/lang/XInitialization.hpp>
 +#include <cppuhelper/implbase6.hxx>
- #ifndef _CPPUHELPER_PROPERTYSETMIXIN_HXX_
  #include <cppuhelper/propertysetmixin.hxx>
- #endif
+ #include <osl/mutex.hxx>
+ 
 @@ -45,11 +46,12 @@
  class SvStream;
  namespace utl { class TempFile; }
diff --git a/patches/dev300/system-cppunit-with-stlport-ooo.diff b/patches/dev300/system-cppunit-with-stlport-ooo.diff
index 8f038df31..a6b8b1717 100644
--- a/patches/dev300/system-cppunit-with-stlport-ooo.diff
+++ b/patches/dev300/system-cppunit-with-stlport-ooo.diff
@@ -340,8 +340,8 @@ diff -r a1a3b75faa8a -r a6913c9677c2 mysqlc/source/mysqlc_databasemetadata.hxx
 --- mysqlc/source/mysqlc_databasemetadata.hxx	Fri Jul 30 12:58:40 2010 +0100
 +++ mysqlc/source/mysqlc_databasemetadata.hxx	Tue Aug 03 10:01:07 2010 +0100
 @@ -39,9 +39,9 @@
+ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
  #include <cppuhelper/implbase1.hxx>
- #endif
  
 -#include <tools/preextstl.h>
 +#include <preextstl.h>
@@ -404,8 +404,8 @@ diff -r a1a3b75faa8a -r a6913c9677c2 mysqlc/source/mysqlc_preparedstatement.hxx
 --- mysqlc/source/mysqlc_preparedstatement.hxx	Fri Jul 30 12:58:40 2010 +0100
 +++ mysqlc/source/mysqlc_preparedstatement.hxx	Tue Aug 03 10:01:07 2010 +0100
 @@ -48,9 +48,9 @@
+ #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp>
  #include <com/sun/star/io/XInputStream.hpp>
- #endif
  
 -#include <tools/preextstl.h>
 +#include <preextstl.h>
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index ff1c83421..96973826e 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -43765,9 +43765,9 @@ index 2fe6f35..987a8c3 100644
  
 +#include <com/sun/star/frame/XModel.hpp>
 +
- #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HXX_
  #include <com/sun/star/container/XNameContainer.hpp>
- #endif
+ #include <com/sun/star/io/XInputStreamProvider.hpp>
+ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 @@ -51,7 +53,9 @@ void SAL_CALL exportDialogModel(
      ::com::sun::star::uno::Reference<
      ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index a05e388c3..7d3de1ce2 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -5304,19 +5304,16 @@ diff --git xmlscript/inc/xmlscript/xmldlg_imexp.hxx xmlscript/inc/xmlscript/xmld
 index 987a8c3..9a91e24 100644
 --- xmlscript/inc/xmlscript/xmldlg_imexp.hxx
 +++ xmlscript/inc/xmlscript/xmldlg_imexp.hxx
-@@ -27,8 +27,6 @@
+@@ -27,12 +27,11 @@
  #ifndef _XMLSCRIPT_XMLDLG_IMEXP_HXX_
  #define _XMLSCRIPT_XMLDLG_IMEXP_HXX_
  
 -#include <com/sun/star/frame/XModel.hpp>
 -
- #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HXX_
  #include <com/sun/star/container/XNameContainer.hpp>
- #endif
-@@ -41,6 +39,7 @@
- #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HXX_
+ #include <com/sun/star/io/XInputStreamProvider.hpp>
+ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
  #include <com/sun/star/uno/XComponentContext.hpp>
- #endif
 +#include <com/sun/star/frame/XModel.hpp>
  
  #include "xmlscript/xmlns.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 9d93bddde..0d537eda6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,6 @@ EXTRA_DIST=\
 	openabout_translateorgza.png \
 	openintro_pld.bmp \
 	openabout_pld.bmp \
-	patchability-extras.zip \
 	sg3.sdg sg3.sdv sg3.thm \
 	sofficerc-upstream \
 	tango_mainapp_16.png \