diff options
23 files changed, 18 insertions, 78 deletions
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index ef03cecd3d30..9490b6730844 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.cxx @@ -243,13 +243,11 @@ public: class UnaryFunctionFunctor { - const ExpressionFunct meFunct; ParserContextSharedPtr mpContext; public: - UnaryFunctionFunctor( const ExpressionFunct eFunct, const ParserContextSharedPtr& rContext ) : - meFunct( eFunct ), + UnaryFunctionFunctor( const ParserContextSharedPtr& rContext ) : mpContext( rContext ) { } @@ -338,7 +336,7 @@ public: unaryFunction = (COLUMN >> '(' >> integer >> ')' ) - [ UnaryFunctionFunctor( UNARY_FUNC_COLUMN, self.getContext()) ] + [ UnaryFunctionFunctor( self.getContext()) ] ; assignment = diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index c7223c77f573..a82034fc1476 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -91,7 +91,6 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIte ,m_xStatement(*pStmt) ,m_xMetaData(nullptr) ,m_xDBMetaData(pStmt->getOwnConnection()->getMetaData()) - ,m_nTextEncoding(pStmt->getOwnConnection()->getTextEncoding()) ,m_nRowPos(-1) ,m_nFilePos(0) ,m_nLastVisitedPos(-1) @@ -99,7 +98,6 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIte ,m_nColumnCount(0) ,m_bWasNull(false) ,m_bEOF(false) - ,m_bLastRecord(false) ,m_bInserted(false) ,m_bRowUpdated(false) ,m_bRowInserted(false) diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 1b868e64f122..39fa8c4ebd57 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -69,7 +69,6 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) ,m_nFetchDirection(FetchDirection::FORWARD) ,m_nResultSetConcurrency(ResultSetConcurrency::UPDATABLE) ,m_bEscapeProcessing(true) - ,rBHelper(OStatement_BASE::rBHelper) { m_pConnection->acquire(); diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index c767011ddd0c..cc79acb62402 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -68,7 +68,6 @@ java_sql_Statement_Base::java_sql_Statement_Base( JNIEnv * pEnv, java_sql_Connec ,m_nResultSetConcurrency(ResultSetConcurrency::READ_ONLY) ,m_nResultSetType(ResultSetType::FORWARD_ONLY) ,m_bEscapeProcessing(true) - ,rBHelper(java_sql_Statement_BASE::rBHelper) { m_pConnection->acquire(); } diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx index eac63ff81911..bf11724a9c8c 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx @@ -37,7 +37,6 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE { - TIntVector m_vMapping; // when not every column is needed ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; ::std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx index 5eb3c36ccab9..ec4466e2ea3f 100644 --- a/connectivity/source/inc/RowFunctionParser.hxx +++ b/connectivity/source/inc/RowFunctionParser.hxx @@ -31,13 +31,7 @@ namespace connectivity struct OOO_DLLPUBLIC_DBTOOLS RowEquation { - sal_Int32 nOperation; ORowSetValueDecoratorRef nPara[ 3 ]; - - RowEquation() : - nOperation ( 0 ) - { - } }; enum ExpressionFunct diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx index f4476e2280a1..a5c832ad09ea 100644 --- a/connectivity/source/inc/file/FPreparedStatement.hxx +++ b/connectivity/source/inc/file/FPreparedStatement.hxx @@ -45,7 +45,6 @@ namespace connectivity // Data attributes - OUString m_aSql; OValueRefRow m_aParameterRow; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 9037f6dfd44f..6e202cd9cacd 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -69,7 +69,6 @@ namespace connectivity { protected: - ::std::vector<void*> m_aBindVector; ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time ::std::vector<sal_Int32> m_aOrderbyColumnNumber; @@ -110,8 +109,6 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xColsIdx; // table columns - OUString m_aTableRange; - rtl_TextEncoding m_nTextEncoding; sal_Int32 m_nRowPos; sal_Int32 m_nFilePos; sal_Int32 m_nLastVisitedPos; @@ -119,7 +116,6 @@ namespace connectivity sal_Int32 m_nColumnCount; bool m_bWasNull; bool m_bEOF; // after last record - bool m_bLastRecord; bool m_bInserted; // true when moveToInsertRow was called // set to false when cursor moved or cancel bool m_bRowUpdated; diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index 10074fac0757..94750d2a4ca4 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -97,8 +97,6 @@ namespace connectivity sal_Int32 m_nResultSetConcurrency; bool m_bEscapeProcessing; - ::cppu::OBroadcastHelper& rBHelper; - protected: // initialize the column index map (mapping select columns to table columns) void createColumnMapping(); diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx index bf4c44e0b51d..b8974f7c2daf 100644 --- a/connectivity/source/inc/java/sql/JStatement.hxx +++ b/connectivity/source/inc/java/sql/JStatement.hxx @@ -86,7 +86,6 @@ namespace connectivity sal_Int32 m_nResultSetConcurrency; sal_Int32 m_nResultSetType; bool m_bEscapeProcessing; - ::cppu::OBroadcastHelper& rBHelper; // Static data for the class diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 02babdd93f9e..8050cc8fbd49 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -168,7 +168,6 @@ namespace dbaui const Reference< XComponentContext >& _rxContext,sal_Int32 _nMaxColumnsInIndex) :ModalDialog( _pParent, "IndexDesignDialog", "dbaccess/ui/indexdesigndialog.ui") ,m_xConnection(_rxConnection) - ,m_aGeometrySettings(E_DIALOG, OUString("dbaccess.tabledesign.indexdialog")) ,m_pIndexes(nullptr) ,m_pPreviousSelection(nullptr) ,m_bEditAgain(false) diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index a9bc4922b3bf..41fd44166cf7 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -81,7 +81,6 @@ namespace dbaui { protected: css::uno::Reference< css::sdbc::XConnection > m_xConnection; - SvtViewOptions m_aGeometrySettings; VclPtr<ToolBox> m_pActions; VclPtr<DbaIndexList> m_pIndexList; diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 3ac6da085c6f..d4bc6084d685 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -333,7 +333,6 @@ OBoundControl::OBoundControl( const Reference< XComponentContext >& _rxContext, const OUString& _rAggregateService, const bool _bSetDelegator ) :OControl( _rxContext, _rAggregateService, _bSetDelegator ) ,m_bLocked(false) - ,m_aOriginalFont( EmptyFontDescriptor() ) { } diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 89730654cf58..8ebde1f7a563 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -269,9 +269,6 @@ class OBoundControl :public OControl protected: bool m_bLocked : 1; - css::awt::FontDescriptor - m_aOriginalFont; // as long as the text/value is invalid, we also change the font - public: OBoundControl( const css::uno::Reference< css::uno::XComponentContext >& _rxContext, diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx index 5f8cc744c6b7..67a553c4ce37 100644 --- a/framework/inc/uielement/macrosmenucontroller.hxx +++ b/framework/inc/uielement/macrosmenucontroller.hxx @@ -47,7 +47,6 @@ namespace framework struct ExecuteInfo { css::uno::Reference< css::frame::XDispatch > xDispatch; - css::util::URL aTargetURL; }; css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchProvider; diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx index a491b8098457..43aa58ce65c3 100644 --- a/sc/source/filter/inc/formulabuffer.hxx +++ b/sc/source/filter/inc/formulabuffer.hxx @@ -38,13 +38,11 @@ public: struct SharedFormulaEntry { css::table::CellAddress maAddress; - css::table::CellRangeAddress maRange; OUString maTokenStr; sal_Int32 mnSharedId; SharedFormulaEntry( const css::table::CellAddress& rAddress, - const css::table::CellRangeAddress& rRange, const OUString& rTokenStr, sal_Int32 nSharedId ); }; @@ -131,7 +129,6 @@ public: const css::table::CellAddress& rTokenAddress, const OUString& ); void createSharedFormulaMapEntry( const css::table::CellAddress& rAddress, - const css::table::CellRangeAddress& rRange, sal_Int32 nSharedId, const OUString& rTokens ); /// ensure sizes of vectors matches the number of sheets diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index b7aec9c88660..8de19efecfb1 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -303,7 +303,6 @@ public: void createSharedFormulaMapEntry( const css::table::CellAddress& rAddress, - const css::table::CellRangeAddress& rRange, sal_Int32 nSharedId, const OUString& rTokens ); void setCellFormulaValue( diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index ef6172f46a9e..4e82ea667769 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -340,9 +340,9 @@ protected: } FormulaBuffer::SharedFormulaEntry::SharedFormulaEntry( - const table::CellAddress& rAddr, const table::CellRangeAddress& rRange, + const table::CellAddress& rAddr, const OUString& rTokenStr, sal_Int32 nSharedId ) : - maAddress(rAddr), maRange(rRange), maTokenStr(rTokenStr), mnSharedId(nSharedId) {} + maAddress(rAddr), maTokenStr(rTokenStr), mnSharedId(nSharedId) {} FormulaBuffer::SharedFormulaDesc::SharedFormulaDesc( const css::table::CellAddress& rAddr, sal_Int32 nSharedId, @@ -457,12 +457,12 @@ FormulaBuffer::SheetItem FormulaBuffer::getSheetItem( SCTAB nTab ) } void FormulaBuffer::createSharedFormulaMapEntry( - const table::CellAddress& rAddress, const table::CellRangeAddress& rRange, + const table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ) { assert( rAddress.Sheet >= 0 && (size_t)rAddress.Sheet < maSharedFormulas.size() ); std::vector<SharedFormulaEntry>& rSharedFormulas = maSharedFormulas[ rAddress.Sheet ]; - SharedFormulaEntry aEntry(rAddress, rRange, rTokens, nSharedId); + SharedFormulaEntry aEntry(rAddress, rTokens, nSharedId); rSharedFormulas.push_back( aEntry ); } diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx index 0cf6280ca0d1..3bc5b9800e61 100644 --- a/sc/source/filter/oox/sheetdatacontext.cxx +++ b/sc/source/filter/oox/sheetdatacontext.cxx @@ -161,7 +161,7 @@ void SheetDataContext::onEndElement() if( maFmlaData.mnSharedId >= 0 ) { if( mbValidRange && maFmlaData.isValidSharedRef( maCellData.maCellAddr ) ) - createSharedFormulaMapEntry(maCellData.maCellAddr, maFmlaData.maFormulaRef, maFmlaData.mnSharedId, maFormulaStr); + createSharedFormulaMapEntry(maCellData.maCellAddr, maFmlaData.mnSharedId, maFormulaStr); setCellFormula(maCellData.maCellAddr, maFmlaData.mnSharedId, maCellValue, maCellData.mnCellType); mrSheetData.setCellFormat( maCellData ); diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 69fdb25a53e3..2c2dba1d0faf 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -1643,9 +1643,9 @@ void WorksheetHelper::setCellArrayFormula( const css::table::CellRangeAddress& r } void WorksheetHelper::createSharedFormulaMapEntry( - const table::CellAddress& rAddress, const table::CellRangeAddress& rRange, sal_Int32 nSharedId, const OUString& rTokens ) + const table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ) { - getFormulaBuffer().createSharedFormulaMapEntry(rAddress, rRange, nSharedId, rTokens); + getFormulaBuffer().createSharedFormulaMapEntry(rAddress, nSharedId, rTokens); } } // namespace xls diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 1a51e14c9da2..12bc2c6ba685 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -110,7 +110,6 @@ struct SwRectFnCollection SwRectGet fnGetWidth; SwRectGet fnGetHeight; SwRectPoint fnGetPos; - SwRectSize fnGetSize; SwRectSet fnSetTop; SwRectSet fnSetBottom; @@ -139,22 +138,19 @@ struct SwRectFnCollection SwFrameGet fnGetPrtBottom; SwFrameGet fnGetPrtLeft; SwFrameGet fnGetPrtRight; - SwRectDist fnTopDist; - SwRectDist fnBottomDist; - SwRectDist fnLeftDist; - SwRectDist fnRightDist; + SwRectDist fnTopDist; + SwRectDist fnBottomDist; SwFrameMax fnSetLimit; - SwRectMax fnOverStep; + SwRectMax fnOverStep; - SwRectSetPos fnSetPos; + SwRectSetPos fnSetPos; SwFrameMakePos fnMakePos; - SwOperator fnXDiff; - SwOperator fnYDiff; - SwOperator fnXInc; - SwOperator fnYInc; + SwOperator fnXDiff; + SwOperator fnYDiff; + SwOperator fnYInc; - SwRectSetTwice fnSetLeftAndWidth; - SwRectSetTwice fnSetTopAndHeight; + SwRectSetTwice fnSetLeftAndWidth; + SwRectSetTwice fnSetTopAndHeight; }; typedef SwRectFnCollection* SwRectFn; diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index 9f377bb4456b..15d406983491 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -63,7 +63,6 @@ static SwRectFnCollection aHorizontal = { &SwRect::_Width, &SwRect::_Height, &SwRect::TopLeft, - &SwRect::_Size, /* fnRectSet */ &SwRect::_Top, &SwRect::_Bottom, @@ -94,8 +93,6 @@ static SwRectFnCollection aHorizontal = { &SwFrame::GetPrtRight, &SwRect::GetTopDistance, &SwRect::GetBottomDistance, - &SwRect::GetLeftDistance, - &SwRect::GetRightDistance, &SwFrame::SetMaxBottom, &SwRect::OverStepBottom, @@ -104,7 +101,6 @@ static SwRectFnCollection aHorizontal = { &FirstMinusSecond, &FirstMinusSecond, &SwIncrement, - &SwIncrement, &SwRect::SetLeftAndWidth, &SwRect::SetTopAndHeight }; @@ -118,7 +114,6 @@ static SwRectFnCollection aVertical = { &SwRect::_Height, &SwRect::_Width, &SwRect::TopRight, - &SwRect::SwappedSize, /* fnRectSet */ &SwRect::_Right, &SwRect::_Left, @@ -149,8 +144,6 @@ static SwRectFnCollection aVertical = { &SwFrame::GetPrtBottom, &SwRect::GetRightDistance, &SwRect::GetLeftDistance, - &SwRect::GetTopDistance, - &SwRect::GetBottomDistance, &SwFrame::SetMinLeft, &SwRect::OverStepLeft, @@ -159,7 +152,6 @@ static SwRectFnCollection aVertical = { &FirstMinusSecond, &SecondMinusFirst, &SwIncrement, - &SwDecrement, &SwRect::SetTopAndHeight, &SwRect::SetRightAndWidth }; @@ -173,7 +165,6 @@ static SwRectFnCollection aBottomToTop = { &SwRect::_Width, &SwRect::_Height, &SwRect::BottomLeft, - &SwRect::_Size, /* fnRectSet */ &SwRect::_Bottom, &SwRect::_Top, @@ -204,8 +195,6 @@ static SwRectFnCollection aBottomToTop = { &SwFrame::GetPrtRight, &SwRect::GetBottomDistance, &SwRect::GetTopDistance, - &SwRect::GetLeftDistance, - &SwRect::GetRightDistance, &SwFrame::SetMinTop, &SwRect::OverStepTop, @@ -214,7 +203,6 @@ static SwRectFnCollection aBottomToTop = { &FirstMinusSecond, &SecondMinusFirst, &SwIncrement, - &SwDecrement, &SwRect::SetLeftAndWidth, &SwRect::SetBottomAndHeight }; @@ -228,7 +216,6 @@ static SwRectFnCollection aVerticalRightToLeft = { &SwRect::_Height, &SwRect::_Width, &SwRect::BottomRight, - &SwRect::SwappedSize, /* fnRectSet */ &SwRect::_Left, &SwRect::_Right, @@ -259,8 +246,6 @@ static SwRectFnCollection aVerticalRightToLeft = { &SwFrame::GetPrtTop, &SwRect::GetLeftDistance, &SwRect::GetRightDistance, - &SwRect::GetBottomDistance, - &SwRect::GetTopDistance, &SwFrame::SetMaxRight, &SwRect::OverStepRight, @@ -269,7 +254,6 @@ static SwRectFnCollection aVerticalRightToLeft = { &FirstMinusSecond, &FirstMinusSecond, &SwDecrement, - &SwIncrement, &SwRect::SetBottomAndHeight, &SwRect::SetLeftAndWidth }; @@ -283,7 +267,6 @@ static SwRectFnCollection aVerticalLeftToRight = { &SwRect::_Height, &SwRect::_Width, &SwRect::TopLeft, - &SwRect::SwappedSize, /* fnRectSet */ &SwRect::_Left, &SwRect::_Right, @@ -314,8 +297,6 @@ static SwRectFnCollection aVerticalLeftToRight = { &SwFrame::GetPrtBottom, &SwRect::GetLeftDistance, &SwRect::GetRightDistance, - &SwRect::GetTopDistance, - &SwRect::GetBottomDistance, &SwFrame::SetMaxRight, &SwRect::OverStepRight, @@ -324,7 +305,6 @@ static SwRectFnCollection aVerticalLeftToRight = { &FirstMinusSecond, &FirstMinusSecond, &SwIncrement, - &SwIncrement, &SwRect::SetTopAndHeight, &SwRect::SetLeftAndWidth }; diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 54166dabeb26..17e366f5369b 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -239,12 +239,10 @@ public: ResultSetFactoryI(const Reference<XComponentContext >& rxContext, const Reference<XContentProvider >& xProvider, const Sequence<Property>& seq, - const Sequence<NumberedSortingInfo>& seqSort, const std::vector<FTPDirentry>& dirvec) : m_xContext(rxContext), m_xProvider(xProvider), m_seq(seq), - m_seqSort(seqSort), m_dirvec(dirvec) { } @@ -262,7 +260,6 @@ public: Reference< XComponentContext > m_xContext; Reference< XContentProvider > m_xProvider; Sequence< Property > m_seq; - Sequence< NumberedSortingInfo > m_seqSort; std::vector<FTPDirentry> m_dirvec; }; @@ -560,7 +557,6 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand, new ResultSetFactoryI(m_xContext, m_xProvider.get(), aOpenCommand.Properties, - aOpenCommand.SortingInfo, resvec)); aRet <<= xSet; } |