[Libreoffice-commits] core.git: extras/source include/svx solenv/bin svx/source
extras/source/glade/libreoffice-catalog.xml.in |3 ---
include/svx/relfld.hxx |7 ---
solenv/bin/native-code.py |1 -
svx/source/dialog/relfld.cxx | 23 ---
4 files changed, 34 deletions(-)
New commits:
commit 075e365e20a75dd12c29b0b094fea986f3e1231a
Author: Caolán McNamara
AuthorDate: Sat Feb 1 14:31:09 2020 +
Commit: Caolán McNamara
CommitDate: Sun Feb 2 21:39:58 2020 +0100
SvxRelativeField is newly unused
Change-Id: Iaeb72e9aa7276736632a66f1eb75277a696e91e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87831
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 903553e985b5..b132e58b18f5 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -82,9 +82,6 @@
-
#include
-#include
#include
#include
-class SAL_DLLPUBLIC_RTTI SvxRelativeField final : public MetricField
-{
-public:
-SvxRelativeField(vcl::Window* pParent, WinBits nBits, FieldUnit eUnit);
-};
-
class SVX_DLLPUBLIC RelativeField
{
private:
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 9f4704e82074..f8133a6d7723 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -515,7 +515,6 @@ custom_widgets = [
'SearchResultsBox',
'SidebarToolBox',
'SvxColorValueSet',
-'SvxRelativeField',
'TemplateDefaultView',
]
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index a6609d2009a4..d8db417a9717 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -18,29 +18,6 @@
*/
#include
-#include
-
-SvxRelativeField::SvxRelativeField(
-vcl::Window *const pParent, WinBits const nBits, FieldUnit const eUnit)
-: MetricField( pParent, nBits)
-{
-SetUnit(eUnit);
-SetDecimalDigits( 2 );
-SetMin( 0 );
-SetMax( );
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxRelativeField(VclPtr
& rRet, const VclPtr & pParent, VclBuilder::stringmap & rMap)
-{
-
static_assert(std::is_same_v,
- decltype(makeSvxRelativeField)>);
-OUString const custom(BuilderUtils::extractCustomProperty(rMap));
-FieldUnit const eUnit(BuilderUtils::detectUnit(custom));
-rRet = VclPtr::Create(pParent,
-WB_BORDER | WB_SPIN | WB_REPEAT |
-WB_LEFT | WB_GROUP,
-eUnit);
-}
RelativeField::RelativeField(std::unique_ptr pControl)
: m_xSpinButton(std::move(pControl))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source include/svx solenv/bin svx/source
extras/source/glade/libreoffice-catalog.xml.in |4 -
include/svx/papersizelistbox.hxx | 13 -
solenv/bin/native-code.py |1
svx/source/dialog/papersizelistbox.cxx | 62 -
4 files changed, 80 deletions(-)
New commits:
commit c7043c0f2aab380648c8e35b8724107a881978b3
Author: Caolán McNamara
AuthorDate: Wed Jan 1 21:05:17 2020 +
Commit: Caolán McNamara
CommitDate: Thu Jan 2 18:54:46 2020 +0100
PaperSizeListBox is now unused
Change-Id: I0ce2fbb7f0346f55984a419f741319690a209434
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86121
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index c9bcb3b9b73a..ad20ad5fac51 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -122,10 +122,6 @@
generic-name="Fill Attr ListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
-
-
diff --git a/include/svx/papersizelistbox.hxx b/include/svx/papersizelistbox.hxx
index 4dea2e176dde..5ede4fc81bc6 100644
--- a/include/svx/papersizelistbox.hxx
+++ b/include/svx/papersizelistbox.hxx
@@ -22,7 +22,6 @@
#include
#include
-#include
#include
enum class PaperSizeApp
@@ -31,18 +30,6 @@ enum class PaperSizeApp
Draw
};
-class SVX_DLLPUBLIC PaperSizeListBox final : public ListBox
-{
-public:
-PaperSizeListBox( vcl::Window* pParent );
-
-void FillPaperSizeEntries( PaperSizeApp eApp );
-void SetSelection( Paper eSize );
-Paper GetSelection() const;
-
-Size GetOptimalSize() const override;
-};
-
class SVX_DLLPUBLIC SvxPaperSizeListBox
{
private:
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d99370c3c18f..91c7df2d1403 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -502,7 +502,6 @@ custom_widgets = [
'IndexBox',
'ManagedMenuButton',
'OptionalBox',
-'PaperSizeListBox',
'PriorityHBox',
'PriorityMergedHBox',
'PropertyControl',
diff --git a/svx/source/dialog/papersizelistbox.cxx
b/svx/source/dialog/papersizelistbox.cxx
index f1ac6d4c0e40..c9c7a3001339 100644
--- a/svx/source/dialog/papersizelistbox.cxx
+++ b/svx/source/dialog/papersizelistbox.cxx
@@ -20,70 +20,8 @@
#include
#include
#include
-#include
#include "page.hrc"
-PaperSizeListBox::PaperSizeListBox(vcl::Window* pParent)
-: ListBox( pParent, WB_BORDER | WB_DROPDOWN)
-{
-SetDropDownLineCount(6);
-}
-
-VCL_BUILDER_FACTORY(PaperSizeListBox);
-
-void PaperSizeListBox::FillPaperSizeEntries( PaperSizeApp eApp )
-{
-const std::pair* pPaperAry = eApp == PaperSizeApp::Std ?
-RID_SVXSTRARY_PAPERSIZE_STD : RID_SVXSTRARY_PAPERSIZE_DRAW;
-sal_uInt32 nCnt = eApp == PaperSizeApp::Std ?
-SAL_N_ELEMENTS(RID_SVXSTRARY_PAPERSIZE_STD) :
SAL_N_ELEMENTS(RID_SVXSTRARY_PAPERSIZE_DRAW);
-
-for ( sal_uInt32 i = 0; i < nCnt; ++i )
-{
-OUString aStr = SvxResId(pPaperAry[i].first);
-Paper eSize = static_cast(pPaperAry[i].second);
-sal_Int32 nPos = InsertEntry( aStr );
-SetEntryData( nPos,
reinterpret_cast(static_cast(eSize)) );
-}
-}
-
-void PaperSizeListBox::SetSelection( Paper ePreselectPaper )
-{
-sal_Int32 nEntryCount = GetEntryCount();
-sal_Int32 nSelPos = LISTBOX_ENTRY_NOTFOUND;
-sal_Int32 nUserPos = LISTBOX_ENTRY_NOTFOUND;
-
-for (sal_Int32 i = 0; i < nEntryCount; ++i )
-{
-Paper eTmp =
static_cast(reinterpret_cast(GetEntryData(i)));
-
-if ( eTmp == ePreselectPaper )
-{
-nSelPos = i;
-break;
-}
-
-if ( eTmp == PAPER_USER )
- nUserPos = i;
-}
-
-// preselect current paper format - #115915#: ePaper might not be in
aPaperSizeBox so use PAPER_USER instead
-SelectEntryPos( ( nSelPos != LISTBOX_ENTRY_NOTFOUND ) ? nSelPos : nUserPos
);
-}
-
-Paper PaperSizeListBox::GetSelection() const
-{
-const sal_Int32 nPos = GetSelectedEntryPos();
-Paper ePaper =
static_cast(reinterpret_cast(GetEntryData( nPos )));
-
-return ePaper;
-}
-
-Size PaperSizeListBox::GetOptimalSize() const
-{
-return Size(150, ListBox::GetOptimalSize().Height());
-}
-
SvxPaperSizeListBox::SvxPaperSizeListBox(std::unique_ptr
pControl)
: m_xControl(std::move(pControl))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source include/svx solenv/bin svx/source
extras/source/glade/libreoffice-catalog.xml.in |4 -
include/svx/pagenumberlistbox.hxx | 11 -
solenv/bin/native-code.py |1
svx/source/dialog/pagenumberlistbox.cxx| 51 -
4 files changed, 67 deletions(-)
New commits:
commit 50c845f60cfd8541a004dbeecc85cb696452b4f4
Author: Caolán McNamara
AuthorDate: Wed Jan 1 17:43:10 2020 +
Commit: Caolán McNamara
CommitDate: Thu Jan 2 14:53:32 2020 +0100
PageNumberListBox is now unused
Change-Id: I2d1c070cb54ca3596eb7f5b07b46f5aa98565633
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86082
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 0a8b70ca4357..c9bcb3b9b73a 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -126,10 +126,6 @@
generic-name="Page Size ListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
-
-
diff --git a/include/svx/pagenumberlistbox.hxx
b/include/svx/pagenumberlistbox.hxx
index e416fcb8d507..08bb19220ccd 100644
--- a/include/svx/pagenumberlistbox.hxx
+++ b/include/svx/pagenumberlistbox.hxx
@@ -22,19 +22,8 @@
#include
#include
-#include
#include
-class SVX_DLLPUBLIC PageNumberListBox final : public ListBox
-{
-public:
-PageNumberListBox( vcl::Window* pParent );
-
-void SetSelection( sal_uInt16 );
-
-Size GetOptimalSize() const override;
-};
-
class SVX_DLLPUBLIC SvxPageNumberListBox
{
private:
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index adb71e6e3bc3..d99370c3c18f 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -502,7 +502,6 @@ custom_widgets = [
'IndexBox',
'ManagedMenuButton',
'OptionalBox',
-'PageNumberListBox',
'PaperSizeListBox',
'PriorityHBox',
'PriorityMergedHBox',
diff --git a/svx/source/dialog/pagenumberlistbox.cxx
b/svx/source/dialog/pagenumberlistbox.cxx
index b67a088fd750..9b9b2b8724af 100644
--- a/svx/source/dialog/pagenumberlistbox.cxx
+++ b/svx/source/dialog/pagenumberlistbox.cxx
@@ -20,60 +20,9 @@
#include
#include
#include
-#include
#include
#include
-PageNumberListBox::PageNumberListBox(vcl::Window* pParent)
-: ListBox( pParent, WB_BORDER | WB_DROPDOWN)
-{
-for (size_t i = 0; i < SAL_N_ELEMENTS(RID_SVXSTRARY_NUMBERINGTYPE); ++i)
-{
-sal_uInt16 nData = RID_SVXSTRARY_NUMBERINGTYPE[i].second;
-switch (nData)
-{
-// String list array is also used in Writer and contains strings
-// for Bullet and Graphics, ignore those here.
-case css::style::NumberingType::CHAR_SPECIAL:
-case css::style::NumberingType::BITMAP:
-case css::style::NumberingType::BITMAP | LINK_TOKEN:
-break;
-default:
-{
-OUString aStr =
SvxResId(RID_SVXSTRARY_NUMBERINGTYPE[i].first);
-sal_Int32 nPos = InsertEntry( aStr );
-SetEntryData( nPos,
reinterpret_cast(static_cast(nData)) );
-}
-}
-}
-SetDropDownLineCount(6);
-}
-
-VCL_BUILDER_FACTORY(PageNumberListBox);
-
-void PageNumberListBox::SetSelection( sal_uInt16 nPos )
-{
-sal_Int32 nEntryCount = GetEntryCount();
-sal_Int32 nSelPos = LISTBOX_ENTRY_NOTFOUND;
-
-for (sal_Int32 i = 0; i < nEntryCount; ++i )
-{
-sal_uInt16 nTmp =
static_cast(reinterpret_cast(GetEntryData(i)));
-
-if ( nTmp == nPos )
-{
-nSelPos = i;
-break;
-}
-}
-SelectEntryPos( ( nSelPos != LISTBOX_ENTRY_NOTFOUND ) ? nSelPos :
LISTBOX_ENTRY_NOTFOUND );
-}
-
-Size PageNumberListBox::GetOptimalSize() const
-{
-return Size(150, ListBox::GetOptimalSize().Height());
-}
-
SvxPageNumberListBox::SvxPageNumberListBox(std::unique_ptr
pControl)
: m_xControl(std::move(pControl))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source include/svx solenv/bin svx/source
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
AuthorDate: Mon Oct 14 11:22:46 2019 +0100
Commit: Caolán McNamara
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
Tested-by: Caolán McNamara
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"/>
-
-
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_Int32ImplGetEntryPos( 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_Int32ImplInsertImgEntry( const OUString&
rEntry, sal_Int32 nPos, bool bChecked ) override;
-
-SVX_DLLPRIVATE virtual void ImplClear() override;
-SVX_DLLPRIVATE virtual sal_Int32ImplInsertEntry( const OUString&
rEntry, sal_Int32 nPos ) override;
-SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos,
void* pData ) override;
-SVX_DLLPRIVATE virtual sal_Int32ImplGetSelectedEntryPos() 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_Int32ImplGetEntryPos( 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
#include
#include
-#include
#include
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 )
{
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 &
rRet, const VclPtr & pParent, VclBuilder::stringmap & rMap)
-{
-
static_assert(std::is_same_v,
- 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 pLanguageBox(pParent, nBits);
-pLanguageBox->EnableAutoSize(true);
-rRet = pLanguageBox;
-}
-
SvxLanguageBoxBase::SvxLanguageBoxBase()
: m_bWithCheckmark(false)
{
@@ -706,56 +686,6 @@ LanguageBox::LanguageBox(std::unique_ptr
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 :
[Libreoffice-commits] core.git: extras/source include/svx solenv/bin svx/source
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
AuthorDate: Mon Oct 14 11:08:09 2019 +0100
Commit: Caolán McNamara
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
Tested-by: Caolán McNamara
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 @@
-
-
-
-
-GParamBoolean
-
-
-
-
-
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
#include
#include
#include
-class SVX_DLLPUBLIC SvxTextEncodingBox : public ListBox
-{
-private:
-SVX_DLLPRIVATE sal_Int32EncodingToPos_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
-
- 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
-
-@param bExcludeImportSubsets
-If , 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
- whenever the box is used in import dialogs. */
-voidFillFromTextEncodingTable(
-bool bExcludeImportSubsets,
-sal_uInt32 nExcludeInfoFlags = 0,
-sal_uInt32 nButIncludeInfoFlags = 0
-);
-
-/** Fill with all known MIME encodings and select the best according to
-GetBestMimeEncoding
- */
-voidFillWithMimeAndSelectBest();
-
-voidInsertTextEncoding( const rtl_TextEncoding nEnc,
-const OUString& rEntry );
-
-voidSelectTextEncoding( const rtl_TextEncoding nEnc );
-
-rtl_TextEncodingGetSelectTextEncoding() 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
#endif
-#include
#include
#include
#include
@@ -37,93 +36,6 @@
#include
#include
-SvxTextEncodingBox::SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits )
-: ListBox( pParent, nBits )
-{
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void
makeSvxTextEncodingBox(VclPtr & rRet, const VclPtr &
pParent, VclBuilder::stringmap & rMap)
-{
-
static_assert(std::is_same_v,
- 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 pListBox(pParent, nWinBits);
-if (bDropdown)
-pListBox->EnableAutoSize(true);
-rRet = pListBox;
-}
-
-SvxTextEncodingBox::~SvxTextEncodingBox()
-{
-disposeOnce();
-}
-
-sal_Int32
[Libreoffice-commits] core.git: extras/source include/svx solenv/bin svx/source sw/source sw/uiconfig
extras/source/glade/libreoffice-catalog.xml.in |3
include/svx/swframeexample.hxx | 64 -
solenv/bin/native-code.py |1
svx/source/dialog/swframeexample.cxx | 693
sw/source/ui/frmdlg/column.cxx | 24
sw/source/ui/frmdlg/frmpage.cxx| 1033 +++--
sw/source/ui/table/tabledlg.cxx| 42 -
sw/source/uibase/inc/frmpage.hxx | 137 +--
sw/source/uibase/inc/prcntfld.hxx | 73 -
sw/source/uibase/utlui/prcntfld.cxx| 271 --
sw/uiconfig/swriter/ui/frmtypepage.ui | 51 -
11 files changed, 645 insertions(+), 1747 deletions(-)
New commits:
commit 4b7e2b8a64eca337ea06f7d11fc9d2f66a9d555e
Author: Caolán McNamara
AuthorDate: Wed Nov 21 21:21:35 2018 +
Commit: Caolán McNamara
CommitDate: Thu Nov 22 21:59:48 2018 +0100
weld SwFramePage
Change-Id: I12f868611860867df26bd29474aa19189c2b9a96
Reviewed-on: https://gerrit.libreoffice.org/63818
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index a02836e94439..629a835e5232 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -250,9 +250,6 @@
-
diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx
index ddcc5961b95a..814f0d84aa22 100644
--- a/include/svx/swframeexample.hxx
+++ b/include/svx/swframeexample.hxx
@@ -27,7 +27,7 @@
#include
#include
-class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window
+class SVX_DLLPUBLIC SwFrameExample : public weld::CustomWidgetController
{
Color m_aTransColor; ///< transparency
Color m_aBgCol; ///< background
@@ -63,65 +63,6 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window
void InitColors_Impl();
void InitAllRects_Impl(vcl::RenderContext& rRenderContext);
-void CalcBoundRect_Impl(tools::Rectangle );
-tools::Rectangle DrawInnerFrame_Impl(vcl::RenderContext& rRenderContext,
const tools::Rectangle , const Color , const Color
);
-
-virtual void Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&) override;
-virtual Size GetOptimalSize() const override;
-protected:
-virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
-public:
-
-SvxSwFrameExample(vcl::Window* pParent, WinBits nStyle);
-
-void SetWrap(css::text::WrapTextMode nW) { nWrap = nW; }
-
-void SetHAlign(short nH) { nHAlign = nH; }
-void SetHoriRel(short nR) { nHRel = nR; }
-
-void SetVAlign(short nV) { nVAlign = nV; }
-void SetVertRel(short nR) { nVRel = nR; }
-
-void SetTransparent(bool bT) { bTrans= bT; }
-void SetAnchor(RndStdIds nA) { nAnchor = nA; }
-
-void SetRelPos(const Point& rP);
-};
-
-class SVX_DLLPUBLIC SwFrameExample : public weld::CustomWidgetController
-{
-Color m_aTransColor; ///< transparency
-Color m_aBgCol; ///< background
-Color m_aFrameColor; ///< graphic frame
-Color m_aAlignColor; ///< align anchor
-Color m_aBorderCol; ///< frame of doc
-Color m_aPrintAreaCol;///< frame of printable area of doc
-Color m_aTxtCol; ///< symbolised text
-Color m_aBlankCol;///< area of symbol for blank
-Color m_aBlankFrameCol; ///< frame of symbol for blank
-
-tools::Rectangle aPage;
-tools::Rectangle aPagePrtArea;
-tools::Rectangle aTextLine;
-tools::Rectangle aPara;
-tools::Rectangle aParaPrtArea;
-tools::Rectangle aFrameAtFrame;
-tools::Rectangle aDrawObj;
-tools::Rectangle aAutoCharFrame;
-SizeaFrmSize;
-
-short nHAlign;
-short nHRel;
-
-short nVAlign;
-short nVRel;
-
-RndStdIds nAnchor;
-
-Point aRelPos;
-
-void InitColors_Impl();
-void InitAllRects_Impl(vcl::RenderContext& rRenderContext);
void CalcBoundRect_Impl(vcl::RenderContext& rRenderContext,
tools::Rectangle );
tools::Rectangle DrawInnerFrame_Impl(vcl::RenderContext& rRenderContext,
const tools::Rectangle , const Color , const Color
);
@@ -133,12 +74,15 @@ public:
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
+void SetWrap(css::text::WrapTextMode nW) { nWrap = nW; }
+
void SetHAlign(short nH) { nHAlign = nH; }
void SetHoriRel(short nR) { nHRel = nR; }
void SetVAlign(short nV) { nVAlign = nV; }
void SetVertRel(short nR) { nVRel = nR; }
+void SetTransparent(bool bT) { bTrans= bT; }
void SetAnchor(RndStdIds nA) { nAnchor
