diff options
author | Andre Fischer <af@apache.org> | 2013-05-27 12:55:37 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-28 20:08:31 +0100 |
commit | bf087c85aab791a9282bbda940344c8bf9925ef4 (patch) | |
tree | f2e96bda488c5488ea7d7517954163c8a1b7c293 /sfx2 | |
parent | 17bbff0e686fb32e3062316c238c7bdded037b9a (diff) |
Resolves: #i122387# Use the right tool box for font color in text sidebar
(cherry picked from commit 08159967126946849906827ceadd802053d132c0)
Conflicts:
sfx2/inc/sfx2/sidebar/EnumContext.hxx
Change-Id: If40d3dee7c11e4ea6b01d40d713280e1dc19484d
Unname unused argument to prevent compiler warnings.
(cherry picked from commit f68dfc2cc8754d9cf72ae1b09f119e683ad44124)
Change-Id: I6450c6e46d5971abc871ed378d2ad6307e8f7a3e
(cherry picked from commit 21747cae6ad12ec6566e6dd9a06f3c268c72404d)
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/sidebar/EnumContext.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx index d78d8cfbedda..48a974e206e0 100644 --- a/sfx2/source/sidebar/EnumContext.cxx +++ b/sfx2/source/sidebar/EnumContext.cxx @@ -136,6 +136,14 @@ const ::rtl::OUString& EnumContext::GetContextName (void) const +EnumContext::Context EnumContext::GetContext (void) const +{ + return meContext; +} + + + + bool EnumContext::operator== (const EnumContext aOther) { return meApplication==aOther.meApplication |