User: hr Date: 2007-08-02 14:37:40+0000 Modified: dba/reportdesign/source/ui/inc/ScrollHelper.hxx
Log: INTEGRATION: CWS rpt23fix01 (1.2.2); FILE MERGED 2007/07/16 07:37:18 lla 1.2.2.2: #i77986# toolbar fix 2007/07/11 09:43:36 oj 1.2.2.1: #i78407# fix some scrolling issues File Changes: Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [changed]: ScrollHelper.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ScrollHelper.hxx?r1=1.2&r2=1.3 Delta lines: +8 -10 -------------------- --- ScrollHelper.hxx 2007-07-09 11:56:30+0000 1.2 +++ ScrollHelper.hxx 2007-08-02 14:37:38+0000 1.3 @@ -86,7 +86,6 @@ ScrollBar m_aHScroll; ScrollBar m_aVScroll; ScrollBarBox m_aCornerWin; // window in the bottom right corner - Point m_aScrollOffset; Size m_aTotalPixelSize; Point m_aPixOffset; // offset to virtual window (pixel) ODesignView* m_pParent; @@ -95,9 +94,7 @@ m_pReportDefintionMultiPlexer; // listener for property changes DECL_LINK( ScrollHdl, ScrollBar*); - DECL_LINK( EndScrollHdl, ScrollBar*); Size ResizeScrollBars(); - void ScrollPane( long nDeltaX, long nDeltaY ); void ImplInitSettings(); void impl_initScrollBar( ScrollBar& _rScrollBar ) const; void impl_scrollContent( long nDeltaX, long nDeltaY ); @@ -121,7 +118,7 @@ void EndScroll( long nDeltaX, long nDeltaY ); - inline Point getScrollOffset() const { return m_aScrollOffset; } + inline Point getScrollOffset() const { return Point(m_aHScroll.GetThumbPos(),m_aVScroll.GetThumbPos())/*m_aScrollOffset*/; } inline OReportWindow* getReportWindow() const { return m_pChild; } void setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight); inline Size getTotalSize() const { return m_aTotalPixelSize; } @@ -131,6 +128,7 @@ // forwards void SetMode( DlgEdMode _eMode ); void SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); + rtl::OUString GetInsertObjString() const; void setGridSnap(BOOL bOn); void setDragStripes(BOOL bOn); BOOL isDragStripes() const; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
