Skip to content

C
core
Kaydet (Commit) b532fccc authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

work around spurious signed overflow warnings 

gcc version 4.6.3 20120306 (Red Hat 4.6.3-2) (GCC):
/com/sun/star/uno/Sequence.hxx:178:10: error: assuming signed overflow
does not occur when assuming that (X - c) > X is always false
[-Werror=strict-overflow]
üst a5081281
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 20 deletions
filter/source/pdf/impdialog.cxx
Dosyayı görüntüle @ b532fccc
......@@ -391,40 +391,41 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
aRet.realloc( aRet.getLength() + nElementAdded );
// add the encryption enable flag
aRet[ aRet.getLength() - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Watermark" ) );
aRet[ aRet.getLength() - nElementAdded ].Value <<= maWatermarkText;
sal_uInt32 const nLength(aRet.getLength());
aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Watermark" ) );
aRet[ nLength - nElementAdded ].Value <<= maWatermarkText;
nElementAdded--;
// add the encryption enable flag
aRet[ aRet.getLength() - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EncryptFile" ) );
aRet[ aRet.getLength() - nElementAdded ].Value <<= mbEncrypt;
aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EncryptFile" ) );
aRet[ nLength - nElementAdded ].Value <<= mbEncrypt;
nElementAdded--;
// add the open password
aRet[ aRet.getLength() - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PreparedPasswords" ) );
aRet[ aRet.getLength() - nElementAdded ].Value <<= mxPreparedPasswords;
aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PreparedPasswords" ) );
aRet[ nLength - nElementAdded ].Value <<= mxPreparedPasswords;
nElementAdded--;
//the restrict permission flag (needed to have the scripting consistent with the dialog)
aRet[ aRet.getLength() - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "RestrictPermissions" ) );
aRet[ aRet.getLength() - nElementAdded ].Value <<= mbRestrictPermissions;
aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "RestrictPermissions" ) );
aRet[ nLength - nElementAdded ].Value <<= mbRestrictPermissions;
nElementAdded--;
//add the permission password
aRet[ aRet.getLength() - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PreparedPermissionPassword" ) );
aRet[ aRet.getLength() - nElementAdded ].Value <<= maPreparedOwnerPassword;
aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PreparedPermissionPassword" ) );
aRet[ nLength - nElementAdded ].Value <<= maPreparedOwnerPassword;
nElementAdded--;
// this should be the last added...
if( mbIsRangeChecked )
{
aRet[ aRet.getLength() - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) );
aRet[ aRet.getLength() - nElementAdded ].Value <<= OUString( msPageRange );
aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) );
aRet[ nLength - nElementAdded ].Value <<= OUString( msPageRange );
}
else if( mbSelectionIsChecked )
{
aRet[ aRet.getLength() - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Selection" ) );
aRet[ aRet.getLength() - nElementAdded ].Value <<= maSelection;
aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Selection" ) );
aRet[ nLength - nElementAdded ].Value <<= maSelection;
}
return aRet;
......
toolkit/source/controls/tksimpleanimation.cxx
Dosyayı görüntüle @ b532fccc
......@@ -109,8 +109,10 @@ namespace toolkit
{
uno::Sequence< ::rtl::OUString > aServices( UnoControlModel::getSupportedServiceNames() );
aServices.realloc( aServices.getLength() + 2 );
aServices[ aServices.getLength() - 2 ] = ::rtl::OUString::createFromAscii( szServiceName_UnoSimpleAnimationControlModel );
aServices[ aServices.getLength() - 1 ] = ::rtl::OUString::createFromAscii( szServiceName2_UnoSimpleAnimationControlModel );
aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 2]
= ::rtl::OUString::createFromAscii( szServiceName_UnoSimpleAnimationControlModel );
aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 1]
= ::rtl::OUString::createFromAscii( szServiceName2_UnoSimpleAnimationControlModel );
return aServices;
}
......
toolkit/source/controls/tkthrobber.cxx
Dosyayı görüntüle @ b532fccc
......@@ -107,8 +107,10 @@ namespace toolkit
{
uno::Sequence< ::rtl::OUString > aServices( UnoControlModel::getSupportedServiceNames() );
aServices.realloc( aServices.getLength() + 2 );
aServices[ aServices.getLength() - 2 ] = ::rtl::OUString::createFromAscii( szServiceName_UnoThrobberControlModel );
aServices[ aServices.getLength() - 1 ] = ::rtl::OUString::createFromAscii( szServiceName2_UnoThrobberControlModel );
aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 2] =
::rtl::OUString::createFromAscii(szServiceName_UnoThrobberControlModel);
aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 1] =
::rtl::OUString::createFromAscii(szServiceName2_UnoThrobberControlModel);
return aServices;
}
......@@ -160,8 +162,10 @@ namespace toolkit
{
uno::Sequence< ::rtl::OUString > aServices( UnoControlBase::getSupportedServiceNames() );
aServices.realloc( aServices.getLength() + 2 );
aServices[ aServices.getLength() - 2 ] = ::rtl::OUString::createFromAscii( szServiceName_UnoThrobberControl );
aServices[ aServices.getLength() - 1 ] = ::rtl::OUString::createFromAscii( szServiceName2_UnoThrobberControl );
aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 2] =
::rtl::OUString::createFromAscii(szServiceName_UnoThrobberControl);
aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 1] =
::rtl::OUString::createFromAscii(szServiceName2_UnoThrobberControl);
return aServices;
}
......
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