rpms/openoffice.org/F-10 openoffice.org.spec, 1.1739, 1.1740 workspace.os131.patch, 1.3, 1.4

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10169

Modified Files:
	openoffice.org.spec workspace.os131.patch 
Log Message:
Resolves: rhbz#520772 and fix this for proposed F-10 as well


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1739
retrieving revision 1.1740
diff -u -p -r1.1739 -r1.1740
--- openoffice.org.spec	1 Sep 2009 15:01:51 -0000	1.1739
+++ openoffice.org.spec	2 Sep 2009 14:22:37 -0000	1.1740
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 15
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -3806,6 +3806,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Sep 02 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.6
+- Resolves: rhbz#520772 copy/paste cockup
+
 * Mon Aug 31 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.5
 - Resolves: CVE-2009-0200/CVE-2009-0201
 - Resolves: rhbz#499474 soffice and .recently-used.xbel

workspace.os131.patch:
 inc/IDocumentContentOperations.hxx |    2 
 inc/doc.hxx                        |   10 
 inc/unotxdoc.hxx                   |   32 +--
 source/core/doc/doccomp.cxx        |    6 
 source/core/doc/docfmt.cxx         |    2 
 source/core/doc/docglbl.cxx        |    4 
 source/core/doc/docglos.cxx        |    2 
 source/core/doc/doclay.cxx         |    4 
 source/core/doc/docnew.cxx         |  384 +++++++++++++++++++++++++++++++++++--
 source/core/doc/docnum.cxx         |    2 
 source/core/doc/docredln.cxx       |    6 
 source/core/doc/tblcpy.cxx         |    2 
 source/core/doc/tblrwcl.cxx        |    2 
 source/core/docnode/ndcopy.cxx     |   73 +++++--
 source/core/docnode/section.cxx    |    4 
 source/core/edit/eddel.cxx         |    2 
 source/core/edit/edglss.cxx        |    6 
 source/core/frmedt/fecopy.cxx      |    4 
 source/core/txtnode/atrftn.cxx     |    2 
 source/core/undo/untblk.cxx        |    2 
 source/filter/ww8/ww8glsy.cxx      |    2 
 source/filter/xml/xmltbli.cxx      |    2 
 source/ui/dbui/dbmgr.cxx           |  239 +++++++++--------------
 source/ui/uno/unoatxt.cxx          |    4 
 source/ui/uno/unotxdoc.cxx         |   30 +-
 25 files changed, 606 insertions(+), 222 deletions(-)

Index: workspace.os131.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/workspace.os131.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- workspace.os131.patch	2 Sep 2009 13:45:41 -0000	1.3
+++ workspace.os131.patch	2 Sep 2009 14:22:37 -0000	1.4
@@ -88,19 +88,6 @@ Index: sw/source/core/edit/edglss.cxx
  
  		FOREACHPAM_END()
          }
-Index: sw/source/core/edit/acorrect.cxx
-===================================================================
---- sw/source/core/edit/acorrect.cxx	(.../tags/DEV300_m50)	(revision 275705)
-+++ sw/source/core/edit/acorrect.cxx	(.../cws/os131)	(revision 275705)
-@@ -374,7 +374,7 @@
- 				SwDontExpandItem aExpItem;
- 				aExpItem.SaveDontExpandItems( *aPam.GetPoint() );
- 
--				pAutoDoc->Copy( aCpyPam, *aPam.GetPoint() );
-+                pAutoDoc->Copy( aCpyPam, *aPam.GetPoint(), false );
- 
- 				aExpItem.RestoreDontExpandItems( *aPam.GetPoint() );
- 
 Index: sw/source/core/edit/eddel.cxx
 ===================================================================
 --- sw/source/core/edit/eddel.cxx	(.../tags/DEV300_m50)	(revision 275705)
@@ -160,13 +147,12 @@ Index: sw/source/core/doc/docnew.cxx
  #include <drawdoc.hxx>
  #include <linkenum.hxx>
  #include <fldupde.hxx>
-@@ -105,13 +97,11 @@
+@@ -105,12 +97,10 @@
  #include <istyleaccess.hxx>
  #include <swstylemanager.hxx>
  #include <IGrammarContact.hxx>
-+#include <tblsel.hxx>
- #include <MarkManager.hxx>
 -
++#include <tblsel.hxx>
  #include <unochart.hxx>
  
 -#ifndef _CMDID_H
@@ -175,7 +161,7 @@ Index: sw/source/core/doc/docnew.cxx
  
  
  // --> OD 2006-04-19 #b6375613#
-@@ -1049,3 +1039,369 @@
+@@ -1057,3 +1047,369 @@
      }
  }
  // <--
@@ -209,8 +195,8 @@ Index: sw/source/core/doc/docnew.cxx
 +    {
 +        for( nWhich = aRangeOfDefaults[nRange]; nWhich < aRangeOfDefaults[nRange + 1]; ++nWhich )
 +        {
-+            const SfxPoolItem& rSourceAttr = mpAttrPool->GetDefaultItem( nWhich );
-+            if( rSourceAttr != pRet->mpAttrPool->GetDefaultItem( nWhich ) )
++            const SfxPoolItem& rSourceAttr = aAttrPool.GetDefaultItem( nWhich );
++            if( rSourceAttr != pRet->aAttrPool.GetDefaultItem( nWhich ) )
 +                aNewDefaults.Put( rSourceAttr );
 +        }
 +        nRange += 2;
@@ -679,25 +665,6 @@ Index: sw/source/core/doc/tblrwcl.cxx
                  // den initialen TextNode loeschen
                  pCpyPara->pDoc->GetNodes().Delete( aInsIdx, 1 );
              }
-Index: sw/source/core/doc/swserv.cxx
-===================================================================
---- sw/source/core/doc/swserv.cxx	(.../tags/DEV300_m50)	(revision 275705)
-+++ sw/source/core/doc/swserv.cxx	(.../cws/os131)	(revision 275705)
-@@ -299,9 +299,12 @@
-     if(eType == BOOKMARK_SERVER && CNTNT_TYPE.pBkmk)
-     {
-         ::sw::mark::DdeBookmark* const pDdeBookmark = dynamic_cast< ::sw::mark::DdeBookmark* >(CNTNT_TYPE.pBkmk);
--        if(pDdeBookmark) pDdeBookmark->SetRefObject(NULL);
-+        if(pDdeBookmark) 
-+		{
-+            CNTNT_TYPE.pBkmk = 0, eType = NONE_SERVER;
-+			pDdeBookmark->SetRefObject(NULL);
-+		}
-     }
--    CNTNT_TYPE.pBkmk = 0, eType = NONE_SERVER;
- }
- 
- void SwServerObject::SetDdeBookmark( ::sw::mark::IMark& rBookmark)
 Index: sw/source/core/doc/doclay.cxx
 ===================================================================
 --- sw/source/core/doc/doclay.cxx	(.../tags/DEV300_m50)	(revision 275705)
@@ -1276,7 +1243,7 @@ Index: sw/source/ui/uno/unoatxt.cxx
 ===================================================================
 --- sw/source/ui/uno/unoatxt.cxx	(.../tags/DEV300_m50)	(revision 275705)
 +++ sw/source/ui/uno/unoatxt.cxx	(.../cws/os131)	(revision 275705)
-@@ -416,7 +416,7 @@
+@@ -417,7 +417,7 @@
  		if(pxCursor)
  		{
  			SwPaM* pUnoCrsr = pxCursor->GetPaM();
@@ -1285,10 +1252,10 @@ Index: sw/source/ui/uno/unoatxt.cxx
  		}
  		else
  		{
-@@ -424,7 +424,7 @@
-             if(pBkmk && pBkmk->IsExpanded())
+@@ -425,7 +425,7 @@
+             if(pBkm && pBkm->GetOtherBookmarkPos())
  			{
-                 SwPaM aTmp(pBkmk->GetOtherMarkPos(), pBkmk->GetMarkPos());
+                 SwPaM aTmp(*pBkm->GetOtherBookmarkPos(), pBkm->GetBookmarkPos());
 -                bRet |= (true == pxRange->GetDoc()->Copy(aTmp, aPos));
 +                bRet |= (true == pxRange->GetDoc()->Copy(aTmp, aPos, false));
  			}