extensions/source/dbpilots/controlwizard.cxx | 1 - extensions/source/dbpilots/controlwizard.hxx | 1 - sd/source/ui/animations/SlideTransitionPane.cxx | 4 ---- sd/source/ui/inc/SlideTransitionPane.hxx | 2 -- svx/source/sidebar/effect/EffectPropertyPanel.cxx | 4 ---- svx/source/sidebar/effect/EffectPropertyPanel.hxx | 2 -- sw/source/core/text/xmldump.cxx | 11 +++-------- vcl/source/fontsubset/ttcr.cxx | 1 - vcl/source/fontsubset/ttcr.hxx | 1 - 9 files changed, 3 insertions(+), 24 deletions(-)
New commits: commit 727141098b7d7bfed65e64d2062042269a8f6088 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Fri Nov 18 16:28:11 2022 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Mon Nov 21 10:05:30 2022 +0100 loplugin:unusedfields start removing unused weld fields Change-Id: If736ff669ffe24c3dd111c26285c19fc65806a3d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142946 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 5b4ed61dee92..13fa2980683a 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -150,7 +150,6 @@ namespace dbp m_xFormDatasource = m_xBuilder->weld_label("datasource"); m_xFormDatasourceLabel = m_xBuilder->weld_label("datasourcelabel"); m_xFormTable = m_xBuilder->weld_label("formtable"); - m_xFormTableLabel = m_xBuilder->weld_label("formtablelabel"); const OControlWizardContext& rContext = getContext(); if ( rContext.bEmbedded ) diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index cf55c655e574..22e7feca1a5b 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -49,7 +49,6 @@ namespace dbp std::unique_ptr<weld::Label> m_xFormDatasource; std::unique_ptr<weld::Label> m_xFormContentTypeLabel; std::unique_ptr<weld::Label> m_xFormContentType; - std::unique_ptr<weld::Label> m_xFormTableLabel; std::unique_ptr<weld::Label> m_xFormTable; std::unique_ptr<weld::Frame> m_xFrame; diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 4e49dd8aaa5d..30ccf1a51a7b 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -413,9 +413,7 @@ constexpr sal_uInt16 nNoneId = std::numeric_limits<sal_uInt16>::max(); void SlideTransitionPane::Initialize(SdDrawDocument* pDoc) { - mxFT_VARIANT = m_xBuilder->weld_label("variant_label"); mxLB_VARIANT = m_xBuilder->weld_combo_box("variant_list"); - mxFT_duration = m_xBuilder->weld_label("duration_label"); mxCBX_duration = m_xBuilder->weld_metric_spin_button("transition_duration", FieldUnit::SECOND); mxFT_SOUND = m_xBuilder->weld_label("sound_label"); mxLB_SOUND = m_xBuilder->weld_combo_box("sound_list"); @@ -485,9 +483,7 @@ SlideTransitionPane::~SlideTransitionPane() removeListener(); mxVS_TRANSITION_ICONSWin.reset(); mxVS_TRANSITION_ICONS.reset(); - mxFT_VARIANT.reset(); mxLB_VARIANT.reset(); - mxFT_duration.reset(); mxCBX_duration.reset(); mxFT_SOUND.reset(); mxLB_SOUND.reset(); diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx index 2b6ea8f93c8b..2672bfa630ef 100644 --- a/sd/source/ui/inc/SlideTransitionPane.hxx +++ b/sd/source/ui/inc/SlideTransitionPane.hxx @@ -100,9 +100,7 @@ private: std::unique_ptr<TransitionPane> mxVS_TRANSITION_ICONS; std::unique_ptr<weld::CustomWeld> mxVS_TRANSITION_ICONSWin; - std::unique_ptr<weld::Label> mxFT_VARIANT; std::unique_ptr<weld::ComboBox> mxLB_VARIANT; - std::unique_ptr<weld::Label> mxFT_duration; std::unique_ptr<weld::MetricSpinButton> mxCBX_duration; std::unique_ptr<weld::Label> mxFT_SOUND; std::unique_ptr<weld::ComboBox> mxLB_SOUND; diff --git a/svx/source/sidebar/effect/EffectPropertyPanel.cxx b/svx/source/sidebar/effect/EffectPropertyPanel.cxx index 77e2dac11229..400dda997962 100644 --- a/svx/source/sidebar/effect/EffectPropertyPanel.cxx +++ b/svx/source/sidebar/effect/EffectPropertyPanel.cxx @@ -34,8 +34,6 @@ EffectPropertyPanel::EffectPropertyPanel(weld::Widget* pParent, SfxBindings* pBi [this] { return GetFrameWeld(); })) , mxGlowTransparency( m_xBuilder->weld_metric_spin_button("LB_GLOW_TRANSPARENCY", FieldUnit::PERCENT)) - , mxFTRadiusSoftEdge(m_xBuilder->weld_label("radiussoftedge")) - , mxFTRadiusGlow(m_xBuilder->weld_label("radiusglow")) , mxFTColor(m_xBuilder->weld_label("glowcolorlabel")) , mxSoftEdgeRadius(m_xBuilder->weld_metric_spin_button("SB_SOFTEDGE_RADIUS", FieldUnit::POINT)) { @@ -47,11 +45,9 @@ EffectPropertyPanel::~EffectPropertyPanel() mxGlowRadius.reset(); mxLBGlowColor.reset(); mxGlowTransparency.reset(); - mxFTRadiusSoftEdge.reset(); mxFTColor.reset(); mxFTTransparency.reset(); mxSoftEdgeRadius.reset(); - mxFTRadiusGlow.reset(); maGlowColorController.dispose(); maGlowRadiusController.dispose(); diff --git a/svx/source/sidebar/effect/EffectPropertyPanel.hxx b/svx/source/sidebar/effect/EffectPropertyPanel.hxx index d657d83e61ca..7edc219a47bd 100644 --- a/svx/source/sidebar/effect/EffectPropertyPanel.hxx +++ b/svx/source/sidebar/effect/EffectPropertyPanel.hxx @@ -43,8 +43,6 @@ private: std::unique_ptr<weld::MetricSpinButton> mxGlowRadius; std::unique_ptr<ColorListBox> mxLBGlowColor; std::unique_ptr<weld::MetricSpinButton> mxGlowTransparency; - std::unique_ptr<weld::Label> mxFTRadiusSoftEdge; - std::unique_ptr<weld::Label> mxFTRadiusGlow; std::unique_ptr<weld::Label> mxFTColor; std::unique_ptr<weld::MetricSpinButton> mxSoftEdgeRadius; diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index c5bf9fea53ef..09cd98ff1525 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -163,14 +163,11 @@ class XmlPortionDumper:public SwPortionHandler private: xmlTextWriterPtr m_Writer; TextFrameIndex m_Ofs; - const OUString& m_rText; - OUString m_aLine; public: - explicit XmlPortionDumper(xmlTextWriterPtr some_writer, const OUString& rText) + explicit XmlPortionDumper(xmlTextWriterPtr some_writer) : m_Writer(some_writer) , m_Ofs(0) - , m_rText(rText) { } @@ -197,7 +194,6 @@ class XmlPortionDumper:public SwPortionHandler (void)xmlTextWriterWriteFormatAttribute(m_Writer, BAD_CAST("nWidth"), "%i", static_cast<int>(nWidth)); (void)xmlTextWriterEndElement(m_Writer); - m_aLine += m_rText.subView(sal_Int32(m_Ofs), sal_Int32(nLength)); m_Ofs += nLength; } @@ -210,7 +206,7 @@ class XmlPortionDumper:public SwPortionHandler type of this portion */ virtual void Special( TextFrameIndex nLength, - const OUString & rText, + const OUString & /*rText*/, PortionType nType, const SwFont* pFont ) override { @@ -222,7 +218,6 @@ class XmlPortionDumper:public SwPortionHandler pFont->dumpAsXml(m_Writer); (void)xmlTextWriterEndElement(m_Writer); - m_aLine += rText; m_Ofs += nLength; } @@ -451,7 +446,7 @@ void SwFrame::dumpAsXml( xmlTextWriterPtr writer ) const RTL_TEXTENCODING_UTF8 ); (void)xmlTextWriterWriteString( writer, reinterpret_cast<const xmlChar *>(aText8.getStr( )) ); - XmlPortionDumper pdumper( writer, aText ); + XmlPortionDumper pdumper( writer ); pTextFrame->VisitPortions( pdumper ); if (const SwParaPortion* pPara = pTextFrame->GetPara()) { diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx index 4bd53ca6e053..84a0375c8087 100644 --- a/vcl/source/fontsubset/ttcr.cxx +++ b/vcl/source/fontsubset/ttcr.cxx @@ -747,7 +747,6 @@ TrueTypeTablePost::TrueTypeTablePost(sal_Int32 format, m_underlinePosition = underlinePosition; m_underlineThickness = underlineThickness; m_isFixedPitch = isFixedPitch; - m_ptr = nullptr; } void TrueTypeTableCmap::cmapAdd(sal_uInt32 id, sal_uInt32 c, sal_uInt32 g) diff --git a/vcl/source/fontsubset/ttcr.hxx b/vcl/source/fontsubset/ttcr.hxx index e48d9fe69d75..31dbc1b1f97b 100644 --- a/vcl/source/fontsubset/ttcr.hxx +++ b/vcl/source/fontsubset/ttcr.hxx @@ -287,7 +287,6 @@ struct TableEntry; sal_Int16 m_underlinePosition; sal_Int16 m_underlineThickness; sal_uInt32 m_isFixedPitch; - void *m_ptr; /* format-specific pointer */ }; } // namespace