diff options
| author | Kurt Zenker <kz@openoffice.org> | 2010-01-15 15:13:13 +0100 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2010-01-15 15:13:13 +0100 |
| commit | 4eeae16d41ddb88df9b4aec1fe2ea975b8ef5ec7 (patch) | |
| tree | 339ecc4b1d536382f0c14c1ac50646abd290d91b /svtools | |
| parent | 760c83ecf2cb3f998364e37c56d5c72d99699b46 (diff) | |
| parent | b7362dfa446a3876529d7223306675f3b7d371c8 (diff) | |
CWS-TOOLING: integrate CWS fwk120
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/svtools/imapobj.hxx | 2 | ||||
| -rw-r--r-- | svtools/source/filter.vcl/filter/filter2.cxx | 3 | ||||
| -rw-r--r-- | svtools/source/misc/imap.cxx | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/svtools/inc/svtools/imapobj.hxx b/svtools/inc/svtools/imapobj.hxx index b8da0e5c3ee8..46b73ee95f2c 100644 --- a/svtools/inc/svtools/imapobj.hxx +++ b/svtools/inc/svtools/imapobj.hxx @@ -96,7 +96,7 @@ public: static rtl_TextEncoding nActualTextEncoding; - IMapObject() {}; + IMapObject(); IMapObject( const String& rURL, const String& rAltText, const String& rDesc, diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter.vcl/filter/filter2.cxx index d570dd34e50f..9e0e3ba43d54 100644 --- a/svtools/source/filter.vcl/filter/filter2.cxx +++ b/svtools/source/filter.vcl/filter/filter2.cxx @@ -471,7 +471,8 @@ BOOL GraphicDescriptor::ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo ) // Groesse des verbleibenden Puffers ermitteln if ( bLinked ) - nMax = ( (SvMemoryStream&) rStm ).GetSize() - 16; + nMax = static_cast< SvMemoryStream& >(rStm).GetEndOfData() + - 16; else nMax = DATA_SIZE - 16; diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index df7760f7931b..b0aaee113c20 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -64,6 +64,12 @@ UINT16 IMapObject::nActualTextEncoding = (UINT16) RTL_TEXTENCODING_DONTKNOW; #pragma optimize ( "", off ) #endif +IMapObject::IMapObject() + : bActive( false ) + , nReadVersion( 0 ) +{ +} + IMapObject::IMapObject( const String& rURL, const String& rAltText, const String& rDesc, const String& rTarget, const String& rName, BOOL bURLActive ) : aURL( rURL ) @@ -72,6 +78,7 @@ IMapObject::IMapObject( const String& rURL, const String& rAltText, const String , aTarget( rTarget ) , aName( rName ) , bActive( bURLActive ) +, nReadVersion( 0 ) { } |