diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-15 14:36:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-16 06:19:38 +0000 |
| commit | 96e9ffa64706f523d67659a20a0ccce6fbd0cb91 (patch) | |
| tree | 81b9eaa904d20da4b6d3997a4cb69b29416c12c9 /oox | |
| parent | 7fc7fad400c619e518448ee521b2aba099dccf9b (diff) | |
loplogin:singlevalfields in include/
Change-Id: I27842162fcf82120ecb811ee8e89e187430931fc
Reviewed-on: https://gerrit.libreoffice.org/28931
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/dump/dumperbase.cxx | 13 | ||||
| -rw-r--r-- | oox/source/ole/vbaexport.cxx | 2 |
2 files changed, 2 insertions, 13 deletions
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 42c718adbb70..8f8474c10e84 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -1260,8 +1260,7 @@ SharedConfigData::SharedConfigData( const OUString& rFileName, mxContext( rxContext ), mxRootStrg( rxRootStrg ), maSysFileName( rSysFileName ), - mbLoaded( false ), - mbPwCancelled( false ) + mbLoaded( false ) { OUString aFileUrl = InputOutputHelper::convertFileNameToUrl( rFileName ); if( !aFileUrl.isEmpty() ) @@ -1463,11 +1462,6 @@ NameListRef Config::getNameList( const String& rListName ) const return implGetNameList( rListName ); } -bool Config::isPasswordCancelled() const -{ - return mxCfgData->isPasswordCancelled(); -} - bool Config::implIsValid() const { return isValid( mxCfgData ); @@ -2578,11 +2572,6 @@ bool DumperBase::isImportEnabled() const return !isValid() || cfg().isImportEnabled(); } -bool DumperBase::isImportCancelled() const -{ - return isValid() && cfg().isPasswordCancelled(); -} - void DumperBase::construct( const ConfigRef& rxConfig ) { if( isValid( rxConfig ) && rxConfig->isDumperEnabled() ) diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx index 0215a6772a8f..7272757754a8 100644 --- a/oox/source/ole/vbaexport.cxx +++ b/oox/source/ole/vbaexport.cxx @@ -402,7 +402,6 @@ VBAEncryption::VBAEncryption(const sal_uInt8* pData, const sal_uInt16 length, Sv ,mnUnencryptedByte1(0) ,mnEncryptedByte1(0) ,mnEncryptedByte2(0) - ,mnVersion(2) ,mnProjKey(nProjKey) ,mnIgnoredLength(0) ,mnSeed(pSeed ? *pSeed : 0x00) @@ -424,6 +423,7 @@ void VBAEncryption::writeSeed() void VBAEncryption::writeVersionEnc() { + static const sal_uInt8 mnVersion = 2; // the encrypted version mnVersionEnc = mnSeed ^ mnVersion; exportString(mrEncryptedData, createHexStringFromDigit(mnVersionEnc)); } |