summaryrefslogtreecommitdiff
path: root/vbahelper/inc
diff options
context:
space:
mode:
authorDaniel Rentz <dr@openoffice.org>2010-07-28 13:27:00 +0200
committerDaniel Rentz <dr@openoffice.org>2010-07-28 13:27:00 +0200
commitc34ae9ba3c48c793a78ae86729d112ea1a282236 (patch)
tree798a40972d9e6d72c6d8b5a03d2f9283d0b250af /vbahelper/inc
parent69d41381ba6e808153508ccd09ea73b8d77dbe76 (diff)
mib17: resolved conflict after rebase corrected
Diffstat (limited to 'vbahelper/inc')
-rw-r--r--vbahelper/inc/vbahelper/vbaapplicationbase.hxx3
-rw-r--r--vbahelper/inc/vbahelper/vbadocumentbase.hxx3
2 files changed, 0 insertions, 6 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,