[Libreoffice-commits] core.git: Branch 'private/jmux/mailmerge-fixes' - 302 commits - android/Bootstrap android/CustomTarget_lo_android.mk android/experimental android/Module_android.mk avmedia/source basctl/source basic/source bin/get-bugzilla-attachments-by-mimetype bridges/source chart2/CppunitTest_chart2_xshape.mk chart2/inc chart2/source cli_ure/source codemaker/source comphelper/source compilerplugins/clang config_host.mk.in configmgr/source configure.ac connectivity/source cppcanvas/source cppuhelper/source cppu/source cui/source cui/uiconfig cui/UIConfig_cui.mk dbaccess/source desktop/Library_sofficeapp.mk desktop/source dictionaries download.lst drawinglayer/source editeng/source extensions/CppunitTest_extensions_test_update.mk extensions/source external/firebird external/hyphen external/libexttextcat external/libgltf external/libpagemaker external/Module_external.mk external/mythes filter/Configuration_filter.mk filter/source forms/source fpicker/source fpicker/uiconfig fpicker/UIConfig _fps.mk framework/source helpcompiler/source helpcontent2 hwpfilter/source i18nlangtag/source i18npool/source include/basegfx include/canvas include/comphelper include/connectivity include/dbaccess include/drawinglayer include/editeng include/LibreOfficeKit include/oox include/osl include/sal include/sfx2 include/svl include/svtools include/svx include/toolkit include/tools include/vcl include/xmloff jvmfwk/plugins jvmfwk/source l10ntools/source libreofficekit/source lotuswordpro/source Makefile.fetch odk/examples oox/source README.cross registry/source reportdesign/source RepositoryExternal.mk rsc/source sal/android sal/Library_lo-bootstrap.mk sal/osl sal/qa sal/rtl sax/source sc/inc sc/qa scripting/source sc/source sdext/source sd/inc sd/source sfx2/source slideshow/source solenv/bin solenv/gbuild sot/source starmath/inc starmath/source svgio/source svl/source svtools/source svx/Library_svxcore.mk svx/source sw/inc sw/Library_sw.mk sw/qa sw/source sw/uiconfig sysui/desktop toolkit /source tools/source ucb/source unodevtools/source unoidl/source unotools/source unoxml/source uui/source vbahelper/source vcl/generic vcl/inc vcl/osx vcl/source vcl/unx writerfilter/CustomTarget_source.mk writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source writerperfect/Library_wpftdraw.mk writerperfect/qa writerperfect/source xmloff/inc xmloff/source
Jan-Marek Glogowski
glogow at fbihome.de
Tue Jul 1 10:26:49 PDT 2014
Rebased ref, commits from common ancestor:
commit ca13dd2bfcc13fb720c9f5e8f0fe2b3319f8bb3c
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Jul 1 15:48:01 2014 +0200
Add debug messages for sw.{createcopy,docappend}
This adds a lot of SAL_INFO messages to SwDoc::CreateCopy and
SwDoc::Append.
Change-Id: Ie924e20698bec84482fcc5496175a9e29245729e
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index c34eb66..e63beca 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -994,6 +994,11 @@ void SwDoc::ReplaceCompatabilityOptions(const SwDoc& rSource)
m_pDocumentSettingManager->ReplaceCompatibilityOptions(rSource.GetDocumentSettingManager());
}
+#define CNTNT_DOC( doc ) \
+ ((doc)->GetNodes().GetEndOfContent().GetIndex() - (doc)->GetNodes().GetEndOfExtras().GetIndex() - 2)
+#define CNTNT_IDX( idx ) \
+ ((idx).GetNode().GetIndex() - GetNodes().GetEndOfExtras().GetIndex() - 1)
+
SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
{
SwDoc* pRet = new SwDoc;
@@ -1017,7 +1022,14 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
pRet->ReplaceStyles(*this);
+#ifdef DBG_UTIL
+ SAL_INFO( "sw.createcopy", "CC-Nd-Src: " << CNTNT_DOC( this ) );
+ SAL_INFO( "sw.createcopy", "CC-Nd: " << CNTNT_DOC( pRet ) );
+#endif
pRet->Append(*this, 0, NULL, bCallInitNew);
+#ifdef DBG_UTIL
+ SAL_INFO( "sw.createcopy", "CC-Nd: " << CNTNT_DOC( pRet ) );
+#endif
// remove the temporary shell if it is there as it was done before
pRet->SetTmpDocShell( (SfxObjectShell*) NULL );
@@ -1048,9 +1060,35 @@ void SwDoc::Append( const SwDoc& rSource, sal_uInt16 nStartPageNumber,
else
aCpyPam = SwPaM( aSourceIdx, aSourceEndIdx );
+#ifdef DBG_UTIL
+ SAL_INFO( "sw.docappend", "NodeType 0x" << std::hex << (int) aSourceIdx.GetNode().GetNodeType()
+ << std::dec << " " << aSourceIdx.GetNode().GetIndex() );
+ aSourceIdx++;
+ SAL_INFO( "sw.docappend", "NodeType 0x" << std::hex << (int) aSourceIdx.GetNode().GetNodeType()
+ << std::dec << " " << aSourceIdx.GetNode().GetIndex() );
+ if ( aSourceIdx.GetNode().GetNodeType() != ND_ENDNODE ) {
+ aSourceIdx++;
+ SAL_INFO( "sw.docappend", "NodeType 0x" << std::hex << (int) aSourceIdx.GetNode().GetNodeType() << std::dec );
+ aSourceIdx--;
+ }
+ aSourceIdx--;
+ SAL_INFO( "sw.docappend", ".." );
+ SAL_INFO( "sw.docappend", "NodeType 0x" << std::hex << (int) aSourceEndIdx.GetNode().GetNodeType()
+ << std::dec << " " << aSourceEndIdx.GetNode().GetIndex() );
+ aSourceEndIdx++;
+ SAL_INFO( "sw.docappend", "NodeType 0x" << std::hex << (int) aSourceEndIdx.GetNode().GetNodeType()
+ << std::dec << " " << aSourceEndIdx.GetNode().GetIndex() );
+ aSourceEndIdx--;
+ SAL_INFO( "sw.docappend", "Src-Nd: " << CNTNT_DOC( &rSource ) );
+ SAL_INFO( "sw.docappend", "Nd: " << CNTNT_DOC( this ) );
+#endif
+
SwWrtShell* pTargetShell = GetDocShell()->GetWrtShell();
sal_uInt16 nPhysPageNumber = 0;
if ( pTargetShell ) {
+#ifdef DBG_UTIL
+ SAL_INFO( "sw.docappend", "Has target write shell" );
+#endif
pTargetShell->StartAllAction();
// Otherwise we have to handle SwDummySectionNodes as first node
@@ -1067,7 +1105,13 @@ void SwDoc::Append( const SwDoc& rSource, sal_uInt16 nStartPageNumber,
// We always start on an odd physical page number
if (1 == nPhysPageNumber % 2)
nPhysPageNumber++;
+#ifdef DBG_UTIL
+ SAL_INFO( "sw.docappend", "PPNo " << nPhysPageNumber );
+#endif
}
+#ifdef DBG_UTIL
+ SAL_INFO( "sw.docappend", "Nd: " << CNTNT_DOC( this ) );
+#endif
// -1, otherwise aFixupIdx would move to new EOC
SwNodeIndex aFixupIdx( GetNodes().GetEndOfContent(), -1 );
@@ -1076,6 +1120,13 @@ void SwDoc::Append( const SwDoc& rSource, sal_uInt16 nStartPageNumber,
SwNodeIndex aTargetIdx( GetNodes().GetEndOfContent() );
SwPaM aInsertPam( aTargetIdx );
+#ifdef DBG_UTIL
+ SAL_INFO( "sw.docappend", "Pam-Nd: " << aCpyPam.GetNode( true ).GetIndex() - aCpyPam.GetNode( false ).GetIndex() + 1
+ << " (0x" << std::hex << (int) aCpyPam.GetNode( false ).GetNodeType() << std::dec
+ << " " << aCpyPam.GetNode( false ).GetIndex()
+ << " - 0x" << std::hex << (int) aCpyPam.GetNode( true ).GetNodeType() << std::dec
+ << " " << aCpyPam.GetNode( true ).GetIndex() << ")" );
+#endif
GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, NULL );
LockExpFlds();
@@ -1091,9 +1142,14 @@ void SwDoc::Append( const SwDoc& rSource, sal_uInt16 nStartPageNumber,
SwNodeIndex aIndexBefore(rInsPos.nNode);
aIndexBefore--;
-
+#ifdef DBG_UTIL
+ SAL_INFO( "sw.docappend", "CopyRange In: " << CNTNT_DOC( this ) );
+#endif
rSource.CopyRange( aCpyPam, rInsPos, true );
// Note: aCpyPam is invalid now
+#ifdef DBG_UTIL
+ SAL_INFO( "sw.docappend", "CopyRange Out: " << CNTNT_DOC( this ) );
+#endif
++aIndexBefore;
SwPaM aPaM(SwPosition(aIndexBefore),
@@ -1122,10 +1178,23 @@ void SwDoc::Append( const SwDoc& rSource, sal_uInt16 nStartPageNumber,
if ( nStartPageNumber || pTargetPageDesc ) {
// Changes the index of aFixupIdx
SwTxtNode *aTxtNd = dynamic_cast< SwTxtNode* >( GetNodes().GoNext(&aFixupIdx) );
+#ifdef DBG_UTIL
+ SAL_INFO( "sw.docappend", "Idx " << CNTNT_IDX( aDelIdx ) );
+ SAL_INFO( "sw.docappend", "Idx " << CNTNT_IDX( aFixupIdx ) );
+#endif
if ( aTxtNd ) {
SfxPoolItem *pNewItem = aTxtNd->GetAttr( RES_PAGEDESC ).Clone();
+#ifdef DBG_UTIL
+ SAL_INFO( "sw.docappend", "Which: " << pNewItem->Which() << " " << RES_PAGEDESC );
+#endif
SwFmtPageDesc *aDesc = dynamic_cast< SwFmtPageDesc* >( pNewItem );
if ( aDesc ) {
+#ifdef DBG_UTIL
+if ( aDesc->GetPageDesc() )
+ SAL_INFO( "sw.docappend", "PD Update " << aDesc->GetPageDesc()->GetName() );
+else
+ SAL_INFO( "sw.docappend", "PD New" );
+#endif
if ( nStartPageNumber )
aDesc->SetNumOffset( nStartPageNumber );
if ( pTargetPageDesc )
@@ -1134,6 +1203,10 @@ void SwDoc::Append( const SwDoc& rSource, sal_uInt16 nStartPageNumber,
}
delete pNewItem;
}
+
+#ifdef DBG_UTIL
+ SAL_INFO( "sw.docappend", "Idx " << CNTNT_IDX( aDelIdx ) );
+#endif
iDelNodes++;
}
@@ -1147,6 +1220,11 @@ void SwDoc::Append( const SwDoc& rSource, sal_uInt16 nStartPageNumber,
if ( pTargetShell )
pTargetShell->SttEndDoc( false );
aDelIdx -= (iDelNodes - 1);
+#ifdef DBG_UTIL
+ SAL_INFO( "sw.docappend", "iDelNodes: " << iDelNodes
+ << " Idx: " << aDelIdx.GetNode().GetIndex()
+ << " EOE: " << GetNodes().GetEndOfExtras().GetIndex() );
+#endif
GetNodes().Delete( aDelIdx, iDelNodes );
}
}
@@ -1159,6 +1237,10 @@ void SwDoc::Append( const SwDoc& rSource, sal_uInt16 nStartPageNumber,
SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() );
if (FLY_AT_PAGE != aAnchor.GetAnchorId())
continue;
+#ifdef DBG_UTIL
+ SAL_INFO( "sw.docappend", "PaAn: " << aAnchor.GetPageNum()
+ << " => " << aAnchor.GetPageNum() + nPhysPageNumber );
+#endif
if ( nPhysPageNumber )
aAnchor.SetPageNum( aAnchor.GetPageNum() + nPhysPageNumber );
CopyLayoutFmt( rCpyFmt, aAnchor, true, true );
commit b55d0cf0471adb50e6ac09f427891d527c9b3693
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Jul 1 15:45:47 2014 +0200
Fix single node CopyRange
Change-Id: Iadf21d3928303c2ab8df0d93dabd969ed1ff7e09
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index d0e31aa..b276d4d 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -469,7 +469,8 @@ private:
void CopyFlyInFlyImpl( const SwNodeRange& rRg,
const sal_Int32 nEndContentIndex,
const SwNodeIndex& rStartIdx,
- const bool bCopyFlyAtFly = false ) const;
+ const bool bCopyFlyAtFly = false,
+ const bool bMergedFirstNode = false ) const;
sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, bool bNewFrms );
typedef SwFmt* (SwDoc:: *FNCopyFmt)( const OUString&, SwFmt*, bool, bool );
@@ -902,7 +903,8 @@ public:
const SwPaM* pCopiedPaM = NULL,
bool bMakeNewFrms = true,
bool bDelRedlines = true,
- bool bCopyFlyAtFly = false ) const;
+ bool bCopyFlyAtFly = false,
+ bool bSkipFirstNode = false ) const;
//UUUU Helper that checks for unique items for DrawingLayer items of type NameOrIndex
// and evtl. corrects that items to ensure unique names for that type. This call may
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 5443c9f..771e9d7 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -673,7 +673,7 @@ SwDoc::CopyRange( SwPaM& rPam, SwPosition& rPos, const bool bCopyAll ) const
bool bColumnSel = pDoc->IsClipBoard() && pDoc->IsColumnSelection();
// Catch if there's no copy to do
- if( !rPam.HasMark() || ( *pStt >= *pEnd && !bColumnSel ) )
+ if( !rPam.HasMark() || ( *pStt > *pEnd && !bColumnSel ) )
return false;
// Prevent copying in Flys that are anchored in the area
@@ -923,7 +923,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
SwPosition* pEnd = rPam.End();
// Catch when there's no copy to do.
- if( !rPam.HasMark() || ( *pStt >= *pEnd && !bColumnSel ) ||
+ if( !rPam.HasMark() || ( *pStt > *pEnd && !bColumnSel ) ||
//JP 29.6.2001: 88963 - dont copy if inspos is in region of start to end
//JP 15.11.2001: don't test inclusive the end, ever exclusive
( pDoc == this && *pStt <= rPos && rPos < *pEnd ))
@@ -1011,6 +1011,8 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
pNumRuleToPropagate = 0;
}
+ bool bHandledStartNode = false;
+
// This do/while block is only there so that we can break out of it!
do {
if( pSttTxtNd )
@@ -1018,6 +1020,8 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
// Don't copy the beginning completely?
if( !bCopyCollFmt || bColumnSel || pStt->nContent.GetIndex() )
{
+ bHandledStartNode = true;
+
SwIndex aDestIdx( rPos.nContent );
bool bCopyOk = false;
if( !pDestTxtNd )
@@ -1093,18 +1097,11 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
pEnd->nContent -= nCpyLen;
}
- if( bOneNode )
+ if( bCopyCollFmt && bOneNode )
{
- if( bCopyCollFmt )
- {
- pSttTxtNd->CopyCollFmt( *pDestTxtNd );
- POP_NUMRULE_STATE
- }
-
- break;
+ pSttTxtNd->CopyCollFmt( *pDestTxtNd );
+ POP_NUMRULE_STATE
}
-
- aRg.aStart++;
}
}
else if( pDestTxtNd )
@@ -1161,7 +1158,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
}
pDestTxtNd = aInsPos.GetNode().GetTxtNode();
- if( pEndTxtNd )
+ if( pEndTxtNd && (!bOneNode || !bHandledStartNode) )
{
SwIndex aDestIdx( rPos.nContent );
if( !pDestTxtNd )
@@ -1205,7 +1202,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
if( bCopyAll || aRg.aStart != aRg.aEnd )
{
SfxItemSet aBrkSet( pDoc->GetAttrPool(), aBreakSetRange );
- if( pSttTxtNd && bCopyCollFmt && pDestTxtNd->HasSwAttrSet() )
+ if( !bOneNode && pSttTxtNd && bCopyCollFmt && pDestTxtNd->HasSwAttrSet() )
{
aBrkSet.Put( *pDestTxtNd->GetpSwAttrSet() );
if( SFX_ITEM_SET == aBrkSet.GetItemState( RES_BREAK, false ) )
@@ -1217,13 +1214,15 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
if( aInsPos == pEnd->nNode )
{
SwNodeIndex aSaveIdx( aInsPos, -1 );
- CopyWithFlyInFly( aRg, 0,aInsPos, &rPam, bMakeNewFrms, false );
+ CopyWithFlyInFly( aRg, 0, aInsPos, &rPam, bMakeNewFrms,
+ false, false, bHandledStartNode );
++aSaveIdx;
pEnd->nNode = aSaveIdx;
pEnd->nContent.Assign( aSaveIdx.GetNode().GetTxtNode(), 0 );
}
else
- CopyWithFlyInFly( aRg, pEnd->nContent.GetIndex(), aInsPos, &rPam, bMakeNewFrms, false );
+ CopyWithFlyInFly( aRg, pEnd->nContent.GetIndex(), aInsPos, &rPam,
+ bMakeNewFrms, false, false, bHandledStartNode );
bCopyBookmarks = false;
@@ -1312,7 +1311,8 @@ void SwDoc::CopyWithFlyInFly(
const SwPaM* pCopiedPaM,
const bool bMakeNewFrms,
const bool bDelRedlines,
- const bool bCopyFlyAtFly ) const
+ const bool bCopyFlyAtFly,
+ const bool bMergedFirstNode ) const
{
SwDoc* pDest = rInsPos.GetNode().GetDoc();
@@ -1320,13 +1320,17 @@ void SwDoc::CopyWithFlyInFly(
SwNodeIndex aSavePos( rInsPos, -1 );
bool bEndIsEqualEndPos = rInsPos == rRg.aEnd;
- GetNodes()._CopyNodes( rRg, rInsPos, bMakeNewFrms, true );
- ++aSavePos;
- if( bEndIsEqualEndPos )
+ SwNodeRange aRg( rRg );
+ if ( bMergedFirstNode )
+ aRg.aStart++;
+ if ( aRg.aStart <= aRg.aEnd )
+ GetNodes()._CopyNodes( aRg, rInsPos, bMakeNewFrms, true );
+ if ( !bMergedFirstNode )
+ ++aSavePos;
+ if ( bEndIsEqualEndPos )
((SwNodeIndex&)rRg.aEnd) = aSavePos;
aRedlRest.Restore();
-
#if OSL_DEBUG_LEVEL > 0
{
//JP 17.06.99: Bug 66973 - check count only if the selection is in
@@ -1340,9 +1344,9 @@ void SwDoc::CopyWithFlyInFly(
!aTmpI.GetNode().IsEndNode() )
{
// If the range starts with a SwStartNode, it isn't copied
- sal_uInt16 offset = (rRg.aStart.GetNode().GetNodeType() != ND_STARTNODE) ? 1 : 0;
+ sal_uInt16 offset = (aRg.aStart.GetNode().GetNodeType() != ND_STARTNODE) ? 1 : 0;
OSL_ENSURE( rInsPos.GetIndex() - aSavePos.GetIndex() ==
- rRg.aEnd.GetIndex() - rRg.aStart.GetIndex() - 1 + offset,
+ aRg.aEnd.GetIndex() - aRg.aStart.GetIndex() - 1 + offset,
"An insufficient number of nodes were copied!" );
}
}
@@ -1350,7 +1354,7 @@ void SwDoc::CopyWithFlyInFly(
{
::sw::UndoGuard const undoGuard(pDest->GetIDocumentUndoRedo());
- CopyFlyInFlyImpl( rRg, nEndContentIndex, aSavePos, bCopyFlyAtFly );
+ CopyFlyInFlyImpl( rRg, nEndContentIndex, aSavePos, bCopyFlyAtFly, bMergedFirstNode );
}
SwNodeRange aCpyRange( aSavePos, rInsPos );
@@ -1392,7 +1396,8 @@ void SwDoc::CopyFlyInFlyImpl(
const SwNodeRange& rRg,
const sal_Int32 nEndContentIndex,
const SwNodeIndex& rStartIdx,
- const bool bCopyFlyAtFly ) const
+ const bool bCopyFlyAtFly,
+ const bool bMergedFirstNode ) const
{
// First collect all Flys, sort them according to their ordering number,
// and then only copy them. This maintains the ordering numbers (which are only
@@ -1512,6 +1517,9 @@ void SwDoc::CopyFlyInFlyImpl(
++aIdx;
}
+ if ( bMergedFirstNode )
+ nAnchorTxtNdNumInRange--;
+
if ( !bAnchorTxtNdFound )
{
// This case can *not* happen, but to be robust take the first
commit dfba87412ba460627c18e393b7e9bee6c4bf3ad8
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Jul 1 13:02:58 2014 +0200
Refactor NumRule handling in CopyImpl
The bug fix for i#86492 added a lot of duplicated code. This moves
the code into their own functions and uses macros to make the
resulting code even more readable.
Change-Id: Ifa0ece26f3152f1f8d8c65173b459e8c14c5b43a
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 1f49b0d..5443c9f 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -849,6 +849,69 @@ static bool lcl_ContainsOnlyParagraphsInList( const SwPaM& rPam )
return bRet;
}
+#define NUMRULE_STATE \
+ int aNumRuleState = SFX_ITEM_UNKNOWN; \
+ SwNumRuleItem aNumRuleItem; \
+ int aListIdState = SFX_ITEM_UNKNOWN; \
+ SfxStringItem aListIdItem( RES_PARATR_LIST_ID, OUString() ); \
+
+#define PUSH_NUMRULE_STATE \
+ lcl_PushNumruleState( aNumRuleState, aNumRuleItem, aListIdState, aListIdItem, pDestTxtNd );
+
+#define POP_NUMRULE_STATE \
+ lcl_PopNumruleState( aNumRuleState, aNumRuleItem, aListIdState, aListIdItem, pDestTxtNd, rPam );
+
+static void lcl_PushNumruleState( int &aNumRuleState, SwNumRuleItem &aNumRuleItem,
+ int &aListIdState, SfxStringItem &aListIdItem,
+ const SwTxtNode *pDestTxtNd )
+{
+ // Safe numrule item at destination.
+ // #i86492# - Safe also <ListId> item of destination.
+ const SfxItemSet * pAttrSet = pDestTxtNd->GetpSwAttrSet();
+ if (pAttrSet != NULL)
+ {
+ const SfxPoolItem * pItem = NULL;
+ aNumRuleState = pAttrSet->GetItemState(RES_PARATR_NUMRULE, false, &pItem);
+ if (SFX_ITEM_SET == aNumRuleState)
+ aNumRuleItem = *((SwNumRuleItem *) pItem);
+
+ aListIdState =
+ pAttrSet->GetItemState(RES_PARATR_LIST_ID, false, &pItem);
+ if (SFX_ITEM_SET == aListIdState)
+ {
+ aListIdItem.SetValue( static_cast<const SfxStringItem*>(pItem)->GetValue() );
+ }
+ }
+}
+
+static void lcl_PopNumruleState( int aNumRuleState, const SwNumRuleItem &aNumRuleItem,
+ int aListIdState, const SfxStringItem &aListIdItem,
+ SwTxtNode *pDestTxtNd, const SwPaM& rPam )
+{
+ /* If only a part of one paragraph is copied
+ restore the numrule at the destination. */
+ // #i86492# - restore also <ListId> item
+ if ( !lcl_MarksWholeNode(rPam) )
+ {
+ if (SFX_ITEM_SET == aNumRuleState)
+ {
+ pDestTxtNd->SetAttr(aNumRuleItem);
+ }
+ else
+ {
+ pDestTxtNd->ResetAttr(RES_PARATR_NUMRULE);
+ }
+ if (SFX_ITEM_SET == aListIdState)
+ {
+ pDestTxtNd->SetAttr(aListIdItem);
+ }
+ else
+ {
+ pDestTxtNd->ResetAttr(RES_PARATR_LIST_ID);
+ }
+ }
+}
+
bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
const bool bMakeNewFrms, const bool bCopyAll,
SwPaM *const pCpyRange ) const
@@ -1012,28 +1075,10 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
}
}
- // Safe numrule item at destination.
- // #i86492# - Safe also <ListId> item of destination.
- int aNumRuleState = SFX_ITEM_UNKNOWN;
- SwNumRuleItem aNumRuleItem;
- int aListIdState = SFX_ITEM_UNKNOWN;
- SfxStringItem aListIdItem( RES_PARATR_LIST_ID, OUString() );
+ NUMRULE_STATE
+ if( bCopyCollFmt && bOneNode )
{
- const SfxItemSet * pAttrSet = pDestTxtNd->GetpSwAttrSet();
- if (pAttrSet != NULL)
- {
- const SfxPoolItem * pItem = NULL;
- aNumRuleState = pAttrSet->GetItemState(RES_PARATR_NUMRULE, false, &pItem);
- if (SFX_ITEM_SET == aNumRuleState)
- aNumRuleItem = *((SwNumRuleItem *) pItem);
-
- aListIdState =
- pAttrSet->GetItemState(RES_PARATR_LIST_ID, false, &pItem);
- if (SFX_ITEM_SET == aListIdState)
- {
- aListIdItem.SetValue( static_cast<const SfxStringItem*>(pItem)->GetValue() );
- }
- }
+ PUSH_NUMRULE_STATE
}
if( !bCopyOk )
@@ -1053,29 +1098,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
if( bCopyCollFmt )
{
pSttTxtNd->CopyCollFmt( *pDestTxtNd );
-
- /* If only a part of one paragraph is copied
- restore the numrule at the destination. */
- // #i86492# - restore also <ListId> item
- if ( !lcl_MarksWholeNode(rPam) )
- {
- if (SFX_ITEM_SET == aNumRuleState)
- {
- pDestTxtNd->SetAttr(aNumRuleItem);
- }
- else
- {
- pDestTxtNd->ResetAttr(RES_PARATR_NUMRULE);
- }
- if (SFX_ITEM_SET == aListIdState)
- {
- pDestTxtNd->SetAttr(aListIdItem);
- }
- else
- {
- pDestTxtNd->ResetAttr(RES_PARATR_LIST_ID);
- }
- }
+ POP_NUMRULE_STATE
}
break;
@@ -1157,31 +1180,14 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
bStartIsTxtNode = true;
}
- // Save numrule at destination
- // #i86492# - Safe also <ListId> item of destination.
- int aNumRuleState = SFX_ITEM_UNKNOWN;
- SwNumRuleItem aNumRuleItem;
- int aListIdState = SFX_ITEM_UNKNOWN;
- SfxStringItem aListIdItem( RES_PARATR_LIST_ID, OUString() );
- {
- const SfxItemSet* pAttrSet = pDestTxtNd->GetpSwAttrSet();
- if (pAttrSet != NULL)
- {
- const SfxPoolItem * pItem = NULL;
-
- aNumRuleState =
- pAttrSet->GetItemState(RES_PARATR_NUMRULE, false, &pItem);
- if (SFX_ITEM_SET == aNumRuleState)
- aNumRuleItem = *((SwNumRuleItem *) pItem);
+ const bool bEmptyDestNd = pDestTxtNd->GetTxt().isEmpty();
- aListIdState =
- pAttrSet->GetItemState(RES_PARATR_LIST_ID, false, &pItem);
- if (SFX_ITEM_SET == aListIdState)
- aListIdItem.SetValue( static_cast<const SfxStringItem*>(pItem)->GetValue() );
- }
+ NUMRULE_STATE
+ if( bCopyCollFmt && ( bOneNode || bEmptyDestNd ))
+ {
+ PUSH_NUMRULE_STATE
}
- const bool bEmptyDestNd = pDestTxtNd->GetTxt().isEmpty();
pEndTxtNd->CopyText( pDestTxtNd, aDestIdx, SwIndex( pEndTxtNd ),
pEnd->nContent.GetIndex() );
@@ -1189,31 +1195,9 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
if( bCopyCollFmt && ( bOneNode || bEmptyDestNd ))
{
pEndTxtNd->CopyCollFmt( *pDestTxtNd );
-
if ( bOneNode )
{
- /* If only a part of one paragraph is copied
- restore the numrule at the destination. */
- // #i86492# - restore also <ListId> item
- if ( !lcl_MarksWholeNode(rPam) )
- {
- if (SFX_ITEM_SET == aNumRuleState)
- {
- pDestTxtNd->SetAttr(aNumRuleItem);
- }
- else
- {
- pDestTxtNd->ResetAttr(RES_PARATR_NUMRULE);
- }
- if (SFX_ITEM_SET == aListIdState)
- {
- pDestTxtNd->SetAttr(aListIdItem);
- }
- else
- {
- pDestTxtNd->ResetAttr(RES_PARATR_LIST_ID);
- }
- }
+ POP_NUMRULE_STATE
}
}
}
commit 4f577cf7719a0767e8b9d43ac40d0fc67ed6f4a8
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Jul 1 15:25:10 2014 +0200
Append fixup
Change-Id: I84ee5290ded20803d1496daa52325c3651a9bc97
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ec80dd3..d0e31aa 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1885,8 +1885,8 @@ public:
::sw::UndoManager const& GetUndoManager() const;
SfxObjectShell* CreateCopy(bool bCallInitNew) const;
- void Append( const SwDoc& rSource, int nStartPageNumber,
- SwPageDesc* pTargetPageDesc, int nPhysPageNumber );
+ void Append( const SwDoc& rSource, sal_uInt16 nStartPageNumber,
+ SwPageDesc* pTargetPageDesc, bool bDeletePrevious = false );
/**
* Dumps the entire nodes structure to the given destination (file nodes.xml in the current directory by default)
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index b0a83b3..c34eb66 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -92,6 +92,7 @@
#include <DocumentDrawModelManager.hxx>
#include <unochart.hxx>
#include <fldbas.hxx>
+#include <wrtsh.hxx>
#include <cmdid.h>
@@ -1016,13 +1017,7 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
pRet->ReplaceStyles(*this);
- pRet->Append(*this, 0, NULL, 0);
-
- if ( bCallInitNew ) {
- // delete leading page / initial content from target document
- SwNodeIndex aDeleteIdx( pRet->GetNodes().GetEndOfExtras(), 2 );
- pRet->GetNodes().Delete( aDeleteIdx, 1 );
- }
+ pRet->Append(*this, 0, NULL, bCallInitNew);
// remove the temporary shell if it is there as it was done before
pRet->SetTmpDocShell( (SfxObjectShell*) NULL );
@@ -1033,20 +1028,54 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
}
// appends all pages of source SwDoc - based on SwFEShell::Paste( SwDoc* )
-void SwDoc::Append( const SwDoc& rSource, int nStartPageNumber,
- SwPageDesc* pTargetPageDesc, int nPhysPageNumber )
+void SwDoc::Append( const SwDoc& rSource, sal_uInt16 nStartPageNumber,
+ SwPageDesc* pTargetPageDesc, bool bDeletePrevious )
{
- // GetEndOfExtras + 1 = StartOfContent
+ // GetEndOfExtras + 1 = StartOfContent == no content node!
+ // this prevents CopyRange to merge any starting text nodes of the first
+ // source paragraph!
+ // additionally it ensures, that we have at least two nodes in the SwPaM.
SwNodeIndex aSourceIdx( rSource.GetNodes().GetEndOfExtras(), 1 );
- SwPaM aCpyPam( aSourceIdx ); //DocStart
+ SwNodeIndex aSourceEndIdx( rSource.GetNodes().GetEndOfContent(), -1 );
+ SwPaM aCpyPam( aSourceIdx );
+
+ if ( aSourceEndIdx.GetNode().IsTxtNode() ) {
+ aCpyPam.SetMark();
+ // moves to the last content node before EOC; for single paragraph
+ // documents this would result in [n, n], which is considered empty
+ aCpyPam.Move( fnMoveForward, fnGoDoc );
+ }
+ else
+ aCpyPam = SwPaM( aSourceIdx, aSourceEndIdx );
+
+ SwWrtShell* pTargetShell = GetDocShell()->GetWrtShell();
+ sal_uInt16 nPhysPageNumber = 0;
+ if ( pTargetShell ) {
+ pTargetShell->StartAllAction();
+
+ // Otherwise we have to handle SwDummySectionNodes as first node
+ if ( pTargetPageDesc ) {
+ OUString name = pTargetPageDesc->GetName();
+ pTargetShell->InsertPageBreak( &name, nStartPageNumber );
+ }
+
+ // -1 for the page break + -1, becauce it's an offset
+ nPhysPageNumber = pTargetShell->GetPhyPageNum() - 2;
+ if (bDeletePrevious)
+ nPhysPageNumber--;
- // Append at the end of document / content
+ // We always start on an odd physical page number
+ if (1 == nPhysPageNumber % 2)
+ nPhysPageNumber++;
+ }
+
+ // -1, otherwise aFixupIdx would move to new EOC
+ SwNodeIndex aFixupIdx( GetNodes().GetEndOfContent(), -1 );
+
+ // append at the end of document / content
SwNodeIndex aTargetIdx( GetNodes().GetEndOfContent() );
- SwPaM aInsertPam( aTargetIdx ); //replaces PCURCRSR from SwFEShell::Paste()
- aTargetIdx--;
+ SwPaM aInsertPam( aTargetIdx );
- aCpyPam.SetMark();
- aCpyPam.Move( fnMoveForward, fnGoDoc );
GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, NULL );
LockExpFlds();
@@ -1085,24 +1114,44 @@ void SwDoc::Append( const SwDoc& rSource, int nStartPageNumber,
}
}
- // update the PageDesc pool item
- if ( nStartPageNumber || pTargetPageDesc ) {
- SwTxtNode *aTxtNd = dynamic_cast< SwTxtNode* >( GetNodes().GoNext(&aTargetIdx) );
- if ( aTxtNd ) {
- SfxPoolItem *pNewItem = aTxtNd->GetAttr( RES_PAGEDESC ).Clone();
- SwFmtPageDesc *aDesc = dynamic_cast< SwFmtPageDesc* >( pNewItem );
- if ( aDesc ) {
- if ( nStartPageNumber )
- aDesc->SetNumOffset( nStartPageNumber );
- if ( pTargetPageDesc )
- aDesc->RegisterToPageDesc( *pTargetPageDesc );
- aTxtNd->SetAttr( *aDesc );
+ {
+ sal_uInt16 iDelNodes = 0;
+ SwNodeIndex aDelIdx( aFixupIdx );
+
+ // update the PageDesc format item
+ if ( nStartPageNumber || pTargetPageDesc ) {
+ // Changes the index of aFixupIdx
+ SwTxtNode *aTxtNd = dynamic_cast< SwTxtNode* >( GetNodes().GoNext(&aFixupIdx) );
+ if ( aTxtNd ) {
+ SfxPoolItem *pNewItem = aTxtNd->GetAttr( RES_PAGEDESC ).Clone();
+ SwFmtPageDesc *aDesc = dynamic_cast< SwFmtPageDesc* >( pNewItem );
+ if ( aDesc ) {
+ if ( nStartPageNumber )
+ aDesc->SetNumOffset( nStartPageNumber );
+ if ( pTargetPageDesc )
+ aDesc->RegisterToPageDesc( *pTargetPageDesc );
+ aTxtNd->SetAttr( *aDesc );
+ }
+ delete pNewItem;
}
- delete pNewItem;
+ iDelNodes++;
+ }
+
+ if ( bDeletePrevious )
+ iDelNodes++;
+
+ if ( iDelNodes ) {
+ // delete leading empty page(s), e.g. from InsertPageBreak or
+ // new SwDoc. this has to be done before copying the page bound
+ // frames, otherwise the drawing layer gets confused.
+ if ( pTargetShell )
+ pTargetShell->SttEndDoc( false );
+ aDelIdx -= (iDelNodes - 1);
+ GetNodes().Delete( aDelIdx, iDelNodes );
}
}
- // additionally copy page bound frames
+ // finally copy page bound frames
const SwFrmFmts *pSpzFrmFmts = rSource.GetSpzFrmFmts();
for ( sal_uInt16 i = 0; i < pSpzFrmFmts->size(); ++i )
{
@@ -1110,7 +1159,7 @@ void SwDoc::Append( const SwDoc& rSource, int nStartPageNumber,
SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() );
if (FLY_AT_PAGE != aAnchor.GetAnchorId())
continue;
- if ( nStartPageNumber )
+ if ( nPhysPageNumber )
aAnchor.SetPageNum( aAnchor.GetPageNum() + nPhysPageNumber );
CopyLayoutFmt( rCpyFmt, aAnchor, true, true );
}
@@ -1120,6 +1169,9 @@ void SwDoc::Append( const SwDoc& rSource, int nStartPageNumber,
UnlockExpFlds();
UpdateFlds(NULL, false);
+
+ if ( pTargetShell )
+ pTargetShell->EndAllAction();
}
sal_uInt16 SwTxtFmtColls::GetPos(const SwTxtFmtColl* p) const
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 5575934..1f49b0d 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -1355,8 +1355,10 @@ void SwDoc::CopyWithFlyInFly(
!rRg.aStart.GetNode().IsSectionNode() &&
!aTmpI.GetNode().IsEndNode() )
{
+ // If the range starts with a SwStartNode, it isn't copied
+ sal_uInt16 offset = (rRg.aStart.GetNode().GetNodeType() != ND_STARTNODE) ? 1 : 0;
OSL_ENSURE( rInsPos.GetIndex() - aSavePos.GetIndex() ==
- rRg.aEnd.GetIndex() - rRg.aStart.GetIndex(),
+ rRg.aEnd.GetIndex() - rRg.aStart.GetIndex() - 1 + offset,
"An insufficient number of nodes were copied!" );
}
}
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index e8e63db..71b51af 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2769,7 +2769,6 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
const SwFrmFmt& rMaster = pSourcePageDesc->GetMaster();
bool bPageStylesWithHeaderFooter = rMaster.GetHeader().IsActive() ||
rMaster.GetFooter().IsActive();
- SwNodes *pTargetNodes = &pTargetShell->GetDoc()->GetNodes();
// copy compatibility options
lcl_CopyCompatibilityOptions( rSourceShell, *pTargetShell);
@@ -2840,10 +2839,6 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
}
// 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
@@ -2868,7 +2863,7 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
pTargetPageDesc = pTargetShell->FindPageDescByName( sModifiedStartingPageDesc );
if(nDocNo == 1)
- pTargetShell->SetPageStyle(sModifiedStartingPageDesc);
+ pTargetShell->SetPageStyle( sModifiedStartingPageDesc );
sal_uInt16 nPageCountBefore = pTargetShell->GetPageCnt();
OSL_ENSURE(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended");
@@ -2877,18 +2872,7 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
if ( nDocNo <= MAX_DOC_DUMP )
lcl_SaveDoc( xWorkDocSh, "WorkDoc", nDocNo );
#endif
-
- if (nDocNo == 1 ) {
- pTargetDoc->Append( *(rWorkShell.GetDoc()), 0, pTargetPageDesc, 0 );
-
- // delete the leading empty page from the initial SwDoc
- pTargetShell->SttEndDoc( false );
- SwNodeIndex aDeleteIdx( pTargetNodes->GetEndOfExtras(), 2 );
- pTargetNodes->Delete( aDeleteIdx, 1 );
- }
- else
- pTargetDoc->Append( *(rWorkShell.GetDoc()), nStartingPageNo,
- pTargetPageDesc, pTargetShell->GetPhyPageNum() );
+ pTargetDoc->Append( *(rWorkShell.GetDoc()), nStartingPageNo, pTargetPageDesc, nDocNo == 1 );
// #i72820# calculate layout to be able to find the correct page index
pTargetShell->CalcLayout();
commit cb30e3af7e616670eb7752b496ca73fc56ac1677
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Sat Jun 28 01:41:17 2014 +0200
MM: introduce SwDoc::Append helper function
This drops all the specialized, workaround code from MM, introduced
to use the SwFEShell::Paste function.
There is still a little common codepath, therefore this adds
comments to always update both functions.
Change-Id: I704b3ef3257dd977dac95e16e25049ff8ade97ed
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ac31da1..ec80dd3 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1883,7 +1883,10 @@ public:
::sw::MetaFieldManager & GetMetaFieldManager();
::sw::UndoManager & GetUndoManager();
::sw::UndoManager const& GetUndoManager() const;
+
SfxObjectShell* CreateCopy(bool bCallInitNew) const;
+ void Append( const SwDoc& rSource, int nStartPageNumber,
+ SwPageDesc* pTargetPageDesc, int nPhysPageNumber );
/**
* Dumps the entire nodes structure to the given destination (file nodes.xml in the current directory by default)
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 2660c5a..749e735 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -219,7 +219,7 @@ public:
/// Copy and Paste methods for internal clipboard.
bool Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt = 0 );
- bool Paste( SwDoc* pClpDoc, bool bIncludingPageFrames = false, bool bIncludeFullDocument = false);
+ bool Paste( SwDoc* pClpDoc, bool bIncludingPageFrames = false );
/// Paste some pages into another doc - used in mailmerge.
bool PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt16 nEndPage);
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 7d586ac..b0a83b3 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -1003,7 +1003,8 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
SfxObjectShell* pRetShell = new SwDocShell( pRet, SFX_CREATE_MODE_STANDARD );
if( bCallInitNew )
{
- // it could happen that DoInitNew creates model, that increases the refcount of the object
+ // it could happen that DoInitNew creates model,
+ // that increases the refcount of the object
pRetShell->DoInitNew();
}
@@ -1015,30 +1016,54 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
pRet->ReplaceStyles(*this);
- // Based on the simplified codepath from SwFEShell::Paste()
+ pRet->Append(*this, 0, NULL, 0);
+ if ( bCallInitNew ) {
+ // delete leading page / initial content from target document
+ SwNodeIndex aDeleteIdx( pRet->GetNodes().GetEndOfExtras(), 2 );
+ pRet->GetNodes().Delete( aDeleteIdx, 1 );
+ }
+
+ // remove the temporary shell if it is there as it was done before
+ pRet->SetTmpDocShell( (SfxObjectShell*) NULL );
+
+ pRet->release();
+
+ return pRetShell;
+}
+
+// appends all pages of source SwDoc - based on SwFEShell::Paste( SwDoc* )
+void SwDoc::Append( const SwDoc& rSource, int nStartPageNumber,
+ SwPageDesc* pTargetPageDesc, int nPhysPageNumber )
+{
// GetEndOfExtras + 1 = StartOfContent
- SwNodeIndex aSourceIdx( GetNodes().GetEndOfExtras(), 1 );
- SwPaM aCpyPam( aSourceIdx ); // DocStart
+ SwNodeIndex aSourceIdx( rSource.GetNodes().GetEndOfExtras(), 1 );
+ SwPaM aCpyPam( aSourceIdx ); //DocStart
- SwNodeIndex aTargetIdx( pRet->GetNodes().GetEndOfContent() );
- SwPaM aInsertPam( aTargetIdx );
+ // Append at the end of document / content
+ SwNodeIndex aTargetIdx( GetNodes().GetEndOfContent() );
+ SwPaM aInsertPam( aTargetIdx ); //replaces PCURCRSR from SwFEShell::Paste()
+ aTargetIdx--;
aCpyPam.SetMark();
aCpyPam.Move( fnMoveForward, fnGoDoc );
- pRet->LockExpFlds();
+ GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, NULL );
+ LockExpFlds();
{
+ // **
+ // ** refer to SwFEShell::Paste, if you change the following code **
+ // **
+
SwPosition& rInsPos = *aInsertPam.GetPoint();
- SwPosition aInsertPosition( rInsPos );
{
SwNodeIndex aIndexBefore(rInsPos.nNode);
aIndexBefore--;
- CopyRange( aCpyPam, rInsPos, true );
+ rSource.CopyRange( aCpyPam, rInsPos, true );
// Note: aCpyPam is invalid now
++aIndexBefore;
@@ -1047,37 +1072,54 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
aPaM.GetDoc()->MakeUniqueNumRules(aPaM);
- // No need to update the rsid, as pRet is an empty doc
+ // Update the rsid of each pasted text node
+ SwNodes &rDestNodes = GetNodes();
+ sal_uLong const nEndIdx = aPaM.End()->nNode.GetIndex();
+
+ for (sal_uLong nIdx = aPaM.Start()->nNode.GetIndex();
+ nIdx <= nEndIdx; ++nIdx)
+ {
+ SwTxtNode *const pTxtNode = rDestNodes[nIdx]->GetTxtNode();
+ if ( pTxtNode )
+ UpdateParRsid( pTxtNode );
+ }
+ }
+
+ // update the PageDesc pool item
+ if ( nStartPageNumber || pTargetPageDesc ) {
+ SwTxtNode *aTxtNd = dynamic_cast< SwTxtNode* >( GetNodes().GoNext(&aTargetIdx) );
+ if ( aTxtNd ) {
+ SfxPoolItem *pNewItem = aTxtNd->GetAttr( RES_PAGEDESC ).Clone();
+ SwFmtPageDesc *aDesc = dynamic_cast< SwFmtPageDesc* >( pNewItem );
+ if ( aDesc ) {
+ if ( nStartPageNumber )
+ aDesc->SetNumOffset( nStartPageNumber );
+ if ( pTargetPageDesc )
+ aDesc->RegisterToPageDesc( *pTargetPageDesc );
+ aTxtNd->SetAttr( *aDesc );
+ }
+ delete pNewItem;
+ }
}
// additionally copy page bound frames
- for ( sal_uInt16 i = 0; i < GetSpzFrmFmts()->size(); ++i )
+ const SwFrmFmts *pSpzFrmFmts = rSource.GetSpzFrmFmts();
+ for ( sal_uInt16 i = 0; i < pSpzFrmFmts->size(); ++i )
{
- const SwFrmFmt& rCpyFmt = *(*GetSpzFrmFmts())[i];
+ const SwFrmFmt& rCpyFmt = *(*pSpzFrmFmts)[i];
SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() );
if (FLY_AT_PAGE != aAnchor.GetAnchorId())
continue;
- pRet->CopyLayoutFmt( rCpyFmt, aAnchor, true, true );
+ if ( nStartPageNumber )
+ aAnchor.SetPageNum( aAnchor.GetPageNum() + nPhysPageNumber );
+ CopyLayoutFmt( rCpyFmt, aAnchor, true, true );
}
}
- pRet->UnlockExpFlds();
- pRet->UpdateFlds( NULL, false );
+ GetIDocumentUndoRedo().EndUndo( UNDO_INSGLOSSARY, NULL );
- // End of SwFEShell::Paste() codepath
-
- if ( bCallInitNew ) {
- // delete leading page / initial content from target document
- SwNodeIndex aDeleteIdx( pRet->GetNodes().GetEndOfExtras(), 2 );
- pRet->GetNodes().Delete( aDeleteIdx, 1 );
- }
-
- // remove the temporary shell if it is there as it was done before
- pRet->SetTmpDocShell( (SfxObjectShell*)NULL );
-
- pRet->release();
-
- return pRetShell;
+ UnlockExpFlds();
+ UpdateFlds(NULL, false);
}
sal_uInt16 SwTxtFmtColls::GetPos(const SwTxtFmtColl* p) const
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 628d9c1..8debb4c 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -668,13 +668,13 @@ namespace {
typedef std::pair< PaMPtr, PositionPtr > Insertion;
}
-bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames, bool bIncludeFullDocument )
+bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
{
SET_CURR_SHELL( this );
OSL_ENSURE( pClpDoc, "no clipboard document" );
const sal_uInt16 nStartPageNumber = GetPhyPageNum();
// then till end of the nodes array
- SwNodeIndex aIdx( pClpDoc->GetNodes().GetEndOfExtras(), (bIncludeFullDocument) ? 1 : 2 );
+ SwNodeIndex aIdx( pClpDoc->GetNodes().GetEndOfExtras(), 2 );
SwPaM aCpyPam( aIdx ); //DocStart
// If there are table formulas in the area, then display the table first
@@ -1022,6 +1022,10 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames, bool bIncludeF
GetDoc()->ClearBoxNumAttrs( rInsPos.nNode );
}
+ // **
+ // ** Update SwDoc::Append, if you change the following code **
+ // **
+
// find out if the clipboard document starts with a table
bool bStartWithTable = 0 != aCpyPam.Start()->nNode.GetNode().FindTableNode();
SwPosition aInsertPosition( rInsPos );
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 529c3929..e8e63db 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2760,6 +2760,10 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
//initiate SelectShell() to create sub shells
pTargetView->AttrChangedNotify( &pTargetView->GetWrtShell() );
SwWrtShell* pTargetShell = pTargetView->GetWrtShellPtr();
+ SwDoc* pTargetDoc = pTargetShell->GetDoc();
+
+ pTargetView->GetDocShell()->_LoadStyles( *rSourceView.GetDocShell(), true );
+
// #i63806#
const SwPageDesc* pSourcePageDesc = rSourceShell.FindPageDescByName( sStartingPageDesc );
const SwFrmFmt& rMaster = pSourcePageDesc->GetMaster();
@@ -2848,8 +2852,6 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
{
//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();
OUString sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
pTargetShell->GetDoc()->MakePageDesc( sNewPageDescName );
pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
@@ -2862,65 +2864,31 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
lcl_CopyFollowPageDesc( *pTargetShell, *pWorkPageDesc, *pTargetPageDesc, nDocNo );
}
}
- if(nDocNo == 1 || bPageStylesWithHeaderFooter)
- pTargetView->GetDocShell()->_LoadStyles( *rSourceView.GetDocShell(), true );
- if(nDocNo > 1)
- pTargetShell->InsertPageBreak( &sModifiedStartingPageDesc, nStartingPageNo );
else
+ pTargetPageDesc = pTargetShell->FindPageDescByName( sModifiedStartingPageDesc );
+
+ if(nDocNo == 1)
pTargetShell->SetPageStyle(sModifiedStartingPageDesc);
sal_uInt16 nPageCountBefore = pTargetShell->GetPageCnt();
OSL_ENSURE(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended");
- bool para_added = false;
-
- //#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 );
- para_added = true;
- }
- }
#ifdef DBG_UTIL
if ( nDocNo <= MAX_DOC_DUMP )
lcl_SaveDoc( xWorkDocSh, "WorkDoc", nDocNo );
#endif
- SwNodeIndex fixupIdx( pTargetNodes->GetEndOfContent(), -1 );
- pTargetShell->Paste( rWorkShell.GetDoc(), true, true );
-
- if (bPageStylesWithHeaderFooter) {
- // set the real page desc and update the number offset for the pasted document
- fixupIdx += 2;
- SwTxtNode *aTxtNd = fixupIdx.GetNode().GetTxtNode();
- if ( aTxtNd ) {
- SfxPoolItem *pNewItem = aTxtNd->GetAttr( RES_PAGEDESC ).Clone();
- SwFmtPageDesc *aDesc = dynamic_cast< SwFmtPageDesc* >( pNewItem );
- if ( aDesc ) {
- aDesc->SetNumOffset( nStartingPageNo );
- aDesc->RegisterToPageDesc( *pTargetPageDesc );
- aTxtNd->SetAttr( *aDesc );
- }
- delete pNewItem;
- }
+ if (nDocNo == 1 ) {
+ pTargetDoc->Append( *(rWorkShell.GetDoc()), 0, pTargetPageDesc, 0 );
- // delete the leading empty page from InsertPageBreak
- fixupIdx -= 2;
- pTargetNodes->Delete( fixupIdx, 2 );
- }
-
- if ( para_added ) {
- // Move cursor to the start or Delete will assert because
- // of the cursors SwIndex ref on the deleting node.
- pTargetShell->SttEndDoc( true );
- SwNodeIndex aTargetIdx( pTargetNodes->GetEndOfContent(), -1 );
- pTargetNodes->Delete( aTargetIdx, 1 );
+ // delete the leading empty page from the initial SwDoc
+ pTargetShell->SttEndDoc( false );
+ SwNodeIndex aDeleteIdx( pTargetNodes->GetEndOfExtras(), 2 );
+ pTargetNodes->Delete( aDeleteIdx, 1 );
}
+ else
+ pTargetDoc->Append( *(rWorkShell.GetDoc()), nStartingPageNo,
+ pTargetPageDesc, pTargetShell->GetPhyPageNum() );
// #i72820# calculate layout to be able to find the correct page index
pTargetShell->CalcLayout();
commit 22d79acc9d05f255289b031e5dd029d068158641
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Jun 23 09:27:27 2014 +0200
MM: always copy the internal document
There is really no need to create the first document via UNO
createClone(), which is also slower then the internal copy.
Actually createClone also calls createCopy, but without
initializing the document.
Change-Id: I23437b0f3ad663942a02be575b39883f9a3b8587
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index d73bb63..529c3929 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1005,17 +1005,8 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
Application::Reschedule();
// The SfxObjectShell will be closed explicitly later but it is more safe to use SfxObjectShellLock here
- SfxObjectShellLock xWorkDocSh;
// copy the source document
- if( 1 == nDocNo && (bAsSingleFile || rMergeDescriptor.bCreateSingleFile) )
- {
- uno::Reference< util::XCloneable > xClone( pSourceDocSh->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
- xWorkDocSh = pSourceDocSh->GetDoc()->CreateCopy( true );
+ SfxObjectShellLock xWorkDocSh = pSourceDocSh->GetDoc()->CreateCopy( true );
{
//create a view frame for the document
@@ -2802,18 +2793,7 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
// copy the source document
// the copy will be closed later, but it is more safe to use SfxObjectShellLock here
- SfxObjectShellLock xWorkDocSh;
- if(nDocNo == 1 )
- {
- 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
- {
- xWorkDocSh = rSourceView.GetDocShell()->GetDoc()->CreateCopy(true);
- }
+ SfxObjectShellLock xWorkDocSh = rSourceView.GetDocShell()->GetDoc()->CreateCopy(true);
#ifdef DBG_UTIL
if ( nDocNo <= MAX_DOC_DUMP )
lcl_SaveDoc( xWorkDocSh, "WorkDoc", nDocNo );
commit 5fff7e5077923a8a892ebab63c3019568a07eb05
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Jun 27 14:58:24 2014 +0200
Some minor MM code cleanups
Just makes the code in SwFEShell::Paste and
SwDBManager::MergeDocuments more readable.
Change-Id: Ifd78d6a44fa78eaf1f4fca63f4bbd3ee43ca129d
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index a09f923..628d9c1 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -680,7 +680,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames, bool bIncludeF
// If there are table formulas in the area, then display the table first
// so that the table formula can calculate a new value first
// (individual boxes in the area are retrieved via the layout)
- SwFieldType* pTblFldTyp = GetDoc()->GetSysFldType( RES_TABLEFLD );
+ SwFieldType* pTblFldTyp = GetDoc()->GetSysFldType( RES_TABLEFLD );
SwTableNode *pDestNd, *pSrcNd = aCpyPam.GetNode().GetTableNode();
if( !pSrcNd ) // TabellenNode ?
@@ -1071,19 +1071,12 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames, bool bIncludeF
for ( sal_uInt16 i = 0; i < pClpDoc->GetSpzFrmFmts()->size(); ++i )
{
- bool bInsWithFmt = true;
const SwFrmFmt& rCpyFmt = *(*pClpDoc->GetSpzFrmFmts())[i];
- if( bInsWithFmt )
- {
- SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() );
- if ( FLY_AT_PAGE == aAnchor.GetAnchorId() )
- {
- aAnchor.SetPageNum( aAnchor.GetPageNum() + nStartPageNumber - 1 );
- }
- else
- continue;
- GetDoc()->CopyLayoutFmt( rCpyFmt, aAnchor, true, true );
- }
+ SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() );
+ if ( FLY_AT_PAGE != aAnchor.GetAnchorId() )
+ continue;
+ aAnchor.SetPageNum( aAnchor.GetPageNum() + nStartPageNumber - 1 );
+ GetDoc()->CopyLayoutFmt( rCpyFmt, aAnchor, true, true );
}
}
}
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index ef8d4df..d73bb63 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2883,17 +2883,12 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
}
}
if(nDocNo == 1 || bPageStylesWithHeaderFooter)
- {
pTargetView->GetDocShell()->_LoadStyles( *rSourceView.GetDocShell(), true );
- }
if(nDocNo > 1)
- {
pTargetShell->InsertPageBreak( &sModifiedStartingPageDesc, nStartingPageNo );
- }
else
- {
pTargetShell->SetPageStyle(sModifiedStartingPageDesc);
- }
+
sal_uInt16 nPageCountBefore = pTargetShell->GetPageCnt();
OSL_ENSURE(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended");
bool para_added = false;
@@ -2901,9 +2896,9 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
//#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))
+ SwPosition aTestPos( aIdx );
+ SwCursor aTestCrsr( aTestPos, 0, false );
+ if ( !aTestCrsr.MovePara(fnParaNext, fnParaStart) )
{
//append a paragraph
pWorkDoc->AppendTxtNode( aTestPos );
@@ -2955,7 +2950,7 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
lcl_SaveDoc( xTargetDocShell, "MergeDoc" );
#endif
- //add the document info to the config item
+ // add the document info to the config item
SwDocMergeInfo aMergeInfo;
aMergeInfo.nStartPageInTarget = nPageCountBefore;
aMergeInfo.nEndPageInTarget = pTargetShell->GetPageCnt();
@@ -2967,17 +2962,17 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
for( sal_uInt16 i = 0; i < 25; i++)
Application::Reschedule();
- //restore the ole DBManager
+ // restore the old DBManager
pWorkDoc->SetDBManager( pWorkDBManager );
- //now the temporary document should be closed
- SfxObjectShellRef xDocSh(pWorkView->GetDocShell());
- xDocSh->DoClose();
+ // close the temporary document
+ xWorkDocSh->DoClose();
+
nEndRow = pImpl->pMergeData->xResultSet->getRow();
++nDocNo;
} while( !bCancel &&
(bSynchronizedDoc && (nStartRow != nEndRow)? ExistsNextRecord() : ToNextMergeRecord()));
- //deselect all, go out of the frame and go to the beginning of the document
+ // deselect all, go out of the frame and go to the beginning of the document
Point aPt(LONG_MIN, LONG_MIN);
pTargetShell->SelectObj(aPt, SW_LEAVE_FRAME);
if (pTargetShell->IsSelFrmMode())
commit 9e610c4c20cf657099af3ff045e4dbb84fa86cbf
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Jun 27 11:46:00 2014 +0200
MM: fix lost or broken paragraph anchored objects
With the extended SwFEShell::Paste version, we can finally paste
full documents without losing the paragraph anchored Flys of the
first paragraph.
Actually one should be able to drop the InsertPageBreak and the
single paragraph delete, but my attempt resulted in problems with
page anchored Flys and somehow reintroduced the problem seen in
fdo#80395 with draw objects.
Change-Id: I370fa89f432ba4dd95c1f02605f33f04dfbaad85
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 646a0a6..ef8d4df 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -125,6 +125,8 @@
#include <unomid.h>
#include <section.hxx>
#include <rootfrm.hxx>
+#include <fmtpdsc.hxx>
+#include <ndtxt.hxx>
#include <boost/scoped_ptr.hpp>
@@ -2772,6 +2774,7 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
const SwFrmFmt& rMaster = pSourcePageDesc->GetMaster();
bool bPageStylesWithHeaderFooter = rMaster.GetHeader().IsActive() ||
rMaster.GetFooter().IsActive();
+ SwNodes *pTargetNodes = &pTargetShell->GetDoc()->GetNodes();
// copy compatibility options
lcl_CopyCompatibilityOptions( rSourceShell, *pTargetShell);
@@ -2860,6 +2863,7 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
//#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
+ SwPageDesc* pTargetPageDesc = NULL;
if(bPageStylesWithHeaderFooter)
{
//create a new pagestyle
@@ -2868,7 +2872,7 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
SwDoc* pTargetDoc = pTargetShell->GetDoc();
OUString sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
pTargetShell->GetDoc()->MakePageDesc( sNewPageDescName );
- SwPageDesc* pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
+ pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
const SwPageDesc* pWorkPageDesc = rWorkShell.FindPageDescByName( sStartingPageDesc );
if(pWorkPageDesc && pTargetPageDesc)
@@ -2911,7 +2915,29 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
if ( nDocNo <= MAX_DOC_DUMP )
lcl_SaveDoc( xWorkDocSh, "WorkDoc", nDocNo );
#endif
- pTargetShell->Paste( rWorkShell.GetDoc(), true );
+
+ SwNodeIndex fixupIdx( pTargetNodes->GetEndOfContent(), -1 );
+ pTargetShell->Paste( rWorkShell.GetDoc(), true, true );
+
+ if (bPageStylesWithHeaderFooter) {
+ // set the real page desc and update the number offset for the pasted document
+ fixupIdx += 2;
+ SwTxtNode *aTxtNd = fixupIdx.GetNode().GetTxtNode();
+ if ( aTxtNd ) {
+ SfxPoolItem *pNewItem = aTxtNd->GetAttr( RES_PAGEDESC ).Clone();
+ SwFmtPageDesc *aDesc = dynamic_cast< SwFmtPageDesc* >( pNewItem );
+ if ( aDesc ) {
+ aDesc->SetNumOffset( nStartingPageNo );
+ aDesc->RegisterToPageDesc( *pTargetPageDesc );
+ aTxtNd->SetAttr( *aDesc );
+ }
+ delete pNewItem;
+ }
+
+ // delete the leading empty page from InsertPageBreak
+ fixupIdx -= 2;
+ pTargetNodes->Delete( fixupIdx, 2 );
+ }
if ( para_added ) {
// Move cursor to the start or Delete will assert because
@@ -2921,12 +2947,9 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
pTargetNodes->Delete( aTargetIdx, 1 );
}
- //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();
- }
+ // #i72820# calculate layout to be able to find the correct page index
+ pTargetShell->CalcLayout();
+
#ifdef DBG_UTIL
if ( nDocNo <= MAX_DOC_DUMP )
lcl_SaveDoc( xTargetDocShell, "MergeDoc" );
@@ -2935,8 +2958,6 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
//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 );
commit aa2a4f44e74cdcb1d61e920ef83493ff41aa1101
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Jun 27 11:28:02 2014 +0200
MM: fix workaround for single paragraph docs
There is already a workaround for pasting a document with a single
paragraph by appending a dummy empty paragraph to the working copy.
This patch removes the dummy paragraph from the target document.
Change-Id: I288d35264bf6f1a5f92c50d6a309e3bdd4ab5836
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 0ed706f..646a0a6 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2892,6 +2892,8 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
}
sal_uInt16 nPageCountBefore = pTargetShell->GetPageCnt();
OSL_ENSURE(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended");
+ bool para_added = false;
+
//#i51359# add a second paragraph in case there's only one
{
SwNodeIndex aIdx( pWorkDoc->GetNodes().GetEndOfExtras(), 2 );
@@ -2901,6 +2903,7 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
{
//append a paragraph
pWorkDoc->AppendTxtNode( aTestPos );
+ para_added = true;
}
}
@@ -2909,6 +2912,15 @@ sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
lcl_SaveDoc( xWorkDocSh, "WorkDoc", nDocNo );
#endif
pTargetShell->Paste( rWorkShell.GetDoc(), true );
+
+ if ( para_added ) {
+ // Move cursor to the start or Delete will assert because
+ // of the cursors SwIndex ref on the deleting node.
+ pTargetShell->SttEndDoc( true );
+ SwNodeIndex aTargetIdx( pTargetNodes->GetEndOfContent(), -1 );
+ pTargetNodes->Delete( aTargetIdx, 1 );
+ }
+
//convert fields in page styles (header/footer - has to be done after the first document has been pasted
if(1 == nDocNo)
{
commit 2d737b5e5ac8569c473a64ef9a67724624c0b201
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Jun 27 11:21:47 2014 +0200
Optionally paste the full document
In the mail merge case we want to paste the full document including
the SwTxtNode containing the SwFmtPageDesc node, which is always
the first node of a document.
For normal paste we want to merge the first paragraph into the
paragraph at the cursor position. This currently loses all Flys
anchored at the first paragraph.
Change-Id: I2b1ce279743f559e700b47276012ad56d74a059c
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 9c2e89d..2660c5a 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -219,7 +219,7 @@ public:
/// Copy and Paste methods for internal clipboard.
bool Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt = 0 );
- bool Paste( SwDoc* pClpDoc, bool bIncludingPageFrames = false);
+ bool Paste( SwDoc* pClpDoc, bool bIncludingPageFrames = false, bool bIncludeFullDocument = false);
/// Paste some pages into another doc - used in mailmerge.
bool PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt16 nEndPage);
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index c980082..a09f923 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -668,13 +668,13 @@ namespace {
typedef std::pair< PaMPtr, PositionPtr > Insertion;
}
-bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
+bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames, bool bIncludeFullDocument )
{
SET_CURR_SHELL( this );
OSL_ENSURE( pClpDoc, "no clipboard document" );
const sal_uInt16 nStartPageNumber = GetPhyPageNum();
// then till end of the nodes array
- SwNodeIndex aIdx( pClpDoc->GetNodes().GetEndOfExtras(), 2 );
+ SwNodeIndex aIdx( pClpDoc->GetNodes().GetEndOfExtras(), (bIncludeFullDocument) ? 1 : 2 );
SwPaM aCpyPam( aIdx ); //DocStart
// If there are table formulas in the area, then display the table first
commit 39b769d7c8ffa737f14cfadf70818d4bddea4c70
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Jun 23 09:16:18 2014 +0200
Replace the whole content for copied documents
If the document is initialized in CreateCopy, it already contains
the initial empty paragraph. So we have to delete the content from
initial document, as we're going to replace the whole content with
the pasted document.
Change-Id: I33faed4de77919fb926d408e19af9c1ec3b0f7d3
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index cea0032..7d586ac 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -1018,10 +1018,10 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
// Based on the simplified codepath from SwFEShell::Paste()
// GetEndOfExtras + 1 = StartOfContent
- SwNodeIndex aSourceIdx( GetNodes().GetEndOfExtras(), 2 );
+ SwNodeIndex aSourceIdx( GetNodes().GetEndOfExtras(), 1 );
SwPaM aCpyPam( aSourceIdx ); // DocStart
- SwNodeIndex aTargetIdx( pRet->GetNodes(), 2 );
+ SwNodeIndex aTargetIdx( pRet->GetNodes().GetEndOfContent() );
SwPaM aInsertPam( aTargetIdx );
aCpyPam.SetMark();
@@ -1066,6 +1066,12 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
// End of SwFEShell::Paste() codepath
+ if ( bCallInitNew ) {
+ // delete leading page / initial content from target document
+ SwNodeIndex aDeleteIdx( pRet->GetNodes().GetEndOfExtras(), 2 );
+ pRet->GetNodes().Delete( aDeleteIdx, 1 );
+ }
+
// remove the temporary shell if it is there as it was done before
pRet->SetTmpDocShell( (SfxObjectShell*)NULL );
commit 9166aa9bd017c04a3d411e48612b23e25f847d63
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Thu Jun 26 20:23:39 2014 +0200
Merge SwDoc::Paste into SwDoc::CreateCopy
Change-Id: I95686eb116e17b4da6662b4fbadcf08a0b92a6f4
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 2f84c0d..ac31da1 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -531,7 +531,6 @@ private:
OUString msDocAccTitle;
void InitTOXTypes();
- void Paste( const SwDoc& );
bool DeleteAndJoinImpl(SwPaM&, const bool);
bool DeleteAndJoinWithRedlineImpl(SwPaM&, const bool unused = false);
bool DeleteRangeImpl(SwPaM&, const bool unused = false);
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 9ebd797..cea0032 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -1015,37 +1015,22 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
pRet->ReplaceStyles(*this);
- // copy content
- pRet->Paste( *this );
+ // Based on the simplified codepath from SwFEShell::Paste()
- // remove the temporary shell if it is there as it was done before
- pRet->SetTmpDocShell( (SfxObjectShell*)NULL );
-
- pRet->release();
-
- return pRetShell;
-}
+ // GetEndOfExtras + 1 = StartOfContent
+ SwNodeIndex aSourceIdx( GetNodes().GetEndOfExtras(), 2 );
+ SwPaM aCpyPam( aSourceIdx ); // DocStart
-// copy document content - code from SwFEShell::Paste( SwDoc* )
-void SwDoc::Paste( const SwDoc& rSource )
-{
- // this has to be empty const sal_uInt16 nStartPageNumber = GetPhyPageNum();
- // until the end of the NodesArray
- SwNodeIndex aSourceIdx( rSource.GetNodes().GetEndOfExtras(), 2 );
- SwPaM aCpyPam( aSourceIdx ); //DocStart
- SwNodeIndex aTargetIdx( GetNodes().GetEndOfExtras(), 2 );
- SwPaM aInsertPam( aTargetIdx ); //replaces PCURCRSR from SwFEShell::Paste()
+ SwNodeIndex aTargetIdx( pRet->GetNodes(), 2 );
+ SwPaM aInsertPam( aTargetIdx );
aCpyPam.SetMark();
aCpyPam.Move( fnMoveForward, fnGoDoc );
- this->GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, NULL );
- this->LockExpFlds();
+ pRet->LockExpFlds();
{
SwPosition& rInsPos = *aInsertPam.GetPoint();
- //find out if the clipboard document starts with a table
- bool bStartWithTable = 0 != aCpyPam.Start()->nNode.GetNode().FindTableNode();
SwPosition aInsertPosition( rInsPos );
{
@@ -1053,7 +1038,7 @@ void SwDoc::Paste( const SwDoc& rSource )
aIndexBefore--;
- rSource.CopyRange( aCpyPam, rInsPos, true );
+ CopyRange( aCpyPam, rInsPos, true );
// Note: aCpyPam is invalid now
++aIndexBefore;
@@ -1062,38 +1047,31 @@ void SwDoc::Paste( const SwDoc& rSource )
aPaM.GetDoc()->MakeUniqueNumRules(aPaM);
- // No need to update the rsid, as this is an empty doc
+ // No need to update the rsid, as pRet is an empty doc
}
- //TODO: Is this necessary here? SaveTblBoxCntnt( &rInsPos );
- if(/*bIncludingPageFrames && */bStartWithTable)
+ // additionally copy page bound frames
+ for ( sal_uInt16 i = 0; i < GetSpzFrmFmts()->size(); ++i )
{
- //remove the paragraph in front of the table
- SwPaM aPara(aInsertPosition);
- this->DelFullPara(aPara);
- }
- //additionally copy page bound frames
- if( /*bIncludingPageFrames && */rSource.GetSpzFrmFmts()->size() )
- {
- for ( sal_uInt16 i = 0; i < rSource.GetSpzFrmFmts()->size(); ++i )
- {
- const SwFrmFmt& rCpyFmt = *(*rSource.GetSpzFrmFmts())[i];
- SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() );
- if (FLY_AT_PAGE == aAnchor.GetAnchorId())
- {
- aAnchor.SetPageNum( aAnchor.GetPageNum() /*+ nStartPageNumber - */);
- }
- else
- continue;
- this->CopyLayoutFmt( rCpyFmt, aAnchor, true, true );
- }
+ const SwFrmFmt& rCpyFmt = *(*GetSpzFrmFmts())[i];
+ SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() );
+ if (FLY_AT_PAGE != aAnchor.GetAnchorId())
+ continue;
+ pRet->CopyLayoutFmt( rCpyFmt, aAnchor, true, true );
}
}
- this->GetIDocumentUndoRedo().EndUndo( UNDO_INSGLOSSARY, NULL );
+ pRet->UnlockExpFlds();
+ pRet->UpdateFlds( NULL, false );
+
+ // End of SwFEShell::Paste() codepath
- UnlockExpFlds();
- UpdateFlds(NULL, false);
+ // remove the temporary shell if it is there as it was done before
+ pRet->SetTmpDocShell( (SfxObjectShell*)NULL );
+
+ pRet->release();
+
+ return pRetShell;
}
sal_uInt16 SwTxtFmtColls::GetPos(const SwTxtFmtColl* p) const
commit 60cc468ee9e1446450dff1448d0baa4ff1d05637
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Jun 13 14:44:37 2014 +0200
Revert "fdo#66145: do not check IsFirstShared() in SwPageDesc::GetLeftFmt()"
This reverts commit 4df438c9a9d5e698c47c1e85903eb81880a5e6fa.
Change-Id: I8f8d32c07f8706fad6c62fba2a9a373feed6cbed
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index e7641f2..42c7cc4 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -305,14 +305,14 @@ bool SwPageDesc::IsFollowNextPageOfNode( const SwNode& rNd ) const
SwFrmFmt *SwPageDesc::GetLeftFmt(bool const bFirst)
{
return (nsUseOnPage::PD_LEFT & eUse)
- ? ((bFirst) ? &m_FirstLeft : &aLeft)
+ ? ((bFirst && !IsFirstShared()) ? &m_FirstLeft : &aLeft)
: 0;
}
SwFrmFmt *SwPageDesc::GetRightFmt(bool const bFirst)
{
return (nsUseOnPage::PD_RIGHT & eUse)
- ? ((bFirst) ? &m_FirstMaster : &aMaster)
+ ? ((bFirst && !IsFirstShared()) ? &m_FirstMaster : &aMaster)
: 0;
}
commit d51f53fedb8cd68b1b3122c7199c4ea2d3a6980f
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Jul 1 17:48:28 2014 +0200
fdo#80014: vcl: fix drawing of linear gradients
There is an off-by-one error in OutputDevice::ImplDrawLinearGradient()
that causes the bottom line to remain black.
(regression from 04d937c1ec36c2d9fa8c90604c81a37d30e97da6)
Change-Id: I33948ec8065e446a9ec7efeab5e506c93fa2e9e8
diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx
index 7a4a3c5..1f2a26c 100644
--- a/vcl/source/outdev/gradient.cxx
+++ b/vcl/source/outdev/gradient.cxx
@@ -320,7 +320,7 @@ void OutputDevice::DrawLinearGradient( const Rectangle& rRect,
// Polygon for this color step
aRect.Top() = (long)( fGradientLine + ((double) i) * fScanInc );
- aRect.Bottom() = (long)( fGradientLine + ( ((double) i) + 1.0 ) * fScanInc + fScanInc*.1 );
+ aRect.Bottom() = (long)( fGradientLine + ( ((double) i) + 1.0 ) * fScanInc );
aPoly[0] = aRect.TopLeft();
aPoly[1] = aRect.TopRight();
aPoly[2] = aRect.BottomRight();
commit 63cd667ccb35325a973cf4f98c5e1bf9db92b9b4
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Jul 1 17:49:28 2014 +0200
writerfilter: characters() may be called multiple times for a single token
Change-Id: Icdd3dc7740c5f3d82a45b2553fda65c6010ea4e4
diff --git a/writerfilter/source/ooxml/fasttokens.py b/writerfilter/source/ooxml/fasttokens.py
index a364252..bcd0329 100644
--- a/writerfilter/source/ooxml/fasttokens.py
+++ b/writerfilter/source/ooxml/fasttokens.py
@@ -16,6 +16,7 @@ class ContentHandler(xml.sax.handler.ContentHandler):
def __init__(self):
self.inFasttoken = False
self.counter = 0
+ self.chars = []
def startElement(self, name, attrs):
if name == "fasttoken":
@@ -23,12 +24,15 @@ class ContentHandler(xml.sax.handler.ContentHandler):
def endElement(self, name):
if name == "fasttoken":
+ chars = "".join(self.chars)
+ print("const Token_t OOXML_%s = %s;" % (chars.replace('-', '_'), self.counter))
+ self.chars = []
+ self.counter += 1
self.inFasttoken = False
def characters(self, characters):
if self.inFasttoken:
- print("const Token_t OOXML_%s = %s;" % (characters.replace('-', '_'), self.counter))
- self.counter += 1
+ self.chars.append(characters)
print("""
/*
diff --git a/writerfilter/source/ooxml/gperffasttokenhandler.py b/writerfilter/source/ooxml/gperffasttokenhandler.py
index 103a944..4fa34e7 100644
--- a/writerfilter/source/ooxml/gperffasttokenhandler.py
+++ b/writerfilter/source/ooxml/gperffasttokenhandler.py
@@ -15,6 +15,7 @@ import sys
class ContentHandler(xml.sax.handler.ContentHandler):
def __init__(self):
self.inFasttoken = False
+ self.chars = []
def startElement(self, name, attrs):
if name == "fasttoken":
@@ -22,12 +23,15 @@ class ContentHandler(xml.sax.handler.ContentHandler):
def endElement(self, name):
if name == "fasttoken":
+ chars = "".join(self.chars)
+ token = chars.replace('-', '_')
+ print("%s, OOXML_%s" % (token, token))
+ self.chars = []
self.inFasttoken = False
def characters(self, characters):
if self.inFasttoken:
- token = characters.replace('-', '_')
- print("%s, OOXML_%s" % (token, token))
+ self.chars.append(characters)
print("""
%{
commit 9263b101c39172cbcf04189c515bca80cb15f3aa
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jul 1 17:38:02 2014 +0200
Activate the "suspicious cast to sal_Bool" parts of loplugin:salbool
Change-Id: I78a368ef2899b2462251b45a327fc7b1f31fe764
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
index 30c2641..3f33a6c 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -205,7 +205,7 @@ sal_Bool SAL_CALL OGLPlayer::isPlaybackLoop() throw ( uno::RuntimeException, std
{
osl::MutexGuard aGuard(m_aMutex);
assert(m_pHandle);
- return (sal_Bool)gltf_animation_get_looping(m_pHandle);
+ return gltf_animation_get_looping(m_pHandle) != 0;
}
void SAL_CALL OGLPlayer::setVolumeDB( sal_Int16 /*nVolumDB*/ ) throw ( uno::RuntimeException, std::exception )
diff --git a/compilerplugins/clang/store/salbool.cxx b/compilerplugins/clang/salbool.cxx
similarity index 93%
rename from compilerplugins/clang/store/salbool.cxx
rename to compilerplugins/clang/salbool.cxx
index abef250..a3476be 100644
--- a/compilerplugins/clang/store/salbool.cxx
+++ b/compilerplugins/clang/salbool.cxx
@@ -9,6 +9,7 @@
#include <algorithm>
#include <cassert>
+#include <cstdlib>
#include <set>
#include <string>
@@ -106,7 +107,10 @@ class SalBool:
public RecursiveASTVisitor<SalBool>, public loplugin::RewritePlugin
{
public:
- explicit SalBool(InstantiationData const & data): RewritePlugin(data) {}
+ explicit SalBool(InstantiationData const & data):
+ RewritePlugin(data),
+ fullMode_(std::getenv("loplugin:salbool") != nullptr)
+ {}
virtual void run() override;
@@ -139,6 +143,7 @@ private:
bool rewrite(SourceLocation location);
+ bool fullMode_;
std::set<VarDecl const *> varDecls_;
};
@@ -178,7 +183,7 @@ void SalBool::run() {
}
}
}
- if (!rewrite(loc)) {
+ if (fullMode_ && !rewrite(loc)) {
report(
DiagnosticsEngine::Warning,
"VarDecl, use \"bool\" instead of \"sal_Bool\"", loc)
@@ -322,13 +327,15 @@ bool SalBool::VisitParmVarDecl(ParmVarDecl const * decl) {
// with a "mismatch" error before the rewriter had a chance
// to act upon the definition (but use the heuristic of
// assuming pure virtual functions do not have definitions):
- if (!((isInMainFile(
- compiler.getSourceManager().getSpellingLoc(
- dyn_cast<FunctionDecl>(
- decl->getDeclContext())
- ->getNameInfo().getLoc()))
- || f->isDefined() || f->isPure())
- && rewrite(loc)))
+ if (fullMode_
+ && !((compat::isInMainFile(
+ compiler.getSourceManager(),
+ compiler.getSourceManager().getSpellingLoc(
+ dyn_cast<FunctionDecl>(
+ decl->getDeclContext())
+ ->getNameInfo().getLoc()))
+ || f->isDefined() || f->isPure())
+ && rewrite(loc)))
{
report(
DiagnosticsEngine::Warning,
@@ -409,7 +416,7 @@ bool SalBool::VisitFieldDecl(FieldDecl const * decl) {
}
}
}
- if (!rewrite(loc)) {
+ if (fullMode_ && !rewrite(loc)) {
report(
DiagnosticsEngine::Warning,
"FieldDecl, use \"bool\" instead of \"sal_Bool\"", loc)
@@ -467,11 +474,13 @@ bool SalBool::VisitFunctionDecl(FunctionDecl const * decl) {
// rewriter had a chance to act upon the definition (but use the
// heuristic of assuming pure virtual functions do not have
// definitions):
- if (!((isInMainFile(
- compiler.getSourceManager().getSpellingLoc(
- decl->getNameInfo().getLoc()))
- || f->isDefined() || f->isPure())
- && rewrite(loc)))
+ if (fullMode_
+ && !((compat::isInMainFile(
+ compiler.getSourceManager(),
+ compiler.getSourceManager().getSpellingLoc(
+ decl->getNameInfo().getLoc()))
+ || f->isDefined() || f->isPure())
+ && rewrite(loc)))
{
report(
DiagnosticsEngine::Warning,
@@ -487,7 +496,9 @@ bool SalBool::VisitValueDecl(ValueDecl const * decl) {
if (ignoreLocation(decl)) {
return true;
}
- if (isSalBool(decl->getType()) && !rewrite(decl->getLocStart())) {
+ if (fullMode_ && isSalBool(decl->getType())
+ && !rewrite(decl->getLocStart()))
+ {
report(
DiagnosticsEngine::Warning,
"ValueDecl, use \"bool\" instead of \"sal_Bool\"",
@@ -498,7 +509,7 @@ bool SalBool::VisitValueDecl(ValueDecl const * decl) {
}
bool SalBool::isInSpecialMainFile(SourceLocation spellingLocation) const {
- return compat::isInMainFile(spellingLocation)
+ return compat::isInMainFile(compiler.getSourceManager(), spellingLocation)
&& (compiler.getSourceManager().getFilename(spellingLocation)
== SRCDIR "/cppu/qa/test_any.cxx");
}
diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx
index 08ca702..2e8cb8d 100644
--- a/connectivity/source/drivers/kab/KResultSet.cxx
+++ b/connectivity/source/drivers/kab/KResultSet.cxx
@@ -968,7 +968,7 @@ void KabResultSet::getFastPropertyValue(
switch (nHandle)
{
case PROPERTY_ID_ISBOOKMARKABLE:
- _rValue <<= (sal_Bool)sal_False;
+ _rValue <<= false;
break;
case PROPERTY_ID_CURSORNAME:
case PROPERTY_ID_RESULTSETCONCURRENCY:
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index 3acf350..6b98792 100644
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -56,9 +56,9 @@ namespace svt { namespace table
namespace
{
- template< class ATTRIBUTE_TYPE >
- void lcl_set( Reference< XGridColumn > const & i_column, void ( SAL_CALL XGridColumn::*i_setter )( ATTRIBUTE_TYPE ),
- ATTRIBUTE_TYPE i_value )
+ template< class T1, class T2 >
+ void lcl_set( Reference< XGridColumn > const & i_column, void ( SAL_CALL XGridColumn::*i_setter )( T1 ),
+ T2 i_value )
{
try
{
@@ -334,7 +334,7 @@ namespace svt { namespace table
void UnoGridColumnFacade::setResizable( bool i_resizable )
{
ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" );
- lcl_set( m_xGridColumn, &XGridColumn::setResizeable, sal_Bool( i_resizable ) );
+ lcl_set( m_xGridColumn, &XGridColumn::setResizeable, i_resizable );
}
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index b376f5a..0094aed 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -152,9 +152,9 @@ void SvxPageWindow::Paint(const Rectangle&)
else
{
// Left and right page are different -> draw two pages if possible
- DrawPage(Point(0,nYPos),false,(sal_Bool)(eUsage & SVX_PAGE_LEFT));
+ DrawPage(Point(0,nYPos),false,(eUsage & SVX_PAGE_LEFT) != 0);
DrawPage(Point(aSize.Width() + aSize.Width() / 8,nYPos),true,
- (sal_Bool)(eUsage & SVX_PAGE_RIGHT));
+ (eUsage & SVX_PAGE_RIGHT) != 0);
}
}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index d834fb8..05d618b 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -243,8 +243,8 @@ DECLARE_RTFIMPORT_TEST(testN750757, "n750757.rtf")
uno::Reference<container::XEnumerationAccess> xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
uno::Reference<container::XEnumeration> xParaEnum = xParaEnumAccess->createEnumeration();
- CPPUNIT_ASSERT_EQUAL(sal_Bool(false), getProperty<sal_Bool>(xParaEnum->nextElement(), "ParaContextMargin"));
- CPPUNIT_ASSERT_EQUAL(sal_Bool(true), getProperty<sal_Bool>(xParaEnum->nextElement(), "ParaContextMargin"));
+ CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<sal_Bool>(xParaEnum->nextElement(), "ParaContextMargin")));
+ CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<sal_Bool>(xParaEnum->nextElement(), "ParaContextMargin")));
}
DECLARE_RTFIMPORT_TEST(testFdo45563, "fdo45563.rtf")
commit 485a7c880fd2675ff9c5fc792d4caae980b4535e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 1 16:21:48 2014 +0100
coverity#735881 Dereference after null check
Change-Id: I2fd45dd0ab1e0bedca7e827886949beb3f494cad
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 0eba6e7..72ebdc9 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1750,7 +1750,7 @@ SdrTableObj& SdrTableObj::operator=(const SdrTableObj& rObj)
bNoMirror = rObj.bNoMirror;
bDisableAutoWidthOnDragging = rObj.bDisableAutoWidthOnDragging;
- if( rObj.mpImpl )
+ if (mpImpl && rObj.mpImpl)
*mpImpl = *rObj.mpImpl;
return *this;
}
commit 0820f53c0d0211f43bc820b95793c5b868f22a50
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 1 16:20:27 2014 +0100
coverity#735850 Dereference after null check
Change-Id: If164a92ed502502ce1b25ecddaa8852e83eb4f3c
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 3f789e00..377a758 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1387,8 +1387,7 @@ bool SfxObjectShell::SaveTo_Impl
bool bOk = false;
// TODO/LATER: get rid of bOk
-
- if( bOwnTarget && !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) )
+ if (bOwnTarget && pFilter && !(pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER))
{
AddLog( OUString( OSL_LOG_PREFIX "Storing in own format." ) );
uno::Reference< embed::XStorage > xMedStorage = rMedium.GetStorage();
commit 4d22b8f7b46c6e93f682ac26aee1403cd5288a88
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 1 16:11:14 2014 +0100
coverity#1038321 Unintended sign extension
and
coverity#1038320 Unintended sign extension
coverity#1038319 Unintended sign extension
coverity#1038318 Unintended sign extension
coverity#1038317 Unintended sign extension
coverity#1038316 Unintended sign extension
coverity#1038315 Unintended sign extension
coverity#1038314 Unintended sign extension
Change-Id: Ib8015baf8ffec48e1b2d6ce1e7ce284fb36303b0
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 24b5630..25b003d 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -259,9 +259,9 @@ class SmShowSymbolSetWindow : public Control
SymbolPtrVec_t aSymbolSet;
Link aSelectHdlLink;
Link aDblClickHdlLink;
- sal_uInt16 nLen;
- sal_uInt16 nRows, nColumns;
- sal_uInt16 nXOffset, nYOffset;
+ long nLen;
+ long nRows, nColumns;
+ long nXOffset, nYOffset;
sal_uInt16 nSelectSymbol;
void SetScrollBarRange();
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 06c1115..83850e6 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1200,16 +1200,16 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSmShowSymbolSet(Window *pPa
void SmShowSymbolSetWindow::calccols()
{
// Height of 16pt in pixels (matching 'aOutputSize')
- nLen = (sal_uInt16) LogicToPixel(Size(0, 16), MapMode(MAP_POINT)).Height();
+ nLen = LogicToPixel(Size(0, 16), MapMode(MAP_POINT)).Height();
Size aOutputSize = GetOutputSizePixel();
- nColumns = sal::static_int_cast< sal_uInt16 >(aOutputSize.Width() / nLen);
+ nColumns = aOutputSize.Width() / nLen;
if (nColumns > 2 && nColumns % 2 != 0)
--nColumns;
- nRows = sal::static_int_cast< sal_uInt16 >(aOutputSize.Height() / nLen);
- nColumns = std::max<sal_uInt16>(1, nColumns);
- nRows = std::max<sal_uInt16>(1, nRows);
+ nRows = aOutputSize.Height() / nLen;
+ nColumns = std::max<long>(1, nColumns);
+ nRows = std::max<long>(1, nRows);
nXOffset = (aOutputSize.Width() - (nColumns * nLen)) / 2;
nYOffset = (aOutputSize.Height() - (nRows * nLen)) / 2;
@@ -1232,7 +1232,7 @@ void SmShowSymbolSetWindow::SetSymbolSet(const SymbolPtrVec_t& rSymbolSet)
void SmShowSymbolSetWindow::SetScrollBarRange()
{
- if (static_cast< sal_uInt16 >(aSymbolSet.size()) > (nColumns * nRows))
+ if (aSymbolSet.size() > static_cast<size_t>(nColumns * nRows))
{
m_pVScrollBar->SetRange(Range(0, ((aSymbolSet.size() + (nColumns - 1)) / nColumns) - nRows));
m_pVScrollBar->Enable(true);
commit 8a9bc476df2457870c2b41812d2828a81f67c783
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 1 15:54:55 2014 +0100
coverity#735883 Unchecked dynamic_cast
Change-Id: I4dec526d78dfaa1d894ab1be205e58e1224fbf72
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index d40c3ba..71935c3 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -1124,12 +1124,12 @@ void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_
// merge first cell
CellRef xOriginCell( dynamic_cast< Cell* >( getCellByPosition( nCol, nRow ).get() ) );
- if( xOriginCell.is() )
- {
- if( bUndo )
- xOriginCell->AddUndo();
- xOriginCell->merge( nColSpan, nRowSpan );
- }
+ if(!xOriginCell.is())
+ return;
+
+ if( bUndo )
+ xOriginCell->AddUndo();
+ xOriginCell->merge( nColSpan, nRowSpan );
sal_Int32 nTempCol = nCol + 1;
@@ -1151,9 +1151,6 @@ void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_
}
}
-
-
-
void TableModel::updateRows()
{
sal_Int32 nRow = 0;
@@ -1164,8 +1161,6 @@ void TableModel::updateRows()
}
}
-
-
void TableModel::updateColumns()
{
sal_Int32 nColumn = 0;
@@ -1176,8 +1171,6 @@ void TableModel::updateColumns()
}
}
-
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a7e1ffc248bed431693c6d50c02e7c936c67f360
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 1 15:50:28 2014 +0100
coverity#706988 Uncaught exception
and
coverity#706989 Uncaught exception
Change-Id: I426ae26f69311effd60c0b60b7f4d677a2e35c80
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index ef0839a..bf8a374 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -5339,7 +5339,9 @@ ScVbaRange::Previous() throw (script::BasicErrorException, uno::RuntimeException
}
uno::Reference< excel::XRange > SAL_CALL
-ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw ( script::BasicErrorException, std::exception )
+ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue)
+ throw (script::BasicErrorException, uno::RuntimeException,
+ std::exception)
{
bool bIsSingleCell = isSingleCellRange();
bool bIsMultiArea = ( m_Areas->getCount() > 1 );
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index 8d0035b..5c12276 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -289,7 +289,8 @@ public:
static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException);
static bool getCellRangesForAddress( sal_uInt16& rResFlags, const OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter = 0 );
virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue)
+ throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XErrorQuery
virtual sal_Bool SAL_CALL hasError( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XHelperInterface
commit 7950797f27ca09091e4221ea91f90e2aca98a2c5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 1 15:42:18 2014 +0100
coverity#706468 Uncaught exception
and
coverity#706469 Uncaught exception
Change-Id: Ia67d777b09ac7f72a94a9019765266854775c53f
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 660d927..167a52e 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -1834,19 +1834,20 @@ Reference< XComponent > ODocumentDefinition::impl_openUI_nolck_throw( bool _bFor
if ( !m_pImpl || !m_pImpl->m_pDataSource )
throw DisposedException();
- Reference< XDatabaseDocumentUI > xUI( lcl_getDatabaseDocumentUI( *m_pImpl->m_pDataSource ) );
- if ( !xUI.is() )
- {
- // no XDatabaseDocumentUI -> just execute the respective command
- m_bOpenInDesign = _bForEditing;
- Reference< XComponent > xComponent( onCommandOpenSomething( Any(), true, NULL ), UNO_QUERY );
- OSL_ENSURE( xComponent.is(), "ODocumentDefinition::impl_openUI_nolck_throw: opening the thingie failed." );
- return xComponent;
- }
-
Reference< XComponent > xComponent;
try
{
+ Reference< XDatabaseDocumentUI > xUI( lcl_getDatabaseDocumentUI( *m_pImpl->m_pDataSource ) );
+ if ( !xUI.is() )
+ {
+ // no XDatabaseDocumentUI -> just execute the respective command
+ m_bOpenInDesign = _bForEditing;
+ xComponent = Reference<XComponent>(onCommandOpenSomething(Any(), true, NULL), UNO_QUERY);
+ OSL_ENSURE( xComponent.is(), "ODocumentDefinition::impl_openUI_nolck_throw: opening the thingie failed." );
+ return xComponent;
+ }
+
+
OUString sName( impl_getHierarchicalName( false ) );
sal_Int32 nObjectType = m_bForm ? DatabaseObject::FORM : DatabaseObject::REPORT;
aGuard.clear();
@@ -1861,6 +1862,7 @@ Reference< XComponent > ODocumentDefinition::impl_openUI_nolck_throw( bool _bFor
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list