fixincludeguards.sh: cui

Change-Id: I0a9f69b8c2129329f742f18e7749484b6f3e5bf7

29 files changed, 78 insertions, 78 deletions

diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx
index 3753bf652bf3..8116b401cb19 100644
--- a/cui/source/options/certpath.hxx
+++ b/cui/source/options/certpath.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _CUI_CERTPATH_HXX
-#define _CUI_CERTPATH_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_CERTPATH_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_CERTPATH_HXX
 
 #include <sfx2/basedlgs.hxx>
 #include <svtools/simptabl.hxx>
diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index e2a881d0e9dc..c72948f2ac6f 100644
--- a/cui/source/options/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_CFGCHART_HXX
-#define _SVX_CFGCHART_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_CFGCHART_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_CFGCHART_HXX
 
 // header for TYPEINFO
 #include <tools/rtti.hxx>
@@ -109,6 +109,6 @@ private:
     SvxChartColorTable      m_aColorTable;
 };
 
-#endif  // _SVX_CFGCHART_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_CFGCHART_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/connpoolconfig.hxx b/cui/source/options/connpoolconfig.hxx
index 7c70c0f0e688..0c6440177521 100644
--- a/cui/source/options/connpoolconfig.hxx
+++ b/cui/source/options/connpoolconfig.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OFFAPP_CONNPOOLCONFIG_HXX_
-#define _OFFAPP_CONNPOOLCONFIG_HXX_
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLCONFIG_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLCONFIG_HXX
 
 class SfxItemSet;
 //........................................................................
@@ -41,7 +41,7 @@ namespace offapp
 }   // namespace offapp
 //........................................................................
 
-#endif // _OFFAPP_CONNPOOLCONFIG_HXX_
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLCONFIG_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 27e95bcafd75..c162ab0e4364 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OFFAPP_CONNPOOLOPTIONS_HXX_
-#define _OFFAPP_CONNPOOLOPTIONS_HXX_
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLOPTIONS_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLOPTIONS_HXX
 
 #include <svl/solar.hrc>
 #include <sfx2/tabdlg.hxx>
@@ -71,6 +71,6 @@ namespace offapp
 
 } // namespace offapp
 
-#endif // _OFFAPP_CONNPOOLOPTIONS_HXX_
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx
index 59c07615ac70..26a68c867c51 100644
--- a/cui/source/options/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OFFAPP_CONNPOOLSETTINGS_HXX_
-#define _OFFAPP_CONNPOOLSETTINGS_HXX_
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLSETTINGS_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLSETTINGS_HXX
 
 #include <comphelper/stl_types.hxx>
 #include <rtl/ustring.hxx>
@@ -94,7 +94,7 @@ namespace offapp
 }   // namespace offapp
 //........................................................................
 
-#endif // _OFFAPP_CONNPOOLSETTINGS_HXX_
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLSETTINGS_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/dbregisterednamesconfig.hxx b/cui/source/options/dbregisterednamesconfig.hxx
index 4db6e7611fb1..fdb21ce42449 100644
--- a/cui/source/options/dbregisterednamesconfig.hxx
+++ b/cui/source/options/dbregisterednamesconfig.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_DBREGISTEREDNAMESCONFIG_HXX
-#define SVX_DBREGISTEREDNAMESCONFIG_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTEREDNAMESCONFIG_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTEREDNAMESCONFIG_HXX
 
 class SfxItemSet;
 //........................................................................
@@ -41,7 +41,7 @@ namespace svx
 }   // namespace svx
 //........................................................................
 
-#endif // SVX_DBREGISTEREDNAMESCONFIG_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTEREDNAMESCONFIG_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx
index 692d75f5e378..d59136b90ddc 100644
--- a/cui/source/options/dbregistersettings.hxx
+++ b/cui/source/options/dbregistersettings.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_DBREGISTERSETTING_HXX
-#define SVX_DBREGISTERSETTING_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTERSETTINGS_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTERSETTINGS_HXX
 
 #include <comphelper/stl_types.hxx>
 #include <svl/poolitem.hxx>
@@ -83,6 +83,6 @@ namespace svx
 //........................................................................
 }   // namespace svx
 //........................................................................
-#endif // SVX_DBREGISTERSETTING_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTERSETTINGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index bff0d340c33b..0cc731ee958c 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_DOCLINKDIALOG_HXX_
-#define _SVX_DOCLINKDIALOG_HXX_
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_DOCLINKDIALOG_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_DOCLINKDIALOG_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
@@ -79,6 +79,6 @@ namespace svx
 }   // namespace svx
 //......................................................................
 
-#endif // _SVX_DOCLINKDIALOG_HXX_
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_DOCLINKDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index b5c88a214f7d..16301725b623 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.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 _SVX_FONT_SUBSTITUTION_HXX
-#define _SVX_FONT_SUBSTITUTION_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_FONTSUBS_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_FONTSUBS_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include <svtools/ctrlbox.hxx>
@@ -101,6 +101,6 @@ public:
 };
 
 
-#endif // _SVX_FONT_SUBSTITUTION_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_FONTSUBS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx
index eb2751283e1c..d495ba319763 100644
--- a/cui/source/options/optHeaderTabListbox.hxx
+++ b/cui/source/options/optHeaderTabListbox.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 SVX_OPTHEADERTABLISTBOX_HXX
-#define SVX_OPTHEADERTABLISTBOX_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTHEADERTABLISTBOX_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTHEADERTABLISTBOX_HXX
 
 #include <svtools/simptabl.hxx>
 
@@ -33,6 +33,6 @@ namespace svx
         virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind);
     };
 } // svx
-#endif // SVX_OPTHEADERTABLISTBOX_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTHEADERTABLISTBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index 1a60c08cb927..6b27066bcf5c 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_CUI_OPTABOUTCONFIG_HXX
-#define INCLUDED_CUI_OPTABOUTCONFIG_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTABOUTCONFIG_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTABOUTCONFIG_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index 52d6fb6f27d8..c004d23a6b45 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.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 _SVX_OPTACCESSIBILITY_HXX
-#define _SVX_OPTACCESSIBILITY_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTACCESSIBILITY_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTACCESSIBILITY_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include <vcl/fixed.hxx>
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index a3e0d3d395af..3e75c8116dbf 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_OPTBASIC_HXX
-#define _SVX_OPTBASIC_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTBASIC_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTBASIC_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
@@ -47,6 +47,6 @@ public:
 };
 
 
-#endif //_SVX_OPTBASIC_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTBASIC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 487534bd1979..8c38565857c2 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_OPTCHART_HXX
-#define _SVX_OPTCHART_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTCHART_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTCHART_HXX
 
 // header for SfxTabPage
 #include <sfx2/tabdlg.hxx>
@@ -68,6 +68,6 @@ public:
     virtual void        Reset( const SfxItemSet& rInAttrs );
 };
 
-#endif  // _SVX_OPTCHART_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCHART_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index 345983a2ebf0..119909fdd7ab 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.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 SVX_OPTCOLOR_HXX
-#define SVX_OPTCOLOR_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTCOLOR_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTCOLOR_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include <vcl/group.hxx>
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index a6f0e1e1b10b..358698c3ac16 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.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 _SVX_OPTCTL_HXX
-#define _SVX_OPTCTL_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTCTL_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTCTL_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
@@ -52,6 +52,6 @@ public:
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
-#endif // #ifndef _SVX_OPTCTL_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCTL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 7ae67214cbc3..1976d66cfbd3 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.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 _OFA_OPTFLTR_HXX
-#define _OFA_OPTFLTR_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTFLTR_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTFLTR_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/group.hxx>
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 56057e4bcd11..c82e0011dbe8 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.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 _OFA_OPTGDLG_HXX
-#define _OFA_OPTGDLG_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX
 #include <vcl/lstbox.hxx>
 #include <vcl/group.hxx>
 #include <vcl/field.hxx>
@@ -167,7 +167,7 @@ public:
     virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
-#endif // #ifndef _OFA_OPTGDLG_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 3bd46a75b6ee..957afc8f48b2 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.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 _OFA_OPTHTML_HXX
-#define _OFA_OPTHTML_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTHTML_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTHTML_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index fcc935c94d12..1403b9e47a32 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.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 _SVX_OPTINET_HXX
-#define _SVX_OPTINET_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTINET2_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTINET2_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <vcl/field.hxx>
@@ -224,7 +224,7 @@ public:
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
-#endif // #ifndef _SVX_OPTINET_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTINET2_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index bb8debe1ad1f..1b474ca6eab4 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.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 _SVX_OPTJAVA_HXX
-#define _SVX_OPTJAVA_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTJAVA_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTJAVA_HXX
 
 #include <config_features.h>
 
@@ -177,6 +177,6 @@ public:
     void                    SetClassPath( const OUString& _rPath );
 };
 
-#endif // #ifndef _SVX_OPTJAVA_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTJAVA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 7679cfb01c04..739ad78b2dbf 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_OPTJSEARCH_HXX_
-#define _SVX_OPTJSEARCH_HXX_
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTJSEARCH_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTJSEARCH_HXX
 
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index a22c5ac2079b..ba85a7e74e60 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.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 _OFA_OPTMEMORY_HXX
-#define _OFA_OPTMEMORY_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTMEMORY_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTMEMORY_HXX
 
 #include <vcl/lstbox.hxx>
 #include <vcl/group.hxx>
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 69dfbb07ba83..a3d2a1250e0e 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.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 _SVX_OPTSAVE_HXX
-#define _SVX_OPTSAVE_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HXX
 
 #include <vcl/group.hxx>
 #include <vcl/field.hxx>
@@ -80,6 +80,6 @@ public:
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
-#endif  // #ifndef _SVX_OPTSAVE_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index bdfb8f7a8e74..5610fb0fe9a5 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_OPTUPDT_HXX
-#define _SVX_OPTUPDT_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTUPDT_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTUPDT_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include <vcl/fixed.hxx>
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index 4ac31f005964..f3ef5228daa7 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef CUI_PERSONALIZATION_HXX
-#define CUI_PERSONALIZATION_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_PERSONALIZATION_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_PERSONALIZATION_HXX
 
 #include <sfx2/tabdlg.hxx>
 
@@ -48,6 +48,6 @@ private:
     bool CopyPersonaToGallery( const OUString &rURL );
 };
 
-#endif // CUI_PERSONALIZATION_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_PERSONALIZATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx
index b329a858b780..afe40c02907a 100644
--- a/cui/source/options/sdbcdriverenum.hxx
+++ b/cui/source/options/sdbcdriverenum.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OFFMGR_SDBCDRIVERENUMERATION_HXX_
-#define _OFFMGR_SDBCDRIVERENUMERATION_HXX_
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_SDBCDRIVERENUM_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_SDBCDRIVERENUM_HXX
 
 
 #include <sal/types.h>
@@ -58,7 +58,7 @@ namespace offapp
 }   // namespace offapp
 //........................................................................
 
-#endif // _OFFMGR_SDBCDRIVERENUMERATION_HXX_
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_SDBCDRIVERENUM_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx
index 8a0766d5de4a..950fa256a2bc 100644
--- a/cui/source/options/securityoptions.hxx
+++ b/cui/source/options/securityoptions.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 _SVX_SECURITYOPTIONS_HXX
-#define _SVX_SECURITYOPTIONS_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_SECURITYOPTIONS_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_SECURITYOPTIONS_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
@@ -64,6 +64,6 @@ namespace svx
 }   // namespace svx
 //........................................................................
 
-#endif // #ifndef _SVX_SECURITYOPTIONS_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_SECURITYOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index c469dad79796..278da8fe996e 100644
--- a/cui/source/options/webconninfo.hxx
+++ b/cui/source/options/webconninfo.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 _SVX_WEBCONNINFO_HXX
-#define _SVX_WEBCONNINFO_HXX
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_WEBCONNINFO_HXX
+#define INCLUDED_CUI_SOURCE_OPTIONS_WEBCONNINFO_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
@@ -70,6 +70,6 @@ namespace svx
 }   // namespace svx
 //........................................................................
 
-#endif // #ifndef _SVX_WEBCONNINFO_HXX
+#endif // INCLUDED_CUI_SOURCE_OPTIONS_WEBCONNINFO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */