bin/fixincludeguards.sh
| 4 ++-
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx
| 6 ++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx
| 6 ++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx
| 6 ++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
| 6 ++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx
| 6 ++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
| 6 ++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
| 6 ++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx
| 6 ++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
| 6 ++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx
| 6 ++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx
| 6 ++---
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx
| 4 +--
odk/examples/OLE/activex/SOActiveX.h
| 6 ++---
odk/examples/OLE/activex/SOComWindowPeer.h
| 12 ++--------
odk/examples/OLE/activex/StdAfx2.h
| 10 ++------
odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
| 4 +--
odk/examples/cpp/complextoolbarcontrols/MyJob.h
| 4 +--
odk/examples/cpp/complextoolbarcontrols/MyListener.h
| 4 +--
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
| 4 +--
odk/examples/cpp/custompanel/ctp_factory.hxx
| 6 ++---
odk/examples/cpp/custompanel/ctp_panel.hxx
| 6 ++---
22 files changed, 61 insertions(+), 69 deletions(-)
New commits:
commit f0546a51ada8dc4f4436861e03e086938e9dd555
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Tue Jun 3 12:36:21 2014 +0200
odk/examples: mark them as examples
Change-Id: Ie4b925b2411f2a26076de7d0dc367678b390dba8
diff --git a/bin/fixincludeguards.sh b/bin/fixincludeguards.sh
index 1dfceaa..2655534 100755
--- a/bin/fixincludeguards.sh
+++ b/bin/fixincludeguards.sh
@@ -28,7 +28,9 @@ for fn in "$@"; do
# global header in include/ top level dir:
# drop the project dir
- fnfixed=`echo $fn | sed
's,\(include\|odk/examples/cpp\|odk/examples/DevelopersGuide\)/,,g'`
+ fnfixed=`echo $fn | sed 's,include/,,g'`
+ # add examples prefix to headers in odk/examples
+ fnfixed=`echo $fnfixed | sed
's,odk/examples/\(cpp\|DevelopersGuide\|OLE\)/,examples_,g'`
# convert file path to header guard
guard=`echo "$fnfixed" | sed 's/[\/\.-]/_/g' | tr 'a-z' 'A-Z'`
diff --git
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx
index 442b257..65641fb3 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 INCLUDED_COMPONENTS_ADDONS_PROTOCOLHANDLERADDON_CPP_ADDON_HXX
-#define INCLUDED_COMPONENTS_ADDONS_PROTOCOLHANDLERADDON_CPP_ADDON_HXX
+#ifndef INCLUDED_EXAMPLES_COMPONENTS_ADDONS_PROTOCOLHANDLERADDON_CPP_ADDON_HXX
+#define INCLUDED_EXAMPLES_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 // INCLUDED_COMPONENTS_ADDONS_PROTOCOLHANDLERADDON_CPP_ADDON_HXX
+#endif //
INCLUDED_EXAMPLES_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 9a2d286..a2bb248 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef INCLUDED_DATABASE_DRIVERSKELETON_OSUBCOMPONENT_HXX
-#define INCLUDED_DATABASE_DRIVERSKELETON_OSUBCOMPONENT_HXX
+#ifndef INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_OSUBCOMPONENT_HXX
+#define INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_OSUBCOMPONENT_HXX
#include <com/sun/star/lang/DisposedException.hpp>
#include <cppuhelper/interfacecontainer.h>
@@ -238,6 +238,6 @@ namespace connectivity
}
}
-#endif // INCLUDED_DATABASE_DRIVERSKELETON_OSUBCOMPONENT_HXX
+#endif // INCLUDED_EXAMPLES_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 58ee806..24cf670 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef INCLUDED_DATABASE_DRIVERSKELETON_OTYPEINFO_HXX
-#define INCLUDED_DATABASE_DRIVERSKELETON_OTYPEINFO_HXX
+#ifndef INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_OTYPEINFO_HXX
+#define INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_OTYPEINFO_HXX
#include <com/sun/star/sdbc/ColumnSearch.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
@@ -95,6 +95,6 @@ namespace connectivity
};
}
-#endif // INCLUDED_DATABASE_DRIVERSKELETON_OTYPEINFO_HXX
+#endif // INCLUDED_EXAMPLES_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 e94a228..a1e72aa 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SCONNECTION_HXX
-#define INCLUDED_DATABASE_DRIVERSKELETON_SCONNECTION_HXX
+#ifndef INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_SCONNECTION_HXX
+#define INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_SCONNECTION_HXX
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -153,6 +153,6 @@ namespace connectivity
}
}
-#endif // INCLUDED_DATABASE_DRIVERSKELETON_SCONNECTION_HXX
+#endif // INCLUDED_EXAMPLES_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 5f88f9b..fe1449b 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SDATABASEMETADATA_HXX
-#define INCLUDED_DATABASE_DRIVERSKELETON_SDATABASEMETADATA_HXX
+#ifndef INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_SDATABASEMETADATA_HXX
+#define INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_SDATABASEMETADATA_HXX
#include "SConnection.hxx"
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -216,6 +216,6 @@ namespace connectivity
}
}
-#endif // INCLUDED_DATABASE_DRIVERSKELETON_SDATABASEMETADATA_HXX
+#endif // INCLUDED_EXAMPLES_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 43fbf68..b80b3e4 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SDRIVER_HXX
-#define INCLUDED_DATABASE_DRIVERSKELETON_SDRIVER_HXX
+#ifndef INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_SDRIVER_HXX
+#define INCLUDED_EXAMPLES_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 // INCLUDED_DATABASE_DRIVERSKELETON_SDRIVER_HXX
+#endif // INCLUDED_EXAMPLES_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 6670d56..ca4df6e 100644
---
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
+++
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SPREPAREDSTATEMENT_HXX
-#define INCLUDED_DATABASE_DRIVERSKELETON_SPREPAREDSTATEMENT_HXX
+#ifndef INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_SPREPAREDSTATEMENT_HXX
+#define INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_SPREPAREDSTATEMENT_HXX
#include "SStatement.hxx"
#include <com/sun/star/sdbc/XPreparedStatement.hpp>
@@ -146,6 +146,6 @@ namespace connectivity
}
}
-#endif // INCLUDED_DATABASE_DRIVERSKELETON_SPREPAREDSTATEMENT_HXX
+#endif // INCLUDED_EXAMPLES_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 9440dbb..edc20b6 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef CONNECTIVITY_SRESULTSET_HXX
-#define CONNECTIVITY_SRESULTSET_HXX
+#ifndef INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_SRESULTSET_HXX
+#define INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_SRESULTSET_HXX
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
@@ -217,6 +217,6 @@ namespace connectivity
}
}
-#endif // CONNECTIVITY_SRESULTSET_HXX
+#endif // INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_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 3f8886f..7404601 100644
---
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
+++
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SRESULTSETMETADATA_HXX
-#define INCLUDED_DATABASE_DRIVERSKELETON_SRESULTSETMETADATA_HXX
+#ifndef INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_SRESULTSETMETADATA_HXX
+#define INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_SRESULTSETMETADATA_HXX
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <cppuhelper/implbase1.hxx>
@@ -88,6 +88,6 @@ namespace connectivity
}
}
-#endif // INCLUDED_DATABASE_DRIVERSKELETON_SRESULTSETMETADATA_HXX
+#endif // INCLUDED_EXAMPLES_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 9122597..c014b83 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SSTATEMENT_HXX
-#define INCLUDED_DATABASE_DRIVERSKELETON_SSTATEMENT_HXX
+#ifndef INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_SSTATEMENT_HXX
+#define INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_SSTATEMENT_HXX
#include <com/sun/star/sdbc/XStatement.hpp>
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
@@ -174,6 +174,6 @@ namespace connectivity
}
}
-#endif // INCLUDED_DATABASE_DRIVERSKELETON_SSTATEMENT_HXX
+#endif // INCLUDED_EXAMPLES_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 880f595..f5161f3 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef INCLUDED_DATABASE_DRIVERSKELETON_PROPERTYIDS_HXX
-#define INCLUDED_DATABASE_DRIVERSKELETON_PROPERTYIDS_HXX
+#ifndef INCLUDED_EXAMPLES_DATABASE_DRIVERSKELETON_PROPERTYIDS_HXX
+#define INCLUDED_EXAMPLES_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,6 +141,6 @@ namespace skeleton
#define PROPERTY_ID_PRIVILEGES 50
-#endif // INCLUDED_DATABASE_DRIVERSKELETON_PROPERTYIDS_HXX
+#endif // INCLUDED_EXAMPLES_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 20a9506..aa9d82b 100644
---
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx
+++
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef
INCLUDED_OFFICEDEV_FILTERDEVELOPMENT_FLATXMLFILTERDETECTION_FILTERDETECT_HXX
-#define
INCLUDED_OFFICEDEV_FILTERDEVELOPMENT_FLATXMLFILTERDETECTION_FILTERDETECT_HXX
+#ifndef
INCLUDED_EXAMPLES_OFFICEDEV_FILTERDEVELOPMENT_FLATXMLFILTERDETECTION_FILTERDETECT_HXX
+#define
INCLUDED_EXAMPLES_OFFICEDEV_FILTERDEVELOPMENT_FLATXMLFILTERDETECTION_FILTERDETECT_HXX
#include <com/sun/star/document/XFilter.hpp>
diff --git a/odk/examples/OLE/activex/SOActiveX.h
b/odk/examples/OLE/activex/SOActiveX.h
index f36cbe7..2057e43 100644
--- a/odk/examples/OLE/activex/SOActiveX.h
+++ b/odk/examples/OLE/activex/SOActiveX.h
@@ -35,8 +35,8 @@
// SOActiveX.h : Declaration of the CSOActiveX
-#ifndef __SOACTIVEX_H_
-#define __SOACTIVEX_H_
+#ifndef INCLUDED_EXAMPLES_ACTIVEX_SOACTIVEX_H
+#define INCLUDED_EXAMPLES_ACTIVEX_SOACTIVEX_H
#include "resource.h"
#include <ExDispID.h>
@@ -163,6 +163,6 @@ public:
HRESULT Cleanup();
};
-#endif //__SOACTIVEX_H_
+#endif // INCLUDED_EXAMPLES_ACTIVEX_SOACTIVEX_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/OLE/activex/SOComWindowPeer.h
b/odk/examples/OLE/activex/SOComWindowPeer.h
index b03b26c..1a16bf4 100644
--- a/odk/examples/OLE/activex/SOComWindowPeer.h
+++ b/odk/examples/OLE/activex/SOComWindowPeer.h
@@ -35,14 +35,8 @@
// SOComWindowPeer.h: Definition of the SOComWindowPeer class
-
-
-#ifndef __SOCOMWINDOWPEER_H_
-#define __SOCOMWINDOWPEER_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
+#ifndef INCLUDED_EXAMPLES_ACTIVEX_SOCOMWINDOWPEER_H
+#define INCLUDED_EXAMPLES_ACTIVEX_SOCOMWINDOWPEER_H
#include "resource.h"
#include <ExDispID.h>
@@ -160,6 +154,6 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SOCOMWINDOWPEER)
void SetHWNDInternally( HWND hwnd ) { m_hwnd = hwnd; }
};
-#endif // __SOCOMWINDOWPEER_H_
+#endif // INCLUDED_EXAMPLES_ACTIVEX_SOCOMWINDOWPEER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/OLE/activex/StdAfx2.h
b/odk/examples/OLE/activex/StdAfx2.h
index 2767f4d..df14ccf 100644
--- a/odk/examples/OLE/activex/StdAfx2.h
+++ b/odk/examples/OLE/activex/StdAfx2.h
@@ -37,12 +37,8 @@
// or project specific include files that are used frequently,
// but are changed infrequently
-#if !defined(AFX_STDAFX_H__C1799EA0_62CC_44DE_A2DD_C9F0410FF7F1__INCLUDED_)
-#define AFX_STDAFX_H__C1799EA0_62CC_44DE_A2DD_C9F0410FF7F1__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
+#ifndef INCLUDED_EXAMPLES_ACTIVEX_STDAFX2_H
+#define INCLUDED_EXAMPLES_ACTIVEX_STDAFX2_H
#define STRICT
#ifndef _WIN32_WINNT
@@ -63,6 +59,6 @@ extern CComModule _Module;
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before
the previous line.
-#endif //
!defined(AFX_STDAFX_H__C1799EA0_62CC_44DE_A2DD_C9F0410FF7F1__INCLUDED)
+#endif // INCLUDED_EXAMPLES_ACTIVEX_STDAFX2_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
index c529a0a..f24150d 100644
--- a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
+++ b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_LISTENERHELPER_H
-#define INCLUDED_COMPLEXTOOLBARCONTROLS_LISTENERHELPER_H
+#ifndef INCLUDED_EXAMPLES_COMPLEXTOOLBARCONTROLS_LISTENERHELPER_H
+#define INCLUDED_EXAMPLES_COMPLEXTOOLBARCONTROLS_LISTENERHELPER_H
#include <map>
#include <vector>
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyJob.h
b/odk/examples/cpp/complextoolbarcontrols/MyJob.h
index 4c02cc6..2f3f984 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyJob.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyJob.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_MYJOB_H
-#define INCLUDED_COMPLEXTOOLBARCONTROLS_MYJOB_H
+#ifndef INCLUDED_EXAMPLES_COMPLEXTOOLBARCONTROLS_MYJOB_H
+#define INCLUDED_EXAMPLES_COMPLEXTOOLBARCONTROLS_MYJOB_H
#include <com/sun/star/task/XJob.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.h
b/odk/examples/cpp/complextoolbarcontrols/MyListener.h
index 6a6c7e1..b76de44 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyListener.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_MYLISTENER_H
-#define INCLUDED_COMPLEXTOOLBARCONTROLS_MYLISTENER_H
+#ifndef INCLUDED_EXAMPLES_COMPLEXTOOLBARCONTROLS_MYLISTENER_H
+#define INCLUDED_EXAMPLES_COMPLEXTOOLBARCONTROLS_MYLISTENER_H
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/task/XJob.hpp>
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
index 830cded..4ee22a0 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_MYPROTOCOLHANDLER_H
-#define INCLUDED_COMPLEXTOOLBARCONTROLS_MYPROTOCOLHANDLER_H
+#ifndef INCLUDED_EXAMPLES_COMPLEXTOOLBARCONTROLS_MYPROTOCOLHANDLER_H
+#define INCLUDED_EXAMPLES_COMPLEXTOOLBARCONTROLS_MYPROTOCOLHANDLER_H
#include <com/sun/star/awt/XToolkit2.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
diff --git a/odk/examples/cpp/custompanel/ctp_factory.hxx
b/odk/examples/cpp/custompanel/ctp_factory.hxx
index e5fbea1..de7be54 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 INCLUDED_CUSTOMPANEL_CTP_FACTORY_HXX
-#define INCLUDED_CUSTOMPANEL_CTP_FACTORY_HXX
+#ifndef INCLUDED_EXAMPLES_CUSTOMPANEL_CTP_FACTORY_HXX
+#define INCLUDED_EXAMPLES_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 // INCLUDED_CUSTOMPANEL_CTP_FACTORY_HXX
+#endif // INCLUDED_EXAMPLES_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 e0ec084..5428496 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 INCLUDED_CUSTOMPANEL_CTP_PANEL_HXX
-#define INCLUDED_CUSTOMPANEL_CTP_PANEL_HXX
+#ifndef INCLUDED_EXAMPLES_CUSTOMPANEL_CTP_PANEL_HXX
+#define INCLUDED_EXAMPLES_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 // INCLUDED_CUSTOMPANEL_CTP_PANEL_HXX
+#endif // INCLUDED_EXAMPLES_CUSTOMPANEL_CTP_PANEL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
