diff options
| author | Andre Fischer <af@apache.org> | 2013-05-14 15:21:57 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:35 +0100 |
| commit | a9626f143a1466591764b03baa2d15905487b692 (patch) | |
| tree | 410958c92408356de4f510b022518be4a5e187d8 /sfx2/Library_sfx.mk | |
| parent | 6e6f8cb2b7f2173eafb988f78e9704ed1bbc4b0a (diff) | |
Resolves: #i122302# Use tool bar controls for color controls...
in text property panel
(cherry picked from commit 3b252796e1126b5ec1216082f55b8d12017eaeb1)
Conflicts:
sfx2/Package_inc.mk
sfx2/inc/sfx2/sidebar/ControlFactory.hxx
sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
sfx2/inc/sfx2/sidebar/EnumContext.hxx
sfx2/source/sidebar/SidebarToolBox.cxx
svx/source/sidebar/insert/InsertPropertyPanel.cxx
svx/source/sidebar/insert/InsertPropertyPanel.hxx
svx/source/sidebar/text/TextPropertyPanel.cxx
Change-Id: Ifa1947c9e9bfdc3635dbb5b0c7a79f8ead613a90
Diffstat (limited to 'sfx2/Library_sfx.mk')
| -rw-r--r-- | sfx2/Library_sfx.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 09ddbe1fd736..03775fda52a8 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -239,6 +239,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/sidebar/ContextChangeBroadcaster \ sfx2/source/sidebar/ContextList \ sfx2/source/sidebar/ControlFactory \ + sfx2/source/sidebar/ControllerFactory \ sfx2/source/sidebar/ControllerItem \ sfx2/source/sidebar/CustomImageRadioButton \ sfx2/source/sidebar/Deck \ |