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

Szymon Kłos (via logerrit) logerrit at kemper.freedesktop.org
Wed Nov 6 10:58:57 UTC 2019


 sw/source/uibase/shells/basesh.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cb1183510c605a5d63fdc9fec6735ac5e8db92ce
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Nov 6 10:39:16 2019 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Nov 6 11:57:35 2019 +0100

    tdf#128593 fix crash on setting table background color
    
    Change-Id: I9596cd9817d63590f07ffd2068e79b2df5806aeb
    Reviewed-on: https://gerrit.libreoffice.org/82128
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index bb9f4a975297..e65149b15995 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -2345,7 +2345,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
 
             aBrushItem->SetGraphicPos(GPOS_NONE);
 
-            sal_uInt16 nSlotId = SID_BACKGROUND_COLOR ? SID_BACKGROUND_COLOR : SID_TABLE_CELL_BACKGROUND_COLOR;
+            sal_uInt16 nSlotId = (nSlot == SID_BACKGROUND_COLOR) ? SID_BACKGROUND_COLOR : SID_TABLE_CELL_BACKGROUND_COLOR;
             if (pArgs && SfxItemState::SET == pArgs->GetItemState(SID_ATTR_COLOR_STR, false, &pColorStringItem))
             {
                 OUString sColor = static_cast<const SfxStringItem*>(pColorStringItem)->GetValue();


More information about the Libreoffice-commits mailing list