[Libreoffice-commits] core.git: avmedia/source

[Caolán McNamara]

 avmedia/source/framework/mediacontrol.cxx |    4 ++--
 avmedia/source/inc/mediamisc.hxx          |    1 -
 avmedia/source/viewer/mediawindow.cxx     |    6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit e049dd5f11dab0b29b85d8977a78cacef1ee22f9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 17 21:00:17 2017 +0100

    AVMEDIA_RESSTR define can go now
    
    Change-Id: I9220cae493facf05d5ee9a9bb341a14e6448c2a5

diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 846bd1a52f68..698042eb9a73 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -98,7 +98,7 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl
     mpZoomToolBox->Show();
     maMinSize.Width() += mpZoomToolBox->GetSizePixel().Width();
 
-    const OUString aMediaPath( AVMEDIA_RESSTR( AVMEDIA_MEDIA_PATH_DEFAULT ) );
+    const OUString aMediaPath( AVMEDIA_RESID( AVMEDIA_MEDIA_PATH_DEFAULT ) );
     mpMediaPath->SetText(aMediaPath);
     mpMediaPath->SetUpdateMode( false );
     mpMediaPath->SetSizePixel( Size( mpMediaPath->GetTextWidth( aMediaPath ) + 400, mpPlayToolBox->GetSizePixel().Height() ) ); // maybe extend the no. 400 to span the screen width
@@ -170,7 +170,7 @@ const Size& MediaControl::getMinSizePixel() const
 
 void MediaControl::UpdateURLField(MediaItem tempItem)
 {
-    const OUString aURL( AVMEDIA_RESSTR( AVMEDIA_MEDIA_PATH ) + ":  " + tempItem.getURL() ) ;
+    const OUString aURL( OUString(AVMEDIA_RESID(AVMEDIA_MEDIA_PATH)) + ":  " + tempItem.getURL() ) ;
     mpMediaPath->SetText(aURL);
     mpMediaPath->SetUpdateMode( false );
     mpMediaPath->SetSizePixel( Size( mpMediaPath->GetTextWidth( aURL ) + 8, mpPlayToolBox->GetSizePixel().Height() ) );
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index 632c4cd4c43a..f6db84cc2ecb 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -25,7 +25,6 @@
 class ResMgr;
 
 #define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() )
-#define AVMEDIA_RESSTR( nId ) AVMEDIA_RESID( nId ).toString()
 
 #define AVMEDIA_MANAGER_SERVICE_PREFERRED "com.sun.star.comp.avmedia.Manager_VLC"
 #ifdef _WIN32
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 54c7308976b8..811ac0e1f7d5 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -219,7 +219,7 @@ bool MediaWindow::executeMediaURLDialog(OUString& rURL, bool *const o_pbLink)
     static const char               aSeparator[] = ";";
     OUString                        aAllTypes;
 
-    aDlg.SetTitle( AVMEDIA_RESSTR( (o_pbLink)
+    aDlg.SetTitle( AVMEDIA_RESID( (o_pbLink)
                 ? AVMEDIA_STR_INSERTMEDIA_DLG : AVMEDIA_STR_OPENMEDIA_DLG ) );
 
     getMediaFilters( aFilters );
@@ -236,7 +236,7 @@ bool MediaWindow::executeMediaURLDialog(OUString& rURL, bool *const o_pbLink)
     }
 
     // add filter for all media types
-    aDlg.AddFilter( AVMEDIA_RESSTR( AVMEDIA_STR_ALL_MEDIAFILES ), aAllTypes );
+    aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_MEDIAFILES ), aAllTypes );
 
     for( FilterNameVector::size_type i = 0; i < aFilters.size(); ++i )
     {
@@ -255,7 +255,7 @@ bool MediaWindow::executeMediaURLDialog(OUString& rURL, bool *const o_pbLink)
     }
 
     // add filter for all types
-    aDlg.AddFilter( AVMEDIA_RESSTR( AVMEDIA_STR_ALL_FILES ), "*.*" );
+    aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_FILES ), "*.*" );
 
     uno::Reference<ui::dialogs::XFilePicker2> const xFP(aDlg.GetFilePicker());
     uno::Reference<ui::dialogs::XFilePickerControlAccess> const xCtrlAcc(xFP,