[Libreoffice-commits] Changes to 'feature/rb11'

Mon Nov 12 13:09:44 PST 2012

New branch 'feature/rb11' available with the following commits:
commit 8028137450d2823efc231304b802c7181a583b9d
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Nov 12 17:21:24 2012 +0000

    re-base on ALv2 code. Includes:
    
        Patches contributed by: Armin Le Grand.
        #118558# Correcting OLE attributes of LO3.4 at load time by loading as OOo3.3, details see task.
        http://svn.apache.org/viewvc?view=revision&revision=1195906
        #118485# - Styles for OLEs are not saved.
        http://svn.apache.org/viewvc?view=revision&revision=1182166

commit 70c5fb87f593eaee1e5a023e0674b85b09cae0ac
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Nov 12 17:09:32 2012 +0000

    Revert "sb140: #i117310# remove unnecessary dependency
    
    on XTypeProvider::getImplementationId"
    
    This reverts commit 27b9f9f348b720e08f37db829533372dc4b73248.
    
    Conflicts:
    	xmloff/inc/xmloff/txtparae.hxx
    	xmloff/source/style/SinglePropertySetInfoCache.cxx

commit 13dfd831640ca8786631e743e4d5bbcbef0d5085
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu Apr 7 13:02:56 2011 +0200

    masterfix OOO340: #i117696# do not write fo:margin
    
    Conflicts:
    	xmloff/source/style/PageMasterExportPropMapper.cxx