Kaydet (Commit) 610bc5aa authored tarafından pv2k's avatar pv2k Kaydeden (comit) Tamás Zolnai

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/32261Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarTamás Zolnai <tamas.zolnai@collabora.com>
üst 2d54ffbf
...@@ -404,6 +404,7 @@ class SvxNumPositionTabPage : public SfxTabPage ...@@ -404,6 +404,7 @@ class SvxNumPositionTabPage : public SfxTabPage
MapUnit eCoreUnit; MapUnit eCoreUnit;
bool bModified : 1; bool bModified : 1;
bool bDefault : 1;
bool bPreset : 1; bool bPreset : 1;
bool bInInintControl : 1; // workaround for Modify-error, is said to be corrected from 391 on bool bInInintControl : 1; // workaround for Modify-error, is said to be corrected from 391 on
bool bLabelAlignmentPosAndSpaceModeActive; bool bLabelAlignmentPosAndSpaceModeActive;
......
...@@ -2639,6 +2639,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent, ...@@ -2639,6 +2639,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent,
, nActNumLvl(SAL_MAX_UINT16) , nActNumLvl(SAL_MAX_UINT16)
, nNumItemId(SID_ATTR_NUMBERING_RULE) , nNumItemId(SID_ATTR_NUMBERING_RULE)
, bModified(false) , bModified(false)
, bDefault(true)
, bPreset(false) , bPreset(false)
, bInInintControl(false) , bInInintControl(false)
, bLabelAlignmentPosAndSpaceModeActive(false) , bLabelAlignmentPosAndSpaceModeActive(false)
...@@ -2914,7 +2915,7 @@ void SvxNumPositionTabPage::InitControls() ...@@ -2914,7 +2915,7 @@ void SvxNumPositionTabPage::InitControls()
m_pAlign2LB->SetNoSelection(); m_pAlign2LB->SetNoSelection();
} }
if ( bSameLabelFollowedBy ) if ( bSameLabelFollowedBy || bDefault )
{ {
sal_Int32 nPos = 0; // LISTTAB sal_Int32 nPos = 0; // LISTTAB
if ( aNumFmtArr[nLvl]->GetLabelFollowedBy() == SvxNumberFormat::SPACE ) if ( aNumFmtArr[nLvl]->GetLabelFollowedBy() == SvxNumberFormat::SPACE )
...@@ -2936,7 +2937,7 @@ void SvxNumPositionTabPage::InitControls() ...@@ -2936,7 +2937,7 @@ void SvxNumPositionTabPage::InitControls()
{ {
m_pListtabFT->Enable(); m_pListtabFT->Enable();
m_pListtabMF->Enable(); m_pListtabMF->Enable();
if ( bSameListtab ) if ( bSameListtab || bDefault )
{ {
SetMetricValue(*m_pListtabMF, aNumFmtArr[nLvl]->GetListtabPos(), eCoreUnit); SetMetricValue(*m_pListtabMF, aNumFmtArr[nLvl]->GetListtabPos(), eCoreUnit);
} }
...@@ -2952,7 +2953,7 @@ void SvxNumPositionTabPage::InitControls() ...@@ -2952,7 +2953,7 @@ void SvxNumPositionTabPage::InitControls()
m_pListtabMF->SetText(""); m_pListtabMF->SetText("");
} }
if ( bSameAlignAt ) if ( bSameAlignAt || bDefault )
{ {
SetMetricValue(*m_pAlignedAtMF, SetMetricValue(*m_pAlignedAtMF,
aNumFmtArr[nLvl]->GetIndentAt() + aNumFmtArr[nLvl]->GetFirstLineIndent(), aNumFmtArr[nLvl]->GetIndentAt() + aNumFmtArr[nLvl]->GetFirstLineIndent(),
...@@ -2963,7 +2964,7 @@ void SvxNumPositionTabPage::InitControls() ...@@ -2963,7 +2964,7 @@ void SvxNumPositionTabPage::InitControls()
m_pAlignedAtMF->SetText(""); m_pAlignedAtMF->SetText("");
} }
if ( bSameIndentAt ) if ( bSameIndentAt || bDefault )
{ {
SetMetricValue(*m_pIndentAtMF, aNumFmtArr[nLvl]->GetIndentAt(), eCoreUnit); SetMetricValue(*m_pIndentAtMF, aNumFmtArr[nLvl]->GetIndentAt(), eCoreUnit);
} }
...@@ -3234,6 +3235,7 @@ IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox&, rBox, void ) ...@@ -3234,6 +3235,7 @@ IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox&, rBox, void )
{ {
sal_uInt16 nSaveNumLvl = nActNumLvl; sal_uInt16 nSaveNumLvl = nActNumLvl;
nActNumLvl = 0; nActNumLvl = 0;
bDefault = false;
if(rBox.IsEntryPosSelected( pActNum->GetLevelCount() ) && if(rBox.IsEntryPosSelected( pActNum->GetLevelCount() ) &&
(rBox.GetSelectEntryCount() == 1 || nSaveNumLvl != 0xffff)) (rBox.GetSelectEntryCount() == 1 || nSaveNumLvl != 0xffff))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment