strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impress1 (1.4.226); FILE MERGED

Browse source 
2003/10/30 17:04:39 af 1.4.226.3: #111996# Adapted previous changes by MBA to the sd namespace introduced in the meantime.
2003/10/28 09:45:48 af 1.4.226.2: RESYNC: (1.4-1.5); FILE MERGED
2003/09/17 09:26:12 af 1.4.226.1: #111996# Transition to stacked sub-shells. Introduction of namespace sd.
This commit is contained in:
Oliver Bolte 2004-01-20 09:35:35 +00:00
parent edeacb43e0
commit 26dc655ff7
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sd/source/ui/app/sddll.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: sddll.cxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: rt $ $Date: 2003-09-19 08:15:58 $
* last change: $Author: obo $ $Date: 2004-01-20 10:35:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -75,8 +75,12 @@
#pragma hdrstop
#include "sddll.hxx"
#include "docshell.hxx"
#include "grdocsh.hxx"
#ifndef SD_DRAW_DOC_SHELL_HXX
#include "DrawDocShell.hxx"
#endif
#ifndef SD_GRAPHIC_DOC_SHELL_HXX
#include "GraphicDocShell.hxx"
#endif
#include "sdresid.hxx"
#include "sdobjfac.hxx"
#include "cfgids.hxx"
@ -118,10 +122,10 @@ void SdDLL::Init()
SfxObjectFactory* pImpressFact = NULL;
if (SvtModuleOptions().IsImpress())
pImpressFact = &SdDrawDocShell::Factory();
pImpressFact = &::sd::DrawDocShell::Factory();
if (SvtModuleOptions().IsDraw())
pDrawFact = &SdGraphicDocShell::Factory();
pDrawFact = &::sd::GraphicDocShell::Factory();
// the SdModule must be created
SdModule** ppShlPtr = (SdModule**) GetAppData(SHL_DRAW);
@ -129,13 +133,15 @@ void SdDLL::Init()
if (SvtModuleOptions().IsImpress())
{
// Register the Impress shape types in order to make the shapes accessible.
SdDrawDocShell::RegisterFactory( SDT_SD_DOCFACTPRIO );
::accessibility::RegisterImpressShapeTypes ();
::sd::DrawDocShell::RegisterFactory( SDT_SD_DOCFACTPRIO );
// Register the Impress shape types in order to make the shapes
// accessible.
::accessibility::RegisterImpressShapeTypes ();
}
if (SvtModuleOptions().IsDraw())
SdGraphicDocShell::RegisterFactory( SDT_SD_DOCFACTPRIO );
::sd::GraphicDocShell::RegisterFactory( SDT_SD_DOCFACTPRIO );
// register your view-factories here
RegisterFactorys();