diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:19:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:22 +0100 |
| commit | b98352996c24a3b21c52c32d62d0a7fdbc8e4246 (patch) | |
| tree | 3f4a8c74e2bce383274ae6c0308d0db3c80161ff /include/framework | |
| parent | 564fe23374fa544c34875da0dd695cb8a939f0f2 (diff) | |
framework: Use appropriate OUString functions on string constants
Change-Id: I5da5cd3254102c742021b3e7b4e1f907ca897ca5
Diffstat (limited to 'include/framework')
| -rw-r--r-- | include/framework/addonsoptions.hxx | 19 | ||||
| -rw-r--r-- | include/framework/menuconfiguration.hxx | 4 |
2 files changed, 2 insertions, 21 deletions
diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx index 02c42f076353..7cd834626ec0 100644 --- a/include/framework/addonsoptions.hxx +++ b/include/framework/addonsoptions.hxx @@ -41,25 +41,6 @@ #define ADDONSMENUITEM_STRING_IMAGEIDENTIFIER "ImageIdentifier" #define ADDONSMENUITEM_STRING_CONTEXT "Context" #define ADDONSMENUITEM_STRING_SUBMENU "Submenu" -#define ADDONSMENUITEM_STRING_CONTROLTYPE "ControlType" -#define ADDONSMENUITEM_STRING_WIDTH "Width" - -#define STATUSBARITEM_STRING_ALIGN "Alignment" -#define STATUSBARITEM_STRING_AUTOSIZE "AutoSize" -#define STATUSBARITEM_STRING_OWNERDRAW "OwnerDraw" - -#define ADDONSMENUITEM_PROPERTYNAME_URL OUString(ADDONSMENUITEM_STRING_URL ) -#define ADDONSMENUITEM_PROPERTYNAME_TITLE OUString(ADDONSMENUITEM_STRING_TITLE ) -#define ADDONSMENUITEM_PROPERTYNAME_TARGET OUString(ADDONSMENUITEM_STRING_TARGET ) -#define ADDONSMENUITEM_PROPERTYNAME_IMAGEIDENTIFIER OUString(ADDONSMENUITEM_STRING_IMAGEIDENTIFIER ) -#define ADDONSMENUITEM_PROPERTYNAME_CONTEXT OUString(ADDONSMENUITEM_STRING_CONTEXT ) -#define ADDONSMENUITEM_PROPERTYNAME_SUBMENU OUString(ADDONSMENUITEM_STRING_SUBMENU ) -#define ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE OUString(ADDONSMENUITEM_STRING_CONTROLTYPE ) -#define ADDONSMENUITEM_PROPERTYNAME_WIDTH OUString(ADDONSMENUITEM_STRING_WIDTH ) - -#define STATUSBARITEM_PROPERTYNAME_ALIGN OUString(STATUSBARITEM_STRING_ALIGN ) -#define STATUSBARITEM_PROPERTYNAME_AUTOSIZE OUString(STATUSBARITEM_STRING_AUTOSIZE ) -#define STATUSBARITEM_PROPERTYNAME_OWNERDRAW OUString(STATUSBARITEM_STRING_OWNERDRAW ) #define ADDONSPOPUPMENU_URL_PREFIX_STR "private:menu/Addon" diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx index 50e4405d3fe2..885baae3cdeb 100644 --- a/include/framework/menuconfiguration.hxx +++ b/include/framework/menuconfiguration.hxx @@ -36,8 +36,8 @@ #include <vcl/menu.hxx> #include <vcl/toolbox.hxx> -#define BOOKMARK_NEWMENU OUString( "private:menu_bookmark_new" ) -#define BOOKMARK_WIZARDMENU OUString( "private:menu_bookmark_wizard" ) +#define BOOKMARK_NEWMENU "private:menu_bookmark_new" +#define BOOKMARK_WIZARDMENU "private:menu_bookmark_wizard" // Prepare for inclusion by framework and sfx // Please consider that there is a corresponding define also in sfxsids.hrc!! (SID_SFX_START)/(SID_ADDONS) |