Author: hdu
Date: Tue Apr 16 12:57:07 2013
New Revision: 1468400
URL: http://svn.apache.org/r1468400
Log:
assume STL to always be newer than stlport's version from 2002
Modified:
openoffice/trunk/main/connectivity/source/inc/java/lang/Object.hxx
openoffice/trunk/main/formula/source/core/api/token.cxx
openoffice/trunk/main/sc/source/core/tool/token.cxx
openoffice/trunk/main/sc/source/ui/docshell/docsh4.cxx
openoffice/trunk/main/svl/inc/svl/itemset.hxx
openoffice/trunk/main/svl/source/items/itemset.cxx
openoffice/trunk/main/sw/source/ui/app/appenv.cxx
openoffice/trunk/main/sw/source/ui/app/applab.cxx
openoffice/trunk/main/sw/source/ui/dbui/dbmgr.cxx
openoffice/trunk/main/sw/source/ui/shells/textsh2.cxx
openoffice/trunk/main/sw/source/ui/uiview/viewprt.cxx
openoffice/trunk/main/sw/source/ui/wrtsh/wrtsh1.cxx
Modified: openoffice/trunk/main/connectivity/source/inc/java/lang/Object.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/inc/java/lang/Object.hxx?rev=1468400&r1=1468399&r2=1468400&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/inc/java/lang/Object.hxx
(original)
+++ openoffice/trunk/main/connectivity/source/inc/java/lang/Object.hxx Tue Apr
16 12:57:07 2013
@@ -23,10 +23,8 @@
#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>
Modified: openoffice/trunk/main/formula/source/core/api/token.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/source/core/api/token.cxx?rev=1468400&r1=1468399&r2=1468400&view=diff
==============================================================================
--- openoffice/trunk/main/formula/source/core/api/token.cxx (original)
+++ openoffice/trunk/main/formula/source/core/api/token.cxx Tue Apr 16 12:57:07
2013
@@ -28,11 +28,7 @@
// INCLUDE ---------------------------------------------------------------
-#if STLPORT_VERSION<321
-#include <stddef.h>
-#else
#include <cstddef>
-#endif
#include <cstdio>
#include <string.h>
Modified: openoffice/trunk/main/sc/source/core/tool/token.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/tool/token.cxx?rev=1468400&r1=1468399&r2=1468400&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/tool/token.cxx (original)
+++ openoffice/trunk/main/sc/source/core/tool/token.cxx Tue Apr 16 12:57:07 2013
@@ -28,11 +28,7 @@
// INCLUDE ---------------------------------------------------------------
-#if STLPORT_VERSION<321
-#include <stddef.h>
-#else
#include <cstddef>
-#endif
#include <cstdio>
#include <string.h>
Modified: openoffice/trunk/main/sc/source/ui/docshell/docsh4.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/docshell/docsh4.cxx?rev=1468400&r1=1468399&r2=1468400&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/docshell/docsh4.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/docshell/docsh4.cxx Tue Apr 16 12:57:07
2013
@@ -32,9 +32,7 @@
using namespace ::com::sun::star;
// INCLUDE ---------------------------------------------------------------
-#if STLPORT_VERSION>=321
#include <math.h> // prevent conflict between exception and
std::exception
-#endif
#include "scitems.hxx"
#include <sfx2/fcontnr.hxx>
Modified: openoffice/trunk/main/svl/inc/svl/itemset.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svl/inc/svl/itemset.hxx?rev=1468400&r1=1468399&r2=1468400&view=diff
==============================================================================
--- openoffice/trunk/main/svl/inc/svl/itemset.hxx (original)
+++ openoffice/trunk/main/svl/inc/svl/itemset.hxx Tue Apr 16 12:57:07 2013
@@ -25,11 +25,7 @@
#include "svl/svldllapi.h"
-#if STLPORT_VERSION<321
-#include <stdarg.h>
-#else
#include <cstdarg> // std::va_list and friends
-#endif
#include <svl/poolitem.hxx>
#include <tools/rtti.hxx>
#include <tools/solar.h>
Modified: openoffice/trunk/main/svl/source/items/itemset.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svl/source/items/itemset.cxx?rev=1468400&r1=1468399&r2=1468400&view=diff
==============================================================================
--- openoffice/trunk/main/svl/source/items/itemset.cxx (original)
+++ openoffice/trunk/main/svl/source/items/itemset.cxx Tue Apr 16 12:57:07 2013
@@ -25,10 +25,7 @@
#include "precompiled_svl.hxx"
#include <string.h>
-
-#if STLPORT_VERSION>=321
#include <cstdarg>
-#endif
#define _SVSTDARR_USHORTS
#define _SVSTDARR_ULONGS
Modified: openoffice/trunk/main/sw/source/ui/app/appenv.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/app/appenv.cxx?rev=1468400&r1=1468399&r2=1468400&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/app/appenv.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/app/appenv.cxx Tue Apr 16 12:57:07 2013
@@ -24,11 +24,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>
Modified: openoffice/trunk/main/sw/source/ui/app/applab.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/app/applab.cxx?rev=1468400&r1=1468399&r2=1468400&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/app/applab.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/app/applab.cxx Tue Apr 16 12:57:07 2013
@@ -24,11 +24,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>
Modified: openoffice/trunk/main/sw/source/ui/dbui/dbmgr.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/dbui/dbmgr.cxx?rev=1468400&r1=1468399&r2=1468400&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/dbui/dbmgr.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/dbui/dbmgr.cxx Tue Apr 16 12:57:07 2013
@@ -23,11 +23,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#if STLPORT_VERSION>=321
+
#include <cstdarg>
-#endif
+#include <cstdio>
-#include <stdio.h>
#include <unotxdoc.hxx>
#include <com/sun/star/text/NotePrintMode.hpp>
#include <sfx2/app.hxx>
Modified: openoffice/trunk/main/sw/source/ui/shells/textsh2.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/textsh2.cxx?rev=1468400&r1=1468399&r2=1468400&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/textsh2.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/textsh2.cxx Tue Apr 16 12:57:07
2013
@@ -24,11 +24,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-
-#if STLPORT_VERSION>=321
#include <cstdarg>
-#endif
#include <svtools/svmedit.hxx>
#include <svl/eitem.hxx>
Modified: openoffice/trunk/main/sw/source/ui/uiview/viewprt.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/uiview/viewprt.cxx?rev=1468400&r1=1468399&r2=1468400&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/uiview/viewprt.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/uiview/viewprt.cxx Tue Apr 16 12:57:07
2013
@@ -26,9 +26,7 @@
#include <com/sun/star/text/NotePrintMode.hpp>
-#if STLPORT_VERSION>=321
#include <cstdarg>
-#endif
#ifndef _CMDID_H
#include <cmdid.h>
Modified: openoffice/trunk/main/sw/source/ui/wrtsh/wrtsh1.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/wrtsh/wrtsh1.cxx?rev=1468400&r1=1468399&r2=1468400&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/wrtsh/wrtsh1.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/wrtsh/wrtsh1.cxx Tue Apr 16 12:57:07 2013
@@ -33,9 +33,7 @@
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/util/XModifiable.hpp>
-#if STLPORT_VERSION>=321
#include <math.h> // prevent conflict between exception and std::exception
-#endif
#include <hintids.hxx>
#include <svx/svdview.hxx>
#include <sot/factory.hxx>
