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

[Jakub Trzebiatowski]

 sw/inc/globals.hrc             |    3 +++
 sw/source/ui/app/app.src       |   10 ++++++++++
 sw/source/ui/misc/bookmark.cxx |    8 ++++----
 3 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 8d123bf1491bcc7415f4dde3ddd397a11146bb38
Author: Jakub Trzebiatowski <ubap.dev at gmail.com>
Date:   Sat Mar 26 12:54:18 2016 +0100

    tdf#90855 add table header entries to resources
    
    removed hardcoded table header entries
    
    Change-Id: Ib0268421d1b0035e7764555054377d08ee47a29d
    Reviewed-on: https://gerrit.libreoffice.org/23520
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index a907906..4471435 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -95,6 +95,9 @@
 
 // free
 
+#define STR_BOOKMARK_NAME           (RC_GLOBALS_BEGIN + 36)
+#define STR_BOOKMARK_TEXT           (RC_GLOBALS_BEGIN + 37)
+
 #define STR_LOAD_HTML_DOC           (RC_GLOBALS_BEGIN + 38)
 
 #define STR_JAVA_EDIT               (RC_GLOBALS_BEGIN + 39)
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 74c3ce1..4f16b1d 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -223,6 +223,16 @@ String STR_REMOVE_WARNING
     Text [ en-US ] = "The following characters are not valid and have been removed: ";
 };
 
+String STR_BOOKMARK_NAME
+{
+    Text [ en-US ] = "Name";
+};
+
+String STR_BOOKMARK_TEXT
+{
+    Text [ en-US ] = "Text";
+};
+
 String SW_STR_NONE
 {
     Text [ en-US ] = "[None]" ;
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index a65ddaf..ba9fc87 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -337,13 +337,13 @@ void SwInsertBookmarkDlg::dispose()
 BookmarkTable::BookmarkTable(SvSimpleTableContainer& rParent) :
     SvSimpleTable(rParent, 0)
 {
-    static long nTabs[] = {3, 0, 30, 150};
+    static long nTabs[] = {3, 0, 40, 150};
 
     SetTabs(nTabs, MAP_PIXEL);
     SetSelectionMode(MULTIPLE_SELECTION);
-    InsertHeaderEntry("Page");
-    InsertHeaderEntry("Name");
-    InsertHeaderEntry("Text");
+    InsertHeaderEntry(OUString(SW_RES(STR_PAGE)));
+    InsertHeaderEntry(OUString(SW_RES(STR_BOOKMARK_NAME)));
+    InsertHeaderEntry(OUString(SW_RES(STR_BOOKMARK_TEXT)));
 
     rParent.SetTable(this);
 }