Skip to content

C
core
Kaydet (Commit) 1768904f authored tarafından Ariel Constenla-Haile's avatar Ariel Constenla-Haile Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Related: #i121442# Read Statusbar merging configuration 

(cherry picked from commit b2db8c4c)

Conflicts:
	framework/inc/framework/addonsoptions.hxx
	framework/source/fwe/classes/addonsoptions.cxx

Change-Id: I3cd8f310990098fc61adb8287ef53596f4038fdc
üst 0d3b4f59
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 0 deletions
include/framework/addonsoptions.hxx
Dosyayı görüntüle @ 1768904f
...@@ -44,6 +44,10 @@ ...@@ -44,6 +44,10 @@
#define ADDONSMENUITEM_STRING_CONTROLTYPE "ControlType" #define ADDONSMENUITEM_STRING_CONTROLTYPE "ControlType"
#define ADDONSMENUITEM_STRING_WIDTH "Width" #define ADDONSMENUITEM_STRING_WIDTH "Width"
#define STATUSBARITEM_STRING_ALIGN "Alignment"
#define STATUSBARITEM_STRING_AUTOSIZE "AutoSize"
#define STATUSBARITEM_STRING_OWNERDRAW "OwnerDraw"
#define ADDONSMENUITEM_URL_LEN 3 #define ADDONSMENUITEM_URL_LEN 3
#define ADDONSMENUITEM_TITLE_LEN 5 #define ADDONSMENUITEM_TITLE_LEN 5
#define ADDONSMENUITEM_TARGET_LEN 6 #define ADDONSMENUITEM_TARGET_LEN 6
...@@ -60,6 +64,10 @@ ...@@ -60,6 +64,10 @@
#define ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE OUString(ADDONSMENUITEM_STRING_CONTROLTYPE ) #define ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE OUString(ADDONSMENUITEM_STRING_CONTROLTYPE )
#define ADDONSMENUITEM_PROPERTYNAME_WIDTH OUString(ADDONSMENUITEM_STRING_WIDTH ) #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" #define ADDONSPOPUPMENU_URL_PREFIX_STR "private:menu/Addon"
#define ADDONSPOPUPMENU_URL_PREFIX OUString( ADDONSPOPUPMENU_URL_PREFIX_STR ) #define ADDONSPOPUPMENU_URL_PREFIX OUString( ADDONSPOPUPMENU_URL_PREFIX_STR )
...@@ -93,6 +101,18 @@ struct FWE_DLLPUBLIC MergeToolbarInstruction ...@@ -93,6 +101,18 @@ struct FWE_DLLPUBLIC MergeToolbarInstruction
typedef ::std::vector< MergeToolbarInstruction > MergeToolbarInstructionContainer; typedef ::std::vector< MergeToolbarInstruction > MergeToolbarInstructionContainer;
struct FWE_DLLPUBLIC MergeStatusbarInstruction
{
::rtl::OUString aMergePoint;
::rtl::OUString aMergeCommand;
::rtl::OUString aMergeCommandParameter;
::rtl::OUString aMergeFallback;
::rtl::OUString aMergeContext;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > aMergeStatusbarItems;
};
typedef ::std::vector< MergeStatusbarInstruction > MergeStatusbarInstructionContainer;
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
// forward declarations // forward declarations
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
...@@ -274,6 +294,8 @@ class FWE_DLLPUBLIC AddonsOptions ...@@ -274,6 +294,8 @@ class FWE_DLLPUBLIC AddonsOptions
*//*-*****************************************************************************************************/ *//*-*****************************************************************************************************/
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsHelpMenu() const; const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsHelpMenu() const;
const MergeStatusbarInstructionContainer& GetMergeStatusbarInstructions() const;
/*-****************************************************************************************************//** /*-****************************************************************************************************//**
@short Retrieve an image for a command URL which is defined inside the addon menu configuration @short Retrieve an image for a command URL which is defined inside the addon menu configuration
@descr Call it to retrieve an image for a command URL which is defined inside the addon menu configuration @descr Call it to retrieve an image for a command URL which is defined inside the addon menu configuration
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment