extras/source/glade/libreoffice-catalog.xml.in | 12 --
include/svx/txencbox.hxx | 44 --------
solenv/bin/native-code.py | 2
svx/source/dialog/txencbox.cxx | 123 -------------------------
4 files changed, 181 deletions(-)
New commits:
commit 9d04e52257ea85c16d21ca78bebb3fb13fe99c60
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Oct 14 11:08:09 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Oct 17 13:38:25 2019 +0200
SvxTextEncodingBox is now unused
Change-Id: I0276d79cd713357d36d504e8501cd1b979e86c9c
Reviewed-on: https://gerrit.libreoffice.org/80766
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 c915344ed631..4ecc596ffec1 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -74,18 +74,6 @@
</properties>
</glade-widget-class>
- <glade-widget-class title="Text Encoding ListBox"
name="svxlo-SvxTextEncodingBox"
- generic-name="TextEncodingBox" parent="GtkComboBox"
- icon-name="widget-gtk-combobox">
- <properties>
- <property save="True" query="False" id="dropdown" default="True"
name="Use DropDown">
- <parameter-spec>
- <type>GParamBoolean</type>
- </parameter-spec>
- </property>
- </properties>
- </glade-widget-class>
-
<glade-widget-class title="Document Preview Window"
name="sdlo-SdDocPreviewWin"
generic-name="Document Preview Window"
parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index 9745dc3f84e2..e5a7b250f1d2 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -19,54 +19,10 @@
#ifndef INCLUDED_SVX_TXENCBOX_HXX
#define INCLUDED_SVX_TXENCBOX_HXX
-#include <vcl/lstbox.hxx>
#include <vcl/weld.hxx>
#include <rtl/textenc.h>
#include <svx/svxdllapi.h>
-class SVX_DLLPUBLIC SvxTextEncodingBox : public ListBox
-{
-private:
- SVX_DLLPRIVATE sal_Int32 EncodingToPos_Impl(
rtl_TextEncoding nEnc ) const;
-
-public:
- SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits );
- virtual ~SvxTextEncodingBox() override;
-
- /** Fill with all known encodings but exclude those matching one or more
- given flags as defined in rtl/tencinfo.h
-
- <p> If nButIncludeInfoFlags is given, encodings are included even if
they
- match nExcludeInfoFlags. Thus it is possible to exclude 16/32-bit
- Unicode with RTL_TEXTENCODING_INFO_UNICODE but to include UTF7 and
UTF8
- with RTL_TEXTENCODING_INFO_MIME </p>
-
- @param bExcludeImportSubsets
- If <TRUE/>, some specific encodings are not listed, as they are a
- subset of another encoding. This is the case for
- RTL_TEXTENCODING_GB_2312, RTL_TEXTENCODING_GBK,
- RTL_TEXTENCODING_MS_936, which are covered by
- RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
- <TRUE/> whenever the box is used in import dialogs. */
- void FillFromTextEncodingTable(
- bool bExcludeImportSubsets,
- sal_uInt32 nExcludeInfoFlags = 0,
- sal_uInt32 nButIncludeInfoFlags = 0
- );
-
- /** Fill with all known MIME encodings and select the best according to
- <method>GetBestMimeEncoding</method>
- */
- void FillWithMimeAndSelectBest();
-
- void InsertTextEncoding( const rtl_TextEncoding nEnc,
- const OUString& rEntry );
-
- void SelectTextEncoding( const rtl_TextEncoding nEnc );
-
- rtl_TextEncoding GetSelectTextEncoding() const;
-};
-
class SVX_DLLPUBLIC TextEncodingBox
{
private:
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index ab2f87894b80..8f37e476d0e6 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -508,8 +508,6 @@ custom_widgets = [
'SvxLanguageBox',
'SvxLightCtl3D',
'SvxRelativeField',
- 'SvxTextEncodingBox',
- 'SvxTextEncodingBox',
'SwNavHelpToolBox',
'TableValueSet',
'TemplateDefaultView',
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index ab64466281ae..017950da6425 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -26,7 +26,6 @@
#if HAVE_FEATURE_DBCONNECTIVITY
#include <svx/dbcharsethelper.hxx>
#endif
-#include <vcl/builderfactory.hxx>
#include <unotools/syslocale.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
@@ -37,93 +36,6 @@
#include <osl/nlsupport.h>
#include <txenctab.hrc>
-SvxTextEncodingBox::SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits )
- : ListBox( pParent, nBits )
-{
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void
makeSvxTextEncodingBox(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(makeSvxTextEncodingBox)>);
- WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
- bool bDropdown = BuilderUtils::extractDropdown(rMap);
- if (bDropdown)
- nWinBits |= WB_DROPDOWN;
- OUString sBorder = BuilderUtils::extractCustomProperty(rMap);
- if (!sBorder.isEmpty())
- nWinBits |= WB_BORDER;
- VclPtrInstance<SvxTextEncodingBox> pListBox(pParent, nWinBits);
- if (bDropdown)
- pListBox->EnableAutoSize(true);
- rRet = pListBox;
-}
-
-SvxTextEncodingBox::~SvxTextEncodingBox()
-{
- disposeOnce();
-}
-
-sal_Int32 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const
-{
- sal_Int32 nCount = GetEntryCount();
- for ( sal_Int32 i=0; i<nCount; i++ )
- {
- if ( nEnc == rtl_TextEncoding(
reinterpret_cast<sal_uIntPtr>(GetEntryData(i)) ) )
- return i;
- }
- return LISTBOX_ENTRY_NOTFOUND;
-}
-
-
-void SvxTextEncodingBox::FillFromTextEncodingTable(
- bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
- sal_uInt32 nButIncludeInfoFlags )
-{
- rtl_TextEncodingInfo aInfo;
- aInfo.StructSize = sizeof(rtl_TextEncodingInfo);
- const sal_uInt32 nCount = SAL_N_ELEMENTS(RID_SVXSTR_TEXTENCODING_TABLE);
- for (sal_uInt32 j = 0; j < nCount; ++j)
- {
- bool bInsert = true;
- rtl_TextEncoding nEnc = RID_SVXSTR_TEXTENCODING_TABLE[j].second;
- if ( nExcludeInfoFlags )
- {
- if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) )
- bInsert = false;
- else
- {
- if ( (aInfo.Flags & nExcludeInfoFlags) == 0 )
- {
- if ( (nExcludeInfoFlags & RTL_TEXTENCODING_INFO_UNICODE) &&
- ((nEnc == RTL_TEXTENCODING_UCS2) ||
- nEnc == RTL_TEXTENCODING_UCS4) )
- bInsert = false; // InfoFlags don't work for
Unicode :-(
- }
- else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 )
- bInsert = false;
- }
- }
- if ( bInsert )
- {
- if ( bExcludeImportSubsets )
- {
- switch ( nEnc )
- {
- // subsets of RTL_TEXTENCODING_GB_18030
- case RTL_TEXTENCODING_GB_2312 :
- case RTL_TEXTENCODING_GBK :
- case RTL_TEXTENCODING_MS_936 :
- bInsert = false;
- break;
- }
- }
- if ( bInsert )
- InsertTextEncoding(nEnc,
SvxResId(RID_SVXSTR_TEXTENCODING_TABLE[j].first));
- }
- }
-}
-
namespace
{
std::vector<rtl_TextEncoding> FillFromDbTextEncodingMap(bool
bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags)
@@ -204,41 +116,6 @@ void TextEncodingTreeView::FillFromDbTextEncodingMap(
m_xControl->thaw();
}
-void SvxTextEncodingBox::FillWithMimeAndSelectBest()
-{
- FillFromTextEncodingTable( false, 0xffffffff, RTL_TEXTENCODING_INFO_MIME );
- rtl_TextEncoding nEnc = SvtSysLocale::GetBestMimeEncoding();
- SelectTextEncoding( nEnc );
-}
-
-
-void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc,
- const OUString& rEntry )
-{
- sal_Int32 nAt = InsertEntry( rEntry );
- SetEntryData( nAt, reinterpret_cast<void*>(nEnc) );
-}
-
-
-rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const
-{
- sal_Int32 nPos = GetSelectedEntryPos();
-
- if ( nPos != LISTBOX_ENTRY_NOTFOUND )
- return rtl_TextEncoding(
reinterpret_cast<sal_uIntPtr>(GetEntryData(nPos)) );
- else
- return RTL_TEXTENCODING_DONTKNOW;
-}
-
-
-void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc )
-{
- sal_Int32 nAt = EncodingToPos_Impl( nEnc );
-
- if ( nAt != LISTBOX_ENTRY_NOTFOUND )
- SelectEntryPos( nAt );
-}
-
TextEncodingBox::TextEncodingBox(std::unique_ptr<weld::ComboBox> pControl)
: m_xControl(std::move(pControl))
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
