sdext/source/minimizer/pppoptimizerdialog.cxx | 1
sw/source/filter/html/htmltab.cxx | 37 ++++++++++++++------------
2 files changed, 20 insertions(+), 18 deletions(-)
New commits:
commit 364b63ff4ed9410524fa2785c73bb58108fd6c06
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Dec 7 11:26:04 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Dec 7 13:17:36 2022 +0000
ofz#54093 Null-dereference
Change-Id: I00b3762d9f8a17ed51db397a5d2ccc88c3c7fcf5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143772
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index c8fee89794cc..fe55cec381ac 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -5076,24 +5076,27 @@ std::shared_ptr<HTMLTable>
SwHTMLParser::BuildTable(SvxAdjust eParentAdjust,
OSL_ENSURE( pTableStNd ==
m_pPam->GetPointNode().FindTableNode(),
"Are we in the wrong table?" );
- SwNode* pNd;
- if( bTop )
- pNd = pTableStNd;
- else
- pNd = pTableStNd->EndOfSectionNode();
- SwNodeIndex aDstIdx( *pNd, bTop ? 0 : 1 );
-
- m_xDoc->getIDocumentContentOperations().MoveNodeRange(
aSrcRg, aDstIdx.GetNode(),
- SwMoveFlags::DEFAULT );
-
- // If the caption was added before the table, a page style
on that table
- // needs to be moved to the first paragraph of the header.
- // Additionally, all remembered indices that point to the
table node
- // need to be moved
- if( bTop )
+ if (pTableStNd)
{
- MovePageDescAttrs( pTableStNd,
aSrcRg.aStart.GetIndex(),
- false );
+ SwNode* pNd;
+ if( bTop )
+ pNd = pTableStNd;
+ else
+ pNd = pTableStNd->EndOfSectionNode();
+ SwNodeIndex aDstIdx( *pNd, bTop ? 0 : 1 );
+
+ m_xDoc->getIDocumentContentOperations().MoveNodeRange(
aSrcRg, aDstIdx.GetNode(),
+ SwMoveFlags::DEFAULT );
+
+ // If the caption was added before the table, a page
style on that table
+ // needs to be moved to the first paragraph of the
header.
+ // Additionally, all remembered indices that point to
the table node
+ // need to be moved
+ if( bTop )
+ {
+ MovePageDescAttrs( pTableStNd,
aSrcRg.aStart.GetIndex(),
+ false );
+ }
}
}
commit 82afcf2d945f5e2465c82bc846440bc12909e9f8
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Dec 6 19:41:48 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Dec 7 13:17:26 2022 +0000
stray fprintf
Change-Id: I6b74eeac5cc881ffe6b1676941b3ae462a284f33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143744
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx
b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 9ad72b748726..74a89bfbac1a 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -125,7 +125,6 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
}
else if ( rURL.Path == "statusupdate" )
{
- fprintf(stderr, "statusupdate\n");
if ( mpOptimizerDialog )
mpOptimizerDialog->UpdateStatus( rArguments );
}
