Add many more files to EXCEPTIONSFILES, needed at least on NetBSD.

27 files changed, 399 insertions, 558 deletions

diff --git a/sc/source/core/data/makefile.mk b/sc/source/core/data/makefile.mk
index f3b3a357ade3..8ad87c34c1f8 100644
--- a/sc/source/core/data/makefile.mk
+++ b/sc/source/core/data/makefile.mk
@@ -44,35 +44,39 @@ AUTOSEG=true
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
-    $(SLO)$/attarray.obj \
+    $(EXCEPTIONSFILES) \
+    $(EXCEPTIONSNOOPTFILES) \
     $(SLO)$/attrib.obj \
+    $(SLO)$/compressedarray.obj \
+    $(SLO)$/docparam.obj \
+    $(SLO)$/markarr.obj \
+    $(SLO)$/markdata.obj \
+    $(SLO)$/pagepar.obj \
+    $(SLO)$/sheetevents.obj \
+    $(SLO)$/sortparam.obj
+
+EXCEPTIONSFILES= \
+    $(SLO)$/attarray.obj \
     $(SLO)$/autonamecache.obj \
     $(SLO)$/bcaslot.obj \
-    $(SLO)$/cell.obj \
     $(SLO)$/cell2.obj \
-        $(SLO)$/clipparam.obj \
+    $(SLO)$/clipparam.obj \
     $(SLO)$/column.obj \
-    $(SLO)$/column2.obj \
-    $(SLO)$/column3.obj \
-    $(SLO)$/compressedarray.obj \
-    $(SLO)$/conditio.obj \
     $(SLO)$/dbdocutl.obj \
     $(SLO)$/dociter.obj \
     $(SLO)$/docpool.obj \
     $(SLO)$/documen2.obj \
     $(SLO)$/documen3.obj \
-    $(SLO)$/documen4.obj \
     $(SLO)$/documen5.obj \
     $(SLO)$/documen6.obj \
     $(SLO)$/documen7.obj \
     $(SLO)$/documen8.obj \
     $(SLO)$/documen9.obj \
     $(SLO)$/document.obj \
-    $(SLO)$/docparam.obj \
-        $(SLO)$/dpcachetable.obj \
-        $(SLO)$/dpdimsave.obj \
+    $(SLO)$/dpcachetable.obj \
+    $(SLO)$/dpdimsave.obj \
     $(SLO)$/dpglobal.obj \
-        $(SLO)$/dpgroup.obj \
+    $(SLO)$/dpgroup.obj \
     $(SLO)$/dpobject.obj \
     $(SLO)$/dpoutput.obj \
     $(SLO)$/dpoutputgeometry.obj \
@@ -80,97 +84,53 @@ SLOFILES =  \
     $(SLO)$/dpsdbtab.obj \
     $(SLO)$/dpshttab.obj \
     $(SLO)$/dptabdat.obj \
+    $(SLO)$/dptablecache.obj \
     $(SLO)$/dptabres.obj \
     $(SLO)$/dptabsrc.obj \
-    $(SLO)$/dptablecache.obj\
-    $(SLO)$/scdpoutputimpl.obj\
     $(SLO)$/drawpage.obj \
     $(SLO)$/drwlayer.obj \
     $(SLO)$/fillinfo.obj \
     $(SLO)$/global.obj \
     $(SLO)$/global2.obj \
     $(SLO)$/globalx.obj \
-    $(SLO)$/markarr.obj \
-    $(SLO)$/markdata.obj \
     $(SLO)$/olinetab.obj \
-    $(SLO)$/pagepar.obj \
     $(SLO)$/patattr.obj \
     $(SLO)$/pivot2.obj \
     $(SLO)$/poolhelp.obj \
-    $(SLO)$/sheetevents.obj \
+    $(SLO)$/postit.obj \
+    $(SLO)$/scdpoutputimpl.obj \
     $(SLO)$/segmenttree.obj \
-    $(SLO)$/sortparam.obj \
     $(SLO)$/stlpool.obj \
     $(SLO)$/stlsheet.obj \
-        $(SLO)$/tabbgcolor.obj \
+    $(SLO)$/tabbgcolor.obj \
     $(SLO)$/table1.obj \
     $(SLO)$/table2.obj \
-    $(SLO)$/table3.obj \
-    $(SLO)$/table4.obj \
     $(SLO)$/table5.obj \
     $(SLO)$/table6.obj \
     $(SLO)$/tabprotection.obj \
-    $(SLO)$/userdat.obj \
-    $(SLO)$/validat.obj \
-    $(SLO)$/postit.obj
+    $(SLO)$/userdat.obj
 
-EXCEPTIONSFILES= \
-    $(SLO)$/autonamecache.obj \
-    $(SLO)$/bcaslot.obj \
-    $(SLO)$/cell2.obj \
-    $(SLO)$/clipparam.obj \
-    $(SLO)$/column.obj \
+.IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCSPARC"
+EXCEPTIONSNOOPTFILES= \
+    $(SLO)$/cell.obj \
+    $(SLO)$/column2.obj \
     $(SLO)$/column3.obj \
-    $(SLO)$/dociter.obj \
-    $(SLO)$/documen2.obj \
-    $(SLO)$/document.obj \
-    $(SLO)$/dpdimsave.obj \
-    $(SLO)$/dpglobal.obj \
-    $(SLO)$/dpgroup.obj \
-    $(SLO)$/dpshttab.obj \
-    $(SLO)$/dptabres.obj \
-    $(SLO)$/dptabdat.obj \
-    $(SLO)$/global2.obj \
-    $(SLO)$/tabbgcolor.obj \
-    $(SLO)$/table1.obj \
-    $(SLO)$/table2.obj \
+    $(SLO)$/conditio.obj \
+    $(SLO)$/documen4.obj \
     $(SLO)$/table3.obj \
-    $(SLO)$/tabprotection.obj \
-    $(SLO)$/postit.obj \
-    $(SLO)$/documen3.obj \
-    $(SLO)$/documen5.obj \
-    $(SLO)$/documen6.obj \
-    $(SLO)$/documen9.obj \
-    $(SLO)$/dpcachetable.obj \
-    $(SLO)$/dptablecache.obj \
-    $(SLO)$/scdpoutputimpl.obj \
-    $(SLO)$/dpsdbtab.obj \
-    $(SLO)$/dpobject.obj \
-    $(SLO)$/dpoutput.obj \
-    $(SLO)$/dpoutputgeometry.obj \
-    $(SLO)$/dpsave.obj \
-    $(SLO)$/dbdocutl.obj \
-    $(SLO)$/dptabsrc.obj \
-    $(SLO)$/drwlayer.obj \
-    $(SLO)$/globalx.obj \
-    $(SLO)$/segmenttree.obj
+    $(SLO)$/table4.obj \
+    $(SLO)$/validat.obj
 
-.IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCSPARC"
-NOOPTFILES= \
-        $(SLO)$/column2.obj \
-        $(SLO)$/column3.obj \
-        $(SLO)$/table3.obj \
-        $(SLO)$/table4.obj  \
-        $(SLO)$/documen4.obj \
-        $(SLO)$/conditio.obj \
-        $(SLO)$/validat.obj
-EXCEPTIONSNOOPTFILES= \
-        $(SLO)$/cell.obj
 .ELSE
 EXCEPTIONSFILES+= \
     $(SLO)$/cell.obj \
-    $(SLO)$/global.obj \
-    $(SLO)$/table5.obj
+    $(SLO)$/column2.obj \
+    $(SLO)$/column3.obj \
+    $(SLO)$/conditio.obj \
+    $(SLO)$/documen4.obj \
+    $(SLO)$/table3.obj \
+    $(SLO)$/table4.obj \
+    $(SLO)$/validat.obj
 .ENDIF
 
 # --- Tagets -------------------------------------------------------
diff --git a/sc/source/core/tool/makefile.mk b/sc/source/core/tool/makefile.mk
index b1cad5831a28..76f3b2c5a5b6 100644
--- a/sc/source/core/tool/makefile.mk
+++ b/sc/source/core/tool/makefile.mk
@@ -44,9 +44,21 @@ AUTOSEG=true
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/addinhelpid.obj \
+        $(SLO)$/detdata.obj  \
+        $(SLO)$/filtopt.obj \
+        $(SLO)$/hints.obj \
+        $(SLO)$/inputopt.obj \
+        $(SLO)$/navicfg.obj \
+        $(SLO)$/printopt.obj \
+        $(SLO)$/rechead.obj  \
+        $(SLO)$/refdata.obj \
+        $(SLO)$/refreshtimer.obj
+
+EXCEPTIONSFILES= \
         $(SLO)$/addincfg.obj \
         $(SLO)$/addincol.obj \
-        $(SLO)$/addinhelpid.obj \
         $(SLO)$/addinlis.obj \
         $(SLO)$/address.obj \
         $(SLO)$/adiasync.obj \
@@ -55,11 +67,11 @@ SLOFILES =  \
         $(SLO)$/callform.obj \
         $(SLO)$/cellform.obj \
         $(SLO)$/cellkeytranslator.obj \
-        $(SLO)$/charthelper.obj \
         $(SLO)$/chartarr.obj \
-        $(SLO)$/chartpos.obj \
+        $(SLO)$/charthelper.obj \
         $(SLO)$/chartlis.obj \
         $(SLO)$/chartlock.obj \
+        $(SLO)$/chartpos.obj \
         $(SLO)$/chgtrack.obj \
         $(SLO)$/chgviset.obj \
         $(SLO)$/collect.obj  \
@@ -67,15 +79,11 @@ SLOFILES =  \
         $(SLO)$/consoli.obj  \
         $(SLO)$/dbcolect.obj \
         $(SLO)$/ddelink.obj \
-        $(SLO)$/detdata.obj  \
-        $(SLO)$/detfunc.obj  \
+        $(SLO)$/detfunc.obj \
         $(SLO)$/docoptio.obj \
         $(SLO)$/doubleref.obj \
         $(SLO)$/editutil.obj \
-        $(SLO)$/filtopt.obj \
         $(SLO)$/formulaparserpool.obj \
-        $(SLO)$/hints.obj \
-        $(SLO)$/inputopt.obj \
         $(SLO)$/interpr1.obj \
         $(SLO)$/interpr2.obj \
         $(SLO)$/interpr3.obj \
@@ -83,11 +91,9 @@ SLOFILES =  \
         $(SLO)$/interpr5.obj \
         $(SLO)$/interpr6.obj \
         $(SLO)$/lookupcache.obj \
-        $(SLO)$/navicfg.obj \
         $(SLO)$/odffmap.obj \
         $(SLO)$/optutil.obj \
         $(SLO)$/parclass.obj \
-        $(SLO)$/printopt.obj \
         $(SLO)$/prnsave.obj \
         $(SLO)$/progress.obj \
         $(SLO)$/queryparam.obj \
@@ -95,10 +101,7 @@ SLOFILES =  \
         $(SLO)$/rangenam.obj \
         $(SLO)$/rangeseq.obj \
         $(SLO)$/rangeutl.obj \
-        $(SLO)$/rechead.obj  \
-        $(SLO)$/refdata.obj \
         $(SLO)$/reffind.obj \
-        $(SLO)$/refreshtimer.obj \
         $(SLO)$/reftokenhelper.obj \
         $(SLO)$/refupdat.obj \
         $(SLO)$/scmatrix.obj \
@@ -111,31 +114,6 @@ SLOFILES =  \
         $(SLO)$/viewopti.obj \
         $(SLO)$/zforauto.obj
 
-EXCEPTIONSFILES= \
-        $(SLO)$/addincol.obj \
-        $(SLO)$/cellkeytranslator.obj \
-        $(SLO)$/charthelper.obj \
-        $(SLO)$/chartarr.obj \
-        $(SLO)$/chartlis.obj \
-        $(SLO)$/chartlock.obj \
-        $(SLO)$/chgtrack.obj \
-        $(SLO)$/compiler.obj \
-        $(SLO)$/detfunc.obj \
-        $(SLO)$/doubleref.obj \
-        $(SLO)$/formulaparserpool.obj \
-        $(SLO)$/interpr1.obj \
-        $(SLO)$/interpr2.obj \
-        $(SLO)$/interpr3.obj \
-        $(SLO)$/interpr4.obj \
-        $(SLO)$/interpr5.obj \
-        $(SLO)$/lookupcache.obj \
-        $(SLO)$/prnsave.obj \
-        $(SLO)$/queryparam.obj \
-        $(SLO)$/reftokenhelper.obj \
-        $(SLO)$/simplerangelist.obj \
-        $(SLO)$/stringutil.obj \
-        $(SLO)$/token.obj
-
 # [kh] POWERPC compiler problem
 .IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCPOWERPC"
 NOOPTFILES= \
diff --git a/sc/source/filter/dif/makefile.mk b/sc/source/filter/dif/makefile.mk
index 70944b9f9536..495a7ab5edf3 100644
--- a/sc/source/filter/dif/makefile.mk
+++ b/sc/source/filter/dif/makefile.mk
@@ -42,10 +42,14 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =					\
+SLOFILES = \
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
         $(SLO)$/difimp.obj	\
         $(SLO)$/difexp.obj
 
+
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sc/source/filter/excel/makefile.mk b/sc/source/filter/excel/makefile.mk
index c9618737a516..029a9a96c374 100644
--- a/sc/source/filter/excel/makefile.mk
+++ b/sc/source/filter/excel/makefile.mk
@@ -45,63 +45,8 @@ VISIBILITY_HIDDEN=TRUE
 # --- Files --------------------------------------------------------
 
 SLOFILES =	\
-        $(SLO)$/colrowst.obj				\
-        $(SLO)$/excdoc.obj					\
-        $(SLO)$/excel.obj					\
-        $(SLO)$/excform.obj					\
-        $(SLO)$/excform8.obj				\
-        $(SLO)$/excimp8.obj					\
-        $(SLO)$/excrecds.obj				\
-        $(SLO)$/exctools.obj				\
-        $(SLO)$/expop2.obj					\
-        $(SLO)$/fontbuff.obj				\
-        $(SLO)$/frmbase.obj					\
-        $(SLO)$/impop.obj					\
-        $(SLO)$/namebuff.obj				\
-        $(SLO)$/read.obj					\
-        $(SLO)$/tokstack.obj				\
-        $(SLO)$/xechart.obj					\
-        $(SLO)$/xecontent.obj				\
-        $(SLO)$/xeescher.obj				\
-        $(SLO)$/xeformula.obj				\
-        $(SLO)$/xehelper.obj				\
-        $(SLO)$/xelink.obj					\
-        $(SLO)$/xename.obj					\
-        $(SLO)$/xepage.obj					\
-        $(SLO)$/xepivot.obj					\
-        $(SLO)$/xerecord.obj				\
-        $(SLO)$/xeroot.obj					\
-        $(SLO)$/xestream.obj				\
-        $(SLO)$/xestring.obj				\
-        $(SLO)$/xestyle.obj					\
-        $(SLO)$/xetable.obj					\
-        $(SLO)$/xeview.obj					\
-        $(SLO)$/xichart.obj					\
-        $(SLO)$/xicontent.obj				\
-        $(SLO)$/xiescher.obj				\
-        $(SLO)$/xiformula.obj				\
-        $(SLO)$/xihelper.obj				\
-        $(SLO)$/xilink.obj					\
-        $(SLO)$/xiname.obj					\
-        $(SLO)$/xipage.obj					\
-        $(SLO)$/xipivot.obj					\
-        $(SLO)$/xiroot.obj					\
-        $(SLO)$/xistream.obj				\
-        $(SLO)$/xistring.obj				\
-        $(SLO)$/xistyle.obj					\
-        $(SLO)$/xiview.obj					\
-        $(SLO)$/xladdress.obj				\
-        $(SLO)$/xlchart.obj					\
-        $(SLO)$/xlescher.obj				\
-        $(SLO)$/xlformula.obj				\
-        $(SLO)$/xlpage.obj					\
-        $(SLO)$/xlpivot.obj					\
-        $(SLO)$/xlroot.obj					\
-        $(SLO)$/xlstyle.obj					\
-        $(SLO)$/xltools.obj					\
-        $(SLO)$/xltracer.obj				\
-        $(SLO)$/xlview.obj \
-        $(SLO)$/xltoolbar.obj \
+        $(EXCEPTIONSFILES)				\
+        $(SLO)$/xltracer.obj
 
 .IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCSPARC"
 NOOPTFILES = \
@@ -109,49 +54,61 @@ NOOPTFILES = \
 .ENDIF
 
 EXCEPTIONSFILES = \
-        $(SLO)$/excdoc.obj					\
-        $(SLO)$/excel.obj					\
-        $(SLO)$/excform.obj					\
+        $(SLO)$/colrowst.obj				\
+        $(SLO)$/excdoc.obj				\
+        $(SLO)$/excel.obj				\
+        $(SLO)$/excform.obj				\
         $(SLO)$/excform8.obj				\
-        $(SLO)$/excimp8.obj					\
+        $(SLO)$/excimp8.obj				\
         $(SLO)$/excrecds.obj				\
-        $(SLO)$/expop2.obj					\
-        $(SLO)$/impop.obj					\
+        $(SLO)$/exctools.obj				\
+        $(SLO)$/expop2.obj				\
+        $(SLO)$/fontbuff.obj				\
+        $(SLO)$/frmbase.obj				\
+        $(SLO)$/impop.obj				\
         $(SLO)$/namebuff.obj				\
+        $(SLO)$/read.obj				\
         $(SLO)$/tokstack.obj				\
+        $(SLO)$/xechart.obj				\
         $(SLO)$/xecontent.obj				\
         $(SLO)$/xeescher.obj				\
         $(SLO)$/xeformula.obj				\
         $(SLO)$/xehelper.obj				\
-        $(SLO)$/xelink.obj					\
-        $(SLO)$/xename.obj					\
-        $(SLO)$/xepage.obj					\
-        $(SLO)$/xepivot.obj					\
-        $(SLO)$/xechart.obj					\
+        $(SLO)$/xelink.obj				\
+        $(SLO)$/xename.obj				\
+        $(SLO)$/xepage.obj				\
+        $(SLO)$/xepivot.obj				\
+        $(SLO)$/xerecord.obj				\
+        $(SLO)$/xeroot.obj				\
         $(SLO)$/xestream.obj				\
         $(SLO)$/xestring.obj				\
-        $(SLO)$/xestyle.obj					\
-        $(SLO)$/xetable.obj					\
-        $(SLO)$/xeview.obj					\
-        $(SLO)$/xichart.obj					\
+        $(SLO)$/xestyle.obj				\
+        $(SLO)$/xetable.obj				\
+        $(SLO)$/xeview.obj				\
+        $(SLO)$/xichart.obj				\
         $(SLO)$/xicontent.obj				\
         $(SLO)$/xiescher.obj				\
+        $(SLO)$/xiformula.obj				\
         $(SLO)$/xihelper.obj				\
-        $(SLO)$/xilink.obj					\
-        $(SLO)$/xipage.obj					\
-        $(SLO)$/xipivot.obj					\
+        $(SLO)$/xilink.obj				\
+        $(SLO)$/xiname.obj				\
+        $(SLO)$/xipage.obj				\
+        $(SLO)$/xipivot.obj				\
+        $(SLO)$/xiroot.obj				\
         $(SLO)$/xistream.obj				\
         $(SLO)$/xistring.obj				\
-        $(SLO)$/xistyle.obj					\
+        $(SLO)$/xistyle.obj				\
+        $(SLO)$/xiview.obj				\
         $(SLO)$/xladdress.obj				\
-        $(SLO)$/xiescher.obj				\
-        $(SLO)$/xlchart.obj					\
+        $(SLO)$/xlchart.obj				\
+        $(SLO)$/xlescher.obj				\
         $(SLO)$/xlformula.obj				\
-        $(SLO)$/xlpivot.obj					\
-        $(SLO)$/xlroot.obj					\
-        $(SLO)$/xlstyle.obj					\
-        $(SLO)$/xltoolbar.obj \
-        $(SLO)$/xltools.obj					\
+        $(SLO)$/xlpage.obj				\
+        $(SLO)$/xlpivot.obj				\
+        $(SLO)$/xlroot.obj				\
+        $(SLO)$/xlstyle.obj				\
+        $(SLO)$/xltoolbar.obj				\
+        $(SLO)$/xltools.obj				\
         $(SLO)$/xlview.obj
 
 # --- Targets -------------------------------------------------------
diff --git a/sc/source/filter/ftools/makefile.mk b/sc/source/filter/ftools/makefile.mk
index d37e74a133a0..ba5407afaaf7 100644
--- a/sc/source/filter/ftools/makefile.mk
+++ b/sc/source/filter/ftools/makefile.mk
@@ -43,12 +43,12 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 # --- Files --------------------------------------------------------
 
 SLOFILES =	\
-        $(SLO)$/fapihelper.obj				\
-        $(SLO)$/fprogressbar.obj			\
-        $(SLO)$/ftools.obj
+        $(EXCEPTIONSFILES)				\
+        $(SLO)$/fprogressbar.obj
 
 EXCEPTIONSFILES = \
-        $(SLO)$/fapihelper.obj
+        $(SLO)$/fapihelper.obj				\
+        $(SLO)$/ftools.obj
 
 # --- Targets -------------------------------------------------------
 
diff --git a/sc/source/filter/html/makefile.mk b/sc/source/filter/html/makefile.mk
index 41db4de9780f..cb6312b3601d 100644
--- a/sc/source/filter/html/makefile.mk
+++ b/sc/source/filter/html/makefile.mk
@@ -44,14 +44,13 @@ VISIBILITY_HIDDEN=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =						\
-        $(SLO)$/htmlexp.obj		\
-        $(SLO)$/htmlexp2.obj	\
-        $(SLO)$/htmlimp.obj		\
-        $(SLO)$/htmlpars.obj
+SLOFILES =				\
+        $(EXCEPTIONSFILES)
 
-EXCEPTIONSFILES =				\
+EXCEPTIONSFILES =			\
         $(SLO)$/htmlexp.obj		\
+        $(SLO)$/htmlexp2.obj		\
+        $(SLO)$/htmlimp.obj		\
         $(SLO)$/htmlpars.obj
 
 # --- Targets -------------------------------------------------------
diff --git a/sc/source/filter/lotus/makefile.mk b/sc/source/filter/lotus/makefile.mk
index e4d18f8f9a7d..1da481836c8e 100644
--- a/sc/source/filter/lotus/makefile.mk
+++ b/sc/source/filter/lotus/makefile.mk
@@ -44,22 +44,22 @@ VISIBILITY_HIDDEN=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =						\
+SLOFILES =				\
+        $(EXCEPTIONSFILES)		\
+        $(SLO)$/export.obj		\
+        $(SLO)$/optab.obj
+
+EXCEPTIONSFILES =			\
+        $(SLO)$/expop.obj		\
         $(SLO)$/filter.obj		\
-        $(SLO)$/lotus.obj		\
-        $(SLO)$/lotimpop.obj	\
-        $(SLO)$/lotread.obj		\
+        $(SLO)$/lotattr.obj		\
         $(SLO)$/lotform.obj		\
+        $(SLO)$/lotimpop.obj		\
+        $(SLO)$/lotread.obj		\
+        $(SLO)$/lotus.obj		\
         $(SLO)$/memory.obj		\
         $(SLO)$/op.obj			\
-        $(SLO)$/optab.obj		\
-        $(SLO)$/tool.obj		\
-        $(SLO)$/expop.obj		\
-        $(SLO)$/export.obj		\
-        $(SLO)$/lotattr.obj
-
-EXCEPTIONSFILES =				\
-        $(SLO)$/op.obj
+        $(SLO)$/tool.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sc/source/filter/qpro/makefile.mk b/sc/source/filter/qpro/makefile.mk
index 7406f05e3308..f5e66ea0e514 100644
--- a/sc/source/filter/qpro/makefile.mk
+++ b/sc/source/filter/qpro/makefile.mk
@@ -43,11 +43,14 @@ AUTOSEG=true
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =						\
-        $(SLO)$/qpro.obj		\
+SLOFILES =			\
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
+        $(SLO)$/biff.obj	\
+        $(SLO)$/qpro.obj	\
         $(SLO)$/qproform.obj    \
-        $(SLO)$/qprostyle.obj	\
-        $(SLO)$/biff.obj
+        $(SLO)$/qprostyle.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sc/source/filter/rtf/makefile.mk b/sc/source/filter/rtf/makefile.mk
index 651309fb454d..3aa6dbe8ad8d 100644
--- a/sc/source/filter/rtf/makefile.mk
+++ b/sc/source/filter/rtf/makefile.mk
@@ -44,8 +44,11 @@ VISIBILITY_HIDDEN=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =						\
-        $(SLO)$/eeimpars.obj	\
+SLOFILES =				\
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
+        $(SLO)$/eeimpars.obj		\
         $(SLO)$/expbase.obj		\
         $(SLO)$/rtfexp.obj		\
         $(SLO)$/rtfimp.obj		\
diff --git a/sc/source/filter/starcalc/makefile.mk b/sc/source/filter/starcalc/makefile.mk
index 157059d433ec..a9c06eb14a4d 100644
--- a/sc/source/filter/starcalc/makefile.mk
+++ b/sc/source/filter/starcalc/makefile.mk
@@ -44,8 +44,11 @@ VISIBILITY_HIDDEN=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =						\
-        $(SLO)$/scflt.obj		\
+SLOFILES =			\
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
+        $(SLO)$/scflt.obj	\
         $(SLO)$/scfobj.obj
 
 # --- Tagets -------------------------------------------------------
diff --git a/sc/source/filter/xcl97/makefile.mk b/sc/source/filter/xcl97/makefile.mk
index 04a028e04af3..0ce4670875b2 100644
--- a/sc/source/filter/xcl97/makefile.mk
+++ b/sc/source/filter/xcl97/makefile.mk
@@ -44,14 +44,13 @@ VISIBILITY_HIDDEN=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =									\
-        $(SLO)$/xcl97esc.obj				\
-        $(SLO)$/xcl97rec.obj				\
-        $(SLO)$/XclImpChangeTrack.obj		\
-        $(SLO)$/XclExpChangeTrack.obj
+SLOFILES =					\
+        $(EXCEPTIONSFILES)
 
-EXCEPTIONSFILES =							\
-        $(SLO)$/xcl97esc.obj				\
+EXCEPTIONSFILES =				\
+        $(SLO)$/XclImpChangeTrack.obj		\
+        $(SLO)$/XclExpChangeTrack.obj		\
+        $(SLO)$/xcl97esc.obj			\
         $(SLO)$/xcl97rec.obj
 
 # --- Targets -------------------------------------------------------
diff --git a/sc/source/ui/Accessibility/makefile.mk b/sc/source/ui/Accessibility/makefile.mk
index f041ca095bdd..49f3fb1fb39c 100644
--- a/sc/source/ui/Accessibility/makefile.mk
+++ b/sc/source/ui/Accessibility/makefile.mk
@@ -37,53 +37,33 @@ TARGET=accessibility
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =  										\
+SLOFILES =  							\
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES=						\
+        $(SLO)$/AccessibleCell.obj				\
+        $(SLO)$/AccessibleCellBase.obj				\
         $(SLO)$/AccessibleContextBase.obj			\
-        $(SLO)$/AccessibleTableBase.obj				\
+        $(SLO)$/AccessibleCsvControl.obj			\
+        $(SLO)$/AccessibleDataPilotControl.obj			\
         $(SLO)$/AccessibleDocument.obj				\
-        $(SLO)$/AccessibleGlobal.obj				\
-        $(SLO)$/AccessibleSpreadsheet.obj			\
-        $(SLO)$/AccessibleCell.obj					\
-        $(SLO)$/AccessibilityHints.obj				\
         $(SLO)$/AccessibleDocumentBase.obj			\
-        $(SLO)$/AccessibleCellBase.obj				\
-        $(SLO)$/AccessibleDocumentPagePreview.obj	\
-        $(SLO)$/AccessibleFilterMenu.obj	\
-        $(SLO)$/AccessibleFilterMenuItem.obj	\
-        $(SLO)$/AccessibleFilterTopWindow.obj	\
-        $(SLO)$/AccessiblePreviewTable.obj			\
-        $(SLO)$/AccessiblePreviewCell.obj			\
-        $(SLO)$/AccessiblePreviewHeaderCell.obj		\
-        $(SLO)$/AccessiblePageHeader.obj			\
-        $(SLO)$/AccessibleText.obj					\
-        $(SLO)$/AccessiblePageHeaderArea.obj		\
-        $(SLO)$/DrawModelBroadcaster.obj			\
+        $(SLO)$/AccessibleDocumentPagePreview.obj		\
         $(SLO)$/AccessibleEditObject.obj			\
-        $(SLO)$/AccessibleDataPilotControl.obj		\
-        $(SLO)$/AccessibleCsvControl.obj
-
-EXCEPTIONSFILES=									\
-        $(SLO)$/AccessibleContextBase.obj			\
-        $(SLO)$/AccessibleTableBase.obj				\
-        $(SLO)$/AccessibleDocument.obj				\
+        $(SLO)$/AccessibleFilterMenu.obj			\
+        $(SLO)$/AccessibleFilterMenuItem.obj			\
+        $(SLO)$/AccessibleFilterTopWindow.obj			\
         $(SLO)$/AccessibleGlobal.obj				\
-        $(SLO)$/AccessibleSpreadsheet.obj			\
-        $(SLO)$/AccessibleCell.obj					\
-        $(SLO)$/AccessibleDocumentBase.obj			\
-        $(SLO)$/AccessibleCellBase.obj				\
-        $(SLO)$/AccessibleDocumentPagePreview.obj	\
-        $(SLO)$/AccessibleFilterMenu.obj	\
-        $(SLO)$/AccessibleFilterMenuItem.obj	\
-        $(SLO)$/AccessibleFilterTopWindow.obj	\
-        $(SLO)$/AccessiblePreviewTable.obj			\
-        $(SLO)$/AccessiblePreviewCell.obj			\
-        $(SLO)$/AccessiblePreviewHeaderCell.obj		\
+        $(SLO)$/AccessibilityHints.obj				\
         $(SLO)$/AccessiblePageHeader.obj			\
-        $(SLO)$/AccessiblePageHeaderArea.obj		\
+        $(SLO)$/AccessiblePageHeaderArea.obj			\
+        $(SLO)$/AccessiblePreviewCell.obj			\
+        $(SLO)$/AccessiblePreviewHeaderCell.obj			\
+        $(SLO)$/AccessiblePreviewTable.obj			\
+        $(SLO)$/AccessibleSpreadsheet.obj			\
+        $(SLO)$/AccessibleTableBase.obj				\
+        $(SLO)$/AccessibleText.obj				\
         $(SLO)$/DrawModelBroadcaster.obj			\
-        $(SLO)$/AccessibleEditObject.obj			\
-        $(SLO)$/AccessibleDataPilotControl.obj		\
-        $(SLO)$/AccessibleCsvControl.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sc/source/ui/app/makefile.mk b/sc/source/ui/app/makefile.mk
index 9d487ba207fc..95b36b1e7323 100644
--- a/sc/source/ui/app/makefile.mk
+++ b/sc/source/ui/app/makefile.mk
@@ -38,29 +38,23 @@ TARGET=app
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
-    $(SLO)$/scmod.obj  \
-    $(SLO)$/scmod2.obj  \
-    $(SLO)$/scdll.obj  \
-    $(SLO)$/typemap.obj  \
-    $(SLO)$/transobj.obj \
-    $(SLO)$/drwtrans.obj \
-    $(SLO)$/lnktrans.obj \
-    $(SLO)$/seltrans.obj \
-    $(SLO)$/inputhdl.obj \
-    $(SLO)$/inputwin.obj \
-    $(SLO)$/rfindlst.obj \
-    $(SLO)$/uiitems.obj  \
+    $(EXCEPTIONSFILES) \
     $(SLO)$/msgpool.obj \
-    $(SLO)$/client.obj
+    $(SLO)$/rfindlst.obj \
+    $(SLO)$/uiitems.obj
 
 EXCEPTIONSFILES= \
+    $(SLO)$/client.obj \
     $(SLO)$/drwtrans.obj \
-    $(SLO)$/scdll.obj  \
-    $(SLO)$/scmod2.obj \
+    $(SLO)$/inputhdl.obj \
+    $(SLO)$/inputwin.obj \
+    $(SLO)$/lnktrans.obj \
+    $(SLO)$/scdll.obj \
     $(SLO)$/scmod.obj \
-    $(SLO)$/typemap.obj  \
-    $(SLO)$/client.obj \
-    $(SLO)$/inputwin.obj
+    $(SLO)$/scmod2.obj \
+    $(SLO)$/seltrans.obj \
+    $(SLO)$/typemap.obj \
+    $(SLO)$/transobj.obj
 
 #LIB3TARGET=$(SLB)$/ysclib.lib
 #LIB3OBJFILES=$(SLO)$/sclib.obj
diff --git a/sc/source/ui/attrdlg/makefile.mk b/sc/source/ui/attrdlg/makefile.mk
index 9b4dc49dec57..a979840b6063 100644
--- a/sc/source/ui/attrdlg/makefile.mk
+++ b/sc/source/ui/attrdlg/makefile.mk
@@ -42,12 +42,16 @@ CXXFILES =  attrdlg.cxx		\
             tabpages.cxx	\
             condfrmt.cxx
 
-SLOFILES =  $(SLO)$/attrdlg.obj	\
-            $(SLO)$/tabpages.obj	\
+SLOFILES = \
+            $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
+            $(SLO)$/attrdlg.obj		\
             $(SLO)$/condfrmt.obj	\
             $(SLO)$/scabstdlg.obj	\
-        $(SLO)$/scuiexp.obj		\
-        $(SLO)$/scdlgfact.obj
+            $(SLO)$/scdlgfact.obj	\
+            $(SLO)$/scuiexp.obj		\
+            $(SLO)$/tabpages.obj
 
 LIB1TARGET = $(SLB)$/$(TARGET).lib
 
diff --git a/sc/source/ui/cctrl/makefile.mk b/sc/source/ui/cctrl/makefile.mk
index 70b5490a9626..41598f7901c1 100644
--- a/sc/source/ui/cctrl/makefile.mk
+++ b/sc/source/ui/cctrl/makefile.mk
@@ -39,16 +39,15 @@ LIBTARGET=NO
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES= \
-    $(SLO)$/tbinsert.obj	\
-    $(SLO)$/tbzoomsliderctrl.obj \
-    $(SLO)$/dpcontrol.obj
+        $(SLO)$/cbuttonw.obj		\
+        $(SLO)$/dpcontrol.obj		\
+        $(SLO)$/editfield.obj		\
+        $(SLO)$/tbinsert.obj		\
+        $(SLO)$/tbzoomsliderctrl.obj
 
 SLOFILES =	\
+        $(SLO)$/dpcontrol.obj		\
         $(SLO)$/popmenu.obj		\
-        $(SLO)$/tbinsert.obj	\
-        $(SLO)$/cbuttonw.obj	\
-        $(SLO)$/dpcontrol.obj	\
-        $(SLO)$/editfield.obj	\
         $(EXCEPTIONSFILES)
 
 SRS1NAME=$(TARGET)
diff --git a/sc/source/ui/dbgui/makefile.mk b/sc/source/ui/dbgui/makefile.mk
index ab632bf1b1e7..33b8cdbfca7a 100644
--- a/sc/source/ui/dbgui/makefile.mk
+++ b/sc/source/ui/dbgui/makefile.mk
@@ -39,45 +39,37 @@ LIBTARGET=no
 # --- Files --------------------------------------------------------
 
 SLOFILES =	\
-    $(SLO)$/sortdlg.obj		\
-    $(SLO)$/tpsort.obj		\
-    $(SLO)$/filtdlg.obj		\
-    $(SLO)$/sfiltdlg.obj	\
-    $(SLO)$/foptmgr.obj		\
-    $(SLO)$/pfiltdlg.obj	\
-    $(SLO)$/dbnamdlg.obj	\
-    $(SLO)$/expftext.obj	\
-    $(SLO)$/textimportoptions.obj \
-    $(SLO)$/subtdlg.obj		\
-    $(SLO)$/tpsubt.obj		\
-    $(SLO)$/fieldwnd.obj	\
-    $(SLO)$/pvlaydlg.obj	\
-    $(SLO)$/pvfundlg.obj	\
-    $(SLO)$/dpgroupdlg.obj	\
-    $(SLO)$/dapitype.obj	\
-    $(SLO)$/dapidata.obj	\
+    $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES= \
+    $(SLO)$/asciiopt.obj	\
     $(SLO)$/consdlg.obj		\
-    $(SLO)$/scendlg.obj		\
-    $(SLO)$/imoptdlg.obj	\
-    $(SLO)$/validate.obj	\
-    $(SLO)$/csvsplits.obj	\
     $(SLO)$/csvcontrol.obj	\
-    $(SLO)$/csvruler.obj	\
     $(SLO)$/csvgrid.obj		\
+    $(SLO)$/csvruler.obj	\
+    $(SLO)$/csvsplits.obj	\
     $(SLO)$/csvtablebox.obj	\
-    $(SLO)$/asciiopt.obj	\
-    $(SLO)$/scuiasciiopt.obj	\
-     $(SLO)$/scuiimoptdlg.obj
-
-EXCEPTIONSFILES= \
-    $(SLO)$/csvgrid.obj \
-    $(SLO)$/csvruler.obj \
-    $(SLO)$/csvsplits.obj \
-    $(SLO)$/csvtablebox.obj \
-    $(SLO)$/fieldwnd.obj \
+    $(SLO)$/dapidata.obj	\
+    $(SLO)$/dapitype.obj	\
+    $(SLO)$/dbnamdlg.obj	\
+    $(SLO)$/dpgroupdlg.obj	\
+    $(SLO)$/expftext.obj	\
+    $(SLO)$/fieldwnd.obj	\
+    $(SLO)$/filtdlg.obj		\
+    $(SLO)$/foptmgr.obj		\
+    $(SLO)$/imoptdlg.obj	\
+    $(SLO)$/pfiltdlg.obj	\
     $(SLO)$/pvfundlg.obj	\
     $(SLO)$/pvlaydlg.obj	\
-    $(SLO)$/dapidata.obj	\
+    $(SLO)$/scendlg.obj		\
+    $(SLO)$/scuiasciiopt.obj	\
+    $(SLO)$/scuiimoptdlg.obj	\
+    $(SLO)$/sfiltdlg.obj	\
+    $(SLO)$/sortdlg.obj		\
+    $(SLO)$/subtdlg.obj		\
+    $(SLO)$/textimportoptions.obj \
+    $(SLO)$/tpsort.obj		\
+    $(SLO)$/tpsubt.obj		\
     $(SLO)$/validate.obj
 
 SRS1NAME=$(TARGET)
diff --git a/sc/source/ui/docshell/makefile.mk b/sc/source/ui/docshell/makefile.mk
index 6776a0b7efdd..6736362d9565 100644
--- a/sc/source/ui/docshell/makefile.mk
+++ b/sc/source/ui/docshell/makefile.mk
@@ -66,43 +66,35 @@ CXXFILES = \
 
 
 SLOFILES =  \
-        $(SLO)$/docsh.obj	\
-        $(SLO)$/docsh2.obj	\
-        $(SLO)$/docsh3.obj	\
-        $(SLO)$/docsh4.obj   	\
-        $(SLO)$/docsh5.obj   	\
-        $(SLO)$/docsh6.obj   	\
-        $(SLO)$/docsh7.obj   	\
-        $(SLO)$/docsh8.obj   	\
-        $(SLO)$/externalrefmgr.obj \
-        $(SLO)$/tablink.obj   	\
-        $(SLO)$/arealink.obj   	\
-        $(SLO)$/dbdocfun.obj 	\
-        $(SLO)$/dbdocimp.obj 	\
-        $(SLO)$/impex.obj	\
-        $(SLO)$/docfunc.obj	\
-        $(SLO)$/olinefun.obj	\
-        $(SLO)$/servobj.obj	\
-        $(SLO)$/tpstat.obj	\
-        $(SLO)$/autostyl.obj	\
-        $(SLO)$/pagedata.obj \
+        $(EXCEPTIONSFILES) \
         $(SLO)$/hiranges.obj \
-        $(SLO)$/pntlock.obj \
-        $(SLO)$/sizedev.obj \
-        $(SLO)$/editable.obj \
-    $(SLO)$/macromgr.obj
+        $(SLO)$/pagedata.obj \
+        $(SLO)$/pntlock.obj
 
 
 EXCEPTIONSFILES= \
+        $(SLO)$/arealink.obj \
+        $(SLO)$/autostyl.obj \
+        $(SLO)$/dbdocfun.obj \
+        $(SLO)$/dbdocimp.obj \
+        $(SLO)$/docfunc.obj \
         $(SLO)$/docsh.obj \
-        $(SLO)$/docsh3.obj	\
+        $(SLO)$/docsh2.obj \
+        $(SLO)$/docsh3.obj \
         $(SLO)$/docsh4.obj \
+        $(SLO)$/docsh5.obj \
         $(SLO)$/docsh6.obj \
+        $(SLO)$/docsh7.obj \
         $(SLO)$/docsh8.obj \
+        $(SLO)$/editable.obj \
         $(SLO)$/externalrefmgr.obj \
-        $(SLO)$/dbdocimp.obj \
-        $(SLO)$/docfunc.obj \
-    $(SLO)$/macromgr.obj
+        $(SLO)$/impex.obj \
+        $(SLO)$/macromgr.obj \
+        $(SLO)$/olinefun.obj \
+        $(SLO)$/servobj.obj \
+        $(SLO)$/sizedev.obj \
+        $(SLO)$/tablink.obj \
+        $(SLO)$/tpstat.obj
 
 SRS1NAME=$(TARGET)
 SRC1FILES =  tpstat.src
@@ -133,7 +125,7 @@ LIB1OBJFILES =  \
         $(SLO)$/pntlock.obj \
         $(SLO)$/sizedev.obj \
         $(SLO)$/editable.obj \
-    $(SLO)$/macromgr.obj
+        $(SLO)$/macromgr.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sc/source/ui/drawfunc/makefile.mk b/sc/source/ui/drawfunc/makefile.mk
index cf69944d3a1a..41aa76331df5 100644
--- a/sc/source/ui/drawfunc/makefile.mk
+++ b/sc/source/ui/drawfunc/makefile.mk
@@ -43,40 +43,37 @@ SRC1FILES =  \
         drformsh.src
 
 SLOFILES =  \
-        $(SLO)$/fupoor.obj \
-        $(SLO)$/fumark.obj \
-        $(SLO)$/fudraw.obj \
-        $(SLO)$/fusel.obj \
-        $(SLO)$/fusel2.obj \
-        $(SLO)$/fuconstr.obj \
-        $(SLO)$/fuconrec.obj \
-        $(SLO)$/fuconarc.obj \
-        $(SLO)$/fuconuno.obj \
-        $(SLO)$/fuconpol.obj \
-        $(SLO)$/fuconcustomshape.obj \
-        $(SLO)$/fuins1.obj \
-        $(SLO)$/fuins2.obj \
-        $(SLO)$/futext.obj \
-        $(SLO)$/futext2.obj \
-        $(SLO)$/futext3.obj \
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES= \
+        $(SLO)$/chartsh.obj \
         $(SLO)$/drawsh.obj \
         $(SLO)$/drawsh2.obj \
         $(SLO)$/drawsh4.obj \
         $(SLO)$/drawsh5.obj \
+        $(SLO)$/drformsh.obj \
         $(SLO)$/drtxtob.obj \
         $(SLO)$/drtxtob1.obj \
         $(SLO)$/drtxtob2.obj \
-        $(SLO)$/drformsh.obj \
-        $(SLO)$/oleobjsh.obj \
-        $(SLO)$/chartsh.obj  \
-        $(SLO)$/graphsh.obj	\
-        $(SLO)$/mediash.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/fusel.obj \
+        $(SLO)$/fuconarc.obj \
+        $(SLO)$/fuconcustomshape.obj \
+        $(SLO)$/fuconpol.obj \
+        $(SLO)$/fuconrec.obj \
+        $(SLO)$/fuconstr.obj \
+        $(SLO)$/fuconuno.obj \
+        $(SLO)$/fudraw.obj \
+        $(SLO)$/fuins1.obj \
         $(SLO)$/fuins2.obj \
-        $(SLO)$/graphsh.obj	\
-        $(SLO)$/mediash.obj
+        $(SLO)$/fumark.obj \
+        $(SLO)$/fupoor.obj \
+        $(SLO)$/fusel.obj \
+        $(SLO)$/fusel2.obj \
+        $(SLO)$/futext.obj \
+        $(SLO)$/futext2.obj \
+        $(SLO)$/futext3.obj \
+        $(SLO)$/graphsh.obj \
+        $(SLO)$/mediash.obj \
+        $(SLO)$/oleobjsh.obj
 
 NOOPTFILES=\
     $(SLO)$/fusel.obj
diff --git a/sc/source/ui/formdlg/makefile.mk b/sc/source/ui/formdlg/makefile.mk
index 2574ca48f348..4440abaf314d 100644
--- a/sc/source/ui/formdlg/makefile.mk
+++ b/sc/source/ui/formdlg/makefile.mk
@@ -38,10 +38,13 @@ TARGET=formdlgs
 # --- Files --------------------------------------------------------
 
 SLOFILES =	\
-        $(SLO)$/formula.obj  \
-        $(SLO)$/formdata.obj  \
-        $(SLO)$/privsplt.obj	\
-        $(SLO)$/dwfunctr.obj
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/formdata.obj
+
+EXCEPTIONSFILES = \
+        $(SLO)$/dwfunctr.obj \
+        $(SLO)$/formula.obj \
+        $(SLO)$/privsplt.obj
 
 SRS1NAME=$(TARGET)
 SRC1FILES =	\
diff --git a/sc/source/ui/miscdlgs/makefile.mk b/sc/source/ui/miscdlgs/makefile.mk
index 115fc3aebe57..403c98237f81 100644
--- a/sc/source/ui/miscdlgs/makefile.mk
+++ b/sc/source/ui/miscdlgs/makefile.mk
@@ -39,54 +39,46 @@ LIBTARGET=no
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
+    $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
+    $(SLO)$/acredlin.obj		\
+    $(SLO)$/anyrefdg.obj		\
+    $(SLO)$/autofmt.obj			\
+    $(SLO)$/conflictsdlg.obj		\
+    $(SLO)$/crdlg.obj			\
+    $(SLO)$/crnrdlg.obj			\
     $(SLO)$/datafdlg.obj		\
     $(SLO)$/delcldlg.obj		\
-    $(SLO)$/inscldlg.obj		\
     $(SLO)$/delcodlg.obj		\
+    $(SLO)$/filldlg.obj			\
+    $(SLO)$/groupdlg.obj		\
+    $(SLO)$/highred.obj			\
+    $(SLO)$/inscldlg.obj		\
     $(SLO)$/inscodlg.obj		\
-    $(SLO)$/strindlg.obj		\
-    $(SLO)$/tabbgcolordlg.obj   \
-    $(SLO)$/mtrindlg.obj		\
+    $(SLO)$/instbdlg.obj		\
     $(SLO)$/lbseldlg.obj		\
-    $(SLO)$/filldlg.obj			\
-    $(SLO)$/autofmt.obj			\
-    $(SLO)$/solvrdlg.obj		\
-    $(SLO)$/optsolver.obj       \
-    $(SLO)$/solveroptions.obj   \
-    $(SLO)$/solverutil.obj      \
+    $(SLO)$/linkarea.obj		\
+    $(SLO)$/mtrindlg.obj		\
     $(SLO)$/mvtabdlg.obj		\
-    $(SLO)$/groupdlg.obj		\
-    $(SLO)$/tabopdlg.obj		\
-    $(SLO)$/crdlg.obj			\
     $(SLO)$/namecrea.obj		\
     $(SLO)$/namepast.obj		\
-    $(SLO)$/textdlgs.obj		\
-    $(SLO)$/anyrefdg.obj		\
-    $(SLO)$/crnrdlg.obj			\
-    $(SLO)$/shtabdlg.obj		\
-    $(SLO)$/instbdlg.obj		\
-    $(SLO)$/acredlin.obj		\
-    $(SLO)$/highred.obj			\
-    $(SLO)$/simpref.obj			\
+    $(SLO)$/optsolver.obj		\
+    $(SLO)$/protectiondlg.obj		\
     $(SLO)$/redcom.obj			\
-    $(SLO)$/linkarea.obj		\
-    $(SLO)$/warnbox.obj	\
-    $(SLO)$/scuiautofmt.obj     \
-    $(SLO)$/conflictsdlg.obj    \
-    $(SLO)$/sharedocdlg.obj \
-    $(SLO)$/protectiondlg.obj \
-    $(SLO)$/retypepassdlg.obj
-
-EXCEPTIONSFILES = \
-    $(SLO)$/acredlin.obj        \
-    $(SLO)$/conflictsdlg.obj    \
+    $(SLO)$/retypepassdlg.obj		\
+    $(SLO)$/scuiautofmt.obj		\
     $(SLO)$/sharedocdlg.obj		\
-    $(SLO)$/optsolver.obj       \
-    $(SLO)$/solveroptions.obj   \
-    $(SLO)$/crnrdlg.obj         \
-    $(SLO)$/solverutil.obj \
-    $(SLO)$/protectiondlg.obj \
-    $(SLO)$/retypepassdlg.obj
+    $(SLO)$/shtabdlg.obj		\
+    $(SLO)$/simpref.obj			\
+    $(SLO)$/solveroptions.obj		\
+    $(SLO)$/solverutil.obj		\
+    $(SLO)$/solvrdlg.obj		\
+    $(SLO)$/strindlg.obj		\
+    $(SLO)$/tabbgcolordlg.obj   	\
+    $(SLO)$/tabopdlg.obj		\
+    $(SLO)$/textdlgs.obj		\
+    $(SLO)$/warnbox.obj
 
 SRS1NAME=$(TARGET)
 SRC1FILES = \
diff --git a/sc/source/ui/namedlg/makefile.mk b/sc/source/ui/namedlg/makefile.mk
index 7bc7b2653b6a..f9cd60d008a4 100644
--- a/sc/source/ui/namedlg/makefile.mk
+++ b/sc/source/ui/namedlg/makefile.mk
@@ -41,6 +41,9 @@ CXXFILES = \
         namedlg.cxx
 
 SLOFILES =  \
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
         $(SLO)$/namedlg.obj
 
 # --- Tagets -------------------------------------------------------
diff --git a/sc/source/ui/navipi/makefile.mk b/sc/source/ui/navipi/makefile.mk
index 992aefcd4f45..1ce4df4b4927 100644
--- a/sc/source/ui/navipi/makefile.mk
+++ b/sc/source/ui/navipi/makefile.mk
@@ -37,13 +37,13 @@ TARGET=navipi
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =					\
-    $(SLO)$/navipi.obj		\
-    $(SLO)$/navcitem.obj	\
-    $(SLO)$/scenwnd.obj		\
-    $(SLO)$/content.obj
+SLOFILES =			\
+    $(EXCEPTIONSFILES)
 
-EXCEPTIONSFILES =			\
+EXCEPTIONSFILES =		\
+    $(SLO)$/content.obj		\
+    $(SLO)$/navcitem.obj	\
+    $(SLO)$/navipi.obj		\
     $(SLO)$/scenwnd.obj
 
 SRS1NAME=$(TARGET)
diff --git a/sc/source/ui/optdlg/makefile.mk b/sc/source/ui/optdlg/makefile.mk
index 9c816f56f7b8..b2be3b5c02ad 100644
--- a/sc/source/ui/optdlg/makefile.mk
+++ b/sc/source/ui/optdlg/makefile.mk
@@ -45,20 +45,17 @@ CXXFILES = \
         tpprint.cxx     \
         opredlin.cxx
 
-EXCEPTIONSFILES= \
-        $(SLO)$/tpcompatibility.obj
-
 SLOFILES =  \
-        $(SLO)$/tpusrlst.obj \
-        $(SLO)$/tpview.obj   \
-        $(SLO)$/tpcalc.obj	\
-        $(SLO)$/tpformula.obj	\
-        $(SLO)$/tpcompatibility.obj \
-        $(SLO)$/tpprint.obj	\
-        $(SLO)$/opredlin.obj
+        $(EXCEPTIONSFILES)
 
 EXCEPTIONSFILES= \
-        $(SLO)$/tpcompatibility.obj	\
+        $(SLO)$/opredlin.obj \
+        $(SLO)$/tpcalc.obj \
+        $(SLO)$/tpcompatibility.obj \
+        $(SLO)$/tpformula.obj \
+        $(SLO)$/tpprint.obj \
+        $(SLO)$/tpusrlst.obj \
+        $(SLO)$/tpview.obj
 
 
 # --- Tagets -------------------------------------------------------
diff --git a/sc/source/ui/pagedlg/makefile.mk b/sc/source/ui/pagedlg/makefile.mk
index 93224ec7cb58..a7984f7d19af 100644
--- a/sc/source/ui/pagedlg/makefile.mk
+++ b/sc/source/ui/pagedlg/makefile.mk
@@ -39,8 +39,8 @@ LIBTARGET=no
 # --- Files --------------------------------------------------------
 
 CXXFILES = \
-    areasdlg.cxx	\
-    hfedtdlg.cxx	\
+        areasdlg.cxx	\
+        hfedtdlg.cxx	\
         tptable.cxx	\
         tphf.cxx 	\
         tphfedit.cxx
@@ -48,13 +48,15 @@ CXXFILES = \
             
 
 SLOFILES = \
-        $(SLO)$/areasdlg.obj	\
-    $(SLO)$/hfedtdlg.obj	\
-        $(SLO)$/tptable.obj	\
-        $(SLO)$/tphf.obj		\
-        $(SLO)$/tphfedit.obj	\
-        $(SLO)$/scuitphfedit.obj
+        $(EXCEPTIONSFILES)
 
+EXCEPTIONSFILES = \
+        $(SLO)$/areasdlg.obj		\
+        $(SLO)$/hfedtdlg.obj		\
+        $(SLO)$/scuitphfedit.obj	\
+        $(SLO)$/tphf.obj		\
+        $(SLO)$/tphfedit.obj		\
+        $(SLO)$/tptable.obj		\
 
 SRS1NAME=$(TARGET)
 SRC1FILES =  pagedlg.src     	\
@@ -65,7 +67,7 @@ LIB1TARGET = $(SLB)$/$(TARGET).lib
 
 LIB1OBJFILES = \
         $(SLO)$/areasdlg.obj	\
-    $(SLO)$/tphfedit.obj
+        $(SLO)$/tphfedit.obj
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sc/source/ui/styleui/makefile.mk b/sc/source/ui/styleui/makefile.mk
index ccbd2e14f34c..16cdb2e7b791 100644
--- a/sc/source/ui/styleui/makefile.mk
+++ b/sc/source/ui/styleui/makefile.mk
@@ -41,6 +41,9 @@ CXXFILES =  \
     styledlg.cxx
 
 SLOFILES =  \
+    $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
     $(SLO)$/styledlg.obj \
 
 SRS1NAME=$(TARGET)
diff --git a/sc/source/ui/undo/makefile.mk b/sc/source/ui/undo/makefile.mk
index 2b8dd60df32d..12c94fd32cc9 100644
--- a/sc/source/ui/undo/makefile.mk
+++ b/sc/source/ui/undo/makefile.mk
@@ -56,26 +56,23 @@ CXXFILES = \
 
 
 SLOFILES =  \
-        $(SLO)$/target.obj \
-        $(SLO)$/refundo.obj \
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/target.obj
+
+EXCEPTIONSFILES= \
         $(SLO)$/areasave.obj \
+        $(SLO)$/refundo.obj \
         $(SLO)$/undobase.obj \
-        $(SLO)$/undoutil.obj \
-        $(SLO)$/undocell.obj \
-        $(SLO)$/undostyl.obj \
-        $(SLO)$/undoolk.obj \
         $(SLO)$/undoblk.obj \
         $(SLO)$/undoblk2.obj \
         $(SLO)$/undoblk3.obj \
+        $(SLO)$/undocell.obj \
         $(SLO)$/undodat.obj \
         $(SLO)$/undodraw.obj \
-        $(SLO)$/undotab.obj
-
-EXCEPTIONSFILES= \
-    $(SLO)$/undoblk3.obj \
-    $(SLO)$/undocell.obj \
-    $(SLO)$/undostyl.obj \
-    $(SLO)$/undotab.obj
+        $(SLO)$/undoolk.obj \
+        $(SLO)$/undostyl.obj \
+        $(SLO)$/undotab.obj \
+        $(SLO)$/undoutil.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sc/source/ui/view/makefile.mk b/sc/source/ui/view/makefile.mk
index 3b1d570f71c0..f00db352cebe 100644
--- a/sc/source/ui/view/makefile.mk
+++ b/sc/source/ui/view/makefile.mk
@@ -39,22 +39,67 @@ TARGET=view
 
 
 SLOFILES =  \
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/cellmergeoption.obj
+
+EXCEPTIONSFILES= \
+        $(SLO)$/auditsh.obj \
+        $(SLO)$/cellsh.obj \
+        $(SLO)$/cellsh1.obj \
+        $(SLO)$/cellsh2.obj \
+        $(SLO)$/cellsh3.obj \
+        $(SLO)$/cellsh4.obj \
+        $(SLO)$/colrowba.obj \
+        $(SLO)$/dbfunc.obj \
+        $(SLO)$/dbfunc2.obj \
+        $(SLO)$/dbfunc3.obj \
+        $(SLO)$/dbfunc4.obj \
+        $(SLO)$/drawutil.obj \
+        $(SLO)$/drawvie2.obj \
+        $(SLO)$/drawvie3.obj \
+        $(SLO)$/drawvie4.obj \
+        $(SLO)$/drawview.obj \
+        $(SLO)$/editsh.obj \
+        $(SLO)$/formatsh.obj \
+        $(SLO)$/galwrap.obj \
+        $(SLO)$/gridmerg.obj \
+        $(SLO)$/gridwin.obj \
+        $(SLO)$/gridwin2.obj \
+        $(SLO)$/gridwin3.obj \
+        $(SLO)$/gridwin4.obj \
+        $(SLO)$/gridwin5.obj \
+        $(SLO)$/hdrcont.obj \
+        $(SLO)$/hintwin.obj \
+        $(SLO)$/imapwrap.obj \
+        $(SLO)$/invmerge.obj \
+        $(SLO)$/notemark.obj \
+        $(SLO)$/olinewin.obj \
+        $(SLO)$/olkact.obj \
+        $(SLO)$/output.obj \
+        $(SLO)$/output2.obj \
+        $(SLO)$/output3.obj \
+        $(SLO)$/overlayobject.obj \
+        $(SLO)$/pfuncache.obj \
+        $(SLO)$/pgbrksh.obj \
+        $(SLO)$/pivotsh.obj \
+        $(SLO)$/preview.obj \
+        $(SLO)$/prevloc.obj \
+        $(SLO)$/prevwsh.obj \
+        $(SLO)$/prevwsh2.obj \
+        $(SLO)$/printfun.obj \
+        $(SLO)$/reffact.obj \
+        $(SLO)$/scextopt.obj \
+        $(SLO)$/select.obj \
+        $(SLO)$/selectionstate.obj \
+        $(SLO)$/spelldialog.obj \
+        $(SLO)$/spelleng.obj \
+        $(SLO)$/tabcont.obj \
+        $(SLO)$/tabsplit.obj \
         $(SLO)$/tabview.obj \
         $(SLO)$/tabview2.obj \
         $(SLO)$/tabview3.obj \
         $(SLO)$/tabview4.obj \
         $(SLO)$/tabview5.obj \
-        $(SLO)$/viewfunc.obj \
-        $(SLO)$/viewfun2.obj \
-        $(SLO)$/viewfun3.obj \
-        $(SLO)$/viewfun4.obj \
-        $(SLO)$/viewfun5.obj \
-        $(SLO)$/viewfun6.obj \
-        $(SLO)$/viewfun7.obj \
-        $(SLO)$/dbfunc.obj \
-        $(SLO)$/dbfunc2.obj \
-        $(SLO)$/dbfunc3.obj \
-        $(SLO)$/dbfunc4.obj \
         $(SLO)$/tabvwsh.obj \
         $(SLO)$/tabvwsh2.obj \
         $(SLO)$/tabvwsh3.obj \
@@ -70,58 +115,16 @@ SLOFILES =  \
         $(SLO)$/tabvwshf.obj \
         $(SLO)$/tabvwshg.obj \
         $(SLO)$/tabvwshh.obj \
-        $(SLO)$/printfun.obj \
-        $(SLO)$/pfuncache.obj \
-        $(SLO)$/preview.obj \
-        $(SLO)$/prevwsh.obj \
-        $(SLO)$/prevwsh2.obj \
-        $(SLO)$/prevloc.obj \
-        $(SLO)$/editsh.obj \
-        $(SLO)$/pivotsh.obj \
-        $(SLO)$/auditsh.obj \
-        $(SLO)$/gridwin.obj \
-        $(SLO)$/gridwin2.obj \
-        $(SLO)$/gridwin3.obj \
-        $(SLO)$/gridwin4.obj \
-        $(SLO)$/gridwin5.obj \
-        $(SLO)$/drawview.obj \
-        $(SLO)$/drawvie2.obj \
-        $(SLO)$/drawvie3.obj \
-        $(SLO)$/drawvie4.obj \
-        $(SLO)$/drawutil.obj \
-        $(SLO)$/output.obj \
-        $(SLO)$/output2.obj \
-        $(SLO)$/output3.obj \
-        $(SLO)$/overlayobject.obj \
-        $(SLO)$/gridmerg.obj \
-        $(SLO)$/invmerge.obj \
-        $(SLO)$/cellmergeoption.obj \
-        $(SLO)$/select.obj \
-        $(SLO)$/olinewin.obj \
-        $(SLO)$/hintwin.obj \
-        $(SLO)$/notemark.obj \
-        $(SLO)$/tabcont.obj \
-        $(SLO)$/tabsplit.obj \
+        $(SLO)$/viewdata.obj \
+        $(SLO)$/viewfun2.obj \
+        $(SLO)$/viewfun3.obj \
+        $(SLO)$/viewfun4.obj \
+        $(SLO)$/viewfun5.obj \
+        $(SLO)$/viewfun6.obj \
+        $(SLO)$/viewfun7.obj \
+        $(SLO)$/viewfunc.obj \
         $(SLO)$/viewutil.obj \
-        $(SLO)$/hdrcont.obj \
-        $(SLO)$/colrowba.obj \
-        $(SLO)$/olkact.obj \
-        $(SLO)$/galwrap.obj \
-        $(SLO)$/imapwrap.obj \
-        $(SLO)$/reffact.obj \
-        $(SLO)$/selectionstate.obj \
-        $(SLO)$/spelleng.obj \
-        $(SLO)$/spelldialog.obj \
-        $(SLO)$/waitoff.obj \
-        $(SLO)$/cellsh.obj \
-        $(SLO)$/cellsh1.obj\
-        $(SLO)$/cellsh2.obj\
-        $(SLO)$/cellsh3.obj\
-        $(SLO)$/cellsh4.obj\
-        $(SLO)$/formatsh.obj\
-        $(SLO)$/pgbrksh.obj\
-        $(SLO)$/viewdata.obj\
-        $(SLO)$/scextopt.obj
+        $(SLO)$/waitoff.obj
 
 .IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCSPARC"
     NOOPTFILES= \
@@ -142,29 +145,6 @@ SLOFILES =  \
         $(SLO)$/tabvwsh2.obj
 .ENDIF
 
-EXCEPTIONSFILES= \
-    $(SLO)$/dbfunc3.obj \
-    $(SLO)$/gridwin.obj \
-    $(SLO)$/invmerge.obj \
-    $(SLO)$/output2.obj \
-    $(SLO)$/overlayobject.obj \
-    $(SLO)$/pfuncache.obj \
-    $(SLO)$/spelldialog.obj \
-    $(SLO)$/cellsh1.obj \
-    $(SLO)$/drawvie4.obj \
-    $(SLO)$/formatsh.obj \
-    $(SLO)$/gridwin2.obj \
-    $(SLO)$/scextopt.obj \
-    $(SLO)$/tabvwshb.obj \
-    $(SLO)$/tabvwshf.obj \
-    $(SLO)$/viewdata.obj \
-    $(SLO)$/viewfunc.obj \
-    $(SLO)$/viewfun2.obj \
-    $(SLO)$/viewfun3.obj \
-    $(SLO)$/viewfun5.obj \
-    $(SLO)$/viewfun7.obj \
-    $(SLO)$/reffact.obj
-
 # goal seek -O2