[Libreoffice-commits] .: 2 commits - starmath/qa sw/qa sw/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Wed Feb 9 11:25:15 PST 2011
starmath/qa/cppunit/makefile.mk | 7 -------
starmath/qa/cppunit/test_nodetotextvisitors.cxx | 6 ++----
starmath/qa/cppunit/test_starmath.cxx | 2 --
sw/qa/core/Test-BigPtrArray.cxx | 2 --
sw/qa/core/makefile.mk | 7 -------
sw/qa/core/swdoc-test.cxx | 2 --
sw/source/ui/app/appenv.cxx | 4 ----
sw/source/ui/app/applab.cxx | 4 ----
sw/source/ui/dbui/dbmgr.cxx | 2 --
sw/source/ui/ribbar/tbxanchr.cxx | 2 +-
sw/source/ui/ribbar/workctrl.cxx | 2 +-
sw/source/ui/shells/textsh2.cxx | 2 --
sw/source/ui/uiview/view.cxx | 2 +-
sw/source/ui/uiview/viewmdi.cxx | 2 +-
sw/source/ui/uiview/viewprt.cxx | 2 --
sw/source/ui/uiview/viewsrch.cxx | 2 +-
sw/source/ui/utlui/navipi.cxx | 2 +-
sw/source/ui/wrtsh/wrtsh1.cxx | 4 +---
18 files changed, 9 insertions(+), 47 deletions(-)
New commits:
commit 20d5d9883ae8d905b52dab71669ba0e6b92b5a48
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Feb 9 16:20:36 2011 +0100
Trying to remove the stlport mention from the code
diff --git a/starmath/qa/cppunit/makefile.mk b/starmath/qa/cppunit/makefile.mk
index 4e043e8..cd31ef6 100644
--- a/starmath/qa/cppunit/makefile.mk
+++ b/starmath/qa/cppunit/makefile.mk
@@ -35,13 +35,6 @@ ENABLE_EXCEPTIONS=TRUE
.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)
# --- Libs ---------------------------------------------------------
diff --git a/sw/qa/core/makefile.mk b/sw/qa/core/makefile.mk
index 769ffb9..ad18326 100644
--- a/sw/qa/core/makefile.mk
+++ b/sw/qa/core/makefile.mk
@@ -35,13 +35,6 @@ ENABLE_EXCEPTIONS=TRUE
.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)
SHL1OBJS=\
diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx
index bf07daf..cd5b46b 100644
--- a/sw/source/ui/app/appenv.cxx
+++ b/sw/source/ui/app/appenv.cxx
@@ -29,11 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-#if STLPORT_VERSION>=321
#include <cstdarg>
-#endif
-
#include <hintids.hxx>
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index 186d93c..d509df8 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -29,11 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-#if STLPORT_VERSION>=321
#include <cstdarg>
-#endif
-
#include <hintids.hxx>
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index c831416..b9cf90c 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -28,9 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#if STLPORT_VERSION>=321
#include <cstdarg>
-#endif
#include <stdio.h>
#include <unotxdoc.hxx>
diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx
index af1ecdf..dd2fb50 100644
--- a/sw/source/ui/ribbar/tbxanchr.cxx
+++ b/sw/source/ui/ribbar/tbxanchr.cxx
@@ -31,7 +31,7 @@
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
#include <vcl/timer.hxx>
#include <sfx2/app.hxx>
#include <svx/htmlmode.hxx>
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index bac4704..bc306f3 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -30,7 +30,7 @@
#include "precompiled_sw.hxx"
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
#include <svl/eitem.hxx>
#include <svx/htmlmode.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx
index 632cea5..4a7feea 100644
--- a/sw/source/ui/shells/textsh2.cxx
+++ b/sw/source/ui/shells/textsh2.cxx
@@ -31,9 +31,7 @@
-#if STLPORT_VERSION>=321
#include <cstdarg>
-#endif
#include <svtools/svmedit.hxx>
#include <svl/eitem.hxx>
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index ee4f600..49e48d9 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
#include <stdlib.h>
#include <hintids.hxx>
#include <rtl/logfile.hxx>
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index 06534f8..3310b83 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
#include "hintids.hxx"
#include <vcl/svapp.hxx>
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index ea8c915..32e8dce 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -31,9 +31,7 @@
#include <com/sun/star/text/NotePrintMode.hpp>
-#if STLPORT_VERSION>=321
#include <cstdarg>
-#endif
#include <cmdid.h>
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 9189a8a..54b05ab 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
#include <hintids.hxx>
#include <com/sun/star/util/SearchOptions.hpp>
#include <svl/cjkoptions.hxx>
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 1ba6702..d055d23 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -33,7 +33,7 @@
#define NAVIPI_CXX
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
#include <tools/list.hxx>
#include <svl/urlbmk.hxx>
#include <svl/stritem.hxx>
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index e04221a..7840bbc 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -36,9 +36,7 @@
#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
-#if STLPORT_VERSION>=321
-#include <math.h> // prevent conflict between exception and std::exception
-#endif
+#include <math.h>
#include <hintids.hxx>
#include <svx/svdview.hxx>
#include <sot/factory.hxx>
commit 10f4025cebb448aaca5790451a9924751610c411
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Feb 9 10:51:24 2011 +0100
Removing the ext_std masterpiece
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index 35e95cb..8931d3d 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -34,14 +34,12 @@
# include <postwin.h>
#endif
-#include "preextstl.h"
#include <cppunit/TestSuite.h>
#include <cppunit/TestFixture.h>
#include <cppunit/TestCase.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/TestAssert.h>
-#include "postextstl.h"
#include <sal/config.h>
@@ -65,9 +63,9 @@ struct assertion_traits<String>
return x == y;
}
- static ext_std::string toString(const String& x)
+ static std::string toString(const String& x)
{
- ext_std::string text = ByteString(x, RTL_TEXTENCODING_UTF8).GetBuffer();
+ std::string text = ByteString(x, RTL_TEXTENCODING_UTF8).GetBuffer();
OStringStream ost;
ost << text;
return ost.str();
diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx
index d8b36fc..0ba5edd 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -34,13 +34,11 @@
# include <postwin.h>
#endif
-#include "preextstl.h"
#include <cppunit/TestSuite.h>
#include <cppunit/TestFixture.h>
#include <cppunit/TestCase.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <cppunit/extensions/HelperMacros.h>
-#include "postextstl.h"
#include <sal/config.h>
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
index 009dca4..11703dd 100644
--- a/sw/qa/core/Test-BigPtrArray.cxx
+++ b/sw/qa/core/Test-BigPtrArray.cxx
@@ -36,13 +36,11 @@
#define TIMELOG
-#include "preextstl.h"
#include <cppunit/TestSuite.h>
#include <cppunit/TestFixture.h>
#include <cppunit/TestCase.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <cppunit/extensions/HelperMacros.h>
-#include "postextstl.h"
#include <bparr.hxx>
#include <string.h>
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index b718f43..a9a6690 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -32,13 +32,11 @@
# include <postwin.h>
#endif
-#include "preextstl.h"
#include <cppunit/TestSuite.h>
#include <cppunit/TestFixture.h>
#include <cppunit/TestCase.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <cppunit/extensions/HelperMacros.h>
-#include "postextstl.h"
#include <osl/file.hxx>
#include <osl/process.h>
More information about the Libreoffice-commits
mailing list