diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-11-18 22:26:32 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2015-11-18 22:26:32 +0200 |
| commit | 78214c982e1fab18b9f6c694a3b56c520da1724d (patch) | |
| tree | c1e2ee01c2fb70338c0da1430d05fb2478d1b12e /include | |
| parent | eedcc2c45c09e3180061ae1dfa0eb9d64afc3f39 (diff) | |
Revert "ToolBox: Remove unused methods"
The ImplLoadRes method *is* used in
ToolBox::ToolBox( vcl::Window* pParent, const ResId& rResId ).
This change breaks the navigator panel, and therefore the
JunitTest_toolkit_unoapi_1 test.
This reverts commit 99648095012187ef284d0a9399a8e12878b2a370.
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/toolbox.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 13aff0ff8991..81f629787078 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -190,6 +190,7 @@ private: SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); using DockingWindow::ImplInitSettings; SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); + SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE ImplToolItem* ImplGetItem( sal_uInt16 nId ) const; SAL_DLLPRIVATE bool ImplCalcItem(); SAL_DLLPRIVATE sal_uInt16 ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz ); @@ -311,6 +312,8 @@ public: virtual void Resizing( Size& rSize ) override; virtual Size GetOptimalSize() const override; + void InsertItem( const ResId& rResId, + sal_uInt16 nPos = TOOLBOX_APPEND ); /// Insert a command (like '.uno:Save'). virtual void InsertItem( const OUString& rCommand, const css::uno::Reference<css::frame::XFrame>& rFrame, |