cui/source/tabpages/tpline.cxx | 8 ++++++--
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 5 ++++-
svx/source/tbxctrls/linectrl.cxx | 6 +++++-
svx/source/tbxctrls/tbcontrl.cxx | 8 ++++++--
svx/source/xoutdev/xattr2.cxx | 4 +++-
svx/source/xoutdev/xtabdash.cxx | 5 ++++-
6 files changed, 28 insertions(+), 8 deletions(-)
New commits:
commit b214ef1f016f7470c363987e28dafea03333b0a4
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Mon Feb 24 13:34:03 2020 -0400
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 25 21:47:58 2020 +0100
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/+/89368
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index b4498348c8ed..790c6dd3e082 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -53,6 +53,7 @@
#include <svx/strings.hrc>
#include <vcl/settings.hxx>
#include <cuitabarea.hxx>
+#include <comphelper/lok.hxx>
#define MAX_BMP_WIDTH 16
#define MAX_BMP_HEIGHT 16
@@ -227,7 +228,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);
@@ -289,7 +291,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/sidebar/line/LinePropertyPanelBase.cxx
b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index 50da4a9d6b14..824ee8126095 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -47,6 +47,8 @@
#include <svx/xlinjoit.hxx>
#include <bitmaps.hlst>
+#include <comphelper/lok.hxx>
+
using namespace css;
using namespace css::uno;
@@ -58,7 +60,8 @@ namespace
void FillLineEndListBox(ListBox& rListBoxStart, ListBox& rListBoxEnd, const
XLineEndList& rList, const BitmapEx& rBitmapZero)
{
const sal_uInt32 nCount(rList.Count());
- const OUString sNone(SvxResId(RID_SVXSTR_NONE));
+ const OUString sNone(comphelper::LibreOfficeKit::isActive() ?
SvxResId(RID_SVXSTR_INVISIBLE)
+ : SvxResId(RID_SVXSTR_NONE));
rListBoxStart.SetUpdateMode(false);
rListBoxEnd.SetUpdateMode(false);
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 1f158dab2855..fa67f56f7fb5 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -41,6 +41,8 @@
#include <memory>
#include <o3tl/make_unique.hxx>
+#include <comphelper/lok.hxx>
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::util;
@@ -370,7 +372,9 @@ void SvxLineEndWindow::FillValueSet()
// First entry: no line end.
// An entry is temporarily added to get the UI bitmap
basegfx::B2DPolyPolygon aNothing;
- mpLineEndList->Insert(o3tl::make_unique<XLineEndEntry>(aNothing,
SvxResId(RID_SVXSTR_NONE)));
+ mpLineEndList->Insert(o3tl::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 6aa577dbf859..7c4bf4ad20e0 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -109,6 +109,8 @@
#include <sal/log.hxx>
#include <unotools/collatorwrapper.hxx>
+#include <comphelper/lok.hxx>
+
#define MAX_MRU_FONTNAME_ENTRIES 5
// don't make more than 15 entries visible at once
@@ -1640,7 +1642,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));
}
}
@@ -2376,7 +2379,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 f81f42eaf6e0..403039134829 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -34,6 +34,8 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <comphelper/lok.hxx>
+
#include <libxml/xmlwriter.h>
XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) :
@@ -99,7 +101,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 9efd16a141fd..706d67168b79 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
