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 | c34ae9ba3c48c793a78ae86729d112ea1a282236 (patch) | |
| tree | 798a40972d9e6d72c6d8b5a03d2f9283d0b250af /vbahelper | |
| parent | 69d41381ba6e808153508ccd09ea73b8d77dbe76 (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 8611a46a6bfc..6902bc7b5042 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 8e14a0a8662e..2588b7da1720 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 01cd63cde7ac..65f7f4bcfbeb 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> |