From 60c0bf9b1a5a6ee202eb40d2b66958bfe06be4a9 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 23:02:51 +0200 Subject: CWS gnumake2: move delivered header files from sfx2/inc to sfx2/inc/sfx2; removed unused code; avoid delivering sfx.srs to solver --- starmath/source/view.cxx | 2 +- starmath/util/makefile.mk | 3 +-- sw/prj/d.lst | 1 + sw/source/ui/uiview/pview.cxx | 2 +- sw/source/ui/uiview/srcview.cxx | 8 +++++--- sw/source/ui/uiview/view0.cxx | 2 +- sw/source/ui/vba/service.cxx | 6 +++--- sw/source/ui/web/wview.cxx | 2 +- sw/source/ui/wrtsh/wrtundo.cxx | 11 ++++++----- sw/util/makefile.mk | 7 +++---- 10 files changed, 23 insertions(+), 21 deletions(-) diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 855831fc9e9f..233054cfe35b 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -752,7 +752,7 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0)) } -SFX_IMPL_VIEWFACTORY(SmViewShell, SmResId(RID_VIEWNAME)) +SFX_IMPL_VIEWFACTORY(SmViewShell) { SFX_VIEW_REGISTRATION(SmDocShell); } diff --git a/starmath/util/makefile.mk b/starmath/util/makefile.mk index 978cb6cff40c..50ef998b984a 100644 --- a/starmath/util/makefile.mk +++ b/starmath/util/makefile.mk @@ -46,8 +46,7 @@ GEN_HID_OTHER=TRUE RESLIB1NAME=sm RESLIB1IMAGES=$(PRJ)$/res RESLIB1SRSFILES=\ - $(SRS)$/smres.srs \ - $(SOLARCOMMONRESDIR)$/sfx.srs + $(SRS)$/smres.srs SHL1TARGET= sm$(DLLPOSTFIX) SHL1IMPLIB= smimp diff --git a/sw/prj/d.lst b/sw/prj/d.lst index 958771dad257..ed58b3140762 100644 --- a/sw/prj/d.lst +++ b/sw/prj/d.lst @@ -66,6 +66,7 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar ..\%__SRC%\bin\vbaswobj*.dll %_DEST%\bin%_EXT%\vbaswobj*.dll ..\%__SRC%\bin\sw*.res %_DEST%\bin%_EXT%\sw*.res ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* +..\%__SRC%\lib\vbaswobj* %_DEST%\lib%_EXT%\vbaswobj* ..\uiconfig\swriter\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\menubar\*.xml ..\uiconfig\swxform\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\menubar\*.xml diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index d7cc7936958b..3e8ce79ae2fb 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -111,7 +111,7 @@ using namespace ::com::sun::star; -SFX_IMPL_VIEWFACTORY(SwPagePreView, SW_RES(STR_NONAME)) +SFX_IMPL_VIEWFACTORY(SwPagePreView) { SFX_VIEW_REGISTRATION(SwDocShell); SFX_VIEW_REGISTRATION(SwWebDocShell); diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 26a1253c5486..716164348aa8 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -52,6 +52,8 @@ #include #include #include +#include +#include #include #include @@ -130,7 +132,7 @@ using ::com::sun::star::util::SearchOptions; -SFX_IMPL_VIEWFACTORY(SwSrcView, SW_RES(STR_NONAME)) +SFX_IMPL_VIEWFACTORY(SwSrcView) { SFX_VIEW_REGISTRATION(SwWebDocShell); } @@ -566,7 +568,7 @@ void SwSrcView::GetState(SfxItemSet& rSet) nCount = rMgr.GetUndoActionCount(); if(nCount) { - String aStr(ResId( STR_UNDO, *SFX_APP()->GetSfxResManager() ));; + String aStr(SvtResId( STR_UNDO));; aStr += rMgr.GetUndoActionComment(--nCount); rSet.Put(SfxStringItem(nWhich, aStr)); } @@ -578,7 +580,7 @@ void SwSrcView::GetState(SfxItemSet& rSet) nCount = rMgr.GetRedoActionCount(); if(nCount) { - String aStr(ResId( STR_REDO, *SFX_APP()->GetSfxResManager() ));; + String aStr(SvtResId( STR_REDO));; aStr += rMgr.GetRedoActionComment(--nCount); rSet.Put(SfxStringItem(nWhich,aStr)); } diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index 73c401f2bcb6..2d0b7f340f51 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -106,7 +106,7 @@ using ::rtl::OUString; #include -SFX_IMPL_VIEWFACTORY(SwView, SW_RES(STR_NONAME)) +SFX_IMPL_VIEWFACTORY(SwView) { if ( SvtModuleOptions().IsWriter() ) { diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx index 20b93a45a2ce..e7532cee443c 100644 --- a/sw/source/ui/vba/service.cxx +++ b/sw/source/ui/vba/service.cxx @@ -57,14 +57,14 @@ extern sdecl::ServiceDecl const serviceDecl; extern "C" { - void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { OSL_TRACE("In component_getImplementationEnv"); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - sal_Bool SAL_CALL component_writeInfo( + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { OSL_TRACE("In component_writeInfo"); @@ -74,7 +74,7 @@ extern "C" globals::serviceDecl, document::serviceDecl, wrapformat::serviceDecl ); } - void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx index 34ccd8f72378..d24fdfbfe9ab 100644 --- a/sw/source/ui/web/wview.cxx +++ b/sw/source/ui/web/wview.cxx @@ -96,7 +96,7 @@ #include -SFX_IMPL_VIEWFACTORY(SwWebView, SW_RES(STR_NONAME)) +SFX_IMPL_VIEWFACTORY(SwWebView) { SFX_VIEW_REGISTRATION(SwWebDocShell); } diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx index 8a1a011988b3..39ac134420db 100644 --- a/sw/source/ui/wrtsh/wrtundo.cxx +++ b/sw/source/ui/wrtsh/wrtundo.cxx @@ -40,10 +40,11 @@ #include #include // fuer Undo-Ids #include - -#ifndef _WRTSH_HRC +#include +#include +#include +#include #include -#endif #include @@ -131,7 +132,7 @@ String SwWrtShell::GetDoString( DoType eDoType ) const default:;//prevent warning } - aStr.Insert( String(ResId( nResStr, *SFX_APP()->GetSfxResManager())), 0 ); + aStr.Insert( String( SvtResId( nResStr)), 0 ); aStr += aUndoStr; return aStr; @@ -175,7 +176,7 @@ String SwWrtShell::GetRepeatString() const if (aUndoStr.Len() > 0) { - aStr.Insert( ResId( STR_REPEAT, *SFX_APP()->GetSfxResManager()), 0 ); + aStr.Insert( SvtResId( STR_REPEAT ), 0 ); aStr += aUndoStr; } diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index 08afadc10698..cf8b8f176e45 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -68,8 +68,7 @@ sw_res_files= \ $(SRS)$/unocore.srs \ $(SRS)$/utlui.srs \ $(SRS)$/web.srs \ - $(SRS)$/wrtsh.srs \ - $(SOLARCOMMONRESDIR)$/sfx.srs + $(SRS)$/wrtsh.srs RESLIB1NAME=sw RESLIB1IMAGES=$(PRJ)$/imglst $(PRJ)$/res @@ -342,9 +341,9 @@ SHL4STDLIBS= \ #target vba TARGET_VBA=vbaswobj -SHL5TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno +SHL5TARGET=$(TARGET_VBA).uno SHL5IMPLIB= i$(TARGET_VBA) - +SHL5DLLPRE= SHL5VERSIONMAP=$(TARGET_VBA).map SHL5DEF=$(MISC)$/$(SHL5TARGET).def DEF5NAME=$(SHL5TARGET) -- cgit From 6551c54e36c592e55353e6da8a914c68718bdf16 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 23:05:45 +0200 Subject: CWS gnumake2: move header generation for oovbaapi to offuh --- sw/prj/build.lst | 2 +- sw/source/ui/vba/makefile.mk | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/sw/prj/build.lst b/sw/prj/build.lst index 6fd49c1d77b0..cf9d0baaa9d6 100755 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,4 +1,4 @@ -sw sw : filter l10n connectivity OOo:writerperfect vbahelper svx stoc writerfilter NULL +sw sw : filter offuh l10n connectivity OOo:writerperfect vbahelper svx stoc writerfilter NULL sw sw usr1 - all sw_mkout NULL sw sw\inc nmake - all sw_inc NULL sw sw\uiconfig\layout nmake - all sw_layout NULL diff --git a/sw/source/ui/vba/makefile.mk b/sw/source/ui/vba/makefile.mk index f4c604f5d4eb..47513f95a40b 100644 --- a/sw/source/ui/vba/makefile.mk +++ b/sw/source/ui/vba/makefile.mk @@ -100,12 +100,3 @@ SLOFILES= \ .INCLUDE : target.mk -ALLTAR : \ - $(MISC)$/$(TARGET).don \ - -$(SLOFILES) : $(MISC)$/$(TARGET).don - -$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb - +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@ - echo $@ - -- cgit From 257f1ae021145a109f184cd15105e08362abf99b Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 17 Apr 2010 12:41:17 +0200 Subject: CWS gnumake2: new gbuild system --- sw/Makefile | 30 ++ sw/prj/build.lst | 9 +- sw/prj/gbuild.lst | 3 + sw/prj/makefile.mk | 2 + sw/prj/target_lib_msword.mk | 121 +++++++ sw/prj/target_lib_sw.mk | 744 ++++++++++++++++++++++++++++++++++++++ sw/prj/target_lib_swd.mk | 76 ++++ sw/prj/target_lib_swui.mk | 195 ++++++++++ sw/prj/target_lib_vbaswobj.mk | 133 +++++++ sw/prj/target_module_sw.mk | 50 +++ sw/prj/target_package_misc.mk | 30 ++ sw/prj/target_package_uiconfig.mk | 281 ++++++++++++++ sw/prj/target_package_xml.mk | 29 ++ sw/prj/target_res_sw.mk | 184 ++++++++++ sw/source/core/undo/undo.src | 2 +- sw/source/ui/fmtui/fmtui.src | 91 ----- sw/source/ui/inc/swmn.hrc | 386 ++++++++++++++++++++ sw/source/ui/inc/swmn_tmpl.hrc | 386 -------------------- sw/source/ui/inc/toolbox.hrc | 566 +++++++++++++++++++++++++++++ sw/source/ui/inc/toolbox_tmpl.hrc | 566 ----------------------------- 20 files changed, 2835 insertions(+), 1049 deletions(-) create mode 100644 sw/Makefile create mode 100644 sw/prj/gbuild.lst create mode 100644 sw/prj/makefile.mk create mode 100644 sw/prj/target_lib_msword.mk create mode 100644 sw/prj/target_lib_sw.mk create mode 100644 sw/prj/target_lib_swd.mk create mode 100644 sw/prj/target_lib_swui.mk create mode 100644 sw/prj/target_lib_vbaswobj.mk create mode 100644 sw/prj/target_module_sw.mk create mode 100644 sw/prj/target_package_misc.mk create mode 100644 sw/prj/target_package_uiconfig.mk create mode 100644 sw/prj/target_package_xml.mk create mode 100644 sw/prj/target_res_sw.mk delete mode 100644 sw/source/ui/fmtui/fmtui.src create mode 100644 sw/source/ui/inc/swmn.hrc delete mode 100644 sw/source/ui/inc/swmn_tmpl.hrc create mode 100644 sw/source/ui/inc/toolbox.hrc delete mode 100644 sw/source/ui/inc/toolbox_tmpl.hrc diff --git a/sw/Makefile b/sw/Makefile new file mode 100644 index 000000000000..d020b04dba7c --- /dev/null +++ b/sw/Makefile @@ -0,0 +1,30 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +include ../solenv/inc/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) diff --git a/sw/prj/build.lst b/sw/prj/build.lst index cf9d0baaa9d6..03b2bc4a78fc 100755 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -3,7 +3,6 @@ sw sw usr1 - all sw_mkout NULL sw sw\inc nmake - all sw_inc NULL sw sw\uiconfig\layout nmake - all sw_layout NULL sw sw\prj get - all sw_prj NULL -sw sw\source\ui\inc nmake - all sw_uinc NULL sw sw\source\core\inc get - all sw_cinc NULL sw sw\source\filter\inc get - all sw_finc NULL sw sw\res get - all sw_res NULL @@ -11,7 +10,7 @@ sw sw\win\res get - all sw_wres NULL sw sw\win\imglst get - all sw_wimg NULL sw sw\sdi nmake - all sw_sdi NULL sw sw\source\core\bastyp nmake - all sw_bast sw_inc NULL -sw sw\source\ui\app nmake - all sw_app sw_sdi sw_uinc sw_inc NULL +sw sw\source\ui\app nmake - all sw_app sw_sdi sw_inc NULL sw sw\source\ui\cctrl nmake - all sw_cctrl sw_inc NULL sw sw\source\ui\chrdlg nmake - all sw_chrdl sw_inc NULL sw sw\source\ui\config nmake - all sw_conf sw_inc NULL @@ -23,19 +22,19 @@ sw sw\source\ui\envelp nmake - all sw_envlp sw_inc NULL sw sw\source\ui\fldui nmake - all sw_fldui sw_inc NULL sw sw\source\ui\fmtui nmake - all sw_fmtui sw_inc NULL sw sw\source\ui\frmdlg nmake - all sw_frmdl sw_inc NULL -sw sw\source\ui\globdoc nmake - all sw_globd sw_uinc sw_inc NULL +sw sw\source\ui\globdoc nmake - all sw_globd sw_inc NULL sw sw\source\ui\index nmake - all sw_index sw_inc NULL sw sw\source\ui\lingu nmake - all sw_ling sw_inc NULL sw sw\source\ui\misc nmake - all sw_misc sw_sdi sw_inc NULL sw sw\source\ui\ribbar nmake - all sw_rbbar sw_inc NULL -sw sw\source\ui\shells nmake - all sw_shell sw_uinc sw_sdi sw_inc NULL +sw sw\source\ui\shells nmake - all sw_shell sw_sdi sw_inc NULL sw sw\source\ui\smartmenu nmake - all sw_smartmenu sw_inc NULL sw sw\source\ui\table nmake - all sw_table sw_inc NULL sw sw\source\ui\uiview nmake - all sw_uivw sw_sdi sw_inc NULL sw sw\source\ui\uno nmake - all sw_uiuno sw_sdi sw_inc NULL sw sw\source\ui\vba nmake - all sw_vba sw_inc NULL sw sw\source\ui\utlui nmake - all sw_utlui sw_inc NULL -sw sw\source\ui\web nmake - all sw_web sw_uinc sw_sdi sw_inc NULL +sw sw\source\ui\web nmake - all sw_web sw_sdi sw_inc NULL sw sw\source\ui\wrtsh nmake - all sw_wrtsh sw_inc NULL sw sw\source\core\attr nmake - all sw_attr sw_inc NULL sw sw\source\core\crsr nmake - all sw_crsr sw_inc NULL diff --git a/sw/prj/gbuild.lst b/sw/prj/gbuild.lst new file mode 100644 index 000000000000..d4770eec862c --- /dev/null +++ b/sw/prj/gbuild.lst @@ -0,0 +1,3 @@ +sw sw : l10n connectivity OOo:writerperfect svx stoc uui writerfilter filter oovbaapi cui vbahelper NULL +sw sw usr1 - all sw_mkout NULL +sw sw\prj nmake - all sw_prj NULL diff --git a/sw/prj/makefile.mk b/sw/prj/makefile.mk new file mode 100644 index 000000000000..a5f9aa9d8248 --- /dev/null +++ b/sw/prj/makefile.mk @@ -0,0 +1,2 @@ +all: + cd .. && make -sj9 diff --git a/sw/prj/target_lib_msword.mk b/sw/prj/target_lib_msword.mk new file mode 100644 index 000000000000..7bad6041aeef --- /dev/null +++ b/sw/prj/target_lib_msword.mk @@ -0,0 +1,121 @@ +#************************************************************************* +# +# 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,msword)) + +$(eval $(call gb_Library_set_include,msword,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/sw/sdi \ + -I$(WORKDIR)/inc/sw/ \ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/inc/pch \ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/ui/inc \ + -I$(SRCDIR)/sw/source/filter/inc \ + -I$(OUTDIR)/inc/sw \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,msword,\ + $$(DEFS) \ + -DACCESSIBLE_LAYOUT \ +)) + +$(eval $(call gb_Library_add_linked_libs,msword,\ + basegfx \ + comphelper \ + go \ + i18nisolang1 \ + i18nutil \ + icuuc \ + msfilter \ + sfx \ + sot \ + stl \ + svl \ + svt \ + svx \ + svx \ + svxcore \ + sw \ + tk \ + tl \ + ucbhelper \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,msword,\ + sw/source/filter/rtf/rtfatr \ + sw/source/filter/rtf/rtffld \ + sw/source/filter/rtf/rtffly \ + sw/source/filter/rtf/rtfnum \ + sw/source/filter/rtf/rtftbl \ + sw/source/filter/rtf/swparrtf \ + sw/source/filter/rtf/wrtrtf \ + sw/source/filter/ww8/WW8FFData \ + sw/source/filter/ww8/WW8FibData \ + sw/source/filter/ww8/WW8Sttbf \ + sw/source/filter/ww8/WW8TableInfo \ + sw/source/filter/ww8/fields \ + sw/source/filter/ww8/styles \ + sw/source/filter/ww8/tracer \ + sw/source/filter/ww8/writerhelper \ + sw/source/filter/ww8/writerwordglue \ + sw/source/filter/ww8/wrtw8esh \ + sw/source/filter/ww8/wrtw8nds \ + sw/source/filter/ww8/wrtw8num \ + sw/source/filter/ww8/wrtw8sty \ + sw/source/filter/ww8/wrtww8 \ + sw/source/filter/ww8/wrtww8gr \ + sw/source/filter/ww8/ww8atr \ + sw/source/filter/ww8/ww8glsy \ + sw/source/filter/ww8/ww8graf \ + sw/source/filter/ww8/ww8graf2 \ + sw/source/filter/ww8/ww8par \ + sw/source/filter/ww8/ww8par2 \ + sw/source/filter/ww8/ww8par3 \ + sw/source/filter/ww8/ww8par4 \ + sw/source/filter/ww8/ww8par5 \ + sw/source/filter/ww8/ww8par6 \ + sw/source/filter/ww8/ww8scan \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,msword,\ + advapi32 \ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/sw/prj/target_lib_sw.mk b/sw/prj/target_lib_sw.mk new file mode 100644 index 000000000000..10c9444fbba5 --- /dev/null +++ b/sw/prj/target_lib_sw.mk @@ -0,0 +1,744 @@ +#************************************************************************* +# +# 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,sw)) + +$(call gb_Library_get_headers_target,sw) : $(call gb_SdiTarget_get_target,sw/sdi/swslots) +$(call gb_Library_get_clean_target,sw) : $(call gb_SdiTarget_get_clean_target,sw/sdi/swslots) + +$(eval $(call gb_Library_set_include,sw,\ + $$(SOLARINC) \ + -I$(WORKDIR)/inc/sw/sdi \ + -I$(WORKDIR)/inc/sw/ \ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/filter/inc \ + -I$(SRCDIR)/sw/source/ui/inc \ + -I$(SRCDIR)/sw/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,sw,\ + $$(DEFS) \ + -DACCESSIBLE_LAYOUT \ + -DSW_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,sw,\ + avmedia \ + basegfx \ + comphelper \ + cppu \ + cppuhelper \ + drawinglayer \ + go \ + i18nisolang1 \ + i18nutil \ + icuuc \ + lng \ + sal \ + salhelper \ + sb \ + sfx \ + sot \ + stl \ + svl \ + svt \ + svx \ + svxcore \ + tk \ + tl \ + ucbhelper \ + utl \ + vbahelper \ + vcl \ + vos3 \ + xo \ +)) + +$(eval $(call gb_Library_add_exception_objects,sw,\ + sw/source/core/SwNumberTree/SwNodeNum \ + sw/source/core/SwNumberTree/SwNumberTree \ + sw/source/core/access/acccell \ + sw/source/core/access/acccontext \ + sw/source/core/access/accdoc \ + sw/source/core/access/accembedded \ + sw/source/core/access/accfootnote \ + sw/source/core/access/accframe \ + sw/source/core/access/accframebase\ + sw/source/core/access/accfrmobj \ + sw/source/core/access/accfrmobjmap \ + sw/source/core/access/accfrmobjslist \ + sw/source/core/access/accgraphic \ + sw/source/core/access/accheaderfooter \ + sw/source/core/access/acchyperlink \ + sw/source/core/access/acchypertextdata \ + sw/source/core/access/accmap \ + sw/source/core/access/accnotextframe \ + sw/source/core/access/accpage \ + sw/source/core/access/accpara \ + sw/source/core/access/accportions \ + sw/source/core/access/accpreview \ + sw/source/core/access/accselectionhelper \ + sw/source/core/access/acctable \ + sw/source/core/access/acctextframe \ + sw/source/core/access/textmarkuphelper \ + sw/source/core/attr/calbck \ + sw/source/core/attr/cellatr \ + sw/source/core/attr/fmtfollowtextflow \ + sw/source/core/attr/fmtwrapinfluenceonobjpos \ + sw/source/core/attr/format \ + sw/source/core/attr/hints \ + sw/source/core/attr/swatrset \ + sw/source/core/bastyp/SwSmartTagMgr \ + sw/source/core/bastyp/bparr \ + sw/source/core/bastyp/breakit \ + sw/source/core/bastyp/calc \ + sw/source/core/bastyp/checkit \ + sw/source/core/bastyp/index \ + sw/source/core/bastyp/init \ + sw/source/core/bastyp/ring \ + sw/source/core/bastyp/swcache \ + sw/source/core/bastyp/swrect \ + sw/source/core/bastyp/swregion \ + sw/source/core/bastyp/swtypes \ + sw/source/core/bastyp/tabcol \ + sw/source/core/crsr/BlockCursor \ + sw/source/core/crsr/bookmrk \ + sw/source/core/crsr/callnk \ + sw/source/core/crsr/crbm \ + sw/source/core/crsr/crossrefbookmark \ + sw/source/core/crsr/crsrsh \ + sw/source/core/crsr/crstrvl \ + sw/source/core/crsr/crstrvl1 \ + sw/source/core/crsr/findattr \ + sw/source/core/crsr/findcoll \ + sw/source/core/crsr/findfmt \ + sw/source/core/crsr/findtxt \ + sw/source/core/crsr/pam \ + sw/source/core/crsr/paminit \ + sw/source/core/crsr/swcrsr \ + sw/source/core/crsr/trvlcol \ + sw/source/core/crsr/trvlfnfl \ + sw/source/core/crsr/trvlreg \ + sw/source/core/crsr/trvltbl \ + sw/source/core/crsr/unocrsr \ + sw/source/core/crsr/viscrs \ + sw/source/core/doc/SwStyleNameMapper \ + sw/source/core/doc/acmplwrd \ + sw/source/core/doc/dbgoutsw \ + sw/source/core/doc/doc \ + sw/source/core/doc/docbasic \ + sw/source/core/doc/docbm \ + sw/source/core/doc/docchart \ + sw/source/core/doc/doccomp \ + sw/source/core/doc/doccorr \ + sw/source/core/doc/docdde \ + sw/source/core/doc/docdesc \ + sw/source/core/doc/docdraw \ + sw/source/core/doc/docedt \ + sw/source/core/doc/docfld \ + sw/source/core/doc/docfly \ + sw/source/core/doc/docfmt \ + sw/source/core/doc/docftn \ + sw/source/core/doc/docglbl \ + sw/source/core/doc/docglos \ + sw/source/core/doc/doclay \ + sw/source/core/doc/docnew \ + sw/source/core/doc/docnum \ + sw/source/core/doc/docredln \ + sw/source/core/doc/docruby \ + sw/source/core/doc/docsort \ + sw/source/core/doc/docstat \ + sw/source/core/doc/doctxm \ + sw/source/core/doc/docxforms \ + sw/source/core/doc/extinput \ + sw/source/core/doc/fmtcol \ + sw/source/core/doc/ftnidx \ + sw/source/core/doc/gctable \ + sw/source/core/doc/htmltbl \ + sw/source/core/doc/lineinfo \ + sw/source/core/doc/list \ + sw/source/core/doc/notxtfrm \ + sw/source/core/doc/number \ + sw/source/core/doc/poolfmt \ + sw/source/core/doc/sortopt \ + sw/source/core/doc/swserv \ + sw/source/core/doc/swstylemanager \ + sw/source/core/doc/tblafmt \ + sw/source/core/doc/tblcpy \ + sw/source/core/doc/tblrwcl \ + sw/source/core/doc/visiturl \ + sw/source/core/docnode/cancellablejob \ + sw/source/core/docnode/finalthreadmanager \ + sw/source/core/docnode/ndcopy \ + sw/source/core/docnode/ndindex \ + sw/source/core/docnode/ndnotxt \ + sw/source/core/docnode/ndnum \ + sw/source/core/docnode/ndsect \ + sw/source/core/docnode/ndtbl \ + sw/source/core/docnode/ndtbl1 \ + sw/source/core/docnode/node \ + sw/source/core/docnode/node2lay \ + sw/source/core/docnode/nodes \ + sw/source/core/docnode/observablethread \ + sw/source/core/docnode/pausethreadstarting \ + sw/source/core/docnode/retrievedinputstreamdata \ + sw/source/core/docnode/retrieveinputstream \ + sw/source/core/docnode/retrieveinputstreamconsumer \ + sw/source/core/docnode/section \ + sw/source/core/docnode/swbaslnk \ + sw/source/core/docnode/swthreadjoiner \ + sw/source/core/docnode/swthreadmanager \ + sw/source/core/docnode/threadlistener \ + sw/source/core/docnode/threadmanager \ + sw/source/core/draw/dcontact \ + sw/source/core/draw/dflyobj \ + sw/source/core/draw/dobjfac \ + sw/source/core/draw/dpage \ + sw/source/core/draw/drawdoc \ + sw/source/core/draw/dview \ + sw/source/core/edit/acorrect \ + sw/source/core/edit/autofmt \ + sw/source/core/edit/edatmisc \ + sw/source/core/edit/edattr \ + sw/source/core/edit/eddel \ + sw/source/core/edit/edfcol \ + sw/source/core/edit/edfld \ + sw/source/core/edit/edfldexp \ + sw/source/core/edit/edfmt \ + sw/source/core/edit/edglbldc \ + sw/source/core/edit/edglss \ + sw/source/core/edit/editsh \ + sw/source/core/edit/edlingu \ + sw/source/core/edit/ednumber \ + sw/source/core/edit/edredln \ + sw/source/core/edit/edsect \ + sw/source/core/edit/edtab \ + sw/source/core/edit/edtox \ + sw/source/core/edit/edundo \ + sw/source/core/edit/edws \ + sw/source/core/fields/authfld \ + sw/source/core/fields/cellfml \ + sw/source/core/fields/chpfld \ + sw/source/core/fields/dbfld \ + sw/source/core/fields/ddefld \ + sw/source/core/fields/ddetbl \ + sw/source/core/fields/docufld \ + sw/source/core/fields/expfld \ + sw/source/core/fields/fldbas \ + sw/source/core/fields/flddat \ + sw/source/core/fields/flddropdown \ + sw/source/core/fields/fldlst \ + sw/source/core/fields/macrofld \ + sw/source/core/fields/postithelper \ + sw/source/core/fields/reffld \ + sw/source/core/fields/scrptfld \ + sw/source/core/fields/tblcalc \ + sw/source/core/fields/textapi \ + sw/source/core/fields/usrfld \ + sw/source/core/frmedt/fecopy \ + sw/source/core/frmedt/fedesc \ + sw/source/core/frmedt/fefly1 \ + sw/source/core/frmedt/feflyole \ + sw/source/core/frmedt/feshview \ + sw/source/core/frmedt/fetab \ + sw/source/core/frmedt/fews \ + sw/source/core/frmedt/tblsel \ + sw/source/core/graphic/grfatr \ + sw/source/core/graphic/ndgrf \ + sw/source/core/layout/anchoreddrawobject \ + sw/source/core/layout/anchoredobject \ + sw/source/core/layout/atrfrm \ + sw/source/core/layout/calcmove \ + sw/source/core/layout/colfrm \ + sw/source/core/layout/findfrm \ + sw/source/core/layout/flowfrm \ + sw/source/core/layout/fly \ + sw/source/core/layout/flycnt \ + sw/source/core/layout/flyincnt \ + sw/source/core/layout/flylay \ + sw/source/core/layout/flypos \ + sw/source/core/layout/frmtool \ + sw/source/core/layout/ftnfrm \ + sw/source/core/layout/hffrm \ + sw/source/core/layout/layact \ + sw/source/core/layout/laycache \ + sw/source/core/layout/layouter \ + sw/source/core/layout/movedfwdfrmsbyobjpos \ + sw/source/core/layout/newfrm \ + sw/source/core/layout/objectformatter \ + sw/source/core/layout/objectformatterlayfrm \ + sw/source/core/layout/objectformattertxtfrm \ + sw/source/core/layout/objstmpconsiderwrapinfl \ + sw/source/core/layout/pagechg \ + sw/source/core/layout/pagedesc \ + sw/source/core/layout/paintfrm \ + sw/source/core/layout/sectfrm \ + sw/source/core/layout/softpagebreak \ + sw/source/core/layout/sortedobjs \ + sw/source/core/layout/sortedobjsimpl \ + sw/source/core/layout/ssfrm \ + sw/source/core/layout/swselectionlist \ + sw/source/core/layout/tabfrm \ + sw/source/core/layout/trvlfrm \ + sw/source/core/layout/unusedf \ + sw/source/core/layout/virtoutp \ + sw/source/core/layout/wsfrm \ + sw/source/core/objectpositioning/anchoredobjectposition \ + sw/source/core/objectpositioning/ascharanchoredobjectposition \ + sw/source/core/objectpositioning/environmentofanchoredobject \ + sw/source/core/objectpositioning/tocntntanchoredobjectposition \ + sw/source/core/objectpositioning/tolayoutanchoredobjectposition \ + sw/source/core/ole/ndole \ + sw/source/core/para/paratr \ + sw/source/core/sw3io/sw3convert \ + sw/source/core/sw3io/swacorr \ + sw/source/core/swg/SwXMLBlockExport \ + sw/source/core/swg/SwXMLBlockImport \ + sw/source/core/swg/SwXMLBlockListContext \ + sw/source/core/swg/SwXMLSectionList \ + sw/source/core/swg/SwXMLTextBlocks \ + sw/source/core/swg/SwXMLTextBlocks1 \ + sw/source/core/swg/swblocks \ + sw/source/core/table/swnewtable \ + sw/source/core/table/swtable \ + sw/source/core/text/EnhancedPDFExportHelper \ + sw/source/core/text/SwGrammarMarkUp \ + sw/source/core/text/atrstck \ + sw/source/core/text/blink \ + sw/source/core/text/frmcrsr \ + sw/source/core/text/frmform \ + sw/source/core/text/frminf \ + sw/source/core/text/frmpaint \ + sw/source/core/text/guess \ + sw/source/core/text/inftxt \ + sw/source/core/text/itradj \ + sw/source/core/text/itratr \ + sw/source/core/text/itrcrsr \ + sw/source/core/text/itrform2 \ + sw/source/core/text/itrpaint \ + sw/source/core/text/itrtxt \ + sw/source/core/text/noteurl \ + sw/source/core/text/porexp \ + sw/source/core/text/porfld \ + sw/source/core/text/porfly \ + sw/source/core/text/porglue \ + sw/source/core/text/porlay \ + sw/source/core/text/porlin \ + sw/source/core/text/pormulti \ + sw/source/core/text/porref \ + sw/source/core/text/porrst \ + sw/source/core/text/portox \ + sw/source/core/text/portxt \ + sw/source/core/text/redlnitr \ + sw/source/core/text/txtcache \ + sw/source/core/text/txtdrop \ + sw/source/core/text/txtfld \ + sw/source/core/text/txtfly \ + sw/source/core/text/txtfrm \ + sw/source/core/text/txtftn \ + sw/source/core/text/txthyph \ + sw/source/core/text/txtinit \ + sw/source/core/text/txtpaint \ + sw/source/core/text/txttab \ + sw/source/core/text/widorp \ + sw/source/core/text/wrong \ + sw/source/core/tox/tox \ + sw/source/core/tox/toxhlp \ + sw/source/core/tox/txmsrt \ + sw/source/core/txtnode/SwGrammarContact \ + sw/source/core/txtnode/atrfld \ + sw/source/core/txtnode/atrflyin \ + sw/source/core/txtnode/atrftn \ + sw/source/core/txtnode/atrref \ + sw/source/core/txtnode/atrtox \ + sw/source/core/txtnode/chrfmt \ + sw/source/core/txtnode/fmtatr2 \ + sw/source/core/txtnode/fntcache \ + sw/source/core/txtnode/fntcap \ + sw/source/core/txtnode/modeltoviewhelper \ + sw/source/core/txtnode/ndhints \ + sw/source/core/txtnode/ndtxt \ + sw/source/core/txtnode/swfntcch \ + sw/source/core/txtnode/swfont \ + sw/source/core/txtnode/thints \ + sw/source/core/txtnode/txatbase \ + sw/source/core/txtnode/txatritr \ + sw/source/core/txtnode/txtatr2 \ + sw/source/core/txtnode/txtedt \ + sw/source/core/undo/SwRewriter \ + sw/source/core/undo/SwUndoField \ + sw/source/core/undo/SwUndoFmt \ + sw/source/core/undo/SwUndoPageDesc \ + sw/source/core/undo/SwUndoTOXChange \ + sw/source/core/undo/docundo \ + sw/source/core/undo/rolbck \ + sw/source/core/undo/unattr \ + sw/source/core/undo/unbkmk \ + sw/source/core/undo/undel \ + sw/source/core/undo/undobj \ + sw/source/core/undo/undobj1 \ + sw/source/core/undo/undoflystrattr \ + sw/source/core/undo/undraw \ + sw/source/core/undo/unfmco \ + sw/source/core/undo/unins \ + sw/source/core/undo/unmove \ + sw/source/core/undo/unnum \ + sw/source/core/undo/unoutl \ + sw/source/core/undo/unovwr \ + sw/source/core/undo/unredln \ + sw/source/core/undo/unsect \ + sw/source/core/undo/unsort \ + sw/source/core/undo/unspnd \ + sw/source/core/undo/untbl \ + sw/source/core/undo/untblk \ + sw/source/core/unocore/SwXTextDefaults \ + sw/source/core/unocore/TextCursorHelper \ + sw/source/core/unocore/XMLRangeHelper \ + sw/source/core/unocore/swunohelper \ + sw/source/core/unocore/unobkm \ + sw/source/core/unocore/unochart \ + sw/source/core/unocore/unoclbck \ + sw/source/core/unocore/unocoll \ + sw/source/core/unocore/unocrsrhelper \ + sw/source/core/unocore/unodraw \ + sw/source/core/unocore/unoevent \ + sw/source/core/unocore/unoevtlstnr \ + sw/source/core/unocore/unofield \ + sw/source/core/unocore/unoflatpara \ + sw/source/core/unocore/unoframe \ + sw/source/core/unocore/unoftn \ + sw/source/core/unocore/unoidx \ + sw/source/core/unocore/unomap \ + sw/source/core/unocore/unoobj \ + sw/source/core/unocore/unoobj2 \ + sw/source/core/unocore/unoparagraph \ + sw/source/core/unocore/unoport \ + sw/source/core/unocore/unoportenum \ + sw/source/core/unocore/unoprnms \ + sw/source/core/unocore/unoredline \ + sw/source/core/unocore/unoredlines \ + sw/source/core/unocore/unorefmk \ + sw/source/core/unocore/unosect \ + sw/source/core/unocore/unosett \ + sw/source/core/unocore/unosrch \ + sw/source/core/unocore/unostyle \ + sw/source/core/unocore/unotbl \ + sw/source/core/unocore/unotext \ + sw/source/core/unocore/unotextmarkup \ + sw/source/core/view/pagepreviewlayout \ + sw/source/core/view/scrrect \ + sw/source/core/view/vdraw \ + sw/source/core/view/viewimp \ + sw/source/core/view/viewpg \ + sw/source/core/view/viewsh \ + sw/source/core/view/vnew \ + sw/source/core/view/vprint \ + sw/source/filter/ascii/ascatr \ + sw/source/filter/ascii/parasc \ + sw/source/filter/ascii/wrtasc \ + sw/source/filter/basflt/docfact \ + sw/source/filter/basflt/fltini \ + sw/source/filter/basflt/iodetect \ + sw/source/filter/basflt/shellio \ + sw/source/filter/html/SwAppletImpl \ + sw/source/filter/html/css1atr \ + sw/source/filter/html/css1kywd \ + sw/source/filter/html/htmlatr \ + sw/source/filter/html/htmlbas \ + sw/source/filter/html/htmlcss1 \ + sw/source/filter/html/htmlctxt \ + sw/source/filter/html/htmldraw \ + sw/source/filter/html/htmlfld \ + sw/source/filter/html/htmlfldw \ + sw/source/filter/html/htmlfly \ + sw/source/filter/html/htmlflyt \ + sw/source/filter/html/htmlform \ + sw/source/filter/html/htmlforw \ + sw/source/filter/html/htmlftn \ + sw/source/filter/html/htmlgrin \ + sw/source/filter/html/htmlnum \ + sw/source/filter/html/htmlplug \ + sw/source/filter/html/htmlsect \ + sw/source/filter/html/htmltab \ + sw/source/filter/html/htmltabw \ + sw/source/filter/html/parcss1 \ + sw/source/filter/html/svxcss1 \ + sw/source/filter/html/swhtml \ + sw/source/filter/html/wrthtml \ + sw/source/filter/writer/writer \ + sw/source/filter/writer/wrt_fn \ + sw/source/filter/writer/wrtswtbl \ + sw/source/filter/ww1/fltshell \ + sw/source/filter/ww1/w1class \ + sw/source/filter/ww1/w1filter \ + sw/source/filter/ww1/w1par \ + sw/source/filter/ww1/w1sprm \ + sw/source/filter/xml/XMLRedlineImportHelper \ + sw/source/filter/xml/swxml \ + sw/source/filter/xml/wrtxml \ + sw/source/filter/xml/xmlbrsh \ + sw/source/filter/xml/xmlexp \ + sw/source/filter/xml/xmlexpit \ + sw/source/filter/xml/xmlfmt \ + sw/source/filter/xml/xmlfmte \ + sw/source/filter/xml/xmlfonte \ + sw/source/filter/xml/xmlimp \ + sw/source/filter/xml/xmlimpit \ + sw/source/filter/xml/xmlitem \ + sw/source/filter/xml/xmliteme \ + sw/source/filter/xml/xmlitemi \ + sw/source/filter/xml/xmlitemm \ + sw/source/filter/xml/xmlithlp \ + sw/source/filter/xml/xmlitmpr \ + sw/source/filter/xml/xmlmeta \ + sw/source/filter/xml/xmlscript \ + sw/source/filter/xml/xmltble \ + sw/source/filter/xml/xmltbli \ + sw/source/filter/xml/xmltext \ + sw/source/filter/xml/xmltexte \ + sw/source/filter/xml/xmltexti \ + sw/source/ui/app/appenv \ + sw/source/ui/app/apphdl \ + sw/source/ui/app/applab \ + sw/source/ui/app/appopt \ + sw/source/ui/app/docsh \ + sw/source/ui/app/docsh2 \ + sw/source/ui/app/docshdrw \ + sw/source/ui/app/docshini \ + sw/source/ui/app/docst \ + sw/source/ui/app/docstyle \ + sw/source/ui/app/mainwn \ + sw/source/ui/app/swdll \ + sw/source/ui/app/swmodul1 \ + sw/source/ui/app/swmodule \ + sw/source/ui/app/swwait \ + sw/source/ui/cctrl/actctrl \ + sw/source/ui/cctrl/popbox \ + sw/source/ui/cctrl/swlbox \ + sw/source/ui/chrdlg/ccoll \ + sw/source/ui/config/barcfg \ + sw/source/ui/config/caption \ + sw/source/ui/config/cfgitems \ + sw/source/ui/config/dbconfig \ + sw/source/ui/config/fontcfg \ + sw/source/ui/config/modcfg \ + sw/source/ui/config/prtopt \ + sw/source/ui/config/uinums \ + sw/source/ui/config/usrpref \ + sw/source/ui/config/viewopt \ + sw/source/ui/dbui/dbmgr \ + sw/source/ui/dbui/dbtree \ + sw/source/ui/dbui/dbui \ + sw/source/ui/dbui/maildispatcher \ + sw/source/ui/dbui/mailmergechildwindow \ + sw/source/ui/dbui/mailmergehelper \ + sw/source/ui/dbui/mmconfigitem \ + sw/source/ui/dbui/swdbtoolsclient \ + sw/source/ui/dialog/SwSpellDialogChildWindow \ + sw/source/ui/dialog/regionsw \ + sw/source/ui/dialog/swabstdlg \ + sw/source/ui/dialog/swwrtshitem \ + sw/source/ui/dochdl/gloshdl \ + sw/source/ui/dochdl/swdtflvr \ + sw/source/ui/docvw/PostItMgr \ + sw/source/ui/docvw/edtdd \ + sw/source/ui/docvw/edtwin \ + sw/source/ui/docvw/edtwin2 \ + sw/source/ui/docvw/edtwin3 \ + sw/source/ui/docvw/postit \ + sw/source/ui/docvw/romenu \ + sw/source/ui/docvw/srcedtw \ + sw/source/ui/envelp/envimg \ + sw/source/ui/envelp/labelcfg \ + sw/source/ui/envelp/labimg \ + sw/source/ui/envelp/syncbtn \ + sw/source/ui/fldui/fldmgr \ + sw/source/ui/fldui/fldwrap \ + sw/source/ui/fldui/xfldui \ + sw/source/ui/frmdlg/colex \ + sw/source/ui/frmdlg/colmgr \ + sw/source/ui/frmdlg/frmmgr \ + sw/source/ui/globdoc/globdoc \ + sw/source/ui/index/idxmrk \ + sw/source/ui/index/toxmgr \ + sw/source/ui/lingu/hhcwrp \ + sw/source/ui/lingu/hyp \ + sw/source/ui/lingu/olmenu \ + sw/source/ui/lingu/sdrhhcwrap \ + sw/source/ui/misc/glosdoc \ + sw/source/ui/misc/glshell \ + sw/source/ui/misc/numberingtypelistbox \ + sw/source/ui/misc/redlndlg \ + sw/source/ui/ribbar/conarc \ + sw/source/ui/ribbar/concustomshape \ + sw/source/ui/ribbar/conform \ + sw/source/ui/ribbar/conpoly \ + sw/source/ui/ribbar/conrect \ + sw/source/ui/ribbar/drawbase \ + sw/source/ui/ribbar/dselect \ + sw/source/ui/ribbar/inputwin \ + sw/source/ui/ribbar/tblctrl \ + sw/source/ui/ribbar/tbxanchr \ + sw/source/ui/ribbar/workctrl \ + sw/source/ui/shells/annotsh \ + sw/source/ui/shells/basesh \ + sw/source/ui/shells/beziersh \ + sw/source/ui/shells/drawdlg \ + sw/source/ui/shells/drawsh \ + sw/source/ui/shells/drformsh \ + sw/source/ui/shells/drwbassh \ + sw/source/ui/shells/drwtxtex \ + sw/source/ui/shells/drwtxtsh \ + sw/source/ui/shells/frmsh \ + sw/source/ui/shells/grfsh \ + sw/source/ui/shells/grfshex \ + sw/source/ui/shells/langhelper \ + sw/source/ui/shells/listsh \ + sw/source/ui/shells/mediash \ + sw/source/ui/shells/olesh \ + sw/source/ui/shells/slotadd \ + sw/source/ui/shells/tabsh \ + sw/source/ui/shells/textdrw \ + sw/source/ui/shells/textfld \ + sw/source/ui/shells/textglos \ + sw/source/ui/shells/textidx \ + sw/source/ui/shells/textsh \ + sw/source/ui/shells/textsh1 \ + sw/source/ui/shells/textsh2 \ + sw/source/ui/shells/txtattr \ + sw/source/ui/shells/txtcrsr \ + sw/source/ui/shells/txtnum \ + sw/source/ui/smartmenu/stmenu \ + sw/source/ui/table/chartins \ + sw/source/ui/table/swtablerep \ + sw/source/ui/table/tablemgr \ + sw/source/ui/uiview/formatclipboard \ + sw/source/ui/uiview/pview \ + sw/source/ui/uiview/scroll \ + sw/source/ui/uiview/srcview \ + sw/source/ui/uiview/swcli \ + sw/source/ui/uiview/uivwimp \ + sw/source/ui/uiview/view \ + sw/source/ui/uiview/view0 \ + sw/source/ui/uiview/view1 \ + sw/source/ui/uiview/view2 \ + sw/source/ui/uiview/viewcoll \ + sw/source/ui/uiview/viewdlg \ + sw/source/ui/uiview/viewdlg2 \ + sw/source/ui/uiview/viewdraw \ + sw/source/ui/uiview/viewling \ + sw/source/ui/uiview/viewmdi \ + sw/source/ui/uiview/viewport \ + sw/source/ui/uiview/viewprt \ + sw/source/ui/uiview/viewsrch \ + sw/source/ui/uiview/viewstat \ + sw/source/ui/uiview/viewtab \ + sw/source/ui/uno/RefreshListenerContainer \ + sw/source/ui/uno/SwXDocumentSettings \ + sw/source/ui/uno/SwXFilterOptions \ + sw/source/ui/uno/SwXPrintPreviewSettings \ + sw/source/ui/uno/dlelstnr \ + sw/source/ui/uno/unoatxt \ + sw/source/ui/uno/unodefaults \ + sw/source/ui/uno/unodispatch \ + sw/source/ui/uno/unodoc \ + sw/source/ui/uno/unofreg \ + sw/source/ui/uno/unomailmerge \ + sw/source/ui/uno/unomod \ + sw/source/ui/uno/unomodule \ + sw/source/ui/uno/unotxdoc \ + sw/source/ui/uno/unotxvw \ + sw/source/ui/uno/warnpassword \ + sw/source/ui/utlui/attrdesc \ + sw/source/ui/utlui/bookctrl \ + sw/source/ui/utlui/condedit \ + sw/source/ui/utlui/content \ + sw/source/ui/utlui/glbltree \ + sw/source/ui/utlui/gloslst \ + sw/source/ui/utlui/initui \ + sw/source/ui/utlui/navicfg \ + sw/source/ui/utlui/navipi \ + sw/source/ui/utlui/numfmtlb \ + sw/source/ui/utlui/prcntfld \ + sw/source/ui/utlui/shdwcrsr \ + sw/source/ui/utlui/textcontrolcombo \ + sw/source/ui/utlui/tmplctrl \ + sw/source/ui/utlui/uiitems \ + sw/source/ui/utlui/uitool \ + sw/source/ui/utlui/unotools \ + sw/source/ui/utlui/viewlayoutctrl \ + sw/source/ui/utlui/zoomctrl \ + sw/source/ui/web/wdocsh \ + sw/source/ui/web/wformsh \ + sw/source/ui/web/wfrmsh \ + sw/source/ui/web/wgrfsh \ + sw/source/ui/web/wlistsh \ + sw/source/ui/web/wolesh \ + sw/source/ui/web/wtabsh \ + sw/source/ui/web/wtextsh \ + sw/source/ui/web/wview \ + sw/source/ui/wrtsh/delete \ + sw/source/ui/wrtsh/move \ + sw/source/ui/wrtsh/select \ + sw/source/ui/wrtsh/wrtsh1 \ + sw/source/ui/wrtsh/wrtsh2 \ + sw/source/ui/wrtsh/wrtsh3 \ + sw/source/ui/wrtsh/wrtsh4 \ + sw/source/ui/wrtsh/wrtundo \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,sw,\ + dl \ + m \ + pthread \ + sb \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,sw,\ + advapi32 \ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif + +$(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter)) + +$(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\ + $$(INCLUDE) \ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/sdi \ +)) +# vim: set noet sw=4 ts=4: diff --git a/sw/prj/target_lib_swd.mk b/sw/prj/target_lib_swd.mk new file mode 100644 index 000000000000..9d493c0bce98 --- /dev/null +++ b/sw/prj/target_lib_swd.mk @@ -0,0 +1,76 @@ +#************************************************************************* +# +# 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,swd)) + +$(eval $(call gb_Library_set_include,swd,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/sw/sdi \ + -I$(WORKDIR)/inc/sw \ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/inc/pch \ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/filter/inc \ + -I$(SRCDIR)/sw/source/ui/inc \ + -I$(OUTDIR)/inc/sw \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,swd,\ + $$(DEFS) \ + -DACCESSIBLE_LAYOUT \ +)) + +$(eval $(call gb_Library_add_linked_libs,swd,\ + comphelper \ + sfx \ + sot \ + svl \ + svt \ + tl \ + ucbhelper \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,swd,\ + sw/source/filter/basflt/iodetect \ + sw/source/ui/uno/detreg \ + sw/source/ui/uno/swdet2 \ + sw/source/ui/uno/swdetect \ +)) +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,swd,\ + kernel32 \ + msvcrt \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/sw/prj/target_lib_swui.mk b/sw/prj/target_lib_swui.mk new file mode 100644 index 000000000000..815caf5832b4 --- /dev/null +++ b/sw/prj/target_lib_swui.mk @@ -0,0 +1,195 @@ +#************************************************************************* +# +# 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,swui)) + +$(eval $(call gb_Library_set_include,swui,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/sw/sdi \ + -I$(WORKDIR)/inc/sw/ \ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/inc/pch \ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/filter/inc \ + -I$(SRCDIR)/sw/source/ui/inc \ + -I$(OUTDIR)/inc/sw \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,swui,\ + $$(DEFS) \ + -DACCESSIBLE_LAYOUT \ +)) + +$(eval $(call gb_Library_add_linked_libs,swui,\ + comphelper \ + cppu \ + cppuhelper \ + cui \ + i18nisolang1 \ + msfilter \ + sal \ + sfx \ + sot \ + stl \ + svl \ + svt \ + svx \ + svx \ + svxcore \ + sw \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,swui,\ + sw/source/core/undo/SwRewriter \ + sw/source/ui/chrdlg/break \ + sw/source/ui/chrdlg/chardlg \ + sw/source/ui/chrdlg/drpcps \ + sw/source/ui/chrdlg/numpara \ + sw/source/ui/chrdlg/pardlg \ + sw/source/ui/chrdlg/swuiccoll \ + sw/source/ui/chrdlg/tblnumfm \ + sw/source/ui/config/mailconfigpage \ + sw/source/ui/config/optcomp \ + sw/source/ui/config/optload \ + sw/source/ui/config/optpage \ + sw/source/ui/dbui/addresslistdialog \ + sw/source/ui/dbui/createaddresslistdialog \ + sw/source/ui/dbui/customizeaddresslistdialog \ + sw/source/ui/dbui/dbinsdlg \ + sw/source/ui/dbui/dbtablepreviewdialog \ + sw/source/ui/dbui/mailmergewizard \ + sw/source/ui/dbui/mmaddressblockpage \ + sw/source/ui/dbui/mmdocselectpage \ + sw/source/ui/dbui/mmgreetingspage \ + sw/source/ui/dbui/mmlayoutpage \ + sw/source/ui/dbui/mmmergepage \ + sw/source/ui/dbui/mmoutputpage \ + sw/source/ui/dbui/mmoutputtypepage \ + sw/source/ui/dbui/mmpreparemergepage \ + sw/source/ui/dbui/selectdbtabledialog \ + sw/source/ui/dialog/abstract \ + sw/source/ui/dialog/addrdlg \ + sw/source/ui/dialog/ascfldlg \ + sw/source/ui/dialog/docstdlg \ + sw/source/ui/dialog/macassgn \ + sw/source/ui/dialog/swdialmgr \ + sw/source/ui/dialog/swdlgfact \ + sw/source/ui/dialog/swuiexp \ + sw/source/ui/dialog/uiregionsw \ + sw/source/ui/dialog/wordcountdialog \ + sw/source/ui/dochdl/selglos \ + sw/source/ui/envelp/envfmt \ + sw/source/ui/envelp/envlop1 \ + sw/source/ui/envelp/envprt \ + sw/source/ui/envelp/label1 \ + sw/source/ui/envelp/labelexp \ + sw/source/ui/envelp/labfmt \ + sw/source/ui/envelp/labprt \ + sw/source/ui/envelp/mailmrge \ + sw/source/ui/fldui/DropDownFieldDialog \ + sw/source/ui/fldui/FldRefTreeListBox \ + sw/source/ui/fldui/changedb \ + sw/source/ui/fldui/flddb \ + sw/source/ui/fldui/flddinf \ + sw/source/ui/fldui/flddok \ + sw/source/ui/fldui/fldedt \ + sw/source/ui/fldui/fldfunc \ + sw/source/ui/fldui/fldpage \ + sw/source/ui/fldui/fldref \ + sw/source/ui/fldui/fldtdlg \ + sw/source/ui/fldui/fldvar \ + sw/source/ui/fldui/inpdlg \ + sw/source/ui/fldui/javaedit \ + sw/source/ui/fmtui/tmpdlg \ + sw/source/ui/frmdlg/column \ + sw/source/ui/frmdlg/cption \ + sw/source/ui/frmdlg/frmdlg \ + sw/source/ui/frmdlg/frmpage \ + sw/source/ui/frmdlg/pattern \ + sw/source/ui/frmdlg/uiborder \ + sw/source/ui/frmdlg/wrap \ + sw/source/ui/index/cntex \ + sw/source/ui/index/cnttab \ + sw/source/ui/index/multmrk \ + sw/source/ui/index/swuiidxmrk \ + sw/source/ui/misc/bookmark \ + sw/source/ui/misc/docfnote \ + sw/source/ui/misc/glosbib \ + sw/source/ui/misc/glossary \ + sw/source/ui/misc/insfnote \ + sw/source/ui/misc/insrule \ + sw/source/ui/misc/linenum \ + sw/source/ui/misc/num \ + sw/source/ui/misc/outline \ + sw/source/ui/misc/pgfnote \ + sw/source/ui/misc/pggrid \ + sw/source/ui/misc/srtdlg \ + sw/source/ui/misc/swmodalredlineacceptdlg \ + sw/source/ui/table/colwd \ + sw/source/ui/table/convert \ + sw/source/ui/table/instable \ + sw/source/ui/table/mergetbl \ + sw/source/ui/table/rowht \ + sw/source/ui/table/splittbl \ + sw/source/ui/table/tabledlg \ + sw/source/ui/table/tautofmt \ + sw/source/ui/utlui/swrenamexnameddlg \ +)) + +$(WORKDIR)/inc/sw/swuilib.hxx : + $(call gb_Helper_announce,Creating swuilib.hxx ...) + mkdir -p $$(dirname $@) && echo "#define DLL_NAME \"$(notdir $(call gb_Library_get_target,swui))\"" > $@ + +.PHONY : $(WORKDIR)/Clean/inc/sw/swuilib.hxx +$(WORKDIR)/Clean/inc/sw/swuilib.hxx : + $(call gb_Helper_announce,Cleaning up swuilib.hxx ...) + -$(call gb_Helper_abbreviate_dirs,\ + rm -f $(WORKDIR)/inc/sw/swuilib.hxx) + + +$(call gb_CxxObject_get_dep_target,sw/source/ui/dialog/swabstdlg) : $(WORKDIR)/inc/sw/swuilib.hxx +$(call gb_CxxObject_get_target,sw/source/ui/dialog/swabstdlg) : $(WORKDIR)/inc/sw/swuilib.hxx + +$(call gb_Library_get_clean_target,swui) : $(WORKDIR)/Clean/inc/sw/swuilib.hxx + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,swui,\ + advapi32 \ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/sw/prj/target_lib_vbaswobj.mk b/sw/prj/target_lib_vbaswobj.mk new file mode 100644 index 000000000000..8145a5d393d1 --- /dev/null +++ b/sw/prj/target_lib_vbaswobj.mk @@ -0,0 +1,133 @@ +#************************************************************************* +# +# 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,vbaswobj)) + +$(eval $(call gb_Library_set_include,vbaswobj,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/sw/vbaswobj \ + -I$(WORKDIR)/inc/sw/ \ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/inc/pch \ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/filter/inc \ + -I$(SRCDIR)/sw/source/ui/inc \ + -I$(OUTDIR)/inc/sw \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,vbaswobj,\ + $$(DEFS) \ + -DVBA_OOBUILD_HACK \ +)) + +$(eval $(call gb_Library_set_ldflags,vbaswobj,\ + $$(LDFLAGS) \ + -Wl$(COMMA)-O1 \ + -Wl$(COMMA)-z$(COMMA)noexecstack \ +)) + +$(eval $(call gb_Library_add_linked_libs,vbaswobj,\ + comphelper \ + cppu \ + cppuhelper \ + i18nisolang1 \ + sal \ + sfx \ + svl \ + svt \ + svx \ + svxcore \ + sw \ + tk \ + tl \ + utl \ + vbahelper \ + vcl \ + stl \ +)) + +$(eval $(call gb_Library_add_exception_objects,vbaswobj,\ + sw/source/ui/vba/service \ + sw/source/ui/vba/vbadocument \ + sw/source/ui/vba/vbasections \ + sw/source/ui/vba/vbadialog \ + sw/source/ui/vba/vbawrapformat \ + sw/source/ui/vba/vbafont \ + sw/source/ui/vba/vbaheaderfooterhelper \ + sw/source/ui/vba/vbarangehelper \ + sw/source/ui/vba/vbaaddin \ + sw/source/ui/vba/vbaautotextentry \ + sw/source/ui/vba/vbarange \ + sw/source/ui/vba/vbadocumentproperties \ + sw/source/ui/vba/vbastyle \ + sw/source/ui/vba/vbapane \ + sw/source/ui/vba/vbaglobals \ + sw/source/ui/vba/vbatemplate \ + sw/source/ui/vba/vbaaddins \ + sw/source/ui/vba/vbaview \ + sw/source/ui/vba/vbaheaderfooter \ + sw/source/ui/vba/vbabookmarks \ + sw/source/ui/vba/vbaoptions \ + sw/source/ui/vba/vbadialogs \ + sw/source/ui/vba/vbapalette \ + sw/source/ui/vba/vbaparagraph \ + sw/source/ui/vba/vbafind \ + sw/source/ui/vba/vbasection \ + sw/source/ui/vba/vbabookmark \ + sw/source/ui/vba/vbaapplication \ + sw/source/ui/vba/vbawindow \ + sw/source/ui/vba/vbareplacement \ + sw/source/ui/vba/vbatable \ + sw/source/ui/vba/vbaselection \ + sw/source/ui/vba/vbasystem \ + sw/source/ui/vba/vbainformationhelper \ + sw/source/ui/vba/vbapagesetup \ + sw/source/ui/vba/vbafield \ + sw/source/ui/vba/vbatables \ + sw/source/ui/vba/vbavariable \ + sw/source/ui/vba/vbadocuments \ + sw/source/ui/vba/vbaparagraphformat \ + sw/source/ui/vba/vbaborders \ + sw/source/ui/vba/vbavariables \ + sw/source/ui/vba/vbastyles \ + sw/source/ui/vba/vbapanes \ + sw/source/ui/vba/wordvbahelper \ +)) + +$(call gb_Library_get_headers_target,vbaswobj) : $(WORKDIR)/CppuUnpack/vbaswobj +$(call gb_Library_get_clean_target,vbaswobj) : $(WORKDIR)/Clean/CppuUnpack/vbaswobj + +.PHONY : $(WORKDIR)/Clean/CppuUnpack/vbaswobj +$(WORKDIR)/Clean/CppuUnpack/vbaswobj : + -$(call gb_Helper_abbreviate_dirs,\ + rm -rf $(WORKDIR)/inc/sw/vbaswobj $(WORKDIR)/CppuUnpack/vbaswobj) + +$(WORKDIR)/CppuUnpack/vbaswobj : | $(gb_CppuTarget_CPPUMAKERTARGET) + $(call gb_Helper_abbreviate_dirs,\ + $(gb_CppuTarget_CPPUMAKERCOMMAND) -O$(WORKDIR)/inc/sw/vbaswobj -BUCR $(OUTDIR)/bin/oovbaapi.rdb -X$(OUTDIR)/bin/types.rdb && mkdir -p $(dir $@) && touch $@) + diff --git a/sw/prj/target_module_sw.mk b/sw/prj/target_module_sw.mk new file mode 100644 index 000000000000..20e4944877dd --- /dev/null +++ b/sw/prj/target_module_sw.mk @@ -0,0 +1,50 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,sw,\ + $(call gb_AllLangResTarget_get_target,sw) \ + $(call gb_Library_get_target,msword) \ + $(call gb_Library_get_target,sw) \ + $(call gb_Library_get_target,swd) \ + $(call gb_Library_get_target,swui) \ + $(call gb_Library_get_target,vbaswobj) \ + $(call gb_Package_get_target,sw_uiconfig) \ + $(call gb_Package_get_target,sw_xml) \ + $(call gb_Package_get_target,sw_misc) \ +)) + +$(eval $(call gb_Module_read_includes,sw,\ + lib_sw \ + lib_swd \ + lib_swui \ + lib_msword \ + lib_vbaswobj \ + package_misc \ + package_uiconfig \ + package_xml \ + res_sw \ +)) diff --git a/sw/prj/target_package_misc.mk b/sw/prj/target_package_misc.mk new file mode 100644 index 000000000000..bb2e3cd8dc7f --- /dev/null +++ b/sw/prj/target_package_misc.mk @@ -0,0 +1,30 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,sw_misc,$(SRCDIR)/sw/misc)) +# TODO: +#COPY sw/unxlngx6.pro/misc/swslots_sid.hid unxlngx6.pro/bin/hid/swslots_sid.hid diff --git a/sw/prj/target_package_uiconfig.mk b/sw/prj/target_package_uiconfig.mk new file mode 100644 index 000000000000..6ec1b30c0509 --- /dev/null +++ b/sw/prj/target_package_uiconfig.mk @@ -0,0 +1,281 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,sw_uiconfig,$(SRCDIR)/sw/uiconfig)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/accelerator/de/default.xml,sglobal/accelerator/de/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/accelerator/en-US/default.xml,sglobal/accelerator/en-US/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/accelerator/es/default.xml,sglobal/accelerator/es/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/accelerator/fr/default.xml,sglobal/accelerator/fr/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/menubar/menubar.xml,sglobal/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/statusbar/statusbar.xml,sglobal/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/alignmentbar.xml,sglobal/toolbar/alignmentbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/arrowshapes.xml,sglobal/toolbar/arrowshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/basicshapes.xml,sglobal/toolbar/basicshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/bezierobjectbar.xml,sglobal/toolbar/bezierobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/calloutshapes.xml,sglobal/toolbar/calloutshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/colorbar.xml,sglobal/toolbar/colorbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawbar.xml,sglobal/toolbar/drawbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawingobjectbar.xml,sglobal/toolbar/drawingobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawtextobjectbar.xml,sglobal/toolbar/drawtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/extrusionobjectbar.xml,sglobal/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/flowchartshapes.xml,sglobal/toolbar/flowchartshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fontworkobjectbar.xml,sglobal/toolbar/fontworkobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fontworkshapetype.xml,sglobal/toolbar/fontworkshapetype.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formcontrols.xml,sglobal/toolbar/formcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formdesign.xml,sglobal/toolbar/formdesign.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formsfilterbar.xml,sglobal/toolbar/formsfilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formsnavigationbar.xml,sglobal/toolbar/formsnavigationbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formtextobjectbar.xml,sglobal/toolbar/formtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/frameobjectbar.xml,sglobal/toolbar/frameobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fullscreenbar.xml,sglobal/toolbar/fullscreenbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/graffilterbar.xml,sglobal/toolbar/graffilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/graphicobjectbar.xml,sglobal/toolbar/graphicobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/insertbar.xml,sglobal/toolbar/insertbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/insertobjectbar.xml,sglobal/toolbar/insertobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/mediaobjectbar.xml,sglobal/toolbar/mediaobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/moreformcontrols.xml,sglobal/toolbar/moreformcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/numobjectbar.xml,sglobal/toolbar/numobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/oleobjectbar.xml,sglobal/toolbar/oleobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/optimizetablebar.xml,sglobal/toolbar/optimizetablebar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/previewobjectbar.xml,sglobal/toolbar/previewobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/standardbar.xml,sglobal/toolbar/standardbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/starshapes.xml,sglobal/toolbar/starshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/symbolshapes.xml,sglobal/toolbar/symbolshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/tableobjectbar.xml,sglobal/toolbar/tableobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/textobjectbar.xml,sglobal/toolbar/textobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/toolbar.xml,sglobal/toolbar/toolbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/viewerbar.xml,sglobal/toolbar/viewerbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/accelerator/de/default.xml,sweb/accelerator/de/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/accelerator/en-US/default.xml,sweb/accelerator/en-US/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/accelerator/es/default.xml,sweb/accelerator/es/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/accelerator/fr/default.xml,sweb/accelerator/fr/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/menubar/menubar.xml,sweb/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/statusbar/statusbar.xml,sweb/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/arrowshapes.xml,sweb/toolbar/arrowshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/basicshapes.xml,sweb/toolbar/basicshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/bezierobjectbar.xml,sweb/toolbar/bezierobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/calloutshapes.xml,sweb/toolbar/calloutshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/colorbar.xml,sweb/toolbar/colorbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/drawingobjectbar.xml,sweb/toolbar/drawingobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/drawtextobjectbar.xml,sweb/toolbar/drawtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/extrusionobjectbar.xml,sweb/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/flowchartshapes.xml,sweb/toolbar/flowchartshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fontworkobjectbar.xml,sweb/toolbar/fontworkobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fontworkshapetype.xml,sweb/toolbar/fontworkshapetype.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formcontrols.xml,sweb/toolbar/formcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formdesign.xml,sweb/toolbar/formdesign.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formsfilterbar.xml,sweb/toolbar/formsfilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formsnavigationbar.xml,sweb/toolbar/formsnavigationbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formtextobjectbar.xml,sweb/toolbar/formtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/frameobjectbar.xml,sweb/toolbar/frameobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fullscreenbar.xml,sweb/toolbar/fullscreenbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/graffilterbar.xml,sweb/toolbar/graffilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/graphicobjectbar.xml,sweb/toolbar/graphicobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/insertbar.xml,sweb/toolbar/insertbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/mediaobjectbar.xml,sweb/toolbar/mediaobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/numobjectbar.xml,sweb/toolbar/numobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/oleobjectbar.xml,sweb/toolbar/oleobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/optimizetablebar.xml,sweb/toolbar/optimizetablebar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/previewobjectbar.xml,sweb/toolbar/previewobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/standardbar.xml,sweb/toolbar/standardbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/starshapes.xml,sweb/toolbar/starshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/symbolshapes.xml,sweb/toolbar/symbolshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/tableobjectbar.xml,sweb/toolbar/tableobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/textobjectbar.xml,sweb/toolbar/textobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/toolbar.xml,sweb/toolbar/toolbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/viewerbar.xml,sweb/toolbar/viewerbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/accelerator/de/default.xml,swform/accelerator/de/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/accelerator/en-US/default.xml,swform/accelerator/en-US/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/accelerator/es/default.xml,swform/accelerator/es/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/accelerator/fr/default.xml,swform/accelerator/fr/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/menubar/menubar.xml,swform/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/statusbar/statusbar.xml,swform/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/alignmentbar.xml,swform/toolbar/alignmentbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/arrowshapes.xml,swform/toolbar/arrowshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/basicshapes.xml,swform/toolbar/basicshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/bezierobjectbar.xml,swform/toolbar/bezierobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/calloutshapes.xml,swform/toolbar/calloutshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/colorbar.xml,swform/toolbar/colorbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawbar.xml,swform/toolbar/drawbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawingobjectbar.xml,swform/toolbar/drawingobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawtextobjectbar.xml,swform/toolbar/drawtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/extrusionobjectbar.xml,swform/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/flowchartshapes.xml,swform/toolbar/flowchartshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fontworkobjectbar.xml,swform/toolbar/fontworkobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fontworkshapetype.xml,swform/toolbar/fontworkshapetype.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formcontrols.xml,swform/toolbar/formcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formdesign.xml,swform/toolbar/formdesign.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formsfilterbar.xml,swform/toolbar/formsfilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formsnavigationbar.xml,swform/toolbar/formsnavigationbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formtextobjectbar.xml,swform/toolbar/formtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/frameobjectbar.xml,swform/toolbar/frameobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fullscreenbar.xml,swform/toolbar/fullscreenbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/graffilterbar.xml,swform/toolbar/graffilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/graphicobjectbar.xml,swform/toolbar/graphicobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/insertbar.xml,swform/toolbar/insertbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/insertobjectbar.xml,swform/toolbar/insertobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/mediaobjectbar.xml,swform/toolbar/mediaobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/moreformcontrols.xml,swform/toolbar/moreformcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/numobjectbar.xml,swform/toolbar/numobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/oleobjectbar.xml,swform/toolbar/oleobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/optimizetablebar.xml,swform/toolbar/optimizetablebar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/previewobjectbar.xml,swform/toolbar/previewobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/standardbar.xml,swform/toolbar/standardbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/starshapes.xml,swform/toolbar/starshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/symbolshapes.xml,swform/toolbar/symbolshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/tableobjectbar.xml,swform/toolbar/tableobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/textobjectbar.xml,swform/toolbar/textobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/toolbar.xml,swform/toolbar/toolbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/viewerbar.xml,swform/toolbar/viewerbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/accelerator/de/default.xml,swreport/accelerator/de/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/accelerator/en-US/default.xml,swreport/accelerator/en-US/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/accelerator/es/default.xml,swreport/accelerator/es/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/accelerator/fr/default.xml,swreport/accelerator/fr/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/menubar/menubar.xml,swreport/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/statusbar/statusbar.xml,swreport/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/alignmentbar.xml,swreport/toolbar/alignmentbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/arrowshapes.xml,swreport/toolbar/arrowshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/basicshapes.xml,swreport/toolbar/basicshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/bezierobjectbar.xml,swreport/toolbar/bezierobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/calloutshapes.xml,swreport/toolbar/calloutshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/colorbar.xml,swreport/toolbar/colorbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawbar.xml,swreport/toolbar/drawbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawingobjectbar.xml,swreport/toolbar/drawingobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawtextobjectbar.xml,swreport/toolbar/drawtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/extrusionobjectbar.xml,swreport/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/flowchartshapes.xml,swreport/toolbar/flowchartshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fontworkobjectbar.xml,swreport/toolbar/fontworkobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fontworkshapetype.xml,swreport/toolbar/fontworkshapetype.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formcontrols.xml,swreport/toolbar/formcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formdesign.xml,swreport/toolbar/formdesign.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formsfilterbar.xml,swreport/toolbar/formsfilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formsnavigationbar.xml,swreport/toolbar/formsnavigationbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formtextobjectbar.xml,swreport/toolbar/formtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/frameobjectbar.xml,swreport/toolbar/frameobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fullscreenbar.xml,swreport/toolbar/fullscreenbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/graffilterbar.xml,swreport/toolbar/graffilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/graphicobjectbar.xml,swreport/toolbar/graphicobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/insertbar.xml,swreport/toolbar/insertbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/insertobjectbar.xml,swreport/toolbar/insertobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/mediaobjectbar.xml,swreport/toolbar/mediaobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/moreformcontrols.xml,swreport/toolbar/moreformcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/numobjectbar.xml,swreport/toolbar/numobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/oleobjectbar.xml,swreport/toolbar/oleobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/optimizetablebar.xml,swreport/toolbar/optimizetablebar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/previewobjectbar.xml,swreport/toolbar/previewobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/standardbar.xml,swreport/toolbar/standardbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/starshapes.xml,swreport/toolbar/starshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/symbolshapes.xml,swreport/toolbar/symbolshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/tableobjectbar.xml,swreport/toolbar/tableobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/textobjectbar.xml,swreport/toolbar/textobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/toolbar.xml,swreport/toolbar/toolbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/viewerbar.xml,swreport/toolbar/viewerbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/accelerator/de/default.xml,swriter/accelerator/de/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/accelerator/en-US/default.xml,swriter/accelerator/en-US/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/accelerator/es/default.xml,swriter/accelerator/es/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/accelerator/fr/default.xml,swriter/accelerator/fr/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/menubar/menubar.xml,swriter/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/statusbar/statusbar.xml,swriter/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/alignmentbar.xml,swriter/toolbar/alignmentbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/arrowshapes.xml,swriter/toolbar/arrowshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/basicshapes.xml,swriter/toolbar/basicshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/bezierobjectbar.xml,swriter/toolbar/bezierobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/calloutshapes.xml,swriter/toolbar/calloutshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/colorbar.xml,swriter/toolbar/colorbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawbar.xml,swriter/toolbar/drawbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawingobjectbar.xml,swriter/toolbar/drawingobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawtextobjectbar.xml,swriter/toolbar/drawtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/extrusionobjectbar.xml,swriter/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/flowchartshapes.xml,swriter/toolbar/flowchartshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkobjectbar.xml,swriter/toolbar/fontworkobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkshapetype.xml,swriter/toolbar/fontworkshapetype.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formcontrols.xml,swriter/toolbar/formcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formdesign.xml,swriter/toolbar/formdesign.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formsfilterbar.xml,swriter/toolbar/formsfilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formsnavigationbar.xml,swriter/toolbar/formsnavigationbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formtextobjectbar.xml,swriter/toolbar/formtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/frameobjectbar.xml,swriter/toolbar/frameobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fullscreenbar.xml,swriter/toolbar/fullscreenbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/graffilterbar.xml,swriter/toolbar/graffilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/graphicobjectbar.xml,swriter/toolbar/graphicobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/insertbar.xml,swriter/toolbar/insertbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/mediaobjectbar.xml,swriter/toolbar/mediaobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/moreformcontrols.xml,swriter/toolbar/moreformcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/numobjectbar.xml,swriter/toolbar/numobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/oleobjectbar.xml,swriter/toolbar/oleobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/optimizetablebar.xml,swriter/toolbar/optimizetablebar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/previewobjectbar.xml,swriter/toolbar/previewobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/standardbar.xml,swriter/toolbar/standardbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/starshapes.xml,swriter/toolbar/starshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/symbolshapes.xml,swriter/toolbar/symbolshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/tableobjectbar.xml,swriter/toolbar/tableobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/textobjectbar.xml,swriter/toolbar/textobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/toolbar.xml,swriter/toolbar/toolbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/viewerbar.xml,swriter/toolbar/viewerbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/accelerator/de/default.xml,swxform/accelerator/de/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/accelerator/en-US/default.xml,swxform/accelerator/en-US/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/accelerator/es/default.xml,swxform/accelerator/es/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/accelerator/fr/default.xml,swxform/accelerator/fr/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/menubar/menubar.xml,swxform/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/statusbar/statusbar.xml,swxform/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/alignmentbar.xml,swxform/toolbar/alignmentbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/arrowshapes.xml,swxform/toolbar/arrowshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/basicshapes.xml,swxform/toolbar/basicshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/bezierobjectbar.xml,swxform/toolbar/bezierobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/calloutshapes.xml,swxform/toolbar/calloutshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/colorbar.xml,swxform/toolbar/colorbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawbar.xml,swxform/toolbar/drawbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawingobjectbar.xml,swxform/toolbar/drawingobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawtextobjectbar.xml,swxform/toolbar/drawtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/extrusionobjectbar.xml,swxform/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/flowchartshapes.xml,swxform/toolbar/flowchartshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fontworkobjectbar.xml,swxform/toolbar/fontworkobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fontworkshapetype.xml,swxform/toolbar/fontworkshapetype.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formcontrols.xml,swxform/toolbar/formcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formdesign.xml,swxform/toolbar/formdesign.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formsfilterbar.xml,swxform/toolbar/formsfilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formsnavigationbar.xml,swxform/toolbar/formsnavigationbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formtextobjectbar.xml,swxform/toolbar/formtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/frameobjectbar.xml,swxform/toolbar/frameobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fullscreenbar.xml,swxform/toolbar/fullscreenbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/graffilterbar.xml,swxform/toolbar/graffilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/graphicobjectbar.xml,swxform/toolbar/graphicobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/insertbar.xml,swxform/toolbar/insertbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/insertobjectbar.xml,swxform/toolbar/insertobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/mediaobjectbar.xml,swxform/toolbar/mediaobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/moreformcontrols.xml,swxform/toolbar/moreformcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/numobjectbar.xml,swxform/toolbar/numobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/oleobjectbar.xml,swxform/toolbar/oleobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/optimizetablebar.xml,swxform/toolbar/optimizetablebar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/previewobjectbar.xml,swxform/toolbar/previewobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/standardbar.xml,swxform/toolbar/standardbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/starshapes.xml,swxform/toolbar/starshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/symbolshapes.xml,swxform/toolbar/symbolshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/tableobjectbar.xml,swxform/toolbar/tableobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/textobjectbar.xml,swxform/toolbar/textobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/toolbar.xml,swxform/toolbar/toolbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/viewerbar.xml,swxform/toolbar/viewerbar.xml)) diff --git a/sw/prj/target_package_xml.mk b/sw/prj/target_package_xml.mk new file mode 100644 index 000000000000..7eb3f1cb1f3f --- /dev/null +++ b/sw/prj/target_package_xml.mk @@ -0,0 +1,29 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,sw_xml,$(SRCDIR)/sw/xml)) +$(eval $(call gb_Package_add_file,sw_xml,xml/writer.xml,writer.xml)) diff --git a/sw/prj/target_res_sw.mk b/sw/prj/target_res_sw.mk new file mode 100644 index 000000000000..ba552333d2fa --- /dev/null +++ b/sw/prj/target_res_sw.mk @@ -0,0 +1,184 @@ +#************************************************************************* +# +# 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_AllLangResTarget_AllLangResTarget,sw)) + +$(eval $(call gb_AllLangResTarget_add_srs,sw,\ + sw/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,sw/res)) + +$(eval $(call gb_SrsTarget_set_include,sw/res,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(WORKDIR)/inc/sw \ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/source/core/undo \ + -I$(SRCDIR)/sw/source/core/unocore \ + -I$(SRCDIR)/sw/source/ui/chrdlg \ + -I$(SRCDIR)/sw/source/ui/config \ + -I$(SRCDIR)/sw/source/ui/dbui \ + -I$(SRCDIR)/sw/source/ui/dialog \ + -I$(SRCDIR)/sw/source/ui/docvw \ + -I$(SRCDIR)/sw/source/ui/envelp \ + -I$(SRCDIR)/sw/source/ui/fldui \ + -I$(SRCDIR)/sw/source/ui/fmtui \ + -I$(SRCDIR)/sw/source/ui/frmdlg \ + -I$(SRCDIR)/sw/source/ui/globdoc \ + -I$(SRCDIR)/sw/source/ui/inc \ + -I$(SRCDIR)/sw/source/ui/index \ + -I$(SRCDIR)/sw/source/ui/lingu \ + -I$(SRCDIR)/sw/source/ui/misc \ + -I$(SRCDIR)/sw/source/ui/ribbar \ + -I$(SRCDIR)/sw/source/ui/shells \ + -I$(SRCDIR)/sw/source/ui/smartmenu \ + -I$(SRCDIR)/sw/source/ui/table \ + -I$(SRCDIR)/sw/source/ui/uiview \ + -I$(SRCDIR)/sw/source/ui/utlui \ + -I$(SRCDIR)/sw/source/ui/web \ + -I$(SRCDIR)/sw/source/ui/wrtsh \ +)) + +$(eval $(call gb_SrsTarget_add_files,sw/res,\ + sw/source/ui/app/app.src \ + sw/source/ui/app/mn.src \ + sw/source/ui/app/error.src \ + sw/source/ui/dialog/abstract.src \ + sw/source/ui/dialog/ascfldlg.src \ + sw/source/ui/dialog/dialog.src \ + sw/source/ui/dialog/docstdlg.src \ + sw/source/ui/dialog/regionsw.src \ + sw/source/ui/dialog/wordcountdialog.src \ + sw/source/ui/chrdlg/chrdlg.src \ + sw/source/ui/chrdlg/ccoll.src \ + sw/source/ui/chrdlg/drpcps.src \ + sw/source/ui/chrdlg/swbreak.src \ + sw/source/ui/chrdlg/paradlg.src \ + sw/source/ui/chrdlg/numpara.src \ + sw/source/ui/chrdlg/chardlg.src \ + sw/source/ui/config/optcomp.src \ + sw/source/ui/config/optload.src \ + sw/source/ui/config/mailconfigpage.src \ + sw/source/ui/config/redlopt.src \ + sw/source/ui/config/optdlg.src \ + sw/source/ui/dbui/mmpreparemergepage.src \ + sw/source/ui/dbui/mmgreetingspage.src \ + sw/source/ui/dbui/mmmergepage.src \ + sw/source/ui/dbui/mmoutputtypepage.src \ + sw/source/ui/dbui/mmlayoutpage.src \ + sw/source/ui/dbui/mmaddressblockpage.src \ + sw/source/ui/dbui/createaddresslistdialog.src \ + sw/source/ui/dbui/dbtablepreviewdialog.src \ + sw/source/ui/dbui/mmdocselectpage.src \ + sw/source/ui/dbui/customizeaddresslistdialog.src \ + sw/source/ui/dbui/mailmergechildwindow.src \ + sw/source/ui/dbui/mailmergewizard.src \ + sw/source/ui/dbui/dbinsdlg.src \ + sw/source/ui/dbui/selectdbtabledialog.src \ + sw/source/ui/dbui/mmoutputpage.src \ + sw/source/ui/dbui/dbui.src \ + sw/source/ui/dbui/addresslistdialog.src \ + sw/source/ui/dochdl/selglos.src \ + sw/source/ui/dochdl/dochdl.src \ + sw/source/ui/docvw/access.src \ + sw/source/ui/docvw/docvw.src \ + sw/source/ui/envelp/mailmrge.src \ + sw/source/ui/envelp/labprt.src \ + sw/source/ui/envelp/label.src \ + sw/source/ui/envelp/envfmt.src \ + sw/source/ui/envelp/labfmt.src \ + sw/source/ui/envelp/envelp.src \ + sw/source/ui/envelp/envprt.src \ + sw/source/ui/envelp/envlop.src \ + sw/source/ui/fldui/flddok.src \ + sw/source/ui/fldui/changedb.src \ + sw/source/ui/fldui/DropDownFieldDialog.src \ + sw/source/ui/fldui/flddinf.src \ + sw/source/ui/fldui/fldref.src \ + sw/source/ui/fldui/fldtdlg.src \ + sw/source/ui/fldui/fldui.src \ + sw/source/ui/fldui/javaedit.src \ + sw/source/ui/fldui/fldfunc.src \ + sw/source/ui/fldui/inpdlg.src \ + sw/source/ui/fldui/fldvar.src \ + sw/source/ui/fldui/flddb.src \ + sw/source/ui/fmtui/tmpdlg.src \ + sw/source/ui/frmdlg/frmui.src \ + sw/source/ui/frmdlg/cption.src \ + sw/source/ui/frmdlg/column.src \ + sw/source/ui/frmdlg/frmpage.src \ + sw/source/ui/globdoc/globdoc.src \ + sw/source/ui/index/idxmrk.src \ + sw/source/ui/index/cnttab.src \ + sw/source/ui/index/multmrk.src \ + sw/source/ui/lingu/olmenu.src \ + sw/source/ui/misc/docfnote.src \ + sw/source/ui/misc/pgfnote.src \ + sw/source/ui/misc/insfnote.src \ + sw/source/ui/misc/srtdlg.src \ + sw/source/ui/misc/bookmark.src \ + sw/source/ui/misc/glosbib.src \ + sw/source/ui/misc/num.src \ + sw/source/ui/misc/glossary.src \ + sw/source/ui/misc/pggrid.src \ + sw/source/ui/misc/outline.src \ + sw/source/ui/misc/linenum.src \ + sw/source/ui/misc/numberingtypelistbox.src \ + sw/source/ui/misc/redlndlg.src \ + sw/source/ui/misc/insrule.src \ + sw/source/ui/misc/autocorr.src \ + sw/source/ui/ribbar/tbxanchr.src \ + sw/source/ui/ribbar/tblctrl.src \ + sw/source/ui/ribbar/workctrl.src \ + sw/source/ui/ribbar/inputwin.src \ + sw/source/ui/shells/shells.src \ + sw/source/ui/smartmenu/stmenu.src \ + sw/source/ui/table/colwd.src \ + sw/source/ui/table/tautofmt.src \ + sw/source/ui/table/table.src \ + sw/source/ui/table/chartins.src \ + sw/source/ui/table/splittbl.src \ + sw/source/ui/table/rowht.src \ + sw/source/ui/table/instable.src \ + sw/source/ui/table/convert.src \ + sw/source/ui/table/tabledlg.src \ + sw/source/ui/table/mergetbl.src \ + sw/source/ui/uiview/pview.src \ + sw/source/ui/uiview/view.src \ + sw/source/core/undo/undo.src \ + sw/source/core/unocore/unocore.src \ + sw/source/ui/utlui/navipi.src \ + sw/source/ui/utlui/attrdesc.src \ + sw/source/ui/utlui/poolfmt.src \ + sw/source/ui/utlui/initui.src \ + sw/source/ui/utlui/unotools.src \ + sw/source/ui/utlui/utlui.src \ + sw/source/ui/utlui/gloslst.src \ + sw/source/ui/web/web.src \ + sw/source/ui/wrtsh/wrtsh.src \ +)) diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src index 2cf91da28ba3..43b3906001a7 100644 --- a/sw/source/core/undo/undo.src +++ b/sw/source/core/undo/undo.src @@ -397,7 +397,7 @@ String STR_UNDO_SETRUBYATTR { Text [ en-US ] = "Ruby Setting"; }; -#102505# +// #102505# String STR_UNDO_TMPAUTOCORR { Text [ en-US ] = "AutoCorrect" ; diff --git a/sw/source/ui/fmtui/fmtui.src b/sw/source/ui/fmtui/fmtui.src deleted file mode 100644 index 841a378dd9b4..000000000000 --- a/sw/source/ui/fmtui/fmtui.src +++ /dev/null @@ -1,91 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: fmtui.src,v $ - * $Revision: 1.12 $ - * - * 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. - * - ************************************************************************/ -#include "fmtui.hrc" -#include "globals.hrc" - -String STR_FMT_STD -{ - Text [ en-US ] = "(none)" ; -}; -String STR_TEMPLATE_WILDCARD -{ - TEXT = "*.vor" ; -}; - //String STR_NONAME //!! VB - //{ - // TEXT = "Unbenannt "; - // TEXT [English] = "Noname "; - // TEXT [norwegian] = "Noname "; - // TEXT [italian] = "Senza nome"; - // TEXT [portuguese_brazilian] = "Semnome "; - // TEXT [portuguese] = "Semnome "; - // TEXT [finnish] = "Nimetön "; - // TEXT [danish] = "Intet navn"; - // TEXT [french] = "Sansnom "; - // TEXT [swedish] = "Namnlös"; - // TEXT [dutch] = "Naamloos"; - // TEXT [spanish] = "Sin nombre "; - // TEXT [english_us] = "Noname "; - //}; -String STR_OVERWRITE -{ - /* ### ACHTUNG: Neuer Text in Resource? Wollen Sie die Vorlage wirklich überschreiben? : Wollen Sie die Vorlage wirklich ³berschreiben? */ - Text [ en-US ] = "\nAre you sure you want to delete this template?" ; -}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sw/source/ui/inc/swmn.hrc b/sw/source/ui/inc/swmn.hrc new file mode 100644 index 000000000000..6a5fb48bf655 --- /dev/null +++ b/sw/source/ui/inc/swmn.hrc @@ -0,0 +1,386 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: swmn_tmpl.hrc,v $ + * $Revision: 1.15.210.1 $ + * + * 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 _SWMN_HRC +#define _SWMN_HRC + +#include +#include +#include "cmdid.h" +#include "app.hrc" +#include "globals.hrc" +#include "helpid.h" +#include "popup.hrc" +//#include "cfgid.h" + +/* --------------------- F O R M A T --------------------------------- */ + +#define SEPARATOR MenuItem { Separator = TRUE; } + +//define for ITEM_FORMAT_NUMBERING +#define DEFINE_SLOTID_FOR_NUMBER_BULLETS FN_NUMBER_BULLETS +#define MN_NUMBERING ITEM_FORMAT_NUMBERING + +#define MN_TXT\ + MenuItem\ + {\ + ITEM_FORMAT_CHAR_DLG\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_PARA_DLG\ + };\ + MenuItem\ + {\ + Identifier = FN_FORMAT_PAGE_DLG ; \ + HelpID = FN_FORMAT_PAGE_DLG ; \ + Text [ en-US ] = "Pa~ge..." ; \ + }; + + +#define MN_TEXT_ATTR\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_FONT\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT\ + };\ + MenuItem\ + {\ + Identifier = MN_FORMAT_STYLE ; \ + HelpID = MN_FORMAT_STYLE ; \ + Command = ".uno:StyleMenu" ; \ + Text [ en-US ] = "St~yle" ; \ + SubMenu = Menu\ + {\ + ItemList = \ + {\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_WEIGHT\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_POSTURE\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_OVERLINE\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_UNDERLINE\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_STRIKEOUT\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_SHADOWED\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_CONTOUR\ + };\ + SEPARATOR ; \ + MenuItem\ + {\ + Identifier = FN_SET_SUPER_SCRIPT ; \ + HelpID = FN_SET_SUPER_SCRIPT ; \ + Text [ en-US ] = "Superscript" ; \ + };\ + MenuItem\ + {\ + Identifier = FN_SET_SUB_SCRIPT ; \ + HelpID = FN_SET_SUB_SCRIPT ; \ + Text [ en-US ] = "Subscript" ; \ + };\ + };\ + };\ + };\ + MenuItem\ + {\ + Identifier = MN_FORMAT_ALGN ; \ + HelpID = MN_FORMAT_ALGN ; \ + Command = ".uno:AlignTextMenu" ; \ + Text [ en-US ] = "A~lignment" ; \ + RadioCheck = TRUE ; \ + SubMenu = Menu\ + {\ + ItemList = \ + {\ + MenuItem\ + {\ + RadioCheck = TRUE ; \ + ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT\ + };\ + MenuItem\ + {\ + RadioCheck = TRUE ; \ + ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT\ + };\ + MenuItem\ + {\ + RadioCheck = TRUE ; \ + ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER\ + };\ + MenuItem\ + {\ + Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ + HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ + RadioCheck = TRUE ; \ + Text [ en-US ] = "Justified" ; \ + };\ + };\ + };\ + };\ + MenuItem\ + {\ + Identifier = MN_FORMAT_LINESPACE ; \ + HelpID = MN_FORMAT_LINESPACE ; \ + Command = ".uno:LineSpacingMenu" ; \ + Text [ en-US ] = "Line Spacing" ; \ + _MenuItemFlags = MIB_RADIOCHECK ; \ + SubMenu = Menu\ + {\ + ItemList = \ + {\ + MenuItem\ + {\ + RadioCheck = TRUE ; \ + ITEM_FORMAT_PARA_LINESPACE_10\ + };\ + MenuItem\ + {\ + RadioCheck = TRUE ; \ + ITEM_FORMAT_PARA_LINESPACE_15\ + };\ + MenuItem\ + {\ + RadioCheck = TRUE ; \ + ITEM_FORMAT_PARA_LINESPACE_20\ + };\ + };\ + };\ + }; + +/* --------------------- M E N U --------------------------------- */ + +/* + + +The application menu bar resource has become obsolete. You can now find the menu bar at the following +location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml + + +*/ + +/* --------------------- D O C U M E N T -------------------------- */ + + +#define _MN_EDIT_FIELD \ + MenuItem \ + { \ + Identifier = FN_EDIT_FIELD ; \ + HelpID = FN_EDIT_FIELD ; \ + Text [ en-US ] = "Fields..." ; \ + }; +#define _MN_EDIT_FOOTNOTE \ + MenuItem \ + { \ + Identifier = FN_EDIT_FOOTNOTE ; \ + HelpID = FN_EDIT_FOOTNOTE ; \ + Text [ en-US ] = "Footnote/Endnote~..." ; \ + }; + #define _MN_EDIT_IDX_ENTRY_DLG \ + MenuItem \ + { \ + Identifier = FN_EDIT_IDX_ENTRY_DLG ; \ + HelpID = FN_EDIT_IDX_ENTRY_DLG ; \ + Text [ en-US ] = "Inde~x Entry..." ; \ + }; + +#define _MN_EDIT_REDLINE \ + MenuItem \ + { \ + Identifier = FN_REDLINE_ACCEPT_DIRECT; \ + HelpID = FN_REDLINE_ACCEPT_DIRECT ; \ + Text [ en-US ] = "Accept Change" ; \ + };\ + MenuItem \ + { \ + Identifier = FN_REDLINE_REJECT_DIRECT ; \ + HelpID = FN_REDLINE_REJECT_DIRECT ; \ + Text [ en-US ] = "Reject Change" ; \ + }; \ + SEPARATOR ; +#define _MN_EDIT_BIB_ENTRY_DLG \ + MenuItem \ + { \ + Identifier = FN_EDIT_AUTH_ENTRY_DLG ; \ + HelpID = FN_EDIT_AUTH_ENTRY_DLG ; \ + Text [ en-US ] = "~Bibliography Entry..."; \ + }; \ + SEPARATOR ; + +#define _MN_EDIT_OPEN_HYPERLINK \ + MenuItem \ + { \ + ITEM_OPEN_HYPERLINK \ + };\ + MenuItem \ + { \ + Identifier = FN_EDIT_HYPERLINK ; \ + HelpID = FN_EDIT_HYPERLINK ; \ + Text [ en-US ] = "Edit Hyperlink..."; \ + }; \ + MenuItem \ + { \ + Identifier = FN_COPY_HYPERLINK_LOCATION; \ + HelpID = FN_COPY_HYPERLINK_LOCATION; \ + Text [ en-US ] = "Copy Hyperlink ~Location"; \ + }; \ + MenuItem \ + { \ + Identifier = FN_REMOVE_HYPERLINK ; \ + HelpID = FN_REMOVE_HYPERLINK ; \ + Text [ en-US ] = "Remo~ve Hyperlink"; \ + }; + +#define _MN_EDIT_OPEN_SMARTTAGMENU \ + MenuItem \ + { \ + ITEM_OPEN_SMARTTAGMENU \ + }; + +#define _MN_EDIT__HYPERLINK \ + MenuItem\ + {\ + Identifier = FN_EDIT_HYPERLINK ; \ + HelpID = FN_EDIT_HYPERLINK ; \ + Text [ en-US ] = "~Edit Hyperlink" ; \ + }; + +#define _DEFAULT_TEXT_EDIT_ELEMENTS \ + _MN_EDIT_FIELD \ + _MN_EDIT_FOOTNOTE \ + _MN_EDIT_IDX_ENTRY_DLG \ + _MN_EDIT_BIB_ENTRY_DLG \ + _MN_EDIT_REDLINE \ + MenuItem \ + { \ + ITEM_POPUP_TEMPLATE_EDIT \ + }; \ + SEPARATOR ; \ + _MN_EDIT_OPEN_HYPERLINK \ + _MN_EDIT_OPEN_SMARTTAGMENU + + +#define MN_RESET\ + MenuItem\ + {\ + Identifier = FN_FORMAT_RESET ; \ + HelpID = FN_FORMAT_RESET ; \ + Text [ en-US ] = "~Default Formatting" ; \ + }; + +#define _NUMBERING_RELATED_MENU \ + SEPARATOR ; \ + MenuItem \ + { \ + Identifier = FN_NUMBER_NEWSTART; \ + HelpId = FN_NUMBER_NEWSTART; \ + Text[ en-US ] = "Restart Numbering"; \ + }; \ + MenuItem \ + { \ + Identifier = FN_NUM_CONTINUE; \ + HelpId = FN_NUM_CONTINUE; \ + Text[ en-US ] = "Continue previous numbering"; \ + }; \ + MenuItem \ + { \ + Identifier = FN_NUM_BULLET_UP; \ + HelpId = FN_NUM_BULLET_UP; \ + Text[ en-US ] = "Up One Level"; \ + }; \ + MenuItem \ + { \ + Identifier = FN_NUM_BULLET_DOWN; \ + HelpId = FN_NUM_BULLET_DOWN; \ + Text[ en-US ] = "Down One Level"; \ + }; + +#define BASE_TEXT_POPUPMENU_BEGIN \ +{ \ + ItemList = \ + { \ + MN_RESET \ + _NUMBERING_RELATED_MENU \ + SEPARATOR ; \ + MN_TEXT_ATTR \ + SEPARATOR ; \ + MN_TXT \ + MN_NUMBERING \ + ITEM_TRANSLITERATE_MENU \ + SEPARATOR ; + +// not in Writer/Web +#define BASE_TEXT_POPUPMENU_NOWEB \ + MenuItem \ + { \ + Identifier = FN_UPDATE_CUR_TOX ; \ + HelpID = FN_UPDATE_CUR_TOX ; \ + Text [ en-US ] = "~Update Index/Table"; \ + }; \ + MenuItem \ + { \ + Identifier = FN_EDIT_CURRENT_TOX; \ + HelpID = FN_EDIT_CURRENT_TOX; \ + Text [ en-US ] = "~Edit Index/Table"; \ + }; \ + MenuItem \ + { \ + Identifier = FN_REMOVE_CUR_TOX; \ + HelpID = FN_REMOVE_CUR_TOX; \ + Text [ en-US ] = "Delete Index/Table"; \ + }; \ + SEPARATOR ; + +#define BASE_TEXT_POPUPMENU_END \ + _DEFAULT_TEXT_EDIT_ELEMENTS \ + }; \ +}; + +#endif + diff --git a/sw/source/ui/inc/swmn_tmpl.hrc b/sw/source/ui/inc/swmn_tmpl.hrc deleted file mode 100644 index 6a5fb48bf655..000000000000 --- a/sw/source/ui/inc/swmn_tmpl.hrc +++ /dev/null @@ -1,386 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: swmn_tmpl.hrc,v $ - * $Revision: 1.15.210.1 $ - * - * 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 _SWMN_HRC -#define _SWMN_HRC - -#include -#include -#include "cmdid.h" -#include "app.hrc" -#include "globals.hrc" -#include "helpid.h" -#include "popup.hrc" -//#include "cfgid.h" - -/* --------------------- F O R M A T --------------------------------- */ - -#define SEPARATOR MenuItem { Separator = TRUE; } - -//define for ITEM_FORMAT_NUMBERING -#define DEFINE_SLOTID_FOR_NUMBER_BULLETS FN_NUMBER_BULLETS -#define MN_NUMBERING ITEM_FORMAT_NUMBERING - -#define MN_TXT\ - MenuItem\ - {\ - ITEM_FORMAT_CHAR_DLG\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_PARA_DLG\ - };\ - MenuItem\ - {\ - Identifier = FN_FORMAT_PAGE_DLG ; \ - HelpID = FN_FORMAT_PAGE_DLG ; \ - Text [ en-US ] = "Pa~ge..." ; \ - }; - - -#define MN_TEXT_ATTR\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_FONT\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT\ - };\ - MenuItem\ - {\ - Identifier = MN_FORMAT_STYLE ; \ - HelpID = MN_FORMAT_STYLE ; \ - Command = ".uno:StyleMenu" ; \ - Text [ en-US ] = "St~yle" ; \ - SubMenu = Menu\ - {\ - ItemList = \ - {\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_WEIGHT\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_POSTURE\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_OVERLINE\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_UNDERLINE\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_STRIKEOUT\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_SHADOWED\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_CONTOUR\ - };\ - SEPARATOR ; \ - MenuItem\ - {\ - Identifier = FN_SET_SUPER_SCRIPT ; \ - HelpID = FN_SET_SUPER_SCRIPT ; \ - Text [ en-US ] = "Superscript" ; \ - };\ - MenuItem\ - {\ - Identifier = FN_SET_SUB_SCRIPT ; \ - HelpID = FN_SET_SUB_SCRIPT ; \ - Text [ en-US ] = "Subscript" ; \ - };\ - };\ - };\ - };\ - MenuItem\ - {\ - Identifier = MN_FORMAT_ALGN ; \ - HelpID = MN_FORMAT_ALGN ; \ - Command = ".uno:AlignTextMenu" ; \ - Text [ en-US ] = "A~lignment" ; \ - RadioCheck = TRUE ; \ - SubMenu = Menu\ - {\ - ItemList = \ - {\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT\ - };\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT\ - };\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER\ - };\ - MenuItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ - RadioCheck = TRUE ; \ - Text [ en-US ] = "Justified" ; \ - };\ - };\ - };\ - };\ - MenuItem\ - {\ - Identifier = MN_FORMAT_LINESPACE ; \ - HelpID = MN_FORMAT_LINESPACE ; \ - Command = ".uno:LineSpacingMenu" ; \ - Text [ en-US ] = "Line Spacing" ; \ - _MenuItemFlags = MIB_RADIOCHECK ; \ - SubMenu = Menu\ - {\ - ItemList = \ - {\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_PARA_LINESPACE_10\ - };\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_PARA_LINESPACE_15\ - };\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_PARA_LINESPACE_20\ - };\ - };\ - };\ - }; - -/* --------------------- M E N U --------------------------------- */ - -/* - - -The application menu bar resource has become obsolete. You can now find the menu bar at the following -location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml - - -*/ - -/* --------------------- D O C U M E N T -------------------------- */ - - -#define _MN_EDIT_FIELD \ - MenuItem \ - { \ - Identifier = FN_EDIT_FIELD ; \ - HelpID = FN_EDIT_FIELD ; \ - Text [ en-US ] = "Fields..." ; \ - }; -#define _MN_EDIT_FOOTNOTE \ - MenuItem \ - { \ - Identifier = FN_EDIT_FOOTNOTE ; \ - HelpID = FN_EDIT_FOOTNOTE ; \ - Text [ en-US ] = "Footnote/Endnote~..." ; \ - }; - #define _MN_EDIT_IDX_ENTRY_DLG \ - MenuItem \ - { \ - Identifier = FN_EDIT_IDX_ENTRY_DLG ; \ - HelpID = FN_EDIT_IDX_ENTRY_DLG ; \ - Text [ en-US ] = "Inde~x Entry..." ; \ - }; - -#define _MN_EDIT_REDLINE \ - MenuItem \ - { \ - Identifier = FN_REDLINE_ACCEPT_DIRECT; \ - HelpID = FN_REDLINE_ACCEPT_DIRECT ; \ - Text [ en-US ] = "Accept Change" ; \ - };\ - MenuItem \ - { \ - Identifier = FN_REDLINE_REJECT_DIRECT ; \ - HelpID = FN_REDLINE_REJECT_DIRECT ; \ - Text [ en-US ] = "Reject Change" ; \ - }; \ - SEPARATOR ; -#define _MN_EDIT_BIB_ENTRY_DLG \ - MenuItem \ - { \ - Identifier = FN_EDIT_AUTH_ENTRY_DLG ; \ - HelpID = FN_EDIT_AUTH_ENTRY_DLG ; \ - Text [ en-US ] = "~Bibliography Entry..."; \ - }; \ - SEPARATOR ; - -#define _MN_EDIT_OPEN_HYPERLINK \ - MenuItem \ - { \ - ITEM_OPEN_HYPERLINK \ - };\ - MenuItem \ - { \ - Identifier = FN_EDIT_HYPERLINK ; \ - HelpID = FN_EDIT_HYPERLINK ; \ - Text [ en-US ] = "Edit Hyperlink..."; \ - }; \ - MenuItem \ - { \ - Identifier = FN_COPY_HYPERLINK_LOCATION; \ - HelpID = FN_COPY_HYPERLINK_LOCATION; \ - Text [ en-US ] = "Copy Hyperlink ~Location"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_REMOVE_HYPERLINK ; \ - HelpID = FN_REMOVE_HYPERLINK ; \ - Text [ en-US ] = "Remo~ve Hyperlink"; \ - }; - -#define _MN_EDIT_OPEN_SMARTTAGMENU \ - MenuItem \ - { \ - ITEM_OPEN_SMARTTAGMENU \ - }; - -#define _MN_EDIT__HYPERLINK \ - MenuItem\ - {\ - Identifier = FN_EDIT_HYPERLINK ; \ - HelpID = FN_EDIT_HYPERLINK ; \ - Text [ en-US ] = "~Edit Hyperlink" ; \ - }; - -#define _DEFAULT_TEXT_EDIT_ELEMENTS \ - _MN_EDIT_FIELD \ - _MN_EDIT_FOOTNOTE \ - _MN_EDIT_IDX_ENTRY_DLG \ - _MN_EDIT_BIB_ENTRY_DLG \ - _MN_EDIT_REDLINE \ - MenuItem \ - { \ - ITEM_POPUP_TEMPLATE_EDIT \ - }; \ - SEPARATOR ; \ - _MN_EDIT_OPEN_HYPERLINK \ - _MN_EDIT_OPEN_SMARTTAGMENU - - -#define MN_RESET\ - MenuItem\ - {\ - Identifier = FN_FORMAT_RESET ; \ - HelpID = FN_FORMAT_RESET ; \ - Text [ en-US ] = "~Default Formatting" ; \ - }; - -#define _NUMBERING_RELATED_MENU \ - SEPARATOR ; \ - MenuItem \ - { \ - Identifier = FN_NUMBER_NEWSTART; \ - HelpId = FN_NUMBER_NEWSTART; \ - Text[ en-US ] = "Restart Numbering"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_NUM_CONTINUE; \ - HelpId = FN_NUM_CONTINUE; \ - Text[ en-US ] = "Continue previous numbering"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_NUM_BULLET_UP; \ - HelpId = FN_NUM_BULLET_UP; \ - Text[ en-US ] = "Up One Level"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_NUM_BULLET_DOWN; \ - HelpId = FN_NUM_BULLET_DOWN; \ - Text[ en-US ] = "Down One Level"; \ - }; - -#define BASE_TEXT_POPUPMENU_BEGIN \ -{ \ - ItemList = \ - { \ - MN_RESET \ - _NUMBERING_RELATED_MENU \ - SEPARATOR ; \ - MN_TEXT_ATTR \ - SEPARATOR ; \ - MN_TXT \ - MN_NUMBERING \ - ITEM_TRANSLITERATE_MENU \ - SEPARATOR ; - -// not in Writer/Web -#define BASE_TEXT_POPUPMENU_NOWEB \ - MenuItem \ - { \ - Identifier = FN_UPDATE_CUR_TOX ; \ - HelpID = FN_UPDATE_CUR_TOX ; \ - Text [ en-US ] = "~Update Index/Table"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_EDIT_CURRENT_TOX; \ - HelpID = FN_EDIT_CURRENT_TOX; \ - Text [ en-US ] = "~Edit Index/Table"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_REMOVE_CUR_TOX; \ - HelpID = FN_REMOVE_CUR_TOX; \ - Text [ en-US ] = "Delete Index/Table"; \ - }; \ - SEPARATOR ; - -#define BASE_TEXT_POPUPMENU_END \ - _DEFAULT_TEXT_EDIT_ELEMENTS \ - }; \ -}; - -#endif - diff --git a/sw/source/ui/inc/toolbox.hrc b/sw/source/ui/inc/toolbox.hrc new file mode 100644 index 000000000000..f17ebbfb8958 --- /dev/null +++ b/sw/source/ui/inc/toolbox.hrc @@ -0,0 +1,566 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: toolbox_tmpl.hrc,v $ + * $Revision: 1.5.210.1 $ + * + * 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 _TOOLBOX_HRC +#define _TOOLBOX_HRC +#include "shells.hrc" +#include "globals.hrc" +#include "cmdid.h" +#define MN_FONT\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_CHAR_FONT;\ + HelpID = SID_ATTR_CHAR_FONT;\ + };\ + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; \ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \ + HelpID = SID_ATTR_CHAR_FONTHEIGHT ; \ + };\ + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + +#define MN_TEXT1( HIDE )\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_CHAR_WEIGHT ; \ + HelpID = SID_ATTR_CHAR_WEIGHT ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_CHAR_POSTURE ; \ + HelpID = SID_ATTR_CHAR_POSTURE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_CHAR_UNDERLINE ; \ + HelpID = SID_ATTR_CHAR_UNDERLINE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_CHAR_OVERLINE ; \ + HelpID = SID_ATTR_CHAR_OVERLINE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = FN_SET_SUPER_SCRIPT;\ + HelpID = FN_SET_SUPER_SCRIPT;\ + Hide = HIDE;\ + };\ + ToolBoxItem\ + {\ + Identifier = FN_SET_SUB_SCRIPT;\ + HelpID = FN_SET_SUB_SCRIPT;\ + Hide = HIDE;\ + };\ + ToolBoxItem\ + {\ + Type = TOOLBOXITEM_SEPARATOR ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \ + HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ + RadioCheck = TRUE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \ + HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \ + RadioCheck = TRUE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \ + HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \ + RadioCheck = TRUE ; \ + };\ + +#define MN_TEXT1_RTL( HIDE )\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_CHAR_WEIGHT ; \ + HelpID = SID_ATTR_CHAR_WEIGHT ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_CHAR_POSTURE ; \ + HelpID = SID_ATTR_CHAR_POSTURE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_CHAR_UNDERLINE ; \ + HelpID = SID_ATTR_CHAR_UNDERLINE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_CHAR_OVERLINE ; \ + HelpID = SID_ATTR_CHAR_OVERLINE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = FN_SET_SUPER_SCRIPT;\ + HelpID = FN_SET_SUPER_SCRIPT;\ + Hide = HIDE;\ + };\ + ToolBoxItem\ + {\ + Identifier = FN_SET_SUB_SCRIPT;\ + HelpID = FN_SET_SUB_SCRIPT;\ + Hide = HIDE;\ + };\ + ToolBoxItem\ + {\ + Type = TOOLBOXITEM_SEPARATOR ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \ + HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \ + RadioCheck = TRUE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \ + HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \ + RadioCheck = TRUE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \ + HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ + RadioCheck = TRUE ; \ + };\ + +#define MN_TEXT1_BLOCK \ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ + HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ + RadioCheck = TRUE ; \ + };\ + +#define MN_TEXT_LINESPACE \ + ToolBoxItem\ + {\ + Type = TOOLBOXITEM_SEPARATOR ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_PARA_LINESPACE_10;\ + HelpID = SID_ATTR_PARA_LINESPACE_10;\ + RadioCheck = TRUE;\ + Hide = TRUE;\ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_PARA_LINESPACE_15;\ + HelpID = SID_ATTR_PARA_LINESPACE_15;\ + RadioCheck = TRUE;\ + Hide = TRUE;\ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_PARA_LINESPACE_20;\ + HelpID = SID_ATTR_PARA_LINESPACE_20;\ + RadioCheck = TRUE;\ + Hide = TRUE;\ + };\ + +#define MN_TEXT_LTR_RTL \ + ToolBoxItem\ + {\ + Type = TOOLBOXITEM_SEPARATOR ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT;\ + HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT;\ + RadioCheck = TRUE;\ + Hide = TRUE;\ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT;\ + HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT;\ + RadioCheck = TRUE;\ + Hide = TRUE;\ + };\ + +#define MN_TEXT_RTL_LTR \ + ToolBoxItem\ + {\ + Type = TOOLBOXITEM_SEPARATOR ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT;\ + HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT;\ + RadioCheck = TRUE;\ + Hide = TRUE;\ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT;\ + HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT;\ + RadioCheck = TRUE;\ + Hide = TRUE;\ + };\ + +#define MN_TEXT2\ + ToolBoxItem\ + {\ + Type = TOOLBOXITEM_SEPARATOR ; \ + };\ + ToolBoxItem\ + {\ + Identifier = FN_NUM_NUMBERING_ON ; \ + HelpID = FN_NUM_NUMBERING_ON ; \ + };\ + ToolBoxItem\ + {\ + Identifier = FN_NUM_BULLET_ON ; \ + HelpID = FN_NUM_BULLET_ON ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_DEC_INDENT ; \ + HelpId = SID_DEC_INDENT ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_INC_INDENT ; \ + HelpId = SID_INC_INDENT ; \ + };\ + ToolBoxItem\ + {\ + Identifier = FN_GROW_FONT_SIZE;\ + HelpID = FN_GROW_FONT_SIZE;\ + Hide = TRUE;\ + };\ + ToolBoxItem\ + {\ + Identifier = FN_SHRINK_FONT_SIZE;\ + HelpID = FN_SHRINK_FONT_SIZE;\ + Hide = TRUE;\ + };\ + +#define MN_BACKGROUND_COLOR\ + ToolBoxItem\ + {\ + ITEM_TOOLBAR_BACKGROUND_COLOR\ + }; + +#define MN_TEXT_BACKGROUND \ + ToolBoxItem\ + {\ + Type = TOOLBOXITEM_SEPARATOR ; \ + };\ + ToolBoxItem\ + {\ + ITEM_TOOLBAR_ATTR_CHAR_COLOR\ + Identifier = SID_ATTR_CHAR_COLOR2 ; \ + Command = ".uno:FontColor"; \ + DropDown = TRUE ;\ + };\ + ToolBoxItem\ + {\ + Identifier = SID_ATTR_CHAR_COLOR_BACKGROUND ; \ + HelpID = SID_ATTR_CHAR_COLOR_BACKGROUND ; \ + DropDown = TRUE ;\ + };\ + ToolBoxItem\ + {\ + ITEM_TOOLBAR_BACKGROUND_COLOR\ + Text [ en-US ] = "Paragraph Background" ; \ + Text [ x-comment ] = " ";\ + }; + +#define MN_TEXT_DIALOGS(HIDE)\ + ToolBoxItem\ + {\ + Type = TOOLBOXITEM_SEPARATOR ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_SELECTALL;\ + HelpId = SID_SELECTALL;\ + Hide = HIDE;\ + };\ + ToolBoxItem\ + {\ + Identifier = SID_CHAR_DLG;\ + HelpId = SID_CHAR_DLG;\ + Hide = HIDE;\ + };\ + ToolBoxItem\ + {\ + Identifier = SID_PARA_DLG;\ + HelpId = SID_PARA_DLG;\ + Hide = HIDE;\ + }; + + +#define MN_TEMPLATE\ + ToolBoxItem\ + {\ + ITEM_TOOLBAR_TEMPLATE_APPLY\ + };\ + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + +#define MN_FRAME_WRAP\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_NOWRAP ; \ + HelpID = FN_FRAME_NOWRAP ; \ + RadioCheck = TRUE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_WRAP ; \ + HelpID = FN_FRAME_WRAP ; \ + RadioCheck = TRUE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_WRAP_IDEAL ; \ + HelpID = FN_FRAME_WRAP_IDEAL ; \ + RadioCheck = TRUE ; \ + Hide = TRUE;\ + };\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_WRAP_LEFT ; \ + HelpID = FN_FRAME_WRAP_LEFT ; \ + RadioCheck = TRUE ; \ + Hide = TRUE;\ + };\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_WRAP_RIGHT ; \ + HelpID = FN_FRAME_WRAP_RIGHT ; \ + RadioCheck = TRUE ; \ + Hide = TRUE;\ + };\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_WRAPTHRU ; \ + HelpID = FN_FRAME_WRAPTHRU ; \ + RadioCheck = TRUE ; \ + }; + +#define MN_FRAME_WRAP_WEB\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_NOWRAP ; \ + HelpID = FN_FRAME_NOWRAP ; \ + RadioCheck = TRUE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_WRAP_LEFT ; \ + HelpID = FN_FRAME_WRAP_LEFT ; \ + RadioCheck = TRUE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_WRAP_RIGHT ; \ + HelpID = FN_FRAME_WRAP_RIGHT ; \ + RadioCheck = TRUE ; \ + };\ + ToolBoxItem\ + {\ + Type = TOOLBOXITEM_SEPARATOR ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_IMAP ; \ + HelpID = SID_IMAP ; \ + RadioCheck = TRUE ; \ + }; + +#define MN_CONTOUR\ + ToolBoxItem\ + {\ + Type = TOOLBOXITEM_SEPARATOR ; \ + };\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_WRAP_CONTOUR ; \ + HelpID = FN_FRAME_WRAP_CONTOUR ; \ + Hide = TRUE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_CONTOUR_DLG ; \ + HelpID = SID_CONTOUR_DLG ; \ + Hide = TRUE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_IMAP ; \ + HelpID = SID_IMAP ; \ + Hide = TRUE ; \ + }; + + +#define MN_FRAME1\ + ToolBoxItem\ + {\ + Type = TOOLBOXITEM_SEPARATOR ; \ + };\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_ALIGN_HORZ_LEFT ; \ + HelpID = FN_FRAME_ALIGN_HORZ_LEFT ; \ + RadioCheck = TRUE ; \ + }; + +#define MN_FRAME2\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_ALIGN_HORZ_CENTER ; \ + HelpID = FN_FRAME_ALIGN_HORZ_CENTER ; \ + RadioCheck = TRUE ; \ + }; + +#define MN_FRAME3\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_ALIGN_HORZ_RIGHT ; \ + HelpID = FN_FRAME_ALIGN_HORZ_RIGHT ; \ + RadioCheck = TRUE ; \ + };\ + ToolBoxItem\ + {\ + Type = TOOLBOXITEM_SEPARATOR ; \ + };\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_ALIGN_VERT_TOP ; \ + HelpID = FN_FRAME_ALIGN_VERT_TOP ; \ + RadioCheck = TRUE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_ALIGN_VERT_CENTER ; \ + HelpID = FN_FRAME_ALIGN_VERT_CENTER ; \ + RadioCheck = TRUE ; \ + };\ + ToolBoxItem\ + {\ + Identifier = FN_FRAME_ALIGN_VERT_BOTTOM ; \ + HelpID = FN_FRAME_ALIGN_VERT_BOTTOM ; \ + RadioCheck = TRUE ; \ + };\ + ToolBoxItem\ + {\ + Type = TOOLBOXITEM_SEPARATOR ; \ + }; + +#define MN_LAYER\ + ToolBoxItem\ + {\ + Identifier = SID_FRAME_TO_TOP ; \ + HelpID = SID_FRAME_TO_TOP ; \ + };\ + ToolBoxItem\ + {\ + Identifier = SID_FRAME_TO_BOTTOM ; \ + HelpID = SID_FRAME_TO_BOTTOM ; \ + }; + +#define MN_LINESTYLE\ + ToolBoxItem\ + {\ + ITEM_TOOLBAR_ATTR_BORDER\ + };\ + ToolBoxItem\ + {\ + ITEM_TOOLBAR_FRAME_LINESTYLE\ + };\ + ToolBoxItem\ + {\ + ITEM_TOOLBAR_FRAME_LINECOLOR\ + }; + +#define MN_ATTRIBUTES_FRAME\ + ToolBoxItem\ + {\ + Identifier = FN_FORMAT_FRAME_DLG ; \ + HelpID = FN_FORMAT_FRAME_DLG ; \ + }; + +#define MN_ATTRIBUTES_GRAFIK\ + ToolBoxItem\ + {\ + Identifier = FN_FORMAT_FRAME_DLG;\ + HelpID = FN_FORMAT_GRAFIC_DLG;\ + Text [ en-US ] = "Graphics Properties";\ + Text [ x-comment ] = " ";\ + }; + + +#define MN_ATTRIBUTES_OLE\ + ToolBoxItem\ + {\ + Identifier = FN_FORMAT_FRAME_DLG;\ + HelpID = FN_FORMAT_FRAME_DLG;\ + Text [ en-US ] = "Object Properties";\ + Text [ x-comment ] = " ";\ + }; + +#define MN_GRID(hide)\ + ToolBoxItem\ + {\ + Type = TOOLBOXITEM_SEPARATOR;\ + };\ + ToolBoxItem\ + {\ + Identifier = SID_GRID_VISIBLE;\ + HelpID = SID_GRID_VISIBLE;\ + hide;\ + };\ + ToolBoxItem\ + {\ + Identifier = SID_GRID_USE;\ + HelpID = SID_GRID_USE;\ + hide;\ + };\ + ToolBoxItem\ + {\ + Identifier = SID_HELPLINES_MOVE;\ + HelpID = SID_HELPLINES_MOVE;\ + hide;\ + }; + + + +#endif // _TOOLBOX_HRC + diff --git a/sw/source/ui/inc/toolbox_tmpl.hrc b/sw/source/ui/inc/toolbox_tmpl.hrc deleted file mode 100644 index f17ebbfb8958..000000000000 --- a/sw/source/ui/inc/toolbox_tmpl.hrc +++ /dev/null @@ -1,566 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: toolbox_tmpl.hrc,v $ - * $Revision: 1.5.210.1 $ - * - * 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 _TOOLBOX_HRC -#define _TOOLBOX_HRC -#include "shells.hrc" -#include "globals.hrc" -#include "cmdid.h" -#define MN_FONT\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_FONT;\ - HelpID = SID_ATTR_CHAR_FONT;\ - };\ - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; \ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \ - HelpID = SID_ATTR_CHAR_FONTHEIGHT ; \ - };\ - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - -#define MN_TEXT1( HIDE )\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_WEIGHT ; \ - HelpID = SID_ATTR_CHAR_WEIGHT ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_POSTURE ; \ - HelpID = SID_ATTR_CHAR_POSTURE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_UNDERLINE ; \ - HelpID = SID_ATTR_CHAR_UNDERLINE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_OVERLINE ; \ - HelpID = SID_ATTR_CHAR_OVERLINE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_SET_SUPER_SCRIPT;\ - HelpID = FN_SET_SUPER_SCRIPT;\ - Hide = HIDE;\ - };\ - ToolBoxItem\ - {\ - Identifier = FN_SET_SUB_SCRIPT;\ - HelpID = FN_SET_SUB_SCRIPT;\ - Hide = HIDE;\ - };\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \ - HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \ - HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \ - HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \ - RadioCheck = TRUE ; \ - };\ - -#define MN_TEXT1_RTL( HIDE )\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_WEIGHT ; \ - HelpID = SID_ATTR_CHAR_WEIGHT ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_POSTURE ; \ - HelpID = SID_ATTR_CHAR_POSTURE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_UNDERLINE ; \ - HelpID = SID_ATTR_CHAR_UNDERLINE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_OVERLINE ; \ - HelpID = SID_ATTR_CHAR_OVERLINE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_SET_SUPER_SCRIPT;\ - HelpID = FN_SET_SUPER_SCRIPT;\ - Hide = HIDE;\ - };\ - ToolBoxItem\ - {\ - Identifier = FN_SET_SUB_SCRIPT;\ - HelpID = FN_SET_SUB_SCRIPT;\ - Hide = HIDE;\ - };\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \ - HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \ - HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \ - HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ - RadioCheck = TRUE ; \ - };\ - -#define MN_TEXT1_BLOCK \ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ - RadioCheck = TRUE ; \ - };\ - -#define MN_TEXT_LINESPACE \ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_LINESPACE_10;\ - HelpID = SID_ATTR_PARA_LINESPACE_10;\ - RadioCheck = TRUE;\ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_LINESPACE_15;\ - HelpID = SID_ATTR_PARA_LINESPACE_15;\ - RadioCheck = TRUE;\ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_LINESPACE_20;\ - HelpID = SID_ATTR_PARA_LINESPACE_20;\ - RadioCheck = TRUE;\ - Hide = TRUE;\ - };\ - -#define MN_TEXT_LTR_RTL \ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT;\ - HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT;\ - RadioCheck = TRUE;\ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT;\ - HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT;\ - RadioCheck = TRUE;\ - Hide = TRUE;\ - };\ - -#define MN_TEXT_RTL_LTR \ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT;\ - HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT;\ - RadioCheck = TRUE;\ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT;\ - HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT;\ - RadioCheck = TRUE;\ - Hide = TRUE;\ - };\ - -#define MN_TEXT2\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_NUM_NUMBERING_ON ; \ - HelpID = FN_NUM_NUMBERING_ON ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_NUM_BULLET_ON ; \ - HelpID = FN_NUM_BULLET_ON ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_DEC_INDENT ; \ - HelpId = SID_DEC_INDENT ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_INC_INDENT ; \ - HelpId = SID_INC_INDENT ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_GROW_FONT_SIZE;\ - HelpID = FN_GROW_FONT_SIZE;\ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = FN_SHRINK_FONT_SIZE;\ - HelpID = FN_SHRINK_FONT_SIZE;\ - Hide = TRUE;\ - };\ - -#define MN_BACKGROUND_COLOR\ - ToolBoxItem\ - {\ - ITEM_TOOLBAR_BACKGROUND_COLOR\ - }; - -#define MN_TEXT_BACKGROUND \ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - ITEM_TOOLBAR_ATTR_CHAR_COLOR\ - Identifier = SID_ATTR_CHAR_COLOR2 ; \ - Command = ".uno:FontColor"; \ - DropDown = TRUE ;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_ATTR_CHAR_COLOR_BACKGROUND ; \ - HelpID = SID_ATTR_CHAR_COLOR_BACKGROUND ; \ - DropDown = TRUE ;\ - };\ - ToolBoxItem\ - {\ - ITEM_TOOLBAR_BACKGROUND_COLOR\ - Text [ en-US ] = "Paragraph Background" ; \ - Text [ x-comment ] = " ";\ - }; - -#define MN_TEXT_DIALOGS(HIDE)\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_SELECTALL;\ - HelpId = SID_SELECTALL;\ - Hide = HIDE;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_CHAR_DLG;\ - HelpId = SID_CHAR_DLG;\ - Hide = HIDE;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_PARA_DLG;\ - HelpId = SID_PARA_DLG;\ - Hide = HIDE;\ - }; - - -#define MN_TEMPLATE\ - ToolBoxItem\ - {\ - ITEM_TOOLBAR_TEMPLATE_APPLY\ - };\ - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - -#define MN_FRAME_WRAP\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_NOWRAP ; \ - HelpID = FN_FRAME_NOWRAP ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAP ; \ - HelpID = FN_FRAME_WRAP ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAP_IDEAL ; \ - HelpID = FN_FRAME_WRAP_IDEAL ; \ - RadioCheck = TRUE ; \ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAP_LEFT ; \ - HelpID = FN_FRAME_WRAP_LEFT ; \ - RadioCheck = TRUE ; \ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAP_RIGHT ; \ - HelpID = FN_FRAME_WRAP_RIGHT ; \ - RadioCheck = TRUE ; \ - Hide = TRUE;\ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAPTHRU ; \ - HelpID = FN_FRAME_WRAPTHRU ; \ - RadioCheck = TRUE ; \ - }; - -#define MN_FRAME_WRAP_WEB\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_NOWRAP ; \ - HelpID = FN_FRAME_NOWRAP ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAP_LEFT ; \ - HelpID = FN_FRAME_WRAP_LEFT ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAP_RIGHT ; \ - HelpID = FN_FRAME_WRAP_RIGHT ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_IMAP ; \ - HelpID = SID_IMAP ; \ - RadioCheck = TRUE ; \ - }; - -#define MN_CONTOUR\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_WRAP_CONTOUR ; \ - HelpID = FN_FRAME_WRAP_CONTOUR ; \ - Hide = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_CONTOUR_DLG ; \ - HelpID = SID_CONTOUR_DLG ; \ - Hide = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_IMAP ; \ - HelpID = SID_IMAP ; \ - Hide = TRUE ; \ - }; - - -#define MN_FRAME1\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_ALIGN_HORZ_LEFT ; \ - HelpID = FN_FRAME_ALIGN_HORZ_LEFT ; \ - RadioCheck = TRUE ; \ - }; - -#define MN_FRAME2\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_ALIGN_HORZ_CENTER ; \ - HelpID = FN_FRAME_ALIGN_HORZ_CENTER ; \ - RadioCheck = TRUE ; \ - }; - -#define MN_FRAME3\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_ALIGN_HORZ_RIGHT ; \ - HelpID = FN_FRAME_ALIGN_HORZ_RIGHT ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_ALIGN_VERT_TOP ; \ - HelpID = FN_FRAME_ALIGN_VERT_TOP ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_ALIGN_VERT_CENTER ; \ - HelpID = FN_FRAME_ALIGN_VERT_CENTER ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Identifier = FN_FRAME_ALIGN_VERT_BOTTOM ; \ - HelpID = FN_FRAME_ALIGN_VERT_BOTTOM ; \ - RadioCheck = TRUE ; \ - };\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR ; \ - }; - -#define MN_LAYER\ - ToolBoxItem\ - {\ - Identifier = SID_FRAME_TO_TOP ; \ - HelpID = SID_FRAME_TO_TOP ; \ - };\ - ToolBoxItem\ - {\ - Identifier = SID_FRAME_TO_BOTTOM ; \ - HelpID = SID_FRAME_TO_BOTTOM ; \ - }; - -#define MN_LINESTYLE\ - ToolBoxItem\ - {\ - ITEM_TOOLBAR_ATTR_BORDER\ - };\ - ToolBoxItem\ - {\ - ITEM_TOOLBAR_FRAME_LINESTYLE\ - };\ - ToolBoxItem\ - {\ - ITEM_TOOLBAR_FRAME_LINECOLOR\ - }; - -#define MN_ATTRIBUTES_FRAME\ - ToolBoxItem\ - {\ - Identifier = FN_FORMAT_FRAME_DLG ; \ - HelpID = FN_FORMAT_FRAME_DLG ; \ - }; - -#define MN_ATTRIBUTES_GRAFIK\ - ToolBoxItem\ - {\ - Identifier = FN_FORMAT_FRAME_DLG;\ - HelpID = FN_FORMAT_GRAFIC_DLG;\ - Text [ en-US ] = "Graphics Properties";\ - Text [ x-comment ] = " ";\ - }; - - -#define MN_ATTRIBUTES_OLE\ - ToolBoxItem\ - {\ - Identifier = FN_FORMAT_FRAME_DLG;\ - HelpID = FN_FORMAT_FRAME_DLG;\ - Text [ en-US ] = "Object Properties";\ - Text [ x-comment ] = " ";\ - }; - -#define MN_GRID(hide)\ - ToolBoxItem\ - {\ - Type = TOOLBOXITEM_SEPARATOR;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_GRID_VISIBLE;\ - HelpID = SID_GRID_VISIBLE;\ - hide;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_GRID_USE;\ - HelpID = SID_GRID_USE;\ - hide;\ - };\ - ToolBoxItem\ - {\ - Identifier = SID_HELPLINES_MOVE;\ - HelpID = SID_HELPLINES_MOVE;\ - hide;\ - }; - - - -#endif // _TOOLBOX_HRC - -- cgit From bd361ff2be54717399287caff2cd9c63a46d62cd Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Apr 2010 18:27:03 +0200 Subject: CWS gnumake2: remove duplicate header in solver: vcl/imagebtn.hxx is just a copy of vcl/button.hxx --- sw/inc/pch/precompiled_sw.hxx | 2 +- sw/source/ui/inc/column.hxx | 2 +- sw/source/ui/inc/envlop.hxx | 2 +- sw/source/ui/inc/fldedt.hxx | 2 +- sw/source/ui/inc/javaedit.hxx | 2 +- sw/source/ui/inc/split.hxx | 2 +- sw/source/ui/inc/swuiidxmrk.hxx | 2 +- sw/source/ui/inc/workctrl.hxx | 2 +- sw/source/ui/inc/wrap.hxx | 2 +- sw/source/ui/table/tablepg.hxx | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 592725f78d63..57ef62576255 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -920,7 +920,7 @@ #include "vcl/group.hxx" #include "vcl/help.hxx" #include "vcl/image.hxx" -#include "vcl/imagebtn.hxx" +#include "vcl/button.hxx" #include "vcl/imgcons.hxx" #include "vcl/inputctx.hxx" #include "vcl/jobset.hxx" diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx index 1cc6ecf33cb9..f2a5e37d283b 100644 --- a/sw/source/ui/inc/column.hxx +++ b/sw/source/ui/inc/column.hxx @@ -49,7 +49,7 @@ #endif #include #ifndef _IMAGEBTN_HXX //autogen -#include +#include #endif #include #include diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx index b7ae315a9beb..849bb63b9d51 100644 --- a/sw/source/ui/inc/envlop.hxx +++ b/sw/source/ui/inc/envlop.hxx @@ -45,7 +45,7 @@ #endif #ifndef _IMAGEBTN_HXX //autogen -#include +#include #endif #include "envimg.hxx" diff --git a/sw/source/ui/inc/fldedt.hxx b/sw/source/ui/inc/fldedt.hxx index cb27672de865..83f4b5b758f3 100644 --- a/sw/source/ui/inc/fldedt.hxx +++ b/sw/source/ui/inc/fldedt.hxx @@ -27,7 +27,7 @@ #ifndef _FLDEDT_HXX #define _FLDEDT_HXX #include -#include +#include class SwView; class SwWrtShell; diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx index 6fecb6c82b30..239c67185e07 100644 --- a/sw/source/ui/inc/javaedit.hxx +++ b/sw/source/ui/inc/javaedit.hxx @@ -44,7 +44,7 @@ #endif #ifndef _IMAGEBTN_HXX //autogen -#include +#include #endif class SwWrtShell; diff --git a/sw/source/ui/inc/split.hxx b/sw/source/ui/inc/split.hxx index 9d96d6ac3a9d..eafe394d2b27 100644 --- a/sw/source/ui/inc/split.hxx +++ b/sw/source/ui/inc/split.hxx @@ -38,7 +38,7 @@ #endif #ifndef _IMAGEBTN_HXX //autogen -#include +#include #endif #ifndef _BUTTON_HXX //autogen diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx index 037aac07fe16..3f529f91affe 100644 --- a/sw/source/ui/inc/swuiidxmrk.hxx +++ b/sw/source/ui/inc/swuiidxmrk.hxx @@ -52,7 +52,7 @@ #endif #ifndef _IMAGEBTN_HXX //autogen -#include +#include #endif #include #include "toxe.hxx" diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx index 4ca42086d93e..f6a6b19c3c73 100644 --- a/sw/source/ui/inc/workctrl.hxx +++ b/sw/source/ui/inc/workctrl.hxx @@ -31,7 +31,7 @@ #include #include #ifndef _IMAGEBTN_HXX //autogen -#include +#include #endif class PopupMenu; diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx index 7d435f90cd17..e0fc8a394c5f 100644 --- a/sw/source/ui/inc/wrap.hxx +++ b/sw/source/ui/inc/wrap.hxx @@ -31,7 +31,7 @@ #include #ifndef _IMAGEBTN_HXX //autogen -#include +#include #endif #ifndef _BUTTON_HXX //autogen diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx index 51e39a65dce9..86eff4a23f08 100644 --- a/sw/source/ui/table/tablepg.hxx +++ b/sw/source/ui/table/tablepg.hxx @@ -31,7 +31,7 @@ #include #endif #ifndef _IMAGEBTN_HXX //autogen -#include +#include #endif #ifndef _LSTBOX_HXX //autogen #include -- cgit From 5b01ceae454fa10269eed69fc0dab8b5c6c50699 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Apr 2010 15:55:51 +0200 Subject: CWS gnumake2: move all delivered headers in svx to inc/svx; remove unused or useless headers --- starmath/source/makefile.mk | 3 - starmath/source/menu_tmpl.src | 160 ------------------------------------------ starmath/source/smres.src | 2 - sw/inc/pch/precompiled_sw.hxx | 2 +- sw/source/ui/fmtui/tmpdlg.cxx | 2 +- 5 files changed, 2 insertions(+), 167 deletions(-) delete mode 100644 starmath/source/menu_tmpl.src diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk index a69a90010700..d786e0423db3 100644 --- a/starmath/source/makefile.mk +++ b/starmath/source/makefile.mk @@ -108,9 +108,6 @@ LIB1OBJFILES = \ # --- Targets ------------------------------------------------------- -LOCALIZE_ME = menu_tmpl.src - - .INCLUDE : target.mk $(INCCOM)$/dllname.hxx: makefile.mk diff --git a/starmath/source/menu_tmpl.src b/starmath/source/menu_tmpl.src deleted file mode 100644 index c6eeeb60b7cd..000000000000 --- a/starmath/source/menu_tmpl.src +++ /dev/null @@ -1,160 +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 _SFX_HRC //autogen -#include -#endif -#ifndef _GLOBLMN_HRC //autogen -#include -#endif -#ifndef _GLOBALACC_SRC //autogen -#include -#endif -#ifndef _SVX_SVXIDS_HRC //autogen -#include -#endif - -#ifndef _STARMATH_HRC -#include "starmath.hrc" -#endif - -#ifndef MN_HELP -#define MN_HELP -#endif - -///////////////////////////////////////////////////////////////// - -/* - -The application menu bar resource has become obsolete. You can now find the menu bar definition at: -/smath/menubar/menubar.xml. - -*/ - -///////////////////////////////////////////////////////////////// - -Accelerator RID_SMACCEL -{ - ItemList = - { - AI_UNDO - AI_REDO - AcceleratorItem - { - Identifier = SID_SELECT ; - Key = KeyCode - { - Code = KEY_A ; - Modifier1 = TRUE ; - }; - }; - AcceleratorItem - { - Identifier = SID_NEXTMARK ; - Key = KeyCode - { - Code = KEY_F4 ; - }; - }; - AcceleratorItem - { - Identifier = SID_PREVMARK ; - Key = KeyCode - { - Code = KEY_F4 ; - Shift = TRUE ; - }; - }; - AcceleratorItem - { - Identifier = SID_NEXTERR ; - Key = KeyCode - { - Code = KEY_F3 ; - }; - }; - AcceleratorItem - { - Identifier = SID_PREVERR ; - Key = KeyCode - { - Code = KEY_F3 ; - Shift = TRUE ; - }; - }; - AcceleratorItem - { - Identifier = SID_DRAW ; - Key = KeyCode - { - Code = KEY_F9 ; - }; - }; - }; -}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/starmath/source/smres.src b/starmath/source/smres.src index 64891a95daf9..a171fe002a21 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -3478,8 +3478,6 @@ String RID_ERR_RIGHTEXPECTED Text [ en-US ] = "'RIGHT' expected" ; }; -#include "menu.src" - ToolBox RID_MATH_TOOLBOX { HelpId = RID_MATH_TOOLBOX ; diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 57ef62576255..35c887f22f87 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -748,7 +748,7 @@ #include "svx/globlmn.hrc" #include "svx/grafctrl.hxx" #include "editeng/hangulhanja.hxx" -#include "svx/hdft2.hxx" +#include "svx/hdft.hxx" #include "svtools/htmlcfg.hxx" #include "svx/htmlmode.hxx" #include "svx/hyperdlg.hxx" diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index c78f51f4796f..015a31fce90e 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -41,7 +41,7 @@ #endif #include #include -#include +#include #include #include #include -- cgit From a4343696d41365225fef603ccb49cfeb4192ef32 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Apr 2010 22:38:57 +0200 Subject: CWS gnumake2: remove some unnecessary resource magic --- sw/source/ui/app/mn.src | 348 ++++++++++++++++++++++++++++++++++++++++++- sw/source/ui/web/web.src | 263 -------------------------------- sw/source/ui/web/wtextsh.cxx | 2 +- 3 files changed, 348 insertions(+), 265 deletions(-) diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src index 81dad77566b2..e1dcd688297c 100644 --- a/sw/source/ui/app/mn.src +++ b/sw/source/ui/app/mn.src @@ -25,9 +25,355 @@ * ************************************************************************/ +#include +#include +#include "cmdid.h" +#include "app.hrc" +#include "globals.hrc" +#include "helpid.h" +#include "popup.hrc" +/* --------------------- F O R M A T --------------------------------- */ -#include "swmn.hrc" +#define SEPARATOR MenuItem { Separator = TRUE; } + +//define for ITEM_FORMAT_NUMBERING +#define DEFINE_SLOTID_FOR_NUMBER_BULLETS FN_NUMBER_BULLETS +#define MN_NUMBERING ITEM_FORMAT_NUMBERING + +#define MN_TXT\ + MenuItem\ + {\ + ITEM_FORMAT_CHAR_DLG\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_PARA_DLG\ + };\ + MenuItem\ + {\ + Identifier = FN_FORMAT_PAGE_DLG ; \ + HelpID = FN_FORMAT_PAGE_DLG ; \ + Text [ en-US ] = "Pa~ge..." ; \ + }; + + +#define MN_TEXT_ATTR\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_FONT\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT\ + };\ + MenuItem\ + {\ + Identifier = MN_FORMAT_STYLE ; \ + HelpID = MN_FORMAT_STYLE ; \ + Command = ".uno:StyleMenu" ; \ + Text [ en-US ] = "St~yle" ; \ + SubMenu = Menu\ + {\ + ItemList = \ + {\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_WEIGHT\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_POSTURE\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_OVERLINE\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_UNDERLINE\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_STRIKEOUT\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_SHADOWED\ + };\ + MenuItem\ + {\ + ITEM_FORMAT_ATTR_CHAR_CONTOUR\ + };\ + SEPARATOR ; \ + MenuItem\ + {\ + Identifier = FN_SET_SUPER_SCRIPT ; \ + HelpID = FN_SET_SUPER_SCRIPT ; \ + Text [ en-US ] = "Superscript" ; \ + };\ + MenuItem\ + {\ + Identifier = FN_SET_SUB_SCRIPT ; \ + HelpID = FN_SET_SUB_SCRIPT ; \ + Text [ en-US ] = "Subscript" ; \ + };\ + };\ + };\ + };\ + MenuItem\ + {\ + Identifier = MN_FORMAT_ALGN ; \ + HelpID = MN_FORMAT_ALGN ; \ + Command = ".uno:AlignTextMenu" ; \ + Text [ en-US ] = "A~lignment" ; \ + RadioCheck = TRUE ; \ + SubMenu = Menu\ + {\ + ItemList = \ + {\ + MenuItem\ + {\ + RadioCheck = TRUE ; \ + ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT\ + };\ + MenuItem\ + {\ + RadioCheck = TRUE ; \ + ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT\ + };\ + MenuItem\ + {\ + RadioCheck = TRUE ; \ + ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER\ + };\ + MenuItem\ + {\ + Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ + HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ + RadioCheck = TRUE ; \ + Text [ en-US ] = "Justified" ; \ + };\ + };\ + };\ + };\ + MenuItem\ + {\ + Identifier = MN_FORMAT_LINESPACE ; \ + HelpID = MN_FORMAT_LINESPACE ; \ + Command = ".uno:LineSpacingMenu" ; \ + Text [ en-US ] = "Line Spacing" ; \ + _MenuItemFlags = MIB_RADIOCHECK ; \ + SubMenu = Menu\ + {\ + ItemList = \ + {\ + MenuItem\ + {\ + RadioCheck = TRUE ; \ + ITEM_FORMAT_PARA_LINESPACE_10\ + };\ + MenuItem\ + {\ + RadioCheck = TRUE ; \ + ITEM_FORMAT_PARA_LINESPACE_15\ + };\ + MenuItem\ + {\ + RadioCheck = TRUE ; \ + ITEM_FORMAT_PARA_LINESPACE_20\ + };\ + };\ + };\ + }; + +/* --------------------- M E N U --------------------------------- */ + +/* + + +The application menu bar resource has become obsolete. You can now find the menu bar at the following +location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml + + +*/ + +/* --------------------- D O C U M E N T -------------------------- */ + + +#define _MN_EDIT_FIELD \ + MenuItem \ + { \ + Identifier = FN_EDIT_FIELD ; \ + HelpID = FN_EDIT_FIELD ; \ + Text [ en-US ] = "Fields..." ; \ + }; +#define _MN_EDIT_FOOTNOTE \ + MenuItem \ + { \ + Identifier = FN_EDIT_FOOTNOTE ; \ + HelpID = FN_EDIT_FOOTNOTE ; \ + Text [ en-US ] = "Footnote/Endnote~..." ; \ + }; + #define _MN_EDIT_IDX_ENTRY_DLG \ + MenuItem \ + { \ + Identifier = FN_EDIT_IDX_ENTRY_DLG ; \ + HelpID = FN_EDIT_IDX_ENTRY_DLG ; \ + Text [ en-US ] = "Inde~x Entry..." ; \ + }; + +#define _MN_EDIT_REDLINE \ + MenuItem \ + { \ + Identifier = FN_REDLINE_ACCEPT_DIRECT; \ + HelpID = FN_REDLINE_ACCEPT_DIRECT ; \ + Text [ en-US ] = "Accept Change" ; \ + };\ + MenuItem \ + { \ + Identifier = FN_REDLINE_REJECT_DIRECT ; \ + HelpID = FN_REDLINE_REJECT_DIRECT ; \ + Text [ en-US ] = "Reject Change" ; \ + }; \ + SEPARATOR ; +#define _MN_EDIT_BIB_ENTRY_DLG \ + MenuItem \ + { \ + Identifier = FN_EDIT_AUTH_ENTRY_DLG ; \ + HelpID = FN_EDIT_AUTH_ENTRY_DLG ; \ + Text [ en-US ] = "~Bibliography Entry..."; \ + }; \ + SEPARATOR ; + +#define _MN_EDIT_OPEN_HYPERLINK \ + MenuItem \ + { \ + ITEM_OPEN_HYPERLINK \ + };\ + MenuItem \ + { \ + Identifier = FN_EDIT_HYPERLINK ; \ + HelpID = FN_EDIT_HYPERLINK ; \ + Text [ en-US ] = "Edit Hyperlink..."; \ + }; \ + MenuItem \ + { \ + Identifier = FN_COPY_HYPERLINK_LOCATION; \ + HelpID = FN_COPY_HYPERLINK_LOCATION; \ + Text [ en-US ] = "Copy Hyperlink ~Location"; \ + }; \ + MenuItem \ + { \ + Identifier = FN_REMOVE_HYPERLINK ; \ + HelpID = FN_REMOVE_HYPERLINK ; \ + Text [ en-US ] = "Remo~ve Hyperlink"; \ + }; + +#define _MN_EDIT_OPEN_SMARTTAGMENU \ + MenuItem \ + { \ + ITEM_OPEN_SMARTTAGMENU \ + }; + +#define _MN_EDIT__HYPERLINK \ + MenuItem\ + {\ + Identifier = FN_EDIT_HYPERLINK ; \ + HelpID = FN_EDIT_HYPERLINK ; \ + Text [ en-US ] = "~Edit Hyperlink" ; \ + }; + +#define _DEFAULT_TEXT_EDIT_ELEMENTS \ + _MN_EDIT_FIELD \ + _MN_EDIT_FOOTNOTE \ + _MN_EDIT_IDX_ENTRY_DLG \ + _MN_EDIT_BIB_ENTRY_DLG \ + _MN_EDIT_REDLINE \ + MenuItem \ + { \ + ITEM_POPUP_TEMPLATE_EDIT \ + }; \ + SEPARATOR ; \ + _MN_EDIT_OPEN_HYPERLINK \ + _MN_EDIT_OPEN_SMARTTAGMENU + + +#define MN_RESET\ + MenuItem\ + {\ + Identifier = FN_FORMAT_RESET ; \ + HelpID = FN_FORMAT_RESET ; \ + Text [ en-US ] = "~Default Formatting" ; \ + }; + +#define _NUMBERING_RELATED_MENU \ + SEPARATOR ; \ + MenuItem \ + { \ + Identifier = FN_NUMBER_NEWSTART; \ + HelpId = FN_NUMBER_NEWSTART; \ + Text[ en-US ] = "Restart Numbering"; \ + }; \ + MenuItem \ + { \ + Identifier = FN_NUM_CONTINUE; \ + HelpId = FN_NUM_CONTINUE; \ + Text[ en-US ] = "Continue previous numbering"; \ + }; \ + MenuItem \ + { \ + Identifier = FN_NUM_BULLET_UP; \ + HelpId = FN_NUM_BULLET_UP; \ + Text[ en-US ] = "Up One Level"; \ + }; \ + MenuItem \ + { \ + Identifier = FN_NUM_BULLET_DOWN; \ + HelpId = FN_NUM_BULLET_DOWN; \ + Text[ en-US ] = "Down One Level"; \ + }; + +#define BASE_TEXT_POPUPMENU_BEGIN \ +{ \ + ItemList = \ + { \ + MN_RESET \ + _NUMBERING_RELATED_MENU \ + SEPARATOR ; \ + MN_TEXT_ATTR \ + SEPARATOR ; \ + MN_TXT \ + MN_NUMBERING \ + ITEM_TRANSLITERATE_MENU \ + SEPARATOR ; + +// not in Writer/Web +#define BASE_TEXT_POPUPMENU_NOWEB \ + MenuItem \ + { \ + Identifier = FN_UPDATE_CUR_TOX ; \ + HelpID = FN_UPDATE_CUR_TOX ; \ + Text [ en-US ] = "~Update Index/Table"; \ + }; \ + MenuItem \ + { \ + Identifier = FN_EDIT_CURRENT_TOX; \ + HelpID = FN_EDIT_CURRENT_TOX; \ + Text [ en-US ] = "~Edit Index/Table"; \ + }; \ + MenuItem \ + { \ + Identifier = FN_REMOVE_CUR_TOX; \ + HelpID = FN_REMOVE_CUR_TOX; \ + Text [ en-US ] = "Delete Index/Table"; \ + }; \ + SEPARATOR ; + +#define BASE_TEXT_POPUPMENU_END \ + _DEFAULT_TEXT_EDIT_ELEMENTS \ + }; \ +}; /*------------------------------------------------------------------------ Beschreibung: Menu Window diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src index 1aa7fc03b4c6..fdfbe8b3c07a 100644 --- a/sw/source/ui/web/web.src +++ b/sw/source/ui/web/web.src @@ -25,15 +25,10 @@ * ************************************************************************/ -#ifndef _SVX_SVXIDS_HRC #include -#endif #include "globals.hrc" #include "cmdid.h" #include "web.hrc" -#include "swmn.hrc" -#define ACC_SW_WEB -#include "toolbox.hrc" #include "helpid.h" #include "cfgid.h" @@ -65,124 +60,6 @@ String RID_WEBTOOLS_TOOLBOX { Text [ en-US ] = "Main Toolbar/Web" ; }; -ToolBox RID_WEBTOOLS_TOOLBOX -{ - HelpID = HID_WEBTOOLS_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - HideWhenDeactivate = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Scroll = TRUE ; - Hide = TRUE ; - Align = BOXALIGN_LEFT ; - ItemList = - { - ToolBoxItem - { - Identifier = FN_INSERT_CTRL ; - HelpID = HID_INSERT_CTRL ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Identifier = FN_INSERT_FIELD_CTRL ; - HelpID = HID_INSERT_FIELD_CTRL ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_TEXT_MARQUEE ; - HelpID = SID_DRAW_TEXT_MARQUEE ; - }; - ToolBoxItem - { - Identifier = SID_FM_CONFIG ; - HelpID = SID_FM_CONFIG; - DropDown = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_GLOSSARY_DLG ; - HelpID = FN_GLOSSARY_DLG ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Identifier = FN_SPELL_GRAMMAR_DIALOG; - HelpID = FN_SPELL_GRAMMAR_DIALOG; - }; - ToolBoxItem - { - ITEM_TOOLBAR_AUTOSPELL_CHECK - }; - ToolBoxItem - { - Identifier = FN_HYPHENATE_OPT_DLG; - HelpID = FN_HYPHENATE_OPT_DLG; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_THESAURUS_DLG; - HelpID = FN_THESAURUS_DLG; - Hide = TRUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_SEARCH_DLG ; - HelpID = SID_SEARCH_DLG ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_ZOOM; - HelpID = SID_ATTR_ZOOM ; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_VIEW_META_CHARS ; - HelpID = FN_VIEW_META_CHARS ; - }; - ToolBoxItem - { - Identifier = FN_VIEW_GRAPHIC ; - HelpID = FN_VIEW_GRAPHIC ; - }; - ToolBoxItem - { - Identifier = FN_PRINT_LAYOUT ; - HelpID = FN_PRINT_LAYOUT ; - }; - ToolBoxItem - { - Identifier = SID_SOURCEVIEW ; - HelpID = HID_SOURCEVIEW ; - }; - }; -}; /************************************************************************* Textleiste *************************************************************************/ @@ -190,156 +67,16 @@ String RID_WEBTEXT_TOOLBOX { Text [ en-US ] = "Text Object Bar/Web" ; }; -ToolBox RID_WEBTEXT_TOOLBOX -{ - HelpID = HID_WEBTEXT_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Hide = TRUE ; - HideWhenDeactivate = TRUE ; - LineSpacing = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - ItemList = - { - MN_TEMPLATE - MN_FONT - MN_TEXT1(TRUE) - MN_TEXT_LTR_RTL - MN_TEXT_LINESPACE - MN_TEXT2 - MN_TEXT_BACKGROUND - MN_TEXT_DIALOGS(TRUE) - }; - Scroll = TRUE ; -}; String RID_WEBFRAME_TOOLBOX { Text [ en-US ] = "Frame Object Bar/Web" ; }; -ToolBox RID_WEBFRAME_TOOLBOX -{ - HelpID = HID_WEBFRAME_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Hide = TRUE ; - LineSpacing = TRUE ; - MenuStrings = TRUE ; - HideWhenDeactivate = TRUE ; - Customize = TRUE ; - ItemList = - { - MN_FRAME_WRAP_WEB - MN_FRAME1 - MN_FRAME3 - MN_LINESTYLE - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - MN_BACKGROUND_COLOR - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_ATTRIBUTES_FRAME - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_LAYER - ToolBoxItem - { - Identifier = FN_TOOL_ANKER ; - HelpID = FN_TOOL_ANKER ; - }; - }; - Scroll = TRUE ; -}; String RID_WEBGRAPHIC_TOOLBOX { Text [ en-US ] = "Graphics Object Bar/Web" ; }; -ToolBox RID_WEBGRAPHIC_TOOLBOX -{ - HelpID = HID_WEBGRAPHIC_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - HideWhenDeactivate = TRUE ; - MenuStrings = TRUE ; - Customize = TRUE ; - Hide = TRUE ; - ItemList = - { - MN_FRAME_WRAP_WEB - MN_FRAME1 - MN_FRAME3 - MN_LINESTYLE - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_ATTRIBUTES_GRAFIK - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_LAYER - ToolBoxItem - { - Identifier = FN_TOOL_ANKER ; - HelpID = FN_TOOL_ANKER ; - DropDown = TRUE ; - }; - }; - Scroll = TRUE ; -}; String RID_WEBOLE_TOOLBOX { Text [ en-US ] = "Object/Web" ; }; -ToolBox RID_WEBOLE_TOOLBOX -{ - HelpID = HID_OLE_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - HideWhenDeactivate = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Hide = TRUE ; - Scroll = TRUE ; - ItemList = - { - MN_FRAME_WRAP_WEB - MN_FRAME1 - MN_FRAME3 - MN_LINESTYLE - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_ATTRIBUTES_OLE - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_LAYER - ToolBoxItem - { - Identifier = FN_TOOL_ANKER ; - HelpID = FN_TOOL_ANKER ; - DropDown = TRUE ; - }; - }; -}; -/************************************************************************* - -*************************************************************************/ -Menu MN_WEB_TEXT_POPUPMENU - BASE_TEXT_POPUPMENU_BEGIN - BASE_TEXT_POPUPMENU_END diff --git a/sw/source/ui/web/wtextsh.cxx b/sw/source/ui/web/wtextsh.cxx index 05c454d5c431..6a77edb155b8 100644 --- a/sw/source/ui/web/wtextsh.cxx +++ b/sw/source/ui/web/wtextsh.cxx @@ -68,7 +68,7 @@ SFX_IMPL_INTERFACE(SwWebTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_WEBTEXT)) { - SFX_POPUPMENU_REGISTRATION(SW_RES(MN_WEB_TEXT_POPUPMENU)); + SFX_POPUPMENU_REGISTRATION(SW_RES(MN_TEXT_POPUPMENU)); SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX)); SFX_CHILDWINDOW_REGISTRATION(FN_EDIT_FORMULA); SFX_CHILDWINDOW_REGISTRATION(FN_INSERT_FIELD); -- cgit From d6a94b5cce61d74995e97a937daa31b9356389f3 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 21 Apr 2010 14:09:27 +0200 Subject: CWS gnumake2: various fixes after merging with DEV300_m76 --- sw/prj/build.lst | 78 ++------------------------------------ sw/prj/d.lst | 113 ------------------------------------------------------- 2 files changed, 3 insertions(+), 188 deletions(-) diff --git a/sw/prj/build.lst b/sw/prj/build.lst index 03b2bc4a78fc..d4770eec862c 100755 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,75 +1,3 @@ -sw sw : filter offuh l10n connectivity OOo:writerperfect vbahelper svx stoc writerfilter NULL -sw sw usr1 - all sw_mkout NULL -sw sw\inc nmake - all sw_inc NULL -sw sw\uiconfig\layout nmake - all sw_layout NULL -sw sw\prj get - all sw_prj NULL -sw sw\source\core\inc get - all sw_cinc NULL -sw sw\source\filter\inc get - all sw_finc NULL -sw sw\res get - all sw_res NULL -sw sw\win\res get - all sw_wres NULL -sw sw\win\imglst get - all sw_wimg NULL -sw sw\sdi nmake - all sw_sdi NULL -sw sw\source\core\bastyp nmake - all sw_bast sw_inc NULL -sw sw\source\ui\app nmake - all sw_app sw_sdi sw_inc NULL -sw sw\source\ui\cctrl nmake - all sw_cctrl sw_inc NULL -sw sw\source\ui\chrdlg nmake - all sw_chrdl sw_inc NULL -sw sw\source\ui\config nmake - all sw_conf sw_inc NULL -sw sw\source\ui\dbui nmake - all sw_dbui sw_inc NULL -sw sw\source\ui\dialog nmake - all sw_dlg sw_inc NULL -sw sw\source\ui\dochdl nmake - all sw_dchdl sw_inc NULL -sw sw\source\ui\docvw nmake - all sw_dcvw sw_inc NULL -sw sw\source\ui\envelp nmake - all sw_envlp sw_inc NULL -sw sw\source\ui\fldui nmake - all sw_fldui sw_inc NULL -sw sw\source\ui\fmtui nmake - all sw_fmtui sw_inc NULL -sw sw\source\ui\frmdlg nmake - all sw_frmdl sw_inc NULL -sw sw\source\ui\globdoc nmake - all sw_globd sw_inc NULL -sw sw\source\ui\index nmake - all sw_index sw_inc NULL -sw sw\source\ui\lingu nmake - all sw_ling sw_inc NULL -sw sw\source\ui\misc nmake - all sw_misc sw_sdi sw_inc NULL -sw sw\source\ui\ribbar nmake - all sw_rbbar sw_inc NULL -sw sw\source\ui\shells nmake - all sw_shell sw_sdi sw_inc NULL -sw sw\source\ui\smartmenu nmake - all sw_smartmenu sw_inc NULL -sw sw\source\ui\table nmake - all sw_table sw_inc NULL -sw sw\source\ui\uiview nmake - all sw_uivw sw_sdi sw_inc NULL -sw sw\source\ui\uno nmake - all sw_uiuno sw_sdi sw_inc NULL -sw sw\source\ui\vba nmake - all sw_vba sw_inc NULL -sw sw\source\ui\utlui nmake - all sw_utlui sw_inc NULL -sw sw\source\ui\web nmake - all sw_web sw_sdi sw_inc NULL -sw sw\source\ui\wrtsh nmake - all sw_wrtsh sw_inc NULL -sw sw\source\core\attr nmake - all sw_attr sw_inc NULL -sw sw\source\core\crsr nmake - all sw_crsr sw_inc NULL -sw sw\source\core\doc nmake - all sw_doc sw_inc NULL -sw sw\source\core\docnode nmake - all sw_dcnd sw_inc NULL -sw sw\source\core\draw nmake - all sw_draw sw_inc NULL -sw sw\source\core\edit nmake - all sw_edit sw_inc NULL -sw sw\source\core\except nmake - all sw_excpt sw_inc NULL -sw sw\source\core\fields nmake - all sw_fld sw_inc NULL -sw sw\source\core\frmedt nmake - all sw_frmed sw_inc NULL -sw sw\source\core\graphic nmake - all sw_grph sw_inc NULL -sw sw\source\core\layout nmake - all sw_layo sw_inc NULL -sw sw\source\core\ole nmake - all sw_ole sw_inc NULL -sw sw\source\core\para nmake - all sw_para sw_inc NULL -sw sw\source\core\sw3io nmake - all sw_sw3io sw_inc NULL -sw sw\source\core\swg nmake - all sw_swg sw_inc NULL -sw sw\source\core\text nmake - all sw_text sw_inc NULL -sw sw\source\core\tox nmake - all sw_tox sw_inc NULL -sw sw\source\core\txtnode nmake - all sw_txtnd sw_inc NULL -sw sw\source\core\undo nmake - all sw_undo sw_inc NULL -sw sw\source\core\view nmake - all sw_view sw_inc NULL -sw sw\source\core\unocore nmake - all sw_uco sw_inc NULL -sw sw\source\core\objectpositioning nmake - all sw_objpos sw_inc NULL -sw sw\source\core\access nmake - all sw_acc sw_inc NULL -sw sw\source\core\SwNumberTree nmake - all sw_NumberTree sw_inc NULL -sw sw\source\core\table nmake - all sw_tablecore sw_inc NULL -sw sw\source\filter\ascii nmake - all sw_ascii sw_inc NULL -sw sw\source\filter\basflt nmake - all sw_bsflt sw_inc NULL -sw sw\source\filter\html nmake - all sw_html sw_inc NULL -sw sw\source\filter\rtf nmake - all sw_rtf sw_inc NULL -sw sw\source\filter\writer nmake - all sw_wrtr sw_inc NULL -sw sw\source\filter\ww1 nmake - all sw_ww1 sw_inc NULL -sw sw\source\filter\ww8 nmake - all sw_ww8 sw_inc NULL -sw sw\source\filter\xml nmake - all sw_xml sw_inc NULL -sw sw\source\ui nmake - all sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wrtsh sw_smartmenu sw_vba NULL -sw sw\source\core nmake - all sw_core sw_attr sw_bast sw_crsr sw_dcnd sw_doc sw_draw sw_edit sw_excpt sw_fld sw_frmed sw_grph sw_layo sw_ole sw_para sw_sw3io sw_swg sw_text sw_tox sw_txtnd sw_uco sw_undo sw_view sw_acc sw_objpos sw_NumberTree sw_tablecore NULL -sw sw\source\filter nmake - all sw_flt sw_ascii sw_bsflt sw_html sw_rtf sw_wrtr sw_ww1 sw_ww8 sw_xml NULL -sw sw\util nmake - all sw_util sw_core sw_flt sw_sdi sw_ui NULL +sw sw : l10n connectivity OOo:writerperfect svx stoc uui writerfilter filter oovbaapi cui vbahelper NULL +sw sw usr1 - all sw_mkout NULL +sw sw\prj nmake - all sw_prj NULL diff --git a/sw/prj/d.lst b/sw/prj/d.lst index ed58b3140762..8b137891791f 100644 --- a/sw/prj/d.lst +++ b/sw/prj/d.lst @@ -1,114 +1 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %_DEST%\inc%_EXT%\sw -mkdir: %_DEST%\xml%_EXT%\uiconfig -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\accelerator -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\accelerator -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\accelerator -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\accelerator -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\accelerator -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\accelerator -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\accelerator\en-US -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\accelerator\de -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\accelerator\es -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\accelerator\fr -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\accelerator\en-US -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\accelerator\de -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\accelerator\es -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\accelerator\fr -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\accelerator\en-US -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\accelerator\de -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\accelerator\es -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\accelerator\fr -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\accelerator\en-US -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\accelerator\de -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\accelerator\es -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\accelerator\fr -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\accelerator\en-US -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\accelerator\de -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\accelerator\es -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\accelerator\fr -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\accelerator\en-US -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\accelerator\de -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\accelerator\es -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\accelerator\fr -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\xml\*.xml %_DEST%\xml%_EXT%\*.xml -..\%__SRC%\bin\sw?????.dll %_DEST%\bin%_EXT%\sw?????.dll -..\%__SRC%\bin\swd?????.dll %_DEST%\bin%_EXT%\swd?????.dll -..\%__SRC%\bin\swui?????.dll %_DEST%\bin%_EXT%\swui?????.dll -..\%__SRC%\bin\msword?????.dll %_DEST%\bin%_EXT%\msword?????.dll -..\%__SRC%\bin\vbaswobj*.dll %_DEST%\bin%_EXT%\vbaswobj*.dll -..\%__SRC%\bin\sw*.res %_DEST%\bin%_EXT%\sw*.res -..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* -..\%__SRC%\lib\vbaswobj* %_DEST%\lib%_EXT%\vbaswobj* - -..\uiconfig\swriter\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\menubar\*.xml -..\uiconfig\swxform\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\menubar\*.xml -..\uiconfig\sweb\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\menubar\*.xml -..\uiconfig\sglobal\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\menubar\*.xml -..\uiconfig\swform\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\menubar\*.xml -..\uiconfig\swreport\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\menubar\*.xml -..\uiconfig\swriter\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\toolbar\*.xml -..\uiconfig\swxform\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\toolbar\*.xml -..\uiconfig\sweb\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\toolbar\*.xml -..\uiconfig\sglobal\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\toolbar\*.xml -..\uiconfig\swform\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\toolbar\*.xml -..\uiconfig\swreport\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\toolbar\*.xml -..\uiconfig\swriter\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\accelerator\en-US\*.xml -..\uiconfig\swriter\accelerator\de\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\accelerator\de\*.xml -..\uiconfig\swriter\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\accelerator\es\*.xml -..\uiconfig\swriter\accelerator\fr\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\accelerator\fr\*.xml -..\uiconfig\swxform\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\accelerator\en-US\*.xml -..\uiconfig\swxform\accelerator\de\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\accelerator\de\*.xml -..\uiconfig\swxform\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\accelerator\es\*.xml -..\uiconfig\swxform\accelerator\fr\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\accelerator\fr\*.xml -..\uiconfig\sweb\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\accelerator\en-US\*.xml -..\uiconfig\sweb\accelerator\de\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\accelerator\de\*.xml -..\uiconfig\sweb\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\accelerator\es\*.xml -..\uiconfig\sweb\accelerator\fr\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\accelerator\fr\*.xml -..\uiconfig\sglobal\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\accelerator\en-US\*.xml -..\uiconfig\sglobal\accelerator\de\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\accelerator\de\*.xml -..\uiconfig\sglobal\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\accelerator\es\*.xml -..\uiconfig\sglobal\accelerator\fr\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\accelerator\fr\*.xml -..\uiconfig\swform\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\accelerator\en-US\*.xml -..\uiconfig\swform\accelerator\de\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\accelerator\de\*.xml -..\uiconfig\swform\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\accelerator\es\*.xml -..\uiconfig\swform\accelerator\fr\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\accelerator\fr\*.xml -..\uiconfig\swreport\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\accelerator\en-US\*.xml -..\uiconfig\swreport\accelerator\de\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\accelerator\de\*.xml -..\uiconfig\swreport\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\accelerator\es\*.xml -..\uiconfig\swreport\accelerator\fr\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\accelerator\fr\*.xml -..\uiconfig\swriter\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\statusbar\*.xml -..\uiconfig\swxform\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\statusbar\*.xml -..\uiconfig\sweb\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\statusbar\*.xml -..\uiconfig\sglobal\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\statusbar\*.xml -..\uiconfig\swform\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\statusbar\*.xml -..\uiconfig\swreport\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar\*.xml - -..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.* -- cgit From aae5258d7bc65ccb49afff4d08762338009394f8 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 21 Apr 2010 14:55:42 +0200 Subject: CWS gnumake2: not using implicit rules --- sw/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/prj/makefile.mk b/sw/prj/makefile.mk index a5f9aa9d8248..2a0b99e72fd5 100644 --- a/sw/prj/makefile.mk +++ b/sw/prj/makefile.mk @@ -1,2 +1,2 @@ all: - cd .. && make -sj9 + cd .. && make -srj9 -- cgit From 2ec0d2a2e2859c465109e28f1e8894794b17aad1 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 22 Apr 2010 18:36:39 +0200 Subject: CWS gnumake2: Sdi deps should work now --- sw/prj/target_lib_sw.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sw/prj/target_lib_sw.mk b/sw/prj/target_lib_sw.mk index 17152c67f7cf..5392ad6276b3 100644 --- a/sw/prj/target_lib_sw.mk +++ b/sw/prj/target_lib_sw.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_Library,sw)) $(call gb_Library_get_headers_target,sw) : $(call gb_SdiTarget_get_target,sw/sdi/swslots) +$(call gb_SdiTarget_get_target,sw/sdi/swslots) :| $(call gb_Library_get_external_headers_target,sw) $(call gb_Library_get_clean_target,sw) : $(call gb_SdiTarget_get_clean_target,sw/sdi/swslots) $(eval $(call gb_Library_set_include,sw,\ @@ -734,6 +735,7 @@ endif $(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter)) + $(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\ $$(INCLUDE) \ -I$(SRCDIR)/sw/inc \ -- cgit From 6a8e21e6c2b25631f1492c22bb1057c0120fc4ae Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 23 Apr 2010 15:15:43 +0200 Subject: CWS gnumake2: added cnvenience methods for adding package and sdi headers --- sw/prj/target_lib_sw.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sw/prj/target_lib_sw.mk b/sw/prj/target_lib_sw.mk index 5392ad6276b3..7f9cfd297113 100644 --- a/sw/prj/target_lib_sw.mk +++ b/sw/prj/target_lib_sw.mk @@ -27,9 +27,7 @@ $(eval $(call gb_Library_Library,sw)) -$(call gb_Library_get_headers_target,sw) : $(call gb_SdiTarget_get_target,sw/sdi/swslots) -$(call gb_SdiTarget_get_target,sw/sdi/swslots) :| $(call gb_Library_get_external_headers_target,sw) -$(call gb_Library_get_clean_target,sw) : $(call gb_SdiTarget_get_clean_target,sw/sdi/swslots) +$(eval $(call gb_Library_add_sdi_headers,sw,sw/sdi/swslots)) $(eval $(call gb_Library_set_include,sw,\ $$(SOLARINC) \ -- cgit From 35f456fad71de5fb75192a956533499509875a33 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 23 Apr 2010 18:14:35 +0200 Subject: gnumake2: lib_vbaswobj: remove obsolete header gen; guard linux-specific stuff --- sw/prj/target_lib_vbaswobj.mk | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/sw/prj/target_lib_vbaswobj.mk b/sw/prj/target_lib_vbaswobj.mk index 5e65b253bd47..dc47290491c9 100644 --- a/sw/prj/target_lib_vbaswobj.mk +++ b/sw/prj/target_lib_vbaswobj.mk @@ -45,12 +45,6 @@ $(eval $(call gb_Library_set_defs,vbaswobj,\ -DVBA_OOBUILD_HACK \ )) -$(eval $(call gb_Library_set_ldflags,vbaswobj,\ - $$(LDFLAGS) \ - -Wl$(COMMA)-O1 \ - -Wl$(COMMA)-z$(COMMA)noexecstack \ -)) - $(eval $(call gb_Library_add_linked_libs,vbaswobj,\ comphelper \ cppu \ @@ -120,15 +114,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaswobj,\ sw/source/ui/vba/wordvbahelper \ )) -$(call gb_Library_get_headers_target,vbaswobj) : $(WORKDIR)/CppuUnpack/vbaswobj -$(call gb_Library_get_clean_target,vbaswobj) : $(WORKDIR)/Clean/CppuUnpack/vbaswobj - -.PHONY : $(WORKDIR)/Clean/CppuUnpack/vbaswobj -$(WORKDIR)/Clean/CppuUnpack/vbaswobj : - -$(call gb_Helper_abbreviate_dirs,\ - rm -rf $(WORKDIR)/inc/sw/vbaswobj $(WORKDIR)/CppuUnpack/vbaswobj) - -$(WORKDIR)/CppuUnpack/vbaswobj : | $(gb_CppuTarget_CPPUMAKERTARGET) - $(call gb_Helper_abbreviate_dirs,\ - $(gb_CppuTarget_CPPUMAKERCOMMAND) -O$(WORKDIR)/inc/sw/vbaswobj -BUCR $(OUTDIR)/bin/oovbaapi.rdb -X$(OUTDIR)/bin/types.rdb && mkdir -p $(dir $@) && touch $@) +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_set_ldflags,vbaswobj,\ + $$(LDFLAGS) \ + -Wl$(COMMA)-O1 \ + -Wl$(COMMA)-z$(COMMA)noexecstack \ +)) +endif -- cgit From 9049ab4475a2094382457c9425fd0f23879c3789 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 23 Apr 2010 18:15:36 +0200 Subject: gnumake2: replace $() command expansion with `` --- sw/prj/target_lib_swui.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/prj/target_lib_swui.mk b/sw/prj/target_lib_swui.mk index 7aedf260dc02..7a2fba5f96ac 100644 --- a/sw/prj/target_lib_swui.mk +++ b/sw/prj/target_lib_swui.mk @@ -168,7 +168,7 @@ $(eval $(call gb_Library_add_exception_objects,swui,\ $(WORKDIR)/inc/sw/swuilib.hxx : $(call gb_Helper_announce,Creating swuilib.hxx ...) - mkdir -p $$(dirname $@) && echo "#define DLL_NAME \"$(notdir $(call gb_Library_get_target,swui))\"" > $@ + mkdir -p `dirname $@` && echo "#define DLL_NAME \"$(notdir $(call gb_Library_get_target,swui))\"" > $@ .PHONY : $(WORKDIR)/Clean/inc/sw/swuilib.hxx $(WORKDIR)/Clean/inc/sw/swuilib.hxx : -- cgit From 7e94829cb910f8c2d4419e541cd7754c7d86994a Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 24 Apr 2010 00:09:05 +0200 Subject: CWS gnumake2: avoid export of template symbols --- starmath/source/smdetect.cxx | 16 ++++++---------- sw/source/ui/uno/swdetect.cxx | 13 ++++++------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index aef4df112431..df49bf57205a 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -30,7 +30,7 @@ #include "smdetect.hxx" -#include +//#include #include #include #include @@ -274,20 +274,16 @@ SmFilterDetect::~SmFilterDetect() if ( !bRepairPackage ) { // ask the user whether he wants to try to repair - RequestPackageReparation* pRequest = new RequestPackageReparation( aDocumentTitle ); - uno::Reference< task::XInteractionRequest > xRequest ( pRequest ); - - xInteraction->handle( xRequest ); - - bRepairAllowed = pRequest->isApproved(); + RequestPackageReparation aRequest( aDocumentTitle ); + xInteraction->handle( aRequest.GetRequest() ); + bRepairAllowed = aRequest.isApproved(); } if ( !bRepairAllowed ) { // repair either not allowed or not successful - NotifyBrokenPackage* pNotifyRequest = new NotifyBrokenPackage( aDocumentTitle ); - uno::Reference< task::XInteractionRequest > xRequest ( pNotifyRequest ); - xInteraction->handle( xRequest ); + NotifyBrokenPackage aNotifyRequest( aDocumentTitle ); + xInteraction->handle( aNotifyRequest.GetRequest() ); } } diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index c33d7428b630..4b86b9f76add 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -278,18 +278,17 @@ SwFilterDetect::~SwFilterDetect() if ( !bRepairPackage ) { // ask the user whether he wants to try to repair - RequestPackageReparation* pRequest = new RequestPackageReparation( aDocumentTitle ); - uno::Reference< task::XInteractionRequest > xRequest ( pRequest ); - xInteraction->handle( xRequest ); - bRepairAllowed = pRequest->isApproved(); + RequestPackageReparation aRequest( aDocumentTitle ); + xInteraction->handle( aRequest.GetRequest() ); + bRepairAllowed = aRequest.isApproved(); } if ( !bRepairAllowed ) { // repair either not allowed or not successful - NotifyBrokenPackage* pNotifyRequest = new NotifyBrokenPackage( aDocumentTitle ); - uno::Reference< task::XInteractionRequest > xRequest ( pNotifyRequest ); - xInteraction->handle( xRequest ); + // repair either not allowed or not successful + NotifyBrokenPackage aNotifyRequest( aDocumentTitle ); + xInteraction->handle( aNotifyRequest.GetRequest() ); rtl::Reference< ::comphelper::OIHWrapNoFilterDialog > xHandler = new ::comphelper::OIHWrapNoFilterDialog( xInteraction ); if ( nIndexOfInteractionHandler != -1 ) -- cgit From bb3d06207441361da9a291668bb1b1d8effad795 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 27 Apr 2010 11:39:42 +0200 Subject: CWS gnumake2: refactoring --- sw/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sw/Makefile b/sw/Makefile index d020b04dba7c..9ab4b8ba83f4 100644 --- a/sw/Makefile +++ b/sw/Makefile @@ -25,6 +25,12 @@ # #************************************************************************* -include ../solenv/inc/gbuild.mk +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) + +gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) + +$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) + +# vim: set noet sw=4 ts=4: -- cgit From 5dfd561343763aad6f204b164ed2547b4ae86424 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 30 Apr 2010 17:40:00 +0200 Subject: gnumake2: always compile debug files, wrap them in DBG_UTIL --- sw/prj/target_lib_sw.mk | 4 ++++ sw/prj/target_lib_swd.mk | 1 + sw/source/core/except/dbgloop.cxx | 6 +++--- sw/source/core/except/errhdl.cxx | 4 ++++ sw/source/core/layout/dbg_lay.cxx | 3 +++ sw/source/core/text/txtio.cxx | 6 ++---- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/sw/prj/target_lib_sw.mk b/sw/prj/target_lib_sw.mk index 7f9cfd297113..95509f0014d3 100644 --- a/sw/prj/target_lib_sw.mk +++ b/sw/prj/target_lib_sw.mk @@ -709,6 +709,10 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/ui/wrtsh/wrtsh3 \ sw/source/ui/wrtsh/wrtsh4 \ sw/source/ui/wrtsh/wrtundo \ + sw/source/core/except/errhdl \ + sw/source/core/except/dbgloop \ + sw/source/core/layout/dbg_lay \ + sw/source/core/text/txtio \ )) ifeq ($(OS),LINUX) diff --git a/sw/prj/target_lib_swd.mk b/sw/prj/target_lib_swd.mk index 9d493c0bce98..1d185e8f4267 100644 --- a/sw/prj/target_lib_swd.mk +++ b/sw/prj/target_lib_swd.mk @@ -61,6 +61,7 @@ $(eval $(call gb_Library_add_linked_libs,swd,\ )) $(eval $(call gb_Library_add_exception_objects,swd,\ + sw/source/core/except/errhdl \ sw/source/filter/basflt/iodetect \ sw/source/ui/uno/detreg \ sw/source/ui/uno/swdet2 \ diff --git a/sw/source/core/except/dbgloop.cxx b/sw/source/core/except/dbgloop.cxx index e581758d5d84..c48c9e5d53bb 100644 --- a/sw/source/core/except/dbgloop.cxx +++ b/sw/source/core/except/dbgloop.cxx @@ -28,9 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#ifndef DBG_UTIL -#error Wer fummelt denn an den makefiles rum? -#endif +#ifdef DBG_UTIL + #include #include "dbgloop.hxx" #include "errhdl.hxx" @@ -165,4 +164,5 @@ int main() } #endif +#endif // DBG_UTIL diff --git a/sw/source/core/except/errhdl.cxx b/sw/source/core/except/errhdl.cxx index 6a36186eb439..b605523cf12e 100644 --- a/sw/source/core/except/errhdl.cxx +++ b/sw/source/core/except/errhdl.cxx @@ -27,6 +27,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" + +#ifdef DBG_UTIL + #define _ERRHDL_CXX @@ -138,4 +141,5 @@ void AssertFail( USHORT nErrorId, const sal_Char* pFileName, USHORT nLine ) AssertFail( pMsg, pFileName, nLine ); } +#endif // DBG_UTIL diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index ca2f9f748145..901050414774 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -28,6 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" +#ifdef DBG_UTIL + /* -----------------08.01.99 14:55------------------- * Und hier die Beschreibung: * @@ -863,4 +865,5 @@ void SwFrmChangesLeave::Leave() SwProtocol::Record( pFrm, PROT_FRMCHANGES, 0, &aFrm ); } +#endif // DBG_UTIL diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx index b1996905935f..535c998b4cba 100644 --- a/sw/source/core/text/txtio.cxx +++ b/sw/source/core/text/txtio.cxx @@ -28,10 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" - -#ifndef DBG_UTIL -#error Wer fummelt denn an den makefiles? -#endif +#ifdef DBG_UTIL #include "viewsh.hxx" // IsDbg() #include "viewopt.hxx" // IsDbg() @@ -946,4 +943,5 @@ SvStream &SwDropPortion::operator<<( SvStream &rOs ) const //$ ostream #endif /* OSL_DEBUG_LEVEL */ +#endif // DBG_UTIL -- cgit From cb4f0e685032b29b5db2d4beb5051b66d846273b Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 5 May 2010 14:51:35 +0200 Subject: CWS gnumake2: fixes for win --- sw/prj/target_lib_sw.mk | 8 ++++---- sw/prj/target_lib_vbaswobj.mk | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/sw/prj/target_lib_sw.mk b/sw/prj/target_lib_sw.mk index 95509f0014d3..a3fcc4a5fd80 100644 --- a/sw/prj/target_lib_sw.mk +++ b/sw/prj/target_lib_sw.mk @@ -30,14 +30,14 @@ $(eval $(call gb_Library_Library,sw)) $(eval $(call gb_Library_add_sdi_headers,sw,sw/sdi/swslots)) $(eval $(call gb_Library_set_include,sw,\ - $$(SOLARINC) \ - -I$(WORKDIR)/inc/sw/sdi \ - -I$(WORKDIR)/inc/sw/ \ - -I$(SRCDIR)/sw/inc \ -I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/source/filter/inc \ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc/pch \ + -I$(SRCDIR)/sw/inc \ + -I$(WORKDIR)/inc/sw/sdi \ + -I$(WORKDIR)/inc/sw/ \ + $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) diff --git a/sw/prj/target_lib_vbaswobj.mk b/sw/prj/target_lib_vbaswobj.mk index dc47290491c9..ee8cf2440f40 100644 --- a/sw/prj/target_lib_vbaswobj.mk +++ b/sw/prj/target_lib_vbaswobj.mk @@ -122,3 +122,14 @@ $(eval $(call gb_Library_set_ldflags,vbaswobj,\ )) endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,vbaswobj,\ + advapi32 \ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: -- cgit From def4ac30a3f31a3e7c1c34b699a684eb2228bcda Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 19 May 2010 20:15:06 +0200 Subject: CWS gnumake2: minor fixes --- sw/prj/target_lib_sw.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/prj/target_lib_sw.mk b/sw/prj/target_lib_sw.mk index a3fcc4a5fd80..261dc3c75b4a 100644 --- a/sw/prj/target_lib_sw.mk +++ b/sw/prj/target_lib_sw.mk @@ -739,8 +739,8 @@ $(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter)) $(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\ - $$(INCLUDE) \ -I$(SRCDIR)/sw/inc \ -I$(SRCDIR)/sw/sdi \ + $$(INCLUDE) \ )) # vim: set noet sw=4 ts=4: -- cgit From 0d34f2aab05ad2123b82f280fa61e2dcddb76273 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 28 May 2010 12:41:16 +0200 Subject: CWS gnumake2: l10ntools cleanup to simplify fixing ---------------- CWS gnumake2: l10ntools cleanup to simplify fixing ---------------- CWS gnumake2: l10ntools cleanup to simplify fixing ---------------- CWS gnumake2: l10ntools cleanup to simplify fixing, fixing filename lookup HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Remove all lines to abort the collapse operation. --- sw/prj/target_module_sw.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sw/prj/target_module_sw.mk b/sw/prj/target_module_sw.mk index 20e4944877dd..1ce567c50237 100644 --- a/sw/prj/target_module_sw.mk +++ b/sw/prj/target_module_sw.mk @@ -27,7 +27,8 @@ $(eval $(call gb_Module_Module,sw,\ $(call gb_AllLangResTarget_get_target,sw) \ - $(call gb_Library_get_target,msword) \ +)) +# $(call gb_Library_get_target,msword) \ $(call gb_Library_get_target,sw) \ $(call gb_Library_get_target,swd) \ $(call gb_Library_get_target,swui) \ @@ -35,10 +36,11 @@ $(eval $(call gb_Module_Module,sw,\ $(call gb_Package_get_target,sw_uiconfig) \ $(call gb_Package_get_target,sw_xml) \ $(call gb_Package_get_target,sw_misc) \ -)) $(eval $(call gb_Module_read_includes,sw,\ - lib_sw \ + res_sw \ +)) +# lib_sw \ lib_swd \ lib_swui \ lib_msword \ @@ -46,5 +48,3 @@ $(eval $(call gb_Module_read_includes,sw,\ package_misc \ package_uiconfig \ package_xml \ - res_sw \ -)) -- cgit From 9f218bc0e0deb2d368bdbdddea13cc70a02b24a8 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 28 May 2010 13:17:09 +0200 Subject: CWS gnumake2: reverting accidental modification in sw --- sw/prj/target_module_sw.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sw/prj/target_module_sw.mk b/sw/prj/target_module_sw.mk index 1ce567c50237..20e4944877dd 100644 --- a/sw/prj/target_module_sw.mk +++ b/sw/prj/target_module_sw.mk @@ -27,8 +27,7 @@ $(eval $(call gb_Module_Module,sw,\ $(call gb_AllLangResTarget_get_target,sw) \ -)) -# $(call gb_Library_get_target,msword) \ + $(call gb_Library_get_target,msword) \ $(call gb_Library_get_target,sw) \ $(call gb_Library_get_target,swd) \ $(call gb_Library_get_target,swui) \ @@ -36,11 +35,10 @@ $(eval $(call gb_Module_Module,sw,\ $(call gb_Package_get_target,sw_uiconfig) \ $(call gb_Package_get_target,sw_xml) \ $(call gb_Package_get_target,sw_misc) \ +)) $(eval $(call gb_Module_read_includes,sw,\ - res_sw \ -)) -# lib_sw \ + lib_sw \ lib_swd \ lib_swui \ lib_msword \ @@ -48,3 +46,5 @@ $(eval $(call gb_Module_read_includes,sw,\ package_misc \ package_uiconfig \ package_xml \ + res_sw \ +)) -- cgit From 1921d141cff63af5d9ffc331355ab350bb8f7c10 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 1 Jun 2010 17:28:33 +0200 Subject: CWS gnumake2: fitting sdi into the workdir structure --- sw/prj/target_lib_sw.mk | 4 ++-- sw/prj/target_lib_swui.mk | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sw/prj/target_lib_sw.mk b/sw/prj/target_lib_sw.mk index 261dc3c75b4a..28e0bc45ed0d 100644 --- a/sw/prj/target_lib_sw.mk +++ b/sw/prj/target_lib_sw.mk @@ -35,8 +35,8 @@ $(eval $(call gb_Library_set_include,sw,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc/pch \ -I$(SRCDIR)/sw/inc \ - -I$(WORKDIR)/inc/sw/sdi \ - -I$(WORKDIR)/inc/sw/ \ + -I$(WORKDIR)/SdiTarget/sw/sdi \ + -I$(WORKDIR)/Misc/sw/ \ $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ diff --git a/sw/prj/target_lib_swui.mk b/sw/prj/target_lib_swui.mk index 7a2fba5f96ac..49ca6c01dc98 100644 --- a/sw/prj/target_lib_swui.mk +++ b/sw/prj/target_lib_swui.mk @@ -28,14 +28,14 @@ $(eval $(call gb_Library_Library,swui)) $(eval $(call gb_Library_set_include,swui,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/sw/sdi \ - -I$(WORKDIR)/inc/sw/ \ -I$(SRCDIR)/sw/inc \ -I$(SRCDIR)/sw/inc/pch \ -I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/source/filter/inc \ -I$(SRCDIR)/sw/source/ui/inc \ + -I$(WORKDIR)/SdiTarget/sw/sdi \ + -I$(WORKDIR)/Misc/sw \ + $$(INCLUDE) \ -I$(OUTDIR)/inc/sw \ -I$(OUTDIR)/inc/offuh \ )) @@ -166,21 +166,21 @@ $(eval $(call gb_Library_add_exception_objects,swui,\ sw/source/ui/utlui/swrenamexnameddlg \ )) -$(WORKDIR)/inc/sw/swuilib.hxx : +$(WORKDIR)/Misc/sw/swuilib.hxx : $(call gb_Helper_announce,Creating swuilib.hxx ...) mkdir -p `dirname $@` && echo "#define DLL_NAME \"$(notdir $(call gb_Library_get_target,swui))\"" > $@ -.PHONY : $(WORKDIR)/Clean/inc/sw/swuilib.hxx +.PHONY : $(WORKDIR)/Clean/Misc/sw/swuilib.hxx $(WORKDIR)/Clean/inc/sw/swuilib.hxx : $(call gb_Helper_announce,Cleaning up swuilib.hxx ...) -$(call gb_Helper_abbreviate_dirs,\ rm -f $(WORKDIR)/inc/sw/swuilib.hxx) -$(call gb_CxxObject_get_dep_target,sw/source/ui/dialog/swabstdlg) : $(WORKDIR)/inc/sw/swuilib.hxx -$(call gb_CxxObject_get_target,sw/source/ui/dialog/swabstdlg) : $(WORKDIR)/inc/sw/swuilib.hxx +$(call gb_CxxObject_get_dep_target,sw/source/ui/dialog/swabstdlg) : $(WORKDIR)/Misc/sw/swuilib.hxx +$(call gb_CxxObject_get_target,sw/source/ui/dialog/swabstdlg) : $(WORKDIR)/Misc/sw/swuilib.hxx -$(call gb_Library_get_clean_target,swui) : $(WORKDIR)/Clean/inc/sw/swuilib.hxx +$(call gb_Library_get_clean_target,swui) : $(WORKDIR)/Clean/Misc/sw/swuilib.hxx ifeq ($(OS),WNT) $(eval $(call gb_Library_add_linked_libs,swui,\ -- cgit From 964eb7decfe7898c6e0518bf99fb2a9790ffecef Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 3 Jun 2010 14:40:35 +0200 Subject: CWS gnumake2: fixing swui cleanup --- sw/prj/target_lib_swui.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sw/prj/target_lib_swui.mk b/sw/prj/target_lib_swui.mk index 49ca6c01dc98..e33956b9f400 100644 --- a/sw/prj/target_lib_swui.mk +++ b/sw/prj/target_lib_swui.mk @@ -171,13 +171,13 @@ $(WORKDIR)/Misc/sw/swuilib.hxx : mkdir -p `dirname $@` && echo "#define DLL_NAME \"$(notdir $(call gb_Library_get_target,swui))\"" > $@ .PHONY : $(WORKDIR)/Clean/Misc/sw/swuilib.hxx -$(WORKDIR)/Clean/inc/sw/swuilib.hxx : +$(WORKDIR)/Clean/Misc/sw/swuilib.hxx : $(call gb_Helper_announce,Cleaning up swuilib.hxx ...) -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(WORKDIR)/inc/sw/swuilib.hxx) + rm -f $(WORKDIR)/Misc/sw/swuilib.hxx) -$(call gb_CxxObject_get_dep_target,sw/source/ui/dialog/swabstdlg) : $(WORKDIR)/Misc/sw/swuilib.hxx +$(call gb_CxxObject_get_dep_target,sw/source/ui/dialog/swabstdlg) \ $(call gb_CxxObject_get_target,sw/source/ui/dialog/swabstdlg) : $(WORKDIR)/Misc/sw/swuilib.hxx $(call gb_Library_get_clean_target,swui) : $(WORKDIR)/Clean/Misc/sw/swuilib.hxx -- cgit From 155250b64550030864994a1fee40132944b7cac6 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 3 Jun 2010 17:58:18 +0200 Subject: CWS gnumake2: getting rid of swuilib.hxx hack --- sw/prj/target_lib_swui.mk | 16 ---------------- sw/source/ui/dialog/makefile.mk | 20 -------------------- sw/source/ui/dialog/swabstdlg.cxx | 5 +++-- 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/sw/prj/target_lib_swui.mk b/sw/prj/target_lib_swui.mk index e33956b9f400..12227c9a0ae8 100644 --- a/sw/prj/target_lib_swui.mk +++ b/sw/prj/target_lib_swui.mk @@ -166,22 +166,6 @@ $(eval $(call gb_Library_add_exception_objects,swui,\ sw/source/ui/utlui/swrenamexnameddlg \ )) -$(WORKDIR)/Misc/sw/swuilib.hxx : - $(call gb_Helper_announce,Creating swuilib.hxx ...) - mkdir -p `dirname $@` && echo "#define DLL_NAME \"$(notdir $(call gb_Library_get_target,swui))\"" > $@ - -.PHONY : $(WORKDIR)/Clean/Misc/sw/swuilib.hxx -$(WORKDIR)/Clean/Misc/sw/swuilib.hxx : - $(call gb_Helper_announce,Cleaning up swuilib.hxx ...) - -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(WORKDIR)/Misc/sw/swuilib.hxx) - - -$(call gb_CxxObject_get_dep_target,sw/source/ui/dialog/swabstdlg) \ -$(call gb_CxxObject_get_target,sw/source/ui/dialog/swabstdlg) : $(WORKDIR)/Misc/sw/swuilib.hxx - -$(call gb_Library_get_clean_target,swui) : $(WORKDIR)/Clean/Misc/sw/swuilib.hxx - ifeq ($(OS),WNT) $(eval $(call gb_Library_add_linked_libs,swui,\ advapi32 \ diff --git a/sw/source/ui/dialog/makefile.mk b/sw/source/ui/dialog/makefile.mk index 54b7784946e8..35bc3022909e 100644 --- a/sw/source/ui/dialog/makefile.mk +++ b/sw/source/ui/dialog/makefile.mk @@ -81,23 +81,3 @@ LIB1OBJFILES = \ # --- Tagets ------------------------------------------------------- .INCLUDE : target.mk -$(INCCOM)$/swuilib.hxx: makefile.mk -.IF "$(GUI)"=="UNX" - $(RM) $@ - echo \#define DLL_NAME \"libswui$(DLLPOSTFIX)$(DLLPOST)\" >$@ -.ELSE -.IF "$(USE_SHELL)"!="4nt" - echo \#define DLL_NAME \"swui$(DLLPOSTFIX)$(DLLPOST)\" >$@ -.ELSE # "$(USE_SHELL)"!="4nt" - echo #define DLL_NAME "swui$(DLLPOSTFIX)$(DLLPOST)" >$@ -.ENDIF # "$(USE_SHELL)"!="4nt" -.ENDIF - -$(SLO)$/swabstdlg.obj : $(INCCOM)$/swuilib.hxx - - - - - - - diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/ui/dialog/swabstdlg.cxx index a39c1866b717..b873d8028024 100644 --- a/sw/source/ui/dialog/swabstdlg.cxx +++ b/sw/source/ui/dialog/swabstdlg.cxx @@ -29,10 +29,10 @@ #include "precompiled_sw.hxx" #include "swabstdlg.hxx" -#include "swuilib.hxx" #include #include +#include typedef SwAbstractDialogFactory* (__LOADONCALLAPI *SwFuncPtrCreateDialogFactory)(); @@ -42,7 +42,8 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create() { SwFuncPtrCreateDialogFactory fp = 0; static ::osl::Module aDialogLibrary; - if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) ) + static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("swui", TRUE)); + if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( sLibName ) ) ) fp = ( SwAbstractDialogFactory* (__LOADONCALLAPI*)() ) aDialogLibrary.getFunctionSymbol( ::rtl::OUString::createFromAscii("CreateDialogFactory") ); if ( fp ) -- cgit From 331210d4b90e96706b79e3b1158710391664515f Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 11 Jun 2010 18:39:05 +0200 Subject: CWS gnumake2: more work on precompiled headers --- sw/prj/target_module_sw.mk | 10 ++++++---- sw/prj/target_pch_sw.mk | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) mode change 100644 => 100755 sw/prj/target_module_sw.mk create mode 100755 sw/prj/target_pch_sw.mk diff --git a/sw/prj/target_module_sw.mk b/sw/prj/target_module_sw.mk old mode 100644 new mode 100755 index 20e4944877dd..cb9433eb44e1 --- a/sw/prj/target_module_sw.mk +++ b/sw/prj/target_module_sw.mk @@ -26,7 +26,9 @@ #************************************************************************* $(eval $(call gb_Module_Module,sw,\ - $(call gb_AllLangResTarget_get_target,sw) \ + $(call gb_PrecompiledHeader_get_target,precompiled_sw) \ +)) + #$(call gb_AllLangResTarget_get_target,sw) \ $(call gb_Library_get_target,msword) \ $(call gb_Library_get_target,sw) \ $(call gb_Library_get_target,swd) \ @@ -35,10 +37,11 @@ $(eval $(call gb_Module_Module,sw,\ $(call gb_Package_get_target,sw_uiconfig) \ $(call gb_Package_get_target,sw_xml) \ $(call gb_Package_get_target,sw_misc) \ -)) $(eval $(call gb_Module_read_includes,sw,\ - lib_sw \ + pch_sw \ +)) + #lib_sw \ lib_swd \ lib_swui \ lib_msword \ @@ -47,4 +50,3 @@ $(eval $(call gb_Module_read_includes,sw,\ package_uiconfig \ package_xml \ res_sw \ -)) diff --git a/sw/prj/target_pch_sw.mk b/sw/prj/target_pch_sw.mk new file mode 100755 index 000000000000..1ef7f12f0a3b --- /dev/null +++ b/sw/prj/target_pch_sw.mk @@ -0,0 +1,41 @@ +#************************************************************************* +# +# 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_PrecompiledHeader_PrecompiledHeader,precompiled_sw,$(SRCDIR)/sw/inc/pch/precompiled_sw)) + +$(eval $(call gb_PrecompiledHeader_set_include,precompiled_sw,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_PrecompiledHeader_set_defs,precompiled_sw,\ + $$(DEFS) \ + -DACCESSIBLE_LAYOUT \ +)) + +# vim: set noet sw=4 ts=4: -- cgit From f6e1fa452313e3916f6bae5ab6c2c07141b34934 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 16 Jun 2010 16:10:59 +0200 Subject: CWS gnumake2: simplified pch, integrated with linktarget --- sw/prj/target_lib_sw.mk | 2 ++ sw/prj/target_module_sw.mk | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sw/prj/target_lib_sw.mk b/sw/prj/target_lib_sw.mk index 28e0bc45ed0d..ddd2f4507110 100644 --- a/sw/prj/target_lib_sw.mk +++ b/sw/prj/target_lib_sw.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,sw)) $(eval $(call gb_Library_add_sdi_headers,sw,sw/sdi/swslots)) +$(eval $(call gb_Library_add_precompiled_header,sw,$(SRCDIR)/sw/inc/pch/precompiled_sw)) + $(eval $(call gb_Library_set_include,sw,\ -I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/source/filter/inc \ diff --git a/sw/prj/target_module_sw.mk b/sw/prj/target_module_sw.mk index cb9433eb44e1..20e4944877dd 100755 --- a/sw/prj/target_module_sw.mk +++ b/sw/prj/target_module_sw.mk @@ -26,9 +26,7 @@ #************************************************************************* $(eval $(call gb_Module_Module,sw,\ - $(call gb_PrecompiledHeader_get_target,precompiled_sw) \ -)) - #$(call gb_AllLangResTarget_get_target,sw) \ + $(call gb_AllLangResTarget_get_target,sw) \ $(call gb_Library_get_target,msword) \ $(call gb_Library_get_target,sw) \ $(call gb_Library_get_target,swd) \ @@ -37,11 +35,10 @@ $(eval $(call gb_Module_Module,sw,\ $(call gb_Package_get_target,sw_uiconfig) \ $(call gb_Package_get_target,sw_xml) \ $(call gb_Package_get_target,sw_misc) \ +)) $(eval $(call gb_Module_read_includes,sw,\ - pch_sw \ -)) - #lib_sw \ + lib_sw \ lib_swd \ lib_swui \ lib_msword \ @@ -50,3 +47,4 @@ $(eval $(call gb_Module_read_includes,sw,\ package_uiconfig \ package_xml \ res_sw \ +)) -- cgit From 10572ecb72031ed14674e51da33350f287878212 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 18 Jun 2010 13:18:22 +0200 Subject: CWS gnumake2: fixing include path in module sw --- sw/prj/target_lib_msword.mk | 12 ++++++------ sw/prj/target_lib_vbaswobj.mk | 11 +++++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/sw/prj/target_lib_msword.mk b/sw/prj/target_lib_msword.mk index d0499d72cd4d..eb891976fcc2 100644 --- a/sw/prj/target_lib_msword.mk +++ b/sw/prj/target_lib_msword.mk @@ -28,16 +28,16 @@ $(eval $(call gb_Library_Library,msword)) $(eval $(call gb_Library_set_include,msword,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/sw/sdi \ - -I$(WORKDIR)/inc/sw/ \ - -I$(SRCDIR)/sw/inc \ - -I$(SRCDIR)/sw/inc/pch \ -I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/source/filter/inc \ - -I$(OUTDIR)/inc/sw \ + -I$(SRCDIR)/sw/inc/pch \ + -I$(SRCDIR)/sw/inc \ + -I$(WORKDIR)/inc/sw/sdi \ + -I$(WORKDIR)/Misc/sw/ \ + $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/sw \ )) $(eval $(call gb_Library_set_defs,msword,\ diff --git a/sw/prj/target_lib_vbaswobj.mk b/sw/prj/target_lib_vbaswobj.mk index ee8cf2440f40..a6d20bd530cc 100644 --- a/sw/prj/target_lib_vbaswobj.mk +++ b/sw/prj/target_lib_vbaswobj.mk @@ -28,16 +28,15 @@ $(eval $(call gb_Library_Library,vbaswobj)) $(eval $(call gb_Library_set_include,vbaswobj,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/sw/vbaswobj \ - -I$(WORKDIR)/inc/sw/ \ - -I$(SRCDIR)/sw/inc \ - -I$(SRCDIR)/sw/inc/pch \ -I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/source/filter/inc \ -I$(SRCDIR)/sw/source/ui/inc \ - -I$(OUTDIR)/inc/sw \ + -I$(SRCDIR)/sw/inc/pch \ + -I$(SRCDIR)/sw/inc \ + -I$(WORKDIR)/Misc/sw/ \ + $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/ \ )) $(eval $(call gb_Library_set_defs,vbaswobj,\ -- cgit From 000dccdad6de998162fcdf942f0e14c729befd44 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 01:29:37 +0200 Subject: CWS gnumake2: module reorg --- sw/AllLangResTarget_sw.mk | 184 ++++++++++ sw/Library_msword.mk | 121 ++++++ sw/Library_sw.mk | 748 ++++++++++++++++++++++++++++++++++++++ sw/Library_swd.mk | 77 ++++ sw/Library_swui.mk | 179 +++++++++ sw/Library_vbaswobj.mk | 134 +++++++ sw/Makefile | 9 +- sw/Module_sw.mk | 42 +++ sw/Package_misc.mk | 30 ++ sw/Package_uiconfig.mk | 281 ++++++++++++++ sw/Package_xml.mk | 29 ++ sw/prj/target_lib_msword.mk | 121 ------ sw/prj/target_lib_sw.mk | 748 -------------------------------------- sw/prj/target_lib_swd.mk | 77 ---- sw/prj/target_lib_swui.mk | 179 --------- sw/prj/target_lib_vbaswobj.mk | 134 ------- sw/prj/target_module_sw.mk | 50 --- sw/prj/target_package_misc.mk | 30 -- sw/prj/target_package_uiconfig.mk | 281 -------------- sw/prj/target_package_xml.mk | 29 -- sw/prj/target_pch_sw.mk | 41 --- sw/prj/target_res_sw.mk | 184 ---------- 22 files changed, 1830 insertions(+), 1878 deletions(-) create mode 100644 sw/AllLangResTarget_sw.mk create mode 100644 sw/Library_msword.mk create mode 100644 sw/Library_sw.mk create mode 100644 sw/Library_swd.mk create mode 100644 sw/Library_swui.mk create mode 100644 sw/Library_vbaswobj.mk create mode 100644 sw/Module_sw.mk create mode 100644 sw/Package_misc.mk create mode 100644 sw/Package_uiconfig.mk create mode 100644 sw/Package_xml.mk delete mode 100644 sw/prj/target_lib_msword.mk delete mode 100644 sw/prj/target_lib_sw.mk delete mode 100644 sw/prj/target_lib_swd.mk delete mode 100644 sw/prj/target_lib_swui.mk delete mode 100644 sw/prj/target_lib_vbaswobj.mk delete mode 100755 sw/prj/target_module_sw.mk delete mode 100644 sw/prj/target_package_misc.mk delete mode 100644 sw/prj/target_package_uiconfig.mk delete mode 100644 sw/prj/target_package_xml.mk delete mode 100755 sw/prj/target_pch_sw.mk delete mode 100644 sw/prj/target_res_sw.mk diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk new file mode 100644 index 000000000000..ba552333d2fa --- /dev/null +++ b/sw/AllLangResTarget_sw.mk @@ -0,0 +1,184 @@ +#************************************************************************* +# +# 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_AllLangResTarget_AllLangResTarget,sw)) + +$(eval $(call gb_AllLangResTarget_add_srs,sw,\ + sw/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,sw/res)) + +$(eval $(call gb_SrsTarget_set_include,sw/res,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(WORKDIR)/inc/sw \ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/source/core/undo \ + -I$(SRCDIR)/sw/source/core/unocore \ + -I$(SRCDIR)/sw/source/ui/chrdlg \ + -I$(SRCDIR)/sw/source/ui/config \ + -I$(SRCDIR)/sw/source/ui/dbui \ + -I$(SRCDIR)/sw/source/ui/dialog \ + -I$(SRCDIR)/sw/source/ui/docvw \ + -I$(SRCDIR)/sw/source/ui/envelp \ + -I$(SRCDIR)/sw/source/ui/fldui \ + -I$(SRCDIR)/sw/source/ui/fmtui \ + -I$(SRCDIR)/sw/source/ui/frmdlg \ + -I$(SRCDIR)/sw/source/ui/globdoc \ + -I$(SRCDIR)/sw/source/ui/inc \ + -I$(SRCDIR)/sw/source/ui/index \ + -I$(SRCDIR)/sw/source/ui/lingu \ + -I$(SRCDIR)/sw/source/ui/misc \ + -I$(SRCDIR)/sw/source/ui/ribbar \ + -I$(SRCDIR)/sw/source/ui/shells \ + -I$(SRCDIR)/sw/source/ui/smartmenu \ + -I$(SRCDIR)/sw/source/ui/table \ + -I$(SRCDIR)/sw/source/ui/uiview \ + -I$(SRCDIR)/sw/source/ui/utlui \ + -I$(SRCDIR)/sw/source/ui/web \ + -I$(SRCDIR)/sw/source/ui/wrtsh \ +)) + +$(eval $(call gb_SrsTarget_add_files,sw/res,\ + sw/source/ui/app/app.src \ + sw/source/ui/app/mn.src \ + sw/source/ui/app/error.src \ + sw/source/ui/dialog/abstract.src \ + sw/source/ui/dialog/ascfldlg.src \ + sw/source/ui/dialog/dialog.src \ + sw/source/ui/dialog/docstdlg.src \ + sw/source/ui/dialog/regionsw.src \ + sw/source/ui/dialog/wordcountdialog.src \ + sw/source/ui/chrdlg/chrdlg.src \ + sw/source/ui/chrdlg/ccoll.src \ + sw/source/ui/chrdlg/drpcps.src \ + sw/source/ui/chrdlg/swbreak.src \ + sw/source/ui/chrdlg/paradlg.src \ + sw/source/ui/chrdlg/numpara.src \ + sw/source/ui/chrdlg/chardlg.src \ + sw/source/ui/config/optcomp.src \ + sw/source/ui/config/optload.src \ + sw/source/ui/config/mailconfigpage.src \ + sw/source/ui/config/redlopt.src \ + sw/source/ui/config/optdlg.src \ + sw/source/ui/dbui/mmpreparemergepage.src \ + sw/source/ui/dbui/mmgreetingspage.src \ + sw/source/ui/dbui/mmmergepage.src \ + sw/source/ui/dbui/mmoutputtypepage.src \ + sw/source/ui/dbui/mmlayoutpage.src \ + sw/source/ui/dbui/mmaddressblockpage.src \ + sw/source/ui/dbui/createaddresslistdialog.src \ + sw/source/ui/dbui/dbtablepreviewdialog.src \ + sw/source/ui/dbui/mmdocselectpage.src \ + sw/source/ui/dbui/customizeaddresslistdialog.src \ + sw/source/ui/dbui/mailmergechildwindow.src \ + sw/source/ui/dbui/mailmergewizard.src \ + sw/source/ui/dbui/dbinsdlg.src \ + sw/source/ui/dbui/selectdbtabledialog.src \ + sw/source/ui/dbui/mmoutputpage.src \ + sw/source/ui/dbui/dbui.src \ + sw/source/ui/dbui/addresslistdialog.src \ + sw/source/ui/dochdl/selglos.src \ + sw/source/ui/dochdl/dochdl.src \ + sw/source/ui/docvw/access.src \ + sw/source/ui/docvw/docvw.src \ + sw/source/ui/envelp/mailmrge.src \ + sw/source/ui/envelp/labprt.src \ + sw/source/ui/envelp/label.src \ + sw/source/ui/envelp/envfmt.src \ + sw/source/ui/envelp/labfmt.src \ + sw/source/ui/envelp/envelp.src \ + sw/source/ui/envelp/envprt.src \ + sw/source/ui/envelp/envlop.src \ + sw/source/ui/fldui/flddok.src \ + sw/source/ui/fldui/changedb.src \ + sw/source/ui/fldui/DropDownFieldDialog.src \ + sw/source/ui/fldui/flddinf.src \ + sw/source/ui/fldui/fldref.src \ + sw/source/ui/fldui/fldtdlg.src \ + sw/source/ui/fldui/fldui.src \ + sw/source/ui/fldui/javaedit.src \ + sw/source/ui/fldui/fldfunc.src \ + sw/source/ui/fldui/inpdlg.src \ + sw/source/ui/fldui/fldvar.src \ + sw/source/ui/fldui/flddb.src \ + sw/source/ui/fmtui/tmpdlg.src \ + sw/source/ui/frmdlg/frmui.src \ + sw/source/ui/frmdlg/cption.src \ + sw/source/ui/frmdlg/column.src \ + sw/source/ui/frmdlg/frmpage.src \ + sw/source/ui/globdoc/globdoc.src \ + sw/source/ui/index/idxmrk.src \ + sw/source/ui/index/cnttab.src \ + sw/source/ui/index/multmrk.src \ + sw/source/ui/lingu/olmenu.src \ + sw/source/ui/misc/docfnote.src \ + sw/source/ui/misc/pgfnote.src \ + sw/source/ui/misc/insfnote.src \ + sw/source/ui/misc/srtdlg.src \ + sw/source/ui/misc/bookmark.src \ + sw/source/ui/misc/glosbib.src \ + sw/source/ui/misc/num.src \ + sw/source/ui/misc/glossary.src \ + sw/source/ui/misc/pggrid.src \ + sw/source/ui/misc/outline.src \ + sw/source/ui/misc/linenum.src \ + sw/source/ui/misc/numberingtypelistbox.src \ + sw/source/ui/misc/redlndlg.src \ + sw/source/ui/misc/insrule.src \ + sw/source/ui/misc/autocorr.src \ + sw/source/ui/ribbar/tbxanchr.src \ + sw/source/ui/ribbar/tblctrl.src \ + sw/source/ui/ribbar/workctrl.src \ + sw/source/ui/ribbar/inputwin.src \ + sw/source/ui/shells/shells.src \ + sw/source/ui/smartmenu/stmenu.src \ + sw/source/ui/table/colwd.src \ + sw/source/ui/table/tautofmt.src \ + sw/source/ui/table/table.src \ + sw/source/ui/table/chartins.src \ + sw/source/ui/table/splittbl.src \ + sw/source/ui/table/rowht.src \ + sw/source/ui/table/instable.src \ + sw/source/ui/table/convert.src \ + sw/source/ui/table/tabledlg.src \ + sw/source/ui/table/mergetbl.src \ + sw/source/ui/uiview/pview.src \ + sw/source/ui/uiview/view.src \ + sw/source/core/undo/undo.src \ + sw/source/core/unocore/unocore.src \ + sw/source/ui/utlui/navipi.src \ + sw/source/ui/utlui/attrdesc.src \ + sw/source/ui/utlui/poolfmt.src \ + sw/source/ui/utlui/initui.src \ + sw/source/ui/utlui/unotools.src \ + sw/source/ui/utlui/utlui.src \ + sw/source/ui/utlui/gloslst.src \ + sw/source/ui/web/web.src \ + sw/source/ui/wrtsh/wrtsh.src \ +)) diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk new file mode 100644 index 000000000000..eb891976fcc2 --- /dev/null +++ b/sw/Library_msword.mk @@ -0,0 +1,121 @@ +#************************************************************************* +# +# 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,msword)) + +$(eval $(call gb_Library_set_include,msword,\ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/ui/inc \ + -I$(SRCDIR)/sw/source/filter/inc \ + -I$(SRCDIR)/sw/inc/pch \ + -I$(SRCDIR)/sw/inc \ + -I$(WORKDIR)/inc/sw/sdi \ + -I$(WORKDIR)/Misc/sw/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/sw \ +)) + +$(eval $(call gb_Library_set_defs,msword,\ + $$(DEFS) \ + -DACCESSIBLE_LAYOUT \ +)) + +$(eval $(call gb_Library_add_linked_libs,msword,\ + basegfx \ + comphelper \ + i18nisolang1 \ + i18nutil \ + icuuc \ + editeng \ + msfilter \ + sfx \ + sot \ + stl \ + svl \ + svt \ + svx \ + svx \ + svxcore \ + sw \ + tk \ + tl \ + ucbhelper \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,msword,\ + sw/source/filter/rtf/rtfatr \ + sw/source/filter/rtf/rtffld \ + sw/source/filter/rtf/rtffly \ + sw/source/filter/rtf/rtfnum \ + sw/source/filter/rtf/rtftbl \ + sw/source/filter/rtf/swparrtf \ + sw/source/filter/rtf/wrtrtf \ + sw/source/filter/ww8/WW8FFData \ + sw/source/filter/ww8/WW8FibData \ + sw/source/filter/ww8/WW8Sttbf \ + sw/source/filter/ww8/WW8TableInfo \ + sw/source/filter/ww8/fields \ + sw/source/filter/ww8/styles \ + sw/source/filter/ww8/tracer \ + sw/source/filter/ww8/writerhelper \ + sw/source/filter/ww8/writerwordglue \ + sw/source/filter/ww8/wrtw8esh \ + sw/source/filter/ww8/wrtw8nds \ + sw/source/filter/ww8/wrtw8num \ + sw/source/filter/ww8/wrtw8sty \ + sw/source/filter/ww8/wrtww8 \ + sw/source/filter/ww8/wrtww8gr \ + sw/source/filter/ww8/ww8atr \ + sw/source/filter/ww8/ww8glsy \ + sw/source/filter/ww8/ww8graf \ + sw/source/filter/ww8/ww8graf2 \ + sw/source/filter/ww8/ww8par \ + sw/source/filter/ww8/ww8par2 \ + sw/source/filter/ww8/ww8par3 \ + sw/source/filter/ww8/ww8par4 \ + sw/source/filter/ww8/ww8par5 \ + sw/source/filter/ww8/ww8par6 \ + sw/source/filter/ww8/ww8scan \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,msword,\ + advapi32 \ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk new file mode 100644 index 000000000000..ddd2f4507110 --- /dev/null +++ b/sw/Library_sw.mk @@ -0,0 +1,748 @@ +#************************************************************************* +# +# 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,sw)) + +$(eval $(call gb_Library_add_sdi_headers,sw,sw/sdi/swslots)) + +$(eval $(call gb_Library_add_precompiled_header,sw,$(SRCDIR)/sw/inc/pch/precompiled_sw)) + +$(eval $(call gb_Library_set_include,sw,\ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/filter/inc \ + -I$(SRCDIR)/sw/source/ui/inc \ + -I$(SRCDIR)/sw/inc/pch \ + -I$(SRCDIR)/sw/inc \ + -I$(WORKDIR)/SdiTarget/sw/sdi \ + -I$(WORKDIR)/Misc/sw/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,sw,\ + $$(DEFS) \ + -DACCESSIBLE_LAYOUT \ + -DSW_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,sw,\ + avmedia \ + basegfx \ + comphelper \ + cppu \ + cppuhelper \ + drawinglayer \ + editeng \ + i18nisolang1 \ + i18nutil \ + icuuc \ + lng \ + sal \ + salhelper \ + sb \ + sfx \ + sot \ + stl \ + svl \ + svt \ + svx \ + svxcore \ + tk \ + tl \ + ucbhelper \ + utl \ + vbahelper \ + vcl \ + vos3 \ + xo \ +)) + +$(eval $(call gb_Library_add_exception_objects,sw,\ + sw/source/core/SwNumberTree/SwNodeNum \ + sw/source/core/SwNumberTree/SwNumberTree \ + sw/source/core/access/acccell \ + sw/source/core/access/acccontext \ + sw/source/core/access/accdoc \ + sw/source/core/access/accembedded \ + sw/source/core/access/accfootnote \ + sw/source/core/access/accframe \ + sw/source/core/access/accframebase\ + sw/source/core/access/accfrmobj \ + sw/source/core/access/accfrmobjmap \ + sw/source/core/access/accfrmobjslist \ + sw/source/core/access/accgraphic \ + sw/source/core/access/accheaderfooter \ + sw/source/core/access/acchyperlink \ + sw/source/core/access/acchypertextdata \ + sw/source/core/access/accmap \ + sw/source/core/access/accnotextframe \ + sw/source/core/access/accpage \ + sw/source/core/access/accpara \ + sw/source/core/access/accportions \ + sw/source/core/access/accpreview \ + sw/source/core/access/accselectionhelper \ + sw/source/core/access/acctable \ + sw/source/core/access/acctextframe \ + sw/source/core/access/textmarkuphelper \ + sw/source/core/attr/calbck \ + sw/source/core/attr/cellatr \ + sw/source/core/attr/fmtfollowtextflow \ + sw/source/core/attr/fmtwrapinfluenceonobjpos \ + sw/source/core/attr/format \ + sw/source/core/attr/hints \ + sw/source/core/attr/swatrset \ + sw/source/core/bastyp/SwSmartTagMgr \ + sw/source/core/bastyp/bparr \ + sw/source/core/bastyp/breakit \ + sw/source/core/bastyp/calc \ + sw/source/core/bastyp/checkit \ + sw/source/core/bastyp/index \ + sw/source/core/bastyp/init \ + sw/source/core/bastyp/ring \ + sw/source/core/bastyp/swcache \ + sw/source/core/bastyp/swrect \ + sw/source/core/bastyp/swregion \ + sw/source/core/bastyp/swtypes \ + sw/source/core/bastyp/tabcol \ + sw/source/core/crsr/BlockCursor \ + sw/source/core/crsr/bookmrk \ + sw/source/core/crsr/callnk \ + sw/source/core/crsr/crbm \ + sw/source/core/crsr/crossrefbookmark \ + sw/source/core/crsr/crsrsh \ + sw/source/core/crsr/crstrvl \ + sw/source/core/crsr/crstrvl1 \ + sw/source/core/crsr/findattr \ + sw/source/core/crsr/findcoll \ + sw/source/core/crsr/findfmt \ + sw/source/core/crsr/findtxt \ + sw/source/core/crsr/pam \ + sw/source/core/crsr/paminit \ + sw/source/core/crsr/swcrsr \ + sw/source/core/crsr/trvlcol \ + sw/source/core/crsr/trvlfnfl \ + sw/source/core/crsr/trvlreg \ + sw/source/core/crsr/trvltbl \ + sw/source/core/crsr/unocrsr \ + sw/source/core/crsr/viscrs \ + sw/source/core/doc/SwStyleNameMapper \ + sw/source/core/doc/acmplwrd \ + sw/source/core/doc/dbgoutsw \ + sw/source/core/doc/doc \ + sw/source/core/doc/docbasic \ + sw/source/core/doc/docbm \ + sw/source/core/doc/docchart \ + sw/source/core/doc/doccomp \ + sw/source/core/doc/doccorr \ + sw/source/core/doc/docdde \ + sw/source/core/doc/docdesc \ + sw/source/core/doc/docdraw \ + sw/source/core/doc/docedt \ + sw/source/core/doc/docfld \ + sw/source/core/doc/docfly \ + sw/source/core/doc/docfmt \ + sw/source/core/doc/docftn \ + sw/source/core/doc/docglbl \ + sw/source/core/doc/docglos \ + sw/source/core/doc/doclay \ + sw/source/core/doc/docnew \ + sw/source/core/doc/docnum \ + sw/source/core/doc/docredln \ + sw/source/core/doc/docruby \ + sw/source/core/doc/docsort \ + sw/source/core/doc/docstat \ + sw/source/core/doc/doctxm \ + sw/source/core/doc/docxforms \ + sw/source/core/doc/extinput \ + sw/source/core/doc/fmtcol \ + sw/source/core/doc/ftnidx \ + sw/source/core/doc/gctable \ + sw/source/core/doc/htmltbl \ + sw/source/core/doc/lineinfo \ + sw/source/core/doc/list \ + sw/source/core/doc/notxtfrm \ + sw/source/core/doc/number \ + sw/source/core/doc/poolfmt \ + sw/source/core/doc/sortopt \ + sw/source/core/doc/swserv \ + sw/source/core/doc/swstylemanager \ + sw/source/core/doc/tblafmt \ + sw/source/core/doc/tblcpy \ + sw/source/core/doc/tblrwcl \ + sw/source/core/doc/visiturl \ + sw/source/core/docnode/cancellablejob \ + sw/source/core/docnode/finalthreadmanager \ + sw/source/core/docnode/ndcopy \ + sw/source/core/docnode/ndindex \ + sw/source/core/docnode/ndnotxt \ + sw/source/core/docnode/ndnum \ + sw/source/core/docnode/ndsect \ + sw/source/core/docnode/ndtbl \ + sw/source/core/docnode/ndtbl1 \ + sw/source/core/docnode/node \ + sw/source/core/docnode/node2lay \ + sw/source/core/docnode/nodes \ + sw/source/core/docnode/observablethread \ + sw/source/core/docnode/pausethreadstarting \ + sw/source/core/docnode/retrievedinputstreamdata \ + sw/source/core/docnode/retrieveinputstream \ + sw/source/core/docnode/retrieveinputstreamconsumer \ + sw/source/core/docnode/section \ + sw/source/core/docnode/swbaslnk \ + sw/source/core/docnode/swthreadjoiner \ + sw/source/core/docnode/swthreadmanager \ + sw/source/core/docnode/threadlistener \ + sw/source/core/docnode/threadmanager \ + sw/source/core/draw/dcontact \ + sw/source/core/draw/dflyobj \ + sw/source/core/draw/dobjfac \ + sw/source/core/draw/dpage \ + sw/source/core/draw/drawdoc \ + sw/source/core/draw/dview \ + sw/source/core/edit/acorrect \ + sw/source/core/edit/autofmt \ + sw/source/core/edit/edatmisc \ + sw/source/core/edit/edattr \ + sw/source/core/edit/eddel \ + sw/source/core/edit/edfcol \ + sw/source/core/edit/edfld \ + sw/source/core/edit/edfldexp \ + sw/source/core/edit/edfmt \ + sw/source/core/edit/edglbldc \ + sw/source/core/edit/edglss \ + sw/source/core/edit/editsh \ + sw/source/core/edit/edlingu \ + sw/source/core/edit/ednumber \ + sw/source/core/edit/edredln \ + sw/source/core/edit/edsect \ + sw/source/core/edit/edtab \ + sw/source/core/edit/edtox \ + sw/source/core/edit/edundo \ + sw/source/core/edit/edws \ + sw/source/core/fields/authfld \ + sw/source/core/fields/cellfml \ + sw/source/core/fields/chpfld \ + sw/source/core/fields/dbfld \ + sw/source/core/fields/ddefld \ + sw/source/core/fields/ddetbl \ + sw/source/core/fields/docufld \ + sw/source/core/fields/expfld \ + sw/source/core/fields/fldbas \ + sw/source/core/fields/flddat \ + sw/source/core/fields/flddropdown \ + sw/source/core/fields/fldlst \ + sw/source/core/fields/macrofld \ + sw/source/core/fields/postithelper \ + sw/source/core/fields/reffld \ + sw/source/core/fields/scrptfld \ + sw/source/core/fields/tblcalc \ + sw/source/core/fields/textapi \ + sw/source/core/fields/usrfld \ + sw/source/core/frmedt/fecopy \ + sw/source/core/frmedt/fedesc \ + sw/source/core/frmedt/fefly1 \ + sw/source/core/frmedt/feflyole \ + sw/source/core/frmedt/feshview \ + sw/source/core/frmedt/fetab \ + sw/source/core/frmedt/fews \ + sw/source/core/frmedt/tblsel \ + sw/source/core/graphic/grfatr \ + sw/source/core/graphic/ndgrf \ + sw/source/core/layout/anchoreddrawobject \ + sw/source/core/layout/anchoredobject \ + sw/source/core/layout/atrfrm \ + sw/source/core/layout/calcmove \ + sw/source/core/layout/colfrm \ + sw/source/core/layout/findfrm \ + sw/source/core/layout/flowfrm \ + sw/source/core/layout/fly \ + sw/source/core/layout/flycnt \ + sw/source/core/layout/flyincnt \ + sw/source/core/layout/flylay \ + sw/source/core/layout/flypos \ + sw/source/core/layout/frmtool \ + sw/source/core/layout/ftnfrm \ + sw/source/core/layout/hffrm \ + sw/source/core/layout/layact \ + sw/source/core/layout/laycache \ + sw/source/core/layout/layouter \ + sw/source/core/layout/movedfwdfrmsbyobjpos \ + sw/source/core/layout/newfrm \ + sw/source/core/layout/objectformatter \ + sw/source/core/layout/objectformatterlayfrm \ + sw/source/core/layout/objectformattertxtfrm \ + sw/source/core/layout/objstmpconsiderwrapinfl \ + sw/source/core/layout/pagechg \ + sw/source/core/layout/pagedesc \ + sw/source/core/layout/paintfrm \ + sw/source/core/layout/sectfrm \ + sw/source/core/layout/softpagebreak \ + sw/source/core/layout/sortedobjs \ + sw/source/core/layout/sortedobjsimpl \ + sw/source/core/layout/ssfrm \ + sw/source/core/layout/swselectionlist \ + sw/source/core/layout/tabfrm \ + sw/source/core/layout/trvlfrm \ + sw/source/core/layout/unusedf \ + sw/source/core/layout/virtoutp \ + sw/source/core/layout/wsfrm \ + sw/source/core/objectpositioning/anchoredobjectposition \ + sw/source/core/objectpositioning/ascharanchoredobjectposition \ + sw/source/core/objectpositioning/environmentofanchoredobject \ + sw/source/core/objectpositioning/tocntntanchoredobjectposition \ + sw/source/core/objectpositioning/tolayoutanchoredobjectposition \ + sw/source/core/ole/ndole \ + sw/source/core/para/paratr \ + sw/source/core/sw3io/sw3convert \ + sw/source/core/sw3io/swacorr \ + sw/source/core/swg/SwXMLBlockExport \ + sw/source/core/swg/SwXMLBlockImport \ + sw/source/core/swg/SwXMLBlockListContext \ + sw/source/core/swg/SwXMLSectionList \ + sw/source/core/swg/SwXMLTextBlocks \ + sw/source/core/swg/SwXMLTextBlocks1 \ + sw/source/core/swg/swblocks \ + sw/source/core/table/swnewtable \ + sw/source/core/table/swtable \ + sw/source/core/text/EnhancedPDFExportHelper \ + sw/source/core/text/SwGrammarMarkUp \ + sw/source/core/text/atrstck \ + sw/source/core/text/blink \ + sw/source/core/text/frmcrsr \ + sw/source/core/text/frmform \ + sw/source/core/text/frminf \ + sw/source/core/text/frmpaint \ + sw/source/core/text/guess \ + sw/source/core/text/inftxt \ + sw/source/core/text/itradj \ + sw/source/core/text/itratr \ + sw/source/core/text/itrcrsr \ + sw/source/core/text/itrform2 \ + sw/source/core/text/itrpaint \ + sw/source/core/text/itrtxt \ + sw/source/core/text/noteurl \ + sw/source/core/text/porexp \ + sw/source/core/text/porfld \ + sw/source/core/text/porfly \ + sw/source/core/text/porglue \ + sw/source/core/text/porlay \ + sw/source/core/text/porlin \ + sw/source/core/text/pormulti \ + sw/source/core/text/porref \ + sw/source/core/text/porrst \ + sw/source/core/text/portox \ + sw/source/core/text/portxt \ + sw/source/core/text/redlnitr \ + sw/source/core/text/txtcache \ + sw/source/core/text/txtdrop \ + sw/source/core/text/txtfld \ + sw/source/core/text/txtfly \ + sw/source/core/text/txtfrm \ + sw/source/core/text/txtftn \ + sw/source/core/text/txthyph \ + sw/source/core/text/txtinit \ + sw/source/core/text/txtpaint \ + sw/source/core/text/txttab \ + sw/source/core/text/widorp \ + sw/source/core/text/wrong \ + sw/source/core/tox/tox \ + sw/source/core/tox/toxhlp \ + sw/source/core/tox/txmsrt \ + sw/source/core/txtnode/SwGrammarContact \ + sw/source/core/txtnode/atrfld \ + sw/source/core/txtnode/atrflyin \ + sw/source/core/txtnode/atrftn \ + sw/source/core/txtnode/atrref \ + sw/source/core/txtnode/atrtox \ + sw/source/core/txtnode/chrfmt \ + sw/source/core/txtnode/fmtatr2 \ + sw/source/core/txtnode/fntcache \ + sw/source/core/txtnode/fntcap \ + sw/source/core/txtnode/modeltoviewhelper \ + sw/source/core/txtnode/ndhints \ + sw/source/core/txtnode/ndtxt \ + sw/source/core/txtnode/swfntcch \ + sw/source/core/txtnode/swfont \ + sw/source/core/txtnode/thints \ + sw/source/core/txtnode/txatbase \ + sw/source/core/txtnode/txatritr \ + sw/source/core/txtnode/txtatr2 \ + sw/source/core/txtnode/txtedt \ + sw/source/core/undo/SwRewriter \ + sw/source/core/undo/SwUndoField \ + sw/source/core/undo/SwUndoFmt \ + sw/source/core/undo/SwUndoPageDesc \ + sw/source/core/undo/SwUndoTOXChange \ + sw/source/core/undo/docundo \ + sw/source/core/undo/rolbck \ + sw/source/core/undo/unattr \ + sw/source/core/undo/unbkmk \ + sw/source/core/undo/undel \ + sw/source/core/undo/undobj \ + sw/source/core/undo/undobj1 \ + sw/source/core/undo/undoflystrattr \ + sw/source/core/undo/undraw \ + sw/source/core/undo/unfmco \ + sw/source/core/undo/unins \ + sw/source/core/undo/unmove \ + sw/source/core/undo/unnum \ + sw/source/core/undo/unoutl \ + sw/source/core/undo/unovwr \ + sw/source/core/undo/unredln \ + sw/source/core/undo/unsect \ + sw/source/core/undo/unsort \ + sw/source/core/undo/unspnd \ + sw/source/core/undo/untbl \ + sw/source/core/undo/untblk \ + sw/source/core/unocore/SwXTextDefaults \ + sw/source/core/unocore/TextCursorHelper \ + sw/source/core/unocore/XMLRangeHelper \ + sw/source/core/unocore/swunohelper \ + sw/source/core/unocore/unobkm \ + sw/source/core/unocore/unochart \ + sw/source/core/unocore/unocoll \ + sw/source/core/unocore/unocrsrhelper \ + sw/source/core/unocore/unodraw \ + sw/source/core/unocore/unoevent \ + sw/source/core/unocore/unoevtlstnr \ + sw/source/core/unocore/unofield \ + sw/source/core/unocore/unoflatpara \ + sw/source/core/unocore/unoframe \ + sw/source/core/unocore/unoftn \ + sw/source/core/unocore/unoidx \ + sw/source/core/unocore/unomap \ + sw/source/core/unocore/unoobj \ + sw/source/core/unocore/unoobj2 \ + sw/source/core/unocore/unoparagraph \ + sw/source/core/unocore/unoport \ + sw/source/core/unocore/unoportenum \ + sw/source/core/unocore/unoprnms \ + sw/source/core/unocore/unoredline \ + sw/source/core/unocore/unoredlines \ + sw/source/core/unocore/unorefmk \ + sw/source/core/unocore/unosect \ + sw/source/core/unocore/unosett \ + sw/source/core/unocore/unosrch \ + sw/source/core/unocore/unostyle \ + sw/source/core/unocore/unotbl \ + sw/source/core/unocore/unotext \ + sw/source/core/unocore/unotextmarkup \ + sw/source/core/view/pagepreviewlayout \ + sw/source/core/view/vdraw \ + sw/source/core/view/viewimp \ + sw/source/core/view/viewpg \ + sw/source/core/view/viewsh \ + sw/source/core/view/vnew \ + sw/source/core/view/vprint \ + sw/source/filter/ascii/ascatr \ + sw/source/filter/ascii/parasc \ + sw/source/filter/ascii/wrtasc \ + sw/source/filter/basflt/docfact \ + sw/source/filter/basflt/fltini \ + sw/source/filter/basflt/iodetect \ + sw/source/filter/basflt/shellio \ + sw/source/filter/html/SwAppletImpl \ + sw/source/filter/html/css1atr \ + sw/source/filter/html/css1kywd \ + sw/source/filter/html/htmlatr \ + sw/source/filter/html/htmlbas \ + sw/source/filter/html/htmlcss1 \ + sw/source/filter/html/htmlctxt \ + sw/source/filter/html/htmldraw \ + sw/source/filter/html/htmlfld \ + sw/source/filter/html/htmlfldw \ + sw/source/filter/html/htmlfly \ + sw/source/filter/html/htmlflyt \ + sw/source/filter/html/htmlform \ + sw/source/filter/html/htmlforw \ + sw/source/filter/html/htmlftn \ + sw/source/filter/html/htmlgrin \ + sw/source/filter/html/htmlnum \ + sw/source/filter/html/htmlplug \ + sw/source/filter/html/htmlsect \ + sw/source/filter/html/htmltab \ + sw/source/filter/html/htmltabw \ + sw/source/filter/html/parcss1 \ + sw/source/filter/html/svxcss1 \ + sw/source/filter/html/swhtml \ + sw/source/filter/html/wrthtml \ + sw/source/filter/writer/writer \ + sw/source/filter/writer/wrt_fn \ + sw/source/filter/writer/wrtswtbl \ + sw/source/filter/ww1/fltshell \ + sw/source/filter/ww1/w1class \ + sw/source/filter/ww1/w1filter \ + sw/source/filter/ww1/w1par \ + sw/source/filter/ww1/w1sprm \ + sw/source/filter/xml/XMLRedlineImportHelper \ + sw/source/filter/xml/swxml \ + sw/source/filter/xml/wrtxml \ + sw/source/filter/xml/xmlbrsh \ + sw/source/filter/xml/xmlexp \ + sw/source/filter/xml/xmlexpit \ + sw/source/filter/xml/xmlfmt \ + sw/source/filter/xml/xmlfmte \ + sw/source/filter/xml/xmlfonte \ + sw/source/filter/xml/xmlimp \ + sw/source/filter/xml/xmlimpit \ + sw/source/filter/xml/xmlitem \ + sw/source/filter/xml/xmliteme \ + sw/source/filter/xml/xmlitemi \ + sw/source/filter/xml/xmlitemm \ + sw/source/filter/xml/xmlithlp \ + sw/source/filter/xml/xmlitmpr \ + sw/source/filter/xml/xmlmeta \ + sw/source/filter/xml/xmlscript \ + sw/source/filter/xml/xmltble \ + sw/source/filter/xml/xmltbli \ + sw/source/filter/xml/xmltext \ + sw/source/filter/xml/xmltexte \ + sw/source/filter/xml/xmltexti \ + sw/source/ui/app/appenv \ + sw/source/ui/app/apphdl \ + sw/source/ui/app/applab \ + sw/source/ui/app/appopt \ + sw/source/ui/app/docsh \ + sw/source/ui/app/docsh2 \ + sw/source/ui/app/docshdrw \ + sw/source/ui/app/docshini \ + sw/source/ui/app/docst \ + sw/source/ui/app/docstyle \ + sw/source/ui/app/mainwn \ + sw/source/ui/app/swdll \ + sw/source/ui/app/swmodul1 \ + sw/source/ui/app/swmodule \ + sw/source/ui/app/swwait \ + sw/source/ui/cctrl/actctrl \ + sw/source/ui/cctrl/popbox \ + sw/source/ui/cctrl/swlbox \ + sw/source/ui/chrdlg/ccoll \ + sw/source/ui/config/barcfg \ + sw/source/ui/config/caption \ + sw/source/ui/config/cfgitems \ + sw/source/ui/config/dbconfig \ + sw/source/ui/config/fontcfg \ + sw/source/ui/config/modcfg \ + sw/source/ui/config/prtopt \ + sw/source/ui/config/uinums \ + sw/source/ui/config/usrpref \ + sw/source/ui/config/viewopt \ + sw/source/ui/dbui/dbmgr \ + sw/source/ui/dbui/dbtree \ + sw/source/ui/dbui/dbui \ + sw/source/ui/dbui/maildispatcher \ + sw/source/ui/dbui/mailmergechildwindow \ + sw/source/ui/dbui/mailmergehelper \ + sw/source/ui/dbui/mmconfigitem \ + sw/source/ui/dbui/swdbtoolsclient \ + sw/source/ui/dialog/SwSpellDialogChildWindow \ + sw/source/ui/dialog/regionsw \ + sw/source/ui/dialog/swabstdlg \ + sw/source/ui/dialog/swwrtshitem \ + sw/source/ui/dochdl/gloshdl \ + sw/source/ui/dochdl/swdtflvr \ + sw/source/ui/docvw/PostItMgr \ + sw/source/ui/docvw/edtdd \ + sw/source/ui/docvw/edtwin \ + sw/source/ui/docvw/edtwin2 \ + sw/source/ui/docvw/edtwin3 \ + sw/source/ui/docvw/postit \ + sw/source/ui/docvw/romenu \ + sw/source/ui/docvw/srcedtw \ + sw/source/ui/envelp/envimg \ + sw/source/ui/envelp/labelcfg \ + sw/source/ui/envelp/labimg \ + sw/source/ui/envelp/syncbtn \ + sw/source/ui/fldui/fldmgr \ + sw/source/ui/fldui/fldwrap \ + sw/source/ui/fldui/xfldui \ + sw/source/ui/frmdlg/colex \ + sw/source/ui/frmdlg/colmgr \ + sw/source/ui/frmdlg/frmmgr \ + sw/source/ui/globdoc/globdoc \ + sw/source/ui/index/idxmrk \ + sw/source/ui/index/toxmgr \ + sw/source/ui/lingu/hhcwrp \ + sw/source/ui/lingu/hyp \ + sw/source/ui/lingu/olmenu \ + sw/source/ui/lingu/sdrhhcwrap \ + sw/source/ui/misc/glosdoc \ + sw/source/ui/misc/glshell \ + sw/source/ui/misc/numberingtypelistbox \ + sw/source/ui/misc/redlndlg \ + sw/source/ui/ribbar/conarc \ + sw/source/ui/ribbar/concustomshape \ + sw/source/ui/ribbar/conform \ + sw/source/ui/ribbar/conpoly \ + sw/source/ui/ribbar/conrect \ + sw/source/ui/ribbar/drawbase \ + sw/source/ui/ribbar/dselect \ + sw/source/ui/ribbar/inputwin \ + sw/source/ui/ribbar/tblctrl \ + sw/source/ui/ribbar/tbxanchr \ + sw/source/ui/ribbar/workctrl \ + sw/source/ui/shells/annotsh \ + sw/source/ui/shells/basesh \ + sw/source/ui/shells/beziersh \ + sw/source/ui/shells/drawdlg \ + sw/source/ui/shells/drawsh \ + sw/source/ui/shells/drformsh \ + sw/source/ui/shells/drwbassh \ + sw/source/ui/shells/drwtxtex \ + sw/source/ui/shells/drwtxtsh \ + sw/source/ui/shells/frmsh \ + sw/source/ui/shells/grfsh \ + sw/source/ui/shells/grfshex \ + sw/source/ui/shells/langhelper \ + sw/source/ui/shells/listsh \ + sw/source/ui/shells/mediash \ + sw/source/ui/shells/olesh \ + sw/source/ui/shells/slotadd \ + sw/source/ui/shells/tabsh \ + sw/source/ui/shells/textdrw \ + sw/source/ui/shells/textfld \ + sw/source/ui/shells/textglos \ + sw/source/ui/shells/textidx \ + sw/source/ui/shells/textsh \ + sw/source/ui/shells/textsh1 \ + sw/source/ui/shells/textsh2 \ + sw/source/ui/shells/txtattr \ + sw/source/ui/shells/txtcrsr \ + sw/source/ui/shells/txtnum \ + sw/source/ui/smartmenu/stmenu \ + sw/source/ui/table/chartins \ + sw/source/ui/table/swtablerep \ + sw/source/ui/table/tablemgr \ + sw/source/ui/uiview/formatclipboard \ + sw/source/ui/uiview/pview \ + sw/source/ui/uiview/scroll \ + sw/source/ui/uiview/srcview \ + sw/source/ui/uiview/swcli \ + sw/source/ui/uiview/uivwimp \ + sw/source/ui/uiview/view \ + sw/source/ui/uiview/view0 \ + sw/source/ui/uiview/view1 \ + sw/source/ui/uiview/view2 \ + sw/source/ui/uiview/viewcoll \ + sw/source/ui/uiview/viewdlg \ + sw/source/ui/uiview/viewdlg2 \ + sw/source/ui/uiview/viewdraw \ + sw/source/ui/uiview/viewling \ + sw/source/ui/uiview/viewmdi \ + sw/source/ui/uiview/viewport \ + sw/source/ui/uiview/viewprt \ + sw/source/ui/uiview/viewsrch \ + sw/source/ui/uiview/viewstat \ + sw/source/ui/uiview/viewtab \ + sw/source/ui/uno/RefreshListenerContainer \ + sw/source/ui/uno/SwXDocumentSettings \ + sw/source/ui/uno/SwXFilterOptions \ + sw/source/ui/uno/SwXPrintPreviewSettings \ + sw/source/ui/uno/dlelstnr \ + sw/source/ui/uno/unoatxt \ + sw/source/ui/uno/unodefaults \ + sw/source/ui/uno/unodispatch \ + sw/source/ui/uno/unodoc \ + sw/source/ui/uno/unofreg \ + sw/source/ui/uno/unomailmerge \ + sw/source/ui/uno/unomod \ + sw/source/ui/uno/unomodule \ + sw/source/ui/uno/unotxdoc \ + sw/source/ui/uno/unotxvw \ + sw/source/ui/uno/warnpassword \ + sw/source/ui/utlui/attrdesc \ + sw/source/ui/utlui/bookctrl \ + sw/source/ui/utlui/condedit \ + sw/source/ui/utlui/content \ + sw/source/ui/utlui/glbltree \ + sw/source/ui/utlui/gloslst \ + sw/source/ui/utlui/initui \ + sw/source/ui/utlui/navicfg \ + sw/source/ui/utlui/navipi \ + sw/source/ui/utlui/numfmtlb \ + sw/source/ui/utlui/prcntfld \ + sw/source/ui/utlui/shdwcrsr \ + sw/source/ui/utlui/textcontrolcombo \ + sw/source/ui/utlui/tmplctrl \ + sw/source/ui/utlui/uiitems \ + sw/source/ui/utlui/uitool \ + sw/source/ui/utlui/unotools \ + sw/source/ui/utlui/viewlayoutctrl \ + sw/source/ui/utlui/zoomctrl \ + sw/source/ui/web/wdocsh \ + sw/source/ui/web/wformsh \ + sw/source/ui/web/wfrmsh \ + sw/source/ui/web/wgrfsh \ + sw/source/ui/web/wlistsh \ + sw/source/ui/web/wolesh \ + sw/source/ui/web/wtabsh \ + sw/source/ui/web/wtextsh \ + sw/source/ui/web/wview \ + sw/source/ui/wrtsh/delete \ + sw/source/ui/wrtsh/move \ + sw/source/ui/wrtsh/select \ + sw/source/ui/wrtsh/wrtsh1 \ + sw/source/ui/wrtsh/wrtsh2 \ + sw/source/ui/wrtsh/wrtsh3 \ + sw/source/ui/wrtsh/wrtsh4 \ + sw/source/ui/wrtsh/wrtundo \ + sw/source/core/except/errhdl \ + sw/source/core/except/dbgloop \ + sw/source/core/layout/dbg_lay \ + sw/source/core/text/txtio \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,sw,\ + dl \ + m \ + pthread \ + sb \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,sw,\ + advapi32 \ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif + +$(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter)) + + +$(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/sdi \ + $$(INCLUDE) \ +)) +# vim: set noet sw=4 ts=4: diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk new file mode 100644 index 000000000000..1d185e8f4267 --- /dev/null +++ b/sw/Library_swd.mk @@ -0,0 +1,77 @@ +#************************************************************************* +# +# 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,swd)) + +$(eval $(call gb_Library_set_include,swd,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/sw/sdi \ + -I$(WORKDIR)/inc/sw \ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/inc/pch \ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/filter/inc \ + -I$(SRCDIR)/sw/source/ui/inc \ + -I$(OUTDIR)/inc/sw \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,swd,\ + $$(DEFS) \ + -DACCESSIBLE_LAYOUT \ +)) + +$(eval $(call gb_Library_add_linked_libs,swd,\ + comphelper \ + sfx \ + sot \ + svl \ + svt \ + tl \ + ucbhelper \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,swd,\ + sw/source/core/except/errhdl \ + sw/source/filter/basflt/iodetect \ + sw/source/ui/uno/detreg \ + sw/source/ui/uno/swdet2 \ + sw/source/ui/uno/swdetect \ +)) +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,swd,\ + kernel32 \ + msvcrt \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk new file mode 100644 index 000000000000..12227c9a0ae8 --- /dev/null +++ b/sw/Library_swui.mk @@ -0,0 +1,179 @@ +#************************************************************************* +# +# 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,swui)) + +$(eval $(call gb_Library_set_include,swui,\ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/inc/pch \ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/filter/inc \ + -I$(SRCDIR)/sw/source/ui/inc \ + -I$(WORKDIR)/SdiTarget/sw/sdi \ + -I$(WORKDIR)/Misc/sw \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/sw \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,swui,\ + $$(DEFS) \ + -DACCESSIBLE_LAYOUT \ +)) + +$(eval $(call gb_Library_add_linked_libs,swui,\ + comphelper \ + cppu \ + cppuhelper \ + editeng \ + i18nisolang1 \ + msfilter \ + sal \ + sfx \ + sot \ + stl \ + svl \ + svt \ + svx \ + svx \ + svxcore \ + sw \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,swui,\ + sw/source/core/undo/SwRewriter \ + sw/source/ui/chrdlg/break \ + sw/source/ui/chrdlg/chardlg \ + sw/source/ui/chrdlg/drpcps \ + sw/source/ui/chrdlg/numpara \ + sw/source/ui/chrdlg/pardlg \ + sw/source/ui/chrdlg/swuiccoll \ + sw/source/ui/chrdlg/tblnumfm \ + sw/source/ui/config/mailconfigpage \ + sw/source/ui/config/optcomp \ + sw/source/ui/config/optload \ + sw/source/ui/config/optpage \ + sw/source/ui/dbui/addresslistdialog \ + sw/source/ui/dbui/createaddresslistdialog \ + sw/source/ui/dbui/customizeaddresslistdialog \ + sw/source/ui/dbui/dbinsdlg \ + sw/source/ui/dbui/dbtablepreviewdialog \ + sw/source/ui/dbui/mailmergewizard \ + sw/source/ui/dbui/mmaddressblockpage \ + sw/source/ui/dbui/mmdocselectpage \ + sw/source/ui/dbui/mmgreetingspage \ + sw/source/ui/dbui/mmlayoutpage \ + sw/source/ui/dbui/mmmergepage \ + sw/source/ui/dbui/mmoutputpage \ + sw/source/ui/dbui/mmoutputtypepage \ + sw/source/ui/dbui/mmpreparemergepage \ + sw/source/ui/dbui/selectdbtabledialog \ + sw/source/ui/dialog/abstract \ + sw/source/ui/dialog/addrdlg \ + sw/source/ui/dialog/ascfldlg \ + sw/source/ui/dialog/docstdlg \ + sw/source/ui/dialog/macassgn \ + sw/source/ui/dialog/swdialmgr \ + sw/source/ui/dialog/swdlgfact \ + sw/source/ui/dialog/swuiexp \ + sw/source/ui/dialog/uiregionsw \ + sw/source/ui/dialog/wordcountdialog \ + sw/source/ui/dochdl/selglos \ + sw/source/ui/envelp/envfmt \ + sw/source/ui/envelp/envlop1 \ + sw/source/ui/envelp/envprt \ + sw/source/ui/envelp/label1 \ + sw/source/ui/envelp/labelexp \ + sw/source/ui/envelp/labfmt \ + sw/source/ui/envelp/labprt \ + sw/source/ui/envelp/mailmrge \ + sw/source/ui/fldui/DropDownFieldDialog \ + sw/source/ui/fldui/FldRefTreeListBox \ + sw/source/ui/fldui/changedb \ + sw/source/ui/fldui/flddb \ + sw/source/ui/fldui/flddinf \ + sw/source/ui/fldui/flddok \ + sw/source/ui/fldui/fldedt \ + sw/source/ui/fldui/fldfunc \ + sw/source/ui/fldui/fldpage \ + sw/source/ui/fldui/fldref \ + sw/source/ui/fldui/fldtdlg \ + sw/source/ui/fldui/fldvar \ + sw/source/ui/fldui/inpdlg \ + sw/source/ui/fldui/javaedit \ + sw/source/ui/fmtui/tmpdlg \ + sw/source/ui/frmdlg/column \ + sw/source/ui/frmdlg/cption \ + sw/source/ui/frmdlg/frmdlg \ + sw/source/ui/frmdlg/frmpage \ + sw/source/ui/frmdlg/pattern \ + sw/source/ui/frmdlg/uiborder \ + sw/source/ui/frmdlg/wrap \ + sw/source/ui/index/cntex \ + sw/source/ui/index/cnttab \ + sw/source/ui/index/multmrk \ + sw/source/ui/index/swuiidxmrk \ + sw/source/ui/misc/bookmark \ + sw/source/ui/misc/docfnote \ + sw/source/ui/misc/glosbib \ + sw/source/ui/misc/glossary \ + sw/source/ui/misc/insfnote \ + sw/source/ui/misc/insrule \ + sw/source/ui/misc/linenum \ + sw/source/ui/misc/num \ + sw/source/ui/misc/outline \ + sw/source/ui/misc/pgfnote \ + sw/source/ui/misc/pggrid \ + sw/source/ui/misc/srtdlg \ + sw/source/ui/misc/swmodalredlineacceptdlg \ + sw/source/ui/table/colwd \ + sw/source/ui/table/convert \ + sw/source/ui/table/instable \ + sw/source/ui/table/mergetbl \ + sw/source/ui/table/rowht \ + sw/source/ui/table/splittbl \ + sw/source/ui/table/tabledlg \ + sw/source/ui/table/tautofmt \ + sw/source/ui/utlui/swrenamexnameddlg \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,swui,\ + advapi32 \ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk new file mode 100644 index 000000000000..a6d20bd530cc --- /dev/null +++ b/sw/Library_vbaswobj.mk @@ -0,0 +1,134 @@ +#************************************************************************* +# +# 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,vbaswobj)) + +$(eval $(call gb_Library_set_include,vbaswobj,\ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/filter/inc \ + -I$(SRCDIR)/sw/source/ui/inc \ + -I$(SRCDIR)/sw/inc/pch \ + -I$(SRCDIR)/sw/inc \ + -I$(WORKDIR)/Misc/sw/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/ \ +)) + +$(eval $(call gb_Library_set_defs,vbaswobj,\ + $$(DEFS) \ + -DVBA_OOBUILD_HACK \ +)) + +$(eval $(call gb_Library_add_linked_libs,vbaswobj,\ + comphelper \ + cppu \ + cppuhelper \ + editeng \ + i18nisolang1 \ + sal \ + sfx \ + svl \ + svt \ + svx \ + svxcore \ + sw \ + tk \ + tl \ + utl \ + vbahelper \ + vcl \ + stl \ +)) + +$(eval $(call gb_Library_add_exception_objects,vbaswobj,\ + sw/source/ui/vba/service \ + sw/source/ui/vba/vbadocument \ + sw/source/ui/vba/vbasections \ + sw/source/ui/vba/vbadialog \ + sw/source/ui/vba/vbawrapformat \ + sw/source/ui/vba/vbafont \ + sw/source/ui/vba/vbaheaderfooterhelper \ + sw/source/ui/vba/vbarangehelper \ + sw/source/ui/vba/vbaaddin \ + sw/source/ui/vba/vbaautotextentry \ + sw/source/ui/vba/vbarange \ + sw/source/ui/vba/vbadocumentproperties \ + sw/source/ui/vba/vbastyle \ + sw/source/ui/vba/vbapane \ + sw/source/ui/vba/vbaglobals \ + sw/source/ui/vba/vbatemplate \ + sw/source/ui/vba/vbaaddins \ + sw/source/ui/vba/vbaview \ + sw/source/ui/vba/vbaheaderfooter \ + sw/source/ui/vba/vbabookmarks \ + sw/source/ui/vba/vbaoptions \ + sw/source/ui/vba/vbadialogs \ + sw/source/ui/vba/vbapalette \ + sw/source/ui/vba/vbaparagraph \ + sw/source/ui/vba/vbafind \ + sw/source/ui/vba/vbasection \ + sw/source/ui/vba/vbabookmark \ + sw/source/ui/vba/vbaapplication \ + sw/source/ui/vba/vbawindow \ + sw/source/ui/vba/vbareplacement \ + sw/source/ui/vba/vbatable \ + sw/source/ui/vba/vbaselection \ + sw/source/ui/vba/vbasystem \ + sw/source/ui/vba/vbainformationhelper \ + sw/source/ui/vba/vbapagesetup \ + sw/source/ui/vba/vbafield \ + sw/source/ui/vba/vbatables \ + sw/source/ui/vba/vbavariable \ + sw/source/ui/vba/vbadocuments \ + sw/source/ui/vba/vbaparagraphformat \ + sw/source/ui/vba/vbaborders \ + sw/source/ui/vba/vbavariables \ + sw/source/ui/vba/vbastyles \ + sw/source/ui/vba/vbapanes \ + sw/source/ui/vba/wordvbahelper \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_set_ldflags,vbaswobj,\ + $$(LDFLAGS) \ + -Wl$(COMMA)-O1 \ + -Wl$(COMMA)-z$(COMMA)noexecstack \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,vbaswobj,\ + advapi32 \ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/sw/Makefile b/sw/Makefile index 9ab4b8ba83f4..60d34122e271 100644 --- a/sw/Makefile +++ b/sw/Makefile @@ -25,12 +25,13 @@ # #************************************************************************* +ifeq ($(strip $(SOLARENV)),) +$(error No environment set) +endif + GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk - -gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) - -$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) +$(eval $(call gb_Module_make_global_targets)) # vim: set noet sw=4 ts=4: diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk new file mode 100644 index 000000000000..13f511a73b82 --- /dev/null +++ b/sw/Module_sw.mk @@ -0,0 +1,42 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,sw)) + +$(eval $(call gb_Module_add_targets,sw,\ + Library_sw \ + Library_swd \ + Library_swui \ + Library_msword \ + Library_vbaswobj \ + Package_misc \ + Package_uiconfig \ + Package_xml \ + AllLangResTarget_sw \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/sw/Package_misc.mk b/sw/Package_misc.mk new file mode 100644 index 000000000000..bb2e3cd8dc7f --- /dev/null +++ b/sw/Package_misc.mk @@ -0,0 +1,30 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,sw_misc,$(SRCDIR)/sw/misc)) +# TODO: +#COPY sw/unxlngx6.pro/misc/swslots_sid.hid unxlngx6.pro/bin/hid/swslots_sid.hid diff --git a/sw/Package_uiconfig.mk b/sw/Package_uiconfig.mk new file mode 100644 index 000000000000..6ec1b30c0509 --- /dev/null +++ b/sw/Package_uiconfig.mk @@ -0,0 +1,281 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,sw_uiconfig,$(SRCDIR)/sw/uiconfig)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/accelerator/de/default.xml,sglobal/accelerator/de/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/accelerator/en-US/default.xml,sglobal/accelerator/en-US/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/accelerator/es/default.xml,sglobal/accelerator/es/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/accelerator/fr/default.xml,sglobal/accelerator/fr/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/menubar/menubar.xml,sglobal/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/statusbar/statusbar.xml,sglobal/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/alignmentbar.xml,sglobal/toolbar/alignmentbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/arrowshapes.xml,sglobal/toolbar/arrowshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/basicshapes.xml,sglobal/toolbar/basicshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/bezierobjectbar.xml,sglobal/toolbar/bezierobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/calloutshapes.xml,sglobal/toolbar/calloutshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/colorbar.xml,sglobal/toolbar/colorbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawbar.xml,sglobal/toolbar/drawbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawingobjectbar.xml,sglobal/toolbar/drawingobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawtextobjectbar.xml,sglobal/toolbar/drawtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/extrusionobjectbar.xml,sglobal/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/flowchartshapes.xml,sglobal/toolbar/flowchartshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fontworkobjectbar.xml,sglobal/toolbar/fontworkobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fontworkshapetype.xml,sglobal/toolbar/fontworkshapetype.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formcontrols.xml,sglobal/toolbar/formcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formdesign.xml,sglobal/toolbar/formdesign.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formsfilterbar.xml,sglobal/toolbar/formsfilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formsnavigationbar.xml,sglobal/toolbar/formsnavigationbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formtextobjectbar.xml,sglobal/toolbar/formtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/frameobjectbar.xml,sglobal/toolbar/frameobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fullscreenbar.xml,sglobal/toolbar/fullscreenbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/graffilterbar.xml,sglobal/toolbar/graffilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/graphicobjectbar.xml,sglobal/toolbar/graphicobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/insertbar.xml,sglobal/toolbar/insertbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/insertobjectbar.xml,sglobal/toolbar/insertobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/mediaobjectbar.xml,sglobal/toolbar/mediaobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/moreformcontrols.xml,sglobal/toolbar/moreformcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/numobjectbar.xml,sglobal/toolbar/numobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/oleobjectbar.xml,sglobal/toolbar/oleobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/optimizetablebar.xml,sglobal/toolbar/optimizetablebar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/previewobjectbar.xml,sglobal/toolbar/previewobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/standardbar.xml,sglobal/toolbar/standardbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/starshapes.xml,sglobal/toolbar/starshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/symbolshapes.xml,sglobal/toolbar/symbolshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/tableobjectbar.xml,sglobal/toolbar/tableobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/textobjectbar.xml,sglobal/toolbar/textobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/toolbar.xml,sglobal/toolbar/toolbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/viewerbar.xml,sglobal/toolbar/viewerbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/accelerator/de/default.xml,sweb/accelerator/de/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/accelerator/en-US/default.xml,sweb/accelerator/en-US/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/accelerator/es/default.xml,sweb/accelerator/es/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/accelerator/fr/default.xml,sweb/accelerator/fr/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/menubar/menubar.xml,sweb/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/statusbar/statusbar.xml,sweb/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/arrowshapes.xml,sweb/toolbar/arrowshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/basicshapes.xml,sweb/toolbar/basicshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/bezierobjectbar.xml,sweb/toolbar/bezierobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/calloutshapes.xml,sweb/toolbar/calloutshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/colorbar.xml,sweb/toolbar/colorbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/drawingobjectbar.xml,sweb/toolbar/drawingobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/drawtextobjectbar.xml,sweb/toolbar/drawtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/extrusionobjectbar.xml,sweb/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/flowchartshapes.xml,sweb/toolbar/flowchartshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fontworkobjectbar.xml,sweb/toolbar/fontworkobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fontworkshapetype.xml,sweb/toolbar/fontworkshapetype.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formcontrols.xml,sweb/toolbar/formcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formdesign.xml,sweb/toolbar/formdesign.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formsfilterbar.xml,sweb/toolbar/formsfilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formsnavigationbar.xml,sweb/toolbar/formsnavigationbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formtextobjectbar.xml,sweb/toolbar/formtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/frameobjectbar.xml,sweb/toolbar/frameobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fullscreenbar.xml,sweb/toolbar/fullscreenbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/graffilterbar.xml,sweb/toolbar/graffilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/graphicobjectbar.xml,sweb/toolbar/graphicobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/insertbar.xml,sweb/toolbar/insertbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/mediaobjectbar.xml,sweb/toolbar/mediaobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/numobjectbar.xml,sweb/toolbar/numobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/oleobjectbar.xml,sweb/toolbar/oleobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/optimizetablebar.xml,sweb/toolbar/optimizetablebar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/previewobjectbar.xml,sweb/toolbar/previewobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/standardbar.xml,sweb/toolbar/standardbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/starshapes.xml,sweb/toolbar/starshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/symbolshapes.xml,sweb/toolbar/symbolshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/tableobjectbar.xml,sweb/toolbar/tableobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/textobjectbar.xml,sweb/toolbar/textobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/toolbar.xml,sweb/toolbar/toolbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/viewerbar.xml,sweb/toolbar/viewerbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/accelerator/de/default.xml,swform/accelerator/de/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/accelerator/en-US/default.xml,swform/accelerator/en-US/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/accelerator/es/default.xml,swform/accelerator/es/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/accelerator/fr/default.xml,swform/accelerator/fr/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/menubar/menubar.xml,swform/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/statusbar/statusbar.xml,swform/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/alignmentbar.xml,swform/toolbar/alignmentbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/arrowshapes.xml,swform/toolbar/arrowshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/basicshapes.xml,swform/toolbar/basicshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/bezierobjectbar.xml,swform/toolbar/bezierobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/calloutshapes.xml,swform/toolbar/calloutshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/colorbar.xml,swform/toolbar/colorbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawbar.xml,swform/toolbar/drawbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawingobjectbar.xml,swform/toolbar/drawingobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawtextobjectbar.xml,swform/toolbar/drawtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/extrusionobjectbar.xml,swform/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/flowchartshapes.xml,swform/toolbar/flowchartshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fontworkobjectbar.xml,swform/toolbar/fontworkobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fontworkshapetype.xml,swform/toolbar/fontworkshapetype.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formcontrols.xml,swform/toolbar/formcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formdesign.xml,swform/toolbar/formdesign.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formsfilterbar.xml,swform/toolbar/formsfilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formsnavigationbar.xml,swform/toolbar/formsnavigationbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formtextobjectbar.xml,swform/toolbar/formtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/frameobjectbar.xml,swform/toolbar/frameobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fullscreenbar.xml,swform/toolbar/fullscreenbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/graffilterbar.xml,swform/toolbar/graffilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/graphicobjectbar.xml,swform/toolbar/graphicobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/insertbar.xml,swform/toolbar/insertbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/insertobjectbar.xml,swform/toolbar/insertobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/mediaobjectbar.xml,swform/toolbar/mediaobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/moreformcontrols.xml,swform/toolbar/moreformcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/numobjectbar.xml,swform/toolbar/numobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/oleobjectbar.xml,swform/toolbar/oleobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/optimizetablebar.xml,swform/toolbar/optimizetablebar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/previewobjectbar.xml,swform/toolbar/previewobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/standardbar.xml,swform/toolbar/standardbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/starshapes.xml,swform/toolbar/starshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/symbolshapes.xml,swform/toolbar/symbolshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/tableobjectbar.xml,swform/toolbar/tableobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/textobjectbar.xml,swform/toolbar/textobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/toolbar.xml,swform/toolbar/toolbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/viewerbar.xml,swform/toolbar/viewerbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/accelerator/de/default.xml,swreport/accelerator/de/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/accelerator/en-US/default.xml,swreport/accelerator/en-US/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/accelerator/es/default.xml,swreport/accelerator/es/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/accelerator/fr/default.xml,swreport/accelerator/fr/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/menubar/menubar.xml,swreport/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/statusbar/statusbar.xml,swreport/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/alignmentbar.xml,swreport/toolbar/alignmentbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/arrowshapes.xml,swreport/toolbar/arrowshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/basicshapes.xml,swreport/toolbar/basicshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/bezierobjectbar.xml,swreport/toolbar/bezierobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/calloutshapes.xml,swreport/toolbar/calloutshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/colorbar.xml,swreport/toolbar/colorbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawbar.xml,swreport/toolbar/drawbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawingobjectbar.xml,swreport/toolbar/drawingobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawtextobjectbar.xml,swreport/toolbar/drawtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/extrusionobjectbar.xml,swreport/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/flowchartshapes.xml,swreport/toolbar/flowchartshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fontworkobjectbar.xml,swreport/toolbar/fontworkobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fontworkshapetype.xml,swreport/toolbar/fontworkshapetype.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formcontrols.xml,swreport/toolbar/formcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formdesign.xml,swreport/toolbar/formdesign.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formsfilterbar.xml,swreport/toolbar/formsfilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formsnavigationbar.xml,swreport/toolbar/formsnavigationbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formtextobjectbar.xml,swreport/toolbar/formtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/frameobjectbar.xml,swreport/toolbar/frameobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fullscreenbar.xml,swreport/toolbar/fullscreenbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/graffilterbar.xml,swreport/toolbar/graffilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/graphicobjectbar.xml,swreport/toolbar/graphicobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/insertbar.xml,swreport/toolbar/insertbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/insertobjectbar.xml,swreport/toolbar/insertobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/mediaobjectbar.xml,swreport/toolbar/mediaobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/moreformcontrols.xml,swreport/toolbar/moreformcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/numobjectbar.xml,swreport/toolbar/numobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/oleobjectbar.xml,swreport/toolbar/oleobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/optimizetablebar.xml,swreport/toolbar/optimizetablebar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/previewobjectbar.xml,swreport/toolbar/previewobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/standardbar.xml,swreport/toolbar/standardbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/starshapes.xml,swreport/toolbar/starshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/symbolshapes.xml,swreport/toolbar/symbolshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/tableobjectbar.xml,swreport/toolbar/tableobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/textobjectbar.xml,swreport/toolbar/textobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/toolbar.xml,swreport/toolbar/toolbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/viewerbar.xml,swreport/toolbar/viewerbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/accelerator/de/default.xml,swriter/accelerator/de/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/accelerator/en-US/default.xml,swriter/accelerator/en-US/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/accelerator/es/default.xml,swriter/accelerator/es/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/accelerator/fr/default.xml,swriter/accelerator/fr/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/menubar/menubar.xml,swriter/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/statusbar/statusbar.xml,swriter/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/alignmentbar.xml,swriter/toolbar/alignmentbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/arrowshapes.xml,swriter/toolbar/arrowshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/basicshapes.xml,swriter/toolbar/basicshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/bezierobjectbar.xml,swriter/toolbar/bezierobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/calloutshapes.xml,swriter/toolbar/calloutshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/colorbar.xml,swriter/toolbar/colorbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawbar.xml,swriter/toolbar/drawbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawingobjectbar.xml,swriter/toolbar/drawingobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawtextobjectbar.xml,swriter/toolbar/drawtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/extrusionobjectbar.xml,swriter/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/flowchartshapes.xml,swriter/toolbar/flowchartshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkobjectbar.xml,swriter/toolbar/fontworkobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkshapetype.xml,swriter/toolbar/fontworkshapetype.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formcontrols.xml,swriter/toolbar/formcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formdesign.xml,swriter/toolbar/formdesign.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formsfilterbar.xml,swriter/toolbar/formsfilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formsnavigationbar.xml,swriter/toolbar/formsnavigationbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formtextobjectbar.xml,swriter/toolbar/formtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/frameobjectbar.xml,swriter/toolbar/frameobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fullscreenbar.xml,swriter/toolbar/fullscreenbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/graffilterbar.xml,swriter/toolbar/graffilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/graphicobjectbar.xml,swriter/toolbar/graphicobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/insertbar.xml,swriter/toolbar/insertbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/mediaobjectbar.xml,swriter/toolbar/mediaobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/moreformcontrols.xml,swriter/toolbar/moreformcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/numobjectbar.xml,swriter/toolbar/numobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/oleobjectbar.xml,swriter/toolbar/oleobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/optimizetablebar.xml,swriter/toolbar/optimizetablebar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/previewobjectbar.xml,swriter/toolbar/previewobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/standardbar.xml,swriter/toolbar/standardbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/starshapes.xml,swriter/toolbar/starshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/symbolshapes.xml,swriter/toolbar/symbolshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/tableobjectbar.xml,swriter/toolbar/tableobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/textobjectbar.xml,swriter/toolbar/textobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/toolbar.xml,swriter/toolbar/toolbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/viewerbar.xml,swriter/toolbar/viewerbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/accelerator/de/default.xml,swxform/accelerator/de/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/accelerator/en-US/default.xml,swxform/accelerator/en-US/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/accelerator/es/default.xml,swxform/accelerator/es/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/accelerator/fr/default.xml,swxform/accelerator/fr/default.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/menubar/menubar.xml,swxform/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/statusbar/statusbar.xml,swxform/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/alignmentbar.xml,swxform/toolbar/alignmentbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/arrowshapes.xml,swxform/toolbar/arrowshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/basicshapes.xml,swxform/toolbar/basicshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/bezierobjectbar.xml,swxform/toolbar/bezierobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/calloutshapes.xml,swxform/toolbar/calloutshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/colorbar.xml,swxform/toolbar/colorbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawbar.xml,swxform/toolbar/drawbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawingobjectbar.xml,swxform/toolbar/drawingobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawtextobjectbar.xml,swxform/toolbar/drawtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/extrusionobjectbar.xml,swxform/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/flowchartshapes.xml,swxform/toolbar/flowchartshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fontworkobjectbar.xml,swxform/toolbar/fontworkobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fontworkshapetype.xml,swxform/toolbar/fontworkshapetype.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formcontrols.xml,swxform/toolbar/formcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formdesign.xml,swxform/toolbar/formdesign.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formsfilterbar.xml,swxform/toolbar/formsfilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formsnavigationbar.xml,swxform/toolbar/formsnavigationbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formtextobjectbar.xml,swxform/toolbar/formtextobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/frameobjectbar.xml,swxform/toolbar/frameobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fullscreenbar.xml,swxform/toolbar/fullscreenbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/graffilterbar.xml,swxform/toolbar/graffilterbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/graphicobjectbar.xml,swxform/toolbar/graphicobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/insertbar.xml,swxform/toolbar/insertbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/insertobjectbar.xml,swxform/toolbar/insertobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/mediaobjectbar.xml,swxform/toolbar/mediaobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/moreformcontrols.xml,swxform/toolbar/moreformcontrols.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/numobjectbar.xml,swxform/toolbar/numobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/oleobjectbar.xml,swxform/toolbar/oleobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/optimizetablebar.xml,swxform/toolbar/optimizetablebar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/previewobjectbar.xml,swxform/toolbar/previewobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/standardbar.xml,swxform/toolbar/standardbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/starshapes.xml,swxform/toolbar/starshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/symbolshapes.xml,swxform/toolbar/symbolshapes.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/tableobjectbar.xml,swxform/toolbar/tableobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/textobjectbar.xml,swxform/toolbar/textobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/toolbar.xml,swxform/toolbar/toolbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/viewerbar.xml,swxform/toolbar/viewerbar.xml)) diff --git a/sw/Package_xml.mk b/sw/Package_xml.mk new file mode 100644 index 000000000000..7eb3f1cb1f3f --- /dev/null +++ b/sw/Package_xml.mk @@ -0,0 +1,29 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,sw_xml,$(SRCDIR)/sw/xml)) +$(eval $(call gb_Package_add_file,sw_xml,xml/writer.xml,writer.xml)) diff --git a/sw/prj/target_lib_msword.mk b/sw/prj/target_lib_msword.mk deleted file mode 100644 index eb891976fcc2..000000000000 --- a/sw/prj/target_lib_msword.mk +++ /dev/null @@ -1,121 +0,0 @@ -#************************************************************************* -# -# 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,msword)) - -$(eval $(call gb_Library_set_include,msword,\ - -I$(SRCDIR)/sw/source/core/inc \ - -I$(SRCDIR)/sw/source/ui/inc \ - -I$(SRCDIR)/sw/source/filter/inc \ - -I$(SRCDIR)/sw/inc/pch \ - -I$(SRCDIR)/sw/inc \ - -I$(WORKDIR)/inc/sw/sdi \ - -I$(WORKDIR)/Misc/sw/ \ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc/sw \ -)) - -$(eval $(call gb_Library_set_defs,msword,\ - $$(DEFS) \ - -DACCESSIBLE_LAYOUT \ -)) - -$(eval $(call gb_Library_add_linked_libs,msword,\ - basegfx \ - comphelper \ - i18nisolang1 \ - i18nutil \ - icuuc \ - editeng \ - msfilter \ - sfx \ - sot \ - stl \ - svl \ - svt \ - svx \ - svx \ - svxcore \ - sw \ - tk \ - tl \ - ucbhelper \ - cppu \ - cppuhelper \ - sal \ - utl \ - vcl \ -)) - -$(eval $(call gb_Library_add_exception_objects,msword,\ - sw/source/filter/rtf/rtfatr \ - sw/source/filter/rtf/rtffld \ - sw/source/filter/rtf/rtffly \ - sw/source/filter/rtf/rtfnum \ - sw/source/filter/rtf/rtftbl \ - sw/source/filter/rtf/swparrtf \ - sw/source/filter/rtf/wrtrtf \ - sw/source/filter/ww8/WW8FFData \ - sw/source/filter/ww8/WW8FibData \ - sw/source/filter/ww8/WW8Sttbf \ - sw/source/filter/ww8/WW8TableInfo \ - sw/source/filter/ww8/fields \ - sw/source/filter/ww8/styles \ - sw/source/filter/ww8/tracer \ - sw/source/filter/ww8/writerhelper \ - sw/source/filter/ww8/writerwordglue \ - sw/source/filter/ww8/wrtw8esh \ - sw/source/filter/ww8/wrtw8nds \ - sw/source/filter/ww8/wrtw8num \ - sw/source/filter/ww8/wrtw8sty \ - sw/source/filter/ww8/wrtww8 \ - sw/source/filter/ww8/wrtww8gr \ - sw/source/filter/ww8/ww8atr \ - sw/source/filter/ww8/ww8glsy \ - sw/source/filter/ww8/ww8graf \ - sw/source/filter/ww8/ww8graf2 \ - sw/source/filter/ww8/ww8par \ - sw/source/filter/ww8/ww8par2 \ - sw/source/filter/ww8/ww8par3 \ - sw/source/filter/ww8/ww8par4 \ - sw/source/filter/ww8/ww8par5 \ - sw/source/filter/ww8/ww8par6 \ - sw/source/filter/ww8/ww8scan \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,msword,\ - advapi32 \ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/sw/prj/target_lib_sw.mk b/sw/prj/target_lib_sw.mk deleted file mode 100644 index ddd2f4507110..000000000000 --- a/sw/prj/target_lib_sw.mk +++ /dev/null @@ -1,748 +0,0 @@ -#************************************************************************* -# -# 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,sw)) - -$(eval $(call gb_Library_add_sdi_headers,sw,sw/sdi/swslots)) - -$(eval $(call gb_Library_add_precompiled_header,sw,$(SRCDIR)/sw/inc/pch/precompiled_sw)) - -$(eval $(call gb_Library_set_include,sw,\ - -I$(SRCDIR)/sw/source/core/inc \ - -I$(SRCDIR)/sw/source/filter/inc \ - -I$(SRCDIR)/sw/source/ui/inc \ - -I$(SRCDIR)/sw/inc/pch \ - -I$(SRCDIR)/sw/inc \ - -I$(WORKDIR)/SdiTarget/sw/sdi \ - -I$(WORKDIR)/Misc/sw/ \ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_Library_set_defs,sw,\ - $$(DEFS) \ - -DACCESSIBLE_LAYOUT \ - -DSW_DLLIMPLEMENTATION \ -)) - -$(eval $(call gb_Library_add_linked_libs,sw,\ - avmedia \ - basegfx \ - comphelper \ - cppu \ - cppuhelper \ - drawinglayer \ - editeng \ - i18nisolang1 \ - i18nutil \ - icuuc \ - lng \ - sal \ - salhelper \ - sb \ - sfx \ - sot \ - stl \ - svl \ - svt \ - svx \ - svxcore \ - tk \ - tl \ - ucbhelper \ - utl \ - vbahelper \ - vcl \ - vos3 \ - xo \ -)) - -$(eval $(call gb_Library_add_exception_objects,sw,\ - sw/source/core/SwNumberTree/SwNodeNum \ - sw/source/core/SwNumberTree/SwNumberTree \ - sw/source/core/access/acccell \ - sw/source/core/access/acccontext \ - sw/source/core/access/accdoc \ - sw/source/core/access/accembedded \ - sw/source/core/access/accfootnote \ - sw/source/core/access/accframe \ - sw/source/core/access/accframebase\ - sw/source/core/access/accfrmobj \ - sw/source/core/access/accfrmobjmap \ - sw/source/core/access/accfrmobjslist \ - sw/source/core/access/accgraphic \ - sw/source/core/access/accheaderfooter \ - sw/source/core/access/acchyperlink \ - sw/source/core/access/acchypertextdata \ - sw/source/core/access/accmap \ - sw/source/core/access/accnotextframe \ - sw/source/core/access/accpage \ - sw/source/core/access/accpara \ - sw/source/core/access/accportions \ - sw/source/core/access/accpreview \ - sw/source/core/access/accselectionhelper \ - sw/source/core/access/acctable \ - sw/source/core/access/acctextframe \ - sw/source/core/access/textmarkuphelper \ - sw/source/core/attr/calbck \ - sw/source/core/attr/cellatr \ - sw/source/core/attr/fmtfollowtextflow \ - sw/source/core/attr/fmtwrapinfluenceonobjpos \ - sw/source/core/attr/format \ - sw/source/core/attr/hints \ - sw/source/core/attr/swatrset \ - sw/source/core/bastyp/SwSmartTagMgr \ - sw/source/core/bastyp/bparr \ - sw/source/core/bastyp/breakit \ - sw/source/core/bastyp/calc \ - sw/source/core/bastyp/checkit \ - sw/source/core/bastyp/index \ - sw/source/core/bastyp/init \ - sw/source/core/bastyp/ring \ - sw/source/core/bastyp/swcache \ - sw/source/core/bastyp/swrect \ - sw/source/core/bastyp/swregion \ - sw/source/core/bastyp/swtypes \ - sw/source/core/bastyp/tabcol \ - sw/source/core/crsr/BlockCursor \ - sw/source/core/crsr/bookmrk \ - sw/source/core/crsr/callnk \ - sw/source/core/crsr/crbm \ - sw/source/core/crsr/crossrefbookmark \ - sw/source/core/crsr/crsrsh \ - sw/source/core/crsr/crstrvl \ - sw/source/core/crsr/crstrvl1 \ - sw/source/core/crsr/findattr \ - sw/source/core/crsr/findcoll \ - sw/source/core/crsr/findfmt \ - sw/source/core/crsr/findtxt \ - sw/source/core/crsr/pam \ - sw/source/core/crsr/paminit \ - sw/source/core/crsr/swcrsr \ - sw/source/core/crsr/trvlcol \ - sw/source/core/crsr/trvlfnfl \ - sw/source/core/crsr/trvlreg \ - sw/source/core/crsr/trvltbl \ - sw/source/core/crsr/unocrsr \ - sw/source/core/crsr/viscrs \ - sw/source/core/doc/SwStyleNameMapper \ - sw/source/core/doc/acmplwrd \ - sw/source/core/doc/dbgoutsw \ - sw/source/core/doc/doc \ - sw/source/core/doc/docbasic \ - sw/source/core/doc/docbm \ - sw/source/core/doc/docchart \ - sw/source/core/doc/doccomp \ - sw/source/core/doc/doccorr \ - sw/source/core/doc/docdde \ - sw/source/core/doc/docdesc \ - sw/source/core/doc/docdraw \ - sw/source/core/doc/docedt \ - sw/source/core/doc/docfld \ - sw/source/core/doc/docfly \ - sw/source/core/doc/docfmt \ - sw/source/core/doc/docftn \ - sw/source/core/doc/docglbl \ - sw/source/core/doc/docglos \ - sw/source/core/doc/doclay \ - sw/source/core/doc/docnew \ - sw/source/core/doc/docnum \ - sw/source/core/doc/docredln \ - sw/source/core/doc/docruby \ - sw/source/core/doc/docsort \ - sw/source/core/doc/docstat \ - sw/source/core/doc/doctxm \ - sw/source/core/doc/docxforms \ - sw/source/core/doc/extinput \ - sw/source/core/doc/fmtcol \ - sw/source/core/doc/ftnidx \ - sw/source/core/doc/gctable \ - sw/source/core/doc/htmltbl \ - sw/source/core/doc/lineinfo \ - sw/source/core/doc/list \ - sw/source/core/doc/notxtfrm \ - sw/source/core/doc/number \ - sw/source/core/doc/poolfmt \ - sw/source/core/doc/sortopt \ - sw/source/core/doc/swserv \ - sw/source/core/doc/swstylemanager \ - sw/source/core/doc/tblafmt \ - sw/source/core/doc/tblcpy \ - sw/source/core/doc/tblrwcl \ - sw/source/core/doc/visiturl \ - sw/source/core/docnode/cancellablejob \ - sw/source/core/docnode/finalthreadmanager \ - sw/source/core/docnode/ndcopy \ - sw/source/core/docnode/ndindex \ - sw/source/core/docnode/ndnotxt \ - sw/source/core/docnode/ndnum \ - sw/source/core/docnode/ndsect \ - sw/source/core/docnode/ndtbl \ - sw/source/core/docnode/ndtbl1 \ - sw/source/core/docnode/node \ - sw/source/core/docnode/node2lay \ - sw/source/core/docnode/nodes \ - sw/source/core/docnode/observablethread \ - sw/source/core/docnode/pausethreadstarting \ - sw/source/core/docnode/retrievedinputstreamdata \ - sw/source/core/docnode/retrieveinputstream \ - sw/source/core/docnode/retrieveinputstreamconsumer \ - sw/source/core/docnode/section \ - sw/source/core/docnode/swbaslnk \ - sw/source/core/docnode/swthreadjoiner \ - sw/source/core/docnode/swthreadmanager \ - sw/source/core/docnode/threadlistener \ - sw/source/core/docnode/threadmanager \ - sw/source/core/draw/dcontact \ - sw/source/core/draw/dflyobj \ - sw/source/core/draw/dobjfac \ - sw/source/core/draw/dpage \ - sw/source/core/draw/drawdoc \ - sw/source/core/draw/dview \ - sw/source/core/edit/acorrect \ - sw/source/core/edit/autofmt \ - sw/source/core/edit/edatmisc \ - sw/source/core/edit/edattr \ - sw/source/core/edit/eddel \ - sw/source/core/edit/edfcol \ - sw/source/core/edit/edfld \ - sw/source/core/edit/edfldexp \ - sw/source/core/edit/edfmt \ - sw/source/core/edit/edglbldc \ - sw/source/core/edit/edglss \ - sw/source/core/edit/editsh \ - sw/source/core/edit/edlingu \ - sw/source/core/edit/ednumber \ - sw/source/core/edit/edredln \ - sw/source/core/edit/edsect \ - sw/source/core/edit/edtab \ - sw/source/core/edit/edtox \ - sw/source/core/edit/edundo \ - sw/source/core/edit/edws \ - sw/source/core/fields/authfld \ - sw/source/core/fields/cellfml \ - sw/source/core/fields/chpfld \ - sw/source/core/fields/dbfld \ - sw/source/core/fields/ddefld \ - sw/source/core/fields/ddetbl \ - sw/source/core/fields/docufld \ - sw/source/core/fields/expfld \ - sw/source/core/fields/fldbas \ - sw/source/core/fields/flddat \ - sw/source/core/fields/flddropdown \ - sw/source/core/fields/fldlst \ - sw/source/core/fields/macrofld \ - sw/source/core/fields/postithelper \ - sw/source/core/fields/reffld \ - sw/source/core/fields/scrptfld \ - sw/source/core/fields/tblcalc \ - sw/source/core/fields/textapi \ - sw/source/core/fields/usrfld \ - sw/source/core/frmedt/fecopy \ - sw/source/core/frmedt/fedesc \ - sw/source/core/frmedt/fefly1 \ - sw/source/core/frmedt/feflyole \ - sw/source/core/frmedt/feshview \ - sw/source/core/frmedt/fetab \ - sw/source/core/frmedt/fews \ - sw/source/core/frmedt/tblsel \ - sw/source/core/graphic/grfatr \ - sw/source/core/graphic/ndgrf \ - sw/source/core/layout/anchoreddrawobject \ - sw/source/core/layout/anchoredobject \ - sw/source/core/layout/atrfrm \ - sw/source/core/layout/calcmove \ - sw/source/core/layout/colfrm \ - sw/source/core/layout/findfrm \ - sw/source/core/layout/flowfrm \ - sw/source/core/layout/fly \ - sw/source/core/layout/flycnt \ - sw/source/core/layout/flyincnt \ - sw/source/core/layout/flylay \ - sw/source/core/layout/flypos \ - sw/source/core/layout/frmtool \ - sw/source/core/layout/ftnfrm \ - sw/source/core/layout/hffrm \ - sw/source/core/layout/layact \ - sw/source/core/layout/laycache \ - sw/source/core/layout/layouter \ - sw/source/core/layout/movedfwdfrmsbyobjpos \ - sw/source/core/layout/newfrm \ - sw/source/core/layout/objectformatter \ - sw/source/core/layout/objectformatterlayfrm \ - sw/source/core/layout/objectformattertxtfrm \ - sw/source/core/layout/objstmpconsiderwrapinfl \ - sw/source/core/layout/pagechg \ - sw/source/core/layout/pagedesc \ - sw/source/core/layout/paintfrm \ - sw/source/core/layout/sectfrm \ - sw/source/core/layout/softpagebreak \ - sw/source/core/layout/sortedobjs \ - sw/source/core/layout/sortedobjsimpl \ - sw/source/core/layout/ssfrm \ - sw/source/core/layout/swselectionlist \ - sw/source/core/layout/tabfrm \ - sw/source/core/layout/trvlfrm \ - sw/source/core/layout/unusedf \ - sw/source/core/layout/virtoutp \ - sw/source/core/layout/wsfrm \ - sw/source/core/objectpositioning/anchoredobjectposition \ - sw/source/core/objectpositioning/ascharanchoredobjectposition \ - sw/source/core/objectpositioning/environmentofanchoredobject \ - sw/source/core/objectpositioning/tocntntanchoredobjectposition \ - sw/source/core/objectpositioning/tolayoutanchoredobjectposition \ - sw/source/core/ole/ndole \ - sw/source/core/para/paratr \ - sw/source/core/sw3io/sw3convert \ - sw/source/core/sw3io/swacorr \ - sw/source/core/swg/SwXMLBlockExport \ - sw/source/core/swg/SwXMLBlockImport \ - sw/source/core/swg/SwXMLBlockListContext \ - sw/source/core/swg/SwXMLSectionList \ - sw/source/core/swg/SwXMLTextBlocks \ - sw/source/core/swg/SwXMLTextBlocks1 \ - sw/source/core/swg/swblocks \ - sw/source/core/table/swnewtable \ - sw/source/core/table/swtable \ - sw/source/core/text/EnhancedPDFExportHelper \ - sw/source/core/text/SwGrammarMarkUp \ - sw/source/core/text/atrstck \ - sw/source/core/text/blink \ - sw/source/core/text/frmcrsr \ - sw/source/core/text/frmform \ - sw/source/core/text/frminf \ - sw/source/core/text/frmpaint \ - sw/source/core/text/guess \ - sw/source/core/text/inftxt \ - sw/source/core/text/itradj \ - sw/source/core/text/itratr \ - sw/source/core/text/itrcrsr \ - sw/source/core/text/itrform2 \ - sw/source/core/text/itrpaint \ - sw/source/core/text/itrtxt \ - sw/source/core/text/noteurl \ - sw/source/core/text/porexp \ - sw/source/core/text/porfld \ - sw/source/core/text/porfly \ - sw/source/core/text/porglue \ - sw/source/core/text/porlay \ - sw/source/core/text/porlin \ - sw/source/core/text/pormulti \ - sw/source/core/text/porref \ - sw/source/core/text/porrst \ - sw/source/core/text/portox \ - sw/source/core/text/portxt \ - sw/source/core/text/redlnitr \ - sw/source/core/text/txtcache \ - sw/source/core/text/txtdrop \ - sw/source/core/text/txtfld \ - sw/source/core/text/txtfly \ - sw/source/core/text/txtfrm \ - sw/source/core/text/txtftn \ - sw/source/core/text/txthyph \ - sw/source/core/text/txtinit \ - sw/source/core/text/txtpaint \ - sw/source/core/text/txttab \ - sw/source/core/text/widorp \ - sw/source/core/text/wrong \ - sw/source/core/tox/tox \ - sw/source/core/tox/toxhlp \ - sw/source/core/tox/txmsrt \ - sw/source/core/txtnode/SwGrammarContact \ - sw/source/core/txtnode/atrfld \ - sw/source/core/txtnode/atrflyin \ - sw/source/core/txtnode/atrftn \ - sw/source/core/txtnode/atrref \ - sw/source/core/txtnode/atrtox \ - sw/source/core/txtnode/chrfmt \ - sw/source/core/txtnode/fmtatr2 \ - sw/source/core/txtnode/fntcache \ - sw/source/core/txtnode/fntcap \ - sw/source/core/txtnode/modeltoviewhelper \ - sw/source/core/txtnode/ndhints \ - sw/source/core/txtnode/ndtxt \ - sw/source/core/txtnode/swfntcch \ - sw/source/core/txtnode/swfont \ - sw/source/core/txtnode/thints \ - sw/source/core/txtnode/txatbase \ - sw/source/core/txtnode/txatritr \ - sw/source/core/txtnode/txtatr2 \ - sw/source/core/txtnode/txtedt \ - sw/source/core/undo/SwRewriter \ - sw/source/core/undo/SwUndoField \ - sw/source/core/undo/SwUndoFmt \ - sw/source/core/undo/SwUndoPageDesc \ - sw/source/core/undo/SwUndoTOXChange \ - sw/source/core/undo/docundo \ - sw/source/core/undo/rolbck \ - sw/source/core/undo/unattr \ - sw/source/core/undo/unbkmk \ - sw/source/core/undo/undel \ - sw/source/core/undo/undobj \ - sw/source/core/undo/undobj1 \ - sw/source/core/undo/undoflystrattr \ - sw/source/core/undo/undraw \ - sw/source/core/undo/unfmco \ - sw/source/core/undo/unins \ - sw/source/core/undo/unmove \ - sw/source/core/undo/unnum \ - sw/source/core/undo/unoutl \ - sw/source/core/undo/unovwr \ - sw/source/core/undo/unredln \ - sw/source/core/undo/unsect \ - sw/source/core/undo/unsort \ - sw/source/core/undo/unspnd \ - sw/source/core/undo/untbl \ - sw/source/core/undo/untblk \ - sw/source/core/unocore/SwXTextDefaults \ - sw/source/core/unocore/TextCursorHelper \ - sw/source/core/unocore/XMLRangeHelper \ - sw/source/core/unocore/swunohelper \ - sw/source/core/unocore/unobkm \ - sw/source/core/unocore/unochart \ - sw/source/core/unocore/unocoll \ - sw/source/core/unocore/unocrsrhelper \ - sw/source/core/unocore/unodraw \ - sw/source/core/unocore/unoevent \ - sw/source/core/unocore/unoevtlstnr \ - sw/source/core/unocore/unofield \ - sw/source/core/unocore/unoflatpara \ - sw/source/core/unocore/unoframe \ - sw/source/core/unocore/unoftn \ - sw/source/core/unocore/unoidx \ - sw/source/core/unocore/unomap \ - sw/source/core/unocore/unoobj \ - sw/source/core/unocore/unoobj2 \ - sw/source/core/unocore/unoparagraph \ - sw/source/core/unocore/unoport \ - sw/source/core/unocore/unoportenum \ - sw/source/core/unocore/unoprnms \ - sw/source/core/unocore/unoredline \ - sw/source/core/unocore/unoredlines \ - sw/source/core/unocore/unorefmk \ - sw/source/core/unocore/unosect \ - sw/source/core/unocore/unosett \ - sw/source/core/unocore/unosrch \ - sw/source/core/unocore/unostyle \ - sw/source/core/unocore/unotbl \ - sw/source/core/unocore/unotext \ - sw/source/core/unocore/unotextmarkup \ - sw/source/core/view/pagepreviewlayout \ - sw/source/core/view/vdraw \ - sw/source/core/view/viewimp \ - sw/source/core/view/viewpg \ - sw/source/core/view/viewsh \ - sw/source/core/view/vnew \ - sw/source/core/view/vprint \ - sw/source/filter/ascii/ascatr \ - sw/source/filter/ascii/parasc \ - sw/source/filter/ascii/wrtasc \ - sw/source/filter/basflt/docfact \ - sw/source/filter/basflt/fltini \ - sw/source/filter/basflt/iodetect \ - sw/source/filter/basflt/shellio \ - sw/source/filter/html/SwAppletImpl \ - sw/source/filter/html/css1atr \ - sw/source/filter/html/css1kywd \ - sw/source/filter/html/htmlatr \ - sw/source/filter/html/htmlbas \ - sw/source/filter/html/htmlcss1 \ - sw/source/filter/html/htmlctxt \ - sw/source/filter/html/htmldraw \ - sw/source/filter/html/htmlfld \ - sw/source/filter/html/htmlfldw \ - sw/source/filter/html/htmlfly \ - sw/source/filter/html/htmlflyt \ - sw/source/filter/html/htmlform \ - sw/source/filter/html/htmlforw \ - sw/source/filter/html/htmlftn \ - sw/source/filter/html/htmlgrin \ - sw/source/filter/html/htmlnum \ - sw/source/filter/html/htmlplug \ - sw/source/filter/html/htmlsect \ - sw/source/filter/html/htmltab \ - sw/source/filter/html/htmltabw \ - sw/source/filter/html/parcss1 \ - sw/source/filter/html/svxcss1 \ - sw/source/filter/html/swhtml \ - sw/source/filter/html/wrthtml \ - sw/source/filter/writer/writer \ - sw/source/filter/writer/wrt_fn \ - sw/source/filter/writer/wrtswtbl \ - sw/source/filter/ww1/fltshell \ - sw/source/filter/ww1/w1class \ - sw/source/filter/ww1/w1filter \ - sw/source/filter/ww1/w1par \ - sw/source/filter/ww1/w1sprm \ - sw/source/filter/xml/XMLRedlineImportHelper \ - sw/source/filter/xml/swxml \ - sw/source/filter/xml/wrtxml \ - sw/source/filter/xml/xmlbrsh \ - sw/source/filter/xml/xmlexp \ - sw/source/filter/xml/xmlexpit \ - sw/source/filter/xml/xmlfmt \ - sw/source/filter/xml/xmlfmte \ - sw/source/filter/xml/xmlfonte \ - sw/source/filter/xml/xmlimp \ - sw/source/filter/xml/xmlimpit \ - sw/source/filter/xml/xmlitem \ - sw/source/filter/xml/xmliteme \ - sw/source/filter/xml/xmlitemi \ - sw/source/filter/xml/xmlitemm \ - sw/source/filter/xml/xmlithlp \ - sw/source/filter/xml/xmlitmpr \ - sw/source/filter/xml/xmlmeta \ - sw/source/filter/xml/xmlscript \ - sw/source/filter/xml/xmltble \ - sw/source/filter/xml/xmltbli \ - sw/source/filter/xml/xmltext \ - sw/source/filter/xml/xmltexte \ - sw/source/filter/xml/xmltexti \ - sw/source/ui/app/appenv \ - sw/source/ui/app/apphdl \ - sw/source/ui/app/applab \ - sw/source/ui/app/appopt \ - sw/source/ui/app/docsh \ - sw/source/ui/app/docsh2 \ - sw/source/ui/app/docshdrw \ - sw/source/ui/app/docshini \ - sw/source/ui/app/docst \ - sw/source/ui/app/docstyle \ - sw/source/ui/app/mainwn \ - sw/source/ui/app/swdll \ - sw/source/ui/app/swmodul1 \ - sw/source/ui/app/swmodule \ - sw/source/ui/app/swwait \ - sw/source/ui/cctrl/actctrl \ - sw/source/ui/cctrl/popbox \ - sw/source/ui/cctrl/swlbox \ - sw/source/ui/chrdlg/ccoll \ - sw/source/ui/config/barcfg \ - sw/source/ui/config/caption \ - sw/source/ui/config/cfgitems \ - sw/source/ui/config/dbconfig \ - sw/source/ui/config/fontcfg \ - sw/source/ui/config/modcfg \ - sw/source/ui/config/prtopt \ - sw/source/ui/config/uinums \ - sw/source/ui/config/usrpref \ - sw/source/ui/config/viewopt \ - sw/source/ui/dbui/dbmgr \ - sw/source/ui/dbui/dbtree \ - sw/source/ui/dbui/dbui \ - sw/source/ui/dbui/maildispatcher \ - sw/source/ui/dbui/mailmergechildwindow \ - sw/source/ui/dbui/mailmergehelper \ - sw/source/ui/dbui/mmconfigitem \ - sw/source/ui/dbui/swdbtoolsclient \ - sw/source/ui/dialog/SwSpellDialogChildWindow \ - sw/source/ui/dialog/regionsw \ - sw/source/ui/dialog/swabstdlg \ - sw/source/ui/dialog/swwrtshitem \ - sw/source/ui/dochdl/gloshdl \ - sw/source/ui/dochdl/swdtflvr \ - sw/source/ui/docvw/PostItMgr \ - sw/source/ui/docvw/edtdd \ - sw/source/ui/docvw/edtwin \ - sw/source/ui/docvw/edtwin2 \ - sw/source/ui/docvw/edtwin3 \ - sw/source/ui/docvw/postit \ - sw/source/ui/docvw/romenu \ - sw/source/ui/docvw/srcedtw \ - sw/source/ui/envelp/envimg \ - sw/source/ui/envelp/labelcfg \ - sw/source/ui/envelp/labimg \ - sw/source/ui/envelp/syncbtn \ - sw/source/ui/fldui/fldmgr \ - sw/source/ui/fldui/fldwrap \ - sw/source/ui/fldui/xfldui \ - sw/source/ui/frmdlg/colex \ - sw/source/ui/frmdlg/colmgr \ - sw/source/ui/frmdlg/frmmgr \ - sw/source/ui/globdoc/globdoc \ - sw/source/ui/index/idxmrk \ - sw/source/ui/index/toxmgr \ - sw/source/ui/lingu/hhcwrp \ - sw/source/ui/lingu/hyp \ - sw/source/ui/lingu/olmenu \ - sw/source/ui/lingu/sdrhhcwrap \ - sw/source/ui/misc/glosdoc \ - sw/source/ui/misc/glshell \ - sw/source/ui/misc/numberingtypelistbox \ - sw/source/ui/misc/redlndlg \ - sw/source/ui/ribbar/conarc \ - sw/source/ui/ribbar/concustomshape \ - sw/source/ui/ribbar/conform \ - sw/source/ui/ribbar/conpoly \ - sw/source/ui/ribbar/conrect \ - sw/source/ui/ribbar/drawbase \ - sw/source/ui/ribbar/dselect \ - sw/source/ui/ribbar/inputwin \ - sw/source/ui/ribbar/tblctrl \ - sw/source/ui/ribbar/tbxanchr \ - sw/source/ui/ribbar/workctrl \ - sw/source/ui/shells/annotsh \ - sw/source/ui/shells/basesh \ - sw/source/ui/shells/beziersh \ - sw/source/ui/shells/drawdlg \ - sw/source/ui/shells/drawsh \ - sw/source/ui/shells/drformsh \ - sw/source/ui/shells/drwbassh \ - sw/source/ui/shells/drwtxtex \ - sw/source/ui/shells/drwtxtsh \ - sw/source/ui/shells/frmsh \ - sw/source/ui/shells/grfsh \ - sw/source/ui/shells/grfshex \ - sw/source/ui/shells/langhelper \ - sw/source/ui/shells/listsh \ - sw/source/ui/shells/mediash \ - sw/source/ui/shells/olesh \ - sw/source/ui/shells/slotadd \ - sw/source/ui/shells/tabsh \ - sw/source/ui/shells/textdrw \ - sw/source/ui/shells/textfld \ - sw/source/ui/shells/textglos \ - sw/source/ui/shells/textidx \ - sw/source/ui/shells/textsh \ - sw/source/ui/shells/textsh1 \ - sw/source/ui/shells/textsh2 \ - sw/source/ui/shells/txtattr \ - sw/source/ui/shells/txtcrsr \ - sw/source/ui/shells/txtnum \ - sw/source/ui/smartmenu/stmenu \ - sw/source/ui/table/chartins \ - sw/source/ui/table/swtablerep \ - sw/source/ui/table/tablemgr \ - sw/source/ui/uiview/formatclipboard \ - sw/source/ui/uiview/pview \ - sw/source/ui/uiview/scroll \ - sw/source/ui/uiview/srcview \ - sw/source/ui/uiview/swcli \ - sw/source/ui/uiview/uivwimp \ - sw/source/ui/uiview/view \ - sw/source/ui/uiview/view0 \ - sw/source/ui/uiview/view1 \ - sw/source/ui/uiview/view2 \ - sw/source/ui/uiview/viewcoll \ - sw/source/ui/uiview/viewdlg \ - sw/source/ui/uiview/viewdlg2 \ - sw/source/ui/uiview/viewdraw \ - sw/source/ui/uiview/viewling \ - sw/source/ui/uiview/viewmdi \ - sw/source/ui/uiview/viewport \ - sw/source/ui/uiview/viewprt \ - sw/source/ui/uiview/viewsrch \ - sw/source/ui/uiview/viewstat \ - sw/source/ui/uiview/viewtab \ - sw/source/ui/uno/RefreshListenerContainer \ - sw/source/ui/uno/SwXDocumentSettings \ - sw/source/ui/uno/SwXFilterOptions \ - sw/source/ui/uno/SwXPrintPreviewSettings \ - sw/source/ui/uno/dlelstnr \ - sw/source/ui/uno/unoatxt \ - sw/source/ui/uno/unodefaults \ - sw/source/ui/uno/unodispatch \ - sw/source/ui/uno/unodoc \ - sw/source/ui/uno/unofreg \ - sw/source/ui/uno/unomailmerge \ - sw/source/ui/uno/unomod \ - sw/source/ui/uno/unomodule \ - sw/source/ui/uno/unotxdoc \ - sw/source/ui/uno/unotxvw \ - sw/source/ui/uno/warnpassword \ - sw/source/ui/utlui/attrdesc \ - sw/source/ui/utlui/bookctrl \ - sw/source/ui/utlui/condedit \ - sw/source/ui/utlui/content \ - sw/source/ui/utlui/glbltree \ - sw/source/ui/utlui/gloslst \ - sw/source/ui/utlui/initui \ - sw/source/ui/utlui/navicfg \ - sw/source/ui/utlui/navipi \ - sw/source/ui/utlui/numfmtlb \ - sw/source/ui/utlui/prcntfld \ - sw/source/ui/utlui/shdwcrsr \ - sw/source/ui/utlui/textcontrolcombo \ - sw/source/ui/utlui/tmplctrl \ - sw/source/ui/utlui/uiitems \ - sw/source/ui/utlui/uitool \ - sw/source/ui/utlui/unotools \ - sw/source/ui/utlui/viewlayoutctrl \ - sw/source/ui/utlui/zoomctrl \ - sw/source/ui/web/wdocsh \ - sw/source/ui/web/wformsh \ - sw/source/ui/web/wfrmsh \ - sw/source/ui/web/wgrfsh \ - sw/source/ui/web/wlistsh \ - sw/source/ui/web/wolesh \ - sw/source/ui/web/wtabsh \ - sw/source/ui/web/wtextsh \ - sw/source/ui/web/wview \ - sw/source/ui/wrtsh/delete \ - sw/source/ui/wrtsh/move \ - sw/source/ui/wrtsh/select \ - sw/source/ui/wrtsh/wrtsh1 \ - sw/source/ui/wrtsh/wrtsh2 \ - sw/source/ui/wrtsh/wrtsh3 \ - sw/source/ui/wrtsh/wrtsh4 \ - sw/source/ui/wrtsh/wrtundo \ - sw/source/core/except/errhdl \ - sw/source/core/except/dbgloop \ - sw/source/core/layout/dbg_lay \ - sw/source/core/text/txtio \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,sw,\ - dl \ - m \ - pthread \ - sb \ -)) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,sw,\ - advapi32 \ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif - -$(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter)) - - -$(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\ - -I$(SRCDIR)/sw/inc \ - -I$(SRCDIR)/sw/sdi \ - $$(INCLUDE) \ -)) -# vim: set noet sw=4 ts=4: diff --git a/sw/prj/target_lib_swd.mk b/sw/prj/target_lib_swd.mk deleted file mode 100644 index 1d185e8f4267..000000000000 --- a/sw/prj/target_lib_swd.mk +++ /dev/null @@ -1,77 +0,0 @@ -#************************************************************************* -# -# 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,swd)) - -$(eval $(call gb_Library_set_include,swd,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/sw/sdi \ - -I$(WORKDIR)/inc/sw \ - -I$(SRCDIR)/sw/inc \ - -I$(SRCDIR)/sw/inc/pch \ - -I$(SRCDIR)/sw/source/core/inc \ - -I$(SRCDIR)/sw/source/filter/inc \ - -I$(SRCDIR)/sw/source/ui/inc \ - -I$(OUTDIR)/inc/sw \ - -I$(OUTDIR)/inc/offuh \ -)) - -$(eval $(call gb_Library_set_defs,swd,\ - $$(DEFS) \ - -DACCESSIBLE_LAYOUT \ -)) - -$(eval $(call gb_Library_add_linked_libs,swd,\ - comphelper \ - sfx \ - sot \ - svl \ - svt \ - tl \ - ucbhelper \ - cppu \ - cppuhelper \ - sal \ - utl \ - vcl \ -)) - -$(eval $(call gb_Library_add_exception_objects,swd,\ - sw/source/core/except/errhdl \ - sw/source/filter/basflt/iodetect \ - sw/source/ui/uno/detreg \ - sw/source/ui/uno/swdet2 \ - sw/source/ui/uno/swdetect \ -)) -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,swd,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/sw/prj/target_lib_swui.mk b/sw/prj/target_lib_swui.mk deleted file mode 100644 index 12227c9a0ae8..000000000000 --- a/sw/prj/target_lib_swui.mk +++ /dev/null @@ -1,179 +0,0 @@ -#************************************************************************* -# -# 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,swui)) - -$(eval $(call gb_Library_set_include,swui,\ - -I$(SRCDIR)/sw/inc \ - -I$(SRCDIR)/sw/inc/pch \ - -I$(SRCDIR)/sw/source/core/inc \ - -I$(SRCDIR)/sw/source/filter/inc \ - -I$(SRCDIR)/sw/source/ui/inc \ - -I$(WORKDIR)/SdiTarget/sw/sdi \ - -I$(WORKDIR)/Misc/sw \ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/sw \ - -I$(OUTDIR)/inc/offuh \ -)) - -$(eval $(call gb_Library_set_defs,swui,\ - $$(DEFS) \ - -DACCESSIBLE_LAYOUT \ -)) - -$(eval $(call gb_Library_add_linked_libs,swui,\ - comphelper \ - cppu \ - cppuhelper \ - editeng \ - i18nisolang1 \ - msfilter \ - sal \ - sfx \ - sot \ - stl \ - svl \ - svt \ - svx \ - svx \ - svxcore \ - sw \ - tk \ - tl \ - ucbhelper \ - utl \ - vcl \ -)) - -$(eval $(call gb_Library_add_exception_objects,swui,\ - sw/source/core/undo/SwRewriter \ - sw/source/ui/chrdlg/break \ - sw/source/ui/chrdlg/chardlg \ - sw/source/ui/chrdlg/drpcps \ - sw/source/ui/chrdlg/numpara \ - sw/source/ui/chrdlg/pardlg \ - sw/source/ui/chrdlg/swuiccoll \ - sw/source/ui/chrdlg/tblnumfm \ - sw/source/ui/config/mailconfigpage \ - sw/source/ui/config/optcomp \ - sw/source/ui/config/optload \ - sw/source/ui/config/optpage \ - sw/source/ui/dbui/addresslistdialog \ - sw/source/ui/dbui/createaddresslistdialog \ - sw/source/ui/dbui/customizeaddresslistdialog \ - sw/source/ui/dbui/dbinsdlg \ - sw/source/ui/dbui/dbtablepreviewdialog \ - sw/source/ui/dbui/mailmergewizard \ - sw/source/ui/dbui/mmaddressblockpage \ - sw/source/ui/dbui/mmdocselectpage \ - sw/source/ui/dbui/mmgreetingspage \ - sw/source/ui/dbui/mmlayoutpage \ - sw/source/ui/dbui/mmmergepage \ - sw/source/ui/dbui/mmoutputpage \ - sw/source/ui/dbui/mmoutputtypepage \ - sw/source/ui/dbui/mmpreparemergepage \ - sw/source/ui/dbui/selectdbtabledialog \ - sw/source/ui/dialog/abstract \ - sw/source/ui/dialog/addrdlg \ - sw/source/ui/dialog/ascfldlg \ - sw/source/ui/dialog/docstdlg \ - sw/source/ui/dialog/macassgn \ - sw/source/ui/dialog/swdialmgr \ - sw/source/ui/dialog/swdlgfact \ - sw/source/ui/dialog/swuiexp \ - sw/source/ui/dialog/uiregionsw \ - sw/source/ui/dialog/wordcountdialog \ - sw/source/ui/dochdl/selglos \ - sw/source/ui/envelp/envfmt \ - sw/source/ui/envelp/envlop1 \ - sw/source/ui/envelp/envprt \ - sw/source/ui/envelp/label1 \ - sw/source/ui/envelp/labelexp \ - sw/source/ui/envelp/labfmt \ - sw/source/ui/envelp/labprt \ - sw/source/ui/envelp/mailmrge \ - sw/source/ui/fldui/DropDownFieldDialog \ - sw/source/ui/fldui/FldRefTreeListBox \ - sw/source/ui/fldui/changedb \ - sw/source/ui/fldui/flddb \ - sw/source/ui/fldui/flddinf \ - sw/source/ui/fldui/flddok \ - sw/source/ui/fldui/fldedt \ - sw/source/ui/fldui/fldfunc \ - sw/source/ui/fldui/fldpage \ - sw/source/ui/fldui/fldref \ - sw/source/ui/fldui/fldtdlg \ - sw/source/ui/fldui/fldvar \ - sw/source/ui/fldui/inpdlg \ - sw/source/ui/fldui/javaedit \ - sw/source/ui/fmtui/tmpdlg \ - sw/source/ui/frmdlg/column \ - sw/source/ui/frmdlg/cption \ - sw/source/ui/frmdlg/frmdlg \ - sw/source/ui/frmdlg/frmpage \ - sw/source/ui/frmdlg/pattern \ - sw/source/ui/frmdlg/uiborder \ - sw/source/ui/frmdlg/wrap \ - sw/source/ui/index/cntex \ - sw/source/ui/index/cnttab \ - sw/source/ui/index/multmrk \ - sw/source/ui/index/swuiidxmrk \ - sw/source/ui/misc/bookmark \ - sw/source/ui/misc/docfnote \ - sw/source/ui/misc/glosbib \ - sw/source/ui/misc/glossary \ - sw/source/ui/misc/insfnote \ - sw/source/ui/misc/insrule \ - sw/source/ui/misc/linenum \ - sw/source/ui/misc/num \ - sw/source/ui/misc/outline \ - sw/source/ui/misc/pgfnote \ - sw/source/ui/misc/pggrid \ - sw/source/ui/misc/srtdlg \ - sw/source/ui/misc/swmodalredlineacceptdlg \ - sw/source/ui/table/colwd \ - sw/source/ui/table/convert \ - sw/source/ui/table/instable \ - sw/source/ui/table/mergetbl \ - sw/source/ui/table/rowht \ - sw/source/ui/table/splittbl \ - sw/source/ui/table/tabledlg \ - sw/source/ui/table/tautofmt \ - sw/source/ui/utlui/swrenamexnameddlg \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,swui,\ - advapi32 \ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/sw/prj/target_lib_vbaswobj.mk b/sw/prj/target_lib_vbaswobj.mk deleted file mode 100644 index a6d20bd530cc..000000000000 --- a/sw/prj/target_lib_vbaswobj.mk +++ /dev/null @@ -1,134 +0,0 @@ -#************************************************************************* -# -# 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,vbaswobj)) - -$(eval $(call gb_Library_set_include,vbaswobj,\ - -I$(SRCDIR)/sw/source/core/inc \ - -I$(SRCDIR)/sw/source/filter/inc \ - -I$(SRCDIR)/sw/source/ui/inc \ - -I$(SRCDIR)/sw/inc/pch \ - -I$(SRCDIR)/sw/inc \ - -I$(WORKDIR)/Misc/sw/ \ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc/ \ -)) - -$(eval $(call gb_Library_set_defs,vbaswobj,\ - $$(DEFS) \ - -DVBA_OOBUILD_HACK \ -)) - -$(eval $(call gb_Library_add_linked_libs,vbaswobj,\ - comphelper \ - cppu \ - cppuhelper \ - editeng \ - i18nisolang1 \ - sal \ - sfx \ - svl \ - svt \ - svx \ - svxcore \ - sw \ - tk \ - tl \ - utl \ - vbahelper \ - vcl \ - stl \ -)) - -$(eval $(call gb_Library_add_exception_objects,vbaswobj,\ - sw/source/ui/vba/service \ - sw/source/ui/vba/vbadocument \ - sw/source/ui/vba/vbasections \ - sw/source/ui/vba/vbadialog \ - sw/source/ui/vba/vbawrapformat \ - sw/source/ui/vba/vbafont \ - sw/source/ui/vba/vbaheaderfooterhelper \ - sw/source/ui/vba/vbarangehelper \ - sw/source/ui/vba/vbaaddin \ - sw/source/ui/vba/vbaautotextentry \ - sw/source/ui/vba/vbarange \ - sw/source/ui/vba/vbadocumentproperties \ - sw/source/ui/vba/vbastyle \ - sw/source/ui/vba/vbapane \ - sw/source/ui/vba/vbaglobals \ - sw/source/ui/vba/vbatemplate \ - sw/source/ui/vba/vbaaddins \ - sw/source/ui/vba/vbaview \ - sw/source/ui/vba/vbaheaderfooter \ - sw/source/ui/vba/vbabookmarks \ - sw/source/ui/vba/vbaoptions \ - sw/source/ui/vba/vbadialogs \ - sw/source/ui/vba/vbapalette \ - sw/source/ui/vba/vbaparagraph \ - sw/source/ui/vba/vbafind \ - sw/source/ui/vba/vbasection \ - sw/source/ui/vba/vbabookmark \ - sw/source/ui/vba/vbaapplication \ - sw/source/ui/vba/vbawindow \ - sw/source/ui/vba/vbareplacement \ - sw/source/ui/vba/vbatable \ - sw/source/ui/vba/vbaselection \ - sw/source/ui/vba/vbasystem \ - sw/source/ui/vba/vbainformationhelper \ - sw/source/ui/vba/vbapagesetup \ - sw/source/ui/vba/vbafield \ - sw/source/ui/vba/vbatables \ - sw/source/ui/vba/vbavariable \ - sw/source/ui/vba/vbadocuments \ - sw/source/ui/vba/vbaparagraphformat \ - sw/source/ui/vba/vbaborders \ - sw/source/ui/vba/vbavariables \ - sw/source/ui/vba/vbastyles \ - sw/source/ui/vba/vbapanes \ - sw/source/ui/vba/wordvbahelper \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_set_ldflags,vbaswobj,\ - $$(LDFLAGS) \ - -Wl$(COMMA)-O1 \ - -Wl$(COMMA)-z$(COMMA)noexecstack \ -)) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,vbaswobj,\ - advapi32 \ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/sw/prj/target_module_sw.mk b/sw/prj/target_module_sw.mk deleted file mode 100755 index 20e4944877dd..000000000000 --- a/sw/prj/target_module_sw.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Module_Module,sw,\ - $(call gb_AllLangResTarget_get_target,sw) \ - $(call gb_Library_get_target,msword) \ - $(call gb_Library_get_target,sw) \ - $(call gb_Library_get_target,swd) \ - $(call gb_Library_get_target,swui) \ - $(call gb_Library_get_target,vbaswobj) \ - $(call gb_Package_get_target,sw_uiconfig) \ - $(call gb_Package_get_target,sw_xml) \ - $(call gb_Package_get_target,sw_misc) \ -)) - -$(eval $(call gb_Module_read_includes,sw,\ - lib_sw \ - lib_swd \ - lib_swui \ - lib_msword \ - lib_vbaswobj \ - package_misc \ - package_uiconfig \ - package_xml \ - res_sw \ -)) diff --git a/sw/prj/target_package_misc.mk b/sw/prj/target_package_misc.mk deleted file mode 100644 index bb2e3cd8dc7f..000000000000 --- a/sw/prj/target_package_misc.mk +++ /dev/null @@ -1,30 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,sw_misc,$(SRCDIR)/sw/misc)) -# TODO: -#COPY sw/unxlngx6.pro/misc/swslots_sid.hid unxlngx6.pro/bin/hid/swslots_sid.hid diff --git a/sw/prj/target_package_uiconfig.mk b/sw/prj/target_package_uiconfig.mk deleted file mode 100644 index 6ec1b30c0509..000000000000 --- a/sw/prj/target_package_uiconfig.mk +++ /dev/null @@ -1,281 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,sw_uiconfig,$(SRCDIR)/sw/uiconfig)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/accelerator/de/default.xml,sglobal/accelerator/de/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/accelerator/en-US/default.xml,sglobal/accelerator/en-US/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/accelerator/es/default.xml,sglobal/accelerator/es/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/accelerator/fr/default.xml,sglobal/accelerator/fr/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/menubar/menubar.xml,sglobal/menubar/menubar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/statusbar/statusbar.xml,sglobal/statusbar/statusbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/alignmentbar.xml,sglobal/toolbar/alignmentbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/arrowshapes.xml,sglobal/toolbar/arrowshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/basicshapes.xml,sglobal/toolbar/basicshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/bezierobjectbar.xml,sglobal/toolbar/bezierobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/calloutshapes.xml,sglobal/toolbar/calloutshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/colorbar.xml,sglobal/toolbar/colorbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawbar.xml,sglobal/toolbar/drawbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawingobjectbar.xml,sglobal/toolbar/drawingobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawtextobjectbar.xml,sglobal/toolbar/drawtextobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/extrusionobjectbar.xml,sglobal/toolbar/extrusionobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/flowchartshapes.xml,sglobal/toolbar/flowchartshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fontworkobjectbar.xml,sglobal/toolbar/fontworkobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fontworkshapetype.xml,sglobal/toolbar/fontworkshapetype.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formcontrols.xml,sglobal/toolbar/formcontrols.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formdesign.xml,sglobal/toolbar/formdesign.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formsfilterbar.xml,sglobal/toolbar/formsfilterbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formsnavigationbar.xml,sglobal/toolbar/formsnavigationbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formtextobjectbar.xml,sglobal/toolbar/formtextobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/frameobjectbar.xml,sglobal/toolbar/frameobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fullscreenbar.xml,sglobal/toolbar/fullscreenbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/graffilterbar.xml,sglobal/toolbar/graffilterbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/graphicobjectbar.xml,sglobal/toolbar/graphicobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/insertbar.xml,sglobal/toolbar/insertbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/insertobjectbar.xml,sglobal/toolbar/insertobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/mediaobjectbar.xml,sglobal/toolbar/mediaobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/moreformcontrols.xml,sglobal/toolbar/moreformcontrols.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/numobjectbar.xml,sglobal/toolbar/numobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/oleobjectbar.xml,sglobal/toolbar/oleobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/optimizetablebar.xml,sglobal/toolbar/optimizetablebar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/previewobjectbar.xml,sglobal/toolbar/previewobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/standardbar.xml,sglobal/toolbar/standardbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/starshapes.xml,sglobal/toolbar/starshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/symbolshapes.xml,sglobal/toolbar/symbolshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/tableobjectbar.xml,sglobal/toolbar/tableobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/textobjectbar.xml,sglobal/toolbar/textobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/toolbar.xml,sglobal/toolbar/toolbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/viewerbar.xml,sglobal/toolbar/viewerbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/accelerator/de/default.xml,sweb/accelerator/de/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/accelerator/en-US/default.xml,sweb/accelerator/en-US/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/accelerator/es/default.xml,sweb/accelerator/es/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/accelerator/fr/default.xml,sweb/accelerator/fr/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/menubar/menubar.xml,sweb/menubar/menubar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/statusbar/statusbar.xml,sweb/statusbar/statusbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/arrowshapes.xml,sweb/toolbar/arrowshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/basicshapes.xml,sweb/toolbar/basicshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/bezierobjectbar.xml,sweb/toolbar/bezierobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/calloutshapes.xml,sweb/toolbar/calloutshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/colorbar.xml,sweb/toolbar/colorbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/drawingobjectbar.xml,sweb/toolbar/drawingobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/drawtextobjectbar.xml,sweb/toolbar/drawtextobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/extrusionobjectbar.xml,sweb/toolbar/extrusionobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/flowchartshapes.xml,sweb/toolbar/flowchartshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fontworkobjectbar.xml,sweb/toolbar/fontworkobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fontworkshapetype.xml,sweb/toolbar/fontworkshapetype.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formcontrols.xml,sweb/toolbar/formcontrols.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formdesign.xml,sweb/toolbar/formdesign.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formsfilterbar.xml,sweb/toolbar/formsfilterbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formsnavigationbar.xml,sweb/toolbar/formsnavigationbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formtextobjectbar.xml,sweb/toolbar/formtextobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/frameobjectbar.xml,sweb/toolbar/frameobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fullscreenbar.xml,sweb/toolbar/fullscreenbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/graffilterbar.xml,sweb/toolbar/graffilterbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/graphicobjectbar.xml,sweb/toolbar/graphicobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/insertbar.xml,sweb/toolbar/insertbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/mediaobjectbar.xml,sweb/toolbar/mediaobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/numobjectbar.xml,sweb/toolbar/numobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/oleobjectbar.xml,sweb/toolbar/oleobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/optimizetablebar.xml,sweb/toolbar/optimizetablebar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/previewobjectbar.xml,sweb/toolbar/previewobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/standardbar.xml,sweb/toolbar/standardbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/starshapes.xml,sweb/toolbar/starshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/symbolshapes.xml,sweb/toolbar/symbolshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/tableobjectbar.xml,sweb/toolbar/tableobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/textobjectbar.xml,sweb/toolbar/textobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/toolbar.xml,sweb/toolbar/toolbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/viewerbar.xml,sweb/toolbar/viewerbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/accelerator/de/default.xml,swform/accelerator/de/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/accelerator/en-US/default.xml,swform/accelerator/en-US/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/accelerator/es/default.xml,swform/accelerator/es/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/accelerator/fr/default.xml,swform/accelerator/fr/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/menubar/menubar.xml,swform/menubar/menubar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/statusbar/statusbar.xml,swform/statusbar/statusbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/alignmentbar.xml,swform/toolbar/alignmentbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/arrowshapes.xml,swform/toolbar/arrowshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/basicshapes.xml,swform/toolbar/basicshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/bezierobjectbar.xml,swform/toolbar/bezierobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/calloutshapes.xml,swform/toolbar/calloutshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/colorbar.xml,swform/toolbar/colorbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawbar.xml,swform/toolbar/drawbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawingobjectbar.xml,swform/toolbar/drawingobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawtextobjectbar.xml,swform/toolbar/drawtextobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/extrusionobjectbar.xml,swform/toolbar/extrusionobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/flowchartshapes.xml,swform/toolbar/flowchartshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fontworkobjectbar.xml,swform/toolbar/fontworkobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fontworkshapetype.xml,swform/toolbar/fontworkshapetype.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formcontrols.xml,swform/toolbar/formcontrols.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formdesign.xml,swform/toolbar/formdesign.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formsfilterbar.xml,swform/toolbar/formsfilterbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formsnavigationbar.xml,swform/toolbar/formsnavigationbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formtextobjectbar.xml,swform/toolbar/formtextobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/frameobjectbar.xml,swform/toolbar/frameobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fullscreenbar.xml,swform/toolbar/fullscreenbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/graffilterbar.xml,swform/toolbar/graffilterbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/graphicobjectbar.xml,swform/toolbar/graphicobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/insertbar.xml,swform/toolbar/insertbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/insertobjectbar.xml,swform/toolbar/insertobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/mediaobjectbar.xml,swform/toolbar/mediaobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/moreformcontrols.xml,swform/toolbar/moreformcontrols.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/numobjectbar.xml,swform/toolbar/numobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/oleobjectbar.xml,swform/toolbar/oleobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/optimizetablebar.xml,swform/toolbar/optimizetablebar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/previewobjectbar.xml,swform/toolbar/previewobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/standardbar.xml,swform/toolbar/standardbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/starshapes.xml,swform/toolbar/starshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/symbolshapes.xml,swform/toolbar/symbolshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/tableobjectbar.xml,swform/toolbar/tableobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/textobjectbar.xml,swform/toolbar/textobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/toolbar.xml,swform/toolbar/toolbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/viewerbar.xml,swform/toolbar/viewerbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/accelerator/de/default.xml,swreport/accelerator/de/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/accelerator/en-US/default.xml,swreport/accelerator/en-US/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/accelerator/es/default.xml,swreport/accelerator/es/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/accelerator/fr/default.xml,swreport/accelerator/fr/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/menubar/menubar.xml,swreport/menubar/menubar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/statusbar/statusbar.xml,swreport/statusbar/statusbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/alignmentbar.xml,swreport/toolbar/alignmentbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/arrowshapes.xml,swreport/toolbar/arrowshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/basicshapes.xml,swreport/toolbar/basicshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/bezierobjectbar.xml,swreport/toolbar/bezierobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/calloutshapes.xml,swreport/toolbar/calloutshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/colorbar.xml,swreport/toolbar/colorbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawbar.xml,swreport/toolbar/drawbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawingobjectbar.xml,swreport/toolbar/drawingobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawtextobjectbar.xml,swreport/toolbar/drawtextobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/extrusionobjectbar.xml,swreport/toolbar/extrusionobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/flowchartshapes.xml,swreport/toolbar/flowchartshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fontworkobjectbar.xml,swreport/toolbar/fontworkobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fontworkshapetype.xml,swreport/toolbar/fontworkshapetype.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formcontrols.xml,swreport/toolbar/formcontrols.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formdesign.xml,swreport/toolbar/formdesign.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formsfilterbar.xml,swreport/toolbar/formsfilterbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formsnavigationbar.xml,swreport/toolbar/formsnavigationbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formtextobjectbar.xml,swreport/toolbar/formtextobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/frameobjectbar.xml,swreport/toolbar/frameobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fullscreenbar.xml,swreport/toolbar/fullscreenbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/graffilterbar.xml,swreport/toolbar/graffilterbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/graphicobjectbar.xml,swreport/toolbar/graphicobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/insertbar.xml,swreport/toolbar/insertbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/insertobjectbar.xml,swreport/toolbar/insertobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/mediaobjectbar.xml,swreport/toolbar/mediaobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/moreformcontrols.xml,swreport/toolbar/moreformcontrols.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/numobjectbar.xml,swreport/toolbar/numobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/oleobjectbar.xml,swreport/toolbar/oleobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/optimizetablebar.xml,swreport/toolbar/optimizetablebar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/previewobjectbar.xml,swreport/toolbar/previewobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/standardbar.xml,swreport/toolbar/standardbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/starshapes.xml,swreport/toolbar/starshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/symbolshapes.xml,swreport/toolbar/symbolshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/tableobjectbar.xml,swreport/toolbar/tableobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/textobjectbar.xml,swreport/toolbar/textobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/toolbar.xml,swreport/toolbar/toolbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/viewerbar.xml,swreport/toolbar/viewerbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/accelerator/de/default.xml,swriter/accelerator/de/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/accelerator/en-US/default.xml,swriter/accelerator/en-US/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/accelerator/es/default.xml,swriter/accelerator/es/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/accelerator/fr/default.xml,swriter/accelerator/fr/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/menubar/menubar.xml,swriter/menubar/menubar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/statusbar/statusbar.xml,swriter/statusbar/statusbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/alignmentbar.xml,swriter/toolbar/alignmentbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/arrowshapes.xml,swriter/toolbar/arrowshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/basicshapes.xml,swriter/toolbar/basicshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/bezierobjectbar.xml,swriter/toolbar/bezierobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/calloutshapes.xml,swriter/toolbar/calloutshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/colorbar.xml,swriter/toolbar/colorbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawbar.xml,swriter/toolbar/drawbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawingobjectbar.xml,swriter/toolbar/drawingobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawtextobjectbar.xml,swriter/toolbar/drawtextobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/extrusionobjectbar.xml,swriter/toolbar/extrusionobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/flowchartshapes.xml,swriter/toolbar/flowchartshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkobjectbar.xml,swriter/toolbar/fontworkobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkshapetype.xml,swriter/toolbar/fontworkshapetype.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formcontrols.xml,swriter/toolbar/formcontrols.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formdesign.xml,swriter/toolbar/formdesign.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formsfilterbar.xml,swriter/toolbar/formsfilterbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formsnavigationbar.xml,swriter/toolbar/formsnavigationbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formtextobjectbar.xml,swriter/toolbar/formtextobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/frameobjectbar.xml,swriter/toolbar/frameobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fullscreenbar.xml,swriter/toolbar/fullscreenbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/graffilterbar.xml,swriter/toolbar/graffilterbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/graphicobjectbar.xml,swriter/toolbar/graphicobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/insertbar.xml,swriter/toolbar/insertbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/mediaobjectbar.xml,swriter/toolbar/mediaobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/moreformcontrols.xml,swriter/toolbar/moreformcontrols.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/numobjectbar.xml,swriter/toolbar/numobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/oleobjectbar.xml,swriter/toolbar/oleobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/optimizetablebar.xml,swriter/toolbar/optimizetablebar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/previewobjectbar.xml,swriter/toolbar/previewobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/standardbar.xml,swriter/toolbar/standardbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/starshapes.xml,swriter/toolbar/starshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/symbolshapes.xml,swriter/toolbar/symbolshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/tableobjectbar.xml,swriter/toolbar/tableobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/textobjectbar.xml,swriter/toolbar/textobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/toolbar.xml,swriter/toolbar/toolbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/viewerbar.xml,swriter/toolbar/viewerbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/accelerator/de/default.xml,swxform/accelerator/de/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/accelerator/en-US/default.xml,swxform/accelerator/en-US/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/accelerator/es/default.xml,swxform/accelerator/es/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/accelerator/fr/default.xml,swxform/accelerator/fr/default.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/menubar/menubar.xml,swxform/menubar/menubar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/statusbar/statusbar.xml,swxform/statusbar/statusbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/alignmentbar.xml,swxform/toolbar/alignmentbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/arrowshapes.xml,swxform/toolbar/arrowshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/basicshapes.xml,swxform/toolbar/basicshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/bezierobjectbar.xml,swxform/toolbar/bezierobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/calloutshapes.xml,swxform/toolbar/calloutshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/colorbar.xml,swxform/toolbar/colorbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawbar.xml,swxform/toolbar/drawbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawingobjectbar.xml,swxform/toolbar/drawingobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawtextobjectbar.xml,swxform/toolbar/drawtextobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/extrusionobjectbar.xml,swxform/toolbar/extrusionobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/flowchartshapes.xml,swxform/toolbar/flowchartshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fontworkobjectbar.xml,swxform/toolbar/fontworkobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fontworkshapetype.xml,swxform/toolbar/fontworkshapetype.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formcontrols.xml,swxform/toolbar/formcontrols.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formdesign.xml,swxform/toolbar/formdesign.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formsfilterbar.xml,swxform/toolbar/formsfilterbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formsnavigationbar.xml,swxform/toolbar/formsnavigationbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formtextobjectbar.xml,swxform/toolbar/formtextobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/frameobjectbar.xml,swxform/toolbar/frameobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fullscreenbar.xml,swxform/toolbar/fullscreenbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/graffilterbar.xml,swxform/toolbar/graffilterbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/graphicobjectbar.xml,swxform/toolbar/graphicobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/insertbar.xml,swxform/toolbar/insertbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/insertobjectbar.xml,swxform/toolbar/insertobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/mediaobjectbar.xml,swxform/toolbar/mediaobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/moreformcontrols.xml,swxform/toolbar/moreformcontrols.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/numobjectbar.xml,swxform/toolbar/numobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/oleobjectbar.xml,swxform/toolbar/oleobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/optimizetablebar.xml,swxform/toolbar/optimizetablebar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/previewobjectbar.xml,swxform/toolbar/previewobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/standardbar.xml,swxform/toolbar/standardbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/starshapes.xml,swxform/toolbar/starshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/symbolshapes.xml,swxform/toolbar/symbolshapes.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/tableobjectbar.xml,swxform/toolbar/tableobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/textobjectbar.xml,swxform/toolbar/textobjectbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/toolbar.xml,swxform/toolbar/toolbar.xml)) -$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/viewerbar.xml,swxform/toolbar/viewerbar.xml)) diff --git a/sw/prj/target_package_xml.mk b/sw/prj/target_package_xml.mk deleted file mode 100644 index 7eb3f1cb1f3f..000000000000 --- a/sw/prj/target_package_xml.mk +++ /dev/null @@ -1,29 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,sw_xml,$(SRCDIR)/sw/xml)) -$(eval $(call gb_Package_add_file,sw_xml,xml/writer.xml,writer.xml)) diff --git a/sw/prj/target_pch_sw.mk b/sw/prj/target_pch_sw.mk deleted file mode 100755 index 1ef7f12f0a3b..000000000000 --- a/sw/prj/target_pch_sw.mk +++ /dev/null @@ -1,41 +0,0 @@ -#************************************************************************* -# -# 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_PrecompiledHeader_PrecompiledHeader,precompiled_sw,$(SRCDIR)/sw/inc/pch/precompiled_sw)) - -$(eval $(call gb_PrecompiledHeader_set_include,precompiled_sw,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_PrecompiledHeader_set_defs,precompiled_sw,\ - $$(DEFS) \ - -DACCESSIBLE_LAYOUT \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sw/prj/target_res_sw.mk b/sw/prj/target_res_sw.mk deleted file mode 100644 index ba552333d2fa..000000000000 --- a/sw/prj/target_res_sw.mk +++ /dev/null @@ -1,184 +0,0 @@ -#************************************************************************* -# -# 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_AllLangResTarget_AllLangResTarget,sw)) - -$(eval $(call gb_AllLangResTarget_add_srs,sw,\ - sw/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,sw/res)) - -$(eval $(call gb_SrsTarget_set_include,sw/res,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc \ - -I$(WORKDIR)/inc/sw \ - -I$(SRCDIR)/sw/inc \ - -I$(SRCDIR)/sw/source/core/undo \ - -I$(SRCDIR)/sw/source/core/unocore \ - -I$(SRCDIR)/sw/source/ui/chrdlg \ - -I$(SRCDIR)/sw/source/ui/config \ - -I$(SRCDIR)/sw/source/ui/dbui \ - -I$(SRCDIR)/sw/source/ui/dialog \ - -I$(SRCDIR)/sw/source/ui/docvw \ - -I$(SRCDIR)/sw/source/ui/envelp \ - -I$(SRCDIR)/sw/source/ui/fldui \ - -I$(SRCDIR)/sw/source/ui/fmtui \ - -I$(SRCDIR)/sw/source/ui/frmdlg \ - -I$(SRCDIR)/sw/source/ui/globdoc \ - -I$(SRCDIR)/sw/source/ui/inc \ - -I$(SRCDIR)/sw/source/ui/index \ - -I$(SRCDIR)/sw/source/ui/lingu \ - -I$(SRCDIR)/sw/source/ui/misc \ - -I$(SRCDIR)/sw/source/ui/ribbar \ - -I$(SRCDIR)/sw/source/ui/shells \ - -I$(SRCDIR)/sw/source/ui/smartmenu \ - -I$(SRCDIR)/sw/source/ui/table \ - -I$(SRCDIR)/sw/source/ui/uiview \ - -I$(SRCDIR)/sw/source/ui/utlui \ - -I$(SRCDIR)/sw/source/ui/web \ - -I$(SRCDIR)/sw/source/ui/wrtsh \ -)) - -$(eval $(call gb_SrsTarget_add_files,sw/res,\ - sw/source/ui/app/app.src \ - sw/source/ui/app/mn.src \ - sw/source/ui/app/error.src \ - sw/source/ui/dialog/abstract.src \ - sw/source/ui/dialog/ascfldlg.src \ - sw/source/ui/dialog/dialog.src \ - sw/source/ui/dialog/docstdlg.src \ - sw/source/ui/dialog/regionsw.src \ - sw/source/ui/dialog/wordcountdialog.src \ - sw/source/ui/chrdlg/chrdlg.src \ - sw/source/ui/chrdlg/ccoll.src \ - sw/source/ui/chrdlg/drpcps.src \ - sw/source/ui/chrdlg/swbreak.src \ - sw/source/ui/chrdlg/paradlg.src \ - sw/source/ui/chrdlg/numpara.src \ - sw/source/ui/chrdlg/chardlg.src \ - sw/source/ui/config/optcomp.src \ - sw/source/ui/config/optload.src \ - sw/source/ui/config/mailconfigpage.src \ - sw/source/ui/config/redlopt.src \ - sw/source/ui/config/optdlg.src \ - sw/source/ui/dbui/mmpreparemergepage.src \ - sw/source/ui/dbui/mmgreetingspage.src \ - sw/source/ui/dbui/mmmergepage.src \ - sw/source/ui/dbui/mmoutputtypepage.src \ - sw/source/ui/dbui/mmlayoutpage.src \ - sw/source/ui/dbui/mmaddressblockpage.src \ - sw/source/ui/dbui/createaddresslistdialog.src \ - sw/source/ui/dbui/dbtablepreviewdialog.src \ - sw/source/ui/dbui/mmdocselectpage.src \ - sw/source/ui/dbui/customizeaddresslistdialog.src \ - sw/source/ui/dbui/mailmergechildwindow.src \ - sw/source/ui/dbui/mailmergewizard.src \ - sw/source/ui/dbui/dbinsdlg.src \ - sw/source/ui/dbui/selectdbtabledialog.src \ - sw/source/ui/dbui/mmoutputpage.src \ - sw/source/ui/dbui/dbui.src \ - sw/source/ui/dbui/addresslistdialog.src \ - sw/source/ui/dochdl/selglos.src \ - sw/source/ui/dochdl/dochdl.src \ - sw/source/ui/docvw/access.src \ - sw/source/ui/docvw/docvw.src \ - sw/source/ui/envelp/mailmrge.src \ - sw/source/ui/envelp/labprt.src \ - sw/source/ui/envelp/label.src \ - sw/source/ui/envelp/envfmt.src \ - sw/source/ui/envelp/labfmt.src \ - sw/source/ui/envelp/envelp.src \ - sw/source/ui/envelp/envprt.src \ - sw/source/ui/envelp/envlop.src \ - sw/source/ui/fldui/flddok.src \ - sw/source/ui/fldui/changedb.src \ - sw/source/ui/fldui/DropDownFieldDialog.src \ - sw/source/ui/fldui/flddinf.src \ - sw/source/ui/fldui/fldref.src \ - sw/source/ui/fldui/fldtdlg.src \ - sw/source/ui/fldui/fldui.src \ - sw/source/ui/fldui/javaedit.src \ - sw/source/ui/fldui/fldfunc.src \ - sw/source/ui/fldui/inpdlg.src \ - sw/source/ui/fldui/fldvar.src \ - sw/source/ui/fldui/flddb.src \ - sw/source/ui/fmtui/tmpdlg.src \ - sw/source/ui/frmdlg/frmui.src \ - sw/source/ui/frmdlg/cption.src \ - sw/source/ui/frmdlg/column.src \ - sw/source/ui/frmdlg/frmpage.src \ - sw/source/ui/globdoc/globdoc.src \ - sw/source/ui/index/idxmrk.src \ - sw/source/ui/index/cnttab.src \ - sw/source/ui/index/multmrk.src \ - sw/source/ui/lingu/olmenu.src \ - sw/source/ui/misc/docfnote.src \ - sw/source/ui/misc/pgfnote.src \ - sw/source/ui/misc/insfnote.src \ - sw/source/ui/misc/srtdlg.src \ - sw/source/ui/misc/bookmark.src \ - sw/source/ui/misc/glosbib.src \ - sw/source/ui/misc/num.src \ - sw/source/ui/misc/glossary.src \ - sw/source/ui/misc/pggrid.src \ - sw/source/ui/misc/outline.src \ - sw/source/ui/misc/linenum.src \ - sw/source/ui/misc/numberingtypelistbox.src \ - sw/source/ui/misc/redlndlg.src \ - sw/source/ui/misc/insrule.src \ - sw/source/ui/misc/autocorr.src \ - sw/source/ui/ribbar/tbxanchr.src \ - sw/source/ui/ribbar/tblctrl.src \ - sw/source/ui/ribbar/workctrl.src \ - sw/source/ui/ribbar/inputwin.src \ - sw/source/ui/shells/shells.src \ - sw/source/ui/smartmenu/stmenu.src \ - sw/source/ui/table/colwd.src \ - sw/source/ui/table/tautofmt.src \ - sw/source/ui/table/table.src \ - sw/source/ui/table/chartins.src \ - sw/source/ui/table/splittbl.src \ - sw/source/ui/table/rowht.src \ - sw/source/ui/table/instable.src \ - sw/source/ui/table/convert.src \ - sw/source/ui/table/tabledlg.src \ - sw/source/ui/table/mergetbl.src \ - sw/source/ui/uiview/pview.src \ - sw/source/ui/uiview/view.src \ - sw/source/core/undo/undo.src \ - sw/source/core/unocore/unocore.src \ - sw/source/ui/utlui/navipi.src \ - sw/source/ui/utlui/attrdesc.src \ - sw/source/ui/utlui/poolfmt.src \ - sw/source/ui/utlui/initui.src \ - sw/source/ui/utlui/unotools.src \ - sw/source/ui/utlui/utlui.src \ - sw/source/ui/utlui/gloslst.src \ - sw/source/ui/web/web.src \ - sw/source/ui/wrtsh/wrtsh.src \ -)) -- cgit From ad8fe1ccb3d5ca8613c63a2d9c3ba9adf7304eb1 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 02:05:52 +0200 Subject: CWS gnumake2: reaching through verbosity and max processes --- sw/prj/makefile.mk | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/sw/prj/makefile.mk b/sw/prj/makefile.mk index 2a0b99e72fd5..967bfea90d3c 100644 --- a/sw/prj/makefile.mk +++ b/sw/prj/makefile.mk @@ -1,2 +1,35 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +.IF $(VERBOSE) +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + all: - cd .. && make -srj9 + @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From ba51d183a02556d78a822a95908f7bd6fe05ccdb Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 7 Jul 2010 18:09:58 +0200 Subject: CWS gnumake2: fixing all module makefiles (copy from tools) --- sw/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sw/Makefile b/sw/Makefile index 60d34122e271..b198cc3d4c32 100644 --- a/sw/Makefile +++ b/sw/Makefile @@ -25,13 +25,10 @@ # #************************************************************************* -ifeq ($(strip $(SOLARENV)),) -$(error No environment set) -endif - +include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets)) +$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(CURRENTREPO)/$(module)/Module_$(module).mk))) # vim: set noet sw=4 ts=4: -- cgit From a8f8b4275e3a0d7c16293bad74351d7890046f70 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 8 Jul 2010 13:58:34 +0200 Subject: CWS gnumake2: using gnu make directly from build.pl --- sw/prj/build.lst | 78 +++---------------------------------------------------- sw/prj/gbuild.lst | 3 --- 2 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 sw/prj/gbuild.lst diff --git a/sw/prj/build.lst b/sw/prj/build.lst index 03b2bc4a78fc..d4770eec862c 100755 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,75 +1,3 @@ -sw sw : filter offuh l10n connectivity OOo:writerperfect vbahelper svx stoc writerfilter NULL -sw sw usr1 - all sw_mkout NULL -sw sw\inc nmake - all sw_inc NULL -sw sw\uiconfig\layout nmake - all sw_layout NULL -sw sw\prj get - all sw_prj NULL -sw sw\source\core\inc get - all sw_cinc NULL -sw sw\source\filter\inc get - all sw_finc NULL -sw sw\res get - all sw_res NULL -sw sw\win\res get - all sw_wres NULL -sw sw\win\imglst get - all sw_wimg NULL -sw sw\sdi nmake - all sw_sdi NULL -sw sw\source\core\bastyp nmake - all sw_bast sw_inc NULL -sw sw\source\ui\app nmake - all sw_app sw_sdi sw_inc NULL -sw sw\source\ui\cctrl nmake - all sw_cctrl sw_inc NULL -sw sw\source\ui\chrdlg nmake - all sw_chrdl sw_inc NULL -sw sw\source\ui\config nmake - all sw_conf sw_inc NULL -sw sw\source\ui\dbui nmake - all sw_dbui sw_inc NULL -sw sw\source\ui\dialog nmake - all sw_dlg sw_inc NULL -sw sw\source\ui\dochdl nmake - all sw_dchdl sw_inc NULL -sw sw\source\ui\docvw nmake - all sw_dcvw sw_inc NULL -sw sw\source\ui\envelp nmake - all sw_envlp sw_inc NULL -sw sw\source\ui\fldui nmake - all sw_fldui sw_inc NULL -sw sw\source\ui\fmtui nmake - all sw_fmtui sw_inc NULL -sw sw\source\ui\frmdlg nmake - all sw_frmdl sw_inc NULL -sw sw\source\ui\globdoc nmake - all sw_globd sw_inc NULL -sw sw\source\ui\index nmake - all sw_index sw_inc NULL -sw sw\source\ui\lingu nmake - all sw_ling sw_inc NULL -sw sw\source\ui\misc nmake - all sw_misc sw_sdi sw_inc NULL -sw sw\source\ui\ribbar nmake - all sw_rbbar sw_inc NULL -sw sw\source\ui\shells nmake - all sw_shell sw_sdi sw_inc NULL -sw sw\source\ui\smartmenu nmake - all sw_smartmenu sw_inc NULL -sw sw\source\ui\table nmake - all sw_table sw_inc NULL -sw sw\source\ui\uiview nmake - all sw_uivw sw_sdi sw_inc NULL -sw sw\source\ui\uno nmake - all sw_uiuno sw_sdi sw_inc NULL -sw sw\source\ui\vba nmake - all sw_vba sw_inc NULL -sw sw\source\ui\utlui nmake - all sw_utlui sw_inc NULL -sw sw\source\ui\web nmake - all sw_web sw_sdi sw_inc NULL -sw sw\source\ui\wrtsh nmake - all sw_wrtsh sw_inc NULL -sw sw\source\core\attr nmake - all sw_attr sw_inc NULL -sw sw\source\core\crsr nmake - all sw_crsr sw_inc NULL -sw sw\source\core\doc nmake - all sw_doc sw_inc NULL -sw sw\source\core\docnode nmake - all sw_dcnd sw_inc NULL -sw sw\source\core\draw nmake - all sw_draw sw_inc NULL -sw sw\source\core\edit nmake - all sw_edit sw_inc NULL -sw sw\source\core\except nmake - all sw_excpt sw_inc NULL -sw sw\source\core\fields nmake - all sw_fld sw_inc NULL -sw sw\source\core\frmedt nmake - all sw_frmed sw_inc NULL -sw sw\source\core\graphic nmake - all sw_grph sw_inc NULL -sw sw\source\core\layout nmake - all sw_layo sw_inc NULL -sw sw\source\core\ole nmake - all sw_ole sw_inc NULL -sw sw\source\core\para nmake - all sw_para sw_inc NULL -sw sw\source\core\sw3io nmake - all sw_sw3io sw_inc NULL -sw sw\source\core\swg nmake - all sw_swg sw_inc NULL -sw sw\source\core\text nmake - all sw_text sw_inc NULL -sw sw\source\core\tox nmake - all sw_tox sw_inc NULL -sw sw\source\core\txtnode nmake - all sw_txtnd sw_inc NULL -sw sw\source\core\undo nmake - all sw_undo sw_inc NULL -sw sw\source\core\view nmake - all sw_view sw_inc NULL -sw sw\source\core\unocore nmake - all sw_uco sw_inc NULL -sw sw\source\core\objectpositioning nmake - all sw_objpos sw_inc NULL -sw sw\source\core\access nmake - all sw_acc sw_inc NULL -sw sw\source\core\SwNumberTree nmake - all sw_NumberTree sw_inc NULL -sw sw\source\core\table nmake - all sw_tablecore sw_inc NULL -sw sw\source\filter\ascii nmake - all sw_ascii sw_inc NULL -sw sw\source\filter\basflt nmake - all sw_bsflt sw_inc NULL -sw sw\source\filter\html nmake - all sw_html sw_inc NULL -sw sw\source\filter\rtf nmake - all sw_rtf sw_inc NULL -sw sw\source\filter\writer nmake - all sw_wrtr sw_inc NULL -sw sw\source\filter\ww1 nmake - all sw_ww1 sw_inc NULL -sw sw\source\filter\ww8 nmake - all sw_ww8 sw_inc NULL -sw sw\source\filter\xml nmake - all sw_xml sw_inc NULL -sw sw\source\ui nmake - all sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wrtsh sw_smartmenu sw_vba NULL -sw sw\source\core nmake - all sw_core sw_attr sw_bast sw_crsr sw_dcnd sw_doc sw_draw sw_edit sw_excpt sw_fld sw_frmed sw_grph sw_layo sw_ole sw_para sw_sw3io sw_swg sw_text sw_tox sw_txtnd sw_uco sw_undo sw_view sw_acc sw_objpos sw_NumberTree sw_tablecore NULL -sw sw\source\filter nmake - all sw_flt sw_ascii sw_bsflt sw_html sw_rtf sw_wrtr sw_ww1 sw_ww8 sw_xml NULL -sw sw\util nmake - all sw_util sw_core sw_flt sw_sdi sw_ui NULL +sw sw : l10n connectivity OOo:writerperfect svx stoc uui writerfilter filter oovbaapi cui vbahelper NULL +sw sw usr1 - all sw_mkout NULL +sw sw\prj nmake - all sw_prj NULL diff --git a/sw/prj/gbuild.lst b/sw/prj/gbuild.lst deleted file mode 100644 index d4770eec862c..000000000000 --- a/sw/prj/gbuild.lst +++ /dev/null @@ -1,3 +0,0 @@ -sw sw : l10n connectivity OOo:writerperfect svx stoc uui writerfilter filter oovbaapi cui vbahelper NULL -sw sw usr1 - all sw_mkout NULL -sw sw\prj nmake - all sw_prj NULL -- cgit From 8df0968f98507dd244d8b3845284622a76a6d8c8 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 20 Jul 2010 16:48:23 +0200 Subject: CWS gnumake2: using GNUMAKE variable from configure --- sw/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/prj/makefile.mk b/sw/prj/makefile.mk index 967bfea90d3c..8b00cb5a5818 100644 --- a/sw/prj/makefile.mk +++ b/sw/prj/makefile.mk @@ -32,4 +32,4 @@ VERBOSEFLAG := -s .ENDIF all: - @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) + @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From 5bba5a1fea8737ec024b5d3a43a3b408af30c659 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 23 Jul 2010 12:48:45 +0200 Subject: gnumake2: some more checks for module makefiles --- sw/Makefile | 10 +++++++++- sw/prj/makefile.mk | 9 +++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/sw/Makefile b/sw/Makefile index b198cc3d4c32..3225bc97e12c 100644 --- a/sw/Makefile +++ b/sw/Makefile @@ -25,7 +25,15 @@ # #************************************************************************* -include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePath.mk +ifneq ($(MAKE_VERSION),3.81) +$(error You need at least GNU Make 3.81!) +endif + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk diff --git a/sw/prj/makefile.mk b/sw/prj/makefile.mk index 8b00cb5a5818..3b1b54d4357f 100644 --- a/sw/prj/makefile.mk +++ b/sw/prj/makefile.mk @@ -25,11 +25,16 @@ # #************************************************************************* -.IF $(VERBOSE) +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" VERBOSEFLAG := .ELSE VERBOSEFLAG := -s .ENDIF all: - @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From f6f7c5f9f32b8b8ba8649176483026ca3a647ecc Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 29 Jul 2010 13:19:07 +0200 Subject: gnumake2: windows build fixes for resync --- sw/Library_vbaswobj.mk | 1 + sw/source/ui/wrtsh/wrtundo.cxx | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index a6d20bd530cc..46bb0c2ce273 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_add_linked_libs,vbaswobj,\ editeng \ i18nisolang1 \ sal \ + sb \ sfx \ svl \ svt \ diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx index 8a60988b2a5b..8a20a03be0f0 100644 --- a/sw/source/ui/wrtsh/wrtundo.cxx +++ b/sw/source/ui/wrtsh/wrtundo.cxx @@ -37,7 +37,6 @@ #include #include // fuer Undo-Ids #include -#include #include #include #include -- cgit From 56a117f90a37eb03ccdd91b3c529761b8af70fef Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 4 Aug 2010 13:27:15 +0200 Subject: gnumake2: clear sw d.lst --- sw/prj/d.lst | 60 ------------------------------------------------------------ 1 file changed, 60 deletions(-) diff --git a/sw/prj/d.lst b/sw/prj/d.lst index 79fecb5a629b..e69de29bb2d1 100644 --- a/sw/prj/d.lst +++ b/sw/prj/d.lst @@ -1,60 +0,0 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %_DEST%\inc%_EXT%\sw -mkdir: %_DEST%\xml%_EXT%\uiconfig -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\xml\*.xml %_DEST%\xml%_EXT%\*.xml -..\%__SRC%\bin\sw?????.dll %_DEST%\bin%_EXT%\sw?????.dll -..\%__SRC%\bin\swd?????.dll %_DEST%\bin%_EXT%\swd?????.dll -..\%__SRC%\bin\swui?????.dll %_DEST%\bin%_EXT%\swui?????.dll -..\%__SRC%\bin\msword?????.dll %_DEST%\bin%_EXT%\msword?????.dll -..\%__SRC%\bin\vbaswobj*.dll %_DEST%\bin%_EXT%\vbaswobj*.dll -..\%__SRC%\bin\sw*.res %_DEST%\bin%_EXT%\sw*.res -..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* -..\%__SRC%\lib\vbaswobj* %_DEST%\lib%_EXT%\vbaswobj* - -..\uiconfig\swriter\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\menubar\*.xml -..\uiconfig\swxform\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\menubar\*.xml -..\uiconfig\sweb\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\menubar\*.xml -..\uiconfig\sglobal\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\menubar\*.xml -..\uiconfig\swform\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\menubar\*.xml -..\uiconfig\swreport\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\menubar\*.xml -..\uiconfig\swriter\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\toolbar\*.xml -..\uiconfig\swxform\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\toolbar\*.xml -..\uiconfig\sweb\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\toolbar\*.xml -..\uiconfig\sglobal\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\toolbar\*.xml -..\uiconfig\swform\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\toolbar\*.xml -..\uiconfig\swreport\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\toolbar\*.xml -..\uiconfig\swriter\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\statusbar\*.xml -..\uiconfig\swxform\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\statusbar\*.xml -..\uiconfig\sweb\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\statusbar\*.xml -..\uiconfig\sglobal\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\statusbar\*.xml -..\uiconfig\swform\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\statusbar\*.xml -..\uiconfig\swreport\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar\*.xml - -..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.* -- cgit From 8222d10d9444229a25ed799fb78cf5fef9e7bf54 Mon Sep 17 00:00:00 2001 From: Daniel Rentz Date: Mon, 23 Aug 2010 13:53:47 +0200 Subject: mib19: improved event handling: do not supreppress global events, when Application.EnableEvents symbol set to false --- sw/source/ui/vba/vbaeventshelper.cxx | 5 ----- sw/source/ui/vba/vbaeventshelper.hxx | 1 - 2 files changed, 6 deletions(-) diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx index abe4abb6e757..b2270b009ca9 100755 --- a/sw/source/ui/vba/vbaeventshelper.cxx +++ b/sw/source/ui/vba/vbaeventshelper.cxx @@ -50,11 +50,6 @@ SwVbaEventsHelper::~SwVbaEventsHelper() { } -bool SwVbaEventsHelper::implEventsEnabled() throw (uno::RuntimeException) -{ - return true; -} - bool SwVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& /*rArgs*/ ) throw (uno::RuntimeException) { diff --git a/sw/source/ui/vba/vbaeventshelper.hxx b/sw/source/ui/vba/vbaeventshelper.hxx index af1c06c0341f..7f951bdaa452 100755 --- a/sw/source/ui/vba/vbaeventshelper.hxx +++ b/sw/source/ui/vba/vbaeventshelper.hxx @@ -41,7 +41,6 @@ public: virtual ~SwVbaEventsHelper(); protected: - virtual bool implEventsEnabled() throw (css::uno::RuntimeException); virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException); virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException); virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bSuccess, bool bCancel ) throw (css::uno::RuntimeException); -- cgit From 75999228ead62620ed8b9d3970277bf916af3d6d Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Thu, 2 Sep 2010 15:13:41 +0200 Subject: gnumake2: move make 3.81 check into configure --- sw/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sw/Makefile b/sw/Makefile index 3225bc97e12c..c19100ee9a5b 100644 --- a/sw/Makefile +++ b/sw/Makefile @@ -25,10 +25,6 @@ # #************************************************************************* -ifneq ($(MAKE_VERSION),3.81) -$(error You need at least GNU Make 3.81!) -endif - ifeq ($(strip $(SOLARENV)),) $(error No environment set!) endif -- cgit From e8426d54e65f2a0690e3260ebd20f8a1319e82bc Mon Sep 17 00:00:00 2001 From: "Daniel Rentz [dr]" Date: Mon, 13 Sep 2010 17:47:04 +0200 Subject: mib19: #163557# cleanup VBA XDocuments implementation, trigger Workbook_Open event when creating a new Excel workbook via Workbooks.Add --- sw/source/ui/vba/vbadocuments.cxx | 25 +++---------------------- sw/source/ui/vba/vbadocuments.hxx | 5 ----- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index 41a7e607533e..195adb2ffca4 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -120,7 +120,7 @@ SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/, { return Open( sFileName, uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any()); } - uno::Reference xTextDoc( VbaDocumentsBase::Add() , uno::UNO_QUERY_THROW ); + uno::Reference xTextDoc( createDocument() , uno::UNO_QUERY_THROW ); if( xTextDoc.is() ) return getDocument( mxContext, xTextDoc, Application() ); @@ -131,7 +131,7 @@ SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/, void SAL_CALL SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any& /*OriginalFormat*/, const uno::Any& /*RouteDocument*/ ) throw (uno::RuntimeException) { - VbaDocumentsBase::Close(); + closeDocuments(); } // #TODO# #FIXME# can any of the unused params below be used? @@ -150,7 +150,7 @@ SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*Confirm uno::Sequence< beans::PropertyValue > sProps(0); - uno::Reference xSpreadDoc( VbaDocumentsBase::Open( Filename, ReadOnly, sProps ), uno::UNO_QUERY_THROW ); + uno::Reference xSpreadDoc( openDocument( Filename, ReadOnly, sProps ), uno::UNO_QUERY_THROW ); uno::Any aRet = getDocument( mxContext, xSpreadDoc, Application() ); uno::Reference< word::XDocument > xDocument( aRet, uno::UNO_QUERY ); if ( xDocument.is() ) @@ -158,25 +158,6 @@ SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*Confirm return aRet; } - // VbaDocumentsBase / XDocumentsBase (to avoid warning C4266 for hiding function on wntmsci) -uno::Any SAL_CALL -SwVbaDocuments::Add() throw (uno::RuntimeException) -{ - return VbaDocumentsBase::Add(); -} - -void SAL_CALL -SwVbaDocuments::Close( ) throw (uno::RuntimeException) -{ - VbaDocumentsBase::Close(); -} - -uno::Any SAL_CALL -SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& ReadOnly, const uno::Sequence< beans::PropertyValue >& rProps ) throw (uno::RuntimeException) -{ - return VbaDocumentsBase::Open( Filename, ReadOnly, rProps ); -} - rtl::OUString& SwVbaDocuments::getServiceImplName() { diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx index 81b936a1ae76..dc0f75543979 100644 --- a/sw/source/ui/vba/vbadocuments.hxx +++ b/sw/source/ui/vba/vbadocuments.hxx @@ -56,11 +56,6 @@ public: virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException); virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException); - - // VbaDocumentsBase / XDocumentsBase (to avoid warning C4266 for hiding function on wntmsci) - virtual css::uno::Any SAL_CALL Add() throw (css::uno::RuntimeException); - virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException); }; #endif /* SW_VBA_DOCUMENTS_HXX */ -- cgit From c659c9cd2c18a6ebd448080559cd404e9672691e Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 22 Oct 2010 10:37:46 +0200 Subject: sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt --- starmath/prj/build.lst | 2 +- sw/prj/build.lst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/starmath/prj/build.lst b/starmath/prj/build.lst index cbfff6772402..a849b8142dee 100644 --- a/starmath/prj/build.lst +++ b/starmath/prj/build.lst @@ -1,4 +1,4 @@ -sm starmath : l10n svx NULL +sm starmath : LIBXSLT:libxslt l10n svx NULL sm starmath usr1 - all sm_mkout NULL sm starmath\inc nmake - all sm_inc NULL sm starmath\prj get - all sm_prj NULL diff --git a/sw/prj/build.lst b/sw/prj/build.lst index 8b6cecba92ba..a3d2697600d2 100644 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,4 +1,4 @@ -sw sw : filter l10n connectivity OOo:writerperfect vbahelper svx stoc writerfilter NULL +sw sw : filter l10n connectivity OOo:writerperfect vbahelper svx stoc writerfilter LIBXSLT:libxslt NULL sw sw usr1 - all sw_mkout NULL sw sw\inc nmake - all sw_inc NULL sw sw\uiconfig\layout nmake - all sw_layout NULL -- cgit From 5eb9ea76e2b0aa72c1bd00d7f0429cb0de3bb1da 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 --- starmath/source/smres.src | 74 -------- starmath/source/view.cxx | 8 - sw/AllLangResTarget_sw.mk | 1 - sw/Library_sw.mk | 1 - sw/Library_vbaswobj.mk | 1 + sw/inc/pch/precompiled_sw.hxx | 4 - sw/prj/build.lst | 91 +--------- sw/source/ui/app/mn.src | 53 +++--- sw/source/ui/inc/swmn.hrc | 379 ---------------------------------------- sw/source/ui/uiview/pview.cxx | 5 - sw/source/ui/uiview/srcview.cxx | 7 - sw/source/ui/uiview/view0.cxx | 5 - sw/source/ui/vba/service.cxx | 15 +- sw/source/ui/web/web.src | 5 +- sw/source/ui/web/wview.cxx | 5 - 15 files changed, 32 insertions(+), 622 deletions(-) delete mode 100644 sw/source/ui/inc/swmn.hrc diff --git a/starmath/source/smres.src b/starmath/source/smres.src index 804da5671b7c..bef6d0bec106 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -1743,77 +1743,6 @@ String RID_ERR_RIGHTEXPECTED Text [ en-US ] = "'RIGHT' expected" ; }; -<<<<<<< local -ToolBox RID_MATH_TOOLBOX -{ - HelpId = RID_MATH_TOOLBOX ; - Customize = TRUE ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Align = BOXALIGN_LEFT ; - Size = MAP_APPFONT ( 0 , 0 ) ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_ZOOMIN ; - HelpID = SID_ZOOMIN ; - Text [ en-US ] = "Zoom In" ; - }; - ToolBoxItem - { - Identifier = SID_ZOOMOUT ; - HelpID = SID_ZOOMOUT ; - Text [ en-US ] = "Zoom Out" ; - }; - ToolBoxItem - { - Identifier = SID_VIEW100 ; - HelpID = SID_VIEW100 ; - Text [ en-US ] = "Zoom 100%" ; - }; - ToolBoxItem - { - Identifier = SID_ADJUST ; - HelpID = SID_ADJUST ; - Text [ en-US ] = "Entire Formula" ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_DRAW ; - HelpID = SID_DRAW ; - Text [ en-US ] = "Refresh" ; - }; - ToolBoxItem - { - Identifier = SID_FORMULACURSOR ; - HelpID = SID_FORMULACURSOR ; - Text [ en-US ] = "Formula Cursor"; - }; - ToolBoxItem - { - Identifier = SID_SYMBOLS_CATALOGUE ; - HelpID = SID_SYMBOLS_CATALOGUE ; - Text [ en-US ] = "Symbols" ; - }; - }; -}; - -======= ->>>>>>> other String RID_MATH_TOOLBOX { Text [ en-US ] = "Main Toolbar" ; @@ -1838,9 +1767,6 @@ StringArray RID_PRINTUIOPTIONS < "Adjusts the formula to the page format used in the printout."; >; < "~Scaling"; >; < "Reduces or enlarges the size of the printed formula by a specified enlargement factor."; >; -// < "Miscellaneous options"; >; -// < "Ig~nore ~~ and ` at the end of the line"; >; -// < "Specfies that these space wildcards will be removed if they are at the end of a line."; >; }; }; diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index c2756685d451..748e62e3536e 100755 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -738,10 +738,6 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0)) SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER, SmResId(RID_MATH_TOOLBOX )); - //Dummy-Objectbar, damit es bei aktivieren nicht staendig zuppelt. -// Wegen #58705# entfernt (RID wurde nirgends verwendet) -// SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_SERVER, -// SmResId(RID_DRAW_OBJECTBAR) ); SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE); SFX_CHILDWINDOW_REGISTRATION(SmToolBoxWrapper::GetChildWindowId()); @@ -749,11 +745,7 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0)) } -<<<<<<< local -SFX_IMPL_VIEWFACTORY(SmViewShell) -======= SFX_IMPL_NAMED_VIEWFACTORY(SmViewShell, "Default") ->>>>>>> other { SFX_VIEW_REGISTRATION(SmDocShell); } diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index ba552333d2fa..5d87fa1ae587 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -153,7 +153,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/misc/insrule.src \ sw/source/ui/misc/autocorr.src \ sw/source/ui/ribbar/tbxanchr.src \ - sw/source/ui/ribbar/tblctrl.src \ sw/source/ui/ribbar/workctrl.src \ sw/source/ui/ribbar/inputwin.src \ sw/source/ui/shells/shells.src \ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index ee08b6a06804..b654d3a5c6ab 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -676,7 +676,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/ui/uno/RefreshListenerContainer \ sw/source/ui/uno/SwXDocumentSettings \ sw/source/ui/uno/SwXFilterOptions \ - sw/source/ui/uno/SwXPrintPreviewSettings \ sw/source/ui/uno/dlelstnr \ sw/source/ui/uno/unoatxt \ sw/source/ui/uno/unodefaults \ diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index 46bb0c2ce273..b5f4576f1d9e 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -79,6 +79,7 @@ $(eval $(call gb_Library_add_exception_objects,vbaswobj,\ sw/source/ui/vba/vbaautotextentry \ sw/source/ui/vba/vbarange \ sw/source/ui/vba/vbadocumentproperties \ + sw/source/ui/vba/vbaeventshelper \ sw/source/ui/vba/vbastyle \ sw/source/ui/vba/vbapane \ sw/source/ui/vba/vbaglobals \ diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index c137892db46c..fd7f3b135365 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -920,12 +920,8 @@ #include "vcl/group.hxx" #include "vcl/help.hxx" #include "vcl/image.hxx" -<<<<<<< local #include "vcl/button.hxx" #include "vcl/imgcons.hxx" -======= -#include "vcl/imagebtn.hxx" ->>>>>>> other #include "vcl/inputctx.hxx" #include "vcl/jobset.hxx" #include "vcl/keycod.hxx" diff --git a/sw/prj/build.lst b/sw/prj/build.lst index 821015ba1561..192a3ad99eb2 100644 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,89 +1,12 @@ -<<<<<<< local sw sw : l10n connectivity OOo:writerperfect svx stoc uui writerfilter filter oovbaapi cui vbahelper NULL sw sw usr1 - all sw_mkout NULL sw sw\prj nmake - all sw_prj NULL -======= -sw sw : filter l10n connectivity OOo:writerperfect vbahelper svx stoc writerfilter NULL -sw sw usr1 - all sw_mkout NULL -sw sw\inc nmake - all sw_inc NULL -sw sw\uiconfig\layout nmake - all sw_layout NULL -sw sw\prj get - all sw_prj NULL -sw sw\source\ui\inc nmake - all sw_uinc NULL -sw sw\source\core\inc get - all sw_cinc NULL -sw sw\source\filter\inc get - all sw_finc NULL -sw sw\res get - all sw_res NULL -sw sw\win\res get - all sw_wres NULL -sw sw\win\imglst get - all sw_wimg NULL -sw sw\sdi nmake - all sw_sdi NULL -sw sw\source\core\bastyp nmake - all sw_bast sw_inc NULL -sw sw\source\ui\app nmake - all sw_app sw_sdi sw_uinc sw_inc NULL -sw sw\source\ui\cctrl nmake - all sw_cctrl sw_inc NULL -sw sw\source\ui\chrdlg nmake - all sw_chrdl sw_inc NULL -sw sw\source\ui\config nmake - all sw_conf sw_inc NULL -sw sw\source\ui\dbui nmake - all sw_dbui sw_inc NULL -sw sw\source\ui\dialog nmake - all sw_dlg sw_inc NULL -sw sw\source\ui\dochdl nmake - all sw_dchdl sw_inc NULL -sw sw\source\ui\docvw nmake - all sw_dcvw sw_inc NULL -sw sw\source\ui\envelp nmake - all sw_envlp sw_inc NULL -sw sw\source\ui\fldui nmake - all sw_fldui sw_inc NULL -sw sw\source\ui\fmtui nmake - all sw_fmtui sw_inc NULL -sw sw\source\ui\frmdlg nmake - all sw_frmdl sw_inc NULL -sw sw\source\ui\globdoc nmake - all sw_globd sw_uinc sw_inc NULL -sw sw\source\ui\index nmake - all sw_index sw_inc NULL -sw sw\source\ui\lingu nmake - all sw_ling sw_inc NULL -sw sw\source\ui\misc nmake - all sw_misc sw_sdi sw_inc NULL -sw sw\source\ui\ribbar nmake - all sw_rbbar sw_inc NULL -sw sw\source\ui\shells nmake - all sw_shell sw_uinc sw_sdi sw_inc NULL -sw sw\source\ui\smartmenu nmake - all sw_smartmenu sw_inc NULL -sw sw\source\ui\table nmake - all sw_table sw_inc NULL -sw sw\source\ui\uiview nmake - all sw_uivw sw_sdi sw_inc NULL -sw sw\source\ui\uno nmake - all sw_uiuno sw_sdi sw_inc NULL -sw sw\source\ui\vba nmake - all sw_vba sw_inc NULL -sw sw\source\ui\utlui nmake - all sw_utlui sw_inc NULL -sw sw\source\ui\web nmake - all sw_web sw_uinc sw_sdi sw_inc NULL -sw sw\source\ui\wrtsh nmake - all sw_wrtsh sw_inc NULL -sw sw\source\core\attr nmake - all sw_attr sw_inc NULL -sw sw\source\core\crsr nmake - all sw_crsr sw_inc NULL -sw sw\source\core\doc nmake - all sw_doc sw_inc NULL -sw sw\source\core\docnode nmake - all sw_dcnd sw_inc NULL -sw sw\source\core\draw nmake - all sw_draw sw_inc NULL -sw sw\source\core\edit nmake - all sw_edit sw_inc NULL -sw sw\source\core\except nmake - all sw_excpt sw_inc NULL -sw sw\source\core\fields nmake - all sw_fld sw_inc NULL -sw sw\source\core\frmedt nmake - all sw_frmed sw_inc NULL -sw sw\source\core\graphic nmake - all sw_grph sw_inc NULL -sw sw\source\core\layout nmake - all sw_layo sw_inc NULL -sw sw\source\core\ole nmake - all sw_ole sw_inc NULL -sw sw\source\core\para nmake - all sw_para sw_inc NULL -sw sw\source\core\sw3io nmake - all sw_sw3io sw_inc NULL -sw sw\source\core\swg nmake - all sw_swg sw_inc NULL -sw sw\source\core\text nmake - all sw_text sw_inc NULL -sw sw\source\core\tox nmake - all sw_tox sw_inc NULL -sw sw\source\core\txtnode nmake - all sw_txtnd sw_inc NULL -sw sw\source\core\undo nmake - all sw_undo sw_inc NULL -sw sw\source\core\view nmake - all sw_view sw_inc NULL -sw sw\source\core\unocore nmake - all sw_uco sw_inc NULL -sw sw\source\core\objectpositioning nmake - all sw_objpos sw_inc NULL -sw sw\source\core\access nmake - all sw_acc sw_inc NULL -sw sw\source\core\SwNumberTree nmake - all sw_NumberTree sw_inc NULL -sw sw\source\core\table nmake - all sw_tablecore sw_inc NULL -sw sw\source\filter\ascii nmake - all sw_ascii sw_inc NULL -sw sw\source\filter\basflt nmake - all sw_bsflt sw_inc NULL -sw sw\source\filter\html nmake - all sw_html sw_inc NULL -sw sw\source\filter\rtf nmake - all sw_rtf sw_inc NULL -sw sw\source\filter\writer nmake - all sw_wrtr sw_inc NULL -sw sw\source\filter\ww1 nmake - all sw_ww1 sw_inc NULL -sw sw\source\filter\ww8 nmake - all sw_ww8 sw_inc NULL -sw sw\source\filter\xml nmake - all sw_xml sw_inc NULL -sw sw\source\ui nmake - all sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wrtsh sw_smartmenu sw_vba NULL -sw sw\source\core nmake - all sw_core sw_attr sw_bast sw_crsr sw_dcnd sw_doc sw_draw sw_edit sw_excpt sw_fld sw_frmed sw_grph sw_layo sw_ole sw_para sw_sw3io sw_swg sw_text sw_tox sw_txtnd sw_uco sw_undo sw_view sw_acc sw_objpos sw_NumberTree sw_tablecore NULL -sw sw\source\filter nmake - all sw_flt sw_ascii sw_bsflt sw_html sw_rtf sw_wrtr sw_ww1 sw_ww8 sw_xml NULL -sw sw\util nmake - all sw_util sw_core sw_flt sw_sdi sw_ui NULL -sw sw\qa\complex\accessibility nmake - all sw_qa_complex_accessibility sw_util NULL -sw sw\qa\complex\checkColor nmake - all sw_qa_complex_checkColor sw_util NULL + +sw sw\qa\complex\accessibility nmake - all sw_qa_complex_accessibility sw_prj NULL +sw sw\qa\complex\checkColor nmake - all sw_qa_complex_checkColor sw_prj NULL # fails -# sw sw\qa\complex\indeterminateState nmake - all sw_qa_complex_indeterminateState sw_util NULL -# sw sw\qa\complex\writer nmake - all sw_qa_complex_writer sw_util NULL -sw sw\qa\unoapi nmake - all sw_qa_unoapi sw_util NULL ->>>>>>> other +# sw sw\qa\complex\indeterminateState nmake - all sw_qa_complex_indeterminateState sw_prj NULL +# sw sw\qa\complex\writer nmake - all sw_qa_complex_writer sw_prj NULL +sw sw\qa\unoapi nmake - all sw_qa_unoapi sw_prj NULL + diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src index f5283e49b173..8c02caec033b 100644 --- a/sw/source/ui/app/mn.src +++ b/sw/source/ui/app/mn.src @@ -35,7 +35,6 @@ /* --------------------- F O R M A T --------------------------------- */ -<<<<<<< local #define SEPARATOR MenuItem { Separator = TRUE; } //define for ITEM_FORMAT_NUMBERING @@ -54,7 +53,7 @@ MenuItem\ {\ Identifier = FN_FORMAT_PAGE_DLG ; \ - HelpID = FN_FORMAT_PAGE_DLG ; \ + HelpId = CMD_FN_FORMAT_PAGE_DLG ; \ Text [ en-US ] = "Pa~ge..." ; \ }; @@ -71,7 +70,6 @@ MenuItem\ {\ Identifier = MN_FORMAT_STYLE ; \ - HelpID = MN_FORMAT_STYLE ; \ Command = ".uno:StyleMenu" ; \ Text [ en-US ] = "St~yle" ; \ SubMenu = Menu\ @@ -110,13 +108,13 @@ MenuItem\ {\ Identifier = FN_SET_SUPER_SCRIPT ; \ - HelpID = FN_SET_SUPER_SCRIPT ; \ + HelpId = CMD_FN_SET_SUPER_SCRIPT ; \ Text [ en-US ] = "Superscript" ; \ };\ MenuItem\ {\ Identifier = FN_SET_SUB_SCRIPT ; \ - HelpID = FN_SET_SUB_SCRIPT ; \ + HelpId = CMD_FN_SET_SUB_SCRIPT ; \ Text [ en-US ] = "Subscript" ; \ };\ };\ @@ -125,10 +123,8 @@ MenuItem\ {\ Identifier = MN_FORMAT_ALGN ; \ - HelpID = MN_FORMAT_ALGN ; \ Command = ".uno:AlignTextMenu" ; \ Text [ en-US ] = "A~lignment" ; \ - RadioCheck = TRUE ; \ SubMenu = Menu\ {\ ItemList = \ @@ -151,7 +147,7 @@ MenuItem\ {\ Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ + HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Justified" ; \ };\ @@ -161,7 +157,6 @@ MenuItem\ {\ Identifier = MN_FORMAT_LINESPACE ; \ - HelpID = MN_FORMAT_LINESPACE ; \ Command = ".uno:LineSpacingMenu" ; \ Text [ en-US ] = "Line Spacing" ; \ _MenuItemFlags = MIB_RADIOCHECK ; \ @@ -206,21 +201,21 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem \ { \ Identifier = FN_EDIT_FIELD ; \ - HelpID = FN_EDIT_FIELD ; \ + HelpId = CMD_FN_EDIT_FIELD ; \ Text [ en-US ] = "Fields..." ; \ }; #define _MN_EDIT_FOOTNOTE \ MenuItem \ { \ Identifier = FN_EDIT_FOOTNOTE ; \ - HelpID = FN_EDIT_FOOTNOTE ; \ + HelpId = CMD_FN_EDIT_FOOTNOTE ; \ Text [ en-US ] = "Footnote/Endnote~..." ; \ }; #define _MN_EDIT_IDX_ENTRY_DLG \ MenuItem \ { \ Identifier = FN_EDIT_IDX_ENTRY_DLG ; \ - HelpID = FN_EDIT_IDX_ENTRY_DLG ; \ + HelpId = CMD_FN_EDIT_IDX_ENTRY_DLG ; \ Text [ en-US ] = "Inde~x Entry..." ; \ }; @@ -228,13 +223,13 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem \ { \ Identifier = FN_REDLINE_ACCEPT_DIRECT; \ - HelpID = FN_REDLINE_ACCEPT_DIRECT ; \ + HelpId = CMD_FN_REDLINE_ACCEPT_DIRECT ; \ Text [ en-US ] = "Accept Change" ; \ };\ MenuItem \ { \ Identifier = FN_REDLINE_REJECT_DIRECT ; \ - HelpID = FN_REDLINE_REJECT_DIRECT ; \ + HelpId = CMD_FN_REDLINE_REJECT_DIRECT ; \ Text [ en-US ] = "Reject Change" ; \ }; \ SEPARATOR ; @@ -242,7 +237,7 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem \ { \ Identifier = FN_EDIT_AUTH_ENTRY_DLG ; \ - HelpID = FN_EDIT_AUTH_ENTRY_DLG ; \ + HelpId = CMD_FN_EDIT_AUTH_ENTRY_DLG ; \ Text [ en-US ] = "~Bibliography Entry..."; \ }; \ SEPARATOR ; @@ -255,19 +250,19 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem \ { \ Identifier = FN_EDIT_HYPERLINK ; \ - HelpID = FN_EDIT_HYPERLINK ; \ + HelpId = CMD_FN_EDIT_HYPERLINK ; \ Text [ en-US ] = "Edit Hyperlink..."; \ }; \ MenuItem \ { \ Identifier = FN_COPY_HYPERLINK_LOCATION; \ - HelpID = FN_COPY_HYPERLINK_LOCATION; \ + HelpId = CMD_FN_COPY_HYPERLINK_LOCATION; \ Text [ en-US ] = "Copy Hyperlink ~Location"; \ }; \ MenuItem \ { \ Identifier = FN_REMOVE_HYPERLINK ; \ - HelpID = FN_REMOVE_HYPERLINK ; \ + HelpId = CMD_FN_REMOVE_HYPERLINK ; \ Text [ en-US ] = "Remo~ve Hyperlink"; \ }; @@ -281,7 +276,7 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem\ {\ Identifier = FN_EDIT_HYPERLINK ; \ - HelpID = FN_EDIT_HYPERLINK ; \ + HelpId = CMD_FN_EDIT_HYPERLINK ; \ Text [ en-US ] = "~Edit Hyperlink" ; \ }; @@ -304,7 +299,7 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem\ {\ Identifier = FN_FORMAT_RESET ; \ - HelpID = FN_FORMAT_RESET ; \ + HelpId = CMD_FN_FORMAT_RESET ; \ Text [ en-US ] = "~Default Formatting" ; \ }; @@ -313,25 +308,25 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem \ { \ Identifier = FN_NUMBER_NEWSTART; \ - HelpId = FN_NUMBER_NEWSTART; \ + HelpId = CMD_FN_NUMBER_NEWSTART; \ Text[ en-US ] = "Restart Numbering"; \ }; \ MenuItem \ { \ Identifier = FN_NUM_CONTINUE; \ - HelpId = FN_NUM_CONTINUE; \ + HelpId = CMD_FN_NUM_CONTINUE; \ Text[ en-US ] = "Continue previous numbering"; \ }; \ MenuItem \ { \ Identifier = FN_NUM_BULLET_UP; \ - HelpId = FN_NUM_BULLET_UP; \ + HelpId = CMD_FN_NUM_BULLET_UP; \ Text[ en-US ] = "Up One Level"; \ }; \ MenuItem \ { \ Identifier = FN_NUM_BULLET_DOWN; \ - HelpId = FN_NUM_BULLET_DOWN; \ + HelpId = CMD_FN_NUM_BULLET_DOWN; \ Text[ en-US ] = "Down One Level"; \ }; @@ -354,19 +349,19 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem \ { \ Identifier = FN_UPDATE_CUR_TOX ; \ - HelpID = FN_UPDATE_CUR_TOX ; \ + HelpId = CMD_FN_UPDATE_CUR_TOX ; \ Text [ en-US ] = "~Update Index/Table"; \ }; \ MenuItem \ { \ Identifier = FN_EDIT_CURRENT_TOX; \ - HelpID = FN_EDIT_CURRENT_TOX; \ + HelpId = CMD_FN_EDIT_CURRENT_TOX; \ Text [ en-US ] = "~Edit Index/Table"; \ }; \ MenuItem \ { \ Identifier = FN_REMOVE_CUR_TOX; \ - HelpID = FN_REMOVE_CUR_TOX; \ + HelpId = CMD_FN_REMOVE_CUR_TOX; \ Text [ en-US ] = "Delete Index/Table"; \ }; \ SEPARATOR ; @@ -375,10 +370,6 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml _DEFAULT_TEXT_EDIT_ELEMENTS \ }; \ }; -======= -#include "swmn.hrc" -#include "helpid.h" ->>>>>>> other /*------------------------------------------------------------------------ Beschreibung: Menu Window diff --git a/sw/source/ui/inc/swmn.hrc b/sw/source/ui/inc/swmn.hrc deleted file mode 100644 index 0d5b3265e79a..000000000000 --- a/sw/source/ui/inc/swmn.hrc +++ /dev/null @@ -1,379 +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 _SWMN_HRC -#define _SWMN_HRC - -#include -#include -#include "cmdid.h" -#include "app.hrc" -#include "globals.hrc" -#include "helpid.h" -#include "popup.hrc" -//#include "cfgid.h" - -/* --------------------- F O R M A T --------------------------------- */ - -#define SEPARATOR MenuItem { Separator = TRUE; } - -//define for ITEM_FORMAT_NUMBERING -#define DEFINE_SLOTID_FOR_NUMBER_BULLETS FN_NUMBER_BULLETS -#define MN_NUMBERING ITEM_FORMAT_NUMBERING - -#define MN_TXT\ - MenuItem\ - {\ - ITEM_FORMAT_CHAR_DLG\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_PARA_DLG\ - };\ - MenuItem\ - {\ - Identifier = FN_FORMAT_PAGE_DLG ; \ - HelpId = CMD_FN_FORMAT_PAGE_DLG ; \ - Text [ en-US ] = "Pa~ge..." ; \ - }; - - -#define MN_TEXT_ATTR\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_FONT\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT\ - };\ - MenuItem\ - {\ - Identifier = MN_FORMAT_STYLE ; \ - Command = ".uno:StyleMenu" ; \ - Text [ en-US ] = "St~yle" ; \ - SubMenu = Menu\ - {\ - ItemList = \ - {\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_WEIGHT\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_POSTURE\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_OVERLINE\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_UNDERLINE\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_STRIKEOUT\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_SHADOWED\ - };\ - MenuItem\ - {\ - ITEM_FORMAT_ATTR_CHAR_CONTOUR\ - };\ - SEPARATOR ; \ - MenuItem\ - {\ - Identifier = FN_SET_SUPER_SCRIPT ; \ - HelpId = CMD_FN_SET_SUPER_SCRIPT ; \ - Text [ en-US ] = "Superscript" ; \ - };\ - MenuItem\ - {\ - Identifier = FN_SET_SUB_SCRIPT ; \ - HelpId = CMD_FN_SET_SUB_SCRIPT ; \ - Text [ en-US ] = "Subscript" ; \ - };\ - };\ - };\ - };\ - MenuItem\ - {\ - Identifier = MN_FORMAT_ALGN ; \ - Command = ".uno:AlignTextMenu" ; \ - Text [ en-US ] = "A~lignment" ; \ - SubMenu = Menu\ - {\ - ItemList = \ - {\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT\ - };\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT\ - };\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER\ - };\ - MenuItem\ - {\ - Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ - HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \ - RadioCheck = TRUE ; \ - Text [ en-US ] = "Justified" ; \ - };\ - };\ - };\ - };\ - MenuItem\ - {\ - Identifier = MN_FORMAT_LINESPACE ; \ - Command = ".uno:LineSpacingMenu" ; \ - Text [ en-US ] = "Line Spacing" ; \ - _MenuItemFlags = MIB_RADIOCHECK ; \ - SubMenu = Menu\ - {\ - ItemList = \ - {\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_PARA_LINESPACE_10\ - };\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_PARA_LINESPACE_15\ - };\ - MenuItem\ - {\ - RadioCheck = TRUE ; \ - ITEM_FORMAT_PARA_LINESPACE_20\ - };\ - };\ - };\ - }; - -/* --------------------- M E N U --------------------------------- */ - -/* - - -The application menu bar resource has become obsolete. You can now find the menu bar at the following -location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml - - -*/ - -/* --------------------- D O C U M E N T -------------------------- */ - - -#define _MN_EDIT_FIELD \ - MenuItem \ - { \ - Identifier = FN_EDIT_FIELD ; \ - HelpId = CMD_FN_EDIT_FIELD ; \ - Text [ en-US ] = "Fields..." ; \ - }; -#define _MN_EDIT_FOOTNOTE \ - MenuItem \ - { \ - Identifier = FN_EDIT_FOOTNOTE ; \ - HelpId = CMD_FN_EDIT_FOOTNOTE ; \ - Text [ en-US ] = "Footnote/Endnote~..." ; \ - }; - #define _MN_EDIT_IDX_ENTRY_DLG \ - MenuItem \ - { \ - Identifier = FN_EDIT_IDX_ENTRY_DLG ; \ - HelpId = CMD_FN_EDIT_IDX_ENTRY_DLG ; \ - Text [ en-US ] = "Inde~x Entry..." ; \ - }; - -#define _MN_EDIT_REDLINE \ - MenuItem \ - { \ - Identifier = FN_REDLINE_ACCEPT_DIRECT; \ - HelpId = CMD_FN_REDLINE_ACCEPT_DIRECT ; \ - Text [ en-US ] = "Accept Change" ; \ - };\ - MenuItem \ - { \ - Identifier = FN_REDLINE_REJECT_DIRECT ; \ - HelpId = CMD_FN_REDLINE_REJECT_DIRECT ; \ - Text [ en-US ] = "Reject Change" ; \ - }; \ - SEPARATOR ; -#define _MN_EDIT_BIB_ENTRY_DLG \ - MenuItem \ - { \ - Identifier = FN_EDIT_AUTH_ENTRY_DLG ; \ - HelpId = CMD_FN_EDIT_AUTH_ENTRY_DLG ; \ - Text [ en-US ] = "~Bibliography Entry..."; \ - }; \ - SEPARATOR ; - -#define _MN_EDIT_OPEN_HYPERLINK \ - MenuItem \ - { \ - ITEM_OPEN_HYPERLINK \ - };\ - MenuItem \ - { \ - Identifier = FN_EDIT_HYPERLINK ; \ - HelpId = CMD_FN_EDIT_HYPERLINK ; \ - Text [ en-US ] = "Edit Hyperlink..."; \ - }; \ - MenuItem \ - { \ - Identifier = FN_COPY_HYPERLINK_LOCATION; \ - HelpId = CMD_FN_COPY_HYPERLINK_LOCATION; \ - Text [ en-US ] = "Copy Hyperlink ~Location"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_REMOVE_HYPERLINK ; \ - HelpId = CMD_FN_REMOVE_HYPERLINK ; \ - Text [ en-US ] = "Remo~ve Hyperlink"; \ - }; - -#define _MN_EDIT_OPEN_SMARTTAGMENU \ - MenuItem \ - { \ - ITEM_OPEN_SMARTTAGMENU \ - }; - -#define _MN_EDIT__HYPERLINK \ - MenuItem\ - {\ - Identifier = FN_EDIT_HYPERLINK ; \ - HelpId = CMD_FN_EDIT_HYPERLINK ; \ - Text [ en-US ] = "~Edit Hyperlink" ; \ - }; - -#define _DEFAULT_TEXT_EDIT_ELEMENTS \ - _MN_EDIT_FIELD \ - _MN_EDIT_FOOTNOTE \ - _MN_EDIT_IDX_ENTRY_DLG \ - _MN_EDIT_BIB_ENTRY_DLG \ - _MN_EDIT_REDLINE \ - MenuItem \ - { \ - ITEM_POPUP_TEMPLATE_EDIT \ - }; \ - SEPARATOR ; \ - _MN_EDIT_OPEN_HYPERLINK \ - _MN_EDIT_OPEN_SMARTTAGMENU - - -#define MN_RESET\ - MenuItem\ - {\ - Identifier = FN_FORMAT_RESET ; \ - HelpId = CMD_FN_FORMAT_RESET ; \ - Text [ en-US ] = "~Default Formatting" ; \ - }; - -#define _NUMBERING_RELATED_MENU \ - SEPARATOR ; \ - MenuItem \ - { \ - Identifier = FN_NUMBER_NEWSTART; \ - HelpId = CMD_FN_NUMBER_NEWSTART; \ - Text[ en-US ] = "Restart Numbering"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_NUM_CONTINUE; \ - HelpId = CMD_FN_NUM_CONTINUE; \ - Text[ en-US ] = "Continue previous numbering"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_NUM_BULLET_UP; \ - HelpId = CMD_FN_NUM_BULLET_UP; \ - Text[ en-US ] = "Up One Level"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_NUM_BULLET_DOWN; \ - HelpId = CMD_FN_NUM_BULLET_DOWN; \ - Text[ en-US ] = "Down One Level"; \ - }; - -#define BASE_TEXT_POPUPMENU_BEGIN \ -{ \ - ItemList = \ - { \ - MN_RESET \ - _NUMBERING_RELATED_MENU \ - SEPARATOR ; \ - MN_TEXT_ATTR \ - SEPARATOR ; \ - MN_TXT \ - MN_NUMBERING \ - ITEM_TRANSLITERATE_MENU \ - SEPARATOR ; - -// not in Writer/Web -#define BASE_TEXT_POPUPMENU_NOWEB \ - MenuItem \ - { \ - Identifier = FN_UPDATE_CUR_TOX ; \ - HelpId = CMD_FN_UPDATE_CUR_TOX ; \ - Text [ en-US ] = "~Update Index/Table"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_EDIT_CURRENT_TOX; \ - HelpId = CMD_FN_EDIT_CURRENT_TOX; \ - Text [ en-US ] = "~Edit Index/Table"; \ - }; \ - MenuItem \ - { \ - Identifier = FN_REMOVE_CUR_TOX; \ - HelpId = CMD_FN_REMOVE_CUR_TOX; \ - Text [ en-US ] = "Delete Index/Table"; \ - }; \ - SEPARATOR ; - -#define BASE_TEXT_POPUPMENU_END \ - _DEFAULT_TEXT_EDIT_ELEMENTS \ - }; \ -}; - -#endif - diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 9a2b729ae89b..d7bdc34409a4 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -107,12 +107,7 @@ using namespace ::com::sun::star; - -<<<<<<< local -SFX_IMPL_VIEWFACTORY(SwPagePreView) -======= SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreView, "PrintPreview") ->>>>>>> other { SFX_VIEW_REGISTRATION(SwDocShell); SFX_VIEW_REGISTRATION(SwWebDocShell); diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 9143e59d76f3..af7e12629a73 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -125,18 +125,11 @@ using ::com::sun::star::util::SearchOptions; #define BMARGPRN 1000 #define BORDERPRN 300 - - -<<<<<<< local -SFX_IMPL_VIEWFACTORY(SwSrcView) -======= SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView") ->>>>>>> other { SFX_VIEW_REGISTRATION(SwWebDocShell); } - SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) ) { SFX_POPUPMENU_REGISTRATION(SW_RES(MN_SRCVIEW_POPUPMENU)); diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index fbe59d286eec..84000c3ae049 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -104,12 +104,7 @@ using ::rtl::OUString; #include - -<<<<<<< local -SFX_IMPL_VIEWFACTORY(SwView) -======= SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default") ->>>>>>> other { if ( SvtModuleOptions().IsWriter() ) { diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx index 957bb38d428c..bff007751562 100644 --- a/sw/source/ui/vba/service.cxx +++ b/sw/source/ui/vba/service.cxx @@ -66,21 +66,7 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -<<<<<<< local - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) - { - OSL_TRACE("In component_writeInfo"); - - // Component registration - return component_writeInfoHelper( pServiceManager, pRegistryKey, - globals::serviceDecl, document::serviceDecl, wrapformat::serviceDecl ); - } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( -======= - void * SAL_CALL component_getFactory( ->>>>>>> other const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { @@ -91,3 +77,4 @@ extern "C" return pRet; } } + diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src index 1de9453e1fc7..9907982a6bca 100644 --- a/sw/source/ui/web/web.src +++ b/sw/source/ui/web/web.src @@ -79,8 +79,5 @@ String RID_WEBOLE_TOOLBOX { Text [ en-US ] = "Object/Web" ; }; -<<<<<<< local -======= -/************************************************************************* ->>>>>>> other + diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx index a45f9b3b22c0..d1e7fe672a38 100644 --- a/sw/source/ui/web/wview.cxx +++ b/sw/source/ui/web/wview.cxx @@ -93,16 +93,11 @@ #include -<<<<<<< local -SFX_IMPL_VIEWFACTORY(SwWebView) -======= SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default") ->>>>>>> other { SFX_VIEW_REGISTRATION(SwWebDocShell); } - SFX_IMPL_INTERFACE( SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) ) { SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId()); -- cgit From d0e31654bf2d5cbbacce9ed45210dd8881fd3d6a Mon Sep 17 00:00:00 2001 From: os Date: Mon, 1 Nov 2010 12:20:46 +0100 Subject: #i115314# FN_INSERT_FRAME: keep WrtShell locally to prevent crash after sub shell dispose --- sw/source/ui/shells/textsh.cxx | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 52b60c66d178..a819a8b21da0 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -627,16 +627,18 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) DBG_ASSERT(pDlg, "Dialogdiet fail!"); if(pDlg->Execute() && pDlg->GetOutputItemSet()) { - GetShell().LockPaint(); - GetShell().StartAllAction(); - GetShell().StartUndo(UNDO_INSERT); + //local variable necessary at least after call of .AutoCaption() because this could be deleted at this point + SwWrtShell& rShell = GetShell(); + rShell.LockPaint(); + rShell.StartAllAction(); + rShell.StartUndo(UNDO_INSERT); const SfxItemSet* pOutSet = pDlg->GetOutputItemSet(); aMgr.SetAttrSet(*pOutSet); // beim ClickToEditFeld erst die Selektion loeschen - if( GetShell().IsInClickToEdit() ) - GetShell().DelRight(); + if( rShell.IsInClickToEdit() ) + rShell.DelRight(); aMgr.InsertFlyFrm(); @@ -647,8 +649,8 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) //FN_INSERT_FRAME USHORT nAnchor = (USHORT)aMgr.GetAnchor(); rReq.AppendItem(SfxUInt16Item(nSlot, nAnchor)); - rReq.AppendItem(SfxPointItem(FN_PARAM_1, GetShell().GetObjAbsPos())); - rReq.AppendItem(SvxSizeItem(FN_PARAM_2, GetShell().GetObjSize())); + rReq.AppendItem(SfxPointItem(FN_PARAM_1, rShell.GetObjAbsPos())); + rReq.AppendItem(SvxSizeItem(FN_PARAM_2, rShell.GetObjSize())); rReq.Done(); } @@ -659,10 +661,10 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) aRewriter.AddRule(UNDO_ARG1, SW_RES(STR_FRAME)); - GetShell().EndUndo(UNDO_INSERT, &aRewriter); + rShell.EndUndo(UNDO_INSERT, &aRewriter); } - GetShell().EndAllAction(); - GetShell().UnlockPaint(); + rShell.EndAllAction(); + rShell.UnlockPaint(); } DELETEZ(pDlg); -- cgit From 9f7cb00c135c713c2dfaf931b02487f0057320dd Mon Sep 17 00:00:00 2001 From: os Date: Mon, 1 Nov 2010 14:16:03 +0100 Subject: #i110287# omit caption separator if caption text is empty --- sw/source/core/doc/doclay.cxx | 5 ++++- sw/source/ui/frmdlg/cption.cxx | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index ceb7d6e3463c..cc29cc8406d0 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -1474,7 +1474,10 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, co aTxt += ' '; } xub_StrLen nIdx = aTxt.Len(); - aTxt += rSeparator; + if( rTxt.Len() > 0 ) + { + aTxt += rSeparator; + } xub_StrLen nSepIdx = aTxt.Len(); aTxt += rTxt; diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 5e620ce6955c..e92cd4e0ae81 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -382,6 +382,7 @@ IMPL_LINK(SwCaptionDialog, CaptionHdl, PushButton*, EMPTYARG) void SwCaptionDialog::DrawSample() { String aStr; + String sCaption = aTextEdit.GetText(); // Nummer String sFldTypeName = aCategoryBox.GetText(); @@ -436,9 +437,12 @@ void SwCaptionDialog::DrawSample() } } - aStr += aSepEdit.GetText(); + if( sCaption.Len() > 0 ) + { + aStr += aSepEdit.GetText(); + } } - aStr += aTextEdit.GetText(); + aStr += sCaption; // do preview! aPrevWin.SetPreviewText( aStr ); } -- cgit From 72959a6d4909fbebbcc40b7b745d233277d546e2 Mon Sep 17 00:00:00 2001 From: os Date: Thu, 4 Nov 2010 11:21:05 +0100 Subject: #i105063# moving cursor to linebreak (dtardon) --- sw/source/core/text/frmcrsr.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx index 8f9d3fc77337..aeddb97d3f83 100644 --- a/sw/source/core/text/frmcrsr.cxx +++ b/sw/source/core/text/frmcrsr.cxx @@ -780,7 +780,7 @@ sal_Bool SwTxtFrm::RightMargin(SwPaM *pPam, sal_Bool bAPI) const if( aLine.GetCurr()->GetLen() && CH_BREAK == aInf.GetTxt().GetChar( nRightMargin - 1 ) ) --nRightMargin; - if( !bAPI && (aLine.GetNext() || pFrm->GetFollow()) ) + else if( !bAPI && (aLine.GetNext() || pFrm->GetFollow()) ) { while( nRightMargin > aLine.GetStart() && ' ' == aInf.GetTxt().GetChar( nRightMargin - 1 ) ) -- cgit From 8eb582f4d077d49d76274b8df82a3f9b20cd8251 Mon Sep 17 00:00:00 2001 From: os Date: Thu, 4 Nov 2010 13:05:15 +0100 Subject: #i101078# gcc 4.3.2 warnings --- sw/inc/fmtcol.hxx | 2 +- sw/source/core/doc/docfld.cxx | 12 ++++++------ sw/source/core/doc/docftn.cxx | 4 ++-- sw/source/core/doc/tblrwcl.cxx | 8 ++++---- sw/source/core/edit/edsect.cxx | 4 ++-- sw/source/core/frmedt/feshview.cxx | 6 ++++-- sw/source/core/frmedt/tblsel.cxx | 4 ++-- sw/source/core/layout/calcmove.cxx | 4 ++-- sw/source/core/layout/frmtool.cxx | 2 +- sw/source/core/layout/layact.cxx | 2 +- sw/source/core/layout/pagechg.cxx | 4 ++-- sw/source/core/layout/paintfrm.cxx | 8 ++++---- sw/source/core/layout/trvlfrm.cxx | 22 ++++++++++++---------- sw/source/core/layout/wsfrm.cxx | 2 +- sw/source/core/table/swtable.cxx | 2 +- sw/source/core/unocore/unostyle.cxx | 12 ++++++------ sw/source/core/unocore/unotbl.cxx | 12 ++++++------ sw/source/filter/ascii/ascatr.cxx | 4 ++-- sw/source/filter/html/htmlctxt.cxx | 2 +- sw/source/filter/ww8/ww8par.cxx | 2 +- sw/source/ui/frmdlg/frmpage.cxx | 2 +- sw/source/ui/index/cnttab.cxx | 12 ++++++------ sw/source/ui/misc/glosdoc.cxx | 2 +- sw/source/ui/misc/outline.cxx | 4 ++-- sw/source/ui/shells/frmsh.cxx | 6 +++--- sw/source/ui/shells/tabsh.cxx | 16 ++++++++-------- sw/source/ui/shells/textsh.cxx | 2 +- sw/source/ui/shells/textsh1.cxx | 4 ++-- sw/source/ui/shells/txtattr.cxx | 4 ++-- sw/source/ui/uiview/view.cxx | 4 ++-- sw/source/ui/uiview/viewtab.cxx | 22 +++++++++++----------- sw/source/ui/utlui/content.cxx | 10 +++++----- 32 files changed, 105 insertions(+), 101 deletions(-) diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index aba9b8533c0a..bcc9d6b45e4d 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -113,7 +113,7 @@ public: void SetAttrOutlineLevel( int ); int GetAttrOutlineLevel() const; int GetAssignedOutlineStyleLevel() const; - inline bool IsAssignedToListLevelOfOutlineStyle() const + inline const bool IsAssignedToListLevelOfOutlineStyle() const { return mbAssignedToOutlineStyle; } diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index f4e80e9de52a..994f33d358ba 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -2464,9 +2464,9 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) { SwDBData aDBData(((SwDBNumSetField*)pFld)->GetDBData(&rDoc)); - if( bIsDBMgr && - rDoc.GetNewDBMgr()->OpenDataSource( aDBData.sDataSource, aDBData.sCommand )&& - GETFLD_ALL == eGetMode || + if( (bIsDBMgr && + rDoc.GetNewDBMgr()->OpenDataSource( aDBData.sDataSource, aDBData.sCommand )&& + GETFLD_ALL == eGetMode) || ( GETFLD_CALC & eGetMode && ((SwDBNumSetField*)pFld)->IsCondValid())) pFormel = &pFld->GetPar1(); @@ -2476,9 +2476,9 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) { SwDBData aDBData(((SwDBNextSetField*)pFld)->GetDBData(&rDoc)); - if( bIsDBMgr && - rDoc.GetNewDBMgr()->OpenDataSource( aDBData.sDataSource, aDBData.sCommand )&& - GETFLD_ALL == eGetMode || + if( (bIsDBMgr && + rDoc.GetNewDBMgr()->OpenDataSource( aDBData.sDataSource, aDBData.sCommand )&& + GETFLD_ALL == eGetMode) || ( GETFLD_CALC & eGetMode && ((SwDBNextSetField*)pFld)->IsCondValid() )) pFormel = &pFld->GetPar1(); diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx index 61bab9fdd525..43b0dbca6853 100644 --- a/sw/source/core/doc/docftn.cxx +++ b/sw/source/core/doc/docftn.cxx @@ -333,8 +333,8 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo) } BOOL bNumChg = rInfo.nFtnOffset != GetEndNoteInfo().nFtnOffset; - BOOL bExtra = !bNumChg && - rInfo.aFmt.GetNumberingType() != GetEndNoteInfo().aFmt.GetNumberingType()|| + BOOL bExtra = (!bNumChg && rInfo.aFmt.GetNumberingType() != GetEndNoteInfo().aFmt.GetNumberingType() ) + || rInfo.GetPrefix() != GetEndNoteInfo().GetPrefix() || rInfo.GetSuffix() != GetEndNoteInfo().GetSuffix(); BOOL bFtnDesc = rInfo.GetPageDesc( *this ) != diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 6119184d3209..1b0cf4fdfa32 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -2924,10 +2924,10 @@ BOOL lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam, if( rParam.bLeft ? ((nDist + nWidth / 2 ) <= rParam.nSide && (TBLFIX_CHGABS != rParam.nMode || - n < rBoxes.Count() && + (n < rBoxes.Count() && (nDist + nWidth + rBoxes[ n+1 ]-> GetFrmFmt()->GetFrmSize().GetWidth() / 2) - > rParam.nSide )) + > rParam.nSide) )) : (nDist + nWidth / 2 ) > rParam.nSide ) { @@ -2989,10 +2989,10 @@ BOOL lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam, if( nLowerDiff || (rParam.bLeft ? ((nDist + nWidth / 2 ) <= rParam.nSide && (TBLFIX_CHGABS != rParam.nMode || - n < rBoxes.Count() && + (n < rBoxes.Count() && (nDist + nWidth + rBoxes[ n+1 ]-> GetFrmFmt()->GetFrmSize().GetWidth() / 2) - > rParam.nSide )) + > rParam.nSide) )) : (nDist + nWidth / 2 ) > rParam.nSide )) { if( !nLowerDiff ) diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx index ba3c2e9c7966..a936002df9a2 100644 --- a/sw/source/core/edit/edsect.cxx +++ b/sw/source/core/edit/edsect.cxx @@ -143,8 +143,8 @@ BOOL SwEditShell::IsAnySectionInDoc( BOOL bChkReadOnly, BOOL bChkHidden, BOOL bC const SwSectionFmt* pFmt = rFmts[ n ]; if( pFmt->IsInNodesArr() && (bChkTOX || - (eTmpType = pFmt->GetSection()->GetType()) != TOX_CONTENT_SECTION - && TOX_HEADER_SECTION != eTmpType )) + ( (eTmpType = pFmt->GetSection()->GetType()) != TOX_CONTENT_SECTION + && TOX_HEADER_SECTION != eTmpType ) ) ) { const SwSection& rSect = *rFmts[ n ]->GetSection(); if( (!bChkReadOnly && !bChkHidden ) || diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index f334ddcaee2f..cb9b9d81cf46 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -1475,10 +1475,12 @@ const SdrObject* SwFEShell::GetBestObject( BOOL bNext, USHORT /*GOTOOBJ_...*/ eT break; } - if( (bNext? (aPos.Y() < aCurPos.Y()) : // nur unter mir + if( ( + (bNext? (aPos.Y() < aCurPos.Y()) : // nur unter mir (aPos.Y() > aCurPos.Y())) && // " reverse (bNext? (aBestPos.Y() > aCurPos.Y()) : // naeher drunter - (aBestPos.Y() < aCurPos.Y())) || // " reverse + (aBestPos.Y() < aCurPos.Y())) + ) || // " reverse (aBestPos.Y() == aCurPos.Y() && (bNext? (aBestPos.X() > aCurPos.X()) : // weiter links (aBestPos.X() < aCurPos.X())))) // " reverse diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index 8cabf285e12b..e1e2386d7ab9 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -1747,8 +1747,8 @@ void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart, (!pTmp->IsCellFrm() || ( ( ! bRTL && (pTmp->Frm().*fnRect->fnGetLeft)() < nSX && (pTmp->Frm().*fnRect->fnGetRight)()< nSX2 ) || - bRTL && (pTmp->Frm().*fnRect->fnGetLeft)() > nSX && - (pTmp->Frm().*fnRect->fnGetRight)()> nSX2 ) ) ) + ( bRTL && (pTmp->Frm().*fnRect->fnGetLeft)() > nSX && + (pTmp->Frm().*fnRect->fnGetRight)()> nSX2 ) ) ) ) pTmp = pTmp->GetNextLayoutLeaf(); if ( pTmp ) diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 28287c957ad1..90d210955023 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -1004,8 +1004,8 @@ BOOL SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) SwAnchoredObject* pObj = (*GetDrawObjs())[i]; const SwFrmFmt& rFmt = pObj->GetFrmFmt(); const BOOL bFly = pObj->ISA(SwFlyFrm); - if ( bFly && - WEIT_WECH == pObj->GetObjRect().Width()|| + if ( ( bFly && + WEIT_WECH == pObj->GetObjRect().Width() ) || rFmt.GetFrmSize().GetWidthPercent() ) continue; diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 395009122063..ca226a8c5fbe 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -1738,7 +1738,7 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, // die in den Fussnoten liegen, nicht etwa die (spaltigen) Bereiche, // in denen die Fussnoten(Container) liegen. // #109767# Table frame is in section, insert section in cell frame. - if( pSct && ( pFtnFrm && !pSct->IsInFtn() ) || pUpper->IsCellFrm() ) + if( (pSct && ( pFtnFrm && !pSct->IsInFtn() )) || pUpper->IsCellFrm() ) pSct = NULL; if( pSct ) { // damit der SectionFrm nicht zerstoert wird durch pTmp->MoveFwd() diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index aec3fde909f1..b9931a6b80fb 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -1077,7 +1077,7 @@ static bool lcl_IsInvaLay( const SwFrm *pFrm, long nBottom ) { if ( !pFrm->IsValid() || - (pFrm->IsCompletePaint() && pFrm->Frm().Top() < nBottom) + (pFrm->IsCompletePaint() && ( pFrm->Frm().Top() < nBottom ) ) ) { return true; diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 01f09f2c41c3..fd24e112109f 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -1827,8 +1827,8 @@ void SwRootFrm::ImplCalcBrowseWidth() SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i]; const SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt(); const BOOL bFly = pAnchoredObj->ISA(SwFlyFrm); - if ( bFly && - WEIT_WECH == pAnchoredObj->GetObjRect().Width()|| + if ( ( bFly && + WEIT_WECH == pAnchoredObj->GetObjRect().Width() ) || rFmt.GetFrmSize().GetWidthPercent() ) continue; diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 09fc6b00e03d..5793971d6938 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -533,7 +533,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut ) if ( rL2.GetTab() != rL1.GetTab() || rL2.IsPainted() || rL2.IsLocked() || - bVert == rL2.Height() > rL2.Width() ) + (bVert == (rL2.Height() > rL2.Width())) ) continue; long nL2a, nL2b, nL2c, nL2d; @@ -707,7 +707,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects ) if ( rLine.IsLocked () ) continue; - if ( !bVerticalSubs == rLine.Height() > rLine.Width() ) //gleiche Ausrichtung? + if ( (!bVerticalSubs == (rLine.Height() > rLine.Width())) ) //gleiche Ausrichtung? continue; if ( aSubsRect.IsOver( rLine ) ) @@ -912,7 +912,7 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut, SwLineRect &rLk = operator[](k); if ( rLi.SSize() == rLk.SSize() ) { - if ( bVerticalSubs == rLk.Height() > rLk.Width() ) + if ( (bVerticalSubs == (rLk.Height() > rLk.Width())) ) { if ( bVerticalSubs ) { @@ -6263,7 +6263,7 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage, void SwPageFrm::RefreshExtraData( const SwRect &rRect ) const { const SwLineNumberInfo &rInfo = GetFmt()->GetDoc()->GetLineNumberInfo(); - BOOL bLineInFly = rInfo.IsPaintLineNumbers() && rInfo.IsCountInFlys() + BOOL bLineInFly = (rInfo.IsPaintLineNumbers() && rInfo.IsCountInFlys()) || (sal_Int16)SW_MOD()->GetRedlineMarkPos() != text::HoriOrientation::NONE; SwRect aRect( rRect ); diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 018e48440b59..df045392e33f 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -581,8 +581,8 @@ const SwCntntFrm * MA_FASTCALL lcl_MissProtectedFrames( const SwCntntFrm *pCnt, if ( !pCell || ( ( bInReadOnly || !pCell->GetFmt()->GetProtect().IsCntntProtected() ) && ( !bMissHeadline || !lcl_IsInRepeatedHeadline( pCell ) ) && - ( !bMissFollowFlowLine || !pCell->IsInFollowFlowRow() ) ) && - !pCell->IsCoveredCell() ) + ( !bMissFollowFlowLine || !pCell->IsInFollowFlowRow() ) && + !pCell->IsCoveredCell() ) ) bProtect = FALSE; else pCnt = (*fnNxtPrv)( pCnt ); @@ -701,14 +701,14 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, const long nPrtLeft = bRTL ? (pTable->*fnRect->fnGetPrtRight)() : (pTable->*fnRect->fnGetPrtLeft)(); - if ( bRTL != nX < nPrtLeft ) + if ( (bRTL != (nX < nPrtLeft)) ) nX = nPrtLeft; else { const long nPrtRight = bRTL ? (pTable->*fnRect->fnGetPrtLeft)() : (pTable->*fnRect->fnGetPrtRight)(); - if ( bRTL != nX > nPrtRight ) + if ( (bRTL != (nX > nPrtRight)) ) nX = nPrtRight; } } @@ -2308,12 +2308,14 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) (aTmp.*fnRectX->fnSetTop)( nTmp ); if( (aEndRect.*fnRectX->fnGetTop)() != (pEnd2Pos->aPortion.*fnRectX->fnGetTop)() ) - if( bPorR2L ) - (aTmp.*fnRectX->fnSetLeft)( - (pEnd2Pos->aPortion.*fnRectX->fnGetLeft)() ); - else - (aTmp.*fnRectX->fnSetRight)( - (pEnd2Pos->aPortion.*fnRectX->fnGetRight)() ); + { + if( bPorR2L ) + (aTmp.*fnRectX->fnSetLeft)( + (pEnd2Pos->aPortion.*fnRectX->fnGetLeft)() ); + else + (aTmp.*fnRectX->fnSetRight)( + (pEnd2Pos->aPortion.*fnRectX->fnGetRight)() ); + } aTmp.Intersection( aEndFrm ); Sub( aRegion, aTmp ); } diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index ade3efd4e70d..31d27d0152a0 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -3125,7 +3125,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) // Finally adjust the columns if width is set to auto // Possible optimisation: execute this code earlier in this function and // return??? - if ( ( bVert && bHeightChgd || ! bVert && bWidthChgd ) && + if ( ( (bVert && bHeightChgd) || (! bVert && bWidthChgd) ) && Lower()->IsColumnFrm() ) { // get column attribute diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 281aac016e43..48b3b5f335fb 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -2410,7 +2410,7 @@ void SwTableBoxFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ) BOOL bNewIsTxtFmt = pNumFmtr->IsTextFormat( nNewFmt ) || NUMBERFORMAT_TEXT == nNewFmt; - if( !bNewIsTxtFmt && nOldFmt != nNewFmt || pNewFml ) + if( (!bNewIsTxtFmt && nOldFmt != nNewFmt) || pNewFml ) { BOOL bChgTxt = TRUE; double fVal = 0; diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 4309622c9545..6bfce552765e 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1894,8 +1894,8 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, if( pCharStyleNames[i] != SwXNumberingRules::GetInvalidStyle() && ((pCharStyleNames[i].Len() && !pFmt->GetCharFmt()) || - pCharStyleNames[i].Len() && - pFmt->GetCharFmt()->GetName() != pCharStyleNames[i] )) + (pCharStyleNames[i].Len() && + pFmt->GetCharFmt()->GetName() != pCharStyleNames[i]) )) { SwCharFmt* pCharFmt = 0; @@ -1927,8 +1927,8 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, //jetzt nochmal fuer Fonts if(pBulletFontNames[i] != SwXNumberingRules::GetInvalidStyle() && ((pBulletFontNames[i].Len() && !pFmt->GetBulletFont()) || - pBulletFontNames[i].Len() && - pFmt->GetBulletFont()->GetName() != pBulletFontNames[i] )) + (pBulletFontNames[i].Len() && + pFmt->GetBulletFont()->GetName() != pBulletFontNames[i]) )) { const SvxFontListItem* pFontListItem = (const SvxFontListItem* )pDoc->GetDocShell() @@ -3609,8 +3609,8 @@ MakeObject: { const SwPageDesc& rDesc = aBase.GetOldPageDesc(); const SwFrmFmt* pFrmFmt = 0; - sal_Bool bShare = bHeader && rDesc.IsHeaderShared()|| - !bHeader && rDesc.IsFooterShared(); + sal_Bool bShare = (bHeader && rDesc.IsHeaderShared())|| + (!bHeader && rDesc.IsFooterShared()); // TextLeft returns the left content if there is one, // Text and TextRight return the master content. // TextRight does the same as Text and is for diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index fdc382ad99d9..a3f52d9c9901 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -700,7 +700,7 @@ void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox* pBo { aCols[i] = pArray[i].Position; if(pArray[i].IsVisible == aCols.IsHidden(i) || - !bRow && aCols.IsHidden(i) || + (!bRow && aCols.IsHidden(i)) || long(aCols[i] - long(nLastValue)) < 0 || UNO_TABLE_COLUMN_SUM < aCols[i] ) { @@ -3439,10 +3439,10 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const SwFrmFmt* pBoxFmt = pBox->GetFrmFmt(); const SvxBoxItem& rBox = pBoxFmt->GetBox(); if( - aTableBorderDistances.IsLeftDistanceValid && nLeftDistance != rBox.GetDistance( BOX_LINE_LEFT ) || - aTableBorderDistances.IsRightDistanceValid && nRightDistance != rBox.GetDistance( BOX_LINE_RIGHT ) || - aTableBorderDistances.IsTopDistanceValid && nTopDistance != rBox.GetDistance( BOX_LINE_TOP ) || - aTableBorderDistances.IsBottomDistanceValid && nBottomDistance != rBox.GetDistance( BOX_LINE_BOTTOM )) + (aTableBorderDistances.IsLeftDistanceValid && nLeftDistance != rBox.GetDistance( BOX_LINE_LEFT )) || + (aTableBorderDistances.IsRightDistanceValid && nRightDistance != rBox.GetDistance( BOX_LINE_RIGHT )) || + (aTableBorderDistances.IsTopDistanceValid && nTopDistance != rBox.GetDistance( BOX_LINE_TOP )) || + (aTableBorderDistances.IsBottomDistanceValid && nBottomDistance != rBox.GetDistance( BOX_LINE_BOTTOM ))) { SvxBoxItem aSetBox( rBox ); SwFrmFmt* pSetBoxFmt = pBox->ClaimFrmFmt(); @@ -3755,7 +3755,7 @@ void SwXTextTable::setName(const OUString& rName) throw( uno::RuntimeException ) vos::OGuard aGuard(Application::GetSolarMutex()); SwFrmFmt* pFmt = GetFrmFmt(); String sNewTblName(rName); - if(!pFmt && !bIsDescriptor || + if((!pFmt && !bIsDescriptor) || !sNewTblName.Len() || STRING_NOTFOUND != sNewTblName.Search('.') || STRING_NOTFOUND != sNewTblName.Search(' ') ) diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx index c1ba4908a339..d4471f9bb790 100644 --- a/sw/source/filter/ascii/ascatr.cxx +++ b/sw/source/filter/ascii/ascatr.cxx @@ -205,8 +205,8 @@ static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) } while( nStrPos < nEnde ); if( !bLastNd || - ( !rWrt.bWriteClipboardDoc && !rWrt.bASCII_NoLastLineEnd ) - && !nStrPos && nEnde == nNodeEnde ) + ( ( !rWrt.bWriteClipboardDoc && !rWrt.bASCII_NoLastLineEnd ) + && !nStrPos && nEnde == nNodeEnde ) ) rWrt.Strm().WriteUnicodeOrByteText( ((SwASCWriter&)rWrt).GetLineEnd()); return rWrt; diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx index 485ac5dd2a2b..b3a62fe4d189 100644 --- a/sw/source/filter/html/htmlctxt.cxx +++ b/sw/source/filter/html/htmlctxt.cxx @@ -192,7 +192,7 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos ) nOldEndCnt = pPam->GetPoint()->nContent.GetIndex(); } - if( RES_PARATR_BEGIN <= nWhich && bMoveBack || + if( (RES_PARATR_BEGIN <= nWhich && bMoveBack) || pAttr->GetSttParaIdx() < pOldEndPara->GetIndex() || (pAttr->GetSttPara() == *pOldEndPara && pAttr->GetSttCnt() != nOldEndCnt) ) diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 24f36b047a4e..21852ea86f25 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -3575,7 +3575,7 @@ void wwSectionManager::InsertSegments() bool bThisAndNextAreCompatible = (aNext != aEnd) ? ((aIter->GetPageWidth() == aNext->GetPageWidth()) && (aIter->GetPageHeight() == aNext->GetPageHeight()) && (aIter->IsLandScape() == aNext->IsLandScape())) : true; - if ((aNext != aEnd && aNext->IsContinous() && bThisAndNextAreCompatible) || bProtected) + if (((aNext != aEnd && aNext->IsContinous() && bThisAndNextAreCompatible) || bProtected)) { bIgnoreCols = true; if ((aIter->NoCols() > 1) || bProtected) diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 5bff86b1a4c7..49bd1b2a0c7e 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1080,7 +1080,7 @@ BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet) aWidthED .GetValue() == aWidthED .GetMin() && aHeightED.GetValue() == aHeightED.GetMin()); - if ((bNew && !bFormat) || (bValueModified || bCheckChanged) && bLegalValue) + if ((bNew && !bFormat) || ((bValueModified || bCheckChanged) && bLegalValue)) { sal_Int64 nNewWidth = aWidthED.DenormalizePercent(aWidthED.GetRealValue(FUNIT_TWIP)); sal_Int64 nNewHeight = aHeightED.DenormalizePercent(aHeightED.GetRealValue(FUNIT_TWIP)); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index a8a01a4f8222..038ec65df87b 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1826,8 +1826,8 @@ void SwTOXEdit::KeyInput( const KeyEvent& rKEvt ) { const Selection& rSel = GetSelection(); sal_uInt16 nTextLen = GetText().Len(); - if(rSel.A() == rSel.B() && - !rSel.A() || rSel.A() == nTextLen ) + if( (rSel.A() == rSel.B() && + !rSel.A() ) || rSel.A() == nTextLen ) { sal_Bool bCall = sal_False; KeyCode aCode = rKEvt.GetKeyCode(); @@ -3804,8 +3804,8 @@ IMPL_LINK(SwTokenWindow, EditResize, Edit*, pEdit) IMPL_LINK(SwTokenWindow, NextItemHdl, SwTOXEdit*, pEdit) { sal_uInt16 nPos = (sal_uInt16)aControlList.GetPos(pEdit); - if(nPos && !pEdit->IsNextControl() || - nPos < aControlList.Count() - 1 && pEdit->IsNextControl()) + if( (nPos && !pEdit->IsNextControl()) || + (nPos < aControlList.Count() - 1 && pEdit->IsNextControl())) { aControlList.Seek(nPos); Control* pNextPrev = pEdit->IsNextControl() ? aControlList.Next() : aControlList.Prev(); @@ -3840,8 +3840,8 @@ IMPL_LINK(SwTokenWindow, TbxFocusHdl, SwTOXEdit*, pEdit) IMPL_LINK(SwTokenWindow, NextItemBtnHdl, SwTOXButton*, pBtn ) { sal_uInt16 nPos = (sal_uInt16)aControlList.GetPos(pBtn); - if(nPos && !pBtn->IsNextControl() || - nPos < aControlList.Count() - 1 && pBtn->IsNextControl()) + if( (nPos && !pBtn->IsNextControl()) || + (nPos < aControlList.Count() - 1 && pBtn->IsNextControl())) { aControlList.Seek(nPos); sal_Bool bNext = pBtn->IsNextControl(); diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx index 9ce1038eb898..6ed886fb3974 100644 --- a/sw/source/ui/misc/glosdoc.cxx +++ b/sw/source/ui/misc/glosdoc.cxx @@ -523,7 +523,7 @@ void SwGlossaries::UpdateGlosPath(sal_Bool bFull) aDirArr.DeleteAndDestroy(0, aDirArr.Count()); if(!nTokenCount || - m_sErrPath.Len() && (bPathChanged || m_sOldErrPath != m_sErrPath) ) + (m_sErrPath.Len() && (bPathChanged || m_sOldErrPath != m_sErrPath)) ) { m_sOldErrPath = m_sErrPath; // Falscher Pfad, d.h. AutoText-Verzeichnis existiert nicht diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index e733aa0389c2..5380a00afbaf 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -617,8 +617,8 @@ void SwOutlineSettingsTabPage::Update() bSameSuffix &= aNumFmtArr[i]->GetSuffix() == aNumFmtArr[0]->GetSuffix(); bSameComplete &= aNumFmtArr[i]->GetIncludeUpperLevels() == aNumFmtArr[0]->GetIncludeUpperLevels(); const SwCharFmt* pFmt = aNumFmtArr[i]->GetCharFmt(); - bSameCharFmt &= !pFirstFmt && !pFmt - || pFirstFmt && pFmt && pFmt->GetName() == pFirstFmt->GetName(); + bSameCharFmt &= (!pFirstFmt && !pFmt) + || (pFirstFmt && pFmt && pFmt->GetName() == pFirstFmt->GetName()); } } CheckForStartValue_Impl(aNumFmtArr[0]->GetNumberingType()); diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 5d972af52f72..75ee36b32f1e 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -711,7 +711,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) case FN_FRAME_ALIGN_HORZ_LEFT: if ( (eFrmType & FRMTYPE_FLY_INCNT) || bProtect || - (nWhich == FN_FRAME_ALIGN_HORZ_CENTER || nWhich == SID_OBJECT_ALIGN_CENTER)&& bHtmlMode ) + ((nWhich == FN_FRAME_ALIGN_HORZ_CENTER || nWhich == SID_OBJECT_ALIGN_CENTER)&& bHtmlMode) ) rSet.DisableItem( nWhich ); break; case FN_FRAME_ALIGN_VERT_ROW_TOP: @@ -721,7 +721,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) case FN_FRAME_ALIGN_VERT_CHAR_CENTER: case FN_FRAME_ALIGN_VERT_CHAR_BOTTOM: if ( !(eFrmType & FRMTYPE_FLY_INCNT) || bProtect - || bHtmlMode && FN_FRAME_ALIGN_VERT_CHAR_BOTTOM == nWhich ) + || (bHtmlMode && FN_FRAME_ALIGN_VERT_CHAR_BOTTOM == nWhich) ) rSet.DisableItem( nWhich ); break; @@ -732,7 +732,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) case FN_FRAME_ALIGN_VERT_TOP: case FN_FRAME_ALIGN_VERT_CENTER: case FN_FRAME_ALIGN_VERT_BOTTOM: - if ( bProtect || bHtmlMode && eFrmType & FRMTYPE_FLY_ATCNT) + if ( bProtect || (bHtmlMode && eFrmType & FRMTYPE_FLY_ATCNT) ) rSet.DisableItem( nWhich ); else { diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index f87bc0d41208..bb4f1c7fb609 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -220,7 +220,7 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh ) // Tabellenvariante, wenn mehrere Tabellenzellen selektiert rSh.GetCrsr(); //Damit GetCrsrCnt() auch das Richtige liefert - aBoxInfo.SetTable (rSh.IsTableMode() && rSh.GetCrsrCnt() > 1 || + aBoxInfo.SetTable ((rSh.IsTableMode() && rSh.GetCrsrCnt() > 1) || !bTableSel); // Abstandsfeld immer anzeigen aBoxInfo.SetDist ((BOOL) TRUE); @@ -663,7 +663,7 @@ void SwTableShell::Execute(SfxRequest &rReq) else aCoreSet.InvalidateItem( RES_BACKGROUND ); - if ( !pDlg && rReq.GetArgs() || pDlg->Execute() == RET_OK ) + if ( (!pDlg && rReq.GetArgs()) || pDlg->Execute() == RET_OK ) { const SfxItemSet* pOutSet = pDlg ? pDlg->GetOutputItemSet() : rReq.GetArgs(); if ( pDlg ) @@ -1330,9 +1330,9 @@ void SwTableShell::GetState(SfxItemSet &rSet) case FN_TABLE_VERT_BOTTOM: { USHORT nAlign = rSh.GetBoxAlign(); - BOOL bSet = nSlot == FN_TABLE_VERT_NONE && nAlign == text::VertOrientation::NONE|| - nSlot == FN_TABLE_VERT_CENTER && nAlign == text::VertOrientation::CENTER || - nSlot == FN_TABLE_VERT_BOTTOM && nAlign == text::VertOrientation::BOTTOM; + BOOL bSet = (nSlot == FN_TABLE_VERT_NONE && nAlign == text::VertOrientation::NONE) || + (nSlot == FN_TABLE_VERT_CENTER && nAlign == text::VertOrientation::CENTER) || + (nSlot == FN_TABLE_VERT_BOTTOM && nAlign == text::VertOrientation::BOTTOM); rSet.Put(SfxBoolItem(nSlot, bSet)); } break; @@ -1342,9 +1342,9 @@ void SwTableShell::GetState(SfxItemSet &rSet) case FN_TABLE_MODE_VARIABLE : { TblChgMode nMode = rSh.GetTblChgMode(); - BOOL bSet = nSlot == FN_TABLE_MODE_FIX && nMode == TBLFIX_CHGABS || - nSlot == FN_TABLE_MODE_FIX_PROP && nMode == TBLFIX_CHGPROP || - nSlot == FN_TABLE_MODE_VARIABLE && nMode == TBLVAR_CHGABS; + BOOL bSet = (nSlot == FN_TABLE_MODE_FIX && nMode == TBLFIX_CHGABS) || + (nSlot == FN_TABLE_MODE_FIX_PROP && nMode == TBLFIX_CHGPROP) || + (nSlot == FN_TABLE_MODE_VARIABLE && nMode == TBLVAR_CHGABS); rSet.Put(SfxBoolItem(nSlot, bSet)); } break; diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index a819a8b21da0..0d217532e32a 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -902,7 +902,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet ) } break; case FN_INSERT_HRULER : - if(rSh.IsReadOnlyAvailable() && rSh.HasReadonlySel() || bCrsrInHidden ) + if((rSh.IsReadOnlyAvailable() && rSh.HasReadonlySel()) || bCrsrInHidden ) rSet.DisableItem(nWhich); break; case FN_FORMAT_COLUMN : diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 2dff1eddc4b4..e084c539da19 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -1743,8 +1743,8 @@ void SwTextShell::ChangeHeaderOrFooter( if( !rStyleName.Len() || rStyleName == sTmp ) { if( bShowWarning && !bOn && GetActiveView() && GetActiveView() == &GetView() && - (bHeader && aDesc.GetMaster().GetHeader().IsActive() || - !bHeader && aDesc.GetMaster().GetFooter().IsActive())) + ((bHeader && aDesc.GetMaster().GetHeader().IsActive()) || + (!bHeader && aDesc.GetMaster().GetFooter().IsActive()))) { bShowWarning = FALSE; //Actions have to be closed while the dialog is showing diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index 9e89620bed28..9d90ac5d5b26 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -119,8 +119,8 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq) eEscape = nWhich == FN_SET_SUPER_SCRIPT ? SVX_ESCAPEMENT_SUPERSCRIPT: SVX_ESCAPEMENT_SUBSCRIPT; - if( nWhich == FN_SET_SUB_SCRIPT && nTmpEsc < 0 || - nWhich == FN_SET_SUPER_SCRIPT && nTmpEsc > 0 ) + if( (nWhich == FN_SET_SUB_SCRIPT && nTmpEsc < 0) || + (nWhich == FN_SET_SUPER_SCRIPT && nTmpEsc > 0) ) eEscape = SVX_ESCAPEMENT_OFF; SfxBindings& rBind = GetView().GetViewFrame()->GetBindings(); diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 15c94782883f..256bdb20b732 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -1180,8 +1180,8 @@ bool lcl_IsOwnDocument( SwView& rView ) String Created = xDocProps->getAuthor(); String Changed = xDocProps->getModifiedBy(); String FullName = SW_MOD()->GetUserOptions().GetFullName(); - return FullName.Len() && - (Changed.Len() && Changed == FullName ) || + return (FullName.Len() && + (Changed.Len() && Changed == FullName )) || (!Changed.Len() && Created.Len() && Created == FullName ); } diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index 44e314a7475b..ca65184c74e6 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -529,7 +529,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) aUL.SetLower( (USHORT)aLongULSpace.GetLower() ); aDesc.GetMaster().SetFmtAttr( aUL ); - if( bHead && pHeaderFmt || !bHead && pFooterFmt ) + if( (bHead && pHeaderFmt) || (!bHead && pFooterFmt) ) { SwFmtFrmSize aSz( bHead ? pHeaderFmt->GetFrmSize() : pFooterFmt->GetFrmSize() ); @@ -694,7 +694,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) SvxColumnItem aColItem((const SvxColumnItem&)rReq. GetArgs()->Get(nSlot)); - if( bSetTabColFromDoc || !bSect && rSh.GetTableFmt() ) + if( bSetTabColFromDoc || (!bSect && rSh.GetTableFmt()) ) { ASSERT(aColItem.Count(), "ColDesc ist leer!!"); @@ -826,7 +826,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) SvxColumnItem aColItem((const SvxColumnItem&)rReq. GetArgs()->Get(nSlot)); - if( bSetTabColFromDoc || !bSect && rSh.GetTableFmt() ) + if( bSetTabColFromDoc || (!bSect && rSh.GetTableFmt()) ) { ASSERT(aColItem.Count(), "ColDesc ist leer!!"); @@ -1078,8 +1078,8 @@ void SwView::StateTabWin(SfxItemSet& rSet) (nSelType & nsSelectionType::SEL_FRM) || (nSelType & nsSelectionType::SEL_OLE) || SFX_ITEM_AVAILABLE > aCoreSet.GetItemState(RES_LR_SPACE)|| - !bVerticalWriting && (SID_ATTR_TABSTOP_VERTICAL == nWhich)|| - bVerticalWriting && (RES_PARATR_TABSTOP == nWhich) + (!bVerticalWriting && (SID_ATTR_TABSTOP_VERTICAL == nWhich))|| + (bVerticalWriting && (RES_PARATR_TABSTOP == nWhich)) ) rSet.DisableItem( nWhich ); else @@ -1106,8 +1106,8 @@ void SwView::StateTabWin(SfxItemSet& rSet) nSelType & nsSelectionType::SEL_FRM || nSelType & nsSelectionType::SEL_OLE || nFrmType == FRMTYPE_DRAWOBJ || - !bVerticalWriting && (SID_ATTR_PARA_LRSPACE_VERTICAL == nWhich)|| - bVerticalWriting && (SID_ATTR_PARA_LRSPACE == nWhich) + (!bVerticalWriting && (SID_ATTR_PARA_LRSPACE_VERTICAL == nWhich))|| + (bVerticalWriting && (SID_ATTR_PARA_LRSPACE == nWhich)) ) { rSet.DisableItem(nWhich); @@ -1282,9 +1282,9 @@ void SwView::StateTabWin(SfxItemSet& rSet) BOOL bTableVertical = bHasTable && rSh.IsTableVertical(); - if((SID_RULER_BORDERS_VERTICAL == nWhich) && + if( ( (SID_RULER_BORDERS_VERTICAL == nWhich) && ((bHasTable && !bTableVertical)|| - (!bVerticalWriting && !bFrmSelection && !bHasTable ) || (bFrmSelection && !bFrameHasVerticalColumns)) || + (!bVerticalWriting && !bFrmSelection && !bHasTable ) || (bFrmSelection && !bFrameHasVerticalColumns)) ) || ((SID_RULER_BORDERS == nWhich) && ((bHasTable && bTableVertical)|| (bVerticalWriting && !bFrmSelection&& !bHasTable) || bFrameHasVerticalColumns))) @@ -1501,8 +1501,8 @@ void SwView::StateTabWin(SfxItemSet& rSet) BOOL bFrameRTL; BOOL bFrameHasVerticalColumns = rSh.IsFrmVertical(FALSE, bFrameRTL) && bFrmSelection; - if((SID_RULER_ROWS == nWhich) && - ((!bVerticalWriting && !bFrmSelection) || (bFrmSelection && !bFrameHasVerticalColumns)) || + if( ( (SID_RULER_ROWS == nWhich) && + ((!bVerticalWriting && !bFrmSelection) || (bFrmSelection && !bFrameHasVerticalColumns)) ) || ((SID_RULER_ROWS_VERTICAL == nWhich) && ((bVerticalWriting && !bFrmSelection) || bFrameHasVerticalColumns))) rSet.DisableItem(nWhich); diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 0b0bca564f48..b8e1c52a7f96 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -2070,7 +2070,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier) SvLBoxEntry* pFirstEntry = FirstSelected(); if (pFirstEntry && lcl_IsContent(pFirstEntry)) { - if(bIsRoot && nRootType == CONTENT_TYPE_OUTLINE || + if((bIsRoot && nRootType == CONTENT_TYPE_OUTLINE) || ((SwContent*)pFirstEntry->GetUserData())->GetParent()->GetType() == CONTENT_TYPE_OUTLINE) { @@ -2088,8 +2088,8 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier) if( nMove ) { short nDir = nCmd == FN_ITEM_UP ? -1 : 1; - if( !bModifier && (nDir == -1 && nActPos > 0 || - nDir == 1 && nActPos < GetEntryCount() - 2 ) ) + if( !bModifier && ((nDir == -1 && nActPos > 0) || + (nDir == 1 && nActPos < GetEntryCount() - 2 )) ) { pShell->MoveOutlinePara( nDir ); //Cursor wieder an die aktuelle Position setzen @@ -2761,8 +2761,8 @@ sal_Bool SwContentTree::Select( SvLBoxEntry* pEntry, sal_Bool bSelect ) sal_Bool bEnable = sal_False; SvLBoxEntry* pParentEntry = GetParent(pEntry); if(!bIsLastReadOnly && (!IsVisible() || - (bIsRoot && nRootType == CONTENT_TYPE_OUTLINE && pParentEntry || - lcl_IsContent(pEntry) && ((SwContentType*)pParentEntry->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE))) + ((bIsRoot && nRootType == CONTENT_TYPE_OUTLINE && pParentEntry) || + (lcl_IsContent(pEntry) && ((SwContentType*)pParentEntry->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE)))) bEnable = sal_True; SwNavigationPI* pNavi = GetParentWindow(); pNavi->aContentToolBox.EnableItem(FN_ITEM_UP , bEnable); -- cgit From 826161a9ee79df8e57dac2257c242dabbee7c7cc Mon Sep 17 00:00:00 2001 From: os Date: Thu, 4 Nov 2010 13:28:24 +0100 Subject: #i104053# patch: use of page styles in dialogs fixed --- sw/source/ui/chrdlg/break.cxx | 2 +- sw/source/ui/misc/docfnote.cxx | 2 +- sw/source/ui/table/tabledlg.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index cc1f208950dc..63d878006f7e 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -200,7 +200,7 @@ SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) : } String aFmtName; - for(i = RES_POOLPAGE_BEGIN; i <= RES_POOLPAGE_REGISTER; ++i) + for(i = RES_POOLPAGE_BEGIN; i < RES_POOLPAGE_END; ++i) if(LISTBOX_ENTRY_NOTFOUND == aPageCollBox.GetEntryPos( aFmtName = SwStyleNameMapper::GetUIName( i, aFmtName ))) ::InsertStringSorted(aFmtName, aPageCollBox, 1 ); diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 06a2e1ae69f4..67fc32bcf1c9 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -265,7 +265,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& ) } // Seite - for( i = RES_POOLPAGE_BEGIN; i <= RES_POOLPAGE_LANDSCAPE; ++i ) + for( i = RES_POOLPAGE_BEGIN; i < RES_POOLPAGE_END; ++i ) aPageTemplBox.InsertEntry(SwStyleNameMapper::GetUIName( i, aEmptyStr )); USHORT nCount = pSh->GetPageDescCnt(); diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index d8e1eed0f3fc..5b26b99d012f 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1643,7 +1643,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) } String aFmtName; - for(i = RES_POOLPAGE_BEGIN; i <= RES_POOLPAGE_REGISTER; ++i) + for(i = RES_POOLPAGE_BEGIN; i < RES_POOLPAGE_END; ++i) if( LISTBOX_ENTRY_NOTFOUND == aPageCollLB.GetEntryPos( aFmtName = SwStyleNameMapper::GetUIName( i, aFmtName ) )) aPageCollLB.InsertEntry( aFmtName ); -- cgit From f48b320fc2c3d60f9c11acb9f06d867cfd431f31 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 4 Nov 2010 13:54:31 +0100 Subject: gnumake2: fixing the sw d.lst --- sw/prj/d.lst | 65 ------------------------------------------------------------ 1 file changed, 65 deletions(-) diff --git a/sw/prj/d.lst b/sw/prj/d.lst index d9c3e89d62ab..e69de29bb2d1 100644 --- a/sw/prj/d.lst +++ b/sw/prj/d.lst @@ -1,65 +0,0 @@ -<<<<<<< local -======= -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %_DEST%\inc%_EXT%\sw -mkdir: %_DEST%\xml%_EXT%\uiconfig -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\toolbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\xml\*.xml %_DEST%\xml%_EXT%\*.xml -..\%__SRC%\bin\sw?????.dll %_DEST%\bin%_EXT%\sw?????.dll -..\%__SRC%\bin\swd?????.dll %_DEST%\bin%_EXT%\swd?????.dll -..\%__SRC%\bin\swui?????.dll %_DEST%\bin%_EXT%\swui?????.dll -..\%__SRC%\bin\msword?????.dll %_DEST%\bin%_EXT%\msword?????.dll -..\%__SRC%\bin\vbaswobj*.dll %_DEST%\bin%_EXT%\vbaswobj*.dll -..\%__SRC%\bin\sw*.res %_DEST%\bin%_EXT%\sw*.res -..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* -..\%__SRC%\misc\swd.component %_DEST%\xml%_EXT%\swd.component - -..\uiconfig\swriter\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\menubar\*.xml -..\uiconfig\swxform\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\menubar\*.xml -..\uiconfig\sweb\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\menubar\*.xml -..\uiconfig\sglobal\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\menubar\*.xml -..\uiconfig\swform\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\menubar\*.xml -..\uiconfig\swreport\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\menubar\*.xml -..\uiconfig\swriter\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\toolbar\*.xml -..\uiconfig\swxform\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\toolbar\*.xml -..\uiconfig\sweb\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\toolbar\*.xml -..\uiconfig\sglobal\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\toolbar\*.xml -..\uiconfig\swform\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\toolbar\*.xml -..\uiconfig\swreport\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\toolbar\*.xml -..\uiconfig\swriter\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\statusbar\*.xml -..\uiconfig\swxform\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\statusbar\*.xml -..\uiconfig\sweb\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\statusbar\*.xml -..\uiconfig\sglobal\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\statusbar\*.xml -..\uiconfig\swform\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\statusbar\*.xml -..\uiconfig\swreport\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar\*.xml - -..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.* -..\%__SRC%\misc\sw.component %_DEST%\xml%_EXT%\sw.component -..\%__SRC%\misc\vbaswobj.component %_DEST%\xml%_EXT%\vbaswobj.component ->>>>>>> other -- cgit From fde11872616870dc4edbf497c485481e8b6156a2 Mon Sep 17 00:00:00 2001 From: os Date: Thu, 4 Nov 2010 14:00:48 +0100 Subject: non-warning change removed --- sw/inc/fmtcol.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index bcc9d6b45e4d..aba9b8533c0a 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -113,7 +113,7 @@ public: void SetAttrOutlineLevel( int ); int GetAttrOutlineLevel() const; int GetAssignedOutlineStyleLevel() const; - inline const bool IsAssignedToListLevelOfOutlineStyle() const + inline bool IsAssignedToListLevelOfOutlineStyle() const { return mbAssignedToOutlineStyle; } -- cgit From 452e5f66caaee7284e4e5a9fcb1e322ea2f2db9b Mon Sep 17 00:00:00 2001 From: os Date: Thu, 4 Nov 2010 15:45:06 +0100 Subject: #i52088# patch: sorting of index entries with and without primary key --- sw/source/core/doc/doctxm.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 58b3e084cf7a..decf471164f9 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -2380,8 +2380,7 @@ Range SwTOXBaseSection::GetKeyRange(const String& rStr, const String& rStrReadin if( rIntl.IsEqual( sMyString, sMyStringReading, pBase->GetLocale(), sToCompare, sToCompareReading, rNew.GetLocale() ) && - pBase->GetLevel() == nLevel && - pBase->GetType() == TOX_SORT_CUSTOM ) + pBase->GetLevel() == nLevel ) break; } if(i == nMax) -- cgit From fc6443a92f54248125638bc7fc32a3026cf2038f Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Thu, 4 Nov 2010 17:56:39 +0100 Subject: pl08: #163778# use EncryptionData from MediaDescriptor --- sw/source/filter/ww8/wrtww8.cxx | 92 +++++++++++++---------- sw/source/filter/ww8/wrtww8.hxx | 7 +- sw/source/filter/ww8/ww8par.cxx | 161 ++++++++++++++++++++++++++++------------ sw/source/ui/app/docsh.cxx | 18 +---- 4 files changed, 176 insertions(+), 102 deletions(-) mode change 100755 => 100644 sw/source/ui/app/docsh.cxx diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index e22ca1c9b731..ba074e7c3558 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -112,6 +112,8 @@ #include "dbgoutsw.hxx" #include +#include +#include #include #include #include @@ -2995,20 +2997,54 @@ void MSWordExportBase::ExportDocument( bool bWriteAll ) pDoc->SetRedlineMode( (RedlineMode_t)(mnRedlineMode) ); } -String SwWW8Writer::GetPassword() +bool SwWW8Writer::InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec ) { - String sUniPassword; + uno::Sequence< beans::NamedValue > aEncryptionData; + if ( mpMedium ) { - SfxItemSet* pSet = mpMedium->GetItemSet(); + SFX_ITEMSET_ARG( mpMedium->GetItemSet(), pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False ); + if ( pEncryptionDataItem && ( pEncryptionDataItem->GetValue() >>= aEncryptionData ) && !rCodec.InitCodec( aEncryptionData ) ) + { + OSL_ENSURE( false, "Unexpected EncryptionData!" ); + aEncryptionData.realloc( 0 ); + } + + if ( !aEncryptionData.getLength() ) + { + // try to generate the encryption data based on password + SFX_ITEMSET_ARG( mpMedium->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False ); + if ( pPasswordItem && pPasswordItem->GetValue().Len() && pPasswordItem->GetValue().Len() <= 15 ) + { + // Generate random number with a seed of time as salt. + TimeValue aTime; + osl_getSystemTime( &aTime ); + rtlRandomPool aRandomPool = rtl_random_createPool (); + rtl_random_addBytes ( aRandomPool, &aTime, 8 ); - const SfxPoolItem* pPasswordItem = NULL; - if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_PASSWORD, sal_True, &pPasswordItem ) ) - if( pPasswordItem != NULL ) - sUniPassword = ( (const SfxStringItem*)pPasswordItem )->GetValue(); + sal_uInt8 pDocId[ 16 ]; + rtl_random_getBytes( aRandomPool, pDocId, 16 ); + + rtl_random_destroyPool( aRandomPool ); + + sal_Unicode aPassword[16]; + memset( aPassword, 0, sizeof( aPassword ) ); + for ( xub_StrLen nChar = 0; nChar < pPasswordItem->GetValue().Len(); ++nChar ) + aPassword[nChar] = pPasswordItem->GetValue().GetChar(nChar); + + rCodec.InitKey( aPassword, pDocId ); + aEncryptionData = rCodec.GetEncryptionData(); + + mpMedium->GetItemSet()->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData ) ) ); + } + } + + if ( aEncryptionData.getLength() ) + mpMedium->GetItemSet()->ClearItem( SID_PASSWORD ); } - return sUniPassword; + // nonempty encryption data means hier that the codec was successfuly initialized + return ( aEncryptionData.getLength() != 0 ); } void WW8Export::ExportDocument_Impl() @@ -3042,8 +3078,6 @@ void WW8Export::ExportDocument_Impl() Strm().SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); - String sUniPassword( GetWriter().GetPassword() ); - utl::TempFile aTempMain; aTempMain.EnableKillingFile(); utl::TempFile aTempTable; @@ -3051,13 +3085,10 @@ void WW8Export::ExportDocument_Impl() utl::TempFile aTempData; aTempData.EnableKillingFile(); - bool bEncrypt = false; - - xub_StrLen nLen = sUniPassword.Len(); - if ( nLen > 0 && nLen <= 15) // Password has been set + msfilter::MSCodec_Std97 aCtx; + bool bEncrypt = m_pWriter ? m_pWriter->InitStd97CodecUpdateMedium( aCtx ) : false; + if ( bEncrypt ) { - bEncrypt =true; - GetWriter().SetStream( aTempMain.GetStream( STREAM_READWRITE | STREAM_SHARE_DENYWRITE ) ); @@ -3121,24 +3152,6 @@ void WW8Export::ExportDocument_Impl() if ( bEncrypt ) { - // Generate random number with a seed of time as salt. - TimeValue aTime; - osl_getSystemTime( &aTime ); - rtlRandomPool aRandomPool = rtl_random_createPool (); - rtl_random_addBytes ( aRandomPool, &aTime, 8 ); - - sal_uInt8 aDocId[ 16 ] = {0}; - rtl_random_getBytes( aRandomPool, aDocId, 16 ); - - rtl_random_destroyPool( aRandomPool ); - - sal_Unicode aPassword[16] = {0}; - for (xub_StrLen nChar = 0; nChar < nLen; ++nChar ) - aPassword[nChar] = sUniPassword.GetChar(nChar); - - msfilter::MSCodec_Std97 aCtx; - aCtx.InitKey(aPassword, aDocId); - SvStream *pStrmTemp, *pTableStrmTemp, *pDataStrmTemp; pStrmTemp = &xWwStrm; pTableStrmTemp = &xTableStrm; @@ -3155,11 +3168,14 @@ void WW8Export::ExportDocument_Impl() sal_uInt32 nEncType = 0x10001; *pTableStrmTemp << nEncType; - sal_uInt8 pSaltData[16] = {0}; - sal_uInt8 pSaltDigest[16] = {0}; - aCtx.GetEncryptKey( aDocId, pSaltData, pSaltDigest ); + sal_uInt8 pDocId[16]; + aCtx.GetDocId( pDocId ); + + sal_uInt8 pSaltData[16]; + sal_uInt8 pSaltDigest[16]; + aCtx.GetEncryptKey( pDocId, pSaltData, pSaltDigest ); - pTableStrmTemp->Write( aDocId, 16 ); + pTableStrmTemp->Write( pDocId, 16 ); pTableStrmTemp->Write( pSaltData, 16 ); pTableStrmTemp->Write( pSaltDigest, 16 ); diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 3c2f0d4d6d13..ed90edfae619 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -52,6 +52,11 @@ #include // einige Forward Deklarationen +namespace msfilter +{ + class MSCodec_Std97; +} + class SwAttrIter; class AttributeOutputBase; class DocxAttributeOutput; @@ -855,7 +860,7 @@ public: static void WriteString_xstz(SvStream& rStrm, const String& rStr, bool bAddZero); - String GetPassword(); + bool InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec ); using StgWriter::Write; virtual ULONG Write( SwPaM&, SfxMedium&, const String* = 0 ); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 24f36b047a4e..48ea093ad552 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -29,16 +29,20 @@ #include "precompiled_sw.hxx" /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ -#include #include #include + +#include #include #include #include +#include #include #include #include +#include +#include #include #include #include @@ -107,6 +111,7 @@ #include #include +#include #include #include @@ -4344,6 +4349,90 @@ namespace return aPassw; } + uno::Sequence< beans::NamedValue > InitXorWord95Codec( ::msfilter::MSCodec_XorWord95& rCodec, SfxMedium& rMedium, WW8Fib* pWwFib ) + { + uno::Sequence< beans::NamedValue > aEncryptionData; + SFX_ITEMSET_ARG( rMedium.GetItemSet(), pEncryptionData, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False ); + if ( pEncryptionData && ( pEncryptionData->GetValue() >>= aEncryptionData ) && !rCodec.InitCodec( aEncryptionData ) ) + aEncryptionData.realloc( 0 ); + + if ( !aEncryptionData.getLength() ) + { + String sUniPassword = QueryPasswordForMedium( rMedium ); + + ByteString sPassword(sUniPassword, WW8Fib::GetFIBCharset( pWwFib->chseTables ) ); + + xub_StrLen nLen = sPassword.Len(); + if( nLen <= 15 ) + { + sal_uInt8 pPassword[16]; + memset( pPassword, 0, sizeof( pPassword ) ); + + for (xub_StrLen nChar = 0; nChar < sPassword.Len(); ++nChar ) + pPassword[nChar] = sPassword.GetChar(nChar); + + rCodec.InitKey( pPassword ); + aEncryptionData = rCodec.GetEncryptionData(); + + // the export supports RC4 algorithm only, so we have to generate the related EncryptionData as well, + // so that Save can export the document without asking for a password; + // as result there will be EncryptionData for both algorithms in the MediaDescriptor + ::msfilter::MSCodec_Std97 aCodec97; + + // Generate random number with a seed of time as salt. + TimeValue aTime; + osl_getSystemTime( &aTime ); + rtlRandomPool aRandomPool = rtl_random_createPool(); + rtl_random_addBytes ( aRandomPool, &aTime, 8 ); + + sal_uInt8 pDocId[ 16 ]; + rtl_random_getBytes( aRandomPool, pDocId, 16 ); + + rtl_random_destroyPool( aRandomPool ); + + sal_uInt16 pStd97Pass[16]; + memset( pStd97Pass, 0, sizeof( pStd97Pass ) ); + for (xub_StrLen nChar = 0; nChar < nLen; ++nChar ) + pStd97Pass[nChar] = sUniPassword.GetChar(nChar); + + aCodec97.InitKey( pStd97Pass, pDocId ); + + // merge the EncryptionData, there should be no conflicts + ::comphelper::SequenceAsHashMap aEncryptionHash( aEncryptionData ); + aEncryptionHash.update( ::comphelper::SequenceAsHashMap( aCodec97.GetEncryptionData() ) ); + aEncryptionHash >> aEncryptionData; + } + } + + return aEncryptionData; + } + + uno::Sequence< beans::NamedValue > InitStd97Codec( ::msfilter::MSCodec_Std97& rCodec, sal_uInt8 pDocId[16], SfxMedium& rMedium ) + { + uno::Sequence< beans::NamedValue > aEncryptionData; + SFX_ITEMSET_ARG( rMedium.GetItemSet(), pEncryptionData, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False ); + if ( pEncryptionData && ( pEncryptionData->GetValue() >>= aEncryptionData ) && !rCodec.InitCodec( aEncryptionData ) ) + aEncryptionData.realloc( 0 ); + + if ( !aEncryptionData.getLength() ) + { + String sUniPassword = QueryPasswordForMedium( rMedium ); + + xub_StrLen nLen = sUniPassword.Len(); + if ( nLen <= 15 ) + { + sal_Unicode pPassword[16]; + memset( pPassword, 0, sizeof( pPassword ) ); + for (xub_StrLen nChar = 0; nChar < nLen; ++nChar ) + pPassword[nChar] = sUniPassword.GetChar(nChar); + + rCodec.InitKey( pPassword, pDocId ); + aEncryptionData = rCodec.GetEncryptionData(); + } + } + + return aEncryptionData; + } } ULONG SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGloss) @@ -4397,31 +4486,22 @@ ULONG SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGloss) if (bDecrypt) { nErrRet = ERRCODE_SVX_WRONGPASS; - switch (eAlgo) + SfxMedium* pMedium = mpDocShell->GetMedium(); + + if ( pMedium ) { - default: - nErrRet = ERRCODE_SVX_READ_FILTER_CRYPT; - break; - case XOR: + switch (eAlgo) { - String sUniPassword = - QueryPasswordForMedium(*(mpDocShell->GetMedium())); - - ByteString sPassword(sUniPassword, - WW8Fib::GetFIBCharset(pWwFib->chseTables)); - - xub_StrLen nLen = sPassword.Len(); - // DR: do not cut a wrong (too long) password - if( nLen <= 15 ) + default: + nErrRet = ERRCODE_SVX_READ_FILTER_CRYPT; + break; + case XOR: { - sal_uInt8 aPassword[16] = {0}; - - for (xub_StrLen nChar = 0; nChar < sPassword.Len(); ++nChar ) - aPassword[nChar] = sPassword.GetChar(nChar); - msfilter::MSCodec_XorWord95 aCtx; - aCtx.InitKey(aPassword); - if (aCtx.VerifyKey(pWwFib->nKey, pWwFib->nHash)) + uno::Sequence< beans::NamedValue > aEncryptionData = InitXorWord95Codec( aCtx, *pMedium, pWwFib ); + + // if initialization has failed the EncryptionData should be empty + if ( aEncryptionData.getLength() && aCtx.VerifyKey( pWwFib->nKey, pWwFib->nHash ) ) { nErrRet = 0; pTempMain = MakeTemp(aDecryptMain); @@ -4453,22 +4533,15 @@ ULONG SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGloss) DecryptXOR(aCtx, *pDataStream, aDecryptData); pDataStream = &aDecryptData; } + + pMedium->GetItemSet()->ClearItem( SID_PASSWORD ); + pMedium->GetItemSet()->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData ) ) ); } } - } - break; - case RC4: - { - String sUniPassword = - QueryPasswordForMedium(*(mpDocShell->GetMedium())); - - xub_StrLen nLen = sUniPassword.Len(); - // DR: do not cut a wrong (too long) password - if (nLen <= 15) + break; + case RC4: { - sal_Unicode aPassword[16] = {0}; - for (xub_StrLen nChar = 0; nChar < nLen; ++nChar ) - aPassword[nChar] = sUniPassword.GetChar(nChar); + msfilter::MSCodec_Std97 aCtx; sal_uInt8 aDocId[ 16 ]; pTableStream->Read(aDocId, 16); @@ -4477,9 +4550,9 @@ ULONG SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGloss) sal_uInt8 aSaltHash[ 16 ]; pTableStream->Read(aSaltHash, 16); - msfilter::MSCodec_Std97 aCtx; - aCtx.InitKey(aPassword, aDocId); - if (aCtx.VerifyKey(aSaltData, aSaltHash)) + // if initialization has failed the EncryptionData should be empty + uno::Sequence< beans::NamedValue > aEncryptionData = InitStd97Codec( aCtx, aDocId, *pMedium ); + if ( aEncryptionData.getLength() && aCtx.VerifyKey( aSaltData, aSaltHash ) ) { nErrRet = 0; @@ -4498,17 +4571,13 @@ ULONG SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGloss) DecryptRC4(aCtx, *pDataStream, aDecryptData); pDataStream = &aDecryptData; } - SfxMedium* pMedium = mpDocShell->GetMedium(); - if ( pMedium ) - { - SfxItemSet* pSet = pMedium->GetItemSet(); - if ( pSet ) - pSet->Put( SfxStringItem(SID_PASSWORD, sUniPassword) ); - } + + pMedium->GetItemSet()->ClearItem( SID_PASSWORD ); + pMedium->GetItemSet()->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData ) ) ); } } + break; } - break; } if (nErrRet == 0) diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx old mode 100755 new mode 100644 index c7ee43255f3b..866829e03632 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -209,23 +209,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, return 0; } } - if(rMedium.IsStorage()) - { - //SvStorageRef aStor( rMedium.GetStorage() ); - const SfxItemSet* pSet = rMedium.GetItemSet(); - const SfxPoolItem *pItem; - if(pSet && SFX_ITEM_SET == pSet->GetItemState(SID_PASSWORD, TRUE, &pItem)) - { - DBG_ASSERT(pItem->IsA( TYPE(SfxStringItem) ), "Fehler Parametertype"); - comphelper::OStorageHelper::SetCommonStoragePassword( rMedium.GetStorage(), ((const SfxStringItem *)pItem)->GetValue() ); - } - // Fuer's Dokument-Einfuegen noch die FF-Version, wenn's der - // eigene Filter ist. - ASSERT( /*pRead != ReadSw3 || */pRead != ReadXML || pFlt->GetVersion(), - "Am Filter ist keine FF-Version gesetzt" ); - //if( (pRead == ReadSw3 || pRead == ReadXML) && pFlt->GetVersion() ) - // aStor->SetVersion( (long)pFlt->GetVersion() ); - } + // #i30171# set the UpdateDocMode at the SwDocShell SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False); nUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() : document::UpdateDocMode::NO_UPDATE; -- cgit From e3c793047f798f8b6acc55e5f550003ededc9544 Mon Sep 17 00:00:00 2001 From: os Date: Fri, 5 Nov 2010 08:55:21 +0100 Subject: #i97951# type change USHORT->sal_uInt32 to prevent overflow in column width calculation --- sw/source/filter/html/htmltabw.cxx | 12 ++++++----- sw/source/filter/inc/wrtswtbl.hxx | 36 ++++++++++++++++---------------- sw/source/filter/writer/wrtswtbl.cxx | 40 ++++++++++++++++++------------------ sw/source/filter/xml/xmltble.cxx | 34 +++++++++++++++--------------- 4 files changed, 62 insertions(+), 60 deletions(-) diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 43b83557a149..91b026ca6770 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -98,7 +98,7 @@ class SwHTMLWrtTable : public SwWriteTable sal_Bool bTop, sal_Bool bBottom, sal_Bool bLeft, sal_Bool bRight ); public: - SwHTMLWrtTable( const SwTableLines& rLines, long nWidth, sal_uInt16 nBWidth, + SwHTMLWrtTable( const SwTableLines& rLines, long nWidth, sal_uInt32 nBWidth, sal_Bool bRel, USHORT nNumOfRowsToRepeat, sal_uInt16 nLeftSub=0, sal_uInt16 nRightSub=0 ); SwHTMLWrtTable( const SwHTMLTableLayout *pLayoutInfo ); @@ -111,7 +111,7 @@ public: SwHTMLWrtTable::SwHTMLWrtTable( const SwTableLines& rLines, long nWidth, - sal_uInt16 nBWidth, sal_Bool bRel, USHORT nNumOfRowsToRepeat, + sal_uInt32 nBWidth, sal_Bool bRel, USHORT nNumOfRowsToRepeat, sal_uInt16 nLSub, sal_uInt16 nRSub ) : SwWriteTable( rLines, nWidth, nBWidth, bRel, MAX_DEPTH, nLSub, nRSub, nNumOfRowsToRepeat ) { @@ -337,7 +337,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, #ifndef PURE_HTML long nWidth = 0; - sal_uInt16 nPrcWidth = USHRT_MAX; + sal_uInt32 nPrcWidth = ULONG_MAX; if( bOutWidth ) { if( bLayoutExport ) @@ -471,7 +471,9 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, } else { - sal_uInt16 nTWidth, nBWidth, nLSub, nRSub; + sal_uInt16 nTWidth; + sal_uInt32 nBWidth; + sal_uInt16 nLSub, nRSub; if( HasRelWidths() ) { nTWidth = 100; @@ -845,7 +847,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, ByteString sOutStr( '<' ); sOutStr += OOO_STRING_SVTOOLS_HTML_col; - sal_uInt16 nWidth; + sal_uInt32 nWidth; sal_Bool bRel; if( bLayoutExport ) { diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx index 5bbf776351a1..c47ac7809bd0 100644 --- a/sw/source/filter/inc/wrtswtbl.hxx +++ b/sw/source/filter/inc/wrtswtbl.hxx @@ -61,7 +61,7 @@ class SwWriteTableCell long nHeight; // fixe/Mindest-Hoehe der Zeile - USHORT nWidthOpt; // Breite aus Option; + sal_uInt32 nWidthOpt; // Breite aus Option; USHORT nRow; // Start-Zeile USHORT nCol; // Start-Spalte @@ -99,7 +99,7 @@ public: nWidthOpt = nWidth; bPrcWidthOpt = bPrc; } - USHORT GetWidthOpt() const { return nWidthOpt; } + sal_uInt32 GetWidthOpt() const { return nWidthOpt; } BOOL HasPrcWidthOpt() const { return bPrcWidthOpt; } }; @@ -180,9 +180,9 @@ SV_DECL_PTRARR_SORT_DEL( SwWriteTableRows, SwWriteTableRowPtr, 5, 5 ) class SwWriteTableCol { - USHORT nPos; // End Position der Spalte + sal_uInt32 nPos; // End Position der Spalte - USHORT nWidthOpt; + sal_uInt32 nWidthOpt; BOOL bRelWidthOpt : 1; BOOL bOutWidth : 1; // Spaltenbreite ausgeben? @@ -191,9 +191,9 @@ public: BOOL bLeftBorder : 1; // Welche Umrandungen sind da? BOOL bRightBorder : 1; - SwWriteTableCol( USHORT nPosition ); + SwWriteTableCol( sal_uInt32 nPosition ); - USHORT GetPos() const { return nPos; } + sal_uInt32 GetPos() const { return nPos; } void SetLeftBorder( BOOL bBorder ) { bLeftBorder = bBorder; } BOOL HasLeftBorder() const { return bLeftBorder; } @@ -207,11 +207,11 @@ public: inline int operator==( const SwWriteTableCol& rCol ) const; inline int operator<( const SwWriteTableCol& rCol ) const; - void SetWidthOpt( USHORT nWidth, BOOL bRel ) + void SetWidthOpt( sal_uInt32 nWidth, BOOL bRel ) { nWidthOpt = nWidth; bRelWidthOpt = bRel; } - USHORT GetWidthOpt() const { return nWidthOpt; } + sal_uInt32 GetWidthOpt() const { return nWidthOpt; } BOOL HasRelWidthOpt() const { return bRelWidthOpt; } }; @@ -248,14 +248,14 @@ protected: USHORT nBorder; // Dicke der ausseren Umrandung USHORT nInnerBorder; // Dicke der inneren Umrandung - USHORT nBaseWidth; // Bezugsgroesse fur Breiten SwFmtFrmSize + sal_uInt32 nBaseWidth; // Bezugsgroesse fur Breiten SwFmtFrmSize USHORT nHeadEndRow; // letzte Zeile des Tabellen-Kopfes USHORT nLeftSub; USHORT nRightSub; - long nTabWidth; // Absolute/Relative Breite der Tabelle + sal_uInt32 nTabWidth; // Absolute/Relative Breite der Tabelle BOOL bRelWidths : 1; // Breiten relativ ausgeben? BOOL bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen? @@ -271,16 +271,16 @@ protected: virtual BOOL ShouldExpandSub( const SwTableBox *pBox, BOOL bExpandedBefore, USHORT nDepth ) const; - void CollectTableRowsCols( long nStartRPos, USHORT nStartCPos, + void CollectTableRowsCols( long nStartRPos, sal_uInt32 nStartCPos, long nParentLineHeight, - USHORT nParentLineWidth, + sal_uInt32 nParentLineWidth, const SwTableLines& rLines, USHORT nDepth ); void FillTableRowsCols( long nStartRPos, USHORT nStartRow, - USHORT nStartCPos, USHORT nStartCol, + sal_uInt32 nStartCPos, USHORT nStartCol, long nParentLineHeight, - USHORT nParentLineWidth, + sal_uInt32 nParentLineWidth, const SwTableLines& rLines, const SvxBrushItem* pLineBrush, USHORT nDepth, @@ -292,14 +292,14 @@ protected: USHORT nRowSpan, USHORT nColSpan, USHORT &rTopBorder, USHORT &rBottomBorder ); - USHORT GetBaseWidth() const { return nBaseWidth; } + sal_uInt32 GetBaseWidth() const { return nBaseWidth; } BOOL HasRelWidths() const { return bRelWidths; } public: - static long GetBoxWidth( const SwTableBox *pBox ); + static sal_uInt32 GetBoxWidth( const SwTableBox *pBox ); - USHORT GetRawWidth( USHORT nCol, USHORT nColSpan ) const; + sal_uInt32 GetRawWidth( USHORT nCol, USHORT nColSpan ) const; USHORT GetAbsWidth( USHORT nCol, USHORT nColSpan ) const; USHORT GetRelWidth( USHORT nCol, USHORT nColSpan ) const; USHORT GetPrcWidth( USHORT nCol, USHORT nColSpan ) const; @@ -317,7 +317,7 @@ protected: public: - SwWriteTable( const SwTableLines& rLines, long nWidth, USHORT nBWidth, + SwWriteTable( const SwTableLines& rLines, long nWidth, sal_uInt32 nBWidth, BOOL bRel, USHORT nMaxDepth = USHRT_MAX, USHORT nLeftSub=0, USHORT nRightSub=0, sal_uInt32 nNumOfRowsToRepeat=0 ); SwWriteTable( const SwHTMLTableLayout *pLayoutInfo ); diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index 9c889fd2519b..9fd6bd3804b5 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -92,7 +92,7 @@ SwWriteTableCell *SwWriteTableRow::AddCell( const SwTableBox *pBox, //----------------------------------------------------------------------- -SwWriteTableCol::SwWriteTableCol(USHORT nPosition) +SwWriteTableCol::SwWriteTableCol(sal_uInt32 nPosition) : nPos(nPosition), nWidthOpt(0), bRelWidthOpt(false), bOutWidth(true), bLeftBorder(true), bRightBorder(true) { @@ -100,13 +100,13 @@ SwWriteTableCol::SwWriteTableCol(USHORT nPosition) //----------------------------------------------------------------------- -long SwWriteTable::GetBoxWidth( const SwTableBox *pBox ) +sal_uInt32 SwWriteTable::GetBoxWidth( const SwTableBox *pBox ) { const SwFrmFmt *pFmt = pBox->GetFrmFmt(); const SwFmtFrmSize& aFrmSize= (const SwFmtFrmSize&)pFmt->GetFmtAttr( RES_FRM_SIZE ); - return aFrmSize.GetSize().Width(); + return sal::static_int_cast(aFrmSize.GetSize().Width()); } long SwWriteTable::GetLineHeight( const SwTableLine *pLine ) @@ -306,9 +306,9 @@ USHORT SwWriteTable::MergeBoxBorders( const SwTableBox *pBox, } -USHORT SwWriteTable::GetRawWidth( USHORT nCol, USHORT nColSpan ) const +sal_uInt32 SwWriteTable::GetRawWidth( USHORT nCol, USHORT nColSpan ) const { - USHORT nWidth = aCols[nCol+nColSpan-1]->GetPos(); + sal_uInt32 nWidth = aCols[nCol+nColSpan-1]->GetPos(); if( nCol > 0 ) nWidth = nWidth - aCols[nCol-1]->GetPos(); @@ -352,7 +352,7 @@ USHORT SwWriteTable::GetRightSpace( USHORT nCol, USHORT nColSpan ) const USHORT SwWriteTable::GetAbsWidth( USHORT nCol, USHORT nColSpan ) const { - long nWidth = GetRawWidth( nCol, nColSpan ); + sal_uInt32 nWidth = GetRawWidth( nCol, nColSpan ); if( nBaseWidth != nTabWidth ) { nWidth *= nTabWidth; @@ -419,9 +419,9 @@ BOOL SwWriteTable::ShouldExpandSub(const SwTableBox *pBox, BOOL /*bExpandedBefor } void SwWriteTable::CollectTableRowsCols( long nStartRPos, - USHORT nStartCPos, + sal_uInt32 nStartCPos, long nParentLineHeight, - USHORT nParentLineWidth, + sal_uInt32 nParentLineWidth, const SwTableLines& rLines, USHORT nDepth ) { @@ -429,7 +429,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos, USHORT nLines = rLines.Count(); #ifdef DBG_UTIL - USHORT nEndCPos = 0; + sal_uInt32 nEndCPos = 0; #endif long nRPos = nStartRPos; @@ -484,16 +484,16 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos, const SwTableBoxes& rBoxes = pLine->GetTabBoxes(); USHORT nBoxes = rBoxes.Count(); - USHORT nCPos = nStartCPos; + sal_uInt32 nCPos = nStartCPos; for( USHORT nBox=0; nBoxGetTabBoxes(); sal_uInt16 nBoxes = rBoxes.Count(); - sal_uInt16 nCPos = 0U; + sal_uInt32 nCPos = 0U; for( sal_uInt16 nBox=0U; nBoxGetColumns(); - sal_uInt16 nCPos = 0U; + sal_uInt32 nCPos = 0U; sal_uInt16 nColumns = rCols.Count(); for( sal_uInt16 nColumn=0U; nColumnGetPos(); sal_uInt32 nWidth = nCPos - nOldCPos; @@ -634,7 +634,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines, nColAbsWidth += (nBaseWidth/2UL); nColAbsWidth /= nBaseWidth; } - pColumn->SetWidthOpt( (sal_uInt16)nColAbsWidth, sal_False ); + pColumn->SetWidthOpt( nColAbsWidth, sal_False ); } ULONG nExpPos = 0; @@ -678,16 +678,16 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines, const SwTableBoxes& rBoxes = pLine->GetTabBoxes(); sal_uInt16 nBoxes = rBoxes.Count(); - sal_uInt16 nCPos = 0U; + sal_uInt32 nCPos = 0U; sal_uInt16 nCol = 0U; for( sal_uInt16 nBox=0U; nBoxGetWidth(); + nCPos = pLines->GetWidth(); // Und ihren Index @@ -959,7 +959,7 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine, const SwTableBoxes& rBoxes = rLine.GetTabBoxes(); sal_uInt16 nBoxes = rBoxes.Count(); - sal_uInt16 nCPos = 0U; + sal_uInt32 nCPos = 0U; sal_uInt16 nCol = 0U; for( sal_uInt16 nBox=0U; nBox Date: Fri, 5 Nov 2010 11:26:52 +0100 Subject: #i112413# for statement fixed --- sw/source/ui/envelp/mailmrge.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 141adf35ddf0..43ef58b11d7c 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -779,7 +779,7 @@ bool SwMailMergeDlg::ExecQryShell() m_aSelection.realloc(nEnd - nStart + 1); Any* pSelection = m_aSelection.getArray(); - for (sal_Int32 i = nStart; i != nEnd; ++i, ++pSelection) + for (sal_Int32 i = nStart; i <= nEnd; ++i, ++pSelection) *pSelection <<= i; } else if (aAllRB.IsChecked() ) -- cgit From b22b6f7a7abf9b88e91c6fc1438d7ea27c16970f Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 6 Nov 2010 15:58:44 +0100 Subject: gnumake2: added component registration --- sw/Library_sw.mk | 2 ++ sw/Library_swd.mk | 2 ++ sw/Library_vbaswobj.mk | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index b654d3a5c6ab..1e5c1d6f8642 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -31,6 +31,8 @@ $(eval $(call gb_Library_add_sdi_headers,sw,sw/sdi/swslots)) $(eval $(call gb_Library_add_precompiled_header,sw,$(SRCDIR)/sw/inc/pch/precompiled_sw)) +$(eval $(call gb_Library_set_componentfile,sw,sw/util/sw)) + $(eval $(call gb_Library_set_include,sw,\ -I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/source/filter/inc \ diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 1d185e8f4267..0917c1bdf903 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,swd)) +$(eval $(call gb_Library_set_componentfile,swd,sw/util/swd)) + $(eval $(call gb_Library_set_include,swd,\ $$(INCLUDE) \ -I$(WORKDIR)/inc/sw/sdi \ diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index b5f4576f1d9e..669934d80471 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,vbaswobj)) +$(eval $(call gb_Library_set_componentfile,vbaswobj,sw/util/vbaswobj)) + $(eval $(call gb_Library_set_include,vbaswobj,\ -I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/source/filter/inc \ -- cgit From af20ce4d3a9c404be88534ef4c99344f8df9dc44 Mon Sep 17 00:00:00 2001 From: os Date: Mon, 8 Nov 2010 13:07:04 +0100 Subject: #i112630# detect pdf filter by mimetype instead of calling GetFiltet4Extension() --- sw/source/ui/dbui/mmoutputpage.cxx | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 0fe1a3717ca1..ee2803e73aad 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -1106,8 +1106,6 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) if(nRet != RET_OK && nRet != RET_YES) return 0; } - //create the send dialog - SwSendMailDialog* pDlg = new SwSendMailDialog( pButton, rConfigItem ); //add the documents sal_uInt32 nBegin = 0; sal_uInt32 nEnd = 0; @@ -1133,7 +1131,26 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) switch( nDocType ) { case MM_DOCTYPE_OOO : break; - case MM_DOCTYPE_PDF : bIsPDF = true; break; + case MM_DOCTYPE_PDF : bIsPDF = true; + { + //the method SwIOSystemGetFilterOfFormat( ) returns the template filter + //because it uses the same user data :-( + SfxFilterMatcher aMatcher( pFilterContainer->GetName() ); + SfxFilterMatcherIter aIter( &aMatcher ); + const SfxFilter* pFilter = aIter.First(); + String sFilterMime( String::CreateFromAscii( "application/pdf" )); + while ( pFilter ) + { + if( pFilter->GetMimeType() == sFilterMime && pFilter->CanExport() ) + { + pSfxFlt = pFilter; + break; + } + pFilter = aIter.Next(); + } + + } + break; case MM_DOCTYPE_WORD: { //the method SwIOSystemGetFilterOfFormat( ) returns the template filter @@ -1239,6 +1256,8 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) uno::Reference< frame::XStorable > xStore( pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY); xStore->storeToURL( sTargetTempURL, aValues ); + //create the send dialog + SwSendMailDialog* pDlg = new SwSendMailDialog( pButton, rConfigItem ); pDlg->SetDocumentCount( nEnd ); pDlg->ShowDialog(); //help to force painting the dialog -- cgit From 8897e7be544c63d1737e3306a832bb0460308ea5 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 10 Nov 2010 15:26:03 +0100 Subject: gnumake2: first try at local build dirs --- sw/Makefile | 1 + sw/prj/makefile.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sw/Makefile b/sw/Makefile index c19100ee9a5b..45de5eecabc0 100644 --- a/sw/Makefile +++ b/sw/Makefile @@ -29,6 +29,7 @@ ifeq ($(strip $(SOLARENV)),) $(error No environment set!) endif +gb_PARTITIALBUILD := T include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk diff --git a/sw/prj/makefile.mk b/sw/prj/makefile.mk index 3b1b54d4357f..3d495209d74a 100644 --- a/sw/prj/makefile.mk +++ b/sw/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install -- cgit From 175209c24466472503df72f64380d5cda35d8e3f Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 11 Nov 2010 15:46:29 +0100 Subject: gnumake2: fix naming for partial build vars --- sw/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/Makefile b/sw/Makefile index b7391a8db240..5002d3f122a1 100644 --- a/sw/Makefile +++ b/sw/Makefile @@ -29,7 +29,7 @@ ifeq ($(strip $(SOLARENV)),) $(error No environment set!) endif -gb_PARTITIALBUILD := T +gb_PARTIALBUILD := T GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -- cgit From 7dc99ab5eb641809a6babd847a31434504e0ceac Mon Sep 17 00:00:00 2001 From: os Date: Wed, 17 Nov 2010 07:36:16 +0100 Subject: #i115608# #i115583# msword library component registration added --- sw/prj/d.lst | 1 + sw/source/filter/ww8/rtfexportfilter.cxx | 39 -------------------------------- sw/util/msword.component | 37 ++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 39 deletions(-) create mode 100644 sw/util/msword.component diff --git a/sw/prj/d.lst b/sw/prj/d.lst index 0cb261c5f0f1..38c4f5046fc8 100644 --- a/sw/prj/d.lst +++ b/sw/prj/d.lst @@ -37,6 +37,7 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar ..\%__SRC%\bin\sw*.res %_DEST%\bin%_EXT%\sw*.res ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* ..\%__SRC%\misc\swd.component %_DEST%\xml%_EXT%\swd.component +..\%__SRC%\misc\msword.component %_DEST%\xml%_EXT%\msword.component ..\uiconfig\swriter\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\menubar\*.xml ..\uiconfig\swxform\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\menubar\*.xml diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx index 53608bf73661..31b298a06017 100644 --- a/sw/source/filter/ww8/rtfexportfilter.cxx +++ b/sw/source/filter/ww8/rtfexportfilter.cxx @@ -143,45 +143,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey ) -{ - sal_Bool bRet = sal_False; - - if( pRegistryKey ) - { - try - { - uno::Reference< registry::XRegistryKey > xNewKey1( - static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( - OUString::createFromAscii( IMPL_NAME_RTFEXPORT "/UNO/SERVICES/" ) ) ); - xNewKey1->createKey( RtfExport_getSupportedServiceNames().getConstArray()[0] ); - - bRet = sal_True; - } - catch( registry::InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException (rtfexport)!" ); - } - - try - { - uno::Reference< registry::XRegistryKey > xNewKey1( - static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( - OUString::createFromAscii( IMPL_NAME_RTFIMPORT "/UNO/SERVICES/" ) ) ); - xNewKey1->createKey( RtfExport_getSupportedServiceNames().getConstArray()[0] ); - - bRet = sal_True; - } - catch( registry::InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException (rtfimport)!" ); - } - } - - return bRet; -} - - // ------------------------ // - component_getFactory - // ------------------------ diff --git a/sw/util/msword.component b/sw/util/msword.component new file mode 100644 index 000000000000..84ae7aaf965f --- /dev/null +++ b/sw/util/msword.component @@ -0,0 +1,37 @@ + + + + + + + + + + + -- cgit From 8cd591b429de09270dfdc54c0a67099fd6c907df Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 17 Nov 2010 14:33:18 +0100 Subject: gnumake2: updated license headers --- sw/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/Makefile b/sw/Makefile index 5002d3f122a1..a79aff831024 100644 --- a/sw/Makefile +++ b/sw/Makefile @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -- cgit From 98170a58add19fa056e37ad5f033605f840c1747 Mon Sep 17 00:00:00 2001 From: os Date: Wed, 17 Nov 2010 14:34:12 +0100 Subject: msword.component added --- sw/util/makefile.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index 6fa4bd5432e2..5d474b4325a3 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -375,7 +375,7 @@ SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib .INCLUDE : target.mk -ALLTAR : $(MISC)/sw.component $(MISC)/swd.component $(MISC)/vbaswobj.component +ALLTAR : $(MISC)/sw.component $(MISC)/swd.component $(MISC)/vbaswobj.component $(MISC)/msword.component $(MISC)/sw.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ sw.component @@ -394,3 +394,9 @@ $(MISC)/vbaswobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ $(XSLTPROC) --nonet --stringparam uri \ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt vbaswobj.component + +$(MISC)/msword.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + msword.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt msword.component -- cgit From c6f4c90e0228a389aa08a3f7c39c965e8ae0fc0f Mon Sep 17 00:00:00 2001 From: os Date: Thu, 18 Nov 2010 08:26:12 +0100 Subject: #i115608# msword component registration --- sw/util/makefile.mk | 2 +- sw/util/msword.map | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index 5d474b4325a3..98c616b7036d 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -398,5 +398,5 @@ $(MISC)/vbaswobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ $(MISC)/msword.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ msword.component $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL4TARGETN:f)' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt msword.component diff --git a/sw/util/msword.map b/sw/util/msword.map index d2a9d9b4f7e1..6a4f01ffa7f7 100644 --- a/sw/util/msword.map +++ b/sw/util/msword.map @@ -7,7 +7,6 @@ UDK_3_0_0 { SaveOrDelMSVBAStorage_ww8; GetSaveWarningOfMSVBAStorage_ww8; component_getImplementationEnvironment; - component_writeInfo; component_getFactory; local: *; -- cgit From 772e57adce746f4c3e42c2333828d6c068f30fbb Mon Sep 17 00:00:00 2001 From: os Date: Fri, 19 Nov 2010 08:02:17 +0100 Subject: SfxItemPool access --- sw/source/filter/ww8/rtfexport.cxx | 26 ++++++++++++++++---------- sw/source/filter/ww8/wrtw8sty.cxx | 10 ++++++---- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index f4f3f7166fe0..f899d2160e86 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -525,8 +525,8 @@ void RtfExport::ExportDocument_Impl() // protected section in the document. { const SfxItemPool& rPool = pDoc->GetAttrPool(); - USHORT nMaxItem = rPool.GetItemCount2(RES_PROTECT); - for( USHORT n = 0; n < nMaxItem; ++n ) + sal_uInt32 const nMaxItem = rPool.GetItemCount2(RES_PROTECT); + for (sal_uInt32 n = 0; n < nMaxItem; ++n) { const SvxProtectItem* pProtect = (const SvxProtectItem*)rPool.GetItem2(RES_PROTECT, n); if (pProtect && pProtect->IsCntntProtected()) @@ -997,7 +997,7 @@ void RtfExport::OutColorTable() { // Build the table from rPool since the colors provided to // RtfAttributeOutput callbacks are too late. - USHORT n, nMaxItem; + sal_uInt32 nMaxItem; const SfxItemPool& rPool = pDoc->GetAttrPool(); // char color @@ -1009,7 +1009,7 @@ void RtfExport::OutColorTable() RES_CHRATR_COLOR ) )) InsColor( pCol->GetValue() ); nMaxItem = rPool.GetItemCount2(RES_CHRATR_COLOR); - for( n = 0; n < nMaxItem; ++n ) + for (sal_uInt32 n = 0; n < nMaxItem; ++n) { if( 0 != (pCol = (const SvxColorItem*)rPool.GetItem2( RES_CHRATR_COLOR, n ) ) ) @@ -1019,7 +1019,7 @@ void RtfExport::OutColorTable() const SvxUnderlineItem* pUnder = (const SvxUnderlineItem*)GetDfltAttr( RES_CHRATR_UNDERLINE ); InsColor( pUnder->GetColor() ); nMaxItem = rPool.GetItemCount2(RES_CHRATR_UNDERLINE); - for( n = 0; n < nMaxItem;n++) + for (sal_uInt32 n = 0; n < nMaxItem; ++n) { if( 0 != (pUnder = (const SvxUnderlineItem*)rPool.GetItem2( RES_CHRATR_UNDERLINE, n ) ) ) InsColor( pUnder->GetColor() ); @@ -1029,7 +1029,7 @@ void RtfExport::OutColorTable() const SvxOverlineItem* pOver = (const SvxOverlineItem*)GetDfltAttr( RES_CHRATR_OVERLINE ); InsColor( pOver->GetColor() ); nMaxItem = rPool.GetItemCount2(RES_CHRATR_OVERLINE); - for( n = 0; n < nMaxItem;n++) + for (sal_uInt32 n = 0; n < nMaxItem; ++n) { if( 0 != (pOver = (const SvxOverlineItem*)rPool.GetItem2( RES_CHRATR_OVERLINE, n ) ) ) InsColor( pOver->GetColor() ); @@ -1052,12 +1052,14 @@ void RtfExport::OutColorTable() InsColor( pBkgrd->GetColor() ); } nMaxItem = rPool.GetItemCount2( *pIds ); - for( n = 0; n < nMaxItem; ++n ) + for (sal_uInt32 n = 0; n < nMaxItem; ++n) + { if( 0 != (pBkgrd = (const SvxBrushItem*)rPool.GetItem2( *pIds , n ) )) { InsColor( pBkgrd->GetColor() ); } + } } // shadow color @@ -1071,12 +1073,14 @@ void RtfExport::OutColorTable() InsColor( pShadow->GetColor() ); } nMaxItem = rPool.GetItemCount2(RES_SHADOW); - for( n = 0; n < nMaxItem; ++n ) + for (sal_uInt32 n = 0; n < nMaxItem; ++n) + { if( 0 != (pShadow = (const SvxShadowItem*)rPool.GetItem2( RES_SHADOW, n ) ) ) { InsColor( pShadow->GetColor() ); } + } } // frame border color @@ -1086,12 +1090,14 @@ void RtfExport::OutColorTable() RES_BOX ) )) InsColorLine( *pBox ); nMaxItem = rPool.GetItemCount2(RES_BOX); - for( n = 0; n < nMaxItem; ++n ) + for (sal_uInt32 n = 0; n < nMaxItem; ++n) + { if( 0 != (pBox = (const SvxBoxItem*)rPool.GetItem2( RES_BOX, n ) )) InsColorLine( *pBox ); + } } - for( n = 0; n < m_aColTbl.size(); n++ ) + for (size_t n = 0; n < m_aColTbl.size(); ++n) { const Color& rCol = m_aColTbl[ n ]; if( n || COL_AUTO != rCol.GetColor() ) diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 4d16a5646536..ab7a8c4e3a0e 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -784,14 +784,16 @@ void wwFontHelper::InitFontTable(bool bWrtWW8,const SwDoc& rDoc) const USHORT aTypes[] = { RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_FONT, 0 }; for (const USHORT* pId = aTypes; *pId; ++pId) { - USHORT nMaxItem = rPool.GetItemCount2( *pId ); - for( USHORT nGet = 0; nGet < nMaxItem; ++nGet ) - if( 0 != (pFont = (const SvxFontItem*)rPool.GetItem2( - *pId, nGet )) ) + sal_uInt32 const nMaxItem = rPool.GetItemCount2( *pId ); + for (sal_uInt32 nGet = 0; nGet < nMaxItem; ++nGet) + { + pFont = (const SvxFontItem*)rPool.GetItem2( *pId, nGet ); + if (0 != pFont) { GetId(wwFont(pFont->GetFamilyName(), pFont->GetPitch(), pFont->GetFamily(), pFont->GetCharSet(),bWrtWW8)); } + } } } -- cgit From 6ad930a9e6a25ec36f4672bf833cffa7371d6f9a Mon Sep 17 00:00:00 2001 From: os Date: Fri, 19 Nov 2010 14:24:51 +0100 Subject: #i112395# rtf import fixed --- sw/source/filter/rtf/swparrtf.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index a4f3063ea05a..0c23218092d5 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -3641,7 +3641,7 @@ void SwRTFParser::ReadHeaderFooter( int nToken, SwPageDesc* pPageDesc ) // wurde an der Position ein Escapement aufgespannt, so entferne // das jetzt. Fussnoten sind bei uns immer hochgestellt. - SvxRTFItemStackTypePtr pTmp = aSaveStack.back(); + SvxRTFItemStackTypePtr pTmp = aSaveStack.empty() ? 0 : aSaveStack.back(); if( pTmp && pTmp->GetSttNodeIdx() == pPam->GetPoint()->nNode.GetIndex() && pTmp->GetSttCnt() == nPos ) -- cgit From bacdf52829e90e9535ceefd1a08a5dd92adb610c Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 19 Nov 2010 21:45:41 +0100 Subject: gnumake2: removing old dmake file in migrated modules --- sw/inc/makefile.mk | 49 ---- sw/qa/complex/accessibility/makefile.mk | 50 ---- sw/qa/complex/checkColor/makefile.mk | 50 ---- sw/qa/complex/indeterminateState/makefile.mk | 50 ---- sw/qa/complex/writer/makefile.mk | 56 ---- sw/qa/core/makefile.mk | 69 ----- sw/qa/unoapi/makefile.mk | 48 ---- sw/sdi/makefile.mk | 106 ------- sw/source/core/SwNumberTree/makefile.mk | 50 ---- sw/source/core/access/makefile.mk | 100 ------- sw/source/core/attr/makefile.mk | 55 ---- sw/source/core/bastyp/makefile.mk | 79 ------ sw/source/core/crsr/makefile.mk | 83 ------ sw/source/core/doc/makefile.mk | 92 ------- sw/source/core/docnode/makefile.mk | 82 ------ sw/source/core/draw/makefile.mk | 60 ---- sw/source/core/edit/makefile.mk | 71 ----- sw/source/core/except/makefile.mk | 60 ---- sw/source/core/fields/makefile.mk | 94 ------- sw/source/core/frmedt/makefile.mk | 76 ------ sw/source/core/graphic/makefile.mk | 53 ---- sw/source/core/inc/makefile.mk | 26 -- sw/source/core/layout/makefile.mk | 113 -------- sw/source/core/makefile.mk | 110 -------- sw/source/core/objectpositioning/makefile.mk | 59 ---- sw/source/core/ole/makefile.mk | 55 ---- sw/source/core/para/makefile.mk | 54 ---- sw/source/core/sw3io/makefile.mk | 49 ---- sw/source/core/swg/makefile.mk | 62 ----- sw/source/core/table/makefile.mk | 48 ---- sw/source/core/text/makefile.mk | 119 -------- sw/source/core/tox/makefile.mk | 57 ---- sw/source/core/txtnode/makefile.mk | 86 ------ sw/source/core/undo/makefile.mk | 86 ------ sw/source/core/unocore/makefile.mk | 124 --------- sw/source/core/view/makefile.mk | 61 ----- sw/source/filter/ascii/makefile.mk | 56 ---- sw/source/filter/basflt/makefile.mk | 58 ---- sw/source/filter/html/makefile.mk | 83 ------ sw/source/filter/inc/makefile.mk | 26 -- sw/source/filter/makefile.mk | 67 ----- sw/source/filter/rtf/makefile.mk | 65 ----- sw/source/filter/writer/makefile.mk | 54 ---- sw/source/filter/ww1/makefile.mk | 94 ------- sw/source/filter/ww8/dump/makefile.mk | 122 --------- sw/source/filter/ww8/makefile.mk | 105 ------- sw/source/filter/xml/makefile.mk | 94 ------- sw/source/ui/app/makefile.mk | 101 ------- sw/source/ui/cctrl/makefile.mk | 59 ---- sw/source/ui/chrdlg/makefile.mk | 69 ----- sw/source/ui/config/makefile.mk | 87 ------ sw/source/ui/dbui/makefile.mk | 122 --------- sw/source/ui/dialog/makefile.mk | 85 ------ sw/source/ui/dochdl/makefile.mk | 65 ----- sw/source/ui/docvw/makefile.mk | 69 ----- sw/source/ui/envelp/makefile.mk | 80 ------ sw/source/ui/fldui/makefile.mk | 94 ------- sw/source/ui/fmtui/makefile.mk | 51 ---- sw/source/ui/frmdlg/makefile.mk | 79 ------ sw/source/ui/globdoc/makefile.mk | 51 ---- sw/source/ui/inc/makefile.mk | 42 --- sw/source/ui/index/makefile.mk | 68 ----- sw/source/ui/lingu/makefile.mk | 56 ---- sw/source/ui/makefile.mk | 101 ------- sw/source/ui/misc/makefile.mk | 96 ------- sw/source/ui/ribbar/makefile.mk | 70 ----- sw/source/ui/shells/makefile.mk | 94 ------- sw/source/ui/smartmenu/makefile.mk | 53 ---- sw/source/ui/table/makefile.mk | 81 ------ sw/source/ui/uiview/makefile.mk | 90 ------ sw/source/ui/uno/makefile.mk | 81 ------ sw/source/ui/utlui/makefile.mk | 79 ------ sw/source/ui/vba/makefile.mk | 99 ------- sw/source/ui/web/makefile.mk | 59 ---- sw/source/ui/wrtsh/makefile.mk | 62 ----- sw/uiconfig/layout/makefile.mk | 46 ---- sw/util/makefile.mk | 394 --------------------------- 77 files changed, 5949 deletions(-) delete mode 100644 sw/inc/makefile.mk delete mode 100644 sw/qa/complex/accessibility/makefile.mk delete mode 100755 sw/qa/complex/checkColor/makefile.mk delete mode 100755 sw/qa/complex/indeterminateState/makefile.mk delete mode 100755 sw/qa/complex/writer/makefile.mk delete mode 100644 sw/qa/core/makefile.mk delete mode 100644 sw/qa/unoapi/makefile.mk delete mode 100644 sw/sdi/makefile.mk delete mode 100644 sw/source/core/SwNumberTree/makefile.mk delete mode 100644 sw/source/core/access/makefile.mk delete mode 100644 sw/source/core/attr/makefile.mk delete mode 100644 sw/source/core/bastyp/makefile.mk delete mode 100644 sw/source/core/crsr/makefile.mk delete mode 100644 sw/source/core/doc/makefile.mk delete mode 100644 sw/source/core/docnode/makefile.mk delete mode 100644 sw/source/core/draw/makefile.mk delete mode 100644 sw/source/core/edit/makefile.mk delete mode 100644 sw/source/core/except/makefile.mk delete mode 100644 sw/source/core/fields/makefile.mk delete mode 100644 sw/source/core/frmedt/makefile.mk delete mode 100644 sw/source/core/graphic/makefile.mk delete mode 100644 sw/source/core/inc/makefile.mk delete mode 100644 sw/source/core/layout/makefile.mk delete mode 100644 sw/source/core/makefile.mk delete mode 100644 sw/source/core/objectpositioning/makefile.mk delete mode 100644 sw/source/core/ole/makefile.mk delete mode 100644 sw/source/core/para/makefile.mk delete mode 100644 sw/source/core/sw3io/makefile.mk delete mode 100644 sw/source/core/swg/makefile.mk delete mode 100644 sw/source/core/table/makefile.mk delete mode 100644 sw/source/core/text/makefile.mk delete mode 100644 sw/source/core/tox/makefile.mk delete mode 100644 sw/source/core/txtnode/makefile.mk delete mode 100644 sw/source/core/undo/makefile.mk delete mode 100644 sw/source/core/unocore/makefile.mk delete mode 100755 sw/source/core/view/makefile.mk delete mode 100644 sw/source/filter/ascii/makefile.mk delete mode 100644 sw/source/filter/basflt/makefile.mk delete mode 100644 sw/source/filter/html/makefile.mk delete mode 100644 sw/source/filter/inc/makefile.mk delete mode 100644 sw/source/filter/makefile.mk delete mode 100644 sw/source/filter/rtf/makefile.mk delete mode 100644 sw/source/filter/writer/makefile.mk delete mode 100644 sw/source/filter/ww1/makefile.mk delete mode 100644 sw/source/filter/ww8/dump/makefile.mk delete mode 100644 sw/source/filter/ww8/makefile.mk delete mode 100644 sw/source/filter/xml/makefile.mk delete mode 100644 sw/source/ui/app/makefile.mk delete mode 100644 sw/source/ui/cctrl/makefile.mk delete mode 100644 sw/source/ui/chrdlg/makefile.mk delete mode 100644 sw/source/ui/config/makefile.mk delete mode 100644 sw/source/ui/dbui/makefile.mk delete mode 100644 sw/source/ui/dialog/makefile.mk delete mode 100644 sw/source/ui/dochdl/makefile.mk delete mode 100644 sw/source/ui/docvw/makefile.mk delete mode 100644 sw/source/ui/envelp/makefile.mk delete mode 100644 sw/source/ui/fldui/makefile.mk delete mode 100644 sw/source/ui/fmtui/makefile.mk delete mode 100644 sw/source/ui/frmdlg/makefile.mk delete mode 100644 sw/source/ui/globdoc/makefile.mk delete mode 100644 sw/source/ui/inc/makefile.mk delete mode 100644 sw/source/ui/index/makefile.mk delete mode 100644 sw/source/ui/lingu/makefile.mk delete mode 100644 sw/source/ui/makefile.mk delete mode 100644 sw/source/ui/misc/makefile.mk delete mode 100644 sw/source/ui/ribbar/makefile.mk delete mode 100644 sw/source/ui/shells/makefile.mk delete mode 100644 sw/source/ui/smartmenu/makefile.mk delete mode 100644 sw/source/ui/table/makefile.mk delete mode 100644 sw/source/ui/uiview/makefile.mk delete mode 100644 sw/source/ui/uno/makefile.mk delete mode 100644 sw/source/ui/utlui/makefile.mk delete mode 100644 sw/source/ui/vba/makefile.mk delete mode 100644 sw/source/ui/web/makefile.mk delete mode 100644 sw/source/ui/wrtsh/makefile.mk delete mode 100644 sw/uiconfig/layout/makefile.mk delete mode 100644 sw/util/makefile.mk diff --git a/sw/inc/makefile.mk b/sw/inc/makefile.mk deleted file mode 100644 index b5efd14c8164..000000000000 --- a/sw/inc/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=sw -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" # && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" ) -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/sw/qa/complex/accessibility/makefile.mk b/sw/qa/complex/accessibility/makefile.mk deleted file mode 100644 index 06e7c6a70408..000000000000 --- a/sw/qa/complex/accessibility/makefile.mk +++ /dev/null @@ -1,50 +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. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = sw -TARGET = qa_complex_accessibility - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/accessibility -JAVATESTFILES = AccessibleRelationSet.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/sw/qa/complex/checkColor/makefile.mk b/sw/qa/complex/checkColor/makefile.mk deleted file mode 100755 index e5b368083ada..000000000000 --- a/sw/qa/complex/checkColor/makefile.mk +++ /dev/null @@ -1,50 +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. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = sw -TARGET = qa_complex_checkColor - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/checkColor -JAVATESTFILES = CheckChangeColor.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/sw/qa/complex/indeterminateState/makefile.mk b/sw/qa/complex/indeterminateState/makefile.mk deleted file mode 100755 index d19915b1e2fe..000000000000 --- a/sw/qa/complex/indeterminateState/makefile.mk +++ /dev/null @@ -1,50 +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. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = sw -TARGET = qa_complex_indeterminateState - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/indeterminateState -JAVATESTFILES = CheckIndeterminateState.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/sw/qa/complex/writer/makefile.mk b/sw/qa/complex/writer/makefile.mk deleted file mode 100755 index 550e9d64fd82..000000000000 --- a/sw/qa/complex/writer/makefile.mk +++ /dev/null @@ -1,56 +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. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = sw -TARGET = qa_complex_writer - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/writer -JAVATESTFILES = \ - CheckBookmarks.java \ - CheckCrossReferences.java \ - CheckFlies.java \ - CheckIndexedPropertyValues.java \ - CheckNamedPropertyValues.java \ - TextPortionEnumerationTest.java -JAVAFILES = $(JAVATESTFILES) TestDocument.java -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/sw/qa/core/makefile.mk b/sw/qa/core/makefile.mk deleted file mode 100644 index 00ebfda8844a..000000000000 --- a/sw/qa/core/makefile.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=sw -TARGET=test-bigptrarray -# this is removed at the moment because we need some enhancements -# TESTDIR=TRUE - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGSCXX += $(CPPUNIT_CFLAGS) - -# BEGIN ---------------------------------------------------------------- -# auto generated Target:testjob by codegen.pl - -.IF "$(GUI)" == "WNT" - CFLAGS+=/Ob1 -.ENDIF - -SHL1OBJS=$(SLO)$/Test-BigPtrArray.obj \ - $(SLO)$/bparr.obj - -SHL1TARGET=$(TARGET) -SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) $(TESTSHL2LIB) - -SHL1IMPLIB= i$(SHL1TARGET) - -# SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME =$(SHL1TARGET) - -# DEF1EXPORTFILE= export.exp -SHL1VERSIONMAP = export.map - -# END ------------------------------------------------------------------ - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : _cppunit.mk diff --git a/sw/qa/unoapi/makefile.mk b/sw/qa/unoapi/makefile.mk deleted file mode 100644 index f5102c2c9c84..000000000000 --- a/sw/qa/unoapi/makefile.mk +++ /dev/null @@ -1,48 +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. -#***********************************************************************/ - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = sw -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/sw/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/sw/sdi/makefile.mk b/sw/sdi/makefile.mk deleted file mode 100644 index e539c7a05511..000000000000 --- a/sw/sdi/makefile.mk +++ /dev/null @@ -1,106 +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. -# -#************************************************************************* - -# wx mktyplib nur unter Windows aufrufbar -# VMB.386 und WXSRVR.EXE muessen geladen sein! (n:\mscwini\bin) - -PRJ=.. - -PRJNAME=sw -TARGET=swslots - -# --- Settings ----------------------------------------------------- -.IF "$(L10N_framework)"=="" -SVSDIINC=$(PRJ)$/source$/ui$/inc -.ENDIF - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(L10N_framework)"=="" -SDI1NAME=$(TARGET) -SDI1EXPORT=swriter -#SIDHRCNAME=swslots.hrc - -# --- Files -------------------------------------------------------- -SVSDI1DEPEND= \ - $(SOLARINCXDIR)$/sfx2/sfx.sdi \ - $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \ - $(SOLARINCXDIR)$/svx/svx.sdi \ - $(SOLARINCXDIR)$/svx/svxitems.sdi \ - $(SOLARINCXDIR)$/svx/xoitems.sdi \ - switems.sdi\ - swriter.sdi\ - _docsh.sdi\ - docsh.sdi\ - wdocsh.sdi\ - wrtapp.sdi\ - _basesh.sdi\ - basesh.sdi\ - _textsh.sdi\ - textsh.sdi\ - wtextsh.sdi\ - _drwbase.sdi\ - drwbassh.sdi\ - wdrwbase.sdi\ - formsh.sdi\ - _formsh.sdi\ - wformsh.sdi\ - drawsh.sdi\ - drwtxtsh.sdi\ - _listsh.sdi\ - listsh.sdi\ - wlistsh.sdi\ - _frmsh.sdi\ - frmsh.sdi\ - wfrmsh.sdi\ - _tabsh.sdi\ - tabsh.sdi\ - wtabsh.sdi\ - _grfsh.sdi\ - grfsh.sdi\ - wgrfsh.sdi\ - _olesh.sdi\ - olesh.sdi\ - wolesh.sdi\ - beziersh.sdi\ - _viewsh.sdi\ - viewsh.sdi\ - wviewsh.sdi\ - _mediash.sdi\ - mediash.sdi\ - _annotsh.sdi\ - annotsh.sdi\ - swslots.hrc \ - $(INC)$/globals.hrc \ - $(INC)$/cmdid.h -.ENDIF - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/sw/source/core/SwNumberTree/makefile.mk b/sw/source/core/SwNumberTree/makefile.mk deleted file mode 100644 index d67a3f321a01..000000000000 --- a/sw/source/core/SwNumberTree/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=SwNumberTree - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/SwNumberTree.obj \ - $(SLO)$/SwNodeNum.obj - -EXCEPTIONSFILES = \ - $(SLO)$/SwNumberTree.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/access/makefile.mk b/sw/source/core/access/makefile.mk deleted file mode 100644 index 72871314f722..000000000000 --- a/sw/source/core/access/makefile.mk +++ /dev/null @@ -1,100 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=access - -# --- Settings ----------------------------------------------------- -#ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/acccell.obj \ - $(SLO)$/acccontext.obj \ - $(SLO)$/accdoc.obj \ - $(SLO)$/accembedded.obj \ - $(SLO)$/accfootnote.obj \ - $(SLO)$/accframe.obj \ - $(SLO)$/accframebase.obj \ - $(SLO)$/accfrmobj.obj \ - $(SLO)$/accfrmobjmap.obj \ - $(SLO)$/accfrmobjslist.obj \ - $(SLO)$/accgraphic.obj \ - $(SLO)$/accheaderfooter.obj \ - $(SLO)$/acchyperlink.obj \ - $(SLO)$/acchypertextdata.obj \ - $(SLO)$/accmap.obj \ - $(SLO)$/accnotextframe.obj \ - $(SLO)$/accpage.obj \ - $(SLO)$/accpara.obj \ - $(SLO)$/accportions.obj \ - $(SLO)$/accpreview.obj \ - $(SLO)$/accselectionhelper.obj \ - $(SLO)$/acctable.obj \ - $(SLO)$/acctextframe.obj \ - $(SLO)$/textmarkuphelper.obj \ - $(SLO)$/parachangetrackinginfo.obj - -EXCEPTIONSFILES= \ - $(SLO)$/acccell.obj \ - $(SLO)$/acccontext.obj \ - $(SLO)$/accdoc.obj \ - $(SLO)$/accembedded.obj \ - $(SLO)$/accfootnote.obj \ - $(SLO)$/accframe.obj \ - $(SLO)$/accframebase.obj \ - $(SLO)$/accfrmobj.obj \ - $(SLO)$/accfrmobjmap.obj \ - $(SLO)$/accfrmobjslist.obj \ - $(SLO)$/accgraphic.obj \ - $(SLO)$/accheaderfooter.obj \ - $(SLO)$/acchyperlink.obj \ - $(SLO)$/acchypertextdata.obj \ - $(SLO)$/accmap.obj \ - $(SLO)$/accnotextframe.obj \ - $(SLO)$/accpage.obj \ - $(SLO)$/accpara.obj \ - $(SLO)$/accportions.obj \ - $(SLO)$/accpreview.obj \ - $(SLO)$/accselectionhelper.obj \ - $(SLO)$/acctable.obj \ - $(SLO)$/acctextframe.obj \ - $(SLO)$/textmarkuphelper.obj \ - $(SLO)$/parachangetrackinginfo.obj - -# --- Targets ------------------------------------------------------- - - -.INCLUDE : target.mk - diff --git a/sw/source/core/attr/makefile.mk b/sw/source/core/attr/makefile.mk deleted file mode 100644 index a3827d4776e0..000000000000 --- a/sw/source/core/attr/makefile.mk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=attr - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/calbck.obj \ - $(SLO)$/cellatr.obj \ - $(SLO)$/fmtfollowtextflow.obj \ - $(SLO)$/fmtwrapinfluenceonobjpos.obj \ - $(SLO)$/format.obj \ - $(SLO)$/hints.obj \ - $(SLO)$/swatrset.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/bastyp/makefile.mk b/sw/source/core/bastyp/makefile.mk deleted file mode 100644 index 8333dabd5f37..000000000000 --- a/sw/source/core/bastyp/makefile.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=bastyp - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - bparr.cxx \ - breakit.cxx \ - calc.cxx \ - checkit.cxx \ - index.cxx \ - init.cxx \ - ring.cxx \ - swcache.cxx \ - swrect.cxx \ - swregion.cxx \ - swtypes.cxx \ - tabcol.cxx \ - SwSmartTagMgr.cxx - -SLOFILES = \ - $(SLO)$/bparr.obj \ - $(SLO)$/breakit.obj \ - $(SLO)$/calc.obj \ - $(SLO)$/checkit.obj \ - $(SLO)$/index.obj \ - $(SLO)$/init.obj \ - $(SLO)$/ring.obj \ - $(SLO)$/swcache.obj \ - $(SLO)$/swrect.obj \ - $(SLO)$/swregion.obj \ - $(SLO)$/swtypes.obj \ - $(SLO)$/tabcol.obj \ - $(SLO)$/SwSmartTagMgr.obj - -EXCEPTIONSFILES = \ - $(SLO)$/tabcol.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/crsr/makefile.mk b/sw/source/core/crsr/makefile.mk deleted file mode 100644 index a2571901c068..000000000000 --- a/sw/source/core/crsr/makefile.mk +++ /dev/null @@ -1,83 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=crsr - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/crbm.obj \ - $(SLO)$/crsrsh.obj \ - $(SLO)$/bookmrk.obj \ - $(SLO)$/viscrs.obj - -SLOFILES = \ - $(SLO)$/BlockCursor.obj \ - $(SLO)$/bookmrk.obj \ - $(SLO)$/callnk.obj \ - $(SLO)$/crbm.obj \ - $(SLO)$/crsrsh.obj \ - $(SLO)$/crstrvl.obj \ - $(SLO)$/crstrvl1.obj \ - $(SLO)$/findattr.obj \ - $(SLO)$/findcoll.obj \ - $(SLO)$/findfmt.obj \ - $(SLO)$/findtxt.obj \ - $(SLO)$/pam.obj \ - $(SLO)$/paminit.obj \ - $(SLO)$/swcrsr.obj \ - $(SLO)$/trvlcol.obj \ - $(SLO)$/trvlfnfl.obj \ - $(SLO)$/trvlreg.obj \ - $(SLO)$/trvltbl.obj \ - $(SLO)$/unocrsr.obj \ - $(SLO)$/viscrs.obj \ - $(SLO)$/crossrefbookmark.obj - -.IF "$(mydebug)" != "" -SLOFILES += \ - $(SLO)$/pamio.obj -.ENDIF - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/sw/source/core/doc/makefile.mk b/sw/source/core/doc/makefile.mk deleted file mode 100644 index 5a65b2de24e1..000000000000 --- a/sw/source/core/doc/makefile.mk +++ /dev/null @@ -1,92 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=doc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES = \ - $(SLO)$/SwStyleNameMapper.obj \ - $(SLO)$/acmplwrd.obj \ - $(SLO)$/dbgoutsw.obj \ - $(SLO)$/doc.obj \ - $(SLO)$/docbm.obj \ - $(SLO)$/doccomp.obj \ - $(SLO)$/docdraw.obj \ - $(SLO)$/docedt.obj \ - $(SLO)$/docfmt.obj \ - $(SLO)$/docglbl.obj \ - $(SLO)$/docglos.obj \ - $(SLO)$/doclay.obj \ - $(SLO)$/docxforms.obj \ - $(SLO)$/docnew.obj \ - $(SLO)$/docnum.obj \ - $(SLO)$/docsort.obj \ - $(SLO)$/doctxm.obj \ - $(SLO)$/number.obj \ - $(SLO)$/swstylemanager.obj \ - $(SLO)$/tblcpy.obj \ - $(SLO)$/tblrwcl.obj \ - $(SLO)$/list.obj - -SLOFILES = $(EXCEPTIONSFILES) \ - $(SLO)$/docbasic.obj \ - $(SLO)$/docchart.obj \ - $(SLO)$/doccorr.obj \ - $(SLO)$/docdde.obj \ - $(SLO)$/docdesc.obj \ - $(SLO)$/docfld.obj \ - $(SLO)$/docfly.obj \ - $(SLO)$/docftn.obj \ - $(SLO)$/docredln.obj \ - $(SLO)$/docruby.obj \ - $(SLO)$/docstat.obj \ - $(SLO)$/extinput.obj \ - $(SLO)$/fmtcol.obj \ - $(SLO)$/ftnidx.obj \ - $(SLO)$/gctable.obj \ - $(SLO)$/lineinfo.obj \ - $(SLO)$/notxtfrm.obj \ - $(SLO)$/poolfmt.obj \ - $(SLO)$/sortopt.obj \ - $(SLO)$/swserv.obj \ - $(SLO)$/tblafmt.obj \ - $(SLO)$/visiturl.obj \ - $(SLO)$/htmltbl.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/docnode/makefile.mk b/sw/source/core/docnode/makefile.mk deleted file mode 100644 index d3e5df64b6cd..000000000000 --- a/sw/source/core/docnode/makefile.mk +++ /dev/null @@ -1,82 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=docnode - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/cancellablejob.obj \ - $(SLO)$/finalthreadmanager.obj \ - $(SLO)$/ndcopy.obj \ - $(SLO)$/ndtbl.obj \ - $(SLO)$/node.obj \ - $(SLO)$/observablethread.obj \ - $(SLO)$/retrieveinputstream.obj \ - $(SLO)$/retrievedinputstreamdata.obj \ - $(SLO)$/swbaslnk.obj \ - $(SLO)$/threadmanager.obj - -SLOFILES = \ - $(SLO)$/ndindex.obj \ - $(SLO)$/ndcopy.obj \ - $(SLO)$/ndnotxt.obj \ - $(SLO)$/ndnum.obj \ - $(SLO)$/ndsect.obj \ - $(SLO)$/ndtbl.obj \ - $(SLO)$/ndtbl1.obj \ - $(SLO)$/node.obj \ - $(SLO)$/node2lay.obj \ - $(SLO)$/nodes.obj \ - $(SLO)$/section.obj \ - $(SLO)$/swbaslnk.obj \ - $(SLO)$/retrievedinputstreamdata.obj \ - $(SLO)$/observablethread.obj \ - $(SLO)$/cancellablejob.obj \ - $(SLO)$/retrieveinputstream.obj \ - $(SLO)$/retrieveinputstreamconsumer.obj \ - $(SLO)$/threadlistener.obj \ - $(SLO)$/threadmanager.obj \ - $(SLO)$/swthreadmanager.obj \ - $(SLO)$/swthreadjoiner.obj \ - $(SLO)$/pausethreadstarting.obj \ - $(SLO)$/finalthreadmanager.obj - - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/draw/makefile.mk b/sw/source/core/draw/makefile.mk deleted file mode 100644 index a57b1b530e7f..000000000000 --- a/sw/source/core/draw/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=draw - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/dview.obj \ - $(SLO)$/dcontact.obj \ - $(SLO)$/dflyobj.obj \ - $(SLO)$/drawdoc.obj \ - $(SLO)$/dobjfac.obj \ - $(SLO)$/dpage.obj - -EXCEPTIONSFILES= \ - $(SLO)$/dview.obj \ - $(SLO)$/dcontact.obj \ - $(SLO)$/drawdoc.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/edit/makefile.mk b/sw/source/core/edit/makefile.mk deleted file mode 100644 index a7820b405842..000000000000 --- a/sw/source/core/edit/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=edit - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES=\ - $(SLO)$/eddel.obj \ - $(SLO)$/edlingu.obj \ - $(SLO)$/edfldexp.obj \ - $(SLO)$/edtab.obj - -SLOFILES = \ - $(EXCEPTIONSFILES)\ - $(SLO)$/acorrect.obj \ - $(SLO)$/autofmt.obj \ - $(SLO)$/edatmisc.obj \ - $(SLO)$/edattr.obj \ - $(SLO)$/edfcol.obj \ - $(SLO)$/edfld.obj \ - $(SLO)$/edfmt.obj \ - $(SLO)$/edglbldc.obj \ - $(SLO)$/edglss.obj \ - $(SLO)$/editsh.obj \ - $(SLO)$/ednumber.obj \ - $(SLO)$/edredln.obj \ - $(SLO)$/edtox.obj \ - $(SLO)$/edundo.obj \ - $(SLO)$/edws.obj \ - $(SLO)$/edsect.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/except/makefile.mk b/sw/source/core/except/makefile.mk deleted file mode 100644 index 19450849b59d..000000000000 --- a/sw/source/core/except/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=except - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk - -# hier kein PCH! -prjpch= -PRJPCH= - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -CXXFILES = - -.IF "$(dbgutil)"!="" -CXXFILES += \ - errhdl.cxx \ - dbgloop.cxx - -SLOFILES += \ - $(SLO)$/errhdl.obj \ - $(SLO)$/dbgloop.obj -.ENDIF -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/fields/makefile.mk b/sw/source/core/fields/makefile.mk deleted file mode 100644 index 280fff6aae88..000000000000 --- a/sw/source/core/fields/makefile.mk +++ /dev/null @@ -1,94 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=fields - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - authfld.cxx \ - cellfml.cxx \ - chpfld.cxx \ - dbfld.cxx \ - ddefld.cxx \ - ddetbl.cxx \ - docufld.cxx \ - expfld.cxx \ - fldbas.cxx \ - flddat.cxx \ - flddropdown.cxx \ - scrptfld.cxx \ - macrofld.cxx \ - fldlst.cxx \ - postithelper.cxx \ - reffld.cxx \ - tblcalc.cxx \ - usrfld.cxx - - - -SLOFILES = \ - $(SLO)$/textapi.obj \ - $(SLO)$/authfld.obj \ - $(SLO)$/cellfml.obj \ - $(SLO)$/chpfld.obj \ - $(SLO)$/dbfld.obj \ - $(SLO)$/ddefld.obj \ - $(SLO)$/ddetbl.obj \ - $(SLO)$/docufld.obj \ - $(SLO)$/expfld.obj \ - $(SLO)$/fldbas.obj \ - $(SLO)$/flddat.obj \ - $(SLO)$/flddropdown.obj \ - $(SLO)$/fldlst.obj \ - $(SLO)$/scrptfld.obj \ - $(SLO)$/macrofld.obj \ - $(SLO)$/postithelper.obj \ - $(SLO)$/reffld.obj \ - $(SLO)$/tblcalc.obj \ - $(SLO)$/usrfld.obj - -EXCEPTIONSFILES = \ - $(SLO)$/flddropdown.obj \ - $(SLO)$/postithelper.obj \ - $(SLO)$/docufld.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/frmedt/makefile.mk b/sw/source/core/frmedt/makefile.mk deleted file mode 100644 index 8b277f899425..000000000000 --- a/sw/source/core/frmedt/makefile.mk +++ /dev/null @@ -1,76 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=frmedt - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - fecopy.cxx \ - fedesc.cxx \ - fefly1.cxx \ - feflyole.cxx \ - feshview.cxx \ - fetab.cxx \ - fews.cxx \ - tblsel.cxx - - - -SLOFILES = $(EXCEPTIONSFILES) \ - $(SLO)$/fedesc.obj \ - $(SLO)$/feflyole.obj \ - $(SLO)$/feshview.obj \ - $(SLO)$/fetab.obj \ - $(SLO)$/tblsel.obj - -EXCEPTIONSFILES=\ - $(SLO)$/fecopy.obj \ - $(SLO)$/fefly1.obj \ - $(SLO)$/fews.obj - - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/graphic/makefile.mk b/sw/source/core/graphic/makefile.mk deleted file mode 100644 index bb637de66610..000000000000 --- a/sw/source/core/graphic/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=graphic - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/grfatr.obj \ - $(SLO)$/ndgrf.obj - -EXCEPTIONSFILES= \ - $(SLO)$/ndgrf.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/inc/makefile.mk b/sw/source/core/inc/makefile.mk deleted file mode 100644 index 1b35ca49549d..000000000000 --- a/sw/source/core/inc/makefile.mk +++ /dev/null @@ -1,26 +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. -# -#************************************************************************* diff --git a/sw/source/core/layout/makefile.mk b/sw/source/core/layout/makefile.mk deleted file mode 100644 index 7019203aa20f..000000000000 --- a/sw/source/core/layout/makefile.mk +++ /dev/null @@ -1,113 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=layout - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -.IF "$(madebug)" != "" -CDEFS+=-DDEBUG -.ENDIF - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES = \ - $(SLO)$/anchoreddrawobject.obj \ - $(SLO)$/flycnt.obj \ - $(SLO)$/laycache.obj \ - $(SLO)$/layouter.obj \ - $(SLO)$/movedfwdfrmsbyobjpos.obj \ - $(SLO)$/newfrm.obj \ - $(SLO)$/objectformatter.obj \ - $(SLO)$/objstmpconsiderwrapinfl.obj \ - $(SLO)$/paintfrm.obj \ - $(SLO)$/softpagebreak.obj \ - $(SLO)$/sortedobjsimpl.obj \ - $(SLO)$/pagechg.obj - - -SLOFILES = \ - $(SLO)$/atrfrm.obj \ - $(SLO)$/anchoredobject.obj \ - $(SLO)$/anchoreddrawobject.obj \ - $(SLO)$/calcmove.obj \ - $(SLO)$/colfrm.obj \ - $(SLO)$/findfrm.obj \ - $(SLO)$/flowfrm.obj \ - $(SLO)$/fly.obj \ - $(SLO)$/flycnt.obj \ - $(SLO)$/flyincnt.obj \ - $(SLO)$/flylay.obj \ - $(SLO)$/flypos.obj \ - $(SLO)$/frmtool.obj \ - $(SLO)$/ftnfrm.obj \ - $(SLO)$/hffrm.obj \ - $(SLO)$/layact.obj \ - $(SLO)$/laycache.obj \ - $(SLO)$/layouter.obj \ - $(SLO)$/movedfwdfrmsbyobjpos.obj \ - $(SLO)$/newfrm.obj \ - $(SLO)$/objectformatter.obj \ - $(SLO)$/objectformattertxtfrm.obj \ - $(SLO)$/objectformatterlayfrm.obj \ - $(SLO)$/objstmpconsiderwrapinfl.obj \ - $(SLO)$/pagechg.obj \ - $(SLO)$/pagedesc.obj \ - $(SLO)$/paintfrm.obj \ - $(SLO)$/sectfrm.obj \ - $(SLO)$/softpagebreak.obj \ - $(SLO)$/sortedobjs.obj \ - $(SLO)$/sortedobjsimpl.obj \ - $(SLO)$/ssfrm.obj \ - $(SLO)$/swselectionlist.obj \ - $(SLO)$/tabfrm.obj \ - $(SLO)$/trvlfrm.obj \ - $(SLO)$/unusedf.obj \ - $(SLO)$/virtoutp.obj \ - $(SLO)$/wsfrm.obj - -.IF "$(dbgutil)"!="" -SLOFILES += \ - $(SLO)$/dbg_lay.obj -.ENDIF - - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/makefile.mk b/sw/source/core/makefile.mk deleted file mode 100644 index 2701445fb888..000000000000 --- a/sw/source/core/makefile.mk +++ /dev/null @@ -1,110 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=sw - -TARGET=core - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(CALLTARGETS)"=="core" -RC_SUBDIRS= -.ENDIF - -# --- Files -------------------------------------------------------- - - -SUBLIBS1= \ - $(SLB)$/access.lib \ - $(SLB)$/graphic.lib \ - $(SLB)$/para.lib \ - $(SLB)$/attr.lib \ - $(SLB)$/edit.lib \ - $(SLB)$/crsr.lib \ - $(SLB)$/view.lib - - -SUBLIBS2= \ - $(SLB)$/draw.lib \ - $(SLB)$/sw3io.lib \ - $(SLB)$/swg.lib \ - $(SLB)$/layout.lib \ - $(SLB)$/text.lib \ - $(SLB)$/doc.lib \ - $(SLB)$/txtnode.lib - -SUBLIBS3= \ - $(SLB)$/docnode.lib \ - $(SLB)$/unocore.lib \ - $(SLB)$/objectpositioning.lib \ - $(SLB)$/SwNumberTree.lib \ - $(SLB)$/tablecore.lib - -.IF "$(dbgutil)"!="" -SUBLIBS3+= \ - $(SLB)$/except.lib -.ENDIF - -SUBLIBS4= \ - $(SLB)$/frmedt.lib \ - $(SLB)$/ole.lib \ - $(SLB)$/fields.lib \ - $(SLB)$/tox.lib \ - $(SLB)$/undo.lib \ - $(SLB)$/bastyp.lib -#------------------------------------------------------------------------- - -################################################################ - -LIB1TARGET=$(SLB)$/core1.lib -LIB1FILES= \ - $(SUBLIBS1) - -LIB2TARGET=$(SLB)$/core2.lib -LIB2FILES= \ - $(SUBLIBS2) - -LIB3TARGET=$(SLB)$/core3.lib -LIB3FILES= \ - $(SUBLIBS3) - -LIB4TARGET=$(SLB)$/core4.lib -LIB4FILES= \ - $(SUBLIBS4) - -.INCLUDE : target.mk - -################################################################ - -#------------------------------------------------------------------------- - - diff --git a/sw/source/core/objectpositioning/makefile.mk b/sw/source/core/objectpositioning/makefile.mk deleted file mode 100644 index 4192414d9b73..000000000000 --- a/sw/source/core/objectpositioning/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=objectpositioning - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -.IF "$(madebug)" != "" -CDEFS+=-DDEBUG -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/anchoredobjectposition.obj \ - $(SLO)$/ascharanchoredobjectposition.obj \ - $(SLO)$/tolayoutanchoredobjectposition.obj \ - $(SLO)$/tocntntanchoredobjectposition.obj \ - $(SLO)$/environmentofanchoredobject.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/ole/makefile.mk b/sw/source/core/ole/makefile.mk deleted file mode 100644 index 8aaf9ed419d2..000000000000 --- a/sw/source/core/ole/makefile.mk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=ole - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - ndole.cxx - -SLOFILES = \ - $(SLO)$/ndole.obj - -EXCEPTIONSFILES = \ - $(SLO)$/ndole.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/para/makefile.mk b/sw/source/core/para/makefile.mk deleted file mode 100644 index 7005bf0e9889..000000000000 --- a/sw/source/core/para/makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=para - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - paratr.cxx - - - -SLOFILES = \ - $(SLO)$/paratr.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/sw3io/makefile.mk b/sw/source/core/sw3io/makefile.mk deleted file mode 100644 index 01a50f5df733..000000000000 --- a/sw/source/core/sw3io/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=sw3io - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/swacorr.obj \ - $(SLO)$/sw3convert.obj - - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/swg/makefile.mk b/sw/source/core/swg/makefile.mk deleted file mode 100644 index c7aa25ec5d24..000000000000 --- a/sw/source/core/swg/makefile.mk +++ /dev/null @@ -1,62 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=swg - -#ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- -SLOFILES = \ - $(SLO)$/swblocks.obj \ - $(SLO)$/SwXMLBlockImport.obj \ - $(SLO)$/SwXMLSectionList.obj \ - $(SLO)$/SwXMLBlockExport.obj \ - $(SLO)$/SwXMLBlockListContext.obj \ - $(SLO)$/SwXMLTextBlocks.obj \ - $(SLO)$/SwXMLTextBlocks1.obj - -EXCEPTIONSFILES = \ - $(SLO)$/SwXMLBlockImport.obj \ - $(SLO)$/SwXMLSectionList.obj \ - $(SLO)$/SwXMLBlockExport.obj \ - $(SLO)$/SwXMLBlockListContext.obj \ - $(SLO)$/SwXMLTextBlocks.obj \ - $(SLO)$/SwXMLTextBlocks1.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/table/makefile.mk b/sw/source/core/table/makefile.mk deleted file mode 100644 index d63101e30a7e..000000000000 --- a/sw/source/core/table/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=tablecore -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/swtable.obj \ - $(SLO)$/swnewtable.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/text/makefile.mk b/sw/source/core/text/makefile.mk deleted file mode 100644 index 0076a1748741..000000000000 --- a/sw/source/core/text/makefile.mk +++ /dev/null @@ -1,119 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=text - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -.IF "$(ENABLE_GRAPHITE)" == "TRUE" -CFLAGS+=-DENABLE_GRAPHITE -.ENDIF -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/atrstck.obj \ - $(SLO)$/EnhancedPDFExportHelper.obj \ - $(SLO)$/frmcrsr.obj \ - $(SLO)$/frmform.obj \ - $(SLO)$/frminf.obj \ - $(SLO)$/frmpaint.obj \ - $(SLO)$/guess.obj \ - $(SLO)$/inftxt.obj \ - $(SLO)$/itradj.obj \ - $(SLO)$/itratr.obj \ - $(SLO)$/itrcrsr.obj \ - $(SLO)$/itrform2.obj \ - $(SLO)$/itrpaint.obj \ - $(SLO)$/itrtxt.obj \ - $(SLO)$/porexp.obj \ - $(SLO)$/porfld.obj \ - $(SLO)$/porfly.obj \ - $(SLO)$/porglue.obj \ - $(SLO)$/porlay.obj \ - $(SLO)$/porlin.obj \ - $(SLO)$/pormulti.obj \ - $(SLO)$/porref.obj \ - $(SLO)$/porrst.obj \ - $(SLO)$/portox.obj \ - $(SLO)$/portxt.obj \ - $(SLO)$/redlnitr.obj \ - $(SLO)$/txtcache.obj \ - $(SLO)$/txtdrop.obj \ - $(SLO)$/txtfld.obj \ - $(SLO)$/txtfly.obj \ - $(SLO)$/txtfrm.obj \ - $(SLO)$/txtftn.obj \ - $(SLO)$/txthyph.obj \ - $(SLO)$/txtinit.obj \ - $(SLO)$/txtpaint.obj \ - $(SLO)$/txttab.obj \ - $(SLO)$/widorp.obj \ - $(SLO)$/blink.obj \ - $(SLO)$/noteurl.obj \ - $(SLO)$/SwGrammarMarkUp.obj \ - $(SLO)$/wrong.obj - -.IF "$(dbgutil)"!="" -SLOFILES += \ - $(SLO)$/txtio.obj -.ENDIF - -EXCEPTIONSFILES = \ - $(SLO)$/EnhancedPDFExportHelper.obj \ - $(SLO)$/inftxt.obj \ - $(SLO)$/itradj.obj \ - $(SLO)$/itrcrsr.obj \ - $(SLO)$/porlay.obj \ - $(SLO)$/pormulti.obj \ - $(SLO)$/SwGrammarMarkUp.obj \ - $(SLO)$/txtfly.obj \ - $(SLO)$/wrong.obj - - -.IF "$(CPUNAME)" == "SPARC" -.IF "$(OS)" == "NETBSD" -NOOPTFILES = \ - $(SLO)$/txtftn.obj -.ENDIF -.ENDIF - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/tox/makefile.mk b/sw/source/core/tox/makefile.mk deleted file mode 100644 index 60de3744917f..000000000000 --- a/sw/source/core/tox/makefile.mk +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=tox - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/tox.obj \ - $(SLO)$/toxhlp.obj \ - $(SLO)$/txmsrt.obj - -EXCEPTIONSFILES= \ - $(SLO)$/toxhlp.obj \ - $(SLO)$/tox.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/txtnode/makefile.mk b/sw/source/core/txtnode/makefile.mk deleted file mode 100644 index f03f96c42674..000000000000 --- a/sw/source/core/txtnode/makefile.mk +++ /dev/null @@ -1,86 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=txtnode - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/atrfld.obj \ - $(SLO)$/atrflyin.obj \ - $(SLO)$/atrftn.obj \ - $(SLO)$/atrref.obj \ - $(SLO)$/atrtox.obj \ - $(SLO)$/chrfmt.obj \ - $(SLO)$/fmtatr2.obj \ - $(SLO)$/fntcap.obj \ - $(SLO)$/fntcache.obj \ - $(SLO)$/swfntcch.obj \ - $(SLO)$/SwGrammarContact.obj \ - $(SLO)$/modeltoviewhelper.obj \ - $(SLO)$/ndhints.obj \ - $(SLO)$/ndtxt.obj \ - $(SLO)$/swfont.obj \ - $(SLO)$/thints.obj \ - $(SLO)$/txatbase.obj \ - $(SLO)$/txatritr.obj \ - $(SLO)$/txtatr2.obj \ - $(SLO)$/txtedt.obj - - -EXCEPTIONSFILES = \ - $(SLO)$/fmtatr2.obj \ - $(SLO)$/atrtox.obj \ - $(SLO)$/atrflyin.obj \ - $(SLO)$/docnew.obj \ - $(SLO)$/fntcache.obj \ - $(SLO)$/ndtxt.obj \ - $(SLO)$/thints.obj \ - $(SLO)$/txtedt.obj - - -.IF "$(dbutil)" != "" -OFILES+=$(SLO)$/dbchratr.$(QBJX) -.ENDIF - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/undo/makefile.mk b/sw/source/core/undo/makefile.mk deleted file mode 100644 index c381761adba1..000000000000 --- a/sw/source/core/undo/makefile.mk +++ /dev/null @@ -1,86 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=undo - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - undo.src - -EXCEPTIONSFILES = \ - $(SLO)$/SwRewriter.obj \ - $(SLO)$/unattr.obj \ - $(SLO)$/undobj.obj \ - $(SLO)$/undraw.obj \ - $(SLO)$/unovwr.obj \ - $(SLO)$/untbl.obj - -SLOFILES = \ - $(SLO)$/SwRewriter.obj \ - $(SLO)$/SwUndoField.obj \ - $(SLO)$/SwUndoPageDesc.obj \ - $(SLO)$/SwUndoFmt.obj \ - $(SLO)$/SwUndoTOXChange.obj \ - $(SLO)$/docundo.obj \ - $(SLO)$/rolbck.obj \ - $(SLO)$/unattr.obj \ - $(SLO)$/unbkmk.obj \ - $(SLO)$/undel.obj \ - $(SLO)$/undobj.obj \ - $(SLO)$/undobj1.obj \ - $(SLO)$/undoflystrattr.obj \ - $(SLO)$/undraw.obj \ - $(SLO)$/unfmco.obj \ - $(SLO)$/unins.obj \ - $(SLO)$/unmove.obj \ - $(SLO)$/unnum.obj \ - $(SLO)$/unoutl.obj \ - $(SLO)$/unovwr.obj \ - $(SLO)$/unredln.obj \ - $(SLO)$/unsect.obj \ - $(SLO)$/unsort.obj \ - $(SLO)$/unspnd.obj \ - $(SLO)$/untbl.obj \ - $(SLO)$/untblk.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/unocore/makefile.mk b/sw/source/core/unocore/makefile.mk deleted file mode 100644 index 09e6371ada80..000000000000 --- a/sw/source/core/unocore/makefile.mk +++ /dev/null @@ -1,124 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=unocore - -# --- Settings ----------------------------------------------------- -#ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- -EXCEPTIONSFILES= \ - $(SLO)$/swunohelper.obj\ - $(SLO)$/SwXTextDefaults.obj\ - $(SLO)$/unobkm.obj\ - $(SLO)$/unochart.obj\ - $(SLO)$/unoevent.obj\ - $(SLO)$/unocrsrhelper.obj\ - $(SLO)$/unoevtlstnr.obj\ - $(SLO)$/unoftn.obj\ - $(SLO)$/unorefmk.obj\ - $(SLO)$/unosect.obj\ - $(SLO)$/unosett.obj\ - $(SLO)$/unocoll.obj\ - $(SLO)$/unodraw.obj\ - $(SLO)$/unofield.obj\ - $(SLO)$/unoframe.obj\ - $(SLO)$/unoidx.obj\ - $(SLO)$/unoobj.obj\ - $(SLO)$/unoobj2.obj\ - $(SLO)$/unoparagraph.obj\ - $(SLO)$/unoport.obj\ - $(SLO)$/unoredline.obj\ - $(SLO)$/unoredlines.obj\ - $(SLO)$/unosrch.obj\ - $(SLO)$/unostyle.obj\ - $(SLO)$/unotbl.obj \ - $(SLO)$/unoflatpara.obj\ - $(SLO)$/unotextmarkup.obj\ - $(SLO)$/TextCursorHelper.obj \ - $(SLO)$/unotext.obj - -.IF "$(GUI)$(COM)$(CPU)" == "WNTMSCI" -EXCEPTIONSNOOPTFILES =$(SLO)$/unoportenum.obj -.ELSE -EXCEPTIONSFILES +=$(SLO)$/unoportenum.obj -.ENDIF - - -SRS1NAME=$(TARGET) -SRC1FILES = \ - unocore.src - -SLOFILES = \ - $(SLO)$/swunohelper.obj\ - $(SLO)$/SwXTextDefaults.obj\ - $(SLO)$/unoportenum.obj\ - $(SLO)$/unobkm.obj\ - $(SLO)$/unochart.obj\ - $(SLO)$/unoevent.obj\ - $(SLO)$/unocrsrhelper.obj\ - $(SLO)$/unoevtlstnr.obj\ - $(SLO)$/unoftn.obj\ - $(SLO)$/unorefmk.obj\ - $(SLO)$/unosect.obj\ - $(SLO)$/unosett.obj\ - $(SLO)$/unocoll.obj\ - $(SLO)$/unodraw.obj\ - $(SLO)$/unofield.obj\ - $(SLO)$/unoframe.obj\ - $(SLO)$/unoidx.obj\ - $(SLO)$/unoobj.obj\ - $(SLO)$/unoobj2.obj\ - $(SLO)$/unoparagraph.obj\ - $(SLO)$/unoport.obj\ - $(SLO)$/unoredline.obj\ - $(SLO)$/unoredlines.obj\ - $(SLO)$/unosrch.obj\ - $(SLO)$/unostyle.obj\ - $(SLO)$/unotbl.obj \ - $(SLO)$/unoflatpara.obj\ - $(SLO)$/unotextmarkup.obj\ - $(SLO)$/TextCursorHelper.obj \ - $(SLO)$/unotext.obj\ - $(SLO)$/unomap.obj\ - $(SLO)$/unoprnms.obj\ - $(SLO)$/XMLRangeHelper.obj - - - -# --- Targets ------------------------------------------------------- - - -.INCLUDE : target.mk - diff --git a/sw/source/core/view/makefile.mk b/sw/source/core/view/makefile.mk deleted file mode 100755 index 0ac0e0d106cb..000000000000 --- a/sw/source/core/view/makefile.mk +++ /dev/null @@ -1,61 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=view -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/vdraw.obj \ - $(SLO)$/viewimp.obj \ - $(SLO)$/viewsh.obj \ - $(SLO)$/pagepreviewlayout.obj \ - $(SLO)$/printdata.obj \ - $(SLO)$/viewpg.obj \ - $(SLO)$/vnew.obj \ - $(SLO)$/vprint.obj - - - -EXCEPTIONSFILES = \ - $(SLO)$/pagepreviewlayout.obj - - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/filter/ascii/makefile.mk b/sw/source/filter/ascii/makefile.mk deleted file mode 100644 index e2bd2bef2569..000000000000 --- a/sw/source/filter/ascii/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=ascii - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - ascatr.cxx \ - parasc.cxx \ - wrtasc.cxx - - - -SLOFILES = \ - $(SLO)$/ascatr.obj \ - $(SLO)$/parasc.obj \ - $(SLO)$/wrtasc.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/filter/basflt/makefile.mk b/sw/source/filter/basflt/makefile.mk deleted file mode 100644 index 7713d1265707..000000000000 --- a/sw/source/filter/basflt/makefile.mk +++ /dev/null @@ -1,58 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=basflt - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/docfact.obj \ - $(SLO)$/fltini.obj \ - $(SLO)$/shellio.obj \ - $(SLO)$/iodetect.obj - -EXCEPTIONSFILES = \ - $(SLO)$/fltini.obj \ - $(SLO)$/iodetect.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/filter/html/makefile.mk b/sw/source/filter/html/makefile.mk deleted file mode 100644 index b99cc6789424..000000000000 --- a/sw/source/filter/html/makefile.mk +++ /dev/null @@ -1,83 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=html - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS=$(CDEFS) -Dmydebug -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/css1atr.obj \ - $(SLO)$/css1kywd.obj \ - $(SLO)$/htmlatr.obj \ - $(SLO)$/htmlbas.obj \ - $(SLO)$/htmlcss1.obj \ - $(SLO)$/htmlctxt.obj \ - $(SLO)$/htmldraw.obj \ - $(SLO)$/htmlfld.obj \ - $(SLO)$/htmlfldw.obj \ - $(SLO)$/htmlfly.obj \ - $(SLO)$/htmlflyt.obj \ - $(SLO)$/htmlform.obj \ - $(SLO)$/htmlforw.obj \ - $(SLO)$/htmlftn.obj \ - $(SLO)$/htmlgrin.obj \ - $(SLO)$/htmlnum.obj \ - $(SLO)$/htmlplug.obj \ - $(SLO)$/htmlsect.obj \ - $(SLO)$/htmltab.obj \ - $(SLO)$/htmltabw.obj \ - $(SLO)$/parcss1.obj \ - $(SLO)$/svxcss1.obj \ - $(SLO)$/swhtml.obj \ - $(SLO)$/wrthtml.obj \ - $(SLO)$/SwAppletImpl.obj \ - -EXCEPTIONSFILES = \ - $(SLO)$/htmlfld.obj \ - $(SLO)$/htmlplug.obj \ - $(SLO)$/htmlsect.obj \ - $(SLO)$/swhtml.obj \ - $(SLO)$/wrthtml.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/filter/inc/makefile.mk b/sw/source/filter/inc/makefile.mk deleted file mode 100644 index 1b35ca49549d..000000000000 --- a/sw/source/filter/inc/makefile.mk +++ /dev/null @@ -1,26 +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. -# -#************************************************************************* diff --git a/sw/source/filter/makefile.mk b/sw/source/filter/makefile.mk deleted file mode 100644 index c2b343eb8bc6..000000000000 --- a/sw/source/filter/makefile.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sw -TARGET=filter - -.IF "$(CALLTARGETS)"=="filter" -RC_SUBDIRS= -.ENDIF - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - - -SUBLIBS= \ - $(SLB)$/ascii.lib \ - $(SLB)$/basflt.lib \ - $(SLB)$/html.lib \ - $(SLB)$/writer.lib \ - $(SLB)$/ww1.lib \ - $(SLB)$/xml.lib - -# ----------------------------------------------------------- - - -################################################################ - -LIB1TARGET=$(SLB)$/filter.lib -LIB1FILES= \ - $(SUBLIBS) - -.INCLUDE : target.mk - -################################################################ - - diff --git a/sw/source/filter/rtf/makefile.mk b/sw/source/filter/rtf/makefile.mk deleted file mode 100644 index 2ff764d730a1..000000000000 --- a/sw/source/filter/rtf/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=rtf - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -MAKING_LIBMSWORD=TRUE -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS=$(CDEFS) -Dmydebug -.ENDIF - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/rtffly.obj \ - $(SLO)$/rtfnum.obj \ - $(SLO)$/swparrtf.obj \ - $(SLO)$/wrtrtf.obj - - -SLOFILES = \ - $(SLO)$/rtfatr.obj \ - $(SLO)$/rtffld.obj \ - $(SLO)$/rtffly.obj \ - $(SLO)$/rtfnum.obj \ - $(SLO)$/rtftbl.obj \ - $(SLO)$/swparrtf.obj \ - $(SLO)$/wrtrtf.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/filter/writer/makefile.mk b/sw/source/filter/writer/makefile.mk deleted file mode 100644 index d08caa9eb441..000000000000 --- a/sw/source/filter/writer/makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=writer - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - writer.cxx \ - wrt_fn.cxx \ - wrtswtbl.cxx - -SLOFILES = \ - $(SLO)$/writer.obj \ - $(SLO)$/wrt_fn.obj \ - $(SLO)$/wrtswtbl.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/filter/ww1/makefile.mk b/sw/source/filter/ww1/makefile.mk deleted file mode 100644 index 4f751cbaea29..000000000000 --- a/sw/source/filter/ww1/makefile.mk +++ /dev/null @@ -1,94 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=ww1 - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS=$(CDEFS) -Dmydebug -.ENDIF - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/w1filter.obj \ - $(SLO)$/fltshell.obj - -SLOFILES = \ - $(SLO)$/w1par.obj \ - $(SLO)$/w1class.obj \ - $(SLO)$/w1filter.obj \ - $(SLO)$/w1sprm.obj \ - $(SLO)$/fltshell.obj \ - - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -run: alltar - -#copy all relevant files to a backupdir -bak: - copy ..\inc\fltshell.hxx backup - copy *.?xx backup - copy makefile* backup - copy vcs.cfg backup - copy ..\..\..\dump1\src\dump1.cxx backup - copy ..\..\..\dump1\src\makefile backup\makefile.dmp - copy ..\..\..\WNTMSCI\bin\makefile backup\makefile.bin - copy ..\..\..\UTIL\makefile backup\makefile.utl - copy s:\solenv\inc\wnt.mak backup - -# remove this filter from libs to avoid annoying effects -upgrade: - attrib -r *.?xx - attrib -r makefile.* - del ..\..\..\WNMSCI\LIB\ww1.lib - del ..\..\..\WNMSCI\DBO\w1*.obj - del ..\..\..\WNMSCI\DBO\fltshell.obj - del ..\..\..\WNMSCI\MISC - lib /nologo /REMOVE:..\..\..\WNTMSCI\obj\fltshell.obj /out:..\..\..\WNTMSCI\LIB\filter.lib ..\..\..\WNTMSCI\LIB\filter.lib - lib /nologo /REMOVE:..\..\..\WNTMSCI\obj\w1sprm.obj /out:..\..\..\WNTMSCI\LIB\filter.lib ..\..\..\WNTMSCI\LIB\filter.lib - lib /nologo /REMOVE:..\..\..\WNTMSCI\obj\w1filter.obj /out:..\..\..\WNTMSCI\LIB\filter.lib ..\..\..\WNTMSCI\LIB\filter.lib - lib /nologo /REMOVE:..\..\..\WNTMSCI\obj\w1class.obj /out:..\..\..\WNTMSCI\LIB\filter.lib ..\..\..\WNTMSCI\LIB\filter.lib - lib /nologo /REMOVE:..\..\..\WNTMSCI\obj\w1par.obj /out:..\..\..\WNTMSCI\LIB\filter.lib ..\..\..\WNTMSCI\LIB\filter.lib - copy backup\makefile.bin ..\..\..\WNTMSCI\bin\makefile - diff backup\makefile.utl ..\..\..\UTIL\makefile - diff s:\solenv\inc\wnt.mak backup - -zip: bak - pkzip c:\temp\ww1 backup\*.* - diff --git a/sw/source/filter/ww8/dump/makefile.mk b/sw/source/filter/ww8/dump/makefile.mk deleted file mode 100644 index 695eddc9d11d..000000000000 --- a/sw/source/filter/ww8/dump/makefile.mk +++ /dev/null @@ -1,122 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=. - -PRJNAME=DUMP8 -TARGET=dump8 - -# --- Settings --------------------------------------------------- - -.INCLUDE : settings.mk - -CXXFILES= dump8.cxx dump8a.cxx ww8dout.cxx ww8darr.cxx ww8scan.cxx msvbasic.cxx - -OBJFILES= $(OBJ)$/dump8.obj $(OBJ)$/dump8a.obj $(OBJ)$/ww8dout.obj \ - $(OBJ)$/ww8darr.obj $(OBJ)$/ww8scan.obj $(OBJ)$/msvbasic.obj - - -.IF "$(depend)" == "" - -CFLAGS+= -DDUMP - -# --- DUMP8 EXE -------------------------------------------------------- - -# IENV=$(IENV);..\RES - -APP1TARGET=$(PRJNAME) - -# RESLIB1NAME=vu -# RESLIB1SRSFILES=$(SRS)$/main.srs - -APP1LIBS=$(LIB1TARGET) - -.IF "$(GUI)" == "WNT" -APP1STDLIBS= $(SVTOOLLIB) $(SVLLIB) $(TOOLSLIB) $(SVLIB) $(SVMEMLIB) $(SO2LIB) -# irtl.lib -.IF "$(SO3)" == "" -APP1STDLIBS+= sdstor.lib -.ELSE -APP1STDLIBS+= $(SOTLIB) -.ENDIF -.IF "$(COMEX)"=="10" -APP1STDLIBS+= $(OLE32LIB) $(OLEAUT32LIB) $(UUIDLIB) $(SHELL32LIB) $(ADVAPI32LIB) libci.lib -.ELSE -APP1STDLIBS+= $(OLE32LIB) $(OLEAUT32LIB) $(UUIDLIB) $(SHELL32LIB) $(ADVAPI32LIB) libci.lib msvcirt.lib -.ENDIF -.ELSE -.IF "$(GUI)" == "OS2" -APP1STDLIBS=sdstor.lib $(SO2LIB) $(SVTOOLLIB) $(SVLIB) tools.lib $(SVMEMLIB) $(SVXLIB) -.ELSE -APP1STDLIBS=$(SVTOOLLIB) tools.lib $(SVLIB) $(SVMEMLIB) sdstor.lib $(SO2LIB) $(SVXLIB) -APP1STDLIBS+= ole2 compobj storage shell -.ENDIF -.ENDIF -.IF "$(GUI)"=="WNT" -APP1DEPN= $(L)$/svtool.lib $(L)$/itools.lib $(SVLIBDEPEND) $(L)$/svmem.lib $(L)$/so2.lib -.ELSE -APP1DEPN= $(L)$/svtool.lib $(L)$/tools.lib $(SVLIBDEPEND) $(L)$/svmem.lib $(L)$/so2.lib -.ENDIF -APP1OBJS= $(OBJ)$/dump8.obj $(OBJ)$/dump8a.obj $(OBJ)$/ww8dout.obj \ - $(OBJ)$/ww8darr.obj $(OBJ)$/ww8scan.obj $(OBJ)/msvbasic.obj - -APP1DEF= $(MISC)$/$(PRJNAME).def - - -#------------------------------------------------------------------------- -# OS/2 -#------------------------------------------------------------------------- - -.IF "$(GUI)" == "OS2" - -ALL: \ - $(SRS)$/main.srs \ - ALLTAR - -$(MISC)$/$(PRJNAME).def: makefile - echo NAME VIEWER WINDOWAPI >$@ - echo DESCRIPTION 'Storage Viewer (C)1995 STAR DIVISION GmbH' >>$@ - echo EXETYPE OS2 >>$@ - echo PROTMODE >>$@ - echo STUB 'OS2STUB.EXE' >>$@ - echo CODE LOADONCALL >>$@ - echo DATA PRELOAD MULTIPLE >>$@ - echo HEAPSIZE 4096 >>$@ - echo STACKSIZE 30000 >>$@ - -.ENDIF # GUI == OS2 - -#------------------------------------------------------------------------- -# Windows NT -#------------------------------------------------------------------------- - -# --- Targets ----------------------------------------------------------- - -.ENDIF - -.INCLUDE : target.mk - diff --git a/sw/source/filter/ww8/makefile.mk b/sw/source/filter/ww8/makefile.mk deleted file mode 100644 index b25887e3e2bf..000000000000 --- a/sw/source/filter/ww8/makefile.mk +++ /dev/null @@ -1,105 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=ww8 - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -MAKING_LIBMSWORD=TRUE -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS=$(CDEFS) -Dmydebug -.ENDIF - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES = \ - $(SLO)$/wrtww8gr.obj \ - $(SLO)$/ww8par2.obj \ - $(SLO)$/ww8par3.obj \ - $(SLO)$/ww8par5.obj \ - $(SLO)$/tracer.obj \ - $(SLO)$/fields.obj \ - $(SLO)$/styles.obj \ - $(SLO)$/ww8graf.obj \ - $(SLO)$/ww8graf2.obj \ - $(SLO)$/wrtw8esh.obj \ - $(SLO)$/wrtw8nds.obj \ - $(SLO)$/wrtw8num.obj \ - $(SLO)$/wrtw8sty.obj \ - $(SLO)$/wrtww8.obj \ - $(SLO)$/ww8atr.obj \ - $(SLO)$/ww8par.obj \ - $(SLO)$/ww8par6.obj \ - $(SLO)$/writerhelper.obj \ - $(SLO)$/writerwordglue.obj \ - $(SLO)$/ww8scan.obj \ - $(SLO)$/WW8TableInfo.obj \ - $(SLO)$/WW8FFData.obj \ - $(SLO)$/WW8Sttbf.obj \ - $(SLO)$/WW8FibData.obj - - -SLOFILES = \ - $(SLO)$/wrtw8esh.obj \ - $(SLO)$/wrtw8nds.obj \ - $(SLO)$/wrtw8num.obj \ - $(SLO)$/wrtw8sty.obj \ - $(SLO)$/wrtww8.obj \ - $(SLO)$/wrtww8gr.obj \ - $(SLO)$/ww8atr.obj \ - $(SLO)$/ww8graf.obj \ - $(SLO)$/ww8graf2.obj \ - $(SLO)$/ww8par.obj \ - $(SLO)$/ww8par2.obj \ - $(SLO)$/ww8par3.obj \ - $(SLO)$/ww8par4.obj \ - $(SLO)$/ww8par5.obj \ - $(SLO)$/ww8par6.obj \ - $(SLO)$/ww8glsy.obj \ - $(SLO)$/tracer.obj \ - $(SLO)$/fields.obj \ - $(SLO)$/styles.obj \ - $(SLO)$/ww8scan.obj \ - $(SLO)$/writerhelper.obj \ - $(SLO)$/writerwordglue.obj \ - $(SLO)$/WW8TableInfo.obj \ - $(SLO)$/WW8FFData.obj \ - $(SLO)$/WW8Sttbf.obj \ - $(SLO)$/WW8FibData.obj - - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/filter/xml/makefile.mk b/sw/source/filter/xml/makefile.mk deleted file mode 100644 index c1191fe3faf1..000000000000 --- a/sw/source/filter/xml/makefile.mk +++ /dev/null @@ -1,94 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=xml - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS=$(CDEFS) -Dmydebug -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/swxml.obj \ - $(SLO)$/xmlimp.obj \ - $(SLO)$/wrtxml.obj \ - $(SLO)$/xmlexp.obj \ - $(SLO)$/xmltext.obj \ - $(SLO)$/xmltexte.obj \ - $(SLO)$/xmltexti.obj \ - $(SLO)$/xmltbli.obj \ - $(SLO)$/xmltble.obj \ - $(SLO)$/xmlfmt.obj \ - $(SLO)$/xmlfmte.obj \ - $(SLO)$/xmlmeta.obj \ - $(SLO)$/xmlscript.obj \ - $(SLO)$/xmlitemm.obj \ - $(SLO)$/xmlitemi.obj \ - $(SLO)$/xmliteme.obj \ - $(SLO)$/xmlithlp.obj \ - $(SLO)$/xmlbrsh.obj \ - $(SLO)$/xmlfonte.obj \ - $(SLO)$/XMLRedlineImportHelper.obj \ - $(SLO)$/xmlitem.obj \ - $(SLO)$/xmlitmpr.obj \ - $(SLO)$/xmlimpit.obj \ - $(SLO)$/xmlexpit.obj - -EXCEPTIONSFILES= \ - $(SLO)$/swxml.obj \ - $(SLO)$/xmlimp.obj \ - $(SLO)$/wrtxml.obj \ - $(SLO)$/xmlexp.obj \ - $(SLO)$/xmltext.obj \ - $(SLO)$/xmltexti.obj \ - $(SLO)$/xmltexte.obj \ - $(SLO)$/xmltbli.obj \ - $(SLO)$/xmltble.obj \ - $(SLO)$/xmlfmt.obj \ - $(SLO)$/xmlfmte.obj \ - $(SLO)$/xmlmeta.obj \ - $(SLO)$/xmlscript.obj \ - $(SLO)$/xmlitemi.obj \ - $(SLO)$/xmliteme.obj \ - $(SLO)$/xmlithlp.obj \ - $(SLO)$/xmlbrsh.obj \ - $(SLO)$/xmlfonte.obj \ - $(SLO)$/XMLRedlineImportHelper.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/sw/source/ui/app/makefile.mk b/sw/source/ui/app/makefile.mk deleted file mode 100644 index 88f9ff9d6398..000000000000 --- a/sw/source/ui/app/makefile.mk +++ /dev/null @@ -1,101 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=app - -LIBTARGET=NO - -# future: DEMO\... - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES =\ - app.src \ - mn.src \ - error.src - - -SLOFILES = \ - $(SLO)$/appenv.obj \ - $(SLO)$/apphdl.obj \ - $(SLO)$/applab.obj \ - $(SLO)$/appopt.obj \ - $(SLO)$/docsh.obj \ - $(SLO)$/docsh2.obj \ - $(SLO)$/docshdrw.obj \ - $(SLO)$/docshini.obj \ - $(SLO)$/docst.obj \ - $(SLO)$/docstyle.obj \ - $(SLO)$/mainwn.obj \ - $(SLO)$/swmodule.obj \ - $(SLO)$/swmodul1.obj \ - $(SLO)$/swdll.obj \ - $(SLO)$/swwait.obj - -EXCEPTIONSFILES= \ - $(SLO)$/docsh.obj \ - $(SLO)$/docst.obj \ - $(SLO)$/docshini.obj \ - $(SLO)$/swmodule.obj \ - $(SLO)$/swmodul1.obj \ - $(SLO)$/apphdl.obj \ - $(SLO)$/docsh2.obj - -LIB1TARGET= $(SLB)$/app.lib - -LIB1OBJFILES= \ - $(SLO)$/appenv.obj \ - $(SLO)$/apphdl.obj \ - $(SLO)$/applab.obj \ - $(SLO)$/appopt.obj \ - $(SLO)$/docsh.obj \ - $(SLO)$/docsh2.obj \ - $(SLO)$/docshdrw.obj \ - $(SLO)$/docshini.obj \ - $(SLO)$/docst.obj \ - $(SLO)$/docstyle.obj \ - $(SLO)$/mainwn.obj \ - $(SLO)$/swmodul1.obj \ - $(SLO)$/swwait.obj - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -$(SRS)$/app.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc - diff --git a/sw/source/ui/cctrl/makefile.mk b/sw/source/ui/cctrl/makefile.mk deleted file mode 100644 index 33ba83f34d7c..000000000000 --- a/sw/source/ui/cctrl/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=cctrl - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - actctrl.cxx \ - popbox.cxx \ - swlbox.cxx - -SLOFILES = \ - $(SLO)$/actctrl.obj \ - $(SLO)$/popbox.obj \ - $(SLO)$/swlbox.obj - -EXCEPTIONSFILES = \ - $(SLO)$/popbox.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/chrdlg/makefile.mk b/sw/source/ui/chrdlg/makefile.mk deleted file mode 100644 index 42aad1aeddf1..000000000000 --- a/sw/source/ui/chrdlg/makefile.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=chrdlg -LIBTARGET=NO -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - swbreak.src \ - chardlg.src \ - chrdlg.src \ - drpcps.src \ - ccoll.src \ - paradlg.src \ - numpara.src - -SLOFILES = \ - $(SLO)$/break.obj \ - $(SLO)$/chardlg.obj \ - $(SLO)$/drpcps.obj \ - $(SLO)$/ccoll.obj \ - $(SLO)$/swuiccoll.obj \ - $(SLO)$/pardlg.obj \ - $(SLO)$/tblnumfm.obj \ - $(SLO)$/numpara.obj - -LIB1TARGET = $(SLB)$/$(TARGET).lib - -LIB1OBJFILES = \ - $(SLO)$/ccoll.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/config/makefile.mk b/sw/source/ui/config/makefile.mk deleted file mode 100644 index 4b8ed01ca90e..000000000000 --- a/sw/source/ui/config/makefile.mk +++ /dev/null @@ -1,87 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=config -LIBTARGET=NO -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- -IMGLST_SRS=$(SRS)$/config.srs -BMP_IN=$(PRJ)$/win/imglst - -SRS1NAME=$(TARGET) -SRC1FILES = \ - mailconfigpage.src \ - optdlg.src \ - optload.src \ - optcomp.src \ - redlopt.src - -EXCEPTIONSFILES = \ - $(SLO)$/mailconfigpage.obj \ - $(SLO)$/optcomp.obj \ - $(SLO)$/optload.obj - -SLOFILES = \ - $(EXCEPTIONSFILES) \ - $(SLO)$/barcfg.obj \ - $(SLO)$/caption.obj \ - $(SLO)$/cfgitems.obj \ - $(SLO)$/dbconfig.obj \ - $(SLO)$/fontcfg.obj \ - $(SLO)$/modcfg.obj \ - $(SLO)$/optpage.obj \ - $(SLO)$/prtopt.obj \ - $(SLO)$/uinums.obj \ - $(SLO)$/usrpref.obj \ - $(SLO)$/viewopt.obj - -LIB1TARGET= $(SLB)$/$(TARGET).lib - -LIB1OBJFILES = \ - $(SLO)$/barcfg.obj \ - $(SLO)$/caption.obj \ - $(SLO)$/cfgitems.obj \ - $(SLO)$/dbconfig.obj \ - $(SLO)$/fontcfg.obj \ - $(SLO)$/modcfg.obj \ - $(SLO)$/prtopt.obj \ - $(SLO)$/uinums.obj \ - $(SLO)$/usrpref.obj \ - $(SLO)$/viewopt.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/dbui/makefile.mk b/sw/source/ui/dbui/makefile.mk deleted file mode 100644 index c2477b02ca4a..000000000000 --- a/sw/source/ui/dbui/makefile.mk +++ /dev/null @@ -1,122 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=dbui -LIBTARGET=no -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- -IMGLST_SRS=$(SRS)$/dbui.srs -BMP_IN=$(PRJ)$/win/imglst - - -SRS1NAME=$(TARGET) -SRC1FILES = \ - addresslistdialog.src \ - createaddresslistdialog.src \ - customizeaddresslistdialog.src \ - dbinsdlg.src \ - dbui.src \ - dbtablepreviewdialog.src \ - mailmergechildwindow.src \ - mailmergewizard.src \ - mmdocselectpage.src \ - mmlayoutpage.src \ - mmoutputpage.src \ - mmoutputtypepage.src \ - mmaddressblockpage.src \ - mmgreetingspage.src \ - mmmergepage.src \ - mmpreparemergepage.src \ - selectdbtabledialog.src \ - -EXCEPTIONSFILES= \ - $(SLO)$/addresslistdialog.obj \ - $(SLO)$/createaddresslistdialog.obj \ - $(SLO)$/customizeaddresslistdialog.obj \ - $(SLO)$/dbinsdlg.obj \ - $(SLO)$/dbmgr.obj \ - $(SLO)$/dbtablepreviewdialog.obj \ - $(SLO)$/dbtree.obj \ - $(SLO)$/maildispatcher.obj \ - $(SLO)$/mailmergechildwindow.obj \ - $(SLO)$/mailmergehelper.obj \ - $(SLO)$/mmaddressblockpage.obj \ - $(SLO)$/mmconfigitem.obj \ - $(SLO)$/mmlayoutpage.obj \ - $(SLO)$/mmgreetingspage.obj \ - $(SLO)$/mmoutputpage.obj - -SLOFILES = \ - $(SLO)$/addresslistdialog.obj \ - $(SLO)$/createaddresslistdialog.obj \ - $(SLO)$/customizeaddresslistdialog.obj \ - $(SLO)$/dbinsdlg.obj \ - $(SLO)$/dbmgr.obj \ - $(SLO)$/dbtree.obj \ - $(SLO)$/dbtablepreviewdialog.obj \ - $(SLO)$/maildispatcher.obj \ - $(SLO)$/mailmergehelper.obj \ - $(SLO)$/mailmergewizard.obj \ - $(SLO)$/mailmergechildwindow.obj \ - $(SLO)$/mmconfigitem.obj \ - $(SLO)$/mmdocselectpage.obj \ - $(SLO)$/mmlayoutpage.obj \ - $(SLO)$/mmoutputpage.obj \ - $(SLO)$/mmoutputtypepage.obj \ - $(SLO)$/mmaddressblockpage.obj \ - $(SLO)$/mmgreetingspage.obj \ - $(SLO)$/mmmergepage.obj \ - $(SLO)$/mmpreparemergepage.obj \ - $(SLO)$/dbui.obj \ - $(SLO)$/selectdbtabledialog.obj \ - $(SLO)$/swdbtoolsclient.obj - - -LIB1TARGET = $(SLB)$/$(TARGET).lib - -LIB1OBJFILES = \ - $(SLO)$/dbmgr.obj \ - $(SLO)$/dbtree.obj \ - $(SLO)$/dbui.obj \ - $(SLO)$/maildispatcher.obj \ - $(SLO)$/mailmergehelper.obj \ - $(SLO)$/mailmergechildwindow.obj \ - $(SLO)$/mmconfigitem.obj \ - $(SLO)$/swdbtoolsclient.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/dialog/makefile.mk b/sw/source/ui/dialog/makefile.mk deleted file mode 100644 index 26047ad63655..000000000000 --- a/sw/source/ui/dialog/makefile.mk +++ /dev/null @@ -1,85 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=dialog -LIBTARGET=no - -# future: DEMO\dialog.srs - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - abstract.src \ - ascfldlg.src \ - dialog.src \ - docstdlg.src \ - regionsw.src \ - wordcountdialog.src - -EXCEPTIONSFILES = \ - $(SLO)$/SwSpellDialogChildWindow.obj - -SLOFILES = \ - $(SLO)$/abstract.obj \ - $(SLO)$/addrdlg.obj \ - $(SLO)$/ascfldlg.obj \ - $(SLO)$/docstdlg.obj \ - $(SLO)$/macassgn.obj \ - $(SLO)$/SwSpellDialogChildWindow.obj \ - $(SLO)$/regionsw.obj \ - $(SLO)$/uiregionsw.obj \ - $(SLO)$/swabstdlg.obj \ - $(SLO)$/swuiexp.obj \ - $(SLO)$/swwrtshitem.obj \ - $(SLO)$/swdialmgr.obj \ - $(SLO)$/wordcountdialog.obj \ - $(SLO)$/swdlgfact.obj - -LIB1TARGET = $(SLB)$/$(TARGET).lib - -LIB1OBJFILES = \ - $(SLO)$/regionsw.obj \ - $(SLO)$/swabstdlg.obj \ - $(SLO)$/SwSpellDialogChildWindow.obj \ - $(SLO)$/swwrtshitem.obj - -# $(SLO)$/macassgn.obj \ - -# --- Tagets ------------------------------------------------------- -.INCLUDE : target.mk - - - diff --git a/sw/source/ui/dochdl/makefile.mk b/sw/source/ui/dochdl/makefile.mk deleted file mode 100644 index 48400052f5c5..000000000000 --- a/sw/source/ui/dochdl/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=dochdl -LIBTARGET=no -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - dochdl.src \ - selglos.src - -SLOFILES = \ - $(SLO)$/gloshdl.obj \ - $(SLO)$/selglos.obj \ - $(SLO)$/swdtflvr.obj - -EXCEPTIONSFILES = \ - $(SLO)$/swdtflvr.obj - -# $(SLO)$/dataex.obj \ - -LIB1TARGET = $(SLB)$/$(TARGET).lib - -LIB1OBJFILES = \ - $(SLO)$/gloshdl.obj \ - $(SLO)$/swdtflvr.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/docvw/makefile.mk b/sw/source/ui/docvw/makefile.mk deleted file mode 100644 index a2914b2f86b7..000000000000 --- a/sw/source/ui/docvw/makefile.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=docvw -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - access.src \ - docvw.src \ - annotation.src - -SLOFILES = \ - $(SLO)$/edtdd.obj \ - $(SLO)$/edtwin.obj \ - $(SLO)$/edtwin2.obj \ - $(SLO)$/edtwin3.obj \ - $(SLO)$/romenu.obj \ - $(SLO)$/srcedtw.obj \ - $(SLO)$/PostItMgr.obj \ - $(SLO)$/frmsidebarwincontainer.obj \ - $(SLO)$/AnchorOverlayObject.obj \ - $(SLO)$/ShadowOverlayObject.obj \ - $(SLO)$/SidebarWin.obj \ - $(SLO)$/SidebarWinAcc.obj \ - $(SLO)$/AnnotationWin.obj \ - $(SLO)$/AnnotationMenuButton.obj \ - $(SLO)$/SidebarTxtControl.obj \ - $(SLO)$/SidebarTxtControlAcc.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/envelp/makefile.mk b/sw/source/ui/envelp/makefile.mk deleted file mode 100644 index 3010601b0ac2..000000000000 --- a/sw/source/ui/envelp/makefile.mk +++ /dev/null @@ -1,80 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=envelp -LIBTARGET=no -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES =\ - envelp.src \ - envfmt.src \ - envlop.src \ - envprt.src \ - label.src \ - labfmt.src \ - labprt.src \ - mailmrge.src - -SLOFILES = \ - $(SLO)$/envfmt.obj \ - $(SLO)$/envimg.obj \ - $(SLO)$/envlop1.obj \ - $(SLO)$/envprt.obj \ - $(SLO)$/labelcfg.obj \ - $(SLO)$/label1.obj \ - $(SLO)$/labelexp.obj \ - $(SLO)$/labfmt.obj \ - $(SLO)$/labprt.obj \ - $(SLO)$/labimg.obj \ - $(SLO)$/mailmrge.obj \ - $(SLO)$/syncbtn.obj - -EXCEPTIONSFILES= \ - $(SLO)$/labelexp.obj \ - $(SLO)$/mailmrge.obj - -LIB1TARGET = $(SLB)$/$(TARGET).lib - -LIB1OBJFILES = \ - $(SLO)$/envimg.obj \ - $(SLO)$/labelcfg.obj \ - $(SLO)$/labimg.obj \ - $(SLO)$/syncbtn.obj -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/fldui/makefile.mk b/sw/source/ui/fldui/makefile.mk deleted file mode 100644 index ee9dbff9cf7e..000000000000 --- a/sw/source/ui/fldui/makefile.mk +++ /dev/null @@ -1,94 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -LIBTARGET=no -PRJNAME=sw -TARGET=fldui - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - changedb.src \ - DropDownFieldDialog.src\ - flddb.src \ - flddinf.src \ - flddok.src \ - fldfunc.src \ - fldref.src \ - fldtdlg.src \ - fldui.src \ - fldvar.src \ - javaedit.src \ - inpdlg.src - -SLOFILES = \ - $(SLO)$/changedb.obj \ - $(SLO)$/DropDownFieldDialog.obj \ - $(SLO)$/flddb.obj \ - $(SLO)$/flddinf.obj \ - $(SLO)$/flddok.obj \ - $(SLO)$/fldedt.obj \ - $(SLO)$/fldfunc.obj \ - $(SLO)$/fldmgr.obj \ - $(SLO)$/fldpage.obj \ - $(SLO)$/fldref.obj \ - $(SLO)$/fldtdlg.obj \ - $(SLO)$/fldvar.obj \ - $(SLO)$/javaedit.obj \ - $(SLO)$/inpdlg.obj \ - $(SLO)$/fldwrap.obj \ - $(SLO)$/xfldui.obj \ - $(SLO)$/FldRefTreeListBox.obj - - -EXCEPTIONSFILES = \ - $(SLO)$/fldtdlg.obj \ - $(SLO)$/fldedt.obj \ - $(SLO)$/flddinf.obj \ - $(SLO)$/xfldui.obj - -LIB1TARGET = $(SLB)$/$(TARGET).lib - -LIB1OBJFILES = \ - $(SLO)$/fldmgr.obj \ - $(SLO)$/fldwrap.obj \ - $(SLO)$/xfldui.obj - -# $(SLO)$/DropDownFieldDialog.obj \ - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/fmtui/makefile.mk b/sw/source/ui/fmtui/makefile.mk deleted file mode 100644 index 37ad48df008e..000000000000 --- a/sw/source/ui/fmtui/makefile.mk +++ /dev/null @@ -1,51 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=fmtui -LIBTARGET=NO -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - tmpdlg.src - -SLOFILES = \ - $(SLO)$/tmpdlg.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/frmdlg/makefile.mk b/sw/source/ui/frmdlg/makefile.mk deleted file mode 100644 index a7addb0b9493..000000000000 --- a/sw/source/ui/frmdlg/makefile.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=frmdlg -LIBTARGET=no - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - column.src \ - cption.src \ - frmpage.src \ - frmui.src \ - wrap.src - -SLOFILES = \ - $(SLO)$/colmgr.obj \ - $(SLO)$/column.obj \ - $(SLO)$/colex.obj \ - $(SLO)$/cption.obj \ - $(SLO)$/frmdlg.obj \ - $(SLO)$/frmmgr.obj \ - $(SLO)$/frmpage.obj \ - $(SLO)$/pattern.obj \ - $(SLO)$/uiborder.obj \ - $(SLO)$/wrap.obj - -EXCEPTIONSFILES = \ - $(SLO)$/frmpage.obj \ - $(SLO)$/cption.obj - -LIB1TARGET = $(SLB)$/$(TARGET).lib - -LIB1OBJFILES = \ - $(SLO)$/colmgr.obj \ - $(SLO)$/colex.obj \ - $(SLO)$/frmmgr.obj - - - - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/globdoc/makefile.mk b/sw/source/ui/globdoc/makefile.mk deleted file mode 100644 index d75eb7af8807..000000000000 --- a/sw/source/ui/globdoc/makefile.mk +++ /dev/null @@ -1,51 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=globdoc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - globdoc.src - -SLOFILES = \ - $(SLO)$/globdoc.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/inc/makefile.mk b/sw/source/ui/inc/makefile.mk deleted file mode 100644 index cb9b968dcc06..000000000000 --- a/sw/source/ui/inc/makefile.mk +++ /dev/null @@ -1,42 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=uiinc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -LOCALIZE_ME=swmn_tmpl.hrc toolbox_tmpl.hrc - -.INCLUDE : target.mk - diff --git a/sw/source/ui/index/makefile.mk b/sw/source/ui/index/makefile.mk deleted file mode 100644 index 647b579e531b..000000000000 --- a/sw/source/ui/index/makefile.mk +++ /dev/null @@ -1,68 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=index -LIBTARGET=NO -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - cnttab.src \ - idxmrk.src \ - multmrk.src - -EXCEPTIONSFILES = \ - $(SLO)$/cnttab.obj \ - $(SLO)$/cntex.obj - -SLOFILES = \ - $(SLO)$/cnttab.obj \ - $(SLO)$/cntex.obj \ - $(SLO)$/idxmrk.obj \ - $(SLO)$/swuiidxmrk.obj \ - $(SLO)$/multmrk.obj \ - $(SLO)$/toxmgr.obj - -LIB1TARGET= $(SLB)$/$(TARGET).lib - -LIB1OBJFILES = \ - $(SLO)$/idxmrk.obj \ - $(SLO)$/toxmgr.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/lingu/makefile.mk b/sw/source/ui/lingu/makefile.mk deleted file mode 100644 index 617910a61060..000000000000 --- a/sw/source/ui/lingu/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=lingu - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/olmenu.obj \ - -SLOFILES = \ - $(SLO)$/hyp.obj \ - $(SLO)$/olmenu.obj \ - $(SLO)$/sdrhhcwrap.obj \ - $(SLO)$/hhcwrp.obj - -SRS1NAME=$(TARGET) -SRC1FILES = \ - olmenu.src - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/makefile.mk b/sw/source/ui/makefile.mk deleted file mode 100644 index b331a2a00765..000000000000 --- a/sw/source/ui/makefile.mk +++ /dev/null @@ -1,101 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sw -TARGET=ui - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(GUI)" != "OS2" -.IF "$(GUI)" != "WNT" -.IF "$(COM)" != "BLC" -.IF "$(COM)" != "WTC" -LIBFLAGS=/NOI /NOE /PAGE:256 -.ENDIF -.ENDIF -.ENDIF -.ENDIF - -# --- Files -------------------------------------------------------- - -# andere Label als Verzeichnisnamen fuer VC++/NT - -SUBLIBS1= \ - $(SLB)$/app.lib \ - $(SLB)$/cctrl.lib \ - $(SLB)$/chrdlg.lib \ - $(SLB)$/config.lib \ - $(SLB)$/dbui.lib \ - $(SLB)$/dialog.lib \ - $(SLB)$/dochdl.lib \ - $(SLB)$/docvw.lib \ - $(SLB)$/envelp.lib \ - $(SLB)$/fldui.lib \ - $(SLB)$/frmdlg.lib \ - $(SLB)$/globdoc.lib - -SUBLIBS2= \ - $(SLB)$/index.lib \ - $(SLB)$/lingu.lib \ - $(SLB)$/misc.lib \ - $(SLB)$/ribbar.lib \ - $(SLB)$/shells.lib \ - $(SLB)$/smartmenu.lib \ - $(SLB)$/table.lib \ - $(SLB)$/unoidl.lib \ - $(SLB)$/utlui.lib \ - $(SLB)$/web.lib \ - $(SLB)$/uiview.lib \ - $(SLB)$/wrtsh.lib - -# ----------------------------------------------------------- - -################################################################ - -LIB1TARGET=$(SLB)$/ui1.lib -LIB1FILES= \ - $(SUBLIBS1) - -LIB2TARGET=$(SLB)$/ui2.lib -LIB2FILES= \ - $(SUBLIBS2) - -.INCLUDE : target.mk - -################################################################ - -kill: - @$(RM) $(SLB)$/ui.lst - @$(RM) $(SLB)$/ui.lib - - diff --git a/sw/source/ui/misc/makefile.mk b/sw/source/ui/misc/makefile.mk deleted file mode 100644 index 72d9f80aec3f..000000000000 --- a/sw/source/ui/misc/makefile.mk +++ /dev/null @@ -1,96 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=misc -LIBTARGET=no -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES=\ - bookmark.src \ - docfnote.src \ - glossary.src \ - glosbib.src \ - insfnote.src \ - insrule.src \ - linenum.src \ - num.src \ - numberingtypelistbox.src \ - outline.src \ - pgfnote.src \ - pggrid.src \ - redlndlg.src \ - srtdlg.src - -EXCEPTIONSFILES = \ - $(SLO)$/glossary.obj \ - $(SLO)$/glosdoc.obj \ - $(SLO)$/glshell.obj \ - $(SLO)$/numberingtypelistbox.obj \ - $(SLO)$/outline.obj \ - $(SLO)$/redlndlg.obj - - -SLOFILES = \ - $(SLO)$/bookmark.obj \ - $(SLO)$/docfnote.obj \ - $(SLO)$/glosbib.obj \ - $(SLO)$/glosdoc.obj \ - $(SLO)$/glossary.obj \ - $(SLO)$/glshell.obj \ - $(SLO)$/insfnote.obj \ - $(SLO)$/insrule.obj \ - $(SLO)$/linenum.obj \ - $(SLO)$/num.obj \ - $(SLO)$/numberingtypelistbox.obj \ - $(SLO)$/outline.obj \ - $(SLO)$/pgfnote.obj \ - $(SLO)$/pggrid.obj \ - $(SLO)$/redlndlg.obj \ - $(SLO)$/swmodalredlineacceptdlg.obj \ - $(SLO)$/srtdlg.obj - -LIB1TARGET = $(SLB)$/$(TARGET).lib - -LIB1OBJFILES = \ - $(SLO)$/glosdoc.obj \ - $(SLO)$/glshell.obj \ - $(SLO)$/numberingtypelistbox.obj \ - $(SLO)$/redlndlg.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/ribbar/makefile.mk b/sw/source/ui/ribbar/makefile.mk deleted file mode 100644 index 2adb59eec185..000000000000 --- a/sw/source/ui/ribbar/makefile.mk +++ /dev/null @@ -1,70 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=ribbar - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - tbxanchr.src \ - inputwin.src \ - workctrl.src - -EXCEPTIONSFILES = \ - $(SLO)$/tblctrl.obj \ - $(SLO)$/tbxanchr.obj \ - $(SLO)$/workctrl.obj - -SLOFILES = \ - $(SLO)$/inputwin.obj \ - $(SLO)$/tbxanchr.obj \ - $(SLO)$/conrect.obj \ - $(SLO)$/conform.obj \ - $(SLO)$/conpoly.obj \ - $(SLO)$/conarc.obj \ - $(SLO)$/concustomshape.obj \ - $(SLO)$/dselect.obj \ - $(SLO)$/drawbase.obj \ - $(SLO)$/tblctrl.obj \ - $(SLO)$/workctrl.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - -$(SRS)$/ribbar.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc - diff --git a/sw/source/ui/shells/makefile.mk b/sw/source/ui/shells/makefile.mk deleted file mode 100644 index dce62a2c9336..000000000000 --- a/sw/source/ui/shells/makefile.mk +++ /dev/null @@ -1,94 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=shells - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - shells.src - -SLOFILES = \ - $(SLO)$/langhelper.obj \ - $(SLO)$/annotsh.obj \ - $(SLO)$/basesh.obj \ - $(SLO)$/beziersh.obj \ - $(SLO)$/drawdlg.obj \ - $(SLO)$/drawsh.obj \ - $(SLO)$/drformsh.obj \ - $(SLO)$/drwbassh.obj \ - $(SLO)$/drwtxtex.obj \ - $(SLO)$/drwtxtsh.obj \ - $(SLO)$/frmsh.obj \ - $(SLO)$/grfsh.obj \ - $(SLO)$/grfshex.obj \ - $(SLO)$/mediash.obj \ - $(SLO)$/listsh.obj \ - $(SLO)$/olesh.obj \ - $(SLO)$/slotadd.obj \ - $(SLO)$/tabsh.obj \ - $(SLO)$/textdrw.obj \ - $(SLO)$/textfld.obj \ - $(SLO)$/textglos.obj \ - $(SLO)$/textidx.obj \ - $(SLO)$/textsh.obj \ - $(SLO)$/textsh1.obj \ - $(SLO)$/textsh2.obj \ - $(SLO)$/txtattr.obj \ - $(SLO)$/txtcrsr.obj \ - $(SLO)$/txtnum.obj - -EXCEPTIONSFILES = \ - $(SLO)$/basesh.obj \ - $(SLO)$/annotsh.obj \ - $(SLO)$/drwtxtsh.obj \ - $(SLO)$/textsh.obj \ - $(SLO)$/textsh2.obj \ - $(SLO)$/grfshex.obj \ - $(SLO)$/drawsh.obj \ - $(SLO)$/drwtxtsh.obj \ - $(SLO)$/frmsh.obj \ - $(SLO)$/drwtxtex.obj \ - $(SLO)$/slotadd.obj \ - $(SLO)$/textsh1.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - -$(SRS)$/shells.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc - diff --git a/sw/source/ui/smartmenu/makefile.mk b/sw/source/ui/smartmenu/makefile.mk deleted file mode 100644 index 1950430cf378..000000000000 --- a/sw/source/ui/smartmenu/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=smartmenu - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES = \ - $(SLO)$/stmenu.obj - -SLOFILES = \ - $(SLO)$/stmenu.obj - -SRS1NAME=$(TARGET) -SRC1FILES = \ - stmenu.src - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/table/makefile.mk b/sw/source/ui/table/makefile.mk deleted file mode 100644 index 8b2ba850d174..000000000000 --- a/sw/source/ui/table/makefile.mk +++ /dev/null @@ -1,81 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=table -LIBTARGET=no -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/chartins.obj\ - -SRS1NAME=$(TARGET) -SRC1FILES = \ - colwd.src \ - convert.src \ - chartins.src \ - instable.src \ - mergetbl.src \ - rowht.src \ - splittbl.src \ - table.src \ - tabledlg.src \ - tautofmt.src - -SLOFILES = \ - $(SLO)$/colwd.obj \ - $(SLO)$/convert.obj \ - $(SLO)$/chartins.obj \ - $(SLO)$/instable.obj \ - $(SLO)$/mergetbl.obj \ - $(SLO)$/rowht.obj \ - $(SLO)$/splittbl.obj \ - $(SLO)$/tabledlg.obj \ - $(SLO)$/tablemgr.obj \ - $(SLO)$/swtablerep.obj \ - $(SLO)$/tautofmt.obj - -LIB1TARGET = $(SLB)$/$(TARGET).lib - -LIB1OBJFILES = \ - $(SLO)$/chartins.obj \ - $(SLO)$/swtablerep.obj \ - $(SLO)$/tablemgr.obj - - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/uiview/makefile.mk b/sw/source/ui/uiview/makefile.mk deleted file mode 100644 index 337ee85da580..000000000000 --- a/sw/source/ui/uiview/makefile.mk +++ /dev/null @@ -1,90 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=uiview - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - view.src \ - pview.src - -EXCEPTIONSFILES= \ - $(SLO)$/formatclipboard.obj \ - $(SLO)$/srcview.obj \ - $(SLO)$/swcli.obj \ - $(SLO)$/uivwimp.obj \ - $(SLO)$/view.obj \ - $(SLO)$/view0.obj \ - $(SLO)$/view1.obj \ - $(SLO)$/view2.obj \ - $(SLO)$/viewdraw.obj \ - $(SLO)$/viewport.obj \ - $(SLO)$/viewprt.obj \ - $(SLO)$/viewsrch.obj \ - $(SLO)$/viewling.obj \ - $(SLO)$/viewmdi.obj \ - -SLOFILES = \ - $(SLO)$/view0.obj \ - $(SLO)$/view.obj \ - $(SLO)$/view1.obj \ - $(SLO)$/view2.obj \ - $(SLO)$/viewcoll.obj \ - $(SLO)$/viewdlg2.obj \ - $(SLO)$/viewdlg.obj \ - $(SLO)$/viewdraw.obj \ - $(SLO)$/viewling.obj \ - $(SLO)$/viewmdi.obj \ - $(SLO)$/pview.obj \ - $(SLO)$/viewport.obj \ - $(SLO)$/viewstat.obj \ - $(SLO)$/viewtab.obj \ - $(SLO)$/viewprt.obj \ - $(SLO)$/viewsrch.obj \ - $(SLO)$/scroll.obj \ - $(SLO)$/swcli.obj \ - $(SLO)$/srcview.obj \ - $(SLO)$/uivwimp.obj \ - $(SLO)$/formatclipboard.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - -$(SRS)$/uiview.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc - diff --git a/sw/source/ui/uno/makefile.mk b/sw/source/ui/uno/makefile.mk deleted file mode 100644 index ac4b6dde697b..000000000000 --- a/sw/source/ui/uno/makefile.mk +++ /dev/null @@ -1,81 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=unoidl -ENABLE_EXCEPTIONS=TRUE -LIBTARGET=no - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(DVO_XFORMS)" != "" -CDEFS+=-DDVO_XFORMS -.ENDIF - -# --- Files -------------------------------------------------------- - -SLO1FILES = \ - $(SLO)$/unodefaults.obj\ - $(SLO)$/unodispatch.obj\ - $(SLO)$/unotxdoc.obj\ - $(SLO)$/unoatxt.obj \ - $(SLO)$/unomailmerge.obj \ - $(SLO)$/unomod.obj \ - $(SLO)$/unotxvw.obj \ - $(SLO)$/dlelstnr.obj \ - $(SLO)$/unofreg.obj \ - $(SLO)$/SwXDocumentSettings.obj \ - $(SLO)$/SwXFilterOptions.obj\ - $(SLO)$/RefreshListenerContainer.obj \ - $(SLO)$/unomodule.obj \ - $(SLO)$/unodoc.obj - -SLO2FILES = \ - $(SLO)$/swdetect.obj \ - $(SLO)$/swdet2.obj \ - $(SLO)$/detreg.obj - -SLOFILES = \ - $(SLO1FILES) \ - $(SLO2FILES) - -LIB1TARGET = \ - $(SLB)$/$(TARGET).lib - -LIB1OBJFILES = \ - $(SLO1FILES) - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/utlui/makefile.mk b/sw/source/ui/utlui/makefile.mk deleted file mode 100644 index cded61eee357..000000000000 --- a/sw/source/ui/utlui/makefile.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=utlui - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - - -SRS1NAME=$(TARGET) -SRC1FILES = \ - initui.src \ - gloslst.src \ - navipi.src \ - poolfmt.src \ - attrdesc.src \ - unotools.src \ - utlui.src - -EXCEPTIONSFILES= \ - $(SLO)$/bookctrl.obj \ - $(SLO)$/glbltree.obj \ - $(SLO)$/navipi.obj \ - $(SLO)$/unotools.obj \ - $(SLO)$/content.obj \ - $(SLO)$/swrenamexnameddlg.obj - -SLOFILES = $(EXCEPTIONSFILES) \ - $(SLO)$/condedit.obj \ - $(SLO)$/gloslst.obj \ - $(SLO)$/initui.obj \ - $(SLO)$/navicfg.obj \ - $(SLO)$/numfmtlb.obj \ - $(SLO)$/prcntfld.obj \ - $(SLO)$/textcontrolcombo.obj \ - $(SLO)$/tmplctrl.obj \ - $(SLO)$/uitool.obj \ - $(SLO)$/uiitems.obj \ - $(SLO)$/attrdesc.obj \ - $(SLO)$/shdwcrsr.obj \ - $(SLO)$/zoomctrl.obj \ - $(SLO)$/viewlayoutctrl.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/vba/makefile.mk b/sw/source/ui/vba/makefile.mk deleted file mode 100644 index 9c2b40d1a9b0..000000000000 --- a/sw/source/ui/vba/makefile.mk +++ /dev/null @@ -1,99 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=vbaswobj -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -.IF "$(ENABLE_VBA)"!="YES" -dummy: - @echo "not building vba..." -.ENDIF - -INCPRE=$(INCCOM)$/$(TARGET) -CDEFS+=-DVBA_OOBUILD_HACK -# ------------------------------------------------------------------ - -SLOFILES= \ - $(SLO)$/vbaglobals.obj \ - $(SLO)$/vbaapplication.obj \ - $(SLO)$/vbadocument.obj \ - $(SLO)$/vbawindow.obj \ - $(SLO)$/vbasystem.obj \ - $(SLO)$/vbarangehelper.obj \ - $(SLO)$/vbarange.obj \ - $(SLO)$/vbabookmark.obj \ - $(SLO)$/vbabookmarks.obj \ - $(SLO)$/vbavariable.obj \ - $(SLO)$/vbavariables.obj \ - $(SLO)$/vbaview.obj \ - $(SLO)$/wordvbahelper.obj \ - $(SLO)$/service.obj \ - $(SLO)$/vbadocumentproperties.obj \ - $(SLO)$/vbapane.obj \ - $(SLO)$/vbapanes.obj \ - $(SLO)$/vbaoptions.obj \ - $(SLO)$/vbaselection.obj \ - $(SLO)$/vbatemplate.obj \ - $(SLO)$/vbaparagraphformat.obj \ - $(SLO)$/vbaautotextentry.obj \ - $(SLO)$/vbaparagraph.obj \ - $(SLO)$/vbafind.obj \ - $(SLO)$/vbareplacement.obj \ - $(SLO)$/vbastyle.obj \ - $(SLO)$/vbastyles.obj \ - $(SLO)$/vbafont.obj \ - $(SLO)$/vbapalette.obj \ - $(SLO)$/vbainformationhelper.obj \ - $(SLO)$/vbatable.obj \ - $(SLO)$/vbatables.obj \ - $(SLO)$/vbafield.obj \ - $(SLO)$/vbaborders.obj \ - $(SLO)$/vbadocuments.obj \ - $(SLO)$/vbaheaderfooter.obj \ - $(SLO)$/vbaheaderfooterhelper.obj \ - $(SLO)$/vbaaddin.obj \ - $(SLO)$/vbaaddins.obj \ - $(SLO)$/vbadialogs.obj \ - $(SLO)$/vbadialog.obj \ - $(SLO)$/vbawrapformat.obj \ - $(SLO)$/vbapagesetup.obj \ - $(SLO)$/vbasection.obj \ - $(SLO)$/vbasections.obj \ - $(SLO)$/vbaeventshelper.obj \ - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/sw/source/ui/web/makefile.mk b/sw/source/ui/web/makefile.mk deleted file mode 100644 index 2b1eb7590b9a..000000000000 --- a/sw/source/ui/web/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=web - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - web.src - -SLOFILES = \ - $(SLO)$/wformsh.obj \ - $(SLO)$/wgrfsh.obj \ - $(SLO)$/wlistsh.obj \ - $(SLO)$/wolesh.obj \ - $(SLO)$/wtabsh.obj \ - $(SLO)$/wfrmsh.obj \ - $(SLO)$/wtextsh.obj \ - $(SLO)$/wdocsh.obj \ - $(SLO)$/wview.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/wrtsh/makefile.mk b/sw/source/ui/wrtsh/makefile.mk deleted file mode 100644 index baeb3acd25e5..000000000000 --- a/sw/source/ui/wrtsh/makefile.mk +++ /dev/null @@ -1,62 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=wrtsh - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - wrtsh.src - -SLOFILES = \ - $(SLO)$/move.obj \ - $(SLO)$/select.obj \ - $(SLO)$/wrtsh1.obj \ - $(SLO)$/wrtsh2.obj \ - $(SLO)$/wrtsh3.obj \ - $(SLO)$/wrtsh4.obj \ - $(SLO)$/delete.obj \ - $(SLO)$/wrtundo.obj - -EXCEPTIONSFILES = \ - $(SLO)$/wrtsh1.obj \ - $(SLO)$/wrtsh2.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/uiconfig/layout/makefile.mk b/sw/uiconfig/layout/makefile.mk deleted file mode 100644 index 9437db7a009b..000000000000 --- a/sw/uiconfig/layout/makefile.mk +++ /dev/null @@ -1,46 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=../.. -PRJNAME=sw -TARGET=layout - -.INCLUDE : settings.mk - -.IF "$(ENABLE_LAYOUT)" == "TRUE" - -all: ALLTAR - -XML_FILES=wordcount.xml - -.INCLUDE : layout.mk - -.ELSE # ENABLE_LAYOUT != TRUE -all .PHONY: -.ENDIF # ENABLE_LAYOUT != TRUE - -.INCLUDE : target.mk diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk deleted file mode 100644 index 0163270b052c..000000000000 --- a/sw/util/makefile.mk +++ /dev/null @@ -1,394 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=sw -TARGET=sw -GEN_HID=TRUE -GEN_HID_OTHER=TRUE -USE_DEFFILE=TRUE - -# --- Settings ------------------------------------------------------------ - -.INCLUDE : settings.mk - -# --- Allgemein ----------------------------------------------------------- - -sw_res_files= \ - $(SRS)$/app.srs \ - $(SRS)$/dialog.srs \ - $(SRS)$/chrdlg.srs \ - $(SRS)$/config.srs \ - $(SRS)$/dbui.srs \ - $(SRS)$/dochdl.srs \ - $(SRS)$/docvw.srs \ - $(SRS)$/envelp.srs \ - $(SRS)$/fldui.srs \ - $(SRS)$/fmtui.srs \ - $(SRS)$/frmdlg.srs \ - $(SRS)$/globdoc.srs \ - $(SRS)$/index.srs \ - $(SRS)$/lingu.srs \ - $(SRS)$/misc.srs \ - $(SRS)$/ribbar.srs \ - $(SRS)$/shells.srs \ - $(SRS)$/smartmenu.srs \ - $(SRS)$/table.srs \ - $(SRS)$/uiview.srs \ - $(SRS)$/undo.srs \ - $(SRS)$/unocore.srs \ - $(SRS)$/utlui.srs \ - $(SRS)$/web.srs \ - $(SRS)$/wrtsh.srs - -RESLIB1NAME=sw -RESLIB1IMAGES=$(PRJ)$/imglst $(PRJ)$/res -RESLIB1SRSFILES= \ - $(sw_res_files) - -SWLIBFILES = \ - $(SLB)$/core1.lib \ - $(SLB)$/core2.lib \ - $(SLB)$/core3.lib \ - $(SLB)$/core4.lib \ - $(SLB)$/filter.lib \ - $(SLB)$/ui1.lib \ - $(SLB)$/ui2.lib - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -SHL1USE_EXPORTS=name -SHL1IMPLIB= _$(TARGET) -SHL1LIBS= $(SLB)$/swall.lib $(SWLIBFILES) - -LIB1TARGET =$(SLB)$/swall.lib - -LIB1OBJFILES= $(OUT)$/slo$/swmodule.obj \ - $(OUT)$/slo$/swdll.obj - -# dynamic libraries -SHL1STDLIBS+= \ - $(LNGLIB) \ - $(SVXCORELIB) \ - $(EDITENGLIB) \ - $(SVXLIB) \ - $(SFXLIB) \ - $(XMLOFFLIB) \ - $(BASICLIB) \ - $(BASEGFXLIB) \ - $(DRAWINGLAYERLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(VOSLIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(ICUUCLIB) \ - $(I18NUTILLIB) \ - $(AVMEDIALIB) - -.IF "$(GUI)"=="WNT" -SHL1STDLIBS+= $(ADVAPI32LIB) -.ENDIF # WNT - - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1BASE= 0x1e000000 -DEF1NAME =$(SHL1TARGET) -DEFLIB1NAME=swall $(SWLIBFILES:b) - -SHL2TARGET= swd$(DLLPOSTFIX) -SHL2IMPLIB= swdimp -SHL2VERSIONMAP=$(SOLARENV)/src/component.map -SHL2DEF=$(MISC)$/$(SHL2TARGET).def -DEF2NAME= $(SHL2TARGET) - -SHL2STDLIBS= \ - $(SFX2LIB) \ - $(SVTOOLLIB) \ - $(UNOTOOLSLIB) \ - $(SVLLIB) \ - $(VCLLIB) \ - $(SOTLIB) \ - $(TOOLSLIB) \ - $(UCBHELPERLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL2OBJS= $(SLO)$/swdetect.obj \ - $(SLO)$/swdet2.obj \ - $(SLO)$/detreg.obj \ - $(SLO)$/iodetect.obj - -.IF "$(dbgutil)"!="" -SHL2OBJS+= \ - $(SLO)$/errhdl.obj -.ENDIF - -SHL2DEPN+= makefile.mk - -# add for swui -SHL3TARGET= swui$(DLLPOSTFIX) -SHL3IMPLIB= swuiimp -SHL3VERSIONMAP= swui.map -SHL3DEF=$(MISC)$/$(SHL3TARGET).def -SHL3DEPN=$(SHL1TARGETN) -DEF3NAME= $(SHL3TARGET) - -SHL3STDLIBS= \ - $(ISWLIB) \ - $(SVXCORELIB) \ - $(EDITENGLIB) \ - $(SVXLIB) \ - $(SFX2LIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SOTLIB) \ - $(SVLLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(SOTLIB) - -SHL3LIBS= $(SLB)$/swui.lib -LIB3TARGET = $(SLB)$/swui.lib - -LIB3OBJFILES = \ - $(SLO)$/swuiexp.obj \ - $(SLO)$/SwRewriter.obj \ - $(SLO)$/swdlgfact.obj \ - $(SLO)$/addrdlg.obj \ - $(SLO)$/ascfldlg.obj \ - $(SLO)$/break.obj \ - $(SLO)$/bookmark.obj \ - $(SLO)$/changedb.obj \ - $(SLO)$/chardlg.obj \ - $(SLO)$/convert.obj \ - $(SLO)$/cption.obj \ - $(SLO)$/dbinsdlg.obj \ - $(SLO)$/docfnote.obj \ - $(SLO)$/docstdlg.obj \ - $(SLO)$/envlop1.obj \ - $(SLO)$/envfmt.obj \ - $(SLO)$/envprt.obj \ - $(SLO)$/label1.obj \ - $(SLO)$/labfmt.obj \ - $(SLO)$/labelexp.obj \ - $(SLO)$/labprt.obj \ - $(SLO)$/drpcps.obj \ - $(SLO)$/pardlg.obj \ - $(SLO)$/pattern.obj \ - $(SLO)$/pggrid.obj \ - $(SLO)$/pgfnote.obj \ - $(SLO)$/rowht.obj \ - $(SLO)$/selglos.obj \ - $(SLO)$/splittbl.obj \ - $(SLO)$/srtdlg.obj \ - $(SLO)$/tautofmt.obj \ - $(SLO)$/tblnumfm.obj \ - $(SLO)$/uiborder.obj \ - $(SLO)$/wrap.obj \ - $(SLO)$/colwd.obj \ - $(SLO)$/tabledlg.obj \ - $(SLO)$/fldtdlg.obj \ - $(SLO)$/fldedt.obj \ - $(SLO)$/fldpage.obj \ - $(SLO)$/flddb.obj \ - $(SLO)$/flddinf.obj \ - $(SLO)$/flddok.obj \ - $(SLO)$/fldfunc.obj \ - $(SLO)$/fldref.obj \ - $(SLO)$/FldRefTreeListBox.obj \ - $(SLO)$/fldvar.obj \ - $(SLO)$/swrenamexnameddlg.obj \ - $(SLO)$/swmodalredlineacceptdlg.obj \ - $(SLO)$/abstract.obj \ - $(SLO)$/frmdlg.obj \ - $(SLO)$/tmpdlg.obj \ - $(SLO)$/frmpage.obj \ - $(SLO)$/glosbib.obj \ - $(SLO)$/glossary.obj \ - $(SLO)$/inpdlg.obj \ - $(SLO)$/insfnote.obj \ - $(SLO)$/instable.obj \ - $(SLO)$/insrule.obj \ - $(SLO)$/javaedit.obj \ - $(SLO)$/linenum.obj \ - $(SLO)$/mailmrge.obj \ - $(SLO)$/multmrk.obj \ - $(SLO)$/mergetbl.obj \ - $(SLO)$/outline.obj \ - $(SLO)$/num.obj \ - $(SLO)$/column.obj \ - $(SLO)$/cnttab.obj \ - $(SLO)$/cntex.obj \ - $(SLO)$/uiregionsw.obj \ - $(SLO)$/optload.obj \ - $(SLO)$/optcomp.obj \ - $(SLO)$/optpage.obj \ - $(SLO)$/swuiccoll.obj \ - $(SLO)$/numpara.obj \ - $(SLO)$/swdialmgr.obj \ - $(SLO)$/swuiidxmrk.obj \ - $(SLO)$/DropDownFieldDialog.obj \ - $(SLO)$/macassgn.obj \ - $(SLO)$/wordcountdialog.obj \ - $(SLO)$/mailconfigpage.obj \ - $(SLO)$/addresslistdialog.obj \ - $(SLO)$/createaddresslistdialog.obj \ - $(SLO)$/customizeaddresslistdialog.obj \ - $(SLO)$/dbtablepreviewdialog.obj \ - $(SLO)$/mailmergewizard.obj \ - $(SLO)$/mmdocselectpage.obj \ - $(SLO)$/mmlayoutpage.obj \ - $(SLO)$/mmoutputpage.obj \ - $(SLO)$/mmoutputtypepage.obj \ - $(SLO)$/mmaddressblockpage.obj \ - $(SLO)$/mmgreetingspage.obj \ - $(SLO)$/mmmergepage.obj \ - $(SLO)$/mmpreparemergepage.obj \ - $(SLO)$/selectdbtabledialog.obj - -.IF "$(GUI)$(COM)" == "WNTMSC" -.IF "$(ENABLE_PCH)" != "" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" ) -#target sw -SHL1OBJS += $(SLO)$/pchname.obj \ - $(SLO)$/pchname_ex.obj -#target swd -SHL2OBJS += $(SLO)$/pchname.obj \ - $(SLO)$/pchname_ex.obj -#target swui -SHL3OBJS += $(SLO)$/pchname.obj \ - $(SLO)$/pchname_ex.obj -.ENDIF # "$(ENABLE_PCH)" != "" -.ENDIF # "$(GUI)$(COM)" == "WNTMSC" - -SHL4TARGET=msword$(DLLPOSTFIX) -SHL4VERSIONMAP=msword.map -SHL4LIBS=$(SLB)$/rtf.lib $(SLB)$/ww8.lib -SHL4DEPN=$(SHL1TARGETN) -SHL4DEF=$(MISC)$/$(SHL4TARGET).def -DEF4NAME=$(SHL4TARGET) - -SHL4STDLIBS= \ - $(ISWLIB) \ - $(SVXCORELIB) \ - $(EDITENGLIB) \ - $(MSFILTERLIB) \ - $(SFXLIB) \ - $(BASEGFXLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(ICUUCLIB) \ - $(BASICLIB) \ - $(I18NUTILLIB) - -.IF "$(ENABLE_VBA)" == "YES" -#target vba -TARGET_VBA=vbaswobj -SHL5TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno -SHL5IMPLIB= i$(TARGET_VBA) - -SHL5VERSIONMAP=$(SOLARENV)/src/component.map -SHL5DEF=$(MISC)$/$(SHL5TARGET).def -DEF5NAME=$(SHL5TARGET) -SHL5STDLIBS= \ - $(ISWLIB) \ - $(CPPUHELPERLIB) \ - $(VCLLIB) \ - $(CPPULIB) \ - $(COMPHELPERLIB) \ - $(SVLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(SALLIB)\ - $(VBAHELPERLIB) \ - $(BASICLIB) \ - $(SFXLIB) \ - $(SVXLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(VCLLIB) \ - $(TKLIB) \ - $(I18NISOLANGLIB) \ - $(EDITENGLIB) \ - $(SVXCORELIB) \ - $(MSFILTERLIB) - -SHL5DEPN=$(SHL1TARGETN) -SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib -.ENDIF # .IF "$(ENABLE_VBA)" == "YES" - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/sw.component $(MISC)/swd.component $(MISC)/vbaswobj.component - -$(MISC)/sw.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - sw.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt sw.component - -$(MISC)/swd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - swd.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt swd.component - -$(MISC)/vbaswobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - vbaswobj.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt vbaswobj.component -- cgit From a3697be25720d83afb8221f1490dde0c2de9e035 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 19 Nov 2010 22:11:42 +0100 Subject: gnumake2: cleared migrated build.lst --- sw/prj/build.lst | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sw/prj/build.lst b/sw/prj/build.lst index 192a3ad99eb2..2b316d418cb5 100644 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,12 +1,2 @@ sw sw : l10n connectivity OOo:writerperfect svx stoc uui writerfilter filter oovbaapi cui vbahelper NULL -sw sw usr1 - all sw_mkout NULL sw sw\prj nmake - all sw_prj NULL - - -sw sw\qa\complex\accessibility nmake - all sw_qa_complex_accessibility sw_prj NULL -sw sw\qa\complex\checkColor nmake - all sw_qa_complex_checkColor sw_prj NULL -# fails -# sw sw\qa\complex\indeterminateState nmake - all sw_qa_complex_indeterminateState sw_prj NULL -# sw sw\qa\complex\writer nmake - all sw_qa_complex_writer sw_prj NULL -sw sw\qa\unoapi nmake - all sw_qa_unoapi sw_prj NULL - -- cgit From 024a55900940782373f93e6f4b5077855527a558 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 22 Nov 2010 13:40:19 +0100 Subject: gnumake2: getting rid of obsolete install and uninstall targets --- sw/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/prj/makefile.mk b/sw/prj/makefile.mk index 3d495209d74a..3b1b54d4357f 100644 --- a/sw/prj/makefile.mk +++ b/sw/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From 2eb40fcdb2f3e4e9768fa18ad662c11d52c44ad2 Mon Sep 17 00:00:00 2001 From: os Date: Mon, 22 Nov 2010 16:46:59 +0100 Subject: #b7001883# exit if sprm array is invalid --- sw/source/filter/ww8/ww8par.cxx | 9 ++++++++- sw/source/filter/ww8/ww8scan.cxx | 17 +++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 24f36b047a4e..cd11631a0181 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4919,7 +4919,14 @@ ULONG WW8Reader::Read(SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, const St } SwWW8ImplReader* pRdr = new SwWW8ImplReader(nVersion, pStg, pIn, rDoc, rBaseURL, bNew); - nRet = pRdr->LoadDoc( rPam ); + try + { + nRet = pRdr->LoadDoc( rPam ); + } + catch( const std::exception& ) + { + nRet = ERR_WW8_NO_WW8_FILE_ERR; + } delete pRdr; if( refStrm.Is() ) diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index d64e207313d8..171e45260818 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -892,11 +892,18 @@ void WW8SprmIter::SetSprms(const BYTE* pSprms_, long nLen_) const BYTE* WW8SprmIter::operator ++( int ) { - if (nRemLen > 0) + if (nRemLen > 0 ) { - pSprms += nAktSize; - nRemLen -= nAktSize; - UpdateMyMembers(); + if( nRemLen >= nAktSize ) + { + pSprms += nAktSize; + nRemLen -= nAktSize; + UpdateMyMembers(); + } + else + { + throw( ::std::exception() ); + } } return pSprms; } @@ -3247,6 +3254,8 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p) Otherwise our cool fastsave algorithm can be brought to bear on the problem. */ + if( !pPieceIter ) + return; ULONG nOldPos = pPieceIter->GetIdx(); bool bOk = pPieceIter->SeekPos(nOrigCp); pPieceIter->SetIdx( nOldPos ); -- cgit From 8d8c81526357ec93dbf6c0e120089679602de327 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Tue, 23 Nov 2010 14:24:46 +0100 Subject: gnumake2: enable packmodule in setsolar mws builds --- sw/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/prj/makefile.mk b/sw/prj/makefile.mk index 3b1b54d4357f..c73a3d944bbf 100644 --- a/sw/prj/makefile.mk +++ b/sw/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) -- cgit From 2bc737661a2c673bd7adfba299ceee02fcab627b Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 26 Nov 2010 13:37:22 +0100 Subject: gnumake2: sorting all lists in makefiles --- sw/AllLangResTarget_sw.mk | 126 +++++++++++++++++++++++----------------------- sw/Library_msword.mk | 8 +-- sw/Library_sw.mk | 2 +- sw/Library_swd.mk | 6 +-- sw/Library_vbaswobj.mk | 2 +- sw/Module_sw.mk | 4 +- 6 files changed, 74 insertions(+), 74 deletions(-) diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 5d87fa1ae587..e0a2a4994e55 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -65,119 +65,119 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\ )) $(eval $(call gb_SrsTarget_add_files,sw/res,\ + sw/source/core/undo/undo.src \ + sw/source/core/unocore/unocore.src \ sw/source/ui/app/app.src \ - sw/source/ui/app/mn.src \ sw/source/ui/app/error.src \ - sw/source/ui/dialog/abstract.src \ - sw/source/ui/dialog/ascfldlg.src \ - sw/source/ui/dialog/dialog.src \ - sw/source/ui/dialog/docstdlg.src \ - sw/source/ui/dialog/regionsw.src \ - sw/source/ui/dialog/wordcountdialog.src \ - sw/source/ui/chrdlg/chrdlg.src \ + sw/source/ui/app/mn.src \ sw/source/ui/chrdlg/ccoll.src \ + sw/source/ui/chrdlg/chardlg.src \ + sw/source/ui/chrdlg/chrdlg.src \ sw/source/ui/chrdlg/drpcps.src \ - sw/source/ui/chrdlg/swbreak.src \ - sw/source/ui/chrdlg/paradlg.src \ sw/source/ui/chrdlg/numpara.src \ - sw/source/ui/chrdlg/chardlg.src \ + sw/source/ui/chrdlg/paradlg.src \ + sw/source/ui/chrdlg/swbreak.src \ + sw/source/ui/config/mailconfigpage.src \ sw/source/ui/config/optcomp.src \ + sw/source/ui/config/optdlg.src \ sw/source/ui/config/optload.src \ - sw/source/ui/config/mailconfigpage.src \ sw/source/ui/config/redlopt.src \ - sw/source/ui/config/optdlg.src \ - sw/source/ui/dbui/mmpreparemergepage.src \ - sw/source/ui/dbui/mmgreetingspage.src \ - sw/source/ui/dbui/mmmergepage.src \ - sw/source/ui/dbui/mmoutputtypepage.src \ - sw/source/ui/dbui/mmlayoutpage.src \ - sw/source/ui/dbui/mmaddressblockpage.src \ + sw/source/ui/dbui/addresslistdialog.src \ sw/source/ui/dbui/createaddresslistdialog.src \ - sw/source/ui/dbui/dbtablepreviewdialog.src \ - sw/source/ui/dbui/mmdocselectpage.src \ sw/source/ui/dbui/customizeaddresslistdialog.src \ + sw/source/ui/dbui/dbinsdlg.src \ + sw/source/ui/dbui/dbtablepreviewdialog.src \ + sw/source/ui/dbui/dbui.src \ sw/source/ui/dbui/mailmergechildwindow.src \ sw/source/ui/dbui/mailmergewizard.src \ - sw/source/ui/dbui/dbinsdlg.src \ - sw/source/ui/dbui/selectdbtabledialog.src \ + sw/source/ui/dbui/mmaddressblockpage.src \ + sw/source/ui/dbui/mmdocselectpage.src \ + sw/source/ui/dbui/mmgreetingspage.src \ + sw/source/ui/dbui/mmlayoutpage.src \ + sw/source/ui/dbui/mmmergepage.src \ sw/source/ui/dbui/mmoutputpage.src \ - sw/source/ui/dbui/dbui.src \ - sw/source/ui/dbui/addresslistdialog.src \ - sw/source/ui/dochdl/selglos.src \ + sw/source/ui/dbui/mmoutputtypepage.src \ + sw/source/ui/dbui/mmpreparemergepage.src \ + sw/source/ui/dbui/selectdbtabledialog.src \ + sw/source/ui/dialog/abstract.src \ + sw/source/ui/dialog/ascfldlg.src \ + sw/source/ui/dialog/dialog.src \ + sw/source/ui/dialog/docstdlg.src \ + sw/source/ui/dialog/regionsw.src \ + sw/source/ui/dialog/wordcountdialog.src \ sw/source/ui/dochdl/dochdl.src \ + sw/source/ui/dochdl/selglos.src \ sw/source/ui/docvw/access.src \ sw/source/ui/docvw/docvw.src \ - sw/source/ui/envelp/mailmrge.src \ - sw/source/ui/envelp/labprt.src \ - sw/source/ui/envelp/label.src \ - sw/source/ui/envelp/envfmt.src \ - sw/source/ui/envelp/labfmt.src \ sw/source/ui/envelp/envelp.src \ - sw/source/ui/envelp/envprt.src \ + sw/source/ui/envelp/envfmt.src \ sw/source/ui/envelp/envlop.src \ - sw/source/ui/fldui/flddok.src \ - sw/source/ui/fldui/changedb.src \ + sw/source/ui/envelp/envprt.src \ + sw/source/ui/envelp/label.src \ + sw/source/ui/envelp/labfmt.src \ + sw/source/ui/envelp/labprt.src \ + sw/source/ui/envelp/mailmrge.src \ sw/source/ui/fldui/DropDownFieldDialog.src \ + sw/source/ui/fldui/changedb.src \ + sw/source/ui/fldui/flddb.src \ sw/source/ui/fldui/flddinf.src \ + sw/source/ui/fldui/flddok.src \ + sw/source/ui/fldui/fldfunc.src \ sw/source/ui/fldui/fldref.src \ sw/source/ui/fldui/fldtdlg.src \ sw/source/ui/fldui/fldui.src \ - sw/source/ui/fldui/javaedit.src \ - sw/source/ui/fldui/fldfunc.src \ - sw/source/ui/fldui/inpdlg.src \ sw/source/ui/fldui/fldvar.src \ - sw/source/ui/fldui/flddb.src \ + sw/source/ui/fldui/inpdlg.src \ + sw/source/ui/fldui/javaedit.src \ sw/source/ui/fmtui/tmpdlg.src \ - sw/source/ui/frmdlg/frmui.src \ - sw/source/ui/frmdlg/cption.src \ sw/source/ui/frmdlg/column.src \ + sw/source/ui/frmdlg/cption.src \ sw/source/ui/frmdlg/frmpage.src \ + sw/source/ui/frmdlg/frmui.src \ sw/source/ui/globdoc/globdoc.src \ - sw/source/ui/index/idxmrk.src \ sw/source/ui/index/cnttab.src \ + sw/source/ui/index/idxmrk.src \ sw/source/ui/index/multmrk.src \ sw/source/ui/lingu/olmenu.src \ - sw/source/ui/misc/docfnote.src \ - sw/source/ui/misc/pgfnote.src \ - sw/source/ui/misc/insfnote.src \ - sw/source/ui/misc/srtdlg.src \ + sw/source/ui/misc/autocorr.src \ sw/source/ui/misc/bookmark.src \ + sw/source/ui/misc/docfnote.src \ sw/source/ui/misc/glosbib.src \ - sw/source/ui/misc/num.src \ sw/source/ui/misc/glossary.src \ - sw/source/ui/misc/pggrid.src \ - sw/source/ui/misc/outline.src \ + sw/source/ui/misc/insfnote.src \ + sw/source/ui/misc/insrule.src \ sw/source/ui/misc/linenum.src \ + sw/source/ui/misc/num.src \ sw/source/ui/misc/numberingtypelistbox.src \ + sw/source/ui/misc/outline.src \ + sw/source/ui/misc/pgfnote.src \ + sw/source/ui/misc/pggrid.src \ sw/source/ui/misc/redlndlg.src \ - sw/source/ui/misc/insrule.src \ - sw/source/ui/misc/autocorr.src \ + sw/source/ui/misc/srtdlg.src \ + sw/source/ui/ribbar/inputwin.src \ sw/source/ui/ribbar/tbxanchr.src \ sw/source/ui/ribbar/workctrl.src \ - sw/source/ui/ribbar/inputwin.src \ sw/source/ui/shells/shells.src \ sw/source/ui/smartmenu/stmenu.src \ - sw/source/ui/table/colwd.src \ - sw/source/ui/table/tautofmt.src \ - sw/source/ui/table/table.src \ sw/source/ui/table/chartins.src \ - sw/source/ui/table/splittbl.src \ - sw/source/ui/table/rowht.src \ - sw/source/ui/table/instable.src \ + sw/source/ui/table/colwd.src \ sw/source/ui/table/convert.src \ - sw/source/ui/table/tabledlg.src \ + sw/source/ui/table/instable.src \ sw/source/ui/table/mergetbl.src \ + sw/source/ui/table/rowht.src \ + sw/source/ui/table/splittbl.src \ + sw/source/ui/table/table.src \ + sw/source/ui/table/tabledlg.src \ + sw/source/ui/table/tautofmt.src \ sw/source/ui/uiview/pview.src \ sw/source/ui/uiview/view.src \ - sw/source/core/undo/undo.src \ - sw/source/core/unocore/unocore.src \ - sw/source/ui/utlui/navipi.src \ sw/source/ui/utlui/attrdesc.src \ - sw/source/ui/utlui/poolfmt.src \ + sw/source/ui/utlui/gloslst.src \ sw/source/ui/utlui/initui.src \ + sw/source/ui/utlui/navipi.src \ + sw/source/ui/utlui/poolfmt.src \ sw/source/ui/utlui/unotools.src \ sw/source/ui/utlui/utlui.src \ - sw/source/ui/utlui/gloslst.src \ sw/source/ui/web/web.src \ sw/source/ui/wrtsh/wrtsh.src \ )) diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index eb891976fcc2..5aebe867f806 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -48,11 +48,14 @@ $(eval $(call gb_Library_set_defs,msword,\ $(eval $(call gb_Library_add_linked_libs,msword,\ basegfx \ comphelper \ + cppu \ + cppuhelper \ + editeng \ i18nisolang1 \ i18nutil \ icuuc \ - editeng \ msfilter \ + sal \ sfx \ sot \ stl \ @@ -65,9 +68,6 @@ $(eval $(call gb_Library_add_linked_libs,msword,\ tk \ tl \ ucbhelper \ - cppu \ - cppuhelper \ - sal \ utl \ vcl \ )) diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 1e5c1d6f8642..cc1df51d2dba 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -110,8 +110,8 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/core/access/accselectionhelper \ sw/source/core/access/acctable \ sw/source/core/access/acctextframe \ - sw/source/core/access/textmarkuphelper \ sw/source/core/access/parachangetrackinginfo \ + sw/source/core/access/textmarkuphelper \ sw/source/core/attr/calbck \ sw/source/core/attr/cellatr \ sw/source/core/attr/fmtfollowtextflow \ diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 0917c1bdf903..17511d3bf4ed 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -49,15 +49,15 @@ $(eval $(call gb_Library_set_defs,swd,\ $(eval $(call gb_Library_add_linked_libs,swd,\ comphelper \ + cppu \ + cppuhelper \ + sal \ sfx \ sot \ svl \ svt \ tl \ ucbhelper \ - cppu \ - cppuhelper \ - sal \ utl \ vcl \ )) diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index 669934d80471..44bbfa8a0c6f 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,vbaswobj,\ sal \ sb \ sfx \ + stl \ svl \ svt \ svx \ @@ -65,7 +66,6 @@ $(eval $(call gb_Library_add_linked_libs,vbaswobj,\ utl \ vbahelper \ vcl \ - stl \ )) $(eval $(call gb_Library_add_exception_objects,vbaswobj,\ diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 13f511a73b82..ccd570308a35 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -28,15 +28,15 @@ $(eval $(call gb_Module_Module,sw)) $(eval $(call gb_Module_add_targets,sw,\ + AllLangResTarget_sw \ + Library_msword \ Library_sw \ Library_swd \ Library_swui \ - Library_msword \ Library_vbaswobj \ Package_misc \ Package_uiconfig \ Package_xml \ - AllLangResTarget_sw \ )) # vim: set noet ts=4 sw=4: -- cgit From 8849f61270fec9c3e1a09ad29824c95d6d41c997 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 26 Nov 2010 17:32:03 +0100 Subject: CWS gnumake2: some adaptions to changes on master in removed makefile.mk files --- sw/Library_msword.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 5aebe867f806..35eaa1617f66 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -73,13 +73,16 @@ $(eval $(call gb_Library_add_linked_libs,msword,\ )) $(eval $(call gb_Library_add_exception_objects,msword,\ - sw/source/filter/rtf/rtfatr \ sw/source/filter/rtf/rtffld \ sw/source/filter/rtf/rtffly \ sw/source/filter/rtf/rtfnum \ sw/source/filter/rtf/rtftbl \ sw/source/filter/rtf/swparrtf \ - sw/source/filter/rtf/wrtrtf \ + sw/source/filter/ww8/rtfattributeoutput \ + sw/source/filter/ww8/rtfexport \ + sw/source/filter/ww8/rtfexportfilter \ + sw/source/filter/ww8/rtfimportfilter \ + sw/source/filter/ww8/rtfsdrexport \ sw/source/filter/ww8/WW8FFData \ sw/source/filter/ww8/WW8FibData \ sw/source/filter/ww8/WW8Sttbf \ -- cgit From 4699b3eb9b0edcacfa790b5621628ca14a6fc2e9 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Wed, 1 Dec 2010 13:03:57 +0100 Subject: gnumake2: remove warnings --- sw/source/core/doc/tblrwcl.cxx | 2 +- sw/source/filter/html/htmlform.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 6119184d3209..dae62703d2bf 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -3113,7 +3113,7 @@ void lcl_ChgBoxSize( SwTableBox& rBox, CR_SetBoxWidth& rParam, const SwFmtFrmSize& rOldSz, USHORT& rDelWidth, SwTwips nDist ) { - long nDiff; + long nDiff = 0; BOOL bSetSize = FALSE; switch( rParam.nMode ) diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 3067de67ce97..a8c0aedc388f 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -1351,7 +1351,7 @@ void SwHTMLParser::NewForm( sal_Bool bAppend ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; ScriptType eScriptType2 = eDfltScriptType; - sal_uInt16 nEvent; + sal_uInt16 nEvent = 0; sal_Bool bSetEvent = sal_False; switch( pOption->GetToken() ) @@ -1525,7 +1525,7 @@ void SwHTMLParser::InsertInput() { const HTMLOption *pOption = (*pHTMLOptions)[--i]; ScriptType eScriptType2 = eDfltScriptType; - sal_uInt16 nEvent; + sal_uInt16 nEvent = 0; sal_Bool bSetEvent = sal_False; switch( pOption->GetToken() ) @@ -2017,7 +2017,7 @@ void SwHTMLParser::NewTextArea() { const HTMLOption *pOption = (*pHTMLOptions)[--i]; ScriptType eScriptType2 = eDfltScriptType; - sal_uInt16 nEvent; + sal_uInt16 nEvent = 0; sal_Bool bSetEvent = sal_False; switch( pOption->GetToken() ) @@ -2308,7 +2308,7 @@ void SwHTMLParser::NewSelect() { const HTMLOption *pOption = (*pHTMLOptions)[--i]; ScriptType eScriptType2 = eDfltScriptType; - sal_uInt16 nEvent; + sal_uInt16 nEvent = 0; sal_Bool bSetEvent = sal_False; switch( pOption->GetToken() ) -- cgit From 23b346e7e5f930ae6f0827d995c61a8d58a799e8 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 3 Dec 2010 20:33:01 +0100 Subject: CWS gnumake2:some fixes for problems found in autotests --- sw/AllLangResTarget_sw.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index e0a2a4994e55..8fcc5b552979 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -134,6 +134,7 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/frmdlg/cption.src \ sw/source/ui/frmdlg/frmpage.src \ sw/source/ui/frmdlg/frmui.src \ + sw/source/ui/frmdlg/wrap.src \ sw/source/ui/globdoc/globdoc.src \ sw/source/ui/index/cnttab.src \ sw/source/ui/index/idxmrk.src \ -- cgit From ce3d20c7bbf68448be7cc8a7ae97148d7be22a50 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 3 Dec 2010 23:27:34 +0100 Subject: gnumake2: removing obsolete *.flt and *.map files in module sw --- sw/util/msword.map | 14 ------ sw/util/sw.flt | 136 ----------------------------------------------------- sw/util/swui.map | 6 --- 3 files changed, 156 deletions(-) delete mode 100644 sw/util/msword.map delete mode 100644 sw/util/sw.flt delete mode 100644 sw/util/swui.map diff --git a/sw/util/msword.map b/sw/util/msword.map deleted file mode 100644 index d2a9d9b4f7e1..000000000000 --- a/sw/util/msword.map +++ /dev/null @@ -1,14 +0,0 @@ -UDK_3_0_0 { - global: - ImportRTF; - ExportRTF; - ImportDOC; - ExportDOC; - SaveOrDelMSVBAStorage_ww8; - GetSaveWarningOfMSVBAStorage_ww8; - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/sw/util/sw.flt b/sw/util/sw.flt deleted file mode 100644 index 83c763492233..000000000000 --- a/sw/util/sw.flt +++ /dev/null @@ -1,136 +0,0 @@ -+getImplementation -START -CharAttribList -CharPosArray -ContentAttribs -ContentAttribsInfo -ContentInfo -ContentNode -DeletedNodeInfo -EditAttrib -EditCharAttrib -EditDbg -EditDoc -EditEngineItemPool -EditHTMLParser -EditLine -EditNodeIdx -EditPaM -EditPosition -EditRTFParser -EditSel -EditSpellWrapper -EditStyleSheet -EditUndoConnectParas -EditUndoDelContent -EditUndoInsertChars -EditUndoInsertFeature -EditUndoManager -EditUndoMoveParagraphs -EditUndoRemoveChars -EditUndoRemoveFeature -EditUndoSetAttribs -EditUndoSetParaAttribs -EditUndoSetStyleSheet -EditUndoSplitPara -GlobalEditData -IdleFormattter -ImpEditEngine -ImpEditView -InternalEditStatus -ParaPortion -ParagraphList -RTFPardAttrMapIds -RTFPlainAttrMapIds -SelRange -SortedPositions_SAR -SvxACorrChars -SvxColorList -SvxFontTable -SvxRTFStyleType -SvxTabStopArr_SAR -TextPortionList -XEditAttrib -XParaPortionList -BinTextObject -DialogsResMgr -E3dDragMethod -E3dTriangle -GetImp -ImpA -ImpB -ImpBrw -ImpC -ImpCheck -ImpColor -ImpD -ImpDrag -ImpEdCtrl -ImpEdit -ImpF -+ImpGetResStr -ImpGet -ImpH -ImpHide -ImpI -ImpItem -ImpJ -ImpL -ImpList -ImpM -ImpMulti -ImportInfo -ImpP -ImpPaint -ImpPast -ImpRecalc -ImpReset -ImpRemove -ImpRef -ImpReset -ImpS -ImpScroll -ImpSdrGDIMetaFileImport -ImpSet -ImpShow -ImpT -ImpX -OLUndoAttr -OLUndoDepth -OLUndoExpand -OLUndoHeight -OutlinerEditEng -SdrGraphicLink -SdrItemBrowser -SdrOleLink -SpellCache -SvFileObject -WrongList -WrongRanges -XIOCompat -_SdrItemBrowserControl -_SdrItemBrowserWindow -+FmXGridControl -+FmXGridPeer -FmX -FmExp -ODatabaseForm -WEP -LIBMAIN -LibMain -??_5 -??_7 -??_8 -??_9 -??_C -??_E -??_F -??_G -??_H -??_I -___CT -_alloc -_CT -exception::exception -_TI2 -___CT diff --git a/sw/util/swui.map b/sw/util/swui.map deleted file mode 100644 index ad5e33836c7c..000000000000 --- a/sw/util/swui.map +++ /dev/null @@ -1,6 +0,0 @@ -UDK_3_0_0 { - global: - CreateDialogFactory; - local: - *; -}; -- cgit From 8d55ef353c1cdd3e09fa306df56d856d7a556b23 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 6 Dec 2010 12:43:12 +0100 Subject: gnumake2: added findbar.xml to in sw uiconfig (thanks mba) --- sw/Package_uiconfig.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sw/Package_uiconfig.mk b/sw/Package_uiconfig.mk index 66b355b79d45..3669eecaa89f 100644 --- a/sw/Package_uiconfig.mk +++ b/sw/Package_uiconfig.mk @@ -1,7 +1,7 @@ #************************************************************************* # # 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 @@ -38,6 +38,7 @@ $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolb $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawingobjectbar.xml,sglobal/toolbar/drawingobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawtextobjectbar.xml,sglobal/toolbar/drawtextobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/extrusionobjectbar.xml,sglobal/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/findbar.xml,sglobal/toolbar/findbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/flowchartshapes.xml,sglobal/toolbar/flowchartshapes.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fontworkobjectbar.xml,sglobal/toolbar/fontworkobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fontworkshapetype.xml,sglobal/toolbar/fontworkshapetype.xml)) @@ -75,6 +76,7 @@ $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/ $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/drawingobjectbar.xml,sweb/toolbar/drawingobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/drawtextobjectbar.xml,sweb/toolbar/drawtextobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/extrusionobjectbar.xml,sweb/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/findbar.xml,sweb/toolbar/findbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/flowchartshapes.xml,sweb/toolbar/flowchartshapes.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fontworkobjectbar.xml,sweb/toolbar/fontworkobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fontworkshapetype.xml,sweb/toolbar/fontworkshapetype.xml)) @@ -190,6 +192,7 @@ $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolb $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawingobjectbar.xml,swriter/toolbar/drawingobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawtextobjectbar.xml,swriter/toolbar/drawtextobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/extrusionobjectbar.xml,swriter/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/findbar.xml,swriter/toolbar/findbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/flowchartshapes.xml,swriter/toolbar/flowchartshapes.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkobjectbar.xml,swriter/toolbar/fontworkobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkshapetype.xml,swriter/toolbar/fontworkshapetype.xml)) @@ -228,6 +231,7 @@ $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolb $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawingobjectbar.xml,swxform/toolbar/drawingobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawtextobjectbar.xml,swxform/toolbar/drawtextobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/extrusionobjectbar.xml,swxform/toolbar/extrusionobjectbar.xml)) +$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/findbar.xml,swxform/toolbar/findbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/flowchartshapes.xml,swxform/toolbar/flowchartshapes.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fontworkobjectbar.xml,swxform/toolbar/fontworkobjectbar.xml)) $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fontworkshapetype.xml,swxform/toolbar/fontworkshapetype.xml)) -- cgit From 8ad779467d54c07000b0e4cf75bf16a34ee01345 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 6 Dec 2010 14:04:50 +0100 Subject: masterfix DEV300: #i10000# changed ULONG_MAX to SAL_MAX_UINT32 --- sw/source/filter/html/htmltabw.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 91b026ca6770..7171f4ec28b1 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -70,6 +70,7 @@ #endif #include #endif +#include //#define MAX_DEPTH (USHRT_MAX) #define MAX_DEPTH (3) @@ -337,7 +338,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, #ifndef PURE_HTML long nWidth = 0; - sal_uInt32 nPrcWidth = ULONG_MAX; + sal_uInt32 nPrcWidth = SAL_MAX_UINT32; if( bOutWidth ) { if( bLayoutExport ) -- cgit From 6d2bd0b433056988e83e9371cf71567a6c31e591 Mon Sep 17 00:00:00 2001 From: os Date: Wed, 8 Dec 2010 10:17:56 +0100 Subject: #i115956# token translation fixed --- starmath/source/parse.cxx | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index d12f3df07400..697e18362d87 100755 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -2317,18 +2317,23 @@ void SmParser::Special() // conversion of symbol names for 6.0 (XML) file format // (name change on import / export. // UI uses localized names XML file format does not.) - if (IsImportSymbolNames()) + if( rName.Len() && rName.GetChar( 0 ) == sal_Unicode( '%' ) ) { - const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData(); - aNewName = rLSD.GetUiSymbolName( rName ); - bReplace = TRUE; - } - else if (IsExportSymbolNames()) - { - const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData(); - aNewName = rLSD.GetExportSymbolName( rName ); - bReplace = TRUE; + if (IsImportSymbolNames()) + { + const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData(); + aNewName = rLSD.GetUiSymbolName( rName.Copy( 1 ) ); + bReplace = TRUE; + } + else if (IsExportSymbolNames()) + { + const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData(); + aNewName = rLSD.GetExportSymbolName( rName.Copy( 1 ) ); + bReplace = TRUE; + } } + if( aNewName.Len() ) + aNewName.Insert( '%', 0 ); } else // 5.0 <-> 6.0 formula text (symbol name) conversion { @@ -2367,7 +2372,7 @@ void SmParser::Special() if (bReplace && aNewName.Len() && rName != aNewName) { - Replace( GetTokenIndex() + 1, rName.Len(), aNewName ); + Replace( GetTokenIndex(), rName.Len(), aNewName ); rName = aNewName; } -- cgit From e4c73464ecd0fa5862dc7faf46d6e282ba041b53 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 14 Dec 2010 16:26:16 +0100 Subject: gnumake2: fix sw pch for windows --- sw/inc/pch/precompiled_sw.hxx | 1 - 1 file changed, 1 deletion(-) diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index fd7f3b135365..7a5f1e2847b1 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -921,7 +921,6 @@ #include "vcl/help.hxx" #include "vcl/image.hxx" #include "vcl/button.hxx" -#include "vcl/imgcons.hxx" #include "vcl/inputctx.hxx" #include "vcl/jobset.hxx" #include "vcl/keycod.hxx" -- cgit