sb118: merged in backout

9 files changed, 14 insertions, 49 deletions

diff --git a/sc/util/createExtPackage.pl b/sc/util/createExtPackage.pl
index 967ef9e34d9d..06ac16673dec 100644
--- a/sc/util/createExtPackage.pl
+++ b/sc/util/createExtPackage.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: createExtPackage.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/util/hidother.src b/sc/util/hidother.src
index 230bf06e1fbb..48dfebdf5c2c 100644
--- a/sc/util/hidother.src
+++ b/sc/util/hidother.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hidother.src,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index 3c51d15634de..275b3d22548a 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.49 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,6 +50,7 @@ RESLIB1LIST=\
     $(SRS)$/formdlgs.srs \
     $(SRS)$/pagedlg.srs	\
     $(SRS)$/navipi.srs	\
+    $(SRS)$/cctrl.srs	\
     $(SOLARCOMMONRESDIR)$/sfx.srs
 
 RESLIB1NAME=sc
@@ -80,8 +77,8 @@ SHL1STDLIBS=       \
     $(SVTOOLLIB)	\
     $(SVLLIB)		\
     $(SVXCORELIB)		\
+    $(EDITENGLIB)		\
     $(SVXLIB)		\
-    $(GOODIESLIB)	\
     $(BASEGFXLIB) \
     $(DRAWINGLAYERLIB) \
     $(VCLLIB)		\
@@ -142,7 +139,7 @@ LIB4FILES=	\
 
 SHL2TARGET= scd$(DLLPOSTFIX)
 SHL2IMPLIB= scdimp
-SHL2VERSIONMAP= scd.map
+SHL2VERSIONMAP=$(SOLARENV)/src/component.map
 SHL2DEF=$(MISC)$/$(SHL2TARGET).def
 DEF2NAME=		$(SHL2TARGET)
 
@@ -186,6 +183,7 @@ SHL6STDLIBS= \
     $(SVTOOLLIB)	\
     $(SVLLIB)		\
     $(SVXCORELIB)		\
+    $(EDITENGLIB)		\
     $(MSFILTERLIB)		\
     $(SVXLIB)		\
     $(BASEGFXLIB) \
@@ -214,6 +212,7 @@ DEF8NAME=$(SHL8TARGET)
 
 SHL8STDLIBS= \
             $(ISCLIB) \
+            $(EDITENGLIB)		\
             $(SVXCORELIB) \
             $(SVXLIB) \
             $(SFX2LIB) \
@@ -278,6 +277,7 @@ LIB8OBJFILES = \
         $(SLO)$/dapidata.obj	\
         $(SLO)$/crdlg.obj			\
         $(SLO)$/scuiasciiopt.obj	\
+        $(SLO)$/textimportoptions.obj	\
         $(SLO)$/scuiautofmt.obj	\
         $(SLO)$/dpgroupdlg.obj	\
         $(SLO)$/editfield.obj
@@ -288,7 +288,7 @@ TARGET_VBA=vbaobj
 SHL9TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno
 SHL9IMPLIB=	i$(TARGET_VBA)
 
-SHL9VERSIONMAP=$(TARGET_VBA).map
+SHL9VERSIONMAP=$(SOLARENV)/src/component.map
 SHL9DEF=$(MISC)$/$(SHL9TARGET).def
 DEF9NAME=$(SHL9TARGET)
 .IF "$(VBA_EXTENSION)"=="YES"
@@ -308,6 +308,7 @@ SHL9STDLIBS= \
         $(SALLIB)\
         $(BASICLIB)	\
         $(SFXLIB)	\
+        $(EDITENGLIB)		\
         $(SVXCORELIB)	\
         $(SVTOOLLIB)    \
         $(SVLLIB) \
diff --git a/sc/util/makefile.pmk b/sc/util/makefile.pmk
index 237d49cf8a7f..226a4dc9d811 100644
--- a/sc/util/makefile.pmk
+++ b/sc/util/makefile.pmk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.pmk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/util/sc.map b/sc/util/sc.map
deleted file mode 100644
index bfd1401a7685..000000000000
--- a/sc/util/sc.map
+++ /dev/null
@@ -1,8 +0,0 @@
-SC_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/sc/util/scd.map b/sc/util/scd.map
deleted file mode 100644
index bfd1401a7685..000000000000
--- a/sc/util/scd.map
+++ /dev/null
@@ -1,8 +0,0 @@
-SC_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/sc/util/scfilt.map b/sc/util/scfilt.map
index 589736f24eb1..642b8db15088 100644
--- a/sc/util/scfilt.map
+++ b/sc/util/scfilt.map
@@ -1,4 +1,4 @@
-SCFILT_1_0 {
+UDK_3_0_0 {
   global:
     ScFilterCreate;
   local:
diff --git a/sc/util/scui.map b/sc/util/scui.map
index f40bd255fe1d..ad5e33836c7c 100644
--- a/sc/util/scui.map
+++ b/sc/util/scui.map
@@ -1,4 +1,4 @@
-SWUI_1_0 {
+UDK_3_0_0 {
     global:
     CreateDialogFactory;
     local:
diff --git a/sc/util/vbaobj.map b/sc/util/vbaobj.map
deleted file mode 100644
index 737cddbfe3df..000000000000
--- a/sc/util/vbaobj.map
+++ /dev/null
@@ -1,9 +0,0 @@
-OOO_1.1 {
-    global:
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};