diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/tbxctrl.hxx | 7 | ||||
| -rw-r--r-- | include/svx/dialogs.hrc | 7 | ||||
| -rw-r--r-- | include/vcl/dialog.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/floatwin.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/syswin.hxx | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 2c7d81a2ec79..99202ff0525c 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -138,9 +138,10 @@ public: SfxPopupWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits ); - SfxPopupWindow( sal_uInt16 nId, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ResId &rId ); + SfxPopupWindow(sal_uInt16 nId, + const OString& rID, const OUString& rUIXMLDescription, + const css::uno::Reference<css::frame::XFrame> &rFrame = + css::uno::Reference<css::frame::XFrame>()); SfxPopupWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow, diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 430339747598..2a033e96fcf1 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -803,12 +803,11 @@ #define RID_SVXSTR_UNDO_GRAFTRANSPARENCY (RID_SVX_START + 828) #define RID_SVXSTR_UNDO_GRAFCROP (RID_SVXSTR_GRAFCROP) -// listbox control for UNDO and REDO -#define RID_SVXTBX_UNDO_REDO_CTRL (RID_SVX_START + 845) +// strings for UNDO and REDO #define RID_SVXSTR_NUM_UNDO_ACTIONS (RID_SVX_START + 846) #define RID_SVXSTR_NUM_REDO_ACTIONS (RID_SVX_START + 847) -#define RID_SVXSTR_NUM_UNDO_ACTION (RID_SVX_START + 848) -#define RID_SVXSTR_NUM_REDO_ACTION (RID_SVX_START + 849) +#define RID_SVXSTR_NUM_UNDO_ACTION (RID_SVX_START + 848) +#define RID_SVXSTR_NUM_REDO_ACTION (RID_SVX_START + 849) // Default-transparence-gradient-names #define RID_SVXSTR_TRASNGR0_DEF (RID_SVX_START + 850) diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 14d303cef14c..ff9f249f3367 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -65,7 +65,7 @@ protected: public: SAL_DLLPRIVATE bool IsInClose() const { return mbInClose; } - virtual void doDeferredInit(bool bResizable, bool bCloseable) SAL_OVERRIDE; + virtual void doDeferredInit(WinBits nBits) SAL_OVERRIDE; protected: explicit Dialog( WindowType nType ); diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index c76876003ff1..2d4981ef1fad 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -117,7 +117,7 @@ public: SAL_DLLPRIVATE void ImplEndPopupMode( sal_uInt16 nFlags = 0, sal_uLong nFocusId = 0 ); SAL_DLLPRIVATE Rectangle& ImplGetItemEdgeClipRect(); SAL_DLLPRIVATE bool ImplIsInPrivatePopupMode() const { return mbInPopupMode; } - virtual void doDeferredInit(bool bResizable, bool bCloseable) SAL_OVERRIDE; + virtual void doDeferredInit(WinBits nBits) SAL_OVERRIDE; public: explicit FloatingWindow(Window* pParent, WinBits nStyle = WB_STDFLOATWIN); diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 93c5926551ff..ce79e114a8a1 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -276,7 +276,7 @@ public: SAL_DLLPRIVATE bool hasPendingLayout() const { return maLayoutTimer.IsActive(); } - virtual void doDeferredInit(bool bResizable, bool bCloseable); + virtual void doDeferredInit(WinBits nBits); }; #endif // INCLUDED_VCL_SYSWIN_HXX |