Kaydet (Commit) b59ece02 authored tarafından Caolán McNamara's avatar Caolán McNamara

This can be a Window and not a DockingWindow now

Change-Id: I5b7e42c008328e30d6475283a635e4fdfa1148cb
üst e964c55f
...@@ -20,17 +20,9 @@ ...@@ -20,17 +20,9 @@
#include "sc.hrc" #include "sc.hrc"
#include "dwfunctr.hrc" #include "dwfunctr.hrc"
DockingWindow FID_FUNCTION_BOX Window FID_FUNCTION_BOX
{ {
Border = TRUE ;
Hide = TRUE ;
SVLook = TRUE ; SVLook = TRUE ;
Sizeable = TRUE ;
Moveable = TRUE ;
Closeable = TRUE ;
Zoomable = TRUE ;
Dockable = TRUE ;
EnableResizing = TRUE ;
Size = MAP_APPFONT ( 130 , 160 ) ; Size = MAP_APPFONT ( 130 , 160 ) ;
HelpId = HID_FUNCTION_BOX ; HelpId = HID_FUNCTION_BOX ;
ListBox CB_CAT ListBox CB_CAT
......
...@@ -32,10 +32,11 @@ ...@@ -32,10 +32,11 @@
#include "privsplt.hxx" #include "privsplt.hxx"
#include "funcdesc.hxx" #include "funcdesc.hxx"
class ScFunctionDockWin : public SfxDockingWindow, public SfxListener class ScFunctionWin : public vcl::Window, public SfxListener
{ {
private: private:
SfxBindings& rBindings;
Idle aIdle; Idle aIdle;
VclPtr<ScPrivatSplit> aPrivatSplit; VclPtr<ScPrivatSplit> aPrivatSplit;
VclPtr<ListBox> aCatBox; VclPtr<ListBox> aCatBox;
...@@ -72,31 +73,22 @@ private: ...@@ -72,31 +73,22 @@ private:
protected: protected:
virtual bool Close() override;
virtual void Resize() override; virtual void Resize() override;
virtual void Resizing( Size& rSize ) override;
void SetSize(); void SetSize();
virtual void ToggleFloatingMode() override;
virtual void StateChanged( StateChangedType nStateChange ) override; virtual void StateChanged( StateChangedType nStateChange ) override;
virtual SfxChildAlignment CheckAlignment(SfxChildAlignment,
SfxChildAlignment eAlign) override;
public: public:
ScFunctionDockWin( SfxBindings* pBindings, ScFunctionWin( SfxBindings* pBindings,
vcl::Window* pParent, vcl::Window* pParent,
const ResId& rResId ); const ResId& rResId );
virtual ~ScFunctionDockWin(); virtual ~ScFunctionWin();
virtual void dispose() override; virtual void dispose() override;
using SfxDockingWindow::Notify; using ::vcl::Window::Notify;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
void InitLRUList(); void InitLRUList();
void Initialize (SfxChildWinInfo* pInfo);
virtual void FillInfo(SfxChildWinInfo&) const override;
}; };
#endif #endif
......
...@@ -99,7 +99,7 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( ...@@ -99,7 +99,7 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement (
} }
else if (rsResourceURL.endsWith("/FunctionsPanel")) else if (rsResourceURL.endsWith("/FunctionsPanel"))
{ {
pPanel = VclPtr<ScFunctionDockWin>::Create(pBindings, pParentWindow, ScResId(FID_FUNCTION_BOX)); pPanel = VclPtr<ScFunctionWin>::Create(pBindings, pParentWindow, ScResId(FID_FUNCTION_BOX));
nMinimumSize = 0; nMinimumSize = 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment