summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-06-10 15:06:20 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-06-10 15:08:57 +0100
commit2802dca10eef67554a81cb2347d5f648fa6fcd63 (patch)
treeba1c60e69c2c97ab386f2b889ccb3df9615e4adf /extensions
parent2347dcf3ba47aa784868ddfc855f34a5344b4de0 (diff)
coverity#1405937 rework to silence Uncaught exception
Change-Id: I89be5a53b5282130fd399a17ebe1a03ea75009e5
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/propctrlr/browserline.cxx21
-rw-r--r--extensions/source/propctrlr/browserline.hxx2
2 files changed, 8 insertions, 15 deletions
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index b9fe58839c72..32c9cb680780 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -69,8 +69,8 @@ namespace pcr
OBrowserLine::~OBrowserLine()
{
- implHideBrowseButton( true, false );
- implHideBrowseButton( false, false );
+ implHideBrowseButton(true);
+ implHideBrowseButton(false);
m_aFtTitle.disposeAndClear();
}
@@ -410,8 +410,7 @@ namespace pcr
}
rButton.SetModeImage( aImage );
- }
-
+ }
void OBrowserLine::ShowBrowseButton( const Image& _rImage, bool _bPrimary )
{
@@ -420,14 +419,12 @@ namespace pcr
rButton.SetModeImage( _rImage );
}
-
void OBrowserLine::ShowBrowseButton( bool _bPrimary )
{
impl_ensureButton( _bPrimary );
}
-
- void OBrowserLine::implHideBrowseButton( bool _bPrimary, bool _bReLayout )
+ void OBrowserLine::implHideBrowseButton(bool _bPrimary)
{
VclPtr<PushButton>& rpButton = _bPrimary ? m_pBrowseButton : m_pAdditionalBrowseButton;
@@ -436,18 +433,14 @@ namespace pcr
rpButton->Hide();
rpButton.disposeAndClear();
}
-
- if ( _bReLayout )
- impl_layoutComponents();
}
-
- void OBrowserLine::HideBrowseButton( bool _bPrimary )
+ void OBrowserLine::HideBrowseButton(bool _bPrimary)
{
- implHideBrowseButton( _bPrimary, true );
+ implHideBrowseButton(_bPrimary);
+ impl_layoutComponents();
}
-
void OBrowserLine::SetTitleWidth(sal_uInt16 nWidth)
{
if (m_nNameWidth != nWidth+10)
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index 656d86b94b71..f71f9578cd86 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -116,7 +116,7 @@ namespace pcr
DECL_LINK( OnButtonClicked, Button*, void );
DECL_LINK( OnButtonFocus, Control&, void );
- void implHideBrowseButton( bool _bPrimary, bool _bReLayout );
+ void implHideBrowseButton(bool _bPrimary);
void implUpdateEnabledDisabled();
void impl_layoutComponents();