[Libreoffice-commits] core.git: avmedia/inc include/sfx2

Noel Grandin noel.grandin at collabora.co.uk
Thu May 24 18:46:40 UTC 2018


 avmedia/inc/strings.hrc  |    4 ++--
 include/sfx2/sfxsids.hrc |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2f9dc9f56f77330c2d0e111888dd5403c3cb070c
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu May 24 11:50:25 2018 +0200

    include guard should be at the end of the file
    
    and the modeline should be on the last line
    
    Change-Id: I6032fdee6fc29d11cac1e4b8ec9c36e004258e73
    Reviewed-on: https://gerrit.libreoffice.org/54752
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/avmedia/inc/strings.hrc b/avmedia/inc/strings.hrc
index 78c39db02682..ea001490d87a 100644
--- a/avmedia/inc/strings.hrc
+++ b/avmedia/inc/strings.hrc
@@ -45,6 +45,6 @@
 #define AVMEDIA_STR_ALL_FILES       NC_("AVMEDIA_STR_ALL_FILES", "All files")
 #define AVMEDIA_STR_ERR_URL         NC_("AVMEDIA_STR_ERR_URL", "The format of the selected file is not supported.")
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 06f31d9c590c..49bfb72846f2 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -656,8 +656,6 @@ class SfxDocumentInfoItem;
 
 #define SID_RESTORE_EDITING_VIEW            (SID_SFX_START + 1663)
 
-#endif  // #ifndef INCLUDED_SFX2_SFXSIDS_HRC
-
 // SfxSecurityPage related stuff
 
 #define FN_EDIT2                (SID_SW_START + 1800)
@@ -682,4 +680,6 @@ class SfxDocumentInfoItem;
 #define FID_CHG_RECORD          (EDIT_MENU_START + 18)
 #define SID_CHG_PROTECT         (SC_VIEW_START + 84)
 
+#endif  // #ifndef INCLUDED_SFX2_SFXSIDS_HRC
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list