[Libreoffice-commits] core.git: cui/inc cui/source include/svx

Michael Weghorn (via logerrit) logerrit at kemper.freedesktop.org
Thu Mar 4 07:15:37 UTC 2021


 cui/inc/strings.hrc            |   12 ------------
 cui/source/tabpages/border.cxx |    1 +
 include/svx/strings.hrc        |   15 +++++++++++++++
 3 files changed, 16 insertions(+), 12 deletions(-)

New commits:
commit 0cbd8a5d4571cdf3601ca8deb64d734d35e234f9
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Mar 3 11:03:42 2021 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Thu Mar 4 08:14:54 2021 +0100

    tdf#140762  Move RIDs related to borders to include/svx
    
    They'll be reused for the items in the "Borders" dropdown
    button in Calc's formatting toolbar in a subsequent step.
    
    Change-Id: I895d787d185a69f7aa7d3db3c490271184152ddb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111870
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 257fa4ae554f..9ec01b758738 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -349,18 +349,6 @@
 #define RID_SVXSTR_STARTQUOTE                       NC_("RID_SVXSTR_STARTQUOTE", "Start Quote")
 #define RID_SVXSTR_ENDQUOTE                         NC_("RID_SVXSTR_ENDQUOTE", "End Quote")
 
-#define RID_SVXSTR_TABLE_PRESET_NONE                NC_("RID_SVXSTR_TABLE_PRESET_NONE", "Set No Borders")
-#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER           NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Set Outer Border Only")
-#define RID_SVXSTR_TABLE_PRESET_OUTERHORI           NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Set Outer Border and Horizontal Lines")
-#define RID_SVXSTR_TABLE_PRESET_OUTERALL            NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Set Outer Border and All Inner Lines")
-#define RID_SVXSTR_TABLE_PRESET_OUTERINNER          NC_("RID_SVXSTR_TABLE_PRESET_OUTERINNER", "Set Outer Border Without Changing Inner Lines")
-#define RID_SVXSTR_PARA_PRESET_DIAGONAL             NC_("RID_SVXSTR_PARA_PRESET_DIAGONAL", "Set Diagonal Lines Only")
-#define RID_SVXSTR_PARA_PRESET_ALL                  NC_("RID_SVXSTR_PARA_PRESET_ALL", "Set All Four Borders")
-#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT            NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Set Left and Right Borders Only")
-#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM            NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Set Top and Bottom Borders Only")
-#define RID_SVXSTR_PARA_PRESET_ONLYLEFT             NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFT", "Set Left Border Only")
-#define RID_SVXSTR_HOR_PRESET_ONLYHOR               NC_("RID_SVXSTR_HOR_PRESET_ONLYHOR", "Set Top and Bottom Borders, and All Inner Lines")
-#define RID_SVXSTR_VER_PRESET_ONLYVER               NC_("RID_SVXSTR_VER_PRESET_ONLYVER", "Set Left and Right Borders, and All Inner Lines")
 #define RID_SVXSTR_SHADOW_STYLE_NONE                NC_("RID_SVXSTR_SHADOW_STYLE_NONE", "No Shadow")
 #define RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT         NC_("RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT", "Cast Shadow to Bottom Right")
 #define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT            NC_("RID_SVXSTR_SHADOW_STYLE_TOPRIGHT", "Cast Shadow to Top Right")
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index b6e3d8d39ed5..cb7429928d44 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -22,6 +22,7 @@
 #include <string_view>
 
 #include <sfx2/objsh.hxx>
+#include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 
 #include <strings.hrc>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index b2c3822757dd..c8f71976d322 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1759,6 +1759,21 @@
 
 #define RID_SVXSTR_TRANSPARENCY                             NC_("RID_SVXSTR_TRANSPARENCY", "Transparency:")
 
+
+// strings related to borders
+#define RID_SVXSTR_TABLE_PRESET_NONE                NC_("RID_SVXSTR_TABLE_PRESET_NONE", "Set No Borders")
+#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER           NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Set Outer Border Only")
+#define RID_SVXSTR_TABLE_PRESET_OUTERHORI           NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Set Outer Border and Horizontal Lines")
+#define RID_SVXSTR_TABLE_PRESET_OUTERALL            NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Set Outer Border and All Inner Lines")
+#define RID_SVXSTR_TABLE_PRESET_OUTERINNER          NC_("RID_SVXSTR_TABLE_PRESET_OUTERINNER", "Set Outer Border Without Changing Inner Lines")
+#define RID_SVXSTR_PARA_PRESET_DIAGONAL             NC_("RID_SVXSTR_PARA_PRESET_DIAGONAL", "Set Diagonal Lines Only")
+#define RID_SVXSTR_PARA_PRESET_ALL                  NC_("RID_SVXSTR_PARA_PRESET_ALL", "Set All Four Borders")
+#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT            NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Set Left and Right Borders Only")
+#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM            NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Set Top and Bottom Borders Only")
+#define RID_SVXSTR_PARA_PRESET_ONLYLEFT             NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFT", "Set Left Border Only")
+#define RID_SVXSTR_HOR_PRESET_ONLYHOR               NC_("RID_SVXSTR_HOR_PRESET_ONLYHOR", "Set Top and Bottom Borders, and All Inner Lines")
+#define RID_SVXSTR_VER_PRESET_ONLYVER               NC_("RID_SVXSTR_VER_PRESET_ONLYVER", "Set Left and Right Borders, and All Inner Lines")
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list