[Libreoffice-commits] core.git: extensions/source

[Libreoffice Gerrit user]

 extensions/source/propctrlr/propcontroller.cxx |   20 ++++++++------------
 extensions/source/propctrlr/propcontroller.hxx |    2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

New commits:
commit 4adea88305ff22483bdc925fe782a3422a6da813
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Aug 15 15:11:25 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Aug 16 09:00:39 2018 +0200

    loplugin:returnconstant in OPropertyBrowserController
    
    Change-Id: Id5e225dbe5a1c2f27c1032cdaab35a01c78ede81
    Reviewed-on: https://gerrit.libreoffice.org/59136
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 0db2e8be590a..8492d115e0d6 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -361,16 +361,14 @@ namespace pcr
         if (!pParentWin)
             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 );
-            }
-            catch( const Exception& )
-            {
-                OSL_FAIL( "OPropertyBrowserController::attachFrame: caught an exception!" );
-            }
+            m_xFrame->setComponent( VCLUnoHelper::GetInterface( m_pView ), this );
+        }
+        catch( const Exception& )
+        {
+            OSL_FAIL( "OPropertyBrowserController::attachFrame: caught an exception!" );
         }
 
         startContainerWindowListening();
@@ -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(_pParentWin, "OPropertyBrowserController::Construct: invalid parent window!");
@@ -690,8 +688,6 @@ namespace pcr
         impl_initializeView_nothrow();
 
         m_pView->Show();
-
-        return true;
     }
 
 
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index f2463adeb9f4..0dbbe5cffe93 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -307,7 +307,7 @@ namespace pcr
         */
         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
             @param  _rPropertyName