Tag: cws_src680_reportdesign02 User: oj Date: 2007-10-26 12:31:40+0000 Modified: dba/reportdesign/source/ui/inc/DesignView.hxx dba/reportdesign/source/ui/inc/ScrollHelper.hxx dba/reportdesign/source/ui/inc/propbrw.hxx dba/reportdesign/source/ui/report/DesignView.cxx dba/reportdesign/source/ui/report/ReportWindow.cxx dba/reportdesign/source/ui/report/ScrollHelper.cxx dba/reportdesign/source/ui/report/ViewsWindow.cxx dba/reportdesign/source/ui/report/propbrw.cxx
Log: #i77919# use of SplitWindow File Changes: Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [changed]: DesignView.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/DesignView.hxx?r1=1.3&r2=1.3.36.1 Delta lines: +6 -4 ------------------- --- DesignView.hxx 2007-08-02 14:36:51+0000 1.3 +++ DesignView.hxx 2007-10-26 12:31:37+0000 1.3.36.1 @@ -6,9 +6,9 @@ * * $RCSfile: DesignView.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.36.1 $ * - * last change: $Author: hr $ $Date: 2007/08/02 14:36:51 $ + * last change: $Author: oj $ $Date: 2007/10/26 12:31:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -90,6 +90,7 @@ #ifndef _SV_TABPAGE_HXX //autogen #include <vcl/tabpage.hxx> #endif +#include <vcl/splitwin.hxx> #include <MarkedSection.hxx> class KeyEvent; @@ -113,7 +114,8 @@ class ODesignView : public dbaui::ODataView, public SfxBroadcaster, public IMarkedSection { private: - Splitter m_aSplitter; + //Splitter m_aSplitter; + SplitWindow* m_pSplitWin; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xReportComponent; OReportController* m_pReportController; File [changed]: ScrollHelper.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ScrollHelper.hxx?r1=1.3&r2=1.3.36.1 Delta lines: +4 -4 ------------------- --- ScrollHelper.hxx 2007-08-02 14:37:38+0000 1.3 +++ ScrollHelper.hxx 2007-10-26 12:31:37+0000 1.3.36.1 @@ -6,9 +6,9 @@ * * $RCSfile: ScrollHelper.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.36.1 $ * - * last change: $Author: hr $ $Date: 2007/08/02 14:37:38 $ + * last change: $Author: oj $ $Date: 2007/10/26 12:31:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -60,7 +60,7 @@ #include <rtl/ref.hxx> #endif #include <boost/shared_ptr.hpp> - +#include <vcl/dockwin.hxx> #include <MarkedSection.hxx> class SdrView; File [changed]: propbrw.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/propbrw.hxx?r1=1.3&r2=1.3.36.1 Delta lines: +5 -3 ------------------- --- propbrw.hxx 2007-08-03 10:02:24+0000 1.3 +++ propbrw.hxx 2007-10-26 12:31:37+0000 1.3.36.1 @@ -6,9 +6,9 @@ * * $RCSfile: propbrw.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.36.1 $ * - * last change: $Author: hr $ $Date: 2007/08/03 10:02:24 $ + * last change: $Author: oj $ $Date: 2007/10/26 12:31:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -140,6 +140,8 @@ inline OSectionView* GetCurView() const { return m_pView; } ::rtl::OUString getCurrentPage() const; inline void setCurrentPage(const ::rtl::OUString& _sLastActivePage) { m_sLastActivePage = _sLastActivePage; } + + ::Size getMinimumSize() const; private: using Window::Update; }; Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: DesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/DesignView.cxx?r1=1.3&r2=1.3.36.1 Delta lines: +139 -51 ---------------------- --- DesignView.cxx 2007-08-02 14:39:56+0000 1.3 +++ DesignView.cxx 2007-10-26 12:31:37+0000 1.3.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: DesignView.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.36.1 $ * - * last change: $Author: hr $ $Date: 2007/08/02 14:39:56 $ + * last change: $Author: oj $ $Date: 2007/10/26 12:31:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -97,6 +97,82 @@ using namespace container; #define LINE_SIZE 50 +#define START_SIZE_TASKPANE 30 +#define COLSET_ID 1 +#define REPORT_ID 2 +#define TASKPANE_ID 3 + +class OTaskWindow : public Window +{ + PropBrw* m_pPropWin; +public: + OTaskWindow(Window* _pParent) : Window(_pParent),m_pPropWin(NULL){} + + inline void setPropertyBrowser(PropBrw* _pPropWin) + { + m_pPropWin = _pPropWin; + } + + virtual void Resize() + { + const Size aSize = GetOutputSizePixel(); + if ( m_pPropWin && aSize.Height() && aSize.Width() ) + m_pPropWin->SetSizePixel(aSize); + } + long getMinimumWidth() const + { + long nRet = 0; + if ( m_pPropWin ) + nRet = m_pPropWin->getMinimumSize().Width(); + return nRet; + } +}; +class OwnSplitWindow : public SplitWindow +{ +public: + OwnSplitWindow(Window* pParent) : SplitWindow(pParent,WB_DIALOGCONTROL){SetBackground( );} + + virtual void Split() + { + SplitWindow::Split(); + setItemSizes(); + } + void setItemSizes() + { + const long nOutWidth = GetOutputSizePixel().Width(); + long nTaskPaneMinSplitSize = static_cast<OTaskWindow*>(GetItemWindow(TASKPANE_ID))->getMinimumWidth(); + nTaskPaneMinSplitSize = static_cast<long>(nTaskPaneMinSplitSize*100/nOutWidth); + if ( !nTaskPaneMinSplitSize ) + nTaskPaneMinSplitSize = START_SIZE_TASKPANE; + + const long nReportMinSplitSize = static_cast<long>(12000/nOutWidth); + + long nReportSize = GetItemSize( REPORT_ID ); + long nTaskPaneSize = GetItemSize( TASKPANE_ID ); + + BOOL bMod = FALSE; + if( nReportSize < nReportMinSplitSize ) + { + nReportSize = nReportMinSplitSize; + nTaskPaneSize = 99 - nReportMinSplitSize; + + bMod = TRUE; + } + else if( nTaskPaneSize < nTaskPaneMinSplitSize ) + { + nTaskPaneSize = nTaskPaneMinSplitSize; + nReportSize = 99 - nTaskPaneMinSplitSize; + + bMod = TRUE; + } + + if( bMod ) + { + SetItemSize( REPORT_ID, nReportSize ); + SetItemSize( TASKPANE_ID, nTaskPaneSize ); + } + } +}; //================================================================== // class ODesignView //================================================================== @@ -106,7 +182,7 @@ const Reference< XMultiServiceFactory >& _rxOrb, OReportController* _pController) : ODataView( pParent,_pController,_rxOrb,WB_DIALOGCONTROL ) - ,m_aSplitter(this,WB_HSCROLL) + //,m_aSplitter(this,WB_HSCROLL) ,m_pReportController( _pController ) ,m_pPropWin(NULL) ,m_pAddField(NULL) @@ -125,18 +201,27 @@ SetHelpId(UID_RPT_APP_VIEW); ImplInitSettings(); + m_pSplitWin = new OwnSplitWindow( this ); + SetMapMode( MapMode( MAP_100TH_MM ) ); m_pScrollWindow = new OScrollWindowHelper(this); - m_pScrollWindow->Show(); + //m_pScrollWindow->Show(); // now create the task pane on the right side :-) - m_pTaskPane = new Window(this); - m_pTaskPane->Show(); + m_pTaskPane = new OTaskWindow(this); + //m_pTaskPane->Show(); + + m_pSplitWin->InsertItem( COLSET_ID,100,SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE | SWIB_COLSET ); + m_pSplitWin->InsertItem( REPORT_ID, m_pScrollWindow, 100/*m_pScrollWindow->getMaxMarkerWidth(sal_False)*/, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE /*SWIB_COLSET*/); + //m_pSplitWin->InsertItem( TASKPANE_ID, m_pTaskPane, 50, SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE ); // Splitter einrichten - m_aSplitter.SetSplitHdl(LINK(this, ODesignView,SplitHdl)); - //m_aSplitter.Show(); + //m_aSplitter.SetSplitHdl(LINK(this, ODesignView,SplitHdl)); + m_pSplitWin->SetSplitHdl(LINK(this, ODesignView,SplitHdl)); + m_pSplitWin->ShowAutoHideButton(); + m_pSplitWin->SetAlign(WINDOWALIGN_LEFT); + m_pSplitWin->Show(); m_aMarkTimer.SetTimeout( 100 ); m_aMarkTimer.SetTimeoutHdl( LINK( this, ODesignView, MarkTimeout ) ); @@ -173,6 +258,11 @@ ::std::auto_ptr<Window> aTemp2(m_pTaskPane); m_pTaskPane = NULL; } + { + ::std::auto_ptr<Window> aTemp2(m_pSplitWin); + m_pSplitWin = NULL; + } + } // ----------------------------------------------------------------------------- void ODesignView::initialize() @@ -245,44 +335,32 @@ } // if ( 0 != _rPlaygroundSize.Width() ) Size aReportWindowSize(aPlaygroundSize); - if ( m_aSplitter.IsVisible() ) + if ( m_pSplitWin->IsItemValid(TASKPANE_ID) ) { // normalize the split pos - Size aSplitSize( m_aSplitter.GetSizePixel().Width(),_rPlayground.GetHeight()); - - Point aTaskPanePos(nSplitPos + aSplitSize.Width(), _rPlayground.Top()); - //long nTest = m_pPropWin->GetMinOutputSizePixel().Width(); + const long nSplitterWidth = GetSettings().GetStyleSettings().GetSplitSize(); + Point aTaskPanePos(nSplitPos + nSplitterWidth, _rPlayground.Top()); if ( m_pTaskPane && m_pTaskPane->IsVisible() ) { aTaskPanePos.X() = aPlaygroundSize.Width() - m_pTaskPane->GetSizePixel().Width(); - sal_Int32 nMinWidth = m_pPropWin->GetMinOutputSizePixel().Width(); + sal_Int32 nMinWidth = m_pPropWin->getMinimumSize().Width(); if ( nMinWidth > (aPlaygroundSize.Width() - aTaskPanePos.X()) ) { aTaskPanePos.X() = aPlaygroundSize.Width() - nMinWidth; } - nSplitPos = aTaskPanePos.X() - aSplitSize.Width(); + nSplitPos = aTaskPanePos.X() - nSplitterWidth; getController()->setSplitPos(nSplitPos); - } - Point aSplitPos( nSplitPos,_rPlayground.Top() ); - // set the size of the splitter - m_aSplitter.SetPosSizePixel( aSplitPos, aSplitSize ); - m_aSplitter.SetDragRectPixel( _rPlayground ); - - aReportWindowSize = Size(aSplitPos.X() - _rPlayground.Left() - aSplitSize.Width(),_rPlayground.GetHeight()); - Size aTaskPaneSize(aPlaygroundSize.Width() - aTaskPanePos.X(),aPlaygroundSize.Height() ); - // set the size of the task pane - - m_pTaskPane->SetPosSizePixel(aTaskPanePos,aTaskPaneSize); - if ( m_pPropWin ) - m_pPropWin->SetSizePixel(aTaskPaneSize); + const long nTaskPaneSize = static_cast<long>((aPlaygroundSize.Width() - aTaskPanePos.X())*100/aPlaygroundSize.Width()); + if ( m_pSplitWin->GetItemSize( TASKPANE_ID ) != nTaskPaneSize ) + { + m_pSplitWin->SetItemSize( REPORT_ID, 99 - nTaskPaneSize ); + m_pSplitWin->SetItemSize( TASKPANE_ID, nTaskPaneSize ); + } + } } - // set the size of the report window - m_pScrollWindow->SetPosSizePixel( - _rPlayground.TopLeft() - ,aReportWindowSize - ); + m_pSplitWin->SetPosSizePixel( _rPlayground.TopLeft(),aPlaygroundSize ); } // just for completeness: there is no space left, we occupied it all ... _rPlayground.SetPos( _rPlayground.BottomRight() ); @@ -302,7 +380,10 @@ m_pPropWin->Update(m_pCurrentView); uno::Reference<beans::XPropertySet> xProp(m_xReportComponent,uno::UNO_QUERY); if ( xProp.is() ) + { m_pPropWin->Update(xProp); + static_cast<OTaskWindow*>(m_pTaskPane)->Resize(); + } Resize(); } @@ -442,7 +523,11 @@ // ----------------------------------------------------------------------------- void ODesignView::ImplInitSettings() { +//#if OSL_DEBUG_LEVEL > 0 +// SetBackground( Wallpaper( COL_RED )); +//#else SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() )); +//#endif SetFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); } @@ -450,25 +535,21 @@ IMPL_LINK( ODesignView, SplitHdl, void*, ) { m_bInSplitHandler = sal_True; - const long nTest = m_aSplitter.GetSplitPosPixel(); + //const long nTest = m_aSplitter.GetSplitPosPixel(); + const Size aOutputSize = GetOutputSizePixel(); + const long nTest = aOutputSize.Width() * m_pSplitWin->GetItemSize(TASKPANE_ID) / 100; long nMinWidth = static_cast<long>(0.1*aOutputSize.Width()); if ( m_pPropWin && m_pPropWin->IsVisible() ) nMinWidth = m_pPropWin->GetMinOutputSizePixel().Width(); if ( (aOutputSize.Width() - nTest) >= nMinWidth && nTest > m_pScrollWindow->getMaxMarkerWidth(sal_False) ) { - m_aSplitter.SetPosPixel( Point( nTest,m_aSplitter.GetPosPixel().Y() ) ); + long nOldSplitPos = getController()->getSplitPos(); getController()->setSplitPos(nTest); - if ( m_pTaskPane && m_pTaskPane->IsVisible() ) + if ( nOldSplitPos != -1 && nOldSplitPos <= nTest ) { - Point aTaskPanePos(nTest + m_aSplitter.GetSizePixel().Width(), 0); - Size aTaskPaneSize(aOutputSize.Width() - aTaskPanePos.X(),aOutputSize.Height() ); - m_pTaskPane->SetPosSizePixel(aTaskPanePos,aTaskPaneSize); - if ( m_pPropWin ) - m_pPropWin->SetSizePixel(aTaskPaneSize); - // set the size of the report window - m_pScrollWindow->SetSizePixel(Size(nTest,aOutputSize.Height())); + Invalidate(INVALIDATE_NOCHILDREN); } } @@ -494,6 +575,8 @@ if ( !m_pPropWin && _bToogleOn ) { m_pPropWin = new PropBrw(getController()->getORB(),m_pTaskPane,this); + m_pPropWin->Invalidate(); + static_cast<OTaskWindow*>(m_pTaskPane)->setPropertyBrowser(m_pPropWin); notifySystemWindow(this,m_pPropWin,::comphelper::mem_fun(&TaskPaneList::AddWindow)); } if ( m_pPropWin && _bToogleOn != m_pPropWin->IsVisible() ) @@ -503,10 +586,15 @@ const sal_Bool bWillBeVisible = _bToogleOn; m_pPropWin->Show(bWillBeVisible); - m_aSplitter.Show(bWillBeVisible); m_pTaskPane->Show(bWillBeVisible); - Resize(); - Invalidate(INVALIDATE_NOCHILDREN|INVALIDATE_NOERASE); + m_pTaskPane->Invalidate(); + + if ( bWillBeVisible ) + m_pSplitWin->InsertItem( TASKPANE_ID, m_pTaskPane,START_SIZE_TASKPANE, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE/*|SWIB_COLSET */); + else + m_pSplitWin->RemoveItem(TASKPANE_ID); + + Invalidate(/*INVALIDATE_NOCHILDREN|INVALIDATE_NOERASE*/); if ( bWillBeVisible ) m_aMarkTimer.Start(); } File [changed]: ReportWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportWindow.cxx?r1=1.3&r2=1.3.36.1 Delta lines: +7 -3 ------------------- --- ReportWindow.cxx 2007-08-02 14:40:37+0000 1.3 +++ ReportWindow.cxx 2007-10-26 12:31:37+0000 1.3.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: ReportWindow.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.36.1 $ * - * last change: $Author: hr $ $Date: 2007/08/02 14:40:37 $ + * last change: $Author: oj $ $Date: 2007/10/26 12:31:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -293,7 +293,11 @@ //------------------------------------------------------------------------------ void OReportWindow::ImplInitSettings() { +//#if OSL_DEBUG_LEVEL > 0 +// SetBackground( Wallpaper( COL_YELLOW )); +//#else SetBackground( ); +//#endif } //----------------------------------------------------------------------------- void OReportWindow::DataChanged( const DataChangedEvent& rDCEvt ) File [changed]: ScrollHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ScrollHelper.cxx?r1=1.4&r2=1.4.36.1 Delta lines: +30 -4 -------------------- --- ScrollHelper.cxx 2007-08-03 12:45:48+0000 1.4 +++ ScrollHelper.cxx 2007-10-26 12:31:37+0000 1.4.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: ScrollHelper.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.36.1 $ * - * last change: $Author: hr $ $Date: 2007/08/03 12:45:48 $ + * last change: $Author: oj $ $Date: 2007/10/26 12:31:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -248,6 +248,24 @@ void OScrollWindowHelper::Resize() { OScrollWindowHelper_BASE::Resize(); + // Size aSize = GetOutputSizePixel(); + // const Size aMinSize(getMaxMarkerWidth(sal_False),0); + // bool bResize = false; + //if( aSize.Width() < aMinSize.Width() ) + //{ + // aSize.setWidth( aMinSize.Width() ); + // bResize = true; + //} + //if( aSize.Height() < aMinSize.Height() ) + //{ + // aSize.setHeight( aMinSize.Height() ); + // bResize = true; + //} + //if( bResize ) + // { + // //static_cast<SplitWindow*>(GetParent())->SetItemSize(2,aSize.getWidth()); + // SetOutputSizePixel( aSize ); + // } const Size aTotalOutputSize = ResizeScrollBars(); OSL_ENSURE(m_pChild,"ReportWindow is NULL"); @@ -422,7 +440,15 @@ //------------------------------------------------------------------------------ void OScrollWindowHelper::ImplInitSettings() { - SetBackground( ); +//#if OSL_DEBUG_LEVEL > 0 +// SetBackground( Wallpaper( COL_BLUE )); +//#else + //SetBackground( ); + SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() )); +//#endif + SetFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); + SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); +//#endif } //----------------------------------------------------------------------------- void OScrollWindowHelper::DataChanged( const DataChangedEvent& rDCEvt ) File [changed]: ViewsWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ViewsWindow.cxx?r1=1.5&r2=1.5.10.1 Delta lines: +9 -3 ------------------- --- ViewsWindow.cxx 2007-09-26 14:25:24+0000 1.5 +++ ViewsWindow.cxx 2007-10-26 12:31:37+0000 1.5.10.1 @@ -4,9 +4,9 @@ * * $RCSfile: ViewsWindow.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.10.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:25:24 $ + * last change: $Author: oj $ $Date: 2007/10/26 12:31:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -317,7 +317,11 @@ //------------------------------------------------------------------------------ void OViewsWindow::ImplInitSettings() { +//#if OSL_DEBUG_LEVEL > 0 +// SetBackground( Wallpaper( COL_GREEN )); +//#else SetBackground( Wallpaper( m_aColorConfig.GetColorValue(::svtools::APPBACKGROUND).nColor ) ); +//#endif SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); } @@ -346,6 +350,8 @@ pSplitter->SetStartSplitHdl(LINK(this, OViewsWindow,StartSplitHdl)); pSplitter->SetSplitHdl(LINK(this, OViewsWindow,SplitHdl)); pSplitter->SetEndSplitHdl(LINK(this, OViewsWindow,EndSplitHdl)); + pSplitter->SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() )); + //pSplitter->SetSizePixel(Size(pSplitter->GetSizePixel().Width(),1)); pSplitter->Show(); ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> pMulti = new OPropertyChangeMultiplexer(this,_xSection.get()); File [changed]: propbrw.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/propbrw.cxx?r1=1.3&r2=1.3.36.1 Delta lines: +25 -15 --------------------- --- propbrw.cxx 2007-08-03 10:05:03+0000 1.3 +++ propbrw.cxx 2007-10-26 12:31:37+0000 1.3.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: propbrw.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.36.1 $ * - * last change: $Author: hr $ $Date: 2007/08/03 10:05:03 $ + * last change: $Author: oj $ $Date: 2007/10/26 12:31:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -424,7 +424,7 @@ m_xBrowserController->inspect(uno::Sequence< Reference<uno::XInterface> >()); m_xBrowserController->inspect(_aObjects); - Resize(); + //Resize(); } SetText( GetHeadlineName(_aObjects) ); } @@ -520,31 +520,41 @@ return xNameCont.get(); } -//---------------------------------------------------------------------------- -void PropBrw::Resize() +// ----------------------------------------------------------------------------- +::Size PropBrw::getMinimumSize() const { - Window::Resize(); - + ::Size aSize; Reference< awt::XLayoutConstrains > xLayoutConstrains( m_xBrowserController, UNO_QUERY ); if( xLayoutConstrains.is() ) { - ::Size aSize; awt::Size aMinSize = xLayoutConstrains->getMinimumSize(); aMinSize.Height += 4; aMinSize.Width += 4; aSize.setHeight( aMinSize.Height ); aSize.setWidth( aMinSize.Width ); - SetMinOutputSizePixel( aSize ); - aSize = GetOutputSizePixel(); + } + return aSize; +} +//---------------------------------------------------------------------------- +void PropBrw::Resize() +{ + Window::Resize(); + + Reference< awt::XLayoutConstrains > xLayoutConstrains( m_xBrowserController, UNO_QUERY ); + if( xLayoutConstrains.is() ) + { + ::Size aMinSize = getMinimumSize(); + SetMinOutputSizePixel( aMinSize ); + ::Size aSize = GetOutputSizePixel(); sal_Bool bResize = sal_False; - if( aSize.Width() < aMinSize.Width ) + if( aSize.Width() < aMinSize.Width() ) { - aSize.setWidth( aMinSize.Width ); + aSize.setWidth( aMinSize.Width() ); bResize = sal_True; } - if( aSize.Height() < aMinSize.Height ) + if( aSize.Height() < aMinSize.Height() ) { - aSize.setHeight( aMinSize.Height ); + aSize.setHeight( aMinSize.Height() ); bResize = sal_True; } if( bResize ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
