sw/source/core/text/EnhancedPDFExportHelper.cxx | 143 +++++++++++-------------
1 file changed, 71 insertions(+), 72 deletions(-)
New commits:
commit 1f0e53237a912609813b912b51a2ab664a8871ea
Author: Bjoern Michaelsen <bjoern.michael...@libreoffice.org>
AuthorDate: Tue Feb 25 23:37:10 2020 +0100
Commit: Björn Michaelsen <bjoern.michael...@libreoffice.org>
CommitDate: Wed Feb 26 20:56:58 2020 +0100
use GatherFields
Change-Id: I921956e5640cc16941109969d059809be66f0228
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89489
Tested-by: Jenkins
Reviewed-by: Björn Michaelsen <bjoern.michael...@libreoffice.org>
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 823bde78b662..477be010437e 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -120,7 +120,7 @@ void lcl_DBGCheckStack()
nElement = rItem;
}
(void)nElement;
-}
+};
#endif
@@ -264,6 +264,21 @@ bool lcl_HasPreviousParaSameNumRule(SwTextFrame const&
rTextFrame, const SwTextN
return bRet;
}
+bool lcl_TryMoveToNonHiddenField(SwEditShell& rShell, const SwTextNode& rNd,
SwFormatField& rField)
+{
+ // 1. Check if the whole paragraph is hidden
+ // 2. Move to the field
+ // 3. Check for hidden text attribute
+ if(rNd.IsHidden())
+ return false;
+ if(!rShell.GotoFormatField(rField) || rShell.SelectHiddenRange())
+ {
+ rShell.SwCursorShell::ClearMark();
+ return false;
+ }
+ return true;
+};
+
} // end namespace
SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info* pNumInfo,
@@ -1557,15 +1572,8 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
{
const SwTextNode* pTNd =
pFormatField->GetTextField()->GetpTextNode();
OSL_ENSURE(nullptr != pTNd, "Enhanced pdf export - text node
is missing");
-
- // 1. Check if the whole paragraph is hidden
- // 2. Move to the field
- // 3. Check for hidden text attribute
- if(pTNd->IsHidden() || !mrSh.GotoFormatField(*pFormatField) ||
mrSh.SelectHiddenRange())
- {
- mrSh.SwCursorShell::ClearMark();
+ if(!lcl_TryMoveToNonHiddenField(mrSh, *pTNd, *pFormatField))
continue;
- }
// Link Rectangle
const SwRect& rNoteRect = mrSh.GetCharRect();
const SwPageFrame* pCurrPage = static_cast<const
SwPageFrame*>(mrSh.GetLayout()->Lower());
@@ -1838,91 +1846,82 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
// REFERENCES
- SwFieldType* pType = mrSh.GetFieldType( SwFieldIds::GetRef, OUString()
);
- SwIterator<SwFormatField,SwFieldType> aIter( *pType );
- for( SwFormatField* pFirst = aIter.First(); pFirst; )
+ std::vector<SwFormatField*> vpFields;
+ mrSh.GetFieldType( SwFieldIds::GetRef, OUString()
)->GatherFields(vpFields);
+ for(auto pFormatField : vpFields )
{
- if( pFirst->GetTextField() && pFirst->IsFieldInDoc() )
+ if( pFormatField->GetTextField() && pFormatField->IsFieldInDoc() )
{
- const SwTextNode* pTNd =
pFirst->GetTextField()->GetpTextNode();
+ const SwTextNode* pTNd =
pFormatField->GetTextField()->GetpTextNode();
OSL_ENSURE( nullptr != pTNd, "Enhanced pdf export - text node
is missing" );
+ if(!lcl_TryMoveToNonHiddenField(mrSh, *pTNd, *pFormatField))
+ continue;
+ // Select the field:
+ mrSh.SwCursorShell::SetMark();
+ mrSh.SwCursorShell::Right( 1, CRSR_SKIP_CHARS );
- // 1. Check if the whole paragraph is hidden
- // 2. Move to the field
- // 3. Check for hidden text attribute
- if ( !pTNd->IsHidden() &&
- mrSh.GotoFormatField( *pFirst ) &&
- !mrSh.SelectHiddenRange() )
- {
- // Select the field:
- mrSh.SwCursorShell::SetMark();
- mrSh.SwCursorShell::Right( 1, CRSR_SKIP_CHARS );
+ // Link Rectangles
+ SwRects aTmp;
+ aTmp.insert( aTmp.begin(),
mrSh.SwCursorShell::GetCursor_()->begin(),
mrSh.SwCursorShell::GetCursor_()->end() );
+ OSL_ENSURE( !aTmp.empty(), "Enhanced pdf export - rectangles
are missing" );
- // Link Rectangles
- SwRects aTmp;
- aTmp.insert( aTmp.begin(),
mrSh.SwCursorShell::GetCursor_()->begin(),
mrSh.SwCursorShell::GetCursor_()->end() );
- OSL_ENSURE( !aTmp.empty(), "Enhanced pdf export -
rectangles are missing" );
+ mrSh.SwCursorShell::ClearMark();
- mrSh.SwCursorShell::ClearMark();
+ // Destination Rectangle
+ const SwGetRefField* pField =
static_cast<SwGetRefField*>(pFormatField->GetField());
+ const OUString& rRefName = pField->GetSetRefName();
+ mrSh.GotoRefMark( rRefName, pField->GetSubType(),
pField->GetSeqNo() );
+ const SwRect& rDestRect = mrSh.GetCharRect();
- // Destination Rectangle
- const SwGetRefField* pField =
- static_cast<SwGetRefField*>(pFirst->GetField());
- const OUString& rRefName = pField->GetSetRefName();
- mrSh.GotoRefMark( rRefName, pField->GetSubType(),
pField->GetSeqNo() );
- const SwRect& rDestRect = mrSh.GetCharRect();
+ const SwPageFrame* pCurrPage = static_cast<const
SwPageFrame*>( mrSh.GetLayout()->Lower() );
- const SwPageFrame* pCurrPage = static_cast<const
SwPageFrame*>( mrSh.GetLayout()->Lower() );
+ // Destination PageNum
+ const sal_Int32 nDestPageNum = CalcOutputPageNum( rDestRect );
- // Destination PageNum
- const sal_Int32 nDestPageNum = CalcOutputPageNum(
rDestRect );
+ if ( -1 != nDestPageNum )
+ {
+ // Destination Export
+ tools::Rectangle aRect(SwRectToPDFRect(pCurrPage,
rDestRect.SVRect()));
+ const sal_Int32 nDestId =
pPDFExtOutDevData->CreateDest(aRect, nDestPageNum);
- if ( -1 != nDestPageNum )
+ // #i44368# Links in Header/Footer
+ const SwPosition aPos( *pTNd );
+ const bool bHeaderFooter = pDoc->IsInHeaderFooter(
aPos.nNode );
+
+ // Create links for all selected rectangles:
+ const size_t nNumOfRects = aTmp.size();
+ for ( size_t i = 0; i < nNumOfRects; ++i )
{
- // Destination Export
- tools::Rectangle aRect(SwRectToPDFRect(pCurrPage,
rDestRect.SVRect()));
- const sal_Int32 nDestId =
pPDFExtOutDevData->CreateDest(aRect, nDestPageNum);
+ // Link rectangle
+ const SwRect& rLinkRect( aTmp[ i ] );
- // #i44368# Links in Header/Footer
- const SwPosition aPos( *pTNd );
- const bool bHeaderFooter = pDoc->IsInHeaderFooter(
aPos.nNode );
+ // Link PageNums
+ std::vector<sal_Int32> aLinkPageNums =
CalcOutputPageNums( rLinkRect );
- // Create links for all selected rectangles:
- const size_t nNumOfRects = aTmp.size();
- for ( size_t i = 0; i < nNumOfRects; ++i )
+ for (sal_Int32 aLinkPageNum : aLinkPageNums)
{
- // Link rectangle
- const SwRect& rLinkRect( aTmp[ i ] );
-
- // Link PageNums
- std::vector<sal_Int32> aLinkPageNums =
CalcOutputPageNums( rLinkRect );
-
- for (sal_Int32 aLinkPageNum : aLinkPageNums)
- {
- // Link Export
- aRect = SwRectToPDFRect(pCurrPage,
rLinkRect.SVRect());
- const sal_Int32 nLinkId =
- pPDFExtOutDevData->CreateLink(aRect,
aLinkPageNum);
+ // Link Export
+ aRect = SwRectToPDFRect(pCurrPage,
rLinkRect.SVRect());
+ const sal_Int32 nLinkId =
+ pPDFExtOutDevData->CreateLink(aRect,
aLinkPageNum);
- // Store link info for tagged pdf output:
- const IdMapEntry aLinkEntry( rLinkRect,
nLinkId );
- aLinkIdMap.push_back( aLinkEntry );
+ // Store link info for tagged pdf output:
+ const IdMapEntry aLinkEntry( rLinkRect, nLinkId );
+ aLinkIdMap.push_back( aLinkEntry );
- // Connect Link and Destination:
- pPDFExtOutDevData->SetLinkDest( nLinkId,
nDestId );
+ // Connect Link and Destination:
+ pPDFExtOutDevData->SetLinkDest( nLinkId, nDestId );
- // #i44368# Links in Header/Footer
- if ( bHeaderFooter )
- {
- const OUString aDummy;
- MakeHeaderFooterLinks( *pPDFExtOutDevData,
*pTNd, rLinkRect, nDestId, aDummy, true );
- }
+ // #i44368# Links in Header/Footer
+ if ( bHeaderFooter )
+ {
+ const OUString aDummy;
+ MakeHeaderFooterLinks( *pPDFExtOutDevData,
*pTNd, rLinkRect, nDestId, aDummy, true );
}
}
}
}
}
- pFirst = aIter.Next();
mrSh.SwCursorShell::ClearMark();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
