Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

5 files changed, 211 insertions, 41 deletions

diff --git a/sc/util/hidother.src b/sc/util/hidother.src
index 7170e7b4c3dc..f971cf4c97d7 100644
--- a/sc/util/hidother.src
+++ b/sc/util/hidother.src
@@ -24,40 +24,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "../inc/scfuncs.hrc"           // HID_FUNC_XXX
+#include "../inc/helpids.h"
 
 //  Help-IDs fuer Dokument-Fenster
 
 hidspecial HID_SC_WIN_GRIDWIN    { HelpID = HID_SC_WIN_GRIDWIN; };
 hidspecial HID_SC_WIN_PREVIEW    { HelpID = HID_SC_WIN_PREVIEW; };
 
-//  Help-IDs fuer Shells (Helferlein)
-
-hidspecial HID_SCSHELL_TABVWSH   { HelpID = HID_SCSHELL_TABVWSH; };
-hidspecial HID_SCSHELL_PREVWSH   { HelpID = HID_SCSHELL_PREVWSH; };
-hidspecial HID_SCSHELL_AUDIT     { HelpID = HID_SCSHELL_AUDIT; };
-hidspecial HID_SCSHELL_PIVOTSH   { HelpID = HID_SCSHELL_PIVOTSH; };
-hidspecial HID_SCSHELL_DRAWSH    { HelpID = HID_SCSHELL_DRAWSH; };
-hidspecial HID_SCSHELL_DRTXTOB   { HelpID = HID_SCSHELL_DRTXTOB; };
-hidspecial HID_SCSHELL_DRAWFORMSH{ HelpID = HID_SCSHELL_DRAWFORMSH ; };
-
-hidspecial HID_SCSHELL_CELLSH       { HelpID = HID_SCSHELL_CELLSH       ; };
-hidspecial HID_SCSHELL_FORMATSH     { HelpID = HID_SCSHELL_FORMATSH     ; };
-hidspecial HID_SCSHELL_OLEOBEJCTSH  { HelpID = HID_SCSHELL_OLEOBEJCTSH  ; };
-hidspecial HID_SCSHELL_CHARTSH      { HelpID = HID_SCSHELL_CHARTSH      ; };
-hidspecial HID_SCSHELL_GRAPHIC      { HelpID = HID_SCSHELL_GRAPHIC      ; };
-hidspecial HID_SCSHELL_PAGEBREAK    { HelpID = HID_SCSHELL_PAGEBREAK    ; };
-
-//  Help-IDs fuer Standard-Vorlagen
-
-hidspecial HID_SC_SHEET_CELL_STD    { HelpID = HID_SC_SHEET_CELL_STD; };
-hidspecial HID_SC_SHEET_CELL_ERG    { HelpID = HID_SC_SHEET_CELL_ERG; };
-hidspecial HID_SC_SHEET_CELL_ERG1   { HelpID = HID_SC_SHEET_CELL_ERG1; };
-hidspecial HID_SC_SHEET_CELL_UEB    { HelpID = HID_SC_SHEET_CELL_UEB; };
-hidspecial HID_SC_SHEET_CELL_UEB1   { HelpID = HID_SC_SHEET_CELL_UEB1; };
-hidspecial HID_SC_SHEET_PAGE_STD    { HelpID = HID_SC_SHEET_PAGE_STD; };
-hidspecial HID_SC_SHEET_PAGE_REP    { HelpID = HID_SC_SHEET_PAGE_REP; };
-
 //  Elemente in der Eingabezeile
 
 hidspecial HID_INSWIN_POS        { HelpID = HID_INSWIN_POS; };
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index 5b9c165450d7..5cefb928e143 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -51,7 +51,7 @@ RESLIB1LIST=\
     $(SRS)$/pagedlg.srs	\
     $(SRS)$/navipi.srs	\
     $(SRS)$/cctrl.srs	\
-    $(SOLARCOMMONRESDIR)$/sfx.srs
+
 
 RESLIB1NAME=sc
 RESLIB1IMAGES=\
@@ -85,6 +85,7 @@ SHL1STDLIBS=       \
     $(CPPUHELPERLIB)	\
     $(COMPHELPERLIB)	\
     $(UCBHELPERLIB)	\
+    $(VBAHELPERLIB)	\
     $(TKLIB)		\
     $(SALLIB)		\
     $(SALHELPERLIB)		\
@@ -282,8 +283,6 @@ LIB8OBJFILES = \
         $(SLO)$/dpgroupdlg.obj	\
         $(SLO)$/editfield.obj
 
-.IF "$(ENABLE_VBA)"=="YES"
-
 TARGET_VBA=vbaobj
 SHL9TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno
 SHL9IMPLIB=	i$(TARGET_VBA)
@@ -291,11 +290,7 @@ SHL9IMPLIB=	i$(TARGET_VBA)
 SHL9VERSIONMAP=$(SOLARENV)/src/component.map
 SHL9DEF=$(MISC)$/$(SHL9TARGET).def
 DEF9NAME=$(SHL9TARGET)
-.IF "$(VBA_EXTENSION)"=="YES"
-SHL9RPATH=OXT
-.ELSE
 SHL9RPATH=OOO
-.ENDIF
 
 SHL9STDLIBS= \
         $(VBAHELPERLIB) \
@@ -335,11 +330,24 @@ SHL9LIBS=$(SLB)$/$(TARGET_VBA).lib
 
 .INCLUDE :  target.mk
 
-.IF "$(VBA_EXTENSION)"=="YES"
-    COMP=build_extn
-.ENDIF
-
 ALLTAR:	$(MISC)$/linkinc.ls  $(COMP)
 
-build_extn : $(SHL9TARGETN)
-    $(PERL) createExtPackage.pl $(COMMONBIN)$/vbaapi.oxt  $(SOLARBINDIR)$/oovbaapi.rdb $(LIBCOMPNAME)
+ALLTAR : $(MISC)/sc.component $(MISC)/scd.component $(MISC)/vbaobj.component
+
+$(MISC)/sc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        sc.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt sc.component
+
+$(MISC)/scd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        scd.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt scd.component
+
+$(MISC)/vbaobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        vbaobj.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL9TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt vbaobj.component
diff --git a/sc/util/sc.component b/sc/util/sc.component
new file mode 100644
index 000000000000..abd05aa579f2
--- /dev/null
+++ b/sc/util/sc.component
@@ -0,0 +1,97 @@
+<?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.Calc.FilterOptionsDialog">
+    <service name="com.sun.star.ui.dialogs.FilterOptionsDialog"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.SpreadsheetDocument">
+    <service name="com.sun.star.sheet.SpreadsheetDocument"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLContentExporter">
+    <service name="com.sun.star.comp.Calc.XMLContentExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLExporter">
+    <service name="com.sun.star.comp.Calc.XMLExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLMetaExporter">
+    <service name="com.sun.star.comp.Calc.XMLMetaExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLOasisContentExporter">
+    <service name="com.sun.star.comp.Calc.XMLOasisContentExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLOasisContentImporter">
+    <service name="com.sun.star.comp.Calc.XMLOasisContentImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLOasisExporter">
+    <service name="com.sun.star.comp.Calc.XMLOasisExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLOasisImporter">
+    <service name="com.sun.star.comp.Calc.XMLOasisImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLOasisMetaExporter">
+    <service name="com.sun.star.comp.Calc.XMLOasisMetaExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLOasisMetaImporter">
+    <service name="com.sun.star.comp.Calc.XMLOasisMetaImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLOasisSettingsExporter">
+    <service name="com.sun.star.comp.Calc.XMLOasisSettingsExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLOasisSettingsImporter">
+    <service name="com.sun.star.comp.Calc.XMLOasisSettingsImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLOasisStylesExporter">
+    <service name="com.sun.star.comp.Calc.XMLOasisStylesExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLOasisStylesImporter">
+    <service name="com.sun.star.comp.Calc.XMLOasisStylesImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLSettingsExporter">
+    <service name="com.sun.star.comp.Calc.XMLSettingsExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLStylesExporter">
+    <service name="com.sun.star.comp.Calc.XMLStylesExporter"/>
+  </implementation>
+  <implementation name="stardiv.StarCalc.ScAutoFormatsObj">
+    <service name="com.sun.star.sheet.TableAutoFormats"/>
+  </implementation>
+  <implementation name="stardiv.StarCalc.ScFunctionAccess">
+    <service name="com.sun.star.sheet.FunctionAccess"/>
+  </implementation>
+  <implementation name="stardiv.StarCalc.ScFunctionListObj">
+    <service name="com.sun.star.sheet.FunctionDescriptions"/>
+  </implementation>
+  <implementation name="stardiv.StarCalc.ScRecentFunctionsObj">
+    <service name="com.sun.star.sheet.RecentFunctions"/>
+  </implementation>
+  <implementation name="stardiv.StarCalc.ScSpreadsheetSettings">
+    <service name="com.sun.star.sheet.GlobalSheetSettings"/>
+  </implementation>
+</component>
diff --git a/sc/util/scd.component b/sc/util/scd.component
new file mode 100644
index 000000000000..df2e2f77e25f
--- /dev/null
+++ b/sc/util/scd.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.calc.FormatDetector">
+    <service name="com.sun.star.frame.ExtendedTypeDetection"/>
+  </implementation>
+</component>
diff --git a/sc/util/vbaobj.component b/sc/util/vbaobj.component
new file mode 100644
index 000000000000..52ad691822d0
--- /dev/null
+++ b/sc/util/vbaobj.component
@@ -0,0 +1,58 @@
+<?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="ScVbaApplication">
+    <service name="ooo.vba.excel.Application"/>
+  </implementation>
+  <implementation name="ScVbaEventsHelper">
+    <service name="com.sun.star.script.vba.VBASpreadsheetEventProcessor"/>
+  </implementation>
+  <implementation name="ScVbaGlobals">
+    <service name="ooo.vba.excel.Globals"/>
+  </implementation>
+  <implementation name="ScVbaHyperlink">
+    <service name="ooo.vba.excel.Hyperlink"/>
+  </implementation>
+  <implementation name="ScVbaTextFrame">
+    <service name="ooo.vba.excel.TextFrame"/>
+  </implementation>
+  <implementation name="ScVbaWindow">
+    <service name="ooo.vba.excel.Window"/>
+  </implementation>
+  <implementation name="ScVbaWorkbook">
+    <service name="ooo.vba.excel.Workbook"/>
+  </implementation>
+  <implementation name="ScVbaWorksheet">
+    <service name="ooo.vba.excel.Worksheet"/>
+  </implementation>
+  <implementation name="SvVbaRange">
+    <service name="ooo.vba.excel.Range"/>
+  </implementation>
+</component>