[Libreoffice-commits] Changes to 'integration/dev300_m106'

[Jan Holesovsky]

New branch 'integration/dev300_m106' available with the following commits:
commit 8f6b8858024a0395d685afff15d8657981593a14
Merge: 323476bbcc3d1b787d5fe7602c45db68a3580ac5 d9c342f89f8007499f4d5b8f2f1f91d1a25de52a
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Apr 22 15:10:19 2011 +0200

    Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
    
    Conflicts:
    	sw/source/core/docnode/ndnotxt.cxx
    	sw/source/core/inc/viewimp.hxx
    	sw/source/core/layout/fly.cxx
    	sw/source/core/layout/paintfrm.cxx
    	sw/source/filter/ww8/WW8TableInfo.cxx
    	sw/source/filter/ww8/wrtw8nds.cxx
    	sw/source/filter/ww8/wrtww8.cxx
    	sw/source/filter/ww8/wrtww8.hxx
    	sw/source/filter/ww8/ww8atr.cxx
    	sw/source/filter/xml/xmlitemi.cxx
    	sw/source/filter/xml/xmlmeta.cxx
    	sw/source/ui/app/docsh2.cxx
    	sw/source/ui/dialog/swdlgfact.cxx
    	sw/source/ui/shells/grfsh.cxx