diff options
author | Jan Holesovsky <kendy@collabora.com> | 2016-02-05 12:20:11 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2016-02-05 12:25:14 +0100 |
commit | e6a2b10b7a01cbb1d7b2148c37e73cee2d78c10e (patch) | |
tree | c42fdcaffa4e30cbda575713059a333129a808e7 | |
parent | 48032cd65ec65175dc6b8635d19f0f1e35437f22 (diff) |
lok: Notify also about the states of .uno:CharBackgroundExt.
.uno:CharBackgroundExt is supplementary to .uno:BackColor.
When .uno:BackColor is set, Writer turns into a 'watercan' mode, where the
user directly marks parts of the text with the wanted background color.
.uno:CharBackgroundExt then controls this watercan mode - dispatching it
toggles the watercan mode on/off, and also the StateChanged events reflect the
on/off mode accordingly.
Change-Id: I6472eb39129d1b1517fba14bad584cbd125e826a
-rw-r--r-- | desktop/source/lib/init.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/control/unoctitm.cxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 72fef8309de7..ccde8f6869b4 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -700,6 +700,7 @@ static void doc_iniUnoCommands () OUString(".uno:Bold"), OUString(".uno:CenterPara"), OUString(".uno:CharBackColor"), + OUString(".uno:CharBackgroundExt"), OUString(".uno:CharFontName"), OUString(".uno:Color"), OUString(".uno:DecrementIndent"), diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index a189a5faeeba..8a2a8661fdf7 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -1068,6 +1068,7 @@ void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe if (aEvent.FeatureURL.Path == "Bold" || aEvent.FeatureURL.Path == "CenterPara" || + aEvent.FeatureURL.Path == "CharBackgroundExt" || aEvent.FeatureURL.Path == "DefaultBullet" || aEvent.FeatureURL.Path == "DefaultNumbering" || aEvent.FeatureURL.Path == "Italic" || @@ -1085,7 +1086,6 @@ void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe bool bTemp = false; aEvent.State >>= bTemp; aBuffer.append(bTemp); - } else if (aEvent.FeatureURL.Path == "CharFontName") { |