rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.34, 1.35 openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch, 1.1, 1.2

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch 
Log Message:
clean up a bit

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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	2 Oct 2007 12:41:22 -0000	1.34
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	3 Oct 2007 07:35:04 -0000	1.35
@@ -1115,7 +1115,7 @@
 +					    {
 +						    sNewPrinterName = ASCII_STR("Generic Printer");
 +                           psp::PrinterInfoManager& rManager( psp::PrinterInfoManager::get() );
-+                           psp::PrinterInfo aInfo(rManager.getPrinterInfo(sNewPrinterName);
++                           psp::PrinterInfo aInfo(rManager.getPrinterInfo(sNewPrinterName));
 +                           aInfo.m_aCommand = rtl::OUString((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
 +                           rManager.changePrinterInfo(sNewPrinterName, aInfo);
 +					    }

openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch:

Index: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch	6 Sep 2007 11:21:59 -0000	1.1
+++ openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch	3 Oct 2007 07:35:04 -0000	1.2
@@ -30,3 +30,18 @@
  {
  	/** the C typelib reference pointer
          @internal
+Index: source/parser/cpp/cx_c_std.cxx
+===================================================================
+RCS file: /cvs/tools/autodoc/source/parser/cpp/cx_c_std.cxx,v
+retrieving revision 1.6
+diff -u -r1.6 cx_c_std.cxx
+--- openoffice.org.orig/autodoc/source/parser/cpp/cx_c_std.cxx	16 Sep 2006 16:59:23 -0000	1.6
++++ openoffice.org/autodoc/source/parser/cpp/cx_c_std.cxx	3 Oct 2007 07:33:16 -0000
+@@ -511,6 +511,7 @@
+ 	aStateMachine.AddToken("__cdecl",	0,	A_nBezDefStatus,	finIgnore);
+ 	aStateMachine.AddToken("__stdcall", 0,	A_nBezDefStatus,	finIgnore);
+ 	aStateMachine.AddToken("__fastcall",0,	A_nBezDefStatus,	finIgnore);
++	aStateMachine.AddToken("CPPU_GCC_DLLPUBLIC_EXPORT",0,	A_nBezDefStatus,	finIgnore);
+ 	aStateMachine.AddToken("/**/",	    0,	A_nOperatorDefStatus,finIgnore);
+ 
+ 	// Context changers