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

[Libreoffice Gerrit user]

 svx/source/items/numfmtsh.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8e12e3300592438b06b5649deaf84574de5066ba
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Fri Feb 8 20:46:36 2019 +0100
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Sat Feb 9 02:56:24 2019 +0100

    Resolves: tdf#123122 category is just one bit, date+time is two bits set
    
    DATE|TIME != DATE ...
    
    Regression from
    
        commit e85966450b770e1169f113183ce1a9a9f4dcc507
        CommitDate: Wed Oct 3 12:08:55 2018 +0200
    
            Related: tdf#119613 tdf#118127 suppress duplicated builtins, rework All cat
    
    Change-Id: If500dbeae00805f04f61586730479901b27d3901
    Reviewed-on: https://gerrit.libreoffice.org/67554
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins

diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index feb595e11363..85c051fbc226 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -1035,7 +1035,7 @@ short SvxNumberFormatShell::FillEListWithUsD_Impl(std::vector<OUString>& rList,
     {
         const SvNumberformat* pNumEntry = rEntry.second;
 
-        if (bCategoryMatch && pNumEntry->GetMaskedType() != eCategory)
+        if (bCategoryMatch && (pNumEntry->GetMaskedType() & eCategory) != eCategory)
             continue; // for; type does not match category if not ALL
 
         const bool bUserDefined = bool(pNumEntry->GetType() & SvNumFormatType::DEFINED);