diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/inc/numfmtlb.hxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/numfmtlb.cxx | 12 |
2 files changed, 3 insertions, 12 deletions
diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 358cf2babc3f..15749c65ec84 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -71,11 +71,8 @@ class SW_DLLPUBLIC SwNumFormatListBox SvNumFormatType nCurrFormatType; bool mbCurrFormatTypeNeedsInit; sal_Int32 nStdEntry; - bool bOneArea; sal_uInt32 nDefFormat; LanguageType eCurLanguage; - bool bShowLanguageControl; //determine whether the language control has - //to be shown in the number format dialog bool bUseAutomaticLanguage;//determine whether language is automatically assigned std::unique_ptr<weld::ComboBox> mxControl; diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index d1748e953da9..a7766a505a1b 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -458,9 +458,7 @@ SwNumFormatListBox::SwNumFormatListBox(std::unique_ptr<weld::ComboBox> xControl) : nCurrFormatType(SvNumFormatType::ALL) , mbCurrFormatTypeNeedsInit(true) , nStdEntry(0) - , bOneArea(false) , nDefFormat(0) - , bShowLanguageControl(false) , bUseAutomaticLanguage(true) , mxControl(std::move(xControl)) { @@ -716,9 +714,9 @@ void SwNumFormatListBox::CallSelectHdl() SID_ATTR_NUMBERFORMAT_INFO ) ); if( (SvNumFormatType::DATE | SvNumFormatType::TIME) & nCurrFormatType ) - aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ONE_AREA, bOneArea)); + aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ONE_AREA, false)); - aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_NOLANGUAGE, !bShowLanguageControl)); + aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_NOLANGUAGE, true)); aCoreSet.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ADD_AUTO, bUseAutomaticLanguage)); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); @@ -747,11 +745,7 @@ void SwNumFormatListBox::CallSelectHdl() // SetDefFormat uses eCurLanguage to look for if this format already in the list SetDefFormat(nNumberFormat); } - if( bShowLanguageControl && SfxItemState::SET == pOutSet->GetItemState( - SID_ATTR_NUMBERFORMAT_ADD_AUTO, false, &pItem )) - { - bUseAutomaticLanguage = static_cast<const SfxBoolItem*>(pItem)->GetValue(); - } + } else SetDefFormat(nFormat); |