summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-07-27 17:01:36 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-07-28 16:45:48 +0100
commit5efc15f0006866ac4c422c1b2bde173ded47893f (patch)
tree119b46339aae67b9a5b1a76ea2a955a548e5016e /avmedia
parente39a959429234aef5348a8b5800b27c29de02a6f (diff)
reduce use of UniString from ResID ctor
Change-Id: I8d7619e7807ff2d400ec5c7fd181375130245728
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/inc/mediamisc.hxx1
-rw-r--r--avmedia/source/viewer/mediawindow.cxx6
2 files changed, 4 insertions, 3 deletions
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index b87fe432df3e..f460161bc909 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -20,6 +20,7 @@
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 WNT
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 310d5640a72f..835e3626810a 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -255,7 +255,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
const OUString aSeparator( ";" );
OUString aAllTypes;
- aDlg.SetTitle( AVMEDIA_RESID( (o_pbLink)
+ aDlg.SetTitle( AVMEDIA_RESSTR( (o_pbLink)
? AVMEDIA_STR_INSERTMEDIA_DLG : AVMEDIA_STR_OPENMEDIA_DLG ) );
getMediaFilters( aFilters );
@@ -273,7 +273,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
}
// add filter for all media types
- aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_MEDIAFILES ), aAllTypes );
+ aDlg.AddFilter( AVMEDIA_RESSTR( AVMEDIA_STR_ALL_MEDIAFILES ), aAllTypes );
for( i = 0; i < aFilters.size(); ++i )
{
@@ -292,7 +292,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
}
// add filter for all types
- aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_FILES ), OUString( "*.*" ) );
+ aDlg.AddFilter( AVMEDIA_RESSTR( AVMEDIA_STR_ALL_FILES ), OUString( "*.*" ) );
uno::Reference<ui::dialogs::XFilePicker> const xFP(aDlg.GetFilePicker());
uno::Reference<ui::dialogs::XFilePickerControlAccess> const xCtrlAcc(xFP,