diff options
| -rw-r--r-- | include/oox/crypto/CryptTools.hxx | 3 | ||||
| -rw-r--r-- | include/oox/dump/dumperbase.hxx | 40 | ||||
| -rw-r--r-- | include/oox/ole/axbinarywriter.hxx | 8 | ||||
| -rw-r--r-- | include/oox/ole/olehelper.hxx | 1 | ||||
| -rw-r--r-- | include/oox/vml/vmlshape.hxx | 1 | ||||
| -rw-r--r-- | include/opencl/openclwrapper.hxx | 1 | ||||
| -rw-r--r-- | oox/source/crypto/CryptTools.cxx | 9 |
7 files changed, 5 insertions, 58 deletions
diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx index eaf531f4d439..898c47db438d 100644 --- a/include/oox/crypto/CryptTools.hxx +++ b/include/oox/crypto/CryptTools.hxx @@ -53,7 +53,6 @@ public: }; protected: - CryptoType mType; #if USE_TLS_OPENSSL EVP_CIPHER_CTX mContext; #endif @@ -75,7 +74,7 @@ protected: #endif protected: - Crypto(CryptoType type); + Crypto(); public: virtual ~Crypto(); diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 3fe5512c81cb..0f274356b834 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -251,46 +251,6 @@ struct ItemFormat -struct Address -{ - sal_Int32 mnCol; - sal_Int32 mnRow; - Address() : mnCol( 0 ), mnRow( 0 ) {} - explicit Address( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {} -}; - - - -struct Range -{ - Address maFirst; - Address maLast; - Range() {} -}; - - - -typedef ::std::vector< Range > RangeList; - - - -struct TokenAddress : public Address -{ - bool mbRelCol; - bool mbRelRow; - TokenAddress() : mbRelCol( false ), mbRelRow( false ) {} -}; - - - -struct TokenRange -{ - TokenAddress maFirst; - TokenAddress maLast; - TokenRange() {} -}; - - /** Static helper functions for formatted output to strings. */ diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx index ae3cdc124a45..d3c22c2f90f3 100644 --- a/include/oox/ole/axbinarywriter.hxx +++ b/include/oox/ole/axbinarywriter.hxx @@ -135,10 +135,6 @@ private: /** Stream property for a picture or mouse icon. */ struct PictureProperty : public ComplexProperty { - StreamDataSequence& mrPicData; - - explicit PictureProperty( StreamDataSequence& rPicData ) : - mrPicData( rPicData ) {} virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ) override; }; @@ -149,10 +145,6 @@ private: ComplexPropVector maLargeProps; ///< Stores info for all used large properties. ComplexPropVector maStreamProps; ///< Stores info for all used stream data properties. AxPairData maDummyPairData; ///< Dummy pair for unsupported properties. - StreamDataSequence maDummyPicData; ///< Dummy picture for unsupported properties. - OUString maDummyString; ///< Dummy string for unsupported properties. - ::std::vector< OUString > - maDummyStringArray; ///< Dummy string array for unsupported properties. sal_Int16 mnBlockSize; sal_Int64 mnPropFlagsStart; ///< pos of Prop flags sal_Int64 mnPropFlags; ///< Flags specifying existing properties. diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx index 974e6ce6f7cb..12ae732ebf6c 100644 --- a/include/oox/ole/olehelper.hxx +++ b/include/oox/ole/olehelper.hxx @@ -96,7 +96,6 @@ struct StdHlinkInfo OUString maTarget; OUString maLocation; OUString maDisplay; - OUString maFrame; }; diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index 5c955dc171be..927f8c1ab9ad 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -206,7 +206,6 @@ struct ShapeModel OUString maControl1; ///< Bezier control point 1 OUString maControl2; ///< Bezier control point 2 OUString maVmlPath; ///< VML path for this shape - OUString maEditAs; ///< VML EditAs for shape explicit ShapeModel(); ~ShapeModel(); diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx index 1541739e7c95..24d8714ec7ce 100644 --- a/include/opencl/openclwrapper.hxx +++ b/include/opencl/openclwrapper.hxx @@ -41,7 +41,6 @@ struct GPUEnv { //share vb in all modules in hb library cl_platform_id mpPlatformID; - cl_device_type mDevType; cl_context mpContext; cl_device_id mpDevID; cl_command_queue mpCmdQueue[OPENCL_CMDQUEUE_SIZE]; diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx index 6b58d715c83e..f21b0e1b7713 100644 --- a/oox/source/crypto/CryptTools.cxx +++ b/oox/source/crypto/CryptTools.cxx @@ -16,10 +16,9 @@ namespace core { using namespace std; -Crypto::Crypto(CryptoType type) - : mType(type) +Crypto::Crypto() #if USE_TLS_NSS - , mContext(nullptr) + : mContext(nullptr) , mSecParam(nullptr) , mSymKey(nullptr) #endif @@ -111,7 +110,7 @@ void Crypto::setupContext(vector<sal_uInt8>& key, vector<sal_uInt8>& iv, CryptoT // DECRYPT Decrypt::Decrypt(vector<sal_uInt8>& key, vector<sal_uInt8>& iv, CryptoType type) : - Crypto(type) + Crypto() { #if USE_TLS_OPENSSL EVP_CIPHER_CTX_init( &mContext ); @@ -159,7 +158,7 @@ sal_uInt32 Decrypt::aes128ecb(vector<sal_uInt8>& output, vector<sal_uInt8>& inpu // ENCRYPT Encrypt::Encrypt(vector<sal_uInt8>& key, vector<sal_uInt8>& iv, CryptoType type) : - Crypto(type) + Crypto() { #if USE_TLS_OPENSSL EVP_CIPHER_CTX_init( &mContext ); |