Kaydet (Commit) 4adea883 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:returnconstant in OPropertyBrowserController

Change-Id: Id5e225dbe5a1c2f27c1032cdaab35a01c78ede81
Reviewed-on: https://gerrit.libreoffice.org/59136
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst b9df8ad9
...@@ -361,16 +361,14 @@ namespace pcr ...@@ -361,16 +361,14 @@ namespace pcr
if (!pParentWin) if (!pParentWin)
throw RuntimeException("The frame is invalid. Unable to extract the container window.",*this); throw RuntimeException("The frame is invalid. Unable to extract the container window.",*this);
if ( Construct( pParentWin ) ) Construct( pParentWin );
try
{ {
try m_xFrame->setComponent( VCLUnoHelper::GetInterface( m_pView ), this );
{ }
m_xFrame->setComponent( VCLUnoHelper::GetInterface( m_pView ), this ); catch( const Exception& )
} {
catch( const Exception& ) OSL_FAIL( "OPropertyBrowserController::attachFrame: caught an exception!" );
{
OSL_FAIL( "OPropertyBrowserController::attachFrame: caught an exception!" );
}
} }
startContainerWindowListening(); startContainerWindowListening();
...@@ -669,7 +667,7 @@ namespace pcr ...@@ -669,7 +667,7 @@ namespace pcr
} }
bool OPropertyBrowserController::Construct(vcl::Window* _pParentWin) void OPropertyBrowserController::Construct(vcl::Window* _pParentWin)
{ {
DBG_ASSERT(!haveView(), "OPropertyBrowserController::Construct: already have a view!"); DBG_ASSERT(!haveView(), "OPropertyBrowserController::Construct: already have a view!");
DBG_ASSERT(_pParentWin, "OPropertyBrowserController::Construct: invalid parent window!"); DBG_ASSERT(_pParentWin, "OPropertyBrowserController::Construct: invalid parent window!");
...@@ -690,8 +688,6 @@ namespace pcr ...@@ -690,8 +688,6 @@ namespace pcr
impl_initializeView_nothrow(); impl_initializeView_nothrow();
m_pView->Show(); m_pView->Show();
return true;
} }
......
...@@ -307,7 +307,7 @@ namespace pcr ...@@ -307,7 +307,7 @@ namespace pcr
*/ */
bool impl_findObjectProperty_nothrow( const OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty = nullptr ); bool impl_findObjectProperty_nothrow( const OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty = nullptr );
bool Construct(vcl::Window* _pParentWin); void Construct(vcl::Window* _pParentWin);
/** retrieves the property handler for a given property name /** retrieves the property handler for a given property name
@param _rPropertyName @param _rPropertyName
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment