diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/numitem.hxx | 12 | ||||
| -rw-r--r-- | include/filter/msfilter/mscodec.hxx | 14 | ||||
| -rw-r--r-- | include/filter/msfilter/svdfppt.hxx | 6 | ||||
| -rw-r--r-- | include/tools/globname.hxx | 4 |
4 files changed, 15 insertions, 21 deletions
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index 7757948a54aa..777f877f0ce5 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -312,11 +312,11 @@ public: class SvxNodeNum { - sal_uInt16 nLevelVal[ SVX_MAX_NUM ]; // Numbers of all levels - sal_uInt8 nMyLevel; // Current Level + sal_uInt16 nLevelVal[ SVX_MAX_NUM ] = {}; // Numbers of all levels + sal_uInt8 nMyLevel = 0; // Current Level public: - explicit inline SvxNodeNum(); + explicit inline SvxNodeNum() = default; inline SvxNodeNum& operator=( const SvxNodeNum& rCpy ); sal_uInt8 GetLevel() const { return nMyLevel; } @@ -326,12 +326,6 @@ public: sal_uInt16* GetLevelVal() { return nLevelVal; } }; -SvxNodeNum::SvxNodeNum() - : nMyLevel( 0 ) -{ - memset( nLevelVal, 0, sizeof( nLevelVal ) ); -} - inline SvxNodeNum& SvxNodeNum::operator=( const SvxNodeNum& rCpy ) { if ( &rCpy != this) diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx index bc0240ae20eb..a56694e9e1bd 100644 --- a/include/filter/msfilter/mscodec.hxx +++ b/include/filter/msfilter/mscodec.hxx @@ -121,7 +121,7 @@ public: void Skip( std::size_t nBytes ); protected: - sal_uInt8 mpnKey[ 16 ]; /// Encryption key. + sal_uInt8 mpnKey[ 16 ] = {}; /// Encryption key. std::size_t mnOffset; /// Key offset. private: @@ -463,10 +463,10 @@ struct MSFILTER_DLLPUBLIC EncryptionStandardHeader struct MSFILTER_DLLPUBLIC EncryptionVerifierAES { sal_uInt32 saltSize; // must be 0x00000010 - sal_uInt8 salt[SALT_LENGTH]; // random generated salt value - sal_uInt8 encryptedVerifier[ENCRYPTED_VERIFIER_LENGTH]; // randomly generated verifier value + sal_uInt8 salt[SALT_LENGTH] = {}; // random generated salt value + sal_uInt8 encryptedVerifier[ENCRYPTED_VERIFIER_LENGTH] = {}; // randomly generated verifier value sal_uInt32 encryptedVerifierHashSize; // actually written hash size - depends on algorithm - sal_uInt8 encryptedVerifierHash[SHA256_HASH_LENGTH]; // verifier value hash - itself also encrypted + sal_uInt8 encryptedVerifierHash[SHA256_HASH_LENGTH] = {}; // verifier value hash - itself also encrypted EncryptionVerifierAES(); }; @@ -474,10 +474,10 @@ struct MSFILTER_DLLPUBLIC EncryptionVerifierAES struct MSFILTER_DLLPUBLIC EncryptionVerifierRC4 { sal_uInt32 saltSize; // must be 0x00000010 - sal_uInt8 salt[SALT_LENGTH]; // random generated salt value - sal_uInt8 encryptedVerifier[ENCRYPTED_VERIFIER_LENGTH]; // randomly generated verifier value + sal_uInt8 salt[SALT_LENGTH] = {}; // random generated salt value + sal_uInt8 encryptedVerifier[ENCRYPTED_VERIFIER_LENGTH] = {}; // randomly generated verifier value sal_uInt32 encryptedVerifierHashSize; // actually written hash size - depends on algorithm - sal_uInt8 encryptedVerifierHash[SHA1_HASH_LENGTH]; // verifier value hash - itself also encrypted + sal_uInt8 encryptedVerifierHash[SHA1_HASH_LENGTH] = {}; // verifier value hash - itself also encrypted EncryptionVerifierRC4(); }; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 070aecae01ce..2720a0612c21 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -257,7 +257,7 @@ public: struct PptColorSchemeAtom { - sal_uInt8 aData[32]; + sal_uInt8 aData[32] = {}; public: PptColorSchemeAtom(); @@ -979,8 +979,8 @@ struct PPTRuler : public salhelper::SimpleReferenceObject { sal_Int32 nFlags; sal_uInt16 nDefaultTab; - sal_uInt16 nTextOfs[nMaxPPTLevels]; - sal_uInt16 nBulletOfs[nMaxPPTLevels]; + sal_uInt16 nTextOfs[nMaxPPTLevels] = {}; + sal_uInt16 nBulletOfs[nMaxPPTLevels] = {}; std::unique_ptr<PPTTabEntry[]> pTab; sal_uInt16 nTabCount; diff --git a/include/tools/globname.hxx b/include/tools/globname.hxx index 9672f444ccad..88a5e492d923 100644 --- a/include/tools/globname.hxx +++ b/include/tools/globname.hxx @@ -33,7 +33,7 @@ struct SAL_WARN_UNUSED SvGUID struct SAL_WARN_UNUSED ImpSvGlobalName { - struct SvGUID szData; + struct SvGUID szData = {}; ImpSvGlobalName(const SvGUID &rData) : szData(rData) @@ -43,7 +43,7 @@ struct SAL_WARN_UNUSED ImpSvGlobalName sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11, sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15); ImpSvGlobalName( const ImpSvGlobalName & rObj ); - ImpSvGlobalName(); + ImpSvGlobalName() = default; bool operator == ( const ImpSvGlobalName & rObj ) const; }; |