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

[Jan Holesovsky]

New branch 'integration/dev300_m106' available with the following commits:
commit e88a4fb61318f2282e21f4f55bf6e67075200fd4
Merge: 7e8a4888be548390148cc932a5d0b899e4fdd318 a446d943bae5ca14030ca2ea18f8a8ff895fbcaf
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Apr 22 15:07:40 2011 +0200

    Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
    
    Conflicts:
    	dbaccess/source/core/api/CacheSet.cxx
    	dbaccess/source/core/api/KeySet.cxx
    	dbaccess/source/core/api/KeySet.hxx
    	dbaccess/source/core/api/OptimisticSet.hxx
    	dbaccess/source/core/api/RowSet.cxx
    	dbaccess/source/core/api/RowSetCache.cxx
    	dbaccess/source/core/api/query.cxx
    	dbaccess/source/core/dataaccess/SharedConnection.cxx
    	dbaccess/source/ui/app/AppController.cxx
    	dbaccess/source/ui/app/makefile.mk
    	dbaccess/source/ui/control/FieldDescControl.cxx
    	dbaccess/source/ui/querydesign/query.src
    	dbaccess/source/ui/tabledesign/TEditControl.cxx
    	reportdesign/source/ui/report/ReportController.cxx
    	reportdesign/source/ui/report/ReportSection.cxx
    	reportdesign/source/ui/report/SectionWindow.cxx
    	reportdesign/source/ui/report/StartMarker.cxx
    	reportdesign/source/ui/report/ViewsWindow.cxx