diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-04 13:37:06 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-07 06:39:05 +0000 |
commit | 27513d4df50f6d18b585f4cbec6a4dd3f9b432cc (patch) | |
tree | 92b1d636fae62968195b253bc02f936968734c9a /sc/source/filter/inc | |
parent | loplugin:oncevar in framework (diff) | |
download | core-27513d4df50f6d18b585f4cbec6a4dd3f9b432cc.tar.gz core-27513d4df50f6d18b585f4cbec6a4dd3f9b432cc.zip |
loplugin:expandablemethods in sc
Change-Id: Ib417c5e978fca563f8c0ef0dbe6b9d50fead9828
Reviewed-on: https://gerrit.libreoffice.org/30566
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/filter/inc')
-rw-r--r-- | sc/source/filter/inc/XclImpChangeTrack.hxx | 12 | ||||
-rw-r--r-- | sc/source/filter/inc/excimp8.hxx | 4 | ||||
-rw-r--r-- | sc/source/filter/inc/htmlimp.hxx | 1 | ||||
-rw-r--r-- | sc/source/filter/inc/sheetdatabuffer.hxx | 4 | ||||
-rw-r--r-- | sc/source/filter/inc/viewsettings.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/xepivot.hxx | 3 | ||||
-rw-r--r-- | sc/source/filter/inc/xestyle.hxx | 11 | ||||
-rw-r--r-- | sc/source/filter/inc/xichart.hxx | 10 | ||||
-rw-r--r-- | sc/source/filter/inc/xihelper.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/xipivot.hxx | 4 | ||||
-rw-r--r-- | sc/source/filter/inc/xistream.hxx | 6 | ||||
-rw-r--r-- | sc/source/filter/inc/xistring.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/xistyle.hxx | 2 |
13 files changed, 1 insertions, 62 deletions
diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index ac296e37711c..f38e53ecc5c3 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -72,8 +72,6 @@ private: void DoDeleteRange( const ScRange& rRange ); inline sal_uInt8 LookAtuInt8(); - inline double ReadRK(); - inline bool ReadBool(); inline void Read2DAddress( ScAddress& rAddress ); inline void Read2DRange( ScRange& rRange ); SCTAB ReadTabNum(); @@ -118,16 +116,6 @@ inline sal_uInt8 XclImpChangeTrack::LookAtuInt8() return nValue; } -inline double XclImpChangeTrack::ReadRK() -{ - return XclTools::GetDoubleFromRK( pStrm->ReadInt32() ); -} - -inline bool XclImpChangeTrack::ReadBool() -{ - return (pStrm->ReaduInt16() != 0); -} - inline void XclImpChangeTrack::Read2DAddress( ScAddress& rAddress ) { rAddress.SetRow( static_cast<SCROW>(pStrm->ReaduInt16()) ); diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index be0c7d8b591c..4677de7ed595 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -60,9 +60,6 @@ public: virtual void PostDocLoad() override; private: - void LoadDocumentProperties(); - -private: // represents codename ( and associated modules ) // not speficied directly in the binary format std::vector<OUString> maAutoGeneratedCodeNames; @@ -105,7 +102,6 @@ public: void SetExtractPos( const ScAddress& rAddr ); inline void SetAutoOrAdvanced() { bAutoOrAdvanced = true; } void Apply(); - void CreateScDBData(); void EnableRemoveFilter(); }; diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx index e67c0b2ccfe3..ff36053ad80d 100644 --- a/sc/source/filter/inc/htmlimp.hxx +++ b/sc/source/filter/inc/htmlimp.hxx @@ -31,7 +31,6 @@ private: public: ScHTMLImport( ScDocument* pDoc, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ); virtual ~ScHTMLImport() override; - const ScHTMLParser* GetParser() const { return static_cast<ScHTMLParser*>(mpParser); } virtual void WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0, SvNumberFormatter* pFormatter = nullptr, bool bConvertDate = true ) override; diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index 9d5c54e8cb9d..9da32e68a304 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -140,10 +140,6 @@ public: void setRowFormat( sal_Int32 nRow, sal_Int32 nXfId, bool bCustomFormat ); /** Merges the cells in the passed cell range. */ void setMergedRange( const css::table::CellRangeAddress& rRange ); - /** Sets a standard number format (constant from com.sun.star.util.NumberFormat) to the specified cell. */ - void setStandardNumFmt( - const ScAddress& rCellAddr, - sal_Int16 nStdNumFmt ); /** Processes the cell formatting data of the passed cell. */ void setCellFormat( const CellModel& rModel ); diff --git a/sc/source/filter/inc/viewsettings.hxx b/sc/source/filter/inc/viewsettings.hxx index 7cbbf1a0d03c..951e0e2e3ecd 100644 --- a/sc/source/filter/inc/viewsettings.hxx +++ b/sc/source/filter/inc/viewsettings.hxx @@ -79,8 +79,6 @@ struct SheetViewModel /** Returns the grid color as RGB value. */ sal_Int32 getGridColor( const ::oox::core::FilterBase& rFilter ) const; - /** Returns the selection data, if available, otherwise 0. */ - const PaneSelectionModel* getPaneSelection( sal_Int32 nPaneId ) const; /** Returns the selection data of the active pane. */ const PaneSelectionModel* getActiveSelection() const; /** Returns read/write access to the selection data of the specified pane. */ diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index c8c1fbbf02dc..8d9cd54770c1 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -186,9 +186,6 @@ public: static void SaveXml( XclExpXmlStream& rStrm ); private: - /** Returns read/write access to a pivot cache field. */ - XclExpPCField* GetFieldAcc( sal_uInt16 nFieldIdx ); - /** Adds all pivot cache fields. */ void AddFields( const ScDPObject& rDPObj ); diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index 364f37242cef..544b1280a03a 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -101,13 +101,9 @@ public: sal_uInt16& rnXclForeIx, sal_uInt16& rnXclBackIx, sal_uInt8& rnXclPattern, sal_uInt32 nForeColorId, sal_uInt32 nBackColorId ) const; - /** Returns the RGB color data for a (non-zero-based) Excel palette entry. - @return The color from current or default palette or COL_AUTO, if nothing else found. */ - ColorData GetColorData( sal_uInt16 nXclIndex ) const; /** Returns the color for a (non-zero-based) Excel palette entry. @return The color from current or default palette or COL_AUTO, if nothing else found. */ - inline Color GetColor( sal_uInt16 nXclIndex ) const - { return Color( GetColorData( nXclIndex ) ); } + Color GetColor( sal_uInt16 nXclIndex ) const; /** Saves the PALETTE record, if it differs from the default palette. */ virtual void Save( XclExpStream& rStrm ) override; @@ -228,11 +224,6 @@ public: @return The resulting Excel font index. */ sal_uInt16 Insert( const XclFontData& rFontData, XclExpColorType eColorType, bool bAppFont = false ); - /** Inserts the font into the buffer if not present. - @param bAppFont true = Sets the application font; false = Inserts a new font. - @return The resulting Excel font index. */ - sal_uInt16 Insert( const vcl::Font& rFont, - XclExpColorType eColorType, bool bAppFont ); /** Inserts the SvxFont into the buffer if not present, e.g. where escapements are used. @return The resulting Excel font index. */ sal_uInt16 Insert( const SvxFont& rFont, diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index d97c722d387a..3a5272da7e6f 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -1021,8 +1021,6 @@ private: /** Reads a CHDATAFORMAT record group (default series format). */ void ReadChDataFormat( XclImpStream& rStrm ); - /** Returns true, if the chart type group contains a hi-lo line format. */ - inline bool HasHiLoLine() const { return m_ChartLines.find(EXC_CHCHARTLINE_HILO) != m_ChartLines.end(); } /** Returns true, if the chart type group contains drop bar formats. */ inline bool HasDropBars() const { return !m_DropBars.empty(); } @@ -1149,14 +1147,6 @@ public: inline sal_uInt16 GetAxisType() const { return maData.mnType; } /** Returns the axis dimension index used by the chart API. */ inline sal_Int32 GetApiAxisDimension() const { return maData.GetApiAxisDimension(); } - /** Returns true, if the axis is active. */ - inline bool IsActivated() const { return !mxAxisLine || mxAxisLine->IsShowAxis(); } - /** Returns true, if the axis contains caption labels. */ - inline bool HasLabels() const { return !mxTick || mxTick->HasLabels(); } - /** Returns true, if the axis shows its major grid lines. */ - inline bool HasMajorGrid() const { return static_cast< bool >(mxMajorGrid); } - /** Returns true, if the axis shows its minor grid lines. */ - inline bool HasMinorGrid() const { return static_cast< bool >(mxMinorGrid); } /** Creates an API axis object. */ css::uno::Reference< css::chart2::XAxis > diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index 6677eeb4b718..a523231f1c76 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -209,8 +209,6 @@ private: /** Returns the maximum line height of the specified portion. */ sal_uInt16 GetMaxLineHeight( XclImpHFPortion ePortion ) const; - /** Returns the current maximum line height. */ - sal_uInt16 GetCurrMaxLineHeight() const; /** Updates the maximum line height of the specified portion, using the current font size. */ void UpdateMaxLineHeight( XclImpHFPortion ePortion ); diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index bfdb553b2f25..8bf43053b343 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -153,8 +153,6 @@ public: const OUString& GetSourceRangeName() const { return maSrcRangeName; } - /** Returns the number of pivot cache fields. */ - sal_uInt16 GetFieldCount() const; /** Returns read-only access to a pivot cache field. */ const XclImpPCField* GetField( sal_uInt16 nFieldIdx ) const; @@ -174,7 +172,6 @@ public: /** Reads the entire pivot cache stream. Uses decrypter from passed stream. */ void ReadPivotCacheStream( XclImpStream& rStrm ); - bool HasCacheRecords() const; bool IsRefreshOnLoad() const; bool IsValid() const; @@ -277,7 +274,6 @@ private: void ConvertDataField( ScDPSaveDimension& rSaveDim, const XclPTDataFieldInfo& rDataInfo ) const; void ConvertDataFieldInfo( ScDPSaveDimension& rSaveDim, const XclPTDataFieldInfo& rDataInfo ) const; - void ConvertItems( ScDPSaveDimension& rSaveDim ) const; private: typedef ::std::list< XclPTDataFieldInfo > XclPTDataFieldInfoList; diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 3a53643ef1cf..8c5567591b1e 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -323,8 +323,6 @@ public: void SetDecrypter( XclImpDecrypterRef const & xDecrypter ); /** Sets decrypter from another stream. */ void CopyDecrypterFrom( const XclImpStream& rStrm ); - /** Returns true, if a valid decrypter is set at the stream. */ - bool HasValidDecrypter() const; /** Switches usage of current decryption algorithm on/off. @descr Encryption is re-enabled automatically, if a new record is started using the function StartNextRecord(). */ @@ -510,10 +508,6 @@ private: @return Count of bytes really read. */ sal_uInt16 ReadRawData( void* pData, sal_uInt16 nBytes ); - /** Reads 8 bit/16 bit string length. */ - inline sal_uInt16 ReadByteStrLen( bool b16BitLen ) - { return b16BitLen ? ReaduInt16() : ReaduInt8(); } - private: typedef ::std::vector< XclImpStreamPos > XclImpStreamPosStack; diff --git a/sc/source/filter/inc/xistring.hxx b/sc/source/filter/inc/xistring.hxx index 9105dbbbe237..0cf90c0e53d9 100644 --- a/sc/source/filter/inc/xistring.hxx +++ b/sc/source/filter/inc/xistring.hxx @@ -46,8 +46,6 @@ public: inline void SetFormats( const XclFormatRunVec& rFormats ) { maFormats = rFormats; } /** Reads and appends the formatting information (run count and runs) from stream. */ inline void ReadFormats( XclImpStream& rStrm ) { ReadFormats( rStrm, maFormats ); } - /** Reads and appends nRunCount formatting runs from stream. */ - inline void ReadFormats( XclImpStream& rStrm, sal_uInt16 nRunCount ) { ReadFormats( rStrm, maFormats, nRunCount ); } /** Reads and appends formatting runs from an OBJ or TXO record. */ inline void ReadObjFormats( XclImpStream& rStrm, sal_uInt16 nFormatSize ) { ReadObjFormats( rStrm, maFormats, nFormatSize ); } diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx index f537b4916d60..eb4c0c5e618a 100644 --- a/sc/source/filter/inc/xistyle.hxx +++ b/sc/source/filter/inc/xistyle.hxx @@ -638,8 +638,6 @@ public: /** Inserts a range of hyperlink cells. */ void SetHyperlink( const XclRange& rXclRange, const OUString& rUrl ); - /** Inserts the first cell of a merged cell range. */ - void SetMerge( SCCOL nScCol, SCROW nScRow ); /** Inserts a complete merged cell range. */ void SetMerge( SCCOL nScCol1, SCROW nScRow1, SCCOL nScCol2, SCROW nScRow2 ); |