diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-29 12:43:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-30 06:57:26 +0000 |
| commit | 4d87443bf59c3242d58b56cc1583d73213ae1f2f (patch) | |
| tree | c1f74fc569506299100b5063f14c09e46035a943 /include/oox | |
| parent | 8e812b87ff7f8c5bf2c6f8858646c55effd2eea3 (diff) | |
loplugin:constantparam
Change-Id: Idbe8c8e6b3d44cacce296ec8c79b2b244281057c
Reviewed-on: https://gerrit.libreoffice.org/29321
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/drawingml/shape.hxx | 3 | ||||
| -rw-r--r-- | include/oox/helper/binaryinputstream.hxx | 7 | ||||
| -rw-r--r-- | include/oox/ole/axcontrol.hxx | 3 | ||||
| -rw-r--r-- | include/oox/ole/vbaexport.hxx | 1 | ||||
| -rw-r--r-- | include/oox/ole/vbaproject.hxx | 3 | ||||
| -rw-r--r-- | include/oox/ppt/pptshape.hxx | 1 |
6 files changed, 5 insertions, 13 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 1367e2e22d1d..4748dd10ae2d 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -184,8 +184,7 @@ public: const Theme* pTheme, const css::uno::Reference< css::drawing::XShapes >& rxShapes, basegfx::B2DHomMatrix& aTransformation, - const css::awt::Rectangle* pShapeRect = nullptr, - ShapeIdMap* pShapeMap = nullptr ); + const css::awt::Rectangle* pShapeRect = nullptr ); void setXShape( const css::uno::Reference< css::drawing::XShape >& rXShape ) { mxShape = rXShape; }; diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index 1e86437daf67..2e952d3ba9e5 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -181,6 +181,7 @@ public: /** Reads a Unicode character array (may be compressed) and returns the string. + NUL characters are replaced by question marks (default). @param nChars Number of 8-bit or 16-bit characters to read from the stream. @@ -188,12 +189,8 @@ public: @param bCompressed True = Character array is compressed (stored as 8-bit characters). False = Character array is not compressed (stored as 16-bit characters). - - @param bAllowNulChars - True = NUL characters are inserted into the imported string. - False = NUL characters are replaced by question marks (default). */ - OUString readCompressedUnicodeArray( sal_Int32 nChars, bool bCompressed, bool bAllowNulChars = false ); + OUString readCompressedUnicodeArray( sal_Int32 nChars, bool bCompressed ); /** Copies bytes from the current position to the passed output stream. */ diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 66ab0d0d0f4d..472c649b839f 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -970,8 +970,7 @@ public: explicit EmbeddedForm( const css::uno::Reference< css::frame::XModel >& rxDocModel, const css::uno::Reference< css::drawing::XDrawPage >& rxDrawPage, - const GraphicHelper& rGraphicHelper, - bool bDefaultColorBgr = true ); + const GraphicHelper& rGraphicHelper ); /** Converts the passed control and inserts the control model into the form. @return The API control model, if conversion was successful. */ diff --git a/include/oox/ole/vbaexport.hxx b/include/oox/ole/vbaexport.hxx index 448b6a3ea4f1..8d96c0e7a277 100644 --- a/include/oox/ole/vbaexport.hxx +++ b/include/oox/ole/vbaexport.hxx @@ -120,7 +120,6 @@ public: VBAEncryption(const sal_uInt8* pData, const sal_uInt16 nLength, SvStream& rEncryptedData, - sal_uInt8* pSeed, sal_uInt8 nProjKey); void write(); diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index b7bbd4e1e9be..22e1a12f8587 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -175,8 +175,7 @@ private: /** Imports the VBA code modules and forms. */ void importVba( StorageBase& rVbaPrjStrg, - const GraphicHelper& rGraphicHelper, - bool bDefaultColorBgr ); + const GraphicHelper& rGraphicHelper ); /** Attaches VBA macros to objects registered via registerMacroAttacher(). */ void attachMacros(); diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx index 5f147929bdde..5256a6679464 100644 --- a/include/oox/ppt/pptshape.hxx +++ b/include/oox/ppt/pptshape.hxx @@ -65,7 +65,6 @@ public: const oox::drawingml::Theme* pTheme, const css::uno::Reference< css::drawing::XShapes >& rxShapes, basegfx::B2DHomMatrix& aTransformation, - const css::awt::Rectangle* pShapeRect = nullptr, ::oox::drawingml::ShapeIdMap* pShapeMap = nullptr ); virtual void applyShapeReference( const oox::drawingml::Shape& rReferencedShape, bool bUseText = true ) override; |