ab80: resync to m100

5 files changed, 10 insertions, 152 deletions

diff --git a/vbahelper/source/msforms/makefile.mk b/vbahelper/source/msforms/makefile.mk
deleted file mode 100644
index 40a6b8350fd4..000000000000
--- a/vbahelper/source/msforms/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=vbahelper
-TARGET=msforms
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.IF "$(ENABLE_VBA)" == "NO"
-dummy:
-    @echo "Nothing to build"
-.ENDIF
-
-.INCLUDE :  settings.mk
-
-SLOFILES=\
-    $(SLO)$/vbacontrol.obj \
-    $(SLO)$/vbacontrols.obj \
-    $(SLO)$/vbabutton.obj \
-    $(SLO)$/vbacombobox.obj \
-    $(SLO)$/vbalabel.obj \
-    $(SLO)$/vbatextbox.obj \
-    $(SLO)$/vbaradiobutton.obj \
-    $(SLO)$/vbalistbox.obj \
-    $(SLO)$/vbatogglebutton.obj \
-    $(SLO)$/vbacheckbox.obj \
-    $(SLO)$/vbaframe.obj \
-    $(SLO)$/vbascrollbar.obj \
-    $(SLO)$/vbaprogressbar.obj \
-    $(SLO)$/vbamultipage.obj \
-    $(SLO)$/vbalistcontrolhelper.obj \
-    $(SLO)$/vbaspinbutton.obj \
-    $(SLO)$/vbasystemaxcontrol.obj \
-    $(SLO)$/vbaimage.obj \
-    $(SLO)$/vbapages.obj \
-    $(SLO)$/vbauserform.obj \
-    $(SLO)$/service.obj \
-
-# #FIXME vbapropvalue needs to move to vbahelper
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx
index 992fbd94a8c5..247eabfe95e8 100644
--- a/vbahelper/source/msforms/vbacontrol.hxx
+++ b/vbahelper/source/msforms/vbacontrol.hxx
@@ -41,6 +41,7 @@
 #include <memory>
 
 //typedef ::cppu::WeakImplHelper1< ov::msforms::XControl > ControlImpl_BASE;
+//template SAL_DLLPUBLIC_IMPORT InheritedHelperInterfaceImpl1< ov::msforms::XControl >;
 typedef InheritedHelperInterfaceImpl1< ov::msforms::XControl > ControlImpl_BASE;
 
 class ScVbaControl : public ControlImpl_BASE
diff --git a/vbahelper/source/vbahelper/makefile.mk b/vbahelper/source/vbahelper/makefile.mk
deleted file mode 100644
index 51fa5b449d23..000000000000
--- a/vbahelper/source/vbahelper/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/../
-PRJNAME=vbahelper
-TARGET=vbahelperbits
-
-ENABLE_EXCEPTIONS := TRUE
-VISIBILITY_HIDDEN=TRUE
-# --- Settings -----------------------------------------------------
-
-.IF "$(ENABLE_VBA)" == "NO"
-dummy:
-    @echo "Nothing to build"
-.ENDIF
-
-.INCLUDE :  settings.mk
-
-SLOFILES=\
-    $(SLO)$/vbahelper.obj \
-    $(SLO)$/vbapropvalue.obj \
-    $(SLO)$/vbacommandbars.obj \
-    $(SLO)$/vbacommandbar.obj \
-    $(SLO)$/vbacommandbarcontrols.obj \
-    $(SLO)$/vbacommandbarcontrol.obj \
-    $(SLO)$/vbacommandbarhelper.obj \
-    $(SLO)$/vbaapplicationbase.obj \
-    $(SLO)$/vbawindowbase.obj \
-    $(SLO)$/vbadocumentbase.obj \
-    $(SLO)$/vbadocumentsbase.obj \
-    $(SLO)$/vbaglobalbase.obj \
-    $(SLO)$/vbafontbase.obj \
-    $(SLO)$/vbadialogbase.obj \
-    $(SLO)$/vbadialogsbase.obj \
-    $(SLO)$/vbashape.obj \
-    $(SLO)$/vbacolorformat.obj \
-    $(SLO)$/vbashapes.obj \
-    $(SLO)$/vbalineformat.obj \
-    $(SLO)$/vbafillformat.obj \
-    $(SLO)$/vbapictureformat.obj \
-    $(SLO)$/vbashaperange.obj \
-    $(SLO)$/vbatextframe.obj \
-    $(SLO)$/vbapagesetupbase.obj \
-    $(SLO)$/vbaeventshelperbase.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index 65974738c3f4..cfce8b49e3d1 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -198,9 +198,9 @@ implnCut()
 {
     ScTabViewShell* pViewShell =  getCurrentBestViewShell();
     if ( pViewShell )
-        pViewShell->CutToClip( NULL, TRUE );
+        pViewShell->CutToClip( NULL, sal_True );
 }
-void implnPasteSpecial(SfxViewShell* pViewShell, USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
+void implnPasteSpecial(SfxViewShell* pViewShell, sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
 {
     PasteCellsWarningReseter resetWarningBox;
     sal_Bool bAsLink(sal_False), bOtherDoc(sal_False);
@@ -225,7 +225,7 @@ void implnPasteSpecial(SfxViewShell* pViewShell, USHORT nFlags,USHORT nFunction,
                     pDoc = pOwnClip->GetDocument();
                 pTabViewShell->PasteFromClip( nFlags, pDoc,
                     nFunction, bSkipEmpty, bTranspose, bAsLink,
-                    eMoveMode, IDF_NONE, TRUE );
+                    eMoveMode, IDF_NONE, sal_True );
                 pTabViewShell->CellContentChanged();
             }
         }
@@ -298,7 +298,7 @@ aNULL()
     return aNULLL;
 }
 
-void dispatchExecute(SfxViewShell* pViewShell, USHORT nSlot, SfxCallMode nCall)
+void dispatchExecute(SfxViewShell* pViewShell, sal_uInt16 nSlot, SfxCallMode nCall)
 {
     SfxViewFrame* pViewFrame = NULL;
     if ( pViewShell )
@@ -607,7 +607,7 @@ void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno::
                 }
             }
             else
-                pDispatcher->Execute( (USHORT)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
+                pDispatcher->Execute( (sal_uInt16)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
         }
 
     }
@@ -879,6 +879,9 @@ ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::u
 {
     m_pShapeHelper.reset( new ShapeHelper( xShape ) );
 }
+ConcreteXShapeGeometryAttributes::~ConcreteXShapeGeometryAttributes()
+{
+}
 
 sal_Int32 getPointerStyle( const uno::Reference< frame::XModel >& xModel )
 {
diff --git a/vbahelper/source/vbahelper/vbawindowbase.cxx b/vbahelper/source/vbahelper/vbawindowbase.cxx
index 50da8451aedb..54546a394690 100644
--- a/vbahelper/source/vbahelper/vbawindowbase.cxx
+++ b/vbahelper/source/vbahelper/vbawindowbase.cxx
@@ -80,7 +80,7 @@ css::awt::Rectangle getPosSize( const uno::Reference< frame::XModel >& xModel )
     return aRect;
 }
 
-void setPosSize( const uno::Reference< frame::XModel >& xModel, sal_Int32 nValue, USHORT nFlag )
+void setPosSize( const uno::Reference< frame::XModel >& xModel, sal_Int32 nValue, sal_uInt16 nFlag )
 {
     uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
     uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );