mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AVMEDIA_RESSTR define can go now

Browse Source 
Change-Id: I9220cae493facf05d5ee9a9bb341a14e6448c2a5
This commit is contained in:
Caolán McNamara
2017-05-17 21:00:17 +01:00
parent d47d1d9215
commit e049dd5f11
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
avmedia/source/framework/mediacontrol.cxx
View File

@@ -98,7 +98,7 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl
mpZoomToolBox->Show(); mpZoomToolBox->Show();
maMinSize.Width() += mpZoomToolBox->GetSizePixel().Width(); 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->SetText(aMediaPath);
mpMediaPath->SetUpdateMode( false ); mpMediaPath->SetUpdateMode( false );
mpMediaPath->SetSizePixel( Size( mpMediaPath->GetTextWidth( aMediaPath ) + 400, mpPlayToolBox->GetSizePixel().Height() ) ); // maybe extend the no. 400 to span the screen width 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) 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->SetText(aURL);
mpMediaPath->SetUpdateMode( false ); mpMediaPath->SetUpdateMode( false );
mpMediaPath->SetSizePixel( Size( mpMediaPath->GetTextWidth( aURL ) + 8, mpPlayToolBox->GetSizePixel().Height() ) ); mpMediaPath->SetSizePixel( Size( mpMediaPath->GetTextWidth( aURL ) + 8, mpPlayToolBox->GetSizePixel().Height() ) );

1
avmedia/source/inc/mediamisc.hxx
View File

@@ -25,7 +25,6 @@
class ResMgr; class ResMgr;
#define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() ) #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" #define AVMEDIA_MANAGER_SERVICE_PREFERRED "com.sun.star.comp.avmedia.Manager_VLC"
#ifdef _WIN32 #ifdef _WIN32

6
avmedia/source/viewer/mediawindow.cxx
View File

@@ -219,7 +219,7 @@ bool MediaWindow::executeMediaURLDialog(OUString& rURL, bool *const o_pbLink)
static const char aSeparator[] = ";"; static const char aSeparator[] = ";";
OUString aAllTypes; OUString aAllTypes;
aDlg.SetTitle( AVMEDIA_RESSTR( (o_pbLink) aDlg.SetTitle( AVMEDIA_RESID( (o_pbLink)
? AVMEDIA_STR_INSERTMEDIA_DLG : AVMEDIA_STR_OPENMEDIA_DLG ) ); ? AVMEDIA_STR_INSERTMEDIA_DLG : AVMEDIA_STR_OPENMEDIA_DLG ) );
getMediaFilters( aFilters ); getMediaFilters( aFilters );
@@ -236,7 +236,7 @@ bool MediaWindow::executeMediaURLDialog(OUString& rURL, bool *const o_pbLink)
} }
// add filter for all media types // 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 ) 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 // 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::XFilePicker2> const xFP(aDlg.GetFilePicker());
uno::Reference<ui::dialogs::XFilePickerControlAccess> const xCtrlAcc(xFP, uno::Reference<ui::dialogs::XFilePickerControlAccess> const xCtrlAcc(xFP,