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

[Caolán McNamara (via logerrit)]

 svx/source/dialog/rulritem.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 305c8365b4066a042cd9cbb42a10f1081b5abb2f
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Dec 30 14:24:07 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Dec 31 11:08:49 2022 +0000

    Resolves: tdf#150676 silence SvxColumnItem::QueryValue with 0 arg warning
    
    which is commonly seen and not unexpected
    
    Change-Id: I3dde49f8cee206985187e9317a354536f18f4e0e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144877
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 2e1dac9848b8..8e61bf381c3d 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -458,6 +458,10 @@ bool SvxColumnItem::QueryValue( css::uno::Any& rVal, 
sal_uInt8 nMemberId ) const
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
     {
+        case 0:
+            // SfxDispatchController_Impl::StateChanged calls this with 
hardcoded 0 triggering this;
+            SAL_INFO("svx", "SvxColumnItem::QueryValue with nMemberId of 0");
+            return false;
         case MID_COLUMNARRAY:
             return false;
         case MID_RIGHT:
@@ -476,8 +480,7 @@ bool SvxColumnItem::QueryValue( css::uno::Any& rVal, 
sal_uInt8 nMemberId ) const
             rVal <<= bTable;
             break;
         default:
-            // SfxDispatchController_Impl::StateChanged calls this with 
hardcoded 0 triggering this;
-            OSL_FAIL("Wrong MemberId!");
+            SAL_WARN("svx", "Wrong MemberId!");
             return false;
     }