Tag: cws_src680_dba24b User: oj Date: 2007-08-24 11:15:59+0000 Modified: dba/dbaccess/source/ui/inc/JoinController.hxx dba/dbaccess/source/ui/inc/JoinDesignView.hxx dba/dbaccess/source/ui/inc/JoinTableView.hxx dba/dbaccess/source/ui/querydesign/JoinController.cxx dba/dbaccess/source/ui/querydesign/JoinTableView.cxx
Log: #i80894# reset range to show all tables File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: JoinController.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/JoinController.hxx?r1=1.22.28.1&r2=1.22.28.2 Delta lines: +6 -6 ------------------- --- JoinController.hxx 2007-08-16 06:14:43+0000 1.22.28.1 +++ JoinController.hxx 2007-08-24 11:15:57+0000 1.22.28.2 @@ -4,9 +4,9 @@ * * $RCSfile: JoinController.hxx,v $ * - * $Revision: 1.22.28.1 $ + * $Revision: 1.22.28.2 $ * - * last change: $Author: oj $ $Date: 2007/08/16 06:14:43 $ + * last change: $Author: oj $ $Date: 2007/08/24 11:15:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,6 +79,7 @@ OAddTableDlg* m_pAddTableDialog; ::std::auto_ptr< AddTableDialogContext > m_pDialogContext; + Point m_aMinimumTableViewSize; // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. virtual FeatureState GetState(sal_uInt16 nId) const; @@ -109,10 +110,9 @@ // --------------------------------------------------------------- // attribute access - TTableWindowData* getTableWindowData() { return &m_vTableData; } - TTableConnectionData* getTableConnectionData() { return &m_vTableConnectionData;} - - OAddTableDlg* getAddTableDialog() const { return m_pAddTableDialog; } + inline TTableWindowData* getTableWindowData() { return &m_vTableData; } + inline TTableConnectionData* getTableConnectionData() { return &m_vTableConnectionData;} + inline OAddTableDlg* getAddTableDialog()const { return m_pAddTableDialog; } // --------------------------------------------------------------- // OSingleDocumentController overridables File [changed]: JoinDesignView.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/JoinDesignView.hxx?r1=1.9&r2=1.9.46.1 Delta lines: +4 -3 ------------------- --- JoinDesignView.hxx 2007-05-10 10:28:13+0000 1.9 +++ JoinDesignView.hxx 2007-08-24 11:15:57+0000 1.9.46.1 @@ -4,9 +4,9 @@ * * $RCSfile: JoinDesignView.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.46.1 $ * - * last change: $Author: kz $ $Date: 2007/05/10 10:28:13 $ + * last change: $Author: oj $ $Date: 2007/08/24 11:15:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -86,6 +86,7 @@ // called when fields are deleted OJoinTableView* getTableView() const { return m_pTableView; } + OScrollWindowHelper* getScrollHelper() const { return m_pScrollWindow; } protected: // return the Rectangle where I can paint myself virtual void resizeDocumentView(Rectangle& rRect); File [changed]: JoinTableView.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/JoinTableView.hxx?r1=1.24.180.2&r2=1.24.180.3 Delta lines: +4 -2 ------------------- --- JoinTableView.hxx 2007-08-22 11:41:58+0000 1.24.180.2 +++ JoinTableView.hxx 2007-08-24 11:15:57+0000 1.24.180.3 @@ -4,9 +4,9 @@ * * $RCSfile: JoinTableView.hxx,v $ * - * $Revision: 1.24.180.2 $ + * $Revision: 1.24.180.3 $ * - * last change: $Author: oj $ $Date: 2007/08/22 11:41:58 $ + * last change: $Author: oj $ $Date: 2007/08/24 11:15:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -91,6 +91,8 @@ void setTableView(OJoinTableView* _pTableView); + void resetRange(const Point& _aSize); + // own methods ScrollBar* GetHScrollBar() { return &m_aHScrollBar; } ScrollBar* GetVScrollBar() { return &m_aVScrollBar; } Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: JoinController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/JoinController.cxx?r1=1.42.130.1&r2=1.42.130.2 Delta lines: +12 -2 -------------------- --- JoinController.cxx 2007-08-16 06:14:43+0000 1.42.130.1 +++ JoinController.cxx 2007-08-24 11:15:57+0000 1.42.130.2 @@ -4,9 +4,9 @@ * * $RCSfile: JoinController.cxx,v $ * - * $Revision: 1.42.130.1 $ + * $Revision: 1.42.130.2 $ * - * last change: $Author: oj $ $Date: 2007/08/16 06:14:43 $ + * last change: $Author: oj $ $Date: 2007/08/24 11:15:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -468,6 +468,7 @@ { if ( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "Tables" ) ) ) { + m_aMinimumTableViewSize = Point(); Sequence<PropertyValue> aWindow; pIter->Value >>= aWindow; const PropertyValue *pTablesIter = aWindow.getConstArray(); @@ -478,6 +479,11 @@ pTablesIter->Value >>= aTable; loadTableWindow(aTable); } + if ( m_aMinimumTableViewSize != Point() ) + { + getJoinView()->getScrollHelper()->resetRange(m_aMinimumTableViewSize); + } + break; } } } @@ -524,6 +530,10 @@ pData->SetSize( Size( nWidth, nHeight ) ); pData->ShowAll(bShowAll); m_vTableData.push_back(pData); + if ( m_aMinimumTableViewSize.X() < (nX+nWidth) ) + m_aMinimumTableViewSize.X() = (nX+nWidth); + if ( m_aMinimumTableViewSize.Y() < (nY+nHeight) ) + m_aMinimumTableViewSize.Y() = (nY+nHeight); } // ----------------------------------------------------------------------------- void OJoinController::saveTableWindows(Sequence<PropertyValue>& _rViewProps) File [changed]: JoinTableView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/JoinTableView.cxx?r1=1.57.28.2&r2=1.57.28.3 Delta lines: +9 -2 ------------------- --- JoinTableView.cxx 2007-08-22 11:41:58+0000 1.57.28.2 +++ JoinTableView.cxx 2007-08-24 11:15:57+0000 1.57.28.3 @@ -4,9 +4,9 @@ * * $RCSfile: JoinTableView.cxx,v $ * - * $Revision: 1.57.28.2 $ + * $Revision: 1.57.28.3 $ * - * last change: $Author: oj $ $Date: 2007/08/22 11:41:58 $ + * last change: $Author: oj $ $Date: 2007/08/24 11:15:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -170,6 +170,13 @@ GetHScrollBar()->SetScrollHdl( LINK(m_pTableView, OJoinTableView, ScrollHdl) ); GetVScrollBar()->SetScrollHdl( LINK(m_pTableView, OJoinTableView, ScrollHdl) ); } +// ----------------------------------------------------------------------------- +void OScrollWindowHelper::resetRange(const Point& _aSize) +{ + Point aPos = PixelToLogic(_aSize); + GetHScrollBar()->SetRange( Range(0, aPos.X() + TABWIN_SPACING_X) ); + GetVScrollBar()->SetRange( Range(0, aPos.Y() + TABWIN_SPACING_Y) ); +} //------------------------------------------------------------------------------ void OScrollWindowHelper::Resize() { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
