[Libreoffice-commits] core.git: desktop/source embeddedobj/source include/cppcanvas sd/source
Thomas Arnhold
thomas at arnhold.org
Mon Oct 21 20:33:17 PDT 2013
desktop/source/inc/desktopdllapi.h | 1 +
embeddedobj/source/inc/closepreventer.hxx | 5 +++++
embeddedobj/source/inc/targetstatecontrol.hxx | 4 ++++
embeddedobj/source/inc/xcreator.hxx | 5 ++---
embeddedobj/source/msole/advisesink.hxx | 5 +++++
embeddedobj/source/msole/mtnotification.hxx | 4 ++++
embeddedobj/source/msole/olewrapclient.hxx | 5 +++++
embeddedobj/source/msole/xdialogcreator.hxx | 5 ++---
embeddedobj/source/msole/xolefactory.hxx | 5 ++---
include/cppcanvas/cppcanvasdllapi.h | 5 +++--
sd/source/ui/inc/assclass.hxx | 4 ++--
sd/source/ui/inc/dlgass.hxx | 4 ++--
12 files changed, 37 insertions(+), 15 deletions(-)
New commits:
commit d6b80337fb76e31b2e6a11c18c3ae989767c8118
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Oct 22 05:32:12 2013 +0200
fdo#68849 add some header guards
Change-Id: I1cd598fba94e337c2ccad68a4a888743aeb292f0
diff --git a/desktop/source/inc/desktopdllapi.h b/desktop/source/inc/desktopdllapi.h
index 98ca434..ebc75f1 100644
--- a/desktop/source/inc/desktopdllapi.h
+++ b/desktop/source/inc/desktopdllapi.h
@@ -8,6 +8,7 @@
*/
#ifndef INCLUDED_DESKTOP_SOURCE_INC_DESKTOPDLLAPI_H
+#define INCLUDED_DESKTOP_SOURCE_INC_DESKTOPDLLAPI_H
#include <sal/config.h>
#include <sal/types.h>
diff --git a/embeddedobj/source/inc/closepreventer.hxx b/embeddedobj/source/inc/closepreventer.hxx
index 55e4999..9310cdc 100644
--- a/embeddedobj/source/inc/closepreventer.hxx
+++ b/embeddedobj/source/inc/closepreventer.hxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_INC_CLOSEPREVENTER_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_CLOSEPREVENTER_HXX
+
#include <com/sun/star/util/XCloseListener.hpp>
#include <cppuhelper/implbase1.hxx>
@@ -28,4 +31,6 @@ class OClosePreventer : public ::cppu::WeakImplHelper1 < ::com::sun::star::util:
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
};
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/source/inc/targetstatecontrol.hxx b/embeddedobj/source/inc/targetstatecontrol.hxx
index b0b3b5e..6cc999a 100644
--- a/embeddedobj/source/inc/targetstatecontrol.hxx
+++ b/embeddedobj/source/inc/targetstatecontrol.hxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_INC_TARGETSTATECONTROL_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_TARGETSTATECONTROL_HXX
+
#include <sal/types.h>
#include <osl/diagnose.h>
@@ -37,5 +40,6 @@ public:
}
};
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx
index 7a90121..a282c41 100644
--- a/embeddedobj/source/inc/xcreator.hxx
+++ b/embeddedobj/source/inc/xcreator.hxx
@@ -17,13 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __XCREATOR_HXX_
-#define __XCREATOR_HXX_
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_INC_XCREATOR_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_XCREATOR_HXX
#include <com/sun/star/embed/XEmbeddedObjectCreator.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-
#include <cppuhelper/implbase2.hxx>
#include <comphelper/mimeconfighelper.hxx>
diff --git a/embeddedobj/source/msole/advisesink.hxx b/embeddedobj/source/msole/advisesink.hxx
index d178e48..d8d0da7 100644
--- a/embeddedobj/source/msole/advisesink.hxx
+++ b/embeddedobj/source/msole/advisesink.hxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_ADVISESINK_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_ADVISESINK_HXX
+
#include <osl/interlck.h>
#include <osl/mutex.hxx>
#include <platform.h>
@@ -46,4 +49,6 @@ public:
STDMETHODIMP_(void) OnClose(void);
};
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/source/msole/mtnotification.hxx b/embeddedobj/source/msole/mtnotification.hxx
index d4f69a4..9b45e5f 100644
--- a/embeddedobj/source/msole/mtnotification.hxx
+++ b/embeddedobj/source/msole/mtnotification.hxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_MTNOTIFICATION_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_MTNOTIFICATION_HXX
+
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/awt/XCallback.hpp>
@@ -44,5 +47,6 @@ public:
~MainThreadNotificationRequest();
};
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/source/msole/olewrapclient.hxx b/embeddedobj/source/msole/olewrapclient.hxx
index 4aaaaee..52ebca2 100644
--- a/embeddedobj/source/msole/olewrapclient.hxx
+++ b/embeddedobj/source/msole/olewrapclient.hxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_OLEWRAPCLIENT_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_OLEWRAPCLIENT_HXX
+
#include <osl/interlck.h>
#include <osl/mutex.hxx>
#include <platform.h>
@@ -46,4 +49,6 @@ public:
STDMETHODIMP RequestNewObjectLayout(void);
};
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/source/msole/xdialogcreator.hxx b/embeddedobj/source/msole/xdialogcreator.hxx
index 9201328..7f184d3 100644
--- a/embeddedobj/source/msole/xdialogcreator.hxx
+++ b/embeddedobj/source/msole/xdialogcreator.hxx
@@ -17,14 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __XDIALOGCREATOR_HXX_
-#define __XDIALOGCREATOR_HXX_
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_XDIALOGCREATOR_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_XDIALOGCREATOR_HXX
#include <com/sun/star/embed/XInsertObjectDialog.hpp>
#include <com/sun/star/embed/XEmbedObjectClipboardCreator.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-
#include <cppuhelper/implbase3.hxx>
diff --git a/embeddedobj/source/msole/xolefactory.hxx b/embeddedobj/source/msole/xolefactory.hxx
index 37747e8..2c10940 100644
--- a/embeddedobj/source/msole/xolefactory.hxx
+++ b/embeddedobj/source/msole/xolefactory.hxx
@@ -17,13 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __XFACTORY_HXX_
-#define __XFACTORY_HXX_
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_XOLEFACTORY_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_XOLEFACTORY_HXX
#include <com/sun/star/embed/XEmbeddedObjectCreator.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-
#include <cppuhelper/implbase2.hxx>
diff --git a/include/cppcanvas/cppcanvasdllapi.h b/include/cppcanvas/cppcanvasdllapi.h
index be641aa..90b0ba8 100644
--- a/include/cppcanvas/cppcanvasdllapi.h
+++ b/include/cppcanvas/cppcanvasdllapi.h
@@ -16,8 +16,9 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CPPCANVASDLLAPI_H
-#define INCLUDED_CPPCANVASDLLAPI_H
+
+#ifndef INCLUDED_CPPCANVAS_CPPCANVASDLLAPI_H
+#define INCLUDED_CPPCANVAS_CPPCANVASDLLAPI_H
#if defined CPPCANVAS_DLLIMPLEMENTATION
diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx
index b8adf2e..66b984e 100644
--- a/sd/source/ui/inc/assclass.hxx
+++ b/sd/source/ui/inc/assclass.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INC_ASSCLASS
-#define INC_ASSCLASS
+#ifndef INCLUDED_SD_SOURCE_UI_INC_ASSCLASS_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_ASSCLASS_HXX
#include <vector>
#include <boost/scoped_array.hpp>
diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx
index 5625d9d..2983a5f 100644
--- a/sd/source/ui/inc/dlgass.hxx
+++ b/sd/source/ui/inc/dlgass.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INC_DLGASS
-#define INC_DLGASS
+#ifndef INCLUDED_SD_SOURCE_UI_INC_DLGASS_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_DLGASS_HXX
#include <vcl/group.hxx>
#include <vcl/edit.hxx>
More information about the Libreoffice-commits
mailing list