odk/examples: pretty up

Change-Id: Id157616660253913ef0ef94c17a680bddacb0660

14 files changed, 44 insertions, 39 deletions

diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx
index 9568aeae24db..442b2574acb7 100644
--- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx
+++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef _Addon_HXX
-#define _Addon_HXX
+#ifndef INCLUDED_COMPONENTS_ADDONS_PROTOCOLHANDLERADDON_CPP_ADDON_HXX
+#define INCLUDED_COMPONENTS_ADDONS_PROTOCOLHANDLERADDON_CPP_ADDON_HXX
 
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -127,6 +127,6 @@ sal_Bool SAL_CALL Addon_supportsService( const ::rtl::OUString& ServiceName )
 SAL_CALL Addon_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rContext)
     throw ( ::com::sun::star::uno::Exception );
 
-#endif // _Addon_HXX
+#endif // INCLUDED_COMPONENTS_ADDONS_PROTOCOLHANDLERADDON_CPP_ADDON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx
index c979408d9504..9a2d28615644 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef _CONNECTIVITY_OSUBCOMPONENT_HXX_
-#define _CONNECTIVITY_OSUBCOMPONENT_HXX_
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_OSUBCOMPONENT_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_OSUBCOMPONENT_HXX
 
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <cppuhelper/interfacecontainer.h>
@@ -237,6 +237,7 @@ namespace connectivity
 
     }
 }
-#endif // _CONNECTIVITY_OSUBCOMPONENT_HXX_
+
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_OSUBCOMPONENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx
index c4d67d5066c6..58ee806a12b8 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef _CONNECTIVITY_OTYPEINFO_HXX_
-#define _CONNECTIVITY_OTYPEINFO_HXX_
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_OTYPEINFO_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_OTYPEINFO_HXX
 
 #include <com/sun/star/sdbc/ColumnSearch.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
@@ -94,7 +94,7 @@ namespace connectivity
         inline ::rtl::OUString getDBName() const { return aTypeName; }
     };
 }
-#endif // _CONNECTIVITY_OTYPEINFO_HXX_
 
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_OTYPEINFO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
index 9aa70405ee60..e94a2283add4 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef CONNECTIVITY_SCONNECTION_HXX
-#define CONNECTIVITY_SCONNECTION_HXX
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SCONNECTION_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_SCONNECTION_HXX
 
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -152,6 +152,7 @@ namespace connectivity
         };
     }
 }
-#endif // CONNECTIVITY_SCONNECTION_HXX
+
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_SCONNECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx
index f7d294871700..5f88f9b67cb3 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef CONNECTIVITY_SDATABASEMETADATA_HXX
-#define CONNECTIVITY_SDATABASEMETADATA_HXX
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SDATABASEMETADATA_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_SDATABASEMETADATA_HXX
 
 #include "SConnection.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -216,6 +216,6 @@ namespace connectivity
     }
 }
 
-#endif // CONNECTIVITY_SDATABASEMETADATA_HXX
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_SDATABASEMETADATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
index 36d50a486b6d..43fbf68e7500 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef CONNECTIVITY_SDRIVER_HXX
-#define CONNECTIVITY_SDRIVER_HXX
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SDRIVER_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_SDRIVER_HXX
 
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -83,6 +83,6 @@ namespace connectivity
 
 }
 
-#endif // CONNECTIVITY_SDRIVER_HXX
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_SDRIVER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
index 0914e5c5f76d..6670d561f91c 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
@@ -33,8 +33,9 @@
  *
  *************************************************************************/
 
-#ifndef CONNECTIVITY_SPREPAREDSTATEMENT_HXX
-#define CONNECTIVITY_SPREPAREDSTATEMENT_HXX
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SPREPAREDSTATEMENT_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_SPREPAREDSTATEMENT_HXX
+
 #include "SStatement.hxx"
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
 #include <com/sun/star/sdbc/XParameters.hpp>
@@ -144,6 +145,7 @@ namespace connectivity
         };
     }
 }
-#endif // CONNECTIVITY_SPREPAREDSTATEMENT_HXX
+
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_SPREPAREDSTATEMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx
index 9a102418bd99..9440dbb5f4c2 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx
@@ -216,6 +216,7 @@ namespace connectivity
         };
     }
 }
+
 #endif // CONNECTIVITY_SRESULTSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
index 1c78c6e032cb..3f8886fef4a8 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef CONNECTIVITY_SRESULSETMETADATA_HXX
-#define CONNECTIVITY_SRESULSETMETADATA_HXX
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SRESULTSETMETADATA_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_SRESULTSETMETADATA_HXX
 
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <cppuhelper/implbase1.hxx>
@@ -88,6 +88,6 @@ namespace connectivity
     }
 }
 
-#endif // CONNECTIVITY_SRESULSETMETADATA_HXX
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_SRESULTSETMETADATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx
index 1e3d06c82358..9122597bc29e 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef CONNECTIVITY_SSTATEMENT_HXX
-#define CONNECTIVITY_SSTATEMENT_HXX
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SSTATEMENT_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_SSTATEMENT_HXX
 
 #include <com/sun/star/sdbc/XStatement.hpp>
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
@@ -173,6 +173,7 @@ namespace connectivity
         };
     }
 }
-#endif // CONNECTIVITY_SSTATEMENT_HXX
+
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_SSTATEMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx
index 7c6615c418e2..880f59520e7d 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#define _CONNECTIVITY_PROPERTYIDS_HXX_
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_PROPERTYIDS_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_PROPERTYIDS_HXX
 
 // this define has to be set to split the names into different dll's or so's
 // every dll has his own set of property names
@@ -141,7 +141,6 @@ namespace skeleton
 
 #define PROPERTY_ID_PRIVILEGES                      50
 
-#endif // _CONNECTIVITY_PROPERTYIDS_HXX_
-
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_PROPERTYIDS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx
index f3b0382c781f..20a95063275b 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx
@@ -33,8 +33,8 @@
  *
  *************************************************************************/
 
-#ifndef _FILTERDETECT_HXX
-#define _FILTERDETECT_HXX
+#ifndef INCLUDED_OFFICEDEV_FILTERDEVELOPMENT_FLATXMLFILTERDETECTION_FILTERDETECT_HXX
+#define INCLUDED_OFFICEDEV_FILTERDEVELOPMENT_FLATXMLFILTERDETECTION_FILTERDETECT_HXX
 
 
 #include <com/sun/star/document/XFilter.hpp>
diff --git a/odk/examples/cpp/custompanel/ctp_factory.hxx b/odk/examples/cpp/custompanel/ctp_factory.hxx
index f38b933c4a62..e5fbea1d5546 100644
--- a/odk/examples/cpp/custompanel/ctp_factory.hxx
+++ b/odk/examples/cpp/custompanel/ctp_factory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SD_WORKBENCH_CTP_FACTORY_HXX
-#define SD_WORKBENCH_CTP_FACTORY_HXX
+#ifndef INCLUDED_CUSTOMPANEL_CTP_FACTORY_HXX
+#define INCLUDED_CUSTOMPANEL_CTP_FACTORY_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ui/XUIElementFactory.hpp>
@@ -69,6 +69,6 @@ namespace sd { namespace colortoolpanel
 } } // namespace sd::colortoolpanel
 
 
-#endif // SD_WORKBENCH_CTP_FACTORY_HXX
+#endif // INCLUDED_CUSTOMPANEL_CTP_FACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/cpp/custompanel/ctp_panel.hxx b/odk/examples/cpp/custompanel/ctp_panel.hxx
index 1e9566990105..e0ec08420164 100644
--- a/odk/examples/cpp/custompanel/ctp_panel.hxx
+++ b/odk/examples/cpp/custompanel/ctp_panel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SD_WORKBENCH_CTP_PANEL_HXX
-#define SD_WORKBENCH_CTP_PANEL_HXX
+#ifndef INCLUDED_CUSTOMPANEL_CTP_PANEL_HXX
+#define INCLUDED_CUSTOMPANEL_CTP_PANEL_HXX
 
 #include <com/sun/star/ui/XToolPanel.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -111,6 +111,6 @@ namespace sd { namespace colortoolpanel
 } } // namespace sd::colortoolpanel
 
 
-#endif // SD_WORKBENCH_CTP_PANEL_HXX
+#endif // INCLUDED_CUSTOMPANEL_CTP_PANEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */