[Libreoffice-commits] core.git: framework/inc framework/source include/sfx2 include/svtools include/svx sfx2/source svtools/source svx/source sw/source vcl/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jan 30 15:18:24 UTC 2020
framework/inc/dispatch/oxt_handler.hxx | 1
framework/source/dispatch/oxt_handler.cxx | 7 ----
include/sfx2/sidebar/ControllerItem.hxx | 4 --
include/svtools/asynclink.hxx | 1
include/svx/linectrl.hxx | 2 -
sfx2/source/sidebar/ControllerItem.cxx | 12 -------
svtools/source/control/asynclink.cxx | 6 ---
svx/source/tbxctrls/extrusioncontrols.cxx | 5 ---
svx/source/tbxctrls/extrusioncontrols.hxx | 3 -
sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 1
sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 1
vcl/source/window/splitwin.cxx | 39 +++++--------------------
12 files changed, 11 insertions(+), 71 deletions(-)
New commits:
commit facc94bb0aef58353d54e14f948790643ccbec32
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jan 30 14:36:57 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jan 30 16:17:45 2020 +0100
loplugin:unusedfields
Change-Id: Ifb9c91b3e8d6c2dd3a639a239fa41e7d5c7a4ee6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87735
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 73b83d3f8dd4..69bc07074c3e 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -86,7 +86,6 @@ class Oxt_Handler final : public ::cppu::WeakImplHelper<
osl::Mutex m_mutex;
css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; /// global uno service factory to create new services
- css::uno::Reference< css::frame::XDispatchResultListener > m_xListener;
};
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index 8eed74832b3c..8bc67abf9105 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -59,13 +59,6 @@ Oxt_Handler::Oxt_Handler( const css::uno::Reference< css::lang::XMultiServiceFac
*//*-*************************************************************************************************************/
Oxt_Handler::~Oxt_Handler()
{
- if ( m_xListener.is() )
- {
- css::frame::DispatchResultEvent aEvent;
- aEvent.State = css::frame::DispatchResultState::FAILURE;
- m_xListener->dispatchFinished( aEvent );
- m_xListener.clear();
- }
}
/*-************************************************************************************************************
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index 6b55fc173dfa..51befddff94d 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -57,9 +57,6 @@ public:
SfxBindings &rBindings,
ItemUpdateReceiverInterface& rItemUpdateReceiver);
- /// releases our action listener
- virtual void dispose() override;
-
virtual ~ControllerItem() override;
/** Force the controller item to call its NotifyItemUpdate
@@ -72,7 +69,6 @@ private:
virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) override;
ItemUpdateReceiverInterface& mrItemUpdateReceiver;
- css::uno::Reference<css::lang::XComponent> mxFrameActionListener;
};
} } // end of namespace sfx2::sidebar
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx
index 9c72c42e8abf..0d9f88f4e588 100644
--- a/include/svtools/asynclink.hxx
+++ b/include/svtools/asynclink.hxx
@@ -35,7 +35,6 @@ class SVT_DLLPUBLIC AsynchronLink
{
Link<void*,void> _aLink;
ImplSVEvent* _nEventId;
- std::unique_ptr<Idle> _pIdle;
bool _bInCall;
bool* _pDeleted;
void* _pArg;
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index 7fc9fc742cea..d44682f395d8 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -37,8 +37,6 @@ typedef std::function<bool(const OUString&, const css::uno::Any&)> LineStyleSele
class SVX_DLLPUBLIC SvxLineStyleToolBoxControl final : public svt::PopupWindowController
{
private:
- std::unique_ptr<XLineStyleItem> pStyleItem;
- std::unique_ptr<XLineDashItem> pDashItem;
std::unique_ptr<svx::ToolboxButtonLineStyleUpdater> m_xBtnUpdater;
LineStyleSelectFunction m_aLineStyleSelectFunction;
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index 11698a1c264f..7e1a0ae88925 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -33,8 +33,7 @@ ControllerItem::ControllerItem (
SfxBindings &rBindings,
ItemUpdateReceiverInterface& rItemUpdateReceiver)
: SfxControllerItem(nSlotId, rBindings),
- mrItemUpdateReceiver(rItemUpdateReceiver),
- mxFrameActionListener()
+ mrItemUpdateReceiver(rItemUpdateReceiver)
{
}
@@ -43,15 +42,6 @@ ControllerItem::~ControllerItem()
dispose();
}
-void ControllerItem::dispose()
-{
- if (mxFrameActionListener.is())
- mxFrameActionListener->dispose();
- mxFrameActionListener.clear();
-
- SfxControllerItem::dispose();
-}
-
void ControllerItem::StateChanged (
sal_uInt16 nSID,
SfxItemState eState,
diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx
index d5cde4fe66dc..31a7b28e7978 100644
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.cxx
@@ -40,9 +40,7 @@ void AsynchronLink::Call( void* pObj, bool bAllowDoubles )
if( _aLink.IsSet() )
{
_pArg = pObj;
- DBG_ASSERT( bAllowDoubles ||
- ( !_nEventId && ( !_pIdle || !_pIdle->IsActive() ) ),
- "Already made a call" );
+ DBG_ASSERT( bAllowDoubles || !_nEventId, "Already made a call" );
ClearPendingCall();
if( _pMutex ) _pMutex->acquire();
_nEventId = Application::PostUserEvent( LINK( this, AsynchronLink, HandleCall_PostUserEvent) );
@@ -56,7 +54,6 @@ AsynchronLink::~AsynchronLink()
{
Application::RemoveUserEvent( _nEventId );
}
- _pIdle.reset();
if( _pDeleted ) *_pDeleted = true;
_pMutex.reset();
}
@@ -83,7 +80,6 @@ void AsynchronLink::ClearPendingCall()
_nEventId = nullptr;
}
if( _pMutex ) _pMutex->release();
- if( _pIdle ) _pIdle->Stop();
}
void AsynchronLink::Call_Impl( void* pArg )
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 3ada4301154a..b58df356877f 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -586,8 +586,6 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::PopupWindowController* pCo
, mxBright(m_xBuilder->weld_radio_button("bright"))
, mxNormal(m_xBuilder->weld_radio_button("normal"))
, mxDim(m_xBuilder->weld_radio_button("dim"))
- , mnDirection(FROM_FRONT)
- , mbDirectionEnabled(false)
{
mxLightingSet->SetStyle(WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT);
@@ -651,9 +649,6 @@ void ExtrusionLightingWindow::implSetIntensity( int nLevel, bool bEnabled )
void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
{
- mnDirection = nDirection;
- mbDirectionEnabled = bEnabled;
-
if( !bEnabled )
nDirection = FROM_FRONT;
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index e323ee1b9dd7..e4c10ff796ca 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -149,9 +149,6 @@ private:
Image maImgLightingOn[9];
Image maImgLightingPreview[9];
- int mnDirection;
- bool mbDirectionEnabled;
-
void implSetIntensity( int nLevel, bool bEnabled );
void implSetDirection( int nDirection, bool bEnabled );
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index a2d033696de1..78f81372841f 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -60,7 +60,6 @@ WrapPropertyPanel::WrapPropertyPanel(
const css::uno::Reference< css::frame::XFrame >& rxFrame,
SfxBindings* pBindings )
: PanelLayout(pParent, "WrapPropertyPanel", "modules/swriter/ui/sidebarwrap.ui", rxFrame, true)
- , mxFrame( rxFrame )
, mpBindings(pBindings)
// spacing
, nTop(0)
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
index b62922eed009..befe9dd181f2 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
@@ -51,7 +51,6 @@ namespace sw { namespace sidebar {
const css::uno::Reference< css::frame::XFrame >& rxFrame,
SfxBindings* pBindings );
private:
- css::uno::Reference< css::frame::XFrame > mxFrame;
SfxBindings* mpBindings;
//Spacing
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index f1f56776cc5d..7f48142f6a54 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -82,10 +82,8 @@ class ImplSplitSet
{
public:
ImplSplitSet();
- ~ImplSplitSet();
std::vector< ImplSplitItem > mvItems;
- std::unique_ptr<Wallpaper> mpWallpaper;
long mnLastSize;
long mnSplitSize;
sal_uInt16 mnId;
@@ -122,11 +120,6 @@ ImplSplitSet::ImplSplitSet() :
{
}
-ImplSplitSet::~ImplSplitSet()
-{
- mpWallpaper.reset();
-}
-
/** Check whether the given size is inside the valid range defined by
[rItem.mnMinSize,rItem.mnMaxSize]. When it is not inside it then return
the upper or lower bound, respectively. Otherwise return the given size
@@ -859,13 +852,6 @@ void SplitWindow::ImplDrawBack(vcl::RenderContext& rRenderContext, ImplSplitSet*
for ( const auto& rItem : rItems )
{
pSet = rItem.mpSet.get();
- if (pSet && pSet->mpWallpaper)
- {
- Point aPoint(rItem.mnLeft, rItem.mnTop);
- Size aSize(rItem.mnWidth, rItem.mnHeight);
- tools::Rectangle aRect(aPoint, aSize);
- rRenderContext.DrawWallpaper(aRect, *pSet->mpWallpaper);
- }
}
for ( auto& rItem : rItems )
@@ -1190,23 +1176,16 @@ void SplitWindow::ImplInit( vcl::Window* pParent, WinBits nStyle )
void SplitWindow::ImplInitSettings()
{
- // If MainSet has a Wallpaper, this is the background,
- // otherwise it is the standard colour
- if ( mpMainSet->mpWallpaper )
- SetBackground( *mpMainSet->mpWallpaper );
- else
- {
- const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
+ const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- Color aColor;
- if ( IsControlBackground() )
- aColor = GetControlBackground();
- else if ( Window::GetStyle() & WB_3DLOOK )
- aColor = rStyleSettings.GetFaceColor();
- else
- aColor = rStyleSettings.GetWindowColor();
- SetBackground( aColor );
- }
+ Color aColor;
+ if ( IsControlBackground() )
+ aColor = GetControlBackground();
+ else if ( Window::GetStyle() & WB_3DLOOK )
+ aColor = rStyleSettings.GetFaceColor();
+ else
+ aColor = rStyleSettings.GetWindowColor();
+ SetBackground( aColor );
}
SplitWindow::SplitWindow( vcl::Window* pParent, WinBits nStyle ) :
More information about the Libreoffice-commits
mailing list