add stock new and edit button texts

Change-Id: Ia8f5f6592211e50323de66a4177f752a1adcf584

3 files changed, 40 insertions, 31 deletions

diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 4951c5c5ac35..e0a64f643cb3 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -151,6 +151,8 @@
 #define SV_BUTTONTEXT_ADD                   10112
 #define SV_BUTTONTEXT_DELETE                10113
 #define SV_BUTTONTEXT_REMOVE                10114
+#define SV_BUTTONTEXT_NEW                   10115
+#define SV_BUTTONTEXT_EDIT                  10116
 
 #define SV_STDTEXT_FIRST                    SV_STDTEXT_SERVICENOTAVAILABLE
 #define SV_STDTEXT_SERVICENOTAVAILABLE      10200
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
index d415a1fa3b12..8bfbdbbe568c 100644
--- a/vcl/source/src/btntext.src
+++ b/vcl/source/src/btntext.src
@@ -96,3 +96,13 @@ String SV_BUTTONTEXT_REMOVE
 {
     Text [ en-US ] = "~Remove";
 };
+
+String SV_BUTTONTEXT_NEW
+{
+    Text [ en-US ] = "~New";
+};
+
+String SV_BUTTONTEXT_EDIT
+{
+    Text [ en-US ] = "~Edit";
+};
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 073be0d802c1..735bde150d71 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -332,6 +332,32 @@ namespace
         return bInconsistent;
     }
 
+    OUString getStockText(const OString &rType)
+    {
+        if (rType == "gtk-ok")
+            return (VclResId(SV_BUTTONTEXT_OK).toString());
+        else if (rType == "gtk-cancel")
+            return (VclResId(SV_BUTTONTEXT_CANCEL).toString());
+        else if (rType == "gtk-help")
+            return (VclResId(SV_BUTTONTEXT_HELP).toString());
+        else if (rType == "gtk-close")
+            return (VclResId(SV_BUTTONTEXT_CLOSE).toString());
+        else if (rType == "gtk-revert-to-saved")
+            return (VclResId(SV_BUTTONTEXT_RESET).toString());
+        else if (rType == "gtk-add")
+            return (VclResId(SV_BUTTONTEXT_ADD).toString());
+        else if (rType == "gtk-delete")
+            return (VclResId(SV_BUTTONTEXT_DELETE).toString());
+        else if (rType == "gtk-remove")
+            return (VclResId(SV_BUTTONTEXT_REMOVE).toString());
+        else if (rType == "gtk-new")
+            return (VclResId(SV_BUTTONTEXT_NEW).toString());
+        else if (rType == "gtk-edit")
+            return (VclResId(SV_BUTTONTEXT_EDIT).toString());
+        SAL_WARN("vcl.layout", "unknown stock type: " << rType.getStr());
+        return OUString();
+    }
+
     Window * extractStockAndBuildButton(Window *pParent, VclBuilder::stringmap &rMap)
     {
         WinBits nBits = WB_CENTER|WB_VCENTER|WB_3DLOOK;
@@ -374,39 +400,10 @@ namespace
                 pBtn->SetSymbol(SYMBOL_PREV);
                 pWindow = pBtn;
             }
-            else if (sType == "gtk-close")
-            {
-                PushButton *pBtn = new PushButton(pParent, nBits);
-                pBtn->SetText(VclResId(SV_BUTTONTEXT_CLOSE).toString());
-                pWindow = pBtn;
-            }
-            else if (sType == "gtk-revert-to-saved")
-            {
-                PushButton *pBtn = new PushButton(pParent, nBits);
-                pBtn->SetText(VclResId(SV_BUTTONTEXT_RESET).toString());
-                pWindow = pBtn;
-            }
-            else if (sType == "gtk-add")
-            {
-                PushButton *pBtn = new PushButton(pParent, nBits);
-                pBtn->SetText(VclResId(SV_BUTTONTEXT_ADD).toString());
-                pWindow = pBtn;
-            }
-            else if (sType == "gtk-delete")
-            {
-                PushButton *pBtn = new PushButton(pParent, nBits);
-                pBtn->SetText(VclResId(SV_BUTTONTEXT_DELETE).toString());
-                pWindow = pBtn;
-            }
-            else if (sType == "gtk-remove")
-            {
-                PushButton *pBtn = new PushButton(pParent, nBits);
-                pBtn->SetText(VclResId(SV_BUTTONTEXT_REMOVE).toString());
-                pWindow = pBtn;
-            }
             else
             {
-                SAL_WARN("vcl.layout", "unknown stock type: " << sType.getStr());
+                pWindow = new PushButton(pParent, nBits);
+                pWindow->SetText(getStockText(sType));
             }
         }