extras/source/glade/libreoffice-catalog.xml.in | 4 -
include/svx/langbox.hxx | 18 ------
solenv/bin/native-code.py | 1
svx/source/dialog/langbox.cxx | 70 -------------------------
4 files changed, 93 deletions(-)
New commits:
commit 6a902b238324d4d0c3c45819c2b23e6973d40a29
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Oct 14 11:22:46 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Oct 17 14:35:57 2019 +0200
SvxLanguageBox is now unused
Change-Id: I5aafb53bb9885b8b0b43161f1afc79852b1d89a3
Reviewed-on: https://gerrit.libreoffice.org/80767
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 4ecc596ffec1..a370ccbf8041 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -136,10 +136,6 @@
generic-name="PropertyControl" parent="GtkComboBoxText"
icon-name="widget-gtk-comboboxtext"/>
- <glade-widget-class title="Language ListBox"
name="svxcorelo-SvxLanguageBox"
- generic-name="LanguageBox" parent="GtkComboBoxText"
- icon-name="widget-gtk-combobox"/>
-
<glade-widget-class title="Fill Type ListBox" name="svxlo-SvxFillTypeBox"
generic-name="Fill Type ListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 9f93df3ea341..ad686bf39cd0 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -89,24 +89,6 @@ protected:
SVX_DLLPRIVATE virtual sal_Int32 ImplGetEntryPos( const void* pData )
const = 0;
};
-
-class SVX_DLLPUBLIC SvxLanguageBox : public ListBox, public SvxLanguageBoxBase
-{
-public:
- SvxLanguageBox( vcl::Window* pParent, WinBits nBits );
-
-private:
- SVX_DLLPRIVATE virtual sal_Int32 ImplInsertImgEntry( const OUString&
rEntry, sal_Int32 nPos, bool bChecked ) override;
-
- SVX_DLLPRIVATE virtual void ImplClear() override;
- SVX_DLLPRIVATE virtual sal_Int32 ImplInsertEntry( const OUString&
rEntry, sal_Int32 nPos ) override;
- SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos,
void* pData ) override;
- SVX_DLLPRIVATE virtual sal_Int32 ImplGetSelectedEntryPos() const
override;
- SVX_DLLPRIVATE virtual void* ImplGetEntryData( sal_Int32 nPos )
const override;
- SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos,
bool bSelect ) override;
- SVX_DLLPRIVATE virtual sal_Int32 ImplGetEntryPos( const void* pData )
const override;
-};
-
class SVX_DLLPUBLIC LanguageBox
{
public:
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 8f37e476d0e6..eb3fc15740bb 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -505,7 +505,6 @@ custom_widgets = [
'SvxColorValueSet',
'SvxFillAttrBox',
'SvxFillTypeBox',
- 'SvxLanguageBox',
'SvxLightCtl3D',
'SvxRelativeField',
'SwNavHelpToolBox',
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index eb099005d2e6..8403b67fdbe9 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -33,7 +33,6 @@
#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <bitmaps.hlst>
-#include <vcl/builderfactory.hxx>
#include <vcl/i18nhelp.hxx>
using namespace ::com::sun::star::util;
@@ -65,10 +64,7 @@ OUString GetDicInfoStr( const OUString& rName, const
LanguageType nLang, bool bN
return aTmp;
}
-
// misc local helper functions
-
-
static std::vector< LanguageType > lcl_LocaleSeqToLangSeq( Sequence<
css::lang::Locale > const &rSeq )
{
sal_Int32 nCount = rSeq.getLength();
@@ -83,28 +79,12 @@ static std::vector< LanguageType > lcl_LocaleSeqToLangSeq(
Sequence< css::lang::
return aLangs;
}
-
static bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16
nLang )
{
return rLangSeq.hasElements()
&& std::find(rLangSeq.begin(), rLangSeq.end(), nLang) !=
rLangSeq.end();
}
-extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxLanguageBox(VclPtr<vcl::Window> &
rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
-{
-
static_assert(std::is_same_v<std::remove_pointer_t<VclBuilder::customMakeWidget>,
- decltype(makeSvxLanguageBox)>);
- WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
- bool bDropdown = BuilderUtils::extractDropdown(rMap);
- if (bDropdown)
- nBits |= WB_DROPDOWN;
- else
- nBits |= WB_BORDER;
- VclPtrInstance<SvxLanguageBox> pLanguageBox(pParent, nBits);
- pLanguageBox->EnableAutoSize(true);
- rRet = pLanguageBox;
-}
-
SvxLanguageBoxBase::SvxLanguageBoxBase()
: m_bWithCheckmark(false)
{
@@ -706,56 +686,6 @@ LanguageBox::LanguageBox(std::unique_ptr<weld::ComboBox>
pControl)
m_xControl->connect_changed(LINK(this, LanguageBox, ChangeHdl));
}
-SvxLanguageBox::SvxLanguageBox( vcl::Window* pParent, WinBits nBits )
- : ListBox( pParent, nBits )
- , SvxLanguageBoxBase()
-{
- // display entries sorted
- SetStyle( GetStyle() | WB_SORT );
-
- ImplLanguageBoxBaseInit();
-}
-
-sal_Int32 SvxLanguageBox::ImplInsertImgEntry( const OUString& rEntry,
sal_Int32 nPos, bool bChecked )
-{
- return InsertEntry( rEntry, (bChecked ? m_aCheckedImage :
m_aNotCheckedImage), nPos );
-}
-
-void SvxLanguageBox::ImplClear()
-{
- Clear();
-}
-
-sal_Int32 SvxLanguageBox::ImplInsertEntry( const OUString& rEntry, sal_Int32
nPos )
-{
- return InsertEntry( rEntry, nPos);
-}
-
-void SvxLanguageBox::ImplSetEntryData( sal_Int32 nPos, void* pData )
-{
- SetEntryData( nPos, pData);
-}
-
-sal_Int32 SvxLanguageBox::ImplGetSelectedEntryPos() const
-{
- return GetSelectedEntryPos();
-}
-
-void* SvxLanguageBox::ImplGetEntryData( sal_Int32 nPos ) const
-{
- return GetEntryData( nPos);
-}
-
-void SvxLanguageBox::ImplSelectEntryPos( sal_Int32 nPos, bool bSelect )
-{
- SelectEntryPos( nPos, bSelect);
-}
-
-sal_Int32 SvxLanguageBox::ImplGetEntryPos( const void* pData ) const
-{
- return GetEntryPos( pData);
-}
-
sal_Int32 LanguageBox::SaveEditedAsEntry()
{
if (m_eEditedAndValid != EditedAndValid::Valid)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
