rpms/openoffice.org/devel workspace.kendy10.patch, NONE, 1.1 openoffice.org.spec, 1.811, 1.812 openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3949

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.kendy10.patch 
Removed Files:
	openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch 
Log Message:
recently used into a workspace now

workspace.kendy10.patch:
 recently_used_file_handler.cxx |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

--- NEW FILE workspace.kendy10.patch ---
Index: shell/source/unix/sysshell/recently_used_file_handler.cxx
===================================================================
RCS file: /cvs/gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx,v
retrieving revision 1.5
diff -u -p -u -w -r1.5 recently_used_file_handler.cxx
--- openoffice.org.orig/shell/source/unix/sysshell/recently_used_file_handler.cxx	7 Sep 2005 19:56:25 -0000	1.5
+++ openoffice.org/shell/source/unix/sysshell/recently_used_file_handler.cxx	16 Jun 2006 10:40:51 -0000
@@ -49,6 +49,10 @@
 #include "rtl/string.hxx"
 #endif
 
+#ifndef _RTL_STRBUF_HXX_
+#include "rtl/strbuf.hxx"
+#endif
+
 #include "osl/thread.h"
 
 #ifndef INCLUDED_RECENTLY_USED_FILE_HXX
@@ -212,10 +216,33 @@ namespace /* private */ {
             write_xml_end_tag(TAG_RECENT_ITEM, file);            
         }
         
+		static rtl::OString escape_content(const string_t &text)
+		{
+			rtl::OStringBuffer aBuf;
+			for (sal_Int32 i = 0; i < text.length(); i++)
+			{
+#               define MAP(a,b) case a: aBuf.append(b); break
+				switch (text[i])
+				{
+					MAP ('&',  "&");
+					MAP ('<',  "<");
+					MAP ('>',  ">");
+					MAP ('\'', "'");
+					MAP ('"',  """);
+				default:
+					aBuf.append(text[i]);
+					break;
+				}
+#               undef MAP
+			}
+			return aBuf.makeStringAndClear();
+		}
+        
         void write_xml_tag(const string_t& name, const string_t& value, const recently_used_file& file) const
         {            
             write_xml_start_tag(name, file);
-            file.write(value.c_str(), value.length());
+			rtl::OString escaped = escape_content (value);
+            file.write(escaped.getStr(), escaped.getLength());
             write_xml_end_tag(name, file);
         }
         
@@ -541,7 +568,7 @@ const rtl::OUString DEFAULT_CONTEXT = rt
 
 // We need to re-encode file urls because osl_getFileURLFromSystemPath converts
 // to UTF-8 before encoding non ascii characters, which is not what other apps expect.
-rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
+static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
 {
 	rtl::OUString extUrl;
 		
@@ -572,7 +599,7 @@ extern "C" void add_to_recently_used_fil
         rtl::OUString externalUrl = translateToExternalUrl(file_url);
 	
         read_recently_used_items(ruf, item_list);	
-        recently_used_item_list_add(item_list, (externalUrl.getLength()) ? externalUrl : file_url, mime_type);
+        recently_used_item_list_add(item_list, externalUrl.getLength() ? externalUrl : file_url, mime_type);
         write_recently_used_items(ruf, item_list);                                
     }
     catch(const char* ex)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.811
retrieving revision 1.812
diff -u -r1.811 -r1.812
--- openoffice.org.spec	2 Aug 2006 11:09:06 -0000	1.811
+++ openoffice.org.spec	2 Aug 2006 19:20:17 -0000	1.812
@@ -107,7 +107,7 @@
 Patch41: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
 Patch42: openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
 Patch43: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch44: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
+Patch44: workspace.kendy10.patch
 Patch45: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch46: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 Patch47: ooobuild.VBAObjects.patch
@@ -156,7 +156,6 @@
 %package core
 Summary: core modules for %{name}
 Group: Applications/Productivity
-Requires: dejavu-lgc-fonts
 Requires: urw-fonts
 %ifarch %{ppc}
 # Ensure we have 32-bit theme libs in 64-bit multilib environments.
@@ -401,6 +400,7 @@
 Summary: Greek language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: dejavu-lgc-fonts
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-el
 Obsoletes: openoffice.org2-langpack-el_GR
@@ -682,6 +682,7 @@
 Summary: Russian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: dejavu-lgc-fonts
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-ru
 
@@ -906,7 +907,7 @@
 %patch41 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
 %patch42 -p1 -b .ooo66851.i18npool.x86_64.patch
 %patch43 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch44 -p1 -b .ooo66510.shell.recentlyused.patch
+%patch44 -p1 -b .workspace.kendy10.patch
 %patch45 -p1 -b .rh187919.gtkunderkde.patch
 %patch46 -p1 -b .ooo67186.sw.eventisULONG.patch
 %patch47 -p0 -b .ooobuild.VBAObjects.patch
@@ -3515,7 +3516,8 @@
 	+ openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext, a bizarre, but
 	perfectly functional input method surrounding text implementation
 	based on the ATK bridge
-- rh#200805# replace ooo58663 missing glyph patch with workspace.icuupgrade.patch
+- rh#200805# replace ooo58663 missing glyph patch -> workspace.icuupgrade
+- ooo#66510# recentlyused fix -> workspace.kendy10
 
 * Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch


--- openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch DELETED ---