diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:15:40 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:15:40 +0000 |
| commit | 93355633cddb59412a46d9a7fc9abf689be9e6de (patch) | |
| tree | 86327477dc6415b8c5b138a4da0febf133c2f320 /shell/source/all | |
| parent | 2535d01620f455ede2e6b138448bb3c87c68ccbf (diff) | |
INTEGRATION: CWS warnings01 (1.4.14); FILE MERGED
2006/03/10 15:10:57 pl 1.4.14.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'shell/source/all')
| -rw-r--r-- | shell/source/all/ooofilereader/contentreader.cxx | 14 | ||||
| -rw-r--r-- | shell/source/all/ooofilereader/metainforeader.cxx | 10 |
2 files changed, 16 insertions, 8 deletions
diff --git a/shell/source/all/ooofilereader/contentreader.cxx b/shell/source/all/ooofilereader/contentreader.cxx index e1a9ac632e8f..3aa2eef25797 100644 --- a/shell/source/all/ooofilereader/contentreader.cxx +++ b/shell/source/all/ooofilereader/contentreader.cxx @@ -4,9 +4,9 @@ * * $RCSfile: contentreader.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:43:28 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:15:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -61,7 +61,11 @@ CBaseReader( DocumentName ) m_DefaultLocale = DocumentLocale; Initialize( DOC_CONTENT_NAME ); } - catch(xml_parser_exception& ex) + catch(xml_parser_exception& + #if OSL_DEBUG_LEVEL > 0 + ex + #endif + ) { ENSURE(false, ex.what()); } @@ -190,8 +194,8 @@ void CContentReader::end_element(const std::wstring& /*raw_name*/, const std::ws if ( local_name == CONTENT_STYLE_STYLE ) { - StyleLocalePair_t StyleLocalePair = reinterpret_cast<CAutoStyleTag * >( pTagBuilder)->getStyleLocalePair(); - if ( ( reinterpret_cast<CAutoStyleTag * >( pTagBuilder)->isFull() ) && ( StyleLocalePair.second != m_DefaultLocale ) ) + StyleLocalePair_t StyleLocalePair = static_cast<CAutoStyleTag * >( pTagBuilder)->getStyleLocalePair(); + if ( ( static_cast<CAutoStyleTag * >( pTagBuilder)->isFull() ) && ( StyleLocalePair.second != m_DefaultLocale ) ) m_StyleMap.insert( StyleLocalePair ); } if (( local_name == CONTENT_TEXT_A )||( local_name == CONTENT_TEXT_SPAN ) || diff --git a/shell/source/all/ooofilereader/metainforeader.cxx b/shell/source/all/ooofilereader/metainforeader.cxx index b6e012017a41..a2c66589fdd2 100644 --- a/shell/source/all/ooofilereader/metainforeader.cxx +++ b/shell/source/all/ooofilereader/metainforeader.cxx @@ -4,9 +4,9 @@ * * $RCSfile: metainforeader.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:44:55 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:15:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -80,7 +80,11 @@ CBaseReader( DocumentName ) Initialize( META_CONTENT_NAME ); } - catch(xml_parser_exception& ex) + catch(xml_parser_exception& + #if OSL_DEBUG_LEVEL > 0 + ex + #endif + ) { ENSURE(false, ex.what()); } |