tdf#146468: Match border tooltips in toolbar/sidebar

Update the border tooltips within Calc's toolbar and sidebar so that they
have matching descriptions.

Also update tooltips in Writer toolbar so that descriptions match across
both apps.

Change-Id: Ib7c682ed5035fe61d991209c4f2cf7f0a1a08a5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169052
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Stéphane Guillou <stephane.guillou@libreoffice.org>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169328
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>

6 files changed, 57 insertions, 29 deletions

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index fe07cc5d8221..330f8f77aa17 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -1377,8 +1377,8 @@ TranslateId SvxBorderTabPage::GetPresetStringId( sal_uInt16 nValueSetIdx ) const
     {
         RID_SVXSTR_TABLE_PRESET_NONE,
         RID_SVXSTR_PARA_PRESET_ALL,
-        RID_SVXSTR_PARA_PRESET_LEFTRIGHT,
-        RID_SVXSTR_PARA_PRESET_TOPBOTTOM,
+        RID_SVXSTR_PARA_PRESET_ONLYLEFTRIGHT,
+        RID_SVXSTR_PARA_PRESET_ONLYTOPBOTTOM,
         RID_SVXSTR_PARA_PRESET_ONLYLEFT,
         RID_SVXSTR_PARA_PRESET_DIAGONAL,
 
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 2b46e77b6b66..cf3c12e12a4e 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1811,7 +1811,8 @@
 
 // strings related to borders
 #define RID_SVXSTR_TABLE_PRESET_NONE                NC_("RID_SVXSTR_TABLE_PRESET_NONE", "No Borders")
-#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER           NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border Only")
+#define RID_SVXSTR_TABLE_PRESET_OUTER               NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border") // Sidebar/toolbar
+#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER           NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border Only") // Format dialog
 #define RID_SVXSTR_TABLE_PRESET_OUTERHORI           NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Outer Border and Horizontal Lines")
 #define RID_SVXSTR_TABLE_PRESET_OUTERALL            NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Outer Border and All Inner Lines")
 #define RID_SVXSTR_TABLE_PRESET_OUTERVERI           NC_("RID_SVXSTR_TABLE_PRESET_OUTERVERI", "Outer Border and Vertical Lines")
@@ -1821,15 +1822,22 @@
 #define RID_SVXSTR_PARA_PRESET_DIAGONALUP           NC_("RID_SVXSTR_PARA_PRESET_DIAGONALUP", "Diagonal Up Border")
 #define RID_SVXSTR_PARA_PRESET_CRISSCROSS           NC_("RID_SVXSTR_PARA_PRESET_CRISSCROSS", "Criss-Cross Border")
 #define RID_SVXSTR_PARA_PRESET_ALL                  NC_("RID_SVXSTR_PARA_PRESET_ALL", "All Four Borders")
-#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT            NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Left and Right Borders Only")
-#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM            NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Top and Bottom Borders Only")
+#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT            NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Left and Right Borders")
+#define RID_SVXSTR_PARA_PRESET_ONLYLEFTRIGHT        NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFTRIGHT", "Left and Right Borders Only")
+#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM            NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Top and Bottom Borders")
+#define RID_SVXSTR_PARA_PRESET_ONLYTOPBOTTOM        NC_("RID_SVXSTR_PARA_PRESET_ONLYTOPBOTTOM", "Top and Bottom Borders Only")
 #define RID_SVXSTR_PARA_PRESET_TOPBOTTOMHORI        NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOMHORI", "Top and Bottom Borders, and All Horizontal Lines")
-#define RID_SVXSTR_PARA_PRESET_ONLYLEFT             NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFT", "Left Border Only")
-#define RID_SVXSTR_PARA_PRESET_ONLYRIGHT            NC_("RID_SVXSTR_PARA_PRESET_ONLYRIGHT", "Right Border Only")
-#define RID_SVXSTR_PARA_PRESET_ONLYTOP              NC_("RID_SVXSTR_PARA_PRESET_ONLYTOP", "Top Border Only")
-#define RID_SVXSTR_PARA_PRESET_ONLYTBOTTOM          NC_("RID_SVXSTR_PARA_PRESET_ONLYTBOTTOM", "Bottom Border Only")
+#define RID_SVXSTR_PARA_PRESET_ONLYLEFT             NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFT", "Left Border")
+#define RID_SVXSTR_PARA_PRESET_ONLYRIGHT            NC_("RID_SVXSTR_PARA_PRESET_ONLYRIGHT", "Right Border")
+#define RID_SVXSTR_PARA_PRESET_ONLYTOP              NC_("RID_SVXSTR_PARA_PRESET_ONLYTOP", "Top Border")
+#define RID_SVXSTR_PARA_PRESET_ONLYBOTTOM           NC_("RID_SVXSTR_PARA_PRESET_ONLYBOTTOM", "Bottom Border")
 #define RID_SVXSTR_HOR_PRESET_ONLYHOR               NC_("RID_SVXSTR_HOR_PRESET_ONLYHOR", "Top and Bottom Borders, and All Inner Lines")
 #define RID_SVXSTR_VER_PRESET_ONLYVER               NC_("RID_SVXSTR_VER_PRESET_ONLYVER", "Left and Right Borders, and All Inner Lines")
+#define RID_SVXSTR_TABLE_PRESET_THICK               NC_("RID_SVXSTR_TABLE_PRESET_THICK", "Thick Box Border")
+#define RID_SVXSTR_TABLE_PRESET_THICKBOTTOM         NC_("RID_SVXSTR_TABLE_PRESET_THICKBOTTOM", "Thick Bottom Border")
+#define RID_SVXSTR_TABLE_PRESET_TOPTHICKBOTTOM      NC_("RID_SVXSTR_TABLE_PRESET_TOPTHICKBOTTOM", "Top and Thick Bottom Borders")
+#define RID_SVXSTR_TABLE_PRESET_DOUBLEBOTTOM        NC_("RID_SVXSTR_TABLE_PRESET_DOUBLEBOTTOM", "Double Bottom Border")
+#define RID_SVXSTR_TABLE_PRESET_TOPDOUBLEBOTTOM     NC_("RID_SVXSTR_TABLE_PRESET_TOPDOUBLEBOTTOM", "Top and Double Bottom Borders")
 
 #define RID_SVXSTR_REMOVE_FAVORITES                 NC_("RID_SVXSTR_REMOVE_FAVORITES", "Remove from Favorites")
 #define RID_SVXSTR_MISSING_CHAR                     NC_("RID_SVXSTR_MISSING_CHAR", "Missing character")
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index b6ec90b18e54..12ac05d23794 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -22,6 +22,8 @@
 #include <editeng/borderline.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <vcl/settings.hxx>
 #include <editeng/lineitem.hxx>
@@ -62,12 +64,30 @@ CellBorderStylePopup::~CellBorderStylePopup()
 
 void CellBorderStylePopup::Initialize()
 {
+    // Tooltip values now controlled in svx/strings.hrc instead of sc/uiconfig/scalc/ui/floatingborderstyle.ui
     mxTBBorder1->connect_clicked ( LINK(this, CellBorderStylePopup, TB1SelectHdl) );
+    mxTBBorder1->set_item_tooltip_text(0, SvxResId(RID_SVXSTR_TABLE_PRESET_NONE));
+    mxTBBorder1->set_item_tooltip_text(1, SvxResId(RID_SVXSTR_TABLE_PRESET_OUTERALL));
+    mxTBBorder1->set_item_tooltip_text(2, SvxResId(RID_SVXSTR_TABLE_PRESET_OUTER));
+    mxTBBorder1->set_item_tooltip_text(3, SvxResId(RID_SVXSTR_TABLE_PRESET_THICK));
 
     mxTBBorder2->connect_clicked ( LINK(this, CellBorderStylePopup, TB2and3SelectHdl) );
+    mxTBBorder2->set_item_tooltip_text(0, SvxResId(RID_SVXSTR_PARA_PRESET_ONLYLEFT));
+    mxTBBorder2->set_item_tooltip_text(1, SvxResId(RID_SVXSTR_PARA_PRESET_ONLYRIGHT));
+    mxTBBorder2->set_item_tooltip_text(2, SvxResId(RID_SVXSTR_PARA_PRESET_ONLYTOP));
+    mxTBBorder2->set_item_tooltip_text(3, SvxResId(RID_SVXSTR_PARA_PRESET_ONLYBOTTOM));
+
     mxTBBorder3->connect_clicked ( LINK(this, CellBorderStylePopup, TB2and3SelectHdl) );
+    mxTBBorder3->set_item_tooltip_text(0, SvxResId(RID_SVXSTR_PARA_PRESET_DIAGONALUP));
+    mxTBBorder3->set_item_tooltip_text(1, SvxResId(RID_SVXSTR_PARA_PRESET_DIAGONALDOWN));
+    mxTBBorder3->set_item_tooltip_text(2, SvxResId(RID_SVXSTR_PARA_PRESET_TOPBOTTOM));
+    mxTBBorder3->set_item_tooltip_text(3, SvxResId(RID_SVXSTR_PARA_PRESET_LEFTRIGHT));
 
     mxTBBorder4->connect_clicked ( LINK(this, CellBorderStylePopup, TB4SelectHdl) );
+    mxTBBorder4->set_item_tooltip_text(0, SvxResId(RID_SVXSTR_TABLE_PRESET_THICKBOTTOM));
+    mxTBBorder4->set_item_tooltip_text(1, SvxResId(RID_SVXSTR_TABLE_PRESET_DOUBLEBOTTOM));
+    mxTBBorder4->set_item_tooltip_text(2, SvxResId(RID_SVXSTR_TABLE_PRESET_TOPTHICKBOTTOM));
+    mxTBBorder4->set_item_tooltip_text(3, SvxResId(RID_SVXSTR_TABLE_PRESET_TOPDOUBLEBOTTOM));
 }
 
 IMPL_LINK(CellBorderStylePopup, TB1SelectHdl, const OUString&, rId, void)
diff --git a/sc/uiconfig/scalc/ui/floatingborderstyle.ui b/sc/uiconfig/scalc/ui/floatingborderstyle.ui
index df407c4b456b..2640d06d051f 100644
--- a/sc/uiconfig/scalc/ui/floatingborderstyle.ui
+++ b/sc/uiconfig/scalc/ui/floatingborderstyle.ui
@@ -31,7 +31,6 @@
                 <child>
                   <object class="GtkToolButton" id="none">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|none|tooltip_text">No Border</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_Empty_18x18.png</property>
                   </object>
                   <packing>
@@ -42,7 +41,6 @@
                 <child>
                   <object class="GtkToolButton" id="all">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|all|tooltip_text">All Borders</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_All_18x18.png</property>
                   </object>
                   <packing>
@@ -53,7 +51,6 @@
                 <child>
                   <object class="GtkToolButton" id="outside">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|outside|tooltip_text">Outside Borders</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_FourBorders_18x18.png</property>
                   </object>
                   <packing>
@@ -64,7 +61,6 @@
                 <child>
                   <object class="GtkToolButton" id="thickbox">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|thickbox|tooltip_text">Thick Box Border</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png</property>
                   </object>
                   <packing>
@@ -87,7 +83,6 @@
                 <child>
                   <object class="GtkToolButton" id="thickbottom">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|thickbottom|tooltip_text">Thick Bottom Border</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png</property>
                   </object>
                   <packing>
@@ -98,7 +93,6 @@
                 <child>
                   <object class="GtkToolButton" id="doublebottom">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|doublebottom|tooltip_text">Double Bottom Border</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_Bottom_Double_18x18.png</property>
                   </object>
                   <packing>
@@ -109,7 +103,6 @@
                 <child>
                   <object class="GtkToolButton" id="topthickbottom">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|topthickbottom|tooltip_text">Top and Thick Bottom Borders</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png</property>
                   </object>
                   <packing>
@@ -120,7 +113,6 @@
                 <child>
                   <object class="GtkToolButton" id="topdoublebottom">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|topdoublebottom|tooltip_text">Top and Double Bottom Borders</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png</property>
                   </object>
                   <packing>
@@ -143,7 +135,6 @@
                 <child>
                   <object class="GtkToolButton" id="left">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|left|tooltip_text">Left Border</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_Left_18x18.png</property>
                   </object>
                   <packing>
@@ -154,7 +145,6 @@
                 <child>
                   <object class="GtkToolButton" id="right">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|right|tooltip_text">Right Border</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_Right_18x18.png</property>
                   </object>
                   <packing>
@@ -165,7 +155,6 @@
                 <child>
                   <object class="GtkToolButton" id="top">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|top|tooltip_text">Top Border</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_Top_18x18.png</property>
                   </object>
                   <packing>
@@ -176,7 +165,6 @@
                 <child>
                   <object class="GtkToolButton" id="bottom">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|bottom|tooltip_text">Bottom Border</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_Bottom_18x18.png</property>
                   </object>
                   <packing>
@@ -199,7 +187,6 @@
                 <child>
                   <object class="GtkToolButton" id="diagup">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|diagup|tooltip_text">Diagonal Up Border</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_RightDiagonal_18x18.png</property>
                   </object>
@@ -211,7 +198,6 @@
                 <child>
                   <object class="GtkToolButton" id="diagdown">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|diagdown|tooltip_text">Diagonal Down Border</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png</property>
                   </object>
@@ -223,7 +209,6 @@
                 <child>
                   <object class="GtkToolButton" id="topbottom">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|topbottom|tooltip_text">Top and Bottom Borders</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_TopAndBottom_18x18.png</property>
                   </object>
@@ -235,7 +220,6 @@
                 <child>
                   <object class="GtkToolButton" id="leftright">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="floatingborderstyle|leftright|tooltip_text">Left and Right Borders</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">sc/res/sidebar/CellBorder_LeftAndRight_18x18.png</property>
                   </object>
diff --git a/solenv/sanitizers/ui/modules/scalc.suppr b/solenv/sanitizers/ui/modules/scalc.suppr
index bdc95e795200..83df53230a57 100644
--- a/solenv/sanitizers/ui/modules/scalc.suppr
+++ b/solenv/sanitizers/ui/modules/scalc.suppr
@@ -45,6 +45,22 @@ sc/uiconfig/scalc/ui/definedatabaserangedialog.ui://GtkLabel[@id='invalid'] orph
 sc/uiconfig/scalc/ui/definename.ui://GtkLabel[@id='label'] orphan-label
 sc/uiconfig/scalc/ui/doubledialog.ui://GtkEntry[@id='value'] no-labelled-by
 sc/uiconfig/scalc/ui/externaldata.ui://GtkLabel[@id='secondsft'] orphan-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='none'] button-no-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='all'] button-no-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='outside'] button-no-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='thickbox'] button-no-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='thickbottom'] button-no-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='doublebottom'] button-no-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='topthickbottom'] button-no-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='topdoublebottom'] button-no-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='left'] button-no-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='right'] button-no-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='top'] button-no-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='bottom'] button-no-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='diagup'] button-no-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='diagdown'] button-no-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='topbottom'] button-no-label
+sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='leftright'] button-no-label
 sc/uiconfig/scalc/ui/fourieranalysisdialog.ui://GtkLabel[@id='error-message'] orphan-label
 sc/uiconfig/scalc/ui/groupbynumber.ui://GtkEntry[@id='edit_by'] no-labelled-by
 sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelFT_H_CUSTOM'] orphan-label
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index e7001b9bfba3..718759e4168f 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2773,9 +2773,9 @@ void SvxFrameWindow_Impl::InitImageList()
             {BitmapEx(RID_SVXBMP_FRAME4), SvxResId(RID_SVXSTR_PARA_PRESET_LEFTRIGHT)},
 
             {BitmapEx(RID_SVXBMP_FRAME5), SvxResId(RID_SVXSTR_PARA_PRESET_ONLYTOP)},
-            {BitmapEx(RID_SVXBMP_FRAME6), SvxResId(RID_SVXSTR_PARA_PRESET_ONLYTBOTTOM)},
+            {BitmapEx(RID_SVXBMP_FRAME6), SvxResId(RID_SVXSTR_PARA_PRESET_ONLYBOTTOM)},
             {BitmapEx(RID_SVXBMP_FRAME7), SvxResId(RID_SVXSTR_PARA_PRESET_TOPBOTTOM)},
-            {BitmapEx(RID_SVXBMP_FRAME8), SvxResId(RID_SVXSTR_TABLE_PRESET_ONLYOUTER)},
+            {BitmapEx(RID_SVXBMP_FRAME8), SvxResId(RID_SVXSTR_TABLE_PRESET_OUTER)},
 
             {BitmapEx(RID_SVXBMP_FRAME9), SvxResId(RID_SVXSTR_PARA_PRESET_TOPBOTTOMHORI)},
             {BitmapEx(RID_SVXBMP_FRAME10), SvxResId(RID_SVXSTR_TABLE_PRESET_OUTERHORI)},
@@ -2796,9 +2796,9 @@ void SvxFrameWindow_Impl::InitImageList()
             {BitmapEx(RID_SVXBMP_FRAME14), SvxResId(RID_SVXSTR_PARA_PRESET_DIAGONALDOWN)}, // diagonal down border
 
             {BitmapEx(RID_SVXBMP_FRAME5), SvxResId(RID_SVXSTR_PARA_PRESET_ONLYTOP)},
-            {BitmapEx(RID_SVXBMP_FRAME6), SvxResId(RID_SVXSTR_PARA_PRESET_ONLYTBOTTOM)},
+            {BitmapEx(RID_SVXBMP_FRAME6), SvxResId(RID_SVXSTR_PARA_PRESET_ONLYBOTTOM)},
             {BitmapEx(RID_SVXBMP_FRAME7), SvxResId(RID_SVXSTR_PARA_PRESET_TOPBOTTOM)},
-            {BitmapEx(RID_SVXBMP_FRAME8), SvxResId(RID_SVXSTR_TABLE_PRESET_ONLYOUTER)},
+            {BitmapEx(RID_SVXBMP_FRAME8), SvxResId(RID_SVXSTR_TABLE_PRESET_OUTER)},
             {BitmapEx(RID_SVXBMP_FRAME13), SvxResId(RID_SVXSTR_PARA_PRESET_DIAGONALUP)}, // diagonal up border
 
             {BitmapEx(RID_SVXBMP_FRAME9), SvxResId(RID_SVXSTR_PARA_PRESET_TOPBOTTOMHORI)},