diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 08:10:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 08:10:15 +0000 |
| commit | a317fa729897bde02fc6e891f9f4f98cfbabc456 (patch) | |
| tree | b7da646f667e91caebd04d191a5d2a41599ac30b /sw/source/core/swg | |
| parent | 6d611417c7adb44b308cd6d9bb16b301921c26da (diff) | |
INTEGRATION: CWS swwarnings (1.14.222); FILE MERGED
2007/06/28 11:51:22 os 1.14.222.3: RESYNC: (1.14-1.15); FILE MERGED
2007/04/11 07:02:53 tl 1.14.222.2: #i69287# warning-free code
2007/03/09 10:57:01 ama 1.14.222.1: #i69287#: warning free code
Diffstat (limited to 'sw/source/core/swg')
| -rw-r--r-- | sw/source/core/swg/SwXMLTextBlocks1.cxx | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx index 2136b08cce..ef42f3ae3a 100644 --- a/sw/source/core/swg/SwXMLTextBlocks1.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx @@ -4,9 +4,9 @@ * * $RCSfile: SwXMLTextBlocks1.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: ihi $ $Date: 2007-06-05 17:31:16 $ + * last change: $Author: hr $ $Date: 2007-09-27 09:10:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -106,6 +106,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; using namespace ::rtl; + using ::xmloff::token::XML_BLOCK_LIST; using ::xmloff::token::XML_UNFORMATTED_TEXT; using ::xmloff::token::GetXMLToken; @@ -233,7 +234,8 @@ ULONG SwXMLTextBlocks::GetMacroTable( USHORT nIdx, try { xRoot = xBlkRoot->openStorageElement( aPackageName, embed::ElementModes::READ ); - sal_Bool bOasis = ( SotStorage::GetVersion( xRoot ) > SOT_FORMATSTR_ID_STARWRITER_60 ); + long nTmp = SOT_FORMATSTR_ID_STARWRITER_60; + sal_Bool bOasis = ( SotStorage::GetVersion( xRoot ) > nTmp ); OUString sStreamName = OUString::createFromAscii("atevent.xml"); uno::Reference < io::XStream > xDocStream = xRoot->openStreamElement( @@ -423,10 +425,10 @@ ULONG SwXMLTextBlocks::GetBlockText( const String& rShort, String& rText ) return n; } -ULONG SwXMLTextBlocks::PutBlockText( const String& rShort, const String& rName, +ULONG SwXMLTextBlocks::PutBlockText( const String& rShort, const String& , const String& rText, const String& rPackageName ) { - USHORT nIndex = GetIndex ( rShort ); + GetIndex ( rShort ); /* if (xBlkRoot->IsContained ( rPackageName ) ) { @@ -482,9 +484,9 @@ ULONG SwXMLTextBlocks::PutBlockText( const String& rShort, const String& rName, if (! (nFlags & SWXML_NOROOTCOMMIT) ) { - uno::Reference < embed::XTransactedObject > xTrans( xBlkRoot, uno::UNO_QUERY ); - if ( xTrans.is() ) - xTrans->commit(); + uno::Reference < embed::XTransactedObject > xTmpTrans( xBlkRoot, uno::UNO_QUERY ); + if ( xTmpTrans.is() ) + xTmpTrans->commit(); } } catch ( uno::Exception& ) @@ -676,8 +678,8 @@ ULONG SwXMLTextBlocks::SetMacroTable( { xRoot = xBlkRoot->openStorageElement( aPackageName, embed::ElementModes::WRITE ); OUString sStreamName( RTL_CONSTASCII_USTRINGPARAM("atevent.xml") ); - - sal_Bool bOasis = ( SotStorage::GetVersion( xRoot ) > SOT_FORMATSTR_ID_STARWRITER_60 ); + long nTmp = SOT_FORMATSTR_ID_STARWRITER_60; + sal_Bool bOasis = ( SotStorage::GetVersion( xRoot ) > nTmp ); uno::Reference < io::XStream > xDocStream = xRoot->openStreamElement( sStreamName, embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE ); @@ -741,9 +743,9 @@ ULONG SwXMLTextBlocks::SetMacroTable( nRes = ERR_SWG_WRITE_ERROR; // finally, commit stream, sub-storage and storage - uno::Reference < embed::XTransactedObject > xTrans( xRoot, uno::UNO_QUERY ); - if ( xTrans.is() ) - xTrans->commit(); + uno::Reference < embed::XTransactedObject > xTmpTrans( xRoot, uno::UNO_QUERY ); + if ( xTmpTrans.is() ) + xTmpTrans->commit(); if ( !bFileAlreadyOpen ) { |