diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 13:31:22 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 13:31:22 +0000 |
| commit | 7e2fc8498bf745e51f50cfe756ef6dd026212201 (patch) | |
| tree | 88031dcb9b0b13f9b7c0de5ed9600e2243208724 /sdext/source/presenter/PresenterHelpView.hxx | |
| parent | 44db83d4af80da1dc96b25b5d9b0b79bbc68bc32 (diff) | |
INTEGRATION: CWS presenterscreen (1.2.4); FILE MERGED
2008/04/30 08:17:43 af 1.2.4.3: #i88850# Make sure that all help text can be displayed.
2008/04/22 08:24:47 af 1.2.4.2: RESYNC: (1.2-1.3); FILE MERGED
2008/04/16 15:35:32 af 1.2.4.1: #i18486# Help view now displays supported keyboard keys.
Diffstat (limited to 'sdext/source/presenter/PresenterHelpView.hxx')
| -rw-r--r-- | sdext/source/presenter/PresenterHelpView.hxx | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx index 6645ab7ed645..03bcf31f06d4 100644 --- a/sdext/source/presenter/PresenterHelpView.hxx +++ b/sdext/source/presenter/PresenterHelpView.hxx @@ -8,7 +8,7 @@ * * $RCSfile: PresenterHelpView.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -54,7 +54,9 @@ namespace { namespace sdext { namespace presenter { -/** Experimental. Do not use (yet). +class PresenterButton; + +/** Show help text that describes the defined keys. */ class PresenterHelpView : private ::cppu::BaseMutex, @@ -107,17 +109,31 @@ public: throw (com::sun::star::uno::RuntimeException); private: + class TextContainer; + css::uno::Reference<css::uno::XComponentContext> mxComponentContext; css::uno::Reference<css::drawing::framework::XResourceId> mxViewId; css::uno::Reference<css::drawing::framework::XPane> mxPane; css::uno::Reference<css::awt::XWindow> mxWindow; + css::uno::Reference<css::rendering::XCanvas> mxCanvas; ::rtl::Reference<PresenterController> mpPresenterController; - css::uno::Reference<css::rendering::XSpriteCanvas> mxCanvas; - css::uno::Reference<css::rendering::XCanvasFont> mxFont; + PresenterTheme::SharedFontDescriptor mpFont; + ::boost::scoped_ptr<TextContainer> mpTextContainer; + ::rtl::Reference<PresenterButton> mpCloseButton; + sal_Int32 mnSeparatorY; + sal_Int32 mnMaximalWidth; void ProvideCanvas (void); void Resize (void); void Paint (const css::awt::Rectangle& rRedrawArea); + void ReadHelpStrings (void); + void ProcessString ( + const css::uno::Reference<css::beans::XPropertySet>& rsProperties); + + /** Find a font size, so that all text can be displayed at the same + time. + */ + void CheckFontSize (void); /** This method throws a DisposedException when the object has already been disposed. |