[Libreoffice-commits] .: 3 commits - configmgr/prj connectivity/source desktop/source desktop/win32 formula/source sfx2/qa sfx2/source shell/source svx/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Wed Feb 9 11:24:33 PST 2011
configmgr/prj/build.lst | 2 +-
connectivity/source/inc/java/lang/Object.hxx | 3 ---
desktop/source/pagein/makefile.mk | 8 --------
desktop/win32/source/setup/makefile.mk | 4 ++--
formula/source/core/api/token.cxx | 4 ----
sfx2/qa/cppunit/makefile.mk | 7 -------
sfx2/qa/cppunit/test_metadatable.cxx | 2 --
sfx2/source/control/statcach.cxx | 3 +--
sfx2/source/dialog/splitwin.cxx | 3 +--
sfx2/source/doc/docfilt.cxx | 3 +--
sfx2/source/menu/mnuitem.cxx | 3 +--
sfx2/source/menu/mnumgr.cxx | 3 +--
sfx2/source/toolbox/tbxitem.cxx | 1 -
shell/source/win32/shlxthandler/makefile.mk | 2 +-
shell/source/win32/shlxthandler/ooofilt/makefile.mk | 9 ---------
svx/source/customshapes/tbxcustomshapes.cxx | 2 +-
svx/source/form/tbxform.cxx | 2 +-
svx/source/mnuctrls/fntctl.cxx | 4 ++--
svx/source/mnuctrls/fntszctl.cxx | 2 +-
svx/source/tbxctrls/extrusioncontrols.cxx | 2 +-
svx/source/tbxctrls/fillctrl.cxx | 2 +-
svx/source/tbxctrls/grafctrl.cxx | 2 +-
svx/source/tbxctrls/layctrl.cxx | 2 +-
svx/source/tbxctrls/linectrl.cxx | 2 +-
svx/source/tbxctrls/tbcontrl.cxx | 2 +-
svx/source/tbxctrls/tbxdrctl.cxx | 2 +-
26 files changed, 21 insertions(+), 60 deletions(-)
New commits:
commit 77cbc98b7bf77757ccae232165e10939e5adf2ec
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Feb 9 16:20:18 2011 +0100
Trying to remove the stlport mention from the code
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index b017163..fe3fa4c 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -28,10 +28,7 @@
#ifndef _CONNECTIVITY_JAVA_LANG_OBJECT_HXX_
#define _CONNECTIVITY_JAVA_LANG_OBJECT_HXX_
-#if STLPORT_VERSION>=321
-// jni.h needs cstdarg for std::va_list
#include <cstdarg>
-#endif
#include <osl/thread.h>
#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk
index bc63314..09248d4 100644
--- a/desktop/source/pagein/makefile.mk
+++ b/desktop/source/pagein/makefile.mk
@@ -142,14 +142,6 @@ $(MISC)$/$(TARGET)-common : makefile.mk
@-echo $(URELIBPATH)$/$(DLLPRE)reg$(UDKDLLPOST) >> $@
@-echo $(URELIBPATH)$/$(DLLPRE)store$(UDKDLLPOST) >> $@
@-echo $(URELIBPATH)$/reflection$(UNODLLPOST) >> $@
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(COMNAME)" == "gcc2" || "$(COMNAME)" == "gcc3"
- @-echo $(URELIBPATH)$/$(DLLPRE)stlport_gcc$(DLLPOST) >> $@
-.ENDIF # gcc
-.IF "$(COMNAME)" == "sunpro5"
- @-echo $(URELIBPATH)$/$(DLLPRE)stlport_sunpro$(DLLPOST) >> $@
-.ENDIF # sunpro5
-.ENDIF # SYSTEM_STL
@-echo $(URELIBPATH)$/$(DLLPRE)uno_cppuhelper$(COMID)$(UDKDLLPOST) >> $@
@-echo $(URELIBPATH)$/$(DLLPRE)uno_cppu$(UDKDLLPOST) >> $@
@-echo $(URELIBPATH)$/$(DLLPRE)uno_sal$(UDKDLLPOST) >> $@
diff --git a/desktop/win32/source/setup/makefile.mk b/desktop/win32/source/setup/makefile.mk
index 15b7b19..f0c6e0e 100644
--- a/desktop/win32/source/setup/makefile.mk
+++ b/desktop/win32/source/setup/makefile.mk
@@ -43,9 +43,9 @@ ENABLE_EXCEPTIONS = TRUE
INCPRE+=$(MFC_INCLUDE)
-.IF "$(USE_STLP_DEBUG)"!=""
+.IF "$(USE_DEBUG_RUNTIME)"!=""
CDEFS+=-D_DEBUG
-.ENDIF # "$(USE_STLP_DEBUG)"!=""
+.ENDIF # "$(USE_DEBUG_RUNTIME)"!=""
RCFILES= $(RES)$/$(TARGET).rc
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index edf3d5d..87cb865 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -29,11 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_formula.hxx"
-#if STLPORT_VERSION<321
-#include <stddef.h>
-#else
#include <cstddef>
-#endif
#include <cstdio>
#include <string.h>
diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk
index 56195fd..10e0eaa 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 94fcde6..fe29c01 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 4cf18e2..381de0e 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 76c87d5..fb79015 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 842f7d8..13ec119 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 6a46996..63fabd7 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 f6e870d..f4dab73 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
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk
index b6c9a45..fdaa1c4 100644
--- a/shell/source/win32/shlxthandler/makefile.mk
+++ b/shell/source/win32/shlxthandler/makefile.mk
@@ -35,7 +35,7 @@ USE_DEFFILE=TRUE
USE_DEFFILE_X64=TRUE
.ENDIF
NO_DEFAULT_STL=TRUE
-USE_STLP_DEBUG=
+USE_DEBUG_RUNTIME=
# --- Settings -----------------------------------------------------
diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
index 9111069..fd1bc50 100644
--- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk
+++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
@@ -32,9 +32,6 @@ LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE
USE_DEFFILE=TRUE
-# Do not use the dynamic STLport library.
-NO_DEFAULT_STL=YES
-
# Do not use the uwinapi library
UWINAPILIB=
@@ -46,7 +43,6 @@ UWINAPILIB=
CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
CDEFS+=-D_WIN32_IE=0x501
-# SCPCDEFS+=-D_STLP_USE_STATIC_LIB
# --- Files --------------------------------------------------------
@@ -54,9 +50,6 @@ SLOFILES=$(SLO)$/ooofilt.obj\
$(SLO)$/propspec.obj\
$(SLO)$/stream_helper.obj
-# $(SLO)$/utilities.obj
-# $(SLO)$/dbgmacros.obj
-
SHL1TARGET=$(TARGET)
.IF "$(COM)"=="GCC"
SHL1STDLIBS=$(ZLIB3RDLIB) $(EXPAT3RDLIB)
@@ -84,8 +77,6 @@ SHL1STDLIBS+=msvcrt.lib
.ENDIF
-# $(LIBSTLPORTST)
-
SHL1LIBS+=$(SLB)$/util.lib\
$(SLB)$/ooofilereader.lib
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index bcaf8a6..4175542 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
#include <svx/svxids.hrc>
#include <tools/shl.hxx>
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index d533d9c..c2cd8da 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
#include <tools/ref.hxx>
#include <tools/shl.hxx>
#include <svl/intitem.hxx>
diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
index 3427006..cbadeaa 100644
--- a/svx/source/mnuctrls/fntctl.cxx
+++ b/svx/source/mnuctrls/fntctl.cxx
@@ -29,13 +29,13 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headern
+#include <string>
#include <svtools/stdmenu.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/dispatch.hxx>
-#include <svx/fntctl.hxx> //
+#include <svx/fntctl.hxx>
#include <svx/svxids.hrc>
#include "editeng/flstitem.hxx"
#include "editeng/fontitem.hxx"
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index 5f3a757..53bebaa 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headern
+#include <string>
#include <svl/itempool.hxx>
#include <svtools/stdmenu.hxx>
#include <svtools/ctrltool.hxx>
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 3da165a..ac1b68a 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/awt/MenuItemStyle.hpp>
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 742406b..d0ec280 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -31,7 +31,7 @@
// include ---------------------------------------------------------------
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
#include <sfx2/app.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/objsh.hxx>
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index af6fcc2..fa836aa 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
#include <vcl/toolbox.hxx>
#include <vcl/field.hxx>
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 262a285..c88d905 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -31,7 +31,7 @@
// include ---------------------------------------------------------------
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
#include <vcl/toolbox.hxx>
#include <vcl/button.hxx>
#include <svl/intitem.hxx>
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 03e1ea6..e275a36 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -31,7 +31,7 @@
// include ---------------------------------------------------------------
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
#include <vcl/toolbox.hxx>
#include <sfx2/app.hxx>
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 326ec3e..c50a4fb 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
#include <tools/shl.hxx>
#include <svl/poolitem.hxx>
#include <svl/eitem.hxx>
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 87533e5..cff4b1b 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
-#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+#include <string>
#include <tools/ref.hxx>
#include <tools/shl.hxx>
commit 2c56a53e5fb1e2240cf56e9886638c4dbcb85578
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Feb 9 10:50:38 2011 +0100
Removing the ext_std masterpiece
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index 2dcfb08..9afb68f 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -28,12 +28,10 @@
#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>
commit 01c37214c3eb33d36d339bf21e2c589bad4444b6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Feb 9 04:26:53 2011 +0100
Make stlport only optional dependency of postprocess
diff --git a/configmgr/prj/build.lst b/configmgr/prj/build.lst
index 9fcccbc..3999f64 100644
--- a/configmgr/prj/build.lst
+++ b/configmgr/prj/build.lst
@@ -1,4 +1,4 @@
-cg configmgr : BOOST:boost comphelper cppu cppuhelper offuh sal salhelper stlport NULL
+cg configmgr : BOOST:boost comphelper cppu cppuhelper offuh sal salhelper NULL
cg configmgr\inc nmake - all cg_inc NULL
cg configmgr\source nmake - all cg_source cg_inc NULL
cg configmgr\qa\unoapi nmake - all cg_qa_unoapi NULL
More information about the Libreoffice-commits
mailing list