diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-17 13:23:23 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-18 06:15:55 +0000 |
commit | 292560a957498bed70b625c992ec6bcf631dceb3 (patch) | |
tree | 4b4c39fbabf370d870ac9a5b2c6154df2238599a /sc | |
parent | e64ea98801d20e5024da900a0ac8faaf565f4bf3 (diff) |
loplugin:unusedmethods
Change-Id: Icf773925c37dde8b7404edac9864e7b10fe113b4
Reviewed-on: https://gerrit.libreoffice.org/29968
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
24 files changed, 0 insertions, 487 deletions
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 625da79bf2a9..308eecb4efe6 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -178,7 +178,6 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\ sc/source/filter/oox/defnamesbuffer \ sc/source/filter/oox/drawingbase \ sc/source/filter/oox/drawingfragment \ - sc/source/filter/oox/drawingmanager \ sc/source/filter/oox/excelchartconverter \ sc/source/filter/oox/excelhandlers \ sc/source/filter/oox/excelvbaproject \ diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 3994b83e9296..8701a6ebe93e 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1860,7 +1860,6 @@ public: const ScMarkData* pMarkData = nullptr ); SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const; - SC_DLLPUBLIC SvNumberFormatter* CreateFormatTable() const; /** Sort a range of data. */ void Sort( diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index d2af6d209bd7..389611d4d2c5 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -482,11 +482,6 @@ SvNumberFormatter* ScDocument::GetFormatTable() const return xPoolHelper->GetFormTable(); } -SvNumberFormatter* ScDocument::CreateFormatTable() const -{ - return xPoolHelper->CreateNumberFormatter(); -} - SfxItemPool* ScDocument::GetEditPool() const { return xPoolHelper->GetEditPool(); diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index 4e4ba704571e..2eafdb5408f8 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -93,7 +93,6 @@ struct BinAddress inline explicit BinAddress( const ScAddress& rAddr ) : mnCol( rAddr.Col() ), mnRow( rAddr.Row() ) {} void read( SequenceInputStream& rStrm ); - void read( BiffInputStream& rStrm ); }; inline bool operator<( const BinAddress& rL, const BinAddress& rR ) @@ -114,7 +113,6 @@ struct BinRange BinAddress maLast; void read( SequenceInputStream& rStrm ); - void read( BiffInputStream& rStrm ); }; inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRange& orRange ) diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index 929b3cb997c8..914fb608ab26 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -37,9 +37,6 @@ public: explicit BiffDecoderBase(); virtual ~BiffDecoderBase() override; - /** Derived classes return a clone of the decoder for usage in new streams. */ - inline BiffDecoderBase* clone() { return implClone(); } - /** Implementation of the ::comphelper::IDocPasswordVerifier interface. */ virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) override; virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) override; diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index cf620d1dccd9..f5c52f74cfe9 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -143,18 +143,6 @@ public: */ bool startNextRecord(); - /** Sets stream pointer to the start of the content of the specified record. - - The handle of the current record can be received and stored using the - function getRecHandle() for later usage with this function. The record - handle is equivalent to the position of the underlying binary stream, - thus the function can be used to perform a hard seek to a specific - position, if it is sure that a record starts exactly at this position. - - @return False = no record found (invalid handle passed). - */ - bool startRecordByHandle( sal_Int64 nRecHandle ); - /** Sets stream pointer before current record and invalidates stream. The next call to startNextRecord() will start again the current record. @@ -167,12 +155,6 @@ public: // decoder ---------------------------------------------------------------- - /** Sets a new decoder object. - - Enables decryption of record contents for the rest of the stream. - */ - void setDecoder( const BiffDecoderRef& rxDecoder ); - /** Enables/disables usage of current decoder. Decryption is reenabled automatically, if a new record is started using diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx deleted file mode 100644 index e4f07a55e025..000000000000 --- a/sc/source/filter/inc/drawingmanager.hxx +++ /dev/null @@ -1,73 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SC_SOURCE_FILTER_INC_DRAWINGMANAGER_HXX -#define INCLUDED_SC_SOURCE_FILTER_INC_DRAWINGMANAGER_HXX - -#include "drawingbase.hxx" - -namespace com { namespace sun { namespace star { - namespace drawing { class XDrawPage; } - namespace drawing { class XShape; } - namespace drawing { class XShapes; } -} } } - -namespace oox { namespace drawingml { class ShapePropertyMap; } } - -namespace oox { -namespace xls { - -const sal_uInt16 BIFF_OBJ_INVALID_ID = 0; - -// BIFF drawing objects -class BiffDrawingBase; - -// BIFF drawing page - -/** Base class for a container for all objects on a drawing page (in a - spreadsheet or in an embedded chart object). - - For BIFF import, it is needed to load all drawing objects before converting - them to UNO shapes. There might be some dummy drawing objects (e.g. the - dropdown buttons of autofilters) which have to be skipped. The information, - that a drawing object is a dummy object, may be located after the drawing - objects themselves. - - The BIFF8 format stores drawing objects in the DFF stream (stored - fragmented in MSODRAWING records), and in the OBJ records. The DFF stream - fragments are collected in a single stream, and the complete stream will be - processed afterwards. - */ -class BiffDrawingBase : public WorksheetHelper -{ -public: - explicit BiffDrawingBase( const WorksheetHelper& rHelper, - const css::uno::Reference< css::drawing::XDrawPage >& rxDrawPage ); - -private: - css::uno::Reference< css::drawing::XDrawPage > - mxDrawPage; /// UNO draw page used to insert the shapes. -}; - -} // namespace xls -} // namespace oox - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx index 9e7380498d31..780da035bde3 100644 --- a/sc/source/filter/inc/excelhandlers.hxx +++ b/sc/source/filter/inc/excelhandlers.hxx @@ -93,41 +93,6 @@ public: virtual void importRecord( BiffInputStream& rStrm ) = 0; }; -class BiffFragmentHandler -{ -public: - /** Opens the stream with the passed full name. */ - explicit BiffFragmentHandler( - const ::oox::core::FilterBase& rFilter, - const OUString& rStrmName ); - - virtual ~BiffFragmentHandler(); - -protected: - /** Returns the BIFF input stream of this fragment. */ - inline BiffInputStream& getInputStream() { return *mxBiffStrm; } - - /** Skips the current fragment up to its trailing EOF record. - - Skips all records until next EOF record. When this function returns, - stream points to the EOF record, and the next call of startNextRecord() - at the stream will start the record following the EOF record. - - Embedded fragments enclosed in BOF/EOF records (e.g. embedded chart - objects) are skipped correctly. - - @return True = stream points to the EOF record of the current fragment. - */ - bool skipFragment(); - -private: - typedef std::shared_ptr< BinaryXInputStream > XInputStreamRef; - typedef std::shared_ptr< BiffInputStream > BiffInputStreamRef; - - XInputStreamRef mxXInStrm; - BiffInputStreamRef mxBiffStrm; -}; - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 1e3a47570e11..f016f2c24acf 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -234,8 +234,6 @@ struct BinSingleRef2d explicit BinSingleRef2d(); void setBiff12Data( sal_uInt16 nCol, sal_Int32 nRow, bool bRelativeAsOffset ); - void setBiff2Data( sal_uInt8 nCol, sal_uInt16 nRow, bool bRelativeAsOffset ); - void setBiff8Data( sal_uInt16 nCol, sal_uInt16 nRow, bool bRelativeAsOffset ); void readBiff12Data( SequenceInputStream& rStrm, bool bRelativeAsOffset ); }; diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx index 0031177cfe85..57861d4f26a3 100644 --- a/sc/source/filter/inc/numberformatsbuffer.hxx +++ b/sc/source/filter/inc/numberformatsbuffer.hxx @@ -72,8 +72,6 @@ public: const css::uno::Reference< css::util::XNumberFormats >& rxNumFmts, const css::lang::Locale& rFromLocale ); sal_uLong fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const; - /** Writes the number format to the passed property map. */ - void writeToPropertyMap( PropertyMap& rPropMap ) const; private: NumFmtModel maModel; diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index 80e2f45972e7..a2b45bcf943d 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -242,8 +242,6 @@ public: /** Imports one or more group items from the passed record. */ void importPCDFGroupItem( sal_Int32 nRecId, SequenceInputStream& rStrm ); - /** Imports pivot cache field settings from the PCDFIELD record. */ - void importPCDField( BiffInputStream& rStrm ); /** Imports numeric grouping settings from the PCDFRANGEPR record. */ void importPCDFRangePr( BiffInputStream& rStrm ); /** Imports the mapping between group items and base items from the PCDFDISCRETEPR record. */ @@ -389,9 +387,6 @@ public: /** Reads sheet source settings from the PCDSHEETSOURCE record. */ void importPCDSheetSource( SequenceInputStream& rStrm, const ::oox::core::Relations& rRelations ); - /** Reads pivot cache global settings from the PCDEFINITION record. */ - void importPCDefinition( BiffInputStream& rStrm ); - /** Creates and returns a new pivot cache field. */ PivotCacheField& createCacheField( bool bInitDatabaseField = false ); /** Checks validity of source data and creates a dummy data sheet for external sheet sources. */ diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx index e88b82cb0287..ded475e4b2e8 100644 --- a/sc/source/filter/inc/pivotcachefragment.hxx +++ b/sc/source/filter/inc/pivotcachefragment.hxx @@ -88,31 +88,6 @@ private: bool mbInRecord; }; -class BiffPivotCacheRecordsContext : public BiffWorksheetContextBase -{ -public: - explicit BiffPivotCacheRecordsContext( - const WorksheetHelper& rHelper, - const PivotCache& rPivotCache ); - - /** Reads the current record from stream and tries to insert a cell into - the source data sheet. */ - virtual void importRecord( BiffInputStream& rStrm ) override; - -private: - void startNextRow(); - -private: - typedef ::std::vector< sal_Int32 > ColumnIndexVector; - - const PivotCache& mrPivotCache; - ColumnIndexVector maUnsharedCols; /// Column indexes of all unshared cache fields. - size_t mnColIdx; /// Current index into maUnsharedCols. - sal_Int32 mnRowIdx; /// Current row in source data (0-based). - bool mbHasShared; /// True = pivot cache contains fields with shared items. - bool mbInRow; /// True = a data row has been started. -}; - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index 0d4185c19759..6d8c86706cb5 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -67,12 +67,6 @@ void BinAddress::read( SequenceInputStream& rStrm ) mnCol = rStrm.readInt32(); } -void BinAddress::read( BiffInputStream& rStrm ) -{ - mnRow = rStrm.readuInt16(); - mnCol = rStrm.readuInt16(); -} - void BinRange::read( SequenceInputStream& rStrm ) { maFirst.mnRow = rStrm.readInt32(); @@ -81,14 +75,6 @@ void BinRange::read( SequenceInputStream& rStrm ) maLast.mnCol = rStrm.readInt32(); } -void BinRange::read( BiffInputStream& rStrm ) -{ - maFirst.mnRow = rStrm.readuInt16(); - maLast.mnRow = rStrm.readuInt16(); - maFirst.mnCol = rStrm.readuInt16(); - maLast.mnCol = rStrm.readuInt16(); -} - void BinRangeList::read( SequenceInputStream& rStrm ) { sal_Int32 nCount = rStrm.readInt32(); diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx index 7d9e8a2784cd..22e776196900 100644 --- a/sc/source/filter/oox/biffinputstream.cxx +++ b/sc/source/filter/oox/biffinputstream.cxx @@ -188,12 +188,6 @@ bool BiffInputStream::startNextRecord() return isInRecord(); } -bool BiffInputStream::startRecordByHandle( sal_Int64 nRecHandle ) -{ - rewindToRecord( nRecHandle ); - return startNextRecord(); -} - void BiffInputStream::rewindRecord() { rewindToRecord( mnRecHandle ); @@ -201,11 +195,6 @@ void BiffInputStream::rewindRecord() // decoder -------------------------------------------------------------------- -void BiffInputStream::setDecoder( const BiffDecoderRef& rxDecoder ) -{ - maRecBuffer.setDecoder( rxDecoder ); -} - void BiffInputStream::enableDecoder() { maRecBuffer.enableDecoder( true ); diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index f6c146b62541..098f72cb66ff 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -35,7 +35,6 @@ #include "drawingfragment.hxx" #include <svx/sdtaitm.hxx> #include "unitconverter.hxx" -#include "drawingmanager.hxx" #include <com/sun/star/text/XText.hpp> diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx deleted file mode 100644 index 5810996b3b36..000000000000 --- a/sc/source/filter/oox/drawingmanager.cxx +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "drawingmanager.hxx" - -#include <com/sun/star/awt/Rectangle.hpp> -#include <com/sun/star/drawing/CircleKind.hpp> -#include <com/sun/star/drawing/PointSequenceSequence.hpp> -#include <com/sun/star/drawing/PolygonKind.hpp> -#include <com/sun/star/drawing/XShapes.hpp> -#include <osl/diagnose.h> -#include <oox/core/filterbase.hxx> -#include <oox/drawingml/fillproperties.hxx> -#include <oox/drawingml/lineproperties.hxx> -#include <oox/drawingml/shapepropertymap.hxx> -#include <oox/helper/containerhelper.hxx> -#include <oox/token/tokens.hxx> -#include "biffinputstream.hxx" -#include "unitconverter.hxx" - -namespace oox { -namespace xls { - -using namespace ::com::sun::star::awt; -using namespace ::com::sun::star::drawing; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::uno; -using namespace ::oox::drawingml; - -// BIFF drawing page -BiffDrawingBase::BiffDrawingBase( const WorksheetHelper& rHelper, const Reference< XDrawPage >& rxDrawPage ) : - WorksheetHelper( rHelper ), - mxDrawPage( rxDrawPage ) -{ -} - -} // namespace xls -} // namespace oox - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx index f41dc978323f..3dbb965bcd9d 100644 --- a/sc/source/filter/oox/excelhandlers.cxx +++ b/sc/source/filter/oox/excelhandlers.cxx @@ -47,26 +47,6 @@ BiffWorksheetContextBase::BiffWorksheetContextBase( const WorksheetHelper& rHelp { } -BiffFragmentHandler::BiffFragmentHandler( const FilterBase& rFilter, const OUString& rStrmName ) -{ - // do not automatically close the root stream (indicated by empty stream name) - bool bRootStrm = rStrmName.isEmpty(); - mxXInStrm.reset( new BinaryXInputStream( rFilter.openInputStream( rStrmName ), !bRootStrm ) ); - mxBiffStrm.reset( new BiffInputStream( *mxXInStrm ) ); -} - -BiffFragmentHandler::~BiffFragmentHandler() -{ -} - -bool BiffFragmentHandler::skipFragment() -{ - while( mxBiffStrm->startNextRecord() && (mxBiffStrm->getRecId() != BIFF_ID_EOF) ) - if( BiffHelper::isBofRecord( *mxBiffStrm ) ) - skipFragment(); - return !mxBiffStrm->isEof() && (mxBiffStrm->getRecId() == BIFF_ID_EOF); -} - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 3e675a481b54..fcd792b08700 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -71,30 +71,6 @@ void BinSingleRef2d::setBiff12Data( sal_uInt16 nCol, sal_Int32 nRow, bool bRelat mnRow -= (BIFF12_TOK_REF_ROWMASK + 1); } -void BinSingleRef2d::setBiff2Data( sal_uInt8 nCol, sal_uInt16 nRow, bool bRelativeAsOffset ) -{ - mnCol = nCol; - mnRow = nRow & BIFF_TOK_REF_ROWMASK; - mbColRel = getFlag( nRow, BIFF_TOK_REF_COLREL ); - mbRowRel = getFlag( nRow, BIFF_TOK_REF_ROWREL ); - if( bRelativeAsOffset && mbColRel && (mnCol >= 0x80) ) - mnCol -= 0x100; - if( bRelativeAsOffset && mbRowRel && (mnRow > (BIFF_TOK_REF_ROWMASK >> 1)) ) - mnRow -= (BIFF_TOK_REF_ROWMASK + 1); -} - -void BinSingleRef2d::setBiff8Data( sal_uInt16 nCol, sal_uInt16 nRow, bool bRelativeAsOffset ) -{ - mnCol = nCol & BIFF_TOK_REF_COLMASK; - mnRow = nRow; - mbColRel = getFlag( nCol, BIFF_TOK_REF_COLREL ); - mbRowRel = getFlag( nCol, BIFF_TOK_REF_ROWREL ); - if( bRelativeAsOffset && mbColRel && (mnCol > (BIFF_TOK_REF_COLMASK >> 1)) ) - mnCol -= (BIFF_TOK_REF_COLMASK + 1); - if( bRelativeAsOffset && mbRowRel && (mnRow >= 0x8000) ) - mnRow -= 0x10000; -} - void BinSingleRef2d::readBiff12Data( SequenceInputStream& rStrm, bool bRelativeAsOffset ) { sal_Int32 nRow; diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index ac42d7459b8a..f614767771a1 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -1970,11 +1970,6 @@ sal_uLong NumberFormat::fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs return nScNumFmt; } -void NumberFormat::writeToPropertyMap( PropertyMap& rPropMap ) const -{ - rPropMap.setProperty( PROP_NumberFormat, maApiData.mnIndex); -} - NumberFormatsBuffer::NumberFormatsBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper(rHelper) , mnHighestId(0) diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index 56632e7cbe31..4a7ca8ff446f 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -102,28 +102,9 @@ const sal_uInt8 BIFF12_PCDEFINITION_SUPPORTDRILL = 0x08; const sal_uInt8 BIFF12_PCDWBSOURCE_HASRELID = 0x01; const sal_uInt8 BIFF12_PCDWBSOURCE_HASSHEET = 0x02; -const sal_uInt16 BIFF_PC_NOSTRING = 0xFFFF; - -const sal_uInt16 BIFF_PCDFIELD_HASITEMS = 0x0001; -const sal_uInt16 BIFF_PCDFIELD_HASPARENT = 0x0008; -const sal_uInt16 BIFF_PCDFIELD_RANGEGROUP = 0x0010; -const sal_uInt16 BIFF_PCDFIELD_ISNUMERIC = 0x0020; -const sal_uInt16 BIFF_PCDFIELD_HASSEMIMIXED = 0x0080; -const sal_uInt16 BIFF_PCDFIELD_HASLONGINDEX = 0x0200; -const sal_uInt16 BIFF_PCDFIELD_HASNONDATE = 0x0400; -const sal_uInt16 BIFF_PCDFIELD_HASDATE = 0x0800; -const sal_uInt16 BIFF_PCDFIELD_SERVERFIELD = 0x2000; -const sal_uInt16 BIFF_PCDFIELD_NOUNIQUEITEMS = 0x4000; - const sal_uInt16 BIFF_PCDFRANGEPR_AUTOSTART = 0x0001; const sal_uInt16 BIFF_PCDFRANGEPR_AUTOEND = 0x0002; -const sal_uInt16 BIFF_PCDEFINITION_SAVEDATA = 0x0001; -const sal_uInt16 BIFF_PCDEFINITION_INVALID = 0x0002; -const sal_uInt16 BIFF_PCDEFINITION_REFRESHONLOAD = 0x0004; -const sal_uInt16 BIFF_PCDEFINITION_OPTIMIZEMEMORY = 0x0008; -const sal_uInt16 BIFF_PCDEFINITION_BACKGROUNDQUERY = 0x0010; -const sal_uInt16 BIFF_PCDEFINITION_ENABLEREFRESH = 0x0020; /** Adjusts the weird date format read from binary streams. @@ -626,63 +607,6 @@ void PivotCacheField::importPCDFGroupItem( sal_Int32 nRecId, SequenceInputStream maGroupItems.importItem( nRecId, rStrm ); } -void PivotCacheField::importPCDField( BiffInputStream& rStrm ) -{ - sal_uInt16 nFlags, nGroupItems, nBaseItems, nSharedItems; - rStrm >> nFlags; - maFieldGroupModel.mnParentField = rStrm.readuInt16(); - maFieldGroupModel.mnBaseField = rStrm.readuInt16(); - rStrm.skip( 2 ); // number of unique items (either shared or group) - rStrm >> nGroupItems >> nBaseItems >> nSharedItems; - maFieldModel.maName = rStrm.readByteStringUC( getTextEncoding() ); - - maFieldModel.mbServerField = getFlag( nFlags, BIFF_PCDFIELD_SERVERFIELD ); - maFieldModel.mbUniqueList = !getFlag( nFlags, BIFF_PCDFIELD_NOUNIQUEITEMS ); - maSharedItemsModel.mbHasSemiMixed = getFlag( nFlags, BIFF_PCDFIELD_HASSEMIMIXED ); - maSharedItemsModel.mbHasNonDate = getFlag( nFlags, BIFF_PCDFIELD_HASNONDATE ); - maSharedItemsModel.mbHasDate = getFlag( nFlags, BIFF_PCDFIELD_HASDATE ); - maSharedItemsModel.mbIsNumeric = getFlag( nFlags, BIFF_PCDFIELD_ISNUMERIC ); - maSharedItemsModel.mbHasLongIndexes = getFlag( nFlags, BIFF_PCDFIELD_HASLONGINDEX ); - maFieldGroupModel.mbRangeGroup = getFlag( nFlags, BIFF_PCDFIELD_RANGEGROUP ); - - // in BIFF, presence of parent group field is denoted by a flag - if( !getFlag( nFlags, BIFF_PCDFIELD_HASPARENT ) ) - maFieldGroupModel.mnParentField = -1; - - // following PCDFSQLTYPE record contains SQL type - if( (rStrm.getNextRecId() == BIFF_ID_PCDFSQLTYPE) && rStrm.startNextRecord() ) - maFieldModel.mnSqlType = rStrm.readInt16(); - - // read group items, if any - if( nGroupItems > 0 ) - { - SAL_WARN_IF( - !getFlag(nFlags, BIFF_PCDFIELD_HASITEMS), "sc.filter", - "PivotCacheField::importPCDField - missing items flag"); - maGroupItems.importItemList( rStrm, nGroupItems ); - - sal_uInt16 nNextRecId = rStrm.getNextRecId(); - bool bHasRangePr = nNextRecId == BIFF_ID_PCDFRANGEPR; - bool bHasDiscretePr = nNextRecId == BIFF_ID_PCDFDISCRETEPR; - - OSL_ENSURE( bHasRangePr || bHasDiscretePr, "PivotCacheField::importPCDField - missing group properties record" ); - OSL_ENSURE( bHasRangePr == maFieldGroupModel.mbRangeGroup, "PivotCacheField::importPCDField - invalid range grouping flag" ); - if( bHasRangePr && rStrm.startNextRecord() ) - importPCDFRangePr( rStrm ); - else if( bHasDiscretePr && rStrm.startNextRecord() ) - importPCDFDiscretePr( rStrm ); - } - - // read the shared items, if any - if( nSharedItems > 0 ) - { - SAL_WARN_IF( - !getFlag(nFlags, BIFF_PCDFIELD_HASITEMS), "sc.filter", - "PivotCacheField::importPCDField - missing items flag"); - maSharedItems.importItemList( rStrm, nSharedItems ); - } -} - void PivotCacheField::importPCDFRangePr( BiffInputStream& rStrm ) { sal_uInt16 nFlags; @@ -1167,30 +1091,6 @@ void PivotCache::importPCDSheetSource( SequenceInputStream& rStrm, const Relatio maTargetUrl = rRelations.getExternalTargetFromRelId( maSheetSrcModel.maRelId ); } -void PivotCache::importPCDefinition( BiffInputStream& rStrm ) -{ - sal_uInt16 nFlags, nUserNameLen; - rStrm >> maDefModel.mnRecords; - rStrm.skip( 2 ); // repeated cache ID - rStrm >> nFlags; - rStrm.skip( 2 ); // unused - rStrm >> maDefModel.mnDatabaseFields; - rStrm.skip( 6 ); // total field count, report record count, (repeated) cache type - rStrm >> nUserNameLen; - if( nUserNameLen != BIFF_PC_NOSTRING ) - maDefModel.maRefreshedBy = rStrm.readCharArrayUC( nUserNameLen, getTextEncoding() ); - - maDefModel.mbInvalid = getFlag( nFlags, BIFF_PCDEFINITION_INVALID ); - maDefModel.mbSaveData = getFlag( nFlags, BIFF_PCDEFINITION_SAVEDATA ); - maDefModel.mbRefreshOnLoad = getFlag( nFlags, BIFF_PCDEFINITION_REFRESHONLOAD ); - maDefModel.mbOptimizeMemory = getFlag( nFlags, BIFF_PCDEFINITION_OPTIMIZEMEMORY ); - maDefModel.mbEnableRefresh = getFlag( nFlags, BIFF_PCDEFINITION_ENABLEREFRESH ); - maDefModel.mbBackgroundQuery = getFlag( nFlags, BIFF_PCDEFINITION_BACKGROUNDQUERY ); - - if( (rStrm.getNextRecId() == BIFF_ID_PCDEFINITION2) && rStrm.startNextRecord() ) - rStrm >> maDefModel.mfRefreshedDate; -} - PivotCacheField& PivotCache::createCacheField( bool bInitDatabaseField ) { bool bIsDatabaseField = !bInitDatabaseField || (maFields.size() < maDefModel.mnDatabaseFields); diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx index 4f4498d10ed4..5a3a78488ea1 100644 --- a/sc/source/filter/oox/pivotcachefragment.cxx +++ b/sc/source/filter/oox/pivotcachefragment.cxx @@ -323,80 +323,6 @@ void PivotCacheRecordsFragment::importPCRecordItem( sal_Int32 nRecId, SequenceIn } } -BiffPivotCacheRecordsContext::BiffPivotCacheRecordsContext( const WorksheetHelper& rHelper, const PivotCache& rPivotCache ) : - BiffWorksheetContextBase( rHelper ), - mrPivotCache( rPivotCache ), - mnColIdx( 0 ), - mnRowIdx( 0 ), - mbHasShared( false ), - mbInRow( false ) -{ - // prepare sheet: insert column header names into top row - mrPivotCache.writeSourceHeaderCells( *this ); - - // find all fields without shared items, remember column indexes in source data - for( sal_Int32 nFieldIdx = 0, nFieldCount = mrPivotCache.getCacheFieldCount(), nCol = 0; nFieldIdx < nFieldCount; ++nFieldIdx ) - { - const PivotCacheField* pCacheField = mrPivotCache.getCacheField( nFieldIdx ); - if( pCacheField && pCacheField->isDatabaseField() ) - { - if( pCacheField->hasSharedItems() ) - mbHasShared = true; - else - maUnsharedCols.push_back( nCol ); - ++nCol; - } - } -} - -void BiffPivotCacheRecordsContext::importRecord( BiffInputStream& rStrm ) -{ - if( rStrm.getRecId() == BIFF_ID_PCITEM_INDEXLIST ) - { - OSL_ENSURE( mbHasShared, "BiffPivotCacheRecordsContext::importRecord - unexpected PCITEM_INDEXLIST record" ); - // PCITEM_INDEXLIST record always in front of a new data row - startNextRow(); - mrPivotCache.importPCItemIndexList( rStrm, *this, mnRowIdx ); - mbInRow = !maUnsharedCols.empty(); // mbInRow remains true, if unshared items are expected - return; - } - - PivotCacheItem aItem; - switch( rStrm.getRecId() ) - { - case BIFF_ID_PCITEM_MISSING: break; - case BIFF_ID_PCITEM_STRING: aItem.readString( rStrm, *this ); break; - case BIFF_ID_PCITEM_DOUBLE: aItem.readDouble( rStrm ); break; - case BIFF_ID_PCITEM_INTEGER: aItem.readInteger( rStrm ); break; - case BIFF_ID_PCITEM_DATE: aItem.readDate( rStrm ); break; - case BIFF_ID_PCITEM_BOOL: aItem.readBool( rStrm ); break; - case BIFF_ID_PCITEM_ERROR: aItem.readError( rStrm ); break; - default: return; // unknown record, ignore - } - - // find next column index, might start new row if no fields with shared items exist - if( mbInRow && (mnColIdx == maUnsharedCols.size()) ) - { - OSL_ENSURE( !mbHasShared, "BiffPivotCacheRecordsContext::importRecord - PCITEM_INDEXLIST record missing" ); - mbInRow = mbHasShared; // do not leave current row if PCITEM_INDEXLIST is expected - } - // start next row on first call, or on row wrap without shared items - if( !mbInRow ) - startNextRow(); - - // write the item data to the sheet cell - OSL_ENSURE( mnColIdx < maUnsharedCols.size(), "BiffPivotCacheRecordsContext::importRecord - invalid column index" ); - if( mnColIdx < maUnsharedCols.size() ) - mrPivotCache.writeSourceDataCell( *this, maUnsharedCols[ mnColIdx ], mnRowIdx, aItem ); - ++mnColIdx; -} - -void BiffPivotCacheRecordsContext::startNextRow() -{ - mnColIdx = 0; - ++mnRowIdx; - mbInRow = true; -} } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index ad9837a084a0..c0998c1cf66d 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -31,7 +31,6 @@ #include "commentsfragment.hxx" #include "condformatcontext.hxx" #include "drawingfragment.hxx" -#include "drawingmanager.hxx" #include "externallinkbuffer.hxx" #include "pagesettings.hxx" #include "pivottablefragment.hxx" diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index bb04088163fb..5d20156b73b8 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -54,7 +54,6 @@ #include "convuno.hxx" #include "document.hxx" #include "drawingfragment.hxx" -#include "drawingmanager.hxx" #include "formulaparser.hxx" #include "pagesettings.hxx" #include "querytablebuffer.hxx" diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index ac588dd5f7cd..7a21bf879643 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -112,10 +112,6 @@ class ColumnEdit : public SpinField public: ColumnEdit(Window* pParent, WinBits nWinBits); ~ColumnEdit() override; - void SetNavigatorDlg(ScNavigatorDlg *pNaviDlg) - { - xDlg = pNaviDlg; - } SCCOL GetCol() { return nCol; } void SetCol( SCCOL nColNo ); @@ -144,10 +140,6 @@ class RowEdit : public NumericField public: RowEdit(Window* pParent, WinBits nWinBits); ~RowEdit() override; - void SetNavigatorDlg(ScNavigatorDlg *pNaviDlg) - { - xDlg = pNaviDlg; - } SCROW GetRow() { return (SCROW)GetValue(); } void SetRow(SCROW nRow) { SetValue(nRow); } |