diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-07-28 13:27:00 +0200 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-07-28 13:27:00 +0200 |
| commit | 9d75f9c2519fc523bbddba5fdf3208624b80e80b (patch) | |
| tree | f9cb59758ba1b3d7707fe3314a038be5864bbc9e /vbahelper | |
| parent | db64fdbe27e9f07558b833dd8a5986655e703c10 (diff) | |
mib17: resolved conflict after rebase corrected
Diffstat (limited to 'vbahelper')
| -rw-r--r-- | vbahelper/inc/vbahelper/vbaapplicationbase.hxx | 3 | ||||
| -rw-r--r-- | vbahelper/inc/vbahelper/vbadocumentbase.hxx | 3 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbadocumentbase.cxx | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx index 9041c99fab..4ba494f83b 100644 --- a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx +++ b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx @@ -68,9 +68,6 @@ public: virtual void SAL_CALL Undo() throw (css::uno::RuntimeException); virtual void SAL_CALL Quit() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getVBE() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL SAL_CALL getVBProjects() throw (css::uno::RuntimeException); - // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); diff --git a/vbahelper/inc/vbahelper/vbadocumentbase.hxx b/vbahelper/inc/vbahelper/vbadocumentbase.hxx index d0270edd16..b68eb06815 100644 --- a/vbahelper/inc/vbahelper/vbadocumentbase.hxx +++ b/vbahelper/inc/vbahelper/vbadocumentbase.hxx @@ -54,9 +54,6 @@ public: virtual void SAL_CALL setSaved( sal_Bool bSave ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getVBProject() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getVBProject() throw (css::uno::RuntimeException); // Michhael E. Bohn - - // Methods virtual void SAL_CALL Close( const css::uno::Any &bSaveChanges, const css::uno::Any &aFileName, diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx index 4b6325aa17..0eba699a07 100644 --- a/vbahelper/source/vbahelper/vbadocumentbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> //Michael E. Bohn #include <com/sun/star/beans/XPropertySet.hpp> -#include <ooo/vba/XVBADocService.hpp> #include <comphelper/unwrapargs.hxx> #include <tools/urlobj.hxx> |