summaryrefslogtreecommitdiff
path: root/include/framework
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-10-23 19:18:54 +0200
committerThomas Arnhold <thomas@arnhold.org>2013-10-23 23:22:31 +0200
commit1130a359cb89028b42f366f46bdf034ad13ae540 (patch)
tree6acbd8d220fee0dab8d6911c1968ee9964534beb /include/framework
parent29c0fdc6457243e7b7262b4db86c82b23a7ee0f1 (diff)
fixincludeguards.sh: include - the rest
Change-Id: If1ee11da444a7f96f2d8668b277540da0bb4dbe9
Diffstat (limited to 'include/framework')
-rw-r--r--include/framework/actiontriggerhelper.hxx6
-rw-r--r--include/framework/addonmenu.hxx6
-rw-r--r--include/framework/addonsoptions.hxx6
-rw-r--r--include/framework/bmkmenu.hxx6
-rw-r--r--include/framework/configimporter.hxx6
-rw-r--r--include/framework/documentundoguard.hxx6
-rw-r--r--include/framework/eventsconfiguration.hxx6
-rw-r--r--include/framework/framelistanalyzer.hxx6
-rw-r--r--include/framework/fwedllapi.h6
-rw-r--r--include/framework/iguard.hxx6
-rw-r--r--include/framework/imageproducer.hxx4
-rw-r--r--include/framework/imutex.hxx6
-rw-r--r--include/framework/interaction.hxx6
-rw-r--r--include/framework/menuconfiguration.hxx6
-rw-r--r--include/framework/menuextensionsupplier.hxx6
-rw-r--r--include/framework/preventduplicateinteraction.hxx6
-rw-r--r--include/framework/sfxhelperfunctions.hxx6
-rw-r--r--include/framework/statusbarconfiguration.hxx6
-rw-r--r--include/framework/titlehelper.hxx6
-rw-r--r--include/framework/toolboxconfiguration.hxx6
-rw-r--r--include/framework/undomanagerhelper.hxx6
21 files changed, 62 insertions, 62 deletions
diff --git a/include/framework/actiontriggerhelper.hxx b/include/framework/actiontriggerhelper.hxx
index e942de94924f..392368e634d6 100644
--- a/include/framework/actiontriggerhelper.hxx
+++ b/include/framework/actiontriggerhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_HELPER_ACTIONTRIGGERHELPER_HXX_
-#define __FRAMEWORK_HELPER_ACTIONTRIGGERHELPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_ACTIONTRIGGERHELPER_HXX
+#define INCLUDED_FRAMEWORK_ACTIONTRIGGERHELPER_HXX
#include <com/sun/star/container/XIndexContainer.hpp>
#include <vcl/menu.hxx>
@@ -62,6 +62,6 @@ namespace framework
};
}
-#endif // __FRAMEWORK_HELPER_ACTIONTRIGGERHELPER_HXX_
+#endif // INCLUDED_FRAMEWORK_ACTIONTRIGGERHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx
index 6390459be0f1..3218cba98e41 100644
--- a/include/framework/addonmenu.hxx
+++ b/include/framework/addonmenu.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 __FRAMEWORK_CLASSES_ADDONMENU_HXX_
-#define __FRAMEWORK_CLASSES_ADDONMENU_HXX_
+#ifndef INCLUDED_FRAMEWORK_ADDONMENU_HXX
+#define INCLUDED_FRAMEWORK_ADDONMENU_HXX
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -122,6 +122,6 @@ class FWE_DLLPUBLIC AddonMenuManager
} // namespace framework
-#endif // #ifndef __FRAMEWORK_CLASSES_ADDONMENU_HXX_
+#endif // INCLUDED_FRAMEWORK_ADDONMENU_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx
index 0a926b865c0b..8119b09a617c 100644
--- a/include/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.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 __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_
-#define __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_
+#ifndef INCLUDED_FRAMEWORK_ADDONSOPTIONS_HXX
+#define INCLUDED_FRAMEWORK_ADDONSOPTIONS_HXX
#include <sal/types.h>
#include <osl/mutex.hxx>
@@ -367,6 +367,6 @@ class FWE_DLLPUBLIC AddonsOptions
}
-#endif // #ifndef __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_
+#endif // INCLUDED_FRAMEWORK_ADDONSOPTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/bmkmenu.hxx b/include/framework/bmkmenu.hxx
index bf7e8d7868a8..76cd6652f510 100644
--- a/include/framework/bmkmenu.hxx
+++ b/include/framework/bmkmenu.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 __FRAMEWORK_CLASSES_BMKMENU_HXX
-#define __FRAMEWORK_CLASSES_BMKMENU_HXX
+#ifndef INCLUDED_FRAMEWORK_BMKMENU_HXX
+#define INCLUDED_FRAMEWORK_BMKMENU_HXX
#include "framework/addonmenu.hxx"
@@ -63,6 +63,6 @@ class FWE_DLLPUBLIC BmkMenu : public AddonMenu
} // namespace framework
-#endif // #ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX
+#endif // INCLUDED_FRAMEWORK_BMKMENU_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/configimporter.hxx b/include/framework/configimporter.hxx
index 06b6467f6c2a..c5552a354592 100644
--- a/include/framework/configimporter.hxx
+++ b/include/framework/configimporter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_HELPER_CONFIGIMPORTER_HXX_
-#define __FRAMEWORK_HELPER_CONFIGIMPORTER_HXX_
+#ifndef INCLUDED_FRAMEWORK_CONFIGIMPORTER_HXX
+#define INCLUDED_FRAMEWORK_CONFIGIMPORTER_HXX
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/embed/XStorage.hpp>
@@ -42,6 +42,6 @@ namespace framework
} // namespace framework
-#endif // __FRAMEWORK_HELPER_CONFIGIMPORTER_HXX_
+#endif // INCLUDED_FRAMEWORK_CONFIGIMPORTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/documentundoguard.hxx b/include/framework/documentundoguard.hxx
index 1954a72b5c67..ea1fe9412afb 100644
--- a/include/framework/documentundoguard.hxx
+++ b/include/framework/documentundoguard.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef FRAMEWORK_DOCUMENTUNDOGUARD_HXX
-#define FRAMEWORK_DOCUMENTUNDOGUARD_HXX
+#ifndef INCLUDED_FRAMEWORK_DOCUMENTUNDOGUARD_HXX
+#define INCLUDED_FRAMEWORK_DOCUMENTUNDOGUARD_HXX
#include "framework/fwedllapi.h"
@@ -58,6 +58,6 @@ namespace framework
} // namespace framework
//......................................................................................................................
-#endif // FRAMEWORK_DOCUMENTUNDOGUARD_HXX
+#endif // INCLUDED_FRAMEWORK_DOCUMENTUNDOGUARD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/eventsconfiguration.hxx b/include/framework/eventsconfiguration.hxx
index 29694b7fb539..7a4dd3d9ac00 100644
--- a/include/framework/eventsconfiguration.hxx
+++ b/include/framework/eventsconfiguration.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
-#define __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
+#ifndef INCLUDED_FRAMEWORK_EVENTSCONFIGURATION_HXX
+#define INCLUDED_FRAMEWORK_EVENTSCONFIGURATION_HXX
#include <framework/fwedllapi.h>
#include <tools/stream.hxx>
@@ -38,6 +38,6 @@ struct FWE_DLLPUBLIC EventsConfig
} // namespace framework
-#endif // __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
+#endif // INCLUDED_FRAMEWORK_EVENTSCONFIGURATION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/framelistanalyzer.hxx b/include/framework/framelistanalyzer.hxx
index ab153311ccba..e039304c4181 100644
--- a/include/framework/framelistanalyzer.hxx
+++ b/include/framework/framelistanalyzer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_
-#define __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_
+#ifndef INCLUDED_FRAMEWORK_FRAMELISTANALYZER_HXX
+#define INCLUDED_FRAMEWORK_FRAMELISTANALYZER_HXX
#include <com/sun/star/frame/XFrame.hpp>
@@ -190,6 +190,6 @@ class FWE_DLLPUBLIC FrameListAnalyzer
} // namespace framework
-#endif // #ifndef __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_
+#endif // INCLUDED_FRAMEWORK_FRAMELISTANALYZER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/fwedllapi.h b/include/framework/fwedllapi.h
index 14201508768a..06b1cc1a46ac 100644
--- a/include/framework/fwedllapi.h
+++ b/include/framework/fwedllapi.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_FWEDLLAPI_H
-#define INCLUDED_FWEDLLAPI_H
+#ifndef INCLUDED_FRAMEWORK_FWEDLLAPI_H
+#define INCLUDED_FRAMEWORK_FWEDLLAPI_H
#include "sal/types.h"
@@ -29,6 +29,6 @@
#endif
#define FWE_DLLPRIVATE SAL_DLLPRIVATE
-#endif /* INCLUDED_FWEDLLAPI_H */
+#endif // INCLUDED_FRAMEWORK_FWEDLLAPI_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/iguard.hxx b/include/framework/iguard.hxx
index a522d6225e43..f57fd3c8c9f3 100644
--- a/include/framework/iguard.hxx
+++ b/include/framework/iguard.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_THREADHELP_IGUARD_H_
-#define __FRAMEWORK_THREADHELP_IGUARD_H_
+#ifndef INCLUDED_FRAMEWORK_IGUARD_HXX
+#define INCLUDED_FRAMEWORK_IGUARD_HXX
#include <sal/types.h>
@@ -49,6 +49,6 @@ class SAL_NO_VTABLE IGuard
} // namespace framework
-#endif // #ifndef __FRAMEWORK_THREADHELP_IGUARD_H_
+#endif // INCLUDED_FRAMEWORK_IGUARD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/imageproducer.hxx b/include/framework/imageproducer.hxx
index 0d9398f7b2a3..876c635462e3 100644
--- a/include/framework/imageproducer.hxx
+++ b/include/framework/imageproducer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_
-#define __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_
+#ifndef INCLUDED_FRAMEWORK_IMAGEPRODUCER_HXX
+#define INCLUDED_FRAMEWORK_IMAGEPRODUCER_HXX
#include <sal/types.h>
#include <com/sun/star/frame/XFrame.hpp>
diff --git a/include/framework/imutex.hxx b/include/framework/imutex.hxx
index f576297e0d14..39e9f50ebe39 100644
--- a/include/framework/imutex.hxx
+++ b/include/framework/imutex.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_THREADHELP_IMUTEX_H_
-#define __FRAMEWORK_THREADHELP_IMUTEX_H_
+#ifndef INCLUDED_FRAMEWORK_IMUTEX_HXX
+#define INCLUDED_FRAMEWORK_IMUTEX_HXX
#include <sal/types.h>
@@ -48,6 +48,6 @@ class SAL_NO_VTABLE IMutex
} // namespace framework
-#endif // #ifndef __FRAMEWORK_THREADHELP_IMUTEX_H_
+#endif // INCLUDED_FRAMEWORK_IMUTEX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/interaction.hxx b/include/framework/interaction.hxx
index 1cd56bbd36d9..0b316fb6505d 100644
--- a/include/framework/interaction.hxx
+++ b/include/framework/interaction.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_DISPATCH_INTERACTION_HXX_
-#define __FRAMEWORK_DISPATCH_INTERACTION_HXX_
+#ifndef INCLUDED_FRAMEWORK_INTERACTION_HXX
+#define INCLUDED_FRAMEWORK_INTERACTION_HXX
#include <com/sun/star/task/XInteractionRequest.hpp>
#include <com/sun/star/task/XInteractionContinuation.hpp>
@@ -98,6 +98,6 @@ public:
} // namespace framework
-#endif // #define __FRAMEWORK_DISPATCH_INTERACTION_HXX_
+#endif // #define INCLUDED_FRAMEWORK_INTERACTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx
index 1ccd6ba0d167..ad820f4e46cb 100644
--- a/include/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_XML_MENUCONFIGURATION_HXX_
-#define __FRAMEWORK_XML_MENUCONFIGURATION_HXX_
+#ifndef INCLUDED_FRAMEWORK_MENUCONFIGURATION_HXX
+#define INCLUDED_FRAMEWORK_MENUCONFIGURATION_HXX
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/WrappedTargetException.hpp>
@@ -102,6 +102,6 @@ class FWE_DLLPUBLIC MenuConfiguration
}
-#endif // __FRAMEWORK_XML_MENUCONFIGURATION_HXX_
+#endif // INCLUDED_FRAMEWORK_MENUCONFIGURATION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/menuextensionsupplier.hxx b/include/framework/menuextensionsupplier.hxx
index 6d3a6761e38e..303de1353ea6 100644
--- a/include/framework/menuextensionsupplier.hxx
+++ b/include/framework/menuextensionsupplier.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_
-#define __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_
+#ifndef INCLUDED_FRAMEWORK_MENUEXTENSIONSUPPLIER_HXX
+#define INCLUDED_FRAMEWORK_MENUEXTENSIONSUPPLIER_HXX
#include <rtl/ustring.hxx>
#include <framework/fwedllapi.h>
@@ -38,6 +38,6 @@ FWE_DLLPUBLIC MenuExtensionItem SAL_CALL GetMenuExtension();
}
-#endif // __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_
+#endif // INCLUDED_FRAMEWORK_MENUEXTENSIONSUPPLIER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx
index 5be9d52f62cf..e466cf20996c 100644
--- a/include/framework/preventduplicateinteraction.hxx
+++ b/include/framework/preventduplicateinteraction.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_
-#define __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_
+#ifndef INCLUDED_FRAMEWORK_PREVENTDUPLICATEINTERACTION_HXX
+#define INCLUDED_FRAMEWORK_PREVENTDUPLICATEINTERACTION_HXX
#include <framework/fwedllapi.h>
@@ -231,6 +231,6 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
} // namespace framework
-#endif // #ifndef __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_
+#endif // INCLUDED_FRAMEWORK_PREVENTDUPLICATEINTERACTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/sfxhelperfunctions.hxx b/include/framework/sfxhelperfunctions.hxx
index ce2b604f5e5e..bad672f1b009 100644
--- a/include/framework/sfxhelperfunctions.hxx
+++ b/include/framework/sfxhelperfunctions.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_
-#define __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_
+#ifndef INCLUDED_FRAMEWORK_SFXHELPERFUNCTIONS_HXX
+#define INCLUDED_FRAMEWORK_SFXHELPERFUNCTIONS_HXX
#include <framework/fwedllapi.h>
#include <com/sun/star/frame/XFrame.hpp>
@@ -92,6 +92,6 @@ FWE_DLLPUBLIC void SAL_CALL ActivateToolPanel(
const OUString& i_rPanelURL );
}
-#endif // __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_
+#endif // INCLUDED_FRAMEWORK_SFXHELPERFUNCTIONS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/statusbarconfiguration.hxx b/include/framework/statusbarconfiguration.hxx
index e71a89fe0ca4..c63e0c33872e 100644
--- a/include/framework/statusbarconfiguration.hxx
+++ b/include/framework/statusbarconfiguration.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 __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
-#define __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
+#ifndef INCLUDED_FRAMEWORK_STATUSBARCONFIGURATION_HXX
+#define INCLUDED_FRAMEWORK_STATUSBARCONFIGURATION_HXX
#include <framework/fwedllapi.h>
#include <tools/stream.hxx>
@@ -48,6 +48,6 @@ class FWE_DLLPUBLIC StatusBarConfiguration
} // namespace framework
-#endif // __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
+#endif // INCLUDED_FRAMEWORK_STATUSBARCONFIGURATION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx
index c4cdc31a6329..1ddf064eb4bf 100644
--- a/include/framework/titlehelper.hxx
+++ b/include/framework/titlehelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _FRAMEWORK_TITLEHELPER_HXX_
-#define _FRAMEWORK_TITLEHELPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_TITLEHELPER_HXX
+#define INCLUDED_FRAMEWORK_TITLEHELPER_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/XInterface.hpp>
@@ -201,6 +201,6 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
} // namespace framework
-#endif // _FRAMEWORK_TITLEHELPER_HXX_
+#endif // INCLUDED_FRAMEWORK_TITLEHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/toolboxconfiguration.hxx b/include/framework/toolboxconfiguration.hxx
index a296231a07ea..5bac1c323936 100644
--- a/include/framework/toolboxconfiguration.hxx
+++ b/include/framework/toolboxconfiguration.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 __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
-#define __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
+#ifndef INCLUDED_FRAMEWORK_TOOLBOXCONFIGURATION_HXX
+#define INCLUDED_FRAMEWORK_TOOLBOXCONFIGURATION_HXX
#include <framework/fwedllapi.h>
#include <vcl/bitmap.hxx>
@@ -47,6 +47,6 @@ class FWE_DLLPUBLIC ToolBoxConfiguration
} // namespace framework
-#endif // __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
+#endif // INCLUDED_FRAMEWORK_TOOLBOXCONFIGURATION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/undomanagerhelper.hxx b/include/framework/undomanagerhelper.hxx
index ae91db981553..296092e203ea 100644
--- a/include/framework/undomanagerhelper.hxx
+++ b/include/framework/undomanagerhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef FRAMEWORK_UNDOMANAGERHELPER_HXX
-#define FRAMEWORK_UNDOMANAGERHELPER_HXX
+#ifndef INCLUDED_FRAMEWORK_UNDOMANAGERHELPER_HXX
+#define INCLUDED_FRAMEWORK_UNDOMANAGERHELPER_HXX
#include "framework/fwedllapi.h"
#include "framework/iguard.hxx"
@@ -154,6 +154,6 @@ namespace framework
} // namespace framework
//......................................................................................................................
-#endif // FRAMEWORK_UNDOMANAGERHELPER_HXX
+#endif // INCLUDED_FRAMEWORK_UNDOMANAGERHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */