diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
| commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
| tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/source/ui/inc/dwfunctr.hxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/ui/inc/dwfunctr.hxx')
| -rw-r--r-- | sc/source/ui/inc/dwfunctr.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 1bb4206f3990..85387e5c11ae 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -52,7 +52,7 @@ class ScFunctionChildWindow : public SfxChildWindow { public: - ScFunctionChildWindow( Window*, USHORT, SfxBindings*, + ScFunctionChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW(ScFunctionChildWindow); @@ -79,17 +79,17 @@ private: SfxChildAlignment eSfxOldAlignment; ImageButton aInsertButton; FixedText aFiFuncDesc; - USHORT nLeftSlot; - USHORT nRightSlot; - ULONG nMinWidth; - ULONG nMinHeight; + sal_uInt16 nLeftSlot; + sal_uInt16 nRightSlot; + sal_uLong nMinWidth; + sal_uLong nMinHeight; Size aOldSize; - BOOL bSizeFlag; - BOOL bInit; + sal_Bool bSizeFlag; + sal_Bool bInit; short nDockMode; Point aSplitterInitPos; const ScFuncDesc* pFuncDesc; - USHORT nArgs; + sal_uInt16 nArgs; String** pArgArr; @@ -97,7 +97,7 @@ private: void UpdateFunctionList(); void UpdateLRUList(); - void DoEnter(BOOL bOk); //@@ ??? + void DoEnter(sal_Bool bOk); //@@ ??? void SetDescription(); void SetLeftRightSize(); void SetTopBottonSize(); @@ -114,7 +114,7 @@ private: protected: - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Resize(); virtual void Resizing( Size& rSize ); virtual void SetSize(); @@ -136,7 +136,7 @@ public: using SfxDockingWindow::Notify; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - void SetSlotIDs( USHORT nLeft, USHORT nRight ) + void SetSlotIDs( sal_uInt16 nLeft, sal_uInt16 nRight ) { nLeftSlot = nLeft; nRightSlot = nRight; } void InitLRUList(); |