[openoffice.org/f14/master] use system cppunit
Caolan McNamara
caolanm at fedoraproject.org
Fri Jul 30 13:13:45 UTC 2010
commit 4765e6bccb7fba556371a2a1656c3a0648e4f3b9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 30 14:13:34 2010 +0100
use system cppunit
openoffice.org.spec | 4 +-
sources | 1 -
workspace.cmcfixes77.patch | 1013 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 1015 insertions(+), 3 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 8be7c27..a43023b 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -17,9 +17,9 @@
%endif
%if %{stlport_abi_lockin}
-%define stlflags --with-stlport --without-system-cppunit
+%define stlflags --with-stlport
%else
-%define stlflags --without-stlport --with-system-cppunit
+%define stlflags --without-stlport
%endif
%if %{langpacks}
diff --git a/sources b/sources
index 3aed17f..fa50cc6 100644
--- a/sources
+++ b/sources
@@ -4,7 +4,6 @@ ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.
1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-bd30e9cf5523cdfc019b94f5e1d7fd19 bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
18f577b374d60b3c760a3a3350407632 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
8c994b7e7873b30d70dccc3918cdfbc0 acor_lt.zip
e3a0b76dcd876f3d721ee7183729153d unowinreg.dll
diff --git a/workspace.cmcfixes77.patch b/workspace.cmcfixes77.patch
index 518cd15..251a56d 100644
--- a/workspace.cmcfixes77.patch
+++ b/workspace.cmcfixes77.patch
@@ -296,3 +296,1016 @@ diff -r 85e7cfbbb08a solenv/config/sooo330.ini
// Step over list of property names and get right value from coreesponding value list to set it on internal members!
sal_Int32 nCount = seqPropertyNames.getLength();
+diff -r a1a3b75faa8a basebmp/test/basictest.cxx
+--- a/basebmp/test/basictest.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/basebmp/test/basictest.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -27,10 +27,12 @@
+
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
+ #include "cppunit/plugin/TestPlugIn.h"
++#include "postextstl.h"
+
+ #include <basegfx/vector/b2isize.hxx>
+ #include <basegfx/point/b2ipoint.hxx>
+diff -r a1a3b75faa8a basebmp/test/bmpmasktest.cxx
+--- a/basebmp/test/bmpmasktest.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/basebmp/test/bmpmasktest.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -27,9 +27,11 @@
+
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ #include <basegfx/vector/b2isize.hxx>
+ #include <basegfx/range/b2irange.hxx>
+diff -r a1a3b75faa8a basebmp/test/bmptest.cxx
+--- a/basebmp/test/bmptest.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/basebmp/test/bmptest.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -27,9 +27,11 @@
+
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ #include <basegfx/vector/b2isize.hxx>
+ #include <basegfx/range/b2irange.hxx>
+diff -r a1a3b75faa8a basebmp/test/cliptest.cxx
+--- a/basebmp/test/cliptest.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/basebmp/test/cliptest.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -27,9 +27,11 @@
+
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ #include <basegfx/vector/b2isize.hxx>
+ #include <basegfx/point/b2ipoint.hxx>
+diff -r a1a3b75faa8a basebmp/test/filltest.cxx
+--- a/basebmp/test/filltest.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/basebmp/test/filltest.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -27,9 +27,11 @@
+
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ #include <basegfx/vector/b2isize.hxx>
+ #include <basegfx/range/b2drange.hxx>
+diff -r a1a3b75faa8a basebmp/test/linetest.cxx
+--- a/basebmp/test/linetest.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/basebmp/test/linetest.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -27,9 +27,11 @@
+
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ #include <basegfx/vector/b2isize.hxx>
+ #include <basegfx/point/b2ipoint.hxx>
+diff -r a1a3b75faa8a basebmp/test/makefile.mk
+--- a/basebmp/test/makefile.mk Fri Jul 30 12:58:40 2010 +0100
++++ b/basebmp/test/makefile.mk Fri Jul 30 13:40:34 2010 +0100
+@@ -60,6 +60,13 @@
+ .ENDIF
+ .ENDIF
+
++#building with stlport, but cppunit was not built with stlport
++.IF "$(USE_SYSTEM_STL)"!="YES"
++.IF "$(SYSTEM_CPPUNIT)"=="YES"
++CFLAGSCXX+=-DADAPT_EXT_STL
++.ENDIF
++.ENDIF
++
+ CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
+ # --- Common ----------------------------------------------------------
+diff -r a1a3b75faa8a basebmp/test/masktest.cxx
+--- a/basebmp/test/masktest.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/basebmp/test/masktest.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -27,9 +27,11 @@
+
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ #include <basegfx/vector/b2isize.hxx>
+ #include <basegfx/range/b2irange.hxx>
+diff -r a1a3b75faa8a basebmp/test/polytest.cxx
+--- a/basebmp/test/polytest.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/basebmp/test/polytest.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -27,9 +27,11 @@
+
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ #include <basegfx/vector/b2isize.hxx>
+ #include <basegfx/range/b2irange.hxx>
+diff -r a1a3b75faa8a basegfx/test/basegfx1d.cxx
+--- a/basegfx/test/basegfx1d.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/basegfx/test/basegfx1d.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -30,10 +30,12 @@
+ #include "precompiled_basegfx.hxx"
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
+ #include "cppunit/plugin/TestPlugIn.h"
++#include "postextstl.h"
+
+ namespace basegfx1d
+ {
+diff -r a1a3b75faa8a basegfx/test/basegfx2d.cxx
+--- a/basegfx/test/basegfx2d.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/basegfx/test/basegfx2d.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -30,9 +30,11 @@
+ #include "precompiled_basegfx.hxx"
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ #include <basegfx/matrix/b2dhommatrix.hxx>
+ #include <basegfx/polygon/b2dpolygon.hxx>
+diff -r a1a3b75faa8a basegfx/test/basegfx3d.cxx
+--- a/basegfx/test/basegfx3d.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/basegfx/test/basegfx3d.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -30,9 +30,11 @@
+ #include "precompiled_basegfx.hxx"
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ namespace basegfx3d
+ {
+diff -r a1a3b75faa8a basegfx/test/basegfxtools.cxx
+--- a/basegfx/test/basegfxtools.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/basegfx/test/basegfxtools.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -30,9 +30,11 @@
+ #include "precompiled_basegfx.hxx"
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ #include <basegfx/tools/keystoplerp.hxx>
+ #include <basegfx/numeric/ftools.hxx>
+diff -r a1a3b75faa8a basegfx/test/boxclipper.cxx
+--- a/basegfx/test/boxclipper.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/basegfx/test/boxclipper.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -30,9 +30,11 @@
+ #include "precompiled_basegfx.hxx"
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ #include <basegfx/matrix/b2dhommatrix.hxx>
+ #include <basegfx/curve/b2dcubicbezier.hxx>
+diff -r a1a3b75faa8a basegfx/test/clipstate.cxx
+--- a/basegfx/test/clipstate.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/basegfx/test/clipstate.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -30,9 +30,11 @@
+ #include "precompiled_basegfx.hxx"
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ #include <basegfx/tools/b2dclipstate.hxx>
+ #include <basegfx/range/b2dpolyrange.hxx>
+diff -r a1a3b75faa8a basegfx/test/genericclipper.cxx
+--- a/basegfx/test/genericclipper.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/basegfx/test/genericclipper.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -30,9 +30,11 @@
+ #include "precompiled_basegfx.hxx"
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ #include <basegfx/matrix/b2dhommatrix.hxx>
+ #include <basegfx/curve/b2dcubicbezier.hxx>
+diff -r a1a3b75faa8a basegfx/test/makefile.mk
+--- a/basegfx/test/makefile.mk Fri Jul 30 12:58:40 2010 +0100
++++ b/basegfx/test/makefile.mk Fri Jul 30 13:40:34 2010 +0100
+@@ -36,6 +36,13 @@
+
+ .INCLUDE : settings.mk
+
++#building with stlport, but cppunit was not built with stlport
++.IF "$(USE_SYSTEM_STL)"!="YES"
++.IF "$(SYSTEM_CPPUNIT)"=="YES"
++CFLAGSCXX+=-DADAPT_EXT_STL
++.ENDIF
++.ENDIF
++
+ CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
+ # --- Common ----------------------------------------------------------
+diff -r a1a3b75faa8a configure
+--- a/configure Fri Jul 30 12:58:40 2010 +0100
++++ b/configure Fri Jul 30 13:40:34 2010 +0100
+@@ -13701,16 +13701,6 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+- echo "$as_me:$LINENO: checking STL compatibility" >&5
+-echo $ECHO_N "checking STL compatibility... $ECHO_C" >&6
+- if test "$WITH_STLPORT" != "no"; then
+- { { echo "$as_me:$LINENO: error: to use system cppunit you need to use --without-stlport" >&5
+-echo "$as_me: error: to use system cppunit you need to use --without-stlport" >&2;}
+- { (exit 1); exit 1; }; }
+- else
+- echo "$as_me:$LINENO: result: OK" >&5
+-echo "${ECHO_T}OK" >&6
+- fi
+ else
+ echo "$as_me:$LINENO: result: internal" >&5
+ echo "${ECHO_T}internal" >&6
+diff -r a1a3b75faa8a configure.in
+--- a/configure.in Fri Jul 30 12:58:40 2010 +0100
++++ b/configure.in Fri Jul 30 13:40:34 2010 +0100
+@@ -3613,12 +3613,6 @@
+ # a system-cppunit before the first version using a proper cppunit
+ # (and that being 1.12.1) anyway
+ PKG_CHECK_MODULES( CPPUNIT, cppunit >= 1.12.1 )
+- AC_MSG_CHECKING([STL compatibility])
+- if test "$WITH_STLPORT" != "no"; then
+- AC_MSG_ERROR([to use system cppunit you need to use --without-stlport])
+- else
+- AC_MSG_RESULT([OK])
+- fi
+ else
+ AC_MSG_RESULT([internal])
+ SYSTEM_CPPUNIT=NO
+diff -r a1a3b75faa8a mysqlc/source/mysqlc_connection.cxx
+--- a/mysqlc/source/mysqlc_connection.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/mysqlc/source/mysqlc_connection.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -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>
+diff -r a1a3b75faa8a mysqlc/source/mysqlc_connection.hxx
+--- a/mysqlc/source/mysqlc_connection.hxx Fri Jul 30 12:58:40 2010 +0100
++++ b/mysqlc/source/mysqlc_connection.hxx Fri Jul 30 13:40:34 2010 +0100
+@@ -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>
+diff -r a1a3b75faa8a mysqlc/source/mysqlc_databasemetadata.cxx
+--- a/mysqlc/source/mysqlc_databasemetadata.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/mysqlc/source/mysqlc_databasemetadata.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -54,13 +54,13 @@
+ 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("%");
+
+diff -r a1a3b75faa8a mysqlc/source/mysqlc_databasemetadata.hxx
+--- a/mysqlc/source/mysqlc_databasemetadata.hxx Fri Jul 30 12:58:40 2010 +0100
++++ b/mysqlc/source/mysqlc_databasemetadata.hxx Fri Jul 30 13:40:34 2010 +0100
+@@ -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
+ {
+diff -r a1a3b75faa8a mysqlc/source/mysqlc_driver.cxx
+--- a/mysqlc/source/mysqlc_driver.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/mysqlc/source/mysqlc_driver.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -38,13 +38,12 @@
+ 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- */
+diff -r a1a3b75faa8a mysqlc/source/mysqlc_driver.hxx
+--- a/mysqlc/source/mysqlc_driver.hxx Fri Jul 30 12:58:40 2010 +0100
++++ b/mysqlc/source/mysqlc_driver.hxx Fri Jul 30 13:40:34 2010 +0100
+@@ -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
+diff -r a1a3b75faa8a mysqlc/source/mysqlc_general.hxx
+--- a/mysqlc/source/mysqlc_general.hxx Fri Jul 30 12:58:40 2010 +0100
++++ b/mysqlc/source/mysqlc_general.hxx Fri Jul 30 13:40:34 2010 +0100
+@@ -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
+ {
+diff -r a1a3b75faa8a mysqlc/source/mysqlc_preparedstatement.hxx
+--- a/mysqlc/source/mysqlc_preparedstatement.hxx Fri Jul 30 12:58:40 2010 +0100
++++ b/mysqlc/source/mysqlc_preparedstatement.hxx Fri Jul 30 13:40:34 2010 +0100
+@@ -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
+ {
+diff -r a1a3b75faa8a mysqlc/source/mysqlc_resultsetmetadata.hxx
+--- a/mysqlc/source/mysqlc_resultsetmetadata.hxx Fri Jul 30 12:58:40 2010 +0100
++++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx Fri Jul 30 13:40:34 2010 +0100
+@@ -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
+ {
+diff -r a1a3b75faa8a mysqlc/source/mysqlc_statement.hxx
+--- a/mysqlc/source/mysqlc_statement.hxx Fri Jul 30 12:58:40 2010 +0100
++++ b/mysqlc/source/mysqlc_statement.hxx Fri Jul 30 13:40:34 2010 +0100
+@@ -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>
+
+diff -r a1a3b75faa8a o3tl/qa/makefile.mk
+--- a/o3tl/qa/makefile.mk Fri Jul 30 12:58:40 2010 +0100
++++ b/o3tl/qa/makefile.mk Fri Jul 30 13:40:34 2010 +0100
+@@ -36,6 +36,13 @@
+
+ .INCLUDE : settings.mk
+
++#building with stlport, but cppunit was not built with stlport
++.IF "$(USE_SYSTEM_STL)"!="YES"
++.IF "$(SYSTEM_CPPUNIT)"=="YES"
++CFLAGSCXX+=-DADAPT_EXT_STL
++.ENDIF
++.ENDIF
++
+ CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
+ .IF "$(L10N_framework)"==""
+diff -r a1a3b75faa8a o3tl/qa/test-cow_wrapper.cxx
+--- a/o3tl/qa/test-cow_wrapper.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/o3tl/qa/test-cow_wrapper.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -1,9 +1,11 @@
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
+ #include "cppunit/plugin/TestPlugIn.h"
++#include "postextstl.h"
+
+ #include "cow_wrapper_clients.hxx"
+
+diff -r a1a3b75faa8a o3tl/qa/test-heap_ptr.cxx
+--- a/o3tl/qa/test-heap_ptr.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/o3tl/qa/test-heap_ptr.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -25,9 +25,11 @@
+ *
+ ************************************************************************/
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ #include <o3tl/heap_ptr.hxx>
+
+diff -r a1a3b75faa8a o3tl/qa/test-range.cxx
+--- a/o3tl/qa/test-range.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/o3tl/qa/test-range.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -25,9 +25,11 @@
+ *
+ ************************************************************************/
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ #include <o3tl/range.hxx>
+ #include <vector>
+diff -r a1a3b75faa8a o3tl/qa/test-vector_pool.cxx
+--- a/o3tl/qa/test-vector_pool.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/o3tl/qa/test-vector_pool.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -1,8 +1,10 @@
+ // autogenerated file with codegen.pl
+
++#include "preextstl.h"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
++#include "postextstl.h"
+
+ #include <o3tl/vector_pool.hxx>
+
+diff -r a1a3b75faa8a sal/cppunittester/cppunittester.cxx
+--- a/sal/cppunittester/cppunittester.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/sal/cppunittester/cppunittester.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -31,6 +31,7 @@
+ #include <cstdlib>
+ #include <iostream>
+
++#include "preextstl.h"
+ #include "cppunit/CompilerOutputter.h"
+ #include "cppunit/TestResult.h"
+ #include "cppunit/TestResultCollector.h"
+@@ -38,6 +39,7 @@
+ #include "cppunit/extensions/TestFactoryRegistry.h"
+ #include "cppunit/plugin/PlugInManager.h"
+ #include "cppunit/portability/Stream.h"
++#include "postextstl.h"
+ #include "osl/thread.h"
+ #include "rtl/process.h"
+ #include "rtl/string.hxx"
+diff -r a1a3b75faa8a sal/cppunittester/makefile.mk
+--- a/sal/cppunittester/makefile.mk Fri Jul 30 12:58:40 2010 +0100
++++ b/sal/cppunittester/makefile.mk Fri Jul 30 13:40:34 2010 +0100
+@@ -33,6 +33,13 @@
+
+ .INCLUDE: settings.mk
+
++#building with stlport, but cppunit was not built with stlport
++.IF "$(USE_SYSTEM_STL)"!="YES"
++.IF "$(SYSTEM_CPPUNIT)"=="YES"
++CFLAGSCXX+=-DADAPT_EXT_STL
++.ENDIF
++.ENDIF
++
+ CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
+ OBJFILES = $(APP1OBJS)
+diff -r a1a3b75faa8a sax/qa/cppunit/makefile.mk
+--- a/sax/qa/cppunit/makefile.mk Fri Jul 30 12:58:40 2010 +0100
++++ b/sax/qa/cppunit/makefile.mk Fri Jul 30 13:40:34 2010 +0100
+@@ -35,6 +35,13 @@
+
+ .INCLUDE : settings.mk
+
++#building with stlport, but cppunit was not built with stlport
++.IF "$(USE_SYSTEM_STL)"!="YES"
++.IF "$(SYSTEM_CPPUNIT)"=="YES"
++CFLAGSCXX+=-DADAPT_EXT_STL
++.ENDIF
++.ENDIF
++
+ CFLAGSCXX += $(CPPUNIT_CFLAGS)
+ DLLPRE = # no leading "lib" on .so files
+
+diff -r a1a3b75faa8a sax/qa/cppunit/test_converter.cxx
+--- a/sax/qa/cppunit/test_converter.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/sax/qa/cppunit/test_converter.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -25,10 +25,12 @@
+ *
+ ************************************************************************/
+
++#include "preextstl.h"
+ #include <cppunit/TestAssert.h>
+ #include <cppunit/TestFixture.h>
+ #include <cppunit/extensions/HelperMacros.h>
+ #include <cppunit/plugin/TestPlugIn.h>
++#include "postextstl.h"
+
+ #include <rtl/ustrbuf.hxx>
+
+diff -r a1a3b75faa8a sfx2/qa/cppunit/makefile.mk
+--- a/sfx2/qa/cppunit/makefile.mk Fri Jul 30 12:58:40 2010 +0100
++++ b/sfx2/qa/cppunit/makefile.mk Fri Jul 30 13:40:34 2010 +0100
+@@ -35,6 +35,13 @@
+
+ .INCLUDE : settings.mk
+
++#building with stlport, but cppunit was not built with stlport
++.IF "$(USE_SYSTEM_STL)"!="YES"
++.IF "$(SYSTEM_CPPUNIT)"=="YES"
++CFLAGSCXX+=-DADAPT_EXT_STL
++.ENDIF
++.ENDIF
++
+ CFLAGSCXX += $(CPPUNIT_CFLAGS)
+ DLLPRE = # no leading "lib" on .so files
+
+diff -r a1a3b75faa8a sfx2/qa/cppunit/test_metadatable.cxx
+--- a/sfx2/qa/cppunit/test_metadatable.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/sfx2/qa/cppunit/test_metadatable.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -27,10 +27,12 @@
+
+ #include "precompiled_sfx2.hxx"
+
++#include "preextstl.h"
+ #include <cppunit/TestAssert.h>
+ #include <cppunit/TestFixture.h>
+ #include <cppunit/extensions/HelperMacros.h>
+ #include <cppunit/plugin/TestPlugIn.h>
++#include "postextstl.h"
+
+ #include <rtl/ustrbuf.hxx>
+
+diff -r a1a3b75faa8a stlport/prj/d.lst
+--- a/stlport/prj/d.lst Fri Jul 30 12:58:40 2010 +0100
++++ b/stlport/prj/d.lst Fri Jul 30 13:40:34 2010 +0100
+@@ -17,6 +17,7 @@
+ ..\%__SRC%\inc\stlport\using\h\* %_DEST%\inc%_EXT%\stl\using\h\*
+ ..\%__SRC%\inc\stlport\wrap_std\* %_DEST%\inc%_EXT%\stl\wrap_std\*
+ ..\%__SRC%\inc\stlport\wrap_std\h\* %_DEST%\inc%_EXT%\stl\wrap_std\h\*
++..\systemstlguards\*.h %_DEST%\inc%_EXT%\stl\*.h
+ ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
+ ..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
+ ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
+diff -r a1a3b75faa8a stlport/systemstlguards/postextstl.h
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/stlport/systemstlguards/postextstl.h Fri Jul 30 13:40:34 2010 +0100
+@@ -0,0 +1,36 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2000, 2010 Oracle and/or its affiliates.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org. If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++#ifdef std_was_redefined_as_stlport
++// put things back the way they were
++# define std std_was_redefined_as_stlport
++# undef _STLP_OUTERMOST_HEADER_ID
++// force config to be re-read
++# undef _STLP_NOTHROW_INHERENTLY
++# undef _STLP_CONFIG_H
++# include <stddef.h>
++#endif
+diff -r a1a3b75faa8a stlport/systemstlguards/preextstl.h
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/stlport/systemstlguards/preextstl.h Fri Jul 30 13:40:34 2010 +0100
+@@ -0,0 +1,77 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * Copyright 2000, 2010 Oracle and/or its affiliates.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org. If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++//1. Force inclusion of a std:: using header to ensure the stlport define
++//of std as "stlport"
++#include <algorithm>
++#if defined(ADAPT_EXT_STL)
++//2. Force inclusion of stlport headers to get their stlport:: definitions
++# include <ostream>
++# include <istream>
++# include <fstream>
++# include <iostream>
++# include <sstream>
++# include <vector>
++# include <deque>
++# include <set>
++# include <list>
++# include <map>
++//3. Now force inclusion of native headers to get their std:: definitions
++# if defined(std)
++# define std_was_redefined_as_stlport std
++# undef std
++# define _STLP_OUTERMOST_HEADER_ID 0xdeadbeaf
++# if defined(_GNUC__)
++# pragma GCC visibility push(default)
++# endif
++# include _STLP_NATIVE_HEADER(exception_defines.h)
++# include _STLP_NATIVE_HEADER(limits)
++# include _STLP_NATIVE_HEADER(memory)
++# include _STLP_NATIVE_HEADER(exception)
++# include _STLP_NATIVE_HEADER(iosfwd)
++# include _STLP_NATIVE_HEADER(algorithm)
++# include _STLP_NATIVE_HEADER(string)
++# include _STLP_NATIVE_HEADER(streambuf)
++# include _STLP_NATIVE_HEADER(ios)
++# include _STLP_NATIVE_HEADER(locale)
++# include _STLP_NATIVE_HEADER(stdexcept)
++# include _STLP_NATIVE_HEADER(ostream)
++# include _STLP_NATIVE_HEADER(istream)
++# include _STLP_NATIVE_HEADER(iostream)
++# include _STLP_NATIVE_HEADER(sstream)
++# include _STLP_NATIVE_HEADER(vector)
++# include _STLP_NATIVE_HEADER(deque)
++# include _STLP_NATIVE_HEADER(set)
++# include _STLP_NATIVE_HEADER(list)
++# include _STLP_NATIVE_HEADER(map)
++# if defined(_GNUC__)
++# pragma GCC visibility pop
++# endif
++# endif
++#endif
++//ext_std resolves to the std that external c++ libs, e.g. Graphite were built
++//against regardless of whether that is stlport or system stl
++namespace ext_std = std;
+diff -r a1a3b75faa8a tools/inc/tools/postextstl.h
+--- a/tools/inc/tools/postextstl.h Fri Jul 30 12:58:40 2010 +0100
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,36 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * Copyright 2000, 2010 Oracle and/or its affiliates.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org. If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-
+-#ifdef std_was_redefined_as_stlport
+-// put things back the way they were
+-# define std std_was_redefined_as_stlport
+-# undef _STLP_OUTERMOST_HEADER_ID
+-// force config to be re-read
+-# undef _STLP_NOTHROW_INHERENTLY
+-# undef _STLP_CONFIG_H
+-# include <stddef.h>
+-#endif
+diff -r a1a3b75faa8a tools/inc/tools/preextstl.h
+--- a/tools/inc/tools/preextstl.h Fri Jul 30 12:58:40 2010 +0100
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,71 +0,0 @@
+-/*************************************************************************
+- *
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * Copyright 2000, 2010 Oracle and/or its affiliates.
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * This file is part of OpenOffice.org.
+- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
+- *
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org. If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
+- *
+- ************************************************************************/
+-//1. Force inclusion of a std:: using header to ensure the stlport define
+-//of std as "stlport"
+-#include <algorithm>
+-#if defined(ADAPT_EXT_STL)
+-//2. Force inclusion of stlport headers to get their stlport:: definitions
+-# include <ostream>
+-# include <istream>
+-# include <fstream>
+-# include <iostream>
+-# include <vector>
+-# include <list>
+-# include <map>
+-//3. Now force inclusion of native headers to get their std:: definitions
+-# if defined(std)
+-# define std_was_redefined_as_stlport std
+-# undef std
+-# define _STLP_OUTERMOST_HEADER_ID 0xdeadbeaf
+-# if defined(_GNUC__)
+-# pragma GCC visibility push(default)
+-# endif
+-# include _STLP_NATIVE_HEADER(exception_defines.h)
+-# include _STLP_NATIVE_HEADER(limits)
+-# include _STLP_NATIVE_HEADER(memory)
+-# include _STLP_NATIVE_HEADER(exception)
+-# include _STLP_NATIVE_HEADER(iosfwd)
+-# include _STLP_NATIVE_HEADER(algorithm)
+-# include _STLP_NATIVE_HEADER(string)
+-# include _STLP_NATIVE_HEADER(streambuf)
+-# include _STLP_NATIVE_HEADER(ios)
+-# include _STLP_NATIVE_HEADER(locale)
+-# include _STLP_NATIVE_HEADER(stdexcept)
+-# include _STLP_NATIVE_HEADER(ostream)
+-# include _STLP_NATIVE_HEADER(istream)
+-# include _STLP_NATIVE_HEADER(iostream)
+-# include _STLP_NATIVE_HEADER(vector)
+-# include _STLP_NATIVE_HEADER(list)
+-# include _STLP_NATIVE_HEADER(map)
+-# if defined(_GNUC__)
+-# pragma GCC visibility pop
+-# endif
+-# endif
+-#endif
+-//ext_std resolves to the std that external c++ libs, e.g. Graphite were built
+-//against regardless of whether that is stlport or system stl
+-namespace ext_std = std;
+diff -r a1a3b75faa8a tools/prj/d.lst
+--- a/tools/prj/d.lst Fri Jul 30 12:58:40 2010 +0100
++++ b/tools/prj/d.lst Fri Jul 30 13:40:34 2010 +0100
+@@ -34,9 +34,6 @@
+ ..\inc\tools\postx.h %_DEST%\inc%_EXT%\tools\postx.h
+ ..\inc\tools\prex.h %_DEST%\inc%_EXT%\tools\prex.h
+
+-..\inc\tools\postextstl.h %_DEST%\inc%_EXT%\tools\postextstl.h
+-..\inc\tools\preextstl.h %_DEST%\inc%_EXT%\tools\preextstl.h
+-
+ ..\inc\tools\svlibrary.hxx %_DEST%\inc%_EXT%\tools\svlibrary.hxx
+ ..\inc\tools\solarmutex.hxx %_DEST%\inc%_EXT%\tools\solarmutex.hxx
+ ..\inc\tools\wintypes.hxx %_DEST%\inc%_EXT%\tools\wintypes.hxx
+diff -r a1a3b75faa8a vcl/inc/vcl/graphite_adaptors.hxx
+--- a/vcl/inc/vcl/graphite_adaptors.hxx Fri Jul 30 12:58:40 2010 +0100
++++ b/vcl/inc/vcl/graphite_adaptors.hxx Fri Jul 30 13:40:34 2010 +0100
+@@ -55,11 +55,11 @@
+ #include "vcl/dllapi.h"
+
+ // Libraries
+-#include <tools/preextstl.h>
++#include <preextstl.h>
+ #include <graphite/GrClient.h>
+ #include <graphite/Font.h>
+ #include <graphite/ITextSource.h>
+-#include <tools/postextstl.h>
++#include <postextstl.h>
+
+ // Module type definitions and forward declarations.
+ //
+diff -r a1a3b75faa8a vcl/inc/vcl/graphite_features.hxx
+--- a/vcl/inc/vcl/graphite_features.hxx Fri Jul 30 12:58:40 2010 +0100
++++ b/vcl/inc/vcl/graphite_features.hxx Fri Jul 30 13:40:34 2010 +0100
+@@ -29,11 +29,11 @@
+ // Parse a string of features specified as ; separated pairs.
+ // e.g.
+ // 1001=1&2002=2&fav1=0
+-#include <tools/preextstl.h>
++#include <preextstl.h>
+ #include <graphite/GrClient.h>
+ #include <graphite/Font.h>
+ #include <graphite/GrFeature.h>
+-#include <tools/postextstl.h>
++#include <postextstl.h>
+
+ namespace grutils
+ {
+diff -r a1a3b75faa8a vcl/inc/vcl/graphite_layout.hxx
+--- a/vcl/inc/vcl/graphite_layout.hxx Fri Jul 30 12:58:40 2010 +0100
++++ b/vcl/inc/vcl/graphite_layout.hxx Fri Jul 30 13:40:34 2010 +0100
+@@ -40,13 +40,13 @@
+ #include <vector>
+ #include <utility>
+ // Libraries
+-#include <tools/preextstl.h>
++#include <preextstl.h>
+ #include <graphite/GrClient.h>
+ #include <graphite/Font.h>
+ #include <graphite/GrConstants.h>
+ #include <graphite/GrAppData.h>
+ #include <graphite/SegmentAux.h>
+-#include <tools/postextstl.h>
++#include <postextstl.h>
+ // Platform
+ #include <vcl/sallayout.hxx>
+ #include <vcl/dllapi.h>
+diff -r a1a3b75faa8a vcl/source/glyphs/graphite_cache.cxx
+--- a/vcl/source/glyphs/graphite_cache.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/vcl/source/glyphs/graphite_cache.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -36,10 +36,10 @@
+ #include <tools/debug.hxx>
+ #include <vcl/sallayout.hxx>
+
+-#include <tools/preextstl.h>
++#include <preextstl.h>
+ #include <graphite/GrClient.h>
+ #include <graphite/Segment.h>
+-#include <tools/postextstl.h>
++#include <postextstl.h>
+
+ #include <rtl/ustring.hxx>
+ #include <vcl/graphite_layout.hxx>
+diff -r a1a3b75faa8a vcl/source/glyphs/graphite_layout.cxx
+--- a/vcl/source/glyphs/graphite_layout.cxx Fri Jul 30 12:58:40 2010 +0100
++++ b/vcl/source/glyphs/graphite_layout.cxx Fri Jul 30 13:40:34 2010 +0100
+@@ -63,13 +63,13 @@
+ #include <unicode/uscript.h>
+
+ // Graphite Libraries (must be after vcl headers on windows)
+-#include <tools/preextstl.h>
++#include <preextstl.h>
+ #include <graphite/GrClient.h>
+ #include <graphite/Font.h>
+ #include <graphite/ITextSource.h>
+ #include <graphite/Segment.h>
+ #include <graphite/SegmentPainter.h>
+-#include <tools/postextstl.h>
++#include <postextstl.h>
+
+ #include <vcl/graphite_layout.hxx>
+ #include <vcl/graphite_features.hxx>
+diff -r a1a3b75faa8a vcl/source/glyphs/graphite_textsrc.hxx
+--- a/vcl/source/glyphs/graphite_textsrc.hxx Fri Jul 30 12:58:40 2010 +0100
++++ b/vcl/source/glyphs/graphite_textsrc.hxx Fri Jul 30 13:40:34 2010 +0100
+@@ -59,11 +59,11 @@
+ #include "vcl/dllapi.h"
+
+ // Libraries
+-#include <tools/preextstl.h>
++#include <preextstl.h>
+ #include <graphite/GrClient.h>
+ #include <graphite/Font.h>
+ #include <graphite/ITextSource.h>
+-#include <tools/postextstl.h>
++#include <postextstl.h>
+
+ // Module type definitions and forward declarations.
+ //
+diff -r a1a3b75faa8a vcl/util/makefile2.pmk
+--- a/vcl/util/makefile2.pmk Fri Jul 30 12:58:40 2010 +0100
++++ b/vcl/util/makefile2.pmk Fri Jul 30 13:40:34 2010 +0100
+@@ -36,6 +36,6 @@
+ #building with stlport, but graphite was not built with stlport
+ .IF "$(USE_SYSTEM_STL)"!="YES"
+ .IF "$(SYSTEM_GRAPHITE)"=="YES"
+-CDEFS += -DADAPT_EXT_STL
++CFLAGSCXX+=-DADAPT_EXT_STL
+ .ENDIF
+ .ENDIF
More information about the scm-commits
mailing list