This commit was manufactured by cvs2svn to create tagOOO_BUILD_2_0_4_3

'OOO_BUILD_2_0_4_3'.

10 files changed, 410 insertions, 171 deletions

diff --git a/NEWS b/NEWS
index 5d87cc98f..0ba84d1af 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,84 @@
+ooo-build-2.0.4.3
+
+    + bug fixes:
+	+ serious problems with condensed text portions printing (Radek)
+	+ borders VBA range implementation (Noel, Jiao)
+    + build bits:
+	+ list Ukrainian localization (Rene)
+	+ fix permissions of the documentation (Petr)
+
+ooo-build-2.0.4.2
+
+    + features:
+	+ arch independent directory for templates (Petr)
+    + bug fixes:
+	+ crash in Draw and Impress by pressing the Del key (Mathias)
+	+ problem with binding for controls with accents in VBA (Noel)
+	+ CSV saved with .XLS extension should load in Calc (Jan)
+	+ objects allocation in pyuno (Petr)
+	+ more Slovak localization (Robert)
+	+ hash item collections fix (Jody)
+	+ Pivot Report without Format layout (Jody)
+	+ conflicts in r1c1 stuff (Jody)
+	+ some fixes from Fedora (Mathias, Andreas)
+    + build bits:
+	+ build with new gcc-4.1.2 (Rene)
+	+ build with hsqldb-1.8.0.6/7 (Rene)
+	+ updated Debian, Novell bits (Rene, Petr)
+    + misc
+	+ list of supported qatestool tests (Eric, Rene)
+
+ooo-build-2.0.4.1
+
+    + features:
+	+ common dir for language independent templates (Petr)
+	+ new "Labels" template category (Petr)
+    + speed up:
+	+ temporary disabled some more dangerous speedup fixes (Rene)
+    + bug fixes:
+	+ lots VBA fixes (Noel)
+	+ lots fixes from Fedora (Matthias)
+	+ mozab driver path encoding problem on Win32 (Tor)
+    + build bits:
+	+ build with system icu-3.4 and 3.6 (Rene, Hanno)
+	+ build with recent wizard crash fix (Rene)
+	+ configure check for missing dll on Win32 (Tor)
+	+ parallel build fix (Juerg)
+	+ install SDK only for en-US (Rene)
+	+ enable directx by default on Win32 (Tor)
+	+ updated Debian, Novell bits (Rene, Petr)
+
+ooo-build-2.0.4
+
+    + features:
+	+ target OOO_2_0_4 (Petr)
+	+ initial support for cairocanvas on Win32 (Tor)
+	+ allow to build older bytecode with newer JDK (Petr)
+    + speed up:
+	+ save more space/time/code (Michael)
+	+ temporary disabled some dangerous speedup fixes (Rene)
+    + bug fixes:
+	+ lots VBA fixes and improvements (Noel, Jiao)
+	+ lots 64bit fixes (Caolan, Matthias, Jan)
+	+ input field dialog improvement (Zhang)
+	+ unopkg fails when Setup.xcu is missing (Rene)
+	+ optional argument issues (Michael)
+	+ use fontconfig for font fallback (Caolan, Matthias, Tor)
+	+ mozilla certificates detection (Rene)
+	+ some i18n support added (Robert)
+	+ wizard crash (Rene)
+    + build bits:
+	+ build with Xalan >= 2.7.x fix (Petr)
+	+ bashism fixes (Matthias)
+	+ prebuilt mono dlls update (Petr)
+	+ better support for system icu-3.6 (Rene, Caolan, Matthias)
+	+ mono stuff installation without root access (Petr)
+	+ clean up (Petr, Hanno)
+	+ updated Debian, Gentoo, Novell, Ubuntu bits (Rene, Andreas, Petr,
+	  Matthias)
+    + pending
+	+ enable using Windows Installer patch and upgrade functionality (Tor)
+
 ooo-build-ood680-m4
 
     + features:
@@ -23,7 +104,7 @@ ooo-build-ood680-m4
 	+ correct build and installation of the mono stuff (Petr)
 	+ updated Debian, Gentoo, Mandriva, Novell, Ubuntu (Rene, Andreas,
 	  Giuseppe,  Petr, Matthias)
-+ pending
+    + pending
 	+ enable using Windows Installer patch and upgrade functionality (Tor)
 
 ooo-build-ood680-m2
diff --git a/distro-configs/Debian.conf.in b/distro-configs/Debian.conf.in
index db7f24ea8..fedfc3248 100644
--- a/distro-configs/Debian.conf.in
+++ b/distro-configs/Debian.conf.in
@@ -2,6 +2,7 @@
 --enable-libsn
 --disable-fontooo
 --with-system-expat
+--with-system-odbc-headers
 --with-system-nas
 --with-system-curl
 --with-system-sane-header
diff --git a/etc/test.list b/etc/test.list
index 7992a51fe..25301b8c8 100644
--- a/etc/test.list
+++ b/etc/test.list
@@ -1,185 +1,226 @@
-# Tests started by Sun QA for OOo-2.0.3 on 17 May, 2006
-# See http://qa.openoffice.org/qatesttool/all_tests_ooo203.html
+# Tests started by Sun QA for OOo-2.0.4 on 30 August, 2006
+# See http://qa.openoffice.org/qatesttool/all_tests_ooo204.html
 framework/first/first.bas
 framework/first/topten.bas
+framework/basic/f_basic_basicdocuments.bas
+framework/basic/f_basic_extensions.bas
+framework/basic/f_basic_first.bas
+framework/basic/f_basic_formcontrols.bas
+framework/basic/f_basic_library_export_import.bas
+framework/basic/f_basic_meta-inf.bas
+framework/basic/f_basic_modules.bas
+framework/basic/f_basic_package_export_import.bas
+framework/basic/f_basic_protected_libraries.bas
+framework/basic/f_basic_spectemplate.bas
+framework/basic/f_basic_usertemplate.bas
+framework/basic/f_java_load_applets.bas
+framework/basic/f_scripting_addpkg.bas
+framework/basic/f_scripting_basics.bas
+framework/basic/f_scripting_organizers.bas
+framework/extras/extras_autotext.bas
+framework/extras/extras_drawobjects.bas
+framework/extras/extras_fonts.bas
+framework/extras/extras_labels.bas
+framework/extras/extras_sampleopen.bas
+framework/extras/extras_samplepreview.bas
+framework/extras/extras_tableautoformat.bas
+framework/extras/extras_templateopen.bas
+framework/extras/extras_templatepreview.bas
+framework/filedlg/filedlg_accented_foldernames.bas
+framework/filedlg/filedlg_attributes.bas
+framework/filedlg/filedlg_autocompletion.bas
+framework/filedlg/filedlg_cjkchars.bas
+framework/filedlg/filedlg_dialogtest.bas
+framework/filedlg/filedlg_filenames1.bas
+framework/filedlg/filedlg_filenames2.bas
+framework/filedlg/filedlg_filenames3.bas
+framework/filedlg/filedlg_folders.bas
+framework/filedlg/filedlg_passwords.bas
+framework/help/help_bookmarks.bas
+framework/help/help_compare_apps.bas
+framework/level1/f_function_toolbar_behavior.bas
 framework/level1/f_lvl1_loadsave.bas
+framework/level1/f_lvl1_ole.bas
+framework/level1/f_lvl1_tools.bas
 framework/level2/CJK/CJK_FeatureSwitch.bas
 framework/level2/CJK/CJK_GridLayout.bas
 framework/level2/CJK/CJK_RubyDialogueProposal.bas
 framework/level2/CJK/NewSortingAlgorithmForJapanese.bas
-framework/update/f_updt_help.bas
-framework/update/f_updt_templates.bas
-framework/update/f_updt_toolbars.bas
-framework/update/f_updt_spadmin.bas
-framework/basic/f_scripting_basics.bas
-framework/update/f_updt_firsttimewizard.bas
+framework/options/f_opt_loadsave.bas
+framework/options/f_opt_ooo.bas
+framework/security/f_sec_broken_signature.bas
+framework/security/f_sec_certification_dialogs.bas
+framework/security/f_sec_certified_docs.bas
+framework/security/f_sec_evilmacro.bas
+framework/security/f_sec_incorrect_password.bas
+framework/security/f_sec_macrosecurity.bas
+framework/security/f_sec_recommend_password.bas
 framework/update/f_updt_agendawizard.bas
-framework/basic/f_basic_first.bas
+framework/update/f_updt_autotext.bas
 framework/update/f_updt_basic.bas
 framework/update/f_updt_basicorganizer.bas
-framework/update/f_updt_presentationwizard.bas
+framework/update/f_updt_customize.bas
 framework/update/f_updt_documentconverter.bas
 framework/update/f_updt_euroconverter.bas
-framework/update/f_updt_wizard_webpage.bas
+framework/update/f_updt_faxwizard.bas
+framework/update/f_updt_firsttimewizard.bas
+framework/update/f_updt_help.bas
+framework/update/f_updt_letterwizard.bas
+framework/update/f_updt_optionitems.bas
+framework/update/f_updt_pkgmgr.bas
+framework/update/f_updt_presentationwizard.bas
 framework/update/f_updt_scriptnames.bas
-framework/update/f_updt_autotext.bas
-framework/update/f_updt_customize.bas
-framework/filedlg/filedlg_attributes.bas
-framework/filedlg/filedlg_autocompletion.bas
-framework/filedlg/filedlg_dialogtest.bas
-framework/extras/extras_drawobjects.bas
-framework/basic/f_basic_modules.bas
+framework/update/f_updt_spadmin.bas
+framework/update/f_updt_templates.bas
+framework/update/f_updt_toolbars.bas
 framework/update/f_updt_windowfuncs.bas
-framework/basic/f_scripting_addpkg.bas
-framework/security/f_sec_recommend_password.bas
-framework/basic/f_scripting_organizers.bas
-framework/help/help_search.bas
-framework/basic/f_basic_usertemplate.bas
-framework/basic/f_basic_package_export_import.bas
-framework/filedlg/filedlg_filenames1.bas
-framework/filedlg/filedlg_filenames2.bas
-framework/filedlg/filedlg_filenames3.bas
-framework/extras/extras_fonts.bas
-framework/extras/extras_labels.bas
-framework/extras/extras_samplepreview.bas
-framework/extras/extras_tableautoformat.bas
-framework/extras/extras_templatepreview.bas
-framework/update/f_updt_pkgmgr.bas
-framework/basic/f_basic_formcontrols.bas
-framework/level1/f_lvl1_tools.bas
-framework/security/f_sec_incorrect_password.bas
-framework/security/f_sec_certified_docs.bas
-framework/basic/f_basic_basicdocuments.bas
-framework/help/help_compare_apps.bas
-framework/basic/f_java_load_applets.bas
-framework/basic/f_basic_library_export_import.bas
-framework/security/f_sec_certification_dialogs.bas
-framework/help/help_compare_content.bas
-framework/help/help_bookmarks.bas
-framework/filedlg/filedlg_folders.bas
-framework/filedlg/filedlg_cjkchars.bas
-framework/extras/extras_autotext.bas
-framework/options/f_opt_ooo.bas
-framework/options/f_opt_loadsave.bas
-framework/filedlg/filedlg_passwords.bas
-writer/update/ma_updt.bas
-writer/update/w_updt.bas
-writer/update/ww_updt.bas
-writer/level1/w_redlining.bas
-writer/level1/w_insertgraphic.bas
-writer/level1/w_stylist.bas
+framework/update/f_updt_wizard_webpage.bas
 writer/level1/w_autotext.bas
-writer/level1/w_formatparagraph.bas
-writer/level1/w_formatpage.bas
-writer/level1/w_clipbrd.bas
-writer/level1/w_opt.bas
-writer/level1/w_search.bas
-writer/level1/w_navigator.bas
-writer/level1/w_spellcheck.bas
 writer/level1/w_calculate.bas
-writer/level1/w_numbering.bas
+writer/level1/w_clipbrd.bas
+writer/level1/w_dropdownLB.bas
+writer/level1/w_fontwork.bas
 writer/level1/w_formatcharacter.bas
+writer/level1/w_formatpage.bas
+writer/level1/w_formatparagraph.bas
 writer/level1/w_hyphenation.bas
-writer/loadsave/w_filter.bas
-writer/level1/w_dropdownLB.bas
-writer/loadsave/w_exp_xml2.bas
-writer/loadsave/w_imp_xml2.bas
-writer/loadsave/w_layout_regression.bas
+writer/level1/w_insertgraphic.bas
+writer/level1/w_issuezilla_regression.bas
+writer/level1/w_navigator.bas
+writer/level1/w_numbering.bas
+writer/level1/w_opt.bas
+writer/level1/w_redlining.bas
+writer/level1/w_search.bas
+writer/level1/w_section.bas
+writer/level1/w_shortcuts.bas
 writer/level1/w_sorting.bas
+writer/level1/w_spellcheck.bas
+writer/level1/w_stylist.bas
+writer/level1/w_table.bas
+writer/level1/ww_opt.bas
 writer/loadsave/w_exp_bin.bas
 writer/loadsave/w_exp_xml1.bas
+writer/loadsave/w_exp_xml2.bas
+writer/loadsave/w_filter.bas
 writer/loadsave/w_imp_bin.bas
 writer/loadsave/w_imp_xml1.bas
-writer/level1/w_shortcuts.bas
-calc/update/c_updt.bas
+writer/loadsave/w_imp_xml2.bas
+writer/loadsave/w_layout_regression.bas
+writer/update/ma_updt.bas
+writer/update/w_updt.bas
+writer/update/ww_updt.bas
+calc/level1/c_lvl1.bas
+calc/level1/c_lvl1_filter_names.bas
+calc/loadsave/calc_import_general.bas
 calc/options/c_opt.bas
-calc/special/keyboardaccessibility.bas
-calc/special/validity.bas
-calc/special/menu_2.bas
-calc/special/c_so7_pp1.bas
-calc/special/c_printrange.bas
-calc/special/c_namedrange.bas
 calc/special/c_chinesetranslate.bas
-calc/level1/c_lvl1_filter_names.bas
+calc/special/c_clipboardtest.bas
+calc/special/c_namedrange.bas
+calc/special/c_printrange.bas
+calc/special/c_so7_pp1.bas
 calc/special/fkt_test.bas
-chart/update/ch_updt.bas
+calc/special/keyboardaccessibility.bas
+calc/special/menu_2.bas
+calc/special/page_styles.bas
+calc/special/validity.bas
+calc/update/c_updt.bas
 chart/level1/ch_lvl1.bas
 chart/special/chart_types.bas
-graphics/update/gallery.bas
-graphics/update/i_updt_1.bas
-graphics/update/i_updt_2.bas
-graphics/level1/g_clipboard.bas
-graphics/level1/g_edit.bas
-graphics/level1/g_spellcheck.bas
-graphics/level1/g_toolbars.bas
-graphics/level1/i_shape.bas
+chart/update/ch_updt.bas
+spreadsheet/level1/c_lvl1_filter_names.bas
+spreadsheet/level2/c_namedrange.bas
+spreadsheet/level2/c_printrange.bas
+spreadsheet/level2/c_so7_pp1.bas
 graphics/level1/d_export_graphic.bas
-graphics/level1/i_export_graphic.bas
-graphics/options/i_opt.bas
 graphics/level1/g_accessability.bas
 graphics/level1/g_area.bas
 graphics/level1/g_arrangealign.bas
 graphics/level1/g_autocorrection.bas
-graphics/level1/i_view.bas
+graphics/level1/g_character.bas
+graphics/level1/g_clipboard.bas
+graphics/level1/g_clipexport.bas
 graphics/level1/g_convertto.bas
 graphics/level1/g_crossfading.bas
-graphics/level1/i_slideshow.bas
 graphics/level1/g_dimensions.bas
+graphics/level1/g_edit.bas
+graphics/level1/g_export_html.bas
 graphics/level1/g_findreplace.bas
+graphics/level1/g_format.bas
 graphics/level1/g_group.bas
 graphics/level1/g_imagemap.bas
+graphics/level1/g_insert.bas
+graphics/level1/g_line.bas
 graphics/level1/g_load_save.bas
+graphics/level1/g_mediaplayer.bas
 graphics/level1/g_navigator.bas
+graphics/level1/g_ole.bas
+graphics/level1/g_paneview.bas
+graphics/level1/g_paragraph.bas
+graphics/level1/g_print.bas
+graphics/level1/g_shaddow.bas
 graphics/level1/g_slidelayer.bas
+graphics/level1/g_spellcheck.bas
 graphics/level1/g_stylist.bas
+graphics/level1/g_toolbars.bas
+graphics/level1/g_tools.bas
+graphics/level1/g_zoom.bas
 graphics/level1/i_animation.bas
+graphics/level1/i_export_graphic.bas
 graphics/level1/i_headerfooter.bas
-graphics/level1/g_ole.bas
-graphics/level1/g_paneview.bas
-graphics/level1/g_mediaplayer.bas
 graphics/level1/i_pengine.bas
+graphics/level1/i_shape.bas
 graphics/level1/i_slidecopy.bas
+graphics/level1/i_slideshow.bas
+graphics/level1/i_view.bas
+graphics/options/d_opt.bas
+graphics/options/i_opt.bas
+graphics/update/d_updt.bas
 graphics/update/gallery2.bas
-graphics/level1/g_character.bas
-graphics/level1/g_clipexport.bas
-graphics/level1/g_export_html.bas
-graphics/level1/g_format.bas
-graphics/level1/g_insert.bas
-graphics/level1/g_line.bas
-graphics/level1/g_paragraph.bas
-graphics/level1/g_print.bas
-graphics/level1/g_tools.bas
-graphics/level1/g_zoom.bas
-graphics/level1/g_shaddow.bas
+graphics/update/gallery.bas
+graphics/update/i_updt_1.bas
+graphics/update/i_updt_2.bas
 math/level1/m_lvl1.bas
-base/update/xforms_updt.bas
+math/update/m_updt.bas
+base/level1/controls/b_lvl1_Control_Autopilot.bas
+base/level1/controls/b_lvl1_Control_Calc.bas
+base/level1/controls/b_lvl1_Control_Clipboard.bas
+base/level1/controls/b_lvl1_Control_General.bas
+base/level1/controls/b_lvl1_Control_Several.bas
+base/level1/controls/b_lvl1_Grid_Control.bas
+base/level1/controls/b_lvl1_Property_Browser.bas
+base/level1/controls/b_lvl1_Text_Control.bas
+base/level1/datasources/b_lvl1_AdabasD.bas
 base/level1/datasources/b_lvl1_Addressbook.bas
-base/level1/datasources/b_lvl1_RegisterDatabase.bas
 base/level1/datasources/b_lvl1_ADO-Access.bas
-base/level1/datasources/b_lvl1_AdabasD.bas
+base/level1/datasources/b_lvl1_dBase.bas
+base/level1/datasources/b_lvl1_dBase_functions.bas
+base/level1/datasources/b_lvl1_hsqldb.bas
 base/level1/datasources/b_lvl1_JDBC_MySQL.bas
+base/level1/datasources/b_lvl1_ODBC_MySQL.bas
+base/level1/datasources/b_lvl1_RegisterDatabase.bas
 base/level1/datasources/b_lvl1_Spreadsheet.bas
 base/level1/datasources/b_lvl1_Text.bas
-base/level1/datasources/b_lvl1_dBase.bas
-base/level1/datasources/b_lvl1_dBase_functions.bas
-base/level1/wizards/b_lvl1_Database_Wizard.bas
+base/level1/forms/b_lvl1_FormFilter.bas
+base/level1/forms/b_lvl1_Forms.bas
+base/level1/performance/b_lvl1_Performance_General.bas
 base/level1/wizards/b_lvl1_Copy_Table_Autopilot.bas
+base/level1/wizards/b_lvl1_Database_Wizard.bas
 base/level1/wizards/b_lvl1_FormAutopilot.bas
 base/level1/wizards/b_lvl1_QueryAutopilot.bas
 base/level1/wizards/b_lvl1_ReportAutopilot.bas
-base/level1/performance/b_lvl1_Performance_General.bas
-base/level1/controls/b_lvl1_Control_Autopilot.bas
-base/level1/controls/b_lvl1_Control_Clipboard.bas
+base/level1/wizards/b_lvl1_Table_Wizard.bas
 base/level1/xforms/xf_lvl1_submission.bas
-xml/update/oasis_graphics_update.bas
+base/update/b_updt.bas
+base/update/xforms_updt.bas
 xml/level1/calc_xml_7_export.bas
-xml/level1/draw_xml_7_export.bas
-xml/level1/impress_xml_7_export.bas
-xml/level1/math_xml_7_export.bas
 xml/level1/c_datapilot_pagefields.bas
-xml/level1/docbook_losa.bas
+xml/level1/ch_xml_japanese_candlestick.bas
 xml/level1/c_xml_print_scale.bas
-xml/level1/f_xml_save_ms_ole.bas
 xml/level1/c_xml_scenario.bas
+xml/level1/docbook_losa.bas
+xml/level1/draw_xml_7_export.bas
+xml/level1/f_xml_save_ms_ole.bas
+xml/level1/impress_xml_7_export.bas
+xml/level1/math_xml_7_export.bas
 xml/level1/writer_xml_7_export.bas
-xml/level1/ch_xml_japanese_candlestick.bas
+xml/update/oasis_graphics_update.bas
diff --git a/patches/src680/apply b/patches/src680/apply
index ce3d867c8..3de89a9fc 100644
--- a/patches/src680/apply
+++ b/patches/src680/apply
@@ -6,14 +6,14 @@
 
 PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../scsolver:../gstreamer
 
-OLDEST_SUPPORTED=ood680-m1
+OLDEST_SUPPORTED=ood680-m5 OOO_2_0_4
 
 # -------- Functional sub-sets --------
 
 Common : BuildBits, ParallelMake, TemporaryHacks, FixesNotForUpstream, \
-	 Fixes, Defaults, Features, VCL, Misc, \
+	 Fixes, FedoraFixes, Defaults, Features, VCL, Misc, \
 	 Icons, Branding, VBABits, VBAObjects, CalcFixes, Leaks, Egg, \
-	 QuickStartTray, SpeedImageList, GStreamer, Shrink
+	 QuickStartTray, SpeedImageList, GStreamer
 LinuxCommon : Common, BuildBitsLinuxOnly, LinuxOnly, SystemBits, CWSBackports, GCJ, \
 	      QPro, Lwp, cairocanvas, msaccess, KDE, \
 	      64bitPatches, FPickers, Mono, AddressBooks, QuickStarter
@@ -31,9 +31,10 @@ SUSE-9.2  : NovellBase
 SUSE-9.3  : NovellBase
 SUSE-10.0 : NovellBase
 SUSE-10.1 : NovellBase, BerkeleyDB43
+SUSE-10.2 : NovellBase, BerkeleyDB43
 SUSE      : NovellBase, BerkeleyDB43
-SUSE-PPC  : NovellBase, BerkeleyDB43, SystemJavaBits, GCJWorkaround
-SUSE-64   : NovellBase, BerkeleyDB43, 64bit, GCJWorkaround
+SUSE-PPC  : NovellBase, BerkeleyDB43, SystemJavaBits, GCJWorkaround, NovellGCJWorkaround
+SUSE-64   : NovellBase, BerkeleyDB43, 64bit, GCJWorkaround, NovellGCJWorkaround
 # Debian
 DebianBase : LinuxCommon, DebianBaseOnly, SystemJavaBits, Lockdown, STLport5, CalcSolver
 Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, BerkeleyDB43, ICU36
@@ -133,9 +134,6 @@ smoketest-noinstall.diff, martink
 # also guess office path from testtool.bin path i#FIXME?
 testtool-more-defaults.diff, martink
 
-#Fix new file save error in ood-m1 and ood-m2
-#sfx2-docfile-newfilesave.diff, i#69232 jianhua
-
 #Fix plus/minus in to each heading in Navigator
 plus-minus-sw-navigator.diff, i#64886, n#129410, jianhua
 
@@ -168,6 +166,9 @@ sal-doublefree.diff, i#67740, mklose
 # extract of cmcfixes28
 cws-cmcfixes28.diff
 
+# fix build with newer gccs
+buildfix-gcc-4.1.2-NULL.diff, rengelha, i#70684
+
 # [ LinuxOnly ]
 
 # use fontconfig for font fallback
@@ -177,10 +178,6 @@ fontconfig-substitute.diff, i#54603, mklose
 fontconfig-substitute2.diff, i#54603, mklose
 fontconfig-substitute3.diff, i#54603, mklose
 
-[ TemporaryHacks < ood680-m2 ]
-# Fix check for KDE version in configure.in
-buildfix-configurein.diff, i#68299, jholesov
-
 
 [ GCJ ]
 
@@ -217,11 +214,15 @@ uses-vfs.diff, i#43504, michael
 # add mozilla certificate dir detection to soffice
 soffice-detect-mozilla-certificates.diff
 
-[ Fixes < ood680-m5 ]
-# Fix for unpkg working as root (system-wide extensions)
-cws-jl47.diff, i#69642, rengelha
 
 [ Fixes ]
+# backport of i70759/vclshowstop07 cws
+vcl-vclshowstop07-i70759.diff, i#70759, rodo
+
+# backport revision 1.31.61.1 from cws impress107 to fix crash on
+# the impress wizard
+sd-slideshowimpl-check-for-viewframe.diff, i#69530
+
 # let sd accept uri-list drop, n#183719
 sd-accept-uri-list-drop.diff, n#183719, rodo
 
@@ -246,6 +247,12 @@ sw-bullet-interop-fix.diff, michael
 wizards-crasher-fix.diff, i#68079, michael
 # update pyuno docs from www.oo.o
 pyuno-update-docs.diff, i#63846, michael
+# replace PyMem_DEL() with PyObject_Del() on object dealloc functions to free
+# objects the right way (regcomp segfaulted on openSUSE-10.2)
+# replace PyObject_NEW with PyObject_New because the macro version most
+# probably does not preserve binary compatibility across Python versions
+# and is therefore deprecated in extension modules.
+pyuno-objects-allocation.diff, i#71078, pmladek
 # disable font management dialog in padmin
 padmin-nofontconfig.diff, michael
 # Improve the web bullet export / export to png not gif.
@@ -333,6 +340,12 @@ basic-dfltmethod-bug.diff, i#69718, noelpwer
 # remaining bits from cws sixtyfour08, fixes crash in base on amd64.
 cws-sixtyfour08.diff, mklose
 
+# Mozilla/Thunderbird addressbook filename encoding issue
+mozilla-ab-filename-encoding.diff, i#69327, rvojta
+
+# fix crash in impress/draw on amd64
+sd.sal_uInt32_aslong.diff, i#70601
+
 [ Leaks ]
 
 # silly leaks around the place
@@ -448,6 +461,8 @@ sc-xls-pivot-optimization.diff, i#63686, jody
 sc-xls-builtin-name-scope.diff, jody
 # hash item collections, i#TODO, jody
 sc-dp-hash-items.diff, jody
+# sc-dp-gridlayout.diff, i#68544 n#190970, jody
+sc-dp-gridlayout.diff, jody
 # div/0 error export by other functions
 sc-div-errs.diff, i#47724, muthusub
 # Allow Cols/Rows to be resized even if document is read-only, n#TODO, jody
@@ -476,12 +491,15 @@ vba-sc-handleautoshapemacro-import.diff, i#59082, noelpwer
 vba-sc-autoshapes-hyperlinks.diff, i#66550, noelpwer
 
 # Shrink CellInfo size
-sc-size-fillinfo.diff, i#68672, michael
+#sc-size-fillinfo.diff, i#68672, michael
 
 # Fix optional argument isses
 sc-optional.diff, i#70041, michael
 sc-optional-addins.diff, i#70041, michael
 
+# CSV saved with .XLS extension should load in calc
+sc-detect-csv-saved-as-xls.diff, i#70809, jholesov
+
 [ LinuxOnly ]
 
 # Modify the fpicker makefile causing problems in the win32 build
@@ -721,12 +739,8 @@ sc-standard-filter-options-i18n.diff, i#35579, michael
 # localization if they are not translated
 sc-standard-filter-options-i18n-fake.diff, i#66473, pmladek
 
-[ SDFPatches > ood680-m1 ]
 recovery-disabled-crashreporter-localize.diff, i#65325, jholesov
 
-[ SDFPatches <= ood680-m1 ]
-recovery-disabled-crashreporter-localize-ood680-m1.diff, i#65325, jholesov
-
 
 [ Features ]
 
@@ -736,6 +750,14 @@ session-management.diff, i#63156, rodo
 # Implementation of the layered accelerators
 framework-layered-accelerators.diff, i#64717, jholesov
 
+# search <ooo-home>/share/template/common for language independent templates
+# will not push it upstream because it will be replaced by upcomming kendy's work
+office-cfg-common-template-dir.diff, pmladek
+
+# add new category "Labels" for blank Labels, calling cards, CD labels, etc.
+# will not push it upstream because it will be obsoleted by upcomming kendy's work
+sfx2-template-category-labels.diff, pmladek
+
 [ BuildBits ]
 # do an optimizing link
 build-optimized-link.diff, michael
@@ -789,15 +811,6 @@ lfs.diff, i#26865, rengelha
 # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken, n#195272
 libxmlsec-system-nss.diff, i#69368, pmladek
 
-[ BuildBits < ood680-m2 ]
-# forgotten location after the change SalData -> X11SalData
-buildfix-vcl-with-libsn-GetX11SalData.diff, i#68668, pmladek
-
-# fix --enable-symbols build on ppc
-ppc-symbols-fix.diff, rengelha
-
-# fix Xinerama check for X11R7 (regression in m178)
-x11r7-fix-xinerama-check.diff, rengelha
 
 [ MandrivaOnly ]
 SectionOwner => gghibo
@@ -892,6 +905,8 @@ warning-uninitialized-variables-binfilter.diff
 # FIXME file up-stream
 sixtyfour-warnings-binfilter.diff, jholesov
 
+# fix build with newer gccs
+buildfix-binfilter-gcc-4.1.2-NULL.diff, rengelha, i#70684
 
 [ VCL ]
 
@@ -1088,6 +1103,8 @@ system-portaudio-use-lpthread.diff, hmth
 64bit-jdk-server-paths.diff, i#65974, hmth
 # use IBM j9vm over IBM classic JVM
 ibm-j9vm.diff, hmth
+# Fix for some execstacks in libgcc3_uno.so, i#70845, aprosky
+libgcc3_uno_noexecstack.diff
 
 [ DebianBaseOnly ]
 SectionOwner => rengelha
@@ -1474,12 +1491,10 @@ vba_configure_set_soenv_in.diff
 vba-mscompat-wait.diff, i#64882
 vba-support-export-palette.diff, i#68900
 
-[ VBAObjects > ood680-m6 ]
-cws-npower3.diff, i#64377
-
-[ VBAObjects <= ood680-m6 ]
 cws-npower3-m4.diff, i#64377
 
+vba-basic-array-erase.diff, i#70380
+
 [ VBAObjects ]
 vba-basic-default.diff, i#64884
 
@@ -1493,6 +1508,9 @@ vba-build.diff,  i#68883
 # be global ( when vbasupport is enabled )
 vba-modscopevariable.diff
 
+# when reading module source ( ala existing compatibilty switch )
+vba-accent-in-module.diff, n#214312
+
 # allow us to get the data set ( sfxitemset) associated
 # with a range but that doesn't have ClearInvalidItems() applied
 # to it
@@ -1545,6 +1563,9 @@ config_office-hsqldb-no-java.diff, i#64921, brosenk
 # link native HelpLinker to system jars
 native-HelpLinker-use-system-libs.diff, i#67323, hmth
 
+# fix build with hsqldb 1.8.0.7
+buildfix-hsqldb-1-8-0-7.diff, rengelha
+
 [ GCJWorkaround ]
 # Workaround "error: final field 'XYZ' may not have been initialized"
 # FIXME: Compile to .jar first
@@ -1553,6 +1574,11 @@ gcj-workaround-uninitialized-final.diff, jholesov
 # Will be gone after we have ecj in openSUSE...
 use-system-xt-workaround.diff, jholesov
 
+[ NovellGCJWorkaround ]
+# huh, gcj still compiles private/protected members a wrong way
+# I got the following error when trying to edit table in oobase using hsqldb.jar that was compiled with gcj:
+# General error: java.lang.IllegalAccessError: org.hsqldb.HsqlNameManager$HsqlName: org.hsqldb.HsqlNameManager.serialNumber
+hsqldb-gcj-access-problems.diff, pmladek
 
 [ STLport5 ]
 SectionOwner => hmth
@@ -1772,7 +1798,7 @@ gnome2.16-no-bonobo.diff, doko
 unxlngi6-notune.diff, doko
 ubuntu-no-stack-protector.diff, doko
 
-[ DebianBase ]
+[ FedoraFixes ]
 ooo67658.sfx2.reloadcrash.diff
 ooo67716.svx.overflow.diff
 ooo67781.sc.reloadhiddenrows.diff
@@ -1780,10 +1806,12 @@ ooo67976.svx.macroscrash.diff
 ooo68048.vcl.imsurroundtext.diff
 ooo68919.sc.atk.diff
 ooo69236.slideshow.esccrash.diff
-ooo69530.sd.crash.diff
 oooXXXXX.vcl.x86_64.impressatk.diff
 workspace.calc39.diff
 workspace.vcl65.diff
+ooo69620.vcl.atkcombo.diff
+ooo70361.vcl.atkfilechooser.diff
+ooo70782.secondaryfpicker.atk.diff
 
 [ SpeedImageList ]
 speed-image.diff, i#66680, michael
@@ -1840,3 +1868,6 @@ size-configmgr-template.diff
 # kill >1Mb of bloat in sal, i#70166
 #size-sal-textenc.diff
 
+
+[ ParallelMake ]
+scp2-parallel-build-fix.diff
diff --git a/patches/src680/buildfix-hsqldb-1-8-0-7.diff b/patches/src680/buildfix-hsqldb-1-8-0-7.diff
new file mode 100644
index 000000000..ffe36271b
--- /dev/null
+++ b/patches/src680/buildfix-hsqldb-1-8-0-7.diff
@@ -0,0 +1,36 @@
+Index: com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
+===================================================================
+RCS file: /cvs/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java,v
+retrieving revision 1.7
+diff -u -u -r1.7 StorageFileAccess.java
+--- connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java	8 Sep 2005 04:55:55 -0000	1.7
++++ connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java	28 Oct 2006 16:05:36 -0000
+@@ -80,16 +80,20 @@
+         return new NativeOutputStreamHelper(key,streamName);
+     }
+ 
+-    public void removeElement(java.lang.String filename) throws java.util.NoSuchElementException, java.io.IOException {
+-        if ( isStreamElement(key,filename) )
+-            removeElement(key,filename);
++    public void removeElement(java.lang.String filename) throws java.util.NoSuchElementException {
++        try {
++            if ( isStreamElement(key,filename) )
++                removeElement(key,filename);
++	} catch (java.io.IOException e) {}
+     }
+ 
+-    public void renameElement(java.lang.String oldName, java.lang.String newName) throws java.util.NoSuchElementException, java.io.IOException {
+-        if ( isStreamElement(key,oldName) ){
+-            removeElement(key,newName);
+-            renameElement(key,oldName, newName);
+-        }
++    public void renameElement(java.lang.String oldName, java.lang.String newName) throws java.util.NoSuchElementException {
++        try {
++            if ( isStreamElement(key,oldName) ){
++                removeElement(key,newName);
++                renameElement(key,oldName, newName);
++            }
++       } catch (java.io.IOException e) {}
+     }
+ 
+     public class FileSync implements FileAccess.FileSync
diff --git a/patches/src680/sc-save-password-minlength.diff b/patches/src680/sc-save-password-minlength.diff
index da4d0fd8a..f8f1fd763 100644
--- a/patches/src680/sc-save-password-minlength.diff
+++ b/patches/src680/sc-save-password-minlength.diff
@@ -34,7 +34,7 @@ diff -u -r ../src680-m78.bak/sfx2/source/dialog/passwd.hrc sfx2/source/dialog/pa
 diff -u -r ../src680-m78.bak/sfx2/source/dialog/passwd.src sfx2/source/dialog/passwd.src
 --- ../src680-m78.bak/sfx2/source/dialog/passwd.src	2005-02-23 17:00:37.000000000 +0530
 +++ sfx2/source/dialog/passwd.src	2005-02-24 09:56:29.023722648 +0530
-@@ -117,6 +117,13 @@
+@@ -117,6 +117,15 @@
  		Pos = MAP_APPFONT( 57, 44 );
  		Size = MAP_APPFONT( 75, 12 );
  	};
@@ -44,6 +44,8 @@ diff -u -r ../src680-m78.bak/sfx2/source/dialog/passwd.src sfx2/source/dialog/pa
 +		Size = MAP_APPFONT( 82, 10 );
 +		Text [ de ] = "";
 +		Text [ en-US ] = "(Minimum 5 characters)"; 
++		Text [ cs ] = "(Minimálně 5 znaků)";
++		Text [ sk ] = "(Najmenej 5 znakov)";
 +	};
      FixedLine GB_PASSWD_PASSWORD
  	{
diff --git a/patches/src680/vcl-vclshowstop07-i70759.diff b/patches/src680/vcl-vclshowstop07-i70759.diff
new file mode 100644
index 000000000..7998e5153
--- /dev/null
+++ b/patches/src680/vcl-vclshowstop07-i70759.diff
@@ -0,0 +1,41 @@
+--- vcl/source/gdi/sallayout.cxx.O	2006-11-07 18:46:54.000000000 +0100
++++ vcl/source/gdi/sallayout.cxx	2006-11-07 18:47:00.000000000 +0100
+@@ -1198,27 +1198,28 @@
+ 
+             // do not stretch non-stretchable glyphs
+             if( (pG->mnOrigWidth <= 0) || (nStretchable <= 0) )
+-	        continue;
++                continue;
+ 
+             // distribute extra space equally to stretchable glyphs
+             int nDeltaWidth = nDiffWidth / nStretchable--;
+             nDiffWidth     -= nDeltaWidth;
+             pG->mnNewWidth += nDeltaWidth;
+             nDeltaSum      += nDeltaWidth;
+-	}
++        }
+     }
+     else // condensed case
+     {
+-	// squeeze width by moving glyphs proportionally
++        // squeeze width by moving glyphs proportionally
++        double fSqueeze = (double)nNewWidth / nOldWidth;
+         for( pG = mpGlyphItems; ++pG < pGRight;)
+-	{
+-	    int nX = pG->maLinearPos.X() - maBasePoint.X();
+-	    nX = nX * nNewWidth / nOldWidth;
+-	    pG->maLinearPos.X() = nX + maBasePoint.X();
+-	}
+-	// adjust glyph widths to new positions
++        {
++            int nX = pG->maLinearPos.X() - maBasePoint.X();
++            nX = (int)(nX * fSqueeze);
++            pG->maLinearPos.X() = nX + maBasePoint.X();
++        }
++        // adjust glyph widths to new positions
+         for( pG = mpGlyphItems; pG < pGRight; ++pG )
+-	    pG->mnNewWidth = pG[1].maLinearPos.X() - pG[0].maLinearPos.X();
++            pG->mnNewWidth = pG[1].maLinearPos.X() - pG[0].maLinearPos.X();
+     }
+ }
+ 
diff --git a/patches/vba/vba-accent-in-module.diff b/patches/vba/vba-accent-in-module.diff
new file mode 100644
index 000000000..a268f2325
--- /dev/null
+++ b/patches/vba/vba-accent-in-module.diff
@@ -0,0 +1,14 @@
+--- /data4/sles/ooo-build-LATEST-copy/ooo-build/build/ood680-m5/basic/source/classes/sbxmod.cxx	2006-10-19 11:56:13.000000000 +0100
++++ basic/source/classes/sbxmod.cxx	2006-10-23 11:20:09.000000000 +0100
+@@ -543,6 +543,11 @@ void SbModule::SetSource32( const ::rtl:
+ 					eCurTok = aTok.Next();
+ 					if( eCurTok == COMPATIBLE )
+ 						aTok.SetCompatible( true );
++					else if ( eCurTok == VBASUPPORT )
++					{
++						if( ( aTok.Next() == NUMBER ) && ( aTok.GetDbl()== 1 ) )
++							aTok.SetCompatible( true );
++					}
+ 				}
+ 			}
+ 			eLastTok = eCurTok;
diff --git a/patches/vba/vba-basic-globals.diff b/patches/vba/vba-basic-globals.diff
index 5d02b24d4..952c91195 100644
--- a/patches/vba/vba-basic-globals.diff
+++ b/patches/vba/vba-basic-globals.diff
@@ -24,7 +24,7 @@ diff -u -r1.23 sb.cxx
 +#ifdef ENABLE_VBA
 +SbxArray* getVBAGlobals(StarBASIC* pSBasic, const String &rForName )
 +{
-+	if ( !SbiRuntime::isVBAEnabled() )
++	if ( !SbiRuntime::isVBAEnabled() || !pSBasic->IsSet( SBX_GBLSEARCH )  )
 +	{
 +		return NULL;
 +	}
@@ -145,16 +145,9 @@ retrieving revision 1.11
 diff -u -r1.11 makefile.mk
 --- basic/source/classes/makefile.mk	25 Aug 2003 14:51:18 -0000	1.11
 +++ basic/source/classes/makefile.mk	12 Aug 2005 09:51:08 -0000
-@@ -66,12 +66,17 @@
- TARGET=classes
- LIBTARGET=NO
- 
-+
- # --- Settings -----------------------------------------------------------
- 
- ENABLE_EXCEPTIONS=TRUE
- 
+@@ -46,6 +46,10 @@
  .INCLUDE :  settings.mk
+ .INCLUDE : $(PRJ)$/util$/makefile.pmk
  
 +.IF "$(ENABLE_VBA)"=="YES"
 +	CDEFS+=-DENABLE_VBA
diff --git a/patches/vba/vba-support-export-palette.diff b/patches/vba/vba-support-export-palette.diff
index 4feab0705..fafd2c264 100644
--- a/patches/vba/vba-support-export-palette.diff
+++ b/patches/vba/vba-support-export-palette.diff
@@ -23,7 +23,7 @@ retrieving revision 1.26
 diff -u -p -r1.26 xistyle.cxx
 --- sc/source/filter/excel/xistyle.cxx	13 Jan 2006 16:58:37 -0000	1.26
 +++ sc/source/filter/excel/xistyle.cxx	13 Mar 2006 12:58:17 -0000
-@@ -136,11 +136,72 @@
+@@ -136,11 +136,71 @@
  
  #include "root.hxx"
  
@@ -72,7 +72,7 @@ diff -u -p -r1.26 xistyle.cxx
 +    if( SfxObjectShell* pDocShell = mrRoot.GetDocShell() )
 +    {
 +        // copy values in color palette
-+        sal_Int16 nColors =  maColorTable.size() ? maColorTable.size() : GetColorCount();
++        sal_Int16 nColors =  maColorTable.size();
 +        ColorDataVec aColors;
 +        aColors.resize( nColors );
 +        for( sal_uInt16 nIndex = 0; nIndex < nColors; ++nIndex )
@@ -93,7 +93,6 @@ diff -u -p -r1.26 xistyle.cxx
 -    XclDefaultPalette( rRoot )
 +    XclDefaultPalette( rRoot ), mrRoot( rRoot )
  {
-+    ExportPalette();
  }
  
  ColorData XclImpPalette::GetColorData( sal_uInt16 nXclIndex ) const