This commit was manufactured by cvs2svn to create tagOOO_BUILD_1_9_125_1_2

'OOO_BUILD_1_9_125_1_2'.

11 files changed, 231 insertions, 131 deletions

diff --git a/NEWS b/NEWS
index 9f56fb83c..3dfd2af7e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,26 @@
+ooo-build-1.9.125.1.2
+
+    + bug fixes:
+	+ disabled some unchecked patches (Michael)
+	+ check buttons rendering problem (Raul)
+
+ooo-build-1.9.125.1.1
+
+    + bug fixes:
+	+ set file type by extension in GTK+ fpicker (Raul)
+	+ do not install mono cli_*.dll files twice (Petr)
+	+ do not run crash_report when it is not built (Petr)
+	+ show text correctly with cairo-1.0.0 (Radek)
+	+ ooconfig improvements and fixes (Raul)
+	+ man page fixes (Petr)
+	+ proper fix for bullets exported to MS (Raul)
+	+ disable cairo by default (Michael)
+	+ crash with GTK+ fpicker (Michael)
+	+ crashing while inserting slides (Radek)
+	+ unnecessary duplicities in sub-packages (Petr)
+    + build bits:
+	+ allow to apply the extra localizations sources correctly (Petr)
+
 ooo-build-1.9.125.1
 
     + bug fixes:
diff --git a/bin/build-ooo b/bin/build-ooo
index d868799ac..73bcf5f75 100755
--- a/bin/build-ooo
+++ b/bin/build-ooo
@@ -144,7 +144,7 @@ if test "z$extra_trans_langs" != "z" ; then
     perl $SOLARENV/bin/deliver.pl || exit 1;
    
     echo "Fixing localize.sdf permissions..."
-    find . -type f -name "localize.sdf" -exec chmod 644 {} \;
+    find $OOBUILDDIR -type f -name "localize.sdf" -exec chmod 644 {} \;
 
     for langcode in $extra_trans_langs ; do
 	# merge the available localization
diff --git a/bin/ooconfig b/bin/ooconfig
index 3363dd124..853951869 100644
--- a/bin/ooconfig
+++ b/bin/ooconfig
@@ -6,7 +6,7 @@ use strict;
 #   bool: enable-$/disable-$, int,string: set-$
 
 # setting name	-> [ '/path/to/key',
-#                    'bool|string|int|enum,a,b,c|custom',
+#                    'bool|string|int|custom',
 #                    '<help-description>',
 #                    &custom_func ]
 my $path_idx = 0;
@@ -24,49 +24,35 @@ my $settings = {
     'enable-menu-inactive-items' => [ '/apps/openoffice/show_menu_inactive_items', 'bool', 'Show inactive menu items' ],
     'enable-opengl' => [ '/apps/openoffice/use_opengl', 'bool', 'Use OpenGL' ],
     'enable-optimize-opengl' => [ '/apps/openoffice/optimize_opengl', 'bool', 'Optimized output for OpenGL' ],
-    'enable-printing' => [ '/desktop/gnome/lockdown/disable_printing', 'custom', 'Allow printing', \&inverted_boolean ],
+    'enable-printing' => [ '/desktop/gnome/lockdown/disable_printing', 'custom:bool', 'Allow printing', \&inverted_boolean ],
     'enable-printing-modifies-doc' => [ '/apps/openoffice/printing_modifies_doc', 'bool', 'Printing sets document-modified status' ],
     'enable-recommend-password-on-save' => [ '/apps/openoffice/lockdown/recommend_password_on_save', 'bool', 'Recommend password protection on saving' ],
     'enable-remove-personal-info-on-save' => [ '/apps/openoffice/lockdown/remove_personal_info_on_save', 'bool', 'Remove personal information on saving' ],
     'enable-system-file-dialog' => [  '/apps/openoffice/use_system_file_dialog', 'bool', 'Use system file dialogs' ],
     'enable-system-font' => [  '/apps/openoffice/use_system_font', 'bool', 'Use system font for user interface' ],
-    'enable-ui-customization' => [ '/apps/openoffice/lockdown/disable_ui_customization', 'custom', 'Allow UI customization', \&inverted_boolean ],
+    'enable-ui-customization' => [ '/apps/openoffice/lockdown/disable_ui_customization', 'custom:bool', 'Allow UI customization', \&inverted_boolean ],
     'enable-warn-alien-format' => [ '/apps/openoffice/warn_alien_format', 'bool', 'Warn when not saving in OpenDocument or default format' ],
     'enable-warn-info-create-pdf' => [ '/apps/openoffice/lockdown/warn_info_create_pdf', 'bool', 'Warn if document contains information on creating pdf' ],
     'enable-warn-info-printing' => [ '/apps/openoffice/lockdown/warn_info_printing', 'bool', 'Warn if document contains information on printing' ],
     'enable-warn-info-signing' => [ '/apps/openoffice/lockdown/warn_info_signing', 'bool', 'Warn if document contains information on signing' ],
     'enable-warn-info-saving' => [ '/apps/openoffice/lockdown/warn_info_saving', 'bool', 'Warn if document contains information on saving' ],
     'set-auto-save-interval' => [ '/apps/openoffice/auto_save_interval', 'int', 'Minutes to save AutoRecovery information' ],
+    'set-defaults' => [ 'dummy for help', 'dummy for help', 'Revert to default settings' ],
     'set-font-anti-aliasing-min-pixel' => [  '/apps/openoffice/font_anti_aliasing_min_pixel', 'int', 'Pixels to use screen font antialiasing from' ],
-    'set-icon-size' => [ '/apps/openoffice/icon_size', 'custom', 'Icon size', \&parse_icon_size ],
-    'set-macro-security-level' => [ '/apps/openoffice/lockdown/macro_security_level', 'custom', 'Macro security level', \&parse_macro_security_level ],
-    'set-mailer-program' => [ '/desktop/gnome/url-handlers/mailto/command', 'custom', 'E-mail program', \&mailer_add_for_gconf ],
-    'set-proxy-mode' => [ '/system/proxy/mode', 'custom', 'Proxy server mode', \&parse_proxy_mode ],
-    'set-proxy-http-host' => [ '/system/http_proxy/host', 'string', 'HTTP Proxy' ],
-    'set-proxy-http-port' => [ '/system/http_proxy/port', 'int', 'HTTP Proxy Port' ],
-    'set-proxy-ftp-host' => [ '/system/proxy/ftp_host', 'string', 'FTP Proxy' ],
-    'set-proxy-ftp-port' => [ '/system/proxy/ftp_port', 'int', 'FTP Proxy Port' ],
+    'set-icon-size' => [ '/apps/openoffice/icon_size', 'custom:int', 'Icon size', \&parse_icon_size ],
+    'set-macro-security-level' => [ '/apps/openoffice/lockdown/macro_security_level', 'custom:int', 'Macro security level', \&parse_macro_security_level ],
     'set-undo-steps' => [ '/apps/openoffice/undo_steps', 'int', 'Number of Undo steps' ],
-    'set-writer-default-document' => [ '/apps/openoffice/writer_default_document_format', 'custom', 'Default Writer file format', \&parse_writer ],
-    'set-calc-default-document' => [ '/apps/openoffice/calc_default_document_format', 'custom', 'Default Calc file format', \&parse_calc ],
-    'set-impress-default-document' => [ '/apps/openoffice/impress_default_document_format', 'custom', 'Default Impress file format', \&parse_impress ]
+    'set-writer-default-document' => [ '/apps/openoffice/writer_default_document_format', 'custom:string', 'Default Writer file format', \&parse_writer ],
+    'set-calc-default-document' => [ '/apps/openoffice/calc_default_document_format', 'custom:string', 'Default Calc file format', \&parse_calc ],
+    'set-impress-default-document' => [ '/apps/openoffice/impress_default_document_format', 'custom:string', 'Default Impress file format', \&parse_impress ]
 };
 
 sub inverted_boolean($$$)
 {
     my ($attrs, $key, $value) = @_;
-    $attrs->[$type_idx]='bool';
     return '0' if ($value eq 'yes');
     return '1' if ($value eq 'no');
-    die "impossible";
-}
-
-sub mailer_add_for_gconf($$$)
-{
-    my ($attrs, $key, $value) = @_;
-    $attrs->[$type_idx]='string';
-    return $value . " %s";
-    die "impossible";
+    die "Error: supported values of $key are yes|no: $value is invalid\n";
 }
 
 sub validate_enum($$$)
@@ -88,7 +74,6 @@ sub parse_icon_size($$$)
 {
     my ($attrs, $key, $value) = @_;
     validate_enum ("small,large,auto", $value, $key);
-    $attrs->[$type_idx]='int';
     return '0' if ($value eq 'small');
     return '1' if ($value eq 'large');
     return '2' if ($value eq 'auto');
@@ -99,7 +84,6 @@ sub parse_macro_security_level($$$)
 {
     my ($attrs, $key, $value) = @_;
     validate_enum ("low,medium,high,veryhigh", $value, $key);
-    $attrs->[$type_idx]='int';
     return '0' if ($value eq 'low');
     return '1' if ($value eq 'medium');
     return '2' if ($value eq 'high');
@@ -107,20 +91,10 @@ sub parse_macro_security_level($$$)
     die "impossible";
 }
 
-sub parse_proxy_mode($$$)
-{
-    my ($attrs, $key, $value) = @_;
-    validate_enum ("none,manual,auto", $value, $key);
-    $attrs->[$type_idx]='string';
-    return $value if ($value eq 'none' || ($value eq 'manual') || ($value eq 'sxw'));
-    die "impossible";
-}
-
 sub parse_writer($$$)
 {
     my ($attrs, $key, $value) = @_;
     validate_enum ("odt,doc,sxw", $value, $key);
-    $attrs->[$type_idx]='string';
     return "writer8" if ($value eq 'odt');
     return "MS Word 97" if ($value eq 'doc');
     return "StarOffice XML (Writer)" if ($value eq 'sxw');
@@ -131,7 +105,6 @@ sub parse_calc($$$)
 {
     my ($attrs, $key, $value) = @_;
     validate_enum ("ods,xls,sxc", $value, $key);
-    $attrs->[$type_idx]='string';
     return "calc8" if ($value eq 'ods');
     return "MS Excel 97" if ($value eq 'xls');
     return "StarOffice XML (Calc)" if ($value eq 'sxc');
@@ -142,7 +115,6 @@ sub parse_impress($$$)
 {
     my ($attrs, $key, $value) = @_;
     validate_enum ("odp,ppt,sxi", $value, $key);
-    $attrs->[$type_idx]='string';
     return "impress8" if ($value eq 'odp');
     return "MS PowerPoint 97" if ($value eq 'ppt');
     return "StarOffice XML (Impress)" if ($value eq 'sxi');
@@ -161,12 +133,27 @@ sub help()
     }
 }
 
+sub set_defaults()
+{
+    my $sys_str = "gconftool-2 --recursive-unset '/apps/openoffice'";
+    `$sys_str` && die "Unset failed: $!";
+    $sys_str = "gconftool-2 --set '/desktop/gnome/lockdown/disable_printing' --type bool '0'";
+    `$sys_str` && die "Reset failed: $!";
+}
+
+sub conf_type($)
+{
+    my $type = shift;
+    $type = (split(/:/, $type))[1] if ($type  =~ m/^custom:(.*)$/);
+    return $type;
+}
+
 sub set_key($$)
 {
     my ($attrs, $conf_value) = @_;
     my $sys_str = "gconftool-2 " .
 	"--set '" . $attrs->[$path_idx] . "' " .
-	"--type " . $attrs->[$type_idx] . " " .
+	"--type " . conf_type ($attrs->[$type_idx]) . " " .
 	"'" . $conf_value . "'";
 #    print "\$ $sys_str\n";
     `$sys_str` && die "Set failed: $!";
@@ -177,6 +164,10 @@ for my $arg (@ARGV) {
 	help();
 	exit 0;
     }
+    if ($arg eq '--set-defaults') {
+	set_defaults();
+	exit 0;
+    }
     if (!($arg =~ m/^--(.*)=(.*)/)) {
 	print STDERR "Error: syntax --enable-foo=yes\n";
 	exit 1;
@@ -214,11 +205,7 @@ for my $arg (@ARGV) {
 	     $type eq 'string') {
 	$conf_value = $value;
 
-    } elsif ($type =~ m/^enum,(.*)$/) {
-	validate_enum ($1, $value, $key);
-	$conf_value = $value;
-
-    } elsif ($type eq 'custom') {
+    } elsif ($type =~ m/^custom:(.*)$/) {
 	my $function = $attrs->[$func_idx];
 	$conf_value = $function->($attrs, $key, $value);
 
diff --git a/configure.in b/configure.in
index bfbeb8a6b..b253b3a7a 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ OOO_BUILDMAJOR_VERSION=1
 OOO_BUILDMINOR_VERSION=9
 OOO_BUILDMICRO_VERSION=125
 dnl this includes pre-pended period.
-OOO_BUILDSTRIKE_VERSION=.1
+OOO_BUILDSTRIKE_VERSION=.1.2
 OOO_BUILDVERSION="$OOO_BUILDMAJOR_VERSION.$OOO_BUILDMINOR_VERSION.$OOO_BUILDMICRO_VERSION$OOO_BUILDSTRIKE_VERSION"
 
 AM_INIT_AUTOMAKE(ooo-build, $OOO_BUILDVERSION)
diff --git a/patches/cairo/canvas-source-cairo-cairo_canvashelper-cxx.diff b/patches/cairo/canvas-source-cairo-cairo_canvashelper-cxx.diff
index 3de1ebbd3..d5230627d 100644
--- a/patches/cairo/canvas-source-cairo-cairo_canvashelper-cxx.diff
+++ b/patches/cairo/canvas-source-cairo-cairo_canvashelper-cxx.diff
@@ -1,6 +1,6 @@
 --- /dev/null	
 +++ canvas/source/cairo/cairo_canvashelper.cxx	
-@@ -0,0 +1,1055 @@
+@@ -0,0 +1,1058 @@
 +/*************************************************************************
 + *
 + *  $RCSfile$
@@ -797,6 +797,9 @@
 +
 +		 // fixme (rodo) - use xFont
 +		 cairo_select_font_face( mpCairo, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL );
++		 /* move to 0, 0 as cairo_show_text advances current point and current point is not restored by cairo_restore.
++		    before we were depending on unmodified current point which I believed was preserved by save/restore */
++		 cairo_move_to( mpCairo, 0, 0 );
 +		 cairo_show_text( mpCairo, ::rtl::OUStringToOString( text.Text, RTL_TEXTENCODING_UTF8 ) );
 +
 +		 cairo_restore( mpCairo );
diff --git a/patches/cairo/default-cairo-disable.diff b/patches/cairo/default-cairo-disable.diff
new file mode 100644
index 000000000..173315137
--- /dev/null
+++ b/patches/cairo/default-cairo-disable.diff
@@ -0,0 +1,20 @@
+Index: officecfg/registry/data/org/openoffice/VCL.xcu
+===================================================================
+RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v
+retrieving revision 1.42
+diff -u -p -u -r1.42 VCL.xcu
+--- officecfg/registry/data/org/openoffice/VCL.xcu	21 Jul 2005 14:22:30 -0000	1.42
++++ officecfg/registry/data/org/openoffice/VCL.xcu	1 Sep 2005 10:29:42 -0000
+@@ -62,6 +62,11 @@
+ <!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
+ <oor:component-data oor:name="VCL" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <node oor:name="Settings">
++    <node oor:name="Canvas" oor:op="replace">
++      <prop oor:name="PreferredServices" oor:type="xs:string" oor:op="replace">
++        <value>com.sun.star.rendering.VCLCanvas</value>
++      </prop>
++    </node>
+     <node oor:name="Accessibility" oor:op="replace">
+       <prop oor:name="EnableATToolSupport" oor:type="xs:string" oor:op="replace">
+         <value>false</value>
+
diff --git a/patches/mono/mono-scp2.diff b/patches/mono/mono-scp2.diff
index 876e4c2c5..8b71dfd9d 100644
--- a/patches/mono/mono-scp2.diff
+++ b/patches/mono/mono-scp2.diff
@@ -24,77 +24,37 @@ retrieving revision 1.96
 diff -u -r1.96 file_library_ooo.scp
 --- scp2/source/ooo/file_library_ooo.scp	30 Mar 2005 11:40:14 -0000	1.96
 +++ scp2/source/ooo/file_library_ooo.scp	7 Apr 2005 17:06:32 -0000
-@@ -208,7 +208,7 @@
- // STD_LIB_FILE(gid_File_Lib_Charttools, charttools)
- // STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview)
+@@ -219,7 +219,7 @@
+ 
+ #endif
  
 -#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
 +#if defined ENABLE_MONO || (defined WNT && (defined M1300 || defined M1310)) // currently the only cli platform
  
- File gid_File_Lib_Cli_Cppuhelper
-     TXT_FILE_BODY;
-@@ -217,10 +217,6 @@
-     Dir = gid_Dir_Program_Assembly;
- End
- 
--#endif
--
--#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
--
  File gid_File_Lib_Cli_Cppuhelper_Assembly
      TXT_FILE_BODY;
-     Styles = (PACKED, ASSEMBLY);
-@@ -233,10 +229,6 @@
-     Attributes = "0";
- End
+@@ -246,7 +246,7 @@
  
--#endif
--
--#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
--
- File gid_File_Lib_Cli_Types
-     TXT_FILE_BODY;
-     Styles = (PACKED);
-@@ -244,10 +236,6 @@
-     Dir = gid_Dir_Program_Assembly;
- End
+ #endif
  
--#endif
--
 -#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
--
++#if defined ENABLE_MONO || (defined WNT && (defined M1300 || defined M1310)) // currently the only cli platform
+ 
  File gid_File_Lib_Cli_Types_Assembly
      TXT_FILE_BODY;
-     Styles = (PACKED, ASSEMBLY);
-@@ -260,10 +248,6 @@
-     Attributes = "0";
- End
+@@ -273,7 +273,7 @@
  
--#endif
--
--#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
--
- File gid_File_Lib_Cli_Basetypes
-     TXT_FILE_BODY;
-     Styles = (PACKED);
-@@ -271,10 +255,6 @@
-     Dir = gid_Dir_Program_Assembly;
- End
+ #endif
  
--#endif
--
 -#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
--
++#if defined ENABLE_MONO || (defined WNT && (defined M1300 || defined M1310)) // currently the only cli platform
+ 
  File gid_File_Lib_Cli_Basetypes_Assembly
      TXT_FILE_BODY;
-     Styles = (PACKED, ASSEMBLY);
-@@ -289,9 +269,50 @@
-     Attributes = "0";
- End
+@@ -300,6 +300,44 @@
  
--#endif
+ #endif
  
--#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
 +#ifdef ENABLE_MONO
 +
 +File gid_File_Lib_Cli_Uno_Glue
@@ -107,6 +67,7 @@ diff -u -r1.96 file_library_ooo.scp
 +    Name = "cli_uno_glue.dll";
 +  #endif
 +End
++
 +File gid_File_Lib_Cli_Uno
 +    TXT_FILE_BODY;
 +    Styles = (PACKED);
@@ -118,13 +79,6 @@ diff -u -r1.96 file_library_ooo.scp
 +  #endif
 +End
 +
-+File gid_File_Lib_Cli_Uno_Bridge
-+    TXT_FILE_BODY;
-+    Styles = (PACKED);
-+    Name = "cli_uno_bridge.dll";
-+    Dir = gid_Dir_Program_Assembly;
-+End
-+
 +File gid_File_Lib_Cli_Uno_Bridge_Assembly
 +    TXT_FILE_BODY;
 +    Styles = (PACKED, ASSEMBLY);
@@ -137,29 +91,17 @@ diff -u -r1.96 file_library_ooo.scp
 +    Attributes = "0";
 +End
 +
-+#else
- 
- File gid_File_Lib_Cli_Uno
-     TXT_FILE_BODY;
-@@ -298,9 +302,7 @@
-     Name = "cli_uno.dll";
- End
- 
--#endif
--
--#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
-+#endif // ENABLE_MONO
++#endif
++
+ #if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
  
  File gid_File_Lib_Cli_Ure
-     TXT_FILE_BODY;
-@@ -309,10 +311,6 @@
-     Dir = gid_Dir_Program_Assembly;
- End
+@@ -311,7 +349,7 @@
+ 
+ #endif
  
--#endif
--
 -#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
--
++#if defined ENABLE_MONO || (defined WNT && (defined M1300 || defined M1310)) // currently the only cli platform
+ 
  File gid_File_Lib_Cli_Ure_Assembly
      TXT_FILE_BODY;
-     Styles = (PACKED, ASSEMBLY);
diff --git a/patches/src680/apply b/patches/src680/apply
index e68dd73f2..bf4d2823c 100644
--- a/patches/src680/apply
+++ b/patches/src680/apply
@@ -138,8 +138,9 @@ vcl-menu-fixes.diff
 gui-sw-scroll.diff
 
 [ Fixes ]
-# Fix default Writer bullets not exporting to MS format intact n#10555
+# Fix default Writer and Impress bullets not exporting to MS format intact n#10555
 sw-bullet-interop-fix.diff
+sd-bullet-interop-fix.diff
 # Fix NFS / flock issue n#104655, i#53682
 nfs-flock.diff
 # fix the wizards crasher n#10512, i#43665
@@ -226,6 +227,8 @@ warning-uninitialized-variables-sw.diff
 # use fast/native gtk+ rendering, unless we have the broken
 # qt<->gtk theme selected i#50857
 gtk-kde-fix.diff
+# run crash_report only when it is built, i#54121
+sal-when-to-run-crash-report.diff
 
 [ Fixes >= src680-m126 ]
 # Fix the print error dialog and pop-up when unable to print. BINC 64010 Issue 44695
@@ -318,7 +321,7 @@ sc-pv-crasher.diff
 # add =info() function - i#49498
 sc-info-func.diff
 # changed address function to accept 5 parameters - i#49499
-sc-address.diff
+# sc-address.diff
 # div/0 error export by div function - i#47724
 sc-div.diff
 # div/0 error export by other functions - i47724
@@ -328,7 +331,7 @@ sc-xls-shared-expr.diff
 # COLUMN and ROW return series for arrays i#49906
 sc-column-row-array.diff
 # Support for formula input to start with '+' or '-' - i#20496, i#52179
-sc-startformulawplus.diff
+# sc-startformulawplus.diff
 # To make CSV Text Import settings persistent - i#3687
 sc-preserve-imp-opts.diff
 # An option - 'save as rendered' while exporting to .csv - i#4925
@@ -689,11 +692,17 @@ fpicker-show-checkbox.diff
 fpicker-export-expand.diff
 
 # allow the fpicker to set the file type automatically based on extension n#113250
-# gnome-fpicker-auto-file-type-by-extension.diff
+gnome-fpicker-auto-file-type-by-extension.diff
 
 # make some symbols from svtools visible for the kde fpicker when compiling with gcc4
 fpicker-kde-gcc4-visibility.diff
 
+# fix crasher - n#114644, i#54094
+crash-fpicker-gtk.diff
+
+# fix check box rendering issue - n#80447
+check-buttons-rendering-fix.diff
+
 [ Evo2 ]
 # misc. other fixes / bits for the driver. i#50913
 evo2-fixes-m109.diff
@@ -764,6 +773,10 @@ nld-splash.diff
 [ SUSEOnly ]
 suse-splash.diff
 
+[ Fixes ]
+# fix for bug n114062 extracted from i53967. it was still present in m125
+sd-new-slide-with-floating-frame.diff
+
 [ ArkOnly ]
 # Ark Linux splits Qt into qt-mt and qt-base-mt so text mode apps etc.
 # can use Qt base functionality without linking in the whole GUI.
@@ -1020,6 +1033,9 @@ printing-desktop-integration.diff
 corporate-dictionary.diff
 
 [ cairocanvas ]
+# disable cairo bits by default n#106644
+default-cairo-disable.diff
+
 cairo-canvas-pixmap.diff
 cairo-canvas-component-install.diff
 
diff --git a/patches/src680/sd-bullet-interop-fix.diff b/patches/src680/sd-bullet-interop-fix.diff
new file mode 100644
index 000000000..e0794f8b6
--- /dev/null
+++ b/patches/src680/sd-bullet-interop-fix.diff
@@ -0,0 +1,95 @@
+--- vcl/source/gdi/fontcvt.cxx	2005-08-27 21:50:54.000000000 +0530
++++ vcl/source/gdi/fontcvt.cxx	2005-09-01 19:14:15.000000000 +0530
+@@ -1150,7 +1150,7 @@ ExtraTable aSymbolExtraTab2[] =
+     {0x221A, 0xD6}, {0x22C5, 0xD7}, {0x00AC, 0xD8}, {0x2227, 0xD9},
+     {0x2228, 0xDA}, {0x21D4, 0xDB}, {0x21D0, 0xDC}, {0x21D2, 0xDE},
+     {0x2329, 0xE1}, {0x2211, 0xE5}, {0x232A, 0xF1}, {0x222B, 0xF2},
+-    {0x2320, 0xF3}, {0x2321, 0xF5}
++    {0x2320, 0xF3}, {0x2321, 0xF5}, {0x2013, 0x2D}
+ };
+ 
+ ExtraTable aSymbolExtraTab[] =
+--- sd/source/filter/eppt/epptso.cxx	2005-07-14 16:14:37.000000000 +0530
++++ sd/source/filter/eppt/epptso.cxx	2005-09-01 19:53:17.000000000 +0530
+@@ -2546,6 +2546,60 @@ void ParagraphObj::CalculateGraphicBulle
+     }
+ }
+ 
++// from sw/source/filter/ww8/wrtw8num.cxx for default bullets to export to MS intact
++static void lcl_SubstituteBullet(String& rNumStr, 
++    rtl_TextEncoding& rChrSet, String& rFontName)
++{
++    StarSymbolToMSMultiFont *pConvert = 0;
++    FontFamily eFamily = FAMILY_DECORATIVE;
++    
++    if (!pConvert)
++    {
++        pConvert = CreateStarSymbolToMSMultiFont();
++#ifdef DUMPSYMBOLS
++        ::std::ofstream output("fontdebug");
++        for (sal_Unicode i=0xE000;i<0xF8FF;i++)
++        {
++            String sFont = pConvert->ConvertChar(i);
++            if (sFont.Len())
++                 output << ::std::hex << i << std::endl;
++        }
++#endif
++    }    
++    sal_Unicode cChar = rNumStr.GetChar(0);
++    String sFont = pConvert->ConvertChar(cChar);
++
++    if (sFont.Len())
++    {
++        rNumStr = static_cast< sal_Unicode >(cChar | 0xF000);
++        rFontName = sFont;
++        rChrSet = RTL_TEXTENCODING_SYMBOL;
++    }
++    else if ( (rNumStr.GetChar(0) < 0xE000 || rNumStr.GetChar(0) > 0xF8FF) )
++    {
++        /*
++        Ok we can't fit into a known windows unicode font, but
++        we are not in the private area, so we are a
++        standardized symbol, so turn off the symbol bit and
++        let words own font substitution kick in
++        */
++        rChrSet = RTL_TEXTENCODING_UNICODE;
++        eFamily = FAMILY_SWISS;
++        rFontName = ::GetFontToken(rFontName, 0);
++     }
++     else
++     {
++        /*
++        Well we don't have an available substition, and we're
++        in our private area, so give up and show a standard
++        bullet symbol
++        */
++        rFontName.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Wingdings"));
++        rNumStr = static_cast< sal_Unicode >(0x6C);
++     }      
++     delete pConvert;
++}
++
+ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bGetPropStateValue )
+ {
+     ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > aXIndexReplace;
+@@ -2665,6 +2719,20 @@ void ParagraphObj::ImplGetNumberingLevel
+ 
+                     case SVX_NUM_CHAR_SPECIAL :                           // Bullet
+                     {
++                        if ( aFontDesc.Name.equalsIgnoreAsciiCaseAscii("starsymbol") ||
++                             aFontDesc.Name.equalsIgnoreAsciiCaseAscii("opensymbol") ) 
++                        {
++                            String sFontName = aFontDesc.Name;
++                            String sNumStr = cBulletId;
++                            rtl_TextEncoding eChrSet = aFontDesc.CharSet;
++
++                            lcl_SubstituteBullet(sNumStr,eChrSet,sFontName);
++
++                            aFontDesc.Name = sFontName;
++                            cBulletId = sNumStr.GetChar( 0 );
++                            aFontDesc.CharSet = eChrSet;
++                        }
++
+                         if ( aFontDesc.Name.getLength() )
+                         {
+ /*
diff --git a/patches/src680/sd-new-slide-with-floating-frame.diff b/patches/src680/sd-new-slide-with-floating-frame.diff
new file mode 100644
index 000000000..242528045
--- /dev/null
+++ b/patches/src680/sd-new-slide-with-floating-frame.diff
@@ -0,0 +1,11 @@
+--- sd/source/ui/view/viewshe3.cxx.orig	2005-09-01 15:08:37 +02:00
++++ sd/source/ui/view/viewshe3.cxx	2005-09-01 15:09:47 +02:00
+@@ -1214,7 +1214,7 @@ SdPage* ViewShell::CreateOrDuplicatePage
+         SfxBoolItem aMakeToolPaneVisible (ID_VAL_ISVISIBLE, TRUE);
+         SfxUInt32Item aPanelId (ID_VAL_PANEL_INDEX,
+             toolpanel::TaskPaneViewShell::PID_LAYOUT);
+-        GetDispatcher()->Execute (
++        GetViewFrame()->GetDispatcher()->Execute (
+             SID_TASK_PANE,
+             SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+             &aMakeToolPaneVisible,
diff --git a/scratch/canvas-cairo/cairo_canvashelper.cxx b/scratch/canvas-cairo/cairo_canvashelper.cxx
index 83f100dbb..b45db9676 100644
--- a/scratch/canvas-cairo/cairo_canvashelper.cxx
+++ b/scratch/canvas-cairo/cairo_canvashelper.cxx
@@ -794,6 +794,9 @@ namespace cairocanvas
 
 		 // fixme (rodo) - use xFont
 		 cairo_select_font_face( mpCairo, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL );
+		 /* move to 0, 0 as cairo_show_text advances current point and current point is not restored by cairo_restore.
+		    before we were depending on unmodified current point which I believed was preserved by save/restore */
+		 cairo_move_to( mpCairo, 0, 0 );
 		 cairo_show_text( mpCairo, ::rtl::OUStringToOString( text.Text, RTL_TEXTENCODING_UTF8 ) );
 
 		 cairo_restore( mpCairo );