Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

5 files changed, 153 insertions, 28 deletions

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/hidother.src b/sd/util/hidother.src
index 1a15c421b419..bd378fb6d75f 100644..100755
--- a/sd/util/hidother.src
+++ b/sd/util/hidother.src
@@ -24,28 +24,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #include "../inc/helpids.h"
-#include "hidother.hrc"
-#include "../inc/app.hrc"
-
-hidspecial SID_NOTESMODE      { HelpId = SID_NOTESMODE; };
-hidspecial SID_HANDOUTMODE      { HelpId = SID_HANDOUTMODE; };
-
-hidspecial SD_IF_SDAPP                     { HelpId = SD_IF_SDAPP; };
-hidspecial SD_IF_SDDRAWDOCSHELL            { HelpId = SD_IF_SDDRAWDOCSHELL; };
-hidspecial SD_IF_SDVIEWSHELL               { HelpId = SD_IF_SDVIEWSHELL; };
-hidspecial SD_IF_SDDRAWVIEWSHELL           { HelpId = SD_IF_SDDRAWVIEWSHELL; };
-hidspecial SD_IF_SDSLIDEVIEWSHELL          { HelpId = SD_IF_SDSLIDEVIEWSHELL; };
-hidspecial SD_IF_SDOUTLINEVIEWSHELL        { HelpId = SD_IF_SDOUTLINEVIEWSHELL; };
-hidspecial SD_IF_SDDRAWSTDOBJECTBAR        { HelpId = SD_IF_SDDRAWSTDOBJECTBAR; };
-hidspecial SD_IF_SDDRAWTEXTOBJECTBAR       { HelpId = SD_IF_SDDRAWTEXTOBJECTBAR; };
-hidspecial SD_IF_SDDRAWBEZIEROBJECTBAR     { HelpId = SD_IF_SDDRAWBEZIEROBJECTBAR; };
-hidspecial SD_IF_SDDRAWGLUEPOINTSOBJECTBAR { HelpId = SD_IF_SDDRAWGLUEPOINTSOBJECTBAR; };
-hidspecial SD_IF_SDGRAPHICDOCSHELL         { HelpId = SD_IF_SDGRAPHICDOCSHELL; };
-hidspecial SD_IF_SDGRAPHICVIEWSHELL        { HelpId = SD_IF_SDGRAPHICVIEWSHELL; };
-hidspecial SD_IF_SDGRAPHICSTDOBJECTBAR     { HelpId = SD_IF_SDGRAPHICSTDOBJECTBAR; };
-hidspecial SD_IF_SDDRAWGRAFOBJECTBAR       { HelpId = SD_IF_SDDRAWGRAFOBJECTBAR; };
-hidspecial SD_IF_SDPRESVIEWSHELL           { HelpId = SD_IF_SDPRESVIEWSHELL; };
 
 hidspecial HID_SD_PRINT_OPTIONS        { HelpId = HID_SD_PRINT_OPTIONS; };
 hidspecial HID_SD_OPTIONS_SNAP         { HelpId = HID_SD_OPTIONS_SNAP; };
@@ -130,8 +110,6 @@ hidspecial HID_SD_NAMEDIALOG_LINEEND    { HelpId = HID_SD_NAMEDIALOG_LINEEND; };
 hidspecial HID_SD_TABPAGE_HEADERFOOTER_SLIDE { HelpId = HID_SD_TABPAGE_HEADERFOOTER_SLIDE; };
 hidspecial HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT { HelpId = HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT; };
 
-hidspecial SD_IF_SDDRAWMEDIAOBJECTBAR      { HelpId = SD_IF_SDDRAWMEDIAOBJECTBAR; };
-
 hidspecial HID_SD_TASK_PANE             { HelpId = HID_SD_TASK_PANE; };
 hidspecial HID_SD_SLIDE_DESIGNS         { HelpId = HID_SD_SLIDE_DESIGNS; };
 hidspecial HID_SD_CURRENT_MASTERS       { HelpId = HID_SD_CURRENT_MASTERS; };
@@ -194,8 +172,6 @@ hidspecial HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX   { HelpId = HID_S
 hidspecial HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX          { HelpId = HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX; };
 hidspecial HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX      { HelpId = HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX; };
 
-hidspecial SID_SAVEGRAPHIC { HelpId = SID_SAVEGRAPHIC; };
-
 hidspecial HID_SD_SLIDESHOW_DISPLAY                             { HelpId = HID_SD_SLIDESHOW_DISPLAY; };
 
 hidspecial HID_SD_RULER_HORIZONTAL                              { HelpId = HID_SD_RULER_HORIZONTAL; };
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index b0140f45417a..702cc27cddfc 100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -50,10 +50,11 @@ RESLIB1SRSFILES=\
     $(SRS)$/notes.srs			\
     $(SRS)$/animui.srs			\
     $(SRS)$/slideshow.srs		\
+    $(SRS)$/slsview.srs			\
     $(SRS)$/uitable.srs			\
     $(SRS)$/view.srs			\
     $(SRS)$/uiannotations.srs	\
-    $(SOLARCOMMONRESDIR)$/sfx.srs
+
 
 # --- StarDraw DLL
 
@@ -86,7 +87,7 @@ SHL1STDLIBS+= \
     $(UCBHELPERLIB) \
     $(CPPUHELPERLIB) \
     $(CPPULIB) \
-    $(CANVASLIB) \
+    $(CANVASTOOLSLIB) \
     $(SALLIB) \
     $(SALHELPERLIB) \
     $(AVMEDIALIB)
@@ -279,3 +280,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>