diff options
author | Rafael Dominguez <venccsralph@gmail.com> | 2012-03-25 16:27:08 -0430 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-11 16:47:06 +0100 |
commit | 656f560585e96b697ce6955cff30b1064a79c2c4 (patch) | |
tree | e3b52f59f2b23a24bfae63d7c4b4ef9c378785cd /sd | |
parent | 70263d2e6166f8ea171e1871d9896325c7d8efdf (diff) |
Overload AbstractSdInsertPagesObjsDlg::GetList.
- Use vector instead of deprecated List class.
- Use OUString instead of String.
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/sdabstdlg.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/dlg/sddlgfact.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/dlg/sddlgfact.hxx | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index 8d3e6c09f79e..8a78929b0199 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -30,7 +30,10 @@ // include --------------------------------------------------------------- +#include <vector> + #include <rtl/ref.hxx> +#include <rtl/string.hxx> #include <tools/solar.h> #include <tools/string.hxx> #include <sfx2/sfxdlg.hxx> @@ -137,6 +140,7 @@ class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog //add for SdInser public: virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer virtual List* GetList( sal_uInt16 nType ) = 0; + virtual void GetList ( const sal_uInt16 nType, std::vector<rtl::OUString> &rEntries ) = 0; virtual sal_Bool IsLink() = 0; virtual sal_Bool IsRemoveUnnessesaryMasterPages() const = 0; }; diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 71335990176f..9837d70bcccd 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -286,6 +286,12 @@ List* AbstractSdInsertPagesObjsDlg_Impl::GetList( sal_uInt16 nType ) { return pDlg->GetList( nType ); } + +void AbstractSdInsertPagesObjsDlg_Impl::GetList (const sal_uInt16 nType, std::vector<rtl::OUString> &rEntries) +{ + pDlg->GetList(nType,rEntries); +} + sal_Bool AbstractSdInsertPagesObjsDlg_Impl::IsLink() { return pDlg->IsLink(); diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 829932f0b3c7..db5c9c9c7c57 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -188,6 +188,7 @@ class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg) virtual ::Window * GetWindow(); //this method is added for return a Window type pointer virtual List* GetList( sal_uInt16 nType ); + virtual void GetList ( const sal_uInt16 nType, std::vector<rtl::OUString> &rEntries); virtual sal_Bool IsLink(); virtual sal_Bool IsRemoveUnnessesaryMasterPages() const; }; |