[Libreoffice-commits] core.git: sw/inc sw/source

[Gabor Kelemen]

 sw/inc/globals.hrc                |    2 +-
 sw/source/ui/app/app.src          |    5 +++++
 sw/source/ui/misc/bookmark.cxx    |    2 +-
 sw/source/uibase/inc/bookmark.hxx |    1 -
 4 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit c67a0d0f7ddd8ababa3197d86998979c1ce725d0
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Sat Apr 22 09:18:10 2017 +0200

    tdf#101055 Translate default name of bookmarks
    
    Change-Id: I9dd5ab006c7b7e7da7c4c2705925bbf264b58b60
    Reviewed-on: https://gerrit.libreoffice.org/36813
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 748cd8b811c1..e8cd8d3f9653 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -93,7 +93,7 @@
 #define STR_CENTER_BASE             (RC_GLOBALS_BEGIN + 33)
 
 // free
-
+#define STR_BOOKMARK_DEF_NAME       (RC_GLOBALS_BEGIN + 35)
 #define STR_BOOKMARK_NAME           (RC_GLOBALS_BEGIN + 36)
 #define STR_BOOKMARK_TEXT           (RC_GLOBALS_BEGIN + 37)
 
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index c79806f71e0d..84ba7d3b33b0 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -220,6 +220,11 @@ String STR_REMOVE_WARNING
     Text [ en-US ] = "The following characters are not valid and have been removed: ";
 };
 
+String STR_BOOKMARK_DEF_NAME
+{
+    Text [ en-US ] = "Bookmark";
+};
+
 String STR_BOOKMARK_NAME
 {
     Text [ en-US ] = "Name";
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 4a52dd50f184..64e95a14b3b1 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -40,7 +40,6 @@ using namespace ::com::sun::star;
 
 const OUString BookmarkTable::aForbiddenChars("/\\@*?\",#");
 const char BookmarkTable::cSeparator(';');
-const OUString BookmarkTable::sDefaultBookmarkName("Bookmark");
 
 // callback to modify EditBox
 IMPL_LINK_NOARG(SwInsertBookmarkDlg, ModifyHdl, Edit&, void)
@@ -429,6 +428,7 @@ void BookmarkTable::SelectByName(const OUString& sName)
 
 OUString BookmarkTable::GetNameProposal()
 {
+    OUString sDefaultBookmarkName = SW_RES(STR_BOOKMARK_DEF_NAME);
     sal_Int32 nHighestBookmarkId = 0;
     SvTreeListEntry* pEntry = First();
     while (pEntry)
diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx
index d1ea987d474c..ac20eaa59b31 100644
--- a/sw/source/uibase/inc/bookmark.hxx
+++ b/sw/source/uibase/inc/bookmark.hxx
@@ -43,7 +43,6 @@ public:
     OUString            GetNameProposal();
 
     static const OUString aForbiddenChars;
-    static const OUString sDefaultBookmarkName;
     static const char     cSeparator;
 };