fixincludeguards.sh: forms

Change-Id: I634371fcd867f20e20384f75d613dab5f69a246c

35 files changed, 105 insertions, 105 deletions

diff --git a/forms/source/component/BaseListBox.hxx b/forms/source/component/BaseListBox.hxx
index 528c9e316ecd..672594a70683 100644
--- a/forms/source/component/BaseListBox.hxx
+++ b/forms/source/component/BaseListBox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_BASELISTBOX_HXX_
-#define _FORMS_BASELISTBOX_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_BASELISTBOX_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_BASELISTBOX_HXX
 
 //.........................................................................
 namespace frm
@@ -31,6 +31,6 @@ const sal_uInt16 BOUNDCOLUMN     =  0x0001;
 }
 //.........................................................................
 
-#endif // _FORMS_BASELISTBOX_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_BASELISTBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx
index cc8090d105ae..7845413ec913 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_BUTTON_HXX_
-#define _FRM_BUTTON_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_BUTTON_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_BUTTON_HXX
 
 #include "clickableimage.hxx"
 #include "togglestate.hxx"
@@ -198,6 +198,6 @@ private:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FRM_BUTTON_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_BUTTON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx
index 8cc95234d11a..ba729be6bd65 100644
--- a/forms/source/component/CheckBox.hxx
+++ b/forms/source/component/CheckBox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_CHECKBOX_HXX_
-#define _FORMS_CHECKBOX_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_CHECKBOX_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_CHECKBOX_HXX
 
 #include "refvaluecomponent.hxx"
 
@@ -80,6 +80,6 @@ public:
 }
 //.........................................................................
 
-#endif // _FORMS_CHECKBOX_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_CHECKBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx
index 8313daddc6ef..a4892cca50c9 100644
--- a/forms/source/component/Columns.hxx
+++ b/forms/source/component/Columns.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_COLUMNS_HXX
-#define _FRM_COLUMNS_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_COLUMNS_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_COLUMNS_HXX
 
 #include "cloneable.hxx"
 #include "frm_strings.hxx"
@@ -201,7 +201,7 @@ DECL_COLUMN(ComboBoxColumn)
 DECL_COLUMN(ListBoxColumn)
 DECL_COLUMN(FormattedFieldColumn)
 
-#endif // _FRM_COLUMNS_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_COLUMNS_HXX
 
 //.........................................................................
 }   // namespace frm
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index bd6abc7386d2..1fefa8453686 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_COMBOBOX_HXX_
-#define _FORMS_COMBOBOX_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_COMBOBOX_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_COMBOBOX_HXX
 
 #include "FormComponent.hxx"
 #include "errorbroadcaster.hxx"
@@ -162,6 +162,6 @@ public:
 }
 //.........................................................................
 
-#endif // _FORMS_COMBOBOX_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_COMBOBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx
index c2eb14694cb4..606ae9100008 100644
--- a/forms/source/component/Currency.hxx
+++ b/forms/source/component/Currency.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_CURRENCY_HXX_
-#define _FORMS_CURRENCY_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_CURRENCY_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_CURRENCY_HXX
 
 #include "EditBase.hxx"
 
@@ -89,6 +89,6 @@ public:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FORMS_CURRENCY_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_CURRENCY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 17ca79534f76..cbd685c3e416 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_DATABASEFORM_HXX_
-#define _FRM_DATABASEFORM_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_DATABASEFORM_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_DATABASEFORM_HXX
 
 #include "propertybaghelper.hxx"
 #include <com/sun/star/sdbc/XDataSource.hpp>
@@ -554,7 +554,7 @@ inline void ODatabaseForm::submitNBC(const ::com::sun::star::uno::Reference< ::c
 }   // namespace frm
 //.........................................................................
 
-#endif // _FRM_DATABASEFORM_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_DATABASEFORM_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx
index a1cc55eac4f5..6d15c4ee4337 100644
--- a/forms/source/component/Date.hxx
+++ b/forms/source/component/Date.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_DATE_HXX_
-#define _FORMS_DATE_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_DATE_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_DATE_HXX
 
 #include "EditBase.hxx"
 #include "limitedformats.hxx"
@@ -121,6 +121,6 @@ public:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FORMS_DATE_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_DATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index acefa318ee17..4e280eda5cc0 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_EDIT_HXX_
-#define _FORMS_EDIT_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_EDIT_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_EDIT_HXX
 
 #include "EditBase.hxx"
 
@@ -176,6 +176,6 @@ private:
 }
 //.........................................................................
 
-#endif // _FORMS_EDIT_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_EDIT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx
index 3d22332657b5..fd5240c6d929 100644
--- a/forms/source/component/EditBase.hxx
+++ b/forms/source/component/EditBase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_EDITBASE_HXX_
-#define _FORMS_EDITBASE_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_EDITBASE_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_EDITBASE_HXX
 
 #include "FormComponent.hxx"
 #include <com/sun/star/util/XNumberFormatter.hpp>
@@ -99,6 +99,6 @@ protected:
 }
 //.........................................................................
 
-#endif // _FORMS_EDITBASE_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_EDITBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index ee0e71ecbda4..0d34521a8a6b 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_EVENT_THREAD_HXX_
-#define _FRM_EVENT_THREAD_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_EVENTTHREAD_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_EVENTTHREAD_HXX
 
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
@@ -112,6 +112,6 @@ private:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FRM_EVENT_THREAD_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_EVENTTHREAD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx
index 992e90776848..494b8fa430ab 100644
--- a/forms/source/component/File.hxx
+++ b/forms/source/component/File.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_FILE_HXX_
-#define _FORMS_FILE_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FILE_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_FILE_HXX
 
 #include "FormComponent.hxx"
 
@@ -91,6 +91,6 @@ protected:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FORMS_FILE_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_FILE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx
index e6ca4d6033cb..802b4ae9f414 100644
--- a/forms/source/component/Filter.hxx
+++ b/forms/source/component/Filter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_COMPONENT_FILTER_HXX
-#define FORMS_COMPONENT_FILTER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FILTER_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_FILTER_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -146,6 +146,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // FORMS_COMPONENT_FILTER_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_FILTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx
index bfea6178ea07..a31c88de7711 100644
--- a/forms/source/component/FixedText.hxx
+++ b/forms/source/component/FixedText.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_FIXEDTEXT_HXX_
-#define _FORMS_FIXEDTEXT_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FIXEDTEXT_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_FIXEDTEXT_HXX
 
 #include "FormComponent.hxx"
 
@@ -59,6 +59,6 @@ protected:
 }
 //.........................................................................
 
-#endif // _FORMS_FIXEDTEXT_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_FIXEDTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index 4507225c70c1..1ea82f6989bb 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_FORMATTEDFIELD_HXX_
-#define _FORMS_FORMATTEDFIELD_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELD_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELD_HXX
 
 #include "EditBase.hxx"
 #include <tools/link.hxx>
@@ -187,6 +187,6 @@ namespace frm
 }
 //.........................................................................
 
-#endif // _FORMS_FORMATTEDFIELD_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx
index 0c28f38fe9ca..7158b966c37c 100644
--- a/forms/source/component/FormattedFieldWrapper.hxx
+++ b/forms/source/component/FormattedFieldWrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_FORMATTED_FIELD_WRAPPER_HXX_
-#define _FRM_FORMATTED_FIELD_WRAPPER_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELDWRAPPER_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELDWRAPPER_HXX
 
 #include "FormComponent.hxx"
 #include <cppuhelper/implbase3.hxx>
@@ -90,6 +90,6 @@ protected:
 }
 //.........................................................................
 
-#endif // _FRM_FORMATTED_FIELD_WRAPPER_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELDWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx
index 4509a28de662..d5f9f88f431e 100644
--- a/forms/source/component/GroupBox.hxx
+++ b/forms/source/component/GroupBox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_GROUPBOX_HXX_
-#define _FORMS_GROUPBOX_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_GROUPBOX_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_GROUPBOX_HXX
 
 #include "FormComponent.hxx"
 
@@ -72,6 +72,6 @@ public:
 }
 //.........................................................................
 
-#endif // _FORMS_GROUPBOX_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_GROUPBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index c9fa1ae639ba..7747c41f6221 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_GROUPMANAGER_HXX_
-#define _FRM_GROUPMANAGER_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_GROUPMANAGER_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_GROUPMANAGER_HXX
 
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/awt/XControlModel.hpp>
@@ -220,6 +220,6 @@ public:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FRM_GROUPMANAGER_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_GROUPMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx
index 08d77d613c04..5452ece3565c 100644
--- a/forms/source/component/Hidden.hxx
+++ b/forms/source/component/Hidden.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_HIDDEN_HXX_
-#define _FORMS_HIDDEN_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_HIDDEN_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_HIDDEN_HXX
 
 #include "FormComponent.hxx"
 
@@ -68,7 +68,7 @@ protected:
     DECLARE_XCLONEABLE( );
 };
 
-#endif // _FORMS_HIDDEN_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_HIDDEN_HXX
 
 //.........................................................................
 }
diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx
index 40ebaac17e11..32467b4dba13 100644
--- a/forms/source/component/ImageButton.hxx
+++ b/forms/source/component/ImageButton.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_IMAGE_BUTTON_HXX_
-#define _FRM_IMAGE_BUTTON_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_IMAGEBUTTON_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_IMAGEBUTTON_HXX
 
 #include "clickableimage.hxx"
 #include <com/sun/star/awt/XMouseListener.hpp>
@@ -95,6 +95,6 @@ public:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FRM_IMAGE_BUTTON_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_IMAGEBUTTON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index 4bca62985745..6836a737705f 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRM_IMAGE_CONTROL_HXX_
-#define _FRM_IMAGE_CONTROL_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_IMAGECONTROL_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_IMAGECONTROL_HXX
 
 #include "FormComponent.hxx"
 #include "imgprod.hxx"
@@ -198,6 +198,6 @@ private:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FRM_IMAGE_CONTROL_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_IMAGECONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 244821841d1a..4cd42229a88f 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_LISTBOX_HXX_
-#define _FORMS_LISTBOX_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_LISTBOX_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_LISTBOX_HXX
 
 #include "FormComponent.hxx"
 #include "cachedrowset.hxx"
@@ -335,6 +335,6 @@ private:
 }
 //.........................................................................
 
-#endif // _FORMS_LISTBOX_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_LISTBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx
index bdb0a399c18a..fa7284a8008b 100644
--- a/forms/source/component/Numeric.hxx
+++ b/forms/source/component/Numeric.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_NUMERIC_HXX_
-#define _FORMS_NUMERIC_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_NUMERIC_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_NUMERIC_HXX
 
 #include "EditBase.hxx"
 
@@ -87,6 +87,6 @@ public:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FORMS_NUMERIC_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_NUMERIC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx
index 43975ea2415a..8de1e00a8b89 100644
--- a/forms/source/component/Pattern.hxx
+++ b/forms/source/component/Pattern.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_PATTERN_HXX_
-#define _FORMS_PATTERN_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_PATTERN_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_PATTERN_HXX
 
 #include "EditBase.hxx"
 
@@ -96,6 +96,6 @@ public:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FORMS_PATTERN_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_PATTERN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx
index f1d39d133ec5..1279173af694 100644
--- a/forms/source/component/RadioButton.hxx
+++ b/forms/source/component/RadioButton.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_RADIOBUTTON_HXX_
-#define _FORMS_RADIOBUTTON_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_RADIOBUTTON_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_RADIOBUTTON_HXX
 
 #include "refvaluecomponent.hxx"
 
@@ -101,6 +101,6 @@ protected:
 }
 //.........................................................................
 
-#endif // _FORMS_RADIOBUTTON_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_RADIOBUTTON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx
index 74cf5ac35724..07d3deed35a9 100644
--- a/forms/source/component/Time.hxx
+++ b/forms/source/component/Time.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FORMS_TIME_HXX_
-#define _FORMS_TIME_HXX_
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_TIME_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_TIME_HXX
 
 #include "EditBase.hxx"
 #include "limitedformats.hxx"
@@ -121,6 +121,6 @@ public:
 }   // namespace frm
 //.........................................................................
 
-#endif // _FORMS_TIME_HXX_
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_TIME_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/cachedrowset.hxx b/forms/source/component/cachedrowset.hxx
index e6dcc42fabbb..a765c5871b6d 100644
--- a/forms/source/component/cachedrowset.hxx
+++ b/forms/source/component/cachedrowset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CACHEDROWSET_HXX
-#define CACHEDROWSET_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_CACHEDROWSET_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_CACHEDROWSET_HXX
 
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
@@ -83,6 +83,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // CACHEDROWSET_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_CACHEDROWSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index ec6593e5be71..1b88d5d0cf1f 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_CLICKABLEIMAGE_HXX
-#define FORMS_SOURCE_CLICKABLEIMAGE_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_CLICKABLEIMAGE_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_CLICKABLEIMAGE_HXX
 
 #include "FormComponent.hxx"
 #include "EventThread.hxx"
@@ -281,6 +281,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // FORMS_SOURCE_CLICKABLEIMAGE_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_CLICKABLEIMAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx
index 72a159f0330a..183e4816f8d7 100644
--- a/forms/source/component/entrylisthelper.hxx
+++ b/forms/source/component/entrylisthelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_ENTRYLISTHELPER_HXX
-#define FORMS_ENTRYLISTHELPER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_ENTRYLISTHELPER_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_ENTRYLISTHELPER_HXX
 
 #include <com/sun/star/form/binding/XListEntrySink.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
@@ -185,6 +185,6 @@ namespace frm
 //.........................................................................
 
 
-#endif // FORMS_ENTRYLISTHELPER_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_ENTRYLISTHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/errorbroadcaster.hxx b/forms/source/component/errorbroadcaster.hxx
index 398d86be3593..85fb9d514d3a 100644
--- a/forms/source/component/errorbroadcaster.hxx
+++ b/forms/source/component/errorbroadcaster.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_ERRORBROADCASTER_HXX
-#define FORMS_ERRORBROADCASTER_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_ERRORBROADCASTER_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_ERRORBROADCASTER_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp>
@@ -62,6 +62,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // FORMS_ERRORBROADCASTER_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_ERRORBROADCASTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx
index 3bcbc3222632..4c2f163537e3 100644
--- a/forms/source/component/imgprod.hxx
+++ b/forms/source/component/imgprod.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PRODUCE_HXX
-#define _PRODUCE_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_IMGPROD_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_IMGPROD_HXX
 
 #include <boost/ptr_container/ptr_vector.hpp>
 
@@ -96,6 +96,6 @@ public:
 
 };
 
-#endif // _PRODUCE_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_IMGPROD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx
index 7a7278f89b18..a8da8d876fea 100644
--- a/forms/source/component/navigationbar.hxx
+++ b/forms/source/component/navigationbar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_COMPONENT_NAVIGATION_BAR_HXX
-#define FORMS_COMPONENT_NAVIGATION_BAR_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_NAVIGATIONBAR_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_NAVIGATIONBAR_HXX
 
 #include "FormComponent.hxx"
 #include <com/sun/star/io/XPersistObject.hpp>
@@ -126,6 +126,6 @@ namespace frm
 }   // namespace frm
 //.........................................................................
 
-#endif // FORMS_COMPONENT_NAVIGATION_BAR_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_NAVIGATIONBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx
index 7b256464b4f7..5b038a73e70a 100644
--- a/forms/source/component/refvaluecomponent.hxx
+++ b/forms/source/component/refvaluecomponent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMS_SOURCE_COMPONENT_REFVALUECOMPONENT_HXX
-#define FORMS_SOURCE_COMPONENT_REFVALUECOMPONENT_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_REFVALUECOMPONENT_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_REFVALUECOMPONENT_HXX
 
 #include "FormComponent.hxx"
 #include "togglestate.hxx"
@@ -94,6 +94,6 @@ namespace frm
 } // namespace frm
 //........................................................................
 
-#endif // FORMS_SOURCE_COMPONENT_REFVALUECOMPONENT_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_REFVALUECOMPONENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx
index b11706f93b22..ac14d0ab171f 100644
--- a/forms/source/component/scrollbar.hxx
+++ b/forms/source/component/scrollbar.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 FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
-#define FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
 
 #include "FormComponent.hxx"
 #include "frm_module.hxx"
@@ -90,6 +90,6 @@ namespace frm
 } // namespacefrm
 //........................................................................
 
-#endif // FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx
index 3b8ec0d35aed..dfbff0528623 100644
--- a/forms/source/component/spinbutton.hxx
+++ b/forms/source/component/spinbutton.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 FORMS_SOURCE_COMPONENT_SPINBUTTON_HXX
-#define FORMS_SOURCE_COMPONENT_SPINBUTTON_HXX
+#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_SPINBUTTON_HXX
+#define INCLUDED_FORMS_SOURCE_COMPONENT_SPINBUTTON_HXX
 
 #include "FormComponent.hxx"
 #include "frm_module.hxx"
@@ -90,6 +90,6 @@ namespace frm
 } // namespacefrm
 //........................................................................
 
-#endif // FORMS_SOURCE_COMPONENT_SPINBUTTON_HXX
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_SPINBUTTON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */