[Libreoffice-commits] core.git: include/avmedia include/editeng include/sfx2 include/svtools include/toolkit include/vcl include/xmloff
Noel Grandin
noel at peralex.com
Fri May 30 04:06:34 PDT 2014
include/avmedia/modeltools.hxx | 6 +++---
include/editeng/numdef.hxx | 6 +++---
include/editeng/unonames.hxx | 6 +++---
include/sfx2/brokenpackageint.hxx | 6 +++---
include/sfx2/imagemgr.hxx | 6 +++---
include/svtools/sores.hxx | 6 +++---
include/toolkit/controls/eventcontainer.hxx | 6 +++---
include/vcl/threadex.hxx | 6 +++---
include/xmloff/languagetagodf.hxx | 6 +++---
9 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit b88ab175513533617e324f51e9d0102c1ed9bbba
Author: Noel Grandin <noel at peralex.com>
Date: Fri May 30 09:08:32 2014 +0200
header guard naming consistency
Change-Id: Iebbf5c586f5d2961be98b12638def3adbadef136
diff --git a/include/avmedia/modeltools.hxx b/include/avmedia/modeltools.hxx
index d1a84af..f9c3460 100644
--- a/include/avmedia/modeltools.hxx
+++ b/include/avmedia/modeltools.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_INCLUDE_AVMEDIA_MODELTOOLS_HXX
-#define INCLUDED_INCLUDE_AVMEDIA_MODELTOOLS_HXX
+#ifndef INCLUDED_AVMEDIA_MODELTOOLS_HXX
+#define INCLUDED_AVMEDIA_MODELTOOLS_HXX
#include <rtl/ustring.hxx>
#include <com/sun/star/frame/XModel.hpp>
@@ -24,6 +24,6 @@ bool AVMEDIA_DLLPUBLIC IsModel(const OUString& rMimeType);
} // namespace avemdia
-#endif // INCLUDED_INCLUDE_AVMEDIA_MODELTOOLS_HXX
+#endif // INCLUDED_AVMEDIA_MODELTOOLS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/numdef.hxx b/include/editeng/numdef.hxx
index 8ab423a..152e756 100644
--- a/include/editeng/numdef.hxx
+++ b/include/editeng/numdef.hxx
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_INCLUDE_EDITENG_NUMDEF_HXX
-#define INCLUDED_INCLUDE_EDITENG_NUMDEF_HXX
+#ifndef INCLUDED_EDITENG_NUMDEF_HXX
+#define INCLUDED_EDITENG_NUMDEF_HXX
#define SVX_MAX_NUM 10 // max. possible numbering level
#define SVX_DEF_BULLET (0xF000 + 149)// Character for lists
-#endif // INCLUDED_INCLUDE_EDITENG_NUMDEF_HXX
+#endif // INCLUDED_EDITENG_NUMDEF_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/unonames.hxx b/include/editeng/unonames.hxx
index 19ed112..f3e3a80 100644
--- a/include/editeng/unonames.hxx
+++ b/include/editeng/unonames.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_INCLUDE_EDITENG_UNONAMES_HXX
-#define INCLUDED_INCLUDE_EDITENG_UNONAMES_HXX
+#ifndef INCLUDED_EDITENG_UNONAMES_HXX
+#define INCLUDED_EDITENG_UNONAMES_HXX
// Common across fields
#define UNO_TC_PROP_ANCHOR "Anchor"
@@ -43,6 +43,6 @@
#define UNO_TR_PROP_SELECTION "Selection"
-#endif // INCLUDED_INCLUDE_EDITENG_UNONAMES_HXX
+#endif // INCLUDED_EDITENG_UNONAMES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/brokenpackageint.hxx b/include/sfx2/brokenpackageint.hxx
index 607c640..e8302ba 100644
--- a/include/sfx2/brokenpackageint.hxx
+++ b/include/sfx2/brokenpackageint.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_INCLUDE_SFX2_BROKENPACKAGEINT_HXX
-#define INCLUDED_INCLUDE_SFX2_BROKENPACKAGEINT_HXX
+#ifndef INCLUDED_SFX2_BROKENPACKAGEINT_HXX
+#define INCLUDED_SFX2_BROKENPACKAGEINT_HXX
#include <sal/config.h>
#include <sfx2/dllapi.h>
@@ -48,6 +48,6 @@ public:
com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
};
-#endif // INCLUDED_INCLUDE_SFX2_BROKENPACKAGEINT_HXX
+#endif // INCLUDED_SFX2_BROKENPACKAGEINT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/imagemgr.hxx b/include/sfx2/imagemgr.hxx
index c4a4eb1..e4962bf 100644
--- a/include/sfx2/imagemgr.hxx
+++ b/include/sfx2/imagemgr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_INCLUDE_SFX2_IMAGEMGR_HXX
-#define INCLUDED_INCLUDE_SFX2_IMAGEMGR_HXX
+#ifndef INCLUDED_SFX2_IMAGEMGR_HXX
+#define INCLUDED_SFX2_IMAGEMGR_HXX
#include <sal/config.h>
#include <sfx2/dllapi.h>
@@ -34,6 +34,6 @@ SFX2_DLLPUBLIC Image SAL_CALL GetImage(
bool bBig
);
-#endif // INCLUDED_INCLUDE_SFX2_IMAGEMGR_HXX
+#endif // INCLUDED_SFX2_IMAGEMGR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/sores.hxx b/include/svtools/sores.hxx
index 91d4f5d..fe46fa1 100644
--- a/include/svtools/sores.hxx
+++ b/include/svtools/sores.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_INCLUDE_SVTOOLS_SORES_HXX
-#define INCLUDED_INCLUDE_SVTOOLS_SORES_HXX
+#ifndef INCLUDED_SVTOOLS_SORES_HXX
+#define INCLUDED_SVTOOLS_SORES_HXX
// Strings
#define STR_ERROR_OBJNOCREATE 32014
@@ -99,6 +99,6 @@
#define STR_FORMAT_ID_HTML_NO_COMMENT (STR_FORMAT_START + 119)
#define STR_FORMAT_END (STR_FORMAT_ID_HTML_NO_COMMENT)
-#endif // INCLUDED_INCLUDE_SVTOOLS_SORES_HXX
+#endif // INCLUDED_SVTOOLS_SORES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx
index 610a43d..2744c1d 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_INCLUDE_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX
-#define INCLUDED_INCLUDE_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX
#include <osl/diagnose.h>
#include <com/sun/star/container/XNameContainer.hpp>
@@ -130,6 +130,6 @@ public:
} // namespace toolkit_namecontainer
-#endif // INCLUDED_INCLUDE_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx
index 40bddf6c..f25a3cc 100644
--- a/include/vcl/threadex.hxx
+++ b/include/vcl/threadex.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_INCLUDE_VCL_THREADEX_HXX
-#define INCLUDED_INCLUDE_VCL_THREADEX_HXX
+#ifndef INCLUDED_VCL_THREADEX_HXX
+#define INCLUDED_VCL_THREADEX_HXX
#include <osl/conditn.h>
#include <osl/thread.h>
@@ -249,6 +249,6 @@ inline typename FuncT::result_type syncExecute( FuncT const& func )
} // namespace solarthread
} // namespace vcl
-#endif // INCLUDED_INCLUDE_VCL_THREADEX_HXX
+#endif // INCLUDED_VCL_THREADEX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/xmloff/languagetagodf.hxx b/include/xmloff/languagetagodf.hxx
index 559819f..be687b7 100644
--- a/include/xmloff/languagetagodf.hxx
+++ b/include/xmloff/languagetagodf.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_INCLUDE_XMLOFF_LANGUAGETAGODF_HXX
-#define INCLUDED_INCLUDE_XMLOFF_LANGUAGETAGODF_HXX
+#ifndef INCLUDED_XMLOFF_LANGUAGETAGODF_HXX
+#define INCLUDED_XMLOFF_LANGUAGETAGODF_HXX
#include <sal/config.h>
#include <rtl/ustring.hxx>
@@ -35,6 +35,6 @@ struct LanguageTagODF
LanguageTag getLanguageTag() const { return LanguageTag( maRfcLanguageTag, maLanguage, maScript, maCountry); }
};
-#endif // INCLUDED_INCLUDE_XMLOFF_LANGUAGETAGODF_HXX
+#endif // INCLUDED_XMLOFF_LANGUAGETAGODF_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list