summaryrefslogtreecommitdiff
path: root/avmedia/source
diff options
context:
space:
mode:
Diffstat (limited to 'avmedia/source')
-rw-r--r--avmedia/source/framework/MediaControlBase.cxx4
-rw-r--r--avmedia/source/viewer/mediawindow.cxx2
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx2
3 files changed, 4 insertions, 4 deletions
diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx
index 29921e78c553..f134d3038ef4 100644
--- a/avmedia/source/framework/MediaControlBase.cxx
+++ b/avmedia/source/framework/MediaControlBase.cxx
@@ -64,7 +64,7 @@ void MediaControlBase::UpdateVolumeSlider( MediaItem aMediaItem )
{
mpVolumeSlider->Enable();
const sal_Int32 nVolumeDB = aMediaItem.getVolumeDB();
- mpVolumeSlider->SetThumbPos( ::std::min( ::std::max( nVolumeDB, static_cast< sal_Int32 >( AVMEDIA_DB_RANGE ) ),
+ mpVolumeSlider->SetThumbPos( std::min( std::max( nVolumeDB, static_cast< sal_Int32 >( AVMEDIA_DB_RANGE ) ),
static_cast< sal_Int32 >( 0 ) ) );
}
}
@@ -81,7 +81,7 @@ void MediaControlBase::UpdateTimeSlider( MediaItem aMediaItem )
if( fDuration > 0.0 )
{
- const double fTime = ::std::min( aMediaItem.getTime(), fDuration );
+ const double fTime = std::min( aMediaItem.getTime(), fDuration );
if( !mpTimeSlider->GetLineSize() )
mpTimeSlider->SetLineSize( static_cast< sal_uInt32 >( AVMEDIA_TIME_RANGE * AVMEDIA_LINEINCREMENT / fDuration ) );
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 442e9f5c9bca..dd47d5229c6e 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -201,7 +201,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
for( size_t i = 0; i < SAL_N_ELEMENTS(pFilters); i += 2 )
{
- rFilterNameVector.push_back( ::std::make_pair< OUString, OUString >(
+ rFilterNameVector.push_back( std::make_pair< OUString, OUString >(
OUString::createFromAscii(pFilters[i]),
OUString::createFromAscii(pFilters[i+1]) ) );
}
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 88ec86301d92..9e92dddf3d64 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -556,7 +556,7 @@ void MediaWindowImpl::Resize()
if (mpMediaWindowControl)
{
const sal_Int32 nControlHeight = mpMediaWindowControl->GetSizePixel().Height();
- const sal_Int32 nControlY = ::std::max(aCurSize.Height() - nControlHeight - nOffset, 0L);
+ const sal_Int32 nControlY = std::max(aCurSize.Height() - nControlHeight - nOffset, 0L);
aPlayerWindowSize.Height() = (nControlY - (nOffset << 1));
mpMediaWindowControl->SetPosSizePixel(Point(nOffset, nControlY ), Size(aCurSize.Width() - (nOffset << 1), nControlHeight));