Kaydet (Commit) 7cc6de1c authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Markus Mohrhard

remove whitespace

Change-Id: Id8014a1165876e903a7a4311af43d4a946703f11
üst 74116032
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <comphelper/docpasswordhelper.hxx> #include <comphelper/docpasswordhelper.hxx>
#include <comphelper/sequenceashashmap.hxx> #include <comphelper/sequenceashashmap.hxx>
#include <osl/thread.h> #include <osl/thread.h>
...@@ -27,13 +26,9 @@ ...@@ -27,13 +26,9 @@
#include <vector> #include <vector>
using namespace ::com::sun::star; using namespace ::com::sun::star;
// Decryption // Decryption
XclImpDecrypter::XclImpDecrypter() : XclImpDecrypter::XclImpDecrypter() :
mnError( EXC_ENCR_ERROR_UNSUPP_CRYPT ), mnError( EXC_ENCR_ERROR_UNSUPP_CRYPT ),
mnOldPos( STREAM_SEEK_TO_END ), mnOldPos( STREAM_SEEK_TO_END ),
...@@ -106,8 +101,6 @@ sal_uInt16 XclImpDecrypter::Read( SvStream& rStrm, void* pData, sal_uInt16 nByte ...@@ -106,8 +101,6 @@ sal_uInt16 XclImpDecrypter::Read( SvStream& rStrm, void* pData, sal_uInt16 nByte
return nRet; return nRet;
} }
XclImpBiff5Decrypter::XclImpBiff5Decrypter( sal_uInt16 nKey, sal_uInt16 nHash ) : XclImpBiff5Decrypter::XclImpBiff5Decrypter( sal_uInt16 nKey, sal_uInt16 nHash ) :
mnKey( nKey ), mnKey( nKey ),
mnHash( nHash ) mnHash( nHash )
...@@ -197,8 +190,6 @@ sal_uInt16 XclImpBiff5Decrypter::OnRead( SvStream& rStrm, sal_uInt8* pnData, sal ...@@ -197,8 +190,6 @@ sal_uInt16 XclImpBiff5Decrypter::OnRead( SvStream& rStrm, sal_uInt8* pnData, sal
return nRet; return nRet;
} }
XclImpBiff8Decrypter::XclImpBiff8Decrypter( sal_uInt8 pnSalt[ 16 ], XclImpBiff8Decrypter::XclImpBiff8Decrypter( sal_uInt8 pnSalt[ 16 ],
sal_uInt8 pnVerifier[ 16 ], sal_uInt8 pnVerifierHash[ 16 ] ) : sal_uInt8 pnVerifier[ 16 ], sal_uInt8 pnVerifierHash[ 16 ] ) :
maSalt( pnSalt, pnSalt + 16 ), maSalt( pnSalt, pnSalt + 16 ),
...@@ -321,10 +312,7 @@ sal_uInt16 XclImpBiff8Decrypter::GetOffset( sal_Size nStrmPos ) const ...@@ -321,10 +312,7 @@ sal_uInt16 XclImpBiff8Decrypter::GetOffset( sal_Size nStrmPos ) const
return static_cast< sal_uInt16 >( nStrmPos % EXC_ENCR_BLOCKSIZE ); return static_cast< sal_uInt16 >( nStrmPos % EXC_ENCR_BLOCKSIZE );
} }
// Stream // Stream
XclImpStreamPos::XclImpStreamPos() : XclImpStreamPos::XclImpStreamPos() :
mnPos( STREAM_SEEK_TO_BEGIN ), mnPos( STREAM_SEEK_TO_BEGIN ),
mnNextPos( STREAM_SEEK_TO_BEGIN ), mnNextPos( STREAM_SEEK_TO_BEGIN ),
...@@ -364,8 +352,6 @@ void XclImpStreamPos::Get( ...@@ -364,8 +352,6 @@ void XclImpStreamPos::Get(
rbValid = mbValid; rbValid = mbValid;
} }
XclBiff XclImpStream::DetectBiffVersion( SvStream& rStrm ) XclBiff XclImpStream::DetectBiffVersion( SvStream& rStrm )
{ {
XclBiff eBiff = EXC_BIFF_UNKNOWN; XclBiff eBiff = EXC_BIFF_UNKNOWN;
...@@ -512,8 +498,6 @@ void XclImpStream::EnableDecryption( bool bEnable ) ...@@ -512,8 +498,6 @@ void XclImpStream::EnableDecryption( bool bEnable )
mbUseDecr = bEnable && HasValidDecrypter(); mbUseDecr = bEnable && HasValidDecrypter();
} }
void XclImpStream::PushPosition() void XclImpStream::PushPosition()
{ {
maPosStack.push_back( XclImpStreamPos() ); maPosStack.push_back( XclImpStreamPos() );
...@@ -604,8 +588,6 @@ sal_uInt16 XclImpStream::PeekRecId( sal_Size nPos ) ...@@ -604,8 +588,6 @@ sal_uInt16 XclImpStream::PeekRecId( sal_Size nPos )
return nRecId; return nRecId;
} }
XclImpStream& XclImpStream::operator>>( sal_Int8& rnValue ) XclImpStream& XclImpStream::operator>>( sal_Int8& rnValue )
{ {
if( EnsureRawReadSize( 1 ) ) if( EnsureRawReadSize( 1 ) )
...@@ -872,8 +854,6 @@ void XclImpStream::Ignore( sal_Size nBytes ) ...@@ -872,8 +854,6 @@ void XclImpStream::Ignore( sal_Size nBytes )
} }
} }
sal_Size XclImpStream::ReadUniStringExtHeader( sal_Size XclImpStream::ReadUniStringExtHeader(
bool& rb16Bit, bool& rbRich, bool& rbFareast, bool& rb16Bit, bool& rbRich, bool& rbFareast,
sal_uInt16& rnFormatRuns, sal_uInt32& rnExtInf, sal_uInt8 nFlags ) sal_uInt16& rnFormatRuns, sal_uInt32& rnExtInf, sal_uInt8 nFlags )
...@@ -895,8 +875,6 @@ sal_Size XclImpStream::ReadUniStringExtHeader( bool& rb16Bit, sal_uInt8 nFlags ) ...@@ -895,8 +875,6 @@ sal_Size XclImpStream::ReadUniStringExtHeader( bool& rb16Bit, sal_uInt8 nFlags )
return ReadUniStringExtHeader( rb16Bit, bRich, bFareast, nCrun, nExtInf, nFlags ); return ReadUniStringExtHeader( rb16Bit, bRich, bFareast, nCrun, nExtInf, nFlags );
} }
OUString XclImpStream::ReadRawUniString( sal_uInt16 nChars, bool b16Bit ) OUString XclImpStream::ReadRawUniString( sal_uInt16 nChars, bool b16Bit )
{ {
OUString aRet; OUString aRet;
...@@ -1008,8 +986,6 @@ void XclImpStream::IgnoreUniString( sal_uInt16 nChars ) ...@@ -1008,8 +986,6 @@ void XclImpStream::IgnoreUniString( sal_uInt16 nChars )
IgnoreUniString( nChars, ReaduInt8() ); IgnoreUniString( nChars, ReaduInt8() );
} }
OUString XclImpStream::ReadRawByteString( sal_uInt16 nChars ) OUString XclImpStream::ReadRawByteString( sal_uInt16 nChars )
{ {
sal_Char* pcBuffer = new sal_Char[ nChars + 1 ]; sal_Char* pcBuffer = new sal_Char[ nChars + 1 ];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment