fwk139: Rebase to DEV300m77

9 files changed, 10 insertions, 35 deletions

diff --git a/svl/inc/svl/smplhint.hxx b/svl/inc/svl/smplhint.hxx
index baf3c85222b4..cf705b41c5ae 100644
--- a/svl/inc/svl/smplhint.hxx
+++ b/svl/inc/svl/smplhint.hxx
@@ -39,14 +39,14 @@
 #define SFX_HINT_UPDATEDONE         0x00000020
 #define SFX_HINT_DEINITIALIZING     0x00000040
 #define SFX_HINT_MODECHANGED        0x00000080
-#define SFX_HINT_CANCELLABLE        0x00000100
-#define SFX_HINT_DATAAVAILABLE      0x00000200
-#define SFX_HINT_SAVECOMPLETED      0x00000400
-#define SFX_HINT_RELEASEREF         0x00000800
+    // unused, formerly SFX_HINT_CANCELLABLE
+    // unused, formerly SFX_HINT_DATAAVAILABLE
+    // unused, formerly SFX_HINT_SAVECOMPLETED
+    // unused, formerly SFX_HINT_RELEASEREF
 #define SFX_HINT_COLORS_CHANGED     0x00001000
 #define SFX_HINT_CTL_SETTINGS_CHANGED   0x00002000
 #define SFX_HINT_ACCESSIBILITY_CHANGED  0x00004000
-#define SFX_HINT_VIEWCREATED        0x00008000
+    // unused, formerly SFX_HINT_VIEWCREATED
 #define SFX_HINT_USER00             0x00010000
 #define SFX_HINT_USER01             0x00020000
 #define SFX_HINT_USER02             0x00040000
diff --git a/svl/qa/complex/ConfigItems/helper/exports.map b/svl/qa/complex/ConfigItems/helper/exports.map
deleted file mode 100644
index 85610ad80888..000000000000
--- a/svl/qa/complex/ConfigItems/helper/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-            GetVersionInfo;
-            component_getImplementationEnvironment;
-            component_getFactory;
-            component_writeInfo;
-
-    local:
-            *;
-};
diff --git a/svl/qa/complex/ConfigItems/helper/makefile.mk b/svl/qa/complex/ConfigItems/helper/makefile.mk
index 2c949da7b168..13ea12106792 100644
--- a/svl/qa/complex/ConfigItems/helper/makefile.mk
+++ b/svl/qa/complex/ConfigItems/helper/makefile.mk
@@ -65,7 +65,7 @@ SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME=       $(SHL1TARGET)
 
-SHL1VERSIONMAP= exports.map
+SHL1VERSIONMAP= $(SOLARENV)/src/component.map
 
 # --- Targets ------------------------------------------------------
 
diff --git a/svl/qa/makefile.mk b/svl/qa/makefile.mk
index 4e107e31f924..7e8c7ee795cc 100644
--- a/svl/qa/makefile.mk
+++ b/svl/qa/makefile.mk
@@ -35,6 +35,8 @@ ENABLE_EXCEPTIONS = true
 
 .INCLUDE :  settings.mk
 
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:job by codegen.pl
 SHL1OBJS=  \
diff --git a/svl/source/fsstor/exports.map b/svl/source/fsstor/exports.map
deleted file mode 100644
index f4ed78b9e970..000000000000
--- a/svl/source/fsstor/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/svl/source/fsstor/makefile.mk b/svl/source/fsstor/makefile.mk
index 43515155d63d..dc91814772f9 100644
--- a/svl/source/fsstor/makefile.mk
+++ b/svl/source/fsstor/makefile.mk
@@ -56,7 +56,7 @@ SHL1STDLIBS=\
     $(CPPULIB) \
     $(SALLIB)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
 
diff --git a/svl/source/notify/makefile.mk b/svl/source/notify/makefile.mk
index bfccd06de853..c2e6648907e5 100644
--- a/svl/source/notify/makefile.mk
+++ b/svl/source/notify/makefile.mk
@@ -42,7 +42,6 @@ SLOFILES =	\
         $(SLO)$/hint.obj \
         $(SLO)$/lstner.obj \
         $(SLO)$/isethint.obj \
-        $(SLO)$/cancel.obj \
         $(SLO)$/brdcst.obj \
         $(SLO)$/listener.obj \
         $(SLO)$/listenerbase.obj \
diff --git a/svl/source/passwordcontainer/exports.map b/svl/source/passwordcontainer/exports.map
deleted file mode 100644
index f4ed78b9e970..000000000000
--- a/svl/source/passwordcontainer/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/svl/source/passwordcontainer/makefile.mk b/svl/source/passwordcontainer/makefile.mk
index 92a9993fd251..d9eb9615cf80 100644
--- a/svl/source/passwordcontainer/makefile.mk
+++ b/svl/source/passwordcontainer/makefile.mk
@@ -52,7 +52,7 @@ SHL1STDLIBS=\
     $(CPPULIB) \
     $(SALLIB)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)