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 /sw | |
parent | bd5834005872d005c3129405c6ab2d6d2bdce19d (diff) |
resolve TODO, remove SVVERB_SHOW
Change-Id: I10148330f1a356dbd423af98267c25d7128c3a86
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/uibase/table/tablemgr.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/wrtsh/wrtsh1.cxx | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx index b1518e1f01b9..e6bed55bb587 100644 --- a/sw/source/uibase/table/tablemgr.cxx +++ b/sw/source/uibase/table/tablemgr.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/chart2/data/XDataReceiver.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/beans/PropertyState.hpp> +#include <com/sun/star/embed/EmbedVerbs.hpp> #include <sot/storage.hxx> #include <comphelper/classids.hxx> @@ -267,7 +268,7 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart( pSh->CalcAndSetScale( aEmbObjRef ); //#50270# We don't need to handle errors, //this does the DoVerb in the SfxViewShell. - ErrCode nErr = pClient->DoVerb( SVVERB_SHOW ); + ErrCode nErr = pClient->DoVerb(embed::EmbedVerbs::MS_OLEVERB_SHOW); (void) nErr; // #i121334# diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index b44a2c006169..e82f8aa3f754 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -17,11 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/embed/XVisualObject.hpp> #include <com/sun/star/embed/EmbedMisc.hpp> #include <com/sun/star/embed/EmbedStates.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/embed/EmbedVerbs.hpp> #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/util/XModifiable.hpp> @@ -419,7 +420,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName //#50270# We don't need to handle error, this is handled by the //DoVerb in the SfxViewShell - pClient->DoVerb( SVVERB_SHOW ); + pClient->DoVerb(embed::EmbedVerbs::MS_OLEVERB_SHOW); // TODO/LATER: set document name - should be done in Client } |