summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-24 14:01:10 +0200
committerNoel Grandin <noel@peralex.com>2015-11-24 14:20:25 +0200
commit6cd5d5f0a19b8d30fff0c9aafcce99650581e085 (patch)
treef01db448cc3be1920f4f0b103432d034b3b1a4b6
parente78bb6d545e4dc86ebc17fbeb735f32fa5914bd1 (diff)
loplugin:unusedfields in include/filter/
Change-Id: Id79bc51ba273746873a1381243b2c1d32711bbb4
-rw-r--r--filter/source/msfilter/escherex.cxx1
-rw-r--r--filter/source/msfilter/msdffimp.cxx2
-rw-r--r--filter/source/msfilter/svdfppt.cxx8
-rw-r--r--include/filter/msfilter/escherex.hxx1
-rw-r--r--include/filter/msfilter/msdffimp.hxx4
-rw-r--r--include/filter/msfilter/svdfppt.hxx15
6 files changed, 0 insertions, 31 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index fee5ad8d7981..25d4dcf8dc91 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4979,7 +4979,6 @@ EscherEx::EscherEx(const EscherExGlobalRef& rxGlobal, SvStream* pOutStrm, bool b
, mnHellLayerId(USHRT_MAX)
, mbEscherSpgr(false)
, mbEscherDg(false)
- , mbOleEmf(false)
, mbOOXML(bOOXML)
{
if (!mpOutStrm)
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 55951e8b7706..019d6e079501 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5550,7 +5550,6 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
nSvxMSDffOLEConvFlags( 0 ),
pSecPropSet( nullptr ),
mnDefaultColor( mnDefaultColor_),
- mbTracing( false ),
mbSkipImages (bSkipImages)
{
SetModel( pSdrModel_, nApplicationScale );
@@ -5598,7 +5597,6 @@ SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, const OUString& rBaseURL )
nSvxMSDffOLEConvFlags( 0 ),
pSecPropSet( nullptr ),
mnDefaultColor( COL_DEFAULT ),
- mbTracing( false ),
mbSkipImages(false)
{
SetModel( nullptr, 0 );
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index dfe321c78670..e55edbda97c9 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -522,14 +522,6 @@ SdrEscherImport::SdrEscherImport( PowerPointImportParam& rParam, const OUString&
SvxMSDffManager ( rParam.rDocStream, rBaseURL ),
m_pFonts ( nullptr ),
nStreamLen ( 0 ),
- nTextStylesIndex ( 0xffff ),
- eCharSetSystem ( osl_getThreadTextEncoding() ),
- bWingdingsChecked ( false ),
- bWingdingsAvailable ( false ),
- bMonotypeSortsChecked ( false ),
- bMonotypeSortsAvailable ( false ),
- bTimesNewRomanChecked ( false ),
- bTimesNewRomanAvailable ( false ),
rImportParam ( rParam )
{
}
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 78210d97552e..bfa931f5dcf0 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1185,7 +1185,6 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable
bool mbEscherSpgr;
bool mbEscherDg;
- bool mbOleEmf; // OLE is EMF instead of WMF
bool mbOOXML;
OUString mEditAs;
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 6578a458e440..28b7b27b74ae 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -278,7 +278,6 @@ struct SvxMSDffImportData
MSDffImportRecords m_Records; ///< Shape pointer, Shape ids and private data
Rectangle aParentRect;///< Rectangle of the surrounding groups,
///< which might have been provided externally
- Rectangle aNewRect; ///< Rectangle that is defined by this shape
SvxMSDffImportData()
{}
@@ -306,7 +305,6 @@ struct DffObjData
bool bChildAnchor : 1;
bool bOpt : 1;
bool bOpt2 : 1;
- bool bIsAutoText : 1;
bool bRotateTextWithShape : 1;
bool bPageAnchor;
int nCalledByGroup;
@@ -325,7 +323,6 @@ struct DffObjData
bChildAnchor( false ),
bOpt( false ),
bOpt2( false ),
- bIsAutoText( false ),
bRotateTextWithShape( true ),
bPageAnchor( true ),
nCalledByGroup( nClByGroup ){}
@@ -515,7 +512,6 @@ public:
DffRecordManager maShapeRecords;
ColorData mnDefaultColor;
- bool mbTracing;
bool mbSkipImages;
Color MSO_TEXT_CLR_ToColor( sal_uInt32 nColorCode ) const;
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 710eee35c0a6..cfd27ddba410 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -105,7 +105,6 @@ struct SdHyperlinkEntry
OUString aConvSubString;
ESelection aESelection;
- bool bSelection;
};
// Helper class for reading the PPT InteractiveInfoAtom
@@ -267,11 +266,9 @@ public:
struct PptFontEntityAtom
{
OUString aName;
- double fScaling;
sal_uInt8 lfClipPrecision;
sal_uInt8 lfQuality;
- sal_uInt32 nUniqueFontId; // not used anymore
rtl_TextEncoding eCharSet;
FontFamily eFamily;
FontPitch ePitch;
@@ -393,7 +390,6 @@ class SfxObjectShell;
struct PPTOleEntry
{
sal_uInt32 nId; // OleId
- sal_uInt32 nPersistPtr; // PersistPtr
sal_uInt32 nRecHdOfs; // points to the record header: ExObjListHd
SfxObjectShell* pShell;
sal_uInt16 nType; // maybe PPT_PST_ExEmbed or PPT_PST_ExControl
@@ -401,7 +397,6 @@ struct PPTOleEntry
PPTOleEntry( sal_uInt32 nid, sal_uInt32 nOfs, SfxObjectShell* pSh, sal_uInt16 nT, sal_uInt32 nAsp )
: nId(nid)
- , nPersistPtr(0)
, nRecHdOfs(nOfs)
, pShell(pSh)
, nType(nT)
@@ -446,16 +441,6 @@ protected:
PptFontCollection* m_pFonts;
sal_uInt32 nStreamLen;
- sal_uInt16 nTextStylesIndex;
-
- rtl_TextEncoding eCharSetSystem;
-
- bool bWingdingsChecked : 1;
- bool bWingdingsAvailable : 1;
- bool bMonotypeSortsChecked : 1;
- bool bMonotypeSortsAvailable : 1;
- bool bTimesNewRomanChecked : 1;
- bool bTimesNewRomanAvailable : 1;
bool ReadString( OUString& rStr ) const;
// only for PowerPoint filter: