User: vg Date: 2008-08-19 10:11:21+0000 Modified: dba/reportdesign/source/ui/inc/ReportWindow.hxx
Log: INTEGRATION: CWS dba31a (1.4.28); FILE MERGED 2008/07/07 06:38:25 oj 1.4.28.4: #i80200# method to select different types 2008/06/26 14:26:32 oj 1.4.28.3: #i77916# impl zooming in report builder 2008/06/24 12:06:59 oj 1.4.28.2: RESYNC: (1.4-1.5); FILE MERGED 2008/06/13 11:40:19 oj 1.4.28.1: #i88506# impl hyphenation File Changes: Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [changed]: ReportWindow.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ReportWindow.hxx?r1=1.5&r2=1.6 Delta lines: +10 -21 --------------------- --- ReportWindow.hxx 2008-06-16 13:41:28+0000 1.5 +++ ReportWindow.hxx 2008-08-19 10:11:19+0000 1.6 @@ -40,6 +40,7 @@ #include <boost/shared_ptr.hpp> #include <MarkedSection.hxx> +#include "ViewsWindow.hxx" class Splitter; @@ -53,19 +54,16 @@ class OEndMarker; class OReportPage; class DlgEdFunc; - class OSectionsWindow; - class OViewsWindow; class DlgEdFactory; class OReportWindow : public Window, public IMarkedSection { Ruler m_aHRuler; - ODesignView* m_pView; OScrollWindowHelper* m_pParent; - OSectionsWindow* m_pSections; - OViewsWindow* m_pViews; - DlgEdFactory* m_pObjFac; + OViewsWindow m_aViewsWindow; + ::std::auto_ptr<DlgEdFactory> + m_pObjFac; void ImplInitSettings(); @@ -82,8 +80,6 @@ /** late ctor */ void initialize(); - - DECL_LINK(Collapsed,OStartMarker*); // WINDOW overloads virtual void Resize(); @@ -118,7 +114,7 @@ /** All objects will be marked. */ - void SelectAll(); + void SelectAll(const sal_uInt16 _nObjectType); /** returns <TRUE/> when a object is marked */ @@ -166,17 +162,6 @@ */ sal_Int32 getMaxMarkerWidth(sal_Bool _bWithEnd) const; - /** returns the height of the first spliiter. - */ - sal_Int32 getSplitterHeight() const; - - /** returns the minimum height of the section - * - * \param _nPos - * \return the height in pixel - */ - sal_Int32 getMinHeight(USHORT _nPos) const; - void ScrollChildren(long nDeltaX, long nDeltaY); void notifyHeightChanged(); @@ -207,7 +192,7 @@ void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); // IMarkedSection - ::boost::shared_ptr<OReportSection> getMarkedSection(NearSectionAccess nsa = CURRENT) const; + ::boost::shared_ptr<OSectionWindow> getMarkedSection(NearSectionAccess nsa = CURRENT) const; virtual void markSection(const sal_uInt16 _nPos); @@ -233,6 +218,10 @@ sal_uInt32 getMarkedObjectCount() const; + /** zoom the ruler and view windows + */ + void zoom(const sal_Int16 _nZoom); + /** fills the vector with all selected control models /param _rSelection The vector will be filled and will not be cleared before. */ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
