diff options
| author | Armin Le Grand <alg@apache.org> | 2014-02-27 13:46:24 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 19:30:40 +0000 |
| commit | af63727b9fdd48258f692d1ccf6d15daccc18681 (patch) | |
| tree | b23adba5c31315383e05ee9bc2310a93fa1e575f /svx | |
| parent | c3bdaca0e6c26775fae7f682732251a8e72cff30 (diff) | |
Resolves: #i15508# Added support for BMP file type
(cherry picked from commit 9956ed1303545cd61901e33b110698c4e5e224c4)
Conflicts:
filter/source/msfilter/escherex.cxx
include/vcl/gfxlink.hxx
svx/source/xml/xmlgrhlp.cxx
sw/source/ui/docvw/romenu.cxx
vcl/source/filter/graphicfilter.cxx
Change-Id: Ibcbb69b9c57cd8a438788e9a9c95744e99b6fcdd
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/core/graphichelper.cxx | 3 | ||||
| -rw-r--r-- | svx/source/dialog/compressgraphicdialog.cxx | 3 | ||||
| -rw-r--r-- | svx/source/gallery2/galtheme.cxx | 5 | ||||
| -rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 2 | ||||
| -rw-r--r-- | svx/source/xoutdev/_xoutbmp.cxx | 4 |
5 files changed, 17 insertions, 0 deletions
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx index 8cec8a55248f..d9141215d3b4 100644 --- a/svx/source/core/graphichelper.cxx +++ b/svx/source/core/graphichelper.cxx @@ -81,6 +81,9 @@ void GraphicHelper::GetPreferredExtension( OUString& rExtension, const Graphic& case GFX_LINK_TYPE_NATIVE_JPG: aExtension = "jpg"; break; + case GFX_LINK_TYPE_NATIVE_BMP: + aExtension = "bmp"; + break; default: break; } diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 28aad0381cbb..987a20c9c46a 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -139,6 +139,9 @@ void CompressGraphicsDialog::Update() case GFX_LINK_TYPE_NATIVE_SVG: aGraphicTypeString = "SVG image"; break; + case GFX_LINK_TYPE_NATIVE_BMP: + aGraphicTypeString = "BMP image"; + break; default: aGraphicTypeString = "Unknown"; break; diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index fdf793a6958e..da6385993fb0 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -861,6 +861,11 @@ sal_Bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInse { case( GFX_LINK_TYPE_EPS_BUFFER ): nExportFormat = CVT_SVM; break; case( GFX_LINK_TYPE_NATIVE_GIF ): nExportFormat = CVT_GIF; break; + + // #i15508# added BMP type + // could not find/trigger a call to this, but should do no harm + case( GFX_LINK_TYPE_NATIVE_BMP ): nExportFormat = CVT_BMP; break; + case( GFX_LINK_TYPE_NATIVE_JPG ): nExportFormat = CVT_JPG; break; case( GFX_LINK_TYPE_NATIVE_PNG ): nExportFormat = CVT_PNG; break; case( GFX_LINK_TYPE_NATIVE_TIF ): nExportFormat = CVT_TIF; break; diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index f5bf9f75d2c1..b90271cbbc14 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -647,6 +647,8 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt { case( GFX_LINK_TYPE_EPS_BUFFER ): aExtension = ".eps"; break; case( GFX_LINK_TYPE_NATIVE_GIF ): aExtension = ".gif"; break; + // #i15508# added BMP type for better exports (checked, works) + case( GFX_LINK_TYPE_NATIVE_BMP ): aExtension = ".bmp"; break; case( GFX_LINK_TYPE_NATIVE_JPG ): aExtension = ".jpg"; break; case( GFX_LINK_TYPE_NATIVE_PNG ): aExtension = ".png"; break; case( GFX_LINK_TYPE_NATIVE_TIF ): aExtension = ".tif"; break; diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 7f6e2fc30c1b..1521c7a60563 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -183,6 +183,10 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileNam switch( aGfxLink.GetType() ) { case( GFX_LINK_TYPE_NATIVE_GIF ): aExt = FORMAT_GIF; break; + + // #i15508# added BMP type for better exports (no call/trigger found, prob used in HTML export) + case( GFX_LINK_TYPE_NATIVE_BMP ): aExt = FORMAT_BMP; break; + case( GFX_LINK_TYPE_NATIVE_JPG ): aExt = FORMAT_JPG; break; case( GFX_LINK_TYPE_NATIVE_PNG ): aExt = FORMAT_PNG; break; |