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

[Libreoffice Gerrit user]

New branch 'feature/rb12' available with the following commits:
commit 6b6d014c57b73ddef7b86ddbfb8e6daba67aaefd
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
    
        Patches contributed by Mathias Bauer (and others)
        gnumake4 work variously
        http://svn.apache.org/viewvc?view=revision&revision=1394707
        http://svn.apache.org/viewvc?view=revision&revision=1394326
        cws mba34issues01: #i117717#: remove wrong assertion
        http://svn.apache.org/viewvc?view=revision&revision=1172349
    
        Patch contributed by Herbert Duerr
        goodbye Registration and License dialogs, don't let the door hit you
        http://svn.apache.org/viewvc?view=revision&revision=1172613
        help gcc 4.6.0 on 32bit ubuntu 11.10"
        http://svn.apache.org/viewvc?view=revision&revision=1245357
    
        Do not add targets for junit tests when junit is disabled.
        Patch contributed by Andre Fischer
        http://svn.apache.org/viewvc?view=revision&revision=1241508
    
    remove obsolete FreeBSD visibility special case.
    retain consolidated BSD bridge code, remove OS/2 pieces.

commit 006c5b549b3a6fc4d89f3fe924282fd5f2069625
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Nov 13 15:32:30 2012 +0000

    Revert "sb140: #i117295# use rtl::Static"
    
    This reverts commit d3794d2d8ab2ee3f8118d61538bb753335b37f23.
    
    Conflicts:
    	bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
    	bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
    	bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
    	bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
    	bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx

commit 7328874eeebe3118136eda19604d478df92a60eb
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Nov 13 12:51:05 2012 +0000

    Revert "sb140: #i116785# avoid ring-ref that keeps ref counted objects alive forever"
    
    This reverts commit bb157a42865a2d591f378577c4cfb7c731e18a08.

commit 5de5e59d844f2c7cefd6d04a860627d3befbe08f
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Nov 13 12:18:28 2012 +0000

    Revert "sb140: #i116786# use auto_ptr to track member lifetime"
    
    This reverts commit 335f7fa8c2ef418df7010dd996a2a32bbbdff459.
    
    Conflicts:
    	framework/source/layoutmanager/toolbarlayoutmanager.cxx

commit aab4a3564562f9245cd69a9e3b57c75330b64cc3
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 c4cb530c772464b7d3e070283f3ccfc2add7af39
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