[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - desktop/source sfx2/source

[Michael Meeks (via logerrit)]

 desktop/source/lib/init.cxx      |    1 +
 sfx2/source/control/unoctitm.cxx |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 56e64fde5af48e6ed3358591af8627c123b12b9d
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Mar 31 20:27:00 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Mar 31 22:48:42 2020 +0200

    listen for and broadcast FrameLineColor state changes.
    
    Change-Id: I53efdcc4c5a3871761c4feffb079751286d6fbd6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91438
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8045eed42b75..c544984ade50 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2647,6 +2647,7 @@ static void doc_iniUnoCommands ()
         OUString(".uno:NumberFormatCurrency"),
         OUString(".uno:NumberFormatPercent"),
         OUString(".uno:NumberFormatDate"),
+        OUString(".uno:FrameLineColor"),
         OUString(".uno:SortAscending"),
         OUString(".uno:SortDescending"),
         OUString(".uno:TrackChanges"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index b27bb75451c8..3f84d441562a 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1037,7 +1037,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
              aEvent.FeatureURL.Path == "BackgroundColor" ||
              aEvent.FeatureURL.Path == "CharBackColor" ||
              aEvent.FeatureURL.Path == "Color" ||
-             aEvent.FeatureURL.Path == "FontColor")
+             aEvent.FeatureURL.Path == "FontColor" ||
+             aEvent.FeatureURL.Path == "FrameLineColor")
     {
         sal_Int32 nColor = -1;
         aEvent.State >>= nColor;