sw/source/ui/misc/pggrid.cxx | 73 ++++++++++++++++++++++---------------------
1 file changed, 38 insertions(+), 35 deletions(-)
New commits:
commit 1c11bfc0420245ee19ff9ef1f09eaac79bae53e1
Author: Kevin Suo <suokunl...@126.com>
AuthorDate: Thu Nov 10 16:26:14 2022 +0800
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Nov 11 08:30:47 2022 +0100
Fix code block indent in SwTextGridPage::PutGridItem
Use 4 spaces rather than 8.
Change-Id: Ifdd72168c8ee7ec9b861f2e0ff24961f92747136
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142509
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 545694643b81..2e9f99e9d538 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -227,39 +227,39 @@ DeactivateRC SwTextGridPage::DeactivatePage( SfxItemSet* )
void SwTextGridPage::PutGridItem(SfxItemSet& rSet)
{
- SwTextGridItem aGridItem;
- aGridItem.SetGridType(m_xNoGridRB->get_active() ? GRID_NONE :
- m_xLinesGridRB->get_active() ? GRID_LINES_ONLY : GRID_LINES_CHARS
);
- aGridItem.SetSnapToChars(m_xSnapToCharsCB->get_active());
- aGridItem.SetLines( static_cast< sal_uInt16
>(m_xLinesPerPageNF->get_value()) );
- aGridItem.SetBaseHeight( static_cast< sal_uInt16 >(
- m_bRubyUserValue ? m_nRubyUserValue :
-
m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FieldUnit::TWIP))) );
- // Tdf#151544: set ruby height from the value get from UI only when in
square page mode.
- // When in normal mode, the ruby height should be zero.
- if (m_bSquaredMode)
-
aGridItem.SetRubyHeight(static_cast<sal_uInt16>(m_xRubySizeMF->denormalize(m_xRubySizeMF->get_value(FieldUnit::TWIP))));
- else
- aGridItem.SetRubyHeight(0);
- aGridItem.SetBaseWidth( static_cast< sal_uInt16
>(m_xCharWidthMF->denormalize(m_xCharWidthMF->get_value(FieldUnit::TWIP))) );
- aGridItem.SetRubyTextBelow(m_xRubyBelowCB->get_active());
- aGridItem.SetSquaredMode(m_bSquaredMode);
- aGridItem.SetDisplayGrid(m_xDisplayCB->get_active());
- aGridItem.SetPrintGrid(m_xPrintCB->get_active());
- aGridItem.SetColor(m_xColorLB->GetSelectEntryColor());
- rSet.Put(aGridItem);
-
- SwView * pView = ::GetActiveView();
- if (pView && aGridItem.GetGridType() != GRID_NONE)
+ SwTextGridItem aGridItem;
+ aGridItem.SetGridType(m_xNoGridRB->get_active() ? GRID_NONE :
+ m_xLinesGridRB->get_active() ? GRID_LINES_ONLY : GRID_LINES_CHARS );
+ aGridItem.SetSnapToChars(m_xSnapToCharsCB->get_active());
+ aGridItem.SetLines( static_cast< sal_uInt16
>(m_xLinesPerPageNF->get_value()) );
+ aGridItem.SetBaseHeight( static_cast< sal_uInt16 >(
+ m_bRubyUserValue ? m_nRubyUserValue :
+
m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FieldUnit::TWIP))) );
+ // Tdf#151544: set ruby height from the value get from UI only when in
square page mode.
+ // When in normal mode, the ruby height should be zero.
+ if (m_bSquaredMode)
+
aGridItem.SetRubyHeight(static_cast<sal_uInt16>(m_xRubySizeMF->denormalize(m_xRubySizeMF->get_value(FieldUnit::TWIP))));
+ else
+ aGridItem.SetRubyHeight(0);
+ aGridItem.SetBaseWidth( static_cast< sal_uInt16
>(m_xCharWidthMF->denormalize(m_xCharWidthMF->get_value(FieldUnit::TWIP))) );
+ aGridItem.SetRubyTextBelow(m_xRubyBelowCB->get_active());
+ aGridItem.SetSquaredMode(m_bSquaredMode);
+ aGridItem.SetDisplayGrid(m_xDisplayCB->get_active());
+ aGridItem.SetPrintGrid(m_xPrintCB->get_active());
+ aGridItem.SetColor(m_xColorLB->GetSelectEntryColor());
+ rSet.Put(aGridItem);
+
+ SwView * pView = ::GetActiveView();
+ if (pView && aGridItem.GetGridType() != GRID_NONE)
+ {
+ if ( aGridItem.GetGridType() == GRID_LINES_CHARS )
{
- if ( aGridItem.GetGridType() == GRID_LINES_CHARS )
- {
- m_bHRulerChanged = true;
- }
- m_bVRulerChanged = true;
-
pView->GetHRuler().SetCharWidth(m_xCharWidthMF->get_value(FieldUnit::MM));
-
pView->GetVRuler().SetLineHeight(m_xTextSizeMF->get_value(FieldUnit::MM));
+ m_bHRulerChanged = true;
}
+ m_bVRulerChanged = true;
+
pView->GetHRuler().SetCharWidth(m_xCharWidthMF->get_value(FieldUnit::MM));
+
pView->GetVRuler().SetLineHeight(m_xTextSizeMF->get_value(FieldUnit::MM));
+ }
}
void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet)
commit 9b80b2d6140d1aad240f10755105e49d678b98f1
Author: Kevin Suo <suokunl...@126.com>
AuthorDate: Thu Nov 10 10:19:08 2022 +0800
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Nov 11 08:30:29 2022 +0100
tdf#151979: fix crash in Text Grid dialog when switching active view
GetActiveView() may return a nullptr when previously we are in Calc
window and then click the controls on the writer dialog.
Change-Id: Ia4dcd58b19c40a3e6cd0a791b7645d5fd2dcb9f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142508
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 95f7116670b9..545694643b81 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -152,10 +152,13 @@ bool SwTextGridPage::FillItemSet(SfxItemSet *rSet)
// draw ticks of ruler
SwView * pView = ::GetActiveView();
- if ( m_bHRulerChanged )
- pView->GetHRuler().DrawTicks();
- if ( m_bVRulerChanged )
- pView->GetVRuler().DrawTicks();
+ if (pView)
+ {
+ if ( m_bHRulerChanged )
+ pView->GetHRuler().DrawTicks();
+ if ( m_bVRulerChanged )
+ pView->GetVRuler().DrawTicks();
+ }
return bRet;
}
@@ -247,7 +250,7 @@ void SwTextGridPage::PutGridItem(SfxItemSet& rSet)
rSet.Put(aGridItem);
SwView * pView = ::GetActiveView();
- if ( aGridItem.GetGridType() != GRID_NONE )
+ if (pView && aGridItem.GetGridType() != GRID_NONE)
{
if ( aGridItem.GetGridType() == GRID_LINES_CHARS )
{
