diff options
Diffstat (limited to 'sw/source/core')
34 files changed, 14 insertions, 2075 deletions
diff --git a/sw/source/core/SwNumberTree/makefile.mk b/sw/source/core/SwNumberTree/makefile.mk deleted file mode 100644 index d67a3f321a01..000000000000 --- a/sw/source/core/SwNumberTree/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=SwNumberTree - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/SwNumberTree.obj \ - $(SLO)$/SwNodeNum.obj - -EXCEPTIONSFILES = \ - $(SLO)$/SwNumberTree.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/access/makefile.mk b/sw/source/core/access/makefile.mk deleted file mode 100644 index 72871314f722..000000000000 --- a/sw/source/core/access/makefile.mk +++ /dev/null @@ -1,100 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=access - -# --- Settings ----------------------------------------------------- -#ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/acccell.obj \ - $(SLO)$/acccontext.obj \ - $(SLO)$/accdoc.obj \ - $(SLO)$/accembedded.obj \ - $(SLO)$/accfootnote.obj \ - $(SLO)$/accframe.obj \ - $(SLO)$/accframebase.obj \ - $(SLO)$/accfrmobj.obj \ - $(SLO)$/accfrmobjmap.obj \ - $(SLO)$/accfrmobjslist.obj \ - $(SLO)$/accgraphic.obj \ - $(SLO)$/accheaderfooter.obj \ - $(SLO)$/acchyperlink.obj \ - $(SLO)$/acchypertextdata.obj \ - $(SLO)$/accmap.obj \ - $(SLO)$/accnotextframe.obj \ - $(SLO)$/accpage.obj \ - $(SLO)$/accpara.obj \ - $(SLO)$/accportions.obj \ - $(SLO)$/accpreview.obj \ - $(SLO)$/accselectionhelper.obj \ - $(SLO)$/acctable.obj \ - $(SLO)$/acctextframe.obj \ - $(SLO)$/textmarkuphelper.obj \ - $(SLO)$/parachangetrackinginfo.obj - -EXCEPTIONSFILES= \ - $(SLO)$/acccell.obj \ - $(SLO)$/acccontext.obj \ - $(SLO)$/accdoc.obj \ - $(SLO)$/accembedded.obj \ - $(SLO)$/accfootnote.obj \ - $(SLO)$/accframe.obj \ - $(SLO)$/accframebase.obj \ - $(SLO)$/accfrmobj.obj \ - $(SLO)$/accfrmobjmap.obj \ - $(SLO)$/accfrmobjslist.obj \ - $(SLO)$/accgraphic.obj \ - $(SLO)$/accheaderfooter.obj \ - $(SLO)$/acchyperlink.obj \ - $(SLO)$/acchypertextdata.obj \ - $(SLO)$/accmap.obj \ - $(SLO)$/accnotextframe.obj \ - $(SLO)$/accpage.obj \ - $(SLO)$/accpara.obj \ - $(SLO)$/accportions.obj \ - $(SLO)$/accpreview.obj \ - $(SLO)$/accselectionhelper.obj \ - $(SLO)$/acctable.obj \ - $(SLO)$/acctextframe.obj \ - $(SLO)$/textmarkuphelper.obj \ - $(SLO)$/parachangetrackinginfo.obj - -# --- Targets ------------------------------------------------------- - - -.INCLUDE : target.mk - diff --git a/sw/source/core/attr/makefile.mk b/sw/source/core/attr/makefile.mk deleted file mode 100644 index a3827d4776e0..000000000000 --- a/sw/source/core/attr/makefile.mk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=attr - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/calbck.obj \ - $(SLO)$/cellatr.obj \ - $(SLO)$/fmtfollowtextflow.obj \ - $(SLO)$/fmtwrapinfluenceonobjpos.obj \ - $(SLO)$/format.obj \ - $(SLO)$/hints.obj \ - $(SLO)$/swatrset.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/bastyp/makefile.mk b/sw/source/core/bastyp/makefile.mk deleted file mode 100644 index 8333dabd5f37..000000000000 --- a/sw/source/core/bastyp/makefile.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=bastyp - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - bparr.cxx \ - breakit.cxx \ - calc.cxx \ - checkit.cxx \ - index.cxx \ - init.cxx \ - ring.cxx \ - swcache.cxx \ - swrect.cxx \ - swregion.cxx \ - swtypes.cxx \ - tabcol.cxx \ - SwSmartTagMgr.cxx - -SLOFILES = \ - $(SLO)$/bparr.obj \ - $(SLO)$/breakit.obj \ - $(SLO)$/calc.obj \ - $(SLO)$/checkit.obj \ - $(SLO)$/index.obj \ - $(SLO)$/init.obj \ - $(SLO)$/ring.obj \ - $(SLO)$/swcache.obj \ - $(SLO)$/swrect.obj \ - $(SLO)$/swregion.obj \ - $(SLO)$/swtypes.obj \ - $(SLO)$/tabcol.obj \ - $(SLO)$/SwSmartTagMgr.obj - -EXCEPTIONSFILES = \ - $(SLO)$/tabcol.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/crsr/makefile.mk b/sw/source/core/crsr/makefile.mk deleted file mode 100644 index a2571901c068..000000000000 --- a/sw/source/core/crsr/makefile.mk +++ /dev/null @@ -1,83 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=crsr - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/crbm.obj \ - $(SLO)$/crsrsh.obj \ - $(SLO)$/bookmrk.obj \ - $(SLO)$/viscrs.obj - -SLOFILES = \ - $(SLO)$/BlockCursor.obj \ - $(SLO)$/bookmrk.obj \ - $(SLO)$/callnk.obj \ - $(SLO)$/crbm.obj \ - $(SLO)$/crsrsh.obj \ - $(SLO)$/crstrvl.obj \ - $(SLO)$/crstrvl1.obj \ - $(SLO)$/findattr.obj \ - $(SLO)$/findcoll.obj \ - $(SLO)$/findfmt.obj \ - $(SLO)$/findtxt.obj \ - $(SLO)$/pam.obj \ - $(SLO)$/paminit.obj \ - $(SLO)$/swcrsr.obj \ - $(SLO)$/trvlcol.obj \ - $(SLO)$/trvlfnfl.obj \ - $(SLO)$/trvlreg.obj \ - $(SLO)$/trvltbl.obj \ - $(SLO)$/unocrsr.obj \ - $(SLO)$/viscrs.obj \ - $(SLO)$/crossrefbookmark.obj - -.IF "$(mydebug)" != "" -SLOFILES += \ - $(SLO)$/pamio.obj -.ENDIF - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/sw/source/core/doc/makefile.mk b/sw/source/core/doc/makefile.mk deleted file mode 100644 index 5a65b2de24e1..000000000000 --- a/sw/source/core/doc/makefile.mk +++ /dev/null @@ -1,92 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=doc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES = \ - $(SLO)$/SwStyleNameMapper.obj \ - $(SLO)$/acmplwrd.obj \ - $(SLO)$/dbgoutsw.obj \ - $(SLO)$/doc.obj \ - $(SLO)$/docbm.obj \ - $(SLO)$/doccomp.obj \ - $(SLO)$/docdraw.obj \ - $(SLO)$/docedt.obj \ - $(SLO)$/docfmt.obj \ - $(SLO)$/docglbl.obj \ - $(SLO)$/docglos.obj \ - $(SLO)$/doclay.obj \ - $(SLO)$/docxforms.obj \ - $(SLO)$/docnew.obj \ - $(SLO)$/docnum.obj \ - $(SLO)$/docsort.obj \ - $(SLO)$/doctxm.obj \ - $(SLO)$/number.obj \ - $(SLO)$/swstylemanager.obj \ - $(SLO)$/tblcpy.obj \ - $(SLO)$/tblrwcl.obj \ - $(SLO)$/list.obj - -SLOFILES = $(EXCEPTIONSFILES) \ - $(SLO)$/docbasic.obj \ - $(SLO)$/docchart.obj \ - $(SLO)$/doccorr.obj \ - $(SLO)$/docdde.obj \ - $(SLO)$/docdesc.obj \ - $(SLO)$/docfld.obj \ - $(SLO)$/docfly.obj \ - $(SLO)$/docftn.obj \ - $(SLO)$/docredln.obj \ - $(SLO)$/docruby.obj \ - $(SLO)$/docstat.obj \ - $(SLO)$/extinput.obj \ - $(SLO)$/fmtcol.obj \ - $(SLO)$/ftnidx.obj \ - $(SLO)$/gctable.obj \ - $(SLO)$/lineinfo.obj \ - $(SLO)$/notxtfrm.obj \ - $(SLO)$/poolfmt.obj \ - $(SLO)$/sortopt.obj \ - $(SLO)$/swserv.obj \ - $(SLO)$/tblafmt.obj \ - $(SLO)$/visiturl.obj \ - $(SLO)$/htmltbl.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 1b0cf4fdfa32..fe5beeb006a0 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -3113,7 +3113,7 @@ void lcl_ChgBoxSize( SwTableBox& rBox, CR_SetBoxWidth& rParam, const SwFmtFrmSize& rOldSz, USHORT& rDelWidth, SwTwips nDist ) { - long nDiff; + long nDiff = 0; BOOL bSetSize = FALSE; switch( rParam.nMode ) diff --git a/sw/source/core/docnode/makefile.mk b/sw/source/core/docnode/makefile.mk deleted file mode 100644 index d3e5df64b6cd..000000000000 --- a/sw/source/core/docnode/makefile.mk +++ /dev/null @@ -1,82 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=docnode - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/cancellablejob.obj \ - $(SLO)$/finalthreadmanager.obj \ - $(SLO)$/ndcopy.obj \ - $(SLO)$/ndtbl.obj \ - $(SLO)$/node.obj \ - $(SLO)$/observablethread.obj \ - $(SLO)$/retrieveinputstream.obj \ - $(SLO)$/retrievedinputstreamdata.obj \ - $(SLO)$/swbaslnk.obj \ - $(SLO)$/threadmanager.obj - -SLOFILES = \ - $(SLO)$/ndindex.obj \ - $(SLO)$/ndcopy.obj \ - $(SLO)$/ndnotxt.obj \ - $(SLO)$/ndnum.obj \ - $(SLO)$/ndsect.obj \ - $(SLO)$/ndtbl.obj \ - $(SLO)$/ndtbl1.obj \ - $(SLO)$/node.obj \ - $(SLO)$/node2lay.obj \ - $(SLO)$/nodes.obj \ - $(SLO)$/section.obj \ - $(SLO)$/swbaslnk.obj \ - $(SLO)$/retrievedinputstreamdata.obj \ - $(SLO)$/observablethread.obj \ - $(SLO)$/cancellablejob.obj \ - $(SLO)$/retrieveinputstream.obj \ - $(SLO)$/retrieveinputstreamconsumer.obj \ - $(SLO)$/threadlistener.obj \ - $(SLO)$/threadmanager.obj \ - $(SLO)$/swthreadmanager.obj \ - $(SLO)$/swthreadjoiner.obj \ - $(SLO)$/pausethreadstarting.obj \ - $(SLO)$/finalthreadmanager.obj - - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/draw/makefile.mk b/sw/source/core/draw/makefile.mk deleted file mode 100644 index a57b1b530e7f..000000000000 --- a/sw/source/core/draw/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=draw - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/dview.obj \ - $(SLO)$/dcontact.obj \ - $(SLO)$/dflyobj.obj \ - $(SLO)$/drawdoc.obj \ - $(SLO)$/dobjfac.obj \ - $(SLO)$/dpage.obj - -EXCEPTIONSFILES= \ - $(SLO)$/dview.obj \ - $(SLO)$/dcontact.obj \ - $(SLO)$/drawdoc.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/edit/makefile.mk b/sw/source/core/edit/makefile.mk deleted file mode 100644 index a7820b405842..000000000000 --- a/sw/source/core/edit/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=edit - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES=\ - $(SLO)$/eddel.obj \ - $(SLO)$/edlingu.obj \ - $(SLO)$/edfldexp.obj \ - $(SLO)$/edtab.obj - -SLOFILES = \ - $(EXCEPTIONSFILES)\ - $(SLO)$/acorrect.obj \ - $(SLO)$/autofmt.obj \ - $(SLO)$/edatmisc.obj \ - $(SLO)$/edattr.obj \ - $(SLO)$/edfcol.obj \ - $(SLO)$/edfld.obj \ - $(SLO)$/edfmt.obj \ - $(SLO)$/edglbldc.obj \ - $(SLO)$/edglss.obj \ - $(SLO)$/editsh.obj \ - $(SLO)$/ednumber.obj \ - $(SLO)$/edredln.obj \ - $(SLO)$/edtox.obj \ - $(SLO)$/edundo.obj \ - $(SLO)$/edws.obj \ - $(SLO)$/edsect.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/except/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/except/makefile.mk b/sw/source/core/except/makefile.mk deleted file mode 100644 index 19450849b59d..000000000000 --- a/sw/source/core/except/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=except - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk - -# hier kein PCH! -prjpch= -PRJPCH= - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -CXXFILES = - -.IF "$(dbgutil)"!="" -CXXFILES += \ - errhdl.cxx \ - dbgloop.cxx - -SLOFILES += \ - $(SLO)$/errhdl.obj \ - $(SLO)$/dbgloop.obj -.ENDIF -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/fields/makefile.mk b/sw/source/core/fields/makefile.mk deleted file mode 100644 index 280fff6aae88..000000000000 --- a/sw/source/core/fields/makefile.mk +++ /dev/null @@ -1,94 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=fields - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - authfld.cxx \ - cellfml.cxx \ - chpfld.cxx \ - dbfld.cxx \ - ddefld.cxx \ - ddetbl.cxx \ - docufld.cxx \ - expfld.cxx \ - fldbas.cxx \ - flddat.cxx \ - flddropdown.cxx \ - scrptfld.cxx \ - macrofld.cxx \ - fldlst.cxx \ - postithelper.cxx \ - reffld.cxx \ - tblcalc.cxx \ - usrfld.cxx - - - -SLOFILES = \ - $(SLO)$/textapi.obj \ - $(SLO)$/authfld.obj \ - $(SLO)$/cellfml.obj \ - $(SLO)$/chpfld.obj \ - $(SLO)$/dbfld.obj \ - $(SLO)$/ddefld.obj \ - $(SLO)$/ddetbl.obj \ - $(SLO)$/docufld.obj \ - $(SLO)$/expfld.obj \ - $(SLO)$/fldbas.obj \ - $(SLO)$/flddat.obj \ - $(SLO)$/flddropdown.obj \ - $(SLO)$/fldlst.obj \ - $(SLO)$/scrptfld.obj \ - $(SLO)$/macrofld.obj \ - $(SLO)$/postithelper.obj \ - $(SLO)$/reffld.obj \ - $(SLO)$/tblcalc.obj \ - $(SLO)$/usrfld.obj - -EXCEPTIONSFILES = \ - $(SLO)$/flddropdown.obj \ - $(SLO)$/postithelper.obj \ - $(SLO)$/docufld.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/frmedt/makefile.mk b/sw/source/core/frmedt/makefile.mk deleted file mode 100644 index 45344a44f574..000000000000 --- a/sw/source/core/frmedt/makefile.mk +++ /dev/null @@ -1,76 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=frmedt - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - fecopy.cxx \ - fedesc.cxx \ - fefly1.cxx \ - feflyole.cxx \ - feshview.cxx \ - fetab.cxx \ - fews.cxx \ - tblsel.cxx - - - -SLOFILES = $(EXCEPTIONSFILES) \ - $(SLO)$/fedesc.obj \ - $(SLO)$/feflyole.obj \ - $(SLO)$/feshview.obj \ - $(SLO)$/fetab.obj \ - -EXCEPTIONSFILES=\ - $(SLO)$/tblsel.obj \ - $(SLO)$/fecopy.obj \ - $(SLO)$/fefly1.obj \ - $(SLO)$/fews.obj - - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/graphic/makefile.mk b/sw/source/core/graphic/makefile.mk deleted file mode 100644 index bb637de66610..000000000000 --- a/sw/source/core/graphic/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=graphic - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/grfatr.obj \ - $(SLO)$/ndgrf.obj - -EXCEPTIONSFILES= \ - $(SLO)$/ndgrf.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/inc/makefile.mk b/sw/source/core/inc/makefile.mk deleted file mode 100644 index 1b35ca49549d..000000000000 --- a/sw/source/core/inc/makefile.mk +++ /dev/null @@ -1,26 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* 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/layout/makefile.mk b/sw/source/core/layout/makefile.mk deleted file mode 100644 index 076069b51339..000000000000 --- a/sw/source/core/layout/makefile.mk +++ /dev/null @@ -1,114 +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. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=layout - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -.IF "$(madebug)" != "" -CDEFS+=-DDEBUG -.ENDIF - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES = \ - $(SLO)$/anchoreddrawobject.obj \ - $(SLO)$/flycnt.obj \ - $(SLO)$/layact.obj \ - $(SLO)$/laycache.obj \ - $(SLO)$/layouter.obj \ - $(SLO)$/movedfwdfrmsbyobjpos.obj \ - $(SLO)$/newfrm.obj \ - $(SLO)$/objectformatter.obj \ - $(SLO)$/objstmpconsiderwrapinfl.obj \ - $(SLO)$/paintfrm.obj \ - $(SLO)$/softpagebreak.obj \ - $(SLO)$/sortedobjsimpl.obj \ - $(SLO)$/pagechg.obj - - -SLOFILES = \ - $(SLO)$/atrfrm.obj \ - $(SLO)$/anchoredobject.obj \ - $(SLO)$/anchoreddrawobject.obj \ - $(SLO)$/calcmove.obj \ - $(SLO)$/colfrm.obj \ - $(SLO)$/findfrm.obj \ - $(SLO)$/flowfrm.obj \ - $(SLO)$/fly.obj \ - $(SLO)$/flycnt.obj \ - $(SLO)$/flyincnt.obj \ - $(SLO)$/flylay.obj \ - $(SLO)$/flypos.obj \ - $(SLO)$/frmtool.obj \ - $(SLO)$/ftnfrm.obj \ - $(SLO)$/hffrm.obj \ - $(SLO)$/layact.obj \ - $(SLO)$/laycache.obj \ - $(SLO)$/layouter.obj \ - $(SLO)$/movedfwdfrmsbyobjpos.obj \ - $(SLO)$/newfrm.obj \ - $(SLO)$/objectformatter.obj \ - $(SLO)$/objectformattertxtfrm.obj \ - $(SLO)$/objectformatterlayfrm.obj \ - $(SLO)$/objstmpconsiderwrapinfl.obj \ - $(SLO)$/pagechg.obj \ - $(SLO)$/pagedesc.obj \ - $(SLO)$/paintfrm.obj \ - $(SLO)$/sectfrm.obj \ - $(SLO)$/softpagebreak.obj \ - $(SLO)$/sortedobjs.obj \ - $(SLO)$/sortedobjsimpl.obj \ - $(SLO)$/ssfrm.obj \ - $(SLO)$/swselectionlist.obj \ - $(SLO)$/tabfrm.obj \ - $(SLO)$/trvlfrm.obj \ - $(SLO)$/unusedf.obj \ - $(SLO)$/virtoutp.obj \ - $(SLO)$/wsfrm.obj - -.IF "$(dbgutil)"!="" -SLOFILES += \ - $(SLO)$/dbg_lay.obj -.ENDIF - - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/makefile.mk b/sw/source/core/makefile.mk deleted file mode 100644 index 2701445fb888..000000000000 --- a/sw/source/core/makefile.mk +++ /dev/null @@ -1,110 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=sw - -TARGET=core - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(CALLTARGETS)"=="core" -RC_SUBDIRS= -.ENDIF - -# --- Files -------------------------------------------------------- - - -SUBLIBS1= \ - $(SLB)$/access.lib \ - $(SLB)$/graphic.lib \ - $(SLB)$/para.lib \ - $(SLB)$/attr.lib \ - $(SLB)$/edit.lib \ - $(SLB)$/crsr.lib \ - $(SLB)$/view.lib - - -SUBLIBS2= \ - $(SLB)$/draw.lib \ - $(SLB)$/sw3io.lib \ - $(SLB)$/swg.lib \ - $(SLB)$/layout.lib \ - $(SLB)$/text.lib \ - $(SLB)$/doc.lib \ - $(SLB)$/txtnode.lib - -SUBLIBS3= \ - $(SLB)$/docnode.lib \ - $(SLB)$/unocore.lib \ - $(SLB)$/objectpositioning.lib \ - $(SLB)$/SwNumberTree.lib \ - $(SLB)$/tablecore.lib - -.IF "$(dbgutil)"!="" -SUBLIBS3+= \ - $(SLB)$/except.lib -.ENDIF - -SUBLIBS4= \ - $(SLB)$/frmedt.lib \ - $(SLB)$/ole.lib \ - $(SLB)$/fields.lib \ - $(SLB)$/tox.lib \ - $(SLB)$/undo.lib \ - $(SLB)$/bastyp.lib -#------------------------------------------------------------------------- - -################################################################ - -LIB1TARGET=$(SLB)$/core1.lib -LIB1FILES= \ - $(SUBLIBS1) - -LIB2TARGET=$(SLB)$/core2.lib -LIB2FILES= \ - $(SUBLIBS2) - -LIB3TARGET=$(SLB)$/core3.lib -LIB3FILES= \ - $(SUBLIBS3) - -LIB4TARGET=$(SLB)$/core4.lib -LIB4FILES= \ - $(SUBLIBS4) - -.INCLUDE : target.mk - -################################################################ - -#------------------------------------------------------------------------- - - diff --git a/sw/source/core/objectpositioning/makefile.mk b/sw/source/core/objectpositioning/makefile.mk deleted file mode 100644 index 4192414d9b73..000000000000 --- a/sw/source/core/objectpositioning/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=objectpositioning - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -.IF "$(madebug)" != "" -CDEFS+=-DDEBUG -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/anchoredobjectposition.obj \ - $(SLO)$/ascharanchoredobjectposition.obj \ - $(SLO)$/tolayoutanchoredobjectposition.obj \ - $(SLO)$/tocntntanchoredobjectposition.obj \ - $(SLO)$/environmentofanchoredobject.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/ole/makefile.mk b/sw/source/core/ole/makefile.mk deleted file mode 100644 index 8aaf9ed419d2..000000000000 --- a/sw/source/core/ole/makefile.mk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=ole - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - ndole.cxx - -SLOFILES = \ - $(SLO)$/ndole.obj - -EXCEPTIONSFILES = \ - $(SLO)$/ndole.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/para/makefile.mk b/sw/source/core/para/makefile.mk deleted file mode 100644 index 7005bf0e9889..000000000000 --- a/sw/source/core/para/makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=para - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - paratr.cxx - - - -SLOFILES = \ - $(SLO)$/paratr.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/sw3io/makefile.mk b/sw/source/core/sw3io/makefile.mk deleted file mode 100644 index 01a50f5df733..000000000000 --- a/sw/source/core/sw3io/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=sw3io - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/swacorr.obj \ - $(SLO)$/sw3convert.obj - - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/swg/makefile.mk b/sw/source/core/swg/makefile.mk deleted file mode 100644 index c7aa25ec5d24..000000000000 --- a/sw/source/core/swg/makefile.mk +++ /dev/null @@ -1,62 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=swg - -#ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- -SLOFILES = \ - $(SLO)$/swblocks.obj \ - $(SLO)$/SwXMLBlockImport.obj \ - $(SLO)$/SwXMLSectionList.obj \ - $(SLO)$/SwXMLBlockExport.obj \ - $(SLO)$/SwXMLBlockListContext.obj \ - $(SLO)$/SwXMLTextBlocks.obj \ - $(SLO)$/SwXMLTextBlocks1.obj - -EXCEPTIONSFILES = \ - $(SLO)$/SwXMLBlockImport.obj \ - $(SLO)$/SwXMLSectionList.obj \ - $(SLO)$/SwXMLBlockExport.obj \ - $(SLO)$/SwXMLBlockListContext.obj \ - $(SLO)$/SwXMLTextBlocks.obj \ - $(SLO)$/SwXMLTextBlocks1.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/table/makefile.mk b/sw/source/core/table/makefile.mk deleted file mode 100644 index d63101e30a7e..000000000000 --- a/sw/source/core/table/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=tablecore -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/swtable.obj \ - $(SLO)$/swnewtable.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/text/makefile.mk b/sw/source/core/text/makefile.mk deleted file mode 100644 index 0076a1748741..000000000000 --- a/sw/source/core/text/makefile.mk +++ /dev/null @@ -1,119 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=text - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -.IF "$(ENABLE_GRAPHITE)" == "TRUE" -CFLAGS+=-DENABLE_GRAPHITE -.ENDIF -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/atrstck.obj \ - $(SLO)$/EnhancedPDFExportHelper.obj \ - $(SLO)$/frmcrsr.obj \ - $(SLO)$/frmform.obj \ - $(SLO)$/frminf.obj \ - $(SLO)$/frmpaint.obj \ - $(SLO)$/guess.obj \ - $(SLO)$/inftxt.obj \ - $(SLO)$/itradj.obj \ - $(SLO)$/itratr.obj \ - $(SLO)$/itrcrsr.obj \ - $(SLO)$/itrform2.obj \ - $(SLO)$/itrpaint.obj \ - $(SLO)$/itrtxt.obj \ - $(SLO)$/porexp.obj \ - $(SLO)$/porfld.obj \ - $(SLO)$/porfly.obj \ - $(SLO)$/porglue.obj \ - $(SLO)$/porlay.obj \ - $(SLO)$/porlin.obj \ - $(SLO)$/pormulti.obj \ - $(SLO)$/porref.obj \ - $(SLO)$/porrst.obj \ - $(SLO)$/portox.obj \ - $(SLO)$/portxt.obj \ - $(SLO)$/redlnitr.obj \ - $(SLO)$/txtcache.obj \ - $(SLO)$/txtdrop.obj \ - $(SLO)$/txtfld.obj \ - $(SLO)$/txtfly.obj \ - $(SLO)$/txtfrm.obj \ - $(SLO)$/txtftn.obj \ - $(SLO)$/txthyph.obj \ - $(SLO)$/txtinit.obj \ - $(SLO)$/txtpaint.obj \ - $(SLO)$/txttab.obj \ - $(SLO)$/widorp.obj \ - $(SLO)$/blink.obj \ - $(SLO)$/noteurl.obj \ - $(SLO)$/SwGrammarMarkUp.obj \ - $(SLO)$/wrong.obj - -.IF "$(dbgutil)"!="" -SLOFILES += \ - $(SLO)$/txtio.obj -.ENDIF - -EXCEPTIONSFILES = \ - $(SLO)$/EnhancedPDFExportHelper.obj \ - $(SLO)$/inftxt.obj \ - $(SLO)$/itradj.obj \ - $(SLO)$/itrcrsr.obj \ - $(SLO)$/porlay.obj \ - $(SLO)$/pormulti.obj \ - $(SLO)$/SwGrammarMarkUp.obj \ - $(SLO)$/txtfly.obj \ - $(SLO)$/wrong.obj - - -.IF "$(CPUNAME)" == "SPARC" -.IF "$(OS)" == "NETBSD" -NOOPTFILES = \ - $(SLO)$/txtftn.obj -.ENDIF -.ENDIF - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/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/tox/makefile.mk b/sw/source/core/tox/makefile.mk deleted file mode 100644 index 60de3744917f..000000000000 --- a/sw/source/core/tox/makefile.mk +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=tox - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/tox.obj \ - $(SLO)$/toxhlp.obj \ - $(SLO)$/txmsrt.obj - -EXCEPTIONSFILES= \ - $(SLO)$/toxhlp.obj \ - $(SLO)$/tox.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/txtnode/makefile.mk b/sw/source/core/txtnode/makefile.mk deleted file mode 100644 index f03f96c42674..000000000000 --- a/sw/source/core/txtnode/makefile.mk +++ /dev/null @@ -1,86 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=txtnode - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/atrfld.obj \ - $(SLO)$/atrflyin.obj \ - $(SLO)$/atrftn.obj \ - $(SLO)$/atrref.obj \ - $(SLO)$/atrtox.obj \ - $(SLO)$/chrfmt.obj \ - $(SLO)$/fmtatr2.obj \ - $(SLO)$/fntcap.obj \ - $(SLO)$/fntcache.obj \ - $(SLO)$/swfntcch.obj \ - $(SLO)$/SwGrammarContact.obj \ - $(SLO)$/modeltoviewhelper.obj \ - $(SLO)$/ndhints.obj \ - $(SLO)$/ndtxt.obj \ - $(SLO)$/swfont.obj \ - $(SLO)$/thints.obj \ - $(SLO)$/txatbase.obj \ - $(SLO)$/txatritr.obj \ - $(SLO)$/txtatr2.obj \ - $(SLO)$/txtedt.obj - - -EXCEPTIONSFILES = \ - $(SLO)$/fmtatr2.obj \ - $(SLO)$/atrtox.obj \ - $(SLO)$/atrflyin.obj \ - $(SLO)$/docnew.obj \ - $(SLO)$/fntcache.obj \ - $(SLO)$/ndtxt.obj \ - $(SLO)$/thints.obj \ - $(SLO)$/txtedt.obj - - -.IF "$(dbutil)" != "" -OFILES+=$(SLO)$/dbchratr.$(QBJX) -.ENDIF - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/undo/makefile.mk b/sw/source/core/undo/makefile.mk deleted file mode 100644 index 35771fa444bf..000000000000 --- a/sw/source/core/undo/makefile.mk +++ /dev/null @@ -1,87 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=undo - -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - undo.src - -EXCEPTIONSFILES = \ - $(SLO)$/SwRewriter.obj \ - $(SLO)$/unattr.obj \ - $(SLO)$/undobj.obj \ - $(SLO)$/undraw.obj \ - $(SLO)$/unnum.obj \ - $(SLO)$/unovwr.obj \ - $(SLO)$/untbl.obj - -SLOFILES = \ - $(SLO)$/SwRewriter.obj \ - $(SLO)$/SwUndoField.obj \ - $(SLO)$/SwUndoPageDesc.obj \ - $(SLO)$/SwUndoFmt.obj \ - $(SLO)$/SwUndoTOXChange.obj \ - $(SLO)$/docundo.obj \ - $(SLO)$/rolbck.obj \ - $(SLO)$/unattr.obj \ - $(SLO)$/unbkmk.obj \ - $(SLO)$/undel.obj \ - $(SLO)$/undobj.obj \ - $(SLO)$/undobj1.obj \ - $(SLO)$/undoflystrattr.obj \ - $(SLO)$/undraw.obj \ - $(SLO)$/unfmco.obj \ - $(SLO)$/unins.obj \ - $(SLO)$/unmove.obj \ - $(SLO)$/unnum.obj \ - $(SLO)$/unoutl.obj \ - $(SLO)$/unovwr.obj \ - $(SLO)$/unredln.obj \ - $(SLO)$/unsect.obj \ - $(SLO)$/unsort.obj \ - $(SLO)$/unspnd.obj \ - $(SLO)$/untbl.obj \ - $(SLO)$/untblk.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/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/unocore/makefile.mk b/sw/source/core/unocore/makefile.mk deleted file mode 100644 index 09e6371ada80..000000000000 --- a/sw/source/core/unocore/makefile.mk +++ /dev/null @@ -1,124 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=unocore - -# --- Settings ----------------------------------------------------- -#ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- -EXCEPTIONSFILES= \ - $(SLO)$/swunohelper.obj\ - $(SLO)$/SwXTextDefaults.obj\ - $(SLO)$/unobkm.obj\ - $(SLO)$/unochart.obj\ - $(SLO)$/unoevent.obj\ - $(SLO)$/unocrsrhelper.obj\ - $(SLO)$/unoevtlstnr.obj\ - $(SLO)$/unoftn.obj\ - $(SLO)$/unorefmk.obj\ - $(SLO)$/unosect.obj\ - $(SLO)$/unosett.obj\ - $(SLO)$/unocoll.obj\ - $(SLO)$/unodraw.obj\ - $(SLO)$/unofield.obj\ - $(SLO)$/unoframe.obj\ - $(SLO)$/unoidx.obj\ - $(SLO)$/unoobj.obj\ - $(SLO)$/unoobj2.obj\ - $(SLO)$/unoparagraph.obj\ - $(SLO)$/unoport.obj\ - $(SLO)$/unoredline.obj\ - $(SLO)$/unoredlines.obj\ - $(SLO)$/unosrch.obj\ - $(SLO)$/unostyle.obj\ - $(SLO)$/unotbl.obj \ - $(SLO)$/unoflatpara.obj\ - $(SLO)$/unotextmarkup.obj\ - $(SLO)$/TextCursorHelper.obj \ - $(SLO)$/unotext.obj - -.IF "$(GUI)$(COM)$(CPU)" == "WNTMSCI" -EXCEPTIONSNOOPTFILES =$(SLO)$/unoportenum.obj -.ELSE -EXCEPTIONSFILES +=$(SLO)$/unoportenum.obj -.ENDIF - - -SRS1NAME=$(TARGET) -SRC1FILES = \ - unocore.src - -SLOFILES = \ - $(SLO)$/swunohelper.obj\ - $(SLO)$/SwXTextDefaults.obj\ - $(SLO)$/unoportenum.obj\ - $(SLO)$/unobkm.obj\ - $(SLO)$/unochart.obj\ - $(SLO)$/unoevent.obj\ - $(SLO)$/unocrsrhelper.obj\ - $(SLO)$/unoevtlstnr.obj\ - $(SLO)$/unoftn.obj\ - $(SLO)$/unorefmk.obj\ - $(SLO)$/unosect.obj\ - $(SLO)$/unosett.obj\ - $(SLO)$/unocoll.obj\ - $(SLO)$/unodraw.obj\ - $(SLO)$/unofield.obj\ - $(SLO)$/unoframe.obj\ - $(SLO)$/unoidx.obj\ - $(SLO)$/unoobj.obj\ - $(SLO)$/unoobj2.obj\ - $(SLO)$/unoparagraph.obj\ - $(SLO)$/unoport.obj\ - $(SLO)$/unoredline.obj\ - $(SLO)$/unoredlines.obj\ - $(SLO)$/unosrch.obj\ - $(SLO)$/unostyle.obj\ - $(SLO)$/unotbl.obj \ - $(SLO)$/unoflatpara.obj\ - $(SLO)$/unotextmarkup.obj\ - $(SLO)$/TextCursorHelper.obj \ - $(SLO)$/unotext.obj\ - $(SLO)$/unomap.obj\ - $(SLO)$/unoprnms.obj\ - $(SLO)$/XMLRangeHelper.obj - - - -# --- Targets ------------------------------------------------------- - - -.INCLUDE : target.mk - diff --git a/sw/source/core/view/makefile.mk b/sw/source/core/view/makefile.mk deleted file mode 100755 index 0ac0e0d106cb..000000000000 --- a/sw/source/core/view/makefile.mk +++ /dev/null @@ -1,61 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=view -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/vdraw.obj \ - $(SLO)$/viewimp.obj \ - $(SLO)$/viewsh.obj \ - $(SLO)$/pagepreviewlayout.obj \ - $(SLO)$/printdata.obj \ - $(SLO)$/viewpg.obj \ - $(SLO)$/vnew.obj \ - $(SLO)$/vprint.obj - - - -EXCEPTIONSFILES = \ - $(SLO)$/pagepreviewlayout.obj - - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - |