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 /include/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 'include/oox')
| -rw-r--r-- | include/oox/dump/dumperbase.hxx | 11 | ||||
| -rw-r--r-- | include/oox/ole/vbaexport.hxx | 1 |
2 files changed, 2 insertions, 10 deletions
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index f1358c6e9cf1..3b86e9b03b78 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -779,8 +779,6 @@ public: void eraseNameList( const OUString& rListName ); NameListRef getNameList( const OUString& rListName ) const; - bool isPasswordCancelled() const { return mbPwCancelled; } - protected: virtual bool implIsValid() const override; virtual void implProcessConfigItemStr( @@ -808,7 +806,6 @@ private: NameListMap maNameLists; OUString maConfigPath; bool mbLoaded; - bool mbPwCancelled; }; @@ -872,8 +869,6 @@ public: template< typename Type > bool hasName( const NameListWrapper& rListWrp, Type nKey ) const; - bool isPasswordCancelled() const; - protected: Config() {} void construct( const Config& rParent ); @@ -1707,7 +1702,6 @@ public: virtual ~DumperBase() override; bool isImportEnabled() const; - bool isImportCancelled() const; protected: DumperBase() {} @@ -1724,9 +1718,8 @@ protected: do { \ DumperClassName aDumper( *this ); \ aDumper.dump(); \ - bool bCancelled = aDumper.isImportCancelled(); \ - if( !aDumper.isImportEnabled() || bCancelled ) \ - return aDumper.isValid() && !bCancelled; \ + if( !aDumper.isImportEnabled() ) \ + return aDumper.isValid(); \ } while( false ) #else // OOX_INCLUDE_DUMPER diff --git a/include/oox/ole/vbaexport.hxx b/include/oox/ole/vbaexport.hxx index fed4b797c7a7..448b6a3ea4f1 100644 --- a/include/oox/ole/vbaexport.hxx +++ b/include/oox/ole/vbaexport.hxx @@ -134,7 +134,6 @@ private: sal_uInt8 mnUnencryptedByte1; // the last unencrypted byte read or written sal_uInt8 mnEncryptedByte1; // the last encrypted byte read or written sal_uInt8 mnEncryptedByte2; // the next-to-last encrypted byte read or written - sal_uInt8 mnVersion; // the encrypted version sal_Unicode mnProjKey; // a project-specific encryption key sal_uInt8 mnIgnoredLength; // the length in bytes of IgnoredEnc |