[Libreoffice-commits] core.git: 2 commits - dbaccess/source include/editeng winaccessibility/source

[Thomas Arnhold]

 dbaccess/source/ui/inc/toolbox_tmpl.hrc           |    6 +++---
 include/editeng/memberids.hrc                     |    4 ++--
 winaccessibility/source/UAccCOM/AccActionBase.cxx |    2 --
 winaccessibility/source/UAccCOM/MAccessible.h     |    4 ----
 4 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit e9d40e29d1efc214c5169eaa7b0bde3e4084db16
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun May 18 12:11:42 2014 +0200

    remove some more external header guards
    
    Change-Id: Ic9efae442fef33c620fbdb1e1c3daef4b64d9780

diff --git a/winaccessibility/source/UAccCOM/AccActionBase.cxx b/winaccessibility/source/UAccCOM/AccActionBase.cxx
index a12d8a9..99ead42 100644
--- a/winaccessibility/source/UAccCOM/AccActionBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccActionBase.cxx
@@ -32,9 +32,7 @@
 
 #include "AccessibleKeyStroke.h"
 
-#ifndef __ACCCOMMON_H_
 #include "acccommon.h"
-#endif
 
 using namespace com::sun::star::accessibility::AccessibleRole;
 using namespace com::sun::star::accessibility;
diff --git a/winaccessibility/source/UAccCOM/MAccessible.h b/winaccessibility/source/UAccCOM/MAccessible.h
index e0620db..8447b8f 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.h
+++ b/winaccessibility/source/UAccCOM/MAccessible.h
@@ -27,12 +27,8 @@
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <AccObjectManagerAgent.hxx>
 #include "EnumVariant.h"
-#ifndef __ACCCOMMON_H_
 #include "acccommon.h"
-#endif
-#ifndef _RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
-#endif
 
 #define     OBJID_WINDOW        ((LONG)0x00000000)
 #define     OBJID_SYSMENU       ((LONG)0xFFFFFFFF)
commit 064ca9248407bff10623a86599ad45cbf71decd2
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun May 18 12:10:02 2014 +0200

    hrc files should have hrc suffix
    
    Change-Id: Iadbedc145c85c5f333e4449704fd01d5e12ddde5

diff --git a/dbaccess/source/ui/inc/toolbox_tmpl.hrc b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
index 3cd6f6a..5a03481d 100644
--- a/dbaccess/source/ui/inc/toolbox_tmpl.hrc
+++ b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef DBAUI_TOOLBOX_HXX
-#define DBAUI_TOOLBOX_HXX
+#ifndef DBAUI_TOOLBOX_HRC
+#define DBAUI_TOOLBOX_HRC
 
 #define MID_SBA_QRY_REFRESH \
     Identifier = ID_BROWSER_REFRESH ; \
@@ -65,6 +65,6 @@
     HelpID = HID_DOCUMENT_CREATE_REPWIZ ;\
     Text [ en-US ] = "Report Wizard...";    \
 
-#endif // DBAUI_TOOLBOX_HXX
+#endif // DBAUI_TOOLBOX_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/memberids.hrc b/include/editeng/memberids.hrc
index 402d1a5..28a831a 100644
--- a/include/editeng/memberids.hrc
+++ b/include/editeng/memberids.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EDT_UNOMID_HXX
-#define _EDT_UNOMID_HXX
+#ifndef _EDT_UNOMID_HRC
+#define _EDT_UNOMID_HRC
 
 #include <svl/memberid.hrc>