[Libreoffice-commits] .: ucb/source xmlhelp/source

[Thomas Arnhold]

 ucb/source/ucp/file/filglob.cxx                   |    3 ---
 ucb/source/ucp/file/shell.cxx                     |    4 ----
 xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx  |    4 ----
 xmlhelp/source/cxxhelp/provider/databases.hxx     |    6 ------
 xmlhelp/source/cxxhelp/provider/resultsetbase.hxx |    3 ---
 xmlhelp/source/treeview/tvread.hxx                |    3 ---
 6 files changed, 23 deletions(-)

New commits:
commit d8fc1770099c5bd96ac518561f10840a7dfd62d1
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Thu Feb 23 12:22:39 2012 +0100

    remove all other deprecated header guards

diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index c55cc84..d436fa0 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -32,10 +32,7 @@
 #include "shell.hxx"
 #include "bc.hxx"
 #include <osl/file.hxx>
-#ifndef INCLUDED_STL_VECTOR
 #include <vector>
-#define INCLUDED_STL_VECTOR
-#endif
 #include <ucbhelper/cancelcommandexecution.hxx>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/ucb/UnsupportedCommandException.hpp>
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index a54d4dd..725820d 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -26,11 +26,7 @@
  *
  ************************************************************************/
 
-#ifndef INCLUDED_STL_STACK
 #include <stack>
-#define INCLUDED_STL_STACK
-#endif
-
 #include "osl/diagnose.h"
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
index aaa7244..5f28e8e 100644
--- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
@@ -28,14 +28,10 @@
 #ifndef _XMLSEARCH_UTIL_DECOMPRESSOR_HXX_
 #define _XMLSEARCH_UTIL_DECOMPRESSOR_HXX_
 
-#ifndef INCLUDED_STL_VECTOR
 #include <vector>
-#define INCLUDED_STL_VECTOR
-#endif
 #include <excep/XmlSearchExceptions.hxx>
 #include <util/RandomAccessStream.hxx>
 
-
 namespace xmlsearch {
 
     namespace util {
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index d9c333f..028fad1 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -29,14 +29,8 @@
 #ifndef _DATABASES_HXX_
 #define _DATABASES_HXX_
 
-#ifndef INCLUDED_STL_SET
 #include <set>
-#define INCLUDED_STL_SET
-#endif
-#ifndef INCLUDED_STL_VECTOR
 #include <vector>
-#define INCLUDED_STL_VECTOR
-#endif
 #include <boost/unordered_map.hpp>
 #include <boost/unordered_set.hpp>
 #include <osl/mutex.hxx>
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index c7cf7f6..98772c1 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -28,10 +28,7 @@
 #ifndef _RESULTSETBASE_HXX
 #define _RESULTSETBASE_HXX
 
-#ifndef INCLUDED_STL_VECTOR
 #include <vector>
-#define INCLUDED_STL_VECTOR
-#endif
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/xmlhelp/source/treeview/tvread.hxx b/xmlhelp/source/treeview/tvread.hxx
index 847e5fd..a6bd751 100644
--- a/xmlhelp/source/treeview/tvread.hxx
+++ b/xmlhelp/source/treeview/tvread.hxx
@@ -29,10 +29,7 @@
 #ifndef _TREEVIEW_TVREAD_HXX_
 #define _TREEVIEW_TVREAD_HXX_
 
-#ifndef INCLUDED_STL_VECTOR
 #include <vector>
-#define INCLUDED_STL_VECTOR
-#endif
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
 #include <ucbhelper/macros.hxx>