merge commit

10 files changed, 133 insertions, 12 deletions

diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
index fc0ce20cd710..74aef069d7f5 100644
--- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
+++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
@@ -166,6 +166,9 @@ protected:
     virtual void Deactivated (void);
 
     virtual void impl_dispose (void);
+
+private:
+    void UpdateAccessibleName (void);
 };
 
 } // end of namespace accessibility
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index d85b09d6ab07..b9a3e062955b 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -59,6 +59,7 @@ class DrawView;
 class LayerTabBar;
 class Ruler;
 class SdUnoDrawView;
+class AnnotationManager;
 
 #define CHECK_RANGE(nMin, nValue, nMax) ((nValue >= nMin) && (nValue <= nMax))
 
@@ -231,6 +232,9 @@ public:
     void            AttrExec (SfxRequest& rReq);
     void            AttrState (SfxItemSet& rSet);
 
+    void            ExecuteAnnotation (SfxRequest& rRequest);
+    void            GetAnnotationState (SfxItemSet& rItemSet);
+
     void StartRulerDrag (
         const Ruler& rRuler,
         const MouseEvent& rMEvt);
@@ -391,7 +395,6 @@ protected:
 
     static BOOL     mbPipette;
 
-
                     DECL_LINK( ClipboardChanged, TransferableDataHelper* );
                     DECL_LINK( CloseHdl, Timer* pTimer );
                     DECL_LINK( TabSplitHdl, TabBar * );
@@ -494,6 +497,8 @@ private:
         const Point& rMouseLocation);
 
     using ViewShell::Notify;
+
+    ::std::auto_ptr< AnnotationManager > mpAnnotationManager;
 };
 
 
diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx
index fb0504f0da21..79e33452959c 100644
--- a/sd/source/ui/inc/EventMultiplexer.hxx
+++ b/sd/source/ui/inc/EventMultiplexer.hxx
@@ -92,9 +92,10 @@ public:
     */
     static const EventId EID_PANE_MANAGER_DYING     = 0x00000100;
 
-    /** The edit mode of the ViewShell in the center pane has been modified.
+    /** Edit mode was (or is being) switched to normal mode.  Find
+        EID_EDIT_MODE_MASTER below.
     */
-    static const EventId EID_EDIT_MODE              = 0x00000200;
+    static const EventId EID_EDIT_MODE_NORMAL       = 0x00000200;
 
     /** One or more pages have been inserted into or deleted from the model.
     */
@@ -134,6 +135,10 @@ public:
     */
     static const EventId EID_CONFIGURATION_UPDATED  = 0x00040000;
 
+    /** Edit mode was (or is being) switched to master mode.
+    */
+    static const EventId EID_EDIT_MODE_MASTER       = 0x00080000;
+
     const ViewShellBase& mrBase;
     EventId meEventId;
     const void* mpUserData;
diff --git a/sd/source/ui/inc/annotationmanager.hxx b/sd/source/ui/inc/annotationmanager.hxx
new file mode 100644
index 000000000000..4659b2add63f
--- /dev/null
+++ b/sd/source/ui/inc/annotationmanager.hxx
@@ -0,0 +1,62 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: AnnotationManager.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _SD_ANNOTATIONMANAGER_HXX
+#define _SD_ANNOTATIONMANAGER_HXX
+
+#include <com/sun/star/office/XAnnotationAccess.hpp>
+#include <memory>
+
+#include <rtl/ref.hxx>
+
+namespace sd
+{
+
+class ViewShellBase;
+class AnnotationManagerImpl;
+
+// --------------------------------------------------------------------
+
+class AnnotationManager
+{
+public:
+    AnnotationManager( ViewShellBase& rViewShellBase );
+    ~AnnotationManager();
+
+    void ExecuteAnnotation (SfxRequest& rRequest);
+    void GetAnnotationState (SfxItemSet& rItemSet);
+
+private:
+    ::rtl::Reference< AnnotationManagerImpl > mxImpl;
+};
+
+}
+
+#endif // _SD_ANNOTATIONMANAGER_HXX
diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx
index b8a015859885..f9f2a14e2846 100644
--- a/sd/source/ui/inc/framework/Pane.hxx
+++ b/sd/source/ui/inc/framework/Pane.hxx
@@ -34,19 +34,24 @@
 #include "MutexOwner.hxx"
 
 #include <com/sun/star/drawing/framework/XPane.hpp>
+#include <com/sun/star/drawing/framework/XPane2.hpp>
 #include <com/sun/star/drawing/framework/TabBarButton.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase3.hxx>
 #include <tools/link.hxx>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
 class Window;
 
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
 namespace {
 
-typedef ::cppu::WeakComponentImplHelper2 <
+typedef ::cppu::WeakComponentImplHelper3 <
     ::com::sun::star::drawing::framework::XPane,
+    ::com::sun::star::drawing::framework::XPane2,
       ::com::sun::star::lang::XUnoTunnel
     > PaneInterfaceBase;
 
@@ -96,22 +101,39 @@ public:
     */
     virtual ::Window* GetWindow (void);
 
-    // XPane
+
+    //----- XPane -------------------------------------------------------------
 
     /** For a UNO API based implementation of a view this may the most
         important method of this class because the view is only interested
         in the window of the pane.
     */
-    virtual ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow>
+    virtual cssu::Reference<css::awt::XWindow>
         SAL_CALL getWindow (void)
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (cssu::RuntimeException);
 
-    virtual ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas>
+    virtual cssu::Reference<css::rendering::XCanvas>
         SAL_CALL getCanvas (void)
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (cssu::RuntimeException);
+
 
+    //----- XPane2 -------------------------------------------------------------
 
-    // XResource
+    virtual sal_Bool SAL_CALL isVisible (void)
+        throw (cssu::RuntimeException);
+
+    virtual void SAL_CALL setVisible (sal_Bool bIsVisible)
+        throw (cssu::RuntimeException);
+
+    virtual cssu::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void)
+        throw (cssu::RuntimeException);
+
+    virtual void SAL_CALL setAccessible (
+        const cssu::Reference<css::accessibility::XAccessible>& rxAccessible)
+        throw (cssu::RuntimeException);
+
+
+    //----- XResource ---------------------------------------------------------
 
     virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>
         SAL_CALL getResourceId (void)
@@ -124,11 +146,12 @@ public:
         throw (com::sun::star::uno::RuntimeException);
 
 
-    // XUnoTunnel
+    //----- XUnoTunnel --------------------------------------------------------
 
     virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId)
         throw (com::sun::star::uno::RuntimeException);
 
+
 protected:
     ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> mxPaneId;
     ::Window* mpWindow;
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index bd7ed5529a74..a67c91948617 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -276,6 +276,7 @@ private:
     BOOL    bShowUndoDeleteWarning  : 1;    // Misc/ShowUndoDeleteWarning
     // #i75315#
     BOOL    bSlideshowRespectZOrder : 1;    // Misc/SlideshowRespectZOrder
+    BOOL    bShowComments           : 1;    // Misc/ShowComments
 
     sal_Bool    bPreviewNewEffects;
     sal_Bool    bPreviewChangedEffects;
@@ -320,6 +321,7 @@ public:
     BOOL    IsSolidDragging() const { Init(); return (BOOL) bSolidDragging; }
     BOOL    IsSolidMarkHdl() const { Init(); return (BOOL) bSolidMarkHdl; }
     BOOL    IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs != 0; };
+
     /** Return the currently selected printer independent layout mode.
         @return
             Returns 1 for printer independent layout enabled and 0 when it
@@ -372,6 +374,9 @@ public:
     void    SetPreviewNewEffects( sal_Bool bOn )  { if( bPreviewNewEffects != bOn ) { OptionsChanged(); bPreviewNewEffects = bOn; } }
     void    SetPreviewChangedEffects( sal_Bool bOn )  { if( bPreviewChangedEffects != bOn ) { OptionsChanged(); bPreviewChangedEffects = bOn; } }
     void    SetPreviewTransitions( sal_Bool bOn )  { if( bPreviewTransitions != bOn ) { OptionsChanged(); bPreviewTransitions = bOn; } }
+
+    BOOL    IsShowComments() const { Init(); return bShowComments; }
+    void    SetShowComments( BOOL bShow )  { if( bShowComments != bShow ) { OptionsChanged(); bShowComments = bShow; } }
 };
 
 // -----------------------------------------------------------------------------
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 19834c60ace6..0dd5451c1f45 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -237,6 +237,9 @@
 #define BMP_FOIL_27                         RID_SD_START+336
 #define BMP_FOIL_27_H                       RID_SD_START+337
 
+#define BMP_COMMENTS_INDICATOR              RID_SD_START+338
+#define BMP_COMMENTS_INDICATOR_H            RID_SD_START+339
+
 // -----------------------------------------------------------------------------
 
 #define IMG_PIPETTE_H                       RID_APP_START+21
diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx
index a1d217d92a10..feaa0fa27fd8 100644
--- a/sd/source/ui/inc/smarttag.hxx
+++ b/sd/source/ui/inc/smarttag.hxx
@@ -67,6 +67,12 @@ public:
     /** returns true if the SmartTag consumes this event. */
     virtual bool KeyInput( const KeyEvent& rKEvt );
 
+    /** returns true if the SmartTag consumes this event. */
+    virtual bool RequestHelp( const HelpEvent& rHEvt );
+
+    /** returns true if the SmartTag consumes this event. */
+    virtual bool Command( const CommandEvent& rCEvt );
+
     /** returns true if this smart tag is currently selected */
     bool isSelected() const;
 
@@ -119,6 +125,12 @@ public:
     /** returns true if a SmartTag consumes this event. */
     bool KeyInput( const KeyEvent& rKEvt );
 
+    /** returns true if a SmartTag consumes this event. */
+    bool RequestHelp( const HelpEvent& rHEvt );
+
+    /** returns true if a SmartTag consumes this event. */
+    bool Command( const CommandEvent& rCEvt );
+
     /** disposes all smart tags and clears the set */
     void Dispose();
 
diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx
index b1a3f04b4a71..f80242e412a2 100644
--- a/sd/source/ui/inc/taskpane/TitleBar.hxx
+++ b/sd/source/ui/inc/taskpane/TitleBar.hxx
@@ -92,6 +92,7 @@ public:
     virtual void Paint (const Rectangle& rBoundingBox);
     virtual bool Expand (bool bFlag = true);
     virtual bool IsExpanded (void) const;
+    virtual void SetEnabledState(bool bFlag);

 
     void SetFocus (bool bFlag);
 
diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx
index 2ebb8e87f3ce..e0974b864b96 100644
--- a/sd/source/ui/inc/taskpane/TitledControl.hxx
+++ b/sd/source/ui/inc/taskpane/TitledControl.hxx
@@ -135,6 +135,8 @@ public:
     */
     virtual bool IsExpandable (void) const;
 
+    virtual void SetEnabledState(bool bFlag);

+
     /** Ownership of the given data remains with the caller.  The data
         is thus not destroyed when the destructor of this class is
         called.