summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorsanti <santi@tartessos.(none)>2012-04-16 20:05:42 +0200
committerCaolán McNamara <caolanm@redhat.com>2012-04-16 21:44:19 +0100
commit9800f0c54c3832ef939e404eb84b9fc4a917669c (patch)
tree8a3c74dfd12b6b5fc0ff75fd4d90db9c7f35660d /sc
parent0432c53149b82ffc66a9992707db0962ff05299c (diff)
Remove unused code in sc.
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/inc/condformatbuffer.hxx3
-rw-r--r--sc/source/filter/inc/defnamesbuffer.hxx3
-rw-r--r--sc/source/filter/inc/externallinkbuffer.hxx5
-rw-r--r--sc/source/filter/oox/condformatbuffer.cxx34
-rw-r--r--sc/source/filter/oox/defnamesbuffer.cxx6
-rw-r--r--sc/source/filter/oox/externallinkbuffer.cxx58
6 files changed, 0 insertions, 109 deletions
diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx
index 3dd17b1a9769..3f21fccdce2d 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -89,9 +89,6 @@ public:
/** Imports rule settings from a CFRULE record. */
void importCfRule( SequenceInputStream& rStrm );
- /** Imports rule settings from a CFRULE record. */
- void importCfRule( BiffInputStream& rStrm, sal_Int32 nPriority );
-
/** Creates a conditional formatting rule in the Calc document. */
void finalizeImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetConditionalEntries >& rxEntries );
diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx
index 6704f19bef1d..61803b19ee4e 100644
--- a/sc/source/filter/inc/defnamesbuffer.hxx
+++ b/sc/source/filter/inc/defnamesbuffer.hxx
@@ -101,9 +101,6 @@ protected:
/** Imports the BIFF formula from the passed stream. */
ApiTokenSequence importBiffFormula( sal_Int16 nBaseSheet, BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize = 0 );
- /** Tries to convert the passed token sequence to a SingleReference or ComplexReference. */
- void extractReference( const ApiTokenSequence& rTokens );
-
protected:
DefinedNameModel maModel; /// Model data for this defined name.
mutable ::rtl::OUString maUpModelName; /// Model name converted to uppercase ASCII.
diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx
index 2ea0e6bd3ffb..72c3297bd464 100644
--- a/sc/source/filter/inc/externallinkbuffer.hxx
+++ b/sc/source/filter/inc/externallinkbuffer.hxx
@@ -257,9 +257,6 @@ public:
/** Returns the type of the external library if this is a library link. */
FunctionLibraryType getFuncLibraryType() const;
- /** Returns the internal Calc sheet index or for the passed sheet. */
- sal_Int16 getCalcSheetIndex( sal_Int32 nTabId = 0 ) const;
-
/** Returns the token index of the external document. */
sal_Int32 getDocumentLinkIndex() const;
/** Returns the external sheet cache index or for the passed sheet. */
@@ -278,7 +275,6 @@ private:
void setExternalTargetUrl( const ::rtl::OUString& rTargetUrl, const ::rtl::OUString& rTargetType );
void setDdeOleTargetUrl( const ::rtl::OUString& rClassName, const ::rtl::OUString& rTargetUrl, ExternalLinkType eLinkType );
void parseExternalReference( const ::oox::core::Relations& rRelations, const ::rtl::OUString& rRelId );
- ::rtl::OUString parseBiffTargetUrl( const ::rtl::OUString& rBiffTargetUrl );
/** Creates an external locument link and the sheet cache for the passed sheet name. */
void insertExternalSheet( const ::rtl::OUString& rSheetName );
@@ -322,7 +318,6 @@ struct RefSheetsModel
explicit RefSheetsModel();
void readBiff12Data( SequenceInputStream& rStrm );
- void readBiff8Data( BiffInputStream& rStrm );
};
// ----------------------------------------------------------------------------
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index 2aff3e4a5cf7..e7ec181287c3 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -395,40 +395,6 @@ void CondFormatRule::importCfRule( SequenceInputStream& rStrm )
}
}
-void CondFormatRule::importCfRule( BiffInputStream& rStrm, sal_Int32 nPriority )
-{
- sal_uInt8 nType, nOperator;
- sal_uInt16 nFmla1Size, nFmla2Size;
- sal_uInt32 nFlags;
- rStrm >> nType >> nOperator >> nFmla1Size >> nFmla2Size >> nFlags;
- rStrm.skip( 2 );
-
- static const sal_Int32 spnTypeIds[] = { XML_TOKEN_INVALID, XML_cellIs, XML_expression };
- maModel.mnType = STATIC_ARRAY_SELECT( spnTypeIds, nType, XML_TOKEN_INVALID );
-
- maModel.setBiffOperator( nOperator );
- maModel.mnPriority = nPriority;
- maModel.mbStopIfTrue = true;
-
- DxfRef xDxf = getStyles().createDxf( &maModel.mnDxfId );
- xDxf->importCfRule( rStrm, nFlags );
- xDxf->finalizeImport();
-
- // import the formulas
- OSL_ENSURE( (nFmla1Size > 0) || (nFmla2Size == 0), "CondFormatRule::importCfRule - missing first formula" );
- if( nFmla1Size > 0 )
- {
- CellAddress aBaseAddr = mrCondFormat.getRanges().getBaseAddress();
- ApiTokenSequence aTokens = getFormulaParser().importFormula( aBaseAddr, FORMULATYPE_CONDFORMAT, rStrm, &nFmla1Size );
- maModel.maFormulas.push_back( aTokens );
- if( nFmla2Size > 0 )
- {
- aTokens = getFormulaParser().importFormula( aBaseAddr, FORMULATYPE_CONDFORMAT, rStrm, &nFmla2Size );
- maModel.maFormulas.push_back( aTokens );
- }
- }
-}
-
void CondFormatRule::finalizeImport( const Reference< XSheetConditionalEntries >& rxEntries )
{
sal_Int32 eOperator = ::com::sun::star::sheet::ConditionOperator2::NONE;
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index ea767da61536..8d04f7ad20ae 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -288,12 +288,6 @@ ApiTokenSequence DefinedNameBase::importBiffFormula( sal_Int16 nBaseSheet, BiffI
getFormulaParser().convertErrorToFormula( BIFF_ERR_NAME );
}
-void DefinedNameBase::extractReference( const ApiTokenSequence& rTokens )
-{
- OSL_ENSURE( (getFilterType() == FILTER_BIFF) && (getBiff() <= BIFF4), "DefinedNameBase::extractReference - unexpected call" );
- maRefAny = getFormulaParser().extractReference( rTokens );
-}
-
// ============================================================================
DefinedName::DefinedName( const WorkbookHelper& rHelper ) :
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index 61d28942cedd..d9cd78cded00 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -484,14 +484,6 @@ FunctionLibraryType ExternalLink::getFuncLibraryType() const
return (meLinkType == LINKTYPE_LIBRARY) ? meFuncLibType : FUNCLIB_UNKNOWN;
}
-sal_Int16 ExternalLink::getCalcSheetIndex( sal_Int32 nTabId ) const
-{
- OSL_ENSURE( meLinkType == LINKTYPE_INTERNAL, "ExternalLink::getCalcSheetIndex - invalid link type" );
- OSL_ENSURE( (nTabId == 0) || (getFilterType() == FILTER_OOXML) || (getBiff() == BIFF8),
- "ExternalLink::getCalcSheetIndex - invalid sheet index" );
- return ContainerHelper::getVectorElement( maCalcSheets, nTabId, -1 );
-}
-
sal_Int32 ExternalLink::getDocumentLinkIndex() const
{
OSL_ENSURE( meLinkType == LINKTYPE_EXTERNAL, "ExternalLink::getDocumentLinkIndex - invalid link type" );
@@ -627,49 +619,6 @@ void ExternalLink::parseExternalReference( const Relations& rRelations, const OU
setExternalTargetUrl( pRelation->maTarget, pRelation->maType );
}
-OUString ExternalLink::parseBiffTargetUrl( const OUString& rBiffTargetUrl )
-{
- meLinkType = LINKTYPE_UNKNOWN;
-
- OUString aClassName, aTargetUrl, aSheetName;
- switch( getAddressConverter().parseBiffTargetUrl( aClassName, aTargetUrl, aSheetName, rBiffTargetUrl ) )
- {
- case BIFF_TARGETTYPE_URL:
- if( aTargetUrl.isEmpty() )
- {
- meLinkType = aSheetName.isEmpty() ? LINKTYPE_SELF : LINKTYPE_INTERNAL;
- }
- else if( (aTargetUrl.getLength() == 1) && (aTargetUrl[ 0 ] == ':') )
- {
- if( getBiff() >= BIFF4 )
- meLinkType = LINKTYPE_ANALYSIS;
- }
- else if( (aTargetUrl.getLength() > 1) || (aTargetUrl[ 0 ] != ' ') )
- {
- setExternalTargetUrl( aTargetUrl, OOX_TARGETTYPE_EXTLINK );
- }
- break;
-
- case BIFF_TARGETTYPE_SAMESHEET:
- OSL_ENSURE( aTargetUrl.isEmpty() && aSheetName.isEmpty(), "ExternalLink::parseBiffTargetUrl - unexpected target or sheet name" );
- meLinkType = LINKTYPE_SAME;
- break;
-
- case BIFF_TARGETTYPE_LIBRARY:
- OSL_ENSURE( aSheetName.isEmpty(), "ExternalLink::parseBiffTargetUrl - unexpected sheet name" );
- setExternalTargetUrl( aTargetUrl, OOX_TARGETTYPE_LIBRARY );
- break;
-
- case BIFF_TARGETTYPE_DDE_OLE:
- setDdeOleTargetUrl( aClassName, aTargetUrl, LINKTYPE_MAYBE_DDE_OLE );
- break;
-
- case BIFF_TARGETTYPE_UNKNOWN:
- break;
- }
- return aSheetName;
-}
-
void ExternalLink::insertExternalSheet( const OUString& rSheetName )
{
OSL_ENSURE( !rSheetName.isEmpty(), "ExternalLink::insertExternalSheet - empty sheet name" );
@@ -702,13 +651,6 @@ void RefSheetsModel::readBiff12Data( SequenceInputStream& rStrm )
rStrm >> mnExtRefId >> mnTabId1 >> mnTabId2;
}
-void RefSheetsModel::readBiff8Data( BiffInputStream& rStrm )
-{
- mnExtRefId = rStrm.readuInt16();
- mnTabId1 = rStrm.readInt16();
- mnTabId2 = rStrm.readInt16();
-}
-
// ----------------------------------------------------------------------------
ExternalLinkBuffer::ExternalLinkBuffer( const WorkbookHelper& rHelper ) :