compilerplugins/clang/unusedfields.py | 10 oox/inc/drawingml/chart/chartspacefragment.hxx | 2 oox/source/core/xmlfilterbase.cxx | 4 oox/source/drawingml/chart/chartspacefragment.cxx | 3 package/inc/ZipFile.hxx | 1 package/source/manifest/ManifestImport.cxx | 341 +++++-------- package/source/manifest/ManifestImport.hxx | 4 reportdesign/source/core/api/ReportComponent.cxx | 1 reportdesign/source/core/inc/ReportControlModel.hxx | 1 reportdesign/source/filter/xml/xmlComponent.hxx | 1 reportdesign/source/filter/xml/xmlExport.hxx | 10 reportdesign/source/ui/inc/ColumnInfo.hxx | 3 reportdesign/source/ui/report/ReportControllerObserver.cxx | 15 sc/inc/cellvalues.hxx | 3 sc/inc/compiler.hxx | 14 sc/inc/dociter.hxx | 8 sc/inc/document.hxx | 4 sc/inc/documentlinkmgr.hxx | 2 sc/inc/dpresfilter.hxx | 6 sc/inc/dptabdat.hxx | 2 sc/inc/externalrefmgr.hxx | 1 sc/inc/formulacell.hxx | 1 sc/source/core/data/cellvalues.cxx | 25 sc/source/core/data/dociter.cxx | 15 sc/source/core/data/documen2.cxx | 5 sc/source/core/data/dpresfilter.cxx | 14 sc/source/core/data/dptabdat.cxx | 3 sc/source/core/data/formulacell.cxx | 3 sc/source/core/inc/doubleref.hxx | 3 sc/source/core/tool/doubleref.cxx | 8 sc/source/core/tool/token.cxx | 2 sc/source/filter/excel/frmbase.cxx | 3 sc/source/filter/html/htmlexp.cxx | 1 sc/source/filter/html/htmlpars.cxx | 4 sc/source/filter/inc/autofilterbuffer.hxx | 1 sc/source/filter/inc/commentsbuffer.hxx | 2 sc/source/filter/inc/externallinkbuffer.hxx | 2 sc/source/filter/inc/formel.hxx | 1 sc/source/filter/inc/formulabase.hxx | 2 sc/source/filter/inc/htmlexp.hxx | 1 sc/source/filter/inc/htmlpars.hxx | 15 sc/source/filter/inc/pivottablebuffer.hxx | 2 sc/source/filter/inc/worksheetbuffer.hxx | 7 sc/source/filter/inc/xltracer.hxx | 9 sc/source/filter/lotus/lotfilter.hxx | 2 sc/source/filter/oox/autofilterbuffer.cxx | 3 sc/source/filter/oox/commentsbuffer.cxx | 1 sc/source/filter/oox/externallinkbuffer.cxx | 1 sc/source/filter/oox/formulabase.cxx | 24 sc/source/filter/oox/pivottablebuffer.cxx | 2 sc/source/filter/oox/worksheetbuffer.cxx | 1 sc/source/filter/xml/xmlexprt.cxx | 3 sc/source/filter/xml/xmlexprt.hxx | 1 sc/source/filter/xml/xmlimprt.cxx | 9 sc/source/filter/xml/xmlimprt.hxx | 2 sc/source/ui/docshell/docsh.cxx | 2 sc/source/ui/docshell/documentlinkmgr.cxx | 9 sc/source/ui/inc/docsh.hxx | 2 sc/source/ui/inc/gridwin.hxx | 3 sc/source/ui/inc/retypepassdlg.hxx | 2 sc/source/ui/inc/tabvwsh.hxx | 9 sc/source/ui/miscdlgs/retypepassdlg.cxx | 2 sc/source/ui/optdlg/calcoptionsdlg.hxx | 3 sc/source/ui/vba/vbaapplication.cxx | 2 sc/source/ui/view/gridwin.cxx | 2 sc/source/ui/view/tabvwsh4.cxx | 4 66 files changed, 228 insertions(+), 426 deletions(-)
New commits: commit 05eda0dc19af81ed0d5167bdd0a92113e6e8bc60 Author: Noel Grandin <[email protected]> Date: Fri Nov 20 15:39:19 2015 +0200 loplugin:unusedfields in sc Change-Id: If5123e676a27302f3e11475309bc748977c6f430 diff --git a/compilerplugins/clang/unusedfields.py b/compilerplugins/clang/unusedfields.py index 40b5def..4b9b6aa 100755 --- a/compilerplugins/clang/unusedfields.py +++ b/compilerplugins/clang/unusedfields.py @@ -53,12 +53,16 @@ for d in definitionSet: continue if d in callSet: continue - if (definitionToSourceLocationMap[d].startswith("include/")): + srcLoc = definitionToSourceLocationMap[d]; + if (srcLoc.startswith("include/")): continue - if (definitionToSourceLocationMap[d].startswith("external/")): + if (srcLoc.startswith("external/")): + continue + # this is all representations of on-disk data structures + if (srcLoc == "sc/source/filter/inc/scflt.hxx"): continue - tmp1set.add((clazz, definitionToSourceLocationMap[d])) + tmp1set.add((clazz, srcLoc)) # sort the results using a "natural order" so sequences like [item1,item2,item10] sort nicely def natural_sort_key(s, _nsre=re.compile('([0-9]+)')): diff --git a/sc/inc/cellvalues.hxx b/sc/inc/cellvalues.hxx index 7c132b0..9782357 100644 --- a/sc/inc/cellvalues.hxx +++ b/sc/inc/cellvalues.hxx @@ -30,9 +30,8 @@ struct CellValueSpan { SCROW mnRow1; SCROW mnRow2; - CellType meType; - CellValueSpan( SCROW nRow1, SCROW nRow2, CellType eType ); + CellValueSpan( SCROW nRow1, SCROW nRow2 ); }; /** diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 3c8a12e..06736b4 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -96,20 +96,6 @@ protected: formula::StackVar eType; }; -struct ScDoubleRawToken: private ScRawTokenBase -{ -public: - union - { // union only to assure alignment identical to ScRawToken - double nValue; - struct { - sal_uInt8 cByte; - bool bIsInForceArray; - } sbyte; - }; - DECL_FIXEDMEMPOOL_NEWDEL( ScDoubleRawToken ); -}; - struct ScRawToken: private ScRawTokenBase { friend class ScCompiler; diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index adc7679..34aa834 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -115,20 +115,18 @@ private: class DataAccess { public: - DataAccess(const ScDBQueryDataIterator* pParent); + DataAccess(); virtual ~DataAccess() = 0; virtual bool getCurrent(Value& rValue) = 0; virtual bool getFirst(Value& rValue) = 0; virtual bool getNext(Value& rValue) = 0; - protected: - const ScDBQueryDataIterator* mpParent; }; class DataAccessInternal : public DataAccess { typedef std::pair<sc::CellStoreType::const_iterator,size_t> PositionType; public: - DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc); + DataAccessInternal(ScDBQueryParamInternal* pParam, ScDocument* pDoc); virtual ~DataAccessInternal(); virtual bool getCurrent(Value& rValue) override; virtual bool getFirst(Value& rValue) override; @@ -156,7 +154,7 @@ private: class DataAccessMatrix : public DataAccess { public: - DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam); + DataAccessMatrix(ScDBQueryParamMatrix* pParam); virtual ~DataAccessMatrix(); virtual bool getCurrent(Value& rValue) override; virtual bool getFirst(Value& rValue) override; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 72a2d2d..781db63 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -394,7 +394,6 @@ private: sal_uInt16 nMacroInterpretLevel; // >0 if macro in interpreter sal_uInt16 nInterpreterTableOpLevel; // >0 if in interpreter TableOp sal_uInt16 nSrcVer; // file version (load/save) - SCROW nSrcMaxRow; // number of lines to load/save sal_uInt16 nFormulaTrackCount; HardRecalcState eHardRecalcState; // off, temporary, eternal SCTAB nVisibleTab; // for OLE etc., don't use inside ScDocument @@ -437,11 +436,8 @@ private: // for detective update, is set for each change of a formula bool bDetectiveDirty; - sal_uInt8 nMacroCallMode; // Macros per warning dialog disabled? bool bHasMacroFunc; // valid only after loading - sal_uInt8 nVisSpellState; - sal_uInt8 nAsianCompression; sal_uInt8 nAsianKerning; diff --git a/sc/inc/documentlinkmgr.hxx b/sc/inc/documentlinkmgr.hxx index f5ba279..3f9cc0c 100644 --- a/sc/inc/documentlinkmgr.hxx +++ b/sc/inc/documentlinkmgr.hxx @@ -34,7 +34,7 @@ class DocumentLinkManager : boost::noncopyable std::unique_ptr<DocumentLinkManagerImpl> mpImpl; public: - DocumentLinkManager( ScDocument& rDoc, SfxObjectShell* pShell ); + DocumentLinkManager( SfxObjectShell* pShell ); ~DocumentLinkManager(); void setDataStream( DataStream* p ); diff --git a/sc/inc/dpresfilter.hxx b/sc/inc/dpresfilter.hxx index 0bcdc1a..9ff9ed4 100644 --- a/sc/inc/dpresfilter.hxx +++ b/sc/inc/dpresfilter.hxx @@ -60,10 +60,9 @@ private: struct DimensionNode : boost::noncopyable { - const MemberNode* mpParent; MembersType maChildMembers; - DimensionNode(const MemberNode* pParent); + DimensionNode(); ~DimensionNode(); #if DEBUG_PIVOT_TABLE @@ -73,11 +72,10 @@ private: struct MemberNode : boost::noncopyable { - const DimensionNode* mpParent; ValuesType maValues; DimensionsType maChildDimensions; - MemberNode(const DimensionNode* pParent); + MemberNode(); ~MemberNode(); #if DEBUG_PIVOT_TABLE diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index d47951e..6a013f5 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -93,8 +93,6 @@ public: ScDPResultMember* pColRoot; ScDPResultMember* pRowRoot; - bool bRepeatIfEmpty; - CalcInfo(); }; diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index ae4decd..cb8a1b2 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -430,7 +430,6 @@ public: OUString maRelativeName; OUString maFilterName; OUString maFilterOptions; - bool bUnsaved; void maybeCreateRealFileName(const OUString& rOwnDocName); }; diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 5a6f87b1..5424cb4 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -72,7 +72,6 @@ public: bool mbSubTotal:1; sal_uInt8 meCalcState; - sal_uInt8 meKernelState; ScFormulaCellGroup(); ~ScFormulaCellGroup(); diff --git a/sc/source/core/data/cellvalues.cxx b/sc/source/core/data/cellvalues.cxx index bdee2b9..049538d 100644 --- a/sc/source/core/data/cellvalues.cxx +++ b/sc/source/core/data/cellvalues.cxx @@ -24,29 +24,10 @@ struct BlockPos size_t mnEnd; }; -CellType toCellType( mdds::mtv::element_t eType ) -{ - switch (eType) - { - case element_type_numeric: - return CELLTYPE_VALUE; - case element_type_string: - return CELLTYPE_STRING; - case element_type_edittext: - return CELLTYPE_EDIT; - case element_type_formula: - return CELLTYPE_FORMULA; - default: - ; - } - - return CELLTYPE_NONE; -} - } -CellValueSpan::CellValueSpan( SCROW nRow1, SCROW nRow2, CellType eType ) : - mnRow1(nRow1), mnRow2(nRow2), meType(eType) {} +CellValueSpan::CellValueSpan( SCROW nRow1, SCROW nRow2 ) : + mnRow1(nRow1), mnRow2(nRow2) {} struct CellValuesImpl : boost::noncopyable { @@ -163,7 +144,7 @@ std::vector<CellValueSpan> CellValues::getNonEmptySpans() const // Record this span. size_t nRow1 = it->position; size_t nRow2 = nRow1 + it->size - 1; - aRet.push_back(CellValueSpan(nRow1, nRow2, toCellType(it->type))); + aRet.push_back(CellValueSpan(nRow1, nRow2)); } } return aRet; diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 8e3234d..77ac93a 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -308,8 +308,7 @@ bool ScValueIterator::GetNext(double& rValue, sal_uInt16& rErr) return GetThis(rValue, rErr); } -ScDBQueryDataIterator::DataAccess::DataAccess(const ScDBQueryDataIterator* pParent) : - mpParent(pParent) +ScDBQueryDataIterator::DataAccess::DataAccess() { } @@ -342,8 +341,8 @@ bool ScDBQueryDataIterator::IsQueryValid( return rDoc.maTabs[nTab]->ValidQuery(nRow, rParam, pCell); } -ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc) - : DataAccess(pParent) +ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(ScDBQueryParamInternal* pParam, ScDocument* pDoc) + : DataAccess() , mpCells(nullptr) , mpParam(pParam) , mpDoc(pDoc) @@ -522,8 +521,8 @@ void ScDBQueryDataIterator::DataAccessInternal::incPos() incBlock(); } -ScDBQueryDataIterator::DataAccessMatrix::DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam) - : DataAccess(pParent) +ScDBQueryDataIterator::DataAccessMatrix::DataAccessMatrix(ScDBQueryParamMatrix* pParam) + : DataAccess() , mpParam(pParam) , mnCurRow(0) { @@ -764,13 +763,13 @@ ScDBQueryDataIterator::ScDBQueryDataIterator(ScDocument* pDocument, ScDBQueryPar case ScDBQueryParamBase::INTERNAL: { ScDBQueryParamInternal* p = static_cast<ScDBQueryParamInternal*>(pParam); - mpData.reset(new DataAccessInternal(this, p, pDocument)); + mpData.reset(new DataAccessInternal(p, pDocument)); } break; case ScDBQueryParamBase::MATRIX: { ScDBQueryParamMatrix* p = static_cast<ScDBQueryParamMatrix*>(pParam); - mpData.reset(new DataAccessMatrix(this, p)); + mpData.reset(new DataAccessMatrix(p)); } } } diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index dd554ec..d27a5e6 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -176,7 +176,6 @@ ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) : nMacroInterpretLevel(0), nInterpreterTableOpLevel(0), nSrcVer( SC_CURRENT_VERSION ), - nSrcMaxRow( MAXROW ), nFormulaTrackCount(0), eHardRecalcState(HARDRECALCSTATE_OFF), nVisibleTab( 0 ), @@ -201,9 +200,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) : bInDtorClear( false ), bExpandRefs( false ), bDetectiveDirty( false ), - nMacroCallMode( SC_MACROCALL_ALLOWED ), bHasMacroFunc( false ), - nVisSpellState( 0 ), nAsianCompression(SC_ASIANCOMPRESSION_INVALID), nAsianKerning(SC_ASIANKERNING_INVALID), bPastingDrawFromOtherDoc( false ), @@ -266,7 +263,7 @@ const sfx2::LinkManager* ScDocument::GetLinkManager() const sc::DocumentLinkManager& ScDocument::GetDocLinkManager() { if (!mpDocLinkMgr) - mpDocLinkMgr.reset(new sc::DocumentLinkManager(*this, pShell)); + mpDocLinkMgr.reset(new sc::DocumentLinkManager(pShell)); return *mpDocLinkMgr; } diff --git a/sc/source/core/data/dpresfilter.cxx b/sc/source/core/data/dpresfilter.cxx index 603ab14..a416bc3 100644 --- a/sc/source/core/data/dpresfilter.cxx +++ b/sc/source/core/data/dpresfilter.cxx @@ -30,8 +30,7 @@ size_t ScDPResultTree::NamePairHash::operator() (const NamePairType& rPair) cons return aHash(rPair.first) + aHash(rPair.second); } -ScDPResultTree::DimensionNode::DimensionNode(const MemberNode* pParent) : - mpParent(pParent) {} +ScDPResultTree::DimensionNode::DimensionNode() {} ScDPResultTree::DimensionNode::~DimensionNode() { @@ -60,8 +59,7 @@ void ScDPResultTree::DimensionNode::dump(int nLevel) const } #endif -ScDPResultTree::MemberNode::MemberNode(const DimensionNode* pParent) : - mpParent(pParent) {} +ScDPResultTree::MemberNode::MemberNode() {} ScDPResultTree::MemberNode::~MemberNode() { @@ -87,7 +85,7 @@ void ScDPResultTree::MemberNode::dump(int nLevel) const } #endif -ScDPResultTree::ScDPResultTree() : mpRoot(new MemberNode(nullptr)) {} +ScDPResultTree::ScDPResultTree() : mpRoot(new MemberNode) {} ScDPResultTree::~ScDPResultTree() { delete mpRoot; @@ -120,7 +118,7 @@ void ScDPResultTree::add( { // New dimenison. Insert it. std::pair<DimensionsType::iterator, bool> r = - rDims.insert(DimensionsType::value_type(aUpperName, new DimensionNode(pMemNode))); + rDims.insert(DimensionsType::value_type(aUpperName, new DimensionNode)); if (!r.second) // Insertion failed! @@ -141,7 +139,7 @@ void ScDPResultTree::add( // New member. Insert it. std::pair<MembersType::iterator, bool> r = rMembers.insert( - MembersType::value_type(aUpperName, new MemberNode(pDim))); + MembersType::value_type(aUpperName, new MemberNode)); if (!r.second) // Insertion failed! @@ -192,7 +190,7 @@ void ScDPResultTree::clear() { maPrimaryDimName = EMPTY_OUSTRING; delete mpRoot; - mpRoot = new MemberNode(nullptr); + mpRoot = new MemberNode; } const ScDPResultTree::ValuesType* ScDPResultTree::getResults( diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx index bee083a..9d9fac3 100644 --- a/sc/source/core/data/dptabdat.cxx +++ b/sc/source/core/data/dptabdat.cxx @@ -41,8 +41,7 @@ using ::std::vector; ScDPTableData::CalcInfo::CalcInfo() : pInitState( nullptr ), pColRoot( nullptr ), - pRowRoot( nullptr ), - bRepeatIfEmpty(false) + pRowRoot( nullptr ) { } diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index a405ebe..94250a1 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -548,8 +548,7 @@ ScFormulaCellGroup::ScFormulaCellGroup() : mnFormatType(css::util::NumberFormat::NUMBER), mbInvariant(false), mbSubTotal(false), - meCalcState(sc::GroupCalcEnabled), - meKernelState(sc::OpenCLKernelNone) + meCalcState(sc::GroupCalcEnabled) { SAL_INFO( "sc.core.formulacell", "ScFormulaCellGroup ctor this " << this); } diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx index 9fbb62d..bf601e2 100644 --- a/sc/source/core/inc/doubleref.hxx +++ b/sc/source/core/inc/doubleref.hxx @@ -74,7 +74,7 @@ public: virtual bool isRangeEqual(const ScRange& rRange) const = 0; protected: - ScDBRangeBase(ScDocument* pDoc, RefType eType); + ScDBRangeBase(ScDocument* pDoc); ScDocument* getDoc() const { return mpDoc;} /** @@ -87,7 +87,6 @@ private: ScDBRangeBase(); // disabled ScDocument* mpDoc; - RefType meType; }; class ScDBInternalRange : public ScDBRangeBase diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index f60e8da..5089caa 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -241,8 +241,8 @@ bool lcl_fillQueryEntries( } -ScDBRangeBase::ScDBRangeBase(ScDocument* pDoc, RefType eType) : - mpDoc(pDoc), meType(eType) +ScDBRangeBase::ScDBRangeBase(ScDocument* pDoc) : + mpDoc(pDoc) { } @@ -269,7 +269,7 @@ void ScDBRangeBase::fillQueryOptions(ScQueryParamBase* pParam) } ScDBInternalRange::ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange) : - ScDBRangeBase(pDoc, INTERNAL), maRange(rRange) + ScDBRangeBase(pDoc), maRange(rRange) { } @@ -384,7 +384,7 @@ bool ScDBInternalRange::isRangeEqual(const ScRange& rRange) const } ScDBExternalRange::ScDBExternalRange(ScDocument* pDoc, const ScMatrixRef& pMat) : - ScDBRangeBase(pDoc, EXTERNAL), mpMatrix(pMat) + ScDBRangeBase(pDoc), mpMatrix(pMat) { SCSIZE nC, nR; mpMatrix->GetDimensions(nC, nR); diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 7c43d37..498ba94 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -197,8 +197,6 @@ namespace // Since RawTokens are temporary for the compiler, don't align on 4k and waste memory. // ScRawToken size is FixMembers + MAXSTRLEN + ~4 ~= 1036 IMPL_FIXEDMEMPOOL_NEWDEL( ScRawToken ) -// Some ScDoubleRawToken, FixMembers + sizeof(double) ~= 16 -IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRawToken ) // Need a whole bunch of ScSingleRefToken IMPL_FIXEDMEMPOOL_NEWDEL( ScSingleRefToken ) diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx index 2284502..4e77af8 100644 --- a/sc/source/filter/excel/frmbase.cxx +++ b/sc/source/filter/excel/frmbase.cxx @@ -168,8 +168,7 @@ const ScRange* _ScRangeListTabs::Next () ConverterBase::ConverterBase( svl::SharedStringPool& rSPool, sal_uInt16 nNewBuffer ) : aPool(rSPool), aEingPos( 0, 0, 0 ), - eStatus( ConvOK ), - nBufferSize( nNewBuffer ) + eStatus( ConvOK ) { OSL_ENSURE( nNewBuffer > 0, "ConverterBase::ConverterBase - nNewBuffer == 0!" ); pBuffer = new sal_Char[ nNewBuffer ]; diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 3e2e8c8..12ce2a1 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -208,7 +208,6 @@ ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const OUString& rBaseURL, ScDocume ScExportBase( rStrmP, pDocP, rRangeP ), aBaseURL( rBaseURL ), aStreamPath( rStreamPathP ), - aFilterOptions( rFilterOptions ), pAppWin( Application::GetDefaultDevice() ), nUsedTables( 0 ), nIndent( 0 ), diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index a59c4e3..8e906bd 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -1070,7 +1070,7 @@ void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo ) Colonize( pActEntry ); aTableStack.push( new ScHTMLTableStackEntry( pActEntry, xLockedList, pLocalColOffset, nFirstTableCell, - nColCnt, nRowCnt, nColCntStart, nMaxCol, nTable, + nRowCnt, nColCntStart, nMaxCol, nTable, nTableWidth, nColOffset, nColOffsetStart, bFirstRow ) ); sal_uInt16 nLastWidth = nTableWidth; @@ -1132,7 +1132,7 @@ void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo ) } aTableStack.push( new ScHTMLTableStackEntry( pActEntry, xLockedList, pLocalColOffset, nFirstTableCell, - nColCnt, nRowCnt, nColCntStart, nMaxCol, nTable, + nRowCnt, nColCntStart, nMaxCol, nTable, nTableWidth, nColOffset, nColOffsetStart, bFirstRow ) ); // As soon as we have multiple tables we need to be tolerant with the offsets. diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx index 3eb2b2b..21f3bab 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -115,7 +115,6 @@ struct FilterCriterionModel css::uno::Any maValue; /// Comparison operand. sal_Int32 mnOperator; /// Comparison operator. sal_uInt8 mnDataType; /// Operand data type (BIFF only). - sal_uInt8 mnStrLen; /// Length of string operand (BIFF5-BIFF8 only). explicit FilterCriterionModel(); diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx index af5759b..b5c8f3a 100644 --- a/sc/source/filter/inc/commentsbuffer.hxx +++ b/sc/source/filter/inc/commentsbuffer.hxx @@ -32,9 +32,7 @@ struct CommentModel css::table::CellRangeAddress maRange; /// Position of the comment in the worksheet. RichStringRef mxText; /// Formatted text of the comment (not used in BIFF8). - OUString maAuthor; /// Comment author (BIFF8 only). sal_Int32 mnAuthorId; /// Identifier of the comment's author (OOXML and BIFF12 only). - sal_uInt16 mnObjId; /// Drawing object identifier (BIFF8 only). bool mbAutoFill; /// Auto Selection of comment object's fill style bool mbAutoScale; /// Auto Scale comment text bool mbColHidden; /// Comment cell's Column is Hidden diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx index 526af61..d22e91b 100644 --- a/sc/source/filter/inc/externallinkbuffer.hxx +++ b/sc/source/filter/inc/externallinkbuffer.hxx @@ -40,7 +40,6 @@ namespace xls { struct ExternalNameModel { - bool mbBuiltIn; /// Name is a built-in name. bool mbNotify; /// Notify application on data change. bool mbPreferPic; /// Picture link. bool mbStdDocName; /// Name is the StdDocumentName for DDE. @@ -270,7 +269,6 @@ private: OUString maTargetUrl; /// Target link, DDE topic, OLE target. css::uno::Reference< css::sheet::XExternalDocLink > mxDocLink; /// Interface for an external document. - Int16Vector maCalcSheets; /// Internal sheet indexes. Int32Vector maSheetCaches; /// External sheet cache indexes. ExternalNameVector maExtNames; /// Defined names in external document. }; diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx index 35a2c85..e5d1e46 100644 --- a/sc/source/filter/inc/formel.hxx +++ b/sc/source/filter/inc/formel.hxx @@ -86,7 +86,6 @@ protected: ScAddress aEingPos; ConvErr eStatus; sal_Char* pBuffer; // universal buffer - sal_uInt16 nBufferSize; // ...and its size ConverterBase( svl::SharedStringPool& rSPool, sal_uInt16 nNewBuffer ); virtual ~ConverterBase(); diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 65eb002..174190f 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -477,8 +477,6 @@ enum FuncParamConversion struct FunctionParamInfo { FuncParamValidity meValid; /// Parameter validity. - FuncParamConversion meConv; /// Token class conversion type. - bool mbValType; /// Data type (false = REFTYPE, true = VALTYPE). }; // Function data ============================================================== diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx index 48f7203..3e147e0 100644 --- a/sc/source/filter/inc/htmlexp.hxx +++ b/sc/source/filter/inc/htmlexp.hxx @@ -108,7 +108,6 @@ class ScHTMLExport : public ScExportBase ScHTMLStyle aHTMLStyle; OUString aBaseURL; OUString aStreamPath; - OUString aFilterOptions; OUString aCId; // Content-Id for Mail-Export VclPtr<OutputDevice> pAppWin; // for Pixel-work FileNameMapPtr pFileNameMap; // for CopyLocalFileToINet diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index eb00077..1e71c8b 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -102,27 +102,26 @@ struct ScHTMLTableStackEntry ScRangeListRef xLockedList; ScEEParseEntry* pCellEntry; ScHTMLColOffset* pLocalColOffset; - sal_uLong nFirstTableCell; - SCCOL nColCnt; + sal_uLong nFirstTableCell; SCROW nRowCnt; SCCOL nColCntStart; SCCOL nMaxCol; - sal_uInt16 nTable; - sal_uInt16 nTableWidth; - sal_uInt16 nColOffset; - sal_uInt16 nColOffsetStart; + sal_uInt16 nTable; + sal_uInt16 nTableWidth; + sal_uInt16 nColOffset; + sal_uInt16 nColOffsetStart; bool bFirstRow; ScHTMLTableStackEntry( ScEEParseEntry* pE, const ScRangeListRef& rL, ScHTMLColOffset* pTO, sal_uLong nFTC, - SCCOL nCol, SCROW nRow, + SCROW nRow, SCCOL nStart, SCCOL nMax, sal_uInt16 nTab, sal_uInt16 nTW, sal_uInt16 nCO, sal_uInt16 nCOS, bool bFR ) : xLockedList( rL ), pCellEntry( pE ), pLocalColOffset( pTO ), nFirstTableCell( nFTC ), - nColCnt( nCol ), nRowCnt( nRow ), + nRowCnt( nRow ), nColCntStart( nStart ), nMaxCol( nMax ), nTable( nTab ), nTableWidth( nTW ), nColOffset( nCO ), nColOffsetStart( nCOS ), diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index aaef9bb..37ee04e 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -239,8 +239,6 @@ struct PTDefinitionModel : public AutoFormatModel sal_Int32 mnPageWrap; sal_Int32 mnIndent; sal_Int32 mnChartFormat; - sal_uInt16 mnRowFields; - sal_uInt16 mnColFields; bool mbDataOnRows; bool mbShowError; bool mbShowMissing; diff --git a/sc/source/filter/inc/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx index 148f447..cc86559 100644 --- a/sc/source/filter/inc/worksheetbuffer.hxx +++ b/sc/source/filter/inc/worksheetbuffer.hxx @@ -38,11 +38,10 @@ struct SheetInfoModel { OUString maRelId; /// Relation identifier for the sheet substream. OUString maName; /// Original name of the sheet. - sal_Int64 mnBiffHandle; /// BIFF record handle of the sheet substream. - sal_Int32 mnSheetId; /// Sheet identifier. - sal_Int32 mnState; /// Visibility state. + sal_Int32 mnSheetId; /// Sheet identifier. + sal_Int32 mnState; /// Visibility state. - explicit SheetInfoModel(); + explicit SheetInfoModel(); }; /** Stores information about all sheets in a spreadsheet document. diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx index 8798597..6b216df 100644 --- a/sc/source/filter/inc/xltracer.hxx +++ b/sc/source/filter/inc/xltracer.hxx @@ -60,15 +60,6 @@ enum XclTracerId eTraceLength /// this *should* always be the final entry }; -struct XclTracerDetails -{ - XclTracerId meProblemId; /// Excel Import Trace index. - sal_uInt32 mnID; /// actual ID Index trace tag Value - const sal_Char* mpContext; /// Context for problem e.g. Limits - const sal_Char* mpDetail; /// Context Detail e.g. SheetX - const sal_Char* mpProblem; /// Description of problem -}; - /** This class wraps an MSFilterTracer to create trace logs for import/export filters. */ class XclTracer { diff --git a/sc/source/filter/lotus/lotfilter.hxx b/sc/source/filter/lotus/lotfilter.hxx index 85acbdc..7a7f9f9 100644 --- a/sc/source/filter/lotus/lotfilter.hxx +++ b/sc/source/filter/lotus/lotfilter.hxx @@ -47,7 +47,6 @@ struct LotusContext SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter, *pAttrRepeat, *pAttrStandard; ScProtectionAttr* pAttrUnprot; - SfxUInt32Item** pAttrValForms; FormCache* pValueFormCache; // -> in memory.cxx initialisiert @@ -66,7 +65,6 @@ struct LotusContext , pAttrRepeat(nullptr) , pAttrStandard(nullptr) , pAttrUnprot(nullptr) - , pAttrValForms(nullptr) , pValueFormCache(nullptr) { } diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index cd03e08..b659394 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -318,8 +318,7 @@ ApiFilterSettings Top10Filter::finalizeImport( sal_Int32 /*nMaxCount*/ ) FilterCriterionModel::FilterCriterionModel() : mnOperator( XML_equal ), - mnDataType( BIFF_FILTER_DATATYPE_NONE ), - mnStrLen( 0 ) + mnDataType( BIFF_FILTER_DATATYPE_NONE ) { } diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index d126cf0..7198dc1 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -83,7 +83,6 @@ static sal_Int32 lcl_ToVertAlign( sal_Int32 nAlign ) CommentModel::CommentModel() : mnAuthorId(-1) - , mnObjId(BIFF_OBJ_INVALID_ID) , mbAutoFill(false) , mbAutoScale(false) , mbColHidden(false) diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index e57cf73..5b4a314 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -66,7 +66,6 @@ const sal_uInt16 BIFF12_EXTNAME_ICONIFIED = 0x0020; } // namespace ExternalNameModel::ExternalNameModel() : - mbBuiltIn( false ), mbNotify( false ), mbPreferPic( false ), mbStdDocName( false ), diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index f216b77..b17a896 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -265,18 +265,18 @@ const sal_uInt8 V = BIFF_TOKCLASS_VAL; const sal_uInt8 A = BIFF_TOKCLASS_ARR; // abbreviations for parameter infos -#define RO { FUNC_PARAM_REGULAR, FUNC_PARAMCONV_ORG, false } -#define RA { FUNC_PARAM_REGULAR, FUNC_PARAMCONV_ARR, false } -#define RR { FUNC_PARAM_REGULAR, FUNC_PARAMCONV_RPT, false } -#define RX { FUNC_PARAM_REGULAR, FUNC_PARAMCONV_RPX, false } -#define VO { FUNC_PARAM_REGULAR, FUNC_PARAMCONV_ORG, true } -#define VV { FUNC_PARAM_REGULAR, FUNC_PARAMCONV_VAL, true } -#define VA { FUNC_PARAM_REGULAR, FUNC_PARAMCONV_ARR, true } -#define VR { FUNC_PARAM_REGULAR, FUNC_PARAMCONV_RPT, true } -#define VX { FUNC_PARAM_REGULAR, FUNC_PARAMCONV_RPX, true } -#define RO_E { FUNC_PARAM_EXCELONLY, FUNC_PARAMCONV_ORG, false } -#define VR_E { FUNC_PARAM_EXCELONLY, FUNC_PARAMCONV_RPT, true } -#define C { FUNC_PARAM_CALCONLY, FUNC_PARAMCONV_ORG, false } +#define RO { FUNC_PARAM_REGULAR } +#define RA { FUNC_PARAM_REGULAR } +#define RR { FUNC_PARAM_REGULAR } +#define RX { FUNC_PARAM_REGULAR } +#define VO { FUNC_PARAM_REGULAR } +#define VV { FUNC_PARAM_REGULAR } +#define VA { FUNC_PARAM_REGULAR } +#define VR { FUNC_PARAM_REGULAR } +#define VX { FUNC_PARAM_REGULAR } +#define RO_E { FUNC_PARAM_EXCELONLY } +#define VR_E { FUNC_PARAM_EXCELONLY } +#define C { FUNC_PARAM_CALCONLY } // Note: parameter types of all macro sheet functions (FUNCFLAG_MACROFUNC/FUNCFLAG_MACROCMD) untested! diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index 4bed45c..7756ada 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -862,8 +862,6 @@ PTDefinitionModel::PTDefinitionModel() : mnPageWrap( 0 ), mnIndent( 1 ), mnChartFormat( 0 ), - mnRowFields( 0 ), - mnColFields( 0 ), mbDataOnRows( false ), mbShowError( false ), mbShowMissing( true ), diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index 6c3a0dd..e431919 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; SheetInfoModel::SheetInfoModel() : - mnBiffHandle( -1 ), mnSheetId( -1 ), mnState( XML_visible ) { diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index f1ebdc5..bdda325 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -364,8 +364,7 @@ ScXMLExport::ScXMLExport( nProgressCount(0), nCurrentTable(0), bHasRowHeader(false), - bRowHeaderOpen(false), - mbShowProgress( false ) + bRowHeaderOpen(false) { if (getExportFlags() & SvXMLExportFlags::CONTENT) { diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 2d91646..2d7e3f5 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -130,7 +130,6 @@ class ScXMLExport : public SvXMLExport sal_uInt16 nCurrentTable; bool bHasRowHeader; bool bRowHeaderOpen; - bool mbShowProgress; sal_Int32 GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const; void CollectSharedData(SCTAB& nTableCount, sal_Int32& nShapesCount); diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 4797821..f62f350 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -3094,11 +3094,10 @@ class RangeNameInserter : public ::std::unary_function<ScMyNamedExpression, void { ScDocument* mpDoc; ScRangeName& mrRangeName; - ScXMLImport& mrXmlImport; public: - RangeNameInserter(ScDocument* pDoc, ScRangeName& rRangeName, ScXMLImport& rXmlImport) : - mpDoc(pDoc), mrRangeName(rRangeName), mrXmlImport(rXmlImport) {} + RangeNameInserter(ScDocument* pDoc, ScRangeName& rRangeName) : + mpDoc(pDoc), mrRangeName(rRangeName) {} void operator() (const std::unique_ptr<ScMyNamedExpression>& p) const { @@ -3148,7 +3147,7 @@ void ScXMLImport::SetNamedRanges() // Insert the namedRanges ScRangeName* pRangeNames = pDoc->GetRangeName(); - ::std::for_each(pNamedExpressions->begin(), pNamedExpressions->end(), RangeNameInserter(pDoc, *pRangeNames, *this)); + ::std::for_each(pNamedExpressions->begin(), pNamedExpressions->end(), RangeNameInserter(pDoc, *pRangeNames)); } void ScXMLImport::SetSheetNamedRanges() @@ -3164,7 +3163,7 @@ void ScXMLImport::SetSheetNamedRanges() continue; const ScMyNamedExpressions& rNames = *itr.second; - ::std::for_each(rNames.begin(), rNames.end(), RangeNameInserter(pDoc, *pRangeNames, *this)); + ::std::for_each(rNames.begin(), rNames.end(), RangeNameInserter(pDoc, *pRangeNames)); } } diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index b87e82a..882f1f0 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -767,7 +767,6 @@ class SolarMutexGuard; struct tScMyCellRange { - SCTAB Sheet; sal_Int32 StartColumn, EndColumn; sal_Int32 StartRow, EndRow; }; @@ -836,7 +835,6 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable mutable std::unique_ptr<ScXMLEditAttributeMap> mpEditAttrMap; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - std::list<SvXMLImportContext*> aViewContextList; ScMyStylesImportHelper* pStylesImportHelper; OUString sNumberFormat; OUString sLocale; diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 99a6f51..5181bcc 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2645,7 +2645,6 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : nDocumentLock ( 0 ), nCanUpdate (css::document::UpdateDocMode::ACCORDING_TO_CONFIG), pOldAutoDBRange ( nullptr ), - pDocHelper ( nullptr ), pAutoStyleList ( nullptr ), pPaintLockData ( nullptr ), pSolverSaveData ( nullptr ), @@ -2690,7 +2689,6 @@ ScDocShell::ScDocShell( const SfxModelFlags i_nSfxCreationFlags ) : nDocumentLock ( 0 ), nCanUpdate (css::document::UpdateDocMode::ACCORDING_TO_CONFIG), pOldAutoDBRange ( nullptr ), - pDocHelper ( nullptr ), pAutoStyleList ( nullptr ), pPaintLockData ( nullptr ), pSolverSaveData ( nullptr ), diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx b/sc/source/ui/docshell/documentlinkmgr.cxx index 87bcae2..9609781 100644 --- a/sc/source/ui/docshell/documentlinkmgr.cxx +++ b/sc/source/ui/docshell/documentlinkmgr.cxx @@ -33,13 +33,12 @@ namespace sc { struct DocumentLinkManagerImpl : boost::noncopyable { - ScDocument& mrDoc; SfxObjectShell* mpShell; std::unique_ptr<DataStream> mpDataStream; std::unique_ptr<sfx2::LinkManager> mpLinkManager; - DocumentLinkManagerImpl( ScDocument& rDoc, SfxObjectShell* pShell ) : - mrDoc(rDoc), mpShell(pShell), mpDataStream(nullptr), mpLinkManager(nullptr) {} + DocumentLinkManagerImpl( SfxObjectShell* pShell ) : + mpShell(pShell), mpDataStream(nullptr), mpLinkManager(nullptr) {} ~DocumentLinkManagerImpl() { @@ -56,8 +55,8 @@ struct DocumentLinkManagerImpl : boost::noncopyable } }; -DocumentLinkManager::DocumentLinkManager( ScDocument& rDoc, SfxObjectShell* pShell ) : - mpImpl(new DocumentLinkManagerImpl(rDoc, pShell)) {} +DocumentLinkManager::DocumentLinkManager( SfxObjectShell* pShell ) : + mpImpl(new DocumentLinkManagerImpl(pShell)) {} DocumentLinkManager::~DocumentLinkManager() { diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 1d1edfd..0c0ba7d 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -102,8 +102,6 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener ScDBData* pOldAutoDBRange; - ScSbxDocHelper* pDocHelper; - ScAutoStyleList* pAutoStyleList; ScPaintLockData* pPaintLockData; ScOptSolverSave* pSolverSaveData; diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 3af7fcb..4e0172e 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -161,9 +161,6 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou SvtScriptType nPageScript; - long nLastClickX; - long nLastClickY; - SCCOL nDragStartX; SCROW nDragStartY; SCCOL nDragEndX; diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 03b1882..c5606ba 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -83,7 +83,6 @@ private: OUString maTextNotPassProtected; OUString maTextHashBad; OUString maTextHashGood; - OUString maTextHashRegen; DECL_LINK_TYPED( OKHdl, Button*, void ); DECL_LINK_TYPED( RetypeBtnHdl, Button*, void ); @@ -96,7 +95,6 @@ private: ::std::vector<TableItem> maTableItems; DocProtectionPtr mpDocItem; - size_t mnCurScrollPos; ScPasswordHash meDesiredHash; }; diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 24c9c83..cb1819b 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -95,9 +95,8 @@ class SC_DLLPUBLIC ScTabViewShell: public SfxViewShell, public ScDBFunc private: SvxHtmlOptions aHTMLOpt; ObjectSelectionType eCurOST; - sal_uInt16 nDrawSfxId; - sal_uInt16 nCtrlSfxId; - sal_uInt16 nFormSfxId; + sal_uInt16 nDrawSfxId; + sal_uInt16 nFormSfxId; OUString sDrawCustom; // current custom shape type ScDrawShell* pDrawShell; ScDrawTextObjectBar* pDrawTextShell; @@ -149,18 +148,14 @@ private: bool bDontSwitch; // Don't turn off EditShell bool bInFormatDialog; // for GetSelectionText - bool bPrintSelected; // for result of SvxPrtQryBox bool bReadOnly; // to detect status changes bool bIsActive; - SbxObject* pScSbxObject; - bool bChartAreaValid; // if chart is drawn bool bForceFocusOnCurCell; // #i123629# - OUString aEditChartName; ScRangeListRef aChartSource; Rectangle aChartPos; SCTAB nChartDestTab; diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index e7ccc2d..8730f29 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -32,10 +32,8 @@ ScRetypePassDlg::ScRetypePassDlg(vcl::Window* pParent) : maTextNotPassProtected(ScResId(STR_NOT_PASS_PROTECTED)), maTextHashBad(ScResId(STR_HASH_BAD)), maTextHashGood(ScResId(STR_HASH_GOOD)), - maTextHashRegen(ScResId(STR_HASH_REGENERATED)), mpDocItem(static_cast<ScDocProtection*>(nullptr)), - mnCurScrollPos(0), meDesiredHash(PASSHASH_SHA1) { get(mpBtnOk ,"ok"); diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 1d06251..c7f2ffc 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -79,9 +79,6 @@ private: OUString maSoftware; ScCalcConfig maConfig; -#if HAVE_FEATURE_OPENCL - std::vector<OpenCLPlatformInfo> maPlatformInfo; -#endif bool mbSelectedEmptyStringAsZero; bool mbWriteConfig; diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index d60d937..a57f136 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -101,7 +101,6 @@ using ::com::sun::star::uno::UNO_QUERY; /** Global application settings shared by all open workbooks. */ struct ScVbaAppSettings { - sal_Int32 mnCalculation; bool mbDisplayAlerts; bool mbEnableEvents; bool mbExcel4Menus; @@ -112,7 +111,6 @@ struct ScVbaAppSettings }; ScVbaAppSettings::ScVbaAppSettings() : - mnCalculation( excel::XlCalculation::xlCalculationAutomatic ), mbDisplayAlerts( true ), mbEnableEvents( true ), mbExcel4Menus( false ), diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 5eca603..e2d8ff0 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -476,8 +476,6 @@ ScGridWindow::ScGridWindow( vcl::Window* pParent, ScViewData* pData, ScSplitPos nPagebreakBreak( 0 ), nPagebreakPrev( 0 ), nPageScript( SvtScriptType::NONE ), - nLastClickX( 0 ), - nLastClickY( 0 ), nDragStartX( -1 ), nDragStartY( -1 ), nDragEndX( -1 ), diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index faa12b4..5a6413e 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1632,8 +1632,6 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, ScDBFunc( &pViewFrame->GetWindow(), static_cast<ScDocShell&>(*pViewFrame->GetObjectShell()), this ), eCurOST(OST_NONE), nDrawSfxId(0), - nCtrlSfxId(USHRT_MAX), - nFormSfxId(USHRT_MAX), pDrawShell(nullptr), pDrawTextShell(nullptr), pEditShell(nullptr), @@ -1667,9 +1665,7 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, bFormShellAtTop(false), bDontSwitch(false), bInFormatDialog(false), - bPrintSelected(false), bReadOnly(false), - pScSbxObject(nullptr), bChartAreaValid(false), bForceFocusOnCurCell(false), nCurRefDlgId(0), commit 56b2a2d874c5c74af0eb02d6d542f4dc9d748870 Author: Noel Grandin <[email protected]> Date: Fri Nov 20 15:22:53 2015 +0200 loplugin:unusedfields in oox,package,reportdesign Change-Id: I83d03dcc76b5f0d54ebb0513ae972acb0db8eef1 diff --git a/oox/inc/drawingml/chart/chartspacefragment.hxx b/oox/inc/drawingml/chart/chartspacefragment.hxx index 929f4d0..59abb1b 100644 --- a/oox/inc/drawingml/chart/chartspacefragment.hxx +++ b/oox/inc/drawingml/chart/chartspacefragment.hxx @@ -42,8 +42,6 @@ public: virtual ~ChartSpaceFragment(); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; - - ::oox::core::XmlFilterBase& mpFilterBase; }; diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index aa202ff..709c627 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -164,7 +164,6 @@ struct XmlFilterBaseImpl Reference<XComponentContext> mxContext; FastParser maFastParser; const OUString maBinSuffix; - const OUString maVmlSuffix; RelationsMap maRelationsMap; TextFieldStack maTextFieldStack; @@ -175,8 +174,7 @@ struct XmlFilterBaseImpl XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) : mxContext(rxContext), maFastParser( rxContext ), - maBinSuffix( ".bin" ), - maVmlSuffix( ".vml" ) + maBinSuffix( ".bin" ) { // register XML namespaces registerNamespaces(maFastParser); diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx index b55ce0d..5daef00 100644 --- a/oox/source/drawingml/chart/chartspacefragment.cxx +++ b/oox/source/drawingml/chart/chartspacefragment.cxx @@ -32,8 +32,7 @@ namespace chart { using namespace ::oox::core; ChartSpaceFragment::ChartSpaceFragment( XmlFilterBase& rFilter, const OUString& rFragmentPath, ChartSpaceModel& rModel ) : - FragmentBase< ChartSpaceModel >( rFilter, rFragmentPath, rModel ), - mpFilterBase(rFilter) + FragmentBase< ChartSpaceModel >( rFilter, rFragmentPath, rModel ) { } diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index 68980c4..f0ec8db 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -56,7 +56,6 @@ class ZipFile protected: ::osl::Mutex m_aMutex; - OUString sComment; /* zip file comment */ EntryHash aEntries; ByteGrabber aGrabber; ZipUtils::Inflater aInflater; diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index eb8ed2b..7cc2866 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -33,63 +33,59 @@ using namespace com::sun::star; using namespace std; ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManVector ) -: bIgnoreEncryptData ( false ) -, nDerivedKeySize( 0 ) -, rManVector ( rNewManVector ) - -, sFileEntryElement ( ELEMENT_FILE_ENTRY ) -, sManifestElement ( ELEMENT_MANIFEST ) -, sEncryptionDataElement( ELEMENT_ENCRYPTION_DATA ) -, sAlgorithmElement ( ELEMENT_ALGORITHM ) -, sStartKeyAlgElement ( ELEMENT_START_KEY_GENERATION ) -, sKeyDerivationElement( ELEMENT_KEY_DERIVATION ) - -, sCdataAttribute ( ATTRIBUTE_CDATA ) -, sMediaTypeAttribute ( ATTRIBUTE_MEDIA_TYPE ) -, sVersionAttribute ( ATTRIBUTE_VERSION ) -, sFullPathAttribute ( ATTRIBUTE_FULL_PATH ) -, sSizeAttribute ( ATTRIBUTE_SIZE ) -, sSaltAttribute ( ATTRIBUTE_SALT ) -, sInitialisationVectorAttribute ( ATTRIBUTE_INITIALISATION_VECTOR ) -, sIterationCountAttribute ( ATTRIBUTE_ITERATION_COUNT ) -, sKeySizeAttribute ( ATTRIBUTE_KEY_SIZE ) -, sAlgorithmNameAttribute ( ATTRIBUTE_ALGORITHM_NAME ) -, sStartKeyAlgNameAttribute ( ATTRIBUTE_START_KEY_GENERATION_NAME ) -, sKeyDerivationNameAttribute ( ATTRIBUTE_KEY_DERIVATION_NAME ) -, sChecksumAttribute ( ATTRIBUTE_CHECKSUM ) -, sChecksumTypeAttribute ( ATTRIBUTE_CHECKSUM_TYPE ) - -, sFullPathProperty ( "FullPath" ) -, sMediaTypeProperty ( "MediaType" ) -, sVersionProperty ( "Version" ) -, sIterationCountProperty ( "IterationCount" ) -, sDerivedKeySizeProperty ( "DerivedKeySize" ) -, sSaltProperty ( "Salt" ) -, sInitialisationVectorProperty ( "InitialisationVector" ) -, sSizeProperty ( "Size" ) -, sDigestProperty ( "Digest" ) -, sEncryptionAlgProperty ( "EncryptionAlgorithm" ) -, sStartKeyAlgProperty ( "StartKeyAlgorithm" ) -, sDigestAlgProperty ( "DigestAlgorithm" ) - -, sWhiteSpace ( " " ) - -, sSHA256_URL ( SHA256_URL ) -, sSHA1_Name ( SHA1_NAME ) -, sSHA1_URL ( SHA1_URL ) - -, sSHA256_1k_URL ( SHA256_1K_URL ) -, sSHA1_1k_Name ( SHA1_1K_NAME ) -, sSHA1_1k_URL ( SHA1_1K_URL ) - -, sBlowfish_Name ( BLOWFISH_NAME ) -, sBlowfish_URL ( BLOWFISH_URL ) -, sAES128_URL ( AES128_URL ) -, sAES192_URL ( AES192_URL ) -, sAES256_URL ( AES256_URL ) - -, sPBKDF2_Name ( PBKDF2_NAME ) -, sPBKDF2_URL ( PBKDF2_URL ) + : bIgnoreEncryptData ( false ) + , nDerivedKeySize( 0 ) + , rManVector ( rNewManVector ) + + , sFileEntryElement ( ELEMENT_FILE_ENTRY ) + , sEncryptionDataElement( ELEMENT_ENCRYPTION_DATA ) + , sAlgorithmElement ( ELEMENT_ALGORITHM ) + , sStartKeyAlgElement ( ELEMENT_START_KEY_GENERATION ) + , sKeyDerivationElement( ELEMENT_KEY_DERIVATION ) + + , sMediaTypeAttribute ( ATTRIBUTE_MEDIA_TYPE ) + , sVersionAttribute ( ATTRIBUTE_VERSION ) + , sFullPathAttribute ( ATTRIBUTE_FULL_PATH ) + , sSizeAttribute ( ATTRIBUTE_SIZE ) + , sSaltAttribute ( ATTRIBUTE_SALT ) + , sInitialisationVectorAttribute ( ATTRIBUTE_INITIALISATION_VECTOR ) + , sIterationCountAttribute ( ATTRIBUTE_ITERATION_COUNT ) + , sKeySizeAttribute ( ATTRIBUTE_KEY_SIZE ) + , sAlgorithmNameAttribute ( ATTRIBUTE_ALGORITHM_NAME ) + , sStartKeyAlgNameAttribute ( ATTRIBUTE_START_KEY_GENERATION_NAME ) + , sKeyDerivationNameAttribute ( ATTRIBUTE_KEY_DERIVATION_NAME ) + , sChecksumAttribute ( ATTRIBUTE_CHECKSUM ) + , sChecksumTypeAttribute ( ATTRIBUTE_CHECKSUM_TYPE ) + + , sFullPathProperty ( "FullPath" ) + , sMediaTypeProperty ( "MediaType" ) + , sVersionProperty ( "Version" ) + , sIterationCountProperty ( "IterationCount" ) + , sDerivedKeySizeProperty ( "DerivedKeySize" ) + , sSaltProperty ( "Salt" ) + , sInitialisationVectorProperty ( "InitialisationVector" ) + , sSizeProperty ( "Size" ) + , sDigestProperty ( "Digest" ) + , sEncryptionAlgProperty ( "EncryptionAlgorithm" ) + , sStartKeyAlgProperty ( "StartKeyAlgorithm" ) + , sDigestAlgProperty ( "DigestAlgorithm" ) + + , sSHA256_URL ( SHA256_URL ) + , sSHA1_Name ( SHA1_NAME ) + , sSHA1_URL ( SHA1_URL ) + + , sSHA256_1k_URL ( SHA256_1K_URL ) + , sSHA1_1k_Name ( SHA1_1K_NAME ) + , sSHA1_1k_URL ( SHA1_1K_URL ) + + , sBlowfish_Name ( BLOWFISH_NAME ) + , sBlowfish_URL ( BLOWFISH_URL ) + , sAES128_URL ( AES128_URL ) + , sAES192_URL ( AES192_URL ) + , sAES256_URL ( AES256_URL ) + + , sPBKDF2_Name ( PBKDF2_NAME ) + , sPBKDF2_URL ( PBKDF2_URL ) { aStack.reserve( 10 ); } @@ -99,17 +95,17 @@ ManifestImport::~ManifestImport() } void SAL_CALL ManifestImport::startDocument( ) - throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) +throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } void SAL_CALL ManifestImport::endDocument( ) - throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) +throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } void ManifestImport::doFileEntry(StringHashMap &rConvertedAttribs) - throw( uno::RuntimeException ) +throw( uno::RuntimeException ) { aSequence.resize(PKG_SIZE_ENCR_MNFST); @@ -119,15 +115,13 @@ void ManifestImport::doFileEntry(StringHashMap &rConvertedAttribs) aSequence[PKG_MNFST_MEDIATYPE].Value <<= rConvertedAttribs[sMediaTypeAttribute]; OUString sVersion = rConvertedAttribs[sVersionAttribute]; - if ( sVersion.getLength() ) - { + if ( sVersion.getLength() ) { aSequence[PKG_MNFST_VERSION].Name = sVersionProperty; aSequence[PKG_MNFST_VERSION].Value <<= sVersion; } OUString sSize = rConvertedAttribs[sSizeAttribute]; - if ( sSize.getLength() ) - { + if ( sSize.getLength() ) { sal_Int64 nSize = sSize.toInt64(); aSequence[PKG_MNFST_UCOMPSIZE].Name = sSizeProperty; aSequence[PKG_MNFST_UCOMPSIZE].Value <<= nSize; @@ -135,29 +129,23 @@ void ManifestImport::doFileEntry(StringHashMap &rConvertedAttribs) } void ManifestImport::doEncryptionData(StringHashMap &rConvertedAttribs) - throw( uno::RuntimeException ) +throw( uno::RuntimeException ) { // If this element exists, then this stream is encrypted and we need // to import the initialisation vector, salt and iteration count used nDerivedKeySize = 0; OUString aString = rConvertedAttribs[sChecksumTypeAttribute]; - if ( !bIgnoreEncryptData ) - { - if ( aString.equals( sSHA1_1k_Name ) || aString.equals( sSHA1_1k_URL ) ) - { + if ( !bIgnoreEncryptData ) { + if ( aString.equals( sSHA1_1k_Name ) || aString.equals( sSHA1_1k_URL ) ) { aSequence[PKG_MNFST_DIGESTALG].Name = sDigestAlgProperty; aSequence[PKG_MNFST_DIGESTALG].Value <<= xml::crypto::DigestID::SHA1_1K; - } - else if ( aString.equals( sSHA256_1k_URL ) ) - { + } else if ( aString.equals( sSHA256_1k_URL ) ) { aSequence[PKG_MNFST_DIGESTALG].Name = sDigestAlgProperty; aSequence[PKG_MNFST_DIGESTALG].Value <<= xml::crypto::DigestID::SHA256_1K; - } - else + } else bIgnoreEncryptData = true; - if ( !bIgnoreEncryptData ) - { + if ( !bIgnoreEncryptData ) { aString = rConvertedAttribs[sChecksumAttribute]; uno::Sequence < sal_Int8 > aDecodeBuffer; ::sax::Converter::decodeBase64(aDecodeBuffer, aString); @@ -168,42 +156,32 @@ void ManifestImport::doEncryptionData(StringHashMap &rConvertedAttribs) } void ManifestImport::doAlgorithm(StringHashMap &rConvertedAttribs) - throw( uno::RuntimeException ) +throw( uno::RuntimeException ) { - if ( !bIgnoreEncryptData ) - { + if ( !bIgnoreEncryptData ) { OUString aString = rConvertedAttribs[sAlgorithmNameAttribute]; - if ( aString.equals( sBlowfish_Name ) || aString.equals( sBlowfish_URL ) ) - { + if ( aString.equals( sBlowfish_Name ) || aString.equals( sBlowfish_URL ) ) { aSequence[PKG_MNFST_ENCALG].Name = sEncryptionAlgProperty; aSequence[PKG_MNFST_ENCALG].Value <<= xml::crypto::CipherID::BLOWFISH_CFB_8; - } - else if ( aString.equals( sAES256_URL ) ) - { + } else if ( aString.equals( sAES256_URL ) ) { aSequence[PKG_MNFST_ENCALG].Name = sEncryptionAlgProperty; aSequence[PKG_MNFST_ENCALG].Value <<= xml::crypto::CipherID::AES_CBC_W3C_PADDING; OSL_ENSURE( !nDerivedKeySize || nDerivedKeySize == 32, "Unexpected derived key length!" ); nDerivedKeySize = 32; - } - else if ( aString.equals( sAES192_URL ) ) - { + } else if ( aString.equals( sAES192_URL ) ) { aSequence[PKG_MNFST_ENCALG].Name = sEncryptionAlgProperty; aSequence[PKG_MNFST_ENCALG].Value <<= xml::crypto::CipherID::AES_CBC_W3C_PADDING; OSL_ENSURE( !nDerivedKeySize || nDerivedKeySize == 24, "Unexpected derived key length!" ); nDerivedKeySize = 24; - } - else if ( aString.equals( sAES128_URL ) ) - { + } else if ( aString.equals( sAES128_URL ) ) { aSequence[PKG_MNFST_ENCALG].Name = sEncryptionAlgProperty; aSequence[PKG_MNFST_ENCALG].Value <<= xml::crypto::CipherID::AES_CBC_W3C_PADDING; OSL_ENSURE( !nDerivedKeySize || nDerivedKeySize == 16, "Unexpected derived key length!" ); nDerivedKeySize = 16; - } - else + } else bIgnoreEncryptData = true; - if ( !bIgnoreEncryptData ) - { + if ( !bIgnoreEncryptData ) { aString = rConvertedAttribs[sInitialisationVectorAttribute]; uno::Sequence < sal_Int8 > aDecodeBuffer; ::sax::Converter::decodeBase64(aDecodeBuffer, aString); @@ -214,13 +192,11 @@ void ManifestImport::doAlgorithm(StringHashMap &rConvertedAttribs) } void ManifestImport::doKeyDerivation(StringHashMap &rConvertedAttribs) - throw( uno::RuntimeException ) +throw( uno::RuntimeException ) { - if ( !bIgnoreEncryptData ) - { + if ( !bIgnoreEncryptData ) { OUString aString = rConvertedAttribs[sKeyDerivationNameAttribute]; - if ( aString.equals( sPBKDF2_Name ) || aString.equals( sPBKDF2_URL ) ) - { + if ( aString.equals( sPBKDF2_Name ) || aString.equals( sPBKDF2_URL ) ) { aString = rConvertedAttribs[sSaltAttribute]; uno::Sequence < sal_Int8 > aDecodeBuffer; ::sax::Converter::decodeBase64(aDecodeBuffer, aString); @@ -232,45 +208,38 @@ void ManifestImport::doKeyDerivation(StringHashMap &rConvertedAttribs) aSequence[PKG_MNFST_ITERATION].Value <<= aString.toInt32(); aString = rConvertedAttribs[sKeySizeAttribute]; - if ( aString.getLength() ) - { + if ( aString.getLength() ) { sal_Int32 nKey = aString.toInt32(); OSL_ENSURE( !nDerivedKeySize || nKey == nDerivedKeySize , "Provided derived key length differs from the expected one!" ); nDerivedKeySize = nKey; - } - else if ( !nDerivedKeySize ) + } else if ( !nDerivedKeySize ) nDerivedKeySize = 16; else if ( nDerivedKeySize != 16 ) OSL_ENSURE( false, "Default derived key length differs from the expected one!" ); aSequence[PKG_MNFST_DERKEYSIZE].Name = sDerivedKeySizeProperty; aSequence[PKG_MNFST_DERKEYSIZE].Value <<= nDerivedKeySize; - } - else + } else bIgnoreEncryptData = true; } } void ManifestImport::doStartKeyAlg(StringHashMap &rConvertedAttribs) - throw( uno::RuntimeException ) +throw( uno::RuntimeException ) { OUString aString = rConvertedAttribs[sStartKeyAlgNameAttribute]; - if ( aString.equals( sSHA256_URL ) ) - { + if ( aString.equals( sSHA256_URL ) ) { aSequence[PKG_MNFST_STARTALG].Name = sStartKeyAlgProperty; aSequence[PKG_MNFST_STARTALG].Value <<= xml::crypto::DigestID::SHA256; - } - else if ( aString.equals( sSHA1_Name ) || aString.equals( sSHA1_URL ) ) - { + } else if ( aString.equals( sSHA1_Name ) || aString.equals( sSHA1_URL ) ) { aSequence[PKG_MNFST_STARTALG].Name = sStartKeyAlgProperty; aSequence[PKG_MNFST_STARTALG].Value <<= xml::crypto::DigestID::SHA1; - } - else + } else bIgnoreEncryptData = true; } void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) - throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) +throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { StringHashMap aConvertedAttribs; OUString aConvertedName = PushNameAndNamespaces( aName, xAttribs, aConvertedAttribs ); @@ -279,77 +248,70 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re assert(nLevel >= 1); - switch (nLevel) - { - case 1: - { - if (aConvertedName != ELEMENT_MANIFEST) //manifest:manifest - aStack.back().m_bValid = false; - break; - } - case 2: - { - if (aConvertedName == sFileEntryElement) //manifest:file-entry - doFileEntry(aConvertedAttribs); - else - aStack.back().m_bValid = false; - break; - } - case 3: - { - ManifestStack::reverse_iterator aIter = aStack.rbegin(); - ++aIter; - - if (!aIter->m_bValid) - aStack.back().m_bValid = false; - else if (aConvertedName.equals(sEncryptionDataElement)) //manifest:encryption-data - doEncryptionData(aConvertedAttribs); - else - aStack.back().m_bValid = false; - break; - } - case 4: - { - ManifestStack::reverse_iterator aIter = aStack.rbegin(); - ++aIter; - - if (!aIter->m_bValid) - aStack.back().m_bValid = false; - else if (aConvertedName.equals(sAlgorithmElement)) //manifest:algorithm, - doAlgorithm(aConvertedAttribs); - else if (aConvertedName.equals(sKeyDerivationElement)) //manifest:key-derivation, - doKeyDerivation(aConvertedAttribs); - else if (aConvertedName.equals(sStartKeyAlgElement)) //manifest:start-key-generation - doStartKeyAlg(aConvertedAttribs); - else - aStack.back().m_bValid = false; - break; - } - default: + switch (nLevel) { + case 1: { + if (aConvertedName != ELEMENT_MANIFEST) //manifest:manifest aStack.back().m_bValid = false; - break; + break; + } + case 2: { + if (aConvertedName == sFileEntryElement) //manifest:file-entry + doFileEntry(aConvertedAttribs); + else + aStack.back().m_bValid = false; + break; + } + case 3: { + ManifestStack::reverse_iterator aIter = aStack.rbegin(); + ++aIter; + + if (!aIter->m_bValid) + aStack.back().m_bValid = false; + else if (aConvertedName.equals(sEncryptionDataElement)) //manifest:encryption-data + doEncryptionData(aConvertedAttribs); + else + aStack.back().m_bValid = false; + break; + } + case 4: { + ManifestStack::reverse_iterator aIter = aStack.rbegin(); + ++aIter; + + if (!aIter->m_bValid) + aStack.back().m_bValid = false; + else if (aConvertedName.equals(sAlgorithmElement)) //manifest:algorithm, + doAlgorithm(aConvertedAttribs); + else if (aConvertedName.equals(sKeyDerivationElement)) //manifest:key-derivation, + doKeyDerivation(aConvertedAttribs); + else if (aConvertedName.equals(sStartKeyAlgElement)) //manifest:start-key-generation + doStartKeyAlg(aConvertedAttribs); + else + aStack.back().m_bValid = false; + break; + } + default: + aStack.back().m_bValid = false; + break; } } namespace { - bool isEmpty(const css::beans::PropertyValue &rProp) - { - return rProp.Name.isEmpty(); - } +bool isEmpty(const css::beans::PropertyValue &rProp) +{ + return rProp.Name.isEmpty(); +} } void SAL_CALL ManifestImport::endElement( const OUString& aName ) - throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) +throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { OUString aConvertedName = ConvertName( aName ); - if ( !aStack.empty() && aStack.rbegin()->m_aConvertedName.equals( aConvertedName ) ) - { - if ( aConvertedName.equals( sFileEntryElement ) && aStack.back().m_bValid ) - { + if ( !aStack.empty() && aStack.rbegin()->m_aConvertedName.equals( aConvertedName ) ) { + if ( aConvertedName.equals( sFileEntryElement ) && aStack.back().m_bValid ) { css::beans::PropertyValue aEmpty; aSequence.erase(std::remove_if(aSequence.begin(), aSequence.end(), - isEmpty), aSequence.end()); + isEmpty), aSequence.end()); bIgnoreEncryptData = false; rManVector.push_back ( comphelper::containerToSequence(aSequence) ); @@ -362,22 +324,22 @@ void SAL_CALL ManifestImport::endElement( const OUString& aName ) } void SAL_CALL ManifestImport::characters( const OUString& /*aChars*/ ) - throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) +throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } void SAL_CALL ManifestImport::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) - throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) +throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } void SAL_CALL ManifestImport::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) - throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) +throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ ) - throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) +throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } @@ -386,25 +348,20 @@ OUString ManifestImport::PushNameAndNamespaces( const OUString& aName, const uno StringHashMap aNamespaces; ::std::vector< ::std::pair< OUString, OUString > > aAttribsStrs; - if ( xAttribs.is() ) - { + if ( xAttribs.is() ) { sal_Int16 nAttrCount = xAttribs.is() ? xAttribs->getLength() : 0; aAttribsStrs.reserve( nAttrCount ); - for( sal_Int16 nInd = 0; nInd < nAttrCount; nInd++ ) - { + for( sal_Int16 nInd = 0; nInd < nAttrCount; nInd++ ) { OUString aAttrName = xAttribs->getNameByIndex( nInd ); OUString aAttrValue = xAttribs->getValueByIndex( nInd ); if ( aAttrName.getLength() >= 5 - && aAttrName.startsWith("xmlns") - && ( aAttrName.getLength() == 5 || aAttrName[5] == ':' ) ) - { + && aAttrName.startsWith("xmlns") + && ( aAttrName.getLength() == 5 || aAttrName[5] == ':' ) ) { // this is a namespace declaration OUString aNsName( ( aAttrName.getLength() == 5 ) ? OUString() : aAttrName.copy( 6 ) ); aNamespaces[aNsName] = aAttrValue; - } - else - { + } else { // this is no namespace declaration aAttribsStrs.push_back( pair< OUString, OUString >( aAttrName, aAttrValue ) ); } @@ -417,8 +374,7 @@ OUString ManifestImport::PushNameAndNamespaces( const OUString& aName, const uno aStack.push_back( ManifestScopeEntry( aConvertedName, aNamespaces ) ); - for ( size_t nInd = 0; nInd < aAttribsStrs.size(); nInd++ ) - { + for ( size_t nInd = 0; nInd < aAttribsStrs.size(); nInd++ ) { // convert the attribute names on filling o_aConvertedAttribs[ConvertName( aAttribsStrs[nInd].first )] = aAttribsStrs[nInd].second; } @@ -432,8 +388,7 @@ OUString ManifestImport::ConvertNameWithNamespace( const OUString& aName, const OUString aPureName = aName; sal_Int32 nInd = aName.indexOf( ( sal_Unicode )':' ); - if ( nInd != -1 && nInd < aName.getLength() ) - { + if ( nInd != -1 && nInd < aName.getLength() ) { aNsAlias = aName.copy( 0, nInd ); aPureName = aName.copy( nInd + 1 ); } @@ -442,8 +397,7 @@ OUString ManifestImport::ConvertNameWithNamespace( const OUString& aName, const StringHashMap::const_iterator aIter = aNamespaces.find( aNsAlias ); if ( aIter != aNamespaces.end() - && ( aIter->second == MANIFEST_NAMESPACE || aIter->second == MANIFEST_OASIS_NAMESPACE ) ) - { + && ( aIter->second == MANIFEST_NAMESPACE || aIter->second == MANIFEST_OASIS_NAMESPACE ) ) { // no check for manifest.xml consistency currently since the old versions have supported inconsistent documents as well aResult = MANIFEST_NSPREFIX; aResult += aPureName; @@ -455,8 +409,7 @@ OUString ManifestImport::ConvertNameWithNamespace( const OUString& aName, const OUString ManifestImport::ConvertName( const OUString& aName ) { OUString aConvertedName; - for ( ManifestStack::reverse_iterator aIter = aStack.rbegin(); !aConvertedName.getLength() && aIter != aStack.rend(); ++aIter ) - { + for ( ManifestStack::reverse_iterator aIter = aStack.rbegin(); !aConvertedName.getLength() && aIter != aStack.rend(); ++aIter ) { if ( !aIter->m_aNamespaces.empty() ) aConvertedName = ConvertNameWithNamespace( aName, aIter->m_aNamespaces ); } diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index e62c401..1948496 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -61,13 +61,11 @@ protected: ::std::vector < css::uno::Sequence < css::beans::PropertyValue > > & rManVector; const OUString sFileEntryElement; - const OUString sManifestElement; const OUString sEncryptionDataElement; const OUString sAlgorithmElement; const OUString sStartKeyAlgElement; const OUString sKeyDerivationElement; - const OUString sCdataAttribute; const OUString sMediaTypeAttribute; const OUString sVersionAttribute; const OUString sFullPathAttribute; @@ -95,8 +93,6 @@ protected: const OUString sStartKeyAlgProperty; const OUString sDigestAlgProperty; - const OUString sWhiteSpace; - const OUString sSHA256_URL; const OUString sSHA1_Name; const OUString sSHA1_URL; diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 2ce1c6b..2d474f1 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -65,7 +65,6 @@ OFormatProperties::OFormatProperties() ,nFontRelief(0) ,nTextColor(0) ,nTextLineColor(0) - ,nCharUnderlineColor(0xFFFFFFFF) ,nBackgroundColor(COL_TRANSPARENT) ,aVerticalAlignment( style::VerticalAlignment_TOP ) ,nCharEscapement(0) diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx index 9325578..eca3b21 100644 --- a/reportdesign/source/core/inc/ReportControlModel.hxx +++ b/reportdesign/source/core/inc/ReportControlModel.hxx @@ -53,7 +53,6 @@ namespace reportdesign ::sal_Int16 nFontRelief; ::sal_Int32 nTextColor; ::sal_Int32 nTextLineColor; - ::sal_Int32 nCharUnderlineColor; ::sal_Int32 nBackgroundColor; OUString sCharCombinePrefix; OUString sCharCombineSuffix; diff --git a/reportdesign/source/filter/xml/xmlComponent.hxx b/reportdesign/source/filter/xml/xmlComponent.hxx index 2b448b4..53cbc63 100644 --- a/reportdesign/source/filter/xml/xmlComponent.hxx +++ b/reportdesign/source/filter/xml/xmlComponent.hxx @@ -30,7 +30,6 @@ namespace rptxml { protected: css::uno::Reference< css::report::XReportComponent > m_xComponent; - OUString m_sName; OUString m_sTextStyleName; OXMLComponent(const OXMLComponent&); diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index 2222170..8e1da57 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -93,13 +93,6 @@ public: {} }; typedef ::std::pair< OUString ,OUString> TStringPair; - typedef struct - { - OUString sText; - OUString sField; - OUString sDecimal; - OUString sThousand; - } TDelimiter; typedef ::std::vector< OUString> TStringVec; typedef ::std::map< Reference<XPropertySet> ,OUString > TPropertyStyleMap; typedef ::std::map< Reference<XPropertySet> , TStringVec> TGridStyleMap; @@ -109,8 +102,6 @@ public: typedef ::std::map< Reference<XGroup> ,Reference<XFunction> > TGroupFunctionMap; private: ::std::unique_ptr< TStringPair > m_aAutoIncrement; - ::std::unique_ptr< TDelimiter > m_aDelimiter; - ::std::vector< Any > m_aDataSourceSettings; TSectionsGrid m_aSectionsGrid; TPropertyStyleMap m_aAutoStyleNames; @@ -118,7 +109,6 @@ private: TGridStyleMap m_aRowStyleNames; TGroupFunctionMap m_aGroupFunctionMap; - OUString m_sCharSet; OUString m_sTableStyle; OUString m_sCellStyle; OUString m_sColumnStyle; diff --git a/reportdesign/source/ui/inc/ColumnInfo.hxx b/reportdesign/source/ui/inc/ColumnInfo.hxx index ce87284..65062f9 100644 --- a/reportdesign/source/ui/inc/ColumnInfo.hxx +++ b/reportdesign/source/ui/inc/ColumnInfo.hxx @@ -27,16 +27,13 @@ namespace rptui { OUString sColumnName; OUString sLabel; - bool bColumn; ColumnInfo(const OUString& i_sColumnName,const OUString& i_sLabel) : sColumnName(i_sColumnName) , sLabel(i_sLabel) - , bColumn(true) { } ColumnInfo(const OUString& i_sColumnName) : sColumnName(i_sColumnName) - , bColumn(false) { } }; diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 52c67e3..6916809 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -51,36 +51,29 @@ typedef std::map<uno::Reference< beans::XPropertySet >, AllProperties> PropertyS class OXReportControllerObserverImpl: private boost::noncopyable { public: - const OReportController& m_rReportController; ::std::vector< uno::Reference< container::XChild> > m_aSections; ::osl::Mutex m_aMutex; oslInterlockedCount m_nLocks; bool m_bReadOnly; - explicit OXReportControllerObserverImpl(const OReportController& _rController); - ~OXReportControllerObserverImpl(); + explicit OXReportControllerObserverImpl(); }; - OXReportControllerObserverImpl::OXReportControllerObserverImpl(const OReportController& _rController) - :m_rReportController(_rController) - ,m_nLocks(0) + OXReportControllerObserverImpl::OXReportControllerObserverImpl() + :m_nLocks(0) ,m_bReadOnly(false) { } - OXReportControllerObserverImpl::~OXReportControllerObserverImpl() - { - } - OXReportControllerObserver::OXReportControllerObserver(const OReportController& _rController) - :m_pImpl(new OXReportControllerObserverImpl(_rController) ) + :m_pImpl(new OXReportControllerObserverImpl ) ,m_aFormattedFieldBeautifier(_rController) ,m_aFixedTextColor(_rController) { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
