From d334dd956a594c2fdda43706417ebf4d489f206a Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 2 Feb 2015 11:59:04 +0100 Subject: tdf#68183 sw: config option for disabling the creation of automatic RSID marks It was a problem since the initial commit 062eaeffe7cb986255063bb9b0a5f3fb3fc8e34c (sw: Improved document comparison based on RSIDs., 2011-12-22) that this new feature -- which is annoying for some use-cases -- could not be disabled, let's allow that. Change-Id: I33fa77382919586fb00198246f737caa68dcbd85 Reviewed-on: https://gerrit.libreoffice.org/14277 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- sw/source/ui/config/optpage.cxx | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'sw/source/ui/config') diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 7a704f2f573e..cd68cb6d88ec 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -2215,6 +2215,7 @@ SwCompareOptionsTabPage::SwCompareOptionsTabPage( vcl::Window* pParent, const S get(m_pRsidCB, "useRSID"); get(m_pIgnoreCB, "ignore"); get(m_pLenNF, "ignorelen"); + get(m_pStoreRsidCB, "storeRSID"); Link aLnk( LINK( this, SwCompareOptionsTabPage, ComparisonHdl ) ); m_pAutoRB->SetClickHdl( aLnk ); @@ -2270,6 +2271,12 @@ bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* ) bRet = true; } + if (m_pStoreRsidCB->IsValueChangedFromSaved()) + { + pOpt->SetStoreRsid(m_pStoreRsidCB->IsChecked()); + bRet = true; + } + return bRet; } @@ -2313,6 +2320,9 @@ void SwCompareOptionsTabPage::Reset( const SfxItemSet* ) m_pLenNF->SetValue( pOpt->GetPieceLen() ); m_pLenNF->SaveValue(); + + m_pStoreRsidCB->Check(pOpt->IsStoreRsid()); + m_pStoreRsidCB->SaveValue(); } IMPL_LINK_NOARG(SwCompareOptionsTabPage, ComparisonHdl) -- cgit