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

coverity#708644 Uninitialized pointer field

Change-Id: I329c6b1d901286892e9e03afa299c635e25c59cb
üst cbfcb837
...@@ -117,8 +117,6 @@ private: ...@@ -117,8 +117,6 @@ private:
mbStartDockingEnabled:1, mbStartDockingEnabled:1,
mbLocked:1; mbLocked:1;
void ImplInitData();
DECL_LINK( PopupModeEnd, void* ); DECL_LINK( PopupModeEnd, void* );
void ImplEnableStartDocking( bool bEnable = true ) { mbStartDockingEnabled = bEnable; } void ImplEnableStartDocking( bool bEnable = true ) { mbStartDockingEnabled = bEnable; }
bool ImplStartDockingEnabled() { return mbStartDockingEnabled; } bool ImplStartDockingEnabled() { return mbStartDockingEnabled; }
......
...@@ -795,20 +795,39 @@ void ImplPopupFloatWin::Tracking( const TrackingEvent& rTEvt ) ...@@ -795,20 +795,39 @@ void ImplPopupFloatWin::Tracking( const TrackingEvent& rTEvt )
} }
ImplDockingWindowWrapper::ImplDockingWindowWrapper( const Window *pWindow ) ImplDockingWindowWrapper::ImplDockingWindowWrapper( const Window *pWindow )
: mpDockingWindow(const_cast<Window*>(pWindow))
, mpFloatWin(NULL)
, mpOldBorderWin(NULL)
, mpParent(pWindow->GetParent())
, maMaxOutSize( SHRT_MAX, SHRT_MAX )
, mnTrackX(0)
, mnTrackY(0)
, mnTrackWidth(0)
, mnTrackHeight(0)
, mnDockLeft(0)
, mnDockTop(0)
, mnDockRight(0)
, mnDockBottom(0)
, mnFloatBits(WB_BORDER | WB_CLOSEABLE | WB_SIZEABLE | (pWindow->GetStyle() & DOCKWIN_FLOATSTYLES))
, mbDockCanceled(false)
, mbFloatPrevented(false)
, mbDockable(true)
, mbDocking(false)
, mbDragFull(false)
, mbLastFloatMode(false)
, mbStartFloat(false)
, mbTrackDock(false)
, mbPinned(false)
, mbRollUp(false)
, mbDockBtn(false)
, mbHideBtn(false)
// must be enabled in Window::Notify to prevent permanent docking during mouse move
, mbStartDockingEnabled(false)
, mbLocked(false)
{ {
ImplInitData();
mpDockingWindow = (Window*) pWindow;
mpParent = pWindow->GetParent();
mbDockable = true;
mbLocked = false;
mnFloatBits = WB_BORDER | WB_CLOSEABLE | WB_SIZEABLE | (pWindow->GetStyle() & DOCKWIN_FLOATSTYLES);
DockingWindow *pDockWin = dynamic_cast< DockingWindow* > ( mpDockingWindow ); DockingWindow *pDockWin = dynamic_cast< DockingWindow* > ( mpDockingWindow );
if( pDockWin ) if( pDockWin )
mnFloatBits = pDockWin->GetFloatStyle(); mnFloatBits = pDockWin->GetFloatStyle();
// must be enabled in Window::Notify to prevent permanent docking during mouse move
mbStartDockingEnabled = false;
} }
ImplDockingWindowWrapper::~ImplDockingWindowWrapper() ImplDockingWindowWrapper::~ImplDockingWindowWrapper()
...@@ -877,22 +896,6 @@ bool ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos ) ...@@ -877,22 +896,6 @@ bool ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos )
return true; return true;
} }
void ImplDockingWindowWrapper::ImplInitData()
{
mpDockingWindow = NULL;
//GetWindow()->mpWindowImpl->mbDockWin = true; // TODO: must be eliminated
mpFloatWin = NULL;
mbDockCanceled = false;
mbFloatPrevented = false;
mbDocking = false;
mbPinned = false;
mbRollUp = false;
mbDockBtn = false;
mbHideBtn = false;
maMaxOutSize = Size( SHRT_MAX, SHRT_MAX );
}
void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt ) void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt )
{ {
// used during docking of a currently docked window // used during docking of a currently docked window
......
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