mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#152676 Writer: Compatibility options no longer saved as default

Browse Source 
regression from
    commit 78adf246d5
    Date:   Mon Jul 26 10:54:36 2021 +0200
    return SvtCompatibilityEntry from SvtCompatibilityOptions::GetList

where I mistakenly assumed that the bIsDefault flag in
SvtCompatibilityEntry was being set by the SvtCompatibilityOptions
code. Rather remove this field if it is not going to be maintained
properly.

Change-Id: I23963ae885563d5abc8a99cfd144d7fe00c6f192
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144882
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2022-12-31 08:52:53 +02:00
committed by Noel Grandin
parent 5a06b3b789
commit c6f756e968
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/unotools/compatibility.hxx
View File

@@ -129,19 +129,8 @@ class SvtCompatibilityEntry
setValue(rIdx, css::uno::Any(rValue)); setValue(rIdx, css::uno::Any(rValue));
} }
bool isDefaultEntry() const
{
return m_bDefaultEntry;
}
void setDefaultEntry( bool rValue )
{
m_bDefaultEntry = rValue;
}
private: private:
std::vector<css::uno::Any> m_aPropertyValue; std::vector<css::uno::Any> m_aPropertyValue;
bool m_bDefaultEntry;
}; };
/*-************************************************************************************************************ /*-************************************************************************************************************

10
sw/source/ui/config/optcomp.cxx
View File

@@ -205,10 +205,11 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet )
{ {
const OUString sEntryName = rEntry.getValue<OUString>( SvtCompatibilityEntry::Index::Name ); const OUString sEntryName = rEntry.getValue<OUString>( SvtCompatibilityEntry::Index::Name );
const bool bIsUserEntry = ( sEntryName == SvtCompatibilityEntry::USER_ENTRY_NAME ); const bool bIsUserEntry = ( sEntryName == SvtCompatibilityEntry::USER_ENTRY_NAME );
const bool bIsDefaultEntry = ( sEntryName == SvtCompatibilityEntry::DEFAULT_ENTRY_NAME );
m_pImpl->m_aList.push_back( rEntry ); m_pImpl->m_aList.push_back( rEntry );
if ( rEntry.isDefaultEntry() ) if ( bIsDefaultEntry )
continue; continue;
OUString sNewEntry; OUString sNewEntry;
@@ -260,7 +261,12 @@ IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl, weld::Button&, void)
return; return;
auto pItem = std::find_if(m_pImpl->m_aList.begin(), m_pImpl->m_aList.end(), auto pItem = std::find_if(m_pImpl->m_aList.begin(), m_pImpl->m_aList.end(),
[](const SvtCompatibilityEntry& rItem) { return rItem.isDefaultEntry(); }); [](const SvtCompatibilityEntry& rItem)
{
const OUString sEntryName = rItem.getValue<OUString>( SvtCompatibilityEntry::Index::Name );
const bool bIsDefaultEntry = ( sEntryName == SvtCompatibilityEntry::DEFAULT_ENTRY_NAME );
return bIsDefaultEntry;
});
if (pItem != m_pImpl->m_aList.end()) if (pItem != m_pImpl->m_aList.end())
{ {
const sal_Int32 nCount = m_xOptionsLB->n_children(); const sal_Int32 nCount = m_xOptionsLB->n_children();

2
unotools/source/config/compatibility.cxx
View File

@@ -65,8 +65,6 @@ SvtCompatibilityEntry::SvtCompatibilityEntry()
setValue<bool>( Index::SubtractFlysAnchoredAtFlys, false ); setValue<bool>( Index::SubtractFlysAnchoredAtFlys, false );
setValue<bool>( Index::EmptyDbFieldHidesPara, true ); setValue<bool>( Index::EmptyDbFieldHidesPara, true );
setValue<bool>( Index::AddTableLineSpacing, false ); setValue<bool>( Index::AddTableLineSpacing, false );
setDefaultEntry( false );
} }
OUString SvtCompatibilityEntry::getName( const Index rIdx ) OUString SvtCompatibilityEntry::getName( const Index rIdx )