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

[Caolán McNamara]

 vcl/source/gdi/gfxlink.cxx |   28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

New commits:
commit edf79cacbeaef0080588f00e90e6c1b35a70d17e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Apr 2 19:12:35 2017 +0100

    SwapOutData url is always a file url
    
    so can just use SvFileStream here and not go through ucb
    
    Change-Id: I1d70a4e39977a178afaf7eeadb552f1bd7d9fd1a
    Reviewed-on: https://gerrit.libreoffice.org/36024
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 60d6493e2c71..8921aaf081f3 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -21,13 +21,10 @@
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
 #include <tools/debug.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <unotools/tempfile.hxx>
-#include <ucbhelper/content.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/cvtgrf.hxx>
-#include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <memory>
 #include <o3tl/make_shared.hxx>
 
@@ -269,22 +266,15 @@ std::shared_ptr<sal_uInt8> GfxLink::GetSwapInData() const
 
     std::shared_ptr<sal_uInt8> pData;
 
-    std::unique_ptr<SvStream> xIStm(::utl::UcbStreamHelper::CreateStream( mpSwapOutData->maURL, StreamMode::READWRITE ));
-    if( xIStm )
-    {
-        pData = o3tl::make_shared_array<sal_uInt8>(mnSwapInDataSize);
-        xIStm->ReadBytes( pData.get(), mnSwapInDataSize );
-        bool bError = ( ERRCODE_NONE != xIStm->GetError() );
-        sal_uInt64 const nActReadSize = xIStm->Tell();
-        if (nActReadSize != mnSwapInDataSize)
-        {
-            bError = true;
-        }
-        xIStm.reset();
-
-        if( bError )
-            pData.reset();
-    }
+    SvFileStream aFileStream(mpSwapOutData->maURL, StreamMode::READWRITE);
+    pData = o3tl::make_shared_array<sal_uInt8>(mnSwapInDataSize);
+    aFileStream.ReadBytes(pData.get(), mnSwapInDataSize);
+    bool bError = (ERRCODE_NONE != aFileStream.GetError());
+    sal_uInt64 const nActReadSize = aFileStream.Tell();
+    if (nActReadSize != mnSwapInDataSize)
+        bError = true;
+    if (bError)
+        pData.reset();
     return pData;
 }