summaryrefslogtreecommitdiff
path: root/framework/inc/uielement/statusbarmerger.hxx
AgeCommit message (Collapse)AuthorFilesLines
2013-11-05fixincludeguards.sh: frameworkThomas Arnhold1-2/+2
Change-Id: Ia6f3cb21977095df45a176db2bf68f508c70191c
2013-06-16add missing modelines.Michael Meeks1-0/+3
Change-Id: Ia0472d4dbce203f0b813e353b4b29f9dc9618664
2013-05-21Related: #i121442# support status bar merging and StatusbarControllersAriel Constenla-Haile1-0/+81
framework refactoring and new code to support status bar merging and UNO StatusbarControllers (cherry picked from commit 0b3a77478cf2cfd245a87bc528f851e959a2e6c7) Conflicts: framework/source/uielement/statusbarmanager.cxx framework/source/uielement/toolbarmerger.cxx Change-Id: I334a220ff27bb365e98a0ebd8bc6e55d65e76d64