summaryrefslogtreecommitdiff
path: root/sd/inc
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-10-23 22:38:46 +0200
committerThomas Arnhold <thomas@arnhold.org>2013-10-23 23:22:33 +0200
commit3b58ababc566adef48d8ab600489e554c4585b1d (patch)
treeb1abea7e58d2f9daa28903896d87e3b6284eed43 /sd/inc
parent3a6148e8114a5b980dbedadacce2074390d81555 (diff)
fixincludeguards.sh: sd
Change-Id: Ic831838b377656015d645eec9d439424378e08af
Diffstat (limited to 'sd/inc')
-rw-r--r--sd/inc/CustomAnimationCloner.hxx6
-rw-r--r--sd/inc/CustomAnimationEffect.hxx6
-rw-r--r--sd/inc/CustomAnimationPreset.hxx4
-rw-r--r--sd/inc/EffectMigration.hxx4
-rw-r--r--sd/inc/FactoryIds.hxx4
-rw-r--r--sd/inc/Outliner.hxx4
-rw-r--r--sd/inc/OutlinerIterator.hxx6
-rw-r--r--sd/inc/SdShapeTypes.hxx4
-rw-r--r--sd/inc/TransitionPreset.hxx6
-rw-r--r--sd/inc/animations.hxx4
-rw-r--r--sd/inc/anminfo.hxx6
-rw-r--r--sd/inc/cusshow.hxx6
-rw-r--r--sd/inc/customshowlist.hxx6
-rw-r--r--sd/inc/diadef.h6
-rw-r--r--sd/inc/fadedef.h6
-rw-r--r--sd/inc/glob.hxx6
-rw-r--r--sd/inc/helper/simplereferencecomponent.hxx4
-rw-r--r--sd/inc/imapinfo.hxx6
-rw-r--r--sd/inc/pglink.hxx6
-rw-r--r--sd/inc/pres.hxx6
-rw-r--r--sd/inc/prlayout.hxx6
-rw-r--r--sd/inc/resltn.hxx6
-rw-r--r--sd/inc/sdabstdlg.hxx4
-rw-r--r--sd/inc/sdattr.hxx6
-rw-r--r--sd/inc/sdcgmfilter.hxx6
-rw-r--r--sd/inc/sdcommands.h4
-rw-r--r--sd/inc/sddll.hxx6
-rw-r--r--sd/inc/sddllapi.h6
-rw-r--r--sd/inc/sdenumdef.hxx4
-rw-r--r--sd/inc/sderror.hxx4
-rw-r--r--sd/inc/sdfilter.hxx6
-rw-r--r--sd/inc/sdgrffilter.hxx6
-rw-r--r--sd/inc/sdhtmlfilter.hxx6
-rw-r--r--sd/inc/sdiocmpt.hxx6
-rw-r--r--sd/inc/sdmod.hxx6
-rw-r--r--sd/inc/sdobjfac.hxx6
-rw-r--r--sd/inc/sdpage.hxx6
-rw-r--r--sd/inc/sdpptwrp.hxx6
-rw-r--r--sd/inc/sdresid.hxx4
-rw-r--r--sd/inc/sdundo.hxx6
-rw-r--r--sd/inc/sdxmlwrp.hxx6
-rw-r--r--sd/inc/shapelist.hxx6
-rw-r--r--sd/inc/stlfamily.hxx6
-rw-r--r--sd/inc/stlpool.hxx6
-rw-r--r--sd/inc/stlsheet.hxx6
-rw-r--r--sd/inc/strmname.h6
-rw-r--r--sd/inc/textapi.hxx6
-rw-r--r--sd/inc/undo/undomanager.hxx6
-rw-r--r--sd/inc/undo/undoobjects.hxx6
-rw-r--r--sd/inc/undoanim.hxx6
50 files changed, 138 insertions, 138 deletions
diff --git a/sd/inc/CustomAnimationCloner.hxx b/sd/inc/CustomAnimationCloner.hxx
index 47a55122244d..f59d6df11461 100644
--- a/sd/inc/CustomAnimationCloner.hxx
+++ b/sd/inc/CustomAnimationCloner.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_CUSTOMANIMATIONCLONER_HXX
-#define _SD_CUSTOMANIMATIONCLONER_HXX
+#ifndef INCLUDED_SD_INC_CUSTOMANIMATIONCLONER_HXX
+#define INCLUDED_SD_INC_CUSTOMANIMATIONCLONER_HXX
#include <com/sun/star/animations/XAnimationNode.hpp>
@@ -31,6 +31,6 @@ namespace sd
const SdPage* pSource = 0, const SdPage* pTarget = 0 );
}
-#endif // _SD_CUSTOMANIMATIONCLONER_HXX
+#endif // INCLUDED_SD_INC_CUSTOMANIMATIONCLONER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 623794569797..cfd7bcc66f70 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_CUSTOMANIMATIONEFFECT_HXX
-#define _SD_CUSTOMANIMATIONEFFECT_HXX
+#ifndef INCLUDED_SD_INC_CUSTOMANIMATIONEFFECT_HXX
+#define INCLUDED_SD_INC_CUSTOMANIMATIONEFFECT_HXX
#include <com/sun/star/animations/XAnimationNode.hpp>
#include <com/sun/star/animations/XTimeContainer.hpp>
@@ -466,6 +466,6 @@ private:
}
-#endif // _SD_CUSTOMANIMATIONEFFECT_HXX
+#endif // INCLUDED_SD_INC_CUSTOMANIMATIONEFFECT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 49092161322f..4617e13e3582 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_CUSTOMANIMATIONPRESET_HXX
-#define _SD_CUSTOMANIMATIONPRESET_HXX
+#ifndef INCLUDED_SD_INC_CUSTOMANIMATIONPRESET_HXX
+#define INCLUDED_SD_INC_CUSTOMANIMATIONPRESET_HXX
#include <boost/shared_ptr.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sd/inc/EffectMigration.hxx b/sd/inc/EffectMigration.hxx
index 2387d4390491..0cd2f9d57195 100644
--- a/sd/inc/EffectMigration.hxx
+++ b/sd/inc/EffectMigration.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_EFFECT_MIGRATION_HXX
-#define _SD_EFFECT_MIGRATION_HXX
+#ifndef INCLUDED_SD_INC_EFFECTMIGRATION_HXX
+#define INCLUDED_SD_INC_EFFECTMIGRATION_HXX
#include <com/sun/star/presentation/AnimationEffect.hpp>
#include <com/sun/star/presentation/AnimationSpeed.hpp>
diff --git a/sd/inc/FactoryIds.hxx b/sd/inc/FactoryIds.hxx
index b14b02b0f19b..61f276c01388 100644
--- a/sd/inc/FactoryIds.hxx
+++ b/sd/inc/FactoryIds.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SD_FACTORY_IDS_HXX
-#define SD_FACTORY_IDS_HXX
+#ifndef INCLUDED_SD_INC_FACTORYIDS_HXX
+#define INCLUDED_SD_INC_FACTORYIDS_HXX
namespace sd {
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 7ce40282a2cf..46fce7edf61d 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SD_OUTLINER_HXX
-#define SD_OUTLINER_HXX
+#ifndef INCLUDED_SD_INC_OUTLINER_HXX
+#define INCLUDED_SD_INC_OUTLINER_HXX
#include <svx/svdobj.hxx>
#include <svx/svdoutl.hxx>
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index 87e1ab9ca2c1..3ee514068e79 100644
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SD_OUTLINER_ITERATOR_HXX
-#define SD_OUTLINER_ITERATOR_HXX
+#ifndef INCLUDED_SD_INC_OUTLINERITERATOR_HXX
+#define INCLUDED_SD_INC_OUTLINERITERATOR_HXX
#include <svx/svdobj.hxx>
@@ -357,6 +357,6 @@ public:
} } // end of namespace ::sd::outliner
-#endif // _SD_OUTLINER_ITERATOR_HXX
+#endif // _ INCLUDED_SD_INC_OUTLINERITERATOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/SdShapeTypes.hxx b/sd/inc/SdShapeTypes.hxx
index f522aef7ad3b..d90b4607f6ae 100644
--- a/sd/inc/SdShapeTypes.hxx
+++ b/sd/inc/SdShapeTypes.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_SD_SHAPE_TYPES_HXX
-#define _SD_SD_SHAPE_TYPES_HXX
+#ifndef INCLUDED_SD_INC_SDSHAPETYPES_HXX
+#define INCLUDED_SD_INC_SDSHAPETYPES_HXX
#include <svx/ShapeTypeHandler.hxx>
#include <svx/AccessibleShape.hxx>
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index ed4cee8f74b8..6769dc9b5486 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_TRANSITIONPRESET_HXX
-#define _SD_TRANSITIONPRESET_HXX
+#ifndef INCLUDED_SD_INC_TRANSITIONPRESET_HXX
+#define INCLUDED_SD_INC_TRANSITIONPRESET_HXX
#include <boost/shared_ptr.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -76,6 +76,6 @@ private:
}
-#endif // _SD_TRANSITIONPRESET_HXX
+#endif // INCLUDED_SD_INC_TRANSITIONPRESET_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/animations.hxx b/sd/inc/animations.hxx
index 6602dd9ff8ed..ee3b87032dd0 100644
--- a/sd/inc/animations.hxx
+++ b/sd/inc/animations.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_ANIMATIONS_HXX_
-#define _SD_ANIMATIONS_HXX_
+#ifndef INCLUDED_SD_INC_ANIMATIONS_HXX
+#define INCLUDED_SD_INC_ANIMATIONS_HXX
#include <sddllapi.h>
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index 7a230c22be1e..0e1c65f5fcbc 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_ANMINFO_HXX
-#define _SD_ANMINFO_HXX
+#ifndef INCLUDED_SD_INC_ANMINFO_HXX
+#define INCLUDED_SD_INC_ANMINFO_HXX
#include <com/sun/star/presentation/AnimationEffect.hpp>
#include <com/sun/star/presentation/AnimationSpeed.hpp>
@@ -70,6 +70,6 @@ public:
virtual SdrObjUserData* Clone(SdrObject* pObject) const;
};
-#endif // _SD_ANMINFO_HXX
+#endif // INCLUDED_SD_INC_ANMINFO_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx
index c80cb1d2a5af..81d2817cd262 100644
--- a/sd/inc/cusshow.hxx
+++ b/sd/inc/cusshow.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_CUSSHOW_HXX
-#define _SD_CUSSHOW_HXX
+#ifndef INCLUDED_SD_INC_CUSSHOW_HXX
+#define INCLUDED_SD_INC_CUSSHOW_HXX
#include <vector>
#include <tools/stream.hxx>
@@ -77,6 +77,6 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoCustomShow();
};
-#endif // _SD_CUSSHOW_HXX
+#endif // INCLUDED_SD_INC_CUSSHOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/customshowlist.hxx b/sd/inc/customshowlist.hxx
index 5cafa4465f38..e84d633581ae 100644
--- a/sd/inc/customshowlist.hxx
+++ b/sd/inc/customshowlist.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CUSTOMSHOWLIST_HXX
-#define _CUSTOMSHOWLIST_HXX
+#ifndef INCLUDED_SD_INC_CUSTOMSHOWLIST_HXX
+#define INCLUDED_SD_INC_CUSTOMSHOWLIST_HXX
#include <vector>
@@ -72,6 +72,6 @@ public:
};
-#endif // _CUSTOMSHOWLIST_HXX
+#endif // INCLUDED_SD_INC_CUSTOMSHOWLIST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/diadef.h b/sd/inc/diadef.h
index 8d8fd5265372..0da1bd899d35 100644
--- a/sd/inc/diadef.h
+++ b/sd/inc/diadef.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_DIADEF_H
-#define _SD_DIADEF_H
+#ifndef INCLUDED_SD_INC_DIADEF_H
+#define INCLUDED_SD_INC_DIADEF_H
enum PresChange
{
@@ -30,6 +30,6 @@ enum PresChange
// has to be adjusted
#define PRESCHANGE_COUNT 3
-#endif // _SD_DIADEF_H
+#endif // INCLUDED_SD_INC_DIADEF_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/fadedef.h b/sd/inc/fadedef.h
index 655277546926..88823fb6159b 100644
--- a/sd/inc/fadedef.h
+++ b/sd/inc/fadedef.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_FADEDEF_H
-#define _SD_FADEDEF_H
+#ifndef INCLUDED_SD_INC_FADEDEF_H
+#define INCLUDED_SD_INC_FADEDEF_H
// has to be adjusted!
#define FADE_EFFECT_COUNT 57
@@ -32,6 +32,6 @@ enum FadeSpeed
// has to be adjusted!
#define FADE_SPEED_COUNT 3
-#endif // _SD_FADEDEF_H
+#endif // INCLUDED_SD_INC_FADEDEF_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx
index 4223294fa339..f5e1565f9086 100644
--- a/sd/inc/glob.hxx
+++ b/sd/inc/glob.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SD_GLOB_HXX
-#define SD_GLOB_HXX
+#ifndef INCLUDED_SD_INC_GLOB_HXX
+#define INCLUDED_SD_INC_GLOB_HXX
#include <tools/solar.h>
@@ -84,7 +84,7 @@ const sal_uInt32 SdUDInventor=sal_uInt32('S')*0x00000001+
//------------------------------------------------------------------
-#endif // _SD_GLOB_HXX
+#endif // _ INCLUDED_SD_INC_GLOB_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx
index 85b264e72196..77a6df550952 100644
--- a/sd/inc/helper/simplereferencecomponent.hxx
+++ b/sd/inc/helper/simplereferencecomponent.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_SIMPLEREFERENCECOMPONENT_HXX_
-#define _SD_SIMPLEREFERENCECOMPONENT_HXX_
+#ifndef INCLUDED_SD_INC_HELPER_SIMPLEREFERENCECOMPONENT_HXX
+#define INCLUDED_SD_INC_HELPER_SIMPLEREFERENCECOMPONENT_HXX
#include "osl/interlck.h"
#include "sal/types.h"
diff --git a/sd/inc/imapinfo.hxx b/sd/inc/imapinfo.hxx
index 1544846a1abb..2efbe1a837ad 100644
--- a/sd/inc/imapinfo.hxx
+++ b/sd/inc/imapinfo.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_IMAPINFO_HXX
-#define _SD_IMAPINFO_HXX
+#ifndef INCLUDED_SD_INC_IMAPINFO_HXX
+#define INCLUDED_SD_INC_IMAPINFO_HXX
#include "sdiocmpt.hxx"
#include "glob.hxx"
@@ -51,7 +51,7 @@ public:
const ImageMap& GetImageMap() const { return aImageMap; }
};
-#endif // _SD_IMAPINFO_HXX
+#endif // INCLUDED_SD_INC_IMAPINFO_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx
index 9f9e1c6a7c91..97c597e5446d 100644
--- a/sd/inc/pglink.hxx
+++ b/sd/inc/pglink.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PGLINK_HXX
-#define _PGLINK_HXX
+#ifndef INCLUDED_SD_INC_PGLINK_HXX
+#define INCLUDED_SD_INC_PGLINK_HXX
#include <sfx2/lnkbase.hxx>
@@ -40,7 +40,7 @@ public:
bool Connect() { return 0 != SvBaseLink::GetRealObject(); }
};
-#endif // _PGLINK_HXX
+#endif // INCLUDED_SD_INC_PGLINK_HXX
diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx
index ce1e05feb441..3bc3db7f9938 100644
--- a/sd/inc/pres.hxx
+++ b/sd/inc/pres.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _PRESENTATION_HXX
-#define _PRESENTATION_HXX
+#ifndef INCLUDED_SD_INC_PRES_HXX
+#define INCLUDED_SD_INC_PRES_HXX
enum PresObjKind
{
@@ -129,6 +129,6 @@ enum NavigatorDragType
};
#define NAVIGATOR_DRAGTYPE_COUNT 4
-#endif // _PRESENTATION_HXX
+#endif // INCLUDED_SD_INC_PRES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/prlayout.hxx b/sd/inc/prlayout.hxx
index e8e208ed84a0..fcd83737dd86 100644
--- a/sd/inc/prlayout.hxx
+++ b/sd/inc/prlayout.hxx
@@ -23,8 +23,8 @@
|* checked in and does only contain the enumerator.
\************************************************************************/
-#ifndef _SD_PRLAYOUT_HXX_
-#define _SD_PRLAYOUT_HXX_
+#ifndef INCLUDED_SD_INC_PRLAYOUT_HXX
+#define INCLUDED_SD_INC_PRLAYOUT_HXX
enum PresentationObjects
{
@@ -44,6 +44,6 @@ enum PresentationObjects
PO_SUBTITLE
};
-#endif // _SD_PRLAYOUT_HXX_
+#endif // INCLUDED_SD_INC_PRLAYOUT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/resltn.hxx b/sd/inc/resltn.hxx
index 71a1ec6319f9..e687a686e0c2 100644
--- a/sd/inc/resltn.hxx
+++ b/sd/inc/resltn.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_RESLTN_HXX
-#define _SD_RESLTN_HXX
+#ifndef INCLUDED_SD_INC_RESLTN_HXX
+#define INCLUDED_SD_INC_RESLTN_HXX
enum PublishingResolution
{
@@ -40,6 +40,6 @@ enum PublishingScript
SCRIPT_PERL
};
-#endif // _SD_RESLTN_HXX
+#endif // INCLUDED_SD_INC_RESLTN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 68142c82375f..8d6a6288e923 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_ABSTDLG_HXX
-#define _SD_ABSTDLG_HXX
+#ifndef INCLUDED_SD_INC_SDABSTDLG_HXX
+#define INCLUDED_SD_INC_SDABSTDLG_HXX
#include <vector>
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index a73a4cb1cdd7..dac516b94bf6 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SDATTR_HXX
-#define _SDATTR_HXX
+#ifndef INCLUDED_SD_INC_SDATTR_HXX
+#define INCLUDED_SD_INC_SDATTR_HXX
#include <com/sun/star/presentation/FadeEffect.hpp>
#include <svl/intitem.hxx>
@@ -160,7 +160,7 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
};
-#endif // _SDATTR_HXX
+#endif // INCLUDED_SD_INC_SDATTR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdcgmfilter.hxx b/sd/inc/sdcgmfilter.hxx
index 83fcb0605262..8e2f426152b9 100644
--- a/sd/inc/sdcgmfilter.hxx
+++ b/sd/inc/sdcgmfilter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_SDCGMFILTER_HXX
-#define _SD_SDCGMFILTER_HXX
+#ifndef INCLUDED_SD_INC_SDCGMFILTER_HXX
+#define INCLUDED_SD_INC_SDCGMFILTER_HXX
#include "sdfilter.hxx"
@@ -39,6 +39,6 @@ public:
sal_Bool Export();
};
-#endif // _SD_SDCGMFILTER_HXX
+#endif // INCLUDED_SD_INC_SDCGMFILTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index d30139294edb..2041d8f37e2e 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SD_SDCOMMANDS_HRC
-#define SD_SDCOMMANDS_HRC
+#ifndef INCLUDED_SD_INC_SDCOMMANDS_H
+#define INCLUDED_SD_INC_SDCOMMANDS_H
#define CMD_SID_OBJECT_MIRROR ".uno:Mirror"
#define CMD_SID_ANIMATION_EFFECTS ".uno:AnimationEffects"
diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx
index 5c7a544fcf7b..3a97f6616fda 100644
--- a/sd/inc/sddll.hxx
+++ b/sd/inc/sddll.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SDDLL_HXX
-#define _SDDLL_HXX
+#ifndef INCLUDED_SD_INC_SDDLL_HXX
+#define INCLUDED_SD_INC_SDDLL_HXX
#include <sfx2/module.hxx>
#include <sfx2/sfxdefs.hxx>
@@ -57,6 +57,6 @@ public:
};
-#endif // _SDDLL_HXX
+#endif // INCLUDED_SD_INC_SDDLL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sddllapi.h b/sd/inc/sddllapi.h
index f2d82e42f1b5..09ced7ec2b13 100644
--- a/sd/inc/sddllapi.h
+++ b/sd/inc/sddllapi.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SDDLLAPI_H
-#define INCLUDED_SDDLLAPI_H
+#ifndef INCLUDED_SD_INC_SDDLLAPI_H
+#define INCLUDED_SD_INC_SDDLLAPI_H
#include "sal/types.h"
@@ -28,6 +28,6 @@
#define SD_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-#endif /* INCLUDED_SDDLLAPI_H */
+#endif // INCLUDED_SD_INC_SDDLLAPI_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdenumdef.hxx b/sd/inc/sdenumdef.hxx
index 89e40d00ecb3..f6ed689f2e93 100644
--- a/sd/inc/sdenumdef.hxx
+++ b/sd/inc/sdenumdef.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_ENUMDEF_HXX
-#define _SD_ENUMDEF_HXX
+#ifndef INCLUDED_SD_INC_SDENUMDEF_HXX
+#define INCLUDED_SD_INC_SDENUMDEF_HXX
enum OutputType { OUTPUT_PAGE, OUTPUT_OVERHEAD, OUTPUT_SLIDE, OUTPUT_PRESENTATION, OUTPUT_ORIGINAL, OUTPUT_WIDESCREEN };
enum StartType { ST_EMPTY, ST_TEMPLATE, ST_OPEN };
diff --git a/sd/inc/sderror.hxx b/sd/inc/sderror.hxx
index bad4d9a11f01..d94ffa594c45 100644
--- a/sd/inc/sderror.hxx
+++ b/sd/inc/sderror.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SDSWERROR_H
-#define _SDSWERROR_H
+#ifndef INCLUDED_SD_INC_SDERROR_HXX
+#define INCLUDED_SD_INC_SDERROR_HXX
#include <tools/errcode.hxx>
diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx
index beca2badc741..9927a400e5f4 100644
--- a/sd/inc/sdfilter.hxx
+++ b/sd/inc/sdfilter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_SDFILTER_HXX
-#define _SD_SDFILTER_HXX
+#ifndef INCLUDED_SD_INC_SDFILTER_HXX
+#define INCLUDED_SD_INC_SDFILTER_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -68,6 +68,6 @@ private:
};
-#endif // _SD_SDFILTER_HXX
+#endif // INCLUDED_SD_INC_SDFILTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx
index 6f20cf935ded..e14e0c561344 100644
--- a/sd/inc/sdgrffilter.hxx
+++ b/sd/inc/sdgrffilter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_SDGRFFILTER_HXX
-#define _SD_SDGRFFILTER_HXX
+#ifndef INCLUDED_SD_INC_SDGRFFILTER_HXX
+#define INCLUDED_SD_INC_SDGRFFILTER_HXX
#include <com/sun/star/drawing/XShape.hpp>
@@ -42,6 +42,6 @@ public:
static void HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong nStreamError = ERRCODE_NONE );
};
-#endif // _SD_SDGRFFILTER_HXX
+#endif // INCLUDED_SD_INC_SDGRFFILTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx
index 4690f84b9c95..8f034f614029 100644
--- a/sd/inc/sdhtmlfilter.hxx
+++ b/sd/inc/sdhtmlfilter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_SDHTMLFILTER_HXX
-#define _SD_SDHTMLFILTER_HXX
+#ifndef INCLUDED_SD_INC_SDHTMLFILTER_HXX
+#define INCLUDED_SD_INC_SDHTMLFILTER_HXX
#include "sdfilter.hxx"
@@ -43,6 +43,6 @@ private:
};
-#endif // _SD_SDHTMLFILTER_HXX
+#endif // INCLUDED_SD_INC_SDHTMLFILTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx
index d8cbb6702b4d..23f0839e5103 100644
--- a/sd/inc/sdiocmpt.hxx
+++ b/sd/inc/sdiocmpt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_SDIOCMPT_HXX
-#define _SD_SDIOCMPT_HXX
+#ifndef INCLUDED_SD_INC_SDIOCMPT_HXX
+#define INCLUDED_SD_INC_SDIOCMPT_HXX
#include <tools/stream.hxx>
@@ -63,7 +63,7 @@ public:
sal_uInt16 GetVersion() const { return nVersion; }
};
-#endif // _SD_SDIOCMPT_HXX
+#endif // INCLUDED_SD_INC_SDIOCMPT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index bad6c3d902c9..4b37b4a3c87e 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SDMOD_HXX
-#define _SDMOD_HXX
+#ifndef INCLUDED_SD_INC_SDMOD_HXX
+#define INCLUDED_SD_INC_SDMOD_HXX
#include "glob.hxx"
#include "pres.hxx"
@@ -186,6 +186,6 @@ private:
#define SD_MOD() ( *(SdModule**) GetAppData(SHL_DRAW) )
-#endif // _SDMOD_HXX
+#endif // INCLUDED_SD_INC_SDMOD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdobjfac.hxx b/sd/inc/sdobjfac.hxx
index 14509009bc3a..2191bba92d45 100644
--- a/sd/inc/sdobjfac.hxx
+++ b/sd/inc/sdobjfac.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SDOBJFAC_HXX
-#define _SDOBJFAC_HXX
+#ifndef INCLUDED_SD_INC_SDOBJFAC_HXX
+#define INCLUDED_SD_INC_SDOBJFAC_HXX
#include <tools/link.hxx>
@@ -47,6 +47,6 @@ public:
extern SdObjectFactory aSdObjectFactory;
-#endif // _SDOBJFAC_HXX
+#endif // INCLUDED_SD_INC_SDOBJFAC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 5ec9de36d69d..178656b29272 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SDPAGE_HXX
-#define _SDPAGE_HXX
+#ifndef INCLUDED_SD_INC_SDPAGE_HXX
+#define INCLUDED_SD_INC_SDPAGE_HXX
#include <boost/shared_ptr.hpp>
@@ -390,6 +390,6 @@ private:
void onRemoveObject( SdrObject* pObject );
};
-#endif // _SDPAGE_HXX
+#endif // INCLUDED_SD_INC_SDPAGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdpptwrp.hxx b/sd/inc/sdpptwrp.hxx
index 0cf481ffe6b4..b4f322c82b4b 100644
--- a/sd/inc/sdpptwrp.hxx
+++ b/sd/inc/sdpptwrp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_PPTWRP_HXX
-#define _SD_PPTWRP_HXX
+#ifndef INCLUDED_SD_INC_SDPPTWRP_HXX
+#define INCLUDED_SD_INC_SDPPTWRP_HXX
#include "sdfilter.hxx"
@@ -46,6 +46,6 @@ private:
SvMemoryStream* pBas;
};
-#endif // _SD_PPTWRP_HXX
+#endif // INCLUDED_SD_INC_SDPPTWRP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx
index b13ac0994275..95397b38b06b 100644
--- a/sd/inc/sdresid.hxx
+++ b/sd/inc/sdresid.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SD_RESID_HXX
-#define SD_RESID_HXX
+#ifndef INCLUDED_SD_INC_SDRESID_HXX
+#define INCLUDED_SD_INC_SDRESID_HXX
#include <tools/resid.hxx>
#include "sddllapi.h"
diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx
index 3167c414ed51..50fae9bd4212 100644
--- a/sd/inc/sdundo.hxx
+++ b/sd/inc/sdundo.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_SDUNDO_HXX
-#define _SD_SDUNDO_HXX
+#ifndef INCLUDED_SD_INC_SDUNDO_HXX
+#define INCLUDED_SD_INC_SDUNDO_HXX
#include <svl/undo.hxx>
#include "sddllapi.h"
@@ -42,6 +42,6 @@ protected:
OUString maComment;
};
-#endif // _SD_SDUNDO_HXX
+#endif // INCLUDED_SD_INC_SDUNDO_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx
index bc5055e3de3b..ad7665e236ae 100644
--- a/sd/inc/sdxmlwrp.hxx
+++ b/sd/inc/sdxmlwrp.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SDXMLWRP_HXX
-#define _SDXMLWRP_HXX
+#ifndef INCLUDED_SD_INC_SDXMLWRP_HXX
+#define INCLUDED_SD_INC_SDXMLWRP_HXX
#include <tools/errcode.hxx>
#include "sdfilter.hxx"
@@ -52,6 +52,6 @@ private:
sal_uLong mnStoreVer;
};
-#endif // _SDXMLWRP_HXX
+#endif // INCLUDED_SD_INC_SDXMLWRP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx
index f828ebc61d31..92cc2719e0ae 100644
--- a/sd/inc/shapelist.hxx
+++ b/sd/inc/shapelist.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SHAPELIST_HXX
-#define _SHAPELIST_HXX
+#ifndef INCLUDED_SD_INC_SHAPELIST_HXX
+#define INCLUDED_SD_INC_SHAPELIST_HXX
#include <svx/sdrobjectuser.hxx>
@@ -71,6 +71,6 @@ namespace sd
};
}
-#endif // _SHAPELIST_HXX
+#endif // INCLUDED_SD_INC_SHAPELIST_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx
index 24f27dfaa78a..095d97512987 100644
--- a/sd/inc/stlfamily.hxx
+++ b/sd/inc/stlfamily.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_STLFAMILY_HXX
-#define _SD_STLFAMILY_HXX
+#ifndef INCLUDED_SD_INC_STLFAMILY_HXX
+#define INCLUDED_SD_INC_STLFAMILY_HXX
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/style/XStyle.hpp>
@@ -113,6 +113,6 @@ private:
typedef rtl::Reference< SdStyleFamily > SdStyleFamilyRef;
-#endif // _SD_STLFAMILY_HXX
+#endif // INCLUDED_SD_INC_STLFAMILY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 80fcabcd9a39..3d2cdc9cedf8 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_STLPOOL_HXX
-#define _SD_STLPOOL_HXX
+#ifndef INCLUDED_SD_INC_STLPOOL_HXX
+#define INCLUDED_SD_INC_STLPOOL_HXX
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
@@ -144,6 +144,6 @@ private:
OUString msTableFamilyName;
};
-#endif // _SD_STLPOOL_HXX
+#endif // INCLUDED_SD_INC_STLPOOL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index 8a596e167976..561ce52004f8 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_STLSHEET_HXX
-#define _SD_STLSHEET_HXX
+#ifndef INCLUDED_SD_INC_STLSHEET_HXX
+#define INCLUDED_SD_INC_STLSHEET_HXX
#include <rtl/ref.hxx>
@@ -147,7 +147,7 @@ private:
typedef rtl::Reference< SdStyleSheet > SdStyleSheetRef;
typedef std::vector< SdStyleSheetRef > SdStyleSheetVector;
-#endif // _SD_STLSHEET_HXX
+#endif // INCLUDED_SD_INC_STLSHEET_HXX
diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h
index 6ae356a20135..149f1565a621 100644
--- a/sd/inc/strmname.h
+++ b/sd/inc/strmname.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_STRMNAME_H
-#define _SD_STRMNAME_H
+#ifndef INCLUDED_SD_INC_STRMNAME_H
+#define INCLUDED_SD_INC_STRMNAME_H
// PowerPoint-Filter
static const OUString pFilterPowerPoint97( "MS PowerPoint 97" );
@@ -29,6 +29,6 @@ static const OUString pFilterPowerPoint97AutoPlay( "MS PowerPoint 97 AutoPlay" )
static const OUString pStarDrawXMLContent( "content.xml" );
static const OUString pStarDrawOldXMLContent( "Content.xml" );
-#endif // _SD_STRMNAME_H
+#endif // INCLUDED_SD_INC_STRMNAME_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx
index ceb27cf63a8a..030ca3569f55 100644
--- a/sd/inc/textapi.hxx
+++ b/sd/inc/textapi.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_TEXTAPI_HXX_
-#define _SD_TEXTAPI_HXX_
+#ifndef INCLUDED_SD_INC_TEXTAPI_HXX
+#define INCLUDED_SD_INC_TEXTAPI_HXX
#include <editeng/unoedsrc.hxx>
#include <editeng/unotext.hxx>
@@ -58,6 +58,6 @@ private:
} // namespace sd
-#endif // _SD_TEXTAPI_HXX_
+#endif // INCLUDED_SD_INC_TEXTAPI_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx
index 0991c9fd55f9..b0f68d1f53bb 100644
--- a/sd/inc/undo/undomanager.hxx
+++ b/sd/inc/undo/undomanager.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_UNDOMANAGER_HXX
-#define _SD_UNDOMANAGER_HXX
+#ifndef INCLUDED_SD_INC_UNDO_UNDOMANAGER_HXX
+#define INCLUDED_SD_INC_UNDO_UNDOMANAGER_HXX
#include <misc/scopelock.hxx>
#include <svx/sdrundomanager.hxx>
@@ -60,6 +60,6 @@ private:
}
-#endif // _SD_UNDOMANAGER_HXX
+#endif // INCLUDED_SD_INC_UNDO_UNDOMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx
index f615af64bc9b..99b926e4b77d 100644
--- a/sd/inc/undo/undoobjects.hxx
+++ b/sd/inc/undo/undoobjects.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_UNDOOBJECTS_HXX
-#define _SD_UNDOOBJECTS_HXX
+#ifndef INCLUDED_SD_INC_UNDO_UNDOOBJECTS_HXX
+#define INCLUDED_SD_INC_UNDO_UNDOOBJECTS_HXX
#include <svx/svdundo.hxx>
#include <svx/svdpage.hxx>
@@ -189,6 +189,6 @@ protected:
} // namespace sd
-#endif // _SD_UNDOOBJECTS_HXX
+#endif // INCLUDED_SD_INC_UNDO_UNDOOBJECTS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx
index 04322224a6be..1445d81780fd 100644
--- a/sd/inc/undoanim.hxx
+++ b/sd/inc/undoanim.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SD_UNDO_ANIM_HXX
-#define _SD_UNDO_ANIM_HXX
+#ifndef INCLUDED_SD_INC_UNDOANIM_HXX
+#define INCLUDED_SD_INC_UNDOANIM_HXX
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/animations/XAnimationNode.hpp>
@@ -84,6 +84,6 @@ private:
}
-#endif // _SD_UNDO_ANIM_HXX
+#endif // INCLUDED_SD_INC_UNDOANIM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */