diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-21 10:36:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-21 13:27:58 +0200 |
| commit | c0ce1ec3736be861a2ed58827fadb25269ab0117 (patch) | |
| tree | f294165ac148084d8584105ecee19ddf57b51dfb /include | |
| parent | 1abdeff9de5d9257464048bcdf50a6d6fd926c0b (diff) | |
loplugin:unusedfields in sfx2 part1
and fix a memory leak in NotebookbarTabControl where it was not freeing
it's m_pListener field
Change-Id: Ib9970c9084982d532fa38d1bc3c44180ab2c3c39
Reviewed-on: https://gerrit.libreoffice.org/39036
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/docfilt.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/frmdescr.hxx | 5 | ||||
| -rw-r--r-- | include/sfx2/notebookbar/NotebookbarTabControl.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/viewsh.hxx | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx index d4628b30027d..47454f90e742 100644 --- a/include/sfx2/docfilt.hxx +++ b/include/sfx2/docfilt.hxx @@ -60,7 +60,6 @@ class SFX2_DLLPUBLIC SfxFilter SfxFilterFlags nFormatType; sal_uIntPtr nVersion; SotClipboardFormatId lFormat; - sal_uInt16 nDocIcon; public: SfxFilter( const OUString& rProvider, const OUString& rFilterName ); @@ -70,7 +69,6 @@ public: SfxFilterFlags nFormatType, SotClipboardFormatId lFormat, const OUString &rTypeName, - sal_uInt16 nDocIcon, const OUString &rMimeType, const OUString &rUserData, const OUString& rServiceName ); diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index 6cbda802055f..1e6e49e54215 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -66,9 +66,7 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor ScrollingMode eScroll; bool bHasBorder; bool bHasBorderSet; - bool bResizeHorizontal; bool bResizeVertical; - bool bReadOnly; std::unique_ptr< SfxFrameDescriptor_Impl > pImpl; public: @@ -81,12 +79,11 @@ public: { return aURL; } void SetURL( const OUString& rURL ); void SetActualURL( const OUString& rURL ); - void SetReadOnly( bool bSet ) { bReadOnly = bSet;} void SetEditable( bool bSet ); // Size void SetResizable( bool bRes ) - { bResizeHorizontal = bResizeVertical = bRes; } + { bResizeVertical = bRes; } // FrameName const OUString& GetName() const diff --git a/include/sfx2/notebookbar/NotebookbarTabControl.hxx b/include/sfx2/notebookbar/NotebookbarTabControl.hxx index c6ff08e32273..9f6640dfe062 100644 --- a/include/sfx2/notebookbar/NotebookbarTabControl.hxx +++ b/include/sfx2/notebookbar/NotebookbarTabControl.hxx @@ -13,6 +13,7 @@ #include <vcl/toolbox.hxx> #include <sfx2/dllapi.h> #include <vcl/tabctrl.hxx> +#include <memory> class ChangedUIEventListener; @@ -22,6 +23,7 @@ friend class ChangedUIEventListener; public: NotebookbarTabControl( Window* pParent ); + ~NotebookbarTabControl() override; virtual void StateChanged(StateChangedType nStateChange) override; virtual Size calculateRequisition() const override; @@ -34,7 +36,7 @@ private: ); DECL_LINK(OpenNotebookbarPopupMenu, NotebookBar*, void); - ChangedUIEventListener* m_pListener; + std::unique_ptr<ChangedUIEventListener> m_pListener; css::uno::Reference<css::frame::XFrame> m_xFrame; protected: diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index a6dd243da4d7..6e7053421dae 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -317,8 +317,6 @@ public: SAL_DLLPRIVATE void CheckIPClient_Impl(SfxInPlaceClient*, const tools::Rectangle&); SAL_DLLPRIVATE void PushSubShells_Impl( bool bPush=true ); SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( false ); } - SAL_DLLPRIVATE void TakeOwnership_Impl(); - SAL_DLLPRIVATE void TakeFrameOwnership_Impl(); SAL_DLLPRIVATE bool ExecKey_Impl(const KeyEvent& aKey); /// The actual per-view implementation of lok::Document::registerCallback(). |