loplugin:unusedfields in sd
Change-Id: I42def3dc21ae1a18e1c98d1aeeff4ed4425e941a
Reviewed-on: https://gerrit.libreoffice.org/39479
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index aa9677d..8ad874f 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -2740,8 +2740,6 @@ sd/inc/sdmod.hxx:131
SdModule mpErrorHdl class SfxErrorHandler *
sd/source/filter/eppt/eppt.hxx:176
PPTWriter mnTxId sal_uInt32
sd/source/filter/eppt/epptbase.hxx:140
FontCollectionEntry bIsConverted _Bool
sd/source/filter/ppt/ppt97animations.hxx:41
Ppt97AnimationInfoAtom nSlideCount sal_uInt16
sd/source/filter/ppt/ppt97animations.hxx:47
@@ -2750,14 +2748,6 @@ sd/source/filter/ppt/ppt97animations.hxx:50
Ppt97AnimationInfoAtom nUnknown1 sal_uInt8
sd/source/filter/ppt/ppt97animations.hxx:51
Ppt97AnimationInfoAtom nUnknown2 sal_uInt8
sd/source/filter/ppt/propread.hxx:142
PropRead mnFormat sal_uInt16
sd/source/filter/ppt/propread.hxx:143
PropRead mnVersionLo sal_uInt16
sd/source/filter/ppt/propread.hxx:144
PropRead mnVersionHi sal_uInt16
sd/source/ui/framework/factories/BasicPaneFactory.cxx:74
sd::framework::BasicPaneFactory::PaneDescriptor mbIsChildWindow _Bool
sd/source/ui/inc/animobjs.hxx:129
sd::AnimationWindow pControllerItem class sd::AnimationControllerItem *
sd/source/ui/inc/navigatr.hxx:122
@@ -2770,24 +2760,6 @@ sd/source/ui/remotecontrol/ZeroconfService.hxx:36
sd::ZeroconfService port uint
sd/source/ui/sidebar/MasterPageContainerProviders.hxx:136
sd::sidebar::TemplatePreviewProvider msURL class rtl::OUString
sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx:135
sd::slidesorter::controller::Clipboard mbUpdateSelectionPending _Bool
sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx:57
sd::slidesorter::model::VisualState meCurrentVisualState enum sd::slidesorter::model::VisualState::State
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:121
sd::slidesorter::view::Theme::GradientDescriptor maBaseColor ColorData
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:123
sd::slidesorter::view::Theme::GradientDescriptor mnSaturationOverride sal_Int32
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:124
sd::slidesorter::view::Theme::GradientDescriptor mnBrightnessOverride sal_Int32
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:131
sd::slidesorter::view::Theme::GradientDescriptor mnFillOffset1 sal_Int32
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:132
sd::slidesorter::view::Theme::GradientDescriptor mnFillOffset2 sal_Int32
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:133
sd::slidesorter::view::Theme::GradientDescriptor mnBorderOffset1 sal_Int32
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx:134
sd::slidesorter::view::Theme::GradientDescriptor mnBorderOffset2 sal_Int32
sd/source/ui/slidesorter/view/SlsLayouter.cxx:61
sd::slidesorter::view::Layouter::Implementation mpTheme std::shared_ptr<view::Theme>
sd/source/ui/table/TableDesignPane.hxx:113
@@ -2804,8 +2776,6 @@ sd/source/ui/view/viewshel.cxx:1236
sd::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
sd/source/ui/view/ViewShellBase.cxx:195
sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager>
sdext/source/pdfimport/pdfiadaptor.hxx:92
pdfi::PDFIRawAdaptor m_bEnableToplevelText _Bool
sfx2/source/doc/doctempl.cxx:118
DocTempl::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock
sfx2/source/doc/docundomanager.cxx:198
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index 8213a6c..b47d1a4 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -137,7 +137,6 @@ struct FontCollectionEntry
sal_Int16 CharSet;
OUString Original;
bool bIsConverted;
FontCollectionEntry( const OUString& rName, sal_Int16 nFamily, sal_Int16 nPitch, sal_Int16 nCharSet ) :
Scaling ( 1.0 ),
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 0cdf747..ebe7a35 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -1371,12 +1371,10 @@ void FontCollectionEntry::ImplInit( const OUString& rName )
if ( !aSubstName.isEmpty() )
{
Name = aSubstName;
bIsConverted = true;
}
else
{
Name = rName;
bIsConverted = false;
}
}
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index e586cd9..857912f 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -536,10 +536,7 @@ Section& Section::operator=( const Section& rSection )
PropRead::PropRead( SotStorage& rStorage, const OUString& rName ) :
mbStatus ( false ),
mnByteOrder ( 0xfffe ),
mnFormat ( 0 ),
mnVersionLo ( 4 ),
mnVersionHi ( 2 )
mnByteOrder ( 0xfffe )
{
if ( rStorage.IsStream( rName ) )
{
@@ -570,6 +567,9 @@ void PropRead::Read()
if ( mbStatus )
{
sal_uInt16 mnVersionLo;
sal_uInt16 mnVersionHi;
sal_uInt16 mnFormat;
mpSvStream->ReadUInt16( mnByteOrder ).ReadUInt16( mnFormat ).ReadUInt16( mnVersionLo ).ReadUInt16( mnVersionHi );
if ( mnByteOrder == 0xfffe )
{
@@ -605,9 +605,6 @@ PropRead& PropRead::operator=( const PropRead& rPropRead )
mpSvStream = rPropRead.mpSvStream;
mnByteOrder = rPropRead.mnByteOrder;
mnFormat = rPropRead.mnFormat;
mnVersionLo = rPropRead.mnVersionLo;
mnVersionHi = rPropRead.mnVersionHi;
memcpy( mApplicationCLSID, rPropRead.mApplicationCLSID, 16 );
for(const std::unique_ptr<Section>& rSection : rPropRead.maSections)
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index fc1e3f2..f6db133 100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -139,9 +139,6 @@ class PropRead
tools::SvRef<SotStorageStream> mpSvStream;
sal_uInt16 mnByteOrder;
sal_uInt16 mnFormat;
sal_uInt16 mnVersionLo;
sal_uInt16 mnVersionHi;
sal_uInt8 mApplicationCLSID[ 16 ];
std::vector<std::unique_ptr<Section> > maSections;
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 7dd2f40..aea1f28 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -71,7 +71,6 @@ public:
flag is reset.
*/
bool mbIsReleased;
bool mbIsChildWindow;
bool CompareURL(const OUString& rsPaneURL) const { return msPaneURL.equals(rsPaneURL); }
bool ComparePane(const Reference<XResource>& rxPane) const { return mxPane == rxPane; }
@@ -161,7 +160,6 @@ void SAL_CALL BasicPaneFactory::initialize (const Sequence<Any>& aArguments)
aDescriptor.msPaneURL = FrameworkHelper::msCenterPaneURL;
aDescriptor.mePaneId = CenterPaneId;
aDescriptor.mbIsReleased = false;
aDescriptor.mbIsChildWindow = false;
mpPaneContainer->push_back(aDescriptor);
xCC->addResourceFactory(aDescriptor.msPaneURL, this);
@@ -172,7 +170,6 @@ void SAL_CALL BasicPaneFactory::initialize (const Sequence<Any>& aArguments)
aDescriptor.msPaneURL = FrameworkHelper::msLeftImpressPaneURL;
aDescriptor.mePaneId = LeftImpressPaneId;
aDescriptor.mbIsChildWindow = true;
mpPaneContainer->push_back(aDescriptor);
xCC->addResourceFactory(aDescriptor.msPaneURL, this);
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 6a28fa1..f98ea97 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -145,7 +145,6 @@ Clipboard::Clipboard (SlideSorter& rSlideSorter)
mrController(mrSlideSorter.GetController()),
maPagesToRemove(),
maPagesToSelect(),
mbUpdateSelectionPending(false),
mxUndoContext(),
mxSelectionObserverContext(),
mnDragFinishedUserEventId(nullptr)
@@ -577,7 +576,6 @@ void Clipboard::StartDrag (
{
maPagesToRemove.clear();
maPagesToSelect.clear();
mbUpdateSelectionPending = false;
CreateSlideTransferable(pWindow, true);
mrController.GetInsertionIndicatorHandler()->UpdatePosition(
@@ -851,8 +849,6 @@ sal_uInt16 Clipboard::InsertSlides (
maPagesToSelect.push_back(
dynamic_cast<SdPage*>(pDocument->GetPage(nInsertPosition+i)));
mbUpdateSelectionPending |= (nInsertedPageCount>0);
return nInsertedPageCount;
}
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
index 03d981e..f20133a 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
@@ -128,12 +128,6 @@ private:
*/
PageList maPagesToSelect;
/** When pages are moved or copied then the selection of the slide
sorter has to be updated. This flag is used to remember whether the
selection has to be updated or can stay as it is (sal_False).
*/
bool mbUpdateSelectionPending;
/** Used when a drop is executed to combine all undo actions into one.
Typically created in ExecuteDrop() and released in DragFinish().
*/
diff --git a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
index 35e3b17..cfc0854 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
@@ -34,27 +34,15 @@ class PageDescriptor;
class VisualState
{
public:
enum State {
VS_Selected,
VS_Focused,
VS_Current,
VS_Excluded,
VS_None };
VisualState (const sal_Int32 nPageId);
~VisualState();
void SetVisualState (const State eState);
void UpdateVisualState (const PageDescriptor& rDescriptor);
const Point& GetLocationOffset() const { return maLocationOffset;}
void SetLocationOffset (const Point& rPoint);
sal_Int32 mnPageId; // For debugging
private:
State meCurrentVisualState;
Point maLocationOffset;
};
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index 46bb252..1decf77 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -118,20 +118,10 @@ private:
class GradientDescriptor
{
public:
ColorData maBaseColor;
sal_Int32 mnSaturationOverride;
sal_Int32 mnBrightnessOverride;
ColorData maFillColor1;
ColorData maFillColor2;
ColorData maBorderColor1;
ColorData maBorderColor2;
sal_Int32 mnFillOffset1;
sal_Int32 mnFillOffset2;
sal_Int32 mnBorderOffset1;
sal_Int32 mnBorderOffset2;
};
ColorData maBackgroundColor;
::std::vector<GradientDescriptor> maGradients;
diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx
index 0737d00..1e173b0 100644
--- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx
@@ -183,8 +183,6 @@ bool PageDescriptor::SetState (const State eState, const bool bNewStateValue)
break;
}
if (bModified)
maVisualState.UpdateVisualState(*this);
return bModified;
}
diff --git a/sd/source/ui/slidesorter/model/SlsVisualState.cxx b/sd/source/ui/slidesorter/model/SlsVisualState.cxx
index ad62e9e..0ec4569 100644
--- a/sd/source/ui/slidesorter/model/SlsVisualState.cxx
+++ b/sd/source/ui/slidesorter/model/SlsVisualState.cxx
@@ -25,7 +25,6 @@ namespace sd { namespace slidesorter { namespace model {
VisualState::VisualState (const sal_Int32 nPageId)
: mnPageId(nPageId),
meCurrentVisualState(VS_None),
maLocationOffset(0,0)
{
}
@@ -34,25 +33,6 @@ VisualState::~VisualState()
{
}
void VisualState::SetVisualState (const State eState)
{
meCurrentVisualState = eState;
}
void VisualState::UpdateVisualState (const PageDescriptor& rDescriptor)
{
if (rDescriptor.HasState(PageDescriptor::ST_Excluded))
SetVisualState(VS_Excluded);
else if (rDescriptor.HasState(PageDescriptor::ST_Current))
SetVisualState(VS_Current);
else if (rDescriptor.HasState(PageDescriptor::ST_Focused))
SetVisualState(VS_Focused);
else if (rDescriptor.HasState(PageDescriptor::ST_Selected))
SetVisualState(VS_Selected);
else
SetVisualState(VS_None);
}
void VisualState::SetLocationOffset (const Point& rOffset)
{
if (maLocationOffset != rOffset)
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index 715f28a..a22a14d 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -196,10 +196,6 @@ void Theme::SetGradient (
{
GradientDescriptor& rGradient (GetGradient(eType));
rGradient.maBaseColor = aBaseColor;
rGradient.mnSaturationOverride = nSaturationOverride;
rGradient.mnBrightnessOverride = nBrightnessOverride;
const ColorData aColor (nSaturationOverride>=0 || nBrightnessOverride>=0
? HGBAdapt(aBaseColor, nSaturationOverride, nBrightnessOverride)
: aBaseColor);
@@ -208,11 +204,6 @@ void Theme::SetGradient (
rGradient.maFillColor2 = ChangeLuminance(aColor, nFillEndOffset);
rGradient.maBorderColor1 = ChangeLuminance(aColor, nBorderStartOffset);
rGradient.maBorderColor2 = ChangeLuminance(aColor, nBorderEndOffset);
rGradient.mnFillOffset1 = nFillStartOffset;
rGradient.mnFillOffset2 = nFillEndOffset;
rGradient.mnBorderOffset1 = nBorderStartOffset;
rGradient.mnBorderOffset2 = nBorderEndOffset;
}
const BitmapEx& Theme::GetIcon (const IconType eType)
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index 546efea..27e9ede 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -219,8 +219,7 @@ PDFIRawAdaptor::PDFIRawAdaptor( OUString const & implementationName, const uno::
m_implementationName(implementationName),
m_xContext( xContext ),
m_xModel(),
m_pVisitorFactory(),
m_bEnableToplevelText(false)
m_pVisitorFactory()
{
}
diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx
index 1e5bc36..7843505 100644
--- a/sdext/source/pdfimport/pdfiadaptor.hxx
+++ b/sdext/source/pdfimport/pdfiadaptor.hxx
@@ -89,7 +89,6 @@ namespace pdfi
css::uno::Reference<
css::frame::XModel > m_xModel;
TreeVisitorFactorySharedPtr m_pVisitorFactory;
bool m_bEnableToplevelText;
bool parse( const css::uno::Reference<css::io::XInputStream>& xInput,
const css::uno::Reference<css::task::XInteractionHandler>& xIHdl,
@@ -111,9 +110,6 @@ namespace pdfi
*/
void setTreeVisitorFactory(const TreeVisitorFactorySharedPtr& rVisitorFactory);
/// TEMP - enable writer-like text:p on doc level
void enableToplevelText() { m_bEnableToplevelText=true; }
/** Export pdf document to ODG
@param xOutput
diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx
index 52916d2..8a29986 100644
--- a/sdext/source/pdfimport/services.cxx
+++ b/sdext/source/pdfimport/services.cxx
@@ -43,7 +43,6 @@ namespace
pdfi::PDFIRawAdaptor* pAdaptor = new pdfi::PDFIRawAdaptor( "org.libreoffice.comp.documents.WriterPDFImport", _rxContext );
pAdaptor->setTreeVisitorFactory(pdfi::createWriterTreeVisitorFactory());
pAdaptor->enableToplevelText(); // TEMP! TEMP!
return uno::Reference<uno::XInterface>(static_cast<xml::XImportFilter*>(pAdaptor));
}
