diff options
| author | Release Engineering <releng@openoffice.org> | 2010-06-16 09:47:53 +0200 |
|---|---|---|
| committer | Release Engineering <releng@openoffice.org> | 2010-06-16 09:47:53 +0200 |
| commit | 41436227fd2108d59e52cdd217d73604613ce02e (patch) | |
| tree | a5ef8033ca652be93dd19e7e6b3fc4911289e197 /svtools/inc | |
| parent | d4741b8cb17b32ed902e60024649d6273e99f617 (diff) | |
masterfix: #i10000# resolve merge problems
Diffstat (limited to 'svtools/inc')
| -rw-r--r-- | svtools/inc/svtools/toolboxcontroller.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/svtools/inc/svtools/toolboxcontroller.hxx b/svtools/inc/svtools/toolboxcontroller.hxx index f636178881d0..7a49b294759c 100644 --- a/svtools/inc/svtools/toolboxcontroller.hxx +++ b/svtools/inc/svtools/toolboxcontroller.hxx @@ -133,6 +133,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL void enable( bool bEnable ); protected: + bool getToolboxId( sal_uInt16& rItemId, ToolBox** ppToolBox ); void setSupportVisiableProperty(sal_Bool bValue); //shizhoubo struct Listener { |