diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-06-28 13:12:59 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-06-29 09:25:10 +0200 |
| commit | 4c4d748767c5740cc4b5348c69ad86c68db234bd (patch) | |
| tree | 0dd2552859802f0554f83589cc02995eaa7c602e /sd | |
| parent | Remove UNO includes comments (diff) | |
| download | core-4c4d748767c5740cc4b5348c69ad86c68db234bd.tar.gz core-4c4d748767c5740cc4b5348c69ad86c68db234bd.zip | |
Remove some more include guards
Change-Id: I7c62d086cb593744785abecae7a107686a4d65ce
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/drawdoc.hxx | 5 | ||||
| -rw-r--r-- | sd/inc/sdmod.hxx | 3 | ||||
| -rw-r--r-- | sd/source/helper/simplereferencecomponent.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/inc/WindowUpdater.hxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/inc/filedlg.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/facreg.cxx | 4 |
6 files changed, 3 insertions, 19 deletions
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> |