From 95f3d4c562939999afe323aca72ac070b466e15f Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 01:29:37 +0200 Subject: CWS gnumake2: module reorg --- framework/Library_fwi.mk | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 framework/Library_fwi.mk (limited to 'framework/Library_fwi.mk') diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk new file mode 100644 index 000000000000..0e00df9d8300 --- /dev/null +++ b/framework/Library_fwi.mk @@ -0,0 +1,96 @@ +#************************************************************************* +# +# 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,fwi)) + +$(eval $(call gb_Library_add_package_headers,fwi,framework_inc)) + +$(eval $(call gb_Library_set_defs,fwi,\ + $$(DEFS) \ + -DFWI_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_set_include,fwi,\ + -I$(SRCDIR)/framework/inc/pch \ + -I$(SRCDIR)/framework/source/inc \ + -I$(SRCDIR)/framework/inc \ + -I$(WORKDIR)/inc/framework/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/framework \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,fwi,\ + comphelper \ + stl \ + tk \ + tl \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ + vos3 \ +)) + +$(eval $(call gb_Library_add_exception_objects,fwi,\ + framework/source/fwi/classes/converter \ + framework/source/fwi/classes/framelistanalyzer \ + framework/source/fwi/classes/propertysethelper \ + framework/source/fwi/classes/protocolhandlercache \ + framework/source/fwi/helper/mischelper \ + framework/source/fwi/helper/networkdomain \ + framework/source/fwi/helper/popupmenucontrollerbase \ + framework/source/fwi/helper/shareablemutex \ + framework/source/fwi/jobs/configaccess \ + framework/source/fwi/jobs/jobconst \ + framework/source/fwi/threadhelp/lockhelper \ + framework/source/fwi/threadhelp/transactionmanager \ + framework/source/fwi/uielement/constitemcontainer \ + framework/source/fwi/uielement/itemcontainer \ + framework/source/fwi/uielement/rootitemcontainer \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,fwi,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,fwi,\ + advapi32 \ + kernel32 \ + msvcrt \ + stl \ + unicows \ + uwinapi \ +)) +endif +# TODO: visibility +# vim: set noet sw=4 ts=4: -- cgit v1.2.3 From 4f40fd2727a826d5d0b06617e5179829d66df5d2 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 29 Oct 2010 15:36:30 +0200 Subject: CWS gnumake2: resolve conflicts and make sources buildable on Linux --- basic/prj/d.lst | 35 +-- framework/Library_fwe.mk | 1 + framework/Library_fwi.mk | 1 - framework/Package_inc.mk | 1 + framework/inc/classes/framelistanalyzer.hxx | 214 --------------- framework/inc/framework/framelistanalyzer.hxx | 214 +++++++++++++++ framework/prj/build.lst | 26 -- framework/prj/d.lst | 22 +- framework/source/dispatch/closedispatcher.cxx | 2 +- .../source/dispatch/startmoduledispatcher.cxx | 2 +- framework/source/fwe/classes/framelistanalyzer.cxx | 302 +++++++++++++++++++++ framework/source/fwi/classes/framelistanalyzer.cxx | 302 --------------------- framework/source/loadenv/loadenv.cxx | 2 +- framework/source/services/frame.cxx | 2 +- framework/util/makefile.mk | 27 +- linguistic/prj/d.lst | 6 +- sfx2/Library_sfx2.mk | 1 - sfx2/inc/sfx2/viewfac.hxx | 13 - sfx2/inc/sfx2/viewsh.hxx | 9 - sfx2/prj/build.lst | 31 +-- sfx2/source/appl/sfxhelp.cxx | 4 - sfx2/source/view/viewfac.cxx | 8 - sfx2/source/view/viewfrm.cxx | 6 - svx/source/form/filtnav.src | 31 --- svx/source/sdr/contact/viewcontactofsdrpage.cxx | 4 +- xmloff/source/transform/XMLFilterRegistration.cxx | 37 --- 26 files changed, 531 insertions(+), 772 deletions(-) delete mode 100644 framework/inc/classes/framelistanalyzer.hxx create mode 100644 framework/inc/framework/framelistanalyzer.hxx create mode 100644 framework/source/fwe/classes/framelistanalyzer.cxx delete mode 100644 framework/source/fwi/classes/framelistanalyzer.cxx (limited to 'framework/Library_fwi.mk') diff --git a/basic/prj/d.lst b/basic/prj/d.lst index 52f4afe902c0..41d1a59550f0 100644 --- a/basic/prj/d.lst +++ b/basic/prj/d.lst @@ -24,39 +24,6 @@ mkdir: %_DEST%\inc%_EXT%\basic ..\inc\basic\*.hrc %_DEST%\inc%_EXT%\basic\*.hrc ..\inc\basic\*.h %_DEST%\inc%_EXT%\basic\*.h -<<<<<<< local -======= -..\inc\basic\sbdef.hxx %_DEST%\inc%_EXT%\basic\sbdef.hxx -..\inc\basic\sbmod.hxx %_DEST%\inc%_EXT%\basic\sbmod.hxx -..\inc\basic\sbjsmod.hxx %_DEST%\inc%_EXT%\basic\sbjsmod.hxx -..\inc\basic\sbmeth.hxx %_DEST%\inc%_EXT%\basic\sbmeth.hxx -..\inc\basic\sbprop.hxx %_DEST%\inc%_EXT%\basic\sbprop.hxx -..\inc\basic\sbstar.hxx %_DEST%\inc%_EXT%\basic\sbstar.hxx -..\inc\basic\sbuno.hxx %_DEST%\inc%_EXT%\basic\sbuno.hxx -..\inc\basic\basmgr.hxx %_DEST%\inc%_EXT%\basic\basmgr.hxx -..\inc\basic\sberrors.hxx %_DEST%\inc%_EXT%\basic\sberrors.hxx -..\inc\basic\basrdll.hxx %_DEST%\inc%_EXT%\basic\basrdll.hxx -..\inc\basic\sbstdobj.hxx %_DEST%\inc%_EXT%\basic\sbstdobj.hxx -..\inc\basic\process.hxx %_DEST%\inc%_EXT%\basic\process.hxx -..\inc\basic\mybasic.hxx %_DEST%\inc%_EXT%\basic\mybasic.hxx -..\inc\basic\testtool.hxx %_DEST%\inc%_EXT%\basic\testtool.hxx -..\inc\basic\basicrt.hxx %_DEST%\inc%_EXT%\basic\basicrt.hxx -..\inc\basic\dispdefs.hxx %_DEST%\inc%_EXT%\basic\dispdefs.hxx -..\inc\basic\ttstrhlp.hxx %_DEST%\inc%_EXT%\basic\ttstrhlp.hxx - -..\inc\basic\sbx.hxx %_DEST%\inc%_EXT%\basic\sbx.hxx -..\inc\basic\sbxcore.hxx %_DEST%\inc%_EXT%\basic\sbxcore.hxx -..\inc\basic\sbxdef.hxx %_DEST%\inc%_EXT%\basic\sbxdef.hxx -..\inc\basic\sbxform.hxx %_DEST%\inc%_EXT%\basic\sbxform.hxx -..\inc\basic\sbxmeth.hxx %_DEST%\inc%_EXT%\basic\sbxmeth.hxx -..\inc\basic\sbxobj.hxx %_DEST%\inc%_EXT%\basic\sbxobj.hxx -..\inc\basic\sbxprop.hxx %_DEST%\inc%_EXT%\basic\sbxprop.hxx -..\inc\basic\sbxvar.hxx %_DEST%\inc%_EXT%\basic\sbxvar.hxx -..\inc\basic\sbxbase.hxx %_DEST%\inc%_EXT%\basic\sbxbase.hxx -..\inc\basic\sbxfac.hxx %_DEST%\inc%_EXT%\basic\sbxfac.hxx -..\inc\basic\sbxmstrm.hxx %_DEST%\inc%_EXT%\basic\sbxmstrm.hxx - -..\inc\basic\basicmanagerrepository.hxx %_DEST%\inc%_EXT%\basic\basicmanagerrepository.hxx ..\inc\modsizeexceeded.hxx %_DEST%\inc%_EXT%\basic\modsizeexceeded.hxx ..\%__SRC%\misc\sb.component %_DEST%\xml%_EXT%\sb.component ->>>>>>> other + diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index a8bcd7d40bf4..9dd3643681b5 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -65,6 +65,7 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/classes/addonsoptions \ framework/source/fwe/classes/bmkmenu \ framework/source/fwe/classes/fwkresid \ + framework/source/fwe/classes/framelistanalyzer \ framework/source/fwe/classes/imagewrapper \ framework/source/fwe/classes/menuextensionsupplier \ framework/source/fwe/classes/rootactiontriggercontainer \ diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index e320e5cfbc9b..568f0a1eb22a 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -62,7 +62,6 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\ $(eval $(call gb_Library_add_exception_objects,fwi,\ framework/source/fwi/classes/converter \ - framework/source/fwi/classes/framelistanalyzer \ framework/source/fwi/classes/propertysethelper \ framework/source/fwi/classes/protocolhandlercache \ framework/source/fwi/helper/mischelper \ diff --git a/framework/Package_inc.mk b/framework/Package_inc.mk index 8cb41e542265..adefc3ccbd56 100644 --- a/framework/Package_inc.mk +++ b/framework/Package_inc.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonsoptions.hxx, $(eval $(call gb_Package_add_file,framework_inc,inc/framework/bmkmenu.hxx,framework/bmkmenu.hxx)) $(eval $(call gb_Package_add_file,framework_inc,inc/framework/configimporter.hxx,framework/configimporter.hxx)) $(eval $(call gb_Package_add_file,framework_inc,inc/framework/eventsconfiguration.hxx,framework/eventsconfiguration.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/framelistanalyzer.hxx,framework/framelistanalyzer.hxx)) $(eval $(call gb_Package_add_file,framework_inc,inc/framework/imageproducer.hxx,framework/imageproducer.hxx)) $(eval $(call gb_Package_add_file,framework_inc,inc/framework/imagesconfiguration.hxx,framework/imagesconfiguration.hxx)) $(eval $(call gb_Package_add_file,framework_inc,inc/framework/interaction.hxx,framework/interaction.hxx)) diff --git a/framework/inc/classes/framelistanalyzer.hxx b/framework/inc/classes/framelistanalyzer.hxx deleted file mode 100644 index 745eabafb73a..000000000000 --- a/framework/inc/classes/framelistanalyzer.hxx +++ /dev/null @@ -1,214 +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. - * - ************************************************************************/ - -#ifndef __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_ -#define __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_ - -//_______________________________________________ -// interface includes -#include - -//_______________________________________________ -// other includes -#include - -//_______________________________________________ -// namespace - -namespace framework{ - -//_______________________________________________ -// exported const - -//_______________________________________________ -// exported definitions - -/** analyze and split the current available frame list of a given frames supplier - into different parts. - - These analyzed informations can be used e.g. to decide if it's neccessary - to switch into the backing mode, close the current active frame only or - exit the whole application explicitly or implicitly. - */ -class FWI_DLLPUBLIC FrameListAnalyzer -{ - //_______________________________________ - // types - - public: - - /** These enums can be combined as flags to enable/disable - special search algorithm during analyze phase. - see impl_analyze() for further informations. - But note: To be useable as flags, these enums - must be values of range [2^n]! */ - enum EDetect - { - E_MODEL = 1, - E_HELP = 2, - E_BACKINGCOMPONENT = 4, - E_HIDDEN = 8, - E_ALL = 15, - E_ZOMBIE = 32768 // use it for special test scenarios only!!! - }; - - //_______________________________________ - // member - - public: - - /** provides access to the frame container, which should be analyzed. */ - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFramesSupplier >& m_xSupplier; - - /** hold the reference frame, which is used e.g. to detect other frames with the same model. */ - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& m_xReferenceFrame; - - /** enable/disable some special analyzing steps. - see impl_analyze() for further informations. */ - sal_uInt32 m_eDetectMode; - - /** contains all frames, which uses the same model like the reference frame. - Will be filled only if m_eDetectMode has set the flag E_MODEL. - The reference frame is never part of this list! */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lModelFrames; - - /** contains all frames, which does not contain the same model like the reference frame. - Filling of it can't be supressed by m_eDetectMode. - The reference frame is never part of this list! - All frames inside this list are visible ones. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lOtherVisibleFrames; - - /** contains all frames, which does not contain the same model like the reference frame. - Filling of it can't be supressed by m_eDetectMode. - The reference frame is never part of this list! - All frames inside this list are hidden ones. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lOtherHiddenFrames; - - /** points to the help frame. - Will be set only, if any other frame (means different from the reference frame) - contains the help component. If the reference frame itself includes the help module - it's not set ... but another member m_bIsHelp is used to safe this information. - See following example code: - - - if (m_xReferenceFrame == help) - { - m_xHelp = NULL; - m_bIsHelp = TRUE; - } - else - if (xOtherFrame == help) - { - m_xHelp = xOtherFrame; - m_bIsHelp = FALSE; - } - - - Analyzing of the help frame ignores the visible state of any frame. - But note: a hidden help frame indicates a wrong state! - */ - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xHelp; - - /** points to the frame, which contains the backing component. - Will be set only, if any other frame (means different from the reference frame) - contains the backing component. If the reference frame itself includes the - backing component it's not set ... but another member m_bIsBackingComponent - will used to safe this information. - See following example code: - - - if (m_xReferenceFrame == backing) - { - m_xBackingComponent = NULL; - m_bIsBackingComponent = TRUE; - } - else - if (xOtherFrame == backing) - { - m_xBackingComponent = xOtherFrame; - m_bIsBackingComponent = FALSE ; - } - - - Analyzing of the help frame ignores the visible state of any frame. - But note: a hidden backing mode frame indicates a wrong state! - */ - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xBackingComponent; - - /** is set to true only, if the reference frame is a hidden one. - This value is undefined if m_eDetectMode doesn't have set the flag E_HIDDEN! */ - sal_Bool m_bReferenceIsHidden; - - /** is set to true only, if the reference frame contains the help component. - In this case the member m_xHelp is set to NULL everytimes. - This value is undefined if m_eDetectMode doesn't have set the flag E_HELP! */ - sal_Bool m_bReferenceIsHelp; - - /** is set to true only, if the reference frame contains the backing component. - In this case the member m_xBackingComponent is set to NULL everytimes. - This value is undefined if m_eDetectMode doesn't have set the flag E_BACKINGCOMPONENT! */ - sal_Bool m_bReferenceIsBacking; - - //_______________________________________ - // interface - - public: - - /** starts analyze phase and fille all members with valid informations. - - @param xSupplier - Must be a valid reference to a frames supplier, which provies - access to the frame list for analyzing. - - @param xReferenceFrame - This frame must(!) exist inside the analyzed frame list and - is used for some comparing functions. Further some member states - depends from the current state of this frame. - - @param eDetectMode - It represent a flag field, which can enable/disable special - analyze steps. Note: Some member values will be undefined, if - an analyze step will be disabled. - */ - FrameListAnalyzer( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFramesSupplier >& xSupplier , - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xReferenceFrame , - sal_uInt32 eDetectMode ); - virtual ~FrameListAnalyzer(); - - //_______________________________________ - // helper - - private: - - void impl_analyze(); - - -}; // class FrameListAnalyzer - -} // namespace framework - -#endif // #ifndef __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_ diff --git a/framework/inc/framework/framelistanalyzer.hxx b/framework/inc/framework/framelistanalyzer.hxx new file mode 100644 index 000000000000..d6f2cd734237 --- /dev/null +++ b/framework/inc/framework/framelistanalyzer.hxx @@ -0,0 +1,214 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ + +#ifndef __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_ +#define __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_ + +//_______________________________________________ +// interface includes +#include + +//_______________________________________________ +// other includes +#include + +//_______________________________________________ +// namespace + +namespace framework{ + +//_______________________________________________ +// exported const + +//_______________________________________________ +// exported definitions + +/** analyze and split the current available frame list of a given frames supplier + into different parts. + + These analyzed informations can be used e.g. to decide if it's neccessary + to switch into the backing mode, close the current active frame only or + exit the whole application explicitly or implicitly. + */ +class FWE_DLLPUBLIC FrameListAnalyzer +{ + //_______________________________________ + // types + + public: + + /** These enums can be combined as flags to enable/disable + special search algorithm during analyze phase. + see impl_analyze() for further informations. + But note: To be useable as flags, these enums + must be values of range [2^n]! */ + enum EDetect + { + E_MODEL = 1, + E_HELP = 2, + E_BACKINGCOMPONENT = 4, + E_HIDDEN = 8, + E_ALL = 15, + E_ZOMBIE = 32768 // use it for special test scenarios only!!! + }; + + //_______________________________________ + // member + + public: + + /** provides access to the frame container, which should be analyzed. */ + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFramesSupplier >& m_xSupplier; + + /** hold the reference frame, which is used e.g. to detect other frames with the same model. */ + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& m_xReferenceFrame; + + /** enable/disable some special analyzing steps. + see impl_analyze() for further informations. */ + sal_uInt32 m_eDetectMode; + + /** contains all frames, which uses the same model like the reference frame. + Will be filled only if m_eDetectMode has set the flag E_MODEL. + The reference frame is never part of this list! */ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lModelFrames; + + /** contains all frames, which does not contain the same model like the reference frame. + Filling of it can't be supressed by m_eDetectMode. + The reference frame is never part of this list! + All frames inside this list are visible ones. */ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lOtherVisibleFrames; + + /** contains all frames, which does not contain the same model like the reference frame. + Filling of it can't be supressed by m_eDetectMode. + The reference frame is never part of this list! + All frames inside this list are hidden ones. */ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lOtherHiddenFrames; + + /** points to the help frame. + Will be set only, if any other frame (means different from the reference frame) + contains the help component. If the reference frame itself includes the help module + it's not set ... but another member m_bIsHelp is used to safe this information. + See following example code: + + + if (m_xReferenceFrame == help) + { + m_xHelp = NULL; + m_bIsHelp = TRUE; + } + else + if (xOtherFrame == help) + { + m_xHelp = xOtherFrame; + m_bIsHelp = FALSE; + } + + + Analyzing of the help frame ignores the visible state of any frame. + But note: a hidden help frame indicates a wrong state! + */ + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xHelp; + + /** points to the frame, which contains the backing component. + Will be set only, if any other frame (means different from the reference frame) + contains the backing component. If the reference frame itself includes the + backing component it's not set ... but another member m_bIsBackingComponent + will used to safe this information. + See following example code: + + + if (m_xReferenceFrame == backing) + { + m_xBackingComponent = NULL; + m_bIsBackingComponent = TRUE; + } + else + if (xOtherFrame == backing) + { + m_xBackingComponent = xOtherFrame; + m_bIsBackingComponent = FALSE ; + } + + + Analyzing of the help frame ignores the visible state of any frame. + But note: a hidden backing mode frame indicates a wrong state! + */ + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xBackingComponent; + + /** is set to true only, if the reference frame is a hidden one. + This value is undefined if m_eDetectMode doesn't have set the flag E_HIDDEN! */ + sal_Bool m_bReferenceIsHidden; + + /** is set to true only, if the reference frame contains the help component. + In this case the member m_xHelp is set to NULL everytimes. + This value is undefined if m_eDetectMode doesn't have set the flag E_HELP! */ + sal_Bool m_bReferenceIsHelp; + + /** is set to true only, if the reference frame contains the backing component. + In this case the member m_xBackingComponent is set to NULL everytimes. + This value is undefined if m_eDetectMode doesn't have set the flag E_BACKINGCOMPONENT! */ + sal_Bool m_bReferenceIsBacking; + + //_______________________________________ + // interface + + public: + + /** starts analyze phase and fille all members with valid informations. + + @param xSupplier + Must be a valid reference to a frames supplier, which provies + access to the frame list for analyzing. + + @param xReferenceFrame + This frame must(!) exist inside the analyzed frame list and + is used for some comparing functions. Further some member states + depends from the current state of this frame. + + @param eDetectMode + It represent a flag field, which can enable/disable special + analyze steps. Note: Some member values will be undefined, if + an analyze step will be disabled. + */ + FrameListAnalyzer( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFramesSupplier >& xSupplier , + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xReferenceFrame , + sal_uInt32 eDetectMode ); + virtual ~FrameListAnalyzer(); + + //_______________________________________ + // helper + + private: + + void impl_analyze(); + + +}; // class FrameListAnalyzer + +} // namespace framework + +#endif // #ifndef __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_ diff --git a/framework/prj/build.lst b/framework/prj/build.lst index be5c4d4f5968..f409c6380db6 100644 --- a/framework/prj/build.lst +++ b/framework/prj/build.lst @@ -1,31 +1,6 @@ -<<<<<<< local fr framework : l10n svtools NULL fr framework usr1 - all fr_mkout NULL fr framework\prj nmake - all fr_all NULL -======= -fr framework : l10n svtools NULL -fr framework usr1 - all fr_mkout NULL -fr framework\inc nmake - all fr_inc NULL -fr framework\source\constant nmake - all fr_constant fr_inc NULL -fr framework\source\threadhelp nmake - all fr_threadhelp fr_constant fr_inc NULL -fr framework\source\loadenv nmake - all fr_loadenv fr_threadhelp fr_constant fr_inc NULL -fr framework\source\classes nmake - all fr_classes fr_threadhelp fr_constant fr_inc NULL -fr framework\source\jobs nmake - all fr_jobs fr_threadhelp fr_constant fr_inc NULL -fr framework\source\interaction nmake - all fr_interaction fr_threadhelp fr_constant fr_inc NULL -fr framework\source\helper nmake - all fr_helper fr_threadhelp fr_constant fr_inc NULL -fr framework\source\dispatch nmake - all fr_dispatch fr_threadhelp fr_constant fr_inc NULL -fr framework\source\services nmake - all fr_services fr_threadhelp fr_constant fr_inc NULL -fr framework\source\register nmake - all fr_register fr_threadhelp fr_constant fr_inc NULL -fr framework\source\recording nmake - all fr_recording fr_threadhelp fr_constant fr_inc NULL -fr framework\source\xml nmake - all fr_xml fr_threadhelp fr_inc NULL -fr framework\source\layoutmanager nmake - all fr_layoutmanager fr_threadhelp fr_inc NULL -fr framework\source\uielement nmake - all fr_uielement fr_threadhelp fr_inc NULL -fr framework\source\uifactory nmake - all fr_uifactory fr_threadhelp fr_inc NULL -fr framework\source\uiconfiguration nmake - all fr_uiconfiguration fr_threadhelp fr_inc NULL -fr framework\source\accelerators nmake - all fr_accelerators fr_threadhelp fr_inc NULL -fr framework\source\tabwin nmake - all fr_tabwin fr_threadhelp fr_inc NULL -fr framework\util nmake - all fr_util fr_constant fr_threadhelp fr_classes fr_loadenv fr_jobs fr_interaction fr_helper fr_dispatch fr_services fr_register fr_recording fr_layoutmanager fr_uielement fr_uifactory fr_xml fr_uiconfiguration fr_accelerators fr_tabwin NULL -fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL # complex tests # fails on unxsoli4 @@ -60,4 +35,3 @@ fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL # fr framework\qa\complex\path_settings nmake - all fr_qa_complex_path_settings NULL # fr framework\qa\complex\path_substitution nmake - all fr_qa_complex_path_substitution NULL ->>>>>>> other diff --git a/framework/prj/d.lst b/framework/prj/d.lst index acf00070496d..74a6a768d41b 100644 --- a/framework/prj/d.lst +++ b/framework/prj/d.lst @@ -25,29 +25,8 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar ..\%__SRC%\lib\ifwe.lib %_DEST%\lib%_EXT%\ifwe.lib ..\%__SRC%\lib\ifwi.lib %_DEST%\lib%_EXT%\ifwi.lib -<<<<<<< local ..\inc\framework/*.h %_DEST%\inc%_EXT%\framework\*.h ..\inc\framework/*.hxx %_DEST%\inc%_EXT%\framework\*.hxx -======= -..\inc\helper\imageproducer.hxx %_DEST%\inc%_EXT%\framework\imageproducer.hxx -..\inc\helper\acceleratorinfo.hxx %_DEST%\inc%_EXT%\framework\acceleratorinfo.hxx -..\inc\helper\actiontriggerhelper.hxx %_DEST%\inc%_EXT%\framework\actiontriggerhelper.hxx -..\inc\xml\menuconfiguration.hxx %_DEST%\inc%_EXT%\framework\menuconfiguration.hxx -..\inc\classes\bmkmenu.hxx %_DEST%\inc%_EXT%\framework\bmkmenu.hxx -..\inc\xml\toolboxconfiguration.hxx %_DEST%\inc%_EXT%\framework\toolboxconfiguration.hxx -..\inc\xml\statusbarconfiguration.hxx %_DEST%\inc%_EXT%\framework\statusbarconfiguration.hxx -..\inc\xml\eventsconfiguration.hxx %_DEST%\inc%_EXT%\framework\eventsconfiguration.hxx -..\inc\xml\imagesconfiguration.hxx %_DEST%\inc%_EXT%\framework\imagesconfiguration.hxx -..\inc\classes\addonsoptions.hxx %_DEST%\inc%_EXT%\framework\addonsoptions.hxx -..\inc\dispatch\interaction.hxx %_DEST%\inc%_EXT%\framework\interaction.hxx -..\inc\classes\addonmenu.hxx %_DEST%\inc%_EXT%\framework\addonmenu.hxx -..\inc\classes\sfxhelperfunctions.hxx %_DEST%\inc%_EXT%\framework\sfxhelperfunctions.hxx -..\inc\helper\configimporter.hxx %_DEST%\inc%_EXT%\framework\configimporter.hxx -..\inc\classes\menuextensionsupplier.hxx %_DEST%\inc%_EXT%\framework\menuextensionsupplier.hxx -..\inc\interaction\preventduplicateinteraction.hxx %_DEST%\inc%_EXT%\framework\preventduplicateinteraction.hxx -..\inc\helper\titlehelper.hxx %_DEST%\inc%_EXT%\framework\titlehelper.hxx -..\inc\classes\framelistanalyzer.hxx %_DEST%\inc%_EXT%\framework\framelistanalyzer.hxx ->>>>>>> other ..\uiconfig\startmodule\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar\*.xml ..\uiconfig\startmodule\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar\*.xml @@ -58,3 +37,4 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar ..\%__SRC%\misc\fwk.component %_DEST%\xml%_EXT%\fwk.component ..\%__SRC%\misc\fwl.component %_DEST%\xml%_EXT%\fwl.component ..\%__SRC%\misc\fwm.component %_DEST%\xml%_EXT%\fwm.component + diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index ee84de9d7dd4..57355eaa6398 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index 40def3f98488..0e49b2818e56 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx new file mode 100644 index 000000000000..1a33ebf91d7e --- /dev/null +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -0,0 +1,302 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_framework.hxx" + +#include "framework/framelistanalyzer.hxx" + +//_______________________________________________ +// my own includes +#include +#include +#include +#include +#include + +//_______________________________________________ +// interface includes +#include +#include +#include + +//_______________________________________________ +// includes of other projects +#include +#include + +//_______________________________________________ +// namespace + +namespace framework{ + +//_______________________________________________ +// non exported const + +//_______________________________________________ +// non exported definitions + +//_______________________________________________ +// declarations + +//_______________________________________________ + +/** + */ + +FrameListAnalyzer::FrameListAnalyzer( const css::uno::Reference< css::frame::XFramesSupplier >& xSupplier , + const css::uno::Reference< css::frame::XFrame >& xReferenceFrame , + sal_uInt32 eDetectMode ) + : m_xSupplier (xSupplier ) + , m_xReferenceFrame(xReferenceFrame) + , m_eDetectMode (eDetectMode ) +{ + impl_analyze(); +} + +//_______________________________________________ + +/** + */ + +FrameListAnalyzer::~FrameListAnalyzer() +{ +} + +//_______________________________________________ + +/** returns an analyzed list of all currently opened (top!) frames inside the desktop tree. + + We try to get a snapshot of all opened frames, which are part of the desktop frame container. + Of course we can't access frames, which stands outside of this tree. + But it's neccessary to collect top frames here only. Otherwhise we interpret closing of last + frame wrong. Further we analyze this list and split into different parts. + E.g. for "CloseDoc" we must know, which frames of the given list referr to the same model. + These frames must be closed then. But all other frames must be untouched. + In case the request was "CloseWin" these splitted lists can be used too, to decide if the last window + or document was closed. Then we have to initialize the backing window ... + Last but not least we must know something about our special help frame. It must be handled + seperatly. And last but not least - the backing component frame must be detected too. +*/ + +void FrameListAnalyzer::impl_analyze() +{ + // reset all members to get a consistent state + m_bReferenceIsHidden = sal_False; + m_bReferenceIsHelp = sal_False; + m_bReferenceIsBacking = sal_False; + m_xHelp = css::uno::Reference< css::frame::XFrame >(); + m_xBackingComponent = css::uno::Reference< css::frame::XFrame >(); + + // try to get the task container by using the given supplier + css::uno::Reference< css::container::XIndexAccess > xFrameContainer(m_xSupplier->getFrames(), css::uno::UNO_QUERY); + + // All return list get an initial size to include all possible frames. + // They will be packed at the end of this method ... using the actual step positions then. + sal_Int32 nVisibleStep = 0; + sal_Int32 nHiddenStep = 0; + sal_Int32 nModelStep = 0; + sal_Int32 nCount = xFrameContainer->getCount(); + + m_lOtherVisibleFrames.realloc(nCount); + m_lOtherHiddenFrames.realloc(nCount); + m_lModelFrames.realloc(nCount); + + // ask for the model of the given reference frame. + // It must be compared with the model of every frame of the container + // to sort it into the list of frames with the same model. + // Supress this step, if right detect mode isn't set. + css::uno::Reference< css::frame::XModel > xReferenceModel; + if ((m_eDetectMode & E_MODEL) == E_MODEL ) + { + css::uno::Reference< css::frame::XController > xReferenceController; + if (m_xReferenceFrame.is()) + xReferenceController = m_xReferenceFrame->getController(); + if (xReferenceController.is()) + xReferenceModel = xReferenceController->getModel(); + } + + // check, if the reference frame is in hidden mode. + // But look, if this analyze step is realy needed. + css::uno::Reference< css::beans::XPropertySet > xSet(m_xReferenceFrame, css::uno::UNO_QUERY); + if ( + ((m_eDetectMode & E_HIDDEN) == E_HIDDEN) && + (xSet.is() ) + ) + { + xSet->getPropertyValue(FRAME_PROPNAME_ISHIDDEN) >>= m_bReferenceIsHidden; + } + + // check, if the reference frame includes the backing component. + // But look, if this analyze step is realy needed. + if ((m_eDetectMode & E_BACKINGCOMPONENT) == E_BACKINGCOMPONENT) + { + try + { + css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::utl::getProcessServiceFactory(); + css::uno::Reference< css::frame::XModuleManager > xModuleMgr(xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY_THROW); + ::rtl::OUString sModule = xModuleMgr->identify(m_xReferenceFrame); + m_bReferenceIsBacking = (sModule.equals(SERVICENAME_STARTMODULE)); + } + catch(const css::uno::Exception&) + {} + } + + // check, if the reference frame includes the help module. + // But look, if this analyze step is realy needed. + if ( + ((m_eDetectMode & E_HELP) == E_HELP ) && + (m_xReferenceFrame.is() ) && + (m_xReferenceFrame->getName() == SPECIALTARGET_HELPTASK) + ) + { + m_bReferenceIsHelp = sal_True; + } + + try + { + // Step over all frames of the desktop frame container and analyze it. + for (sal_Int32 i=0; i xFrame; + if ( + !(xFrameContainer->getByIndex(i) >>= xFrame) || + !(xFrame.is() ) || + (xFrame==m_xReferenceFrame ) + ) + continue; + + #ifdef ENABLE_WARNINGS + if ( + ((m_eDetectMode & E_ZOMBIE) == E_ZOMBIE) && + ( + (!xFrame->getContainerWindow().is()) || + (!xFrame->getComponentWindow().is()) + ) + ) + { + LOG_WARNING("FrameListAnalyzer::impl_analyze()", "ZOMBIE!") + } + #endif + + // ------------------------------------------------- + // a) Is it the special help task? + // Return it seperated from any return list. + if ( + ((m_eDetectMode & E_HELP) == E_HELP ) && + (xFrame->getName()==SPECIALTARGET_HELPTASK) + ) + { + m_xHelp = xFrame; + continue; + } + + // ------------------------------------------------- + // b) Or is includes this task the special backing component? + // Return it seperated from any return list. + // But check if the reference task itself is the backing frame. + // Our user mst know it to decide right. + if ((m_eDetectMode & E_BACKINGCOMPONENT) == E_BACKINGCOMPONENT) + { + try + { + css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::utl::getProcessServiceFactory(); + css::uno::Reference< css::frame::XModuleManager > xModuleMgr(xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY); + ::rtl::OUString sModule = xModuleMgr->identify(xFrame); + if (sModule.equals(SERVICENAME_STARTMODULE)) + { + m_xBackingComponent = xFrame; + continue; + } + } + catch(const css::uno::Exception&) + {} + } + + // ------------------------------------------------- + // c) Or is it the a task, which uses the specified model? + // Add it to the list of "model frames". + if ((m_eDetectMode & E_MODEL) == E_MODEL) + { + css::uno::Reference< css::frame::XController > xController = xFrame->getController(); + css::uno::Reference< css::frame::XModel > xModel ; + if (xController.is()) + xModel = xController->getModel(); + if (xModel==xReferenceModel) + { + m_lModelFrames[nModelStep] = xFrame; + ++nModelStep; + continue; + } + } + + // ------------------------------------------------- + // d) Or is it the a task, which use another or no model at all? + // Add it to the list of "other frames". But look for it's + // visible state ... if it's allowed to do so. + // ------------------------------------------------- + sal_Bool bHidden = sal_False; + if ((m_eDetectMode & E_HIDDEN) == E_HIDDEN ) + { + xSet = css::uno::Reference< css::beans::XPropertySet >(xFrame, css::uno::UNO_QUERY); + if (xSet.is()) + { + xSet->getPropertyValue(FRAME_PROPNAME_ISHIDDEN) >>= bHidden; + } + } + + if (bHidden) + { + m_lOtherHiddenFrames[nHiddenStep] = xFrame; + ++nHiddenStep; + } + else + { + m_lOtherVisibleFrames[nVisibleStep] = xFrame; + ++nVisibleStep; + } + } + } + catch(css::lang::IndexOutOfBoundsException) + { + // stop copying if index seams to be wrong. + // This interface can't realy guarantee its count for multithreaded + // environments. So it can occure! + } + + // Pack both lists by using the actual step positions. + // All empty or ignorable items should exist at the end of these lists + // behind the position pointers. So they will be removed by a reallocation. + m_lOtherVisibleFrames.realloc(nVisibleStep); + m_lOtherHiddenFrames.realloc(nHiddenStep); + m_lModelFrames.realloc(nModelStep); +} + +} // namespace framework diff --git a/framework/source/fwi/classes/framelistanalyzer.cxx b/framework/source/fwi/classes/framelistanalyzer.cxx deleted file mode 100644 index 22f019e78df5..000000000000 --- a/framework/source/fwi/classes/framelistanalyzer.cxx +++ /dev/null @@ -1,302 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_framework.hxx" - -#include "classes/framelistanalyzer.hxx" - -//_______________________________________________ -// my own includes -#include -#include -#include -#include -#include - -//_______________________________________________ -// interface includes -#include -#include -#include - -//_______________________________________________ -// includes of other projects -#include -#include - -//_______________________________________________ -// namespace - -namespace framework{ - -//_______________________________________________ -// non exported const - -//_______________________________________________ -// non exported definitions - -//_______________________________________________ -// declarations - -//_______________________________________________ - -/** - */ - -FrameListAnalyzer::FrameListAnalyzer( const css::uno::Reference< css::frame::XFramesSupplier >& xSupplier , - const css::uno::Reference< css::frame::XFrame >& xReferenceFrame , - sal_uInt32 eDetectMode ) - : m_xSupplier (xSupplier ) - , m_xReferenceFrame(xReferenceFrame) - , m_eDetectMode (eDetectMode ) -{ - impl_analyze(); -} - -//_______________________________________________ - -/** - */ - -FrameListAnalyzer::~FrameListAnalyzer() -{ -} - -//_______________________________________________ - -/** returns an analyzed list of all currently opened (top!) frames inside the desktop tree. - - We try to get a snapshot of all opened frames, which are part of the desktop frame container. - Of course we can't access frames, which stands outside of this tree. - But it's neccessary to collect top frames here only. Otherwhise we interpret closing of last - frame wrong. Further we analyze this list and split into different parts. - E.g. for "CloseDoc" we must know, which frames of the given list referr to the same model. - These frames must be closed then. But all other frames must be untouched. - In case the request was "CloseWin" these splitted lists can be used too, to decide if the last window - or document was closed. Then we have to initialize the backing window ... - Last but not least we must know something about our special help frame. It must be handled - seperatly. And last but not least - the backing component frame must be detected too. -*/ - -void FrameListAnalyzer::impl_analyze() -{ - // reset all members to get a consistent state - m_bReferenceIsHidden = sal_False; - m_bReferenceIsHelp = sal_False; - m_bReferenceIsBacking = sal_False; - m_xHelp = css::uno::Reference< css::frame::XFrame >(); - m_xBackingComponent = css::uno::Reference< css::frame::XFrame >(); - - // try to get the task container by using the given supplier - css::uno::Reference< css::container::XIndexAccess > xFrameContainer(m_xSupplier->getFrames(), css::uno::UNO_QUERY); - - // All return list get an initial size to include all possible frames. - // They will be packed at the end of this method ... using the actual step positions then. - sal_Int32 nVisibleStep = 0; - sal_Int32 nHiddenStep = 0; - sal_Int32 nModelStep = 0; - sal_Int32 nCount = xFrameContainer->getCount(); - - m_lOtherVisibleFrames.realloc(nCount); - m_lOtherHiddenFrames.realloc(nCount); - m_lModelFrames.realloc(nCount); - - // ask for the model of the given reference frame. - // It must be compared with the model of every frame of the container - // to sort it into the list of frames with the same model. - // Supress this step, if right detect mode isn't set. - css::uno::Reference< css::frame::XModel > xReferenceModel; - if ((m_eDetectMode & E_MODEL) == E_MODEL ) - { - css::uno::Reference< css::frame::XController > xReferenceController; - if (m_xReferenceFrame.is()) - xReferenceController = m_xReferenceFrame->getController(); - if (xReferenceController.is()) - xReferenceModel = xReferenceController->getModel(); - } - - // check, if the reference frame is in hidden mode. - // But look, if this analyze step is realy needed. - css::uno::Reference< css::beans::XPropertySet > xSet(m_xReferenceFrame, css::uno::UNO_QUERY); - if ( - ((m_eDetectMode & E_HIDDEN) == E_HIDDEN) && - (xSet.is() ) - ) - { - xSet->getPropertyValue(FRAME_PROPNAME_ISHIDDEN) >>= m_bReferenceIsHidden; - } - - // check, if the reference frame includes the backing component. - // But look, if this analyze step is realy needed. - if ((m_eDetectMode & E_BACKINGCOMPONENT) == E_BACKINGCOMPONENT) - { - try - { - css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::utl::getProcessServiceFactory(); - css::uno::Reference< css::frame::XModuleManager > xModuleMgr(xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY_THROW); - ::rtl::OUString sModule = xModuleMgr->identify(m_xReferenceFrame); - m_bReferenceIsBacking = (sModule.equals(SERVICENAME_STARTMODULE)); - } - catch(const css::uno::Exception&) - {} - } - - // check, if the reference frame includes the help module. - // But look, if this analyze step is realy needed. - if ( - ((m_eDetectMode & E_HELP) == E_HELP ) && - (m_xReferenceFrame.is() ) && - (m_xReferenceFrame->getName() == SPECIALTARGET_HELPTASK) - ) - { - m_bReferenceIsHelp = sal_True; - } - - try - { - // Step over all frames of the desktop frame container and analyze it. - for (sal_Int32 i=0; i xFrame; - if ( - !(xFrameContainer->getByIndex(i) >>= xFrame) || - !(xFrame.is() ) || - (xFrame==m_xReferenceFrame ) - ) - continue; - - #ifdef ENABLE_WARNINGS - if ( - ((m_eDetectMode & E_ZOMBIE) == E_ZOMBIE) && - ( - (!xFrame->getContainerWindow().is()) || - (!xFrame->getComponentWindow().is()) - ) - ) - { - LOG_WARNING("FrameListAnalyzer::impl_analyze()", "ZOMBIE!") - } - #endif - - // ------------------------------------------------- - // a) Is it the special help task? - // Return it seperated from any return list. - if ( - ((m_eDetectMode & E_HELP) == E_HELP ) && - (xFrame->getName()==SPECIALTARGET_HELPTASK) - ) - { - m_xHelp = xFrame; - continue; - } - - // ------------------------------------------------- - // b) Or is includes this task the special backing component? - // Return it seperated from any return list. - // But check if the reference task itself is the backing frame. - // Our user mst know it to decide right. - if ((m_eDetectMode & E_BACKINGCOMPONENT) == E_BACKINGCOMPONENT) - { - try - { - css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::utl::getProcessServiceFactory(); - css::uno::Reference< css::frame::XModuleManager > xModuleMgr(xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY); - ::rtl::OUString sModule = xModuleMgr->identify(xFrame); - if (sModule.equals(SERVICENAME_STARTMODULE)) - { - m_xBackingComponent = xFrame; - continue; - } - } - catch(const css::uno::Exception&) - {} - } - - // ------------------------------------------------- - // c) Or is it the a task, which uses the specified model? - // Add it to the list of "model frames". - if ((m_eDetectMode & E_MODEL) == E_MODEL) - { - css::uno::Reference< css::frame::XController > xController = xFrame->getController(); - css::uno::Reference< css::frame::XModel > xModel ; - if (xController.is()) - xModel = xController->getModel(); - if (xModel==xReferenceModel) - { - m_lModelFrames[nModelStep] = xFrame; - ++nModelStep; - continue; - } - } - - // ------------------------------------------------- - // d) Or is it the a task, which use another or no model at all? - // Add it to the list of "other frames". But look for it's - // visible state ... if it's allowed to do so. - // ------------------------------------------------- - sal_Bool bHidden = sal_False; - if ((m_eDetectMode & E_HIDDEN) == E_HIDDEN ) - { - xSet = css::uno::Reference< css::beans::XPropertySet >(xFrame, css::uno::UNO_QUERY); - if (xSet.is()) - { - xSet->getPropertyValue(FRAME_PROPNAME_ISHIDDEN) >>= bHidden; - } - } - - if (bHidden) - { - m_lOtherHiddenFrames[nHiddenStep] = xFrame; - ++nHiddenStep; - } - else - { - m_lOtherVisibleFrames[nVisibleStep] = xFrame; - ++nVisibleStep; - } - } - } - catch(css::lang::IndexOutOfBoundsException) - { - // stop copying if index seams to be wrong. - // This interface can't realy guarantee its count for multithreaded - // environments. So it can occure! - } - - // Pack both lists by using the actual step positions. - // All empty or ignorable items should exist at the end of these lists - // behind the position pointers. So they will be removed by a reallocation. - m_lOtherVisibleFrames.realloc(nVisibleStep); - m_lOtherHiddenFrames.realloc(nHiddenStep); - m_lModelFrames.realloc(nModelStep); -} - -} // namespace framework diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index d4fb22c4f7f8..cf37e1d8129f 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -34,7 +34,7 @@ #ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_ #include #endif -#include +#include #ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_HXX_ #include diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index dfc6225b4572..a6567b218369 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index 10e3a614f5e1..6b7bf5937b00 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -45,7 +45,6 @@ SHL3USE_EXPORTS=name SHL4USE_EXPORTS=name SHL5USE_EXPORTS=name - # --- internal import ------------------------------------------------- LIB1TARGET= $(SLB)$/fwiobj.lib @@ -362,30 +361,6 @@ SHL5DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN) .INCLUDE : target.mk -<<<<<<< local -======= -$(MISC)$/$(SHL1TARGET).flt: makefile.mk - @echo ------------------------------ - @echo Making: $@ - @echo _Impl>$@ - @echo WEP>>$@ - @echo m_pLoader>$@ - @echo _TI2>>$@ - @echo _TI3>>$@ - @echo LIBMAIN>>$@ - @echo LibMain>>$@ - @echo _STL::pair>>$@ - -$(MISC)$/$(SHL2TARGET).flt: makefile.mk - @echo ------------------------------ - @echo Making: $@ - @echo _Impl>$@ - @echo WEP>>$@ - @echo m_pLoader>$@ - @echo _TI2>>$@ - @echo LIBMAIN>>$@ - @echo LibMain>>$@ - ALLTAR : $(MISC)/fwk.component $(MISC)/fwl.component $(MISC)/fwm.component $(MISC)/fwk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ @@ -405,4 +380,4 @@ $(MISC)/fwm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ $(XSLTPROC) --nonet --stringparam uri \ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt fwm.component ->>>>>>> other + diff --git a/linguistic/prj/d.lst b/linguistic/prj/d.lst index 4b2e240ef2ef..03237f925764 100644 --- a/linguistic/prj/d.lst +++ b/linguistic/prj/d.lst @@ -7,9 +7,7 @@ ..\xml\*.xml %_DEST%\xml%_EXT%\*.xml mkdir: %_DEST%\inc%_EXT%\linguistic -<<<<<<< local ..\inc\linguistic\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx -======= -..\inc\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx + ..\%__SRC%\misc\lng.component %_DEST%\xml%_EXT%\lng.component ->>>>>>> other + diff --git a/sfx2/Library_sfx2.mk b/sfx2/Library_sfx2.mk index 3c607647b26f..fbe4fb4c5926 100644 --- a/sfx2/Library_sfx2.mk +++ b/sfx2/Library_sfx2.mk @@ -114,7 +114,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/appl/module \ sfx2/source/appl/newhelp \ sfx2/source/appl/opengrf \ - sfx2/source/appl/sfxdll \ sfx2/source/appl/sfxhelp \ sfx2/source/appl/sfxpicklist \ sfx2/source/appl/shutdownicon \ diff --git a/sfx2/inc/sfx2/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx index cfe2ff0fb855..420a44440aae 100644 --- a/sfx2/inc/sfx2/viewfac.hxx +++ b/sfx2/inc/sfx2/viewfac.hxx @@ -30,9 +30,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include -#ifndef _RESID_HXX //autogen #include -#endif class SfxViewFrame; class SfxViewShell; @@ -45,20 +43,12 @@ typedef void (*SfxViewInit)(); class SFX2_DLLPUBLIC SfxViewFactory { public: -<<<<<<< local - SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, USHORT nOrdinal ); -======= SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, USHORT nOrdinal, const sal_Char* asciiViewName ); ->>>>>>> other ~SfxViewFactory(); SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh); void InitFactory(); -<<<<<<< local -======= - ->>>>>>> other USHORT GetOrdinal() const { return nOrd; } /// returns a legacy view name. This is "view" with an appended ordinal/ID. @@ -75,10 +65,7 @@ private: SfxViewCtor fnCreate; SfxViewInit fnInit; USHORT nOrd; -<<<<<<< local -======= const String m_sViewName; ->>>>>>> other }; #endif diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index 22e873aea097..bbd627a39ad6 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -123,21 +123,13 @@ public: \ static SfxViewFactory&Factory() { return *pFactory; } \ static void InitFactory() -<<<<<<< local -#define SFX_IMPL_VIEWFACTORY(Class) \ -======= #define SFX_IMPL_NAMED_VIEWFACTORY(Class, AsciiViewName) \ ->>>>>>> other SfxViewFactory* Class::pFactory; \ SfxViewShell* __EXPORT Class::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView) \ { return new Class(pFrame, pOldView); } \ void Class::RegisterFactory( USHORT nPrio ) \ { \ -<<<<<<< local - pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio);\ -======= pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio,AsciiViewName);\ ->>>>>>> other InitFactory(); \ } \ void Class::InitFactory() @@ -388,4 +380,3 @@ inline SfxViewFrame* SfxViewShell::GetViewFrame() const #endif // #ifndef _SFXVIEWSH_HXX - diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index d3f687fbc4af..85763aab9258 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,38 +1,11 @@ sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL sf sfx2 usr1 - all sf_mkout NULL -<<<<<<< local sf sfx2\prj nmake - all sf_prj NULL -======= -sf sfx2\inc nmake - all sf_inc NULL -sf sfx2\prj get - all sf_prj NULL -sf sfx2\mac\res get - all sf_mres NULL -sf sfx2\source\inc get - all sf_sinc NULL -sf sfx2\sdi nmake - all sf_sdi NULL -sf sfx2\source\appl nmake - all sf_appl sf_sdi sf_inc NULL -sf sfx2\source\view nmake - all sf_view sf_sdi sf_inc NULL -sf sfx2\source\bastyp nmake - all sf_bast sf_sdi sf_inc NULL -sf sfx2\source\config nmake - all sf_cnfg sf_sdi sf_inc NULL -sf sfx2\source\control nmake - all sf_ctrl sf_sdi sf_inc NULL -sf sfx2\source\dialog nmake - all sf_dlg sf_sdi sf_inc NULL -sf sfx2\source\doc nmake - all sf_doc sf_sdi sf_inc NULL -sf sfx2\source\layout nmake - all sf_layout sf_sdi sf_inc NULL -sf sfx2\source\menu nmake - all sf_menu sf_sdi sf_inc NULL -sf sfx2\source\notify nmake - all sf_noti sf_sdi sf_inc NULL -sf sfx2\source\statbar nmake - all sf_sbar sf_sdi sf_inc NULL -sf sfx2\source\toolbox nmake - all sf_tbox sf_sdi sf_inc NULL -sf sfx2\source\inet nmake - all sf_inet sf_sdi sf_inc NULL -sf sfx2\source\explorer nmake - all sf_expl sf_sdi sf_inc NULL -sf sfx2\workben\custompanel nmake - all sf_wb_custompanel NULL -sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL -sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL -sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL ->>>>>>> other -<<<<<<< local -======= + # fails on unxsoli4 # sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL # sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL # sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL ->>>>>>> other + diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 9c25006b611c..bab37281cb05 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -28,13 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -<<<<<<< local #include "sfx2/sfxhelp.hxx" -======= -#include "sfxhelp.hxx" #include ->>>>>>> other #include #include #include diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx index 85f7c7f3745d..3eed678420dd 100644 --- a/sfx2/source/view/viewfac.cxx +++ b/sfx2/source/view/viewfac.cxx @@ -70,20 +70,12 @@ String SfxViewFactory::GetAPIViewName() const // CTOR / DTOR ----------------------------------------------------------- -<<<<<<< local -SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, USHORT nOrdinal ): -======= SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, USHORT nOrdinal, const sal_Char* asciiViewName ): ->>>>>>> other fnCreate(fnC), fnInit(fnI), -<<<<<<< local - nOrd(nOrdinal) -======= nOrd(nOrdinal), m_sViewName( String::CreateFromAscii( asciiViewName ) ) ->>>>>>> other { DBG_CTOR(SfxViewFactory, 0); } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 55521b026fdc..dbadbc54ebd4 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -92,12 +92,9 @@ #include #include #include -<<<<<<< local #include #include -======= #include ->>>>>>> other #include @@ -112,9 +109,6 @@ using ::com::sun::star::document::XViewDataSupplier; using ::com::sun::star::container::XIndexContainer; namespace css = ::com::sun::star; -#ifndef GCC -#endif - // wg. ViewFrame::Current #include "appdata.hxx" #include diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src index 5a0fd1cb273c..3d9eff3de4e8 100644 --- a/svx/source/form/filtnav.src +++ b/svx/source/form/filtnav.src @@ -26,13 +26,9 @@ ************************************************************************/ #include -<<<<<<< local #include "svx/fmresids.hrc" -======= -#include "fmresids.hrc" #include "fmhelp.hrc" ->>>>>>> other Menu RID_FM_FILTER_MENU { ItemList = @@ -64,30 +60,3 @@ Menu RID_FM_FILTER_MENU }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index ad65b647001e..abe30839aa43 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -45,8 +45,8 @@ #include #include #include -#include "svdstr.hrc" -#include "svdglob.hxx" +#include +#include #include #include diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx index fb67c6d32be5..f201474015fc 100644 --- a/xmloff/source/transform/XMLFilterRegistration.cxx +++ b/xmloff/source/transform/XMLFilterRegistration.cxx @@ -146,44 +146,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -<<<<<<< local -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) -{ - if( pRegistryKey ) - { - try - { - uno::Reference< registry::XRegistryKey > xMasterKey( reinterpret_cast< registry::XRegistryKey * >( pRegistryKey ) ); - - const ServiceDescriptor* pDescriptor = getServiceDescriptors(); - while ( pDescriptor->getImplementationName ) - { - ::rtl::OUString sNewKeyName( RTL_CONSTASCII_USTRINGPARAM("/") ); - sNewKeyName += pDescriptor->getImplementationName(); - sNewKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ); - - uno::Reference< registry::XRegistryKey > xNewKey( xMasterKey->createKey( sNewKeyName ) ); - - uno::Sequence< ::rtl::OUString > aServices = pDescriptor->getSupportedServiceNames(); - const ::rtl::OUString* pServices = aServices.getConstArray(); - for( sal_Int32 i = 0; i < aServices.getLength(); ++i, ++pServices ) - xNewKey->createKey( *pServices); - - ++pDescriptor; - } - } - catch (registry::InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "xof::component_writeInfo: InvalidRegistryException!" ); - } - } - return sal_True; -} - SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) -======= -void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) ->>>>>>> other { void * pRet = NULL; if( pServiceManager ) -- cgit v1.2.3 From e17e44d1787f8c7f830e22f129d4aab497900dea Mon Sep 17 00:00:00 2001 From: tono Date: Fri, 31 Dec 2010 00:35:16 +0900 Subject: i#116264: gbuild for MinGW --- framework/Library_fwe.mk | 13 +++++++++++++ framework/Library_fwi.mk | 16 ++++++++++++++++ framework/Library_fwk.mk | 13 +++++++++++++ framework/Library_fwl.mk | 13 +++++++++++++ framework/Library_fwm.mk | 13 +++++++++++++ sfx2/Library_sfx.mk | 20 ++++++++++++++++++++ xmloff/Library_xo.mk | 15 +++++++++++++++ xmloff/Library_xof.mk | 15 +++++++++++++++ 8 files changed, 118 insertions(+) (limited to 'framework/Library_fwi.mk') diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 33d8959a474e..013fe5bbf56c 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -105,11 +105,24 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\ )) endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,fwe,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + mingwex \ + kernel32 \ + msvcrt \ +)) +else $(eval $(call gb_Library_add_linked_libs,fwe,\ kernel32 \ msvcrt \ uwinapi \ )) endif +endif # TODO: visibility # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 568f0a1eb22a..8512b3a874fe 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -84,6 +84,21 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\ )) endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,fwi,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + moldname \ + mingwex \ + advapi32 \ + kernel32 \ + msvcrt \ + unicows \ +)) +else $(eval $(call gb_Library_add_linked_libs,fwi,\ advapi32 \ kernel32 \ @@ -93,5 +108,6 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\ uwinapi \ )) endif +endif # TODO: visibility # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 50c16b83b42a..1df0c931e564 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -190,10 +190,23 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\ )) endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,fwk,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + mingwex \ + kernel32 \ + msvcrt \ +)) +else $(eval $(call gb_Library_add_linked_libs,fwk,\ kernel32 \ msvcrt \ uwinapi \ )) endif +endif # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index d2002115eaf0..b8b5290f1749 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -90,10 +90,23 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\ )) endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,fwl,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + mingwex \ + kernel32 \ + msvcrt \ +)) +else $(eval $(call gb_Library_add_linked_libs,fwl,\ kernel32 \ msvcrt \ uwinapi \ )) endif +endif # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index 9ff49719148a..e67c2a627091 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -72,10 +72,23 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\ )) endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,fwm,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + mingwex \ + kernel32 \ + msvcrt \ +)) +else $(eval $(call gb_Library_add_linked_libs,fwm,\ kernel32 \ msvcrt \ uwinapi \ )) endif +endif # vim: set noet sw=4 ts=4: diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index ed941d5b9a9f..3c3ebe85294e 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -285,6 +285,25 @@ $(eval $(call gb_Library_add_cxxobjects,sfx,\ , $(gb_LinkTarget_EXCEPTIONFLAGS) -nologo -UPRECOMPILED_HEADERS \ )) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,sfx,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + moldname \ + mingwex \ + advapi32 \ + gdi32 \ + kernel32 \ + msvcrt \ + ole32 \ + shell32 \ + user32 \ + uuid \ +)) +else $(eval $(call gb_Library_add_linked_libs,sfx,\ advapi32 \ gdi32 \ @@ -297,6 +316,7 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ uuid \ uwinapi \ )) +endif else $(eval $(call gb_Library_add_cxxobjects,sfx,\ sfx2/source/appl/shutdowniconw32 \ diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 2e335b4175c4..ddd7a21c8fb4 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -390,6 +390,20 @@ $(eval $(call gb_Library_add_linked_libs,xo,\ endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,xo,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + moldname \ + mingwex \ + kernel32 \ + msvcrt \ + user32 \ +)) +else $(eval $(call gb_Library_add_linked_libs,xo,\ kernel32 \ msvcrt \ @@ -398,4 +412,5 @@ $(eval $(call gb_Library_add_linked_libs,xo,\ uwinapi \ )) endif +endif # vim: set noet ts=4 sw=4: diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index 6880eb1a1fd9..e809935d12ba 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -101,6 +101,20 @@ $(eval $(call gb_Library_add_linked_libs,xof,\ endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,xof,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + moldname \ + mingwex \ + kernel32 \ + msvcrt \ + user32 \ +)) +else $(eval $(call gb_Library_add_linked_libs,xof,\ kernel32 \ msvcrt \ @@ -109,4 +123,5 @@ $(eval $(call gb_Library_add_linked_libs,xof,\ uwinapi \ )) endif +endif # vim: set noet ts=4 sw=4: -- cgit v1.2.3 From f00fbe6e91ce371f589d5f0fe4dd485dbb31064a Mon Sep 17 00:00:00 2001 From: tono Date: Wed, 5 Jan 2011 21:38:47 +0900 Subject: Backed out changeset: e84942bd0aca --- framework/Library_fwe.mk | 13 ------------- framework/Library_fwi.mk | 16 ---------------- framework/Library_fwk.mk | 13 ------------- framework/Library_fwl.mk | 13 ------------- framework/Library_fwm.mk | 13 ------------- sfx2/Library_sfx.mk | 20 -------------------- xmloff/Library_xo.mk | 15 --------------- xmloff/Library_xof.mk | 15 --------------- 8 files changed, 118 deletions(-) (limited to 'framework/Library_fwi.mk') diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 013fe5bbf56c..33d8959a474e 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -105,24 +105,11 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\ )) endif ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,fwe,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -else $(eval $(call gb_Library_add_linked_libs,fwe,\ kernel32 \ msvcrt \ uwinapi \ )) endif -endif # TODO: visibility # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 8512b3a874fe..568f0a1eb22a 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -84,21 +84,6 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\ )) endif ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,fwi,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - advapi32 \ - kernel32 \ - msvcrt \ - unicows \ -)) -else $(eval $(call gb_Library_add_linked_libs,fwi,\ advapi32 \ kernel32 \ @@ -108,6 +93,5 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\ uwinapi \ )) endif -endif # TODO: visibility # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 1df0c931e564..50c16b83b42a 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -190,23 +190,10 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\ )) endif ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,fwk,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -else $(eval $(call gb_Library_add_linked_libs,fwk,\ kernel32 \ msvcrt \ uwinapi \ )) endif -endif # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index b8b5290f1749..d2002115eaf0 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -90,23 +90,10 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\ )) endif ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,fwl,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -else $(eval $(call gb_Library_add_linked_libs,fwl,\ kernel32 \ msvcrt \ uwinapi \ )) endif -endif # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index e67c2a627091..9ff49719148a 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -72,23 +72,10 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\ )) endif ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,fwm,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -else $(eval $(call gb_Library_add_linked_libs,fwm,\ kernel32 \ msvcrt \ uwinapi \ )) endif -endif # vim: set noet sw=4 ts=4: diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 3c3ebe85294e..ed941d5b9a9f 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -285,25 +285,6 @@ $(eval $(call gb_Library_add_cxxobjects,sfx,\ , $(gb_LinkTarget_EXCEPTIONFLAGS) -nologo -UPRECOMPILED_HEADERS \ )) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,sfx,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - advapi32 \ - gdi32 \ - kernel32 \ - msvcrt \ - ole32 \ - shell32 \ - user32 \ - uuid \ -)) -else $(eval $(call gb_Library_add_linked_libs,sfx,\ advapi32 \ gdi32 \ @@ -316,7 +297,6 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ uuid \ uwinapi \ )) -endif else $(eval $(call gb_Library_add_cxxobjects,sfx,\ sfx2/source/appl/shutdowniconw32 \ diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index ddd7a21c8fb4..2e335b4175c4 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -390,20 +390,6 @@ $(eval $(call gb_Library_add_linked_libs,xo,\ endif ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,xo,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else $(eval $(call gb_Library_add_linked_libs,xo,\ kernel32 \ msvcrt \ @@ -412,5 +398,4 @@ $(eval $(call gb_Library_add_linked_libs,xo,\ uwinapi \ )) endif -endif # vim: set noet ts=4 sw=4: diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index e809935d12ba..6880eb1a1fd9 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -101,20 +101,6 @@ $(eval $(call gb_Library_add_linked_libs,xof,\ endif ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,xof,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else $(eval $(call gb_Library_add_linked_libs,xof,\ kernel32 \ msvcrt \ @@ -123,5 +109,4 @@ $(eval $(call gb_Library_add_linked_libs,xof,\ uwinapi \ )) endif -endif # vim: set noet ts=4 sw=4: -- cgit v1.2.3 From c39a9eac4a5102bbac426a8822b6e49f1a3d7b32 Mon Sep 17 00:00:00 2001 From: tono Date: Wed, 5 Jan 2011 22:55:15 +0900 Subject: mingwport33: i#116264: gbuild for MinGW --- framework/Library_fwe.mk | 13 +++++++++++++ framework/Library_fwi.mk | 16 ++++++++++++++++ framework/Library_fwk.mk | 13 +++++++++++++ framework/Library_fwl.mk | 13 +++++++++++++ framework/Library_fwm.mk | 13 +++++++++++++ sfx2/Library_sfx.mk | 20 ++++++++++++++++++++ xmloff/Library_xo.mk | 15 +++++++++++++++ xmloff/Library_xof.mk | 15 +++++++++++++++ 8 files changed, 118 insertions(+) (limited to 'framework/Library_fwi.mk') diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 33d8959a474e..013fe5bbf56c 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -105,11 +105,24 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\ )) endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,fwe,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + mingwex \ + kernel32 \ + msvcrt \ +)) +else $(eval $(call gb_Library_add_linked_libs,fwe,\ kernel32 \ msvcrt \ uwinapi \ )) endif +endif # TODO: visibility # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 568f0a1eb22a..8512b3a874fe 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -84,6 +84,21 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\ )) endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,fwi,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + moldname \ + mingwex \ + advapi32 \ + kernel32 \ + msvcrt \ + unicows \ +)) +else $(eval $(call gb_Library_add_linked_libs,fwi,\ advapi32 \ kernel32 \ @@ -93,5 +108,6 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\ uwinapi \ )) endif +endif # TODO: visibility # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 50c16b83b42a..1df0c931e564 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -190,10 +190,23 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\ )) endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,fwk,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + mingwex \ + kernel32 \ + msvcrt \ +)) +else $(eval $(call gb_Library_add_linked_libs,fwk,\ kernel32 \ msvcrt \ uwinapi \ )) endif +endif # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index d2002115eaf0..b8b5290f1749 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -90,10 +90,23 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\ )) endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,fwl,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + mingwex \ + kernel32 \ + msvcrt \ +)) +else $(eval $(call gb_Library_add_linked_libs,fwl,\ kernel32 \ msvcrt \ uwinapi \ )) endif +endif # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index 9ff49719148a..e67c2a627091 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -72,10 +72,23 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\ )) endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,fwm,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + mingwex \ + kernel32 \ + msvcrt \ +)) +else $(eval $(call gb_Library_add_linked_libs,fwm,\ kernel32 \ msvcrt \ uwinapi \ )) endif +endif # vim: set noet sw=4 ts=4: diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index ed941d5b9a9f..3c3ebe85294e 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -285,6 +285,25 @@ $(eval $(call gb_Library_add_cxxobjects,sfx,\ , $(gb_LinkTarget_EXCEPTIONFLAGS) -nologo -UPRECOMPILED_HEADERS \ )) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,sfx,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + moldname \ + mingwex \ + advapi32 \ + gdi32 \ + kernel32 \ + msvcrt \ + ole32 \ + shell32 \ + user32 \ + uuid \ +)) +else $(eval $(call gb_Library_add_linked_libs,sfx,\ advapi32 \ gdi32 \ @@ -297,6 +316,7 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ uuid \ uwinapi \ )) +endif else $(eval $(call gb_Library_add_cxxobjects,sfx,\ sfx2/source/appl/shutdowniconw32 \ diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 2e335b4175c4..ddd7a21c8fb4 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -390,6 +390,20 @@ $(eval $(call gb_Library_add_linked_libs,xo,\ endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,xo,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + moldname \ + mingwex \ + kernel32 \ + msvcrt \ + user32 \ +)) +else $(eval $(call gb_Library_add_linked_libs,xo,\ kernel32 \ msvcrt \ @@ -398,4 +412,5 @@ $(eval $(call gb_Library_add_linked_libs,xo,\ uwinapi \ )) endif +endif # vim: set noet ts=4 sw=4: diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index 6880eb1a1fd9..e809935d12ba 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -101,6 +101,20 @@ $(eval $(call gb_Library_add_linked_libs,xof,\ endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,xof,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + moldname \ + mingwex \ + kernel32 \ + msvcrt \ + user32 \ +)) +else $(eval $(call gb_Library_add_linked_libs,xof,\ kernel32 \ msvcrt \ @@ -109,4 +123,5 @@ $(eval $(call gb_Library_add_linked_libs,xof,\ uwinapi \ )) endif +endif # vim: set noet ts=4 sw=4: -- cgit v1.2.3 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 --- editeng/AllLangResTarget_editeng.mk | 6 +++--- editeng/Library_editeng.mk | 6 +++--- editeng/Module_editeng.mk | 6 +++--- editeng/Package_inc.mk | 6 +++--- framework/AllLangResTarget_fwe.mk | 6 +++--- framework/Library_fwe.mk | 6 +++--- framework/Library_fwi.mk | 6 +++--- framework/Library_fwk.mk | 6 +++--- framework/Library_fwl.mk | 6 +++--- framework/Library_fwm.mk | 6 +++--- framework/Module_framework.mk | 6 +++--- framework/Package_dtd.mk | 6 +++--- framework/Package_inc.mk | 6 +++--- framework/Package_uiconfig.mk | 6 +++--- framework/Package_unotypes.mk | 6 +++--- sfx2/AllLangResTarget_sfx2.mk | 6 +++--- sfx2/CppunitTest_sfx2_metadatable.mk | 6 +++--- sfx2/JunitTest_sfx2_complex.mk | 6 +++--- sfx2/Library_qstart.mk | 6 +++--- sfx2/Library_sfx.mk | 6 +++--- sfx2/Module_sfx2.mk | 6 +++--- sfx2/Package_inc.mk | 6 +++--- sfx2/Package_sdi.mk | 6 +++--- svx/AllLangResTarget_about.mk | 6 +++--- svx/AllLangResTarget_gal.mk | 6 +++--- svx/AllLangResTarget_ofa.mk | 6 +++--- svx/AllLangResTarget_svx.mk | 6 +++--- svx/AllLangResTarget_textconversiondlgs.mk | 6 +++--- svx/Library_svx.mk | 6 +++--- svx/Library_svxcore.mk | 6 +++--- svx/Library_textconversiondlgs.mk | 6 +++--- svx/Makefile | 2 +- svx/Module_svx.mk | 6 +++--- svx/Package_inc.mk | 8 ++++---- svx/Package_sdi.mk | 6 +++--- vbahelper/Library_msforms.mk | 6 +++--- vbahelper/Library_vbahelper.mk | 6 +++--- vbahelper/Module_vbahelper.mk | 6 +++--- vbahelper/Package_inc.mk | 6 +++--- xmloff/Library_xo.mk | 6 +++--- xmloff/Library_xof.mk | 6 +++--- xmloff/Module_xmloff.mk | 6 +++--- xmloff/Package_dtd.mk | 6 +++--- xmloff/Package_inc.mk | 6 +++--- 44 files changed, 131 insertions(+), 131 deletions(-) (limited to 'framework/Library_fwi.mk') diff --git a/editeng/AllLangResTarget_editeng.mk b/editeng/AllLangResTarget_editeng.mk index 597a0be2581c..e2bd16e4885c 100755 --- a/editeng/AllLangResTarget_editeng.mk +++ b/editeng/AllLangResTarget_editeng.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/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index ec60e1248dc2..0bcd965f8c7c 100755 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.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/editeng/Module_editeng.mk b/editeng/Module_editeng.mk index f60c728fa8b1..4a5dbcf30695 100755 --- a/editeng/Module_editeng.mk +++ b/editeng/Module_editeng.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/editeng/Package_inc.mk b/editeng/Package_inc.mk index d40fb24bb18e..d0c984a78a90 100755 --- a/editeng/Package_inc.mk +++ b/editeng/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. # diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk index 031cb24117d7..10baea76a9e1 100644 --- a/framework/AllLangResTarget_fwe.mk +++ b/framework/AllLangResTarget_fwe.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/framework/Library_fwe.mk b/framework/Library_fwe.mk index 33d8959a474e..301b7e8a37c4 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.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/framework/Library_fwi.mk b/framework/Library_fwi.mk index 568f0a1eb22a..79aa63cb4fa9 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.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/framework/Library_fwk.mk b/framework/Library_fwk.mk index 50c16b83b42a..ddf0c4474510 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.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/framework/Library_fwl.mk b/framework/Library_fwl.mk index d2002115eaf0..4b8625a0a698 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.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/framework/Library_fwm.mk b/framework/Library_fwm.mk index 9ff49719148a..2cac836b9269 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.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/framework/Module_framework.mk b/framework/Module_framework.mk index ddc0abc152bd..82e5a34e51cf 100644 --- a/framework/Module_framework.mk +++ b/framework/Module_framework.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/framework/Package_dtd.mk b/framework/Package_dtd.mk index db23783c4ef9..99318b553acd 100644 --- a/framework/Package_dtd.mk +++ b/framework/Package_dtd.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/framework/Package_inc.mk b/framework/Package_inc.mk index adefc3ccbd56..c5834fa63d71 100644 --- a/framework/Package_inc.mk +++ b/framework/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. # diff --git a/framework/Package_uiconfig.mk b/framework/Package_uiconfig.mk index 295be6c87252..0eca53143c4e 100644 --- a/framework/Package_uiconfig.mk +++ b/framework/Package_uiconfig.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/framework/Package_unotypes.mk b/framework/Package_unotypes.mk index 01069ae93dc4..542dc09902c5 100644 --- a/framework/Package_unotypes.mk +++ b/framework/Package_unotypes.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/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk index aa3270e08a07..04f184370a39 100644 --- a/sfx2/AllLangResTarget_sfx2.mk +++ b/sfx2/AllLangResTarget_sfx2.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/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index 4635ad14d101..b914422813ee 100755 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.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/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk index fbb1e11d8c8c..5d4555aa2bb0 100755 --- a/sfx2/JunitTest_sfx2_complex.mk +++ b/sfx2/JunitTest_sfx2_complex.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/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 6ed99271d353..2843524b1dc1 100755 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.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/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index cd700f543fb0..cb3f2959e48d 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.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/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index 06d3ae861a80..d0e577241468 100755 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.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/sfx2/Package_inc.mk b/sfx2/Package_inc.mk index 6ad8b0209c4e..0d192443477c 100644 --- a/sfx2/Package_inc.mk +++ b/sfx2/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. # diff --git a/sfx2/Package_sdi.mk b/sfx2/Package_sdi.mk index 63f2138adf4f..43e484b19a2d 100644 --- a/sfx2/Package_sdi.mk +++ b/sfx2/Package_sdi.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/svx/AllLangResTarget_about.mk b/svx/AllLangResTarget_about.mk index 9d2a37f4a911..0d08c0075665 100644 --- a/svx/AllLangResTarget_about.mk +++ b/svx/AllLangResTarget_about.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/svx/AllLangResTarget_gal.mk b/svx/AllLangResTarget_gal.mk index 5b8b3bc628a4..eb0b5b15c444 100755 --- a/svx/AllLangResTarget_gal.mk +++ b/svx/AllLangResTarget_gal.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/svx/AllLangResTarget_ofa.mk b/svx/AllLangResTarget_ofa.mk index 07febc115938..964b6562b3dd 100644 --- a/svx/AllLangResTarget_ofa.mk +++ b/svx/AllLangResTarget_ofa.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/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index 6862688339b7..1fbce148dfe2 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.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/svx/AllLangResTarget_textconversiondlgs.mk b/svx/AllLangResTarget_textconversiondlgs.mk index 0c25f77f018a..d30ccd40641b 100644 --- a/svx/AllLangResTarget_textconversiondlgs.mk +++ b/svx/AllLangResTarget_textconversiondlgs.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/svx/Library_svx.mk b/svx/Library_svx.mk index 501cf488f556..0ca0c80aad6c 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.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/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 3acc48d80ec6..2aed7588e050 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.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/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 31ab7907c2a0..9df518190077 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.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/svx/Makefile b/svx/Makefile index 5002d3f122a1..90947b2e5f48 100644 --- a/svx/Makefile +++ b/svx/Makefile @@ -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 # diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index 988e82c1d8bb..864f034ffafe 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.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/svx/Package_inc.mk b/svx/Package_inc.mk index 481d8838c9fe..81066e9c7bff 100644 --- a/svx/Package_inc.mk +++ b/svx/Package_inc.mk @@ -1,8 +1,8 @@ #************************************************************************* # # 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/svx/Package_sdi.mk b/svx/Package_sdi.mk index 1fd307abbf67..0a43a1ae7be3 100644 --- a/svx/Package_sdi.mk +++ b/svx/Package_sdi.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_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. # diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 2e335b4175c4..6d8bef0df7b0 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.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/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index 6880eb1a1fd9..40b48a0ba4af 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.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/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk index d17caa0c3b4b..74a1aa3aaa1e 100644 --- a/xmloff/Module_xmloff.mk +++ b/xmloff/Module_xmloff.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/xmloff/Package_dtd.mk b/xmloff/Package_dtd.mk index fbfbe4a1400d..7f2d5a4e0f1d 100644 --- a/xmloff/Package_dtd.mk +++ b/xmloff/Package_dtd.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/xmloff/Package_inc.mk b/xmloff/Package_inc.mk index ca2d0abe62e2..4e11c2b4b5d9 100644 --- a/xmloff/Package_inc.mk +++ b/xmloff/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 v1.2.3 From 2e98dd0232e6f593998060844c50851a54bd3cef Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 1 Feb 2011 18:44:12 +0100 Subject: CWS gnumake3: use standard linked libs on Windows --- editeng/Library_editeng.mk | 10 +--------- framework/Library_fwe.mk | 7 +------ framework/Library_fwi.mk | 8 +------- framework/Library_fwk.mk | 7 +------ framework/Library_fwl.mk | 7 +------ framework/Library_fwm.mk | 7 +------ sfx2/CppunitTest_sfx2_metadatable.mk | 10 +--------- sfx2/Library_sfx.mk | 8 ++------ svx/Library_svx.mk | 5 +---- svx/Library_svxcore.mk | 12 +----------- svx/Library_textconversiondlgs.mk | 12 +----------- xmloff/Library_xo.mk | 11 +---------- xmloff/Library_xof.mk | 11 +---------- 13 files changed, 14 insertions(+), 101 deletions(-) (limited to 'framework/Library_fwi.mk') diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 6c621d3e6721..293270b9a47c 100755 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -164,6 +164,7 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\ icuuc \ i18nisolang1 \ i18npaper \ + $(gb_StdLibs) \ )) ifeq ($(OS),LINUX) @@ -174,14 +175,5 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\ )) endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,editeng,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 4197128abf6e..63ff8cbb9897 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\ utl \ vcl \ vos3 \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,fwe,\ @@ -116,12 +117,6 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\ kernel32 \ msvcrt \ )) -else -$(eval $(call gb_Library_add_linked_libs,fwe,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) endif endif # TODO: visibility diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 1ba9d9fda79a..e510768700be 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -58,6 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\ utl \ vcl \ vos3 \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,fwi,\ @@ -91,21 +92,14 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\ mingw32 \ $(gb_MINGW_LIBGCC) \ uwinapi \ - moldname \ mingwex \ advapi32 \ kernel32 \ msvcrt \ - unicows \ )) else $(eval $(call gb_Library_add_linked_libs,fwi,\ advapi32 \ - kernel32 \ - msvcrt \ - stl \ - unicows \ - uwinapi \ )) endif endif diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 0bafaa85c23e..80a0ea120d1f 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -58,6 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\ ucbhelper \ utl \ vcl \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,fwk,\ @@ -201,12 +202,6 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\ kernel32 \ msvcrt \ )) -else -$(eval $(call gb_Library_add_linked_libs,fwk,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) endif endif # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index 4fb96617cad3..86325804e513 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -54,6 +54,7 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\ tl \ utl \ vcl \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,fwl,\ @@ -101,12 +102,6 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\ kernel32 \ msvcrt \ )) -else -$(eval $(call gb_Library_add_linked_libs,fwl,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) endif endif # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index 7e75f3f8906f..f441f4d78d56 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\ utl \ vcl \ vos3 \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,fwm,\ @@ -83,12 +84,6 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\ kernel32 \ msvcrt \ )) -else -$(eval $(call gb_Library_add_linked_libs,fwm,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) endif endif # vim: set noet sw=4 ts=4: diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index b914422813ee..d2a31b624d0d 100755 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \ sal \ sfx \ stl \ + $(gb_StdLibs) \ )) $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ @@ -43,13 +44,4 @@ $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ -I$(OUTDIR)/inc \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \ - kernel32 \ - user32 \ - oldnames \ - msvcrt \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 6ead09f6eb48..9ce73f2369ef 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -76,6 +76,7 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ vcl \ vos3 \ xml2 \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_linked_system_libs,sfx,\ @@ -290,7 +291,6 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ mingw32 \ $(gb_MINGW_LIBGCC) \ uwinapi \ - moldname \ mingwex \ advapi32 \ gdi32 \ @@ -303,16 +303,12 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ )) else $(eval $(call gb_Library_add_linked_libs,sfx,\ - advapi32 \ gdi32 \ - kernel32 \ - msvcrt \ - oldnames \ + advapi32 \ ole32 \ shell32 \ user32 \ uuid \ - uwinapi \ )) endif else diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 944f5126a59f..97cde827eb56 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -68,6 +68,7 @@ $(eval $(call gb_Library_add_linked_libs,svx,\ vos3 \ xo \ xcr \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,svx,\ @@ -226,11 +227,7 @@ else ifeq ($(OS),WNT) $(eval $(call gb_Library_add_linked_libs,svx,\ advapi32 \ - kernel32 \ - msvcrt \ oldnames \ - user32 \ - uwinapi \ )) $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/sendreportw32 \ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 33f6ac03af5a..6e811cead2a9 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -83,6 +83,7 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\ vcl \ vos3 \ xo \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,svxcore,\ @@ -455,17 +456,6 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\ )) endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,svxcore,\ - advapi32 \ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif - $(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx)) $(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\ diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 9df518190077..2e0880aced18 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\ tl \ utl \ vcl \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\ @@ -71,15 +72,4 @@ $(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\ )) endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\ - advapi32 \ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 566154a3c480..1aa8b6407eae 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -59,6 +59,7 @@ $(eval $(call gb_Library_add_linked_libs,xo,\ tl \ utl \ vos3 \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,xo,\ @@ -395,19 +396,9 @@ $(eval $(call gb_Library_add_linked_libs,xo,\ mingw32 \ $(gb_MINGW_LIBGCC) \ uwinapi \ - moldname \ mingwex \ kernel32 \ msvcrt \ - user32 \ -)) -else -$(eval $(call gb_Library_add_linked_libs,xo,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ )) endif endif diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index be5c7144aa6e..55e3fbdd66ee 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,xof,\ salhelper \ stl \ xo \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,xof,\ @@ -106,19 +107,9 @@ $(eval $(call gb_Library_add_linked_libs,xof,\ mingw32 \ $(gb_MINGW_LIBGCC) \ uwinapi \ - moldname \ mingwex \ kernel32 \ msvcrt \ - user32 \ -)) -else -$(eval $(call gb_Library_add_linked_libs,xof,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ )) endif endif -- cgit v1.2.3 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 --- editeng/Library_editeng.mk | 14 +- framework/Library_fwe.mk | 14 +- framework/Library_fwi.mk | 11 +- framework/Library_fwk.mk | 12 +- framework/Library_fwl.mk | 10 +- framework/Library_fwm.mk | 10 +- .../inc/helper/uiconfigelementwrapperbase.hxx | 61 ++- framework/inc/helper/uielementwrapperbase.hxx | 45 +- .../fwe/helper/uiconfigelementwrapperbase.cxx | 571 --------------------- .../source/fwe/helper/uielementwrapperbase.cxx | 282 ---------- .../source/helper/uiconfigelementwrapperbase.cxx | 571 +++++++++++++++++++++ framework/source/helper/uielementwrapperbase.cxx | 282 ++++++++++ sfx2/CppunitTest_sfx2_metadatable.mk | 2 +- sfx2/Library_qstart.mk | 7 - sfx2/Library_sfx.mk | 9 +- svx/Library_svx.mk | 7 +- svx/Library_svxcore.mk | 10 +- svx/Library_textconversiondlgs.mk | 11 +- vbahelper/Library_msforms.mk | 20 +- vbahelper/Library_vbahelper.mk | 20 +- xmloff/Library_xo.mk | 11 +- xmloff/Library_xof.mk | 11 +- 22 files changed, 928 insertions(+), 1063 deletions(-) delete mode 100644 framework/source/fwe/helper/uiconfigelementwrapperbase.cxx delete mode 100644 framework/source/fwe/helper/uielementwrapperbase.cxx create mode 100644 framework/source/helper/uiconfigelementwrapperbase.cxx create mode 100644 framework/source/helper/uielementwrapperbase.cxx (limited to 'framework/Library_fwi.mk') diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 293270b9a47c..9213abedd3b1 100755 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -31,10 +31,6 @@ $(eval $(call gb_Library_add_package_headers,editeng,editeng_inc)) $(eval $(call gb_Library_add_precompiled_header,editeng,$(SRCDIR)/editeng/inc/pch/precompiled_editeng)) -# in case UNO services are exported: declare location of component file -#$(eval $(call gb_Library_set_componentfile,editeng,editeng/COMPONENT_FILE)) - -# add any additional include paths for this library here $(eval $(call gb_Library_set_include,editeng,\ $$(INCLUDE) \ -I$(SRCDIR)/editeng/inc/pch \ @@ -164,16 +160,8 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\ icuuc \ i18nisolang1 \ i18npaper \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,editeng,\ - dl \ - m \ - pthread \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 63ff8cbb9897..0b44b82632d1 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\ utl \ vcl \ vos3 \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,fwe,\ @@ -78,8 +78,6 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/helper/imageproducer \ framework/source/fwe/helper/propertysetcontainer \ framework/source/fwe/helper/titlehelper \ - framework/source/fwe/helper/uiconfigelementwrapperbase \ - framework/source/fwe/helper/uielementwrapperbase \ framework/source/fwe/interaction/preventduplicateinteraction \ framework/source/fwe/xml/eventsconfiguration \ framework/source/fwe/xml/eventsdocumenthandler \ @@ -95,15 +93,9 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/xml/xmlnamespaces \ )) +#todo: ImageListDescriptor can't be exported completely without exporting everything ifeq ($(OS),LINUX) - $(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS)))) - -$(eval $(call gb_Library_add_linked_libs,fwe,\ - dl \ - m \ - pthread \ -)) endif ifeq ($(OS),WNT) ifneq ($(USE_MINGW),) @@ -119,5 +111,5 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\ )) endif endif -# TODO: visibility + # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index e510768700be..fc60fdf15564 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -58,7 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\ utl \ vcl \ vos3 \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,fwi,\ @@ -77,13 +77,6 @@ $(eval $(call gb_Library_add_exception_objects,fwi,\ framework/source/fwi/uielement/rootitemcontainer \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,fwi,\ - dl \ - m \ - pthread \ -)) -endif ifeq ($(OS),WNT) ifneq ($(USE_MINGW),) $(eval $(call gb_Library_add_linked_libs,fwi,\ @@ -103,5 +96,5 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\ )) endif endif -# TODO: visibility + # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 80a0ea120d1f..27e3d924774c 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -58,7 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\ ucbhelper \ utl \ vcl \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,fwk,\ @@ -96,6 +96,8 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/helper/statusindicatorfactory \ framework/source/helper/tagwindowasmodified \ framework/source/helper/titlebarupdate \ + framework/source/helper/uiconfigelementwrapperbase \ + framework/source/helper/uielementwrapperbase \ framework/source/helper/vclstatusindicator \ framework/source/helper/wakeupthread \ framework/source/interaction/quietinteraction \ @@ -183,13 +185,6 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/xml/acceleratorconfigurationwriter \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,fwk,\ - dl \ - m \ - pthread \ -)) -endif ifeq ($(OS),WNT) ifneq ($(USE_MINGW),) $(eval $(call gb_Library_add_linked_libs,fwk,\ @@ -204,4 +199,5 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\ )) endif endif + # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index 86325804e513..cbf4a7b9a901 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\ tl \ utl \ vcl \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,fwl,\ @@ -83,13 +83,7 @@ $(eval $(call gb_Library_add_exception_objects,fwl,\ framework/source/uielement/simpletextstatusbarcontroller \ framework/source/uielement/toolbarsmenucontroller \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,fwl,\ - dl \ - m \ - pthread \ -)) -endif + ifeq ($(OS),WNT) ifneq ($(USE_MINGW),) $(eval $(call gb_Library_add_linked_libs,fwl,\ diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index f441f4d78d56..c242ecc8e12f 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -53,7 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\ utl \ vcl \ vos3 \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,fwm,\ @@ -65,13 +65,6 @@ $(eval $(call gb_Library_add_exception_objects,fwm,\ framework/source/tabwin/tabwinfactory \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,fwm,\ - dl \ - m \ - pthread \ -)) -endif ifeq ($(OS),WNT) ifneq ($(USE_MINGW),) $(eval $(call gb_Library_add_linked_libs,fwm,\ @@ -86,4 +79,5 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\ )) endif endif + # vim: set noet sw=4 ts=4: diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx index a815e7ac544d..d2df4bc541b3 100644 --- a/framework/inc/helper/uiconfigelementwrapperbase.hxx +++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx @@ -58,7 +58,6 @@ #include #include #include -#include namespace framework { @@ -79,48 +78,48 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider // public methods //------------------------------------------------------------------------------------------------------------- public: - FWE_DLLPUBLIC UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory ); - virtual FWE_DLLPUBLIC ~UIConfigElementWrapperBase(); + UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory ); + virtual ~UIConfigElementWrapperBase(); // XInterface - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); - virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw(); - virtual FWE_DLLPUBLIC void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XTypeProvider - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); // XComponent - virtual FWE_DLLPUBLIC void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; - virtual FWE_DLLPUBLIC void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // XInitialization - virtual FWE_DLLPUBLIC void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XUIElementSettings - virtual FWE_DLLPUBLIC void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0; - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException); // XUIElement - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; // XUpdatable - virtual FWE_DLLPUBLIC void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); // XUIConfigurationListener - virtual FWE_DLLPUBLIC void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); // XEventListener using cppu::OPropertySetHelper::disposing; - virtual FWE_DLLPUBLIC void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); //------------------------------------------------------------------------------------------------------------- // protected methods @@ -128,21 +127,21 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider protected: // OPropertySetHelper - virtual FWE_DLLPUBLIC sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , + virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , com::sun::star::uno::Any& aOldValue , sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ); - virtual FWE_DLLPUBLIC void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ); using cppu::OPropertySetHelper::getFastPropertyValue; - virtual FWE_DLLPUBLIC void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , + virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , sal_Int32 nHandle ) const; - virtual FWE_DLLPUBLIC ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC void impl_fillNewData(); + virtual void impl_fillNewData(); - static FWE_DLLPUBLIC const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); + static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); sal_Int16 m_nType; bool m_bPersistent : 1, diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx index daa574c9411e..667af7d7f97b 100644 --- a/framework/inc/helper/uielementwrapperbase.hxx +++ b/framework/inc/helper/uielementwrapperbase.hxx @@ -53,7 +53,6 @@ #include #include #include -#include namespace framework { @@ -72,34 +71,34 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider // public methods //------------------------------------------------------------------------------------------------------------- public: - FWE_DLLPUBLIC UIElementWrapperBase( sal_Int16 nType ); - virtual FWE_DLLPUBLIC ~UIElementWrapperBase(); + UIElementWrapperBase( sal_Int16 nType ); + virtual ~UIElementWrapperBase(); // XInterface - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); - virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw(); - virtual FWE_DLLPUBLIC void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XTypeProvider - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); // XComponent - virtual FWE_DLLPUBLIC void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; - virtual FWE_DLLPUBLIC void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // XInitialization - virtual FWE_DLLPUBLIC void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XUpdatable - virtual FWE_DLLPUBLIC void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); // XUIElement - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; //------------------------------------------------------------------------------------------------------------- // protected methods @@ -107,19 +106,19 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider protected: // OPropertySetHelper - virtual FWE_DLLPUBLIC sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , + virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , com::sun::star::uno::Any& aOldValue , sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ); - virtual FWE_DLLPUBLIC void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ); using cppu::OPropertySetHelper::getFastPropertyValue; - virtual FWE_DLLPUBLIC void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , + virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , sal_Int32 nHandle ) const; - virtual FWE_DLLPUBLIC ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); - static FWE_DLLPUBLIC const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); + static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener rtl::OUString m_aResourceURL; diff --git a/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx b/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx deleted file mode 100644 index 030ec5bf8cf6..000000000000 --- a/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx +++ /dev/null @@ -1,571 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_framework.hxx" - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ -#include -#include -#include -#include -#include -#include - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ -#include -#include -#include -#include - -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ -#include -#include - -const int UIELEMENT_PROPHANDLE_CONFIGSOURCE = 1; -const int UIELEMENT_PROPHANDLE_FRAME = 2; -const int UIELEMENT_PROPHANDLE_PERSISTENT = 3; -const int UIELEMENT_PROPHANDLE_RESOURCEURL = 4; -const int UIELEMENT_PROPHANDLE_TYPE = 5; -const int UIELEMENT_PROPHANDLE_XMENUBAR = 6; -const int UIELEMENT_PROPHANDLE_CONFIGLISTENER = 7; -const int UIELEMENT_PROPHANDLE_NOCLOSE = 8; -const int UIELEMENT_PROPCOUNT = 8; -const rtl::OUString UIELEMENT_PROPNAME_CONFIGLISTENER( RTL_CONSTASCII_USTRINGPARAM( "ConfigListener" )); -const rtl::OUString UIELEMENT_PROPNAME_CONFIGSOURCE( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" )); -const rtl::OUString UIELEMENT_PROPNAME_FRAME( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); -const rtl::OUString UIELEMENT_PROPNAME_PERSISTENT( RTL_CONSTASCII_USTRINGPARAM( "Persistent" )); -const rtl::OUString UIELEMENT_PROPNAME_RESOURCEURL( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" )); -const rtl::OUString UIELEMENT_PROPNAME_TYPE( RTL_CONSTASCII_USTRINGPARAM( "Type" )); -const rtl::OUString UIELEMENT_PROPNAME_XMENUBAR( RTL_CONSTASCII_USTRINGPARAM( "XMenuBar" )); -const rtl::OUString UIELEMENT_PROPNAME_NOCLOSE( RTL_CONSTASCII_USTRINGPARAM( "NoClose" )); - -using namespace rtl; -using namespace com::sun::star::beans; -using namespace com::sun::star::uno; -using namespace com::sun::star::frame; -using namespace com::sun::star::lang; -using namespace com::sun::star::container; -using namespace ::com::sun::star::ui; - -namespace framework -{ - -//***************************************************************************************************************** -// XInterface, XTypeProvider -//***************************************************************************************************************** -DEFINE_XINTERFACE_10 ( UIConfigElementWrapperBase , - OWeakObject , - DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), - DIRECT_INTERFACE( ::com::sun::star::ui::XUIElement ), - DIRECT_INTERFACE( ::com::sun::star::ui::XUIElementSettings ), - DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::lang::XInitialization ), - DIRECT_INTERFACE( ::com::sun::star::lang::XComponent ), - DIRECT_INTERFACE( ::com::sun::star::util::XUpdatable ), - DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationListener ) - ) - -DEFINE_XTYPEPROVIDER_10 ( UIConfigElementWrapperBase , - ::com::sun::star::lang::XTypeProvider , - ::com::sun::star::ui::XUIElement , - ::com::sun::star::ui::XUIElementSettings , - ::com::sun::star::beans::XMultiPropertySet , - ::com::sun::star::beans::XFastPropertySet , - ::com::sun::star::beans::XPropertySet , - ::com::sun::star::lang::XInitialization , - ::com::sun::star::lang::XComponent , - ::com::sun::star::util::XUpdatable , - ::com::sun::star::ui::XUIConfigurationListener - ) - -UIConfigElementWrapperBase::UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory ) - : ThreadHelpBase ( &Application::GetSolarMutex() ) - , ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() ) - , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) - , ::cppu::OWeakObject ( ) - , m_nType ( nType ) - , m_bPersistent ( sal_True ) - , m_bInitialized ( sal_False ) - , m_bConfigListener ( sal_False ) - , m_bConfigListening ( sal_False ) - , m_bDisposed ( sal_False ) - , m_bNoClose ( sal_False ) - , m_xServiceFactory ( _xServiceFactory ) - , m_aListenerContainer ( m_aLock.getShareableOslMutex() ) -{ -} - -UIConfigElementWrapperBase::~UIConfigElementWrapperBase() -{ -} - -// XComponent -void SAL_CALL UIConfigElementWrapperBase::dispose() throw (::com::sun::star::uno::RuntimeException) -{ - // must be implemented by derived class - ResetableGuard aLock( m_aLock ); - m_bDisposed = sal_True; -} - -void SAL_CALL UIConfigElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) -{ - m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); -} - -void SAL_CALL UIConfigElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException) -{ - m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), aListener ); -} - -// XEventListener -void SAL_CALL UIConfigElementWrapperBase::disposing( const EventObject& ) -throw( RuntimeException ) -{ - ResetableGuard aLock( m_aLock ); - m_xConfigSource.clear(); -} - -void SAL_CALL UIConfigElementWrapperBase::initialize( const Sequence< Any >& aArguments ) -throw ( Exception, RuntimeException ) -{ - ResetableGuard aLock( m_aLock ); - - if ( !m_bInitialized ) - { - for ( sal_Int32 n = 0; n < aArguments.getLength(); n++ ) - { - PropertyValue aPropValue; - if ( aArguments[n] >>= aPropValue ) - { - if ( aPropValue.Name.equals( UIELEMENT_PROPNAME_CONFIGSOURCE )) - setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_CONFIGSOURCE, aPropValue.Value ); - else if ( aPropValue.Name.equals( UIELEMENT_PROPNAME_FRAME )) - setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_FRAME, aPropValue.Value ); - else if ( aPropValue.Name.equals( UIELEMENT_PROPNAME_PERSISTENT )) - setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_PERSISTENT, aPropValue.Value ); - else if ( aPropValue.Name.equals( UIELEMENT_PROPNAME_RESOURCEURL )) - setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_RESOURCEURL, aPropValue.Value ); - else if ( aPropValue.Name.equals( UIELEMENT_PROPNAME_TYPE )) - setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_TYPE, aPropValue.Value ); - else if ( aPropValue.Name.equals( UIELEMENT_PROPNAME_CONFIGLISTENER )) - setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_CONFIGLISTENER, aPropValue.Value ); - else if ( aPropValue.Name.equals( UIELEMENT_PROPNAME_NOCLOSE )) - setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_NOCLOSE, aPropValue.Value ); - } - } - - m_bInitialized = sal_True; - } -} - -// XUpdatable -void SAL_CALL UIConfigElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException) -{ - // can be implemented by derived class -} - -void SAL_CALL UIConfigElementWrapperBase::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException) -{ - // can be implemented by derived class -} - -void SAL_CALL UIConfigElementWrapperBase::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException) -{ - // can be implemented by derived class -} - -void SAL_CALL UIConfigElementWrapperBase::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException) -{ - // can be implemented by derived class -} - -// XPropertySet helper -sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& aConvertedValue , - Any& aOldValue , - sal_Int32 nHandle , - const Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ) -{ - // Initialize state with FALSE !!! - // (Handle can be invalid) - sal_Bool bReturn = sal_False; - - switch( nHandle ) - { - case UIELEMENT_PROPHANDLE_CONFIGLISTENER: - bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(m_bConfigListener), - aValue, - aOldValue, - aConvertedValue); - break; - - case UIELEMENT_PROPHANDLE_CONFIGSOURCE: - bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(m_xConfigSource), - aValue, - aOldValue, - aConvertedValue); - break; - - case UIELEMENT_PROPHANDLE_FRAME: - { - Reference< XFrame > xFrame( m_xWeakFrame ); - bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(xFrame), - aValue, - aOldValue, - aConvertedValue); - } - break; - - case UIELEMENT_PROPHANDLE_PERSISTENT: - bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(m_bPersistent), - aValue, - aOldValue, - aConvertedValue); - break; - - case UIELEMENT_PROPHANDLE_RESOURCEURL: - bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(m_aResourceURL), - aValue, - aOldValue, - aConvertedValue); - break; - - case UIELEMENT_PROPHANDLE_TYPE : - bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(m_nType), - aValue, - aOldValue, - aConvertedValue); - break; - - case UIELEMENT_PROPHANDLE_XMENUBAR : - bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(m_xMenuBar), - aValue, - aOldValue, - aConvertedValue); - break; - - case UIELEMENT_PROPHANDLE_NOCLOSE: - bReturn = PropHelper::willPropertyBeChanged( - com::sun::star::uno::makeAny(m_bNoClose), - aValue, - aOldValue, - aConvertedValue); - break; - } - - // Return state of operation. - return bReturn ; -} - -void SAL_CALL UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ) -{ - switch( nHandle ) - { - case UIELEMENT_PROPHANDLE_CONFIGLISTENER: - { - bool bBool( m_bConfigListener ); - aValue >>= bBool; - if ( m_bConfigListener != bBool ) - { - if ( m_bConfigListening ) - { - if ( m_xConfigSource.is() && !bBool ) - { - try - { - Reference< XUIConfiguration > xUIConfig( m_xConfigSource, UNO_QUERY ); - if ( xUIConfig.is() ) - { - xUIConfig->removeConfigurationListener( Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY )); - m_bConfigListening = sal_False; - } - } - catch ( Exception& ) - { - } - } - } - else - { - if ( m_xConfigSource.is() && bBool ) - { - try - { - Reference< XUIConfiguration > xUIConfig( m_xConfigSource, UNO_QUERY ); - if ( xUIConfig.is() ) - { - xUIConfig->addConfigurationListener( Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY )); - m_bConfigListening = sal_True; - } - } - catch ( Exception& ) - { - } - } - } - - m_bConfigListener = bBool; - } - } - break; - case UIELEMENT_PROPHANDLE_CONFIGSOURCE: - aValue >>= m_xConfigSource; - break; - case UIELEMENT_PROPHANDLE_FRAME: - { - Reference< XFrame > xFrame; - - aValue >>= xFrame; - m_xWeakFrame = xFrame; - break; - } - case UIELEMENT_PROPHANDLE_PERSISTENT: - { - sal_Bool bBool( m_bPersistent ); - aValue >>= bBool; - m_bPersistent = bBool; - break; - } - case UIELEMENT_PROPHANDLE_RESOURCEURL: - aValue >>= m_aResourceURL; - break; - case UIELEMENT_PROPHANDLE_TYPE: - aValue >>= m_nType; - break; - case UIELEMENT_PROPHANDLE_XMENUBAR: - aValue >>= m_xMenuBar; - break; - case UIELEMENT_PROPHANDLE_NOCLOSE: - { - sal_Bool bBool( m_bNoClose ); - aValue >>= bBool; - m_bNoClose = bBool; - break; - } - } -} - -void SAL_CALL UIConfigElementWrapperBase::getFastPropertyValue( com::sun::star::uno::Any& aValue , - sal_Int32 nHandle ) const -{ - switch( nHandle ) - { - case UIELEMENT_PROPHANDLE_CONFIGLISTENER: - aValue <<= m_bConfigListener; - break; - case UIELEMENT_PROPHANDLE_CONFIGSOURCE: - aValue <<= m_xConfigSource; - break; - case UIELEMENT_PROPHANDLE_FRAME: - { - Reference< XFrame > xFrame( m_xWeakFrame ); - aValue <<= xFrame; - break; - } - case UIELEMENT_PROPHANDLE_PERSISTENT: - aValue <<= m_bPersistent; - break; - case UIELEMENT_PROPHANDLE_RESOURCEURL: - aValue <<= m_aResourceURL; - break; - case UIELEMENT_PROPHANDLE_TYPE: - aValue <<= m_nType; - break; - case UIELEMENT_PROPHANDLE_XMENUBAR: - aValue <<= m_xMenuBar; - break; - case UIELEMENT_PROPHANDLE_NOCLOSE: - aValue <<= m_bNoClose; - break; - } -} - -::cppu::IPropertyArrayHelper& SAL_CALL UIConfigElementWrapperBase::getInfoHelper() -{ - // Optimize this method ! - // We initialize a static variable only one time. And we don't must use a mutex at every call! - // For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL! - static ::cppu::OPropertyArrayHelper* pInfoHelper = NULL; - - if( pInfoHelper == NULL ) - { - // Ready for multithreading - osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ; - - // Control this pointer again, another instance can be faster then these! - if( pInfoHelper == NULL ) - { - // Define static member to give structure of properties to baseclass "OPropertySetHelper". - // "impl_getStaticPropertyDescriptor" is a non exported and static funtion, who will define a static propertytable. - // "sal_True" say: Table is sorted by name. - static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); - pInfoHelper = &aInfoHelper; - } - } - - return(*pInfoHelper); -} - -com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL UIConfigElementWrapperBase::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException) -{ - // Optimize this method ! - // We initialize a static variable only one time. And we don't must use a mutex at every call! - // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! - static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >* pInfo = NULL; - - if( pInfo == NULL ) - { - // Ready for multithreading - osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ; - // Control this pointer again, another instance can be faster then these! - if( pInfo == NULL ) - { - // Create structure of propertysetinfo for baseclass "OPropertySetHelper". - // (Use method "getInfoHelper()".) - static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); - pInfo = &xInfo; - } - } - - return (*pInfo); -} - -const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIConfigElementWrapperBase::impl_getStaticPropertyDescriptor() -{ - // Create a new static property array to initialize sequence! - // Table of all predefined properties of this class. Its used from OPropertySetHelper-class! - // Don't forget to change the defines (see begin of this file), if you add, change or delete a property in this list!!! - // It's necessary for methods of OPropertySetHelper. - // ATTENTION: - // YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!! - - static const com::sun::star::beans::Property pProperties[] = - { - com::sun::star::beans::Property( UIELEMENT_PROPNAME_CONFIGLISTENER, UIELEMENT_PROPHANDLE_CONFIGLISTENER , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), - com::sun::star::beans::Property( UIELEMENT_PROPNAME_CONFIGSOURCE , UIELEMENT_PROPHANDLE_CONFIGSOURCE , ::getCppuType((const Reference< ::com::sun::star::ui::XUIConfigurationManager >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), - com::sun::star::beans::Property( UIELEMENT_PROPNAME_FRAME , UIELEMENT_PROPHANDLE_FRAME , ::getCppuType((const Reference< com::sun::star::frame::XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( UIELEMENT_PROPNAME_NOCLOSE , UIELEMENT_PROPHANDLE_NOCLOSE , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), - com::sun::star::beans::Property( UIELEMENT_PROPNAME_PERSISTENT , UIELEMENT_PROPHANDLE_PERSISTENT , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), - com::sun::star::beans::Property( UIELEMENT_PROPNAME_RESOURCEURL , UIELEMENT_PROPHANDLE_RESOURCEURL , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( UIELEMENT_PROPNAME_TYPE , UIELEMENT_PROPHANDLE_TYPE , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( UIELEMENT_PROPNAME_XMENUBAR , UIELEMENT_PROPHANDLE_XMENUBAR , ::getCppuType((const Reference< com::sun::star::awt::XMenuBar >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) - }; - // Use it to initialize sequence! - static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT ); - // Return static "PropertyDescriptor" - return lPropertyDescriptor; -} -void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAccess >& xSettings ) throw ( RuntimeException ) -{ - ResetableGuard aLock( m_aLock ); - - //if ( m_bDisposed ) - // throw DisposedException(); - - if ( xSettings.is() ) - { - // Create a copy of the data if the container is not const - Reference< XIndexReplace > xReplace( xSettings, UNO_QUERY ); - if ( xReplace.is() ) - m_xConfigData = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xSettings ) ), UNO_QUERY ); - else - m_xConfigData = xSettings; - - if ( m_xConfigSource.is() && m_bPersistent ) - { - ::rtl::OUString aResourceURL( m_aResourceURL ); - Reference< XUIConfigurationManager > xUICfgMgr( m_xConfigSource ); - - aLock.unlock(); - - try - { - xUICfgMgr->replaceSettings( aResourceURL, m_xConfigData ); - } - catch( NoSuchElementException& ) - { - } - } - else if ( !m_bPersistent ) - { - // Transient menubar => Fill menubar with new data - impl_fillNewData(); - } - } -} -void UIConfigElementWrapperBase::impl_fillNewData() -{ -} -Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_Bool bWriteable ) throw ( RuntimeException ) -{ - ResetableGuard aLock( m_aLock ); - - //if ( m_bDisposed ) - // throw DisposedException(); - - if ( bWriteable ) - return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( m_xConfigData ) ), UNO_QUERY ); - - return m_xConfigData; -} - -Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (RuntimeException) -{ - ResetableGuard aLock( m_aLock ); - Reference< XFrame > xFrame( m_xWeakFrame ); - return xFrame; -} - -::rtl::OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException) -{ - ResetableGuard aLock( m_aLock ); - return m_aResourceURL; -} - -::sal_Int16 SAL_CALL UIConfigElementWrapperBase::getType() throw (RuntimeException) -{ - ResetableGuard aLock( m_aLock ); - return m_nType; -} - -} diff --git a/framework/source/fwe/helper/uielementwrapperbase.cxx b/framework/source/fwe/helper/uielementwrapperbase.cxx deleted file mode 100644 index 6329f94b3063..000000000000 --- a/framework/source/fwe/helper/uielementwrapperbase.cxx +++ /dev/null @@ -1,282 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_framework.hxx" - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ -#include -#include -#include -#include - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ -#include -#include -#include - -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ -#include -#include - -const int UIELEMENT_PROPHANDLE_RESOURCEURL = 1; -const int UIELEMENT_PROPHANDLE_TYPE = 2; -const int UIELEMENT_PROPHANDLE_FRAME = 3; -const int UIELEMENT_PROPCOUNT = 3; -const rtl::OUString UIELEMENT_PROPNAME_RESOURCEURL( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" )); -const rtl::OUString UIELEMENT_PROPNAME_TYPE( RTL_CONSTASCII_USTRINGPARAM( "Type" )); -const rtl::OUString UIELEMENT_PROPNAME_FRAME( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); - -using namespace rtl; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::frame; - -namespace framework -{ - -//***************************************************************************************************************** -// XInterface, XTypeProvider -//***************************************************************************************************************** -DEFINE_XINTERFACE_8 ( UIElementWrapperBase , - OWeakObject , - DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), - DIRECT_INTERFACE( ::com::sun::star::ui::XUIElement ), - DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::lang::XInitialization ), - DIRECT_INTERFACE( ::com::sun::star::util::XUpdatable ), - DIRECT_INTERFACE( ::com::sun::star::lang::XComponent ) - ) - -DEFINE_XTYPEPROVIDER_8 ( UIElementWrapperBase , - ::com::sun::star::lang::XTypeProvider , - ::com::sun::star::ui::XUIElement , - ::com::sun::star::beans::XMultiPropertySet , - ::com::sun::star::beans::XFastPropertySet , - ::com::sun::star::beans::XPropertySet , - ::com::sun::star::lang::XInitialization , - ::com::sun::star::util::XUpdatable , - ::com::sun::star::lang::XComponent - ) - -UIElementWrapperBase::UIElementWrapperBase( sal_Int16 nType ) - : ThreadHelpBase ( &Application::GetSolarMutex() ) - , ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() ) - , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) - , ::cppu::OWeakObject ( ) - , m_aListenerContainer ( m_aLock.getShareableOslMutex() ) - , m_nType ( nType ) - , m_bInitialized ( sal_False ) - , m_bDisposed ( sal_False ) -{ -} - -UIElementWrapperBase::~UIElementWrapperBase() -{ -} - -void SAL_CALL UIElementWrapperBase::dispose() throw (::com::sun::star::uno::RuntimeException) -{ - // must be implemented by derived class - ResetableGuard aLock( m_aLock ); - m_bDisposed = sal_True; -} - -void SAL_CALL UIElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) -{ - m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); -} - -void SAL_CALL UIElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) -{ - m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); -} - -void SAL_CALL UIElementWrapperBase::initialize( const Sequence< Any >& aArguments ) -throw ( Exception, RuntimeException ) -{ - ResetableGuard aLock( m_aLock ); - - if ( !m_bInitialized ) - { - for ( sal_Int32 n = 0; n < aArguments.getLength(); n++ ) - { - PropertyValue aPropValue; - if ( aArguments[n] >>= aPropValue ) - { - if ( aPropValue.Name.equalsAscii( "ResourceURL" )) - aPropValue.Value >>= m_aResourceURL; - else if ( aPropValue.Name.equalsAscii( "Frame" )) - { - Reference< XFrame > xFrame; - aPropValue.Value >>= xFrame; - m_xWeakFrame = xFrame; - } - } - } - - m_bInitialized = sal_True; - } -} - -// XUIElement -::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL UIElementWrapperBase::getFrame() throw (::com::sun::star::uno::RuntimeException) -{ - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( m_xWeakFrame ); - return xFrame; -} - -::rtl::OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (::com::sun::star::uno::RuntimeException) -{ - return m_aResourceURL; -} - -::sal_Int16 SAL_CALL UIElementWrapperBase::getType() throw (::com::sun::star::uno::RuntimeException) -{ - return m_nType; -} - -// XUpdatable -void SAL_CALL UIElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException) -{ - // can be implemented by derived class -} - -// XPropertySet helper -sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any& /*aConvertedValue*/ , - Any& /*aOldValue*/ , - sal_Int32 /*nHandle*/ , - const Any& /*aValue*/ ) throw( com::sun::star::lang::IllegalArgumentException ) -{ - // Initialize state with FALSE !!! - // (Handle can be invalid) - return sal_False ; -} - -void SAL_CALL UIElementWrapperBase::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/ , - const com::sun::star::uno::Any& /*aValue*/ ) throw( com::sun::star::uno::Exception ) -{ -} - -void SAL_CALL UIElementWrapperBase::getFastPropertyValue( com::sun::star::uno::Any& aValue , - sal_Int32 nHandle ) const -{ - switch( nHandle ) - { - case UIELEMENT_PROPHANDLE_RESOURCEURL: - aValue <<= m_aResourceURL; - break; - case UIELEMENT_PROPHANDLE_TYPE: - aValue <<= m_nType; - break; - case UIELEMENT_PROPHANDLE_FRAME: - Reference< XFrame > xFrame( m_xWeakFrame ); - aValue <<= xFrame; - break; - } -} - -::cppu::IPropertyArrayHelper& SAL_CALL UIElementWrapperBase::getInfoHelper() -{ - // Optimize this method ! - // We initialize a static variable only one time. And we don't must use a mutex at every call! - // For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL! - static ::cppu::OPropertyArrayHelper* pInfoHelper = NULL; - - if( pInfoHelper == NULL ) - { - // Ready for multithreading - osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ; - - // Control this pointer again, another instance can be faster then these! - if( pInfoHelper == NULL ) - { - // Define static member to give structure of properties to baseclass "OPropertySetHelper". - // "impl_getStaticPropertyDescriptor" is a non exported and static funtion, who will define a static propertytable. - // "sal_True" say: Table is sorted by name. - static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); - pInfoHelper = &aInfoHelper; - } - } - - return(*pInfoHelper); -} - -com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL UIElementWrapperBase::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException) -{ - // Optimize this method ! - // We initialize a static variable only one time. And we don't must use a mutex at every call! - // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! - static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >* pInfo = NULL; - - if( pInfo == NULL ) - { - // Ready for multithreading - osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ; - // Control this pointer again, another instance can be faster then these! - if( pInfo == NULL ) - { - // Create structure of propertysetinfo for baseclass "OPropertySetHelper". - // (Use method "getInfoHelper()".) - static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); - pInfo = &xInfo; - } - } - - return (*pInfo); -} - -const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIElementWrapperBase::impl_getStaticPropertyDescriptor() -{ - // Create a new static property array to initialize sequence! - // Table of all predefined properties of this class. Its used from OPropertySetHelper-class! - // Don't forget to change the defines (see begin of this file), if you add, change or delete a property in this list!!! - // It's necessary for methods of OPropertySetHelper. - // ATTENTION: - // YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!! - - static const com::sun::star::beans::Property pProperties[] = - { - com::sun::star::beans::Property( UIELEMENT_PROPNAME_FRAME , UIELEMENT_PROPHANDLE_FRAME , ::getCppuType((Reference< XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( UIELEMENT_PROPNAME_RESOURCEURL , UIELEMENT_PROPHANDLE_RESOURCEURL , ::getCppuType((sal_Int16*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( UIELEMENT_PROPNAME_TYPE , UIELEMENT_PROPHANDLE_TYPE , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) - }; - // Use it to initialize sequence! - static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT ); - // Return static "PropertyDescriptor" - return lPropertyDescriptor; -} - -} diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx new file mode 100644 index 000000000000..f820d5719b85 --- /dev/null +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -0,0 +1,571 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_framework.hxx" + +//_________________________________________________________________________________________________________________ +// my own includes +//_________________________________________________________________________________________________________________ +#include +#include +#include +#include +#include +#include + +//_________________________________________________________________________________________________________________ +// interface includes +//_________________________________________________________________________________________________________________ +#include +#include +#include +#include + +//_________________________________________________________________________________________________________________ +// includes of other projects +//_________________________________________________________________________________________________________________ +#include +#include + +const int UIELEMENT_PROPHANDLE_CONFIGSOURCE = 1; +const int UIELEMENT_PROPHANDLE_FRAME = 2; +const int UIELEMENT_PROPHANDLE_PERSISTENT = 3; +const int UIELEMENT_PROPHANDLE_RESOURCEURL = 4; +const int UIELEMENT_PROPHANDLE_TYPE = 5; +const int UIELEMENT_PROPHANDLE_XMENUBAR = 6; +const int UIELEMENT_PROPHANDLE_CONFIGLISTENER = 7; +const int UIELEMENT_PROPHANDLE_NOCLOSE = 8; +const int UIELEMENT_PROPCOUNT = 8; +const rtl::OUString UIELEMENT_PROPNAME_CONFIGLISTENER( RTL_CONSTASCII_USTRINGPARAM( "ConfigListener" )); +const rtl::OUString UIELEMENT_PROPNAME_CONFIGSOURCE( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" )); +const rtl::OUString UIELEMENT_PROPNAME_FRAME( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); +const rtl::OUString UIELEMENT_PROPNAME_PERSISTENT( RTL_CONSTASCII_USTRINGPARAM( "Persistent" )); +const rtl::OUString UIELEMENT_PROPNAME_RESOURCEURL( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" )); +const rtl::OUString UIELEMENT_PROPNAME_TYPE( RTL_CONSTASCII_USTRINGPARAM( "Type" )); +const rtl::OUString UIELEMENT_PROPNAME_XMENUBAR( RTL_CONSTASCII_USTRINGPARAM( "XMenuBar" )); +const rtl::OUString UIELEMENT_PROPNAME_NOCLOSE( RTL_CONSTASCII_USTRINGPARAM( "NoClose" )); + +//using namespace rtl; +using namespace com::sun::star::beans; +using namespace com::sun::star::uno; +using namespace com::sun::star::frame; +using namespace com::sun::star::lang; +using namespace com::sun::star::container; +using namespace ::com::sun::star::ui; + +namespace framework +{ + +//***************************************************************************************************************** +// XInterface, XTypeProvider +//***************************************************************************************************************** +DEFINE_XINTERFACE_10 ( UIConfigElementWrapperBase , + OWeakObject , + DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), + DIRECT_INTERFACE( ::com::sun::star::ui::XUIElement ), + DIRECT_INTERFACE( ::com::sun::star::ui::XUIElementSettings ), + DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::lang::XInitialization ), + DIRECT_INTERFACE( ::com::sun::star::lang::XComponent ), + DIRECT_INTERFACE( ::com::sun::star::util::XUpdatable ), + DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationListener ) + ) + +DEFINE_XTYPEPROVIDER_10 ( UIConfigElementWrapperBase , + ::com::sun::star::lang::XTypeProvider , + ::com::sun::star::ui::XUIElement , + ::com::sun::star::ui::XUIElementSettings , + ::com::sun::star::beans::XMultiPropertySet , + ::com::sun::star::beans::XFastPropertySet , + ::com::sun::star::beans::XPropertySet , + ::com::sun::star::lang::XInitialization , + ::com::sun::star::lang::XComponent , + ::com::sun::star::util::XUpdatable , + ::com::sun::star::ui::XUIConfigurationListener + ) + +UIConfigElementWrapperBase::UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory ) + : ThreadHelpBase ( &Application::GetSolarMutex() ) + , ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() ) + , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) + , ::cppu::OWeakObject ( ) + , m_nType ( nType ) + , m_bPersistent ( sal_True ) + , m_bInitialized ( sal_False ) + , m_bConfigListener ( sal_False ) + , m_bConfigListening ( sal_False ) + , m_bDisposed ( sal_False ) + , m_bNoClose ( sal_False ) + , m_xServiceFactory ( _xServiceFactory ) + , m_aListenerContainer ( m_aLock.getShareableOslMutex() ) +{ +} + +UIConfigElementWrapperBase::~UIConfigElementWrapperBase() +{ +} + +// XComponent +void SAL_CALL UIConfigElementWrapperBase::dispose() throw (::com::sun::star::uno::RuntimeException) +{ + // must be implemented by derived class + ResetableGuard aLock( m_aLock ); + m_bDisposed = sal_True; +} + +void SAL_CALL UIConfigElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +{ + m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); +} + +void SAL_CALL UIConfigElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException) +{ + m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), aListener ); +} + +// XEventListener +void SAL_CALL UIConfigElementWrapperBase::disposing( const EventObject& ) +throw( RuntimeException ) +{ + ResetableGuard aLock( m_aLock ); + m_xConfigSource.clear(); +} + +void SAL_CALL UIConfigElementWrapperBase::initialize( const Sequence< Any >& aArguments ) +throw ( Exception, RuntimeException ) +{ + ResetableGuard aLock( m_aLock ); + + if ( !m_bInitialized ) + { + for ( sal_Int32 n = 0; n < aArguments.getLength(); n++ ) + { + PropertyValue aPropValue; + if ( aArguments[n] >>= aPropValue ) + { + if ( aPropValue.Name.equals( UIELEMENT_PROPNAME_CONFIGSOURCE )) + setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_CONFIGSOURCE, aPropValue.Value ); + else if ( aPropValue.Name.equals( UIELEMENT_PROPNAME_FRAME )) + setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_FRAME, aPropValue.Value ); + else if ( aPropValue.Name.equals( UIELEMENT_PROPNAME_PERSISTENT )) + setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_PERSISTENT, aPropValue.Value ); + else if ( aPropValue.Name.equals( UIELEMENT_PROPNAME_RESOURCEURL )) + setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_RESOURCEURL, aPropValue.Value ); + else if ( aPropValue.Name.equals( UIELEMENT_PROPNAME_TYPE )) + setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_TYPE, aPropValue.Value ); + else if ( aPropValue.Name.equals( UIELEMENT_PROPNAME_CONFIGLISTENER )) + setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_CONFIGLISTENER, aPropValue.Value ); + else if ( aPropValue.Name.equals( UIELEMENT_PROPNAME_NOCLOSE )) + setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_NOCLOSE, aPropValue.Value ); + } + } + + m_bInitialized = sal_True; + } +} + +// XUpdatable +void SAL_CALL UIConfigElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException) +{ + // can be implemented by derived class +} + +void SAL_CALL UIConfigElementWrapperBase::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException) +{ + // can be implemented by derived class +} + +void SAL_CALL UIConfigElementWrapperBase::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException) +{ + // can be implemented by derived class +} + +void SAL_CALL UIConfigElementWrapperBase::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException) +{ + // can be implemented by derived class +} + +// XPropertySet helper +sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& aConvertedValue , + Any& aOldValue , + sal_Int32 nHandle , + const Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ) +{ + // Initialize state with FALSE !!! + // (Handle can be invalid) + sal_Bool bReturn = sal_False; + + switch( nHandle ) + { + case UIELEMENT_PROPHANDLE_CONFIGLISTENER: + bReturn = PropHelper::willPropertyBeChanged( + com::sun::star::uno::makeAny(m_bConfigListener), + aValue, + aOldValue, + aConvertedValue); + break; + + case UIELEMENT_PROPHANDLE_CONFIGSOURCE: + bReturn = PropHelper::willPropertyBeChanged( + com::sun::star::uno::makeAny(m_xConfigSource), + aValue, + aOldValue, + aConvertedValue); + break; + + case UIELEMENT_PROPHANDLE_FRAME: + { + Reference< XFrame > xFrame( m_xWeakFrame ); + bReturn = PropHelper::willPropertyBeChanged( + com::sun::star::uno::makeAny(xFrame), + aValue, + aOldValue, + aConvertedValue); + } + break; + + case UIELEMENT_PROPHANDLE_PERSISTENT: + bReturn = PropHelper::willPropertyBeChanged( + com::sun::star::uno::makeAny(m_bPersistent), + aValue, + aOldValue, + aConvertedValue); + break; + + case UIELEMENT_PROPHANDLE_RESOURCEURL: + bReturn = PropHelper::willPropertyBeChanged( + com::sun::star::uno::makeAny(m_aResourceURL), + aValue, + aOldValue, + aConvertedValue); + break; + + case UIELEMENT_PROPHANDLE_TYPE : + bReturn = PropHelper::willPropertyBeChanged( + com::sun::star::uno::makeAny(m_nType), + aValue, + aOldValue, + aConvertedValue); + break; + + case UIELEMENT_PROPHANDLE_XMENUBAR : + bReturn = PropHelper::willPropertyBeChanged( + com::sun::star::uno::makeAny(m_xMenuBar), + aValue, + aOldValue, + aConvertedValue); + break; + + case UIELEMENT_PROPHANDLE_NOCLOSE: + bReturn = PropHelper::willPropertyBeChanged( + com::sun::star::uno::makeAny(m_bNoClose), + aValue, + aOldValue, + aConvertedValue); + break; + } + + // Return state of operation. + return bReturn ; +} + +void SAL_CALL UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , + const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ) +{ + switch( nHandle ) + { + case UIELEMENT_PROPHANDLE_CONFIGLISTENER: + { + bool bBool( m_bConfigListener ); + aValue >>= bBool; + if ( m_bConfigListener != bBool ) + { + if ( m_bConfigListening ) + { + if ( m_xConfigSource.is() && !bBool ) + { + try + { + Reference< XUIConfiguration > xUIConfig( m_xConfigSource, UNO_QUERY ); + if ( xUIConfig.is() ) + { + xUIConfig->removeConfigurationListener( Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY )); + m_bConfigListening = sal_False; + } + } + catch ( Exception& ) + { + } + } + } + else + { + if ( m_xConfigSource.is() && bBool ) + { + try + { + Reference< XUIConfiguration > xUIConfig( m_xConfigSource, UNO_QUERY ); + if ( xUIConfig.is() ) + { + xUIConfig->addConfigurationListener( Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY )); + m_bConfigListening = sal_True; + } + } + catch ( Exception& ) + { + } + } + } + + m_bConfigListener = bBool; + } + } + break; + case UIELEMENT_PROPHANDLE_CONFIGSOURCE: + aValue >>= m_xConfigSource; + break; + case UIELEMENT_PROPHANDLE_FRAME: + { + Reference< XFrame > xFrame; + + aValue >>= xFrame; + m_xWeakFrame = xFrame; + break; + } + case UIELEMENT_PROPHANDLE_PERSISTENT: + { + sal_Bool bBool( m_bPersistent ); + aValue >>= bBool; + m_bPersistent = bBool; + break; + } + case UIELEMENT_PROPHANDLE_RESOURCEURL: + aValue >>= m_aResourceURL; + break; + case UIELEMENT_PROPHANDLE_TYPE: + aValue >>= m_nType; + break; + case UIELEMENT_PROPHANDLE_XMENUBAR: + aValue >>= m_xMenuBar; + break; + case UIELEMENT_PROPHANDLE_NOCLOSE: + { + sal_Bool bBool( m_bNoClose ); + aValue >>= bBool; + m_bNoClose = bBool; + break; + } + } +} + +void SAL_CALL UIConfigElementWrapperBase::getFastPropertyValue( com::sun::star::uno::Any& aValue , + sal_Int32 nHandle ) const +{ + switch( nHandle ) + { + case UIELEMENT_PROPHANDLE_CONFIGLISTENER: + aValue <<= m_bConfigListener; + break; + case UIELEMENT_PROPHANDLE_CONFIGSOURCE: + aValue <<= m_xConfigSource; + break; + case UIELEMENT_PROPHANDLE_FRAME: + { + Reference< XFrame > xFrame( m_xWeakFrame ); + aValue <<= xFrame; + break; + } + case UIELEMENT_PROPHANDLE_PERSISTENT: + aValue <<= m_bPersistent; + break; + case UIELEMENT_PROPHANDLE_RESOURCEURL: + aValue <<= m_aResourceURL; + break; + case UIELEMENT_PROPHANDLE_TYPE: + aValue <<= m_nType; + break; + case UIELEMENT_PROPHANDLE_XMENUBAR: + aValue <<= m_xMenuBar; + break; + case UIELEMENT_PROPHANDLE_NOCLOSE: + aValue <<= m_bNoClose; + break; + } +} + +::cppu::IPropertyArrayHelper& SAL_CALL UIConfigElementWrapperBase::getInfoHelper() +{ + // Optimize this method ! + // We initialize a static variable only one time. And we don't must use a mutex at every call! + // For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL! + static ::cppu::OPropertyArrayHelper* pInfoHelper = NULL; + + if( pInfoHelper == NULL ) + { + // Ready for multithreading + osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ; + + // Control this pointer again, another instance can be faster then these! + if( pInfoHelper == NULL ) + { + // Define static member to give structure of properties to baseclass "OPropertySetHelper". + // "impl_getStaticPropertyDescriptor" is a non exported and static funtion, who will define a static propertytable. + // "sal_True" say: Table is sorted by name. + static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); + pInfoHelper = &aInfoHelper; + } + } + + return(*pInfoHelper); +} + +com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL UIConfigElementWrapperBase::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException) +{ + // Optimize this method ! + // We initialize a static variable only one time. And we don't must use a mutex at every call! + // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! + static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >* pInfo = NULL; + + if( pInfo == NULL ) + { + // Ready for multithreading + osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ; + // Control this pointer again, another instance can be faster then these! + if( pInfo == NULL ) + { + // Create structure of propertysetinfo for baseclass "OPropertySetHelper". + // (Use method "getInfoHelper()".) + static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); + pInfo = &xInfo; + } + } + + return (*pInfo); +} + +const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIConfigElementWrapperBase::impl_getStaticPropertyDescriptor() +{ + // Create a new static property array to initialize sequence! + // Table of all predefined properties of this class. Its used from OPropertySetHelper-class! + // Don't forget to change the defines (see begin of this file), if you add, change or delete a property in this list!!! + // It's necessary for methods of OPropertySetHelper. + // ATTENTION: + // YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!! + + static const com::sun::star::beans::Property pProperties[] = + { + com::sun::star::beans::Property( UIELEMENT_PROPNAME_CONFIGLISTENER, UIELEMENT_PROPHANDLE_CONFIGLISTENER , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), + com::sun::star::beans::Property( UIELEMENT_PROPNAME_CONFIGSOURCE , UIELEMENT_PROPHANDLE_CONFIGSOURCE , ::getCppuType((const Reference< ::com::sun::star::ui::XUIConfigurationManager >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), + com::sun::star::beans::Property( UIELEMENT_PROPNAME_FRAME , UIELEMENT_PROPHANDLE_FRAME , ::getCppuType((const Reference< com::sun::star::frame::XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), + com::sun::star::beans::Property( UIELEMENT_PROPNAME_NOCLOSE , UIELEMENT_PROPHANDLE_NOCLOSE , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), + com::sun::star::beans::Property( UIELEMENT_PROPNAME_PERSISTENT , UIELEMENT_PROPHANDLE_PERSISTENT , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), + com::sun::star::beans::Property( UIELEMENT_PROPNAME_RESOURCEURL , UIELEMENT_PROPHANDLE_RESOURCEURL , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), + com::sun::star::beans::Property( UIELEMENT_PROPNAME_TYPE , UIELEMENT_PROPHANDLE_TYPE , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), + com::sun::star::beans::Property( UIELEMENT_PROPNAME_XMENUBAR , UIELEMENT_PROPHANDLE_XMENUBAR , ::getCppuType((const Reference< com::sun::star::awt::XMenuBar >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) + }; + // Use it to initialize sequence! + static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT ); + // Return static "PropertyDescriptor" + return lPropertyDescriptor; +} +void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAccess >& xSettings ) throw ( RuntimeException ) +{ + ResetableGuard aLock( m_aLock ); + + //if ( m_bDisposed ) + // throw DisposedException(); + + if ( xSettings.is() ) + { + // Create a copy of the data if the container is not const + Reference< XIndexReplace > xReplace( xSettings, UNO_QUERY ); + if ( xReplace.is() ) + m_xConfigData = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xSettings ) ), UNO_QUERY ); + else + m_xConfigData = xSettings; + + if ( m_xConfigSource.is() && m_bPersistent ) + { + ::rtl::OUString aResourceURL( m_aResourceURL ); + Reference< XUIConfigurationManager > xUICfgMgr( m_xConfigSource ); + + aLock.unlock(); + + try + { + xUICfgMgr->replaceSettings( aResourceURL, m_xConfigData ); + } + catch( NoSuchElementException& ) + { + } + } + else if ( !m_bPersistent ) + { + // Transient menubar => Fill menubar with new data + impl_fillNewData(); + } + } +} +void UIConfigElementWrapperBase::impl_fillNewData() +{ +} +Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_Bool bWriteable ) throw ( RuntimeException ) +{ + ResetableGuard aLock( m_aLock ); + + //if ( m_bDisposed ) + // throw DisposedException(); + + if ( bWriteable ) + return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( m_xConfigData ) ), UNO_QUERY ); + + return m_xConfigData; +} + +Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (RuntimeException) +{ + ResetableGuard aLock( m_aLock ); + Reference< XFrame > xFrame( m_xWeakFrame ); + return xFrame; +} + +::rtl::OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException) +{ + ResetableGuard aLock( m_aLock ); + return m_aResourceURL; +} + +::sal_Int16 SAL_CALL UIConfigElementWrapperBase::getType() throw (RuntimeException) +{ + ResetableGuard aLock( m_aLock ); + return m_nType; +} + +} diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx new file mode 100644 index 000000000000..38724e077326 --- /dev/null +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -0,0 +1,282 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_framework.hxx" + +//_________________________________________________________________________________________________________________ +// my own includes +//_________________________________________________________________________________________________________________ +#include +#include +#include +#include + +//_________________________________________________________________________________________________________________ +// interface includes +//_________________________________________________________________________________________________________________ +#include +#include +#include + +//_________________________________________________________________________________________________________________ +// includes of other projects +//_________________________________________________________________________________________________________________ +#include +#include + +const int UIELEMENT_PROPHANDLE_RESOURCEURL = 1; +const int UIELEMENT_PROPHANDLE_TYPE = 2; +const int UIELEMENT_PROPHANDLE_FRAME = 3; +const int UIELEMENT_PROPCOUNT = 3; +const rtl::OUString UIELEMENT_PROPNAME_RESOURCEURL( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" )); +const rtl::OUString UIELEMENT_PROPNAME_TYPE( RTL_CONSTASCII_USTRINGPARAM( "Type" )); +const rtl::OUString UIELEMENT_PROPNAME_FRAME( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); + +//using namespace rtl; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::frame; + +namespace framework +{ + +//***************************************************************************************************************** +// XInterface, XTypeProvider +//***************************************************************************************************************** +DEFINE_XINTERFACE_8 ( UIElementWrapperBase , + OWeakObject , + DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), + DIRECT_INTERFACE( ::com::sun::star::ui::XUIElement ), + DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::lang::XInitialization ), + DIRECT_INTERFACE( ::com::sun::star::util::XUpdatable ), + DIRECT_INTERFACE( ::com::sun::star::lang::XComponent ) + ) + +DEFINE_XTYPEPROVIDER_8 ( UIElementWrapperBase , + ::com::sun::star::lang::XTypeProvider , + ::com::sun::star::ui::XUIElement , + ::com::sun::star::beans::XMultiPropertySet , + ::com::sun::star::beans::XFastPropertySet , + ::com::sun::star::beans::XPropertySet , + ::com::sun::star::lang::XInitialization , + ::com::sun::star::util::XUpdatable , + ::com::sun::star::lang::XComponent + ) + +UIElementWrapperBase::UIElementWrapperBase( sal_Int16 nType ) + : ThreadHelpBase ( &Application::GetSolarMutex() ) + , ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() ) + , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) + , ::cppu::OWeakObject ( ) + , m_aListenerContainer ( m_aLock.getShareableOslMutex() ) + , m_nType ( nType ) + , m_bInitialized ( sal_False ) + , m_bDisposed ( sal_False ) +{ +} + +UIElementWrapperBase::~UIElementWrapperBase() +{ +} + +void SAL_CALL UIElementWrapperBase::dispose() throw (::com::sun::star::uno::RuntimeException) +{ + // must be implemented by derived class + ResetableGuard aLock( m_aLock ); + m_bDisposed = sal_True; +} + +void SAL_CALL UIElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +{ + m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); +} + +void SAL_CALL UIElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +{ + m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); +} + +void SAL_CALL UIElementWrapperBase::initialize( const Sequence< Any >& aArguments ) +throw ( Exception, RuntimeException ) +{ + ResetableGuard aLock( m_aLock ); + + if ( !m_bInitialized ) + { + for ( sal_Int32 n = 0; n < aArguments.getLength(); n++ ) + { + PropertyValue aPropValue; + if ( aArguments[n] >>= aPropValue ) + { + if ( aPropValue.Name.equalsAscii( "ResourceURL" )) + aPropValue.Value >>= m_aResourceURL; + else if ( aPropValue.Name.equalsAscii( "Frame" )) + { + Reference< XFrame > xFrame; + aPropValue.Value >>= xFrame; + m_xWeakFrame = xFrame; + } + } + } + + m_bInitialized = sal_True; + } +} + +// XUIElement +::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL UIElementWrapperBase::getFrame() throw (::com::sun::star::uno::RuntimeException) +{ + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( m_xWeakFrame ); + return xFrame; +} + +::rtl::OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (::com::sun::star::uno::RuntimeException) +{ + return m_aResourceURL; +} + +::sal_Int16 SAL_CALL UIElementWrapperBase::getType() throw (::com::sun::star::uno::RuntimeException) +{ + return m_nType; +} + +// XUpdatable +void SAL_CALL UIElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException) +{ + // can be implemented by derived class +} + +// XPropertySet helper +sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any& /*aConvertedValue*/ , + Any& /*aOldValue*/ , + sal_Int32 /*nHandle*/ , + const Any& /*aValue*/ ) throw( com::sun::star::lang::IllegalArgumentException ) +{ + // Initialize state with FALSE !!! + // (Handle can be invalid) + return sal_False ; +} + +void SAL_CALL UIElementWrapperBase::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/ , + const com::sun::star::uno::Any& /*aValue*/ ) throw( com::sun::star::uno::Exception ) +{ +} + +void SAL_CALL UIElementWrapperBase::getFastPropertyValue( com::sun::star::uno::Any& aValue , + sal_Int32 nHandle ) const +{ + switch( nHandle ) + { + case UIELEMENT_PROPHANDLE_RESOURCEURL: + aValue <<= m_aResourceURL; + break; + case UIELEMENT_PROPHANDLE_TYPE: + aValue <<= m_nType; + break; + case UIELEMENT_PROPHANDLE_FRAME: + Reference< XFrame > xFrame( m_xWeakFrame ); + aValue <<= xFrame; + break; + } +} + +::cppu::IPropertyArrayHelper& SAL_CALL UIElementWrapperBase::getInfoHelper() +{ + // Optimize this method ! + // We initialize a static variable only one time. And we don't must use a mutex at every call! + // For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL! + static ::cppu::OPropertyArrayHelper* pInfoHelper = NULL; + + if( pInfoHelper == NULL ) + { + // Ready for multithreading + osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ; + + // Control this pointer again, another instance can be faster then these! + if( pInfoHelper == NULL ) + { + // Define static member to give structure of properties to baseclass "OPropertySetHelper". + // "impl_getStaticPropertyDescriptor" is a non exported and static funtion, who will define a static propertytable. + // "sal_True" say: Table is sorted by name. + static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); + pInfoHelper = &aInfoHelper; + } + } + + return(*pInfoHelper); +} + +com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL UIElementWrapperBase::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException) +{ + // Optimize this method ! + // We initialize a static variable only one time. And we don't must use a mutex at every call! + // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! + static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >* pInfo = NULL; + + if( pInfo == NULL ) + { + // Ready for multithreading + osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ; + // Control this pointer again, another instance can be faster then these! + if( pInfo == NULL ) + { + // Create structure of propertysetinfo for baseclass "OPropertySetHelper". + // (Use method "getInfoHelper()".) + static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); + pInfo = &xInfo; + } + } + + return (*pInfo); +} + +const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIElementWrapperBase::impl_getStaticPropertyDescriptor() +{ + // Create a new static property array to initialize sequence! + // Table of all predefined properties of this class. Its used from OPropertySetHelper-class! + // Don't forget to change the defines (see begin of this file), if you add, change or delete a property in this list!!! + // It's necessary for methods of OPropertySetHelper. + // ATTENTION: + // YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!! + + static const com::sun::star::beans::Property pProperties[] = + { + com::sun::star::beans::Property( UIELEMENT_PROPNAME_FRAME , UIELEMENT_PROPHANDLE_FRAME , ::getCppuType((Reference< XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), + com::sun::star::beans::Property( UIELEMENT_PROPNAME_RESOURCEURL , UIELEMENT_PROPHANDLE_RESOURCEURL , ::getCppuType((sal_Int16*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), + com::sun::star::beans::Property( UIELEMENT_PROPNAME_TYPE , UIELEMENT_PROPHANDLE_TYPE , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) + }; + // Use it to initialize sequence! + static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT ); + // Return static "PropertyDescriptor" + return lPropertyDescriptor; +} + +} diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index d2a31b624d0d..67d5a7f43869 100755 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -35,7 +35,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \ sal \ sfx \ stl \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 2843524b1dc1..2344d79746c4 100755 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -78,13 +78,6 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\ sfx \ )) -$(eval $(call gb_Library_add_linked_system_libs,qstart_gtk,\ - dl \ - icuuc \ - m \ - pthread \ -)) - $(eval $(call gb_Library_add_exception_objects,qstart_gtk,\ sfx2/source/appl/shutdowniconunx \ )) diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 9ce73f2369ef..4cfd5da93bb6 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -76,14 +76,7 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ vcl \ vos3 \ xml2 \ - $(gb_StdLibs) \ -)) - -$(eval $(call gb_Library_add_linked_system_libs,sfx,\ - icuuc \ - dl \ - m \ - pthread \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,sfx,\ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 97cde827eb56..b549adeb9030 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -68,7 +68,7 @@ $(eval $(call gb_Library_add_linked_libs,svx,\ vos3 \ xo \ xcr \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,svx,\ @@ -218,11 +218,6 @@ ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/sendreportunx \ )) -$(eval $(call gb_Library_add_linked_libs,svx,\ - dl \ - m \ - pthread \ -)) else ifeq ($(OS),WNT) $(eval $(call gb_Library_add_linked_libs,svx,\ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 6e811cead2a9..5b7546d2d1c7 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -83,7 +83,7 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\ vcl \ vos3 \ xo \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,svxcore,\ @@ -448,14 +448,6 @@ $(eval $(call gb_Library_add_cxxobjects,svxcore,\ )) endif -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,svxcore,\ - dl \ - m \ - pthread \ -)) -endif - $(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx)) $(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\ diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 2e0880aced18..c2ddae4fe131 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\ tl \ utl \ vcl \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\ @@ -63,13 +63,4 @@ $(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\ svx/source/unodialogs/textconversiondlgs/resid \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\ - dl \ - m \ - pthread \ - stl \ -)) -endif - # vim: set noet sw=4 ts=4: 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,\ diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 1aa8b6407eae..71afa085d2cd 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -59,7 +59,7 @@ $(eval $(call gb_Library_add_linked_libs,xo,\ tl \ utl \ vos3 \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,xo,\ @@ -379,15 +379,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\ xmloff/source/xforms/xformsimport \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,xo,\ - dl \ - icuuc \ - m \ - pthread \ -)) -endif - ifeq ($(OS),WNT) ifneq ($(USE_MINGW),) $(eval $(call gb_Library_add_linked_libs,xo,\ diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index 55e3fbdd66ee..dca8b3901874 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -45,7 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,xof,\ salhelper \ stl \ xo \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,xof,\ @@ -90,15 +90,6 @@ $(eval $(call gb_Library_add_exception_objects,xof,\ xmloff/source/transform/XMLFilterRegistration \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,xof,\ - icuuc \ - dl \ - m \ - pthread \ -)) -endif - ifeq ($(OS),WNT) ifneq ($(USE_MINGW),) $(eval $(call gb_Library_add_linked_libs,xof,\ -- cgit v1.2.3 From 1851104998e0996874dbebccbfbd4778848f1f17 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 3 Feb 2011 10:24:18 +0100 Subject: CWS gnumake3: clean up mingw stuff after adding STDLIBS --- framework/Library_fwe.mk | 14 -------------- framework/Library_fwi.mk | 14 -------------- framework/Library_fwk.mk | 15 --------------- framework/Library_fwl.mk | 14 -------------- framework/Library_fwm.mk | 15 --------------- sfx2/Library_sfx.mk | 23 ++++------------------- svx/Library_svx.mk | 1 - svx/Library_svxcore.mk | 4 ---- xmloff/Library_xo.mk | 14 -------------- xmloff/Library_xof.mk | 14 -------------- 10 files changed, 4 insertions(+), 124 deletions(-) (limited to 'framework/Library_fwi.mk') diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 0b44b82632d1..7e71e3068e70 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -97,19 +97,5 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\ ifeq ($(OS),LINUX) $(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS)))) endif -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,fwe,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -endif -endif # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index fc60fdf15564..046c7230e35f 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -78,23 +78,9 @@ $(eval $(call gb_Library_add_exception_objects,fwi,\ )) ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) $(eval $(call gb_Library_add_linked_libs,fwi,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ advapi32 \ - kernel32 \ - msvcrt \ )) -else -$(eval $(call gb_Library_add_linked_libs,fwi,\ - advapi32 \ -)) -endif endif # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 27e3d924774c..a34a1bc59720 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -185,19 +185,4 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/xml/acceleratorconfigurationwriter \ )) -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,fwk,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -endif -endif - # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index cbf4a7b9a901..928c723d3f80 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -84,18 +84,4 @@ $(eval $(call gb_Library_add_exception_objects,fwl,\ framework/source/uielement/toolbarsmenucontroller \ )) -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,fwl,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -endif -endif # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index c242ecc8e12f..dbd486c40de1 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -65,19 +65,4 @@ $(eval $(call gb_Library_add_exception_objects,fwm,\ framework/source/tabwin/tabwinfactory \ )) -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,fwm,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -endif -endif - # vim: set noet sw=4 ts=4: diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 4cfd5da93bb6..4bb343e316d6 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -267,7 +267,9 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ Cocoa \ )) endif + ifeq ($(OS),WNT) + # workaround: disable PCH for these objects to avoid redeclaration # errors - needs to be fixed in module tools $(eval $(call gb_Library_add_cxxobjects,sfx,\ @@ -277,24 +279,6 @@ $(eval $(call gb_Library_add_cxxobjects,sfx,\ , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS) -nologo -UPRECOMPILED_HEADERS \ )) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,sfx,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - advapi32 \ - gdi32 \ - kernel32 \ - msvcrt \ - ole32 \ - shell32 \ - user32 \ - uuid \ -)) -else $(eval $(call gb_Library_add_linked_libs,sfx,\ gdi32 \ advapi32 \ @@ -303,8 +287,9 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ user32 \ uuid \ )) -endif + else + $(eval $(call gb_Library_add_cxxobjects,sfx,\ sfx2/source/appl/shutdowniconw32 \ sfx2/source/doc/sfxacldetect \ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index b549adeb9030..4ce5250f77a5 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -222,7 +222,6 @@ else ifeq ($(OS),WNT) $(eval $(call gb_Library_add_linked_libs,svx,\ advapi32 \ - oldnames \ )) $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/sendreportw32 \ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 5b7546d2d1c7..f3941defc8db 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -430,10 +430,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/xoutdev/xtablend \ )) -#.IF ("$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC") || "$(OS)"=="MACOSX" || ("$(OS)"=="LINUX" && "$(CPU)"=="P") -#NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj -#.ENDIF - # the following source file can't be compiled with optimization by some compilers (crash or endless loop): # Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC # the latter is currently not supported by gbuild and needs a fix here later diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 71afa085d2cd..8efabefa47b1 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -379,18 +379,4 @@ $(eval $(call gb_Library_add_exception_objects,xo,\ xmloff/source/xforms/xformsimport \ )) -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,xo,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -endif -endif # vim: set noet ts=4 sw=4: diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index dca8b3901874..455daadaf6e3 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -90,18 +90,4 @@ $(eval $(call gb_Library_add_exception_objects,xof,\ xmloff/source/transform/XMLFilterRegistration \ )) -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,xof,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -endif -endif # vim: set noet ts=4 sw=4: -- cgit v1.2.3