diff options
author | Noel Grandin <noel@peralex.com> | 2012-08-08 12:29:34 +0200 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-08-08 13:54:06 +0300 |
commit | b10a5e4c3c3e0c95abd1f8b3d102c506b7e54c29 (patch) | |
tree | 0a6569fa2aed37898f8aa2fd3d438c3941a1855f /sd/inc | |
parent | Remove usage of list.hxx (diff) | |
download | core-b10a5e4c3c3e0c95abd1f8b3d102c506b7e54c29.tar.gz core-b10a5e4c3c3e0c95abd1f8b3d102c506b7e54c29.zip |
STL'ify CustomShowList
Create SdCustomShowList class to replace usage of tools/list.hxx
Change-Id: I0e57e29c8ee9ac8d693fee0edb084ded5286c141
Diffstat (limited to 'sd/inc')
-rw-r--r-- | sd/inc/drawdoc.hxx | 7 | ||||
-rw-r--r-- | sd/inc/sdabstdlg.hxx | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 3e724439fac8..4f4b73fb5429 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -85,6 +85,8 @@ class SdTransferable; struct SpellCallbackInfo; struct StyleRequestData; class SdDrawDocument; +class SdCustomShow; +class SdCustomShowList; namespace sd { @@ -139,6 +141,7 @@ namespace sd }; } + // ------------------ // - SdDrawDocument - // ------------------ @@ -153,7 +156,7 @@ private: sd::ShapeList* mpOnlineSpellingList; SvxSearchItem* mpOnlineSearchItem; std::vector<sd::FrameView*> maFrameViewList; - List* mpCustomShowList; + SdCustomShowList* mpCustomShowList; ::sd::DrawDocShell* mpDocSh; SdTransferable * mpCreatingTransferable; sal_Bool mbHasOnlineSpellErrors; @@ -394,7 +397,7 @@ public: sal_uLong GetLinkCount(); std::vector<sd::FrameView*>& GetFrameViewList() { return maFrameViewList; } - SD_DLLPUBLIC List* GetCustomShowList(sal_Bool bCreate = sal_False); + SD_DLLPUBLIC SdCustomShowList* GetCustomShowList(sal_Bool bCreate = sal_False); void NbcSetChanged(sal_Bool bFlag = sal_True); diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index 063a7354be57..11342a89cddd 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -71,6 +71,7 @@ class Window; class SdPage; class TabPage; class ViewShell; +class SdCustomShowList; class AbstractCopyDlg : public VclAbstractDialog //add for CopyDlg { @@ -201,7 +202,7 @@ public: virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) = 0; virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ) = 0; virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, - const std::vector<String> &rPageNames, List* pCSList ) = 0; + const std::vector<String> &rPageNames, SdCustomShowList* pCSList ) = 0; virtual VclAbstractDialog* CreateRemoteDialog( ::Window* pWindow ) = 0; virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0; virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0; |