summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorKatarina Behrens <Katarina.Behrens@cib.de>2017-12-14 13:14:02 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2017-12-19 01:25:48 +0100
commit5c66c0711286bcfa9d3ab4a87777c2af9e1c25d9 (patch)
treefa8a93602c18c60984f9e4aee7afb06fc15d4148 /cui
parentdf4fac1dbce087bbd01bbec242b93c72edcef74b (diff)
Read/write 'encrypt to self' bit
use some template functions to avoid duplicate code Change-Id: Ia178ea3a0561e34e0431749262f5f8f1f49b4fe7 Reviewed-on: https://gerrit.libreoffice.org/46693 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/options/optgenrl.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 83a98e60c7b0..c25144f04266 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -443,11 +443,14 @@ bool SvxGeneralTabPage::GetData_Impl()
: m_pSigningKeyLB->GetSelectedEntry();
OUString aEK = m_pEncryptionKeyLB->GetSelectedEntryPos() == 0 ? OUString()
: m_pEncryptionKeyLB->GetSelectedEntry();
+
aUserOpt.SetToken( UserOptToken::SigningKey, aSK );
aUserOpt.SetToken( UserOptToken::EncryptionKey, aEK );
+ aUserOpt.SetBoolValue( UserOptToken::EncryptToSelf, m_pEncryptToSelfCB->IsChecked() );
- bModified |= m_pSigningKeyLB->IsValueChangedFromSaved();
- bModified |= m_pEncryptionKeyLB->IsValueChangedFromSaved();
+ bModified |= m_pSigningKeyLB->IsValueChangedFromSaved() ||
+ m_pEncryptionKeyLB->IsValueChangedFromSaved() ||
+ m_pEncryptToSelfCB->IsValueChangedFromSaved();
#endif
return bModified;
@@ -489,6 +492,8 @@ void SvxGeneralTabPage::SetData_Impl()
OUString aEK = aUserOpt.GetToken(UserOptToken::EncryptionKey);
aEK.isEmpty() ? m_pEncryptionKeyLB->SelectEntryPos( 0 ) //i.e. 'No Key'
: m_pEncryptionKeyLB->SelectEntry( aEK );
+
+ m_pEncryptToSelfCB->Check( aUserOpt.GetEncryptToSelf() );
#endif
}
s?h=private/timar/fontconfigcrash&id=885eb42469f9191f7df270dfd1c8bda5dcec0e2f'>genLang updatejan iversen 2016-03-14genLang updatejan iversen 2016-03-14genLang updatejan iversen 2016-03-14Resolves: tdf#98473 replace || with ‖ to avoid illegal gtk3 action namesCaolán McNamara 2016-03-14genLang updatejan iversen 2016-03-14genLang updatejan iversen 2016-03-11update genLang (l10ntools)Jan Iversen 2016-03-11tdf#97966: Remove 'static' keywordsWastack 2016-03-08Revert "tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals"Michael Stahl 2016-03-08tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionalsRohan Kumar 2016-03-07expand src templatesDavid Tardon 2016-03-07expand src templatesDavid Tardon 2016-03-07drop removed templates from the listDavid Tardon 2016-03-07expand src templates only used in a single placeDavid Tardon 2016-03-03various loplugin warningsStephan Bergmann 2016-03-03Removed call of genLang makefileJan Iversen 2016-03-03genLang project (awareness)Jan Iversen 2016-03-02loplugin:unuseddefaultparam in l10ntoolsNoel Grandin 2016-02-27Add SAL_WARN + convert some printf into SAL_WARNJulien Nabet 2016-02-17use consistent #define checks for the Windows platformNoel Grandin