rpms/openoffice.org/devel openoffice.org.spec, 1.1997, 1.1998 workspace.os131.patch, 1.1, 1.2 openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Wed Sep 2 13:45:43 UTC 2009
- Previous message (by thread): rpms/openoffice.org/F-11 openoffice.org.spec, 1.1932, 1.1933 workspace.os131.patch, 1.1, 1.2
- Next message (by thread): rpms/xmms/F-10 xmms-play.patch, NONE, 1.1 import.log, 1.3, 1.4 xmms.spec, 1.38, 1.39
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28045/devel
Modified Files:
openoffice.org.spec workspace.os131.patch
Removed Files:
openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
Log Message:
Resolves: rhbz#520772 copy/paste cockup
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1997
retrieving revision 1.1998
diff -u -p -r1.1997 -r1.1998
--- openoffice.org.spec 27 Aug 2009 16:17:21 -0000 1.1997
+++ openoffice.org.spec 2 Sep 2009 13:45:43 -0000 1.1998
@@ -1,6 +1,6 @@
%define oootag OOO310
%define ooomilestone 19
-%define rh_rpm_release 4
+%define rh_rpm_release 5
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -4210,6 +4210,9 @@ fi
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Wed Sep 02 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.5
+- Resolves: rhbz#520772 copy/paste cockup
+
* Thu Aug 27 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.4
- rebuilt with new openssl
- add openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
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/devel/workspace.os131.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.os131.patch 21 Aug 2009 05:18:30 -0000 1.1
+++ workspace.os131.patch 2 Sep 2009 13:45:43 -0000 1.2
@@ -1,8 +1,8 @@
Index: sw/source/filter/xml/xmltbli.cxx
===================================================================
---- sw/source/filter/xml/xmltbli.cxx (revision 272643)
-+++ sw/source/filter/xml/xmltbli.cxx (revision 272644)
-@@ -662,7 +662,7 @@
+--- sw/source/filter/xml/xmltbli.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/filter/xml/xmltbli.cxx (.../cws/os131) (revision 275705)
+@@ -667,7 +667,7 @@
SwPaM aSrcPaM( *pSrcPaM->GetPoint(),
*pSrcPaM->GetMark() );
SwPosition aDstPos( *pDstTxtCrsr->GetPaM()->GetPoint() );
@@ -13,8 +13,8 @@ Index: sw/source/filter/xml/xmltbli.cxx
}
Index: sw/source/filter/ww8/ww8glsy.cxx
===================================================================
---- sw/source/filter/ww8/ww8glsy.cxx (revision 272643)
-+++ sw/source/filter/ww8/ww8glsy.cxx (revision 272644)
+--- sw/source/filter/ww8/ww8glsy.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/filter/ww8/ww8glsy.cxx (.../cws/os131) (revision 275705)
@@ -187,7 +187,7 @@
-1 );
pCNd = aIdx.GetNode().GetCntntNode();
@@ -26,8 +26,8 @@ Index: sw/source/filter/ww8/ww8glsy.cxx
}
Index: sw/source/core/frmedt/fecopy.cxx
===================================================================
---- sw/source/core/frmedt/fecopy.cxx (revision 272643)
-+++ sw/source/core/frmedt/fecopy.cxx (revision 272644)
+--- sw/source/core/frmedt/fecopy.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/frmedt/fecopy.cxx (.../cws/os131) (revision 275705)
@@ -840,7 +840,7 @@
{
SwNodeIndex aIndexBefore(rInsPos.nNode);
@@ -48,8 +48,8 @@ Index: sw/source/core/frmedt/fecopy.cxx
aIndexBefore++;
Index: sw/source/core/txtnode/atrftn.cxx
===================================================================
---- sw/source/core/txtnode/atrftn.cxx (revision 272643)
-+++ sw/source/core/txtnode/atrftn.cxx (revision 272644)
+--- sw/source/core/txtnode/atrftn.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/txtnode/atrftn.cxx (.../cws/os131) (revision 275705)
@@ -303,7 +303,7 @@
SwNodeIndex aEnd( *aStart.GetNode().EndOfSectionNode() );
ULONG nDestLen = aEnd.GetIndex() - aStart.GetIndex() - 1;
@@ -61,8 +61,8 @@ Index: sw/source/core/txtnode/atrftn.cxx
// Nodes geloescht werden:
Index: sw/source/core/edit/edglss.cxx
===================================================================
---- sw/source/core/edit/edglss.cxx (revision 272643)
-+++ sw/source/core/edit/edglss.cxx (revision 272644)
+--- sw/source/core/edit/edglss.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/edit/edglss.cxx (.../cws/os131) (revision 275705)
@@ -168,7 +168,7 @@
aStt = pGDoc->GetNodes().GetEndOfExtras();
pCntntNd = pGDoc->GetNodes().GoNext( &aStt );
@@ -84,14 +84,14 @@ Index: sw/source/core/edit/edglss.cxx
}
else
- bRet = GetDoc()->Copy( *PCURCRSR, aPos ) || bRet;
-+ bRet = GetDoc()->Copy( *PCURCRSR, aPos, true ) || bRet;
++ bRet = GetDoc()->Copy( *PCURCRSR, aPos, false ) || bRet;
FOREACHPAM_END()
}
Index: sw/source/core/edit/eddel.cxx
===================================================================
---- sw/source/core/edit/eddel.cxx (revision 272643)
-+++ sw/source/core/edit/eddel.cxx (revision 272644)
+--- sw/source/core/edit/eddel.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/edit/eddel.cxx (.../cws/os131) (revision 275705)
@@ -253,7 +253,7 @@
bFirstMove = FALSE;
}
@@ -103,8 +103,8 @@ Index: sw/source/core/edit/eddel.cxx
SwPaM aInsertPaM(*pPos, aSttNdIdx);
Index: sw/source/core/doc/docnew.cxx
===================================================================
---- sw/source/core/doc/docnew.cxx (revision 272643)
-+++ sw/source/core/doc/docnew.cxx (revision 272644)
+--- sw/source/core/doc/docnew.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/doc/docnew.cxx (.../cws/os131) (revision 275705)
@@ -32,6 +32,7 @@
#include "precompiled_sw.hxx"
#define ROLBCK_HISTORY_ONLY // Der Kampf gegen die CLOOK's
@@ -161,7 +161,7 @@ Index: sw/source/core/doc/docnew.cxx
// --> OD 2006-04-19 #b6375613#
-@@ -1056,3 +1046,370 @@
+@@ -1057,3 +1047,369 @@
}
}
// <--
@@ -472,7 +472,6 @@ Index: sw/source/core/doc/docnew.cxx
+ aCpyPam.SetMark();
+ aCpyPam.Move( fnMoveForward, fnGoDoc );
+
-+ BOOL bRet = TRUE, bDelTbl = TRUE;
+ this->StartUndo( UNDO_INSGLOSSARY, NULL );
+ this->LockExpFlds();
+
@@ -534,8 +533,8 @@ Index: sw/source/core/doc/docnew.cxx
+}
Index: sw/source/core/doc/doccomp.cxx
===================================================================
---- sw/source/core/doc/doccomp.cxx (revision 272643)
-+++ sw/source/core/doc/doccomp.cxx (revision 272644)
+--- sw/source/core/doc/doccomp.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/doc/doccomp.cxx (.../cws/os131) (revision 275705)
@@ -1196,7 +1196,7 @@
SwPaM aCpyPam( rSrcNd, nStt );
aCpyPam.SetMark();
@@ -565,8 +564,8 @@ Index: sw/source/core/doc/doccomp.cxx
pDoc->DoUndo( bUndo );
Index: sw/source/core/doc/docnum.cxx
===================================================================
---- sw/source/core/doc/docnum.cxx (revision 272643)
-+++ sw/source/core/doc/docnum.cxx (revision 272644)
+--- sw/source/core/doc/docnum.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/doc/docnum.cxx (.../cws/os131) (revision 275705)
@@ -2273,7 +2273,7 @@
}
}
@@ -578,8 +577,8 @@ Index: sw/source/core/doc/docnum.cxx
// dann muss der letzte leere Node wieder entfernt werden
Index: sw/source/core/doc/docredln.cxx
===================================================================
---- sw/source/core/doc/docredln.cxx (revision 272643)
-+++ sw/source/core/doc/docredln.cxx (revision 272644)
+--- sw/source/core/doc/docredln.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/doc/docredln.cxx (.../cws/os131) (revision 275705)
@@ -3418,7 +3418,7 @@
SwNodeIndex aNdIdx( *pSttNd, 1 );
SwTxtNode* pTxtNd = aNdIdx.GetNode().GetTxtNode();
@@ -607,8 +606,8 @@ Index: sw/source/core/doc/docredln.cxx
pCntntSect = new SwNodeIndex( *pSttNd );
Index: sw/source/core/doc/docglos.cxx
===================================================================
---- sw/source/core/doc/docglos.cxx (revision 272643)
-+++ sw/source/core/doc/docglos.cxx (revision 272644)
+--- sw/source/core/doc/docglos.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/doc/docglos.cxx (.../cws/os131) (revision 275705)
@@ -183,7 +183,7 @@
SwDontExpandItem aACD;
aACD.SaveDontExpandItems( rInsPos );
@@ -620,8 +619,8 @@ Index: sw/source/core/doc/docglos.cxx
if( pShell )
Index: sw/source/core/doc/tblcpy.cxx
===================================================================
---- sw/source/core/doc/tblcpy.cxx (revision 272643)
-+++ sw/source/core/doc/tblcpy.cxx (revision 272644)
+--- sw/source/core/doc/tblcpy.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/doc/tblcpy.cxx (.../cws/os131) (revision 275705)
@@ -567,7 +567,7 @@
SwNodeIndex aSavePos( aInsIdx, -1 );
@@ -633,8 +632,8 @@ Index: sw/source/core/doc/tblcpy.cxx
aSavePos++;
Index: sw/source/core/doc/docglbl.cxx
===================================================================
---- sw/source/core/doc/docglbl.cxx (revision 272643)
-+++ sw/source/core/doc/docglbl.cxx (revision 272644)
+--- sw/source/core/doc/docglbl.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/doc/docglbl.cxx (.../cws/os131) (revision 275705)
@@ -307,7 +307,7 @@
pDoc->GetNodes().Delete( aIdx, 1 );
@@ -655,8 +654,8 @@ Index: sw/source/core/doc/docglbl.cxx
// und noch alle Bookmarks
Index: sw/source/core/doc/tblrwcl.cxx
===================================================================
---- sw/source/core/doc/tblrwcl.cxx (revision 272643)
-+++ sw/source/core/doc/tblrwcl.cxx (revision 272644)
+--- sw/source/core/doc/tblrwcl.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/doc/tblrwcl.cxx (.../cws/os131) (revision 275705)
@@ -2103,7 +2103,7 @@
*rpFndBox->GetBox()->GetSttNd()->EndOfSectionNode() );
SwNodeIndex aInsIdx( *pBox->GetSttNd(), 1 );
@@ -668,8 +667,8 @@ Index: sw/source/core/doc/tblrwcl.cxx
}
Index: sw/source/core/doc/doclay.cxx
===================================================================
---- sw/source/core/doc/doclay.cxx (revision 272643)
-+++ sw/source/core/doc/doclay.cxx (revision 272644)
+--- sw/source/core/doc/doclay.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/doc/doclay.cxx (.../cws/os131) (revision 275705)
@@ -507,7 +507,7 @@
// sorge dafuer das auch Fly's in Fly's kopiert werden
@@ -690,9 +689,9 @@ Index: sw/source/core/doc/doclay.cxx
mbUndo = bOldUndo;
Index: sw/source/core/doc/docfmt.cxx
===================================================================
---- sw/source/core/doc/docfmt.cxx (revision 272643)
-+++ sw/source/core/doc/docfmt.cxx (revision 272644)
-@@ -2126,7 +2126,7 @@
+--- sw/source/core/doc/docfmt.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/doc/docfmt.cxx (.../cws/os131) (revision 275705)
+@@ -2136,7 +2136,7 @@
aTmpIdx = *pSttNd->EndOfSectionNode();
rSrcNds._Copy( aRg, aTmpIdx );
aTmpIdx = *pSttNd;
@@ -703,8 +702,8 @@ Index: sw/source/core/doc/docfmt.cxx
else
Index: sw/source/core/undo/untblk.cxx
===================================================================
---- sw/source/core/undo/untblk.cxx (revision 272643)
-+++ sw/source/core/undo/untblk.cxx (revision 272644)
+--- sw/source/core/undo/untblk.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/undo/untblk.cxx (.../cws/os131) (revision 275705)
@@ -346,7 +346,7 @@
SwPaM aPam( *rUndoIter.pAktPam->GetPoint() );
@@ -716,9 +715,9 @@ Index: sw/source/core/undo/untblk.cxx
}
Index: sw/source/core/docnode/ndcopy.cxx
===================================================================
---- sw/source/core/docnode/ndcopy.cxx (revision 272643)
-+++ sw/source/core/docnode/ndcopy.cxx (revision 272644)
-@@ -659,7 +659,7 @@
+--- sw/source/core/docnode/ndcopy.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/docnode/ndcopy.cxx (.../cws/os131) (revision 275705)
+@@ -670,7 +670,7 @@
// Kopieren eines Bereiches im oder in ein anderes Dokument !
@@ -727,7 +726,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
{
const SwPosition *pStt = rPam.Start(), *pEnd = rPam.End();
-@@ -698,13 +698,13 @@
+@@ -709,13 +709,13 @@
BOOL bRet = FALSE;
if( pDoc != this )
@@ -743,7 +742,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
else
{
-@@ -728,7 +728,7 @@
+@@ -739,7 +739,7 @@
SwStartNode* pSttNd = pDoc->GetNodes().MakeEmptySection(
SwNodeIndex( GetNodes().GetEndOfAutotext() ));
aPam.GetPoint()->nNode = *pSttNd->EndOfSectionNode();
@@ -752,7 +751,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
aPam.GetPoint()->nNode = pDoc->GetNodes().GetEndOfAutotext();
aPam.SetMark();
-@@ -803,7 +803,7 @@
+@@ -814,7 +814,7 @@
}
BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos,
@@ -761,7 +760,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
{
SwDoc* pDoc = rPos.nNode.GetNode().GetDoc();
bool bColumnSel = pDoc->IsClipBoard() && pDoc->IsColumnSelection();
-@@ -1087,7 +1087,7 @@
+@@ -1098,7 +1098,7 @@
}
}
@@ -770,7 +769,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
{
SfxItemSet aBrkSet( pDoc->GetAttrPool(), aBreakSetRange );
if( pSttNd && bCopyCollFmt && pDestNd->HasSwAttrSet() )
-@@ -1102,13 +1102,13 @@
+@@ -1113,13 +1113,13 @@
if( aInsPos == pEnd->nNode )
{
SwNodeIndex aSaveIdx( aInsPos, -1 );
@@ -786,7 +785,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
bCopyBookmarks = FALSE;
-@@ -1167,7 +1167,7 @@
+@@ -1178,7 +1178,7 @@
// ----- Copy-Methode vom SwDoc - "kopiere Fly's in Fly's" ------
@@ -795,7 +794,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
const SwNodeIndex& rInsPos, BOOL bMakeNewFrms,
BOOL bDelRedlines, BOOL bCopyFlyAtFly ) const
{
-@@ -1206,7 +1206,7 @@
+@@ -1217,7 +1217,7 @@
// Undo abschalten
BOOL bUndo = pDest->DoesUndo();
pDest->DoUndo( FALSE );
@@ -804,7 +803,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
pDest->DoUndo( bUndo );
SwNodeRange aCpyRange( aSavePos, rInsPos );
-@@ -1242,7 +1242,7 @@
+@@ -1253,7 +1253,7 @@
}
}
@@ -813,7 +812,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
BOOL bCopyFlyAtFly ) const
{
// Bug 22727: suche erst mal alle Flys zusammen, sortiere sie entsprechend
-@@ -1259,7 +1259,8 @@
+@@ -1270,7 +1270,8 @@
const SwFrmFmt* pFmt = (*GetSpzFrmFmts())[n];
const SwFmtAnchor* pAnchor = &pFmt->GetAnchor();
const SwPosition* pAPos;
@@ -823,7 +822,7 @@ Index: sw/source/core/docnode/ndcopy.cxx
pAnchor->GetAnchorId() == FLY_AT_FLY ||
pAnchor->GetAnchorId() == FLY_AUTO_CNTNT ) &&
0 != ( pAPos = pAnchor->GetCntntAnchor()) &&
-@@ -1268,9 +1269,53 @@
+@@ -1279,9 +1280,53 @@
: ( IsRedlineMove()
? rRg.aStart < pAPos->nNode
: rRg.aStart <= pAPos->nNode )) &&
@@ -881,9 +880,9 @@ Index: sw/source/core/docnode/ndcopy.cxx
Index: sw/source/core/docnode/section.cxx
===================================================================
---- sw/source/core/docnode/section.cxx (revision 272643)
-+++ sw/source/core/docnode/section.cxx (revision 272644)
-@@ -1415,7 +1415,7 @@
+--- sw/source/core/docnode/section.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/core/docnode/section.cxx (.../cws/os131) (revision 275705)
+@@ -1414,7 +1414,7 @@
if( pSrcDoc != pDoc ||
pCpyPam->Start()->nNode > rInsPos ||
rInsPos >= pCpyPam->End()->nNode )
@@ -892,7 +891,7 @@ Index: sw/source/core/docnode/section.cx
delete pCpyPam;
}
if( pCpyRg && pSrcDoc == pDoc &&
-@@ -1444,7 +1444,7 @@
+@@ -1443,7 +1443,7 @@
SwTblNumFmtMerge aTNFM( *pSrcDoc, *pDoc );
@@ -903,20 +902,18 @@ Index: sw/source/core/docnode/section.cx
if( !bCreateFrm )
Index: sw/source/ui/dbui/dbmgr.cxx
===================================================================
---- sw/source/ui/dbui/dbmgr.cxx (revision 272643)
-+++ sw/source/ui/dbui/dbmgr.cxx (revision 272644)
-@@ -35,7 +35,9 @@
+--- sw/source/ui/dbui/dbmgr.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/ui/dbui/dbmgr.cxx (.../cws/os131) (revision 275705)
+@@ -35,7 +35,7 @@
#endif
#include <stdio.h>
-
-+#ifdef SW_COPY_DOC_IN_MEMORY
+#include <unotxdoc.hxx>
-+#endif
#include <com/sun/star/text/NotePrintMode.hpp>
#include <sfx2/app.hxx>
#include <com/sun/star/sdb/CommandType.hpp>
-@@ -43,17 +45,13 @@
+@@ -43,17 +43,13 @@
#include <com/sun/star/frame/XComponentLoader.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
@@ -935,7 +932,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/uno/XNamingService.hpp>
-@@ -65,9 +63,7 @@
+@@ -65,9 +61,7 @@
#include <dbconfig.hxx>
#include <swdbtoolsclient.hxx>
#include <pagedesc.hxx>
@@ -945,7 +942,7 @@ Index: sw/source/ui/dbui/dbmgr.cxx
#include <unotools/tempfile.hxx>
#include <svtools/pathoptions.hxx>
#include <svtools/urihelper.hxx>
-@@ -86,39 +82,25 @@
+@@ -86,39 +80,25 @@
#include <goodies/mailenum.hxx>
#include <cmdid.h>
#include <swmodule.hxx>
@@ -985,81 +982,267 @@ Index: sw/source/ui/dbui/dbmgr.cxx
#include <mmconfigitem.hxx>
#include <sfx2/request.hxx>
#include <hintids.hxx>
-@@ -3182,7 +3164,10 @@
+@@ -3185,7 +3165,6 @@
SwWrtShell& rSourceShell = rSourceView.GetWrtShell();
BOOL bSynchronizedDoc = rSourceShell.IsLabelDoc() && rSourceShell.GetSectionFmtCount() > 1;
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else
- String sSourceDocURL;
-+#endif
+- String sSourceDocURL;
//save the settings of the first
rSourceShell.SttEndDoc(TRUE);
USHORT nStartingPageNo = rSourceShell.GetVirtPageNum();
-@@ -3192,6 +3177,8 @@
+@@ -3195,22 +3174,6 @@
try
{
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else
- // save the working document into a temporary location
- sSourceDocURL = URIHelper::SmartRel2Abs(
- INetURLObject(), utl::TempFile::CreateTempName(),
-@@ -3207,7 +3194,7 @@
- pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
- uno::Reference< frame::XStorable > xStore( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
- xStore->storeToURL( sSourceDocURL, aValues );
+- // save the working document into a temporary location
+- sSourceDocURL = URIHelper::SmartRel2Abs(
+- INetURLObject(), utl::TempFile::CreateTempName(),
+- URIHelper::GetMaybeFileHdl());
+- const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat(
+- String::CreateFromAscii( FILTER_XML ),
+- SwDocShell::Factory().GetFilterContainer() );
+-
+- SfxStringItem aFilterName( SID_FILTER_NAME, pSfxFlt->GetFilterName());
+- uno::Sequence< beans::PropertyValue > aValues(1);
+- beans::PropertyValue* pValues = aValues.getArray();
+- pValues[0].Name = C2U("FilterName");
+- pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
+- uno::Reference< frame::XStorable > xStore( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
+- xStore->storeToURL( sSourceDocURL, aValues );
-
-+#endif
// create a target docshell to put the merged document into
SfxObjectShellRef xTargetDocShell( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
xTargetDocShell->DoInitNew( 0 );
-@@ -3256,6 +3243,15 @@
+@@ -3259,116 +3222,120 @@
Application::Reschedule();
}
-+#ifdef SW_COPY_DOC_IN_MEMORY
+- // create a new docshell from the temporary document
+- SfxBoolItem aHidden( SID_HIDDEN, TRUE );
+- SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii(URL_PREFIX_PRIV_SOFFICE ));
+- SfxStringItem aTarget( SID_TARGETNAME, String::CreateFromAscii("_blank") );
+- SfxStringItem aURL( SID_FILE_NAME, sSourceDocURL );
+- const SfxPoolItem* pReturnValue =
+- rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
+- &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
+- if(pReturnValue)
+ // copy the source document
-+ uno::Reference< util::XCloneable > xClone( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
-+ uno::Reference< lang::XUnoTunnel > xWorkDocShell( xClone->createClone(), uno::UNO_QUERY);
-+ SwXTextDocument* pWorkModel = reinterpret_cast<SwXTextDocument*>(xWorkDocShell->getSomething(SwXTextDocument::getUnoTunnelId()));
++ SfxObjectShellRef xWorkDocSh;
++ if(nDocNo == 1 )
+ {
+- SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue;
+- SwView* pWorkView = (SwView*) pVItem->GetFrame()->GetViewShell();
+- SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
+- pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
++ uno::Reference< util::XCloneable > xClone( rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
++ uno::Reference< lang::XUnoTunnel > xWorkDocShell( xClone->createClone(), uno::UNO_QUERY);
++ SwXTextDocument* pWorkModel = reinterpret_cast<SwXTextDocument*>(xWorkDocShell->getSomething(SwXTextDocument::getUnoTunnelId()));
++ xWorkDocSh = pWorkModel->GetDocShell();
++ }
++ else
++ {
++ SwDoc* pNewDoc = rSourceView.GetDocShell()->GetDoc()->CreateCopy();
++ xWorkDocSh = new SwDocShell( pNewDoc, SFX_CREATE_MODE_STANDARD );
++ xWorkDocSh->DoInitNew();
++ }
+ //create a ViewFrame
-+ SfxObjectShellRef xWorkDocSh = pWorkModel->GetDocShell();
+ SwView* pWorkView = static_cast< SwView* >( SfxViewFrame::CreateViewFrame( *xWorkDocSh, 0, sal_True )->GetViewShell() );
-+#else
- // create a new docshell from the temporary document
- SfxBoolItem aHidden( SID_HIDDEN, TRUE );
- SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii(URL_PREFIX_PRIV_SOFFICE ));
-@@ -3265,9 +3261,13 @@
- rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
- &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
- if(pReturnValue)
-+#endif
- {
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else
- SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue;
- SwView* pWorkView = (SwView*) pVItem->GetFrame()->GetViewShell();
-+#endif
- SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
- pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
++ SwWrtShell& rWorkShell = pWorkView->GetWrtShell();
++ pWorkView->AttrChangedNotify( &rWorkShell );//Damit SelectShell gerufen wird.
-@@ -3387,8 +3387,11 @@
+- // merge the data
+- SwDoc* pWorkDoc = rWorkShell.GetDoc();
+- SwNewDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr();
+- pWorkDoc->SetNewDBMgr( this );
+- pWorkDoc->EmbedAllLinks();
+- if(UNDO_UI_DELETE_INVISIBLECNTNT == rWorkShell.GetUndoIds())
+- rWorkShell.Undo();
+- // create a layout
+- rWorkShell.CalcLayout();
+- SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
+- rWorkShell.ViewShell::UpdateFlds();
+- SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
++ // merge the data
++ SwDoc* pWorkDoc = rWorkShell.GetDoc();
++ SwNewDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr();
++ pWorkDoc->SetNewDBMgr( this );
++ pWorkDoc->EmbedAllLinks();
++ if(UNDO_UI_DELETE_INVISIBLECNTNT == rWorkShell.GetUndoIds())
++ rWorkShell.Undo();
++ // create a layout
++ rWorkShell.CalcLayout();
++ SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
++ rWorkShell.ViewShell::UpdateFlds();
++ SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
+
+- // strip invisible content and convert fields to text
+- rWorkShell.RemoveInvisibleContent();
+- rWorkShell.ConvertFieldsToText();
+- rWorkShell.SetNumberingRestart();
++ // strip invisible content and convert fields to text
++ rWorkShell.RemoveInvisibleContent();
++ rWorkShell.ConvertFieldsToText();
++ rWorkShell.SetNumberingRestart();
+
+
+- // insert the document into the target document
+- rWorkShell.SttEndDoc(FALSE);
+- rWorkShell.SttEndDoc(TRUE);
+- rWorkShell.SelAll();
+- pTargetShell->SttEndDoc(FALSE);
++ // insert the document into the target document
++ rWorkShell.SttEndDoc(FALSE);
++ rWorkShell.SttEndDoc(TRUE);
++ rWorkShell.SelAll();
++ pTargetShell->SttEndDoc(FALSE);
+
+- //#i63806# put the styles to the target document
+- //if the source uses headers or footers each new copy need to copy a new page styles
+- if(bPageStylesWithHeaderFooter)
+- {
+- //create a new pagestyle
+- //copy the pagedesc from the current document to the new document and change the name of the to-be-applied style
++ //#i63806# put the styles to the target document
++ //if the source uses headers or footers each new copy need to copy a new page styles
++ if(bPageStylesWithHeaderFooter)
++ {
++ //create a new pagestyle
++ //copy the pagedesc from the current document to the new document and change the name of the to-be-applied style
+
+- SwDoc* pTargetDoc = pTargetShell->GetDoc();
+- String sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
+- pTargetShell->GetDoc()->MakePageDesc( sNewPageDescName );
+- SwPageDesc* pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
+- if(pSourcePageDesc && pTargetPageDesc)
+- {
+- pTargetDoc->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, sal_False );
+- sModifiedStartingPageDesc = sNewPageDescName;
+- lcl_CopyFollowPageDesc( *pTargetShell, *pSourcePageDesc, *pTargetPageDesc, nDocNo );
+- }
+- }
+- if(nDocNo == 1 || bPageStylesWithHeaderFooter)
++ SwDoc* pTargetDoc = pTargetShell->GetDoc();
++ String sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
++ pTargetShell->GetDoc()->MakePageDesc( sNewPageDescName );
++ SwPageDesc* pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
++ if(pSourcePageDesc && pTargetPageDesc)
+ {
+- pTargetView->GetDocShell()->_LoadStyles( *pWorkView->GetDocShell(), sal_True );
++ pTargetDoc->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, sal_False );
++ sModifiedStartingPageDesc = sNewPageDescName;
++ lcl_CopyFollowPageDesc( *pTargetShell, *pSourcePageDesc, *pTargetPageDesc, nDocNo );
+ }
+- if(nDocNo > 1)
++ }
++ if(nDocNo == 1 || bPageStylesWithHeaderFooter)
++ {
++ pTargetView->GetDocShell()->_LoadStyles( *pWorkView->GetDocShell(), sal_True );
++ }
++ if(nDocNo > 1)
++ {
++ pTargetShell->InsertPageBreak( &sModifiedStartingPageDesc, nStartingPageNo );
++ }
++ else
++ {
++ pTargetShell->SetPageStyle(sModifiedStartingPageDesc);
++ }
++ USHORT nPageCountBefore = pTargetShell->GetPageCnt();
++ DBG_ASSERT(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended");
++ //#i51359# add a second paragraph in case there's only one
++ {
++ SwNodeIndex aIdx( pWorkDoc->GetNodes().GetEndOfExtras(), 2 );
++ SwPosition aTestPos( aIdx );
++ SwCursor aTestCrsr(aTestPos,0,false);
++ if(!aTestCrsr.MovePara(fnParaNext, fnParaStart))
+ {
+- pTargetShell->InsertPageBreak( &sModifiedStartingPageDesc, nStartingPageNo );
++ //append a paragraph
++ pWorkDoc->AppendTxtNode( aTestPos );
+ }
+- else
+- {
+- pTargetShell->SetPageStyle(sModifiedStartingPageDesc);
+- }
+- USHORT nPageCountBefore = pTargetShell->GetPageCnt();
+- DBG_ASSERT(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended");
+- //#i51359# add a second paragraph in case there's only one
+- {
+- SwNodeIndex aIdx( pWorkDoc->GetNodes().GetEndOfExtras(), 2 );
+- SwPosition aTestPos( aIdx );
+- SwCursor aTestCrsr(aTestPos,0,false);
+- if(!aTestCrsr.MovePara(fnParaNext, fnParaStart))
+- {
+- //append a paragraph
+- pWorkDoc->AppendTxtNode( aTestPos );
+- }
+- }
+- pTargetShell->Paste( rWorkShell.GetDoc(), sal_True );
+- //convert fields in page styles (header/footer - has to be done after the first document has been pasted
+- if(1 == nDocNo)
+- {
+- pTargetShell->CalcLayout();
+- pTargetShell->ConvertFieldsToText();
+- }
+- //add the document info to the config item
+- SwDocMergeInfo aMergeInfo;
+- aMergeInfo.nStartPageInTarget = nPageCountBefore;
+- //#i72820# calculate layout to be able to find the correct page index
++ }
++ pTargetShell->Paste( rWorkShell.GetDoc(), sal_True );
++ //convert fields in page styles (header/footer - has to be done after the first document has been pasted
++ if(1 == nDocNo)
++ {
+ pTargetShell->CalcLayout();
+- aMergeInfo.nEndPageInTarget = pTargetShell->GetPageCnt();
+- aMergeInfo.nDBRow = nStartRow;
+- rMMConfig.AddMergedDocument( aMergeInfo );
+- ++nRet;
++ pTargetShell->ConvertFieldsToText();
++ }
++ //add the document info to the config item
++ SwDocMergeInfo aMergeInfo;
++ aMergeInfo.nStartPageInTarget = nPageCountBefore;
++ //#i72820# calculate layout to be able to find the correct page index
++ pTargetShell->CalcLayout();
++ aMergeInfo.nEndPageInTarget = pTargetShell->GetPageCnt();
++ aMergeInfo.nDBRow = nStartRow;
++ rMMConfig.AddMergedDocument( aMergeInfo );
++ ++nRet;
+
+- // the print monitor needs some time to act
+- for( USHORT i = 0; i < 25; i++)
+- Application::Reschedule();
++ // the print monitor needs some time to act
++ for( USHORT i = 0; i < 25; i++)
++ Application::Reschedule();
+
+- //restore the ole DBMgr
+- pWorkDoc->SetNewDBMgr( pWorkDBMgr );
+- //now the temporary document should be closed
+- SfxObjectShellRef xDocSh(pWorkView->GetDocShell());
+- xDocSh->DoClose();
+- }
++ //restore the ole DBMgr
++ pWorkDoc->SetNewDBMgr( pWorkDBMgr );
++ //now the temporary document should be closed
++ SfxObjectShellRef xDocSh(pWorkView->GetDocShell());
++ xDocSh->DoClose();
+ nEndRow = pImpl->pMergeData->xResultSet->getRow();
+ ++nDocNo;
+ } while( !bCancel &&
+@@ -3390,8 +3357,6 @@
{
DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments");
}
-+#ifdef SW_COPY_DOC_IN_MEMORY
-+#else
- if(sSourceDocURL.Len())
- File::remove( sSourceDocURL );
-+#endif
+- if(sSourceDocURL.Len())
+- File::remove( sSourceDocURL );
DELETEZ(pImpl->pMergeData);
bInMerge = FALSE;
return nRet;
Index: sw/source/ui/uno/unoatxt.cxx
===================================================================
---- sw/source/ui/uno/unoatxt.cxx (revision 272643)
-+++ sw/source/ui/uno/unoatxt.cxx (revision 272644)
+--- sw/source/ui/uno/unoatxt.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/ui/uno/unoatxt.cxx (.../cws/os131) (revision 275705)
@@ -417,7 +417,7 @@
if(pxCursor)
{
@@ -1080,8 +1263,8 @@ Index: sw/source/ui/uno/unoatxt.cxx
}
Index: sw/source/ui/uno/unotxdoc.cxx
===================================================================
---- sw/source/ui/uno/unotxdoc.cxx (revision 272643)
-+++ sw/source/ui/uno/unotxdoc.cxx (revision 272644)
+--- sw/source/ui/uno/unotxdoc.cxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/source/ui/uno/unotxdoc.cxx (.../cws/os131) (revision 275705)
@@ -37,16 +37,12 @@
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
@@ -1123,7 +1306,7 @@ Index: sw/source/ui/uno/unotxdoc.cxx
#include <swcont.hxx>
#include <unodefaults.hxx>
#include <SwXDocumentSettings.hxx>
-@@ -2856,7 +2846,27 @@
+@@ -2851,7 +2841,27 @@
{
return new SwXFlatParagraphIterator( *pDocShell->GetDoc(), nTextMarkupType, bAutomatic );
}
@@ -1153,9 +1336,9 @@ Index: sw/source/ui/uno/unotxdoc.cxx
---------------------------------------------------------------------------*/
Index: sw/inc/doc.hxx
===================================================================
---- sw/inc/doc.hxx (revision 272643)
-+++ sw/inc/doc.hxx (revision 272644)
-@@ -636,7 +636,7 @@
+--- sw/inc/doc.hxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/inc/doc.hxx (.../cws/os131) (revision 275705)
+@@ -638,7 +638,7 @@
// Kopieren eines Bereiches im oder in ein anderes Dokument !
// Die Position darf nicht im Bereich liegen !!
sal_Bool _Copy( SwPaM&, SwPosition&,
@@ -1164,7 +1347,7 @@ Index: sw/inc/doc.hxx
SwFlyFrmFmt* _MakeFlySection( const SwPosition& rAnchPos,
const SwCntntNode& rNode, RndStdIds eRequestId,
-@@ -648,7 +648,8 @@
+@@ -650,7 +650,8 @@
const SfxItemSet* pGrfAttrSet,
SwFrmFmt* = 0 );
@@ -1174,7 +1357,7 @@ Index: sw/inc/doc.hxx
sal_Bool bCopyFlyAtFly = sal_False ) const; // steht im ndcopy.cxx
sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, sal_Bool bNewFrms );
-@@ -720,6 +721,7 @@
+@@ -722,6 +723,7 @@
SwFmt *_MakeFrmFmt(const String &, SwFmt *, BOOL, BOOL );
SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, BOOL, BOOL );
@@ -1182,7 +1365,7 @@ Index: sw/inc/doc.hxx
public:
/** Life cycle
-@@ -915,7 +917,7 @@
+@@ -898,7 +900,7 @@
/** IDocumentContentOperations
*/
@@ -1191,7 +1374,7 @@ Index: sw/inc/doc.hxx
virtual void DeleteSection(SwNode* pNode);
virtual bool Delete(SwPaM&);
virtual bool DelFullPara(SwPaM&);
-@@ -1118,6 +1120,7 @@
+@@ -1101,6 +1103,7 @@
SwFrmFmt *pParent = 0 );
void CopyWithFlyInFly( const SwNodeRange& rRg,
@@ -1199,7 +1382,7 @@ Index: sw/inc/doc.hxx
const SwNodeIndex& rInsPos,
sal_Bool bMakeNewFrms = sal_True,
sal_Bool bDelRedlines = sal_True,
-@@ -2117,6 +2120,7 @@
+@@ -2100,6 +2103,7 @@
{
return n32DummyCompatabilityOptions2;
}
@@ -1209,8 +1392,8 @@ Index: sw/inc/doc.hxx
Index: sw/inc/unotxdoc.hxx
===================================================================
---- sw/inc/unotxdoc.hxx (revision 272643)
-+++ sw/inc/unotxdoc.hxx (revision 272644)
+--- sw/inc/unotxdoc.hxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/inc/unotxdoc.hxx (.../cws/os131) (revision 275705)
@@ -68,9 +68,8 @@
#include <com/sun/star/xforms/XFormsSupplier.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
@@ -1299,8 +1482,8 @@ Index: sw/inc/unotxdoc.hxx
SwXDocumentPropertyHelper * GetPropertyHelper ();
Index: sw/inc/IDocumentContentOperations.hxx
===================================================================
---- sw/inc/IDocumentContentOperations.hxx (revision 272643)
-+++ sw/inc/IDocumentContentOperations.hxx (revision 272644)
+--- sw/inc/IDocumentContentOperations.hxx (.../tags/DEV300_m50) (revision 275705)
++++ sw/inc/IDocumentContentOperations.hxx (.../cws/os131) (revision 275705)
@@ -71,7 +71,7 @@
/** Kopieren eines Bereiches im oder in ein anderes Dokument !
Die Position kann auch im Bereich liegen !!
@@ -1310,3 +1493,10 @@ Index: sw/inc/IDocumentContentOperations
/** Loesche die Section, in der der Node steht.
*/
+
+Property changes on: .
+___________________________________________________________________
+Added: svn:mergeinfo
+ Merged /tags/DEV300_m50:r272825-272842
+ Merged /trunk:r270724-272824
+
--- openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch DELETED ---
- Previous message (by thread): rpms/openoffice.org/F-11 openoffice.org.spec, 1.1932, 1.1933 workspace.os131.patch, 1.1, 1.2
- Next message (by thread): rpms/xmms/F-10 xmms-play.patch, NONE, 1.1 import.log, 1.3, 1.4 xmms.spec, 1.38, 1.39
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list