m89 merged

3 files changed, 11 insertions, 7 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index c228e57885c1..874004826379 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -79,6 +79,9 @@ class SwList;
 #include "comphelper/implementationreference.hxx"
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
+#ifdef FUTURE_VBA
+#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
+#endif
 
 #include <hash_map>
 #include <stringhash.hxx>
@@ -405,7 +408,9 @@ class SW_DLLPUBLIC SwDoc :
 
     // table of forbidden characters of this document
     vos::ORef<SvxForbiddenCharactersTable>  xForbiddenCharsTable;
-
+#ifdef FUTURE_VBA
+    com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > mxVbaEvents;
+#endif
     // --> OD 2007-10-26 #i83479#
 public:
     struct lessThanNodeNum
@@ -2129,7 +2134,9 @@ public:
     {
         return n32DummyCompatabilityOptions2;
     }
-
+#ifdef FUTURE_VBA
+    com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > GetVbaEventProcessor();
+#endif
     ::sfx2::IXmlIdRegistry& GetXmlIdRegistry();
     ::sw::MetaFieldManager & GetMetaFieldManager();
     SfxObjectShell* CreateCopy(bool bCallInitNew) const;
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 620fe0b00b63..39eb365b549c 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -921,7 +921,6 @@
 #include "vcl/help.hxx"
 #include "vcl/image.hxx"
 #include "vcl/imagebtn.hxx"
-#include "vcl/imgcons.hxx"
 #include "vcl/inputctx.hxx"
 #include "vcl/jobset.hxx"
 #include "vcl/keycod.hxx"
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index cf92a707e40f..7f16e4e4d44c 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -27,9 +27,7 @@
 #ifndef SW_UNDOBJ_HXX
 #define SW_UNDOBJ_HXX
 
-// --> OD 2006-11-01 #130889#
 #include <vector>
-// <--
 #include <memory>
 
 #include <boost/shared_ptr.hpp>
@@ -1718,7 +1716,7 @@ public:
 struct _UndoTransliterate_Data;
 class SwUndoTransliterate : public SwUndo, public SwUndRng
 {
-    _UndoTransliterate_Data *pData, *pLastData;
+    std::vector< _UndoTransliterate_Data * >    aChanges;
     sal_uInt32 nType;
 
 public:
@@ -1732,7 +1730,7 @@ public:
 
     void AddChanges( SwTxtNode& rTNd, xub_StrLen nStart, xub_StrLen nLen,
                      ::com::sun::star::uno::Sequence <sal_Int32>& rOffsets );
-    BOOL HasData() const {return 0 != pData; }
+    BOOL HasData() const { return aChanges.size() > 0; }
 };
 
 //--------------------------------------------------------------------