diff options
| -rw-r--r-- | include/sfx2/shell.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/drawfunc/fuins2.cxx | 7 | ||||
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/table/tablemgr.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/wrtsh/wrtsh1.cxx | 5 |
6 files changed, 14 insertions, 11 deletions
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 488e06b8b65d..9c82f1fbd60d 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -113,8 +113,6 @@ enum SfxInterfaceId SFX_INTERFACE_LIB = 450 }; -//TODO/CLEANUP: replace by UNO constant -#define SVVERB_SHOW -1 typedef void (*SfxExecFunc)(SfxShell *, SfxRequest &rReq); typedef void (*SfxStateFunc)(SfxShell *, SfxItemSet &rSet); diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index b98890e6c730..73429814c43d 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -49,6 +49,7 @@ #include <cppuhelper/component_context.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> +#include <com/sun/star/embed/EmbedVerbs.hpp> #include <com/sun/star/frame/XSynchronousFrameLoader.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -361,7 +362,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* } else { - pViewShell->ActivateObject( pObj, SVVERB_SHOW ); + pViewShell->ActivateObject(pObj, embed::EmbedVerbs::MS_OLEVERB_SHOW); } } @@ -605,7 +606,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV //the controller will be unlocked by the dialog when the dialog is told to do so // only activate object if not called via API (e.g. macro) - pViewShell->ActivateObject( pObj, SVVERB_SHOW ); + pViewShell->ActivateObject(pObj, embed::EmbedVerbs::MS_OLEVERB_SHOW); //open wizard //@todo get context from calc if that has one @@ -765,7 +766,7 @@ FuInsertChartFromFile::FuInsertChartFromFile( ScTabViewShell* pViewSh, vcl::Wind pView->UnmarkAllObj(); pView->MarkObj( pObj, pPV ); - pViewShell->ActivateObject( pObj, SVVERB_SHOW ); + pViewShell->ActivateObject(pObj, embed::EmbedVerbs::MS_OLEVERB_SHOW); } void FuInsertChartFromFile::Activate() 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 { 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 } |