From 78c59356757e189f3b3297ac3be0c25f7d28dfc2 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Fri, 14 Jan 2011 15:33:42 +0100 Subject: removetooltypes01: #i112600# remove tooltypes from vbahelper --- vbahelper/inc/vbahelper/vbahelper.hxx | 2 +- vbahelper/source/vbahelper/vbahelper.cxx | 10 +++++----- vbahelper/source/vbahelper/vbawindowbase.cxx | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'vbahelper') diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx index 4c4a9f5d7204..86ded7177c88 100644 --- a/vbahelper/inc/vbahelper/vbahelper.hxx +++ b/vbahelper/inc/vbahelper/vbahelper.hxx @@ -78,7 +78,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 ); - 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& ); diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 65974738c3f4..51f43cc01f8f 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 ); } } 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 ); -- cgit From 3335b2f6920fed0f3cf3e8136c81718154505f86 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 24 Jan 2011 10:44:14 +0100 Subject: CWS gnumake3: convert module vbahelper to gbuild --- vbahelper/Library_msforms.mk | 112 ++++++++++++++++++++++++++++++++++++++ vbahelper/Library_vbahelper.mk | 118 +++++++++++++++++++++++++++++++++++++++++ vbahelper/Makefile | 38 +++++++++++++ vbahelper/Module_vbahelper.mk | 48 +++++++++++++++++ vbahelper/Package_inc.mk | 51 ++++++++++++++++++ vbahelper/prj/build.lst | 5 +- vbahelper/prj/d.lst | 30 ----------- vbahelper/prj/makefile.mk | 40 ++++++++++++++ 8 files changed, 408 insertions(+), 34 deletions(-) create mode 100755 vbahelper/Library_msforms.mk create mode 100755 vbahelper/Library_vbahelper.mk create mode 100755 vbahelper/Makefile create mode 100755 vbahelper/Module_vbahelper.mk create mode 100755 vbahelper/Package_inc.mk delete mode 100644 vbahelper/prj/d.lst create mode 100755 vbahelper/prj/makefile.mk (limited to 'vbahelper') diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk new file mode 100755 index 000000000000..e1aafe6aa92b --- /dev/null +++ b/vbahelper/Library_msforms.mk @@ -0,0 +1,112 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +# MODULE is the name of the module the makefile is located in + +# declare a library +# LIB is the name of the library as it is found in Repository.mk +$(eval $(call gb_Library_Library,msforms)) + +# for platforms supporting PCH: declare the location of the pch file +# this is the name of the cxx file (without extension) +#$(eval $(call gb_Library_add_precompiled_header,msforms,$(SRCDIR)/vbahelper/PCH_FILE)) + +# in case UNO services are exported: declare location of component file +$(eval $(call gb_Library_set_componentfile,msforms,vbahelper/util/msforms)) + +# add any additional include paths for this library here +$(eval $(call gb_Library_set_include,msforms,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ +)) + +# add libraries to be linked to LIB; again these names need to be given as +# specified in Repository.mk +$(eval $(call gb_Library_add_linked_libs,msforms,\ + comphelper \ + cppu \ + cppuhelper \ + svl \ + svt \ + tl \ + sal \ + vbahelper \ + sfx \ + svx \ + vcl \ + tk \ + sb \ + stl \ +)) + +# this code usually will be platform specific; these libraries are also defined in Repository.mk +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,msforms,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,msforms,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif + +# add all source files that shall be compiled with exceptions enabled +# the name is relative to $(SRCROOT) and must not contain an extension +$(eval $(call gb_Library_add_exception_objects,msforms,\ + vbahelper/source/msforms/service \ + vbahelper/source/msforms/vbabutton \ + vbahelper/source/msforms/vbacheckbox \ + vbahelper/source/msforms/vbacombobox \ + vbahelper/source/msforms/vbacontrol \ + vbahelper/source/msforms/vbacontrols \ + vbahelper/source/msforms/vbaframe \ + vbahelper/source/msforms/vbaimage \ + vbahelper/source/msforms/vbalabel \ + vbahelper/source/msforms/vbalistbox \ + vbahelper/source/msforms/vbalistcontrolhelper \ + vbahelper/source/msforms/vbamultipage \ + vbahelper/source/msforms/vbapages \ + vbahelper/source/msforms/vbaprogressbar \ + vbahelper/source/msforms/vbaradiobutton \ + vbahelper/source/msforms/vbascrollbar \ + vbahelper/source/msforms/vbaspinbutton \ + vbahelper/source/msforms/vbasystemaxcontrol \ + vbahelper/source/msforms/vbatextbox \ + vbahelper/source/msforms/vbatogglebutton \ + vbahelper/source/msforms/vbauserform \ +)) + +# vim: set noet sw=4 ts=4: + diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk new file mode 100755 index 000000000000..6637b3a233ce --- /dev/null +++ b/vbahelper/Library_vbahelper.mk @@ -0,0 +1,118 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,vbahelper)) + +$(eval $(call gb_Library_add_package_headers,vbahelper,vbahelper_inc)) + +# for platforms supporting PCH: declare the location of the pch file +# this is the name of the cxx file (without extension) +#$(eval $(call gb_Library_add_precompiled_header,vbahelper,$(SRCDIR)/vbahelper/PCH_FILE)) + +# in case UNO services are exported: declare location of component file +#$(eval $(call gb_Library_set_componentfile,vbahelper,vbahelper/COMPONENT_FILE)) + +# add any additional include paths for this library here +$(eval $(call gb_Library_set_include,vbahelper,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ +)) + +#$(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 +$(eval $(call gb_Library_add_linked_libs,vbahelper,\ + cppu \ + cppuhelper \ + comphelper \ + sb \ + tl \ + sal \ + sfx \ + stl \ + svt \ + vcl \ + svl \ + msfilter \ + tk \ +)) + +# this code usually will be platform specific; these libraries are also defined in Repository.mk +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,vbahelper,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,vbahelper,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif + +# add all source files that shall be compiled with exceptions enabled +# the name is relative to $(SRCROOT) and must not contain an extension +$(eval $(call gb_Library_add_exception_objects,vbahelper,\ + vbahelper/source/vbahelper/vbaapplicationbase \ + vbahelper/source/vbahelper/vbacolorformat \ + vbahelper/source/vbahelper/vbacommandbar \ + vbahelper/source/vbahelper/vbacommandbarcontrol \ + vbahelper/source/vbahelper/vbacommandbarcontrols \ + vbahelper/source/vbahelper/vbacommandbarhelper \ + vbahelper/source/vbahelper/vbacommandbars \ + vbahelper/source/vbahelper/vbadialogbase \ + vbahelper/source/vbahelper/vbadialogsbase \ + vbahelper/source/vbahelper/vbadocumentbase \ + vbahelper/source/vbahelper/vbadocumentsbase \ + vbahelper/source/vbahelper/vbaeventshelperbase \ + vbahelper/source/vbahelper/vbafillformat \ + vbahelper/source/vbahelper/vbafontbase \ + vbahelper/source/vbahelper/vbaglobalbase \ + vbahelper/source/vbahelper/vbahelper \ + vbahelper/source/vbahelper/vbalineformat \ + vbahelper/source/vbahelper/vbapagesetupbase \ + vbahelper/source/vbahelper/vbapictureformat \ + vbahelper/source/vbahelper/vbapropvalue \ + vbahelper/source/vbahelper/vbashape \ + vbahelper/source/vbahelper/vbashaperange \ + vbahelper/source/vbahelper/vbashapes \ + vbahelper/source/vbahelper/vbatextframe \ + vbahelper/source/vbahelper/vbawindowbase \ +)) + +# vim: set noet sw=4 ts=4: + diff --git a/vbahelper/Makefile b/vbahelper/Makefile new file mode 100755 index 000000000000..a79aff831024 --- /dev/null +++ b/vbahelper/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/vbahelper/Module_vbahelper.mk b/vbahelper/Module_vbahelper.mk new file mode 100755 index 000000000000..8375f0f32c29 --- /dev/null +++ b/vbahelper/Module_vbahelper.mk @@ -0,0 +1,48 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,vbahelper)) + +ifeq ($(strip $(ENABLE_VBA)),YES) +# the targets to be inserted are their file names without .mk extension +$(eval $(call gb_Module_add_targets,vbahelper,\ + Library_vbahelper \ + Library_msforms \ + Package_inc \ +)) +endif + +# add any runtime tests (unit tests) here +# remove if no tests +#$(eval $(call gb_Module_add_check_targets,vbahelper,\ +#)) + +# add any subsequent checks (e.g. complex tests) here +#$(eval $(call gb_Module_add_subsequentcheck_targets,vbahelper,\ +#)) + +# vim: set noet sw=4 ts=4: diff --git a/vbahelper/Package_inc.mk b/vbahelper/Package_inc.mk new file mode 100755 index 000000000000..e8194c440fa3 --- /dev/null +++ b/vbahelper/Package_inc.mk @@ -0,0 +1,51 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,vbahelper_inc,$(SRCDIR)/vbahelper/inc)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/helperdecl.hxx,vbahelper/helperdecl.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaaccesshelper.hxx,vbahelper/vbaaccesshelper.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaapplicationbase.hxx,vbahelper/vbaapplicationbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbacollectionimpl.hxx,vbahelper/vbacollectionimpl.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadialogbase.hxx,vbahelper/vbadialogbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadialogsbase.hxx,vbahelper/vbadialogsbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadllapi.h,vbahelper/vbadllapi.h)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadocumentbase.hxx,vbahelper/vbadocumentbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadocumentsbase.hxx,vbahelper/vbadocumentsbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaeventshelperbase.hxx,vbahelper/vbaeventshelperbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbafontbase.hxx,vbahelper/vbafontbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaglobalbase.hxx,vbahelper/vbaglobalbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbahelper.hxx,vbahelper/vbahelper.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbahelperinterface.hxx,vbahelper/vbahelperinterface.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbapagesetupbase.hxx,vbahelper/vbapagesetupbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbapropvalue.hxx,vbahelper/vbapropvalue.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbashape.hxx,vbahelper/vbashape.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbashaperange.hxx,vbahelper/vbashaperange.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbashapes.hxx,vbahelper/vbashapes.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbatextframe.hxx,vbahelper/vbatextframe.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbawindowbase.hxx,vbahelper/vbawindowbase.hxx)) + +# vim: set noet sw=4 ts=4: diff --git a/vbahelper/prj/build.lst b/vbahelper/prj/build.lst index 0fadb0c94625..312c9b062233 100644 --- a/vbahelper/prj/build.lst +++ b/vbahelper/prj/build.lst @@ -1,6 +1,3 @@ vba vbahelper : oovbaapi offuh basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal LIBXSLT:libxslt NULL vba vbahelper usr1 - all vba_mkout NULL -#vba vbahelper\inc nmake - all vba_inc NULL -vba vbahelper\source\vbahelper nmake - all vba_vbahelper NULL -vba vbahelper\source\msforms nmake - all vba_msforms NULL -vba vbahelper\util nmake - all vba_util vba_vbahelper vba_msforms NULL +vba vbahelper\prj nmake - all vba_prj NULL diff --git a/vbahelper/prj/d.lst b/vbahelper/prj/d.lst deleted file mode 100644 index a5457b730409..000000000000 --- a/vbahelper/prj/d.lst +++ /dev/null @@ -1,30 +0,0 @@ -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% -..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% -..\%__SRC%\lib\ivbahelper.lib %_DEST%\lib%_EXT%\vbahelper.lib -..\%__SRC%\lib\vbahelp*.* %_DEST%\lib%_EXT%\vba*.* -..\%__SRC%\bin\vbahelper*.* %_DEST%\bin%_EXT%\vbahelper*.* -..\%__SRC%\bin\msforms*.* %_DEST%\bin%_EXT%\msforms*.* - -mkdir: %_DEST%\inc%_EXT%\basic -..\inc\vbahelper\vbacollectionimpl.hxx %_DEST%\inc%_EXT%\vbahelper\vbacollectionimpl.hxx -..\inc\vbahelper\vbahelper.hxx %_DEST%\inc%_EXT%\vbahelper\vbahelper.hxx -..\inc\vbahelper\vbaaccesshelper.hxx %_DEST%\inc%_EXT%\vbahelper\vbaaccesshelper.hxx -..\inc\vbahelper\helperdecl.hxx %_DEST%\inc%_EXT%\vbahelper\helperdecl.hxx -..\inc\vbahelper\vbahelperinterface.hxx %_DEST%\inc%_EXT%\vbahelper\vbahelperinterface.hxx -..\inc\vbahelper\vbaapplicationbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaapplicationbase.hxx -..\inc\vbahelper\vbafontbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbafontbase.hxx -..\inc\vbahelper\vbadllapi.h %_DEST%\inc%_EXT%\vbahelper\vbadllapi.h -..\inc\vbahelper\vbawindowbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbawindowbase.hxx -..\inc\vbahelper\vbadocumentbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadocumentbase.hxx -..\inc\vbahelper\vbadocumentsbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadocumentsbase.hxx -..\inc\vbahelper\vbapropvalue.hxx %_DEST%\inc%_EXT%\vbahelper\vbapropvalue.hxx -..\inc\vbahelper\vbaglobalbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaglobalbase.hxx -..\inc\vbahelper\vbadialogbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadialogbase.hxx -..\inc\vbahelper\vbadialogsbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadialogsbase.hxx -..\inc\vbahelper\vbashape.hxx %_DEST%\inc%_EXT%\vbahelper\vbashape.hxx -..\inc\vbahelper\vbashapes.hxx %_DEST%\inc%_EXT%\vbahelper\vbashapes.hxx -..\inc\vbahelper\vbatextframe.hxx %_DEST%\inc%_EXT%\vbahelper\vbatextframe.hxx -..\inc\vbahelper\vbashaperange.hxx %_DEST%\inc%_EXT%\vbahelper\vbashaperange.hxx -..\inc\vbahelper\vbapagesetupbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbapagesetupbase.hxx -..\%__SRC%\misc\msforms.component %_DEST%\xml%_EXT%\msforms.component -..\inc\vbahelper\vbaeventshelperbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaeventshelperbase.hxx diff --git a/vbahelper/prj/makefile.mk b/vbahelper/prj/makefile.mk new file mode 100755 index 000000000000..c73a3d944bbf --- /dev/null +++ b/vbahelper/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) -- cgit From b58925d9ca3307e156c28a64cee1081e1289a90d Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 25 Jan 2011 16:17:23 +0100 Subject: CWS gnumake3: fix crappy vbahelper headers --- vbahelper/Library_vbahelper.mk | 8 ++++---- vbahelper/inc/vbahelper/vbaaccesshelper.hxx | 2 +- vbahelper/inc/vbahelper/vbacollectionimpl.hxx | 4 ++-- vbahelper/inc/vbahelper/vbahelper.hxx | 1 + vbahelper/inc/vbahelper/vbahelperinterface.hxx | 8 ++++---- vbahelper/source/msforms/vbacontrol.hxx | 1 + vbahelper/source/vbahelper/vbahelper.cxx | 3 +++ 7 files changed, 16 insertions(+), 11 deletions(-) (limited to 'vbahelper') 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 #include #include -#define VBAHELPER_DLLIMPLEMENTATION +//#define VBAHELPER_DLLIMPLEMENTATION #include #include 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 // 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 //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 ) { -- cgit From 80fa6e0c97fc50fee714f3a7dc75d11d2180877b Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 25 Jan 2011 18:19:55 +0100 Subject: CWS gnumake3: fix license headers --- vbahelper/Library_msforms.mk | 6 +++--- vbahelper/Library_vbahelper.mk | 6 +++--- vbahelper/Module_vbahelper.mk | 6 +++--- vbahelper/Package_inc.mk | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'vbahelper') diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk index e1aafe6aa92b..6bd335f9e210 100755 --- a/vbahelper/Library_msforms.mk +++ b/vbahelper/Library_msforms.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # # for a copy of the LGPLv3 License. # diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index 6bbfc4698527..01d144cc4897 100755 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # # for a copy of the LGPLv3 License. # diff --git a/vbahelper/Module_vbahelper.mk b/vbahelper/Module_vbahelper.mk index 8375f0f32c29..23f560f8af0d 100755 --- a/vbahelper/Module_vbahelper.mk +++ b/vbahelper/Module_vbahelper.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # # for a copy of the LGPLv3 License. # diff --git a/vbahelper/Package_inc.mk b/vbahelper/Package_inc.mk index e8194c440fa3..6d8033aa5b02 100755 --- a/vbahelper/Package_inc.mk +++ b/vbahelper/Package_inc.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # # for a copy of the LGPLv3 License. # -- cgit From 2d3953778c21a379394b9a24fe0c3574de8ce003 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 26 Jan 2011 13:41:35 +0100 Subject: CWS gnumake3: wrong license header in solenv, missing d.lst in sot and vbahelper --- vbahelper/prj/d.lst | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 vbahelper/prj/d.lst (limited to 'vbahelper') diff --git a/vbahelper/prj/d.lst b/vbahelper/prj/d.lst new file mode 100644 index 000000000000..e69de29bb2d1 -- cgit From 6d8c5d706723968e36f194c99134b83ed44e8c41 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 28 Jan 2011 13:59:35 +0100 Subject: CWS gnumake3: kill ENABLE_VBA --- vbahelper/Module_vbahelper.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'vbahelper') diff --git a/vbahelper/Module_vbahelper.mk b/vbahelper/Module_vbahelper.mk index 23f560f8af0d..8fe6c15b6abf 100755 --- a/vbahelper/Module_vbahelper.mk +++ b/vbahelper/Module_vbahelper.mk @@ -27,14 +27,12 @@ $(eval $(call gb_Module_Module,vbahelper)) -ifeq ($(strip $(ENABLE_VBA)),YES) # the targets to be inserted are their file names without .mk extension $(eval $(call gb_Module_add_targets,vbahelper,\ Library_vbahelper \ Library_msforms \ Package_inc \ )) -endif # add any runtime tests (unit tests) here # remove if no tests -- cgit From d1d8b2619b4ddd60fdb658240e48fa223d5b53ae Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 31 Jan 2011 14:12:13 +0100 Subject: CWS gnumake3: workaround for cygwin coredump; don't create deliverlog in parallel --- vbahelper/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vbahelper') diff --git a/vbahelper/prj/makefile.mk b/vbahelper/prj/makefile.mk index c73a3d944bbf..e312a7ccab65 100755 --- a/vbahelper/prj/makefile.mk +++ b/vbahelper/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog -- cgit From 877a4a1fe7b438794e6b2141018477ec847cc65e Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 1 Feb 2011 19:21:11 +0100 Subject: gnumake3: remove loads of obsolete dmakefiles --- vbahelper/source/msforms/makefile.mk | 72 --------------------- vbahelper/source/vbahelper/makefile.mk | 74 ---------------------- vbahelper/util/makefile.mk | 112 --------------------------------- 3 files changed, 258 deletions(-) delete mode 100644 vbahelper/source/msforms/makefile.mk delete mode 100644 vbahelper/source/vbahelper/makefile.mk delete mode 100644 vbahelper/util/makefile.mk (limited to 'vbahelper') 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 -# -# 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/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 -# -# 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/util/makefile.mk b/vbahelper/util/makefile.mk deleted file mode 100644 index 9469df473685..000000000000 --- a/vbahelper/util/makefile.mk +++ /dev/null @@ -1,112 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=vbahelper -TARGET=vbahelper - -# --- Settings --------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(ENABLE_VBA)" == "NO" -dummy: - @echo "Nothing to build" -.ENDIF - -TARGET_HELPER=vbahelper - -LIB1TARGET= $(SLB)$/$(TARGET).lib -LIB1FILES=$(SLB)$/$(TARGET)bits.lib - -SHL1TARGET= $(TARGET_HELPER)$(DLLPOSTFIX) - - -# dynamic libraries -SHL1STDLIBS= \ - $(CPPULIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(BASICLIB) \ - $(TOOLSLIB) \ - $(SALLIB)\ - $(SFXLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(VCLLIB) \ - $(SVTOOLLIB) \ - $(MSFILTERLIB) \ - $(TKLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET_HELPER) -SHL1USE_EXPORTS=name -SHL1LIBS=$(LIB1TARGET) - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -DEFLIB1NAME=$(TARGET) - -TARGET_MSFORMS=msforms -SHL2TARGET=$(TARGET_MSFORMS)$(DLLPOSTFIX).uno -SHL2IMPLIB= i$(TARGET_MSFORMS) - -SHL2VERSIONMAP=$(SOLARENV)/src/component.map -SHL2DEF=$(MISC)$/$(SHL2TARGET).def -DEF2NAME=$(SHL2TARGET) -SHL2STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(COMPHELPERLIB) \ - $(SVLIB) \ - $(TOOLSLIB) \ - $(SALLIB)\ - $(VBAHELPERLIB) \ - $(SFXLIB) \ - $(SVXLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(VCLLIB) \ - $(TKLIB) \ - $(BASICLIB) \ - -SHL2DEPN=$(SHL1TARGETN) -SHL2LIBS=$(SLB)$/$(TARGET_MSFORMS).lib - -# --- Targets ----------------------------------------------------------- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/msforms.component - -$(MISC)/msforms.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - msforms.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt msforms.component -- cgit From ab451ff91e394a5f756558a9b27b39b55c43f075 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 2 Feb 2011 17:05:04 +0100 Subject: CWS gnumake3: rename gb_StdLibs -> gb_STDLIBS; remove explicit linking of individual standard libs from makefiles; fix export problem in framework --- vbahelper/Library_msforms.mk | 20 +------------------- vbahelper/Library_vbahelper.mk | 20 +------------------- 2 files changed, 2 insertions(+), 38 deletions(-) (limited to 'vbahelper') diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk index 6bd335f9e210..3e23c492f32b 100755 --- a/vbahelper/Library_msforms.mk +++ b/vbahelper/Library_msforms.mk @@ -61,27 +61,9 @@ $(eval $(call gb_Library_add_linked_libs,msforms,\ tk \ sb \ stl \ + $(gb_STDLIBS) \ )) -# this code usually will be platform specific; these libraries are also defined in Repository.mk -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,msforms,\ - dl \ - m \ - pthread \ -)) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,msforms,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif - # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,msforms,\ diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index 01d144cc4897..722b66d709a1 100755 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -63,27 +63,9 @@ $(eval $(call gb_Library_add_linked_libs,vbahelper,\ svl \ msfilter \ tk \ + $(gb_STDLIBS) \ )) -# this code usually will be platform specific; these libraries are also defined in Repository.mk -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,vbahelper,\ - dl \ - m \ - pthread \ -)) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,vbahelper,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif - # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,vbahelper,\ -- cgit