compilerplugins/clang/unusedfields.py | 9 ++-------
filter/source/msfilter/eschesdo.cxx | 11 -----------
filter/source/msfilter/eschesdo.hxx | 2 --
filter/source/svg/svgexport.cxx | 13 -------------
filter/source/svg/svgfilter.hxx | 10 ----------
filter/source/svg/svgwriter.cxx | 3 ---
filter/source/svg/svgwriter.hxx | 1 -
include/oox/core/contexthandler2.hxx | 3 +--
oox/source/core/contexthandler2.cxx | 8 +++-----
oox/source/core/fragmenthandler2.cxx | 2 +-
vcl/source/filter/igif/gifread.cxx | 3 ---
11 files changed, 7 insertions(+), 58 deletions(-)
New commits:
commit 5155e21bf1c511fa844010b9d07e2bfcb9ce8570
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Dec 3 09:53:24 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Dec 4 10:22:09 2024 +0100
loplugin:unusedfields
Change-Id: Iac4a64af74c92cbd76335faa62e51fa80ef21789
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177718
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/unusedfields.py
b/compilerplugins/clang/unusedfields.py
index bbfbd0164dca..83e21bb8df62 100755
--- a/compilerplugins/clang/unusedfields.py
+++ b/compilerplugins/clang/unusedfields.py
@@ -174,13 +174,8 @@ for d in definitionSet:
if "Guard" in fieldType:
continue
# these are just all model classes
- if (srcLoc.startswith("oox/")
- or srcLoc.startswith("lotuswordpro/")
- or srcLoc.startswith("include/oox/")
- or srcLoc.startswith("include/filter/")
- or srcLoc.startswith("hwpfilter/")
- or srcLoc.startswith("filter/")
- or srcLoc.startswith("vcl/source/filter/")):
+ if (srcLoc.startswith("lotuswordpro/")
+ or srcLoc.startswith("hwpfilter/")):
continue
if "(lambda at " in d[0]:
continue
diff --git a/filter/source/msfilter/eschesdo.cxx
b/filter/source/msfilter/eschesdo.cxx
index 5571a38419f3..edffd563ffc5 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -53,7 +53,6 @@ ImplEESdrWriter::ImplEESdrWriter( EscherEx& rEx )
: mpEscherEx(&rEx)
, mpPicStrm(nullptr)
, mpHostAppData(nullptr)
- , mbIsTitlePossible(false)
, mpSdrPage( nullptr )
{
}
@@ -829,16 +828,9 @@ sal_uInt32 ImplEESdrWriter::ImplEnterAdditionalTextGroup(
const Reference< XShap
}
-void ImplEESdrWriter::ImplInitPageValues()
-{
- mbIsTitlePossible = true; // With more than one title PowerPoint
will fail.
-}
-
void ImplEESdrWriter::ImplWritePage(
EscherSolverContainer& rSolverContainer, bool ooxmlExport )
{
- ImplInitPageValues();
-
const sal_uInt32 nShapes = mXShapes->getCount();
for( sal_uInt32 n = 0; n < nShapes; ++n )
{
@@ -875,7 +867,6 @@ bool ImplEESdrWriter::ImplInitPage( const SdrPage& rPage )
mXShapes = mXDrawPage;
if ( !mXShapes.is() )
return false;
- ImplInitPageValues();
mpSdrPage = &rPage;
mpSolverContainer.reset( new EscherSolverContainer );
@@ -898,8 +889,6 @@ bool ImplEESdrWriter::ImplInitUnoShapes( const Reference<
XShapes >& rxShapes )
mXDrawPage.clear();
mXShapes = rxShapes;
- ImplInitPageValues();
-
mpSolverContainer.reset( new EscherSolverContainer );
return true;
}
diff --git a/filter/source/msfilter/eschesdo.hxx
b/filter/source/msfilter/eschesdo.hxx
index bd2c1153eacb..5e4bda191e1f 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -105,11 +105,9 @@ class ImplEESdrWriter
SvStream* mpPicStrm;
// own extensions
EscherExHostAppData* mpHostAppData;
- bool mbIsTitlePossible;
const SdrPage* mpSdrPage;
std::unique_ptr<EscherSolverContainer> mpSolverContainer;
- void ImplInitPageValues();
void ImplWritePage( EscherSolverContainer& rSolver, bool
ooxmlExport );
sal_uInt32 ImplWriteShape( ImplEESdrObject& rObj,
EscherSolverContainer& rSolver,
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index f7b30e5b446e..63e829653046 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -1792,11 +1792,6 @@ void SVGFilter::implGetPagePropSet( const Reference<
css::drawing::XDrawPage > &
mVisiblePagePropSet.bIsBackgroundVisible = true;
mVisiblePagePropSet.bAreBackgroundObjectsVisible = true;
mVisiblePagePropSet.bIsPageNumberFieldVisible = false;
- mVisiblePagePropSet.bIsHeaderFieldVisible = false;
- mVisiblePagePropSet.bIsFooterFieldVisible = true;
- mVisiblePagePropSet.bIsDateTimeFieldVisible = true;
- mVisiblePagePropSet.bIsDateTimeFieldFixed = true;
- mVisiblePagePropSet.nDateTimeFormat = SvxDateFormat::B;
mVisiblePagePropSet.nPageNumberingType =
css::style::NumberingType::ARABIC;
// We collect info on master page elements visibility, and placeholder
text shape content.
@@ -1811,14 +1806,6 @@ void SVGFilter::implGetPagePropSet( const Reference<
css::drawing::XDrawPage > &
implSafeGetPagePropSet( u"IsBackgroundVisible"_ustr, xPropSet,
xPropSetInfo ) >>= mVisiblePagePropSet.bIsBackgroundVisible;
implSafeGetPagePropSet( u"IsBackgroundObjectsVisible"_ustr, xPropSet,
xPropSetInfo ) >>= mVisiblePagePropSet.bAreBackgroundObjectsVisible;
implSafeGetPagePropSet( u"IsPageNumberVisible"_ustr, xPropSet,
xPropSetInfo ) >>= mVisiblePagePropSet.bIsPageNumberFieldVisible;
- implSafeGetPagePropSet( u"IsHeaderVisible"_ustr, xPropSet, xPropSetInfo )
>>= mVisiblePagePropSet.bIsHeaderFieldVisible;
- implSafeGetPagePropSet( u"IsFooterVisible"_ustr, xPropSet, xPropSetInfo )
>>= mVisiblePagePropSet.bIsFooterFieldVisible;
- implSafeGetPagePropSet( u"IsDateTimeVisible"_ustr, xPropSet, xPropSetInfo
) >>= mVisiblePagePropSet.bIsDateTimeFieldVisible;
-
- implSafeGetPagePropSet( u"IsDateTimeFixed"_ustr, xPropSet, xPropSetInfo )
>>= mVisiblePagePropSet.bIsDateTimeFieldFixed;
- sal_Int32 nTmp;
- if (implSafeGetPagePropSet( u"DateTimeFormat"_ustr, xPropSet, xPropSetInfo
) >>= nTmp)
- mVisiblePagePropSet.nDateTimeFormat = static_cast<SvxDateFormat>(nTmp);
if( mVisiblePagePropSet.bIsPageNumberFieldVisible )
{
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 29b0a7d29374..90bd682fdb95 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -122,22 +122,12 @@ struct PagePropertySet
bool bIsBackgroundVisible;
bool bAreBackgroundObjectsVisible;
bool bIsPageNumberFieldVisible;
- bool bIsDateTimeFieldVisible;
- bool bIsFooterFieldVisible;
- bool bIsHeaderFieldVisible;
sal_Int32 nPageNumberingType;
- bool bIsDateTimeFieldFixed;
- SvxDateFormat nDateTimeFormat;
PagePropertySet()
: bIsBackgroundVisible(false)
, bAreBackgroundObjectsVisible(false)
, bIsPageNumberFieldVisible(false)
- , bIsDateTimeFieldVisible(false)
- , bIsFooterFieldVisible(false)
- , bIsHeaderFieldVisible(false)
, nPageNumberingType(0)
- , bIsDateTimeFieldFixed(false)
- , nDateTimeFormat(SvxDateFormat::AppDefault)
{
}
};
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 6a9ae6b6219f..00c3f1eb0e40 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1858,7 +1858,6 @@ SVGActionWriter::SVGActionWriter( SVGExport& rExport,
SVGFontExport& rFontExport
maAttributeWriter( rExport, rFontExport, mrCurrentState ),
maTextWriter(rExport, maAttributeWriter, *this),
mpVDev(VclPtr<VirtualDevice>::Create()),
- mbClipAttrChanged( false ),
mbIsPlaceholderShape( false ),
mpEmbeddedBitmapsMap( nullptr ),
mbIsPreview( false )
@@ -4054,8 +4053,6 @@ void SVGActionWriter::ImplWriteActions( const
GDIMetaFile& rMtf,
const_cast<MetaAction*>(pAction)->Execute( mpVDev );
const vcl::Region aClipRegion = mpVDev->GetActiveClipRegion();
ImplWriteClipPath( aClipRegion.GetAsPolyPolygon() );
-
- mbClipAttrChanged = true;
}
break;
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index d87e2e67d4df..a798b8b74a78 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -316,7 +316,6 @@ private:
SVGTextWriter maTextWriter;
VclPtr<VirtualDevice> mpVDev;
MapMode maTargetMapMode;
- bool mbClipAttrChanged;
bool mbIsPlaceholderShape;
const MetaBitmapActionMap* mpEmbeddedBitmapsMap;
bool mbIsPreview;
diff --git a/include/oox/core/contexthandler2.hxx
b/include/oox/core/contexthandler2.hxx
index b6664704044e..dab78e8ed7a6 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -72,7 +72,7 @@ struct ElementInfo;
class OOX_DLLPUBLIC SAL_LOPLUGIN_ANNOTATE("crosscast") ContextHandler2Helper
{
public:
- explicit ContextHandler2Helper( bool bEnableTrimSpace,
XmlFilterBase& rFilter );
+ explicit ContextHandler2Helper( bool bEnableTrimSpace );
explicit ContextHandler2Helper( const ContextHandler2Helper&
rParent );
virtual ~ContextHandler2Helper();
@@ -232,7 +232,6 @@ private:
protected:
bool mbEnableTrimSpace; ///< True = trim whitespace in
characters().
- XmlFilterBase& mrFilter;
};
class OOX_DLLPUBLIC ContextHandler2 : public ContextHandler, public
ContextHandler2Helper
diff --git a/oox/source/core/contexthandler2.cxx
b/oox/source/core/contexthandler2.cxx
index 5c4ab66987ab..5eb725204125 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -45,11 +45,10 @@ struct ElementInfo
explicit ElementInfo() : maChars( 0), mnElement( XML_TOKEN_INVALID ),
mbTrimSpaces( false ) {}
};
-ContextHandler2Helper::ContextHandler2Helper( bool bEnableTrimSpace,
XmlFilterBase& rFilter ) :
+ContextHandler2Helper::ContextHandler2Helper( bool bEnableTrimSpace ) :
mxContextStack( std::make_shared<ContextStack>() ),
mnRootStackSize( 0 ),
- mbEnableTrimSpace( bEnableTrimSpace ),
- mrFilter( rFilter )
+ mbEnableTrimSpace( bEnableTrimSpace )
{
pushElementInfo( XML_ROOT_CONTEXT );
}
@@ -57,8 +56,7 @@ ContextHandler2Helper::ContextHandler2Helper( bool
bEnableTrimSpace, XmlFilterBa
ContextHandler2Helper::ContextHandler2Helper( const ContextHandler2Helper&
rParent ) :
mxContextStack( rParent.mxContextStack ),
mnRootStackSize( rParent.mxContextStack->size() ),
- mbEnableTrimSpace( rParent.mbEnableTrimSpace ),
- mrFilter(rParent.mrFilter)
+ mbEnableTrimSpace( rParent.mbEnableTrimSpace )
{
}
diff --git a/oox/source/core/fragmenthandler2.cxx
b/oox/source/core/fragmenthandler2.cxx
index e4eeef076f41..aac1d0c3899e 100644
--- a/oox/source/core/fragmenthandler2.cxx
+++ b/oox/source/core/fragmenthandler2.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star::xml::sax;
FragmentHandler2::FragmentHandler2( XmlFilterBase& rFilter, const OUString&
rFragmentPath, bool bEnableTrimSpace ) :
FragmentHandler( rFilter, rFragmentPath ),
- ContextHandler2Helper( bEnableTrimSpace, rFilter )
+ ContextHandler2Helper( bEnableTrimSpace )
{
}
diff --git a/vcl/source/filter/igif/gifread.cxx
b/vcl/source/filter/igif/gifread.cxx
index 6f96131a7908..a402faab1871 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -88,7 +88,6 @@ class GIFReader
bool bGCTransparent; // is the image transparent,
if yes:
bool bInterlaced;
bool bOverreadBlock;
- bool bImGraphicReady;
bool bGlobalPalette;
sal_uInt8 nBackgroundColor; // backgroundcolour
sal_uInt8 nGCTransparentIndex; // pixels of this index are
transparent
@@ -146,7 +145,6 @@ GIFReader::GIFReader( SvStream& rStm )
, bGCTransparent ( false )
, bInterlaced ( false)
, bOverreadBlock ( false )
- , bImGraphicReady ( false )
, bGlobalPalette ( false )
, nBackgroundColor ( 0 )
, nGCTransparentIndex ( 0 )
@@ -825,7 +823,6 @@ bool GIFReader::ProcessGIF()
if ( nRet == 1 )
{
- bImGraphicReady = true;
eActAction = NEXT_BLOCK_READING;
bOverreadBlock = false;
}
