diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-31 15:45:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-01 06:22:09 +0000 |
| commit | faf9b82d396686bdb8e5cf9200f48f2080d65d3b (patch) | |
| tree | 21a1aa58416617ec407ab6989784ce02e3bb89a1 /avmedia | |
| parent | cd2088f1395f84f61af47427bb6376db1765a2d6 (diff) | |
makeAny->Any in accessibility..avmedia
Change-Id: I70f2dfa66d7b66738a840e4a7b5c7fb1b8d7b39f
Reviewed-on: https://gerrit.libreoffice.org/33756
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/mediaitem.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx index 5a6a92ccb63b..831f4a90fe9e 100644 --- a/avmedia/source/framework/mediaitem.cxx +++ b/avmedia/source/framework/mediaitem.cxx @@ -417,12 +417,12 @@ CreateStream(uno::Reference<embed::XStorage> const& xStorage, uno::Reference< beans::XPropertySet > const xStreamProps(xStream, uno::UNO_QUERY); if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage - xStreamProps->setPropertyValue("MediaType", uno::makeAny(OUString( + xStreamProps->setPropertyValue("MediaType", uno::Any(OUString( //FIXME how to detect real media type? //but currently xmloff has this one hardcoded anyway... "application/vnd.sun.star.media"))); xStreamProps->setPropertyValue( // turn off compression - "Compressed", uno::makeAny(false)); + "Compressed", uno::Any(false)); } return xStream; } diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 312bf09b868d..442e9f5c9bca 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -266,7 +266,7 @@ bool MediaWindow::executeMediaURLDialog(vcl::Window*, // for video link should be the default xCtrlAcc->setValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, - uno::makeAny(true) ); + uno::Any(true) ); // disabled for now: TODO: preview? xCtrlAcc->enableControl( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 25cd07f03f51..88ec86301d92 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -465,9 +465,9 @@ void MediaWindowImpl::onURLChanged() const Point aPoint; const Size aSize(mpChildWindow->GetSizePixel()); - aArgs[0] = uno::makeAny(mpChildWindow->GetParentWindowHandle()); - aArgs[1] = uno::makeAny(awt::Rectangle(aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height())); - aArgs[2] = uno::makeAny(reinterpret_cast<sal_IntPtr>(mpChildWindow.get())); + aArgs[0] = uno::Any(mpChildWindow->GetParentWindowHandle()); + aArgs[1] = uno::Any(awt::Rectangle(aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height())); + aArgs[2] = uno::Any(reinterpret_cast<sal_IntPtr>(mpChildWindow.get())); try { |