diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 09:10:10 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 09:10:10 +0000 |
| commit | aa119fe3f7e551b30f8f2ceaeb601a9708b1b570 (patch) | |
| tree | c99196484bc8b322ae6c337551c68562d47a8891 /reportdesign | |
| parent | 8d0e762376f5dc3b96b7104f4b479f8a4e46ceb4 (diff) | |
INTEGRATION: CWS dba31a (1.5.28); FILE MERGED
2008/07/15 08:38:55 fs 1.5.28.7: remove unused code
Issue number: #i91592#
Submitted by: cmc@openoffice.org
Reviewed by: frank.schoenheit@sun.com
2008/07/07 06:38:24 oj 1.5.28.6: #i80200# method to select different types
2008/07/03 06:58:31 oj 1.5.28.5: wrong header name typo
2008/07/01 07:02:10 oj 1.5.28.4: #i77916# impl zoom and move config data into ext
2008/06/26 14:26:32 oj 1.5.28.3: #i77916# impl zooming in report builder
2008/06/24 12:06:53 oj 1.5.28.2: RESYNC: (1.5-1.6); FILE MERGED
2008/06/13 11:40:19 oj 1.5.28.1: #i88506# impl hyphenation
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/inc/DesignView.hxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index 4ea77b968a6d..9e24b66c4a45 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DesignView.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -51,6 +51,7 @@ #include <vcl/tabpage.hxx> #include <vcl/splitwin.hxx> #include <MarkedSection.hxx> +#include "ScrollHelper.hxx" class KeyEvent; class MouseEvent; @@ -59,7 +60,6 @@ class Window; namespace rptui { - class OScrollWindowHelper; class OReportSection; class OUnoObject; class OSectionView; @@ -73,12 +73,11 @@ namespace rptui class ODesignView : public dbaui::ODataView, public SfxBroadcaster, public IMarkedSection { private: - //Splitter m_aSplitter; - SplitWindow* m_pSplitWin; + SplitWindow m_aSplitWin; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xReportComponent; OReportController& m_rReportController; - OScrollWindowHelper* m_pScrollWindow; + OScrollWindowHelper m_aScrollWindow; Window* m_pTaskPane; PropBrw* m_pPropWin; OAddFieldWindow* m_pAddField; @@ -93,7 +92,7 @@ namespace rptui Size m_aGridSize; BOOL m_bGridVisible; BOOL m_bGridSnap; - BOOL m_bInSplitHandler; + BOOL m_bDeleted; DECL_LINK( MarkTimeout, Timer * ); @@ -166,12 +165,12 @@ namespace rptui /** All objects will be marked. */ - void SelectAll(); + void SelectAll(const sal_uInt16 _nObjectType); /// checks if a selection exists BOOL HasSelection(); - void UpdatePropertyBrowserDelayed(OSectionView* _pView); + void UpdatePropertyBrowserDelayed(OSectionView& _rView); USHORT getSectionCount() const; @@ -193,7 +192,6 @@ namespace rptui inline BOOL isGridSnap() const { return m_bGridSnap; } void setGridSnap(BOOL bOn); void setDragStripes(BOOL bOn); - BOOL isDragStripes() const; /** turns the grid on or off * * \param _bGridVisible @@ -233,7 +231,7 @@ namespace rptui ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > getCurrentControlModel() const; // 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); /** fills the positions of all collapsed sections. @@ -261,8 +259,6 @@ namespace rptui @param _pSectionView the section where to set the marked flag @param _bMark the marked flag */ - void setMarked(OSectionView* _pSectionView,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); @@ -275,6 +271,10 @@ namespace rptui 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. */ |