[Libreoffice-commits] core.git: sc/inc

Caolán McNamara caolanm at redhat.com
Tue Dec 9 08:26:58 PST 2014


 sc/inc/sc.hrc |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 777a5cfb7cd7c4e9193285701160f2a6d9617041
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 9 16:19:35 2014 +0000

    Revert "move RID_APPTITLE to desktop where its used"
    
    this seems to have been re-committed as a conflict fixup,
    but it had been removed on purpose by
    
    commit 8c041824b67caa53d3f7f96803b7a69ced6614b5
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Tue Nov 25 13:39:28 2014 +0000
    
        all these ids and their associated resources were unnecessary
    
        Change-Id: I3f538668c9c5f1727b8cf49ab72fd5879e12f156
    
    This reverts commit f43162b09c4876cec317b83e2d6c1afbd8576001.
    
    Change-Id: I57514dcc9cd48c841620d4cb20d049ea8c55254e

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index a9da8bf..f76a45a 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -990,8 +990,7 @@
 #define STR_TITLE_AUTHOR        (STR_START + 442)
 #define STR_TITLE_DATE          (STR_START + 443)
 #define STR_UNKNOWN_USER_CONFLICT    (STR_START + 444)
-#define RID_SC_NAME             (STR_START + 445)
-#define STR_END                 (RID_SC_NAME)
+#define STR_END                 (STR_UNKNOWN_USER_CONFLICT)
 
 #define BMP_START               (STR_END)
 


More information about the Libreoffice-commits mailing list