rpms/openoffice.org/devel workspace.tkr16.patch, NONE, 1.1 openoffice.org.spec, 1.1713, 1.1714 openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.tkr16.patch 
Removed Files:
	openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch 
Log Message:
rename to upstream workspace

workspace.tkr16.patch:

--- NEW FILE workspace.tkr16.patch ---
Index: source/ucp/file/shell.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/file/shell.cxx,v
retrieving revision 1.97.18.1
diff -u -r1.97.18.1 shell.cxx
--- openoffice.org.orig/ucb/source/ucp/file/shell.cxx	21 Aug 2008 15:23:40 -0000	1.97.18.1
+++ openoffice.org/ucb/source/ucp/file/shell.cxx	4 Dec 2008 16:29:40 -0000
@@ -2296,6 +2296,10 @@
 
 
 	sal_Bool isDirectory,isFile,isVolume,isRemoveable,isRemote,isFloppy,isCompactDisc;
+    sal_Int64 dirSize = 0;
+
+    if( aFileStatus.isValid( FileStatusMask_FileSize ) )
+        dirSize = aFileStatus.getFileSize();
 
 	if( aFileStatus.isValid( FileStatusMask_Type ) )
 	{
@@ -2314,6 +2318,8 @@
 					osl::FileStatus::Directory == aFileStatus2.getFileType();
 				isFile =
 					osl::FileStatus::Regular == aFileStatus2.getFileType();
+                if( aFileStatus2.isValid( FileStatusMask_FileSize ) )
+                    dirSize = aFileStatus2.getFileSize();
 			}
 			else
 			{
@@ -2395,17 +2401,8 @@
 	it1 = properties.find( MyProperty( Size ) );
 	if( it1 != properties.end() )
 	{
-		if( aFileStatus.isValid( FileStatusMask_FileSize ) )
-		{
-			aAny <<= sal_Int64( aFileStatus.getFileSize() );
-			it1->setValue( aAny );
-		}
-		else
-		{
-			sal_Int64 dirSize = 0;
-			aAny <<= dirSize;
-			it1->setValue( aAny );
-		}
+		aAny <<= dirSize;
+		it1->setValue( aAny );
 	}
 
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1713
retrieving revision 1.1714
diff -u -r1.1713 -r1.1714
--- openoffice.org.spec	8 Dec 2008 16:38:18 -0000	1.1713
+++ openoffice.org.spec	9 Dec 2008 09:33:22 -0000	1.1714
@@ -126,7 +126,7 @@
 Patch53: workspace.cmcfixes51.patch
 Patch54: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
 Patch55: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
-Patch56: openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch
+Patch56: workspace.tkr16.patch
 Patch57: workspace.swffixes.patch
 Patch58: openoffice.org-3.0.1.ooo96970.pluginfixups.patch
 
@@ -1379,7 +1379,7 @@
 %patch53 -p1 -b .workspace.cmcfixes51.patch
 %patch54 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
 %patch55 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
-%patch56 -p1 -b .ooo96906.ucb.symlinks.and.size.patch
+%patch56 -p1 -b .workspace.tkr16.patch
 %patch57 -p1 -b .workspace.swffixes.patch
 %patch58 -p1 -b .ooo96970.pluginfixups.patch
 
@@ -3748,11 +3748,13 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Dec 08 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-12.4
+* Tue Dec 09 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-12.4
 - rhbz#474719 add libXinerama-devel BuildRequires
 - merge openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch and
   openoffice.org-2.3.0.ooo80257.sd.textonlystyle to upstream
   workspace.impressfontsize.patch
+- rename openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch to
+  upstream workspace.tkr16.patch
 
 * Sat Dec 06 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-12.3
 - rebuild for python


--- openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch DELETED ---