summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-09-25 12:30:21 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-09-28 15:35:22 +0200
commit3c11aa745cc78f1bde4efacccb22fa818df825c7 (patch)
tree09135c2ec9f77b09d371418476a5b6fd6acc54d0
parenta98058199410bdb183acd0ec5e7899ea4baf6c5a (diff)
weld ScAttrDlg
Change-Id: I11eb9001604a1997a8bfa80a144306ddcb913d93 Reviewed-on: https://gerrit.libreoffice.org/61011 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--cui/source/inc/numfmt.hxx1
-rw-r--r--cui/source/tabpages/numfmt.cxx9
-rw-r--r--include/svx/svxids.hrc2
-rw-r--r--sc/inc/scabstdlg.hxx4
-rw-r--r--sc/qa/unit/screenshots/screenshots.cxx4
-rw-r--r--sc/source/ui/attrdlg/attrdlg.cxx29
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.cxx10
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx7
-rw-r--r--sc/source/ui/inc/attrdlg.hxx17
-rw-r--r--sc/source/ui/view/tabvwsha.cxx28
-rw-r--r--sc/uiconfig/scalc/ui/formatcellsdialog.ui229
-rw-r--r--svx/source/dialog/fontlb.cxx2
12 files changed, 262 insertions, 80 deletions
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 6fb600fbc41c..70b2806e5c61 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -84,7 +84,6 @@ private:
std::unique_ptr<SvxNumberInfoItem> pNumItem;
std::unique_ptr<SvxNumberFormatShell> pNumFmtShell;
sal_uLong nInitFormat;
- Link<SfxPoolItem const *,void> fnOkHdl;
bool bNumItemFlag; ///< for handling with DocShell
bool bOneAreaFlag;
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 2dd0e9824301..4257799ae311 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1126,10 +1126,8 @@ IMPL_LINK(SvxNumberFormatTabPage, DoubleClickHdl_Impl, weld::TreeView&, rLb, voi
{
SelFormatHdl_Impl(&rLb);
- if ( fnOkHdl.IsSet() )
- { // temporary solution, should be offered by SfxTabPage
- fnOkHdl.Call( nullptr );
- }
+ if (SfxTabDialogController* pController = GetDialogController())
+ pController->getDialog()->response(RET_OK);
else
{
SfxSingleTabDialog* pParent = dynamic_cast<SfxSingleTabDialog*>(GetParentDialog());
@@ -1734,11 +1732,8 @@ void SvxNumberFormatTabPage::AddAutomaticLanguage_Impl(LanguageType eAutoLang, b
void SvxNumberFormatTabPage::PageCreated(const SfxAllItemSet& aSet)
{
const SvxNumberInfoItem* pNumberInfoItem = aSet.GetItem<SvxNumberInfoItem>(SID_ATTR_NUMBERFORMAT_INFO, false);
- const SfxLinkItem* pLinkItem = aSet.GetItem<SfxLinkItem>(SID_LINK_TYPE, false);
if (pNumberInfoItem && !pNumItem)
pNumItem.reset( static_cast<SvxNumberInfoItem*>(pNumberInfoItem->Clone()) );
- if (pLinkItem)
- fnOkHdl = pLinkItem->GetValue();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index e3e857637bed..54cab86e69da 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -817,7 +817,7 @@ class SfxStringItem;
#define SID_FLAG_TYPE ( SID_SVX_START + 1034 )
#define SID_SWMODE_TYPE ( SID_SVX_START + 1035 )
#define SID_DISABLE_CTL ( SID_SVX_START + 1036 )
-#define SID_LINK_TYPE ( SID_SVX_START + 1037 )
+//FREE
#define SID_ENUM_PAGE_MODE ( SID_SVX_START + 1038 )
#define SID_PAPER_START ( SID_SVX_START + 1039 )
#define SID_PAPER_END ( SID_SVX_START + 1040 )
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 1e9ab755223e..b7910d594243 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -515,8 +515,8 @@ public:
bool bOnlyDbtoolsEncodings,
bool bImport = true ) = 0;
- virtual VclPtr<SfxAbstractTabDialog> CreateScAttrDlg( vcl::Window* pParent,
- const SfxItemSet* pCellAttrs ) = 0;
+ virtual VclPtr<SfxAbstractTabDialog> CreateScAttrDlg(weld::Window* pParent,
+ const SfxItemSet* pCellAttrs) = 0;
virtual VclPtr<SfxAbstractTabDialog> CreateScHFEditDlg(vcl::Window* pParent,
const SfxItemSet& rCoreSet,
diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx
index 7b9a2d8cc2ff..5b137437c0f2 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -268,11 +268,9 @@ VclPtr<VclAbstractDialog> ScScreenshotTest::createDialogByID(sal_uInt32 nID)
mpItemSet->MergeRange(SID_ATTR_NUMBERFORMAT_INFO, SID_ATTR_NUMBERFORMAT_INFO);
mpItemSet->Put(*pNumberInfoItem);
- pReturnDialog = mpFact->CreateScAttrDlg(mpViewShell->GetDialogParent(), mpItemSet.get());
+ pReturnDialog = mpFact->CreateScAttrDlg(mpViewShell->GetFrameWeld(), mpItemSet.get());
break;
}
- //ScopedVclPtrInstance<ScShareDocumentDlg> pDlg14( mpViewShell->GetDialogParent(), &rViewData );
- //ScopedVclPtrInstance<ScTableProtectionDlg> pDlg16(mpViewShell->GetDialogParent());
default:
break;
}
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index 16163f7473b0..d49b0ea01d08 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -33,22 +33,23 @@
#include <editeng/flstitem.hxx>
#include <sfx2/app.hxx>
-ScAttrDlg::ScAttrDlg(vcl::Window* pParent, const SfxItemSet* pCellAttrs)
- : SfxTabDialog(pParent, "FormatCellsDialog", "modules/scalc/ui/formatcellsdialog.ui", pCellAttrs)
+ScAttrDlg::ScAttrDlg(weld::Window* pParent, const SfxItemSet* pCellAttrs)
+ : SfxTabDialogController(pParent, "modules/scalc/ui/formatcellsdialog.ui",
+ "FormatCellsDialog", pCellAttrs)
{
- SvtCJKOptions aCJKOptions;
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc fail!");
- m_nNumberPageId = AddTabPage( "numbers", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), nullptr );
+ AddTabPage( "numbers", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), nullptr );
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");
- m_nFontPageId = AddTabPage( "font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), nullptr );
+ AddTabPage( "font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), nullptr );
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!");
AddTabPage( "fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), nullptr );
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageCreatorFunc fail!");
AddTabPage( "alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), nullptr );
- if ( aCJKOptions.IsAsianTypographyEnabled() )
+ SvtCJKOptions aCJKOptions;
+ if (aCJKOptions.IsAsianTypographyEnabled())
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!");
AddTabPage( "asiantypography", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), nullptr );
@@ -66,29 +67,21 @@ ScAttrDlg::~ScAttrDlg()
{
}
-void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
+void ScAttrDlg::PageCreated(const OString& rPageId, SfxTabPage& rTabPage)
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
- if (nPageId == m_nNumberPageId)
+ if (rPageId == "numbers")
{
- aSet.Put (SfxLinkItem( SID_LINK_TYPE, LINK( this, ScAttrDlg, OkHandler )));
rTabPage.PageCreated(aSet);
}
- else if (nPageId == m_nFontPageId)
+ else if (rPageId == "font")
{
const SfxPoolItem* pInfoItem = pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST );
-
- OSL_ENSURE( pInfoItem, "FontListItem not found :-(" );
-
+ assert(pInfoItem && "FontListItem not found :-(");
aSet.Put (SvxFontListItem(static_cast<const SvxFontListItem*>(pInfoItem)->GetFontList(), SID_ATTR_CHAR_FONTLIST ));
rTabPage.PageCreated(aSet);
}
}
-IMPL_LINK_NOARG(ScAttrDlg, OkHandler, SfxPoolItem const *, void)
-{
- GetOKButton().GetClickHdl().Call( nullptr );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index af98d3d92e46..662b78b09c1a 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -693,6 +693,11 @@ short ScAbstractTabController_Impl::Execute()
return m_xDlg->execute();
}
+bool ScAbstractTabController_Impl::StartExecuteAsync(AsyncContext &rCtx)
+{
+ return SfxTabDialogController::runAsync(m_xDlg, rCtx.maEndDialogFn);
+}
+
void ScAbstractTabController_Impl::SetCurPageId( const OString &rName )
{
m_xDlg->SetCurPageId( rName );
@@ -957,10 +962,9 @@ VclPtr<AbstractScImportOptionsDlg> ScAbstractDialogFactory_Impl::CreateScImportO
return VclPtr<AbstractScImportOptionsDlg_Impl>::Create( pDlg );
}
-VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScAttrDlg(vcl::Window* pParent, const SfxItemSet* pCellAttrs)
+VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScAttrDlg(weld::Window* pParent, const SfxItemSet* pCellAttrs)
{
- VclPtr<SfxTabDialog> pDlg = VclPtr<ScAttrDlg>::Create(pParent, pCellAttrs);
- return VclPtr<ScAbstractTabDialog_Impl>::Create(pDlg);
+ return VclPtr<ScAbstractTabController_Impl>::Create(o3tl::make_unique<ScAttrDlg>(pParent, pCellAttrs));
}
VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScHFEditDlg( vcl::Window* pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 43b14a02d0d8..3ffc5bc6b367 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -518,13 +518,14 @@ class ScAbstractTabDialog_Impl : public SfxAbstractTabDialog
class ScAbstractTabController_Impl : public SfxAbstractTabDialog
{
protected:
- std::unique_ptr<SfxTabDialogController> m_xDlg;
+ std::shared_ptr<SfxTabDialogController> m_xDlg;
public:
explicit ScAbstractTabController_Impl(std::unique_ptr<SfxTabDialogController> p)
: m_xDlg(std::move(p))
{
}
virtual short Execute() override;
+ virtual bool StartExecuteAsync(AsyncContext &rCtx) override;
virtual void SetCurPageId( const OString &rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override;
@@ -662,8 +663,8 @@ public:
const OUString* pStrTitle,
bool bOnlyDbtoolsEncodings,
bool bImport = true ) override;
- virtual VclPtr<SfxAbstractTabDialog> CreateScAttrDlg( vcl::Window* pParent,
- const SfxItemSet* pCellAttrs ) override;
+ virtual VclPtr<SfxAbstractTabDialog> CreateScAttrDlg(weld::Window* pParent,
+ const SfxItemSet* pCellAttrs) override;
virtual VclPtr<SfxAbstractTabDialog> CreateScHFEditDlg(vcl::Window* pParent,
const SfxItemSet& rCoreSet,
diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx
index 8d978def7738..b644c3937800 100644
--- a/sc/source/ui/inc/attrdlg.hxx
+++ b/sc/source/ui/inc/attrdlg.hxx
@@ -22,24 +22,17 @@
#include <sfx2/tabdlg.hxx>
-namespace vcl { class Window; }
+namespace weld { class Window; }
class SfxViewFrame;
class SfxItemSet;
-class ScAttrDlg : public SfxTabDialog
+class ScAttrDlg : public SfxTabDialogController
{
public:
- ScAttrDlg( vcl::Window* pParent,
- const SfxItemSet* pCellAttrs );
- virtual ~ScAttrDlg() override;
-
+ ScAttrDlg(weld::Window* pParent, const SfxItemSet* pCellAttrs);
+ virtual ~ScAttrDlg() override;
protected:
- virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) override;
-
-private:
- DECL_LINK( OkHandler, SfxPoolItem const *, void ); // for closing by double clicking in TabPages
- sal_uInt16 m_nNumberPageId;
- sal_uInt16 m_nFontPageId;
+ virtual void PageCreated(const OString& rPageId, SfxTabPage& rTabPage) override;
};
#endif // INCLUDED_SC_SOURCE_UI_INC_ATTRDLG_HXX
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 7ae6f759b2cb..963cad98983f 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -542,7 +542,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName
bInFormatDialog = true;
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- VclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateScAttrDlg(GetDialogParent(), pOldSet.get()));
+ VclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateScAttrDlg(GetFrameWeld(), pOldSet.get()));
if (!rName.isEmpty())
pDlg->SetCurPageId(rName);
@@ -551,23 +551,25 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName
rReq.Ignore(); // the 'old' request is not relevant any more
pDlg->StartExecuteAsync([=](sal_Int32 nResult){
- bInFormatDialog = false;
+ bInFormatDialog = false;
- if ( nResult == RET_OK )
+ if ( nResult == RET_OK )
+ {
+ const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
+
+ const SfxPoolItem* pItem=nullptr;
+ if(pOutSet->GetItemState(SID_ATTR_NUMBERFORMAT_INFO,true,&pItem)==SfxItemState::SET)
{
- const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
+ UpdateNumberFormatter(static_cast<const SvxNumberInfoItem&>(*pItem));
+ }
- const SfxPoolItem* pItem=nullptr;
- if(pOutSet->GetItemState(SID_ATTR_NUMBERFORMAT_INFO,true,&pItem)==SfxItemState::SET)
- {
- UpdateNumberFormatter(static_cast<const SvxNumberInfoItem&>(*pItem));
- }
+ ApplyAttributes(pOutSet, pOldSet.get());
- ApplyAttributes(pOutSet, pOldSet.get());
+ pRequest->Done(*pOutSet);
+ }
- pRequest->Done(*pOutSet);
- }
- });
+ pDlg->disposeOnce();
+ });
}
bool ScTabViewShell::IsRefInputMode() const
diff --git a/sc/uiconfig/scalc/ui/formatcellsdialog.ui b/sc/uiconfig/scalc/ui/formatcellsdialog.ui
index 1943ef3d05a3..a0a6bcf445b4 100644
--- a/sc/uiconfig/scalc/ui/formatcellsdialog.ui
+++ b/sc/uiconfig/scalc/ui/formatcellsdialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sc">
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="FormatCellsDialog">
@@ -7,7 +7,13 @@
<property name="border_width">6</property>
<property name="title" translatable="yes" context="formatcellsdialog|FormatCellsDialog">Format Cells</property>
<property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
@@ -18,12 +24,10 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
+ <object class="GtkButton" id="reset">
+ <property name="label">gtk-revert-to-saved</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -34,10 +38,12 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -48,8 +54,8 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -58,13 +64,12 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
- <property name="secondary">True</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="reset">
- <property name="label">gtk-revert-to-saved</property>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -73,7 +78,8 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">3</property>
+ <property name="secondary">True</property>
</packing>
</child>
</object>
@@ -90,6 +96,7 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <property name="scrollable">True</property>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
@@ -97,6 +104,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="tab">
@@ -116,6 +147,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">1</property>
@@ -139,6 +194,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">2</property>
@@ -162,6 +241,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">3</property>
@@ -185,6 +288,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">4</property>
@@ -208,6 +335,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">5</property>
@@ -231,6 +382,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">6</property>
@@ -254,6 +429,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">7</property>
@@ -280,10 +479,10 @@
</object>
</child>
<action-widgets>
+ <action-widget response="0">reset</action-widget>
<action-widget response="-5">ok</action-widget>
<action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
- <action-widget response="0">reset</action-widget>
</action-widgets>
</object>
</interface>
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 20a9ede5555b..d3aeb9b31b0f 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -87,8 +87,6 @@ SvxFontListBox::SvxFontListBox(vcl::Window* pParent, WinBits nStyle)
maEntryFont = aStdFont;
}
-VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxFontListBox, WB_TABSTOP)
-
void SvxFontListBox::InsertFontEntry( const OUString& rString, const vcl::Font& rFont, const Color* pColor )
{
mbUseFont = true; // InitEntry() will use maEntryFont