Kaydet (Commit) 656f5605 authored tarafından Rafael Dominguez's avatar Rafael Dominguez Kaydeden (comit) Caolán McNamara

Overload AbstractSdInsertPagesObjsDlg::GetList.

- Use vector instead of deprecated List class.
- Use OUString instead of String.
üst 70263d2e
...@@ -30,7 +30,10 @@ ...@@ -30,7 +30,10 @@
// include --------------------------------------------------------------- // include ---------------------------------------------------------------
#include <vector>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <rtl/string.hxx>
#include <tools/solar.h> #include <tools/solar.h>
#include <tools/string.hxx> #include <tools/string.hxx>
#include <sfx2/sfxdlg.hxx> #include <sfx2/sfxdlg.hxx>
...@@ -137,6 +140,7 @@ class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog //add for SdInser ...@@ -137,6 +140,7 @@ class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog //add for SdInser
public: public:
virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer
virtual List* GetList( sal_uInt16 nType ) = 0; 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 IsLink() = 0;
virtual sal_Bool IsRemoveUnnessesaryMasterPages() const = 0; virtual sal_Bool IsRemoveUnnessesaryMasterPages() const = 0;
}; };
......
...@@ -286,6 +286,12 @@ List* AbstractSdInsertPagesObjsDlg_Impl::GetList( sal_uInt16 nType ) ...@@ -286,6 +286,12 @@ List* AbstractSdInsertPagesObjsDlg_Impl::GetList( sal_uInt16 nType )
{ {
return pDlg->GetList( 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() sal_Bool AbstractSdInsertPagesObjsDlg_Impl::IsLink()
{ {
return pDlg->IsLink(); return pDlg->IsLink();
......
...@@ -188,6 +188,7 @@ class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg ...@@ -188,6 +188,7 @@ class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg
DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg) DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg)
virtual ::Window * GetWindow(); //this method is added for return a Window type pointer virtual ::Window * GetWindow(); //this method is added for return a Window type pointer
virtual List* GetList( sal_uInt16 nType ); 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 IsLink();
virtual sal_Bool IsRemoveUnnessesaryMasterPages() const; virtual sal_Bool IsRemoveUnnessesaryMasterPages() const;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment