summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/inc/drawingmanager.hxx37
-rw-r--r--sc/source/filter/inc/pivottablebuffer.hxx2
-rw-r--r--sc/source/filter/inc/richstring.hxx7
-rw-r--r--sc/source/filter/inc/stylesbuffer.hxx3
-rw-r--r--sc/source/filter/oox/connectionsbuffer.cxx60
-rw-r--r--sc/source/filter/oox/drawingmanager.cxx60
-rw-r--r--sc/source/filter/oox/externallinkbuffer.cxx12
-rw-r--r--sc/source/filter/oox/pivottablebuffer.cxx10
-rw-r--r--sc/source/filter/oox/richstring.cxx53
-rw-r--r--sc/source/filter/oox/stylesbuffer.cxx11
10 files changed, 0 insertions, 255 deletions
diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx
index e0a80cefad8f..7021b385b39d 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -72,9 +72,6 @@ struct BiffObjFillModel
bool mbAuto; /// True = automatic fill format.
explicit BiffObjFillModel();
-
- /** Returns true, if the fill formatting is visible (automatic or explicit). */
- bool isFilled() const;
};
// ============================================================================
@@ -161,8 +158,6 @@ protected:
void convertLineProperties( ::oox::drawingml::ShapePropertyMap& rPropMap, const BiffObjLineModel& rLineModel, sal_uInt16 nArrows = 0 ) const;
/** Converts the passed fill formatting to the passed property map. */
void convertFillProperties( ::oox::drawingml::ShapePropertyMap& rPropMap, const BiffObjFillModel& rFillModel ) const;
- /** Converts the passed frame flags to the passed property map. */
- void convertFrameProperties( ::oox::drawingml::ShapePropertyMap& rPropMap, sal_uInt16 nFrameFlags ) const;
/** Derived classes read the contents of the a BIFF3 OBJ record from the passed stream. */
virtual void implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
@@ -230,38 +225,6 @@ protected:
sal_uInt16 mnFirstUngrouped; /// Object identfier of first object not grouped into this group.
};
-/** A simple rectangle object (used as base class for oval objects). */
-class BiffRectObject : public BiffDrawingObjectBase
-{
-public:
- explicit BiffRectObject( const WorksheetHelper& rHelper );
-
-protected:
- /** Reads the fill model, the line model, and frame flags. */
- void readFrameData( BiffInputStream& rStrm );
-
- /** Converts fill formatting, line formatting, and frame style. */
- void convertRectProperties( ::oox::drawingml::ShapePropertyMap& rPropMap ) const;
-
- /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
- virtual void implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
- /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */
- virtual void implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
- /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */
- virtual void implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize );
-
- /** Creates the corresponding XShape and insert it into the passed container. */
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
- implConvertAndInsert( BiffDrawingBase& rDrawing,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
- const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
-
-protected:
- BiffObjFillModel maFillModel; /// Fill formatting.
- BiffObjLineModel maLineModel; /// Line formatting.
- sal_uInt16 mnFrameFlags; /// Additional flags.
-};
-
// ============================================================================
// BIFF drawing page
// ============================================================================
diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx
index 3f7125671dde..82e1501db3bc 100644
--- a/sc/source/filter/inc/pivottablebuffer.hxx
+++ b/sc/source/filter/inc/pivottablebuffer.hxx
@@ -389,8 +389,6 @@ private:
static void importField( IndexVector& orFields, const AttributeList& rAttribs );
/** Reads an array of field indexes for the row or column dimension. */
static void importFields( IndexVector& orFields, SequenceInputStream& rStrm );
- /** Reads an array of field indexes for the row or column dimension. */
- static void importFields( IndexVector& orFields, BiffInputStream& rStrm, sal_Int32 nCount );
private:
PivotTableFieldVector maFields; /// All pivot table fields.
diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx
index 9731e23f034c..7871af8af9a7 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -133,10 +133,6 @@ public:
void appendPortion( const FontPortionModel& rPortion );
/** Reads count and font identifiers from the passed stream. */
void importPortions( SequenceInputStream& rStrm );
- /** Reads nCount font identifiers from the passed stream. */
- void importPortions( BiffInputStream& rStrm, sal_uInt16 nCount, BiffFontPortionMode eMode );
- /** Reads count and font identifiers from the passed stream. */
- void importPortions( BiffInputStream& rStrm, bool b16Bit );
};
// ============================================================================
@@ -210,7 +206,6 @@ struct PhoneticPortionModel
mnPos( nPos ), mnBasePos( nBasePos ), mnBaseLen( nBaseLen ) {}
void read( SequenceInputStream& rStrm );
- void read( BiffInputStream& rStrm );
};
// ----------------------------------------------------------------------------
@@ -225,8 +220,6 @@ public:
void appendPortion( const PhoneticPortionModel& rPortion );
/** Reads all phonetic portions from the passed stream. */
void importPortions( SequenceInputStream& rStrm );
- /** Reads phonetic portion data from the passed stream. */
- ::rtl::OUString importPortions( BiffInputStream& rStrm, sal_Int32 nPhoneticSize );
};
// ============================================================================
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index 02bfe3c0ca6f..fb6c7eaac490 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -281,9 +281,6 @@ public:
/** Returns the font model structure. This function can be called before
finalizeImport() has been called. */
inline const FontModel& getModel() const { return maModel; }
- /** Returns the text encoding for strings used with this font. This
- function can be called before finalizeImport() has been called. */
- rtl_TextEncoding getFontEncoding() const;
/** Final processing after import of all style settings. */
void finalizeImport();
diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx
index 32217bf224c9..5fa8f0d3a6ee 100644
--- a/sc/source/filter/oox/connectionsbuffer.cxx
+++ b/sc/source/filter/oox/connectionsbuffer.cxx
@@ -104,66 +104,6 @@ const sal_uInt16 BIFF_QTSETTINGS_XL2000REFRESHED = 0x0020;
const sal_uInt16 BIFF_QTSETTINGS_TEXTQUERY = 0x0001;
const sal_uInt16 BIFF_QTSETTINGS_TABLENAMES = 0x0002;
-// ----------------------------------------------------------------------------
-
-OUString lclReadQueryString( BiffInputStream& rStrm, sal_uInt16 nCount )
-{
- bool bValidRec = true;
- OUStringBuffer aBuffer;
- for( sal_uInt16 nIndex = 0; bValidRec && (nIndex < nCount); ++nIndex )
- {
- bValidRec = (rStrm.getNextRecId() == BIFF_ID_PCITEM_STRING) && rStrm.startNextRecord();
- if( bValidRec )
- aBuffer.append( rStrm.readUniString() );
- }
- OSL_ENSURE( bValidRec, "lclReadQueryString - missing PCITEM_STRING records" );
- return aBuffer.makeStringAndClear();
-}
-
-void lclParseTables( WebPrModel::TablesVector& rTables, const OUString& rTableNames )
-{
- rTables.clear();
- OUString aTableNames = rTableNames.trim();
- while( !aTableNames.isEmpty() )
- {
- sal_Int32 nSep = -1;
- // table names are enclosed in double quotes
- if( aTableNames[ 0 ] == '"' )
- {
- // search closing quote character
- sal_Int32 nEndQuote = aTableNames.indexOf( '"', 1 );
- OSL_ENSURE( nEndQuote >= 1, "lclParseTables - invalid syntax" );
- if( nEndQuote < 0 )
- nEndQuote = aTableNames.getLength();
- else
- nSep = aTableNames.indexOf( ',', nEndQuote + 1 );
- // extract text between quote characters
- OUString aTableName = aTableNames.copy( 1, nEndQuote - 1 ).trim();
- if( !aTableName.isEmpty() )
- rTables.push_back( Any( aTableName ) );
- else
- rTables.push_back( Any() );
- }
- else
- {
- nSep = aTableNames.indexOf( ',' );
- if( nSep < 0 )
- nSep = aTableNames.getLength();
- OUString aTableIndex = aTableNames.copy( 0, nSep ).trim();
- if( !aTableIndex.isEmpty() && (aTableIndex[ 0 ] >= '1') && (aTableIndex[ 0 ] <= '9') )
- rTables.push_back( Any( aTableIndex.toInt32() ) );
- else
- rTables.push_back( Any() );
- }
-
- // remove processed item from aTableNames
- if( (nSep < 0) || (nSep >= aTableNames.getLength()) )
- aTableNames = OUString();
- else
- aTableNames = aTableNames.copy( nSep + 1 ).trim();
- }
-}
-
} // namespace
// ============================================================================
diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
index eeeef0cce7d2..2d081ac94c13 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -203,11 +203,6 @@ BiffObjFillModel::BiffObjFillModel() :
{
}
-bool BiffObjFillModel::isFilled() const
-{
- return mbAuto || (mnPattern != BIFF_OBJ_PATT_NONE);
-}
-
BiffInputStream& operator>>( BiffInputStream& rStrm, BiffObjFillModel& rModel )
{
sal_uInt8 nFlags;
@@ -524,10 +519,6 @@ void BiffDrawingObjectBase::convertFillProperties( ShapePropertyMap& rPropMap, c
aFillProps.pushToPropMap( rPropMap, getBaseFilter().getGraphicHelper() );
}
-void BiffDrawingObjectBase::convertFrameProperties( ShapePropertyMap& /*rPropMap*/, sal_uInt16 /*nFrameFlags*/ ) const
-{
-}
-
void BiffDrawingObjectBase::implReadObjBiff3( BiffInputStream& /*rStrm*/, sal_uInt16 /*nMacroSize*/ )
{
}
@@ -609,57 +600,6 @@ Reference< XShape > BiffGroupObject::implConvertAndInsert( BiffDrawingBase& rDra
}
// ============================================================================
-
-BiffRectObject::BiffRectObject( const WorksheetHelper& rHelper ) :
- BiffDrawingObjectBase( rHelper ),
- mnFrameFlags( 0 )
-{
- setAreaObj( true );
-}
-
-void BiffRectObject::readFrameData( BiffInputStream& rStrm )
-{
- rStrm >> maFillModel >> maLineModel >> mnFrameFlags;
-}
-
-void BiffRectObject::convertRectProperties( ShapePropertyMap& rPropMap ) const
-{
- convertLineProperties( rPropMap, maLineModel );
- convertFillProperties( rPropMap, maFillModel );
- convertFrameProperties( rPropMap, mnFrameFlags );
-}
-
-void BiffRectObject::implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
-{
- readFrameData( rStrm );
- readMacroBiff3( rStrm, nMacroSize );
-}
-
-void BiffRectObject::implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
-{
- readFrameData( rStrm );
- readMacroBiff4( rStrm, nMacroSize );
-}
-
-void BiffRectObject::implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize )
-{
- readFrameData( rStrm );
- readNameBiff5( rStrm, nNameLen );
- readMacroBiff5( rStrm, nMacroSize );
-}
-
-Reference< XShape > BiffRectObject::implConvertAndInsert( BiffDrawingBase& rDrawing,
- const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const
-{
- ShapePropertyMap aPropMap( getBaseFilter().getModelObjectHelper() );
- convertRectProperties( aPropMap );
-
- Reference< XShape > xShape = rDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.RectangleShape" ), rxShapes, rShapeRect );
- PropertySet( xShape ).setProperties( aPropMap );
- return xShape;
-}
-
-// ============================================================================
// BIFF drawing page
// ============================================================================
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index fe5f94f330e4..61d28942cedd 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -278,18 +278,6 @@ bool ExternalName::getDdeLinkData( OUString& orDdeServer, OUString& orDdeTopic,
// private --------------------------------------------------------------------
-namespace {
-
-void lclSetSheetCacheIndex( SingleReference& orApiRef, sal_Int32 nCacheIdx )
-{
- using namespace ::com::sun::star::sheet::ReferenceFlags;
- setFlag( orApiRef.Flags, SHEET_RELATIVE, false );
- setFlag( orApiRef.Flags, SHEET_3D, true );
- orApiRef.Sheet = nCacheIdx;
-}
-
-} // namespace
-
void ExternalName::setResultSize( sal_Int32 nColumns, sal_Int32 nRows )
{
OSL_ENSURE( (mrParentLink.getLinkType() == LINKTYPE_DDE) || (mrParentLink.getLinkType() == LINKTYPE_OLE) ||
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx
index f434a14a69de..8496510c1923 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -1371,16 +1371,6 @@ void PivotTable::importFields( IndexVector& orFields, SequenceInputStream& rStrm
orFields.push_back( rStrm.readInt32() );
}
-void PivotTable::importFields( IndexVector& orFields, BiffInputStream& rStrm, sal_Int32 nCount )
-{
- OSL_ENSURE( orFields.empty(), "PivotTable::importFields - multiple record instances" );
- orFields.clear();
- OSL_ENSURE( 2 * nCount == rStrm.getRemaining(), "PivotTable::importFields - invalid field count" );
- nCount = static_cast< sal_Int32 >( rStrm.getRemaining() / 2 );
- for( sal_Int32 nIdx = 0; nIdx < nCount; ++nIdx )
- orFields.push_back( rStrm.readInt16() );
-}
-
// ============================================================================
PivotTableBuffer::PivotTableBuffer( const WorkbookHelper& rHelper ) :
diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index f3b682e07431..51f3f6b7adf2 100644
--- a/sc/source/filter/oox/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -190,26 +190,6 @@ void FontPortionModelList::importPortions( SequenceInputStream& rStrm )
}
}
-void FontPortionModelList::importPortions( BiffInputStream& rStrm, sal_uInt16 nCount, BiffFontPortionMode eMode )
-{
- clear();
- reserve( nCount );
- /* #i33341# real life -- same character index may occur several times
- -> use appendPortion() to validate string position. */
- FontPortionModel aPortion;
- for( sal_uInt16 nIndex = 0; !rStrm.isEof() && (nIndex < nCount); ++nIndex )
- {
- aPortion.read( rStrm, eMode );
- appendPortion( aPortion );
- }
-}
-
-void FontPortionModelList::importPortions( BiffInputStream& rStrm, bool b16Bit )
-{
- sal_uInt16 nCount = b16Bit ? rStrm.readuInt16() : rStrm.readuInt8();
- importPortions( rStrm, nCount, b16Bit ? BIFF_FONTPORTION_16BIT : BIFF_FONTPORTION_8BIT );
-}
-
// ============================================================================
PhoneticDataModel::PhoneticDataModel() :
@@ -294,13 +274,6 @@ void PhoneticPortionModel::read( SequenceInputStream& rStrm )
mnBaseLen = rStrm.readuInt16();
}
-void PhoneticPortionModel::read( BiffInputStream& rStrm )
-{
- mnPos = rStrm.readuInt16();
- mnBasePos = rStrm.readuInt16();
- mnBaseLen = rStrm.readuInt16();
-}
-
// ----------------------------------------------------------------------------
void PhoneticPortionModelList::appendPortion( const PhoneticPortionModel& rPortion )
@@ -336,32 +309,6 @@ void PhoneticPortionModelList::importPortions( SequenceInputStream& rStrm )
}
}
-OUString PhoneticPortionModelList::importPortions( BiffInputStream& rStrm, sal_Int32 nPhoneticSize )
-{
- OUString aPhoneticText;
- sal_uInt16 nPortionCount, nTextLen1, nTextLen2;
- rStrm >> nPortionCount >> nTextLen1 >> nTextLen2;
- OSL_ENSURE( nTextLen1 == nTextLen2, "PhoneticPortionModelList::importPortions - wrong phonetic text length" );
- if( (nTextLen1 == nTextLen2) && (nTextLen1 > 0) )
- {
- sal_Int32 nMinSize = 2 * nTextLen1 + 6 * nPortionCount + 14;
- OSL_ENSURE( nMinSize <= nPhoneticSize, "PhoneticPortionModelList::importPortions - wrong size of phonetic data" );
- if( nMinSize <= nPhoneticSize )
- {
- aPhoneticText = rStrm.readUnicodeArray( nTextLen1 );
- clear();
- reserve( nPortionCount );
- PhoneticPortionModel aPortion;
- for( sal_uInt16 nPortion = 0; nPortion < nPortionCount; ++nPortion )
- {
- aPortion.read( rStrm );
- appendPortion( aPortion );
- }
- }
- }
- return aPhoneticText;
-}
-
// ============================================================================
RichString::RichString( const WorkbookHelper& rHelper ) :
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index 2d3777f9b045..c5f555998e03 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -924,17 +924,6 @@ void Font::importCfRule( BiffInputStream& rStrm )
maModel.mbShadow = getFlag( nStyle, BIFF_CFRULE_FONT_SHADOW );
}
-rtl_TextEncoding Font::getFontEncoding() const
-{
- // #i63105# cells use text encoding from FONT record character set
- // #i67768# BIFF2-BIFF4 FONT records do not contain character set
- // #i71033# do not use maApiData, this function is used before finalizeImport()
- rtl_TextEncoding eFontEnc = RTL_TEXTENCODING_DONTKNOW;
- if( (0 <= maModel.mnCharSet) && (maModel.mnCharSet <= SAL_MAX_UINT8) )
- eFontEnc = rtl_getTextEncodingFromWindowsCharset( static_cast< sal_uInt8 >( maModel.mnCharSet ) );
- return (eFontEnc == RTL_TEXTENCODING_DONTKNOW) ? getTextEncoding() : eFontEnc;
-}
-
void Font::finalizeImport()
{
namespace cssawt = ::com::sun::star::awt;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-20 08:09:01 +0000