From 735f3a94b92ac93d11f66c3a86edc42e1915b337 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 10 Nov 2014 11:31:58 +0000 Subject: Related: fdo#85111 put a box around xml filter settings control and writer->insert->table->autoformat and calc->data->consolidate and calc->insert->sheet Change-Id: I7c89d9f01747a00b906afe3c762b747df6872869 --- filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'filter/source/xsltdialog/xmlfiltersettingsdialog.hxx') diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 6ed617fd40de..cfa47e8d0671 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -32,19 +32,19 @@ #include "xmlfiltercommon.hxx" - - class HeaderBar; class XMLFilterListBox; -class SvxPathControl : public VclVBox +class SvxPathControl : public vcl::Window { private: bool bHasBeenShown; + VclVBox* m_pVBox; HeaderBar* m_pHeaderBar; XMLFilterListBox* m_pFocusCtrl; protected: - virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; public: SvxPathControl(vcl::Window* pParent); HeaderBar* getHeaderBar() { return m_pHeaderBar; } @@ -54,8 +54,6 @@ public: virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; - - class HeaderBar; class XMLFilterListBox : public SvTabListBox @@ -70,7 +68,7 @@ private: OUString getEntryString( const filter_info_impl* pInfo ) const; public: - XMLFilterListBox(SvxPathControl* pParent); + XMLFilterListBox(Window* pParent, SvxPathControl* pPathControl); /** adds a new filter info entry to the ui filter list */ void addFilterEntry( const filter_info_impl* pInfo ); -- cgit