diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-05-31 20:37:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-05-31 20:37:41 +0100 |
| commit | 029c3521668fec38d42533d59d4ca6bf19b92abc (patch) | |
| tree | 247f9d4741a3a9e4cedf5c53f02ad6e44306016c /framework/inc | |
| parent | 4cc8aa1b30ba228b5906870910574b3652c3b85a (diff) | |
| parent | 44ada130c3857b167e954b63c7a5490268b72c5b (diff) | |
cmcfixes75: merge with DEV300 m80
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/properties.h | 8 | ||||
| -rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/uielement/uicommanddescription.hxx | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/framework/inc/properties.h b/framework/inc/properties.h index f4cf65a7cf..84d7370af6 100644 --- a/framework/inc/properties.h +++ b/framework/inc/properties.h @@ -217,6 +217,14 @@ namespace framework{ #define UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST "private:resource/image/commandrotateimagelist" #define UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST "private:resource/image/commandmirrorimagelist" +#define UICOMMANDDESCRIPTION_PROPNAME_PROPERTIES "Properties" +#define UICOMMANDDESCRIPTION_PROPNAME_POPUP "Popup" + +#define UICOMMANDDESCRIPTION_PROPERTIES_IMAGE 1 +#define UICOMMANDDESCRIPTION_PROPERTIES_IMAGE_MIRRORED 2 +#define UICOMMANDDESCRIPTION_PROPERTIES_IMAGE_ROTATED 4 +#define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 + //_______________________________________________ /** properties for "AutoRecovery" class */ diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index f8f4715ef1..3544d9649a 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -179,6 +179,8 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener void RemoveControllers(); rtl::OUString RetrieveLabelFromCommand( const rtl::OUString& aCmdURL ); + sal_Int32 RetrievePropertiesFromCommand( const rtl::OUString& aCmdURL ); + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetPropsForCommand( const ::rtl::OUString& rCmdURL ); void CreateControllers(); void UpdateControllers(); void AddFrameActionListener(); diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx index cdb883b995..c0f3d5d48a 100644 --- a/framework/inc/uielement/uicommanddescription.hxx +++ b/framework/inc/uielement/uicommanddescription.hxx @@ -109,7 +109,7 @@ public: ModuleToCommandFileMap m_aModuleToCommandFileMap; UICommandsHashMap m_aUICommandsHashMap; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xGenericUICommands; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > m_xModuleManager; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > m_xModuleManager; }; } // namespace framework |