diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 16:20:18 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 19:57:20 +0100 |
| commit | 77cbc98b7bf77757ccae232165e10939e5adf2ec (patch) | |
| tree | 11e770848cb5636a633275cb89c2e45d8f19f7a8 /sfx2 | |
| parent | 2c56a53e5fb1e2240cf56e9886638c4dbcb85578 (diff) | |
Trying to remove the stlport mention from the code
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/qa/cppunit/makefile.mk | 7 | ||||
| -rw-r--r-- | sfx2/source/control/statcach.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/dialog/splitwin.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/doc/docfilt.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/menu/mnuitem.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/menu/mnumgr.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 1 |
7 files changed, 5 insertions, 18 deletions
diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk index 56195fdbf4..10e0eaa3d9 100644 --- a/sfx2/qa/cppunit/makefile.mk +++ b/sfx2/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) DLLPRE = # no leading "lib" on .so files diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 94fcde64f5..fe29c0129b 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -30,11 +30,10 @@ #include "precompiled_sfx2.hxx" #ifdef SOLARIS -// HACK: prevent conflict between STLPORT and Workshop headers on Solaris 8 #include <ctime> #endif -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 4cf18e27cd..381de0e07d 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -30,11 +30,10 @@ #include "precompiled_sfx2.hxx" #ifdef SOLARIS -// HACK: prevent conflict between STLPORT and Workshop headers on Solaris 8 #include <ctime> #endif -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <vcl/wrkwin.hxx> #include <unotools/viewoptions.hxx> diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx index 76c87d5c44..fb7901575a 100644 --- a/sfx2/source/doc/docfilt.cxx +++ b/sfx2/source/doc/docfilt.cxx @@ -32,11 +32,10 @@ // INCLUDE --------------------------------------------------------------- #ifdef SOLARIS -// HACK: prevent conflict between STLPORT and Workshop headers on Solaris 8 #include <ctime> #endif -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <sot/exchange.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 842f7d86dd..13ec119033 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -30,11 +30,10 @@ #include "precompiled_sfx2.hxx" #ifdef SOLARIS -// HACK: prevent conflict between STLPORT and Workshop headers on Solaris 8 #include <ctime> #endif -#include <string> // HACK: prevent conflict between STLPORT and Workshop includes +#include <string> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 6a46996c30..63fabd70d2 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -34,11 +34,10 @@ #include <com/sun/star/container/XNamed.hpp> #ifdef SOLARIS -// HACK: prevent conflict between STLPORT and Workshop headers on Solaris 8 #include <ctime> #endif -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <cstdarg> // std::va_list #include <vcl/pointr.hxx> diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index f6e870d68c..f4dab73304 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -30,7 +30,6 @@ #include "precompiled_sfx2.hxx" #ifdef SOLARIS -// HACK: prevent conflict between STLPORT and Workshop headers on Solaris 8 #include <ctime> #endif |