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

INTEGRATION: CWS presentationengine01 (1.16.4); FILE MERGED

Browse source 
2004/11/22 23:12:23 thb 1.16.4.4: #i10000# Resolving merge problems: the old slideshow slots have been removed by CL, maybe this has to be mapped to one of the new ones
2004/11/17 19:29:33 thb 1.16.4.3: RESYNC: (1.18-1.20); FILE MERGED
2004/10/12 22:59:40 thb 1.16.4.2: RESYNC: (1.16-1.18); FILE MERGED
2004/08/28 22:40:43 cl 1.16.4.1: removed old presentation code
This commit is contained in:
Rüdiger Timm 2004-11-26 18:58:59 +00:00
parent a775df7cbc
commit 230800e486
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sd/source/ui/app/sddll2.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: sddll2.cxx,v $
*
* $Revision: 1.20 $
* $Revision: 1.21 $
*
* last change: $Author: hr $ $Date: 2004-10-12 14:05:21 $
* last change: $Author: rt $ $Date: 2004-11-26 19:58:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -181,15 +181,9 @@
#ifndef SD_PREVIEW_CHILD_WINDOW_HXX
#include "PreviewChildWindow.hxx"
#endif
#ifndef SD_EFFECT_CHILD_WINDOW_HXX
#include "EffectChildWindow.hxx"
#endif
#ifndef SD_LAZER_DIALOG_CHILD_WINDOW_HXX
#include "LayerDialogChildWindow.hxx"
#endif
#ifndef SD_SLIDE_CHANGE_CHILD_WINDOW_HXX
#include "SlideChangeChildWindow.hxx"
#endif
//#include "3dchld.hxx"
#include "app.hrc"
#include "SpellDialogChildWindow.hxx"
@ -242,10 +236,11 @@ void SdDLL::RegisterControllers()
SvxTbxCtlCustomShapes::RegisterControl( SID_DRAWTBX_CS_FLOWCHART, pMod );
SvxTbxCtlCustomShapes::RegisterControl( SID_DRAWTBX_CS_CALLOUT, pMod );
SvxTbxCtlCustomShapes::RegisterControl( SID_DRAWTBX_CS_STAR, pMod );
SdTbxCtlDiaEffect::RegisterControl(0, pMod);
SdTbxCtlDiaSpeed::RegisterControl(0, pMod);
SdTbxCtlDiaAuto::RegisterControl(0, pMod);
SdTbxCtlDiaTime::RegisterControl(0, pMod);
// SdTbxCtlDiaEffect::RegisterControl(0, pMod);
// SdTbxCtlDiaSpeed::RegisterControl(0, pMod);
// SdTbxCtlDiaAuto::RegisterControl(0, pMod);
// SdTbxCtlDiaTime::RegisterControl(0, pMod);
SdTbxCtlDiaPages::RegisterControl( SID_PAGES_PER_ROW, pMod );
SdTbxCtlGlueEscDir::RegisterControl( SID_GLUE_ESCDIR, pMod );
@ -253,9 +248,7 @@ void SdDLL::RegisterControllers()
::sd::NavigatorChildWindow::RegisterChildWindowContext( ::sd::DrawViewShell::_GetInterfaceIdImpl(), pMod );
::sd::NavigatorChildWindow::RegisterChildWindowContext( ::sd::GraphicViewShell::_GetInterfaceIdImpl(), pMod );
::sd::PreviewChildWindow::RegisterChildWindow(0, pMod);
::sd::EffectChildWindow::RegisterChildWindow(0, pMod);
::sd::LayerDialogChildWindow::RegisterChildWindow(0, pMod);
::sd::SlideChangeChildWindow::RegisterChildWindow(0, pMod);
//Sd3DChildWindow::RegisterChildWindow(0, pMod);
/*
SvxChildWinCustomShapesBasic::RegisterChildWindow( 0, pMod );