impress201: rebase m89

11 files changed, 161 insertions, 139 deletions

diff --git a/sd/prj/build.lst b/sd/prj/build.lst
index 6b4f478b7c20..9e8bf7a1db1f 100644
--- a/sd/prj/build.lst
+++ b/sd/prj/build.lst
@@ -28,7 +28,7 @@ sd	sd\source\ui\slidesorter\controller		nmake	-	all	sd_slscontroller sd_sdi sd_i
 sd	sd\source\ui\slidesorter\cache			nmake	-	all	sd_slscache sd_inc NULL
 sd	sd\source\ui\controller					nmake	-	all	sd_controller sd_inc NULL
 sd	sd\source\ui\notes						nmake	-	all	sd_notes sd_inc NULL
-sd	sd\source\ui\table						nmake	-	all	sd_table sd_inc NULL
+sd	sd\source\ui\table						nmake	-	all	sd_table sd_sdi sd_inc NULL
 sd	sd\source\filter\ppt					nmake	-	all	sd_ppt sd_inc NULL
 sd	sd\source\filter						nmake	-	all	sd_filt sd_sdi sd_ppt sd_inc NULL
 sd	sd\source\filter\cgm					nmake	-	all	sd_cgm sd_inc NULL
diff --git a/sd/prj/d.lst b/sd/prj/d.lst
index 14f85e982eab..0ebbb9a4eff0 100755
--- a/sd/prj/d.lst
+++ b/sd/prj/d.lst
@@ -55,3 +55,5 @@ mkdir: %_DEST%\inc%_EXT%\sd
 ..\uiconfig\sdraw\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\statusbar\*.xml
 ..\uiconfig\simpress\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar\*.xml
 
+..\%__SRC%\misc\sd.component %_DEST%\xml%_EXT%\sd.component
+..\%__SRC%\misc\sdd.component %_DEST%\xml%_EXT%\sdd.component
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 2a40c8707866..c4c2aa3dbee6 100644..100755
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -265,6 +265,11 @@ PPTWriter::~PPTWriter()
     void*  pPtr;
     delete mpExEmbed;
     delete mpPptEscherEx;
+    delete mpCurUserStrm;
+    delete mpPicStrm;
+    delete mpStrm;
+
+
 
     std::vector< PPTExStyleSheet* >::iterator aStyleSheetIter( maStyleSheetList.begin() );
     while( aStyleSheetIter < maStyleSheetList.end() )
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 3d8797beb328..b64affc9881b 100755
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -727,9 +727,9 @@ class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvide
         sal_uInt32          mnTextSize;
 
         SvStorageRef        mrStg;
-        SvStorageStream*    mpCurUserStrm;
-        SvStorageStream*    mpStrm;
-        SvStorageStream*    mpPicStrm;
+        SvStream*           mpCurUserStrm;
+        SvStream*           mpStrm;
+        SvStream*           mpPicStrm;
         PptEscherEx*        mpPptEscherEx;
 
         List                maExOleObj;
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index cbb81b8cad1c..603dbe33ce32 100644..100755
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -166,7 +166,7 @@ class Section : private List
 class PropRead : private List
 {
         sal_Bool                mbStatus;
-        SvStorageStream*        mpSvStream;
+        SvStorageStreamRef      mpSvStream;
 
         sal_uInt16              mnByteOrder;
         sal_uInt16              mnFormat;
diff --git a/sd/source/ui/unoidl/detreg.cxx b/sd/source/ui/unoidl/detreg.cxx
index a45496d5d5a4..caf7e2730e75 100644..100755
--- a/sd/source/ui/unoidl/detreg.cxx
+++ b/sd/source/ui/unoidl/detreg.cxx
@@ -48,30 +48,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void*   ,
-    void*   pRegistryKey    )
-{
-    Reference< ::registry::XRegistryKey >
-            xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ;
-
-    ::rtl::OUString aDelimiter( RTL_CONSTASCII_USTRINGPARAM("/") );
-    ::rtl::OUString aUnoServices( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") );
-
-    // Eigentliche Implementierung und ihre Services registrieren
-    sal_Int32 i;
-    Reference< ::registry::XRegistryKey >  xNewKey;
-
-    xNewKey = xKey->createKey( aDelimiter + SdFilterDetect::impl_getStaticImplementationName() +
-                               aUnoServices );
-
-    Sequence< ::rtl::OUString > aServices = SdFilterDetect::impl_getStaticSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    return sal_True;
-}
-
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
     const sal_Char* pImplementationName,
     void* pServiceManager,
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index 1ac245ad00d4..7e82654887ae 100755
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -303,115 +303,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-static void SAL_CALL writeInfo(
-    registry::XRegistryKey          * pRegistryKey,
-    const OUString                  & rImplementationName,
-    const uno::Sequence< OUString > & rServices )
-{
-    uno::Reference< registry::XRegistryKey > xNewKey(
-        pRegistryKey->createKey(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) );
-
-    for( sal_Int32 i = 0; i < rServices.getLength(); i++ )
-        xNewKey->createKey( rServices.getConstArray()[i]);
-}
-
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void * ,
-    void * pRegistryKey )
-{
-    if( pRegistryKey )
-    {
-        try
-        {
-            registry::XRegistryKey *pKey = reinterpret_cast< registry::XRegistryKey * >( pRegistryKey );
-
-            writeInfo( pKey, SdHtmlOptionsDialog_getImplementationName(), SdHtmlOptionsDialog_getSupportedServiceNames() );
-            writeInfo( pKey, SdDrawingDocument_getImplementationName(), SdDrawingDocument_getSupportedServiceNames() );
-            writeInfo( pKey, SdPresentationDocument_getImplementationName(), SdPresentationDocument_getSupportedServiceNames() );
-            writeInfo( pKey, SdUnoModule_getImplementationName(), SdUnoModule_getSupportedServiceNames() );
-            writeInfo( pKey, sd::RandomNode__getImplementationName(), sd::RandomNode_getSupportedServiceNames() );
-            writeInfo(
-                pKey,
-                sd::framework::Configuration_getImplementationName(),
-                sd::framework::Configuration_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::framework::ConfigurationController_getImplementationName(),
-                sd::framework::ConfigurationController_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::framework::ModuleController_getImplementationName(),
-                sd::framework::ModuleController_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::framework::BasicPaneFactory_getImplementationName(),
-                sd::framework::BasicPaneFactory_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::framework::BasicToolBarFactory_getImplementationName(),
-                sd::framework::BasicToolBarFactory_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::framework::BasicViewFactory_getImplementationName(),
-                sd::framework::BasicViewFactory_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::framework::TaskPanelFactory_getImplementationName(),
-                sd::framework::TaskPanelFactory_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::toolpanel::ToolPanelFactory_getImplementationName(),
-                sd::toolpanel::ToolPanelFactory_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::framework::ResourceId_getImplementationName(),
-                sd::framework::ResourceId_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::framework::PresentationFactoryProvider_getImplementationName(),
-                sd::framework::PresentationFactoryProvider_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::presenter::SlideRenderer_getImplementationName(),
-                sd::presenter::SlideRenderer_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::presenter::PresenterCanvas_getImplementationName(),
-                sd::presenter::PresenterCanvas_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::presenter::PresenterTextViewService_getImplementationName(),
-                sd::presenter::PresenterTextViewService_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::presenter::PresenterHelperService_getImplementationName(),
-                sd::presenter::PresenterHelperService_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::presenter::PresenterPreviewCache_getImplementationName(),
-                sd::presenter::PresenterPreviewCache_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::slidesorter::SlideSorterService_getImplementationName(),
-                sd::slidesorter::SlideSorterService_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::SlideLayoutController_getImplementationName(),
-                sd::SlideLayoutController_getSupportedServiceNames());
-            writeInfo(
-                pKey,
-                sd::InsertSlideController_getImplementationName(),
-                sd::InsertSlideController_getSupportedServiceNames());
-        }
-        catch (registry::InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-    return sal_True;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName,
     void           * pServiceManager,
diff --git a/sd/util/exports.dxp b/sd/util/exports.dxp
index 0c2e3e7cddd7..0cb5620a1603 100644..100755
--- a/sd/util/exports.dxp
+++ b/sd/util/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
\ No newline at end of file
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index 8cc7bd3345e6..ac01158b5b85 100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -276,3 +276,16 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo Making: $@
     @$(TYPE) sd.flt > $@
 
+ALLTAR : $(MISC)/sd.component $(MISC)/sdd.component
+
+$(MISC)/sd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        sd.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt sd.component
+
+$(MISC)/sdd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        sdd.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt sdd.component
diff --git a/sd/util/sd.component b/sd/util/sd.component
new file mode 100644
index 000000000000..0d0011b4839e
--- /dev/null
+++ b/sd/util/sd.component
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.Draw.DrawingDocument">
+    <service name="com.sun.star.drawing.DrawingDocument"/>
+    <service name="com.sun.star.drawing.DrawingDocumentFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.DrawingModule">
+    <service name="com.sun.star.drawing.ModuleDispatcher"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.PresentationDocument">
+    <service name="com.sun.star.drawing.DrawingDocumentFactory"/>
+    <service name="com.sun.star.presentation.PresentationDocument"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.PresenterCanvasFactory">
+    <service name="com.sun.star.rendering.Canvas"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.PresenterHelper">
+    <service name="com.sun.star.drawing.PresenterHelper"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.PresenterPreviewCache">
+    <service name="com.sun.star.drawing.PresenterPreviewCache"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.PresenterTextView">
+    <service name="com.sun.star.drawing.PresenterTextView"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.SlideRenderer">
+    <service name="com.sun.star.drawing.SlideRenderer"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.SlideSorter">
+    <service name="com.sun.star.drawing.SlideSorter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.framework.BasicPaneFactory">
+    <service name="com.sun.star.drawing.framework.BasicPaneFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.framework.BasicToolBarFactory">
+    <service name="com.sun.star.drawing.framework.BasicToolBarFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.framework.BasicViewFactory">
+    <service name="com.sun.star.drawing.framework.BasicViewFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.framework.PresentationFactoryProvider">
+    <service name="com.sun.star.drawing.framework.PresentationFactoryProvider"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.framework.ResourceId">
+    <service name="com.sun.star.drawing.framework.ResourceId"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.framework.TaskPanelFactory">
+    <service name="com.sun.star.drawing.framework.TaskPanelFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.framework.configuration.Configuration">
+    <service name="com.sun.star.drawing.framework.Configuration"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.framework.configuration.ConfigurationController">
+    <service name="com.sun.star.drawing.framework.ConfigurationController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.framework.module.ModuleController">
+    <service name="com.sun.star.drawing.framework.ModuleController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.draw.SdHtmlOptionsDialog">
+    <service name="com.sun.star.ui.dialog.FilterOptionsDialog"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.drawing.ToolPanelFactory">
+    <service name="com.sun.star.drawing.DefaultToolPanelFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sd.InsertSlideController">
+    <service name="com.sun.star.frame.ToolbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sd.SlideLayoutController">
+    <service name="com.sun.star.frame.ToolbarController"/>
+  </implementation>
+  <implementation name="sd::RandomAnimationNode">
+    <service name="com.sun.star.comp.sd.RandomAnimationNode"/>
+  </implementation>
+</component>
diff --git a/sd/util/sdd.component b/sd/util/sdd.component
new file mode 100644
index 000000000000..51160d0f04fe
--- /dev/null
+++ b/sd/util/sdd.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.draw.FormatDetector">
+    <service name="com.sun.star.frame.ExtendedTypeDetection"/>
+  </implementation>
+</component>