From ca254244a22cdbb7d04dc15171624ea979ddfae1 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 27 Feb 2018 16:55:05 +0100 Subject: unotools: remove UseSHA1InODF12/UseBlowfishInODF12 from SvtSaveOptions These config items and all client code were removed on the libreoffice-6-0 branch in commit 47c97efb78a574ba080e953ed219515ea71c2569 but some remnants remained in SvtSaveOptions (which had been converted to direct config access on master after libreoffice-6-0 branched). Office.Common.Save.ODF.UseSHA1InODF12 Office.Common.Save.ODF.UseBlowfishInODF12 Remove them from SvtSaveOptions too because it prints annoying warnings on every startup that the config items can't be found. Change-Id: Ia3c6dd332d556fa98236698302cf9379c9a96feb Reviewed-on: https://gerrit.libreoffice.org/50453 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- unotools/source/config/saveopt.cxx | 54 ++------------------------------------ 1 file changed, 2 insertions(+), 52 deletions(-) (limited to 'unotools') diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index cdb66c6fabe4..9b634173fcb3 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -68,9 +68,7 @@ class SvtSaveOptions_Impl : public utl::ConfigItem bSaveUnpacked, bDoPrettyPrinting, bWarnAlienFormat, - bLoadDocPrinter, - bUseSHA1InODF12, - bUseBlowfishInODF12; + bLoadDocPrinter; SvtSaveOptions::ODFDefaultVersion eODFDefaultVersion; @@ -89,9 +87,7 @@ class SvtSaveOptions_Impl : public utl::ConfigItem bROWarnAlienFormat, bRODoPrettyPrinting, bROLoadDocPrinter, - bROODFDefaultVersion, - bROUseSHA1InODF12, - bROUseBlowfishInODF12; + bROODFDefaultVersion; virtual void ImplCommit() override; @@ -115,8 +111,6 @@ public: bool IsPrettyPrintingEnabled( ) const { return bDoPrettyPrinting; } bool IsWarnAlienFormat() const { return bWarnAlienFormat; } bool IsLoadDocPrinter() const { return bLoadDocPrinter; } - bool IsUseSHA1InODF12() const { return bUseSHA1InODF12; } - bool IsUseBlowfishInODF12() const { return bUseBlowfishInODF12; } SvtSaveOptions::ODFDefaultVersion GetODFDefaultVersion() const { return eODFDefaultVersion; } @@ -348,8 +342,6 @@ bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) const #define INTERNET 13 #define SAVEWORKINGSET 14 #define ODFDEFAULTVERSION 15 -#define USESHA1INODF12 16 -#define USEBLOWFISHINODF12 17 Sequence< OUString > GetPropertyNames() { @@ -371,8 +363,6 @@ Sequence< OUString > GetPropertyNames() "URL/Internet", "WorkingSet", "ODF/DefaultVersion", - "ODF/UseSHA1InODF12", - "ODF/UseBlowfishInODF12" }; const int nCount = SAL_N_ELEMENTS( aPropNames ); @@ -401,8 +391,6 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() , bDoPrettyPrinting( false ) , bWarnAlienFormat( true ) , bLoadDocPrinter( true ) - , bUseSHA1InODF12( false ) - , bUseBlowfishInODF12( false ) , eODFDefaultVersion( SvtSaveOptions::ODFVER_LATEST ) , bROAutoSaveTime( CFG_READONLY_DEFAULT ) , bROUseUserData( CFG_READONLY_DEFAULT ) @@ -420,8 +408,6 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() , bRODoPrettyPrinting( CFG_READONLY_DEFAULT ) , bROLoadDocPrinter( CFG_READONLY_DEFAULT ) , bROODFDefaultVersion( CFG_READONLY_DEFAULT ) - , bROUseSHA1InODF12( CFG_READONLY_DEFAULT ) - , bROUseBlowfishInODF12( CFG_READONLY_DEFAULT ) { Sequence< OUString > aNames = GetPropertyNames(); Sequence< Any > aValues = GetProperties( aNames ); @@ -533,16 +519,6 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() bROLoadDocPrinter = pROStates[nProp]; break; - case USESHA1INODF12: - bUseSHA1InODF12 = bTemp; - bROUseSHA1InODF12 = pROStates[nProp]; - break; - - case USEBLOWFISHINODF12: - bUseBlowfishInODF12 = bTemp; - bROUseBlowfishInODF12 = pROStates[nProp]; - break; - default : SAL_WARN( "unotools.config", "invalid index to load a path" ); } @@ -710,22 +686,6 @@ void SvtSaveOptions_Impl::ImplCommit() ++nRealCount; } break; - case USESHA1INODF12: - if (!bROUseSHA1InODF12) - { - pValues[nRealCount] <<= bUseSHA1InODF12; - pNames[nRealCount] = pOrgNames[i]; - ++nRealCount; - } - break; - case USEBLOWFISHINODF12: - if (!bROUseBlowfishInODF12) - { - pValues[nRealCount] <<= bUseBlowfishInODF12; - pNames[nRealCount] = pOrgNames[i]; - ++nRealCount; - } - break; default: SAL_WARN( "unotools.config", "invalid index to save a path" ); @@ -1016,16 +976,6 @@ SvtSaveOptions::ODFSaneDefaultVersion SvtSaveOptions::GetODFSaneDefaultVersion() return ODFSVER_LATEST_EXTENDED; } -bool SvtSaveOptions::IsUseSHA1InODF12() const -{ - return pImp->pSaveOpt->IsUseSHA1InODF12(); -} - -bool SvtSaveOptions::IsUseBlowfishInODF12() const -{ - return pImp->pSaveOpt->IsUseBlowfishInODF12(); -} - bool SvtSaveOptions::IsReadOnly( SvtSaveOptions::EOption eOption ) const { return pImp->pSaveOpt->IsReadOnly(eOption); -- cgit