summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/ImpressViewShellBase.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-03-12 20:06:58 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-03-12 20:06:58 +0100
commitc61cd1a5a26de1d1f62389988b00229c04e36693 (patch)
tree9d6de00f4d149cba080fe88f1eff71a67786b5f0 /sd/source/ui/view/ImpressViewShellBase.cxx
parent064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff)
parentf2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff)
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/view/ImpressViewShellBase.cxx')
-rw-r--r--sd/source/ui/view/ImpressViewShellBase.cxx10
1 files changed, 2 insertions, 8 deletions
diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx
index fd039bcccc67..5ed10762b5d1 100644
--- a/sd/source/ui/view/ImpressViewShellBase.cxx
+++ b/sd/source/ui/view/ImpressViewShellBase.cxx
@@ -46,12 +46,6 @@ TYPEINIT1(ImpressViewShellBase, ViewShellBase);
// We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
// new ImpressViewShellBase object has been constructed.
-/*
-SFX_IMPL_VIEWFACTORY(ImpressViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
- SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
SfxViewFactory* ImpressViewShellBase::pFactory;
SfxViewShell* ImpressViewShellBase::CreateInstance (
SfxViewFrame *pFrame, SfxViewShell *pOldView)
@@ -60,7 +54,7 @@ SfxViewShell* ImpressViewShellBase::CreateInstance (
pBase->LateInit(::rtl::OUString());
return pBase;
}
-void ImpressViewShellBase::RegisterFactory( USHORT nPrio )
+void ImpressViewShellBase::RegisterFactory( sal_uInt16 nPrio )
{
pFactory = new SfxViewFactory(
&CreateInstance,&InitFactory,nPrio,"Default");
@@ -99,7 +93,7 @@ ImpressViewShellBase::~ImpressViewShellBase (void)
void ImpressViewShellBase::Execute (SfxRequest& rRequest)
{
- USHORT nSlotId = rRequest.GetSlot();
+ sal_uInt16 nSlotId = rRequest.GetSlot();
switch (nSlotId)
{