CWS-TOOLING: integrate CWS impressaccessibility3

2009-09-18 16:10:59 +0200 af  r276289 : #i102525# Fixed some minor compilation problems.
2009-09-17 14:11:23 +0200 af  r276243 : #i102525# Fixed F1 shortcut for help view.
2009-09-16 16:20:58 +0200 af  r276205 : #i102525# Removing const to make Solaris linker happy.
2009-09-16 16:13:25 +0200 af  r276204 : #i90690# Initializing variable to avoid compilation problem.
2009-09-15 19:10:04 +0200 af  r276186 : #i90825# Replace edit source proxy when an outliner object is set.
2009-09-15 11:12:07 +0200 af  r276160 : #i90690# Broadcast accessibility events when the current slide is changed.
2009-09-15 09:37:48 +0200 af  r276148 : #i102525# Fixed Solaris compilation problem.
2009-09-14 18:12:40 +0200 af  r276142 : #i102525# Added missing implementation for some font related functions.
2009-09-14 18:02:05 +0200 af  r276139 : #i102525# Added accessibility support.
2009-09-14 17:30:13 +0200 af  r276136 : #i102525# Added support for interface XPane2 to panes.
2009-09-14 17:00:27 +0200 af  r276133 : #i102525# Added XPane2 interface.
2009-09-14 16:13:04 +0200 af  r276131 : #i50376# Make the focus indicator visible when the slide sorter has the focus.

1 files changed, 9 insertions, 7 deletions

diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx
index c9d4974c8cfe..743770989b0d 100644
--- a/sdext/source/presenter/PresenterNotesView.hxx
+++ b/sdext/source/presenter/PresenterNotesView.hxx
@@ -49,7 +49,7 @@
 #include <com/sun/star/drawing/framework/XResourceId.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <rtl/ref.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 
 namespace css = ::com::sun::star;
 
@@ -67,6 +67,8 @@ namespace sdext { namespace presenter {
 
 class PresenterButton;
 class PresenterScrollBar;
+class PresenterTextView;
+
 
 /** A drawing framework view of the notes of a slide.  At the moment this is
     a simple text view that does not show the original formatting of the
@@ -98,6 +100,9 @@ public:
 
     void ChangeFontSize (const sal_Int32 nSizeChange);
 
+    ::boost::shared_ptr<PresenterTextView> GetTextView (void) const;
+
+
     // lang::XEventListener
 
     virtual void SAL_CALL
@@ -152,16 +157,11 @@ public:
     virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent)
         throw (css::uno::RuntimeException);
 
-    class BitmapContainer;
-    class BitmapFactory;
-
 private:
     css::uno::Reference<css::drawing::framework::XResourceId> mxViewId;
     ::rtl::Reference<PresenterController> mpPresenterController;
     css::uno::Reference<css::awt::XWindow> mxParentWindow;
     css::uno::Reference<css::rendering::XCanvas> mxCanvas;
-    ::boost::scoped_ptr<BitmapContainer> mpBitmapContainer;
-    ::boost::shared_ptr<BitmapFactory> mpBitmapFactory;
     css::uno::Reference<css::drawing::XDrawPage> mxCurrentNotesPage;
     ::rtl::Reference<PresenterScrollBar> mpScrollBar;
     css::uno::Reference<css::awt::XWindow> mxToolBarWindow;
@@ -173,7 +173,8 @@ private:
     css::geometry::RealRectangle2D maTextBoundingBox;
     SharedBitmapDescriptor mpBackground;
     double mnTop;
-    sal_Int32 mnFontSize;
+    PresenterTheme::SharedFontDescriptor mpFont;
+    ::boost::shared_ptr<PresenterTextView> mpTextView;
 
     void CreateToolBar (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
@@ -186,6 +187,7 @@ private:
     void Scroll (const double nDistance);
     void SetTop (const double nTop);
     void UpdateScrollBar (void);
+    void MoveCaret (const sal_Int32 nDistance);
 
     /** This method throws a DisposedException when the object has already been
         disposed.