core.git: sc/source

[Mike Kaganski (via logerrit)]

 sc/source/core/data/patattr.cxx |   40 ++++++++--------------------------------
 1 file changed, 8 insertions(+), 32 deletions(-)

New commits:
commit 750e4d32aa468a91169764144bdf9b59b3a70a31
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Dec 23 11:54:06 2024 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Dec 23 09:11:28 2024 +0100

    Simplify a bit
    
    Change-Id: Ic02ee03a800e3e92fafd73efed5aa0fd803f454b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179195
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index 59c5753633f0..ce0092b5c723 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -1668,26 +1668,14 @@ sal_uInt32 ScPatternAttr::GetNumberFormat( 
SvNumberFormatter* pFormatter,
                                            const SfxItemSet* pCondSet ) const
 {
     assert(pFormatter);
-    if (!pCondSet)
+    if (!pCondSet || !pCondSet->HasItem(ATTR_VALUE_FORMAT))
         return GetNumberFormat(pFormatter);
 
     // Conditional format takes precedence over style and even hard format.
 
-    sal_uInt32 nFormat;
-    LanguageType eLang;
-    if (pCondSet->GetItemState(ATTR_VALUE_FORMAT) == SfxItemState::SET )
-    {
-        nFormat = getNumberFormatKey(*pCondSet);
-        if (pCondSet->GetItemState(ATTR_LANGUAGE_FORMAT) == SfxItemState::SET)
-            eLang = getLanguageType(*pCondSet);
-        else
-            eLang = GetLanguageType();
-    }
-    else
-    {
-        nFormat = GetNumberFormatKey();
-        eLang = GetLanguageType();
-    }
+    sal_uInt32 nFormat = getNumberFormatKey(*pCondSet);
+    LanguageType eLang = pCondSet->HasItem(ATTR_LANGUAGE_FORMAT) ? 
getLanguageType(*pCondSet)
+                                                                 : 
GetLanguageType();
 
     return pFormatter->GetFormatForLanguageIfBuiltIn(nFormat, eLang);
 }
@@ -1695,26 +1683,14 @@ sal_uInt32 ScPatternAttr::GetNumberFormat( 
SvNumberFormatter* pFormatter,
 sal_uInt32 ScPatternAttr::GetNumberFormat( const ScInterpreterContext& 
rContext,
                                            const SfxItemSet* pCondSet ) const
 {
-    if (!pCondSet)
+    if (!pCondSet || !pCondSet->HasItem(ATTR_VALUE_FORMAT))
         return GetNumberFormat(rContext);
 
     // Conditional format takes precedence over style and even hard format.
 
-    sal_uInt32 nFormat;
-    LanguageType eLang;
-    if (pCondSet->GetItemState(ATTR_VALUE_FORMAT) == SfxItemState::SET )
-    {
-        nFormat = getNumberFormatKey(*pCondSet);
-        if (pCondSet->GetItemState(ATTR_LANGUAGE_FORMAT) == SfxItemState::SET)
-            eLang = getLanguageType(*pCondSet);
-        else
-            eLang = GetLanguageType();
-    }
-    else
-    {
-        nFormat = GetNumberFormatKey();
-        eLang = GetLanguageType();
-    }
+    sal_uInt32 nFormat = getNumberFormatKey(*pCondSet);
+    LanguageType eLang = pCondSet->HasItem(ATTR_LANGUAGE_FORMAT) ? 
getLanguageType(*pCondSet)
+                                                                 : 
GetLanguageType();
 
     return rContext.NFGetFormatForLanguageIfBuiltIn(nFormat, eLang);
 }