CWS gnumake2: rebase to DEV300_m76; fix build problems

5 files changed, 44 insertions, 124 deletions

diff --git a/svx/util/hidother.hrc b/svx/util/hidother.hrc
index 605d36df6a1d..68bb57a274b3 100644
--- a/svx/util/hidother.hrc
+++ b/svx/util/hidother.hrc
@@ -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.hrc,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/svx/util/hidother.src b/svx/util/hidother.src
index 8721fe1ff29f..dd566cf9abdc 100644
--- a/svx/util/hidother.src
+++ b/svx/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.45 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,42 +29,9 @@
 #include <svx/svxids.hrc>
 #include "../inc/fmhelp.hrc"
 
-#define HID_AUTOCORR_HELP_ACORSENTWORD          HID_AUTOCORR_HELP_START+5
-#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH  HID_AUTOCORR_HELP_START+13
-#define HID_AUTOCORR_HELP_ACORWORD              HID_AUTOCORR_HELP_START+3
-#define HID_AUTOCORR_HELP_ACORWORDENEMDASH      HID_AUTOCORR_HELP_START+11
-#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL     HID_AUTOCORR_HELP_START+20
-#define HID_AUTOCORR_HELP_CHGORDINALNUMBER      HID_AUTOCORR_HELP_START+21
-#define HID_AUTOCORR_HELP_CHGQUOTES             HID_AUTOCORR_HELP_START+15
-#define HID_AUTOCORR_HELP_CHGSGLQUOTES          HID_AUTOCORR_HELP_START+16
-#define HID_AUTOCORR_HELP_CHGTOENEMDASH         HID_AUTOCORR_HELP_START+7
-#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL       HID_AUTOCORR_HELP_START+19
-#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE    HID_AUTOCORR_HELP_START+18
-#define HID_AUTOCORR_HELP_SENT                  HID_AUTOCORR_HELP_START+1
-#define HID_AUTOCORR_HELP_SENTENEMDASH          HID_AUTOCORR_HELP_START+9
-#define HID_AUTOCORR_HELP_SENTWORD              HID_AUTOCORR_HELP_START+2
-#define HID_AUTOCORR_HELP_SENTWORDENEMDASH      HID_AUTOCORR_HELP_START+10
-#define HID_AUTOCORR_HELP_SETINETATTR           HID_AUTOCORR_HELP_START+17
-#define HID_AUTOCORR_HELP_WORD                  HID_AUTOCORR_HELP_START+0
-#define HID_AUTOCORR_HELP_WORDENEMDASH          HID_AUTOCORR_HELP_START+8
-hidspecial HID_AUTOCORR_HELP_ACORSENTWORD   { HelpID =  HID_AUTOCORR_HELP_ACORSENTWORD;};
-hidspecial HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH   { HelpID =  HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_ACORWORD       { HelpID =  HID_AUTOCORR_HELP_ACORWORD;};
-hidspecial HID_AUTOCORR_HELP_ACORWORDENEMDASH       { HelpID =  HID_AUTOCORR_HELP_ACORWORDENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL  { HelpID =  HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL;};
-hidspecial HID_AUTOCORR_HELP_CHGORDINALNUMBER   { HelpID =  HID_AUTOCORR_HELP_CHGORDINALNUMBER;};
-hidspecial HID_AUTOCORR_HELP_CHGQUOTES          { HelpID =  HID_AUTOCORR_HELP_CHGQUOTES;};
-hidspecial HID_AUTOCORR_HELP_CHGSGLQUOTES       { HelpID =  HID_AUTOCORR_HELP_CHGSGLQUOTES;};
-hidspecial HID_AUTOCORR_HELP_CHGTOENEMDASH      { HelpID =  HID_AUTOCORR_HELP_CHGTOENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_CHGWEIGHTUNDERL    { HelpID =  HID_AUTOCORR_HELP_CHGWEIGHTUNDERL;};
-hidspecial HID_AUTOCORR_HELP_INGNOREDOUBLESPACE { HelpID =  HID_AUTOCORR_HELP_INGNOREDOUBLESPACE;};
-hidspecial HID_AUTOCORR_HELP_SENT           { HelpID =  HID_AUTOCORR_HELP_SENT;};
-hidspecial HID_AUTOCORR_HELP_SENTENEMDASH           { HelpID =  HID_AUTOCORR_HELP_SENTENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_SENTWORD       { HelpID =  HID_AUTOCORR_HELP_SENTWORD;};
-hidspecial HID_AUTOCORR_HELP_SENTWORDENEMDASH       { HelpID =  HID_AUTOCORR_HELP_SENTWORDENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_SETINETATTR        { HelpID =  HID_AUTOCORR_HELP_SETINETATTR;};
-hidspecial HID_AUTOCORR_HELP_WORD           { HelpID =  HID_AUTOCORR_HELP_WORD;};
-hidspecial HID_AUTOCORR_HELP_WORDENEMDASH           { HelpID =  HID_AUTOCORR_HELP_WORDENEMDASH;};
+/* #define HID_AUTOCORR_HELP_CHGNONBRKSPACE        HID_AUTOCORR_HELP_START+20 */
+/* hidspecial HID_AUTOCORR_HELP_CHGNONBRKSPACE     { HelpID =  HID_AUTOCORR_HELP_CHGNONBRKSPACE;}; */
+
 hidspecial HID_FIELD_SEL                    { HelpID =HID_FIELD_SEL             ;};
 hidspecial HID_FIELD_SEL_WIN                { HelpID =HID_FIELD_SEL_WIN         ;};
 hidspecial HID_FILL_ATTR_LISTBOX                { HelpID = HID_FILL_ATTR_LISTBOX ;};
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 92eee374f9da..464ec894e350 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/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.61 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,93 +32,43 @@ TARGET=svx
 GEN_HID=TRUE
 GEN_HID_OTHER=TRUE
 
-USE_DEFFILE=TRUE
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
 
 RSCLOCINC+=-I$(PRJ)$/source$/svdraw
 
-# --- Svx - DLL ----------
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES=\
-    $(SLB)$/svdraw.lib \
-    $(SLB)$/form.lib
-
-.IF "(GUIBASE)" == "WIN"
-LIB1FILES+=$(SLB)$/ibrwimp.lib
-.ENDIF # (WIN)
-
-LIB2TARGET= $(SLB)$/$(TARGET)_2.lib
-LIB2FILES=\
-    $(SLB)$/items.lib     \
-    $(SLB)$/dialogs.lib	\
-    $(SLB)$/mnuctrls.lib  \
-    $(SLB)$/options.lib   \
-    $(SLB)$/stbctrls.lib  \
-    $(SLB)$/tbxctrls.lib  \
-    $(SLB)$/unoedit.lib   \
-    $(SLB)$/smarttags.lib
-
-LIB3TARGET= $(SLB)$/$(TARGET)_3.lib
-LIB3FILES=\
-    $(SLB)$/unodraw.lib	\
-    $(SLB)$/unogallery.lib\
-    $(SLB)$/accessibility.lib	\
-    $(SLB)$/customshapes.lib
+HELPIDFILES=    ..$/inc$/helpid.hrc
 
-LIB4TARGET= $(SLB)$/$(TARGET)_4.lib
-LIB4FILES=\
-    $(SLB)$/fmcomp.lib \
-    $(SLB)$/engine3d.lib \
-    $(SLB)$/table.lib
+# svxcore
+SHL1TARGET= svxcore$(DLLPOSTFIX)
+SHL1IMPLIB= isvxcore
+SHL1USE_EXPORTS=name
 
-# Objects needed for the svxcore library.
-LIB5TARGET= $(SLB)$/$(TARGET)_5.lib
-LIB5FILES=\
-    $(SLB)$/accessibility-core.lib \
+SHL1LIBS= \
     $(SLB)$/animation.lib \
     $(SLB)$/attribute.lib \
     $(SLB)$/contact.lib \
     $(SLB)$/customshapes-core.lib \
     $(SLB)$/dialogs-core.lib \
-    $(SLB)$/editeng.lib \
     $(SLB)$/engine3d-core.lib \
     $(SLB)$/event.lib \
     $(SLB)$/fmcomp-core.lib \
     $(SLB)$/form-core.lib \
     $(SLB)$/gal.lib \
     $(SLB)$/items-core.lib \
-    $(SLB)$/options-core.lib
-
-LIB6TARGET= $(SLB)$/$(TARGET)_6.lib
-LIB6FILES=\
-    $(SLB)$/outliner.lib \
     $(SLB)$/overlay.lib \
     $(SLB)$/primitive2d.lib \
     $(SLB)$/primitive3d.lib \
     $(SLB)$/properties.lib \
     $(SLB)$/svdraw-core.lib \
-    $(SLB)$/svxlink.lib \
-    $(SLB)$/svxrtf-core.lib \
-    $(SLB)$/svxrtf.lib \
     $(SLB)$/table-core.lib \
-    $(SLB)$/tbxctrls-core.lib  \
+    $(SLB)$/tbxctrls-core.lib \
     $(SLB)$/toolbars.lib \
     $(SLB)$/unodraw-core.lib \
-    $(SLB)$/unoedit-core.lib   \
     $(SLB)$/xml.lib \
     $(SLB)$/xout.lib
 
-HELPIDFILES=    ..$/inc$/helpid.hrc
-
-# svxcore
-SHL1TARGET= svxcore$(DLLPOSTFIX)
-SHL1IMPLIB= isvxcore
-SHL1USE_EXPORTS=name
-SHL1LIBS= $(LIB5TARGET) $(LIB6TARGET)
 
 SHL1STDLIBS= \
     $(AVMEDIALIB) \
@@ -132,6 +78,7 @@ SHL1STDLIBS= \
     $(CPPUHELPERLIB) \
     $(CPPULIB) \
     $(DRAWINGLAYERLIB) \
+    $(EDITENGLIB) \
     $(FWELIB) \
     $(GOODIESLIB) \
     $(I18NISOLANGLIB) \
@@ -151,9 +98,10 @@ SHL1STDLIBS= \
     $(VOSLIB) \
     $(XMLOFFLIB) \
 
+
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)_5 $(TARGET)_6
+DEFLIB1NAME=$(SHL1LIBS:b)
 
 # svx
 SHL2TARGET= svx$(DLLPOSTFIX)
@@ -161,7 +109,27 @@ SHL2IMPLIB= i$(TARGET)
 SHL2USE_EXPORTS=name
 SHL2DEPN=$(SHL1TARGETN)
 
-SHL2LIBS= $(LIB1TARGET) $(LIB2TARGET) $(LIB3TARGET) $(LIB4TARGET)
+SHL2LIBS= \
+    $(SLB)$/svdraw.lib \
+    $(SLB)$/form.lib \
+    $(SLB)$/items.lib     \
+    $(SLB)$/dialogs.lib	\
+    $(SLB)$/mnuctrls.lib  \
+    $(SLB)$/stbctrls.lib  \
+    $(SLB)$/tbxctrls.lib  \
+    $(SLB)$/smarttags.lib \
+    $(SLB)$/unodraw.lib	\
+    $(SLB)$/unogallery.lib\
+    $(SLB)$/accessibility.lib	\
+    $(SLB)$/customshapes.lib \
+    $(SLB)$/fmcomp.lib \
+    $(SLB)$/engine3d.lib \
+    $(SLB)$/table.lib
+
+.IF "(GUIBASE)" == "WIN"
+SHL2LIBS+=$(SLB)$/ibrwimp.lib
+.ENDIF # (WIN)
+
 SHL2STDLIBS= \
     $(BASEGFXLIB) \
     $(BASICLIB) \
@@ -169,6 +137,7 @@ SHL2STDLIBS= \
     $(CPPUHELPERLIB)	\
     $(CPPULIB) \
     $(DRAWINGLAYERLIB) \
+    $(EDITENGLIB) \
     $(GOODIESLIB) \
     $(I18NISOLANGLIB) \
     $(ICUUCLIB) \
@@ -187,13 +156,14 @@ SHL2STDLIBS= \
     $(XMLOFFLIB) \
     $(XMLSCRIPTLIB) \
 
+
 .IF "$(GUI)"=="WNT"
 SHL2STDLIBS+=$(SHELLLIB)
 .ENDIF # WNT
 
 SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
 DEF2NAME=	$(SHL2TARGET)
-DEFLIB2NAME=$(TARGET) $(TARGET)_2 $(TARGET)_3 $(TARGET)_4
+DEFLIB2NAME=$(SHL2LIBS:b)
 
 .IF "$(debug)$(dbgutil)"!=""
 SHL2STDLIBS += $(CPPUHELPERLIB)
@@ -204,20 +174,16 @@ SHL2STDLIBS += $(CPPUHELPERLIB)
 # Resource files
 SRSFILELIST=\
         $(SRS)$/svdstr.srs \
-        $(SRS)$/editeng.srs \
-        $(SRS)$/outliner.srs \
         $(SRS)$/dialogs.srs \
         $(SRS)$/drawdlgs.srs \
         $(SRS)$/mnuctrls.srs \
         $(SRS)$/stbctrls.srs \
         $(SRS)$/tbxctrls.srs \
-        $(SRS)$/options.srs \
         $(SRS)$/svxitems.srs \
         $(SRS)$/form.srs \
         $(SRS)$/fmcomp.srs \
         $(SRS)$/engine3d.srs \
         $(SRS)$/unodraw.srs \
-        $(SRS)$/svxlink.srs \
         $(SRS)$/accessibility.srs \
         $(SRS)$/table.srs \
         $(SRS)$/toolbars.srs
diff --git a/svx/util/makefile.pmk b/svx/util/makefile.pmk
index b2aae3329111..e0fffdb1fdeb 100644
--- a/svx/util/makefile.pmk
+++ b/svx/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/svx/util/svxpch.cxx b/svx/util/svxpch.cxx
index 845a2ffae28c..a59ef4b90a74 100644
--- a/svx/util/svxpch.cxx
+++ b/svx/util/svxpch.cxx
@@ -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: svxpch.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,7 +51,7 @@
 #include <sfxview.hxx>
 #include <sfxdlg.hxx>
 #include <sfxstyle.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include <sbx.hxx>
 #include <hmwrap.hxx>
 #include <mail.hxx>