diff options
5 files changed, 13 insertions, 8 deletions
diff --git a/bin/fixincludeguards.sh b/bin/fixincludeguards.sh index 4c3e409a88dc..6bdb59ec26ef 100755 --- a/bin/fixincludeguards.sh +++ b/bin/fixincludeguards.sh @@ -28,7 +28,7 @@ for fn in "$@"; do # global header in include/ top level dir: # drop the project dir - fnfixed=`echo $fn | sed 's/include\///g'` + fnfixed=`echo $fn | sed 's/\(include\|odk\/examples\/cpp\)\///g'` # convert file path to header guard guard=`echo "$fnfixed" | sed 's/[\/\.-]/_/g' | tr 'a-z' 'A-Z'` diff --git a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h index 0fe4bd02a937..c529a0a7655a 100644 --- a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h +++ b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_LISTENERHELPER_H +#define INCLUDED_COMPLEXTOOLBARCONTROLS_LISTENERHELPER_H + #include <map> #include <vector> @@ -77,4 +80,6 @@ public: virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException); }; +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/complextoolbarcontrols/MyJob.h b/odk/examples/cpp/complextoolbarcontrols/MyJob.h index b6ac4bef0c37..4c02cc6c2367 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 _MyJob_HXX -#define _MyJob_HXX +#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_MYJOB_H +#define INCLUDED_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 12d485cddaaf..6a6c7e11eaad 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 _MyListener_HXX -#define _MyListener_HXX +#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_MYLISTENER_H +#define INCLUDED_COMPLEXTOOLBARCONTROLS_MYLISTENER_H #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/task/XJob.hpp> @@ -108,6 +108,6 @@ class WriterListener : public cppu::WeakImplHelper1< css::document::XEventListen throw (css::uno::RuntimeException); }; -#endif // _MyListener_HXX +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h index 026cf42a1b90..830cded03a43 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 _MyProtocolHandler_HXX -#define _MyProtocolHandler_HXX +#ifndef INCLUDED_COMPLEXTOOLBARCONTROLS_MYPROTOCOLHANDLER_H +#define INCLUDED_COMPLEXTOOLBARCONTROLS_MYPROTOCOLHANDLER_H #include <com/sun/star/awt/XToolkit2.hpp> #include <com/sun/star/beans/NamedValue.hpp> |