diff options
author | Mathias Bauer <mba@openoffice.org> | 2011-01-25 16:17:23 +0100 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2011-01-25 16:17:23 +0100 |
commit | b58925d9ca3307e156c28a64cee1081e1289a90d (patch) | |
tree | 5f0674494af2268007a70c552047905489ba57c1 | |
parent | CWS gnumake3: convert editeng module to gbuild (diff) | |
download | core-b58925d9ca3307e156c28a64cee1081e1289a90d.tar.gz core-b58925d9ca3307e156c28a64cee1081e1289a90d.zip |
CWS gnumake3: fix crappy vbahelper headers
-rwxr-xr-x | vbahelper/Library_vbahelper.mk | 8 | ||||
-rw-r--r-- | vbahelper/inc/vbahelper/vbaaccesshelper.hxx | 2 | ||||
-rw-r--r-- | vbahelper/inc/vbahelper/vbacollectionimpl.hxx | 4 | ||||
-rw-r--r-- | vbahelper/inc/vbahelper/vbahelper.hxx | 1 | ||||
-rw-r--r-- | vbahelper/inc/vbahelper/vbahelperinterface.hxx | 8 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbacontrol.hxx | 1 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbahelper.cxx | 3 |
7 files changed, 16 insertions, 11 deletions
diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index 6637b3a233ce..6bbfc4698527 100755 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -42,10 +42,10 @@ $(eval $(call gb_Library_set_include,vbahelper,\ -I$(OUTDIR)/inc/offuh \ )) -#$(eval $(call gb_Library_set_defs,vbahelper,\ -# $$(DEFS) \ -# -DVBAHELPER_DLLIMPLEMENTATION \ -#)) +$(eval $(call gb_Library_set_defs,vbahelper,\ + $$(DEFS) \ + -DVBAHELPER_DLLIMPLEMENTATION \ +)) # add libraries to be linked to vbahelper; again these names need to be given as # specified in Repository.mk diff --git a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx index 79bb44ce30a4..9fcfde744bbc 100644 --- a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx +++ b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx @@ -35,7 +35,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/vbacollectionimpl.hxx b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx index 5bd58b44adaf..601d996a5e64 100644 --- a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx +++ b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx @@ -150,7 +150,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; @@ -335,7 +335,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/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx index 4c4a9f5d7204..dda2200aa04a 100644 --- a/vbahelper/inc/vbahelper/vbahelper.hxx +++ b/vbahelper/inc/vbahelper/vbahelper.hxx @@ -186,6 +186,7 @@ public: virtual void setHeight( double nHeight ); virtual double getWidth(); virtual void setWidth( double nWidth); + virtual ~ConcreteXShapeGeometryAttributes(); }; #define VBA_LEFT "PositionX" diff --git a/vbahelper/inc/vbahelper/vbahelperinterface.hxx b/vbahelper/inc/vbahelper/vbahelperinterface.hxx index b095b5cd2823..dcd04af3d55f 100644 --- a/vbahelper/inc/vbahelper/vbahelperinterface.hxx +++ b/vbahelper/inc/vbahelper/vbahelperinterface.hxx @@ -63,7 +63,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; @@ -109,7 +109,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: @@ -119,7 +119,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: @@ -129,7 +129,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/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/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 65974738c3f4..c435744c5606 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -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 ) { |