diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-12-06 12:29:24 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-21 14:01:17 +0100 |
| commit | cfaac477e2a23880310070690beb3222b1c8227c (patch) | |
| tree | c5678e2606d73d548392174109df695b35fc053b /framework/source/uielement/toolbarmerger.cxx | |
| parent | 1768904fd908e940a210e101c99a58ca1f7e3f27 (diff) | |
Related: #i121442# support status bar merging and StatusbarControllers
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
Diffstat (limited to 'framework/source/uielement/toolbarmerger.cxx')
| -rw-r--r-- | framework/source/uielement/toolbarmerger.cxx | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index ecc51e4c3db7..b0d725625e12 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -28,31 +28,31 @@ namespace framework { -static const char MERGE_TOOLBAR_URL[] = "URL"; -static const char MERGE_TOOLBAR_TITLE[] = "Title"; -static const char MERGE_TOOLBAR_IMAGEID[] = "ImageIdentifier"; -static const char MERGE_TOOLBAR_CONTEXT[] = "Context"; -static const char MERGE_TOOLBAR_TARGET[] = "Target"; -static const char MERGE_TOOLBAR_CONTROLTYPE[] = "ControlType"; -static const char MERGE_TOOLBAR_WIDTH[] = "Width"; - -static const char MERGECOMMAND_ADDAFTER[] = "AddAfter"; -static const char MERGECOMMAND_ADDBEFORE[] = "AddBefore"; -static const char MERGECOMMAND_REPLACE[] = "Replace"; -static const char MERGECOMMAND_REMOVE[] = "Remove"; - -static const char MERGEFALLBACK_ADDLAST[] = "AddLast"; -static const char MERGEFALLBACK_ADDFIRST[] = "AddFirst"; -static const char MERGEFALLBACK_IGNORE[] = "Ignore"; - -static const char TOOLBARCONTROLLER_BUTTON[] = "Button"; -static const char TOOLBARCONTROLLER_COMBOBOX[] = "Combobox"; -static const char TOOLBARCONTROLLER_EDIT[] = "Editfield"; -static const char TOOLBARCONTROLLER_SPINFIELD[] = "Spinfield"; -static const char TOOLBARCONTROLLER_IMGBUTTON[] = "ImageButton"; -static const char TOOLBARCONTROLLER_DROPDOWNBOX[] = "Dropdownbox"; -static const char TOOLBARCONTROLLER_DROPDOWNBTN[] = "DropdownButton"; -static const char TOOLBARCONTROLLER_TOGGLEDDBTN[] = "ToggleDropdownButton"; +static const char MERGE_TOOLBAR_URL[] = "URL"; +static const char MERGE_TOOLBAR_TITLE[] = "Title"; +static const char MERGE_TOOLBAR_IMAGEID[] = "ImageIdentifier"; +static const char MERGE_TOOLBAR_CONTEXT[] = "Context"; +static const char MERGE_TOOLBAR_TARGET[] = "Target"; +static const char MERGE_TOOLBAR_CONTROLTYPE[] = "ControlType"; +static const char MERGE_TOOLBAR_WIDTH[] = "Width"; + +static const char MERGECOMMAND_ADDAFTER[] = "AddAfter"; +static const char MERGECOMMAND_ADDBEFORE[] = "AddBefore"; +static const char MERGECOMMAND_REPLACE[] = "Replace"; +static const char MERGECOMMAND_REMOVE[] = "Remove"; + +static const char MERGEFALLBACK_ADDLAST[] = "AddLast"; +static const char MERGEFALLBACK_ADDFIRST[] = "AddFirst"; +static const char MERGEFALLBACK_IGNORE[] = "Ignore"; + +static const char TOOLBARCONTROLLER_BUTTON[] = "Button"; +static const char TOOLBARCONTROLLER_COMBOBOX[] = "Combobox"; +static const char TOOLBARCONTROLLER_EDIT[] = "Editfield"; +static const char TOOLBARCONTROLLER_SPINFIELD[] = "Spinfield"; +static const char TOOLBARCONTROLLER_IMGBUTTON[] = "ImageButton"; +static const char TOOLBARCONTROLLER_DROPDOWNBOX[] = "Dropdownbox"; +static const char TOOLBARCONTROLLER_DROPDOWNBTN[] = "DropdownButton"; +static const char TOOLBARCONTROLLER_TOGGLEDDBTN[] = "ToggleDropdownButton"; static const char TOOLBOXITEM_SEPARATOR_STR[] = "private:separator"; |