rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.53, 1.54 openoffice.org-3.0.1.ooo99050.sw.htmlload.patch, 1.1, 1.2

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv995

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org-3.0.1.ooo99050.sw.htmlload.patch 
Log Message:
messy patch

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	9 Feb 2009 13:18:13 -0000	1.53
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	10 Feb 2009 23:08:05 -0000	1.54
@@ -822,7 +822,7 @@
  {
  	FreeResource();
  
-@@ -753,6 +794,287 @@
+@@ -753,6 +794,304 @@
  
  // -----------------------------------------------------------------------
  
@@ -1107,6 +1107,23 @@
 +    bSet = true;
 +}
 +
++static rtl::OString getPrintDialogSettings()
++{
++    rtl::OUString aIni;
++    rtl::Bootstrap::get( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aIni );
++    aIni += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE( "bootstrap" ) ) );
++    rtl::Bootstrap aBootstrap( aIni );
++    rtl::OUString aUserPath;
++    aBootstrap.getFrom( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserInstallation" ) ), aUserPath );
++    rtl::OUString aSysPath;
++    if( osl_getSystemPathFromFileURL( aUserPath.pData, &aSysPath.pData ) == osl_File_E_None )
++    {
++        aUserPath = aSysPath;
++        aUserPath += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/psprint/gtkprintdlg" ) );
++    }
++    return rtl::OUStringToOString(aUserPath, RTL_TEXTENCODING_UTF8);
++}
++
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )

openoffice.org-3.0.1.ooo99050.sw.htmlload.patch:

Index: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.1.ooo99050.sw.htmlload.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.1.ooo99050.sw.htmlload.patch	10 Feb 2009 12:41:21 -0000	1.1
+++ openoffice.org-3.0.1.ooo99050.sw.htmlload.patch	10 Feb 2009 23:08:05 -0000	1.2
@@ -4,8 +4,8 @@
 retrieving revision 1.26
 retrieving revision 1.26.112.1
 diff -u -r1.26 -r1.26.112.1
---- openoffice.org/sw/source/filter/htmlform.cxx	10 Apr 2008 16:42:33 -0000	1.26
-+++ openoffice.org.orig/sw/source/filter/htmlform.cxx	20 Jun 2008 06:47:28 -0000	1.26.112.1
+--- openoffice.org/sw/source/filter/html/htmlform.cxx	10 Apr 2008 16:42:33 -0000	1.26
++++ openoffice.org.orig/sw/source/filter/html/htmlform.cxx	20 Jun 2008 06:47:28 -0000	1.26.112.1
 @@ -706,6 +706,7 @@
  								   sal_Bool bMinHeight,
  								   int nToken )
@@ -69,8 +69,8 @@
 retrieving revision 1.49
 retrieving revision 1.49.112.1
 diff -u -r1.49 -r1.49.112.1
---- openoffice.org/sw/source/filter/swhtml.cxx	10 Apr 2008 16:47:35 -0000	1.49
-+++ openoffice.org.orig/sw/source/filter/swhtml.cxx	20 Jun 2008 06:48:01 -0000	1.49.112.1
+--- openoffice.org/sw/source/filter/html/swhtml.cxx	10 Apr 2008 16:47:35 -0000	1.49
++++ openoffice.org.orig/sw/source/filter/html/swhtml.cxx	20 Jun 2008 06:48:01 -0000	1.49.112.1
 @@ -114,6 +114,8 @@
  #include <breakit.hxx>
  #include <SwAppletImpl.hxx>
@@ -139,8 +139,8 @@
 retrieving revision 1.16
 retrieving revision 1.16.112.1
 diff -u -r1.16 -r1.16.112.1
---- openoffice.org/sw/source/filter/swhtml.hxx	10 Apr 2008 16:47:54 -0000	1.16
-+++ openoffice.org.orig/sw/source/filter/swhtml.hxx	20 Jun 2008 06:48:01 -0000	1.16.112.1
+--- openoffice.org/sw/source/filter/html/swhtml.hxx	10 Apr 2008 16:47:54 -0000	1.16
++++ openoffice.org.orig/sw/source/filter/html/swhtml.hxx	20 Jun 2008 06:48:01 -0000	1.16.112.1
 @@ -59,6 +59,7 @@
  #include "htmlvsh.hxx"