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

[Dennis Francis]

 sc/source/ui/app/transobj.cxx |   11 +----------
 sc/source/ui/inc/transobj.hxx |    1 -
 2 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 8a70142223049f98a9c6f91130ecdc87a2a9becf
Author: Dennis Francis <dennis.francis at collabora.co.uk>
Date:   Tue Sep 12 11:33:14 2017 +0200

    Revert "tdf#108299: Limit the size of bitmap created for clipboard..."
    
    This reverts commit 157d1a774086d7344d443005442682f2ca3c01a9.
    
    Fix for the root cause coming up soon.
    
    Change-Id: Ia66432c8b1ed3f2063a3a091976812e2a479ab12
    Reviewed-on: https://gerrit.libreoffice.org/42191
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Dennis Francis <dennis.francis at collabora.co.uk>

diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 9f80b62a19f1..d24e83b7382b 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -33,7 +33,6 @@
 #include <vcl/virdev.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
-#include <sfx2/viewfrm.hxx>
 
 #include "transobj.hxx"
 #include "patattr.hxx"
@@ -65,7 +64,6 @@
 #include "cellsuno.hxx"
 #include "stringutil.hxx"
 #include "formulaiter.hxx"
-#include "tabvwsh.hxx"
 #include <gridwin.hxx>
 
 using namespace com::sun::star;
@@ -176,8 +174,6 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDesc
     aBlock = ScRange( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
     nVisibleTab = nTab1;    // valid table as default
 
-    aMaxBitMapSize = ScTabViewShell::GetActiveViewShell()->GetViewFrame()->GetWindow().GetSizePixel();
-
     tools::Rectangle aMMRect = pDoc->GetMMRect( nCol1,nRow1, nCol2,nRow2, nTab1 );
     aObjDesc.maSize = aMMRect.GetSize();
     PrepareOLE( aObjDesc );
@@ -358,13 +354,8 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt
             tools::Rectangle aMMRect = pDoc->GetMMRect( aBlock.aStart.Col(), aBlock.aStart.Row(),
                                                  aBlock.aEnd.Col(), aBlock.aEnd.Row(),
                                                  aBlock.aStart.Tab() );
-
             ScopedVclPtrInstance< VirtualDevice > pVirtDev;
-            Size aSize = pVirtDev->LogicToPixel( aMMRect.GetSize(), MapUnit::Map100thMM );
-            // Limit the width and height to screen area in pixel scale
-            aSize.Width() = std::min( aMaxBitMapSize.Width(), aSize.Width() );
-            aSize.Height() = std::min( aMaxBitMapSize.Height(), aSize.Height() );
-            pVirtDev->SetOutputSizePixel( aSize );
+            pVirtDev->SetOutputSizePixel( pVirtDev->LogicToPixel( aMMRect.GetSize(), MapUnit::Map100thMM ) );
 
             PaintToDev( pVirtDev, pDoc, 1.0, aBlock );
 
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index f40de060d413..b897a727937e 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -42,7 +42,6 @@ class ScTransferObj : public TransferableHelper
 private:
     ScDocument*                     pDoc;
     ScRange                         aBlock;
-    Size                            aMaxBitMapSize;
     SCROW                           nNonFiltered;       // non-filtered rows
     TransferableObjectDescriptor    aObjDesc;
     SfxObjectShellRef               aDocShellRef;