summaryrefslogtreecommitdiff
path: root/sd/source/ui/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/inc')
-rw-r--r--sd/source/ui/inc/AccessibleDocumentViewBase.hxx27
-rw-r--r--sd/source/ui/inc/AccessibleDrawDocumentView.hxx35
-rw-r--r--sd/source/ui/inc/AccessibleOutlineView.hxx4
-rw-r--r--sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx3
-rw-r--r--sd/source/ui/inc/AccessiblePresentationOLEShape.hxx3
-rw-r--r--sd/source/ui/inc/AccessiblePresentationShape.hxx1
-rw-r--r--sd/source/ui/inc/AccessibleSlideSorterView.hxx2
-rw-r--r--sd/source/ui/inc/DrawController.hxx9
-rw-r--r--sd/source/ui/inc/DrawDocShell.hxx11
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx17
-rw-r--r--sd/source/ui/inc/OutlineViewShell.hxx2
-rw-r--r--sd/source/ui/inc/SdUnoDrawView.hxx4
-rw-r--r--sd/source/ui/inc/SlideSorterViewShell.hxx2
-rw-r--r--sd/source/ui/inc/TabControl.hxx2
-rw-r--r--sd/source/ui/inc/ViewShell.hxx5
-rw-r--r--sd/source/ui/inc/Window.hxx1
-rw-r--r--sd/source/ui/inc/fuediglu.hxx6
-rw-r--r--sd/source/ui/inc/fusel.hxx8
-rw-r--r--sd/source/ui/inc/navigatr.hxx5
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx29
20 files changed, 161 insertions, 15 deletions
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index 602b5b47fe99..2ffee94af8c8 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -34,6 +34,15 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <tools/link.hxx>
+#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
+#include "DrawViewShell.hxx"
+#include "sdpage.hxx"
+#include "drawdoc.hxx"
+#include "FrameView.hxx"
+#include "PresentationViewShell.hxx"
+#include <editeng/outlobj.hxx>
+#include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
+class SdViewShell;
namespace sd {
class ViewShell;
class Window;
@@ -82,6 +91,8 @@ class AccessibleDocumentViewBase
public ::com::sun::star::beans::XPropertyChangeListener,
public ::com::sun::star::awt::XWindowListener,
public ::com::sun::star::awt::XFocusListener
+ ,public ::com::sun::star::accessibility::XAccessibleExtendedAttributes
+ ,public com::sun::star::accessibility::XAccessibleGetAccFlowTo
{
public:
//===== internal ========================================================
@@ -246,7 +257,10 @@ public:
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL focusLost (const ::com::sun::star::awt::FocusEvent& e)
throw (::com::sun::star::uno::RuntimeException);
-
+ //----------------------------xAttribute----------------------------
+ virtual com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
+ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
+ ::sd::ViewShell* mpViewShell;
private:
// return the member maMutex;
@@ -355,7 +369,18 @@ protected:
virtual void SetAccessibleOLEObject (
const ::com::sun::star::uno::Reference <
::com::sun::star::accessibility::XAccessible>& xOLEObject);
+ //===== XAccessibleGetAccFromXShape ============================================
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
+ SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
+ throw ( ::com::sun::star::uno::RuntimeException );
+
+public:
+ virtual void SwitchViewActivated (void) { Activated(); }
+ virtual sal_Int32 SAL_CALL getForeground( )
+ throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getBackground( )
+ throw (::com::sun::star::uno::RuntimeException);
virtual void impl_dispose (void);
};
diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
index 440f3ff4a639..e82275c252bc 100644
--- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
+++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
@@ -22,6 +22,8 @@
#include "AccessibleDocumentViewBase.hxx"
+#include <com/sun/star/accessibility/XAccessibleGroupPosition.hpp>
+
namespace accessibility {
@@ -35,6 +37,7 @@ namespace accessibility {
*/
class AccessibleDrawDocumentView :
public AccessibleDocumentViewBase
+ ,public ::com::sun::star::accessibility::XAccessibleGroupPosition
{
public:
//===== internal ========================================================
@@ -69,6 +72,9 @@ public:
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IndexOutOfBoundsException);
+ virtual OUString SAL_CALL
+ getAccessibleName(void)
+ throw (::com::sun::star::uno::RuntimeException);
//===== lang::XEventListener ============================================
@@ -82,6 +88,26 @@ public:
virtual void SAL_CALL
propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject)
throw (::com::sun::star::uno::RuntimeException);
+ //===== XInterface ======================================================
+
+ virtual com::sun::star::uno::Any SAL_CALL
+ queryInterface (const com::sun::star::uno::Type & rType)
+ throw (::com::sun::star::uno::RuntimeException);
+
+ virtual void SAL_CALL
+ acquire (void)
+ throw ();
+
+ virtual void SAL_CALL
+ release (void)
+ throw ();
+
+ //===== XAccessibleGroupPosition =========================================
+ virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
+ getGroupPosition( const ::com::sun::star::uno::Any& rAny )
+ throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getObjectLink( const ::com::sun::star::uno::Any& accoject )
+ throw (::com::sun::star::uno::RuntimeException);
protected:
@@ -116,6 +142,8 @@ protected:
virtual void
implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+private:
+ ::sd::ViewShell* mpSdViewSh;
protected:
/** This object manages the shapes of the represented draw page. It is
@@ -156,6 +184,13 @@ protected:
virtual void impl_dispose (void);
+ //===== XAccessibleGetAccFromXShape ============================================
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
+ SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
+ throw ( ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ GetSelAccContextInTable();
+
private:
void UpdateAccessibleName (void);
};
diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx
index 732ff4ba9b5f..237b32656d7b 100644
--- a/sd/source/ui/inc/AccessibleOutlineView.hxx
+++ b/sd/source/ui/inc/AccessibleOutlineView.hxx
@@ -71,7 +71,9 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleChild (sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException);
-
+ virtual OUString SAL_CALL
+ getAccessibleName(void)
+ throw (::com::sun::star::uno::RuntimeException);
//===== XAccessibleEventBroadcaster ========================================
virtual void SAL_CALL
diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
index dc935a71694d..b3b987dbb934 100644
--- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
+++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
@@ -23,6 +23,7 @@
#include <svx/AccessibleGraphicShape.hxx>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
namespace accessibility {
/** This class makes Impress shapes accessible.
@@ -56,6 +57,8 @@ public:
virtual OUString
CreateAccessibleDescription ()
throw (::com::sun::star::uno::RuntimeException);
+ /// Return this object's role.
+ virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException);
};
} // end of namespace accessibility
diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
index ba5ccec2e9a6..df639a0f5dfa 100644
--- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
+++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
@@ -23,6 +23,7 @@
#include <svx/AccessibleOLEShape.hxx>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
namespace accessibility {
/** This class makes Impress shapes accessible.
@@ -56,6 +57,8 @@ public:
virtual OUString
CreateAccessibleDescription ()
throw (::com::sun::star::uno::RuntimeException);
+ /// Return this object's role.
+ virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException);
};
} // end of namespace accessibility
diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx
index 4f651a47b4fc..860be7a44299 100644
--- a/sd/source/ui/inc/AccessiblePresentationShape.hxx
+++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx
@@ -55,6 +55,7 @@ public:
virtual OUString
CreateAccessibleDescription ()
throw (::com::sun::star::uno::RuntimeException);
+ OUString GetStyle();
private:
/** Don't use the default constructor. Use the public constructor that
diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
index 6b539fd9a6db..3a231f045563 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
@@ -290,7 +290,7 @@ public:
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
-
+ virtual void SwitchViewActivated (void);
private:
class Implementation;
::std::auto_ptr<Implementation> mpImpl;
diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx
index 4a839b0ba7ed..680684734dba 100644
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@@ -40,6 +40,7 @@
#include <memory>
#include <vector>
#include <boost/scoped_ptr.hpp>
+#include <com/sun/star/drawing/XLayer.hpp>
namespace sd {
@@ -92,6 +93,8 @@ public:
PROPERTY_ZOOMVALUE = 7,
PROPERTY_VIEWOFFSET = 8,
PROPERTY_DRAWVIEWMODE = 9
+ ,PROPERTY_UPDATEACC = 10
+ ,PROPERTY_PAGE_CHANGE = 11
};
/** Create a new DrawController object for the given ViewShellBase.
@@ -137,6 +140,12 @@ public:
switch.
*/
void BroadcastContextChange (void) const;
+ void NotifyAccUpdate();
+ void fireChangeLayer( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>* pCurrentLayer ) throw();
+ // change the parameter to int
+ //void fireSwitchCurrentPage( String pageName) throw();
+ void fireSwitchCurrentPage( sal_Int32 pageIndex) throw();
+ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>* mpCurrentLayer;
/** Return a pointer to the ViewShellBase object that the DrawController
is connected to.
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index e4c7ee62fac4..5278fc6ec1ee 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -127,8 +127,12 @@ public:
void Disconnect(sd::ViewShell* pViewSh);
void UpdateTablePointers();
- sal_Bool GotoBookmark(const OUString& rBookmark);
+ sal_Bool GotoBookmark(const OUString& rBookmark);
+ //realize multi-selection of objects
+ sal_Bool GotoTreeBookmark(const OUString& rBookmark);
+ sal_Bool IsMarked( SdrObject* pObject );
+ sal_Bool GetObjectIsmarked(const OUString& rBookmark);
Bitmap GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixel);
/** checks, if the given name is a valid new name for a slide
@@ -218,6 +222,11 @@ protected:
bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor
void Construct(bool bClipboard);
virtual void InPlaceActivate( sal_Bool bActive );
+public:
+ virtual void setDocAccTitle( const OUString& rTitle );
+ virtual const OUString getDocAccTitle() const;
+ virtual void setDocReadOnly( sal_Bool bReadOnly);
+ virtual sal_Bool getDocReadOnly() const;
};
#ifndef SV_DECL_DRAW_DOC_SHELL_DEFINED
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 40a8702ec6ce..373a1d055687 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -243,10 +243,15 @@ public:
void ResetActualPage();
void ResetActualLayer();
- sal_Bool SwitchPage(sal_uInt16 nPage);
- sal_Bool IsSwitchPageAllowed() const;
-
- sal_Bool GotoBookmark(const OUString& rBookmark);
+ sal_Bool SwitchPage(sal_uInt16 nPage);
+ sal_Bool IsSwitchPageAllowed() const;
+
+ sal_Bool GotoBookmark(const OUString& rBookmark);
+ //Realize multi-selection of objects, If object is marked, the
+ //corresponding entry is set true, else the corresponding entry is set
+ //false.
+ void FreshNavigatrEntry();
+ void FreshNavigatrTree();
void MakeVisible(const Rectangle& rRect, ::Window& rWin);
virtual void ReadFrameViewData(FrameView* pView);
@@ -361,8 +366,10 @@ public:
*/
virtual bool RelocateToParentWindow (::Window* pParentWindow);
- ::rtl::OUString GetSidebarContextName (void) const;
+ OUString GetSidebarContextName (void) const;
+ //move this method to ViewShell.
+ //void NotifyAccUpdate();
protected:
DrawView* mpDrawView;
SdPage* mpActualPage;
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index c373a60d93d1..f3a02602dc1b 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -133,6 +133,8 @@ public:
::com::sun::star::accessibility::XAccessible>
CreateAccessibleDocumentView (::sd::Window* pWindow);
+ OUString m_StrOldPageName;
+
/** Update the preview to show the specified page.
*/
virtual void UpdatePreview (SdPage* pPage, sal_Bool bInit = sal_False);
diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx
index 4d10206b9369..71a018a0fcbc 100644
--- a/sd/source/ui/inc/SdUnoDrawView.hxx
+++ b/sd/source/ui/inc/SdUnoDrawView.hxx
@@ -102,14 +102,14 @@ protected:
void setMasterPageMode(sal_Bool MasterPageMode_) throw();
sal_Bool getLayerMode(void) const throw();
void setLayerMode(sal_Bool LayerMode_) throw();
-
+public:
/** Return a reference to the active layer object.
@return
The returned value may be empty when the internal state of this
view is not valid (like during destruction.)
*/
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> getActiveLayer (void) throw ();
-
+protected:
/** Make the specified object the active layer.
@param rxLayer
The new layer object.
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index 7a802c59d1f8..dd0684241087 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -170,6 +170,8 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>
CreateAccessibleDocumentView (::sd::Window* pWindow);
+ // handle SlideSorterView specially because AccessibleSlideSorterView doesn't inherit from AccessibleDocumentViewBase
+ virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc );
SlideSorter& GetSlideSorter (void) const;
diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx
index 4f45c09f5348..da35355fde29 100644
--- a/sd/source/ui/inc/TabControl.hxx
+++ b/sd/source/ui/inc/TabControl.hxx
@@ -36,6 +36,8 @@ class TabControl
public DragSourceHelper,
public DropTargetHelper
{
+ //declare bIsMarked variable
+ sal_uInt16 RrePageID;
public:
TabControl (DrawViewShell* pDrViewSh, ::Window* pParent);
virtual ~TabControl (void);
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index b6103585f25e..33d956cfe135 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -301,6 +301,11 @@ public:
::com::sun::star::accessibility::XAccessible>
CreateAccessibleDocumentView (::sd::Window* pWindow);
+ virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc );
+ virtual void SwitchActiveViewFireFocus( );
+ // Move these two methods from DrawViewShell to enable slide show view
+ void NotifyAccUpdate();
+ void fireSwitchCurrentPage(sal_Int32 pageIndex);
void SetWinViewPos(const Point& rWinPos, bool bUpdate);
Point GetWinViewPos() const;
Point GetViewOrigin() const;
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index befd040e4126..4aa5fddc49b3 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -191,6 +191,7 @@ protected:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>
CreateAccessible (void);
+ virtual void SwitchView();
OUString GetSurroundingText() const;
Selection GetSurroundingTextSelection() const;
diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx
index e30664132091..5eddb0bfba44 100644
--- a/sd/source/ui/inc/fuediglu.hxx
+++ b/sd/source/ui/inc/fuediglu.hxx
@@ -44,6 +44,12 @@ public:
virtual void Activate();
virtual void Deactivate();
+ //Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point,
+ //and SHIFT+ENTER key to decide the postion and draw the new insert point
+ virtual void ForcePointer(const MouseEvent* pMEvt = NULL);
+private:
+ sal_Bool bBeginInsertPoint;
+ Point oldPoint;
protected:
FuEditGluePoints (
ViewShell* pViewSh,
diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx
index 658e751a237f..8334fc8341cc 100644
--- a/sd/source/ui/inc/fusel.hxx
+++ b/sd/source/ui/inc/fusel.hxx
@@ -63,6 +63,8 @@ public:
*/
virtual bool cancel();
+ //let mouse cursor move
+ virtual void ForcePointer(const MouseEvent* pMEvt = NULL);
protected:
FuSelection (ViewShell* pViewSh,
::sd::Window* pWin,
@@ -95,6 +97,12 @@ private:
position then NULL is returned.
*/
SdrObject* pickObject (const Point& rTestPoint);
+ //Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point,
+ //and SHIFT+ENTER key to decide the postion and draw the new insert point
+ sal_Bool bBeginInsertPoint;
+ Point oldPoint;
+ //let mouse cursor move
+ sal_Bool bMovedToCenterPoint;
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 1a0e59331c70..68d6bc95c283 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -156,6 +156,11 @@ private:
virtual void DataChanged( const DataChangedEvent& rDCEvt );
void SetDragImage();
void ApplyImageList();
+public:
+ //when object is marked , fresh the corresponding entry tree .
+ sd::DrawDocShell* GetDrawDocShell(const SdDrawDocument*);
+ void FreshTree ( const SdDrawDocument* pDoc );
+ void FreshEntry( );
};
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 252a40384144..4200282d9aca 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -29,6 +29,8 @@
#include <svl/urlbmk.hxx>
#include <tools/ref.hxx>
#include "sdxfer.hxx"
+#include <vector>
+using namespace std;
#include <boost/scoped_ptr.hpp>
#include <boost/function.hpp>
@@ -60,6 +62,8 @@ private:
static sal_Bool SAL_DLLPRIVATE bIsInDrag; ///< static, in the case the navigator is deleted in ExecuteDrag
+ // set contenttree in SdNavigatorWin
+ sal_Bool bisInSdNavigatorWin;
public:
// nested class to implement the TransferableHelper
@@ -132,6 +136,9 @@ protected:
::sd::DrawDocShell* mpDropDocSh;
SdNavigatorWin* mpDropNavWin;
SfxViewFrame* mpFrame;
+ vector<OUString> maTreeItem;
+ sal_Bool mbSaveTreeItemState;
+ OUString maSelectionEntryText;
// DragSourceHelper
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
@@ -176,6 +183,7 @@ protected:
using Window::GetDropTarget;
virtual SvTreeListEntry* GetDropTarget (const Point& rLocation);
+ virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&,SvLBoxButtonKind);
public:
@@ -183,6 +191,10 @@ public:
SdPageObjsTLB( Window* pParent, WinBits nStyle );
~SdPageObjsTLB();
+ // helper function for GetEntryAltText and GetEntryLongDescription
+ OUString getAltLongDescText( SvTreeListEntry* pEntry , sal_Bool isAltText) const;
+ OUString GetEntryAltText( SvTreeListEntry* pEntry ) const;
+ OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const;
virtual void SelectHdl();
virtual void KeyInput( const KeyEvent& rKEvt );
@@ -193,11 +205,20 @@ public:
void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const OUString& rDocName );
void SetShowAllShapes (const bool bShowAllShapes, const bool bFill);
bool GetShowAllShapes (void) const;
- sal_Bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL );
- sal_Bool HasSelectedChildren( const OUString& rName );
- sal_Bool SelectEntry( const OUString& rName );
+ sal_Bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL );
+ sal_Bool HasSelectedChildren( const OUString& rName );
+ sal_Bool SelectEntry( const OUString& rName );
OUString GetSelectEntry();
+ //Mark Current Entry
+ void MarkCurEntry( const OUString& rName );
+ void SetSdNavigatorWinFlag(sal_Bool isInSdNavigatorWin){bisInSdNavigatorWin =isInSdNavigatorWin;};
+ void FreshCurEntry();
+
+ void Clear();
+ void SetSaveTreeItemStateFlag(sal_Bool bState){mbSaveTreeItemState = bState;}
+ void SaveExpandedTreeItemState(SvTreeListEntry* pEntry, vector<OUString>& vectTreeItem);
+
/** return selected entries
nDepth == 0 -> pages
nDepth == 1 -> objects */
@@ -205,7 +226,7 @@ public:
std::vector<OUString> GetSelectEntryList (const sal_uInt16 nDepth) const;
SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL);
- ::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); }
+ ::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); }
sal_Bool IsLinkableSelected() const { return mbLinkableSelected; }