diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-13 22:34:34 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-13 23:42:33 +0100 |
| commit | d406d7c3a649bcbbe3377338707221e39f03a639 (patch) | |
| tree | b306913a44a5c8d5d13e847296bae4e8ecc15bd2 /sd | |
| parent | bd5834005872d005c3129405c6ab2d6d2bdce19d (diff) | |
resolve TODO, remove SVVERB_SHOW
Change-Id: I10148330f1a356dbd423af98267c25d7128c3a86
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 7e5b08abd804..3a9a0d09c501 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -23,6 +23,7 @@ #include <comphelper/processfactory.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <svx/svxdlg.hxx> +#include <com/sun/star/embed/EmbedVerbs.hpp> #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> #include <com/sun/star/embed/XComponentSupplier.hpp> #include <com/sun/star/embed/Aspects.hpp> @@ -427,7 +428,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) aVisualSize.Width = aTmp.Width(); aVisualSize.Height = aTmp.Height(); xObj->setVisualAreaSize( nAspect, aVisualSize ); - mpViewShell->ActivateObject(pOleObj, SVVERB_SHOW); + mpViewShell->ActivateObject(pOleObj, embed::EmbedVerbs::MS_OLEVERB_SHOW); if (nSlotId == SID_INSERT_DIAGRAM) { @@ -647,7 +648,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) xObj->setVisualAreaSize( nAspect, aSz ); } - mpViewShell->ActivateObject(pObj, SVVERB_SHOW); + mpViewShell->ActivateObject(pObj, embed::EmbedVerbs::MS_OLEVERB_SHOW); } Size aVisSizePixel = mpWindow->GetOutputSizePixel(); diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 3ba31822bb56..b86daec4b6b1 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <com/sun/star/embed/EmbedVerbs.hpp> #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> @@ -798,7 +799,7 @@ bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) GetViewShellBase().SetVerbs( xObj->getSupportedVerbs() ); - nVerb = SVVERB_SHOW; + nVerb = embed::EmbedVerbs::MS_OLEVERB_SHOW; } else { |