strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS dba14 (1.34.32); FILE MERGED

Browse source 
2004/07/16 07:24:30 fs 1.34.32.2: #i31536# moved ControlGraphicsHelper to svtools, renamed to ImageResourceAccess
2004/07/15 15:08:12 fs 1.34.32.1: #i31536# allow displaying images specified by resource URLs, using the css.graphic.GraphicsProvider
This commit is contained in:
Rüdiger Timm 2004-07-23 09:45:21 +00:00
parent 20f26b55b9
commit ac79c51716
1 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
forms/source/component/ImageControl.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: ImageControl.cxx,v $
*
* $Revision: 1.34 $
* $Revision: 1.35 $
*
* last change: $Author: hr $ $Date: 2004-05-10 12:46:08 $
* last change: $Author: rt $ $Date: 2004-07-23 10:45:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -75,6 +75,9 @@
#ifndef _FRM_SERVICES_HXX_
#include "services.hxx"
#endif
#ifndef SVTOOLS_INC_IMAGERESOURCEACCESS_HXX
#include <svtools/imageresourceaccess.hxx>
#endif
#ifndef _UNTOOLS_UCBLOCKBYTES_HXX
#include <unotools/ucblockbytes.hxx>
#endif
@ -142,6 +145,8 @@
#include <unotools/ucbstreamhelper.hxx>
#endif
#include <memory>
#define ID_OPEN_GRAPHICS 1
#define ID_CLEAR_GRAPHICS 2
@ -437,22 +442,35 @@ sal_Bool OImageControlModel::handleNewImageURL( const ::rtl::OUString& _rURL )
if ( !xSink.is() )
return sal_False;
SvStream* pFileStream = ::utl::UcbStreamHelper::CreateStream( _rURL, STREAM_READ );
sal_Bool bSetNull = (NULL == pFileStream) || (ERRCODE_NONE != pFileStream->GetErrorCode());
// create a stream for the image specified by the URL
::std::auto_ptr< SvStream > pImageStream;
Reference< XInputStream > xImageStream;
if (!bSetNull)
if ( ::svt::ImageResourceAccess::isImageResourceURL( _rURL ) )
{
// get the size of the stream
pFileStream->Seek(STREAM_SEEK_TO_END);
sal_Int32 nSize = (sal_Int32)pFileStream->Tell();
if (pFileStream->GetBufferSize() < 8192)
pFileStream->SetBufferSize(8192);
pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
xImageStream = ::svt::ImageResourceAccess::getImageXStream( getORB(), _rURL );
}
else
{
pImageStream.reset( ::utl::UcbStreamHelper::CreateStream( _rURL, STREAM_READ ) );
sal_Bool bSetNull = ( pImageStream.get() == NULL ) || ( ERRCODE_NONE != pImageStream->GetErrorCode() );
Reference<XInputStream> xInput
(new ::utl::OInputStreamHelper(new SvLockBytes(pFileStream, sal_True),
nSize));
xSink->setInputStream( xInput );
if (!bSetNull)
{
// get the size of the stream
pImageStream->Seek(STREAM_SEEK_TO_END);
sal_Int32 nSize = (sal_Int32)pImageStream->Tell();
if (pImageStream->GetBufferSize() < 8192)
pImageStream->SetBufferSize(8192);
pImageStream->Seek(STREAM_SEEK_TO_BEGIN);
xImageStream = new ::utl::OInputStreamHelper( new SvLockBytes( pImageStream.get(), sal_True ), nSize );
}
}
if ( xImageStream.is() )
{
xSink->setInputStream( xImageStream );
Reference< XInputStream > xInStream(xSink, UNO_QUERY);
if ( m_xColumnUpdate.is() )
@ -475,8 +493,6 @@ sal_Bool OImageControlModel::handleNewImageURL( const ::rtl::OUString& _rURL )
updateColumnWithStream( NULL );
else
setControlValue( Any() );
delete pFileStream;
}
return sal_True;