diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 11:10:41 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 11:10:41 +0000 |
| commit | b0037fb5bd2ae3ef217d51e4f42d56ffdf25ceb5 (patch) | |
| tree | 3ca4674db757c16ef541a843cef228d9a2869e92 /starmath/inc/view.hxx | |
| parent | 897a8e4ad54495b7e519205b173f299aafe42a5c (diff) | |
INTEGRATION: CWS tl32 (1.18.70); FILE MERGED
2007/04/11 09:39:12 tl 1.18.70.3: RESYNC: (1.19-1.20); FILE MERGED
2006/12/01 12:06:51 tl 1.18.70.2: RESYNC: (1.18-1.19); FILE MERGED
2006/11/02 15:13:53 tl 1.18.70.1: #i69286# make starmath warning-free for unxsols4(.pro)
Diffstat (limited to 'starmath/inc/view.hxx')
| -rw-r--r-- | starmath/inc/view.hxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 97dfa0700201..f1d12b47432e 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -4,9 +4,9 @@ * * $RCSfile: view.hxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: obo $ $Date: 2007-01-25 11:35:16 $ + * last change: $Author: vg $ $Date: 2007-05-25 12:10:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -95,6 +95,7 @@ class SmGraphicWindow : public ScrollableWindow protected: void SetFormulaDrawPos(const Point &rPos) { aFormulaDrawPos = rPos; } void SetIsCursorVisible(BOOL bVis) { bIsCursorVisible = bVis; } + using Window::SetCursor; void SetCursor(const SmNode *pNode); void SetCursor(const Rectangle &rRect); @@ -116,12 +117,15 @@ public: SmViewShell * GetView() { return pViewShell; } + using Window::SetZoom; void SetZoom(USHORT Factor); + using Window::GetZoom; USHORT GetZoom() const { return nZoom; } const Point & GetFormulaDrawPos() const { return aFormulaDrawPos; } void ZoomToFitInWindow(); + using ScrollableWindow::SetTotalSize; void SetTotalSize(); BOOL IsCursorVisible() const { return bIsCursorVisible; } @@ -133,7 +137,8 @@ public: // for Accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - SmGraphicAccessible * GetAccessible() { return pAccessible; } + using Window::GetAccessible; + SmGraphicAccessible * GetAccessible_Impl() { return pAccessible; } }; /**************************************************************************/ @@ -306,7 +311,7 @@ public: void NextError(); void PrevError(); - SFX_DECL_INTERFACE(SFX_INTERFACE_SMA_START+2); + SFX_DECL_INTERFACE(SFX_INTERFACE_SMA_START+2) SFX_DECL_VIEWFACTORY(SmViewShell); virtual void Execute( SfxRequest& rReq ); |