Kaydet (Commit) 5154135e authored tarafından Caolán McNamara's avatar Caolán McNamara

fix ppt embedded graphic dumper

üst c32b9cd2
...@@ -142,6 +142,7 @@ ...@@ -142,6 +142,7 @@
#include <com/sun/star/drawing/ProjectionMode.hpp> #include <com/sun/star/drawing/ProjectionMode.hpp>
#include "svx/EnhancedCustomShape2d.hxx" #include "svx/EnhancedCustomShape2d.hxx"
#include <rtl/strbuf.hxx> #include <rtl/strbuf.hxx>
#include <rtl/oustringostreaminserter.hxx>
#include <boost/scoped_array.hpp> #include <boost/scoped_array.hpp>
using namespace ::com::sun::star ; using namespace ::com::sun::star ;
...@@ -6713,10 +6714,10 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, ...@@ -6713,10 +6714,10 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData,
#if OSL_DEBUG_LEVEL > 2 #if OSL_DEBUG_LEVEL > 2
// extract graphics from ole storage into "dbggfxNNN.*" // extract graphics from ole storage into "dbggfxNNN.*"
static sal_Int32 nCount; static sal_Int32 nGrfCount;
String aFileName( String( RTL_CONSTASCII_STRINGPARAM( "dbggfx" ) ) ); String aFileName( String( RTL_CONSTASCII_USTRINGPARAM( "dbggfx" ) ) );
aFileName.Append( String::CreateFromInt32( nCount++ ) ); aFileName.Append( String::CreateFromInt32( nGrfCount++ ) );
switch( nInst &~ 1 ) switch( nInst &~ 1 )
{ {
case 0x216 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".wmf" ) ) ); break; case 0x216 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".wmf" ) ) ); break;
...@@ -6736,7 +6737,11 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, ...@@ -6736,7 +6737,11 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData,
aURL.removeFinalSlash(); aURL.removeFinalSlash();
aURL.Append( aFileName ); aURL.Append( aFileName );
SvStream* pDbgOut = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_TRUNC | STREAM_WRITE ); aURLStr = aURL.GetMainURL( INetURLObject::NO_DECODE );
SAL_INFO("filter.ms", "dumping " << aURLStr);
SvStream* pDbgOut = ::utl::UcbStreamHelper::CreateStream(aURLStr, STREAM_TRUNC | STREAM_WRITE);
if( pDbgOut ) if( pDbgOut )
{ {
...@@ -7310,9 +7315,9 @@ com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > SvxMS ...@@ -7310,9 +7315,9 @@ com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > SvxMS
#if OSL_DEBUG_LEVEL > 2 #if OSL_DEBUG_LEVEL > 2
// extract embedded ole streams into "/tmp/embedded_stream_NNN" // extract embedded ole streams into "/tmp/embedded_stream_NNN"
static sal_Int32 nCount(0); static sal_Int32 nOleCount(0);
String aTmpName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("/tmp/embedded_stream_"))); String aTmpName(RTL_CONSTASCII_USTRINGPARAM("/tmp/embedded_stream_"));
aTmpName += String::CreateFromInt32(nCount++); aTmpName += String::CreateFromInt32(nOleCount++);
aTmpName += String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(".bin")); aTmpName += String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(".bin"));
SvFileStream aTmpStream(aTmpName,STREAM_READ|STREAM_WRITE|STREAM_TRUNC); SvFileStream aTmpStream(aTmpName,STREAM_READ|STREAM_WRITE|STREAM_TRUNC);
pStream->Seek(0); pStream->Seek(0);
......
...@@ -17,6 +17,10 @@ certain functionality. ...@@ -17,6 +17,10 @@ certain functionality.
@li sc.ui - Calc's UI @li sc.ui - Calc's UI
@section Filter
@li filter.ms - escher export/import support
@section oox @section oox
@li oox.xmlstream - XmlStream class @li oox.xmlstream - XmlStream class
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment