[Libreoffice-commits] core.git: 2 commits - filter/source sfx2/source

[Noel Grandin]

 filter/source/msfilter/svdfppt.cxx |    1 +
 sfx2/source/dialog/dockwin.cxx     |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b3cd552f4fdf5f15d9b440efe9d8cc9670248e79
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Apr 4 16:20:30 2018 +0200

    fix bug in ppt import filter, ignoring initials
    
    from somewhere before
        commit d2000efb31f864e912c6cf52760eea0e602b6893
        Date:   Sat Oct 31 00:29:04 2009 +0100
        #i106421#: move msfilter to filter
    
    found by my new unusedvariablesmore plugin
    
    Change-Id: If19c3023bff9247608c9d3ddb84a0e91116c7224
    Reviewed-on: https://gerrit.libreoffice.org/52390
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index fb548d0dda6a..9817e93e4b22 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2720,6 +2720,7 @@ void ImportComment10( SvxMSDffManager const & rMan, SvStream& rStCtrl, SdrPage*
         xAnnotation->setPosition( geometry::RealPoint2D( aPosition.X() / 100.0, aPosition.Y() / 100.0 ) );
         xAnnotation->setAuthor( sAuthor );
         xAnnotation->setDateTime( aDateTime );
+        xAnnotation->setInitials( sInitials );
         uno::Reference< text::XText > xText( xAnnotation->getTextRange() );
         xText->setString( sText );
     }
commit 5b6fbf522f434c2f55022476e0c4706cc0929ab5
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Apr 4 16:09:01 2018 +0200

    fix bug in SfxDockingWindow::CalcAlignment
    
    ever since
        commit 715b590e8753fac3083e15a13f14270f15162050
        Date:   Tue Jul 6 12:35:55 2004 +0000
        INTEGRATION: CWS docking1 (1.29.254); FILE MERGED
    
    Change-Id: Ic447e12592b30f9cfe8ad22bd32214d02cf36477
    Reviewed-on: https://gerrit.libreoffice.org/52389
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 958423e4473b..991d2f01ccdd 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1222,7 +1222,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, tools::Rect
         Point aNewPos(rPos);
         aNewPos.AdjustX( -(aSmallDockingRect.GetWidth()/2) );
         aNewPos.AdjustY( -(aSmallDockingRect.GetHeight()/2) );
-        aSmallDockingRect.SetPos(rPos);
+        aSmallDockingRect.SetPos(aNewPos);
         tools::Rectangle aIntersectRect = aInRect.GetIntersection( aSmallDockingRect );
         if ( aIntersectRect == aSmallDockingRect )
             // docking rectangle completely inside (shrunk) inner area -> floating mode