diff options
Diffstat (limited to 'svx/source/xml/xmlgrhlp.cxx')
| -rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 7f43bc2df269..bda709dc4abd 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xmlgrhlp.cxx,v $ - * $Revision: 1.34 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -49,7 +46,7 @@ #include <vcl/metaact.hxx> #include <tools/zcodec.hxx> -#include "svx/impgrf.hxx" +#include "svtools/filter.hxx" #include "xmlgrhlp.hxx" #include <algorithm> @@ -142,7 +139,7 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const ::rtl::OUString& rGraphi { if( aGraphic.GetType() == GRAPHIC_BITMAP ) { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); String aFormat; if( aGraphic.IsAnimated() ) @@ -334,7 +331,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() mpOStm->Seek( 0 ); USHORT nFormat = GRFILTER_FORMAT_DONTKNOW; USHORT pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW; - GetGrfFilter()->ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat ); + GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat ); if (pDeterminedFormat == GRFILTER_FORMAT_DONTKNOW) { @@ -377,7 +374,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() if (nStreamLen_) { pDest->Seek(0L); - GetGrfFilter()->ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat ); + GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat ); } } delete pDest; @@ -573,7 +570,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStor if( aStream.xStream.is() ) { SvStream* pStream = utl::UcbStreamHelper::CreateStream( aStream.xStream ); - GetGrfFilter()->ImportGraphic( aGraphic, String(), *pStream ); + GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pStream ); delete pStream; } @@ -619,7 +616,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt { if( aGraphic.GetType() == GRAPHIC_BITMAP ) { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); String aFormat; if( aGraphic.IsAnimated() ) |