[Libreoffice-commits] core.git: 2 commits - helpcontent2 sd/source

[Sophia Schröder (via logerrit)]

 helpcontent2                   |    2 +-
 sd/source/ui/func/fuhhconv.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ec22120d81ff52e013881a3b2c4c54b74576953c
Author:     Sophia Schröder <sophia.schroeder at libreoffice.org>
AuthorDate: Tue May 5 13:16:31 2020 +0100
Commit:     Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Tue May 5 14:16:31 2020 +0200

    Update git submodules
    
    * Update helpcontent2 from branch 'master'
      to 9954291143c1edee4361edc70627bdab6778c3c9
      - Visibility improvements
    
        Change-Id: I75e2e37e3fed3adaabbb7c0baca458771e8a54ab
        Reviewed-on: https://gerrit.libreoffice.org/c/help/+/88094
        Tested-by: Jenkins
        Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/helpcontent2 b/helpcontent2
index 115422426e5c..9954291143c1 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 115422426e5c514b05d8f64afa27141bb9ef1ae0
+Subproject commit 9954291143c1edee4361edc70627bdab6778c3c9
commit e0eadb23c19b1963b08c49b68b228925c27b2a21
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue May 5 11:24:00 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue May 5 14:16:17 2020 +0200

    FuHangulHanjaConversion::ConvertStyles reused current search family
    
    it doesn't look right to me that tools->language->chinese_conversion operates
    differently depending on what happened to get selected in the style navigator
    last, presumably it should work on all styles
    
    Change-Id: Iff698ee25e5e85899542891260091428ea77873d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93467
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 45c29cc2c21e..a312439bb646 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -155,7 +155,7 @@ void FuHangulHanjaConversion::ConvertStyles( LanguageType nTargetLanguage, const
     if( !pStyleSheetPool )
         return;
 
-    SfxStyleSheetBase* pStyle = pStyleSheetPool->First(pStyleSheetPool->GetSearchFamily(), pStyleSheetPool->GetSearchMask());
+    SfxStyleSheetBase* pStyle = pStyleSheetPool->First(SfxStyleFamily::All);
     while( pStyle )
     {
         SfxItemSet& rSet = pStyle->GetItemSet();