[Libreoffice-commits] .: 3 commits - framework/inc ucb/source xmloff/inc xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Nov 17 06:18:10 PST 2010
framework/inc/classes/checkediterator.hxx | 2 --
framework/inc/dispatch/interceptionhelper.hxx | 2 --
framework/inc/macros/debug/memorymeasure.hxx | 2 --
ucb/source/ucp/file/filrset.hxx | 2 --
xmloff/inc/numehelp.hxx | 2 --
xmloff/inc/xmloff/XMLFontStylesContext.hxx | 2 --
xmloff/inc/xmloff/XMLPageExport.hxx | 2 --
xmloff/inc/xmloff/nmspmap.hxx | 2 --
xmloff/inc/xmloff/prhdlfac.hxx | 2 --
xmloff/inc/xmloff/prstylei.hxx | 2 --
xmloff/inc/xmloff/xmlimppr.hxx | 2 --
xmloff/inc/xmloff/xmlnumfi.hxx | 2 --
xmloff/inc/xmloff/xmlprmap.hxx | 2 --
xmloff/source/core/DocumentSettingsContext.cxx | 2 --
xmloff/source/draw/sdxmlimp_impl.hxx | 2 --
xmloff/source/forms/controlpropertymap.cxx | 2 --
xmloff/source/style/prstylei.cxx | 2 --
xmloff/source/text/XMLIndexTOCStylesContext.hxx | 3 ---
xmloff/source/text/XMLPropertyBackpatcher.hxx | 5 -----
19 files changed, 42 deletions(-)
New commits:
commit 8112961f678df19931774751462643ec4c299fce
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 17 11:44:46 2010 +0000
remove archaic guards
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index 76c35f3..83e17fe 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -28,9 +28,7 @@
#ifndef _FILRSET_HXX_
#define _FILRSET_HXX_
-#ifndef __SGI_STL_VECTOR
#include <vector>
-#endif
#include <ucbhelper/macros.hxx>
#include <osl/file.hxx>
commit 229d265b98117d42fc78765b15c124d001bba287
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 17 09:55:42 2010 +0000
remove archaic SGI header guards
diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx
index 41cc8a6..d23d3a8 100644
--- a/framework/inc/classes/checkediterator.hxx
+++ b/framework/inc/classes/checkediterator.hxx
@@ -44,9 +44,7 @@
//_________________________________________________________________________________________________________________
#include <sal/types.h>
-#ifndef __SGI_STL_ITERATOR
#include <iterator>
-#endif
//_________________________________________________________________________________________________________________
// namespace
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index ce0e1d5..3da0fd7 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -58,9 +58,7 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/weakref.hxx>
-#ifndef __SGI_STL_DEQUE
#include <deque>
-#endif
//_________________________________________________________________________________________________________________
// namespace
diff --git a/framework/inc/macros/debug/memorymeasure.hxx b/framework/inc/macros/debug/memorymeasure.hxx
index 4a4a178..46d0667 100644
--- a/framework/inc/macros/debug/memorymeasure.hxx
+++ b/framework/inc/macros/debug/memorymeasure.hxx
@@ -50,9 +50,7 @@
#include <rtl/strbuf.hxx>
#endif
- #ifndef __SGI_STL_VECTOR
#include <vector>
- #endif
/*_____________________________________________________________________________________________________________
LOGFILE_MEMORYMEASURE
commit 632d5f043675c61b80dcd811032372e8ccb7d9ee
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 17 09:54:34 2010 +0000
remove archaic SGI header guards
diff --git a/xmloff/inc/numehelp.hxx b/xmloff/inc/numehelp.hxx
index 131b10f..2d1d981 100644
--- a/xmloff/inc/numehelp.hxx
+++ b/xmloff/inc/numehelp.hxx
@@ -35,9 +35,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#ifndef __SGI_STL_SET
#include <set>
-#endif
class SvXMLExport;
namespace rtl
diff --git a/xmloff/inc/xmloff/XMLFontStylesContext.hxx b/xmloff/inc/xmloff/XMLFontStylesContext.hxx
index 8194a86..ec891cd 100644
--- a/xmloff/inc/xmloff/XMLFontStylesContext.hxx
+++ b/xmloff/inc/xmloff/XMLFontStylesContext.hxx
@@ -31,9 +31,7 @@
#include "sal/config.h"
#include "xmloff/dllapi.h"
-#ifndef __SGI_STL_VECTOR
#include <vector>
-#endif
#include <xmloff/xmlstyle.hxx>
diff --git a/xmloff/inc/xmloff/XMLPageExport.hxx b/xmloff/inc/xmloff/XMLPageExport.hxx
index 22f4204..9144626 100644
--- a/xmloff/inc/xmloff/XMLPageExport.hxx
+++ b/xmloff/inc/xmloff/XMLPageExport.hxx
@@ -33,9 +33,7 @@
#include "xmloff/dllapi.h"
#include "sal/types.h"
#include <rtl/ustring.hxx>
-#ifndef __SGI_STL_VECTOR
#include <vector>
-#endif
#include <xmloff/attrlist.hxx>
#include <xmloff/uniref.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/xmloff/inc/xmloff/nmspmap.hxx b/xmloff/inc/xmloff/nmspmap.hxx
index 15c8df0..74713f5 100644
--- a/xmloff/inc/xmloff/nmspmap.hxx
+++ b/xmloff/inc/xmloff/nmspmap.hxx
@@ -34,9 +34,7 @@
#include "sal/types.h"
#include <rtl/ustring.hxx>
#include <hash_map>
-#ifndef __SGI_STL_MAP
#include <map>
-#endif
#include <rtl/ref.hxx>
#include <cppuhelper/weak.hxx>
diff --git a/xmloff/inc/xmloff/prhdlfac.hxx b/xmloff/inc/xmloff/prhdlfac.hxx
index 435eb08..0d906f6 100644
--- a/xmloff/inc/xmloff/prhdlfac.hxx
+++ b/xmloff/inc/xmloff/prhdlfac.hxx
@@ -33,9 +33,7 @@
#include "xmloff/dllapi.h"
#include "sal/types.h"
-#ifndef __SGI_STL_MAP
#include <map>
-#endif
#include <xmloff/uniref.hxx>
#include <xmloff/xmlprhdl.hxx>
diff --git a/xmloff/inc/xmloff/prstylei.hxx b/xmloff/inc/xmloff/prstylei.hxx
index e044f8f..bf90a2e 100644
--- a/xmloff/inc/xmloff/prstylei.hxx
+++ b/xmloff/inc/xmloff/prstylei.hxx
@@ -32,9 +32,7 @@
#include "xmloff/dllapi.h"
#include "sal/types.h"
#include <com/sun/star/style/XStyle.hpp>
-#ifndef __SGI_STL_VECTOR
#include <vector>
-#endif
#include <xmloff/xmlstyle.hxx>
struct XMLPropertyState;
diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/xmloff/inc/xmloff/xmlimppr.hxx
index 9482bd6..b9bf336 100644
--- a/xmloff/inc/xmloff/xmlimppr.hxx
+++ b/xmloff/inc/xmloff/xmlimppr.hxx
@@ -38,9 +38,7 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XTolerantMultiPropertySet.hpp>
-#ifndef __SGI_STL_VECTOR
#include <vector>
-#endif
#include <xmloff/uniref.hxx>
struct XMLPropertyState;
diff --git a/xmloff/inc/xmloff/xmlnumfi.hxx b/xmloff/inc/xmloff/xmlnumfi.hxx
index 619fde0..fc8a663 100644
--- a/xmloff/inc/xmloff/xmlnumfi.hxx
+++ b/xmloff/inc/xmloff/xmlnumfi.hxx
@@ -37,9 +37,7 @@
#include <xmloff/xmlstyle.hxx>
#include <rtl/ustrbuf.hxx>
#include <i18npool/lang.h>
-#ifndef __SGI_STL_VECTOR
#include <vector>
-#endif
#include <unotools/localedatawrapper.hxx>
#define XML_NUMBERSTYLES "NumberStyles"
diff --git a/xmloff/inc/xmloff/xmlprmap.hxx b/xmloff/inc/xmloff/xmlprmap.hxx
index d90a5a9..5e9121b 100644
--- a/xmloff/inc/xmloff/xmlprmap.hxx
+++ b/xmloff/inc/xmloff/xmlprmap.hxx
@@ -35,9 +35,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-#ifndef __SGI_STL_VECTOR
#include <vector>
-#endif
#include <xmloff/uniref.hxx>
#include <xmloff/maptype.hxx>
#include <xmloff/xmltypes.hxx>
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index 0fe63f9..85ffaec 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -39,9 +39,7 @@
#include <xmloff/xmluconv.hxx>
#include <tools/debug.hxx>
-#ifndef __SGI_STL_LIST
#include <list>
-#endif
#include <com/sun/star/i18n/XForbiddenCharacters.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 0990fbf..f0c10ae 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -35,9 +35,7 @@
#include <xmloff/xmltkmap.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
-#ifndef __SGI_STL_VECTOR
#include <vector>
-#endif
#include <xmloff/xmlimp.hxx>
//////////////////////////////////////////////////////////////////////////////
diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx
index 5ac5b33..a3c9b7d 100644
--- a/xmloff/source/forms/controlpropertymap.cxx
+++ b/xmloff/source/forms/controlpropertymap.cxx
@@ -32,9 +32,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/maptype.hxx>
#include <xmloff/xmltypes.hxx>
-#ifndef __SGI_STL_ALGORITHM
#include <algorithm>
-#endif
#include "strings.hxx"
#include <xmloff/contextid.hxx>
#include "controlpropertymap.hxx"
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 4b76b6e..c11799c 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -31,9 +31,7 @@
#include <tools/debug.hxx>
-#ifndef __SGI_STL_SET
#include <set>
-#endif
#include "xmlnmspe.hxx"
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlprcon.hxx>
diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.hxx b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
index 5ddf4df..d3be1f8 100644
--- a/xmloff/source/text/XMLIndexTOCStylesContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
@@ -32,10 +32,7 @@
#include <xmloff/xmlictxt.hxx>
#include <com/sun/star/uno/Reference.h>
-#ifndef __SGI_STL_VECTOR
#include <vector>
-#endif
-
namespace com { namespace sun { namespace star {
namespace xml { namespace sax { class XAttributeList; } }
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx
index 0831877..c52c07b 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.hxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx
@@ -30,13 +30,8 @@
#ifndef _XMLOFF_XMLPROPERTYBACKPATCHER_HXX
#define _XMLOFF_XMLPROPERTYBACKPATCHER_HXX
-#ifndef __SGI_STL_MAP
#include <map>
-#endif
-
-#ifndef __SGI_STL_VECTOR
#include <vector>
-#endif
#include <comphelper/stl_types.hxx>
namespace rtl { class OUString; }
More information about the Libreoffice-commits
mailing list