diff options
| author | Oliver Specht <os@openoffice.org> | 2007-04-23 08:11:31 +0000 |
|---|---|---|
| committer | Oliver Specht <os@openoffice.org> | 2007-04-23 08:11:31 +0000 |
| commit | 1fd2691391cff1ed2fa70e4d7059b203b9159300 (patch) | |
| tree | 6b33f6dc988e950da8f2bdf0967f8775c249ba31 /writerfilter/source/dmapper/GraphicImport.cxx | |
| parent | enabled exceptions (diff) | |
| download | core-1fd2691391cff1ed2fa70e4d7059b203b9159300.tar.gz core-1fd2691391cff1ed2fa70e4d7059b203b9159300.zip | |
unxsols4 warnings/errors fixed
Diffstat (limited to 'writerfilter/source/dmapper/GraphicImport.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index f15916ee97e1..dff06508ef45 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -4,9 +4,9 @@ * * $RCSfile: GraphicImport.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: os $ $Date: 2006-12-13 14:51:20 $ + * last change: $Author: os $ $Date: 2007-04-23 09:11:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -515,7 +515,7 @@ void GraphicImport::attribute(doctok::Id Name, doctok::Value & val) case 0x6E0 : break;// One byte tag then PNG data - case 0x7A8 : m_pImpl->bIsBitmap = true; break; + case 0x7A8 : m_pImpl->bIsBitmap = true; // nSkip += 1; // One byte tag then DIB data break; @@ -636,7 +636,6 @@ void GraphicImport::attribute(doctok::Id Name, doctok::Value & val) case NS_rtf::LN_FFRAME: // ignored /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */ case NS_rtf::LN_UNUSED2_15: break;// ignored - break; // const QName_t LN_shpoptextraoffset = 20028; // const QName_t LN_shptypename = 20029; @@ -1780,7 +1779,7 @@ void GraphicImport::data(const sal_uInt8* buf, size_t len, doctok::Reference<Pro } catch( const uno::Exception& ) { - clog << __FUNCTION__ << " failed!" << endl; + clog << __FILE__ << __LINE__ << " failed!" << endl; } } |