[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

[Michael Stahl]

 sw/source/uibase/docvw/FrameControlsManager.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7657db1f7970f66fe5f03af54195bc812d7bdfaa
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Jun 13 00:11:01 2015 +0200

    sw: overloading in C++ fail episode 6234
    
    Change-Id: Ida670ac9c6687314d8b425c3ac1f9896f54f2a15
    (cherry picked from commit a9286c302e96258f32d13fb66aced25750e82cd3)

diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx b/sw/source/uibase/docvw/FrameControlsManager.cxx
index 262388c..2ea7de4 100644
--- a/sw/source/uibase/docvw/FrameControlsManager.cxx
+++ b/sw/source/uibase/docvw/FrameControlsManager.cxx
@@ -187,7 +187,7 @@ void SwFrameMenuButtonBase::dispose()
 
 SwFrameControl::SwFrameControl( const VclPtr<vcl::Window> &pWindow )
 {
-    assert( pWindow != NULL );
+    assert(static_cast<bool>(pWindow));
     mxWindow.reset( pWindow );
     mpIFace = dynamic_cast<ISwFrameControl *>( pWindow.get() );
 }