diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
commit | c61cd1a5a26de1d1f62389988b00229c04e36693 (patch) | |
tree | 9d6de00f4d149cba080fe88f1eff71a67786b5f0 /sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx | |
parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx')
-rw-r--r-- | sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx index 3e3eb9b9fe99..24a78cddb0ba 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx @@ -88,7 +88,7 @@ public: static SdPage* AddMasterPage ( SdDrawDocument* pTargetDocument, SdPage* pMasterPage, - USHORT nInsertionIndex); + sal_uInt16 nInsertionIndex); virtual Size GetPreferredSize (void); virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); @@ -122,7 +122,8 @@ public: */ void ClearPageSet (void); - void SetSmartHelpId( const SmartId& aId, SmartIdUpdateMode aMode = SMART_SET_SMART ); + using SfxShell::SetHelpId; + void SetHelpId( const rtl::OString& aId ); /** Mark the preview that belongs to the given index as not up-to-date anymore with respect to page content or preview size. @@ -152,7 +153,7 @@ protected: eventually. Filled by InvalidatePreview() and operated upon by UpdatePreviews(). */ - ::std::queue<USHORT> maPreviewUpdateQueue; + ::std::queue<sal_uInt16> maPreviewUpdateQueue; virtual SdPage* GetSelectedMasterPage (void); @@ -221,13 +222,13 @@ private: DECL_LINK(ContainerChangeListener, MasterPageContainerChangeEvent*); void SetItem ( - USHORT nIndex, + sal_uInt16 nIndex, MasterPageContainer::Token aToken); void AddTokenToIndexEntry ( - USHORT nIndex, + sal_uInt16 nIndex, MasterPageContainer::Token aToken); void RemoveTokenToIndexEntry ( - USHORT nIndex, + sal_uInt16 nIndex, MasterPageContainer::Token aToken); }; |