Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
	avmedia/source/framework/mediacontrol.cxx
	connectivity/source/commontools/DateConversion.cxx
	desktop/source/deployment/registry/component/dp_component.cxx
	editeng/inc/editeng/numitem.hxx
	editeng/inc/editeng/txtrange.hxx
	editeng/source/editeng/editobj.cxx
	editeng/source/editeng/editview.cxx
	editeng/source/editeng/eehtml.cxx
	editeng/source/editeng/impedit3.cxx
	editeng/source/editeng/impedit4.cxx
	editeng/source/misc/txtrange.cxx
	editeng/source/outliner/outlin2.cxx
	editeng/source/outliner/outlvw.cxx
	framework/source/layoutmanager/layoutmanager.cxx
	linguistic/source/lngsvcmgr.hxx
	sfx2/source/appl/app.cxx
	sfx2/source/appl/app.src
	sfx2/source/appl/appbas.cxx
	sfx2/source/appl/appcfg.cxx
	sfx2/source/appl/appdde.cxx
	sfx2/source/appl/appmain.cxx
	sfx2/source/appl/appopen.cxx
	sfx2/source/appl/appquit.cxx
	sfx2/source/appl/appserv.cxx
	sfx2/source/appl/childwin.cxx
	sfx2/source/appl/fileobj.cxx
	sfx2/source/appl/fileobj.hxx
	sfx2/source/appl/workwin.cxx
	sfx2/source/control/dispatch.cxx
	sfx2/source/control/macro.cxx
	sfx2/source/control/objface.cxx
	sfx2/source/control/request.cxx
	sfx2/source/control/shell.cxx
	sfx2/source/control/statcach.cxx
	sfx2/source/dialog/dinfdlg.cxx
	sfx2/source/dialog/dockwin.cxx
	sfx2/source/dialog/mailmodel.cxx
	sfx2/source/dialog/mailmodelapi.cxx
	sfx2/source/dialog/mgetempl.cxx
	sfx2/source/dialog/splitwin.cxx
	sfx2/source/dialog/styledlg.cxx
	sfx2/source/dialog/tabdlg.cxx
	sfx2/source/dialog/templdlg.cxx
	sfx2/source/dialog/tplcitem.cxx
	sfx2/source/dialog/tplpitem.cxx
	sfx2/source/doc/doctempl.cxx
	sfx2/source/doc/docvor.cxx
	sfx2/source/doc/new.cxx
	sfx2/source/doc/objcont.cxx
	sfx2/source/doc/objserv.cxx
	sfx2/source/doc/objxtor.cxx
	sfx2/source/inc/appdata.hxx
	sfx2/source/inc/helpid.hrc
	sfx2/source/inc/sfxlocal.hrc
	sfx2/source/inc/statcach.hxx
	sfx2/source/inc/templdgi.hxx
	sfx2/source/inc/virtmenu.hxx
	sfx2/source/inc/workwin.hxx
	sfx2/source/menu/mnumgr.cxx
	sfx2/source/menu/virtmenu.cxx
	sfx2/source/statbar/stbitem.cxx
	sfx2/source/view/frame.cxx
	sfx2/source/view/frame2.cxx
	sfx2/source/view/orgmgr.cxx
	sfx2/source/view/printer.cxx
	sfx2/source/view/prnmon.cxx
	sfx2/source/view/sfxbasecontroller.cxx
	sfx2/source/view/viewfrm.cxx
	sfx2/source/view/viewfrm2.cxx
	sfx2/source/view/viewprn.cxx
	sfx2/source/view/viewsh.cxx
	svx/inc/svx/svditer.hxx
	svx/source/dialog/sdstring.src
	svx/source/form/fmpage.cxx
	svx/source/form/formcontroller.cxx
	svx/source/svdraw/svdcrtv.cxx
	svx/source/svdraw/svditer.cxx
	svx/source/svdraw/svdview.cxx
	xmloff/source/forms/elementimport.cxx

21 files changed, 27 insertions, 31 deletions

diff --git a/vbahelper/inc/vbahelper/helperdecl.hxx b/vbahelper/inc/vbahelper/helperdecl.hxx
index 930041d3fe1e..930041d3fe1e 100644..100755
--- a/vbahelper/inc/vbahelper/helperdecl.hxx
+++ b/vbahelper/inc/vbahelper/helperdecl.hxx
diff --git a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx
index 2aeb9759dfb5..cf166cf0a888 100644..100755
--- a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx
+++ b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx
@@ -33,7 +33,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
-#define VBAHELPER_DLLIMPLEMENTATION
+//#define VBAHELPER_DLLIMPLEMENTATION
 #include <vbahelper/vbadllapi.h>
 #include <memory>
 namespace css = ::com::sun::star;
diff --git a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx
index 0a402c244ee5..0a402c244ee5 100644..100755
--- a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx
+++ b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
index 69020d373e3f..3867825ef586 100644..100755
--- a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
+++ b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
@@ -151,7 +151,7 @@ public:
 typedef ::cppu::WeakImplHelper3< css::container::XNameAccess, css::container::XIndexAccess, css::container::XEnumerationAccess > XNamedCollectionHelper_BASE;
 
 template< typename Ifc1 >
-class VBAHELPER_DLLPUBLIC XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE
+class XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE
 {
 public:
 typedef std::vector< css::uno::Reference< Ifc1 > >  XNamedVec;
@@ -349,7 +349,7 @@ public:
 };
 
 template <typename Ifc> // where Ifc must implement XCollectionTest
-class VBAHELPER_DLLPUBLIC CollTestImplHelper :  public ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > >
+class CollTestImplHelper :  public ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > >
 {
 typedef ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc >  > ImplBase1;
 
diff --git a/vbahelper/inc/vbahelper/vbadialogbase.hxx b/vbahelper/inc/vbahelper/vbadialogbase.hxx
index acf4b7e1ddb7..acf4b7e1ddb7 100644..100755
--- a/vbahelper/inc/vbahelper/vbadialogbase.hxx
+++ b/vbahelper/inc/vbahelper/vbadialogbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbadialogsbase.hxx b/vbahelper/inc/vbahelper/vbadialogsbase.hxx
index a20903094092..a20903094092 100644..100755
--- a/vbahelper/inc/vbahelper/vbadialogsbase.hxx
+++ b/vbahelper/inc/vbahelper/vbadialogsbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbadllapi.h b/vbahelper/inc/vbahelper/vbadllapi.h
index f3e6c5e581bf..f3e6c5e581bf 100644..100755
--- a/vbahelper/inc/vbahelper/vbadllapi.h
+++ b/vbahelper/inc/vbahelper/vbadllapi.h
diff --git a/vbahelper/inc/vbahelper/vbadocumentbase.hxx b/vbahelper/inc/vbahelper/vbadocumentbase.hxx
index f08790ab26d2..f08790ab26d2 100644..100755
--- a/vbahelper/inc/vbahelper/vbadocumentbase.hxx
+++ b/vbahelper/inc/vbahelper/vbadocumentbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx b/vbahelper/inc/vbahelper/vbadocumentsbase.hxx
index d67d96108055..1587091bfd4c 100644..100755
--- a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx
+++ b/vbahelper/inc/vbahelper/vbadocumentsbase.hxx
@@ -58,10 +58,10 @@ public:
     // VbaDocumentsBase_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) = 0;
 
-    // XDocumentsBase
-    virtual css::uno::Any SAL_CALL Add() throw (css::uno::RuntimeException);
-    virtual void SAL_CALL Close(  ) throw (css::uno::RuntimeException);
-    virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException);
+protected:
+    css::uno::Any createDocument() throw (css::uno::RuntimeException);
+    void closeDocuments() throw (css::uno::RuntimeException);
+    css::uno::Any openDocument( const ::rtl::OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException);
 };
 
 #endif /* SC_VBA_WORKBOOKS_HXX */
diff --git a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
index 9fe65267acfc..a2a036b86236 100644..100755
--- a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
+++ b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
@@ -59,6 +59,17 @@ public:
     // XEventListener
     virtual void SAL_CALL disposing( const css::lang::EventObject& aSource ) throw (css::uno::RuntimeException);
 
+    // little helpers ---------------------------------------------------------
+
+    /** Throws, if the passed sequence does not contain a value at the specified index. */
+    static inline void checkArgument( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
+        { if( (nIndex < 0) || (nIndex >= rArgs.getLength()) ) throw css::lang::IllegalArgumentException(); }
+
+    /** Throws, if the passed sequence does not contain a value of a specific at the specified index. */
+    template< typename Type >
+    static inline void checkArgumentType( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
+        { checkArgument( rArgs, nIndex ); if( !rArgs[ nIndex ].has< Type >() ) throw css::lang::IllegalArgumentException(); }
+
 protected:
     // ------------------------------------------------------------------------
 
@@ -74,7 +85,7 @@ protected:
 
     /** Registers a supported event handler.
 
-        @param nEventId  Event identifier from com.sun.star.script.vba.EventIdentifier.
+        @param nEventId  Event identifier from com.sun.star.script.vba.VBAEventId.
         @param pcMacroName  Name of the associated VBA event handler macro.
         @param eType  Document event or global event.
         @param nCancelIndex  0-based index of Cancel parameter, or -1.
@@ -86,15 +97,6 @@ protected:
             sal_Int32 nCancelIndex = -1,
             const css::uno::Any& rUserData = css::uno::Any() );
 
-    /** Throws, if the passed sequence does not contain a value at the specified index. */
-    static inline void checkArgument( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
-        { if( rArgs.getLength() <= nIndex ) throw css::lang::IllegalArgumentException(); }
-
-    /** Throws, if the passed sequence does not contain a value of a specific at the specified index. */
-    template< typename Type >
-    static inline void checkArgumentType( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
-        { if( (rArgs.getLength() <= nIndex) || !rArgs[ nIndex ].has< Type >() ) throw css::lang::IllegalArgumentException(); }
-
     // ------------------------------------------------------------------------
 
     struct EventQueueEntry
@@ -106,10 +108,6 @@ protected:
     };
     typedef ::std::deque< EventQueueEntry > EventQueue;
 
-    /** Derived classes return whether event processing is enabled. Throws if
-        the instance is in an invalid state. */
-    virtual bool implEventsEnabled() throw (css::uno::RuntimeException) = 0;
-
     /** Derived classes do additional prpeparations and return whether the
         event handler has to be called. */
     virtual bool implPrepareEvent(
diff --git a/vbahelper/inc/vbahelper/vbafontbase.hxx b/vbahelper/inc/vbahelper/vbafontbase.hxx
index 8e2ad0fd5dda..8e2ad0fd5dda 100644..100755
--- a/vbahelper/inc/vbahelper/vbafontbase.hxx
+++ b/vbahelper/inc/vbahelper/vbafontbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbaglobalbase.hxx b/vbahelper/inc/vbahelper/vbaglobalbase.hxx
index 1f7d7a280f56..1f7d7a280f56 100644..100755
--- a/vbahelper/inc/vbahelper/vbaglobalbase.hxx
+++ b/vbahelper/inc/vbahelper/vbaglobalbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx
index cf2d14370440..b3307ea8214e 100644..100755
--- a/vbahelper/inc/vbahelper/vbahelper.hxx
+++ b/vbahelper/inc/vbahelper/vbahelper.hxx
@@ -83,7 +83,7 @@ namespace ooo
 
         VBAHELPER_DLLPUBLIC void dispatchRequests( const css::uno::Reference< css::frame::XModel>& xModel, const rtl::OUString& aUrl );
      VBAHELPER_DLLPUBLIC void dispatchRequests (const css::uno::Reference< css::frame::XModel>& xModel, const rtl::OUString & aUrl, const css::uno::Sequence< css::beans::PropertyValue >& sProps, const css::uno::Reference< css::frame::XDispatchResultListener >& rListener = css::uno::Reference< css::frame::XDispatchResultListener >(), const sal_Bool bSilent = sal_True );
-        VBAHELPER_DLLPUBLIC void dispatchExecute(SfxViewShell* pView, USHORT nSlot, SfxCallMode nCall = SFX_CALLMODE_SYNCHRON );
+        VBAHELPER_DLLPUBLIC void dispatchExecute(SfxViewShell* pView, sal_uInt16 nSlot, SfxCallMode nCall = SFX_CALLMODE_SYNCHRON );
         VBAHELPER_DLLPUBLIC sal_Int32 OORGBToXLRGB( sal_Int32 );
         VBAHELPER_DLLPUBLIC sal_Int32 XLRGBToOORGB( sal_Int32 );
         VBAHELPER_DLLPUBLIC css::uno::Any OORGBToXLRGB( const css::uno::Any& );
@@ -193,6 +193,7 @@ public:
     virtual void setHeight( double nHeight );
     virtual double getWidth();
     virtual void setWidth( double nWidth);
+    virtual ~ConcreteXShapeGeometryAttributes();
 };
 
 #define VBA_LEFT "PositionX"
@@ -201,11 +202,8 @@ public:
 #define VBA_WIDTH "Width"
 class VBAHELPER_DLLPUBLIC UserFormGeometryHelper : public AbstractGeometryAttributes
 {
-    css::uno::Reference< css::awt::XUnitConversion > mxControlUnits;
-    css::uno::Reference< css::beans::XPropertySet > mxModel;
-
-    sal_Int32 ConvertLogicToPixel( sal_Int32 nValue, sal_Bool bIsPoint, sal_Bool bIsX, sal_Int16 nSourceUnit );
-    sal_Int32 ConvertPixelToLogic( sal_Int32 nValue, sal_Bool bIsPoint, sal_Bool bIsX, sal_Int16 nTargetUnit );
+    css::uno::Reference< css::awt::XWindow > mxWindow;
+    sal_Bool mbDialog;
 
 public:
     UserFormGeometryHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::awt::XControl >& xControl );
diff --git a/vbahelper/inc/vbahelper/vbahelperinterface.hxx b/vbahelper/inc/vbahelper/vbahelperinterface.hxx
index 68217a63add9..33bcd40edad5 100644..100755
--- a/vbahelper/inc/vbahelper/vbahelperinterface.hxx
+++ b/vbahelper/inc/vbahelper/vbahelperinterface.hxx
@@ -64,7 +64,7 @@
 const ::rtl::OUString sHelperServiceName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.HelperServiceBase" ) );
 
 template< typename Ifc1 >
-class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl : public Ifc1
+class InheritedHelperInterfaceImpl : public Ifc1
 {
 protected:
     css::uno::WeakReference< ov::XHelperInterface > mxParent;
@@ -110,7 +110,7 @@ public:
  };
 
 template< typename Ifc1 >
-class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl1 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > >
+class InheritedHelperInterfaceImpl1 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > >
 {
     typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > > Base;
 public:
@@ -120,7 +120,7 @@ public:
 };
 
 template< typename Ifc1, typename Ifc2 >
-class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl2 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper2< Ifc1, Ifc2 > >
+class InheritedHelperInterfaceImpl2 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper2< Ifc1, Ifc2 > >
 {
     typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper2< Ifc1, Ifc2 > > Base;
 public:
@@ -130,7 +130,7 @@ public:
 };
 
 template< typename Ifc1, typename Ifc2, typename Ifc3 >
-class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl3 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper3< Ifc1, Ifc2, Ifc3 > >
+class InheritedHelperInterfaceImpl3 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper3< Ifc1, Ifc2, Ifc3 > >
 {
     typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper3< Ifc1, Ifc2, Ifc3 > > Base;
 public:
diff --git a/vbahelper/inc/vbahelper/vbapagesetupbase.hxx b/vbahelper/inc/vbahelper/vbapagesetupbase.hxx
index a4294f425705..a4294f425705 100644..100755
--- a/vbahelper/inc/vbahelper/vbapagesetupbase.hxx
+++ b/vbahelper/inc/vbahelper/vbapagesetupbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbapropvalue.hxx b/vbahelper/inc/vbahelper/vbapropvalue.hxx
index 70e4c3aff2a9..70e4c3aff2a9 100644..100755
--- a/vbahelper/inc/vbahelper/vbapropvalue.hxx
+++ b/vbahelper/inc/vbahelper/vbapropvalue.hxx
diff --git a/vbahelper/inc/vbahelper/vbashape.hxx b/vbahelper/inc/vbahelper/vbashape.hxx
index 93f670f1d5fe..93f670f1d5fe 100644..100755
--- a/vbahelper/inc/vbahelper/vbashape.hxx
+++ b/vbahelper/inc/vbahelper/vbashape.hxx
diff --git a/vbahelper/inc/vbahelper/vbashaperange.hxx b/vbahelper/inc/vbahelper/vbashaperange.hxx
index 7a580dac5e77..7a580dac5e77 100644..100755
--- a/vbahelper/inc/vbahelper/vbashaperange.hxx
+++ b/vbahelper/inc/vbahelper/vbashaperange.hxx
diff --git a/vbahelper/inc/vbahelper/vbashapes.hxx b/vbahelper/inc/vbahelper/vbashapes.hxx
index 86e1ba3c6f37..86e1ba3c6f37 100644..100755
--- a/vbahelper/inc/vbahelper/vbashapes.hxx
+++ b/vbahelper/inc/vbahelper/vbashapes.hxx
diff --git a/vbahelper/inc/vbahelper/vbatextframe.hxx b/vbahelper/inc/vbahelper/vbatextframe.hxx
index 584e2559315c..584e2559315c 100644..100755
--- a/vbahelper/inc/vbahelper/vbatextframe.hxx
+++ b/vbahelper/inc/vbahelper/vbatextframe.hxx
diff --git a/vbahelper/inc/vbahelper/vbawindowbase.hxx b/vbahelper/inc/vbahelper/vbawindowbase.hxx
index f7e68273343f..f7e68273343f 100644..100755
--- a/vbahelper/inc/vbahelper/vbawindowbase.hxx
+++ b/vbahelper/inc/vbahelper/vbawindowbase.hxx