CWS gnumake2: rebase to DEV300_m76; fix build problems

5 files changed, 6 insertions, 40 deletions

diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc
index 2c4e03a5d181..9f719f9bcdd0 100644
--- a/svx/source/src/app.hrc
+++ b/svx/source/src/app.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: app.hrc,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -138,7 +135,6 @@
 #define RID_OFADLG_OPTIONS_TREE         (RID_OFA_START + 115)
 #define RID_OFADLG_OPTIONS_TREE_PAGES   (RID_OFA_START + 116)
 #define RID_OFADLG_AWCP_VALUES          (RID_OFA_START + 117)
-#define RID_OFADLG_OPTIONS_TREE_HINT    (RID_OFA_START + 118)
 #define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119)
 #define RID_OFAPAGE_MSFILTEROPT         (RID_OFA_START + 120)
 #define RID_OFAPAGE_MSFILTEROPT2        (RID_OFA_START + 121)
diff --git a/svx/source/src/app.src b/svx/source/src/app.src
index 695424878729..934fbd76a86f 100644
--- a/svx/source/src/app.src
+++ b/svx/source/src/app.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: app.src,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,26 +44,9 @@ ErrorBox RID_ERRBOX_MODULENOTINSTALLED
         SID_HLINKBAR_SEARCH; \
         SID_HLINKBAR_TARGET; \
         SID_HYPERLINK_DIALOG; \
-        SID_FM_RECORD_ABSOLUTE; \
-        SID_FM_RECORD_FIRST; \
-        SID_FM_RECORD_PREV; \
-        SID_FM_RECORD_NEXT; \
-        SID_FM_RECORD_LAST; \
-        SID_FM_RECORD_SAVE; \
-        SID_FM_RECORD_UNDO; \
-        SID_FM_RECORD_NEW; \
-        SID_FM_RECORD_DELETE; \
-        SID_FM_REFRESH; \
-        SID_FM_SORTUP; \
-        SID_FM_SORTDOWN; \
-        SID_FM_ORDERCRIT; \
-        SID_FM_AUTOFILTER; \
-        SID_FM_FILTERCRIT; \
-        SID_FM_FORM_FILTERED; \
-        SID_FM_REMOVE_FILTER_SORT; \
     };\
     IdCount = {\
-        21;\
+        4;\
     };
 
 ImageList RID_DEFAULTIMAGELIST_SC
diff --git a/svx/source/src/errtxt.src b/svx/source/src/errtxt.src
index bae4091dea53..4d6b94dd7fc0 100644
--- a/svx/source/src/errtxt.src
+++ b/svx/source/src/errtxt.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: errtxt.src,v $
- * $Revision: 1.63 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/src/hidgen.hrc b/svx/source/src/hidgen.hrc
index ca756f603b0e..38bea9afca11 100644
--- a/svx/source/src/hidgen.hrc
+++ b/svx/source/src/hidgen.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: hidgen.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/src/makefile.mk b/svx/source/src/makefile.mk
index 630c9c420bb8..c41b3e492e00 100644
--- a/svx/source/src/makefile.mk
+++ b/svx/source/src/makefile.mk
@@ -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.mk,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify