diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 16:20:36 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 20:23:35 +0100 |
commit | 20d5d9883ae8d905b52dab71669ba0e6b92b5a48 (patch) | |
tree | ce703f84351fcf74a259a287e37cee2ca79f89bb | |
parent | 10f4025cebb448aaca5790451a9924751610c411 (diff) |
Trying to remove the stlport mention from the code
-rw-r--r-- | starmath/qa/cppunit/makefile.mk | 7 | ||||
-rw-r--r-- | sw/qa/core/makefile.mk | 7 | ||||
-rw-r--r-- | sw/source/ui/app/appenv.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/app/applab.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/ribbar/tbxanchr.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/ribbar/workctrl.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/shells/textsh2.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/uiview/view.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewmdi.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewprt.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewsrch.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/utlui/navipi.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/wrtsh/wrtsh1.cxx | 4 |
14 files changed, 7 insertions, 37 deletions
diff --git a/starmath/qa/cppunit/makefile.mk b/starmath/qa/cppunit/makefile.mk index 4e043e8557..cd31ef6d40 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 769ffb96d6..ad18326926 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 bf07daf9bf..cd5b46b34f 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 186d93c79e..d509df85cc 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 c83141616a..b9cf90cb7d 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 af1ecdf8dc..dd2fb50bcf 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 bac4704603..bc306f374b 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 632cea50f3..4a7feeae39 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 ee4f600e80..49e48d9c97 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 06534f8dfa..3310b83b8f 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 ea8c9159c6..32e8dce2b5 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 9189a8ae70..54b05ab4d3 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 1ba6702306..d055d23de9 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 e04221af16..7840bbc211 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> |