cws tl74: merge with DEV300_m72

1 files changed, 7 insertions, 19 deletions

diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
index 1fc3c9f8b3fe..ac608fae8ec8 100644
--- a/svx/source/dialog/makefile.mk
+++ b/svx/source/dialog/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # 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.65 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,13 +52,10 @@ SRC1FILES =  \
         fontwork.src \
         frmsel.src \
         hdft.src \
-        hyphen.src \
         hyprlink.src \
         imapdlg.src \
-        impgrf.src \
         langbox.src \
         language.src \
-        lingu.src \
         passwd.src \
         prtqry.src \
         rubydialog.src\
@@ -70,9 +63,9 @@ SRC1FILES =  \
         srchdlg.src \
         svxbmpnumvalueset.src \
         swframeposstrings.src \
-        thesdlg.src \
         txenctab.src \
-        ucsubset.src
+        ucsubset.src \
+        optgrid.src     
 
 SRS2NAME=drawdlgs
 SRC2FILES =  \
@@ -85,16 +78,10 @@ LIB1OBJFILES= \
         $(SLO)$/dialmgr.obj\
         $(SLO)$/dlgutil.obj \
         $(SLO)$/framelink.obj\
-        $(SLO)$/hangulhanja.obj \
-        $(SLO)$/hyphen.obj \
-        $(SLO)$/impgrf.obj \
         $(SLO)$/langbox.obj \
-        $(SLO)$/opengrf.obj \
         $(SLO)$/simptabl.obj \
-        $(SLO)$/splwrap.obj \
         $(SLO)$/svxdlg.obj \
         $(SLO)$/stddlg.obj \
-        $(SLO)$/thesdlg.obj
 
 LIB2TARGET=$(SLB)$/$(TARGET).lib
 
@@ -137,7 +124,6 @@ LIB2OBJFILES= \
         $(SLO)$/srchdlg.obj \
         $(SLO)$/strarray.obj \
         $(SLO)$/svxbmpnumvalueset.obj\
-        $(SLO)$/svxbox.obj \
         $(SLO)$/svxgrahicitem.obj \
         $(SLO)$/svxruler.obj \
         $(SLO)$/swframeexample.obj \
@@ -146,7 +132,9 @@ LIB2OBJFILES= \
         $(SLO)$/txenctab.obj \
         $(SLO)$/wrapfield.obj \
         $(SLO)$/_bmpmask.obj \
-        $(SLO)$/_contdlg.obj
+        $(SLO)$/_contdlg.obj \
+        $(SLO)$/optgrid.obj
+        
 
 .IF "$(GUI)"=="UNX"
 LIB2OBJFILES +=    $(SLO)$/sendreportunx.obj