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

Caolán McNamara caolanm at redhat.com
Mon Sep 4 11:32:56 UTC 2017


 filter/source/msfilter/msdffimp.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f2cffa12672175e69924746c341bbfd93dcce509
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 4 12:31:59 2017 +0100

    fix DEBUG_FILTER_MSDFFIMP code
    
    Change-Id: I3463935177166a808c46a5bdffcda02f45f371c5

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index de7d3272329e..6c749473d1f9 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6432,19 +6432,19 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, tool
             {
                 if ( bZCodecCompression )
                 {
-                    xOut->Seek( STREAM_SEEK_TO_END );
-                    pDbgOut->Write( xOut->GetData(), xOut->Tell() );
-                    xOut->Seek( STREAM_SEEK_TO_BEGIN );
+                    xOut->Seek(STREAM_SEEK_TO_END);
+                    pDbgOut->WriteBytes(xOut->GetData(), xOut->Tell());
+                    xOut->Seek(STREAM_SEEK_TO_BEGIN);
                 }
                 else
                 {
                     sal_Int32 nDbgLen = nLength - nSkip;
                     if ( nDbgLen )
                     {
-                        std::unique_ptr<sal_Char[]> xDat(new sal_Char[ nDbgLen ]);
-                        pGrStream->Read( xDat.get(), nDbgLen );
-                        pDbgOut->Write( xDat.get(), nDbgLen );
-                        pGrStream->SeekRel( -nDbgLen );
+                        std::vector<sal_Char> aData(nDbgLen);
+                        pGrStream->ReadBytes(aData.data(), nDbgLen);
+                        pDbgOut->WriteBytes(aData.data(), nDbgLen);
+                        pGrStream->SeekRel(-nDbgLen);
                     }
                 }
             }


More information about the Libreoffice-commits mailing list