dba33h: merge after pulling DEV300.m87

mysqlc/source/mysqlc_connection.cxx

@@ -35,13 +35,13 @@
 #include "mysqlc_preparedstatement.hxx"
 #include "mysqlc_general.hxx"
 
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <cppconn/driver.h>
 #include <cppconn/connection.h>
 #include <cppconn/statement.h>
 #include <cppconn/metadata.h>
 #include <cppconn/exception.h>
-#include <tools/postextstl.h>
+#include <postextstl.h>
 
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>

mysqlc/source/mysqlc_connection.hxx

@@ -46,9 +46,9 @@
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
 #include <com/sun/star/util/XStringSubstitution.hpp>
 
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <cppconn/driver.h>
-#include <tools/postextstl.h>
+#include <postextstl.h>
 #include <cppuhelper/compbase3.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <rtl/string.hxx>

mysqlc/source/mysqlc_databasemetadata.cxx

@@ -54,13 +54,13 @@ using namespace com::sun::star::sdbc;
 using ::rtl::OUString;
 using mysqlc_sdbc_driver::getStringFromAny;
 
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <cppconn/connection.h>
 #include <cppconn/resultset.h>
 #include <cppconn/metadata.h>
 #include <cppconn/statement.h>
 #include <cppconn/prepared_statement.h>
-#include <tools/postextstl.h>
+#include <postextstl.h>
 
 static ext_std::string wild("%");
 

mysqlc/source/mysqlc_databasemetadata.hxx

@@ -39,9 +39,9 @@
 #include <cppuhelper/implbase1.hxx>
 #endif
 
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <cppconn/metadata.h>
-#include <tools/postextstl.h>
+#include <postextstl.h>
 
 namespace connectivity
 {

mysqlc/source/mysqlc_driver.cxx

@@ -38,13 +38,12 @@ using namespace connectivity::mysqlc;
 using ::rtl::OUString;
 #include <stdio.h>
 
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <cppconn/exception.h>
-
 #ifdef SYSTEM_MYSQL_CPPCONN
     #include <mysql_driver.h>
 #endif
-#include <tools/postextstl.h>
+#include <postextstl.h>
 
 
 /* {{{ MysqlCDriver::MysqlCDriver() -I- */

mysqlc/source/mysqlc_driver.hxx

@@ -36,9 +36,9 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <cppuhelper/compbase2.hxx>
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <cppconn/driver.h>
-#include <tools/postextstl.h>
+#include <postextstl.h>
 #include <osl/module.h>
 
 namespace connectivity

mysqlc/source/mysqlc_general.hxx

@@ -33,9 +33,9 @@
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
 
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <cppconn/exception.h>
-#include <tools/postextstl.h>
+#include <postextstl.h>
 
 namespace mysqlc_sdbc_driver
 {

mysqlc/source/mysqlc_preparedstatement.hxx

@@ -48,9 +48,9 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #endif
 
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <cppconn/prepared_statement.h>
-#include <tools/postextstl.h>
+#include <postextstl.h>
 
 namespace connectivity
 {

mysqlc/source/mysqlc_resultsetmetadata.hxx

@@ -35,9 +35,9 @@
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 
 #include <cppuhelper/implbase1.hxx>
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <cppconn/resultset_metadata.h>
-#include <tools/postextstl.h>
+#include <postextstl.h>
 
 namespace connectivity
 {

mysqlc/source/mysqlc_statement.hxx

@@ -13,9 +13,9 @@
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
 #include <com/sun/star/util/XCancellable.hpp>
 
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <cppconn/statement.h>
-#include <tools/postextstl.h>
+#include <postextstl.h>
 #include <cppuhelper/compbase5.hxx>
 #include <list>
 

swext/mediawiki/help/makefile.mk

@@ -68,6 +68,6 @@ $(OUT_HELP)$/{$(MEDIAWIKI_LANG)}$/$(PACKAGE)$/%.xhp :| %.xhp
 
 
 $(OUT_MEDIAWIKI)$/$(TARGET).done : $(LOCALIZESDF) $(XHPFILES) $(HLANGXHPFILES)
-    @$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(OUT_HELP) -y $(PACKAGE) -l all -lf $(MEDIAWIKI_LANG:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
+    @$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(OUT_HELP) -y $(PACKAGE) -l all -lf $(MEDIAWIKI_LANG:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
 .ENDIF