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

[Libreoffice Gerrit user]

 dbaccess/source/core/dataaccess/ContentHelper.cxx |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 0b4b16b572470039d5a4c0661a226f1d852c8a3e
Author:     Muhammet Kara <muhammet.kara at pardus.org.tr>
AuthorDate: Sun Jul 29 13:22:26 2018 +0300
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Jul 29 13:47:03 2018 +0200

    Merge identical conditional branches in OContentHelper
    
    Change-Id: Ifaf72d1151f32dc99dbe76838f88090ee2fd7b15
    Reviewed-on: https://gerrit.libreoffice.org/58269
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 39f341ddb901..5f8bb59e0b59 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -332,19 +332,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
     {
         const PropertyValue& rValue = pValues[ n ];
 
-        if ( rValue.Name == "ContentType" )
-        {
-            // Read-only property!
-            aRet[ n ] <<= IllegalAccessException("Property is read-only!",
-                            static_cast< cppu::OWeakObject * >( this ) );
-        }
-        else if ( rValue.Name == "IsDocument" )
-        {
-            // Read-only property!
-            aRet[ n ] <<= IllegalAccessException("Property is read-only!",
-                            static_cast< cppu::OWeakObject * >( this ) );
-        }
-        else if ( rValue.Name == "IsFolder" )
+        if ( rValue.Name == "ContentType" || rValue.Name == "IsDocument" || rValue.Name == "IsFolder" )
         {
             // Read-only property!
             aRet[ n ] <<= IllegalAccessException("Property is read-only!",