[Libreoffice-commits] core.git: compilerplugins/clang extensions/source svx/inc

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Thu Jan 23 11:40:35 UTC 2020


 compilerplugins/clang/unusedfields.only-used-in-constructor.results |   14 ++--
 compilerplugins/clang/unusedfields.readonly.results                 |    4 -
 compilerplugins/clang/unusedfields.untouched.results                |   16 ++--
 compilerplugins/clang/unusedfields.writeonly.results                |   34 ++++++----
 extensions/source/propctrlr/propcontroller.cxx                      |    1 
 extensions/source/propctrlr/propertyeditor.cxx                      |    8 --
 extensions/source/propctrlr/propertyeditor.hxx                      |    3 
 svx/inc/galbrws2.hxx                                                |    1 
 8 files changed, 36 insertions(+), 45 deletions(-)

New commits:
commit 6f5332dab1517774ddd73c1568c51cb4814e5924
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jan 23 08:50:03 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jan 23 12:39:59 2020 +0100

    loplugin:unusedfields
    
    Change-Id: I59a63e81cf317094ad60a88d3cdd20fc426c93b4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87235
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 12a7e0451255..9d804914389c 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -164,8 +164,6 @@ dbaccess/source/core/dataaccess/connection.hxx:102
     dbaccess::OConnection m_nInAppend std::atomic<std::size_t>
 dbaccess/source/core/inc/databasecontext.hxx:95
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2776
-      class AllSettings &
 drawinglayer/source/tools/emfphelperdata.hxx:198
     emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32
 drawinglayer/source/tools/emfphelperdata.hxx:199
@@ -666,7 +664,9 @@ svl/source/crypto/cryptosign.cxx:284
     (anonymous namespace)::PKIStatusInfo statusString SECItem
 svl/source/crypto/cryptosign.cxx:285
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
-svx/inc/GalleryControl.hxx:45
+svx/inc/galbrws2.hxx:79
+    GalleryBrowser2 maMiscOptions class SvtMiscOptions
+svx/inc/GalleryControl.hxx:42
     svx::sidebar::GalleryControl mpGallery class Gallery *
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1083
     (anonymous namespace)::ExpressionGrammar::definition multiplicativeExpression ::boost::spirit::rule<ScannerT>
@@ -698,8 +698,6 @@ svx/source/dialog/imapwnd.hxx:87
     IMapWindow maItemInfos struct SfxItemInfo [1]
 svx/source/dialog/weldeditview.cxx:312
     (anonymous namespace)::WeldEditSource m_rEditAcc class WeldEditAccessible &
-svx/source/gallery2/galbrws2.cxx:112
-    (anonymous namespace)::GalleryThemePopup maBuilder class VclBuilder
 svx/source/stbctrls/pszctrl.cxx:101
     (anonymous namespace)::FunctionPopup_Impl m_aBuilder class VclBuilder
 svx/source/stbctrls/selctrl.cxx:44
@@ -714,6 +712,8 @@ sw/inc/unosett.hxx:145
     SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
 sw/qa/core/test_ToxTextGenerator.cxx:145
     (anonymous namespace)::ToxTextGeneratorWithMockedChapterField mChapterFieldType class SwChapterFieldType
+sw/qa/extras/uiwriter/uiwriter2.cxx:70
+      class SwUiWriterTest2 *
 sw/qa/extras/uiwriter/uiwriter.cxx:4137
     (anonymous namespace)::IdleTask maIdle class Idle
 sw/source/core/crsr/crbm.cxx:64
@@ -804,7 +804,7 @@ vcl/inc/WidgetThemeLibrary.hxx:109
     vcl::WidgetThemeLibrary_t nSize uint32_t
 vcl/source/app/salvtables.cxx:3356
     (anonymous namespace)::SalInstanceEntry m_aTextFilter class (anonymous namespace)::WeldTextFilter
-vcl/source/app/salvtables.cxx:6175
+vcl/source/app/salvtables.cxx:6194
     (anonymous namespace)::SalInstanceComboBoxWithEdit m_aTextFilter class (anonymous namespace)::WeldTextFilter
 vcl/source/gdi/jobset.cxx:37
     (anonymous namespace)::ImplOldJobSetupData cDeviceName char [32]
@@ -826,7 +826,7 @@ vcl/unx/gtk3/gtk3gloactiongroup.cxx:27
     (anonymous namespace)::GLOAction parent_instance GObject
 vcl/unx/gtk3/gtk3glomenu.cxx:14
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:4914
+vcl/unx/gtk3/gtk3gtkinst.cxx:5071
     (anonymous namespace)::CrippledViewport viewport GtkViewport
 vcl/unx/kf5/KF5FilePicker.hxx:32
     KF5FilePicker _layout class QGridLayout *
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 8632cb80580e..794b307e9bfb 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -700,9 +700,7 @@ vcl/inc/salwtype.hxx:211
     SalQueryCharPositionEvent mnCharPos sal_uLong
 vcl/inc/svdata.hxx:278
     ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool
-vcl/inc/toolbox.h:40
-    ImplToolItem maOverlayImage class Image
-vcl/inc/toolbox.h:108
+vcl/inc/toolbox.h:107
     vcl::ToolBoxLayoutData m_aLineItemIds std::vector<sal_uInt16>
 vcl/inc/unx/saldisp.hxx:282
     SalDisplay m_aInvalidScreenData const struct SalDisplay::ScreenData
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index 1c8a67482afe..81cb54e4b339 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -40,14 +40,10 @@ dbaccess/source/core/inc/databasecontext.hxx:95
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
 dbaccess/source/sdbtools/inc/connectiondependent.hxx:116
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2776
-      class AllSettings &
 emfio/source/emfuno/xemfparser.cxx:50
     emfio::emfreader::(anonymous namespace)::XEmfParser context_ uno::Reference<uno::XComponentContext>
 extensions/source/scanner/scanner.hxx:45
     ScannerManager maProtector osl::Mutex
-framework/inc/dispatch/popupmenudispatcher.hxx:114
-    framework::PopupMenuDispatcher m_mutex osl::Mutex
 helpcompiler/inc/HelpCompiler.hxx:196
     HelpCompiler lang const std::string
 include/basegfx/DrawCommands.hxx:142
@@ -68,10 +64,10 @@ include/sfx2/msg.hxx:117
     SfxType0 createSfxPoolItemFunc const std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:119
     SfxType0 nAttribs const sal_uInt16
-include/sfx2/msg.hxx:132
-    SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:132
     SfxType1 pType const std::type_info *
+include/sfx2/msg.hxx:132
+    SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:132
     SfxType1 nAttribs sal_uInt16
 include/sfx2/msg.hxx:132
@@ -256,8 +252,6 @@ pyuno/source/module/pyuno_impl.hxx:223
     pyuno::(anonymous) ob_base PyObject
 pyuno/source/module/pyuno_impl.hxx:323
     pyuno::stRuntimeImpl ob_base PyObject
-reportdesign/source/filter/xml/xmlfilter.hxx:70
-    rptxml::ORptFilter m_pDocElemTokenMap ::std::unique_ptr<SvXMLTokenMap>
 reportdesign/source/ui/inc/ReportWindow.hxx:54
     rptui::OReportWindow m_pObjFac std::unique_ptr<DlgEdFactory, o3tl::default_delete<DlgEdFactory> >
 sal/qa/osl/condition/osl_Condition.cxx:72
@@ -374,12 +368,16 @@ svl/source/crypto/cryptosign.cxx:284
     (anonymous namespace)::PKIStatusInfo statusString SECItem
 svl/source/crypto/cryptosign.cxx:285
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
+svx/inc/galbrws2.hxx:79
+    GalleryBrowser2 maMiscOptions class SvtMiscOptions
 svx/source/dialog/contimp.hxx:75
     SvxSuperContourDlg aContourItem class SvxContourDlgItem
 svx/source/dialog/weldeditview.cxx:312
     (anonymous namespace)::WeldEditSource m_rEditAcc class WeldEditAccessible &
 svx/source/tbxctrls/layctrl.cxx:432
     (anonymous namespace)::ColumnsWindow mxControl rtl::Reference<SvxColumnsToolBoxControl>
+sw/qa/extras/uiwriter/uiwriter2.cxx:70
+      class SwUiWriterTest2 *
 sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState const class SwCursorSaveState
 sw/source/core/frmedt/fetab.cxx:75
@@ -446,7 +444,7 @@ vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx:31
     (anonymous namespace)::HyperLink atk_hyper_link const AtkHyperlink
 vcl/unx/gtk3/gtk3gloactiongroup.cxx:27
     (anonymous namespace)::GLOAction parent_instance GObject
-vcl/unx/gtk3/gtk3gtkinst.cxx:4914
+vcl/unx/gtk3/gtk3gtkinst.cxx:5071
     (anonymous namespace)::CrippledViewport viewport GtkViewport
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx:43
     writerfilter::ooxml::OOXMLStreamImpl mxFastParser css::uno::Reference<css::xml::sax::XFastParser>
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index ba25b0627e70..cae053e3fc00 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -2,11 +2,11 @@ basctl/source/basicide/moduldlg.hxx:130
     basctl::ObjectPage m_xDropTarget std::unique_ptr<SbTreeListBoxDropTarget>
 basctl/source/inc/basidesh.hxx:87
     basctl::Shell m_aNotifier class basctl::DocumentEventNotifier
-basctl/source/inc/bastype2.hxx:182
+basctl/source/inc/bastype2.hxx:180
     basctl::TreeListBox m_aNotifier class basctl::DocumentEventNotifier
-basctl/source/inc/bastype2.hxx:251
+basctl/source/inc/bastype2.hxx:249
     basctl::SbTreeListBox m_aNotifier class basctl::DocumentEventNotifier
-basctl/source/inc/IDEComboBox.hxx:101
+basctl/source/inc/IDEComboBox.hxx:104
     basctl::DocListenerBox maNotifier class basctl::DocumentEventNotifier
 basegfx/source/polygon/b2dpolygontriangulator.cxx:113
     basegfx::(anonymous namespace)::Triangulator maNewEdgeEntries std::vector<std::unique_ptr<EdgeEntry> >
@@ -284,10 +284,10 @@ emfio/inc/mtftools.hxx:511
     emfio::MtfTools mrclBounds tools::Rectangle
 extensions/source/propctrlr/genericpropertyhandler.hxx:63
     pcr::GenericPropertyHandler m_xComponentIntrospectionAccess css::uno::Reference<css::beans::XIntrospectionAccess>
-extensions/source/propctrlr/inspectorhelpwindow.hxx:33
-    pcr::InspectorHelpWindow m_nMinLines sal_Int32
-extensions/source/propctrlr/inspectorhelpwindow.hxx:34
-    pcr::InspectorHelpWindow m_nMaxLines sal_Int32
+extensions/source/propctrlr/propertyeditor.hxx:62
+    pcr::OPropertyEditor m_nMinHelpLines sal_Int32
+extensions/source/propctrlr/propertyeditor.hxx:63
+    pcr::OPropertyEditor m_nMaxHelpLines sal_Int32
 extensions/source/scanner/scanner.hxx:47
     ScannerManager mpData void *
 framework/inc/services/layoutmanager.hxx:248
@@ -402,10 +402,16 @@ include/svx/float3d.hxx:171
     Svx3DWin pControllerItem std::unique_ptr<Svx3DCtrlItem>
 include/svx/fmtools.hxx:134
     FmXDisposeListener m_pAdapter rtl::Reference<FmXDisposeMultiplexer>
+include/svx/galctrl.hxx:39
+    GalleryPreview mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop>
+include/svx/galctrl.hxx:92
+    GalleryIconView mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop>
 include/svx/gridctrl.hxx:254
     DbGridControl m_pCursorDisposeListener std::unique_ptr<DisposeListenerGridBridge>
 include/svx/ofaitem.hxx:44
     OfaRefItem mxRef rtl::Reference<reference_type>
+include/svx/sidebar/LinePropertyPanelBase.hxx:110
+    svx::sidebar::LinePropertyPanelBase mxArrowsDispatch std::unique_ptr<ToolbarUnoDispatcher>
 include/svx/srchdlg.hxx:165
     SvxSearchDialog pSearchController std::unique_ptr<SvxSearchController>
 include/svx/srchdlg.hxx:166
@@ -420,8 +426,6 @@ include/test/beans/xpropertyset.hxx:56
     apitest::XPropertySet::PropsToTest constrained std::vector<OUString>
 include/unotools/fontcfg.hxx:158
     utl::FontSubstConfiguration maSubstHash utl::FontSubstConfiguration::UniqueSubstHash
-include/vcl/field.hxx:157
-    NumericFormatter mnFieldValue sal_Int64
 include/vcl/menu.hxx:454
     MenuBar::MenuBarButtonCallbackArg bHighlight _Bool
 include/vcl/NotebookBarAddonsMerger.hxx:54
@@ -752,6 +756,8 @@ svl/source/misc/inethist.cxx:45
     INetURLHistory_Impl::head_entry m_nMagic sal_uInt32
 svl/source/undo/undo.cxx:316
     svl::undo::impl::UndoManagerGuard m_aUndoActionsCleanup ::std::vector<std::unique_ptr<SfxUndoAction> >
+svx/inc/galbrws2.hxx:85
+    GalleryBrowser2 mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop>
 svx/inc/sdr/overlay/overlaytools.hxx:41
     drawinglayer::primitive2d::OverlayStaticRectanglePrimitive mfRotation const double
 svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx:46
@@ -772,11 +778,13 @@ svx/source/sidebar/line/LinePropertyPanel.hxx:85
     svx::sidebar::LinePropertyPanel maStyleControl sfx2::sidebar::ControllerItem
 svx/source/sidebar/line/LinePropertyPanel.hxx:86
     svx::sidebar::LinePropertyPanel maDashControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:92
+svx/source/sidebar/line/LinePropertyPanel.hxx:88
+    svx::sidebar::LinePropertyPanel maLineStyleListControl sfx2::sidebar::ControllerItem
+svx/source/sidebar/line/LinePropertyPanel.hxx:89
     svx::sidebar::LinePropertyPanel maTransControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:93
+svx/source/sidebar/line/LinePropertyPanel.hxx:90
     svx::sidebar::LinePropertyPanel maEdgeStyle sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:94
+svx/source/sidebar/line/LinePropertyPanel.hxx:91
     svx::sidebar::LinePropertyPanel maCapStyle sfx2::sidebar::ControllerItem
 svx/source/sidebar/lists/ListsPropertyPanel.hxx:44
     svx::sidebar::ListsPropertyPanel mxNumBulletDispatcher std::unique_ptr<ToolbarUnoDispatcher>
@@ -1078,7 +1086,7 @@ xmlhelp/source/cxxhelp/provider/databases.hxx:266
     chelp::Databases m_aZipFileTable chelp::Databases::ZipFileTable
 xmlhelp/source/cxxhelp/provider/databases.hxx:272
     chelp::Databases m_aCollatorTable chelp::Databases::CollatorTable
-xmloff/source/draw/ximpstyl.hxx:224
+xmloff/source/draw/ximpstyl.hxx:222
     SdXMLMasterStylesContext maMasterPageList std::vector<rtl::Reference<SdXMLMasterPageContext> >
 xmloff/source/forms/elementexport.hxx:47
     xmloff::OElementExport m_pXMLElement std::unique_ptr<SvXMLElementExport>
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 1b9e3f0f7851..3cfd255ad1b7 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -171,7 +171,6 @@ namespace pcr
         try
         {
             getPropertyBox().EnableHelpSection( m_xModel->getHasHelpSection() );
-            getPropertyBox().SetHelpLineLimites( m_xModel->getMinHelpTextLines(), m_xModel->getMaxHelpTextLines() );
         }
         catch( const Exception& )
         {
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 94200f274ccc..23a5d990adf2 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -40,8 +40,6 @@ namespace pcr
         , m_pObserver(nullptr)
         , m_nNextId(1)
         , m_bHasHelpSection(false)
-        , m_nMinHelpLines(0)
-        , m_nMaxHelpLines(0)
     {
         PropertyHandlerHelper::setBuilderParent(rContext, m_xControlHoldingParent.get());
 
@@ -221,12 +219,6 @@ namespace pcr
         }
     }
 
-    void OPropertyEditor::SetHelpLineLimites( sal_Int32 nMinLines, sal_Int32 nMaxLines )
-    {
-        m_nMinHelpLines = nMinLines;
-        m_nMaxHelpLines = nMaxLines;
-    }
-
     void OPropertyEditor::enableHelpSection( OBrowserPage& rPage, const void* )
     {
         rPage.getListBox().EnableHelpSection( m_bHasHelpSection );
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index a6ec4c211b87..db9a55233928 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -59,8 +59,6 @@ namespace pcr
         sal_uInt16                  m_nNextId;
         Link<LinkParamNone*,void>   m_aPageActivationHandler;
         bool                        m_bHasHelpSection;
-        sal_Int32                   m_nMinHelpLines;
-        sal_Int32                   m_nMaxHelpLines;
 
         MapStringToPageId           m_aPropertyPageIds;
         std::map<sal_uInt16, PropertyPage> m_aShownPages;
@@ -76,7 +74,6 @@ namespace pcr
         void                        EnableHelpSection( bool _bEnable );
         bool                        HasHelpSection() const { return m_bHasHelpSection; }
         void                        SetHelpText( const OUString& _rHelpText );
-        void                        SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines );
 
         void                        SetHelpId( const OString& sHelpId );
         sal_uInt16                  AppendPage( const OUString& r, const OString& _rHelpId );
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index a1e7732e1270..51d84f4aa0ee 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -76,7 +76,6 @@ class GalleryBrowser2 : public SfxListener
 
 private:
 
-    SvtMiscOptions      maMiscOptions;
     Gallery*            mpGallery;
     GalleryTheme*       mpCurTheme;
     std::unique_ptr<GalleryIconView> mxIconView;


More information about the Libreoffice-commits mailing list