diff options
Diffstat (limited to 'toolkit/source/controls')
| -rw-r--r-- | toolkit/source/controls/filectrl.cxx | 6 | ||||
| -rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 19 |
2 files changed, 13 insertions, 12 deletions
diff --git a/toolkit/source/controls/filectrl.cxx b/toolkit/source/controls/filectrl.cxx index cebbd9371818..bea09aeb7e12 100644 --- a/toolkit/source/controls/filectrl.cxx +++ b/toolkit/source/controls/filectrl.cxx @@ -145,14 +145,14 @@ void FileControl::StateChanged( StateChangedType nType ) void FileControl::Resize() { - static const long ButtonBorder = 10; + static const tools::Long ButtonBorder = 10; if( mnInternalFlags & FileControlMode_Internal::INRESIZE ) return; mnInternalFlags |= FileControlMode_Internal::INRESIZE;//InResize = sal_True Size aOutSz = GetOutputSizePixel(); - long nButtonTextWidth = maButton->GetTextWidth( maButtonText ); + tools::Long nButtonTextWidth = maButton->GetTextWidth( maButtonText ); if ( !(mnInternalFlags & FileControlMode_Internal::ORIGINALBUTTONTEXT) || ( nButtonTextWidth < aOutSz.Width()/3 ) ) { @@ -165,7 +165,7 @@ void FileControl::Resize() nButtonTextWidth = maButton->GetTextWidth( aSmallText ); } - long nButtonWidth = nButtonTextWidth+ButtonBorder; + tools::Long nButtonWidth = nButtonTextWidth+ButtonBorder; maEdit->setPosSizePixel( 0, 0, aOutSz.Width()-nButtonWidth, aOutSz.Height() ); maButton->setPosSizePixel( aOutSz.Width()-nButtonWidth, 0, nButtonWidth, aOutSz.Height() ); diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 695b6fcb00e5..5725cd16501a 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -35,6 +35,7 @@ #include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <tools/debug.hxx> +#include <tools/long.hxx> #include <toolkit/helper/property.hxx> #include <toolkit/helper/emptyfontdescriptor.hxx> #include <unotools/localedatawrapper.hxx> @@ -661,7 +662,7 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt { css::uno::Sequence< OUString> aSeq; rValue >>= aSeq; - long nEntries = aSeq.getLength(); + tools::Long nEntries = aSeq.getLength(); OutStream->writeLong( nEntries ); for ( const auto& rVal : std::as_const(aSeq) ) OutStream->writeUTF( rVal ); @@ -670,7 +671,7 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt { css::uno::Sequence<sal_uInt16> aSeq; rValue >>= aSeq; - long nEntries = aSeq.getLength(); + tools::Long nEntries = aSeq.getLength(); OutStream->writeLong( nEntries ); for ( const auto nVal : aSeq ) OutStream->writeShort( nVal ); @@ -679,7 +680,7 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt { css::uno::Sequence<sal_Int16> aSeq; rValue >>= aSeq; - long nEntries = aSeq.getLength(); + tools::Long nEntries = aSeq.getLength(); OutStream->writeLong( nEntries ); for ( const auto nVal : aSeq ) OutStream->writeShort( nVal ); @@ -870,9 +871,9 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre } else if ( *pType == cppu::UnoType< css::uno::Sequence< OUString> >::get() ) { - long nEntries = InStream->readLong(); + tools::Long nEntries = InStream->readLong(); css::uno::Sequence< OUString> aSeq( nEntries ); - for ( long n = 0; n < nEntries; n++ ) + for ( tools::Long n = 0; n < nEntries; n++ ) aSeq.getArray()[n] = InStream->readUTF(); aValue <<= aSeq; @@ -880,17 +881,17 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre else if ( *pType == cppu::UnoType< cppu::UnoSequenceType<cppu::UnoUnsignedShortType> >::get() ) { - long nEntries = InStream->readLong(); + tools::Long nEntries = InStream->readLong(); css::uno::Sequence<sal_uInt16> aSeq( nEntries ); - for ( long n = 0; n < nEntries; n++ ) + for ( tools::Long n = 0; n < nEntries; n++ ) aSeq.getArray()[n] = static_cast<sal_uInt16>(InStream->readShort()); aValue <<= aSeq; } else if ( *pType == cppu::UnoType< css::uno::Sequence<sal_Int16> >::get() ) { - long nEntries = InStream->readLong(); + tools::Long nEntries = InStream->readLong(); css::uno::Sequence<sal_Int16> aSeq( nEntries ); - for ( long n = 0; n < nEntries; n++ ) + for ( tools::Long n = 0; n < nEntries; n++ ) aSeq.getArray()[n] = InStream->readShort(); aValue <<= aSeq; } |