diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/fileobj.cxx | 13 | ||||
| -rw-r--r-- | sfx2/source/appl/linkmgr2.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/doc/docinf.cxx | 6 |
4 files changed, 16 insertions, 9 deletions
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 1083a85956a4..b99ef48cdf75 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/wrkwin.hxx> #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> @@ -41,6 +40,7 @@ #include "sfx2/sfxresid.hxx" #include "fileobj.hxx" #include "app.hrc" +#include <vcl/dibtools.hxx> #define FILETYPE_TEXT 1 #define FILETYPE_GRF 2 @@ -170,9 +170,16 @@ sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData, break; case FORMAT_BITMAP: - if( !aGrf.GetBitmap().IsEmpty()) - aMemStm << aGrf.GetBitmap(); + { + const Bitmap aBitmap(aGrf.GetBitmap()); + + if(!aBitmap.IsEmpty()) + { + WriteDIB(aBitmap, aMemStm, false, true); + } + break; + } default: if( aGrf.GetGDIMetaFile().GetActionSize() ) diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 6c0219b38a6b..7dcccadc2e85 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -36,6 +36,7 @@ #include <unotools/localfilehelper.hxx> #include <i18nlangtag/languagetag.hxx> #include <sfx2/request.hxx> +#include <vcl/dibtools.hxx> #include "fileobj.hxx" #include "impldde.hxx" @@ -570,7 +571,7 @@ sal_Bool LinkManager::GetGraphicFromAny( const String& rMimeType, case FORMAT_BITMAP: { Bitmap aBmp; - aMemStm >> aBmp; + ReadDIB(aBmp, aMemStm, true); rGrf = aBmp; bRet = sal_True; } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index a927cfe35e74..d11cdf920aab 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -67,6 +67,7 @@ #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> +#include <vcl/dibtools.hxx> #include <vcl/graphicfilter.hxx> #include <unotools/viewoptions.hxx> #include <unotools/moduleoptions.hxx> @@ -742,7 +743,7 @@ IMPL_LINK_NOARG(FileDialogHelper_Impl, TimeOutHdl_Impl) // and copy it into the Any SvMemoryStream aData; - aData << aBmp; + WriteDIB(aBmp, aData, false, true); const Sequence < sal_Int8 > aBuffer( static_cast< const sal_Int8* >(aData.GetData()), diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx index 5dbb9dd97f29..172cfb7eeeaf 100644 --- a/sfx2/source/doc/docinf.cxx +++ b/sfx2/source/doc/docinf.cxx @@ -19,20 +19,18 @@ #include <sfx2/docinf.hxx> - #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyContainer.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XCompatWriterDocProperties.hpp> #include <com/sun/star/uno/Exception.hpp> - #include <rtl/ustring.hxx> #include <tools/debug.hxx> #include <comphelper/string.hxx> #include <sot/storage.hxx> #include <vcl/gdimtf.hxx> - +#include <vcl/dibtools.hxx> #include "oleprops.hxx" // ============================================================================ @@ -310,7 +308,7 @@ uno::Sequence<sal_uInt8> SFX2_DLLPUBLIC convertMetaFile(GDIMetaFile* i_pThumb) SvMemoryStream aStream; // magic value 160 taken from GraphicHelper::getThumbnailFormatFromGDI_Impl() if( i_pThumb->CreateThumbnail( 160, aBitmap ) ) { - aBitmap.GetBitmap().Write( aStream, sal_False, sal_False ); + WriteDIB(aBitmap.GetBitmap(), aStream, false, false); aStream.Seek(STREAM_SEEK_TO_END); uno::Sequence<sal_uInt8> aSeq(aStream.Tell()); const sal_uInt8* pBlob( |