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

INTEGRATION: CWS impress1 (1.6.238); FILE MERGED

Browse source 
2003/10/23 13:07:56 af 1.6.238.3: #111996# Registered factory of new OutlineViewShellBase class.
2003/09/24 16:34:05 af 1.6.238.2: #111996# Registration of new factory for Draw view shells.
2003/09/17 09:27:04 af 1.6.238.1: #111996# Transition to stacked sub-shells. Introduction of namespace sd. Registering factories only for ViewShellBase and PresentationViewShellBase.
This commit is contained in:
Oliver Bolte 2004-01-20 09:35:56 +00:00
parent 26dc655ff7
commit e8cb2f2fbd
1 changed files with 97 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
sd/source/ui/app/sddll1.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: sddll1.cxx,v $ * $RCSfile: sddll1.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: thb $ $Date: 2001-11-02 17:12:29 $ * last change: $Author: obo $ $Date: 2004-01-20 10:35:56 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -65,19 +65,64 @@
#include "sddll.hxx" #include "sddll.hxx"
#include "diactrl.hxx" #include "diactrl.hxx"
#include "tbx_ww.hxx" #include "tbx_ww.hxx"
#include "drtxtob.hxx" #ifndef SD_TEXT_OBJECT_BAR_HXX
#include "drbezob.hxx" #include "TextObjectBar.hxx"
#include "drglueob.hxx" #endif
#include "drgrfob.hxx" #ifndef SD_BEZIER_OBJECT_BAR_HXX
#include "drstdob.hxx" #include "BezierObjectBar.hxx"
#include "grstdob.hxx" #endif
#include "outlnvsh.hxx" #ifndef SD_GLUE_POINTS_OBJECT_BAR_HXX
#include "slidvish.hxx" #include "GluePointsObjectBar.hxx"
#include "presvish.hxx" #endif
#include "prvwshll.hxx" #ifndef SD_GRAPHIC_OBJECT_BAR_HXX
#include "drviewsh.hxx" #include "GraphicObjectBar.hxx"
#include "grviewsh.hxx" #endif
#include "grdocsh.hxx" #ifndef SD_DRAW_OBJECT_BAR_HXX
#include "DrawObjectBar.hxx"
#endif
#ifndef SD_IMPRESS_OBJECT_BAR_HXX
#include "ImpressObjectBar.hxx"
#endif
#ifndef SD_VIEW_SHELL_BASE_HXX
#include "ViewShellBase.hxx"
#endif
#ifndef SD_PRESENTATION_VIEW_SHELL_BASE_HXX
#include "PresentationViewShellBase.hxx"
#endif
#ifndef SD_OUTLINE_VIEW_SHELL_HXX
#include "OutlineViewShell.hxx"
#endif
#ifndef SD_SLIDE_VIEW_SHELL_HXX
#include "SlideViewShell.hxx"
#endif
#ifndef SD_PRESENTATION_VIEW_SHELL_HXX
#include "PresentationViewShell.hxx"
#endif
#ifndef SD_OUTLINE_VIEW_SHELL_BASE_HXX
#include "OutlineViewShellBase.hxx"
#endif
#ifndef SD_PREVIEW_VIEW_SHELL_HXX
#include "PreviewViewShell.hxx"
#endif
#ifndef SD_DRAW_VIEW_SHELL_HXX
#include "DrawViewShell.hxx"
#endif
#ifndef SD_GRAPHIC_VIEW_SHELL_HXX
#include "GraphicViewShell.hxx"
#endif
#ifndef SD_GRAPHIC_VIEW_SHELL_BASE_HXX
#include "GraphicViewShellBase.hxx"
#endif
#ifndef SD_DRAW_DOC_SHELL_HXX
#include "DrawDocShell.hxx"
#endif
#ifndef SD_GRAPHIC_DOC_SHELL_HXX
#include "GraphicDocShell.hxx"
#endif
#ifndef SD_FACTORY_IDS_HXX
#include "FactoryIds.hxx"
#endif
#include "sdmod.hxx"
#include "app.hrc" #include "app.hrc"
@ -91,23 +136,36 @@
void SdDLL::RegisterFactorys() void SdDLL::RegisterFactorys()
{ {
if (SvtModuleOptions().IsImpress())
{
::sd::ViewShellBase::RegisterFactory (::sd::IMPRESS_FACTORY_ID);
::sd::OutlineViewShellBase::RegisterFactory (::sd::OUTLINE_FACTORY_ID);
::sd::PresentationViewShellBase::RegisterFactory (::sd::PRESENTATION_FACTORY_ID);
}
if (SvtModuleOptions().IsDraw())
{
::sd::GraphicViewShellBase::RegisterFactory (::sd::DRAW_FACTORY_ID);
}
/* af
if (SvtModuleOptions().IsImpress()) if (SvtModuleOptions().IsImpress())
{ {
// Impress // Impress
SdDrawViewShell::RegisterFactory(1); ::sd::DrawViewShell::RegisterFactory(1);
SdSlideViewShell::RegisterFactory(2); ::sd::SlideViewShell::RegisterFactory(2);
SdOutlineViewShell::RegisterFactory(3); ::sd::OutlineViewShell::RegisterFactory(3);
SdPresViewShell::RegisterFactory(4); ::sd::PresentationViewShell::RegisterFactory(4);
SdPreviewViewShell::RegisterFactory(5); ::sd::PreviewViewShell::RegisterFactory(5);
} }
if (SvtModuleOptions().IsDraw()) { if (SvtModuleOptions().IsDraw()) {
// Draw // Draw
SdGraphicViewShell::RegisterFactory(1); ::sd::GraphicViewShell::RegisterFactory(1);
// #93468# Need preview view also for draw documents // #93468# Need preview view also for draw documents
SdPreviewViewShell::RegisterFactory(5); ::sd::PreviewViewShell::RegisterFactory(5);
} }
*/
} }
@ -125,27 +183,30 @@ void SdDLL::RegisterInterfaces()
SfxModule* pMod = SD_MOD(); SfxModule* pMod = SD_MOD();
SdModule::RegisterInterface(pMod); SdModule::RegisterInterface(pMod);
// View shell base.
::sd::ViewShellBase::RegisterInterface(pMod);
// DocShells // DocShells
SdDrawDocShell::RegisterInterface(pMod); ::sd::DrawDocShell::RegisterInterface(pMod);
SdGraphicDocShell::RegisterInterface(pMod); ::sd::GraphicDocShell::RegisterInterface(pMod);
// Impress ViewShells // Impress ViewShells
SdDrawViewShell::RegisterInterface(pMod); ::sd::DrawViewShell::RegisterInterface(pMod);
SdSlideViewShell::RegisterInterface(pMod); ::sd::SlideViewShell::RegisterInterface(pMod);
SdOutlineViewShell::RegisterInterface(pMod); ::sd::OutlineViewShell::RegisterInterface(pMod);
SdPresViewShell::RegisterInterface(pMod); ::sd::PresentationViewShell::RegisterInterface(pMod);
SdPreviewViewShell::RegisterInterface(pMod); ::sd::PreviewViewShell::RegisterInterface(pMod);
// Draw ViewShell // Draw ViewShell
SdGraphicViewShell::RegisterInterface(pMod); ::sd::GraphicViewShell::RegisterInterface(pMod);
// Impress ObjectShells // Impress ObjectShells
SdDrawStdObjectBar::RegisterInterface(pMod); ::sd::ImpressObjectBar::RegisterInterface(pMod);
SdDrawBezierObjectBar::RegisterInterface(pMod); ::sd::BezierObjectBar::RegisterInterface(pMod);
SdDrawGluePointsObjectBar::RegisterInterface(pMod); ::sd::GluePointsObjectBar::RegisterInterface(pMod);
SdDrawTextObjectBar::RegisterInterface(pMod); ::sd::TextObjectBar::RegisterInterface(pMod);
SdDrawGrafObjectBar::RegisterInterface(pMod); ::sd::GraphicObjectBar::RegisterInterface(pMod);
// Draw ObjectShell // Draw ObjectShell
SdGraphicStdObjectBar::RegisterInterface(pMod); ::sd::DrawObjectBar::RegisterInterface(pMod);
} }