diff options
Diffstat (limited to 'framework/inc/uielement')
11 files changed, 20 insertions, 20 deletions
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx index bc55ff78cd64..7cdcb5d268a9 100644 --- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx @@ -66,7 +66,7 @@ class ComboboxToolbarController : public IComboBoxListener, ComboboxToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, - USHORT nID, + sal_uInt16 nID, sal_Int32 nWidth, const rtl::OUString& aCommand ); virtual ~ComboboxToolbarController(); diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx index 58aa382bc6eb..016cee039796 100644 --- a/framework/inc/uielement/commandinfo.hxx +++ b/framework/inc/uielement/commandinfo.hxx @@ -52,9 +52,9 @@ struct CommandInfo bMirrored( false ), bRotated( false ) {} - USHORT nId; - sal_uInt16 nWidth; - ::std::vector< USHORT > aIds; + sal_uInt16 nId; + sal_uInt16 nWidth; + ::std::vector< sal_uInt16 > aIds; sal_Int16 nImageInfo; sal_Bool bMirrored : 1, bRotated : 1; diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx index dfb7741a223b..557523aa5359 100644 --- a/framework/inc/uielement/complextoolbarcontroller.hxx +++ b/framework/inc/uielement/complextoolbarcontroller.hxx @@ -68,7 +68,7 @@ class ComplexToolbarController : public svt::ToolboxController ComplexToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, - USHORT nID, + sal_uInt16 nID, const rtl::OUString& aCommand ); virtual ~ComplexToolbarController(); diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx index 4f828c35ff3e..eb146bcacdd1 100644 --- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx @@ -64,7 +64,7 @@ class DropdownToolbarController : public IListBoxListener, DropdownToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, - USHORT nID, + sal_uInt16 nID, sal_Int32 nWidth, const rtl::OUString& aCommand ); virtual ~DropdownToolbarController(); diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx index cdb22db98997..d8b48630da50 100644 --- a/framework/inc/uielement/edittoolbarcontroller.hxx +++ b/framework/inc/uielement/edittoolbarcontroller.hxx @@ -64,7 +64,7 @@ class EditToolbarController : public IEditListener, EditToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, - USHORT nID, + sal_uInt16 nID, sal_Int32 nWidth, const rtl::OUString& aCommand ); virtual ~EditToolbarController(); diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx index d8efaf1ad5ad..1db3bfcc593f 100644 --- a/framework/inc/uielement/generictoolbarcontroller.hxx +++ b/framework/inc/uielement/generictoolbarcontroller.hxx @@ -49,7 +49,7 @@ class GenericToolbarController : public svt::ToolboxController GenericToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, - USHORT nID, + sal_uInt16 nID, const rtl::OUString& aCommand ); virtual ~GenericToolbarController(); @@ -82,7 +82,7 @@ class MenuToolbarController : public GenericToolbarController MenuToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, - USHORT nID, + sal_uInt16 nID, const rtl::OUString& aCommand, const rtl::OUString& aModuleIdentifier, const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuDesc ); diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx index d67ee86ef569..f99138cd6939 100644 --- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx @@ -51,7 +51,7 @@ class ImageButtonToolbarController : public ComplexToolbarController ImageButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, - USHORT nID, + sal_uInt16 nID, const rtl::OUString& aCommand ); virtual ~ImageButtonToolbarController(); diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx index 1e8b9024eaca..a9d323365dce 100644 --- a/framework/inc/uielement/macrosmenucontroller.hxx +++ b/framework/inc/uielement/macrosmenucontroller.hxx @@ -81,7 +81,7 @@ namespace framework virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL); void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); String RetrieveLabelFromCommand( const String& aCmdURL ); - void addScriptItems( PopupMenu* pPopupMenu, USHORT startItemId ); + void addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId ); }; } diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index f201c70d7bb0..64f8667924d7 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -163,11 +163,11 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener Menu* GetMenuBar() const { return m_pVCLMenu; } // Configuration methods - static void FillMenuWithConfiguration( USHORT& nId, Menu* pMenu, + static void FillMenuWithConfiguration( sal_uInt16& nId, Menu* pMenu, const ::rtl::OUString& rModuleIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& rTransformer ); - static void FillMenu( USHORT& nId, + static void FillMenu( sal_uInt16& nId, Menu* pMenu, const ::rtl::OUString& rModuleIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer, @@ -202,7 +202,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener struct MenuItemHandler { - MenuItemHandler( USHORT aItemId, + MenuItemHandler( sal_uInt16 aItemId, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xManager, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : nItemId( aItemId ), @@ -210,7 +210,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener xSubMenuManager( xManager ), xMenuItemDispatch( rDispatch ) {} - USHORT nItemId; + sal_uInt16 nItemId; sal_Bool bCheckHide; ::rtl::OUString aTargetFrame; ::rtl::OUString aMenuItemURL; @@ -234,10 +234,10 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener std::vector< MenuItemHandler* >& aMenuShortCuts ); static void MergeAddonMenus( Menu* pMenuBar, const MergeMenuInstructionContainer&, const ::rtl::OUString& aModuleIdentifier ); - MenuItemHandler* GetMenuItemHandler( USHORT nItemId ); + MenuItemHandler* GetMenuItemHandler( sal_uInt16 nItemId ); sal_Bool CreatePopupMenuController( MenuItemHandler* pMenuItemHandler ); - void AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,USHORT _nItemId); - USHORT FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,USHORT _nIndex) const; + void AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId); + sal_uInt16 FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,sal_uInt16 _nIndex) const; void Init(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,AddonMenu* pAddonMenu,sal_Bool bDelete,sal_Bool bDeleteChildren,bool _bHandlePopUp = false); void SetHdl(); diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx index 17a9e1611ffa..cd86f5951b74 100644 --- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx +++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx @@ -70,7 +70,7 @@ class SpinfieldToolbarController : public ISpinfieldListener, SpinfieldToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, - USHORT nID, + sal_uInt16 nID, sal_Int32 nWidth, const rtl::OUString& aCommand ); virtual ~SpinfieldToolbarController(); diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx index 1261b96c769e..d8748648af58 100644 --- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx @@ -58,7 +58,7 @@ class ToggleButtonToolbarController : public ComplexToolbarController ToggleButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, - USHORT nID, + sal_uInt16 nID, Style eStyle, const rtl::OUString& aCommand ); virtual ~ToggleButtonToolbarController(); |