diff options
Diffstat (limited to 'sd/inc')
-rw-r--r-- | sd/inc/sdabstdlg.hxx | 3 | ||||
-rw-r--r-- | sd/inc/sdresid.hxx | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index 7f763c690346..f39b7d369332 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -54,7 +54,6 @@ class SdrModel; class SdrView; class Bitmap; class List; -class SdResId; namespace vcl { class Window; } class SdPage; class TabPage; @@ -194,7 +193,7 @@ public: virtual VclPtr<AbstractSdStartPresDlg> CreateSdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) = 0; virtual VclPtr<VclAbstractDialog> CreateRemoteDialog( vcl::Window* pWindow ) = 0; - virtual VclPtr<SfxAbstractTabDialog> CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SdResId& DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0; + virtual VclPtr<SfxAbstractTabDialog> CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, sal_uInt16 nDlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0; virtual VclPtr<AbstractSdPresLayoutDlg> CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs) = 0; virtual VclPtr<SfxAbstractTabDialog> CreateSdTabTemplateDlg(vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView) = 0; virtual VclPtr<SfxAbstractDialog> CreatSdActionDialog(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) = 0; diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx index 95397b38b06b..2fdb9e30d236 100644 --- a/sd/inc/sdresid.hxx +++ b/sd/inc/sdresid.hxx @@ -22,14 +22,12 @@ #include <tools/resid.hxx> #include "sddllapi.h" +#include "sdmod.hxx" -class SD_DLLPUBLIC SdResId : public ResId +inline OUString SdResId(sal_uInt16 nId) { -public: - SdResId(sal_uInt16 nId); -}; - -#define SD_RESSTR(x) SdResId(x).toString() + return ResId(nId, *SD_MOD()->GetResMgr()); +} #endif /* _SD_SDRESID_HXX */ |