summaryrefslogtreecommitdiff
path: root/framework/inc/framework/bmkmenu.hxx
diff options
context:
space:
mode:
authorCarsten Driesner <cd@openoffice.org>2011-02-16 10:30:35 +0100
committerCarsten Driesner <cd@openoffice.org>2011-02-16 10:30:35 +0100
commit9fdc2716aada42ccb8f60e14555dab10de2c67eb (patch)
tree38fd489d7d0e4aaf5ef8dcf39ff013969fd7adf7 /framework/inc/framework/bmkmenu.hxx
parentc696055fbc116a65aac158fe6747079a3af44be4 (diff)
parentcd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff)
fwk165: Rebase to DEV300m100
Diffstat (limited to 'framework/inc/framework/bmkmenu.hxx')
-rw-r--r--framework/inc/framework/bmkmenu.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/inc/framework/bmkmenu.hxx b/framework/inc/framework/bmkmenu.hxx
index db6e2977f8b5..0ee25dea1ab2 100644
--- a/framework/inc/framework/bmkmenu.hxx
+++ b/framework/inc/framework/bmkmenu.hxx
@@ -67,7 +67,7 @@ class FWE_DLLPUBLIC BmkMenu : public AddonMenu
protected:
BmkMenu::BmkMenuType m_nType;
- USHORT CreateMenuId();
+ sal_uInt16 CreateMenuId();
private:
BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,