[Libreoffice-commits] core.git: 2 commits - reportdesign/source sw/source

[Maxim Monastirsky (via logerrit)]

 reportdesign/source/ui/report/ReportController.cxx |    3 +--
 sw/source/uibase/shells/textsh1.cxx                |    3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6591a83a6e6bfaed336c11ea6f928e8764b6563d
Author:     Maxim Monastirsky <momonas...@gmail.com>
AuthorDate: Thu Jul 6 12:43:52 2023 +0300
Commit:     Maxim Monastirsky <momonas...@gmail.com>
CommitDate: Fri Jul 7 09:51:32 2023 +0200

    Fix .uno:CharBackColor status update
    
    We have the editeng pool set as our secondary, and it maps
    SID_ATTR_CHAR_BACK_COLOR to EE_CHAR_BKGCOLOR, which then
    can't be found in the switch in SwTextShell::GetState.
    But handling EE_CHAR_BKGCOLOR here will be very confusing
    for anyone reading this code, so let's map it back to the
    slot id.
    
    Without this fix, the current highlighting color isn't
    preselected in the toolbar dropdown.
    
    Change-Id: I85e5ceb6d2193f831928f224577d6f87e889981f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154102
    Tested-by: Jenkins
    Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>

diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index da8b94a33d7b..abf5caee862d 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -2162,7 +2162,8 @@ void SwTextShell::GetState( SfxItemSet &rSet )
     sal_uInt16 nWhich = aIter.FirstWhich();
     while ( nWhich )
     {
-        switch ( nWhich )
+        const sal_uInt16 nSlotId = GetPool().GetSlotId(nWhich);
+        switch (nSlotId)
         {
         case FN_FORMAT_CURRENT_FOOTNOTE_DLG:
             if( !rSh.IsCursorInFootnote() )
commit 371f9131f15e41b1f121f26478ab997d13afc56a
Author:     Maxim Monastirsky <momonas...@gmail.com>
AuthorDate: Thu Jul 6 13:44:07 2023 +0300
Commit:     Maxim Monastirsky <momonas...@gmail.com>
CommitDate: Fri Jul 7 09:51:26 2023 +0200

    reportdesign: Fix setting font color from the toolbar dropdown
    
    Seems like a recent regression from changing the argument name
    in PaletteManager::DispatchColorCommand.
    
    Change-Id: I2756a2c615398d40b15991cad2982cc80d6f6a99
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154150
    Tested-by: Jenkins
    Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>

diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index cc3a096b3046..873d17c353c1 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1469,8 +1469,7 @@ void OReportController::Execute(sal_uInt16 _nId, const 
Sequence< PropertyValue >
         case SID_ATTR_CHAR_COLOR2:
         case SID_ATTR_CHAR_COLOR_EXT:
             {
-                const SequenceAsHashMap aMap(aArgs);
-                const util::Color aColor = 
aMap.getUnpackedValueOrDefault(PROPERTY_FONTCOLOR,util::Color());
+                const util::Color aColor( lcl_extractBackgroundColor( aArgs ) 
);
                 
impl_setPropertyAtControls_throw(RID_STR_UNDO_CHANGEFONT,PROPERTY_CHARCOLOR,uno::Any(aColor),aArgs);
                 bForceBroadcast = true;
             }