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

[Zolnai Tamás]

 sd/source/ui/func/fuinsert.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 1f2894314328724b1654ee9990406460e4461ffd
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Wed Apr 30 14:10:35 2014 +0200

    3D model insertion: here we need MM100
    
    Change-Id: Iaa99e50589e08e8d82d860b6c61e6cbf0fd19b0a

diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 4748442..a8c5eac 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -795,9 +795,14 @@ void FuInsert3DModel::DoExecute( SfxRequest& )
             mpWindow->EnterWait();
 
         Point aPos;
-        Size aSize(480,360);
         sal_Int8 nAction = DND_ACTION_COPY;
 
+        Size aSize(480,360);
+        if( mpWindow )
+            aSize = mpWindow->PixelToLogic( aSize, MAP_100TH_MM );
+        else
+            aSize = Application::GetDefaultDevice()->PixelToLogic( aSize, MAP_100TH_MM );
+
         if( mpWindow )
         {
             aPos = mpWindow->PixelToLogic( Rectangle( aPos, mpWindow->GetOutputSizePixel() ).Center() );
@@ -805,6 +810,7 @@ void FuInsert3DModel::DoExecute( SfxRequest& )
             aPos.Y() -= aSize.Height() >> 1;
         }
 
+
         mpView->Insert3DModelURL( sURL, nAction, aPos, aSize, false ) ;
 
         if( mpWindow )