[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sd/source

[Stephan Bergmann]

 sd/source/ui/view/sdview3.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d0156986b0a4a3dc11e16a71637299d031cb30b5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 24 17:39:34 2016 +0100

    -Werror=nonnull-compare
    
    ...where "this" must be (derived from) View, in View::InsertData.
    
    Before 89d39bc100aabf5dccbe77c0b5c0c85736e85b39 "tdf#94559: 4th step to remove
    rtti.hxx," that was
    
      ISA( View )
    
    which had originally been introduced as
    
      ISA( SdView )
    
    into SdView::InsertData with 82453a8c6c84a22b6f940395d9b4c45516197ed3 "#80266#:
    added D&D functionality for slide view" in 2001 (and then, both in concert,
    SdView::InsertData changed to View::InsertData and the ISA( SdView ) changed to
    ISA( View ) with ee8db8ade5ac9205430eab6f1b701f683ea99eb1 "INTEGRATION: CWS
    impress1: #111996# Transition to stacked sub-shells. Introduction of namespace
    sd."
    
    So just assume it was always only a harmless glitch that is good to go.
    
    Change-Id: I5a99e401feb2a4c4455469b58c803ccab06694f5
    (cherry picked from commit a3a7a70811123a9d7c812952496596d7be19135b)
    Signed-off-by: David Tardon <dtardon at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/24413
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 2dc792a..68e5ca4 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -360,7 +360,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
     {
         const View* pSourceView = pOwnData->GetView();
 
-        if( pOwnData->GetDocShell() && pOwnData->IsPageTransferable() && dynamic_cast< View *>( this) !=  nullptr )
+        if( pOwnData->GetDocShell() && pOwnData->IsPageTransferable() )
         {
             mpClipboard->HandlePageDrop (*pOwnData);
             bReturn = true;