diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-30 14:10:35 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-30 15:40:50 +0200 |
| commit | 1f2894314328724b1654ee9990406460e4461ffd (patch) | |
| tree | 3e7616d9ba3866fcdcfa63d006853fed1723c9a5 /sd | |
| parent | 1de73df9cb3fdda3732c5270864bc30e38e63c2f (diff) | |
3D model insertion: here we need MM100
Change-Id: Iaa99e50589e08e8d82d860b6c61e6cbf0fd19b0a
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 4748442537b2..a8c5eac75279 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 ) |