diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-02 11:59:04 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-02 13:24:51 +0000 |
| commit | d334dd956a594c2fdda43706417ebf4d489f206a (patch) | |
| tree | 80a574ef0e018a8f3cedbbd6983ac6c220c7c510 /sw/source/ui/config | |
| parent | c33c309f13dee335d81eb0e00363d4ae2d7c911a (diff) | |
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 <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/source/ui/config')
| -rw-r--r-- | sw/source/ui/config/optpage.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
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) |