summaryrefslogtreecommitdiff
path: root/include/oox
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-01-12 11:43:37 +0200
committerNoel Grandin <noel@peralex.com>2016-01-12 11:47:52 +0200
commit8dbfc413b1603c814cecf5306238c6144185671f (patch)
treeb47d0fe0c3499ca23871845a97590e0a7e88115a /include/oox
parente5bb67f08d4e2095affc5229e638535376ee66b4 (diff)
loplugin:unusedmethods unused return value in include/oox
Change-Id: I22acb6b94774c5944d8276827c53a419f0803f83
Diffstat (limited to 'include/oox')
-rw-r--r--include/oox/core/binarycodec.hxx10
-rw-r--r--include/oox/crypto/AgileEngine.hxx8
-rw-r--r--include/oox/crypto/CryptTools.hxx4
-rw-r--r--include/oox/crypto/CryptoEngine.hxx4
-rw-r--r--include/oox/crypto/Standard2007Engine.hxx4
-rw-r--r--include/oox/drawingml/shapepropertymap.hxx4
-rw-r--r--include/oox/export/chartexport.hxx2
-rw-r--r--include/oox/export/vmlexport.hxx2
-rw-r--r--include/oox/ole/axbinarywriter.hxx2
-rw-r--r--include/oox/ole/axcontrol.hxx4
-rw-r--r--include/oox/ole/vbacontrol.hxx2
-rw-r--r--include/oox/ppt/presentationfragmenthandler.hxx2
12 files changed, 21 insertions, 27 deletions
diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx
index 1095e4555182..e9cf43177bfc 100644
--- a/include/oox/core/binarycodec.hxx
+++ b/include/oox/core/binarycodec.hxx
@@ -131,11 +131,8 @@ public:
@param nBytes
Size of the passed data blocks. pnDestData and pnSrcData must be of
this size.
-
- @return
- True = decoding was successful (no error occurred).
*/
- bool decode(
+ void decode(
sal_uInt8* pnDestData,
const sal_uInt8* pnSrcData,
sal_Int32 nBytes );
@@ -284,11 +281,8 @@ public:
@param nBytes
Number of bytes to be skipped (cipher "seeks" forward).
-
- @return
- True = skip was successful (no error occurred).
*/
- bool skip( sal_Int32 nBytes );
+ void skip( sal_Int32 nBytes );
private:
rtlCipher mhCipher;
diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx
index dc9c36d8f1db..cf47947f1e97 100644
--- a/include/oox/crypto/AgileEngine.hxx
+++ b/include/oox/crypto/AgileEngine.hxx
@@ -42,9 +42,9 @@ class AgileEngine : public CryptoEngine
{
AgileEncryptionInfo mInfo;
- bool calculateHashFinal(const OUString& rPassword, std::vector<sal_uInt8>& aHashFinal);
+ void calculateHashFinal(const OUString& rPassword, std::vector<sal_uInt8>& aHashFinal);
- bool calculateBlock(
+ void calculateBlock(
const sal_uInt8* rBlock,
sal_uInt32 aBlockSize,
std::vector<sal_uInt8>& rHashFinal,
@@ -59,7 +59,7 @@ public:
AgileEncryptionInfo& getInfo() { return mInfo;}
- virtual bool writeEncryptionInfo(
+ virtual void writeEncryptionInfo(
const OUString& rPassword,
BinaryXOutputStream& rStream) override;
@@ -69,7 +69,7 @@ public:
BinaryXInputStream& aInputStream,
BinaryXOutputStream& aOutputStream) override;
- virtual bool encrypt(
+ virtual void encrypt(
BinaryXInputStream& aInputStream,
BinaryXOutputStream& aOutputStream) override;
};
diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx
index 898c47db438d..d93fef62e336 100644
--- a/include/oox/crypto/CryptTools.hxx
+++ b/include/oox/crypto/CryptTools.hxx
@@ -144,8 +144,8 @@ public:
Digest(DigestType eType);
virtual ~Digest();
- bool update(std::vector<sal_uInt8>& input);
- bool finalize(std::vector<sal_uInt8>& digest);
+ void update(std::vector<sal_uInt8>& input);
+ void finalize(std::vector<sal_uInt8>& digest);
sal_uInt32 getLength();
diff --git a/include/oox/crypto/CryptoEngine.hxx b/include/oox/crypto/CryptoEngine.hxx
index ea07a3eff3e2..a6ad858fb5db 100644
--- a/include/oox/crypto/CryptoEngine.hxx
+++ b/include/oox/crypto/CryptoEngine.hxx
@@ -31,7 +31,7 @@ public:
virtual ~CryptoEngine()
{}
- virtual bool writeEncryptionInfo(
+ virtual void writeEncryptionInfo(
const OUString& rPassword,
BinaryXOutputStream& rStream) = 0;
@@ -41,7 +41,7 @@ public:
BinaryXInputStream& aInputStream,
BinaryXOutputStream& aOutputStream) = 0;
- virtual bool encrypt(
+ virtual void encrypt(
BinaryXInputStream& aInputStream,
BinaryXOutputStream& aOutputStream) = 0;
};
diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx
index 5e5a6fc36bff..a4d13fb0f2cb 100644
--- a/include/oox/crypto/Standard2007Engine.hxx
+++ b/include/oox/crypto/Standard2007Engine.hxx
@@ -94,7 +94,7 @@ public:
virtual bool generateEncryptionKey(const OUString& rPassword) override;
- virtual bool writeEncryptionInfo(
+ virtual void writeEncryptionInfo(
const OUString& rPassword,
BinaryXOutputStream& rStream) override;
@@ -102,7 +102,7 @@ public:
BinaryXInputStream& aInputStream,
BinaryXOutputStream& aOutputStream) override;
- virtual bool encrypt(
+ virtual void encrypt(
BinaryXInputStream& aInputStream,
BinaryXOutputStream& aOutputStream) override;
diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx
index abe5505d1740..3306a4c171ff 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -134,8 +134,8 @@ private:
bool setFillBitmapNameFromUrl( sal_Int32 nPropId, const css::uno::Any& rValue );
// not implemented, to prevent implicit conversion from enum to int
- css::uno::Any& operator[]( ShapePropertyId ePropId );
- const css::uno::Any& operator[]( ShapePropertyId ePropId ) const;
+ css::uno::Any& operator[]( ShapePropertyId ePropId ) = delete;
+ const css::uno::Any& operator[]( ShapePropertyId ePropId ) const = delete;
private:
ModelObjectHelper& mrModelObjHelper;
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx
index 9f2b8f586e3e..93842e4aafc6 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -210,7 +210,7 @@ public:
sal_Int32 GetChartID( );
css::uno::Reference< css::frame::XModel > getModel(){ return mxChartModel; }
- ChartExport& WriteChartObj( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nChartCount );
+ void WriteChartObj( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nChartCount );
void ExportContent();
void InitRangeSegmentationProperties(
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 2a57963ba248..7b4cb27cc587 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -92,7 +92,7 @@ public:
/// Export the sdr object as VML.
///
/// Call this when you need to export the object as VML.
- sal_uInt32 AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri = -1,
+ void AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri = -1,
sal_Int16 eVOri = -1, sal_Int16 eHRel = -1,
sal_Int16 eVRel = -1, const Point* pNdTopLeft = nullptr, const bool bOOxmlExport = false );
virtual void AddSdrObjectVMLObject( const SdrObject& rObj) override;
diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx
index a0a34ff09368..02fa348c513e 100644
--- a/include/oox/ole/axbinarywriter.hxx
+++ b/include/oox/ole/axbinarywriter.hxx
@@ -97,7 +97,7 @@ public:
void skipProperty() { startNextProperty( true ); }
/** Final processing, write contents of all complex properties, writes record size */
- bool finalizeExport();
+ void finalizeExport();
private:
bool ensureValid( bool bCondition = true );
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index befbf22bfdc2..a9c8eee451be 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -883,7 +883,7 @@ public:
explicit AxMultiPageModel();
virtual ApiControlType getControlType() const override;
- bool importPageAndMultiPageProperties( BinaryInputStream& rInStrm, sal_Int32 nPages );
+ void importPageAndMultiPageProperties( BinaryInputStream& rInStrm, sal_Int32 nPages );
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override;
std::vector<sal_uInt32> mnIDs;
sal_uInt32 mnActiveTab;
@@ -956,7 +956,7 @@ public:
const css::uno::Reference< css::awt::XControlModel >& rxCtrlModel,
const ControlConverter& rConv ) const;
- bool convertFromProperties(
+ void convertFromProperties(
const css::uno::Reference< css::awt::XControlModel >& rxCtrlModel,
const ControlConverter& rConv );
diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx
index a17513c9f383..7d4a4bbe1d93 100644
--- a/include/oox/ole/vbacontrol.hxx
+++ b/include/oox/ole/vbacontrol.hxx
@@ -149,7 +149,7 @@ private:
bool importSiteModel( BinaryInputStream& rInStrm );
/** Imports the site models of all embedded controls from the 'f' stream. */
- bool importEmbeddedSiteModels( BinaryInputStream& rInStrm );
+ void importEmbeddedSiteModels( BinaryInputStream& rInStrm );
/* Final processing of all embedded controls after import. */
void finalizeEmbeddedControls();
diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx
index f745f2eab4d2..912c181494ad 100644
--- a/include/oox/ppt/presentationfragmenthandler.hxx
+++ b/include/oox/ppt/presentationfragmenthandler.hxx
@@ -43,7 +43,7 @@ public:
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
protected:
- bool importSlide( const ::oox::core::FragmentHandlerRef& rSlideFragmentHandler,
+ void importSlide( const ::oox::core::FragmentHandlerRef& rSlideFragmentHandler,
const oox::ppt::SlidePersistPtr& rPersist );
private: