diff options
68 files changed, 2416 insertions, 339 deletions
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 1b919471115c..1b919471115c 100755..100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx index fcc1b046f2dd..fcc1b046f2dd 100755..100644 --- a/starmath/inc/toolbox.hxx +++ b/starmath/inc/toolbox.hxx diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi index 4b9eaedac599..4b9eaedac599 100755..100644 --- a/starmath/sdi/smath.sdi +++ b/starmath/sdi/smath.sdi diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi index 69cecf25f308..69cecf25f308 100755..100644 --- a/starmath/sdi/smslots.sdi +++ b/starmath/sdi/smslots.sdi diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index a33ab14a98bf..a33ab14a98bf 100755..100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk index 0e038bb9c78d..5900fae65b87 100755..100644 --- a/starmath/source/makefile.mk +++ b/starmath/source/makefile.mk @@ -95,9 +95,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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#ifndef _SFX_HRC //autogen -#include <sfx2/sfx.hrc> -#endif -#ifndef _GLOBLMN_HRC //autogen -#include <svx/globlmn.hrc> -#endif -#ifndef _GLOBALACC_SRC //autogen -#include <svx/globlac.hrc> -#endif -#ifndef _SVX_SVXIDS_HRC //autogen -#include <svx/svxids.hrc> -#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: -<project>/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/smdetect.cxx b/starmath/source/smdetect.cxx index 583098b6d8a2..6986864f6e80 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -30,7 +30,7 @@ #include "smdetect.hxx" -#include <framework/interaction.hxx> +//#include <framework/interaction.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -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/starmath/source/smres.src b/starmath/source/smres.src index e608b1c9108d..804da5671b7c 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -1743,6 +1743,77 @@ 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" ; diff --git a/starmath/source/toolbox.hrc b/starmath/source/toolbox.hrc index 29adff303a3e..29adff303a3e 100755..100644 --- a/starmath/source/toolbox.hrc +++ b/starmath/source/toolbox.hrc diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src index ead1b32810c3..ead1b32810c3 100755..100644 --- a/starmath/source/toolbox.src +++ b/starmath/source/toolbox.src diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 20c235408013..c2756685d451 100755 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -749,7 +749,11 @@ 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/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml index 7c82d733fa70..7c82d733fa70 100755..100644 --- a/starmath/uiconfig/smath/menubar/menubar.xml +++ b/starmath/uiconfig/smath/menubar/menubar.xml diff --git a/starmath/util/makefile.mk b/starmath/util/makefile.mk index 08f673452f3c..09fedb57fb2c 100644 --- a/starmath/util/makefile.mk +++ b/starmath/util/makefile.mk @@ -42,8 +42,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/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 +# <http://www.openoffice.org/license.html> +# 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 +# <http://www.openoffice.org/license.html> +# 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..ee08b6a06804 --- /dev/null +++ b/sw/Library_sw.mk @@ -0,0 +1,757 @@ +#************************************************************************* +# +# 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 +# <http://www.openoffice.org/license.html> +# 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/access/parachangetrackinginfo \ + 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/except/dbgloop \ + sw/source/core/except/errhdl \ + 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/dbg_lay \ + 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/txtio \ + 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/printdata \ + 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/AnchorOverlayObject \ + sw/source/ui/docvw/AnnotationMenuButton \ + sw/source/ui/docvw/AnnotationWin \ + sw/source/ui/docvw/PostItMgr \ + sw/source/ui/docvw/ShadowOverlayObject \ + sw/source/ui/docvw/SidebarTxtControl \ + sw/source/ui/docvw/SidebarTxtControlAcc \ + sw/source/ui/docvw/SidebarWin \ + sw/source/ui/docvw/SidebarWinAcc \ + sw/source/ui/docvw/edtdd \ + sw/source/ui/docvw/edtwin \ + sw/source/ui/docvw/edtwin2 \ + sw/source/ui/docvw/edtwin3 \ + sw/source/ui/docvw/frmsidebarwincontainer \ + 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/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,\ + -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 +# <http://www.openoffice.org/license.html> +# 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 +# <http://www.openoffice.org/license.html> +# 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..46bb0c2ce273 --- /dev/null +++ b/sw/Library_vbaswobj.mk @@ -0,0 +1,135 @@ +#************************************************************************* +# +# 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 +# <http://www.openoffice.org/license.html> +# 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 \ + sb \ + 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 new file mode 100644 index 000000000000..c19100ee9a5b --- /dev/null +++ b/sw/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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 +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(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: 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 +# <http://www.openoffice.org/license.html> +# 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 +# <http://www.openoffice.org/license.html> +# 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..66b355b79d45 --- /dev/null +++ b/sw/Package_uiconfig.mk @@ -0,0 +1,257 @@ +#************************************************************************* +# +# 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 +# <http://www.openoffice.org/license.html> +# 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/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/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/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/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/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/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 +# <http://www.openoffice.org/license.html> +# 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/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 39eb365b549c..c137892db46c 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" @@ -920,7 +920,12 @@ #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 8b6cecba92ba..821015ba1561 100644 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,3 +1,8 @@ +<<<<<<< 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 @@ -81,3 +86,4 @@ sw sw\qa\complex\checkColor nmake - all sw_qa_complex_checkColor sw_util # 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 diff --git a/sw/prj/d.lst b/sw/prj/d.lst index 0cb261c5f0f1..d9c3e89d62ab 100644 --- a/sw/prj/d.lst +++ b/sw/prj/d.lst @@ -1,3 +1,5 @@ +<<<<<<< local +======= mkdir: %COMMON_DEST%\bin%_EXT%\hid mkdir: %_DEST%\inc%_EXT%\sw mkdir: %_DEST%\xml%_EXT%\uiconfig @@ -60,3 +62,4 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar ..\%__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 diff --git a/sw/prj/makefile.mk b/sw/prj/makefile.mk new file mode 100644 index 000000000000..3b1b54d4357f --- /dev/null +++ b/sw/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) 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 <tools/stream.hxx> #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 a0bae4d76cf1..03b5ebf45422 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 @@ -129,4 +132,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 diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src index 1035d8cb0d0f..c394da3e8e87 100644 --- a/sw/source/core/undo/undo.src +++ b/sw/source/core/undo/undo.src @@ -394,7 +394,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/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx index fcb702a7112a..fcb702a7112a 100644..100755 --- a/sw/source/core/view/viewpg.cxx +++ b/sw/source/core/view/viewpg.cxx diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index c7ee43255f3b..c7ee43255f3b 100755..100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src index 3b23591c84eb..f5283e49b173 100644 --- a/sw/source/ui/app/mn.src +++ b/sw/source/ui/app/mn.src @@ -25,10 +25,360 @@ * ************************************************************************/ +#include <svx/dialogs.hrc> +#include <svx/globlmn.hrc> +#include "cmdid.h" +#include "app.hrc" +#include "globals.hrc" +#include "helpid.h" +#include "popup.hrc" + +/* --------------------- F O R M A T --------------------------------- */ + +<<<<<<< local +#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: <project>/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 \ + }; \ +}; +======= #include "swmn.hrc" #include "helpid.h" +>>>>>>> other /*------------------------------------------------------------------------ Beschreibung: Menu Window diff --git a/sw/source/ui/dialog/makefile.mk b/sw/source/ui/dialog/makefile.mk index 758ea00fcb10..26047ad63655 100644 --- a/sw/source/ui/dialog/makefile.mk +++ b/sw/source/ui/dialog/makefile.mk @@ -79,21 +79,7 @@ LIB1OBJFILES = \ # $(SLO)$/macassgn.obj \ # --- Tagets ------------------------------------------------------- - .INCLUDE : target.mk -$(INCCOM)$/swuilib.hxx: makefile.mk -.IF "$(GUI)"=="UNX" - $(RM) $@ - echo \#define DLL_NAME \"libswui$(DLLPOSTFIX)$(DLLPOST)\" >$@ -.ELSE - echo \#define DLL_NAME \"swui$(DLLPOSTFIX)$(DLLPOST)\" >$@ -.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 <osl/module.hxx> #include <tools/string.hxx> +#include <vcl/unohelp.hxx> 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 ) diff --git a/sw/source/ui/fmtui/fmtui.src b/sw/source/ui/fmtui/fmtui.src deleted file mode 100644 index 63067902178f..000000000000 --- a/sw/source/ui/fmtui/fmtui.src +++ /dev/null @@ -1,88 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#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] = "Nimetn "; - // TEXT [danish] = "Intet navn"; - // TEXT [french] = "Sansnom "; - // TEXT [swedish] = "Namnls"; - // 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/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 <vcl/msgbox.hxx> #include <sfx2/viewfrm.hxx> -#include <svx/hdft2.hxx> +#include <svx/hdft.hxx> #include <editeng/flstitem.hxx> #include <svx/htmlmode.hxx> #include <svtools/htmlcfg.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 <vcl/timer.hxx> #ifndef _IMAGEBTN_HXX //autogen -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #endif #include <svtools/ctrlbox.hxx> #include <svtools/valueset.hxx> 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 <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #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 <sfx2/basedlgs.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> 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 <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #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 <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #endif #ifndef _BUTTON_HXX //autogen diff --git a/sw/source/ui/inc/srcview.hxx b/sw/source/ui/inc/srcview.hxx index 574696f1fd27..574696f1fd27 100644..100755 --- a/sw/source/ui/inc/srcview.hxx +++ b/sw/source/ui/inc/srcview.hxx diff --git a/sw/source/ui/inc/swmn_tmpl.hrc b/sw/source/ui/inc/swmn.hrc index 0d5b3265e79a..0d5b3265e79a 100644 --- a/sw/source/ui/inc/swmn_tmpl.hrc +++ b/sw/source/ui/inc/swmn.hrc 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 <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #endif #include <sfx2/childwin.hxx> #include "toxe.hxx" diff --git a/sw/source/ui/inc/toolbox_tmpl.hrc b/sw/source/ui/inc/toolbox.hrc index 73ab3059d705..73ab3059d705 100644 --- a/sw/source/ui/inc/toolbox_tmpl.hrc +++ b/sw/source/ui/inc/toolbox.hrc 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 <vcl/toolbox.hxx> #include <svtools/stdctrl.hxx> #ifndef _IMAGEBTN_HXX //autogen -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #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 <sfx2/basedlgs.hxx> #ifndef _IMAGEBTN_HXX //autogen -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #endif #ifndef _BUTTON_HXX //autogen diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index e9bb702b3d66..e9bb702b3d66 100755..100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx 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 <vcl/fixed.hxx> #endif #ifndef _IMAGEBTN_HXX //autogen -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #endif #ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 2319be573e25..9a2b729ae89b 100755..100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -108,7 +108,11 @@ 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 667beb8ab4ca..9143e59d76f3 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -49,6 +49,8 @@ #include <svl/whiter.hxx> #include <unotools/saveopt.hxx> #include <svtools/transfer.hxx> +#include <svtools/svtools.hrc> +#include <svtools/svtdata.hxx> #include <svx/svxids.hrc> #include <svtools/htmlcfg.hxx> #include <sfx2/app.hxx> @@ -125,7 +127,11 @@ using ::com::sun::star::util::SearchOptions; +<<<<<<< local +SFX_IMPL_VIEWFACTORY(SwSrcView) +======= SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView") +>>>>>>> other { SFX_VIEW_REGISTRATION(SwWebDocShell); } @@ -561,7 +567,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)); } @@ -573,7 +579,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/view.hrc b/sw/source/ui/uiview/view.hrc index d2aa60494801..d2aa60494801 100755..100644 --- a/sw/source/ui/uiview/view.hrc +++ b/sw/source/ui/uiview/view.hrc diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index 93a29f699f5a..fbe59d286eec 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -105,7 +105,11 @@ using ::rtl::OUString; #include <unomid.h> +<<<<<<< local +SFX_IMPL_VIEWFACTORY(SwView) +======= SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default") +>>>>>>> other { if ( SvtModuleOptions().IsWriter() ) { diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index a3ef96d1a613..a3ef96d1a613 100755..100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx diff --git a/sw/source/ui/uno/makefile.mk b/sw/source/ui/uno/makefile.mk index ac4b6dde697b..ac4b6dde697b 100755..100644 --- a/sw/source/ui/uno/makefile.mk +++ b/sw/source/ui/uno/makefile.mk diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index cbde03479433..aa54b4707935 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 ) diff --git a/sw/source/ui/vba/makefile.mk b/sw/source/ui/vba/makefile.mk index b6d0d7994295..9c2b40d1a9b0 100644 --- a/sw/source/ui/vba/makefile.mk +++ b/sw/source/ui/vba/makefile.mk @@ -97,12 +97,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 $@ - diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx index d7779fc653be..957bb38d428c 100644 --- a/sw/source/ui/vba/service.cxx +++ b/sw/source/ui/vba/service.cxx @@ -59,14 +59,28 @@ 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; } +<<<<<<< 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 ) { diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src index 8f1d783595d6..1de9453e1fc7 100644 --- a/sw/source/ui/web/web.src +++ b/sw/source/ui/web/web.src @@ -25,15 +25,10 @@ * ************************************************************************/ -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#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" @@ -84,10 +79,8 @@ String RID_WEBOLE_TOOLBOX { Text [ en-US ] = "Object/Web" ; }; +<<<<<<< local +======= /************************************************************************* - -*************************************************************************/ -Menu MN_WEB_TEXT_POPUPMENU - BASE_TEXT_POPUPMENU_BEGIN - BASE_TEXT_POPUPMENU_END +>>>>>>> other 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); diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx index 1822ab2de4e8..a45f9b3b22c0 100644 --- a/sw/source/ui/web/wview.cxx +++ b/sw/source/ui/web/wview.cxx @@ -93,7 +93,11 @@ #include <swslots.hxx> +<<<<<<< local +SFX_IMPL_VIEWFACTORY(SwWebView) +======= SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default") +>>>>>>> other { SFX_VIEW_REGISTRATION(SwWebDocShell); } diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx index f3c62f9f9dff..8a20a03be0f0 100644 --- a/sw/source/ui/wrtsh/wrtundo.cxx +++ b/sw/source/ui/wrtsh/wrtundo.cxx @@ -37,10 +37,10 @@ #include <wrtsh.hxx> #include <swundo.hxx> // fuer Undo-Ids #include <swdtflvr.hxx> - -#ifndef _WRTSH_HRC +#include <svtools/svtdata.hxx> +#include <svtools/svtools.hrc> +#include <svtools/svtdata.hxx> #include <wrtsh.hrc> -#endif #include <sfx2/sfx.hrc> @@ -128,7 +128,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; @@ -172,7 +172,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 6fa4bd5432e2..0163270b052c 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -44,7 +44,7 @@ sw_res_files= \ $(SRS)$/dialog.srs \ $(SRS)$/chrdlg.srs \ $(SRS)$/config.srs \ - $(SRS)$/dbui.srs \ + $(SRS)$/dbui.srs \ $(SRS)$/dochdl.srs \ $(SRS)$/docvw.srs \ $(SRS)$/envelp.srs \ @@ -60,12 +60,11 @@ sw_res_files= \ $(SRS)$/smartmenu.srs \ $(SRS)$/table.srs \ $(SRS)$/uiview.srs \ - $(SRS)$/undo.srs \ + $(SRS)$/undo.srs \ $(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 @@ -118,8 +117,7 @@ SHL1STDLIBS+= \ $(SALLIB) \ $(SALHELPERLIB) \ $(ICUUCLIB) \ - $(I18NUTILLIB) -SHL1STDLIBS+= \ + $(I18NUTILLIB) \ $(AVMEDIALIB) .IF "$(GUI)"=="WNT" |