diff options
| author | pv2k <vidhey96@gmail.com> | 2016-12-21 04:06:18 +0530 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-01-04 19:58:36 +0000 |
| commit | 610bc5aa161e726135feee0c7f64331df090475a (patch) | |
| tree | 82534ab47122457394489a6cf8a6fdbf8f9d92f9 /cui | |
| parent | 2d54ffbf18d461c846535d539d704d45aff059b1 (diff) | |
tdf#89932 bullets and numbering position tab level-1
Fixed the problem of not showing the default values on level-1
Change-Id: I167694d090a6c4cd8064250837d290efabfad21c
Reviewed-on: https://gerrit.libreoffice.org/32261
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/numpages.hxx | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/numpages.cxx | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index afaaf1e61ba1..0b4f0c594b18 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -404,6 +404,7 @@ class SvxNumPositionTabPage : public SfxTabPage MapUnit eCoreUnit; bool bModified : 1; + bool bDefault : 1; bool bPreset : 1; bool bInInintControl : 1; // workaround for Modify-error, is said to be corrected from 391 on bool bLabelAlignmentPosAndSpaceModeActive; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 790d4a2571fa..b70662def323 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2639,6 +2639,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent, , nActNumLvl(SAL_MAX_UINT16) , nNumItemId(SID_ATTR_NUMBERING_RULE) , bModified(false) + , bDefault(true) , bPreset(false) , bInInintControl(false) , bLabelAlignmentPosAndSpaceModeActive(false) @@ -2914,7 +2915,7 @@ void SvxNumPositionTabPage::InitControls() m_pAlign2LB->SetNoSelection(); } - if ( bSameLabelFollowedBy ) + if ( bSameLabelFollowedBy || bDefault ) { sal_Int32 nPos = 0; // LISTTAB if ( aNumFmtArr[nLvl]->GetLabelFollowedBy() == SvxNumberFormat::SPACE ) @@ -2936,7 +2937,7 @@ void SvxNumPositionTabPage::InitControls() { m_pListtabFT->Enable(); m_pListtabMF->Enable(); - if ( bSameListtab ) + if ( bSameListtab || bDefault ) { SetMetricValue(*m_pListtabMF, aNumFmtArr[nLvl]->GetListtabPos(), eCoreUnit); } @@ -2952,7 +2953,7 @@ void SvxNumPositionTabPage::InitControls() m_pListtabMF->SetText(""); } - if ( bSameAlignAt ) + if ( bSameAlignAt || bDefault ) { SetMetricValue(*m_pAlignedAtMF, aNumFmtArr[nLvl]->GetIndentAt() + aNumFmtArr[nLvl]->GetFirstLineIndent(), @@ -2963,7 +2964,7 @@ void SvxNumPositionTabPage::InitControls() m_pAlignedAtMF->SetText(""); } - if ( bSameIndentAt ) + if ( bSameIndentAt || bDefault ) { SetMetricValue(*m_pIndentAtMF, aNumFmtArr[nLvl]->GetIndentAt(), eCoreUnit); } @@ -3234,6 +3235,7 @@ IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox&, rBox, void ) { sal_uInt16 nSaveNumLvl = nActNumLvl; nActNumLvl = 0; + bDefault = false; if(rBox.IsEntryPosSelected( pActNum->GetLevelCount() ) && (rBox.GetSelectEntryCount() == 1 || nSaveNumLvl != 0xffff)) { |