diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-12-06 12:29:05 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-21 14:01:17 +0100 |
| commit | 1768904fd908e940a210e101c99a58ca1f7e3f27 (patch) | |
| tree | e17256496a216997716eac470e580e518676a054 /framework/source/uielement/statusbaritem.cxx | |
| parent | 0d3b4f59fc43bc7aa9994195d55712aff87b3036 (diff) | |
Related: #i121442# Read Statusbar merging configuration
(cherry picked from commit b2db8c4c68553100b64af8f51bce2d496b12e882)
Conflicts:
framework/inc/framework/addonsoptions.hxx
framework/source/fwe/classes/addonsoptions.cxx
Change-Id: I3cd8f310990098fc61adb8287ef53596f4038fdc
Diffstat (limited to 'framework/source/uielement/statusbaritem.cxx')
0 files changed, 0 insertions, 0 deletions