[Libreoffice-commits] core.git: sw/source

David Tardon dtardon at redhat.com
Wed Apr 29 04:20:00 PDT 2015


 sw/source/core/view/viewsh.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 19472697291fc2a706818f6d89ec301e224c76e5
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Apr 29 13:19:36 2015 +0200

    error C2666: 'operator ==' : 2 overloads have similar conversions
    
    Change-Id: I29ad743da5d82ef15aa71ca60783a16a0aa8693d

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 27c72a1..12591b9 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1931,7 +1931,7 @@ OutputDevice& SwViewShell::GetRefDev() const
           GetViewOptions()->getBrowseMode() &&
          !GetViewOptions()->IsPrtFormat() )
         pTmpOut = GetWin();
-    else if ( 0 != mpTmpRef )
+    else if ( mpTmpRef )
         pTmpOut = mpTmpRef;
     else
         pTmpOut = GetDoc()->getIDocumentDeviceAccess().getReferenceDevice( true );


More information about the Libreoffice-commits mailing list