Kaydet (Commit) 7585b27d authored tarafından Caolán McNamara's avatar Caolán McNamara

WaE: throw out some warnings

üst 933e529f
...@@ -210,7 +210,6 @@ void CGMImpressOutAct::ImplSetFillBundle() ...@@ -210,7 +210,6 @@ void CGMImpressOutAct::ImplSetFillBundle()
sal_uInt32 nFillColor; sal_uInt32 nFillColor;
FillInteriorStyle eFillStyle; FillInteriorStyle eFillStyle;
long nPatternIndex;
sal_uInt32 nHatchIndex; sal_uInt32 nHatchIndex;
if ( mpCGM->pElement->eEdgeVisibility == EV_ON ) if ( mpCGM->pElement->eEdgeVisibility == EV_ON )
...@@ -243,10 +242,6 @@ void CGMImpressOutAct::ImplSetFillBundle() ...@@ -243,10 +242,6 @@ void CGMImpressOutAct::ImplSetFillBundle()
nHatchIndex = (sal_uInt32)mpCGM->pElement->pFillBundle->nFillHatchIndex; nHatchIndex = (sal_uInt32)mpCGM->pElement->pFillBundle->nFillHatchIndex;
else else
nHatchIndex = (sal_uInt32)mpCGM->pElement->aFillBundle.nFillHatchIndex; nHatchIndex = (sal_uInt32)mpCGM->pElement->aFillBundle.nFillHatchIndex;
if ( mpCGM->pElement->nAspectSourceFlags & ASF_PATTERNINDEX )
nPatternIndex = mpCGM->pElement->pFillBundle->nFillPatternIndex;
else
nPatternIndex = mpCGM->pElement->aFillBundle.nFillPatternIndex;
aAny <<= (sal_Int32)nFillColor; aAny <<= (sal_Int32)nFillColor;
maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" )), aAny ); maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" )), aAny );
...@@ -384,28 +379,13 @@ void CGMImpressOutAct::ImplSetFillBundle() ...@@ -384,28 +379,13 @@ void CGMImpressOutAct::ImplSetFillBundle()
void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XPropertySet > & rProperty ) void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XPropertySet > & rProperty )
{ {
uno::Any aAny; uno::Any aAny;
TextPrecision eTextPrecision;
sal_uInt32 nTextFontIndex; sal_uInt32 nTextFontIndex;
sal_uInt32 nTextColor; sal_uInt32 nTextColor;
double fCharacterExpansion;
double fCharacterSpacing;
if ( mpCGM->pElement->nAspectSourceFlags & ASF_TEXTFONTINDEX ) if ( mpCGM->pElement->nAspectSourceFlags & ASF_TEXTFONTINDEX )
nTextFontIndex = mpCGM->pElement->pTextBundle->nTextFontIndex; nTextFontIndex = mpCGM->pElement->pTextBundle->nTextFontIndex;
else else
nTextFontIndex = mpCGM->pElement->aTextBundle.nTextFontIndex; nTextFontIndex = mpCGM->pElement->aTextBundle.nTextFontIndex;
if ( mpCGM->pElement->nAspectSourceFlags & ASF_TEXTPRECISION )
eTextPrecision = mpCGM->pElement->pTextBundle->eTextPrecision;
else
eTextPrecision = mpCGM->pElement->aTextBundle.eTextPrecision;
if ( mpCGM->pElement->nAspectSourceFlags & ASF_CHARACTEREXPANSION )
fCharacterExpansion = mpCGM->pElement->pTextBundle->nCharacterExpansion;
else
fCharacterExpansion = mpCGM->pElement->aTextBundle.nCharacterExpansion;
if ( mpCGM->pElement->nAspectSourceFlags & ASF_CHARACTERSPACING )
fCharacterSpacing = mpCGM->pElement->pTextBundle->nCharacterSpacing;
else
fCharacterSpacing = mpCGM->pElement->aTextBundle.nCharacterSpacing;
if ( mpCGM->pElement->nAspectSourceFlags & ASF_TEXTCOLOR ) if ( mpCGM->pElement->nAspectSourceFlags & ASF_TEXTCOLOR )
nTextColor = mpCGM->pElement->pTextBundle->GetColor(); nTextColor = mpCGM->pElement->pTextBundle->GetColor();
else else
......
...@@ -346,9 +346,9 @@ void lclDeriveKey( const sal_uInt8* pnHash, sal_uInt32 nHashLen, sal_uInt8* pnKe ...@@ -346,9 +346,9 @@ void lclDeriveKey( const sal_uInt8* pnHash, sal_uInt32 nHashLen, sal_uInt8* pnKe
pnBuffer[ i ] ^= pnHash[ i ]; pnBuffer[ i ] ^= pnHash[ i ];
rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 ); rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
rtlDigestError aError = rtl_digest_update( aDigest, pnBuffer, sizeof( pnBuffer ) ); rtl_digest_update( aDigest, pnBuffer, sizeof( pnBuffer ) );
sal_uInt8 pnX1[ RTL_DIGEST_LENGTH_SHA1 ]; sal_uInt8 pnX1[ RTL_DIGEST_LENGTH_SHA1 ];
aError = rtl_digest_get( aDigest, pnX1, RTL_DIGEST_LENGTH_SHA1 ); rtl_digest_get( aDigest, pnX1, RTL_DIGEST_LENGTH_SHA1 );
rtl_digest_destroy( aDigest ); rtl_digest_destroy( aDigest );
memset( pnBuffer, 0x5C, sizeof( pnBuffer ) ); memset( pnBuffer, 0x5C, sizeof( pnBuffer ) );
...@@ -356,9 +356,9 @@ void lclDeriveKey( const sal_uInt8* pnHash, sal_uInt32 nHashLen, sal_uInt8* pnKe ...@@ -356,9 +356,9 @@ void lclDeriveKey( const sal_uInt8* pnHash, sal_uInt32 nHashLen, sal_uInt8* pnKe
pnBuffer[ i ] ^= pnHash[ i ]; pnBuffer[ i ] ^= pnHash[ i ];
aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 ); aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
aError = rtl_digest_update( aDigest, pnBuffer, sizeof( pnBuffer ) ); rtl_digest_update( aDigest, pnBuffer, sizeof( pnBuffer ) );
sal_uInt8 pnX2[ RTL_DIGEST_LENGTH_SHA1 ]; sal_uInt8 pnX2[ RTL_DIGEST_LENGTH_SHA1 ];
aError = rtl_digest_get( aDigest, pnX2, RTL_DIGEST_LENGTH_SHA1 ); rtl_digest_get( aDigest, pnX2, RTL_DIGEST_LENGTH_SHA1 );
rtl_digest_destroy( aDigest ); rtl_digest_destroy( aDigest );
if( nRequiredKeyLen > RTL_DIGEST_LENGTH_SHA1 ) if( nRequiredKeyLen > RTL_DIGEST_LENGTH_SHA1 )
...@@ -383,28 +383,28 @@ bool lclGenerateEncryptionKey( const PackageEncryptionInfo& rEncrInfo, const OUS ...@@ -383,28 +383,28 @@ bool lclGenerateEncryptionKey( const PackageEncryptionInfo& rEncrInfo, const OUS
ByteOrderConverter::writeLittleEndian( pnPasswordLoc, static_cast< sal_uInt16 >( *pStr ) ); ByteOrderConverter::writeLittleEndian( pnPasswordLoc, static_cast< sal_uInt16 >( *pStr ) );
rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 ); rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
rtlDigestError aError = rtl_digest_update( aDigest, pnBuffer, nBufferSize ); rtl_digest_update( aDigest, pnBuffer, nBufferSize );
delete[] pnBuffer; delete[] pnBuffer;
size_t nHashSize = RTL_DIGEST_LENGTH_SHA1 + 4; size_t nHashSize = RTL_DIGEST_LENGTH_SHA1 + 4;
sal_uInt8* pnHash = new sal_uInt8[ nHashSize ]; sal_uInt8* pnHash = new sal_uInt8[ nHashSize ];
aError = rtl_digest_get( aDigest, pnHash + 4, RTL_DIGEST_LENGTH_SHA1 ); rtl_digest_get( aDigest, pnHash + 4, RTL_DIGEST_LENGTH_SHA1 );
rtl_digest_destroy( aDigest ); rtl_digest_destroy( aDigest );
for( sal_uInt32 i = 0; i < 50000; ++i ) for( sal_uInt32 i = 0; i < 50000; ++i )
{ {
ByteOrderConverter::writeLittleEndian( pnHash, i ); ByteOrderConverter::writeLittleEndian( pnHash, i );
aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 ); aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
aError = rtl_digest_update( aDigest, pnHash, nHashSize ); rtl_digest_update( aDigest, pnHash, nHashSize );
aError = rtl_digest_get( aDigest, pnHash + 4, RTL_DIGEST_LENGTH_SHA1 ); rtl_digest_get( aDigest, pnHash + 4, RTL_DIGEST_LENGTH_SHA1 );
rtl_digest_destroy( aDigest ); rtl_digest_destroy( aDigest );
} }
memmove( pnHash, pnHash + 4, RTL_DIGEST_LENGTH_SHA1 ); memmove( pnHash, pnHash + 4, RTL_DIGEST_LENGTH_SHA1 );
memset( pnHash + RTL_DIGEST_LENGTH_SHA1, 0, 4 ); memset( pnHash + RTL_DIGEST_LENGTH_SHA1, 0, 4 );
aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 ); aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
aError = rtl_digest_update( aDigest, pnHash, nHashSize ); rtl_digest_update( aDigest, pnHash, nHashSize );
aError = rtl_digest_get( aDigest, pnHash, RTL_DIGEST_LENGTH_SHA1 ); rtl_digest_get( aDigest, pnHash, RTL_DIGEST_LENGTH_SHA1 );
rtl_digest_destroy( aDigest ); rtl_digest_destroy( aDigest );
lclDeriveKey( pnHash, RTL_DIGEST_LENGTH_SHA1, pnKey, nRequiredKeyLen ); lclDeriveKey( pnHash, RTL_DIGEST_LENGTH_SHA1, pnKey, nRequiredKeyLen );
...@@ -428,9 +428,9 @@ bool lclGenerateEncryptionKey( const PackageEncryptionInfo& rEncrInfo, const OUS ...@@ -428,9 +428,9 @@ bool lclGenerateEncryptionKey( const PackageEncryptionInfo& rEncrInfo, const OUS
EVP_CIPHER_CTX_cleanup( &aes_ctx ); EVP_CIPHER_CTX_cleanup( &aes_ctx );
aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 ); aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
aError = rtl_digest_update( aDigest, pnVerifier, sizeof( pnVerifier ) ); rtl_digest_update( aDigest, pnVerifier, sizeof( pnVerifier ) );
sal_uInt8 pnSha1Hash[ RTL_DIGEST_LENGTH_SHA1 ]; sal_uInt8 pnSha1Hash[ RTL_DIGEST_LENGTH_SHA1 ];
aError = rtl_digest_get( aDigest, pnSha1Hash, RTL_DIGEST_LENGTH_SHA1 ); rtl_digest_get( aDigest, pnSha1Hash, RTL_DIGEST_LENGTH_SHA1 );
rtl_digest_destroy( aDigest ); rtl_digest_destroy( aDigest );
return memcmp( pnSha1Hash, pnVerifierHash, RTL_DIGEST_LENGTH_SHA1 ) == 0; return memcmp( pnSha1Hash, pnVerifierHash, RTL_DIGEST_LENGTH_SHA1 ) == 0;
......
...@@ -941,6 +941,7 @@ namespace oox { namespace ppt { ...@@ -941,6 +941,7 @@ namespace oox { namespace ppt {
// CT_TLPoint // CT_TLPoint
Point p = GetPointPercent( xAttribs ); Point p = GetPointPercent( xAttribs );
// TODO push // TODO push
(void)p;
break; break;
} }
default: default:
......
...@@ -57,7 +57,7 @@ typedef std::vector<PropertyMapVector1> PropertyMapVector2; ...@@ -57,7 +57,7 @@ typedef std::vector<PropertyMapVector1> PropertyMapVector2;
class DomainMapper_Impl; class DomainMapper_Impl;
class TableStyleSheetEntry; class TableStyleSheetEntry;
struct TableInfo; struct TableInfo;
class DomainMapperTableHandler : public TableDataHandler<Handle_t , TablePropertyMapPtr > class WRITERFILTER_DLLPRIVATE DomainMapperTableHandler : public TableDataHandler<Handle_t , TablePropertyMapPtr >
{ {
TextReference_t m_xText; TextReference_t m_xText;
DomainMapper_Impl& m_rDMapper_Impl; DomainMapper_Impl& m_rDMapper_Impl;
......
...@@ -269,7 +269,7 @@ struct LineNumberSettings ...@@ -269,7 +269,7 @@ struct LineNumberSettings
-----------------------------------------------------------------------*/ -----------------------------------------------------------------------*/
class DomainMapper; class DomainMapper;
class DomainMapper_Impl class WRITERFILTER_DLLPRIVATE DomainMapper_Impl
{ {
public: public:
typedef TableManager< ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >, PropertyMapPtr > TableManager_t; typedef TableManager< ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >, PropertyMapPtr > TableManager_t;
......
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