CWS-TOOLING: integrate CWS fwk139

6 files changed, 26 insertions, 8 deletions

diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 93e88b3b74..f61b6434f1 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -765,24 +765,28 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
             DELETEZ(pWebToolbarConfig)  ;
             DELETEZ(pAuthorNames)       ;
             DELETEZ(pDBConfig);
-
-            if (pColorConfig != 0) {
+            if( pColorConfig )
+            {
                 pColorConfig->RemoveListener(this);
                 DELETEZ(pColorConfig);
             }
-            if (pAccessibilityOptions != 0) {
+            if( pAccessibilityOptions )
+            {
                 pAccessibilityOptions->RemoveListener(this);
                 DELETEZ(pAccessibilityOptions);
             }
-            if (pCTLOptions != 0) {
+            if( pCTLOptions )
+            {
                 pCTLOptions->RemoveListener(this);
                 DELETEZ(pCTLOptions);
             }
-            if (pUserOptions != 0) {
+            if( pUserOptions )
+            {
                 pUserOptions->RemoveListener(this);
                 DELETEZ(pUserOptions);
             }
-            if (pUndoOptions != 0) {
+            if( pUndoOptions )
+            {
                 pUndoOptions->RemoveListener(this);
                 DELETEZ(pUndoOptions);
             }
diff --git a/sw/source/ui/cctrl/makefile.mk b/sw/source/ui/cctrl/makefile.mk
index c724f287fc..33ba83f34d 100644
--- a/sw/source/ui/cctrl/makefile.mk
+++ b/sw/source/ui/cctrl/makefile.mk
@@ -50,6 +50,9 @@ SLOFILES =  \
         $(SLO)$/popbox.obj \
         $(SLO)$/swlbox.obj
 
+EXCEPTIONSFILES = \
+        $(SLO)$/popbox.obj
+
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sw/source/ui/ribbar/makefile.mk b/sw/source/ui/ribbar/makefile.mk
index 72acc79307..2405d4b16d 100644
--- a/sw/source/ui/ribbar/makefile.mk
+++ b/sw/source/ui/ribbar/makefile.mk
@@ -45,6 +45,11 @@ SRC1FILES =  \
         tblctrl.src \
         workctrl.src
 
+EXCEPTIONSFILES = \
+        $(SLO)$/tblctrl.obj \
+        $(SLO)$/tbxanchr.obj \
+        $(SLO)$/workctrl.obj
+
 SLOFILES =  \
         $(SLO)$/inputwin.obj \
         $(SLO)$/tbxanchr.obj \
diff --git a/sw/source/ui/shells/makefile.mk b/sw/source/ui/shells/makefile.mk
index e9a03a5a41..dce62a2c93 100644
--- a/sw/source/ui/shells/makefile.mk
+++ b/sw/source/ui/shells/makefile.mk
@@ -83,6 +83,7 @@ EXCEPTIONSFILES =  \
         $(SLO)$/drwtxtsh.obj \
         $(SLO)$/frmsh.obj \
         $(SLO)$/drwtxtex.obj \
+        $(SLO)$/slotadd.obj \
         $(SLO)$/textsh1.obj
 
 # --- Tagets -------------------------------------------------------
diff --git a/sw/source/ui/uiview/makefile.mk b/sw/source/ui/uiview/makefile.mk
index d06bb58a7d..337ee85da5 100644
--- a/sw/source/ui/uiview/makefile.mk
+++ b/sw/source/ui/uiview/makefile.mk
@@ -49,8 +49,13 @@ EXCEPTIONSFILES= \
         $(SLO)$/swcli.obj  \
         $(SLO)$/uivwimp.obj \
         $(SLO)$/view.obj \
+        $(SLO)$/view0.obj \
+        $(SLO)$/view1.obj \
         $(SLO)$/view2.obj \
+        $(SLO)$/viewdraw.obj \
+        $(SLO)$/viewport.obj \
         $(SLO)$/viewprt.obj \
+        $(SLO)$/viewsrch.obj \
         $(SLO)$/viewling.obj \
         $(SLO)$/viewmdi.obj \
 
diff --git a/sw/source/ui/utlui/makefile.mk b/sw/source/ui/utlui/makefile.mk
index 7f2aa91c0e..cded61eee3 100644
--- a/sw/source/ui/utlui/makefile.mk
+++ b/sw/source/ui/utlui/makefile.mk
@@ -51,15 +51,15 @@ SRC1FILES =  \
 
 EXCEPTIONSFILES= \
         $(SLO)$/bookctrl.obj \
+        $(SLO)$/glbltree.obj \
         $(SLO)$/navipi.obj \
         $(SLO)$/unotools.obj    \
+        $(SLO)$/content.obj \
         $(SLO)$/swrenamexnameddlg.obj
 
 SLOFILES =  $(EXCEPTIONSFILES) \
         $(SLO)$/condedit.obj \
-        $(SLO)$/content.obj \
         $(SLO)$/gloslst.obj \
-        $(SLO)$/glbltree.obj \
         $(SLO)$/initui.obj \
         $(SLO)$/navicfg.obj \
         $(SLO)$/numfmtlb.obj \