[Libreoffice-commits] core.git: cui/source cui/uiconfig extras/source include/sfx2 include/svtools include/svx include/vcl sc/qa sc/source sd/source sfx2/source sfx2/uiconfig solenv/sanitizers svtools/source svx/source sw/qa sw/source vcl/source vcl/unx
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Sep 14 10:51:50 UTC 2018
cui/source/inc/chardlg.hxx | 90 +--
cui/source/options/optdict.cxx | 4
cui/source/tabpages/chardlg.cxx | 683 ++++++++++++-------------
cui/uiconfig/ui/charnamepage.ui | 500 ++++++++++++++----
extras/source/glade/libreoffice-catalog.xml.in | 4
include/sfx2/newstyle.hxx | 4
include/svtools/ctrlbox.hxx | 98 +++
include/svx/langbox.hxx | 30 -
include/vcl/combobox.hxx | 2
include/vcl/lstbox.hxx | 2
include/vcl/weld.hxx | 151 +++--
sc/qa/uitest/calc_tests/formatCells.py | 14
sc/source/ui/dbgui/tpsort.cxx | 6
sd/source/ui/dlg/dlgfield.cxx | 10
sfx2/source/dialog/newstyle.cxx | 11
sfx2/uiconfig/ui/newstyle.ui | 2
solenv/sanitizers/ui/cui.suppr | 3
svtools/source/control/ctrlbox.cxx | 490 +++++++++++++++++
svx/source/dialog/langbox.cxx | 124 ++++
sw/qa/uitest/writer_tests2/formatCharacter.py | 12
sw/source/ui/dialog/ascfldlg.cxx | 8
sw/source/ui/misc/srtdlg.cxx | 6
sw/source/uibase/shells/textsh1.cxx | 1
vcl/source/app/salvtables.cxx | 158 ++++-
vcl/source/control/combobox.cxx | 22
vcl/source/window/builder.cxx | 16
vcl/unx/gtk3/gtk3gtkinst.cxx | 117 ++++
27 files changed, 1906 insertions(+), 662 deletions(-)
New commits:
commit 9237a905fa5f2b67db73c15847eff203a258c2b4
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 10 17:19:19 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Sep 14 11:43:51 2018 +0100
weld SvxCharNamePage
Change-Id: Ia54a5ac4fe4a11b7c03508c336193bb52c616e7f
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 6a5f2b5c8332..fa5c91c17b13 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -94,57 +94,58 @@ public:
struct SvxCharNamePage_Impl;
-class SvxCharNamePage : public SvxCharBasePage
+class SvxCharNamePage : public CharBasePage
{
friend class VclPtr<SvxCharNamePage>;
private:
static const sal_uInt16 pNameRanges[];
- VclPtr<VclContainer> m_pWestFrame;
- VclPtr<FixedText> m_pWestFontNameFT;
- VclPtr<FontNameBox> m_pWestFontNameLB;
- VclPtr<FixedText> m_pWestFontStyleFT;
- VclPtr<FontStyleBox> m_pWestFontStyleLB;
- VclPtr<FixedText> m_pWestFontSizeFT;
- VclPtr<FontSizeBox> m_pWestFontSizeLB;
- VclPtr<FixedText> m_pWestFontLanguageFT;
- VclPtr<SvxLanguageComboBox> m_pWestFontLanguageLB;
- VclPtr<FixedText> m_pWestFontTypeFT;
- VclPtr<PushButton> m_pWestFontFeaturesButton;
-
- VclPtr<VclContainer> m_pEastFrame;
- VclPtr<FixedText> m_pEastFontNameFT;
- VclPtr<FontNameBox> m_pEastFontNameLB;
- VclPtr<FixedText> m_pEastFontStyleFT;
- VclPtr<FontStyleBox> m_pEastFontStyleLB;
- VclPtr<FixedText> m_pEastFontSizeFT;
- VclPtr<FontSizeBox> m_pEastFontSizeLB;
- VclPtr<FixedText> m_pEastFontLanguageFT;
- VclPtr<SvxLanguageBox> m_pEastFontLanguageLB;
- VclPtr<FixedText> m_pEastFontTypeFT;
- VclPtr<PushButton> m_pEastFontFeaturesButton;
-
- VclPtr<VclContainer> m_pCTLFrame;
- VclPtr<FixedText> m_pCTLFontNameFT;
- VclPtr<FontNameBox> m_pCTLFontNameLB;
- VclPtr<FixedText> m_pCTLFontStyleFT;
- VclPtr<FontStyleBox> m_pCTLFontStyleLB;
- VclPtr<FixedText> m_pCTLFontSizeFT;
- VclPtr<FontSizeBox> m_pCTLFontSizeLB;
- VclPtr<FixedText> m_pCTLFontLanguageFT;
- VclPtr<SvxLanguageBox> m_pCTLFontLanguageLB;
- VclPtr<FixedText> m_pCTLFontTypeFT;
- VclPtr<PushButton> m_pCTLFontFeaturesButton;
std::unique_ptr<SvxCharNamePage_Impl> m_pImpl;
- SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rSet );
+ std::unique_ptr<weld::Widget> m_xWestFrame;
+ std::unique_ptr<weld::Label> m_xWestFontNameFT;
+ std::unique_ptr<weld::ComboBoxText> m_xWestFontNameLB;
+ std::unique_ptr<weld::Label> m_xWestFontStyleFT;
+ std::unique_ptr<SvtFontStyleBox> m_xWestFontStyleLB;
+ std::unique_ptr<weld::Label> m_xWestFontSizeFT;
+ std::unique_ptr<SvtFontSizeBox> m_xWestFontSizeLB;
+ std::unique_ptr<weld::Label> m_xWestFontLanguageFT;
+ std::unique_ptr<LanguageBox> m_xWestFontLanguageLB;
+ std::unique_ptr<weld::Label> m_xWestFontTypeFT;
+ std::unique_ptr<weld::Button> m_xWestFontFeaturesButton;
+
+ std::unique_ptr<weld::Widget> m_xEastFrame;
+ std::unique_ptr<weld::Label> m_xEastFontNameFT;
+ std::unique_ptr<weld::ComboBoxText> m_xEastFontNameLB;
+ std::unique_ptr<weld::Label> m_xEastFontStyleFT;
+ std::unique_ptr<SvtFontStyleBox> m_xEastFontStyleLB;
+ std::unique_ptr<weld::Label> m_xEastFontSizeFT;
+ std::unique_ptr<SvtFontSizeBox> m_xEastFontSizeLB;
+ std::unique_ptr<weld::Label> m_xEastFontLanguageFT;
+ std::unique_ptr<LanguageBox> m_xEastFontLanguageLB;
+ std::unique_ptr<weld::Label> m_xEastFontTypeFT;
+ std::unique_ptr<weld::Button> m_xEastFontFeaturesButton;
+
+ std::unique_ptr<weld::Widget> m_xCTLFrame;
+ std::unique_ptr<weld::Label> m_xCTLFontNameFT;
+ std::unique_ptr<weld::ComboBoxText> m_xCTLFontNameLB;
+ std::unique_ptr<weld::Label> m_xCTLFontStyleFT;
+ std::unique_ptr<SvtFontStyleBox> m_xCTLFontStyleLB;
+ std::unique_ptr<weld::Label> m_xCTLFontSizeFT;
+ std::unique_ptr<SvtFontSizeBox> m_xCTLFontSizeLB;
+ std::unique_ptr<weld::Label> m_xCTLFontLanguageFT;
+ std::unique_ptr<LanguageBox> m_xCTLFontLanguageLB;
+ std::unique_ptr<weld::Label> m_xCTLFontTypeFT;
+ std::unique_ptr<weld::Button> m_xCTLFontFeaturesButton;
+
+ SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rSet);
void Initialize();
const FontList* GetFontList() const;
void UpdatePreview_Impl();
- void FillStyleBox_Impl( const FontNameBox* rBox );
- void FillSizeBox_Impl( const FontNameBox* rBox );
+ void FillStyleBox_Impl(const weld::Widget& rBox);
+ void FillSizeBox_Impl(const weld::Widget& rBox);
enum LanguageGroup
{
@@ -164,13 +165,12 @@ private:
void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp );
bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
- DECL_LINK( UpdateHdl_Impl, Timer *, void );
- DECL_LINK( FontModifyEditHdl_Impl, Edit&, void );
- DECL_LINK( FontModifyListBoxHdl_Impl, ListBox&, void );
- DECL_LINK( FontModifyComboBoxHdl_Impl, ComboBox&, void );
- DECL_LINK(FontFeatureButtonClicked, Button*, void);
+ DECL_LINK(UpdateHdl_Impl, Timer *, void );
+ DECL_LINK(FontModifyEditHdl_Impl, weld::Entry&, void);
+ DECL_LINK(FontModifyComboBoxHdl_Impl, weld::ComboBoxText&, void);
+ DECL_LINK(FontFeatureButtonClicked, weld::Button&, void);
- void FontModifyHdl_Impl(void const *);
+ void FontModifyHdl_Impl(const weld::Widget&);
public:
using SfxTabPage::ActivatePage;
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index d92db5c93134..e5d3bda009f5 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -105,7 +105,7 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog(weld::Window* pParent)
// display languages
m_xLanguageLB->SetLanguageList(SvxLanguageListFlags::ALL, true, true);
- m_xLanguageLB->SelectEntryPos(0);
+ m_xLanguageLB->set_active(0);
}
IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, weld::Button&, void)
@@ -140,7 +140,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, weld::Button&, void)
}
// create and add
- LanguageType nLang = m_xLanguageLB->GetSelectedLanguage();
+ LanguageType nLang = m_xLanguageLB->get_active_id();
try
{
// create new dictionary
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index e8183ecc0ba9..e5cc4d203a44 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -266,12 +266,12 @@ struct SvxCharNamePage_Impl
Idle m_aUpdateIdle;
OUString m_aNoStyleText;
std::unique_ptr<FontList> m_pFontList;
- sal_Int32 m_nExtraEntryPos;
+ int m_nExtraEntryPos;
bool m_bInSearchMode;
- SvxCharNamePage_Impl() :
- m_nExtraEntryPos( COMBOBOX_ENTRY_NOTFOUND ),
- m_bInSearchMode ( false )
+ SvxCharNamePage_Impl()
+ : m_nExtraEntryPos(std::numeric_limits<int>::max())
+ , m_bInSearchMode(false)
{
m_aUpdateIdle.SetPriority( TaskPriority::LOWEST );
@@ -280,10 +280,34 @@ struct SvxCharNamePage_Impl
// class SvxCharNamePage -------------------------------------------------
-SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet )
- : SvxCharBasePage(pParent, "CharNamePage", "cui/ui/charnamepage.ui", rInSet)
+SvxCharNamePage::SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rInSet)
+ : CharBasePage(pParent, "cui/ui/charnamepage.ui", "CharNamePage", rInSet)
, m_pImpl(new SvxCharNamePage_Impl)
+ , m_xEastFrame(m_xBuilder->weld_widget("asian"))
+ , m_xEastFontNameFT(m_xBuilder->weld_label("eastfontnameft"))
+ , m_xEastFontNameLB(m_xBuilder->weld_combo_box_text("eastfontnamelb"))
+ , m_xEastFontStyleFT(m_xBuilder->weld_label("eaststyleft"))
+ , m_xEastFontStyleLB(new SvtFontStyleBox(m_xBuilder->weld_combo_box_text("eaststylelb")))
+ , m_xEastFontSizeFT(m_xBuilder->weld_label("eastsizeft"))
+ , m_xEastFontSizeLB(new SvtFontSizeBox(m_xBuilder->weld_combo_box_text("eastsizelb")))
+ , m_xEastFontLanguageFT(m_xBuilder->weld_label("eastlangft"))
+ , m_xEastFontLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box_text("eastlanglb")))
+ , m_xEastFontTypeFT(m_xBuilder->weld_label("eastfontinfo"))
+ , m_xEastFontFeaturesButton(m_xBuilder->weld_button("east_features_button"))
+ , m_xCTLFrame(m_xBuilder->weld_widget("ctl"))
+ , m_xCTLFontNameFT(m_xBuilder->weld_label("ctlfontnameft"))
+ , m_xCTLFontNameLB(m_xBuilder->weld_combo_box_text("ctlfontnamelb"))
+ , m_xCTLFontStyleFT(m_xBuilder->weld_label("ctlstyleft"))
+ , m_xCTLFontStyleLB(new SvtFontStyleBox(m_xBuilder->weld_combo_box_text("ctlstylelb")))
+ , m_xCTLFontSizeFT(m_xBuilder->weld_label("ctlsizeft"))
+ , m_xCTLFontSizeLB(new SvtFontSizeBox(m_xBuilder->weld_combo_box_text("ctlsizelb")))
+ , m_xCTLFontLanguageFT(m_xBuilder->weld_label("ctllangft"))
+ , m_xCTLFontLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box_text("ctllanglb")))
+ , m_xCTLFontTypeFT(m_xBuilder->weld_label("ctlfontinfo"))
+ , m_xCTLFontFeaturesButton(m_xBuilder->weld_button("ctl_features_button"))
{
+ m_xPreviewWin.reset(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWin));
+
m_pImpl->m_aNoStyleText = CuiResId( RID_SVXSTR_CHARNAME_NOSTYLE );
SvtLanguageOptions aLanguageOptions;
@@ -293,60 +317,47 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet
if (bShowNonWestern)
{
- get(m_pWestFrame, "western");
- get(m_pWestFontNameFT, "westfontnameft-cjk");
- get(m_pWestFontNameLB, "westfontnamelb-cjk");
- get(m_pWestFontStyleFT, "weststyleft-cjk");
- get(m_pWestFontStyleLB, "weststylelb-cjk");
- get(m_pWestFontSizeFT, "westsizeft-cjk");
- get(m_pWestFontSizeLB, "westsizelb-cjk");
+ m_xWestFrame = m_xBuilder->weld_widget("western");
+ m_xWestFontNameFT = m_xBuilder->weld_label("westfontnameft-cjk");
+ m_xWestFontNameLB = m_xBuilder->weld_combo_box_text("westfontnamelb-cjk");
+ m_xWestFontStyleFT = m_xBuilder->weld_label("weststyleft-cjk");
+ m_xWestFontSizeFT = m_xBuilder->weld_label("westsizeft-cjk");
- get(m_pWestFontLanguageFT, "westlangft-cjk");
- get(m_pWestFontLanguageLB, "westlanglb-cjk");
- get(m_pWestFontTypeFT, "westfontinfo-cjk");
+ m_xWestFontStyleLB.reset(new SvtFontStyleBox(m_xBuilder->weld_combo_box_text("weststylelb-cjk")));
+ m_xWestFontSizeLB.reset(new SvtFontSizeBox(m_xBuilder->weld_combo_box_text("westsizelb-cjk")));
- get(m_pWestFontFeaturesButton, "west_features_button-cjk");
+ m_xWestFontLanguageFT = m_xBuilder->weld_label("westlangft-cjk");
+ m_xWestFontLanguageLB.reset(new LanguageBox(m_xBuilder->weld_combo_box_text("westlanglb-cjk")));
+ m_xWestFontTypeFT = m_xBuilder->weld_label("westfontinfo-cjk");
+
+ m_xWestFontFeaturesButton = m_xBuilder->weld_button("west_features_button-cjk");
}
else
{
- get(m_pWestFrame, "simple");
- get(m_pWestFontNameFT, "westfontnameft-nocjk");
- get(m_pWestFontNameLB, "westfontnamelb-nocjk");
- get(m_pWestFontStyleFT, "weststyleft-nocjk");
- get(m_pWestFontStyleLB, "weststylelb-nocjk");
- get(m_pWestFontSizeFT, "westsizeft-nocjk");
- get(m_pWestFontSizeLB, "westsizelb-nocjk");
-
- get(m_pWestFontLanguageFT, "westlangft-nocjk");
- get(m_pWestFontLanguageLB, "westlanglb-nocjk");
- get(m_pWestFontTypeFT, "westfontinfo-nocjk");
-
- get(m_pWestFontFeaturesButton, "west_features_button-nocjk");
- }
-
- get(m_pEastFrame, "asian");
- get(m_pEastFontNameFT, "eastfontnameft");
- get(m_pEastFontNameLB, "eastfontnamelb");
- get(m_pEastFontStyleFT, "eaststyleft");
- get(m_pEastFontStyleLB, "eaststylelb");
- get(m_pEastFontSizeFT, "eastsizeft");
- get(m_pEastFontSizeLB, "eastsizelb");
- get(m_pEastFontLanguageFT, "eastlangft");
- get(m_pEastFontLanguageLB, "eastlanglb");
- get(m_pEastFontTypeFT, "eastfontinfo");
- get(m_pEastFontFeaturesButton, "east_features_button");
-
- get(m_pCTLFrame, "ctl");
- get(m_pCTLFontNameFT, "ctlfontnameft");
- get(m_pCTLFontNameLB, "ctlfontnamelb");
- get(m_pCTLFontStyleFT, "ctlstyleft");
- get(m_pCTLFontStyleLB, "ctlstylelb");
- get(m_pCTLFontSizeFT, "ctlsizeft");
- get(m_pCTLFontSizeLB, "ctlsizelb");
- get(m_pCTLFontLanguageFT, "ctllangft");
- get(m_pCTLFontLanguageLB, "ctllanglb");
- get(m_pCTLFontTypeFT, "ctlfontinfo");
- get(m_pCTLFontFeaturesButton, "ctl_features_button");
+ m_xWestFrame = m_xBuilder->weld_widget("simple");
+ m_xWestFontNameFT = m_xBuilder->weld_label("westfontnameft-nocjk");
+ m_xWestFontStyleFT = m_xBuilder->weld_label("weststyleft-nocjk");
+ m_xWestFontSizeFT = m_xBuilder->weld_label("westsizeft-nocjk");
+
+ m_xWestFontLanguageFT = m_xBuilder->weld_label("westlangft-nocjk");
+ m_xWestFontLanguageLB.reset(new LanguageBox(m_xBuilder->weld_combo_box_text("westlanglb-nocjk")));
+ m_xWestFontTypeFT = m_xBuilder->weld_label("westfontinfo-nocjk");
+
+ m_xWestFontFeaturesButton = m_xBuilder->weld_button("west_features_button-nocjk");
+
+ std::unique_ptr<weld::EntryTreeView> xWestFontNameLB = m_xBuilder->weld_entry_tree_view("namegrid", "westfontname-nocjk", "westfontnamelb-nocjk");
+ std::unique_ptr<weld::EntryTreeView> xWestFontStyleLB = m_xBuilder->weld_entry_tree_view("stylegrid", "weststyle-nocjk", "weststylelb-nocjk");
+ std::unique_ptr<weld::EntryTreeView> xWestFontSizeLB = m_xBuilder->weld_entry_tree_view("sizegrid", "westsize-nocjk", "westsizelb-nocjk");
+
+ // 8 lines in the treeview
+ xWestFontNameLB->set_height_request_by_rows(8);
+ xWestFontStyleLB->set_height_request_by_rows(8);
+ xWestFontSizeLB->set_height_request_by_rows(8);
+
+ m_xWestFontNameLB = std::move(xWestFontNameLB);
+ m_xWestFontStyleLB.reset(new SvtFontStyleBox(std::move(xWestFontStyleLB)));
+ m_xWestFontSizeLB.reset(new SvtFontSizeBox(std::move(xWestFontSizeLB)));
+ }
//In MacOSX the standard dialogs name font-name, font-style as
//Family, Typeface
@@ -359,42 +370,30 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet
#else
OUString sFontFamilyString(CuiResId(RID_SVXSTR_CHARNAME_FAMILY));
#endif
- m_pWestFontNameFT->SetText(sFontFamilyString);
- m_pEastFontNameFT->SetText(sFontFamilyString);
- m_pCTLFontNameFT->SetText(sFontFamilyString);
+ m_xWestFontNameFT->set_label(sFontFamilyString);
+ m_xEastFontNameFT->set_label(sFontFamilyString);
+ m_xCTLFontNameFT->set_label(sFontFamilyString);
#ifdef MACOSX
OUString sFontStyleString(CuiResId(RID_SVXSTR_CHARNAME_TYPEFACE));
#else
OUString sFontStyleString(CuiResId(RID_SVXSTR_CHARNAME_STYLE));
#endif
- m_pWestFontStyleFT->SetText(sFontStyleString);
- m_pEastFontStyleFT->SetText(sFontStyleString);
- m_pCTLFontStyleFT->SetText(sFontStyleString);
+ m_xWestFontStyleFT->set_label(sFontStyleString);
+ m_xEastFontStyleFT->set_label(sFontStyleString);
+ m_xCTLFontStyleFT->set_label(sFontStyleString);
- m_pWestFrame->Show();
- m_pEastFrame->Show(bShowCJK);
- m_pCTLFrame->Show(bShowCTL);
+ m_xWestFrame->show();
+ m_xEastFrame->show(bShowCJK);
+ m_xCTLFrame->show(bShowCTL);
- get(m_pPreviewWin, "preview");
-
- m_pWestFontLanguageLB->SetLanguageList(SvxLanguageListFlags::WESTERN, true, false, true);
- m_pEastFontLanguageLB->SetLanguageList(SvxLanguageListFlags::CJK, true, false, true);
- m_pCTLFontLanguageLB->SetLanguageList(SvxLanguageListFlags::CTL, true, false, true);
-
- if (!bShowNonWestern)
- {
- //10 lines
- sal_Int32 nHeight = m_pWestFontSizeLB->CalcWindowSizePixel(10);
- m_pWestFontNameLB->set_height_request(nHeight);
- m_pWestFontStyleLB->set_height_request(nHeight);
- m_pWestFontSizeLB->set_height_request(nHeight);
- }
+ m_xWestFontLanguageLB->SetLanguageList(SvxLanguageListFlags::WESTERN, true, false, true);
+ m_xEastFontLanguageLB->SetLanguageList(SvxLanguageListFlags::CJK, true, false, true);
+ m_xCTLFontLanguageLB->SetLanguageList(SvxLanguageListFlags::CTL, true, false, true);
Initialize();
}
-
SvxCharNamePage::~SvxCharNamePage()
{
disposeOnce();
@@ -403,41 +402,17 @@ SvxCharNamePage::~SvxCharNamePage()
void SvxCharNamePage::dispose()
{
m_pImpl.reset();
- m_pWestFrame.clear();
- m_pWestFontNameFT.clear();
- m_pWestFontNameLB.clear();
- m_pWestFontStyleFT.clear();
- m_pWestFontStyleLB.clear();
- m_pWestFontSizeFT.clear();
- m_pWestFontSizeLB.clear();
- m_pWestFontLanguageFT.clear();
- m_pWestFontLanguageLB.clear();
- m_pWestFontFeaturesButton.clear();
- m_pWestFontTypeFT.clear();
- m_pEastFrame.clear();
- m_pEastFontNameFT.clear();
- m_pEastFontNameLB.clear();
- m_pEastFontStyleFT.clear();
- m_pEastFontStyleLB.clear();
- m_pEastFontSizeFT.clear();
- m_pEastFontSizeLB.clear();
- m_pEastFontLanguageFT.clear();
- m_pEastFontLanguageLB.clear();
- m_pEastFontTypeFT.clear();
- m_pEastFontFeaturesButton.clear();
- m_pCTLFrame.clear();
- m_pCTLFontNameFT.clear();
- m_pCTLFontNameLB.clear();
- m_pCTLFontStyleFT.clear();
- m_pCTLFontStyleLB.clear();
- m_pCTLFontSizeFT.clear();
- m_pCTLFontSizeLB.clear();
- m_pCTLFontLanguageFT.clear();
- m_pCTLFontLanguageLB.clear();
- m_pCTLFontTypeFT.clear();
- m_pCTLFontFeaturesButton.clear();
-
- SvxCharBasePage::dispose();
+ m_xCTLFontStyleLB.reset();
+ m_xEastFontLanguageLB.reset();
+ m_xWestFontStyleLB.reset();
+ m_xCTLFontSizeLB.reset();
+ m_xEastFontSizeLB.reset();
+ m_xWestFontSizeLB.reset();
+ m_xWestFontLanguageLB.reset();
+ m_xPreviewWin.reset();
+ m_xCTLFontLanguageLB.reset();
+ m_xEastFontLanguageLB.reset();
+ CharBasePage::dispose();
}
void SvxCharNamePage::Initialize()
@@ -445,30 +420,29 @@ void SvxCharNamePage::Initialize()
// to handle the changes of the other pages
SetExchangeSupport();
- Link<Edit&,void> aLink = LINK( this, SvxCharNamePage, FontModifyEditHdl_Impl );
- m_pWestFontNameLB->SetModifyHdl( aLink );
- m_pWestFontStyleLB->SetModifyHdl( aLink );
- m_pWestFontSizeLB->SetModifyHdl( aLink );
- m_pWestFontLanguageLB->SetSelectHdl( LINK( this, SvxCharNamePage, FontModifyComboBoxHdl_Impl ) );
+ Link<weld::ComboBoxText&,void> aLink = LINK(this, SvxCharNamePage, FontModifyComboBoxHdl_Impl);
+ m_xWestFontNameLB->connect_changed(aLink);
+ m_xWestFontStyleLB->connect_changed(aLink);
+ m_xWestFontSizeLB->connect_changed(aLink);
+ m_xWestFontLanguageLB->connect_changed(aLink);
- m_pWestFontFeaturesButton->SetClickHdl(LINK(this, SvxCharNamePage, FontFeatureButtonClicked));
+ m_xWestFontFeaturesButton->connect_clicked(LINK(this, SvxCharNamePage, FontFeatureButtonClicked));
- m_pEastFontNameLB->SetModifyHdl( aLink );
- m_pEastFontStyleLB->SetModifyHdl( aLink );
- m_pEastFontSizeLB->SetModifyHdl( aLink );
- m_pEastFontLanguageLB->SetSelectHdl( LINK( this, SvxCharNamePage, FontModifyListBoxHdl_Impl ) );
- m_pEastFontFeaturesButton->SetClickHdl(LINK(this, SvxCharNamePage, FontFeatureButtonClicked));
+ m_xEastFontNameLB->connect_changed(aLink);
+ m_xEastFontStyleLB->connect_changed(aLink);
+ m_xEastFontSizeLB->connect_changed(aLink);
+ m_xEastFontLanguageLB->connect_changed(aLink);
+ m_xEastFontFeaturesButton->connect_clicked(LINK(this, SvxCharNamePage, FontFeatureButtonClicked));
- m_pCTLFontNameLB->SetModifyHdl( aLink );
- m_pCTLFontStyleLB->SetModifyHdl( aLink );
- m_pCTLFontSizeLB->SetModifyHdl( aLink );
- m_pCTLFontLanguageLB->SetSelectHdl( LINK( this, SvxCharNamePage, FontModifyListBoxHdl_Impl ) );
- m_pCTLFontFeaturesButton->SetClickHdl(LINK(this, SvxCharNamePage, FontFeatureButtonClicked));
+ m_xCTLFontNameLB->connect_changed(aLink);
+ m_xCTLFontStyleLB->connect_changed(aLink);
+ m_xCTLFontSizeLB->connect_changed(aLink);
+ m_xCTLFontLanguageLB->connect_changed(aLink);
+ m_xCTLFontFeaturesButton->connect_clicked(LINK(this, SvxCharNamePage, FontFeatureButtonClicked));
m_pImpl->m_aUpdateIdle.SetInvokeHandler( LINK( this, SvxCharNamePage, UpdateHdl_Impl ) );
}
-
const FontList* SvxCharNamePage::GetFontList() const
{
if ( !m_pImpl->m_pFontList )
@@ -500,10 +474,10 @@ namespace
{
FontMetric calcFontMetrics( SvxFont& _rFont,
SvxCharNamePage const * _pPage,
- const FontNameBox* _pFontNameLB,
- const FontStyleBox* _pFontStyleLB,
- const FontSizeBox* _pFontSizeLB,
- const SvxLanguageBoxBase* _pLanguageLB,
+ const weld::ComboBoxText* _pFontNameLB,
+ const SvtFontStyleBox* _pFontStyleLB,
+ const SvtFontSizeBox* _pFontSizeLB,
+ const LanguageBox* _pLanguageLB,
const FontList* _pFontList,
sal_uInt16 _nFontWhich,
sal_uInt16 _nFontHeightWhich)
@@ -511,10 +485,10 @@ namespace
Size aSize = _rFont.GetFontSize();
aSize.setWidth( 0 );
FontMetric aFontMetrics;
- OUString sFontName(_pFontNameLB->GetText());
+ OUString sFontName(_pFontNameLB->get_active_text());
bool bFontAvailable = _pFontList->IsAvailable( sFontName );
- if (bFontAvailable || _pFontNameLB->IsValueChangedFromSaved())
- aFontMetrics = _pFontList->Get( sFontName, _pFontStyleLB->GetText() );
+ if (bFontAvailable || _pFontNameLB->get_value_changed_from_saved())
+ aFontMetrics = _pFontList->Get(sFontName, _pFontStyleLB->get_active_text());
else
{
//get the font from itemset
@@ -537,21 +511,21 @@ namespace
// old value, scaled
long nHeight;
if ( _pFontSizeLB->IsPtRelative() )
- nHeight = rOldItem.GetHeight() + PointToTwips( static_cast<long>(_pFontSizeLB->GetValue() / 10) );
+ nHeight = rOldItem.GetHeight() + PointToTwips( static_cast<long>(_pFontSizeLB->get_value() / 10) );
else
- nHeight = static_cast<long>(rOldItem.GetHeight() * _pFontSizeLB->GetValue() / 100);
+ nHeight = static_cast<long>(rOldItem.GetHeight() * _pFontSizeLB->get_value() / 100);
// conversion twips for the example-window
aSize.setHeight(
ItemToControl( nHeight, _pPage->GetItemSet().GetPool()->GetMetric( _nFontHeightWhich ), FUNIT_TWIP ) );
}
- else if ( !_pFontSizeLB->GetText().isEmpty() )
- aSize.setHeight( PointToTwips( static_cast<long>(_pFontSizeLB->GetValue() / 10) ) );
+ else if ( !_pFontSizeLB->get_active_text().isEmpty() )
+ aSize.setHeight( PointToTwips( static_cast<long>(_pFontSizeLB->get_value() / 10) ) );
else
aSize.setHeight( 200 ); // default 10pt
aFontMetrics.SetFontSize( aSize );
- _rFont.SetLanguage(_pLanguageLB->GetSelectedLanguage());
+ _rFont.SetLanguage(_pLanguageLB->get_active_id());
_rFont.SetFamily( aFontMetrics.GetFamilyType() );
_rFont.SetFamilyName( aFontMetrics.GetFamilyName() );
@@ -575,51 +549,60 @@ void SvxCharNamePage::UpdatePreview_Impl()
// Font
const FontList* pFontList = GetFontList();
- FontMetric aWestFontMetric = calcFontMetrics(rFont, this, m_pWestFontNameLB,
- m_pWestFontStyleLB, m_pWestFontSizeLB, m_pWestFontLanguageLB,
+ FontMetric aWestFontMetric = calcFontMetrics(rFont, this, m_xWestFontNameLB.get(),
+ m_xWestFontStyleLB.get(), m_xWestFontSizeLB.get(), m_xWestFontLanguageLB.get(),
pFontList, GetWhich(SID_ATTR_CHAR_FONT),
GetWhich(SID_ATTR_CHAR_FONTHEIGHT));
- m_pWestFontTypeFT->SetText(pFontList->GetFontMapText(aWestFontMetric));
+ m_xWestFontTypeFT->set_label(pFontList->GetFontMapText(aWestFontMetric));
- FontMetric aEastFontMetric = calcFontMetrics(rCJKFont, this, m_pEastFontNameLB,
- m_pEastFontStyleLB, m_pEastFontSizeLB, m_pEastFontLanguageLB,
+ FontMetric aEastFontMetric = calcFontMetrics(rCJKFont, this, m_xEastFontNameLB.get(),
+ m_xEastFontStyleLB.get(), m_xEastFontSizeLB.get(), m_xEastFontLanguageLB.get(),
pFontList, GetWhich(SID_ATTR_CHAR_CJK_FONT),
GetWhich(SID_ATTR_CHAR_CJK_FONTHEIGHT));
- m_pEastFontTypeFT->SetText(pFontList->GetFontMapText(aEastFontMetric));
+ m_xEastFontTypeFT->set_label(pFontList->GetFontMapText(aEastFontMetric));
FontMetric aCTLFontMetric = calcFontMetrics(rCTLFont,
- this, m_pCTLFontNameLB, m_pCTLFontStyleLB, m_pCTLFontSizeLB,
- m_pCTLFontLanguageLB, pFontList, GetWhich(SID_ATTR_CHAR_CTL_FONT),
+ this, m_xCTLFontNameLB.get(), m_xCTLFontStyleLB.get(), m_xCTLFontSizeLB.get(),
+ m_xCTLFontLanguageLB.get(), pFontList, GetWhich(SID_ATTR_CHAR_CTL_FONT),
GetWhich(SID_ATTR_CHAR_CTL_FONTHEIGHT));
- m_pCTLFontTypeFT->SetText(pFontList->GetFontMapText(aCTLFontMetric));
+ m_xCTLFontTypeFT->set_label(pFontList->GetFontMapText(aCTLFontMetric));
- m_pPreviewWin->Invalidate();
+ m_aPreviewWin.Invalidate();
}
-
-void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox )
+void SvxCharNamePage::FillStyleBox_Impl(const weld::Widget& rNameBox)
{
const FontList* pFontList = GetFontList();
DBG_ASSERT( pFontList, "no fontlist" );
- FontStyleBox* pStyleBox = nullptr;
+ SvtFontStyleBox* pStyleBox = nullptr;
+ OUString sFontName;
- if ( m_pWestFontNameLB == pNameBox )
- pStyleBox = m_pWestFontStyleLB;
- else if ( m_pEastFontNameLB == pNameBox )
- pStyleBox = m_pEastFontStyleLB;
- else if ( m_pCTLFontNameLB == pNameBox )
- pStyleBox = m_pCTLFontStyleLB;
+ if (m_xWestFontNameLB.get() == &rNameBox)
+ {
+ pStyleBox = m_xWestFontStyleLB.get();
+ sFontName = m_xWestFontNameLB->get_active_text();
+ }
+ else if (m_xEastFontNameLB.get() == &rNameBox)
+ {
+ pStyleBox = m_xEastFontStyleLB.get();
+ sFontName = m_xEastFontStyleLB->get_active_text();
+ }
+ else if (m_xCTLFontNameLB.get() == &rNameBox)
+ {
+ pStyleBox = m_xCTLFontStyleLB.get();
+ sFontName = m_xCTLFontNameLB->get_active_text();
+ }
else
{
SAL_WARN( "cui.tabpages", "invalid font name box" );
return;
}
- pStyleBox->Fill( pNameBox->GetText(), pFontList );
+ pStyleBox->Fill(sFontName, pFontList);
if ( m_pImpl->m_bInSearchMode )
{
@@ -628,36 +611,40 @@ void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox )
OUString aEntry = m_pImpl->m_aNoStyleText;
const sal_Char sS[] = "%1";
aEntry = aEntry.replaceFirst( sS, pFontList->GetBoldStr() );
- m_pImpl->m_nExtraEntryPos = pStyleBox->InsertEntry( aEntry );
+ m_pImpl->m_nExtraEntryPos = pStyleBox->get_count();
+ pStyleBox->append_text( aEntry );
aEntry = m_pImpl->m_aNoStyleText;
aEntry = aEntry.replaceFirst( sS, pFontList->GetItalicStr() );
- pStyleBox->InsertEntry( aEntry );
+ pStyleBox->append_text(aEntry);
}
}
-
-void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox )
+void SvxCharNamePage::FillSizeBox_Impl(const weld::Widget& rNameBox)
{
const FontList* pFontList = GetFontList();
DBG_ASSERT( pFontList, "no fontlist" );
- FontStyleBox* pStyleBox = nullptr;
- FontSizeBox* pSizeBox = nullptr;
+ SvtFontStyleBox* pStyleBox = nullptr;
+ SvtFontSizeBox* pSizeBox = nullptr;
+ OUString sFontName;
- if ( m_pWestFontNameLB == pNameBox )
+ if (m_xWestFontNameLB.get() == &rNameBox)
{
- pStyleBox = m_pWestFontStyleLB;
- pSizeBox = m_pWestFontSizeLB;
+ pStyleBox = m_xWestFontStyleLB.get();
+ pSizeBox = m_xWestFontSizeLB.get();
+ sFontName = m_xWestFontNameLB->get_active_text();
}
- else if ( m_pEastFontNameLB == pNameBox )
+ else if (m_xEastFontNameLB.get() == &rNameBox)
{
- pStyleBox = m_pEastFontStyleLB;
- pSizeBox = m_pEastFontSizeLB;
+ pStyleBox = m_xEastFontStyleLB.get();
+ pSizeBox = m_xEastFontSizeLB.get();
+ sFontName = m_xEastFontNameLB->get_active_text();
}
- else if ( m_pCTLFontNameLB == pNameBox )
+ else if (m_xCTLFontNameLB.get() == &rNameBox)
{
- pStyleBox = m_pCTLFontStyleLB;
- pSizeBox = m_pCTLFontSizeLB;
+ pStyleBox = m_xCTLFontStyleLB.get();
+ pSizeBox = m_xCTLFontSizeLB.get();
+ sFontName = m_xCTLFontNameLB->get_active_text();
}
else
{
@@ -665,60 +652,76 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox )
return;
}
- FontMetric _aFontMetric( pFontList->Get( pNameBox->GetText(), pStyleBox->GetText() ) );
+ FontMetric _aFontMetric(pFontList->Get(sFontName, pStyleBox->get_active_text()));
pSizeBox->Fill( &_aFontMetric, pFontList );
}
+namespace
+{
+ void FillFontNames(weld::ComboBoxText& rBox, const FontList& rList)
+ {
+ // insert fonts
+ rBox.freeze();
+ sal_uInt16 nFontCount = rList.GetFontNameCount();
+ for (sal_uInt16 i = 0; i < nFontCount; ++i)
+ {
+ const FontMetric& rFontMetric = rList.GetFontName(i);
+ rBox.append_text(rFontMetric.GetFamilyName());
+ }
+ rBox.make_sorted();
+ rBox.thaw();
+ }
+}
void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp )
{
- FontNameBox* pNameBox = nullptr;
- FixedText* pStyleLabel = nullptr;
- FontStyleBox* pStyleBox = nullptr;
- FixedText* pSizeLabel = nullptr;
- FontSizeBox* pSizeBox = nullptr;
- FixedText* pLangFT = nullptr;
- SvxLanguageBoxBase* pLangBox = nullptr;
+ weld::ComboBoxText* pNameBox = nullptr;
+ weld::Label* pStyleLabel = nullptr;
+ SvtFontStyleBox* pStyleBox = nullptr;
+ weld::Label* pSizeLabel = nullptr;
+ SvtFontSizeBox* pSizeBox = nullptr;
+ weld::Label* pLangFT = nullptr;
+ LanguageBox* pLangBox = nullptr;
sal_uInt16 nWhich = 0;
switch ( eLangGrp )
{
case Western :
- pNameBox = m_pWestFontNameLB;
- pStyleLabel = m_pWestFontStyleFT;
- pStyleBox = m_pWestFontStyleLB;
- pSizeLabel = m_pWestFontSizeFT;
- pSizeBox = m_pWestFontSizeLB;
- pLangFT = m_pWestFontLanguageFT;
- pLangBox = m_pWestFontLanguageLB;
+ pNameBox = m_xWestFontNameLB.get();
+ pStyleLabel = m_xWestFontStyleFT.get();
+ pStyleBox = m_xWestFontStyleLB.get();
+ pSizeLabel = m_xWestFontSizeFT.get();
+ pSizeBox = m_xWestFontSizeLB.get();
+ pLangFT = m_xWestFontLanguageFT.get();
+ pLangBox = m_xWestFontLanguageLB.get();
nWhich = GetWhich( SID_ATTR_CHAR_FONT );
break;
case Asian :
- pNameBox = m_pEastFontNameLB;
- pStyleLabel = m_pEastFontStyleFT;
- pStyleBox = m_pEastFontStyleLB;
- pSizeLabel = m_pEastFontSizeFT;
- pSizeBox = m_pEastFontSizeLB;
- pLangFT = m_pEastFontLanguageFT;
- pLangBox = m_pEastFontLanguageLB;
+ pNameBox = m_xEastFontNameLB.get();
+ pStyleLabel = m_xEastFontStyleFT.get();
+ pStyleBox = m_xEastFontStyleLB.get();
+ pSizeLabel = m_xEastFontSizeFT.get();
+ pSizeBox = m_xEastFontSizeLB.get();
+ pLangFT = m_xEastFontLanguageFT.get();
+ pLangBox = m_xEastFontLanguageLB.get();
nWhich = GetWhich( SID_ATTR_CHAR_CJK_FONT );
break;
case Ctl :
- pNameBox = m_pCTLFontNameLB;
- pStyleLabel = m_pCTLFontStyleFT;
- pStyleBox = m_pCTLFontStyleLB;
- pSizeLabel = m_pCTLFontSizeFT;
- pSizeBox = m_pCTLFontSizeLB;
- pLangFT = m_pCTLFontLanguageFT;
- pLangBox = m_pCTLFontLanguageLB;
+ pNameBox = m_xCTLFontNameLB.get();
+ pStyleLabel = m_xCTLFontStyleFT.get();
+ pStyleBox = m_xCTLFontStyleLB.get();
+ pSizeLabel = m_xCTLFontSizeFT.get();
+ pSizeBox = m_xCTLFontSizeLB.get();
+ pLangFT = m_xCTLFontLanguageFT.get();
+ pLangBox = m_xCTLFontLanguageLB.get();
nWhich = GetWhich( SID_ATTR_CHAR_CTL_FONT );
break;
}
const FontList* pFontList = GetFontList();
- pNameBox->Fill( pFontList );
+ FillFontNames(*pNameBox, *pFontList);
const SvxFontItem* pFontItem = nullptr;
SfxItemState eState = rSet.GetItemState( nWhich );
@@ -726,14 +729,14 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
if ( eState >= SfxItemState::DEFAULT )
{
pFontItem = static_cast<const SvxFontItem*>(&( rSet.Get( nWhich ) ));
- pNameBox->SetText( pFontItem->GetFamilyName() );
+ pNameBox->set_active_text( pFontItem->GetFamilyName() );
}
else
{
- pNameBox->SetText( OUString() );
+ pNameBox->set_active_text( OUString() );
}
- FillStyleBox_Impl( pNameBox );
+ FillStyleBox_Impl(*pNameBox);
bool bStyle = false;
bool bStyleAvailable = true;
@@ -776,24 +779,24 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
if ( bStyle && pFontItem )
{
FontMetric aFontMetric = pFontList->Get( pFontItem->GetFamilyName(), eWeight, eItalic );
- pStyleBox->SetText( pFontList->GetStyleName( aFontMetric ) );
+ pStyleBox->set_active_text( pFontList->GetStyleName( aFontMetric ) );
}
else if ( !m_pImpl->m_bInSearchMode || !bStyle )
{
- pStyleBox->SetText( OUString() );
+ pStyleBox->set_active_text( OUString() );
}
else if ( bStyle )
{
FontMetric aFontMetric = pFontList->Get( OUString(), eWeight, eItalic );
- pStyleBox->SetText( pFontList->GetStyleName( aFontMetric ) );
+ pStyleBox->set_active_text( pFontList->GetStyleName( aFontMetric ) );
}
if (!bStyleAvailable)
{
- pStyleBox->Disable( );
- pStyleLabel->Disable( );
+ pStyleBox->set_sensitive(false);
+ pStyleLabel->set_sensitive(false);
}
- FillSizeBox_Impl( pNameBox );
+ FillSizeBox_Impl(*pNameBox);
switch ( eLangGrp )
{
case Western : nWhich = GetWhich( SID_ATTR_CHAR_FONTHEIGHT ); break;
@@ -811,27 +814,27 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
{
bool bPtRel = MapUnit::MapPoint == rItem.GetPropUnit();
pSizeBox->SetPtRelative( bPtRel );
- pSizeBox->SetValue( bPtRel ? static_cast<short>(rItem.GetProp()) * 10 : rItem.GetProp() );
+ pSizeBox->set_value( bPtRel ? static_cast<short>(rItem.GetProp()) * 10 : rItem.GetProp() );
}
else
{
pSizeBox->SetRelative(false);
- pSizeBox->SetValue( CalcToPoint( rItem.GetHeight(), eUnit, 10 ) );
+ pSizeBox->set_value( CalcToPoint( rItem.GetHeight(), eUnit, 10 ) );
}
}
else if ( eState >= SfxItemState::DEFAULT )
{
MapUnit eUnit = rSet.GetPool()->GetMetric( nWhich );
const SvxFontHeightItem& rItem = static_cast<const SvxFontHeightItem&>(rSet.Get( nWhich ));
- pSizeBox->SetValue( CalcToPoint( rItem.GetHeight(), eUnit, 10 ) );
+ pSizeBox->set_value( CalcToPoint( rItem.GetHeight(), eUnit, 10 ) );
}
else
{
- pSizeBox->SetText( OUString() );
+ pSizeBox->set_active_text( OUString() );
if ( eState <= SfxItemState::READONLY )
{
- pSizeBox->Disable( );
- pSizeLabel->Disable( );
+ pSizeBox->set_sensitive(false);
+ pSizeLabel->set_sensitive(false);
}
}
@@ -841,20 +844,20 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
case Asian : nWhich = GetWhich( SID_ATTR_CHAR_CJK_LANGUAGE ); break;
case Ctl : nWhich = GetWhich( SID_ATTR_CHAR_CTL_LANGUAGE ); break;
}
- pLangBox->SetNoSelectionLBB();
+ pLangBox->set_active(-1);
eState = rSet.GetItemState( nWhich );
switch ( eState )
{
case SfxItemState::UNKNOWN:
- pLangFT->Hide();
- pLangBox->HideLBB();
+ pLangFT->hide();
+ pLangBox->hide();
break;
case SfxItemState::DISABLED:
case SfxItemState::READONLY:
- pLangFT->Disable();
- pLangBox->DisableLBB();
+ pLangFT->set_sensitive(false);
+ pLangBox->set_sensitive(false);
break;
case SfxItemState::DEFAULT:
@@ -863,8 +866,8 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
const SvxLanguageItem& rItem = static_cast<const SvxLanguageItem&>(rSet.Get( nWhich ));
LanguageType eLangType = rItem.GetValue();
DBG_ASSERT( eLangType != LANGUAGE_SYSTEM, "LANGUAGE_SYSTEM not allowed" );
- if ( eLangType != LANGUAGE_DONTKNOW )
- pLangBox->SelectLanguage( eLangType );
+ if (eLangType != LANGUAGE_DONTKNOW)
+ pLangBox->set_active_id(eLangType);
break;
}
case SfxItemState::DONTCARE:
@@ -872,62 +875,62 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
}
OUString sMapText(pFontList->GetFontMapText(
- pFontList->Get(pNameBox->GetText(), pStyleBox->GetText())));
+ pFontList->Get(pNameBox->get_active_text(), pStyleBox->get_active_text())));
switch (eLangGrp)
{
case Western:
- m_pWestFontTypeFT->SetText(sMapText);
+ m_xWestFontTypeFT->set_label(sMapText);
break;
case Asian:
- m_pEastFontTypeFT->SetText(sMapText);
+ m_xEastFontTypeFT->set_label(sMapText);
break;
case Ctl:
- m_pCTLFontTypeFT->SetText(sMapText);
+ m_xCTLFontTypeFT->set_label(sMapText);
break;
}
// save these settings
- pNameBox->SaveValue();
- pStyleBox->SaveValue();
- pSizeBox->SaveValue();
- pLangBox->SaveValueLBB();
+ pNameBox->save_value();
+ pStyleBox->save_value();
+ pSizeBox->save_value();
+ pLangBox->save_active_id();
}
bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp )
{
bool bModified = false;
- FontNameBox* pNameBox = nullptr;
- FontStyleBox* pStyleBox = nullptr;
- FontSizeBox* pSizeBox = nullptr;
- SvxLanguageBoxBase* pLangBox = nullptr;
+ weld::ComboBoxText* pNameBox = nullptr;
+ SvtFontStyleBox* pStyleBox = nullptr;
+ SvtFontSizeBox* pSizeBox = nullptr;
+ LanguageBox* pLangBox = nullptr;
sal_uInt16 nWhich = 0;
sal_uInt16 nSlot = 0;
switch ( eLangGrp )
{
case Western :
- pNameBox = m_pWestFontNameLB;
- pStyleBox = m_pWestFontStyleLB;
- pSizeBox = m_pWestFontSizeLB;
- pLangBox = m_pWestFontLanguageLB;
+ pNameBox = m_xWestFontNameLB.get();
+ pStyleBox = m_xWestFontStyleLB.get();
+ pSizeBox = m_xWestFontSizeLB.get();
+ pLangBox = m_xWestFontLanguageLB.get();
nSlot = SID_ATTR_CHAR_FONT;
break;
case Asian :
- pNameBox = m_pEastFontNameLB;
- pStyleBox = m_pEastFontStyleLB;
- pSizeBox = m_pEastFontSizeLB;
- pLangBox = m_pEastFontLanguageLB;
+ pNameBox = m_xEastFontNameLB.get();
+ pStyleBox = m_xEastFontStyleLB.get();
+ pSizeBox = m_xEastFontSizeLB.get();
+ pLangBox = m_xEastFontLanguageLB.get();
nSlot = SID_ATTR_CHAR_CJK_FONT;
break;
case Ctl :
- pNameBox = m_pCTLFontNameLB;
- pStyleBox = m_pCTLFontStyleLB;
- pSizeBox = m_pCTLFontSizeLB;
- pLangBox = m_pCTLFontLanguageLB;
+ pNameBox = m_xCTLFontNameLB.get();
+ pStyleBox = m_xCTLFontStyleLB.get();
+ pSizeBox = m_xCTLFontSizeLB.get();
+ pLangBox = m_xCTLFontLanguageLB.get();
nSlot = SID_ATTR_CHAR_CTL_FONT;
break;
}
@@ -940,11 +943,11 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
const SfxItemSet* pExampleSet = GetDialogExampleSet();
bool bChanged = true;
- const OUString& rFontName = pNameBox->GetText();
+ const OUString& rFontName = pNameBox->get_active_text();
const FontList* pFontList = GetFontList();
- OUString aStyleBoxText =pStyleBox->GetText();
- sal_Int32 nEntryPos = pStyleBox->GetEntryPos( aStyleBoxText );
- if ( nEntryPos >= m_pImpl->m_nExtraEntryPos )
+ OUString aStyleBoxText = pStyleBox->get_active_text();
+ int nEntryPos = pStyleBox->find_text(aStyleBoxText);
+ if (nEntryPos >= m_pImpl->m_nExtraEntryPos)
aStyleBoxText.clear();
FontMetric aInfo( pFontList->Get( rFontName, aStyleBoxText ) );
SvxFontItem aFontItem( aInfo.GetFamilyType(), aInfo.GetFamilyName(), aInfo.GetStyleName(),
@@ -960,7 +963,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
}
if ( !bChanged )
- bChanged = pNameBox->GetSavedValue().isEmpty();
+ bChanged = pNameBox->get_saved_value().isEmpty();
if ( !bChanged && pExampleSet &&
pExampleSet->GetItemState( nWhich, false, &pItem ) == SfxItemState::SET &&
@@ -1000,7 +1003,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
if ( !bChanged )
{
- bChanged = pStyleBox->GetSavedValue().isEmpty();
+ bChanged = pStyleBox->get_saved_value().isEmpty();
if ( m_pImpl->m_bInSearchMode && bChanged &&
aInfo.GetWeight() == WEIGHT_NORMAL && aInfo.GetItalic() != ITALIC_NONE )
@@ -1015,7 +1018,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
if ( nEntryPos >= m_pImpl->m_nExtraEntryPos )
bChanged = ( nEntryPos == m_pImpl->m_nExtraEntryPos );
- OUString aText( pStyleBox->GetText() ); // Tristate, then text empty
+ OUString aText( pStyleBox->get_active_text() ); // Tristate, then text empty
if ( bChanged && !aText.isEmpty() )
{
@@ -1049,7 +1052,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
if ( !bChanged )
{
- bChanged = pStyleBox->GetSavedValue().isEmpty();
+ bChanged = pStyleBox->get_saved_value().isEmpty();
if ( m_pImpl->m_bInSearchMode && bChanged &&
aInfo.GetItalic() == ITALIC_NONE && aInfo.GetWeight() != WEIGHT_NORMAL )
@@ -1073,11 +1076,11 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
rSet.InvalidateItem(nWhich);
// FontSize
- long nSize = static_cast<long>(pSizeBox->GetValue());
+ long nSize = pSizeBox->get_value();
- if ( pSizeBox->GetText().isEmpty() ) // GetValue() returns the min-value
+ if ( pSizeBox->get_active_text().isEmpty() ) // GetValue() returns the min-value
nSize = 0;
- long nSavedSize = static_cast<long>(pSizeBox->GetSavedIntValue());
+ long nSavedSize = pSizeBox->get_saved_value();
const bool bRel = pSizeBox->IsRelative();
switch ( eLangGrp )
@@ -1138,44 +1141,42 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
// For language list boxes acting as ComboBox, check for, add and select an
// edited entry.
- SvxLanguageComboBox* pLangComboBox = dynamic_cast<SvxLanguageComboBox*>(pLangBox);
- if (pLangComboBox)
+ if (pLangBox == m_xWestFontLanguageLB.get())
{
- switch (pLangComboBox->GetEditedAndValid())
+ switch (pLangBox->GetEditedAndValid())
{
- case SvxLanguageComboBox::EditedAndValid::No:
+ case LanguageBox::EditedAndValid::No:
; // nothing to do
break;
- case SvxLanguageComboBox::EditedAndValid::Valid:
+ case LanguageBox::EditedAndValid::Valid:
{
- const sal_Int32 nPos = pLangComboBox->SaveEditedAsEntry();
- if (nPos != COMBOBOX_ENTRY_NOTFOUND)
- pLangComboBox->SelectEntryPos( nPos);
+ const int nPos = pLangBox->SaveEditedAsEntry();
+ if (nPos != -1)
+ pLangBox->set_active(nPos);
}
break;
- case SvxLanguageComboBox::EditedAndValid::Invalid:
- pLangComboBox->SelectEntryPos( pLangComboBox->GetSavedValueLBB());
+ case LanguageBox::EditedAndValid::Invalid:
+ pLangBox->set_active_id(pLangBox->get_saved_active_id());
break;
}
}
- sal_Int32 nLangPos = pLangBox->GetSelectedEntryPosLBB();
- LanguageType eLangType = LanguageType(reinterpret_cast<sal_uLong>(pLangBox->GetEntryDataLBB( nLangPos )));
+ int nLangPos = pLangBox->get_active();
+ LanguageType eLangType = pLangBox->get_active_id();
- if ( pOld )
+ if (pOld)
{
const SvxLanguageItem& rItem = *static_cast<const SvxLanguageItem*>(pOld);
-
- if ( nLangPos == LISTBOX_ENTRY_NOTFOUND || eLangType == rItem.GetValue() )
+ if (nLangPos == -1 || eLangType == rItem.GetValue())
bChanged = false;
}
- if ( !bChanged )
- bChanged = ( pLangBox->GetSavedValueLBB() == LISTBOX_ENTRY_NOTFOUND );
+ if (!bChanged)
+ bChanged = pLangBox->get_active_id_changed_from_saved();
- if ( bChanged && nLangPos != LISTBOX_ENTRY_NOTFOUND )
+ if (bChanged && nLangPos != -1)
{
- rSet.Put( SvxLanguageItem( eLangType, nWhich ) );
+ rSet.Put(SvxLanguageItem(eLangType, nWhich));
bModified = true;
}
else if ( SfxItemState::DEFAULT == rOldSet.GetItemState( nWhich, false ) )
@@ -1184,43 +1185,39 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
return bModified;
}
-
IMPL_LINK_NOARG(SvxCharNamePage, UpdateHdl_Impl, Timer *, void)
{
UpdatePreview_Impl();
}
-
-IMPL_LINK( SvxCharNamePage, FontModifyComboBoxHdl_Impl, ComboBox&, rBox, void )
+IMPL_LINK(SvxCharNamePage, FontModifyComboBoxHdl_Impl, weld::ComboBoxText&, rBox, void)
{
- FontModifyHdl_Impl(&rBox);
+ FontModifyHdl_Impl(rBox);
}
-IMPL_LINK( SvxCharNamePage, FontModifyListBoxHdl_Impl, ListBox&, rBox, void )
-{
- FontModifyHdl_Impl(&rBox);
-}
-IMPL_LINK( SvxCharNamePage, FontModifyEditHdl_Impl, Edit&, rBox, void )
+
+IMPL_LINK(SvxCharNamePage, FontModifyEditHdl_Impl, weld::Entry&, rBox, void)
{
- FontModifyHdl_Impl(&rBox);
+ FontModifyHdl_Impl(rBox);
}
-IMPL_LINK(SvxCharNamePage, FontFeatureButtonClicked, Button*, pButton, void )
+
+IMPL_LINK(SvxCharNamePage, FontFeatureButtonClicked, weld::Button&, rButton, void)
{
OUString sFontName;
- FontNameBox * pNameBox = nullptr;
+ weld::ComboBoxText* pNameBox = nullptr;
- if (pButton == m_pWestFontFeaturesButton.get())
+ if (&rButton == m_xWestFontFeaturesButton.get())
{
- pNameBox = m_pWestFontNameLB;
+ pNameBox = m_xWestFontNameLB.get();
sFontName = GetPreviewFont().GetFamilyName();
}
- else if (pButton == m_pEastFontFeaturesButton.get())
+ else if (&rButton == m_xEastFontFeaturesButton.get())
{
- pNameBox = m_pEastFontNameLB;
+ pNameBox = m_xEastFontNameLB.get();
sFontName = GetPreviewCJKFont().GetFamilyName();
}
- else if (pButton == m_pCTLFontFeaturesButton.get())
+ else if (&rButton == m_xCTLFontFeaturesButton.get())
{
- pNameBox = m_pCTLFontNameLB;
+ pNameBox = m_xCTLFontNameLB.get();
sFontName = GetPreviewCTLFont().GetFamilyName();
}
@@ -1229,32 +1226,30 @@ IMPL_LINK(SvxCharNamePage, FontFeatureButtonClicked, Button*, pButton, void )
cui::FontFeaturesDialog aDialog(GetDialogFrameWeld(), sFontName);
if (aDialog.execute() == RET_OK)
{
- pNameBox->SetText(aDialog.getResultFontName());
+ pNameBox->set_active_text(aDialog.getResultFontName());
UpdatePreview_Impl();
}
}
}
-void SvxCharNamePage::FontModifyHdl_Impl(void const * pNameBox)
+void SvxCharNamePage::FontModifyHdl_Impl(const weld::Widget& rNameBox)
{
m_pImpl->m_aUpdateIdle.Start();
- if ( m_pWestFontNameLB == pNameBox || m_pEastFontNameLB == pNameBox || m_pCTLFontNameLB == pNameBox )
+ if (m_xWestFontNameLB.get() == &rNameBox || m_xEastFontNameLB.get() == &rNameBox || m_xCTLFontNameLB.get() == &rNameBox)
{
- FillStyleBox_Impl( static_cast<FontNameBox const *>(pNameBox) );
- FillSizeBox_Impl( static_cast<FontNameBox const *>(pNameBox) );
+ FillStyleBox_Impl(rNameBox);
+ FillSizeBox_Impl(rNameBox);
}
}
-
void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet )
{
- SvxCharBasePage::ActivatePage( rSet );
+ CharBasePage::ActivatePage( rSet );
UpdatePreview_Impl(); // instead of asynchronous calling in ctor
}
-
DeactivateRC SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
@@ -1262,13 +1257,11 @@ DeactivateRC SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet )
return DeactivateRC::LeavePage;
}
-
-VclPtr<SfxTabPage> SvxCharNamePage::Create( TabPageParent pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> SvxCharNamePage::Create(TabPageParent pParent, const SfxItemSet* rSet)
{
- return VclPtr<SvxCharNamePage>::Create( pParent.pParent, *rSet );
+ return VclPtr<SvxCharNamePage>::Create(pParent, *rSet );
}
-
void SvxCharNamePage::Reset( const SfxItemSet* rSet )
{
Reset_Impl( *rSet, Western );
@@ -1278,20 +1271,21 @@ void SvxCharNamePage::Reset( const SfxItemSet* rSet )
SetPrevFontWidthScale( *rSet );
UpdatePreview_Impl();
}
+
void SvxCharNamePage::ChangesApplied()
{
- m_pWestFontNameLB->SaveValue();
- m_pWestFontStyleLB->SaveValue();
- m_pWestFontSizeLB->SaveValue();
- m_pWestFontLanguageLB->SaveValueLBB();
- m_pEastFontNameLB->SaveValue();
- m_pEastFontStyleLB->SaveValue();
- m_pEastFontSizeLB->SaveValue();
- m_pEastFontLanguageLB->SaveValueLBB();
- m_pCTLFontNameLB->SaveValue();
- m_pCTLFontStyleLB->SaveValue();
- m_pCTLFontSizeLB->SaveValue();
- m_pCTLFontLanguageLB->SaveValueLBB();
+ m_xWestFontNameLB->save_value();
+ m_xWestFontStyleLB->save_value();
+ m_xWestFontSizeLB->save_value();
+ m_xWestFontLanguageLB->save_active_id();
+ m_xEastFontNameLB->save_value();
+ m_xEastFontStyleLB->save_value();
+ m_xEastFontSizeLB->save_value();
+ m_xEastFontLanguageLB->save_active_id();
+ m_xCTLFontNameLB->save_value();
+ m_xCTLFontStyleLB->save_value();
+ m_xCTLFontSizeLB->save_value();
+ m_xCTLFontLanguageLB->save_active_id();
}
bool SvxCharNamePage::FillItemSet( SfxItemSet* rSet )
@@ -1302,16 +1296,14 @@ bool SvxCharNamePage::FillItemSet( SfxItemSet* rSet )
return bModified;
}
-
void SvxCharNamePage::SetFontList( const SvxFontListItem& rItem )
{
m_pImpl->m_pFontList = rItem.GetFontList()->Clone();
}
-
namespace
{
- void enableRelativeMode( SvxCharNamePage const * _pPage, FontSizeBox* _pFontSizeLB, sal_uInt16 _nHeightWhich )
+ void enableRelativeMode( SvxCharNamePage const * _pPage, SvtFontSizeBox* _pFontSizeLB, sal_uInt16 _nHeightWhich )
{
_pFontSizeLB->EnableRelativeMode( 5, 995 ); // min 5%, max 995%, step 5
@@ -1328,16 +1320,14 @@ namespace
}
}
-
void SvxCharNamePage::EnableRelativeMode()
{
DBG_ASSERT( GetItemSet().GetParent(), "RelativeMode, but no ParentSet!" );
- enableRelativeMode(this,m_pWestFontSizeLB,GetWhich( SID_ATTR_CHAR_FONTHEIGHT ));
- enableRelativeMode(this,m_pEastFontSizeLB,GetWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT ));
- enableRelativeMode(this,m_pCTLFontSizeLB,GetWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT ));
+ enableRelativeMode(this,m_xWestFontSizeLB.get(),GetWhich( SID_ATTR_CHAR_FONTHEIGHT ));
+ enableRelativeMode(this,m_xEastFontSizeLB.get(),GetWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT ));
+ enableRelativeMode(this,m_xCTLFontSizeLB.get(),GetWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT ));
}
-
void SvxCharNamePage::EnableSearchMode()
{
m_pImpl->m_bInSearchMode = true;
@@ -1347,26 +1337,25 @@ void SvxCharNamePage::DisableControls( sal_uInt16 nDisable )
{
if ( DISABLE_LANGUAGE & nDisable )
{
- if ( m_pWestFontLanguageFT ) m_pWestFontLanguageFT->Disable();
- if ( m_pWestFontLanguageLB ) m_pWestFontLanguageLB->Disable();
- if ( m_pEastFontLanguageFT ) m_pEastFontLanguageFT->Disable();
- if ( m_pEastFontLanguageLB ) m_pEastFontLanguageLB->Disable();
- if ( m_pCTLFontLanguageFT ) m_pCTLFontLanguageFT->Disable();
- if ( m_pCTLFontLanguageLB ) m_pCTLFontLanguageLB->Disable();
+ if ( m_xWestFontLanguageFT ) m_xWestFontLanguageFT->set_sensitive(false);
+ if ( m_xWestFontLanguageLB ) m_xWestFontLanguageLB->set_sensitive(false);
+ if ( m_xEastFontLanguageFT ) m_xEastFontLanguageFT->set_sensitive(false);
+ if ( m_xEastFontLanguageLB ) m_xEastFontLanguageLB->set_sensitive(false);
+ if ( m_xCTLFontLanguageFT ) m_xCTLFontLanguageFT->set_sensitive(false);
+ if ( m_xCTLFontLanguageLB ) m_xCTLFontLanguageLB->set_sensitive(false);
}
if ( DISABLE_HIDE_LANGUAGE & nDisable )
{
- if ( m_pWestFontLanguageFT ) m_pWestFontLanguageFT->Hide();
- if ( m_pWestFontLanguageLB ) m_pWestFontLanguageLB->Hide();
- if ( m_pEastFontLanguageFT ) m_pEastFontLanguageFT->Hide();
- if ( m_pEastFontLanguageLB ) m_pEastFontLanguageLB->Hide();
- if ( m_pCTLFontLanguageFT ) m_pCTLFontLanguageFT->Hide();
- if ( m_pCTLFontLanguageLB ) m_pCTLFontLanguageLB->Hide();
+ if ( m_xWestFontLanguageFT ) m_xWestFontLanguageFT->hide();
+ if ( m_xWestFontLanguageLB ) m_xWestFontLanguageLB->hide();
+ if ( m_xEastFontLanguageFT ) m_xEastFontLanguageFT->hide();
+ if ( m_xEastFontLanguageLB ) m_xEastFontLanguageLB->hide();
+ if ( m_xCTLFontLanguageFT ) m_xCTLFontLanguageFT->hide();
+ if ( m_xCTLFontLanguageLB ) m_xCTLFontLanguageLB->hide();
}
}
-
void SvxCharNamePage::PageCreated(const SfxAllItemSet& aSet)
{
const SvxFontListItem* pFontListItem = aSet.GetItem<SvxFontListItem>(SID_ATTR_CHAR_FONTLIST, false);
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 47be2ee42ca1..8412e41c3af8 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -2,7 +2,54 @@
<!-- Generated with glade 3.22.1 -->
<interface domain="cui">
<requires lib="gtk+" version="3.18"/>
- <requires lib="LibreOffice" version="1.0"/>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkEntryCompletion" id="entrycompletion1">
+ <property name="model">liststore1</property>
+ <property name="text_column">0</property>
+ <property name="inline_completion">True</property>
+ <property name="popup_completion">False</property>
+ <property name="popup_set_width">False</property>
+ <property name="popup_single_match">False</property>
+ </object>
+ <object class="GtkListStore" id="liststore2">
+ <columns>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkEntryCompletion" id="entrycompletion2">
+ <property name="model">liststore2</property>
+ <property name="text_column">0</property>
+ <property name="inline_completion">True</property>
+ <property name="popup_completion">False</property>
+ <property name="popup_set_width">False</property>
+ <property name="popup_single_match">False</property>
+ </object>
+ <object class="GtkListStore" id="liststore3">
+ <columns>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkEntryCompletion" id="entrycompletion3">
+ <property name="model">liststore3</property>
+ <property name="text_column">0</property>
+ <property name="inline_completion">True</property>
+ <property name="popup_completion">False</property>
+ <property name="popup_set_width">False</property>
+ <property name="popup_single_match">False</property>
+ </object>
<object class="GtkBox" id="CharNamePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -46,12 +93,64 @@
<property name="vexpand">True</property>
<property name="top_padding">6</property>
<child>
- <object class="svtlo-FontNameBox" id="westfontnamelb-nocjk">
+ <object class="GtkGrid" id="namegrid">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="dropdown">False</property>
+ <property name="row_spacing">3</property>
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="westfontnamelb-nocjk">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="model">liststore1</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="westfontname-nocjk">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <property name="completion">entrycompletion1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -73,7 +172,6 @@
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
@@ -81,16 +179,63 @@
<object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
<child>
- <object class="svtlo-FontStyleBox" id="weststylelb-nocjk">
+ <object class="GtkGrid" id="stylegrid">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
+ <property name="can_focus">False</property>
<property name="vexpand">True</property>
- <property name="dropdown">False</property>
+ <property name="row_spacing">3</property>
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="weststylelb-nocjk">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="vexpand">True</property>
+ <property name="model">liststore2</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="weststyle-nocjk">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="completion">entrycompletion2</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -112,7 +257,6 @@
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
@@ -120,17 +264,64 @@
<object class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
<child>
- <object class="svtlo-FontSizeBox" id="westsizelb-nocjk">
- <property name="height_request">150</property>
+ <object class="GtkGrid" id="sizegrid">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
+ <property name="can_focus">False</property>
<property name="vexpand">True</property>
- <property name="dropdown">False</property>
+ <property name="row_spacing">3</property>
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="vscrollbar_policy">always</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="westsizelb-nocjk">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="vexpand">True</property>
+ <property name="model">liststore3</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection3"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn3">
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext3"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="westsize-nocjk">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="completion">entrycompletion3</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -177,11 +368,17 @@
</packing>
</child>
<child>
- <object class="svxcorelo-SvxLanguageComboBox" id="westlanglb-nocjk">
+ <object class="GtkComboBoxText" id="westlanglb-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -249,7 +446,6 @@
<object class="GtkLabel" id="westfontnameft-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="label" context="charnamepage|westfontnameft-cjk">Family:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">westfontnamelb-cjk</property>
@@ -264,7 +460,6 @@
<object class="GtkLabel" id="weststyleft-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="label" context="charnamepage|weststyleft-cjk">Style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">weststylelb-cjk</property>
@@ -279,7 +474,6 @@
<object class="GtkLabel" id="westsizeft-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="label" translatable="yes" context="charnamepage|westsizeft-cjk">Size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">westsizelb-cjk</property>
@@ -294,7 +488,6 @@
<object class="GtkLabel" id="westlangft-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="label" translatable="yes" context="charnamepage|westlangft-cjk">Language:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">westlanglb-cjk</property>
@@ -306,10 +499,16 @@
</packing>
</child>
<child>
- <object class="svtlo-FontNameBox" id="westfontnamelb-cjk">
+ <object class="GtkComboBoxText" id="westfontnamelb-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -317,10 +516,15 @@
</packing>
</child>
<child>
- <object class="svtlo-FontStyleBox" id="weststylelb-cjk">
+ <object class="GtkComboBoxText" id="weststylelb-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -328,10 +532,15 @@
</packing>
</child>
<child>
- <object class="svtlo-FontSizeBox" id="westsizelb-cjk">
+ <object class="GtkComboBoxText" id="westsizelb-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
@@ -339,10 +548,15 @@
</packing>
</child>
<child>
- <object class="svxcorelo-SvxLanguageComboBox" id="westlanglb-cjk">
+ <object class="GtkComboBoxText" id="westlanglb-cjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">3</property>
@@ -350,33 +564,42 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="westfontinfo-cjk">
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">6</property>
- <property name="xalign">0</property>
+ <child>
+ <object class="GtkLabel" id="westfontinfo-cjk">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">6</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="west_features_button-cjk">
+ <property name="label" translatable="yes" context="charnamepage|west_features_button-cjk">Features...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="west_features_button-cjk">
- <property name="label" translatable="yes" context="charnamepage|west_features_button-cjk">Features...</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="left_attach">4</property>
- <property name="top_attach">1</property>
+ <property name="width">4</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -422,7 +645,6 @@
<object class="GtkLabel" id="eastfontnameft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="label" context="charnamepage|eastfontnameft">Family:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eastfontnamelb</property>
@@ -437,7 +659,6 @@
<object class="GtkLabel" id="eaststyleft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="label" context="charnamepage|eaststyleft">Style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eaststylelb</property>
@@ -452,7 +673,6 @@
<object class="GtkLabel" id="eastsizeft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="label" translatable="yes" context="charnamepage|eastsizeft">Size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eastsizelb</property>
@@ -467,7 +687,6 @@
<object class="GtkLabel" id="eastlangft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="label" translatable="yes" context="charnamepage|eastlangft">Language:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eastlanglb</property>
@@ -479,10 +698,16 @@
</packing>
</child>
<child>
- <object class="svtlo-FontNameBox" id="eastfontnamelb">
+ <object class="GtkComboBoxText" id="eastfontnamelb">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -490,10 +715,15 @@
</packing>
</child>
<child>
- <object class="svtlo-FontStyleBox" id="eaststylelb">
+ <object class="GtkComboBoxText" id="eaststylelb">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -501,10 +731,15 @@
</packing>
</child>
<child>
- <object class="svtlo-FontSizeBox" id="eastsizelb">
+ <object class="GtkComboBoxText" id="eastsizelb">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
@@ -512,10 +747,9 @@
</packing>
</child>
<child>
- <object class="svxcorelo-SvxLanguageBox" id="eastlanglb">
+ <object class="GtkComboBoxText" id="eastlanglb">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -523,32 +757,41 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="eastfontinfo">
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <child>
+ <object class="GtkLabel" id="eastfontinfo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="east_features_button">
+ <property name="label" translatable="yes" context="charnamepage|east_features_button">Features...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="east_features_button">
- <property name="label" translatable="yes" context="charnamepage|east_features_button">Features...</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="left_attach">4</property>
- <property name="top_attach">1</property>
+ <property name="width">4</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -594,7 +837,6 @@
<object class="GtkLabel" id="ctlfontnameft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="label" context="charnamepage|ctlfontnameft">Family:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ctlfontnamelb</property>
@@ -609,7 +851,6 @@
<object class="GtkLabel" id="ctlstyleft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="label" context="charnamepage|ctlstyleft">Style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ctlstylelb</property>
@@ -624,7 +865,6 @@
<object class="GtkLabel" id="ctlsizeft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="label" translatable="yes" context="charnamepage|ctlsizeft">Size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ctlsizelb</property>
@@ -639,7 +879,6 @@
<object class="GtkLabel" id="ctllangft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="label" translatable="yes" context="charnamepage|ctllangft">Language:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ctllanglb</property>
@@ -651,10 +890,16 @@
</packing>
</child>
<child>
- <object class="svtlo-FontNameBox" id="ctlfontnamelb">
+ <object class="GtkComboBoxText" id="ctlfontnamelb">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -662,10 +907,15 @@
</packing>
</child>
<child>
- <object class="svtlo-FontStyleBox" id="ctlstylelb">
+ <object class="GtkComboBoxText" id="ctlstylelb">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -673,10 +923,15 @@
</packing>
</child>
<child>
- <object class="svtlo-FontSizeBox" id="ctlsizelb">
+ <object class="GtkComboBoxText" id="ctlsizelb">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can_focus">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
@@ -684,10 +939,9 @@
</packing>
</child>
<child>
- <object class="svxcorelo-SvxLanguageBox" id="ctllanglb">
+ <object class="GtkComboBoxText" id="ctllanglb">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -695,33 +949,42 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="ctlfontinfo">
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">6</property>
- <property name="xalign">0</property>
+ <child>
+ <object class="GtkLabel" id="ctlfontinfo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">6</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="ctl_features_button">
+ <property name="label" translatable="yes" context="charnamepage|ctl_features_button">Features...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">5</property>
+ <property name="width">4</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="ctl_features_button">
- <property name="label" translatable="yes" context="charnamepage|ctl_features_button">Features...</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="left_attach">4</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -752,12 +1015,27 @@
<property name="left_padding">12</property>
<property name="right_padding">12</property>
<child>
- <object class="svxlo-SvxFontPrevWindow" id="preview:border">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="preview:border-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes" context="charnamepage|preview-atkobject">Preview</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkViewport">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkDrawingArea" id="preview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="preview-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes" context="charnamepage|preview-atkobject">Preview</property>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
</child>
</object>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index ac8078154069..e79db6624283 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -496,10 +496,6 @@
generic-name="LanguageBox" parent="VclComboBoxText"
icon-name="widget-gtk-combobox"/>
- <glade-widget-class title="Language ComboBox" name="svxcorelo-SvxLanguageComboBox"
- generic-name="LanguageComboBox" parent="VclComboBoxText"
- icon-name="widget-gtk-comboboxtext"/>
-
<glade-widget-class title="Reference Button" name="foruilo-RefButton"
generic-name="Reference Button" parent="GtkButton"
icon-name="widget-gtk-button"/>
diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx
index 6fecb3378f4d..5cd9e24b41e7 100644
--- a/include/sfx2/newstyle.hxx
+++ b/include/sfx2/newstyle.hxx
@@ -38,13 +38,13 @@ private:
DECL_DLLPRIVATE_LINK(OKHdl, weld::TreeView&, void);
DECL_DLLPRIVATE_LINK(OKClickHdl, weld::Button&, void);
- DECL_DLLPRIVATE_LINK(ModifyHdl, weld::Entry&, void);
+ DECL_DLLPRIVATE_LINK(ModifyHdl, weld::ComboBoxText&, void);
public:
SfxNewStyleDlg(weld::Window* pParent, SfxStyleSheetBasePool&);
virtual ~SfxNewStyleDlg() override;
- OUString GetName() const { return comphelper::string::stripStart(m_xColBox->get_text(), ' '); }
+ OUString GetName() const { return comphelper::string::stripStart(m_xColBox->get_active_text(), ' '); }
};
#endif
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 65c2f5d62a6a..5ff94f0558a9 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list