lok: use "None" string item in the ListBox control

The string item "- none -" confuse mobile users,
it is preferable to use the "None" string

Change-Id: Ib9b5716aa796624255fed7fac5413db69e028bb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89839
Tested-by: Jenkins
Reviewed-by: Henry Castro <hcastro@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94513
Tested-by: Henry Castro <hcastro@collabora.com>

5 files changed, 24 insertions, 7 deletions

diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index beb9018d4361..29c998734e32 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -63,6 +63,7 @@
 #include <vcl/settings.hxx>
 #include <cuitabarea.hxx>
 #include <svtools/unitconv.hxx>
+#include <comphelper/lok.hxx>
 
 #define MAX_BMP_WIDTH   16
 #define MAX_BMP_HEIGHT  16
@@ -230,7 +231,8 @@ void SvxLineTabPage::FillListboxes()
     m_xLbLineStyle->set_active( nOldSelect );
 
     // Line end style
-    OUString sNone( SvxResId( RID_SVXSTR_NONE ) );
+    OUString sNone( comphelper::LibreOfficeKit::isActive() ? SvxResId( RID_SVXSTR_INVISIBLE )
+        : SvxResId( RID_SVXSTR_NONE ) );
     nOldSelect = m_xLbStartStyle->get_active();
     m_xLbStartStyle->clear();
     m_xLbStartStyle->append_text(sNone);
@@ -292,7 +294,9 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
             *m_pnLineEndListState = ChangeType::NONE;
 
             nPos = m_xLbLineStyle->get_active();
-            OUString sNone(SvxResId(RID_SVXSTR_NONE));
+            OUString sNone( comphelper::LibreOfficeKit::isActive() ? SvxResId( RID_SVXSTR_INVISIBLE )
+                : SvxResId( RID_SVXSTR_NONE ) );
+
             m_xLbStartStyle->clear();
             m_xLbStartStyle->append_text(sNone);
 
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index dfe0be2dd57c..2d4506dbde6f 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -45,6 +45,8 @@
 #include <svx/unoapi.hxx>
 #include <memory>
 
+#include <comphelper/lok.hxx>
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
@@ -378,7 +380,9 @@ void SvxLineEndWindow::FillValueSet()
     // First entry: no line end.
     // An entry is temporarily added to get the UI bitmap
     basegfx::B2DPolyPolygon aNothing;
-    mpLineEndList->Insert(std::make_unique<XLineEndEntry>(aNothing, SvxResId(RID_SVXSTR_NONE)));
+    mpLineEndList->Insert(std::make_unique<XLineEndEntry>(aNothing,
+        comphelper::LibreOfficeKit::isActive() ? SvxResId(RID_SVXSTR_INVISIBLE)
+            : SvxResId(RID_SVXSTR_NONE)));
     const XLineEndEntry* pEntry = mpLineEndList->GetLineEnd(nCount);
     BitmapEx aBmp = mpLineEndList->GetUiBitmap( nCount );
     OSL_ENSURE( !aBmp.IsEmpty(), "UI bitmap was not created" );
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 6741954f7581..6385517cc321 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -117,6 +117,8 @@
 #include <unotools/collatorwrapper.hxx>
 #include <boost/property_tree/ptree.hpp>
 
+#include <comphelper/lok.hxx>
+
 #define MAX_MRU_FONTNAME_ENTRIES    5
 
 // don't make more than 15 entries visible at once
@@ -1971,7 +1973,8 @@ namespace
 
     NamedColor GetNoneColor()
     {
-        return std::make_pair(COL_NONE_COLOR, SvxResId(RID_SVXSTR_NONE));
+        return std::make_pair(COL_NONE_COLOR, comphelper::LibreOfficeKit::isActive() ? SvxResId(RID_SVXSTR_INVISIBLE)
+            : SvxResId(RID_SVXSTR_NONE));
     }
 }
 
@@ -2709,7 +2712,8 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( svt::ToolboxController& rController, vcl
     SetOutputSizePixel( Size( 114, 144 ) );
 
     m_aLineStyleLb->SetSourceUnit( FieldUnit::TWIP );
-    m_aLineStyleLb->SetNone( SvxResId(RID_SVXSTR_NONE) );
+    m_aLineStyleLb->SetNone( comphelper::LibreOfficeKit::isActive() ? SvxResId(RID_SVXSTR_INVISIBLE)
+        :SvxResId(RID_SVXSTR_NONE) );
 
     m_aLineStyleLb->InsertEntry( SvxBorderLine::getWidthImpl( SvxBorderLineStyle::SOLID ), SvxBorderLineStyle::SOLID );
     m_aLineStyleLb->InsertEntry( SvxBorderLine::getWidthImpl( SvxBorderLineStyle::DOTTED ), SvxBorderLineStyle::DOTTED );
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 6a59871ce1d2..83ab1904d8b4 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -47,6 +47,8 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
+#include <comphelper/lok.hxx>
+
 #include <libxml/xmlwriter.h>
 
 XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) :
@@ -107,7 +109,7 @@ bool XLineJointItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*e
     {
         case css::drawing::LineJoint::LineJoint_MAKE_FIXED_SIZE:
         case css::drawing::LineJoint_NONE:
-            pId = RID_SVXSTR_NONE;
+            pId = comphelper::LibreOfficeKit::isActive() ? RID_SVXSTR_INVISIBLE : RID_SVXSTR_NONE;
         break;
 
         case css::drawing::LineJoint_MIDDLE:
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 2a73fe02ef04..4155b5eebd02 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -27,6 +27,8 @@
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
 
+#include <comphelper/lok.hxx>
+
 #include <drawinglayer/attribute/lineattribute.hxx>
 #include <drawinglayer/attribute/strokeattribute.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
@@ -211,7 +213,8 @@ OUString const & XDashList::GetStringForUiNoLine() const
     {
         // formerly was RID_SVXSTR_INVISIBLE, but to make equal
         // everywhere, use RID_SVXSTR_NONE
-        const_cast< XDashList* >(this)->maStringNoLine = SvxResId(RID_SVXSTR_NONE);
+        const_cast< XDashList* >(this)->maStringNoLine = comphelper::LibreOfficeKit::isActive() ? SvxResId(RID_SVXSTR_INVISIBLE) :
+            SvxResId(RID_SVXSTR_NONE);
     }
 
     return maStringNoLine;