summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--filter/source/flash/swfexporter.cxx8
-rw-r--r--filter/source/flash/swfexporter.hxx24
-rw-r--r--filter/source/flash/swfwriter.hxx3
-rw-r--r--filter/source/graphicfilter/eps/eps.cxx18
-rw-r--r--filter/source/graphicfilter/icgm/cgm.cxx4
-rw-r--r--filter/source/graphicfilter/icgm/chart.cxx5
-rw-r--r--filter/source/graphicfilter/icgm/chart.hxx24
-rw-r--r--filter/source/graphicfilter/icgm/class7.cxx8
-rw-r--r--filter/source/graphicfilter/icgm/elements.cxx3
-rw-r--r--filter/source/graphicfilter/icgm/elements.hxx5
-rw-r--r--filter/source/graphicfilter/itga/itga.cxx11
-rw-r--r--filter/source/msfilter/eschesdo.cxx4
-rw-r--r--filter/source/msfilter/eschesdo.hxx3
-rw-r--r--filter/source/msfilter/msdffimp.cxx8
-rw-r--r--filter/source/svg/gfxtypes.hxx1
-rw-r--r--filter/source/svg/svgwriter.cxx2
-rw-r--r--filter/source/svg/svgwriter.hxx3
17 files changed, 20 insertions, 114 deletions
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index 883496556a97..360da87fc92d 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -62,15 +62,9 @@ using com::sun::star::lang::XServiceInfo;
PageInfo::PageInfo()
- : meFadeEffect( FadeEffect_NONE )
- , meFadeSpeed( AnimationSpeed_MEDIUM )
- , mnDuration( 0 )
- , mnChange( 0 )
- , mnBackgroundID( 0 )
+ : mnBackgroundID( 0 )
, mnObjectsID( 0)
, mnForegroundID( 0)
- , mbBackgroundVisible( false )
- , mbBackgroundObjectsVisible( false )
{
}
diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx
index 8895f39bce97..e4b831e5d58e 100644
--- a/filter/source/flash/swfexporter.hxx
+++ b/filter/source/flash/swfexporter.hxx
@@ -70,8 +70,7 @@ public:
sal_Int32 mnPresOrder;
- css::presentation::ClickAction meClickAction;
- OUString maBookmark;
+ OUString maBookmark;
sal_Int32 mnDimColor;
bool mbDimHide;
@@ -89,7 +88,6 @@ public:
meTextEffect( css::presentation::AnimationEffect_NONE ),
meEffectSpeed( css::presentation::AnimationSpeed_MEDIUM ),
mnPresOrder( 0 ),
- meClickAction( css::presentation::ClickAction_NONE ),
mnDimColor( 0 ),
mbDimHide( false ),
mbDimPrev( false ),
@@ -99,32 +97,12 @@ public:
};
-struct ShapeAnimationInfo
-{
- ShapeInfo* mpShapeInfo;
- sal_uInt16 mnDepth;
-
- ShapeAnimationInfo( ShapeInfo* pShapeInfo, sal_uInt16 nDepth ) : mpShapeInfo( pShapeInfo ), mnDepth( nDepth ) {}
-};
-
-
-
-
struct PageInfo
{
- css::presentation::FadeEffect meFadeEffect;
- css::presentation::AnimationSpeed meFadeSpeed;
-
- sal_Int32 mnDuration;
- sal_Int32 mnChange;
-
sal_uInt16 mnBackgroundID;
sal_uInt16 mnObjectsID;
sal_uInt16 mnForegroundID;
- bool mbBackgroundVisible;
- bool mbBackgroundObjectsVisible;
-
::std::vector<ShapeInfo*>
maShapesVector;
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index b362082ef7d5..333c2af911b6 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -413,9 +413,6 @@ private:
sal_uInt16 mnNextId;
sal_uInt32 mnFrames;
-// css::uno::Reference< css::io::XOutputStream > mxOutStream;
- oslFileHandle mxOutStream;
-
utl::TempFile maMovieTempFile;
utl::TempFile maFontsTempFile;
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index c2d9bfb60a6d..3c63a7695883 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -60,14 +60,6 @@ using namespace ::com::sun::star::uno;
// -----------------------------field-types------------------------------
-struct ChrSet
-{
- struct ChrSet * pSucc;
- sal_uInt8 nSet;
- OUString aName;
- FontWeight eWeight;
-};
-
struct StackMember
{
struct StackMember * pSucc;
@@ -146,7 +138,6 @@ private:
vcl::Font maFont;
vcl::Font maLastFont;
sal_uInt8 nChrSet;
- ChrSet* pChrSetList; // list of character sets
sal_uInt8 nNextChrSetId; // first unused ChrSet-Id
PSLZWCTreeNode* pTable; // LZW compression data
@@ -283,7 +274,6 @@ PSWriter::PSWriter()
, maFont()
, maLastFont()
, nChrSet(0)
- , pChrSetList(nullptr)
, nNextChrSetId(0)
, pTable(nullptr)
, pPrefix(nullptr)
@@ -407,7 +397,6 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter
}
// global default value setting
- ChrSet* pCS;
StackMember* pGS;
if (rGraphic.GetType() == GRAPHIC_GDIMETAFILE)
@@ -447,7 +436,6 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter
bRegionChanged = false;
nChrSet = 0x00;
- pChrSetList = nullptr;
nNextChrSetId = 1;
if( pMTF->GetActionSize() )
@@ -464,12 +452,6 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter
rTargetStream.WriteUInt32( nPosition - nPSPosition );
rTargetStream.Seek( nPosition );
}
- while( pChrSetList )
- {
- pCS=pChrSetList;
- pChrSetList=pCS->pSucc;
- delete pCS;
- }
while( pGDIStack )
{
pGS=pGDIStack;
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index ead44f8fc411..b71aa03c0d60 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -68,8 +68,8 @@ CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > const & rModel )
, mnElementSize(0)
, mpGDIMetaFile(nullptr)
{
- pElement = new CGMElements( *this );
- pCopyOfE = new CGMElements( *this );
+ pElement = new CGMElements;
+ pCopyOfE = new CGMElements;
}
CGM::~CGM()
diff --git a/filter/source/graphicfilter/icgm/chart.cxx b/filter/source/graphicfilter/icgm/chart.cxx
index 73961fe64e14..5c9e2ce53252 100644
--- a/filter/source/graphicfilter/icgm/chart.cxx
+++ b/filter/source/graphicfilter/icgm/chart.cxx
@@ -21,9 +21,8 @@
#include <chart.hxx>
-CGMChart::CGMChart(CGM& rCGM)
- : mpCGM(&rCGM)
- , mnCurrentFileType(0)
+CGMChart::CGMChart()
+ : mnCurrentFileType(0)
{
for ( sal_Int8 i = 0; i < 7; i++ )
{
diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx
index 8a5067d7b441..632ec0a13dc2 100644
--- a/filter/source/graphicfilter/icgm/chart.hxx
+++ b/filter/source/graphicfilter/icgm/chart.hxx
@@ -113,26 +113,6 @@ struct BulletOption
}
};
-struct BulDef
-{
- char btype;
- char bsize;
- char bcolor;
- char bnumber;
- BulDef()
- : btype(0)
- , bsize(0)
- , bcolor(0)
- , bnumber(0)
- {
- }
-};
-
-typedef struct BulletLines
-{
- BulDef nBulDef[ 48 ];
-} BulletLines;
-
struct IntSettings
{
sal_uInt16 nCountry;
@@ -215,19 +195,17 @@ class CGMChart
friend class CGMImpressOutAct;
protected:
- CGM* mpCGM;
sal_Int8 mnCurrentFileType;
::std::vector< TextEntry* > maTextEntryList;
DataNode mDataNode[ 7 ];
ChartZone mChartZone;
PageOrientDim mPageOrientDim;
BulletOption mBulletOption;
- BulletLines mBulletLines;
ZoneOption mZoneOption;
IntSettings mIntSettings;
public:
- CGMChart( CGM& rCGM );
+ CGMChart();
~CGMChart();
void DeleteTextEntry( TextEntry* );
diff --git a/filter/source/graphicfilter/icgm/class7.cxx b/filter/source/graphicfilter/icgm/class7.cxx
index 21951e8fc79f..b4f7994f15c2 100644
--- a/filter/source/graphicfilter/icgm/class7.cxx
+++ b/filter/source/graphicfilter/icgm/class7.cxx
@@ -42,7 +42,7 @@ void CGM::ImplDoClass7()
case 0x000 : /*AppData - Beginning of File Opcodes*/
{
if ( mpChart == nullptr )
- mpChart = new CGMChart( *this );
+ mpChart = new CGMChart;
mpChart->mnCurrentFileType = pAppData[ 3 ];
}
break;
@@ -179,11 +179,7 @@ void CGM::ImplDoClass7()
mpChart->mBulletOption = *reinterpret_cast<BulletOption*>( pAppData );
}
break;
- case 0x454 : /*AppData - BULLETLINES*/
- {
- mpChart->mBulletLines = *reinterpret_cast<BulletLines*>( pAppData );
- }
- break;
+ case 0x454 : /*AppData - BULLETLINES*/break;
case 0x456 : /*AppData - BULAUTOBUILD */break;
case 0x4B2 : /*AppData - TBLTEXTOPTN */break;
case 0x4B6 : /*AppData - TBLOPTN */break;
diff --git a/filter/source/graphicfilter/icgm/elements.cxx b/filter/source/graphicfilter/icgm/elements.cxx
index 2be1308355aa..2172b72bf14d 100644
--- a/filter/source/graphicfilter/icgm/elements.cxx
+++ b/filter/source/graphicfilter/icgm/elements.cxx
@@ -23,8 +23,7 @@
-CGMElements::CGMElements( CGM& rCGM ) :
- mpCGM ( &rCGM )
+CGMElements::CGMElements()
{
Init();
};
diff --git a/filter/source/graphicfilter/icgm/elements.hxx b/filter/source/graphicfilter/icgm/elements.hxx
index fc7acaca30d0..b2a5fcdea52e 100644
--- a/filter/source/graphicfilter/icgm/elements.hxx
+++ b/filter/source/graphicfilter/icgm/elements.hxx
@@ -32,7 +32,6 @@ class CGMElements
{
void ImplInsertHatch( sal_Int32 Key, int Style, long Distance, long Angle );
public:
- CGM* mpCGM;
long nMetaFileVersion;
sal_uInt32 nIntegerPrecision; // maybe 1, 2, 4 Bytes
@@ -125,8 +124,8 @@ class CGMElements
// Delimiter Counts -> which will be increased by each 'begin' operation
// and decreased by each 'end' operation
- bool bSegmentCount;
- explicit CGMElements( CGM& rCGM );
+ bool bSegmentCount;
+ explicit CGMElements();
~CGMElements();
CGMElements& operator=( CGMElements& );
void Init();
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index 2a06bd5c6758..e36146b571db 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -57,12 +57,11 @@ struct TGAFileFooter
struct TGAExtension
{
sal_uInt16 nExtensionSize;
- char sAuthorName[41];
- char sAuthorComment[324];
- char sDateTimeStamp[12];
- char sJobNameID[41];
- sal_uInt16 nJobTime[3];
- char sSoftwareID[41];
+ char sAuthorName[41];
+ char sAuthorComment[324];
+ char sDateTimeStamp[12];
+ char sJobNameID[41];
+ char sSoftwareID[41];
sal_uInt16 nSoftwareVersionNumber;
sal_uInt8 nSoftwareVersionLetter;
sal_uInt32 nKeyColor;
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 16ea2f18063b..d325345254cb 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -68,16 +68,12 @@ ImplEESdrWriter::ImplEESdrWriter( EscherEx& rEx )
, mpPicStrm(nullptr)
, mpHostAppData(nullptr)
, mnPagesWritten(0)
- , mnShapeMasterTitle(0)
- , mnShapeMasterBody(0)
, mnIndices(0)
, mnOutlinerCount(0)
- , mnPrevTextStyle(0)
, mnStatMaxValue(0)
, mnEffectCount(0)
, mbIsTitlePossible(false)
, mbStatusIndicator(false)
- , mbStatus(false)
{
}
diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx
index 3acb304189d4..f4b50cae88fc 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -124,20 +124,17 @@ protected:
sal_uInt32 mnPagesWritten;
- sal_uInt32 mnShapeMasterTitle;
sal_uInt32 mnShapeMasterBody;
// per page values
sal_uInt32 mnIndices;
sal_uInt32 mnOutlinerCount;
- sal_uInt32 mnPrevTextStyle;
sal_uInt32 mnStatMaxValue;
sal_uInt16 mnEffectCount;
bool mbIsTitlePossible;
bool mbStatusIndicator;
- bool mbStatus;
explicit ImplEESdrWriter( EscherEx& rEx );
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 41c1e5a922a2..235c2743ea5f 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -152,11 +152,9 @@ static sal_uInt32 nMSOleObjCntr = 0;
struct SvxMSDffBLIPInfo
{
- sal_uInt16 nBLIPType; ///< type of BLIP: e.g. 6 for PNG
sal_uLong nFilePos; ///< offset of the BLIP in data strem
- sal_uLong nBLIPSize; ///< number of bytes that the BLIP needs in stream
- SvxMSDffBLIPInfo(sal_uInt16 nBType, sal_uLong nFPos, sal_uLong nBSize):
- nBLIPType( nBType ), nFilePos( nFPos ), nBLIPSize( nBSize ){}
+ SvxMSDffBLIPInfo(sal_uLong nFPos):
+ nFilePos( nFPos ) {}
};
/// the following will be sorted by the order of their appearance:
@@ -5886,7 +5884,7 @@ void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLe
nBLIPCount++;
// now save the info for later access
- m_pBLIPInfos->push_back(SvxMSDffBLIPInfo(nInst, nBLIPPos, nBLIPLen));
+ m_pBLIPInfos->push_back(SvxMSDffBLIPInfo(nBLIPPos));
}
rSt.SeekRel( nLength );
}
diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx
index fddefdec1ca4..3d502da9ccd9 100644
--- a/filter/source/svg/gfxtypes.hxx
+++ b/filter/source/svg/gfxtypes.hxx
@@ -72,7 +72,6 @@ struct Gradient
GradientType meType;
union
{
- double test;
struct
{
double mfX1;
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index f33cb4d0561f..14981f55a6aa 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -98,8 +98,6 @@ SVGAttributeWriter::SVGAttributeWriter( SVGExport& rExport, SVGFontExport& rFont
, mrFontExport( rFontExport )
, mpElemFont( nullptr )
, mpElemPaint( nullptr )
- , maLineJoin(basegfx::B2DLineJoin::NONE)
- , maLineCap(css::drawing::LineCap_BUTT)
{
}
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 1175a265de3a..7afb41b51bb8 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -97,9 +97,6 @@ private:
SvXMLElementExport* mpElemFont;
SvXMLElementExport* mpElemPaint;
- basegfx::B2DLineJoin maLineJoin;
- css::drawing::LineCap maLineCap;
-
SVGAttributeWriter();
static double ImplRound( double fVal, sal_Int32 nDecs = 3 );
generated by cgit (git 2.34.1) at 2025-01-06 23:15:08 +0000