summaryrefslogtreecommitdiff
path: root/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-11-30 16:00:37 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-11-30 16:44:47 +0100
commit6ddefb080b12f54f84a8de44347a9b1816972ad3 (patch)
tree48a7377f65b6ec0d0789b6a4e9903c367dad726a /svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
parent3566bf146e5ad329432b48351d14b012cb5ea538 (diff)
Let getPageViewOutputDevice return const OutputDevice*
...instead of boost::optional<const OutputDevice&> (in preparation for replacing boost::optional with std::optional, which doesn't support references types as template arguments) Change-Id: I02d2b617123cfa9ca0d6436c8a4104c5987f4eb5 Reviewed-on: https://gerrit.libreoffice.org/84121 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx')
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index 42e7a6a22675..23684f55901c 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -60,12 +60,12 @@ vcl::Window* ViewObjectContactOfSdrMediaObj::getWindow() const
{
vcl::Window* pRetval = nullptr;
- boost::optional<const OutputDevice&> oPageOutputDev = getPageViewOutputDevice();
+ const OutputDevice* oPageOutputDev = getPageViewOutputDevice();
if( oPageOutputDev )
{
if(OUTDEV_WINDOW == oPageOutputDev->GetOutDevType())
{
- pRetval = static_cast< vcl::Window* >(&const_cast<OutputDevice&>(oPageOutputDev.get()));
+ pRetval = static_cast< vcl::Window* >(&const_cast<OutputDevice&>(*oPageOutputDev));
}
}