Jan Holesovsky 1a6bf8c433 Merge remote branch 'origin/libreoffice-3-3' ...

Conflicts:
	sw/inc/SwNumberTree.hxx
	sw/inc/calbck.hxx
	sw/inc/tox.hxx
	sw/inc/viscrs.hxx
	sw/source/core/doc/docnum.cxx
	sw/source/core/docnode/finalthreadmanager.cxx
	sw/source/core/docnode/ndnum.cxx
	sw/source/core/docnode/ndtbl.cxx
	sw/source/core/draw/dcontact.cxx
	sw/source/core/edit/edlingu.cxx
	sw/source/core/edit/ednumber.cxx
	sw/source/core/except/errhdl.cxx
	sw/source/core/fields/chpfld.cxx
	sw/source/core/fields/fldbas.cxx
	sw/source/core/frmedt/fetab.cxx
	sw/source/core/layout/flycnt.cxx
	sw/source/core/layout/makefile.mk
	sw/source/core/layout/pagechg.cxx
	sw/source/core/layout/tabfrm.cxx
	sw/source/core/ole/ndole.cxx
	sw/source/core/text/makefile.mk
	sw/source/core/txtnode/txtedt.cxx
	sw/source/filter/basflt/fltini.cxx
	sw/source/filter/html/swhtml.cxx
	sw/source/filter/ww1/fltshell.cxx
	sw/source/filter/ww1/w1sprm.cxx
	sw/source/filter/ww8/wrtw8nds.cxx
	sw/source/filter/ww8/wrtw8num.cxx
	sw/source/filter/ww8/ww8par3.cxx
	sw/source/filter/ww8/ww8par5.cxx
	sw/source/filter/ww8/ww8par6.cxx
	sw/source/filter/xml/xmltble.cxx
	sw/source/filter/xml/xmltbli.cxx
	sw/source/ui/dbui/dbinsdlg.cxx
	sw/source/ui/dbui/mmoutputpage.cxx
	sw/source/ui/dialog/swdlgfact.cxx
	sw/source/ui/docvw/edtwin.cxx
	sw/source/ui/docvw/srcedtw.cxx

2010-11-25 18:50:04 +01:00

..

anchoreddrawobject.cxx

Merge remote branch 'origin/libreoffice-3-3'

2010-11-25 18:50:04 +01:00

anchoredobject.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

atrfrm.cxx

Merge remote branch 'origin/libreoffice-3-3'

2010-11-25 18:50:04 +01:00

calcmove.cxx

Merge remote branch 'origin/libreoffice-3-3'

2010-11-25 18:50:04 +01:00

colfrm.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

dbg_lay.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

findfrm.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

flowfrm.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

fly.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

flycnt.cxx

Merge remote branch 'origin/libreoffice-3-3'

2010-11-25 18:50:04 +01:00

flyincnt.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

flylay.cxx

Merge remote branch 'origin/libreoffice-3-3'

2010-11-25 18:50:04 +01:00

flypos.cxx

Add vim/emacs modelines to all source files

2010-10-14 17:16:56 +02:00

frmtool.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

ftnfrm.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

hffrm.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

layact.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

laycache.cxx

Merge remote branch 'origin/libreoffice-3-3'

2010-11-25 18:50:04 +01:00

layhelp.hxx

Add vim/emacs modelines to all source files

2010-10-14 17:16:56 +02:00

layouter.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

makefile.mk

Merge remote branch 'origin/libreoffice-3-3'

2010-11-25 18:50:04 +01:00

movedfwdfrmsbyobjpos.cxx

Add vim/emacs modelines to all source files

2010-10-14 17:16:56 +02:00

newfrm.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

objectformatter.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

objectformatterlayfrm.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

objectformatterlayfrm.hxx

Add vim/emacs modelines to all source files

2010-10-14 17:16:56 +02:00

objectformattertxtfrm.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

objectformattertxtfrm.hxx

Add vim/emacs modelines to all source files

2010-10-14 17:16:56 +02:00

objstmpconsiderwrapinfl.cxx

Add vim/emacs modelines to all source files

2010-10-14 17:16:56 +02:00

objstmpconsiderwrapinfl.hxx

Add vim/emacs modelines to all source files

2010-10-14 17:16:56 +02:00

pagechg.cxx

Merge remote branch 'origin/libreoffice-3-3'

2010-11-25 18:50:04 +01:00

pagedesc.cxx

Merge remote branch 'origin/libreoffice-3-3'

2010-11-25 18:50:04 +01:00

paintfrm.cxx

Merge remote branch 'origin/libreoffice-3-3'

2010-11-25 18:50:04 +01:00

sectfrm.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

softpagebreak.cxx

Add vim/emacs modelines to all source files

2010-10-14 17:16:56 +02:00

sortedobjs.cxx

Add vim/emacs modelines to all source files

2010-10-14 17:16:56 +02:00

sortedobjsimpl.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

ssfrm.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

swselectionlist.cxx

Add vim/emacs modelines to all source files

2010-10-14 17:16:56 +02:00

tabfrm.cxx

Merge remote branch 'origin/libreoffice-3-3'

2010-11-25 18:50:04 +01:00

trvlfrm.cxx

Merge remote branch 'origin/libreoffice-3-3'

2010-11-25 18:50:04 +01:00

unusedf.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

virtoutp.cxx

Removed DBG_UTIL from sw

2010-11-25 17:12:34 +01:00

virtoutp.hxx

Add vim/emacs modelines to all source files

2010-10-14 17:16:56 +02:00

wsfrm.cxx

Merge remote branch 'origin/libreoffice-3-3'

2010-11-25 18:50:04 +01:00