diff options
56 files changed, 10 insertions, 238 deletions
diff --git a/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx b/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx index 7fd51955144d..4849b124cf87 100644 --- a/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx +++ b/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx @@ -24,10 +24,8 @@ #include <cppuhelper/implbase1.hxx> #include <osl/mutex.hxx> -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif + #include "comphelper/comphelperdllapi.h" //.............................................................................. diff --git a/comphelper/inc/comphelper/sequence.hxx b/comphelper/inc/comphelper/sequence.hxx index 46bffc5987d7..578948ea29a1 100644 --- a/comphelper/inc/comphelper/sequence.hxx +++ b/comphelper/inc/comphelper/sequence.hxx @@ -29,10 +29,7 @@ #ifndef _COMPHELPER_SEQUENCE_HXX_ #define _COMPHELPER_SEQUENCE_HXX_ -#ifndef INCLUDED_ALGORITHM #include <algorithm> // copy algorithm -#define INCLUDED_ALGORITHM -#endif #include <com/sun/star/uno/Sequence.hxx> #include <osl/diagnose.h> #include "comphelper/comphelperdllapi.h" diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx index 2762d39156f8..425a78827ec7 100644 --- a/comphelper/inc/comphelper/sequenceashashmap.hxx +++ b/comphelper/inc/comphelper/sequenceashashmap.hxx @@ -34,10 +34,7 @@ #include <boost/unordered_map.hpp> -#ifndef INCLUDED_ALGORITHM #include <algorithm> -#define INCLUDED_ALGORITHM -#endif #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx index 5b05b0613d7e..233873ded588 100644 --- a/connectivity/source/drivers/mozab/MStatement.hxx +++ b/connectivity/source/drivers/mozab/MStatement.hxx @@ -28,10 +28,7 @@ #include <cppuhelper/compbase3.hxx> #include <comphelper/uno3.hxx> #include "connectivity/CommonTools.hxx" -#ifndef INCLUDED_LIST #include <list> -#define INCLUDED_LIST -#endif #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/broadcasthelper.hxx> #include "connectivity/sqliterator.hxx" diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index 283444f731ef..b523ff3f1cde 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -19,10 +19,8 @@ #ifndef DBAUI_TABLEFIELDDESC_HXX #define DBAUI_TABLEFIELDDESC_HXX -#ifndef INCLUDED_VECTOR -#define INCLUDED_VECTOR #include <vector> -#endif + #include "QEnumTypes.hxx" #include <rtl/ustring.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.hxx b/dbaccess/source/ui/querydesign/QTableWindowData.hxx index ccc632e2a522..9f25d257c598 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.hxx @@ -20,10 +20,7 @@ #define DBAUI_QUERY_TABLEWINDOWDATA_HXX #include "TableWindowData.hxx" -#ifndef INCLUDED_VECTOR -#define INCLUDED_VECTOR #include <vector> -#endif #include <com/sun/star/io/XObjectOutputStream.hpp> #include <com/sun/star/io/XObjectInputStream.hpp> diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx index b997afe30317..00eb6d458179 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx @@ -20,11 +20,7 @@ #define DBAUI_QUERYTABWINUNDOACT_HXX #include "QueryDesignUndoAction.hxx" -#ifndef INCLUDED_VECTOR -#define INCLUDED_VECTOR #include <vector> -#endif // INCLUDED_VECTOR - #include <algorithm> namespace dbaui diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx index 9561a893293f..567287b57fa6 100644 --- a/sal/cpprt/operators_new_delete.cxx +++ b/sal/cpprt/operators_new_delete.cxx @@ -32,20 +32,9 @@ #define _NTSDK #endif /* WNT */ -#ifndef INCLUDED_ALGORITHM #include <algorithm> -#define INCLUDED_ALGORITHM -#endif - -#ifndef INCLUDED_NEW #include <new> -#define INCLUDED_NEW -#endif - -#ifndef INCLUDED_STRING_H #include <string.h> -#define INCLUDED_STRING_H -#endif #include <osl/diagnose.h> #include <rtl/alloc.h> diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index f2b90b8744f5..817b0f6ab748 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -26,28 +26,13 @@ * ************************************************************************/ - #include "osl/process.h" -#ifndef INCLUDED_LIMITS_H #include <limits.h> -#define INCLUDED_LIMITS_H -#endif - -#ifndef INCLUDED_PTHREAD_H #include <pthread.h> -#define INCLUDED_PTHREAD_H -#endif - -#ifndef INCLUDED_STDLIB_H #include <stdlib.h> -#define INCLUDED_STDLIB_H -#endif - -#ifndef INCLUDED_STRING_H #include <string.h> -#define INCLUDED_STRING_H -#endif + #include "osl/diagnose.h" #include "osl/file.h" #include "osl/module.h" diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx b/salhelper/inc/salhelper/simplereferenceobject.hxx index ca8db124897c..b32450c295dd 100644 --- a/salhelper/inc/salhelper/simplereferenceobject.hxx +++ b/salhelper/inc/salhelper/simplereferenceobject.hxx @@ -24,14 +24,8 @@ #include "sal/types.h" #include "salhelperdllapi.h" -#ifndef INCLUDED_CSTDDEF #include <cstddef> -#define INCLUDED_CSTDDEF -#endif -#ifndef INCLUDED_NEW #include <new> -#define INCLUDED_NEW -#endif namespace salhelper { diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx index c2ff482fd915..2c5af54eb7a4 100644 --- a/salhelper/source/simplereferenceobject.cxx +++ b/salhelper/source/simplereferenceobject.cxx @@ -20,10 +20,7 @@ #include "salhelper/simplereferenceobject.hxx" #include "osl/diagnose.h" -#ifndef INCLUDED_NEW #include <new> -#define INCLUDED_NEW -#endif using salhelper::SimpleReferenceObject; diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 470d8eb8afd1..c7031b8901b4 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -29,10 +29,8 @@ #ifndef SC_COMPILER_HXX #define SC_COMPILER_HXX -#ifndef INCLUDED_STRING_H #include <string.h> -#define INCLUDED_STRING_H -#endif + #include <tools/mempool.hxx> #include "scdllapi.h" #include "global.hxx" @@ -47,11 +45,7 @@ #include <formula/FormulaCompiler.hxx> #include <boost/intrusive_ptr.hpp> - -#ifndef INCLUDED_HASH_MAP #include <boost/unordered_map.hpp> -#define INCLUDED_HASH_MAP -#endif //----------------------------------------------- diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx index 3d1ea6d5e1ff..eb38a3d10d71 100644 --- a/sc/inc/compressedarray.hxx +++ b/sc/inc/compressedarray.hxx @@ -29,15 +29,9 @@ #ifndef SC_COMPRESSEDARRAY_HXX #define SC_COMPRESSEDARRAY_HXX -#ifndef INCLUDED_CSTDDEF #include <cstddef> -#define INCLUDED_CSTDDEF -#endif - -#ifndef INCLUDED_ALGORITHM #include <algorithm> -#define INCLUDED_ALGORITHM -#endif + #include "scdllapi.h" const size_t nScCompressedArrayDelta = 4; diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index fe70260aed31..b8026e3abe45 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -43,11 +43,8 @@ #include <svx/svdundo.hxx> #include <vector> - -#ifndef INCLUDED_MEMORY #include <memory> -#define INCLUDED_MEMORY -#endif + #include "sddllapi.h" #include "sdpage.hxx" diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index f4cebe33a716..c6f5900042f5 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -31,10 +31,7 @@ #include <sfx2/module.hxx> #include <vcl/vclevent.hxx> -#ifndef INCLUDED_MEMORY #include <memory> -#define INCLUDED_MEMORY -#endif class SdOptions; class BasicIDE; diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx index 7ef62d70a94c..353a9e996b00 100644 --- a/sd/source/helper/simplereferencecomponent.cxx +++ b/sd/source/helper/simplereferencecomponent.cxx @@ -32,10 +32,7 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include "osl/diagnose.h" -#ifndef INCLUDED_NEW #include <new> -#define INCLUDED_NEW -#endif using com::sun::star::uno::RuntimeException; using sd::SimpleReferenceComponent; diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index 389b8005d179..9f18cd2c689c 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -24,10 +24,7 @@ #include <svl/ctloptions.hxx> #include "sddllapi.h" -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif class Window; class OutputDevice; diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx index e59e089fff78..fdfffdc24694 100644 --- a/sd/source/ui/inc/filedlg.hxx +++ b/sd/source/ui/inc/filedlg.hxx @@ -24,10 +24,8 @@ #include <tools/string.hxx> #include <tools/errcode.hxx> -#ifndef INCLUDED_MEMORY #include <memory> -#define INCLUDED_MEMORY -#endif + #include "sddllapi.h" class SdFileDialog_Imp; diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index c481cb780fc2..8e200e5a63a5 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -36,10 +36,8 @@ #include "osl/diagnose.h" #include "sal/types.h" -#ifndef INCLUDED_STRING_H #include <string.h> -#define INCLUDED_STRING_H -#endif + #include <comphelper/stl_types.hxx> #include <boost/unordered_map.hpp> #include <boost/shared_ptr.hpp> diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx index a60ebdabbdd5..1a90ec51b525 100644 --- a/sfx2/inc/sfx2/linksrc.hxx +++ b/sfx2/inc/sfx2/linksrc.hxx @@ -36,10 +36,7 @@ #include <tools/rtti.hxx> #include <com/sun/star/io/XInputStream.hpp> -#ifndef _SAL_CONFIG_H #include <sal/config.h> -#define _SAL_CONFIG_H -#endif namespace com { namespace sun { namespace star { namespace uno { diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx index c884f7846918..42c50ed65c2c 100644 --- a/store/source/lockbyte.cxx +++ b/store/source/lockbyte.cxx @@ -30,10 +30,7 @@ #include "object.hxx" #include "storbase.hxx" -#ifndef INCLUDED_STRING_H #include <string.h> -#define INCLUDED_STRING_H -#endif using namespace store; diff --git a/store/source/storbase.cxx b/store/source/storbase.cxx index 077f5f3ae307..ef3353ffb945 100644 --- a/store/source/storbase.cxx +++ b/store/source/storbase.cxx @@ -28,10 +28,7 @@ #include "store/types.h" #include "object.hxx" -#ifndef INCLUDED_STDIO_H #include <stdio.h> -#define INCLUDED_STDIO_H -#endif using namespace store; diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx index 2407599a81e4..7c07dbad0cf1 100644 --- a/store/source/storbase.hxx +++ b/store/source/storbase.hxx @@ -31,15 +31,8 @@ #include "store/types.h" -#ifndef INCLUDED_STDDEF_H #include <stddef.h> -#define INCLUDED_STDDEF_H -#endif - -#ifndef INCLUDED_STRING_H #include <string.h> -#define INCLUDED_STRING_H -#endif /*======================================================================== * diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx index cb6421073367..e07aa7f1791c 100644 --- a/store/source/storcach.cxx +++ b/store/source/storcach.cxx @@ -29,10 +29,7 @@ #include "object.hxx" #include "storbase.hxx" -#ifndef INCLUDED_STDDEF_H #include <stddef.h> -#define INCLUDED_STDDEF_H -#endif using namespace store; diff --git a/store/workben/t_file.cxx b/store/workben/t_file.cxx index ffff8bd7c630..745fbbd978e9 100644 --- a/store/workben/t_file.cxx +++ b/store/workben/t_file.cxx @@ -24,10 +24,7 @@ #include "lockbyte.hxx" -#ifndef INCLUDED_STDIO_H #include <stdio.h> -#define INCLUDED_STDIO_H -#endif #include "osl/file.h" #include "osl/process.h" diff --git a/svl/inc/svl/folderrestriction.hxx b/svl/inc/svl/folderrestriction.hxx index 078f5ba11d70..4ddb9d4be7bc 100644 --- a/svl/inc/svl/folderrestriction.hxx +++ b/svl/inc/svl/folderrestriction.hxx @@ -23,10 +23,7 @@ #include "svl/svldllapi.h" #include <tools/string.hxx> -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif //........................................................................ namespace svt diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx index 12f70670663b..09a3f35aded7 100644 --- a/svl/inc/svl/itempool.hxx +++ b/svl/inc/svl/itempool.hxx @@ -31,10 +31,7 @@ #include "svl/svldllapi.h" -#ifndef INCLUDED_LIMITS_H #include <limits.h> -#define INCLUDED_LIMITS_H -#endif #include <tools/solar.h> #include <tools/string.hxx> #include <svl/svarray.hxx> diff --git a/svl/inc/svl/whiter.hxx b/svl/inc/svl/whiter.hxx index 37c7301b1fae..9e2aae4e3f1f 100644 --- a/svl/inc/svl/whiter.hxx +++ b/svl/inc/svl/whiter.hxx @@ -30,10 +30,7 @@ #include "svl/svldllapi.h" -#ifndef INCLUDED_LIMITS_H #include <limits.h> -#define INCLUDED_LIMITS_H -#endif #include <tools/solar.h> class SfxItemSet; diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index e9a2bb0ee8eb..8165016c0288 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -28,10 +28,8 @@ #include <svl/inethist.hxx> -#ifndef INCLUDED_ALGORITHM #include <algorithm> -#define INCLUDED_ALGORITHM -#endif + #include "rtl/instance.hxx" #include "rtl/crc.h" #include "rtl/memory.h" diff --git a/svtools/inc/svtools/acceleratorexecute.hxx b/svtools/inc/svtools/acceleratorexecute.hxx index 321c53869657..66a025de4731 100644 --- a/svtools/inc/svtools/acceleratorexecute.hxx +++ b/svtools/inc/svtools/acceleratorexecute.hxx @@ -34,22 +34,14 @@ #include "svtools/svtdllapi.h" -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> - #include <com/sun/star/frame/XFrame.hpp> - #include <com/sun/star/frame/XDispatchProvider.hpp> - #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> - #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/util/URL.hpp> - #include <com/sun/star/awt/KeyEvent.hpp> #include <vcl/keycod.hxx> #include <vcl/evntpost.hxx> diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx index cc1b5b58b0cb..4a05fa83b473 100644 --- a/svtools/inc/svtools/brwbox.hxx +++ b/svtools/inc/svtools/brwbox.hxx @@ -38,15 +38,8 @@ #include <svtools/accessibletableprovider.hxx> #include <vector> -#ifndef INCLUDED_LIMITS_H #include <limits.h> -#define INCLUDED_LIMITS_H -#endif - -#ifndef INCLUDED_MEMORY #include <memory> -#define INCLUDED_MEMORY -#endif class BrowserColumn; class BrowserDataWin; diff --git a/svtools/inc/svtools/helpopt.hxx b/svtools/inc/svtools/helpopt.hxx index a22a10e97ac7..bcd367b2e7d3 100644 --- a/svtools/inc/svtools/helpopt.hxx +++ b/svtools/inc/svtools/helpopt.hxx @@ -30,10 +30,7 @@ #include "svtools/svtdllapi.h" -#ifndef INCLUDED_LIST #include <list> -#define INCLUDED_LIST -#endif #include <tools/string.hxx> #include <unotools/options.hxx> diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx index 3d1f6a6e343b..92aa9460e692 100644 --- a/svtools/inc/svtools/svlbox.hxx +++ b/svtools/inc/svtools/svlbox.hxx @@ -31,10 +31,7 @@ #include "svtools/svtdllapi.h" -#ifndef INCLUDED_DEQUE #include <deque> -#define INCLUDED_DEQUE -#endif #include <vcl/ctrl.hxx> #include <vcl/seleng.hxx> diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx index 99fdba235c20..4c5701830832 100644 --- a/svtools/inc/svtools/svtabbx.hxx +++ b/svtools/inc/svtools/svtabbx.hxx @@ -32,10 +32,7 @@ #include <svtools/svtreebx.hxx> #include <svtools/accessibletableprovider.hxx> -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif enum SvTabJustify { diff --git a/svtools/inc/svtools/textdata.hxx b/svtools/inc/svtools/textdata.hxx index 1708f8f80f4f..29d97e6e51e4 100644 --- a/svtools/inc/svtools/textdata.hxx +++ b/svtools/inc/svtools/textdata.hxx @@ -154,15 +154,8 @@ struct TEIMEInfos // ----------------- Wrapper for old Tools List ------------------- -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif - -#ifndef INCLUDED_ALGORITHM #include <algorithm> -#define INCLUDED_ALGORITHM -#endif template <class T> class ToolsList : public ::std::vector< T > { diff --git a/svtools/source/filter/FilterConfigCache.hxx b/svtools/source/filter/FilterConfigCache.hxx index 66e55c28c6d3..1967565f269e 100644 --- a/svtools/source/filter/FilterConfigCache.hxx +++ b/svtools/source/filter/FilterConfigCache.hxx @@ -26,7 +26,6 @@ * ************************************************************************/ - #ifndef _FILTER_CONFIG_CACHE_HXX_ #define _FILTER_CONFIG_CACHE_HXX_ @@ -36,10 +35,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif class FilterConfigCache { diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 339f265bf0c2..893ec73b841e 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -33,10 +33,7 @@ #include <SwGetPoolIdFromName.hxx> #include "swdllapi.h" -#ifndef INCLUDED_HASH_MAP #include <boost/unordered_map.hpp> -#define INCLUDED_HASH_MAP -#endif #include <stringhash.hxx> #include <boost/ptr_container/ptr_vector.hpp> diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 4377364c5736..fe4a353aff9d 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -41,10 +41,7 @@ #include <svtools/embedhlp.hxx> -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif namespace editeng { class SvxBorderLine; } diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 7b47fcda7559..d5849c7f2a8e 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -30,11 +30,7 @@ #include <tools/solar.h> #include <SwGetPoolIdFromName.hxx> -#ifndef INCLUDED_LIMITS_H #include <limits.h> //For LONG_MAX. -#define INCLUDED_LIMITS_H -#endif - #include <com/sun/star/uno/Reference.h> #include "swdllapi.h" #include <i18npool/lang.h> diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx index d9c3219b4481..6b896a6f2e3f 100644 --- a/sw/inc/tabcol.hxx +++ b/sw/inc/tabcol.hxx @@ -30,10 +30,7 @@ #include <tools/solar.h> -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif #include "swdllapi.h" struct SwTabColsEntry diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 229d9d3ec61a..f8217350230a 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -42,11 +42,7 @@ #include <toxe.hxx> #include <calbck.hxx> -#ifndef INCLUDED_VECTOR #include <vector> // #i21237# -#define INCLUDED_VECTOR -#endif - namespace com { namespace sun { namespace star { namespace text { class XDocumentIndexMark; } diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index 84c6cae939dc..1947e8740e48 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -29,10 +29,7 @@ #include <flddropdown.hxx> -#ifndef INCLUDED_ALGORITHM #include <algorithm> -#define INCLUDED_ALGORITHM -#endif #include <svl/poolitem.hxx> #include <unofldmid.h> diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx index a20be9de8dcd..ef7a1cef435e 100644 --- a/sw/source/ui/uno/unofreg.cxx +++ b/sw/source/ui/uno/unofreg.cxx @@ -32,10 +32,8 @@ #include <uno/lbnames.h> #include <cppuhelper/factory.hxx> #include <sfx2/sfxmodelfactory.hxx> -#ifndef INCLUDED_STRING_H + #include <string.h> -#define INCLUDED_STRING_H -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::lang; diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index eb125fe19983..7e017fc6f618 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -38,14 +38,8 @@ #include "rtl/ustring.hxx" #include "sal/types.h" -#ifndef INCLUDED_ALGORITHM #include <algorithm> -#define INCLUDED_ALGORITHM -#endif -#ifndef INCLUDED_LIMITS #include <limits> -#define INCLUDED_LIMITS -#endif #include <string.h> diff --git a/ucb/workben/cachemap/cachemapobject1.cxx b/ucb/workben/cachemap/cachemapobject1.cxx index 219a45a42096..fdd05c5d8c0f 100644 --- a/ucb/workben/cachemap/cachemapobject1.cxx +++ b/ucb/workben/cachemap/cachemapobject1.cxx @@ -24,10 +24,7 @@ #include "rtl/ref.hxx" #include "rtl/ustring.hxx" -#ifndef INCLUDED_MEMORY #include <memory> -#define INCLUDED_MEMORY -#endif using ucb::cachemap::Object1; using ucb::cachemap::ObjectContainer1; diff --git a/ucb/workben/cachemap/cachemapobject1.hxx b/ucb/workben/cachemap/cachemapobject1.hxx index 9dd3266b86b0..34b7e5e47662 100644 --- a/ucb/workben/cachemap/cachemapobject1.hxx +++ b/ucb/workben/cachemap/cachemapobject1.hxx @@ -26,14 +26,8 @@ #include "sal/types.h" #include "salhelper/simplereferenceobject.hxx" -#ifndef INCLUDED_MAP #include <map> -#define INCLUDED_MAP -#endif -#ifndef INCLUDED_MEMORY #include <memory> -#define INCLUDED_MEMORY -#endif namespace rtl { class OUString; } namespace ucb { namespace cachemap { class Object1; } } diff --git a/ucb/workben/cachemap/cachemapobject3.cxx b/ucb/workben/cachemap/cachemapobject3.cxx index c86ca2da5672..b7cb5552b402 100644 --- a/ucb/workben/cachemap/cachemapobject3.cxx +++ b/ucb/workben/cachemap/cachemapobject3.cxx @@ -24,10 +24,7 @@ #include "rtl/ref.hxx" #include "rtl/ustring.hxx" -#ifndef INCLUDED_MEMORY #include <memory> -#define INCLUDED_MEMORY -#endif using ucb::cachemap::Object3; using ucb::cachemap::ObjectContainer3; diff --git a/ucb/workben/cachemap/cachemapobject3.hxx b/ucb/workben/cachemap/cachemapobject3.hxx index 95709c465770..279436d4b74d 100644 --- a/ucb/workben/cachemap/cachemapobject3.hxx +++ b/ucb/workben/cachemap/cachemapobject3.hxx @@ -26,14 +26,8 @@ #include "sal/types.h" #include "salhelper/simplereferenceobject.hxx" -#ifndef INCLUDED_MAP #include <map> -#define INCLUDED_MAP -#endif -#ifndef INCLUDED_MEMORY #include <memory> -#define INCLUDED_MEMORY -#endif namespace rtl { class OUString; } namespace ucb { namespace cachemap { class Object3; } } diff --git a/ucb/workben/cachemap/cachemaptest.cxx b/ucb/workben/cachemap/cachemaptest.cxx index 72aa19bc02e7..f486fbae05de 100644 --- a/ucb/workben/cachemap/cachemaptest.cxx +++ b/ucb/workben/cachemap/cachemaptest.cxx @@ -26,18 +26,9 @@ #include "rtl/ref.hxx" #include "rtl/ustring.hxx" -#ifndef INCLUDED_CSTDLIB #include <cstdlib> -#define INCLUDED_CSTDLIB -#endif -#ifndef INCLUDED_MEMORY #include <memory> -#define INCLUDED_MEMORY -#endif -#ifndef INCLUDED_STDIO_H #include <stdio.h> // <iostream> or <cstdio> do not work well on all platforms -#define INCLUDED_STDIO_H -#endif using ucb::cachemap::Object1; using ucb::cachemap::Object2; diff --git a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx index d763a68e2c05..657ba6b61c49 100644 --- a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx +++ b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx @@ -22,13 +22,9 @@ #include <rtl/ustring.hxx> #include <com/sun/star/util/DateTime.hpp> - #include <com/sun/star/xml/crypto/SecurityOperationStatus.hpp> -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif /* * type of reference diff --git a/xmlsecurity/source/framework/buffernode.hxx b/xmlsecurity/source/framework/buffernode.hxx index 7744a2dc3a7d..ac0c966af0a1 100644 --- a/xmlsecurity/source/framework/buffernode.hxx +++ b/xmlsecurity/source/framework/buffernode.hxx @@ -32,10 +32,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp> -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif class ElementMark; class ElementCollector; diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx index 8c58d61f2c2a..df0ac8b54f6e 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx @@ -35,10 +35,7 @@ #include "elementmark.hxx" #include "elementcollector.hxx" -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif class SAXEventKeeperImpl : public cppu::WeakImplHelper6 < diff --git a/xmlsecurity/source/framework/signatureengine.hxx b/xmlsecurity/source/framework/signatureengine.hxx index 73b9434037bf..bfde8fe93860 100644 --- a/xmlsecurity/source/framework/signatureengine.hxx +++ b/xmlsecurity/source/framework/signatureengine.hxx @@ -35,10 +35,7 @@ #include "securityengine.hxx" -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif class SignatureEngine : public cppu::ImplInheritanceHelper2 < diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx index b500ef78b2b3..bf640f27a4cf 100644 --- a/xmlsecurity/source/helper/xsecctl.hxx +++ b/xmlsecurity/source/helper/xsecctl.hxx @@ -54,10 +54,7 @@ #include <cppuhelper/implbase4.hxx> -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif /* * all error information diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx index 7110481fc19f..acfcdc40b046 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx @@ -35,10 +35,7 @@ #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp> -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper3< ::com::sun::star::xml::crypto::XXMLSecurityContext , diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx index e12824d8ec98..2b018c6ffa7b 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx @@ -40,10 +40,7 @@ #include <sys/types.h> #include <sys/stat.h> -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif #ifdef UNX #define stricmp strcasecmp |