rpms/openoffice.org/devel openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch, NONE, 1.1 openoffice.org.spec, 1.1687, 1.1688

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch 
Log Message:
openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch

openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch:

--- NEW FILE openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch ---
diff -up DEV300_m35/sw/source/core/undo/docundo.cxx.orig DEV300_m35/sw/source/core/undo/docundo.cxx
--- DEV300_m35/sw/source/core/undo/docundo.cxx.orig	2008-11-06 09:55:07.000000000 +0100
+++ DEV300_m35/sw/source/core/undo/docundo.cxx	2008-11-06 09:55:23.000000000 +0100
@@ -747,12 +747,6 @@ SwUndoIdAndName * lcl_GetUndoIdAndName(c
         sStr = pUndo->GetComment();
     }
 
-	if( sStr.Len() > 82 )
-	{
-	    String sTmpStr("...", RTL_TEXTENCODING_ASCII_US);
-		sStr.Erase( 80 );
-		sStr += sTmpStr;
-	}
     return new SwUndoIdAndName(nId, &sStr);
 }
 
diff -up DEV300_m35/sw/source/core/undo/undel.cxx.orig DEV300_m35/sw/source/core/undo/undel.cxx
--- DEV300_m35/sw/source/core/undo/undel.cxx.orig	2008-11-04 10:13:54.000000000 +0100
+++ DEV300_m35/sw/source/core/undo/undel.cxx	2008-11-06 09:55:59.000000000 +0100
@@ -595,6 +595,8 @@ SwRewriter SwUndoDelete::GetRewriter() c
                 aStr = UNDO_ARG2;
             }
         }
+        aStr = ShortenString(aStr, nUndoStringLength,
+                                 String(SW_RES(STR_LDOTS)));
 
         if (pHistory)
         {
@@ -602,11 +604,6 @@ SwRewriter SwUndoDelete::GetRewriter() c
 
             aStr = aRewriter.Apply(aStr);
         }
-        else
-        {
-            aStr = ShortenString(aStr, nUndoStringLength,
-                                 String(SW_RES(STR_LDOTS)));
-        }
 
         aResult.AddRule(UNDO_ARG1, aStr);
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1687
retrieving revision 1.1688
diff -u -r1.1687 -r1.1688
--- openoffice.org.spec	6 Nov 2008 08:40:19 -0000	1.1687
+++ openoffice.org.spec	6 Nov 2008 12:43:24 -0000	1.1688
@@ -128,6 +128,7 @@
 Patch55: openoffice.org-3.0.0.ooo95793.goodies.met.patch
 Patch56: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
 Patch57: openoffice.org-3.0.0.ooo95908.pyuno.debugging.spew.patch
+Patch58: openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1380,6 +1381,7 @@
 %patch55 -p1 -b .ooo95793.goodies.met.patch
 %patch56 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
 %patch57 -p1 -b .ooo95908.pyuno.debugging.spew.patch
+%patch58 -p1 -b .ooo90072.sw.undo-longtext.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3747,6 +3749,7 @@
 %changelog
 * Thu Nov 06 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.9
 - add openoffice.org-3.0.0.ooo95908.pyuno.debugging.spew.patch
+- add openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch
 
 * Tue Nov 04 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.8
 - Resolves: rhbz#469804 openoffice.org-3.0.0.ooo95793.goodies.met.patch