rpms/openoffice.org/devel openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.23, 1.24 openoffice.org-2.0.2.rh188467.printingdefaults.patch, 1.1, 1.2 workspace.unifysound01.patch, 1.10, 1.11

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21116

Modified Files:
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
	openoffice.org-2.0.2.rh188467.printingdefaults.patch 
	workspace.unifysound01.patch 
Log Message:
drop integrated patches and subpatches

openoffice.org-1.9.87.rh151357.setlangtolocale.patch:

Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	18 Jan 2008 13:42:07 -0000	1.23
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	28 Jan 2008 17:26:40 -0000	1.24
@@ -79,22 +79,18 @@
 +    static rtl::OUString getLanguageString(bool bAllowUnInstalled=false);
      static bool prepareLanguage();
  };
- 
-Index: source/migration/wizard.cxx
-===================================================================
-RCS file: /cvs/framework/desktop/source/migration/wizard.cxx,v
-retrieving revision 1.3
-diff -u -p -r1.3 wizard.cxx
---- openoffice.org.orig/desktop/source/migration/wizard.cxx	11 Mar 2005 10:50:09 -0000	1.3
-+++ openoffice.org/desktop/source/migration/wizard.cxx	29 Mar 2005 09:01:44 -0000
-@@ -731,25 +731,8 @@
+
+--- openoffice.org.orig/desktop/source/app/appfirststart.cxx	2008-01-28 16:54:47.000000000 +0000
++++ openoffice.org/desktop/source/app/appfirststart.cxx	2008-01-28 16:56:10.000000000 +0000
+@@ -81,26 +81,8 @@
          // yuck! no license :/
      }
  
 -    // determine the filename of the license to show
--	OUString  aLangString;
+-    OUString  aLangString;
 -    ::com::sun::star::lang::Locale aLocale;
 -    OString aMgrName = OString("dkt") + OString::valueOf((sal_Int32)SUPD, 10);
+-
 -    AllSettings aSettings(Application::GetSettings());
 -    aLocale = aSettings.GetUILocale();
 -    ResMgr* pLocalResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);    
@@ -105,23 +101,24 @@
 -    {
 -        aLangString += OUString::createFromAscii("-");
 -        aLangString += aLocale.Country;
--	    if ( aLocale.Variant.getLength() != 0 )
+-        if ( aLocale.Variant.getLength() != 0 )
 -        {
--	        aLangString += OUString::createFromAscii("-");
--	        aLangString += aLocale.Variant;
+-            aLangString += OUString::createFromAscii("-");
+-            aLangString += aLocale.Variant;
 -        }
 -    }
  #if defined(WNT) || defined(OS2)
      aLicensePath = 
          aBaseInstallPath + OUString::createFromAscii(szLicensePath)
-@@ -765,7 +748,6 @@
+@@ -116,7 +98,7 @@
          + aLangString
          + OUString::createFromAscii(szUNXLicenseExt);
  #endif
 -    delete pLocalResMgr;
++
      return aLicensePath;
  }
- }
+ 
 Index: util/makefile.mk
 ===================================================================
 RCS file: /cvs/framework/framework/util/makefile.mk,v

openoffice.org-2.0.2.rh188467.printingdefaults.patch:

Index: openoffice.org-2.0.2.rh188467.printingdefaults.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.2.rh188467.printingdefaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.2.rh188467.printingdefaults.patch	12 Apr 2006 09:54:19 -0000	1.1
+++ openoffice.org-2.0.2.rh188467.printingdefaults.patch	28 Jan 2008 17:26:40 -0000	1.2
@@ -13,28 +13,3 @@
  
  *% --- For None Color or old PostScript(R) printers use following lines ---
  *% *ColorDevice: False
-Index: configuration/psprint.conf
-===================================================================
-RCS file: /cvs/external/psprint_config/configuration/psprint.conf,v
-retrieving revision 1.2
-diff -u -p -u -r1.2 psprint.conf
---- openoffice.org.orig/psprint_config/configuration/psprint.conf	9 Nov 2004 16:38:35 -0000	1.2
-+++ openoffice.org/psprint_config/configuration/psprint.conf	30 Aug 2005 11:17:50 -0000
-@@ -48,7 +48,7 @@
- ;         defaults for newly added printers.
- ; PerformFontSubstitution: wether to replace downloadable fonts
- ;         with resident fonts or not
--PerformFontSubstitution=true
-+PerformFontSubstitution=false
- 
- ; SubstFont_<downloadable font>: the resident font to replace
- ;         <downloadable font> if PerformFontSubstitution is true
-@@ -84,7 +84,7 @@
- 
- ; PerformFontSubstitution: wether to replace downloadable fonts
- ;         with resident fonts or not
--PerformFontSubstitution=true
-+PerformFontSubstitution=false
- 
- ; SubstFont_<downloadable font>: the resident font to replace
- ;         <downloadable font> if PerformFontSubstitution is true

workspace.unifysound01.patch:

Index: workspace.unifysound01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.unifysound01.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- workspace.unifysound01.patch	8 Jan 2008 14:51:51 -0000	1.10
+++ workspace.unifysound01.patch	28 Jan 2008 17:26:40 -0000	1.11
@@ -2535,9 +2535,9 @@
 -.ENDIF
 -.ENDIF
 -
- .IF "$(WITH_LIBSN)"=="YES"
- CDEFS+=-DHAVE_LIBSN
- CFLAGS+=$(LIBSN_CFLAGS)
+ .IF "$(USE_XINERAMA)" != "NO"
+ CDEFS+=-DUSE_XINERAMA
+ .IF "$(USE_XINERAMA_VERSION)" == "Xorg"
 Index: unx/source/app/salinst.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/unx/source/app/salinst.cxx,v