[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 210 commits - bridges/source canvas/source chart2/inc chart2/source comphelper/source configure.ac connectivity/source cui/source dbaccess/source distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf download.lst dtrans/source extensions/source external/jfreereport extras/source filter/CppunitTest_filter_utils.mk filter/Module_filter.mk filter/qa filter/source forms/source i18nlangtag/qa icon-themes/galaxy icon-themes/sifr include/editeng include/oox include/sal include/sfx2 include/svx include/ucbhelper include/unotools include/vcl include/xmloff instsetoo_native/CustomTarget_setup.mk instsetoo_native/inc_common jvmfwk/plugins offapi/com officecfg/registry oox/source postprocess/qa postprocess/Rdb_services.mk readlicense_oo/license RepositoryExternal.mk sc/inc scp2/source sc/source sc/uiconfig sd/source sd/uiconfig setup_native/source sfx2/source solenv/gbuild solenv/gdb st armath/inc starmath/source svl/source svtools/source svx/source sw/inc sw/qa sw/source sw/uiconfig testtools/com testtools/source toolkit/source tools/source ucbhelper/source ucb/source unotools/source vcl/generic vcl/headless vcl/inc vcl/opengl vcl/qa vcl/source vcl/unx wizards/com wizards/source writerfilter/source xmloff/source
Miklos Vajna
vmiklos at collabora.co.uk
Thu Aug 6 03:58:03 PDT 2015
RepositoryExternal.mk | 5
bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 6
bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx | 77
canvas/source/directx/dx_9rm.cxx | 1
chart2/inc/ChartModel.hxx | 3
chart2/source/controller/main/ChartWindow.cxx | 8
chart2/source/inc/LinePropertiesHelper.hxx | 2
chart2/source/model/main/Axis.cxx | 1
chart2/source/tools/LinePropertiesHelper.cxx | 17
comphelper/source/misc/syntaxhighlight.cxx | 1
configure.ac | 11
connectivity/source/drivers/mork/MNSFolders.cxx | 4
cui/source/tabpages/textattr.cxx | 2
dbaccess/source/ui/app/AppController.cxx | 2
dbaccess/source/ui/inc/TableWindow.hxx | 10
dbaccess/source/ui/querydesign/JoinTableView.cxx | 2
dbaccess/source/ui/querydesign/QTableWindow.cxx | 18
dbaccess/source/ui/querydesign/TableWindow.cxx | 83
dbaccess/source/ui/querydesign/TableWindowAccess.cxx | 14
dev/null |binary
distro-configs/LibreOfficeLinux.conf | 1
distro-configs/LibreOfficeWin32.conf | 1
distro-configs/LibreOfficeWin64.conf | 1
download.lst | 4
dtrans/source/win32/dnd/target.cxx | 3
extensions/source/bibliography/bibview.cxx | 6
extensions/source/bibliography/general.cxx | 7
extensions/source/bibliography/general.hxx | 4
external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk | 1
external/jfreereport/UnpackedTarball_jfreereport_libformula.mk | 2
external/jfreereport/patches/flow-engine_date_is_datetime.patch.1 | 13
external/jfreereport/patches/libformula-datevalue_truncation.patch.1 | 29
external/jfreereport/patches/libformula-minutes_truncation.patch.1 | 17
extras/source/autocorr/lang/af-ZA/DocumentList.xml | 19
extras/source/autocorr/lang/bg/DocumentList.xml | 1163
extras/source/autocorr/lang/ca/DocumentList.xml | 871
extras/source/autocorr/lang/cs/DocumentList.xml | 1157
extras/source/autocorr/lang/da/DocumentList.xml | 1059
extras/source/autocorr/lang/de/DocumentList.xml | 1160
extras/source/autocorr/lang/en-AU/DocumentList.xml | 1164
extras/source/autocorr/lang/en-GB/DocumentList.xml | 1163
extras/source/autocorr/lang/en-US/DocumentList.xml | 2057
extras/source/autocorr/lang/en-ZA/DocumentList.xml | 19
extras/source/autocorr/lang/es/DocumentList.xml | 1054
extras/source/autocorr/lang/fa/DocumentList.xml | 19
extras/source/autocorr/lang/fi/DocumentList.xml | 1163
extras/source/autocorr/lang/fr/DocumentList.xml | 1161
extras/source/autocorr/lang/ga-IE/DocumentList.xml | 19
extras/source/autocorr/lang/hr/DocumentList.xml | 753
extras/source/autocorr/lang/hu/DocumentList.xml | 2050
extras/source/autocorr/lang/it/DocumentList.xml | 1156
extras/source/autocorr/lang/ja/DocumentList.xml | 20
extras/source/autocorr/lang/ko/DocumentList.xml | 146
extras/source/autocorr/lang/lb-LU/DocumentList.xml | 19
extras/source/autocorr/lang/lt/DocumentList.xml | 285
extras/source/autocorr/lang/mn/DocumentList.xml | 19
extras/source/autocorr/lang/nl-BE/DocumentList.xml | 1126
extras/source/autocorr/lang/nl/DocumentList.xml | 1138
extras/source/autocorr/lang/pl/DocumentList.xml | 19
extras/source/autocorr/lang/pt-BR/DocumentList.xml | 1145
extras/source/autocorr/lang/pt/DocumentList.xml | 1158
extras/source/autocorr/lang/ro/DocumentList.xml | 1145
extras/source/autocorr/lang/ru/DocumentList.xml | 472
extras/source/autocorr/lang/sk/DocumentList.xml | 427
extras/source/autocorr/lang/sl/DocumentList.xml | 1163
extras/source/autocorr/lang/sv/DocumentList.xml | 164
extras/source/autocorr/lang/tr/DocumentList.xml | 1143
extras/source/autocorr/lang/vi/DocumentList.xml | 19
extras/source/autocorr/lang/zh-CN/DocumentList.xml | 146
extras/source/autocorr/lang/zh-TW/DocumentList.xml | 81
filter/CppunitTest_filter_utils.mk | 46
filter/Module_filter.mk | 1
filter/qa/cppunit/data/dxf/fail/hang-1.dxf | 1
filter/qa/cppunit/data/dxf/pass/pyramid.dxf |25008 ++++++++++
filter/qa/cppunit/data/eps/fail/short-1.eps |binary
filter/qa/cppunit/data/met/fail/crash-1.met |binary
filter/qa/cppunit/data/met/fail/hang-1.met |binary
filter/qa/cppunit/data/met/pass/hang-2.met |binary
filter/qa/cppunit/data/pbm/fail/hang-1.pbm |binary
filter/qa/cppunit/data/pbm/indeterminate/.gitignore | 1
filter/qa/cppunit/data/pbm/pass/rhbz160429-1.pbm |binary
filter/qa/cppunit/data/pcx/fail/hang-1.pcx |binary
filter/qa/cppunit/data/pict/fail/exception-1.pct |binary
filter/qa/cppunit/data/pict/pass/tdf92789.pct |binary
filter/qa/cppunit/data/ras/fail/CVE-2008-1097-1.ras |binary
filter/qa/cppunit/data/ras/fail/crash-1.ras |binary
filter/qa/cppunit/data/tiff/fail/crash-1.tiff |binary
filter/qa/cppunit/data/tiff/fail/crash-2.tiff |binary
filter/qa/cppunit/data/tiff/fail/crash-3.tiff |binary
filter/qa/cppunit/data/tiff/fail/crash-4.tiff |binary
filter/qa/cppunit/data/tiff/fail/crash-5.tiff |binary
filter/qa/cppunit/data/tiff/fail/crash-6.tiff |binary
filter/qa/cppunit/data/tiff/fail/crash-7.tiff |binary
filter/qa/cppunit/data/tiff/fail/hang-1.tiff |binary
filter/qa/cppunit/data/tiff/fail/hang-2.tiff |binary
filter/qa/cppunit/data/tiff/fail/hang-4.tiff |binary
filter/qa/cppunit/data/tiff/fail/hang-5.tiff |binary
filter/qa/cppunit/data/tiff/fail/hang-6.tiff |binary
filter/qa/cppunit/data/tiff/fail/hang-7.tiff |binary
filter/qa/cppunit/data/tiff/fail/hang-8.tiff |binary
filter/qa/cppunit/data/tiff/fail/hang-9.tiff |binary
filter/qa/cppunit/data/tiff/fail/loop.tif |binary
filter/qa/cppunit/filters-ppm-test.cxx | 4
filter/qa/cppunit/utils-test.cxx | 77
filter/source/graphicfilter/idxf/dxfgrprd.cxx | 3
filter/source/graphicfilter/ieps/ieps.cxx | 16
filter/source/graphicfilter/ios2met/ios2met.cxx | 52
filter/source/graphicfilter/ipbm/ipbm.cxx | 2
filter/source/graphicfilter/ipcx/ipcx.cxx | 4
filter/source/graphicfilter/ipict/ipict.cxx | 67
filter/source/graphicfilter/ipsd/ipsd.cxx | 47
filter/source/graphicfilter/iras/iras.cxx | 40
filter/source/graphicfilter/itiff/ccidecom.cxx | 53
filter/source/graphicfilter/itiff/itiff.cxx | 126
filter/source/msfilter/msdffimp.cxx | 10
filter/source/msfilter/util.cxx | 70
forms/source/component/clickableimage.cxx | 21
forms/source/component/clickableimage.hxx | 5
i18nlangtag/qa/cppunit/test_languagetag.cxx | 5
icon-themes/galaxy/brand/flat_logo.svg |10880 ++++
icon-themes/galaxy/brand/intro.png |binary
icon-themes/galaxy/brand/shell/about.svg | 9324 +++
icon-themes/galaxy/brand_dev/intro.png |binary
icon-themes/galaxy/sfx2/res/logo.png |binary
icon-themes/galaxy/sfx2/res/startcenter-logo.png |binary
icon-themes/sifr/cmd/lc_basicshapes.block-arc.png |binary
icon-themes/sifr/cmd/lc_basicshapes.can.png |binary
icon-themes/sifr/cmd/lc_basicshapes.circle-pie.png |binary
icon-themes/sifr/cmd/lc_basicshapes.circle.png |binary
icon-themes/sifr/cmd/lc_basicshapes.cross.png |binary
icon-themes/sifr/cmd/lc_basicshapes.cube.png |binary
icon-themes/sifr/cmd/lc_basicshapes.diamond.png |binary
icon-themes/sifr/cmd/lc_basicshapes.ellipse.png |binary
icon-themes/sifr/cmd/lc_basicshapes.frame.png |binary
icon-themes/sifr/cmd/lc_basicshapes.hexagon.png |binary
icon-themes/sifr/cmd/lc_basicshapes.isosceles-triangle.png |binary
icon-themes/sifr/cmd/lc_basicshapes.octagon.png |binary
icon-themes/sifr/cmd/lc_basicshapes.paper.png |binary
icon-themes/sifr/cmd/lc_basicshapes.parallelogram.png |binary
icon-themes/sifr/cmd/lc_basicshapes.pentagon.png |binary
icon-themes/sifr/cmd/lc_basicshapes.quadrat.png |binary
icon-themes/sifr/cmd/lc_basicshapes.rectangle.png |binary
icon-themes/sifr/cmd/lc_basicshapes.right-triangle.png |binary
icon-themes/sifr/cmd/lc_basicshapes.ring.png |binary
icon-themes/sifr/cmd/lc_basicshapes.round-quadrat.png |binary
icon-themes/sifr/cmd/lc_basicshapes.round-rectangle.png |binary
icon-themes/sifr/cmd/lc_basicshapes.trapezoid.png |binary
icon-themes/sifr/cmd/lc_fillcolor.png |binary
icon-themes/sifr/cmd/lc_insertbookmark.png |binary
icon-themes/sifr/cmd/sc_basicshapes.block-arc.png |binary
icon-themes/sifr/cmd/sc_basicshapes.can.png |binary
icon-themes/sifr/cmd/sc_basicshapes.circle-pie.png |binary
icon-themes/sifr/cmd/sc_basicshapes.circle.png |binary
icon-themes/sifr/cmd/sc_basicshapes.cross.png |binary
icon-themes/sifr/cmd/sc_basicshapes.cube.png |binary
icon-themes/sifr/cmd/sc_basicshapes.diamond.png |binary
icon-themes/sifr/cmd/sc_basicshapes.ellipse.png |binary
icon-themes/sifr/cmd/sc_basicshapes.frame.png |binary
icon-themes/sifr/cmd/sc_basicshapes.hexagon.png |binary
icon-themes/sifr/cmd/sc_basicshapes.isosceles-triangle.png |binary
icon-themes/sifr/cmd/sc_basicshapes.octagon.png |binary
icon-themes/sifr/cmd/sc_basicshapes.paper.png |binary
icon-themes/sifr/cmd/sc_basicshapes.parallelogram.png |binary
icon-themes/sifr/cmd/sc_basicshapes.pentagon.png |binary
icon-themes/sifr/cmd/sc_basicshapes.quadrat.png |binary
icon-themes/sifr/cmd/sc_basicshapes.rectangle.png |binary
icon-themes/sifr/cmd/sc_basicshapes.right-triangle.png |binary
icon-themes/sifr/cmd/sc_basicshapes.ring.png |binary
icon-themes/sifr/cmd/sc_basicshapes.round-quadrat.png |binary
icon-themes/sifr/cmd/sc_basicshapes.round-rectangle.png |binary
icon-themes/sifr/cmd/sc_basicshapes.trapezoid.png |binary
icon-themes/sifr/cmd/sc_fillcolor.png |binary
icon-themes/sifr/cmd/sc_insertbookmark.png |binary
icon-themes/sifr/res/lx03139.png |binary
icon-themes/sifr/res/sx03139.png |binary
include/editeng/editids.hrc | 2
include/oox/vml/vmlshape.hxx | 1
include/oox/vml/vmltextbox.hxx | 1
include/sal/log.hxx | 12
include/sfx2/childwin.hxx | 2
include/svx/charmap.hxx | 1
include/svx/fmview.hxx | 2
include/svx/sdrpaintwindow.hxx | 6
include/svx/svdedxv.hxx | 2
include/svx/svdpntv.hxx | 2
include/svx/svxids.hrc | 2
include/ucbhelper/simpleauthenticationrequest.hxx | 8
include/unotools/historyoptions.hxx | 3
include/vcl/ctrl.hxx | 2
include/vcl/outdev.hxx | 14
include/vcl/print.hxx | 2
include/vcl/printerinfomanager.hxx | 6
include/vcl/settings.hxx | 3
include/vcl/window.hxx | 12
include/xmloff/xmltoken.hxx | 4
instsetoo_native/CustomTarget_setup.mk | 14
instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp |binary
instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp |binary
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 2
offapi/com/sun/star/chart2/X3DChartWindowProvider.idl | 2
offapi/com/sun/star/sheet/DatabaseRange.idl | 7
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 2
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 13
oox/source/export/drawingml.cxx | 2
oox/source/vml/vmlshape.cxx | 77
oox/source/vml/vmlshapecontext.cxx | 1
oox/source/vml/vmltextboxcontext.cxx | 2
postprocess/Rdb_services.mk | 9
postprocess/qa/services.cxx | 11
readlicense_oo/license/CREDITS.fodt | 2923 -
sc/inc/conditio.hxx | 1
sc/inc/dbdata.hxx | 5
sc/inc/refdata.hxx | 9
sc/inc/tokenarray.hxx | 6
sc/source/core/data/column3.cxx | 4
sc/source/core/data/conditio.cxx | 5
sc/source/core/data/documen7.cxx | 25
sc/source/core/data/document.cxx | 63
sc/source/core/data/formulacell.cxx | 3
sc/source/core/tool/compiler.cxx | 80
sc/source/core/tool/dbdata.cxx | 21
sc/source/core/tool/interpr4.cxx | 1
sc/source/core/tool/refdata.cxx | 92
sc/source/core/tool/token.cxx | 28
sc/source/filter/excel/xlformula.cxx | 6
sc/source/filter/oox/formulabase.cxx | 6
sc/source/filter/oox/tablebuffer.cxx | 9
sc/source/filter/xml/xmlexprt.cxx | 9
sc/source/ui/app/inputhdl.cxx | 51
sc/source/ui/docshell/dbdocfun.cxx | 3
sc/source/ui/inc/anyrefdg.hxx | 2
sc/source/ui/inc/inputhdl.hxx | 3
sc/source/ui/miscdlgs/anyrefdg.cxx | 5
sc/source/ui/unoobj/datauno.cxx | 9
sc/source/ui/unoobj/docuno.cxx | 5
sc/source/ui/view/tabview5.cxx | 4
sc/source/ui/view/viewfunc.cxx | 6
sc/uiconfig/scalc/toolbar/drawbar.xml | 2
scp2/source/ooo/directory_ooo.scp | 5
scp2/source/ooo/file_extra_ooo.scp | 7
scp2/source/ooo/module_ooo.scp | 1
sd/source/core/stlpool.cxx | 5
sd/source/core/stlsheet.cxx | 7
sd/source/ui/app/sdmod2.cxx | 3
sd/source/ui/framework/factories/FullScreenPane.cxx | 7
sd/source/ui/inc/OutlineView.hxx | 2
sd/source/ui/presenter/PresenterHelper.cxx | 6
sd/source/ui/slideshow/showwin.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 4
sd/source/ui/unoidl/unomodel.cxx | 35
sd/source/ui/view/ToolBarManager.cxx | 2
sd/source/ui/view/drviews1.cxx | 3
sd/source/ui/view/outlview.cxx | 4
sd/uiconfig/sdraw/toolbar/standardbar.xml | 6
sd/uiconfig/sdraw/toolbar/toolbar.xml | 19
setup_native/source/packinfo/osxdndinstall.png |binary
sfx2/source/appl/childwin.cxx | 17
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/appl/sfxpicklist.cxx | 35
sfx2/source/control/recentdocsview.cxx | 6
sfx2/source/dialog/templdlg.cxx | 30
solenv/gbuild/LinkTarget.mk | 8
solenv/gdb/boost/ptr_container.py | 8
solenv/gdb/boost/unordered.py | 4
solenv/gdb/libreoffice/sw.py | 2
starmath/inc/ElementsDockingWindow.hxx | 4
starmath/inc/dialog.hxx | 1
starmath/source/ElementsDockingWindow.cxx | 69
starmath/source/dialog.cxx | 4
svl/source/numbers/zformat.cxx | 2
svtools/source/misc/dialogcontrolling.cxx | 18
svtools/source/uno/genericunodialog.cxx | 1
svx/source/dialog/charmap.cxx | 4
svx/source/dialog/fntctrl.cxx | 4
svx/source/fmcomp/gridcell.cxx | 6
svx/source/form/fmview.cxx | 4
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx | 71
svx/source/svdraw/sdrpaintwindow.cxx | 3
svx/source/svdraw/svdedxv.cxx | 15
svx/source/svdraw/svdpntv.cxx | 6
svx/source/unodraw/unopool.cxx | 5
svx/source/xml/xmlgrhlp.cxx | 6
sw/inc/pagepreviewlayout.hxx | 7
sw/inc/viewsh.hxx | 1
sw/qa/core/data/ww8/pass/crash-1.doc |binary
sw/qa/core/data/ww8/pass/hang-1.doc |binary
sw/qa/extras/globalfilter/globalfilter.cxx | 24
sw/qa/extras/ooxmlexport/data/rubyhyperlink.fodt | 45
sw/qa/extras/ooxmlexport/data/tdf91594.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 17
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 5
sw/qa/extras/ooxmlimport/data/tdf86374.docx |binary
sw/qa/extras/ooxmlimport/data/tdf89702.docx |binary
sw/qa/extras/ooxmlimport/data/tdf90611.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 34
sw/qa/extras/rtfimport/data/tdf90046.rtf | 8
sw/qa/extras/rtfimport/rtfimport.cxx | 9
sw/qa/extras/ww8export/data/tdf92281.doc |binary
sw/qa/extras/ww8export/ww8export.cxx | 8
sw/source/core/access/accnotextframe.cxx | 3
sw/source/core/doc/DocumentStateManager.cxx | 1
sw/source/core/doc/docnum.cxx | 8
sw/source/core/layout/layact.cxx | 3
sw/source/core/undo/unattr.cxx | 5
sw/source/core/unocore/SwXTextDefaults.cxx | 7
sw/source/core/unocore/unoflatpara.cxx | 8
sw/source/core/view/pagepreviewlayout.cxx | 39
sw/source/core/view/viewsh.cxx | 8
sw/source/filter/ww8/docxattributeoutput.cxx | 10
sw/source/filter/ww8/writerhelper.cxx | 22
sw/source/filter/ww8/writerhelper.hxx | 4
sw/source/filter/ww8/wrtww8.cxx | 5
sw/source/filter/ww8/wrtww8.hxx | 4
sw/source/filter/ww8/ww8par.cxx | 11
sw/source/filter/ww8/ww8par3.cxx | 5
sw/source/filter/ww8/ww8par6.cxx | 2
sw/source/filter/ww8/ww8scan.cxx | 4
sw/source/uibase/app/docsh.cxx | 2
sw/source/uibase/docvw/AnnotationWin.cxx | 4
sw/source/uibase/uiview/pview.cxx | 2
sw/source/uibase/uno/unotxdoc.cxx | 13
sw/uiconfig/swriter/toolbar/drawbar.xml | 2
testtools/com/sun/star/comp/bridge/TestComponent.java | 4
testtools/source/bridgetest/bridgetest.cxx | 4
testtools/source/bridgetest/cli/cli_cs_testobj.cs | 5
testtools/source/bridgetest/cppobj.cxx | 2
testtools/source/bridgetest/idl/bridgetest.idl | 6
toolkit/source/awt/vclxfont.cxx | 2
tools/source/stream/stream.cxx | 2
tools/source/zcodec/zcodec.cxx | 6
ucb/source/ucp/cmis/auth_provider.cxx | 2
ucb/source/ucp/cmis/cmis_content.cxx | 4
ucbhelper/source/provider/simpleauthenticationrequest.cxx | 32
unotools/source/config/historyoptions.cxx | 17
vcl/generic/print/genprnpsp.cxx | 1
vcl/generic/print/prtsetup.cxx | 8
vcl/headless/svpgdi.cxx | 4
vcl/inc/jobset.h | 1
vcl/inc/opengl/program.hxx | 2
vcl/inc/openglgdiimpl.hxx | 2
vcl/inc/svdata.hxx | 4
vcl/inc/window.h | 2
vcl/opengl/blendedTextureVertexShader.glsl | 3
vcl/opengl/dumbVertexShader.glsl | 4
vcl/opengl/gdiimpl.cxx | 117
vcl/opengl/program.cxx | 30
vcl/opengl/scale.cxx | 1
vcl/opengl/textureVertexShader.glsl | 3
vcl/opengl/transformedTextureVertexShader.glsl | 5
vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-2.emf |binary
vcl/qa/cppunit/graphicfilter/data/emf/fail/crash-3.emf |binary
vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-1.emf |binary
vcl/qa/cppunit/graphicfilter/data/emf/fail/hang-2.emf |binary
vcl/qa/cppunit/graphicfilter/data/emf/pass/crash-1.emf |binary
vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-1.gif |binary
vcl/qa/cppunit/graphicfilter/data/gif/pass/crash-2.gif |binary
vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-1.wmf |binary
vcl/qa/cppunit/graphicfilter/data/xbm/fail/crash-1.xbm | 12
vcl/qa/cppunit/graphicfilter/data/xbm/pass/grafix4.xbm | 2011
vcl/qa/cppunit/graphicfilter/filters-test.cxx | 4
vcl/source/app/settings.cxx | 13
vcl/source/control/button.cxx | 7
vcl/source/control/ctrl.cxx | 20
vcl/source/control/field2.cxx | 9
vcl/source/filter/igif/decode.cxx | 12
vcl/source/filter/ixbm/xbmread.cxx | 2
vcl/source/filter/wmf/enhwmf.cxx | 10
vcl/source/filter/wmf/winmtf.cxx | 26
vcl/source/filter/wmf/winwmf.cxx | 31
vcl/source/gdi/jobset.cxx | 4
vcl/source/gdi/print.cxx | 6
vcl/source/gdi/print3.cxx | 2
vcl/source/opengl/OpenGLHelper.cxx | 6
vcl/source/outdev/outdev.cxx | 10
vcl/source/outdev/rect.cxx | 66
vcl/source/window/brdwin.cxx | 15
vcl/source/window/cursor.cxx | 11
vcl/source/window/event.cxx | 6
vcl/source/window/menu.cxx | 22
vcl/source/window/paint.cxx | 251
vcl/source/window/window.cxx | 10
vcl/source/window/window2.cxx | 68
vcl/source/window/winproc.cxx | 7
vcl/unx/generic/desktopdetect/desktopdetector.cxx | 4
vcl/unx/gtk/app/gtkinst.cxx | 2
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 37
vcl/unx/gtk/window/gtksalframe.cxx | 57
vcl/unx/gtk3/app/gtk3gtkinst.cxx | 5
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 26
vcl/unx/kde4/KDE4FilePicker.cxx | 9
vcl/unx/kde4/KDE4FilePicker.hxx | 2
vcl/unx/kde4/KDESalGraphics.cxx | 131
wizards/com/sun/star/wizards/common/FileAccess.py | 10
wizards/com/sun/star/wizards/text/TextDocument.py | 1
wizards/com/sun/star/wizards/web/Process.py | 2
wizards/com/sun/star/wizards/web/WWD_Events.py | 4
wizards/source/access2base/CommandBar.xba | 1
wizards/source/access2base/CommandBarControl.xba | 9
wizards/source/access2base/DoCmd.xba | 2
wizards/source/access2base/UtilProperty.xba | 2
writerfilter/source/dmapper/DomainMapper.cxx | 53
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 206
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 23
writerfilter/source/dmapper/TableManager.hxx | 2
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 10
writerfilter/source/ooxml/model.xml | 1
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 1
xmloff/source/core/xmltoken.cxx | 4
xmloff/source/draw/EnhancedCustomShapeToken.cxx | 2
xmloff/source/style/xmlnumfe.cxx | 8
xmloff/source/style/xmlnumfi.cxx | 18
xmloff/source/text/txtexppr.cxx | 43
413 files changed, 76402 insertions(+), 4848 deletions(-)
New commits:
commit 1f43dcc7f8a874b86b3e03cb45a21feab91822a0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Aug 5 11:25:02 2015 +0200
tdf#92982 vcl rendercontext: fix buffer size with empty user profile
I did not notice this before, as my user profile had a custom window
size; but with an empty user profile the buffer had a 0,0 size, so the
buffered result was empty, as no ImplHandleResize() was invoked.
Change-Id: Ie299ad1323944941afc407dc90f2459d72885d42
(cherry picked from commit 968bc55adebd0158349b32a31ea341be292d8aa1)
Reviewed-on: https://gerrit.libreoffice.org/17532
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index f24e4bb..e8d2b96 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2481,6 +2481,10 @@ void Window::Show(bool bVisible, sal_uInt16 nFlags)
mpWindowImpl->mpFrame->GetClientSize( nOutWidth, nOutHeight );
ImplHandleResize( this, nOutWidth, nOutHeight );
}
+
+ if (mpWindowImpl->mpFrameData->mpBuffer && mpWindowImpl->mpFrameData->mpBuffer->GetOutputSizePixel() != GetOutputSizePixel())
+ // Make sure that the buffer size matches the window size, even if no resize was needed.
+ mpWindowImpl->mpFrameData->mpBuffer->SetOutputSizePixel(GetOutputSizePixel());
}
if( aDogTag.IsDead() )
commit 8a7adc0f798087a9203ca79e9c2cdfab6950d85b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Thu Jul 30 16:41:26 2015 +0200
don't map GDK_KEY_RELEASE to keyboard events, tdf#92996
This was only done in the new gtk3 backend, all other backends seem to
ignore the GDK_KEY_RELEASE event (especially the gtk2 one). So make the
gtk3 backend code consistent with the other backends.
Change-Id: I3bdecb7ce05190ee2496bc552ca79375fb6fd713
Reviewed-on: https://gerrit.libreoffice.org/17431
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit a2eaa1bb9354c3e175d8b8de4f242bed89db4664)
Reviewed-on: https://gerrit.libreoffice.org/17529
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index d8b1352..dcd9ff33 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -138,7 +138,7 @@ static VclInputFlags categorizeEvent(const GdkEvent *pEvent)
nType = VclInputFlags::MOUSE;
break;
case GDK_KEY_PRESS:
- case GDK_KEY_RELEASE:
+ // case GDK_KEY_RELEASE: //similar to the X11SalInstance one
nType = VclInputFlags::KEYBOARD;
break;
case GDK_EXPOSE:
commit e27acba771bf1859ccc997f5fe1e6fa871d1f695
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Aug 4 23:03:05 2015 +0200
wizards: text.TextDocument.getPageCount called as class method only
Change-Id: I9888f8ab7bccdd2902d619487279999f2ff9ab13
(cherry picked from commit c1617b8d74b5e232efeec864241ada89f874fe63)
Reviewed-on: https://gerrit.libreoffice.org/17513
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.py b/wizards/com/sun/star/wizards/text/TextDocument.py
index b52f885..3119b16 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.py
+++ b/wizards/com/sun/star/wizards/text/TextDocument.py
@@ -211,6 +211,7 @@ class TextDocument(object):
@return the page count of the document.
'''
+ @classmethod
def getPageCount(self, model):
xController = model.getCurrentController()
xPC = xController.getViewCursor()
commit 96134109745b47a93d9cbb9784b65c637ae9fdad
Author: Noel Grandin <noel at peralex.com>
Date: Mon Aug 3 11:12:08 2015 +0200
tdf#92788 - Middle Button on Mouse Paste Option Broken for X11
cherry-pick from master
caused by commit 5333782d090a9e147c0c431f0f741863d1d8cf8e
"convert SETTINGS_ #defines to 'enum class'"
Change-Id: Id0c2738a61f73223f6c8716f04a619c8cb84c0a9
Reviewed-on: https://gerrit.libreoffice.org/17493
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 965d470..006e758 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -679,13 +679,14 @@ public:
enum class AllSettingsFlags {
NONE = 0x0000,
+ MOUSE = 0x0001,
STYLE = 0x0002,
MISC = 0x0004,
LOCALE = 0x0020,
};
namespace o3tl
{
- template<> struct typed_flags<AllSettingsFlags> : is_typed_flags<AllSettingsFlags, 0x026> {};
+ template<> struct typed_flags<AllSettingsFlags> : is_typed_flags<AllSettingsFlags, 0x0027> {};
}
class VCL_DLLPUBLIC AllSettings
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 3d6f3c1..638f9e8 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2706,7 +2706,8 @@ ImplAllSettingsData::ImplAllSettingsData()
maLocale( LANGUAGE_SYSTEM ),
maUILocale( LANGUAGE_SYSTEM )
{
- mnWindowUpdate = AllSettingsFlags::STYLE | AllSettingsFlags::MISC | AllSettingsFlags::LOCALE;
+ mnWindowUpdate = AllSettingsFlags::MOUSE | AllSettingsFlags::STYLE |
+ AllSettingsFlags::MISC | AllSettingsFlags::LOCALE;
mpLocaleDataWrapper = NULL;
mpUILocaleDataWrapper = NULL;
mpI18nHelper = NULL;
@@ -2768,6 +2769,16 @@ AllSettingsFlags AllSettings::Update( AllSettingsFlags nFlags, const AllSettings
AllSettingsFlags nChangeFlags = AllSettingsFlags::NONE;
+ if ( nFlags & AllSettingsFlags::MOUSE )
+ {
+ if ( mxData->maMouseSettings != rSet.mxData->maMouseSettings )
+ {
+ CopyData();
+ mxData->maMouseSettings = rSet.mxData->maMouseSettings;
+ nChangeFlags |= AllSettingsFlags::MOUSE;
+ }
+ }
+
if ( nFlags & AllSettingsFlags::STYLE )
{
if ( mxData->maStyleSettings != rSet.mxData->maStyleSettings )
commit 3281e9b529b3f97e2b0a2062f350824acc651055
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun Aug 2 21:20:48 2015 +0200
tdf#93079: "resize shape to fit text" state can't be disabled
Wrong copy-paste
Change-Id: I7460c095c7bbb340be2cab32c4724688076c5952
Reviewed-on: https://gerrit.libreoffice.org/17477
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
(cherry picked from commit 4a847bb4a2002d7f8f5854b7276ac67d369bdd3b)
Reviewed-on: https://gerrit.libreoffice.org/17488
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 645b247..9fe5631 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -384,7 +384,7 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs)
eState = m_pTsbAutoGrowSize->GetState();
if( m_pTsbAutoGrowSize->IsValueChangedFromSaved() )
{
- rAttrs->Put( makeSdrTextAutoGrowHeightItem( TRISTATE_TRUE == eState ) );
+ rAttrs->Put( makeSdrTextAutoGrowSizeItem ( TRISTATE_TRUE == eState ) );
}
eState = m_pTsbWordWrapText->GetState();
commit ae46ea51d776d8b201aa8a29d777d6f85b3d0d21
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Aug 4 08:48:08 2015 +0200
tdf#92982 vcl rendercontext: set correct offset for the frame-level buffer
In case we had a toplevel window W1, the paint was triggered for window
W2 and we had a sub-widget W3, then previously the buffer was created
for W2, so the pixel offsets had to be set relative to W2 when rendering
W3. As a consequence, if a single window was painted, then it was
always painted in the top left corner.
Now that the buffer is persistent and is always created for W1, make
sure that we paint to the correct offset, and W3 is always painted at
the same offset, regardless if it was painted directly, or just because
it's a child of W2.
With this, the buffer conents is closer to what is on the screen, even
if it's not perfect yet.
Also:
- PaintHelper: restore set buffer properties
- let PaintBufferGuard also manage pixel offset
- no need to tweak map mode in PaintBuffer()
Conflicts:
vcl/source/window/paint.cxx
(cherry picked from commits 94a6daa068f75c7196e79a8a4295c2a069ff4530,
c36a00b811471b81abf189d80e07b5ff96243288,
28e465d2611adee62aac984a9c0bf731adcb793b and
ec1a0354050491e84792a30df75d361803b62b1f)
Change-Id: Ibf0e89ad18e5763bd2a01e69d91da163c24a309d
Reviewed-on: https://gerrit.libreoffice.org/17518
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index c2e334c..f0057b3 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -318,7 +318,6 @@ namespace vcl {
class VCL_DLLPUBLIC OutputDevice
{
- friend class PaintHelper;
friend class Printer;
friend class VirtualDevice;
friend class vcl::Window;
@@ -499,6 +498,8 @@ public:
long GetOutputHeightPixel() const { return mnOutHeight; }
long GetOutOffXPixel() const { return mnOutOffX; }
long GetOutOffYPixel() const { return mnOutOffY; }
+ void SetOutOffXPixel(long nOutOffX);
+ void SetOutOffYPixel(long nOutOffY);
Size GetOutputSize() const
{ return PixelToLogic( GetOutputSizePixel() ); }
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 2ae452e..0d9842d 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -427,6 +427,16 @@ sal_uInt16 OutputDevice::GetBitCount() const
return (sal_uInt16)mpGraphics->GetBitCount();
}
+void OutputDevice::SetOutOffXPixel(long nOutOffX)
+{
+ mnOutOffX = nOutOffX;
+}
+
+void OutputDevice::SetOutOffYPixel(long nOutOffY)
+{
+ mnOutOffY = nOutOffY;
+}
+
sal_uLong OutputDevice::GetColorCount() const
{
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index ee5d47a..a02d600 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -40,6 +40,88 @@
#define IMPL_PAINT_ERASE ((sal_uInt16)0x0010)
#define IMPL_PAINT_CHECKRTL ((sal_uInt16)0x0020)
+/// Sets up the buffer to have settings matching the window, and restore the original state in the dtor.
+class PaintBufferGuard
+{
+ ImplFrameData* mpFrameData;
+ bool mbBackground;
+ Wallpaper maBackground;
+ AllSettings maSettings;
+ long mnOutOffX;
+ long mnOutOffY;
+public:
+ PaintBufferGuard(ImplFrameData* pFrameData, vcl::Window* pWindow)
+ : mpFrameData(pFrameData),
+ mbBackground(false),
+ mnOutOffX(0),
+ mnOutOffY(0)
+ {
+ // transfer various settings
+ // FIXME: this must disappear as we move to RenderContext only,
+ // the painting must become state-less, so that no actual
+ // vcl::Window setting affects this
+ mbBackground = pFrameData->mpBuffer->IsBackground();
+ if (pWindow->IsBackground())
+ {
+ maBackground = pFrameData->mpBuffer->GetBackground();
+ pFrameData->mpBuffer->SetBackground(pWindow->GetBackground());
+ }
+ //else
+ //SAL_WARN("vcl.doublebuffering", "the root of the double-buffering hierarchy should not have a transparent background");
+
+ PushFlags nFlags = PushFlags::NONE;
+ nFlags |= PushFlags::CLIPREGION;
+ nFlags |= PushFlags::FILLCOLOR;
+ nFlags |= PushFlags::FONT;
+ nFlags |= PushFlags::LINECOLOR;
+ nFlags |= PushFlags::MAPMODE;
+ maSettings = pFrameData->mpBuffer->GetSettings();
+ nFlags |= PushFlags::REFPOINT;
+ nFlags |= PushFlags::TEXTCOLOR;
+ nFlags |= PushFlags::TEXTLINECOLOR;
+ nFlags |= PushFlags::OVERLINECOLOR;
+ nFlags |= PushFlags::TEXTFILLCOLOR;
+ nFlags |= PushFlags::TEXTALIGN;
+ nFlags |= PushFlags::RASTEROP;
+ nFlags |= PushFlags::TEXTLAYOUTMODE;
+ nFlags |= PushFlags::TEXTLANGUAGE;
+ pFrameData->mpBuffer->Push(nFlags);
+ pFrameData->mpBuffer->SetClipRegion(pWindow->GetClipRegion());
+ pFrameData->mpBuffer->SetFillColor(pWindow->GetFillColor());
+ pFrameData->mpBuffer->SetFont(pWindow->GetFont());
+ pFrameData->mpBuffer->SetLineColor(pWindow->GetLineColor());
+ pFrameData->mpBuffer->SetMapMode(pWindow->GetMapMode());
+ pFrameData->mpBuffer->SetRefPoint(pWindow->GetRefPoint());
+ pFrameData->mpBuffer->SetSettings(pWindow->GetSettings());
+ pFrameData->mpBuffer->SetTextColor(pWindow->GetTextColor());
+ pFrameData->mpBuffer->SetTextLineColor(pWindow->GetTextLineColor());
+ pFrameData->mpBuffer->SetOverlineColor(pWindow->GetOverlineColor());
+ pFrameData->mpBuffer->SetTextFillColor(pWindow->GetTextFillColor());
+ pFrameData->mpBuffer->SetTextAlign(pWindow->GetTextAlign());
+ pFrameData->mpBuffer->SetRasterOp(pWindow->GetRasterOp());
+ pFrameData->mpBuffer->SetLayoutMode(pWindow->GetLayoutMode());
+ pFrameData->mpBuffer->SetDigitLanguage(pWindow->GetDigitLanguage());
+
+ mnOutOffX = pFrameData->mpBuffer->GetOutOffXPixel();
+ mnOutOffY = pFrameData->mpBuffer->GetOutOffYPixel();
+ pFrameData->mpBuffer->SetOutOffXPixel(pWindow->GetOutOffXPixel());
+ pFrameData->mpBuffer->SetOutOffYPixel(pWindow->GetOutOffYPixel());
+ }
+ ~PaintBufferGuard()
+ {
+ // Restore buffer state.
+ mpFrameData->mpBuffer->SetOutOffXPixel(mnOutOffX);
+ mpFrameData->mpBuffer->SetOutOffYPixel(mnOutOffY);
+
+ mpFrameData->mpBuffer->Pop();
+ mpFrameData->mpBuffer->SetSettings(maSettings);
+ if (mbBackground)
+ mpFrameData->mpBuffer->SetBackground(maBackground);
+ else
+ mpFrameData->mpBuffer->SetBackground();
+ }
+};
+
class PaintHelper
{
private:
@@ -47,7 +129,6 @@ private:
vcl::Region* m_pChildRegion;
Rectangle m_aSelectionRect;
Rectangle m_aPaintRect;
- MapMode m_aPaintRectMapMode;
vcl::Region m_aPaintRegion;
sal_uInt16 m_nPaintFlags;
bool m_bPop : 1;
@@ -88,9 +169,6 @@ public:
/// Start buffered paint: set it up to have the same settings as m_pWindow.
void StartBufferedPaint();
- /// Setup the buffer according to the settings of the current m_pWindow.
- void SetupBuffer();
-
/// Paint the content of the buffer to the current m_pWindow.
void PaintBuffer();
@@ -116,53 +194,16 @@ void PaintHelper::StartBufferedPaint()
// painting over, as VirtualDevice::ImplInitVirDev() would do.
// The painted area is m_aPaintRect, or in case it's empty, then the whole window.
pFrameData->mpBuffer->SetBackground(Wallpaper(Color(COL_WHITE)));
- if (m_aPaintRect.IsEmpty())
- pFrameData->mpBuffer->Erase(Rectangle(Point(0, 0), m_pWindow->GetOutputSize()));
- else
- pFrameData->mpBuffer->Erase(m_aPaintRect);
+ {
+ PaintBufferGuard g(pFrameData, m_pWindow);
+ if (m_aPaintRect.IsEmpty())
+ pFrameData->mpBuffer->Erase(Rectangle(Point(0, 0), m_pWindow->GetOutputSize()));
+ else
+ pFrameData->mpBuffer->Erase(m_aPaintRect);
+ }
pFrameData->mbInBufferedPaint = true;
m_bStartedBufferedPaint = true;
-
- // Remember what was the map mode of m_aPaintRect.
- m_aPaintRectMapMode = m_pWindow->GetMapMode();
-
- // we need to remember the mnOutOffX / mnOutOffY, but actually really
- // set it just temporarily for the subwidgets - so we are setting it here
- // only to remember the value & to be able to pass it to the descendants
- // FIXME: once everything's double-buffered, this is (hopefully) not
- // necessary as the buffer is always created for the main window.
- pFrameData->mpBuffer->mnOutOffX = m_pWindow->GetOutOffXPixel();
- pFrameData->mpBuffer->mnOutOffY = m_pWindow->GetOutOffYPixel();
-}
-
-void PaintHelper::SetupBuffer()
-{
- ImplFrameData* pFrameData = m_pWindow->mpWindowImpl->mpFrameData;
- // transfer various settings
- // FIXME: this must disappear as we move to RenderContext only,
- // the painting must become state-less, so that no actual
- // vcl::Window setting affects this
- if (m_pWindow->IsBackground())
- pFrameData->mpBuffer->SetBackground(m_pWindow->GetBackground());
- else
- SAL_WARN("vcl.doublebuffering", "the root of the double-buffering hierarchy should not have a transparent background");
-
- pFrameData->mpBuffer->SetClipRegion(m_pWindow->GetClipRegion());
- pFrameData->mpBuffer->SetFillColor(m_pWindow->GetFillColor());
- pFrameData->mpBuffer->SetFont(m_pWindow->GetFont());
- pFrameData->mpBuffer->SetLineColor(m_pWindow->GetLineColor());
- pFrameData->mpBuffer->SetMapMode(m_pWindow->GetMapMode());
- pFrameData->mpBuffer->SetRefPoint(m_pWindow->GetRefPoint());
- pFrameData->mpBuffer->SetSettings(m_pWindow->GetSettings());
- pFrameData->mpBuffer->SetTextColor(m_pWindow->GetTextColor());
- pFrameData->mpBuffer->SetTextLineColor(m_pWindow->GetTextLineColor());
- pFrameData->mpBuffer->SetOverlineColor(m_pWindow->GetOverlineColor());
- pFrameData->mpBuffer->SetTextFillColor(m_pWindow->GetTextFillColor());
- pFrameData->mpBuffer->SetTextAlign(m_pWindow->GetTextAlign());
- pFrameData->mpBuffer->SetRasterOp(m_pWindow->GetRasterOp());
- pFrameData->mpBuffer->SetLayoutMode(m_pWindow->GetLayoutMode());
- pFrameData->mpBuffer->SetDigitLanguage(m_pWindow->GetDigitLanguage());
}
void PaintHelper::PaintBuffer()
@@ -171,9 +212,6 @@ void PaintHelper::PaintBuffer()
assert(pFrameData->mbInBufferedPaint);
assert(m_bStartedBufferedPaint);
- pFrameData->mpBuffer->mnOutOffX = 0;
- pFrameData->mpBuffer->mnOutOffY = 0;
-
// copy the buffer content to the actual window
// export VCL_DOUBLEBUFFERING_AVOID_PAINT=1 to see where we are
// painting directly instead of using Invalidate()
@@ -181,12 +219,6 @@ void PaintHelper::PaintBuffer()
// window either above or in eg. an event handler]
if (!getenv("VCL_DOUBLEBUFFERING_AVOID_PAINT"))
{
- // The map mode of m_pWindow and/or the buffer may have changed since
- // StartBufferedPaint(), set it back to what it was, otherwise unwanted
- // scaling or translating may happen.
- m_pWindow->SetMapMode(m_aPaintRectMapMode);
- pFrameData->mpBuffer->SetMapMode(m_aPaintRectMapMode);
-
// Make sure that the +1 value GetSize() adds to the size is in pixels.
Size aPaintRectSize;
if (m_pWindow->GetMapMode().GetMapUnit() == MAP_PIXEL)
@@ -199,6 +231,7 @@ void PaintHelper::PaintBuffer()
aPaintRectSize = m_pWindow->PixelToLogic(aRectanglePixel.GetSize());
}
+ PaintBufferGuard g(pFrameData, m_pWindow);
m_pWindow->DrawOutDev(m_aPaintRect.TopLeft(), aPaintRectSize, m_aPaintRect.TopLeft(), aPaintRectSize, *pFrameData->mpBuffer.get());
}
}
@@ -247,24 +280,11 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
if (pFrameData->mbInBufferedPaint && m_pWindow->SupportsDoubleBuffering())
{
// double-buffering
- SetupBuffer();
+ PaintBufferGuard g(pFrameData, m_pWindow);
m_pWindow->ApplySettings(*pFrameData->mpBuffer.get());
- // temporarily decrease the mnOutOffX/Y of the buffer for the
- // subwidgets (because the buffer is our base here)
- // FIXME: once everything's double-buffered, this is (hopefully) not
- // necessary as the buffer is always created for the main window.
- long nOutOffX = pFrameData->mpBuffer->mnOutOffX;
- long nOutOffY = pFrameData->mpBuffer->mnOutOffY;
- pFrameData->mpBuffer->mnOutOffX = m_pWindow->GetOutOffXPixel() - pFrameData->mpBuffer->mnOutOffX;
- pFrameData->mpBuffer->mnOutOffY = m_pWindow->GetOutOffYPixel() - pFrameData->mpBuffer->mnOutOffY;
-
m_pWindow->PushPaintHelper(this, *pFrameData->mpBuffer.get());
m_pWindow->Paint(*pFrameData->mpBuffer.get(), m_aPaintRect);
-
- // restore the mnOutOffX/Y value
- pFrameData->mpBuffer->mnOutOffX = nOutOffX;
- pFrameData->mpBuffer->mnOutOffY = nOutOffY;
}
else
{
commit 17c359165d33e74ddb138b8f8ddbc68add8f6538
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Aug 4 22:44:06 2015 +0200
wizards: FileAccess.getURL does not work on Windows
The hard-coded "/" separator causes getFileURLFromSystemPath to fail,
and it's not obvious why the URL is being converted to a system path
in the first place.
Change-Id: I06ebe6d92954c4f3c884ae6f0b327ea8a36c10a4
(cherry picked from commit 8bf374b98d07c24a37933b8c03a53abb3a8ff5c6)
Reviewed-on: https://gerrit.libreoffice.org/17512
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py b/wizards/com/sun/star/wizards/common/FileAccess.py
index 0e67851..7ff92c3 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.py
+++ b/wizards/com/sun/star/wizards/common/FileAccess.py
@@ -303,10 +303,12 @@ class FileAccess(object):
i += 1
return url
- def getURL(self, parentPath, childPath):
- parent = self.filenameConverter.getSystemPathFromFileURL(parentPath);
- path = parent + "/" + childPath
- return self.filenameConverter.getFileURLFromSystemPath(parentPath, path)
+ def getURL(self, parentURL, childPath):
+ if len(childPath) > 0 and childPath[0] == "/":
+ path = parentURL + childPath
+ else:
+ path = parentURL + "/" + childPath
+ return path
def getURL1(self, path):
f = "/"
commit ef2a8d3c8d4b533858e63efab11d68b4a6233fdb
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Aug 4 18:45:15 2015 +0200
tdf#93041: Resolve clashing SID_OFFER_IMPORT vs. SID_ATTR_CHAR_BACK_COLOR
...introduced with c1b9d61bacaf676d69a0f49a79fb086535f79a48 "tdf#88276: Add slot
and handlers for toolbar|sidebar buttons"
Change-Id: Ic63a7766b7f0ccae9144a0ef276e2df63fc22f2e
(cherry picked from commit 4275056a90eb9e178062276cc104ac2b94db13ca)
Reviewed-on: https://gerrit.libreoffice.org/17508
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index 91102dd..286d7a5 100644
--- a/include/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
@@ -119,7 +119,7 @@
#define SID_ATTR_CHAR_LATIN_POSTURE ( SID_SVX_START + 997 )
#define SID_ATTR_CHAR_LATIN_WEIGHT ( SID_SVX_START + 998 )
#define SID_ATTR_CHAR_GRABBAG ( SID_SVX_START + 1142 )
-#define SID_ATTR_CHAR_BACK_COLOR ( SID_SVX_START + 1143 )
+#define SID_ATTR_CHAR_BACK_COLOR ( SID_SVX_START + 1153 )
// these ID didn't exist prior to the svx split, add new ids here
#define SID_ATTR_CHAR_OVERLINE ( SID_EDIT_START + 68 )
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index ed45af0..d210579 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -1010,6 +1010,8 @@
#define SID_EDIT_POSTIT ( SID_SVX_START + 1148 )
+// 1153 is used by editeng (SID_ATTR_CHAR_BACK_COLOR)
+
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
#define SID_SVX_FIRSTFREE (SID_EDIT_POSTIT + 1)
commit 59db7d680d4e44eab47757168e689dc318f2c362
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Aug 4 11:44:55 2015 +0200
sal: partially revert a251fe4d48237a4d9c9530dafc7bbdce6028e9cf
The change to sal/log.hxx affects extensions too which are not required
to use a C++11 compiler.
Change-Id: I3ed08f9a02a2e082fcdb821bce84244597f2390a
(cherry picked from commit f168fcaed2b30178ca6bf5ddb0f8f1763e10a8db)
Reviewed-on: https://gerrit.libreoffice.org/17502
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/include/sal/log.hxx b/include/sal/log.hxx
index 62cdb77..563ed57 100644
--- a/include/sal/log.hxx
+++ b/include/sal/log.hxx
@@ -74,18 +74,27 @@ template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamStart const &, SAL_UNUSED_PARAMETER T const &)
{
std::abort();
+#if defined _MSC_VER && _MSC_VER < 1700
+ return StreamIgnore();
+#endif
}
template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamString const &, SAL_UNUSED_PARAMETER T const &)
{
std::abort();
+#if defined _MSC_VER && _MSC_VER < 1700
+ return StreamIgnore();
+#endif
}
template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamIgnore const &, SAL_UNUSED_PARAMETER T const &)
{
std::abort();
+#if defined _MSC_VER && _MSC_VER < 1700
+ return StreamIgnore();
+#endif
}
template< typename T > typename T::Result getResult(T const &);
@@ -94,6 +103,9 @@ inline char const * unwrapStream(StreamString const & s) { return s.string; }
inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) {
std::abort();
+#if defined _MSC_VER && _MSC_VER < 1700
+ return 0;
+#endif
}
} }
commit 58df801506373e4943e7ed6fe58ba0216d26ca46
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Fri Jul 24 16:54:44 2015 +0900
Add "styles" template folder + content to installation
Change-Id: Ibb674e17eedfc325d3e335aa074391ad7b2b2aa2
(cherry picked from commit 6c853a986444294dd937cd570a4dc0a31943e432)
Reviewed-on: https://gerrit.libreoffice.org/17486
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 1337098..0f76c94 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -588,6 +588,11 @@ Directory gid_Dir_Template_Common_Presnt
DosName = "presnt";
End
+Directory gid_Dir_Template_Common_Styles
+ ParentID = gid_Dir_Template_Common;
+ DosName = "styles";
+End
+
Directory gid_Brand_Dir_Program_Services
#if defined MACOSX
ParentID = gid_Brand_Dir_Share;
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index c2cc985..f56c028 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -192,6 +192,13 @@ File gid_File_Extra_Tplpresnt
Name = "extras_tplpresnt.filelist";
End
+File gid_File_Extra_Tpl_styles
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "extras_tpl_styles.filelist";
+End
+
File gid_File_Extra_Tplpersonal
Dir = FILELIST_DIR;
TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 50066d3..9acfbe8 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -80,6 +80,7 @@ Module gid_Module_Root
gid_File_Extra_Tplofficorr,
gid_File_Extra_Tploffimisc,
gid_File_Extra_Tplpresnt,
+ gid_File_Extra_Tpl_styles,
gid_File_Extra_Tplpersonal,
gid_File_Extra_Tplwizbitmap,
gid_File_Extra_Tplwizletter,
commit 991ec99f8a9f449d294dafc2a94c3acb664763ff
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Tue Jul 28 18:03:50 2015 +0900
Change "Design" sidebar deck icon
Change-Id: Ibb4a308cfae3598e4d4e9759806c48f6a581bc83
(cherry picked from commit 8a323729e5755a26fd1726b0ac3159050fce8fe6)
Reviewed-on: https://gerrit.libreoffice.org/17485
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 504bf3b..ffb2290 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -216,7 +216,7 @@
<value>DesignDeck</value>
</prop>
<prop oor:name="IconURL" oor:type="xs:string">
- <value>private:graphicrepository/sfx2/res/symphony/sidebar-property-large.png</value>
+ <value>private:graphicrepository/cmd/lc_designerdialog.png</value>
</prop>
<prop oor:name="ContextList">
<value oor:separator=";">
commit 4065a6d62d965e1ef1e40262553b8cd1861b6b26
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Thu Jul 30 18:10:03 2015 +0200
tdf#92903 KDE4: fix listbox regression from 92115
So at least in case of the CTRL_LISTBOX, getNativeControlRegion is
called for a type and part unsupported by IsNativeControlSupported.
For whatever reason, this results in broken listboxes drawn in
Base's "Table Design" dialog, when selecting "field type", which
draws the listbox on top of the cell.
To make it worse, it seems the listbox is actually drawn to a
smaller space then the actual requirement. Appearently it seems to
use the content rect, instead of the bounding rect.
So in addition to fixing the drawing, this patch increases the
listbox bounding rect, which looks too large in normal dialogs, but
makes the Base's listbox better readable.
Change-Id: I112ec038fd20ad33facd260d16b5d68b508d2bd0
Reviewed-on: https://gerrit.libreoffice.org/17438
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens at cib.de>
(cherry picked from commit ef126328c3ad35d51395abc461c3d64429f91c26)
Reviewed-on: https://gerrit.libreoffice.org/17448
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index e4412e2..7e1a881 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -109,10 +109,7 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart par
return true;
case CTRL_LISTBOX:
- return (part == PART_ENTIRE_CONTROL
- || part == PART_SUB_EDIT
- || part == PART_WINDOW
- || part == PART_BUTTON_DOWN);
+ return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE);
case CTRL_SPINBOX:
return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE);
@@ -653,12 +650,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
const OUString&,
Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion )
{
- bool nativeSupport = IsNativeControlSupported( type, part );
- if( ! nativeSupport ) {
- assert( ! nativeSupport && "drawNativeControl called without native support!" );
- return false;
- }
-
bool retVal = false;
QRect boundingRect = region2QRect( controlRegion );
@@ -756,6 +747,14 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
contentRect.adjust(-size,-size,size,size);
}
+ else {
+ int hmargin = QApplication::style()->pixelMetric(
+ QStyle::PM_FocusFrameHMargin, &styleOption);
+ int vmargin = QApplication::style()->pixelMetric(
+ QStyle::PM_FocusFrameVMargin, &styleOption);
+ boundingRect.translate( -hmargin, -vmargin );
+ boundingRect.adjust( -hmargin, -vmargin, 2 * hmargin, 2 * vmargin );
+ }
retVal = true;
break;
}
@@ -779,7 +778,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
contentRect.translate( boundingRect.left() + hmargin, boundingRect.top() + vmargin );
contentRect.adjust( 0, 0, -2 * hmargin, -2 * vmargin );
- boundingRect = contentRect;
retVal = true;
break;
commit 890d86e1758856ae6182a4a428179844a0b4c480
Author: Jean-Pierre Ledure <jp at ledure.be>
Date: Sun Jul 26 13:24:57 2015 +0200
Access2Base - Errors in CommandBarControls collection
- correct return value in Execute method: returned alays False, should return True when successful
- Item property of collection did not work because incomplete object initialisation
Change-Id: I9b2e682afb21747766e918bf905e35d9485b751d
Reviewed-on: https://gerrit.libreoffice.org/17351
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/wizards/source/access2base/CommandBar.xba b/wizards/source/access2base/CommandBar.xba
index 93bc884..ed7955d 100644
--- a/wizards/source/access2base/CommandBar.xba
+++ b/wizards/source/access2base/CommandBar.xba
@@ -170,6 +170,7 @@ Dim oObject As Object
Set oObject = New Collect
oObject._CollType = COLLCOMMANDBARCONTROLS
oObject._ParentType = OBJCOMMANDBAR
+ oObject._ParentName = _Name
oObject._Count = iItemsCount
Case Else ' pvIndex is numeric
Goto Trace_IndexError
diff --git a/wizards/source/access2base/CommandBarControl.xba b/wizards/source/access2base/CommandBarControl.xba
index a6bdcbc..286dc07 100644
--- a/wizards/source/access2base/CommandBarControl.xba
+++ b/wizards/source/access2base/CommandBarControl.xba
@@ -152,24 +152,25 @@ Const cstThisSub = "CommandBarControl.Execute"
Utils._SetCalledSub(cstThisSub)
Dim sExecute As String
- Execute = False
+
+ Execute = True
sExecute = _GetPropertyValue(_Element, "CommandURL", "")
Select Case True
- Case sExecute = ""
+ Case sExecute = "" : Execute = False
Case _IsLeft(sExecute, ".uno:")
Execute = DoCmd.RunCommand(sExecute)
Case _IsLeft(sExecute, "vnd.sun.star.script:")
Execute = Utils._RunScript(sExecute, Array(Nothing))
Case Else
End Select
-
+
Exit_Function:
Utils._ResetCalledSub(cstThisSub)
Exit Function
Error_Function:
TraceError(TRACEABORT, Err, cstThisSub, Erl)
- Reset = False
+ Execute = False
GoTo Exit_Function
End Function ' Execute V1.3.0
diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba
index 0cc2605..261aa26 100644
--- a/wizards/source/access2base/DoCmd.xba
+++ b/wizards/source/access2base/DoCmd.xba
@@ -2016,7 +2016,7 @@ End Sub ' _DispatchCommand V1.3.0
REM -----------------------------------------------------------------------------------------------------------------------
Private Function _getTempDirectoryURL() As String
-' Return the tempry directory defined in the OO Options (Paths)
+' Return the temporary directory defined in the OO Options (Paths)
Dim sDirectory As String, oSettings As Object, oPathSettings As Object
If _ErrorHandler() Then On Local Error Goto Error_Function
diff --git a/wizards/source/access2base/UtilProperty.xba b/wizards/source/access2base/UtilProperty.xba
index b1530c1..b265550 100644
--- a/wizards/source/access2base/UtilProperty.xba
+++ b/wizards/source/access2base/UtilProperty.xba
@@ -156,7 +156,7 @@ Dim iNumProperties As Integer, i As Integer
pvPropertyValuesArray(i) = pvPropertyValuesArray(i + 1)
Next i
EndIf
- ' Redimension the array to have one feweer element.
+ ' Redimension the array to have one fewer element.
Redim Preserve pvPropertyValuesArray(iNumProperties - 2)
EndIf
commit 774a2911fa22a244b6c1f91a9f553b5c40bda0e8
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Aug 4 23:36:13 2015 +0200
tdf#76845: wizards: fix Web wizard XSLT deadlock on Windows
The web wizard runs some XSLT over the exported file. It registers
a handler that is called when the output stream is closed, and this
Process.streamClosedHandler() calls terminate(), which causes the
deadlock, because it wants to join() the extra XSLT thread but the
handler is actually called from the XSLT thread itself.
Fix that by moving the terminate() to another function that runs in the
main thread.
It does not deadlock on Unixes because osl_joinWithThread() actually
detects an attempt to join the calling thread and returns early.
Change-Id: Ia176562fa28b97c7e8956c1e8975c9aa6ee23236
(cherry picked from commit 62de18ab98289fc80984299f13ad71e4a4452ea3)
Reviewed-on: https://gerrit.libreoffice.org/17511
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/wizards/com/sun/star/wizards/web/Process.py b/wizards/com/sun/star/wizards/web/Process.py
index 530b979..82be8b7 100644
--- a/wizards/com/sun/star/wizards/web/Process.py
+++ b/wizards/com/sun/star/wizards/web/Process.py
@@ -375,6 +375,7 @@ class Process(ProcessErrors):
self.tf.start()
while (not self.tfCompleted):
pass
+ self.tf.terminate()
task.advance(True)
@@ -400,7 +401,6 @@ class Process(ProcessErrors):
print ("DEBUG !!! Stream 'error' event handler")
def streamClosedHandler(self, parent):
- parent.tf.terminate()
parent.tfCompleted = True
# I broke the export method to two methods
commit edc0785f7db49c7e621f29d678e9ef44710abc00
Author: Yousuf Philips <philipz85 at hotmail.com>
Date: Sun Aug 2 21:36:25 2015 +0400
tdf#91588 re-enable select button in draw toolbar in sw & sc
Change-Id: Iab1f29925c26e9cc862bb858d72eb528e656215b
Reviewed-on: https://gerrit.libreoffice.org/17475
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
(cherry picked from commit 6860400666683d9e42b8de89bc189721527956e3)
Reviewed-on: https://gerrit.libreoffice.org/17501
diff --git a/sc/uiconfig/scalc/toolbar/drawbar.xml b/sc/uiconfig/scalc/toolbar/drawbar.xml
index 48fe873..4dc2424 100644
--- a/sc/uiconfig/scalc/toolbar/drawbar.xml
+++ b/sc/uiconfig/scalc/toolbar/drawbar.xml
@@ -18,7 +18,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
<toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:helpid="10397"/>
diff --git a/sw/uiconfig/swriter/toolbar/drawbar.xml b/sw/uiconfig/swriter/toolbar/drawbar.xml
index ee39158..df7353b 100644
--- a/sw/uiconfig/swriter/toolbar/drawbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawbar.xml
@@ -18,7 +18,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
<toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
commit 5962c1817e6bffc559341e66d34eb117b0baea5e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Aug 3 10:58:58 2015 +0200
tdf#92982 vcl rendercontext: no need to call SetupBuffer() twice
No need to call it in PaintHelper::StartBufferedPaint(), which would
happen only for the root of the paint hierarchy. It's enough to do it in
PaintHelper::DoPaint(), which happens for each widget.
(cherry picked from commits 27f6b2c038f5daf16a7fff4adf478b603eb08399 and
8bb963c3e51725fba649a5db0f5deb8778f1232b)
Change-Id: Iaf3306ef746bedbe64be36c4efeae73afd75db2a
Reviewed-on: https://gerrit.libreoffice.org/17500
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index c529d13..ee5d47a 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -52,7 +52,7 @@ private:
sal_uInt16 m_nPaintFlags;
bool m_bPop : 1;
bool m_bRestoreCursor : 1;
- bool m_bCreatedBuffer : 1; ///< This PaintHelper created the buffer for the double-buffering, and should dispose it when being destructed (if it is still alive by then).
+ bool m_bStartedBufferedPaint : 1; ///< This PaintHelper started a buffered paint, and should paint it on the screen when being destructed.
public:
PaintHelper(vcl::Window* pWindow, sal_uInt16 nPaintFlags);
void SetPop()
@@ -103,7 +103,7 @@ PaintHelper::PaintHelper(vcl::Window *pWindow, sal_uInt16 nPaintFlags)
, m_nPaintFlags(nPaintFlags)
, m_bPop(false)
, m_bRestoreCursor(false)
- , m_bCreatedBuffer(false)
+ , m_bStartedBufferedPaint(false)
{
}
@@ -122,9 +122,7 @@ void PaintHelper::StartBufferedPaint()
pFrameData->mpBuffer->Erase(m_aPaintRect);
pFrameData->mbInBufferedPaint = true;
- m_bCreatedBuffer = true;
-
- SetupBuffer();
+ m_bStartedBufferedPaint = true;
// Remember what was the map mode of m_aPaintRect.
m_aPaintRectMapMode = m_pWindow->GetMapMode();
@@ -171,7 +169,7 @@ void PaintHelper::PaintBuffer()
{
ImplFrameData* pFrameData = m_pWindow->mpWindowImpl->mpFrameData;
assert(pFrameData->mbInBufferedPaint);
- assert(m_bCreatedBuffer);
+ assert(m_bStartedBufferedPaint);
pFrameData->mpBuffer->mnOutOffX = 0;
pFrameData->mpBuffer->mnOutOffY = 0;
@@ -524,7 +522,7 @@ PaintHelper::~PaintHelper()
// double-buffering: paint in case we created the buffer, the children are
// already painted inside
- if (m_bCreatedBuffer && pFrameData->mbInBufferedPaint)
+ if (m_bStartedBufferedPaint && pFrameData->mbInBufferedPaint)
{
PaintBuffer();
pFrameData->mbInBufferedPaint = false;
commit 49b304a78d30af598d1ca20a35f6cc475e59da0a
Author: Mark Hung <marklh9 at gmail.com>
Date: Wed Jun 24 01:40:13 2015 +0800
tdf#91594 misinterprets letters from Symbol font in docx files
Fix the issue caused by wrong assumption about symbol chracter
and symbol font attributes order in writerfilter. Also allow
symbols to be displayed if user's language is not Western.
Reviewed-on: https://gerrit.libreoffice.org/16543
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
Change-Id: I602d9fbfa79c33c90f655dbf5ee22738b6391ae6
Reviewed-on: https://gerrit.libreoffice.org/17457
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sw/qa/extras/ooxmlexport/data/tdf91594.docx b/sw/qa/extras/ooxmlexport/data/tdf91594.docx
new file mode 100644
index 0000000..ea539af
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf91594.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 20be877..c870263 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -726,6 +726,23 @@ DECLARE_OOXMLEXPORT_TEST(testTdf89890, "tdf89890.docx")
CPPUNIT_ASSERT(bFound);
}
+DECLARE_OOXMLEXPORT_TEST(testTdf91594, "tdf91594.docx")
+{
+ uno::Reference<text::XTextRange> xPara1(getParagraph(1));
+ CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0fb), xPara1->getString()[0] );
+ uno::Reference<text::XTextRange> xPara2(getParagraph(2));
+ CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0fc), xPara2->getString()[0] );
+ uno::Reference<text::XTextRange> xPara3(getParagraph(3));
+ CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0fd), xPara3->getString()[0] );
+ uno::Reference<text::XTextRange> xPara4(getParagraph(4));
+ CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0fe), xPara4->getString()[0] );
+
+ uno::Reference<beans::XPropertySet> xRun(getRun(xPara1,1), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(OUString("Wingdings"), getProperty<OUString>(xRun, "CharFontName"));
+ CPPUNIT_ASSERT_EQUAL(OUString("Wingdings"), getProperty<OUString>(xRun, "CharFontNameAsian"));
+ CPPUNIT_ASSERT_EQUAL(OUString("Wingdings"), getProperty<OUString>(xRun, "CharFontNameComplex"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index d78aca7..8f13b5b 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -255,37 +255,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
break;
case NS_ooxml::LN_CT_Sym_char:
- if( m_pImpl->GetTopContext() && m_pImpl->GetTopContext()->GetFootnote().is())
- {
- m_pImpl->GetTopContext()->GetFootnote()->setLabel(OUString( sal_Unicode(nIntValue)));
- break;
- }
- else //it's a _real_ symbol
- {
- m_pImpl->SetSymbolData(nIntValue);
- }
+ m_pImpl->SetSymbolChar(nIntValue);
break;
case NS_ooxml::LN_CT_Sym_font:
- //the footnote symbol and font are provided after the footnote is already inserted
- if( m_pImpl->GetTopContext() && m_pImpl->GetTopContext()->GetFootnote().is())
- {
- uno::Reference< beans::XPropertySet > xAnchorProps( m_pImpl->GetTopContext()->GetFootnote()->getAnchor(), uno::UNO_QUERY );
- xAnchorProps->setPropertyValue(
- PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_CHAR_FONT_NAME),
- uno::makeAny( sStringValue ));
- }
- else //a real symbol
- if (m_pImpl->GetTopContext())
- {
- m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME, uno::makeAny( sStringValue ));
- /*
- * In case of symbol, symbol character get imported first and then font of symbols.
- * So we are storing symbol character and when we parse symbol font then create UNO object for text.
- */
- sal_Int32 symboldata = m_pImpl->GetSymbolData();
- utext( reinterpret_cast < const sal_uInt8 * >( &(symboldata) ), 1 );
- }
-
+ m_pImpl->SetSymbolFont(sStringValue);
break;
case NS_ooxml::LN_CT_Underline_val:
handleUnderlineType(nIntValue, m_pImpl->GetTopContext());
@@ -2554,6 +2527,26 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
m_pImpl->disableInteropGrabBag();
}
break;
+ case NS_ooxml::LN_EG_RunInnerContent_sym:
+ {
+ resolveSprmProps(*this, rSprm);
+ SymbolData aSymbolData = m_pImpl->GetSymbolData();
+ uno::Any aVal = uno::makeAny( aSymbolData.sFont );
+ if( rContext->GetFootnote().is())
+ {
+ uno::Reference< beans::XPropertySet > xAnchorProps( rContext->GetFootnote()->getAnchor(), uno::UNO_QUERY );
+ xAnchorProps->setPropertyValue( PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_CHAR_FONT_NAME), aVal);
+ rContext->GetFootnote()->setLabel(OUString( aSymbolData.cSymbol ));
+ }
+ else //it's a _real_ symbol
+ {
+ rContext->Insert(PROP_CHAR_FONT_NAME, aVal);
+ rContext->Insert(PROP_CHAR_FONT_NAME_ASIAN, aVal);
+ rContext->Insert(PROP_CHAR_FONT_NAME_COMPLEX, aVal);
+ utext( reinterpret_cast < const sal_uInt8 * >( &(aSymbolData.cSymbol) ), 1 );
+ }
+ }
+ break;
default:
{
#ifdef DEBUG_WRITERFILTER
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 515d6fe..363d300 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -198,7 +198,6 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bTOCPageRef(false),
m_bStartGenericField(false),
m_bTextInserted(false),
- m_nSymboldata(-1),
m_pLastSectionContext( ),
m_pLastCharacterContext(),
m_nCurrentTabStopIndex( 0 ),
@@ -426,11 +425,6 @@ void DomainMapper_Impl::RemoveLastParagraph( )
}
}
-void DomainMapper_Impl::SetSymbolData( sal_Int32 nSymbolData )
-{
- m_nSymboldata = nSymbolData;
-}
-
void DomainMapper_Impl::SetIsLastSectionGroup( bool bIsLast )
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index b2b24b4..0fa9ce7 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -313,6 +313,16 @@ struct FloatingTableInfo
css::uno::Any getPropertyValue(const OUString &propertyName);
};
+struct SymbolData
+{
+ sal_Unicode cSymbol;
+ OUString sFont;
+ SymbolData():
+ cSymbol(),
+ sFont()
+ { }
+};
+
class DomainMapper;
class DomainMapper_Impl
{
@@ -362,8 +372,7 @@ private:
OUString m_sCurrentBkmkName;
_PageMar m_aPageMargins;
- sal_Int32 m_nSymboldata;
-
+ SymbolData m_aSymbolData;
// TableManagers are stacked: one for each stream to avoid any confusion
std::stack< std::shared_ptr< DomainMapperTableManager > > m_aTableManagers;
@@ -504,8 +513,10 @@ public:
void SetParaSectpr(bool bParaSectpr);
bool GetParaSectpr() { return m_bParaSectpr;}
- void SetSymbolData( sal_Int32 nSymbolData );
- sal_Int32 GetSymbolData() { return m_nSymboldata;}
+ void SetSymbolChar( sal_Int32 nSymbol) { m_aSymbolData.cSymbol = sal_Unicode(nSymbol); }
+ void SetSymbolFont( OUString &rName ) { m_aSymbolData.sFont = rName; }
+ const SymbolData & GetSymbolData() { return m_aSymbolData;}
+
/// Setter method for m_bSdt.
void SetSdt(bool bSdt);
/// Getter method for m_bSdt.
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 9a8c4d0..860655e 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -17840,6 +17840,7 @@
<resource name="CT_Sym" resource="Properties">
<attribute name="font" tokenid="ooxml:CT_Sym_font"/>
<attribute name="char" tokenid="ooxml:CT_Sym_char"/>
+ <action name="end" tokenid="ooxml:EG_RunInnerContent_sym" action="sendPropertiesWithId" sendtokenid="ooxml:EG_RunInnerContent_sym"/>
</resource>
<resource name="CT_Text" resource="Stream">
<attribute name="xml:space" tokenid="ooxml:CT_Text_space"/>
commit 06161f4a65d21a841544b0b0acdff229d9e8ffd8
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 29 23:59:43 2015 +0200
tdf#83223: sw: fix Undo of format change of conditional para style
SwUndoFormatAttr was simply missing a case for RES_CONDTXTFMTCOLL.
Handle it the same way as an oridnary paragraph style, which seems to
work for me.
Change-Id: Ib529beb1116633e4890d5b51df39da21de485db9
(cherry picked from commit 37e936996acb4a8329fad2ec73a35f66be446e90)
Reviewed-on: https://gerrit.libreoffice.org/17428
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 8eec8e2..28f47fc 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -204,6 +204,7 @@ bool SwUndoFormatAttr::IsFormatInDoc( SwDoc* pDoc )
switch ( m_nFormatWhich )
{
case RES_TXTFMTCOLL:
+ case RES_CONDTXTFMTCOLL:
bFound = pDoc->GetTextFormatColls()->Contains( m_pFormat );
break;
@@ -301,7 +302,9 @@ void SwUndoFormatAttr::RepeatImpl(::sw::RepeatContext & rContext)
}
break;
- case RES_TXTFMTCOLL: {
+ case RES_TXTFMTCOLL:
+ case RES_CONDTXTFMTCOLL:
+ {
SwTextNode *const pNd =
rContext.GetRepeatPaM().GetNode().GetTextNode();
if( pNd ) {
commit 98846dcbf489af21113ee12454c1b6ad21b2ba3f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Jul 31 15:28:20 2015 +0200
tdf#92982 vcl rendercontext: set buffer size in ImplHandleResize()
Instead of in PaintHelper::StartBufferedPaint(). If the buffer size is
set to match the size of a sub-widget (for which the paint was
triggered), then client using the buffer as a persistent vdev are unable
to paint at arbitrary locations.
For example, if we painted the ruler, then the blinking cursor won't be
able to paint to the SwEditWin area.
(cherry picked from commits 161f7533ac177c25516ec206233936bd6982e3df and
43ac95ab64980ed958ba144c33971f897791d15f)
Change-Id: Iba07070baafb5b802fc6da200696611afd2010d7
Reviewed-on: https://gerrit.libreoffice.org/17490
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 406c141..c529d13 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -114,8 +114,12 @@ void PaintHelper::StartBufferedPaint()
// Instead of creating a new VirtualDevice, just erase the area we'll be
// painting over, as VirtualDevice::ImplInitVirDev() would do.
+ // The painted area is m_aPaintRect, or in case it's empty, then the whole window.
pFrameData->mpBuffer->SetBackground(Wallpaper(Color(COL_WHITE)));
- pFrameData->mpBuffer->Erase(m_aPaintRect);
+ if (m_aPaintRect.IsEmpty())
+ pFrameData->mpBuffer->Erase(Rectangle(Point(0, 0), m_pWindow->GetOutputSize()));
+ else
+ pFrameData->mpBuffer->Erase(m_aPaintRect);
pFrameData->mbInBufferedPaint = true;
m_bCreatedBuffer = true;
@@ -125,9 +129,6 @@ void PaintHelper::StartBufferedPaint()
// Remember what was the map mode of m_aPaintRect.
m_aPaintRectMapMode = m_pWindow->GetMapMode();
- // update the output size now, after all the settings were copied
- pFrameData->mpBuffer->SetOutputSize(m_pWindow->GetOutputSize());
-
// we need to remember the mnOutOffX / mnOutOffY, but actually really
// set it just temporarily for the subwidgets - so we are setting it here
// only to remember the value & to be able to pass it to the descendants
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 06d8fa8..304753a 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -35,6 +35,7 @@
#include <vcl/help.hxx>
#include <vcl/dockwin.hxx>
#include <vcl/menu.hxx>
+#include <vcl/virdev.hxx>
#include <touch/touch.h>
#include <svdata.hxx>
@@ -1712,6 +1713,12 @@ void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight )
}
else
pWindow->ImplGetWindowImpl()->mbCallResize = true;
+
+ if (pWindow->SupportsDoubleBuffering() && pWindow->ImplGetWindowImpl()->mbFrame)
+ {
+ // Propagate resize for the frame's buffer.
+ pWindow->ImplGetWindowImpl()->mpFrameData->mpBuffer->SetOutputSizePixel(pWindow->GetOutputSizePixel());
+ }
}
}
commit 33e3ecc0438edc03cb6ec24ba8d9e525ed791af2
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 29 22:46:26 2015 +0200
gdb pretty printers for boost can't iterate with Python 3
Change-Id: Ie2d1cb7312de6f14a5c6de81eefd7a00be6f75c0
(cherry picked from commit 396643d46a778539f2bde30569d35ec05d7d867b)
Reviewed-on: https://gerrit.libreoffice.org/17421
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: David Tardon <dtardon at redhat.com>
diff --git a/solenv/gdb/boost/ptr_container.py b/solenv/gdb/boost/ptr_container.py
index 38f3b2f..425d812 100644
--- a/solenv/gdb/boost/ptr_container.py
+++ b/solenv/gdb/boost/ptr_container.py
@@ -70,7 +70,7 @@ class PtrStdPrinterBase(object):
return self
def __next__(self):
- (index, value) = self.impl.next()
+ (index, value) = six.advance_iterator(self.impl)
return (index, value.cast(self.type).dereference())
def _import_std(self):
@@ -137,7 +137,7 @@ class PtrMapPrinter(PtrStdPrinterBase):
return self
def __next__(self):
- (index, value) = self.impl.next()
+ (index, value) = six.advance_iterator(self.impl)
if self.key:
value = value.cast(self.key_type)
else:
@@ -190,7 +190,7 @@ class PtrUnorderedMapPrinter(PtrBoostPrinterBase):
def __next__(self):
if self.step:
- self.value = self.impl.next()
+ self.value = six.advance_iterator(self.impl)
value = self.value[0]
else:
value = self.value[1].cast(self.value_type).dereference()
@@ -216,7 +216,7 @@ class PtrUnorderedSetPrinter(PtrBoostPrinterBase):
return self
def __next__(self):
- return ("", self.impl.next()[1].cast(self.value_type).dereference())
+ return ("", six.advance_iterator(self.impl)[1].cast(self.value_type).dereference())
printer = None
diff --git a/solenv/gdb/boost/unordered.py b/solenv/gdb/boost/unordered.py
index c21d31a..2c56721 100644
--- a/solenv/gdb/boost/unordered.py
+++ b/solenv/gdb/boost/unordered.py
@@ -63,7 +63,7 @@ class UnorderedMapPrinter(PrinterBase):
def __next__(self):
if self.step:
- self.value = self.impl.next()
+ self.value = six.advance_iterator(self.impl)
value = self.value[0]
else:
value = self.value[1]
@@ -87,7 +87,7 @@ class UnorderedSetPrinter(PrinterBase):
return self
def __next__(self):
- return ("", self.impl.next()[1])
+ return ("", six.advance_iterator(self.impl)[1])
printer = None
commit 96135fac9d08eac269bce93761d4d8e4e080467e
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 29 10:56:57 2015 +0200
RepositoryExternal.mk: missing dependency on python3 package
This was causing all these "libpython3.3m.so: file not recognized: File
truncated" failures.
(cherry picked from commit 57dd4d01c1ba036e5da4abf986b8d594d0ccdb95)
RepositoryExternal.mk: for some reason Mac wants a GeneratedPackage
(cherry picked from commit d9162d24ce242f27f9cc0430f0650daac8e5db24)
Change-Id: I5d983fee8d5cd313fbd0d6ece800fa8b80d81b35
Reviewed-on: https://gerrit.libreoffice.org/17398
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: David Ostrovsky <david at ostrovsky.org>
Reviewed-by: David Tardon <dtardon at redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1d7b09c..20de676 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3170,6 +3170,11 @@ endef
define gb_LinkTarget__use_python
$(call gb_LinkTarget__use_python_headers,$(1))
+ifeq ($(OS),MACOSX)
+$(call gb_LinkTarget_use_generated_package,$(1),python3)
+else
+$(call gb_LinkTarget_use_package,$(1),python3)
+endif
ifeq ($(OS),WNT)
$(call gb_LinkTarget_add_libs,$(1),\
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 49bd40b..b4b9060 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1301,6 +1301,14 @@ define gb_LinkTarget_use_packages
$(foreach package,$(2),$(call gb_LinkTarget_use_package,$(1),$(package)))
endef
+# use a GeneratedPackage, possibly from another module
+# call gb_LinkTarget_use_generated_package,linktarget,package
+define gb_LinkTarget_use_generated_package
+$(call gb_LinkTarget_get_headers_target,$(1)) :| \
+ $(call gb_GeneratedPackage_get_target,$(strip $(2)))
+
+endef
+
# Use sources from unpacked tarball of an external project
# call gb_LinkTarget_use_unpacked,linktarget,unpackedtarget
define gb_LinkTarget_use_unpacked
commit 6bfe71c11b2d0b6030cac7b6d37e59954c297966
Author: Laurent Balland-Poirier <laurent.balland-poirier at laposte.net>
Date: Wed Jul 29 22:18:04 2015 +0200
tdf#92918 Engineering notation lost with Add/Delete Decimal Place
With scientific format, use the trick of thousand separator to detect
Engineering notation.
Change-Id: I7acdfb8bec646f9d6c1a17c334b60fa9708c8111
Reviewed-on: https://gerrit.libreoffice.org/17406
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
(cherry picked from commit f4bdd7989f237e8e90ac94c2798e0ea0fb31af6b)
Reviewed-on: https://gerrit.libreoffice.org/17440
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 3783473..2cb7612 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2543,6 +2543,12 @@ void ScViewFunc::ChangeNumFmtDecimals( bool bIncrement )
nPrecision = aOut.getLength() - nPos - aDecSep.getLength();
// else keep 0
}
+ else
+ {
+ if ( (nOldType & css::util::NumberFormat::SCIENTIFIC) && !bThousand &&
+ (pOldEntry->GetFormatIntegerDigits()%3 == 0) && pOldEntry->GetFormatIntegerDigits() > 0 )
+ bThousand = true;
+ }
if (!bError)
{
commit 26d67d4b5d6bf9fb06d6462a0d087a8a9fa64e87
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu Jul 30 12:13:30 2015 +0200
tdf#92765: Show the real icon instead of a black square with gtk vclplug.
This partially brings back the behavior before
10a3db37377a68ec7529bbfbf876c852d58b7ae4.
Change-Id: I5b372ab56105c05dda6ecb9aa1eed1c6a0c72ea8
Reviewed-on: https://gerrit.libreoffice.org/17420
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index ba2f79b..7f8570e 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1659,15 +1659,20 @@ bitmapToPixbuf( SalBitmap *pSalBitmap, SalBitmap *pSalAlpha )
for( nX = 0; nX < pBitmap->mnWidth; nX++ )
{
BitmapColor aColor;
- if (pBitmap->mnBitCount == 24)
+ if (pBitmap->mnFormat == BMP_FORMAT_24BIT_TC_BGR)
{
- pBitmap->maColorMask.GetColorFor24Bit(aColor, pData);
- pData+=3;
+ aColor = BitmapColor(pData[2], pData[1], pData[0]);
+ pData += 3;
+ }
+ else if (pBitmap->mnFormat == BMP_FORMAT_24BIT_TC_RGB)
+ {
+ aColor = BitmapColor(pData[0], pData[1], pData[2]);
+ pData += 3;
}
else
{
pBitmap->maColorMask.GetColorFor32Bit(aColor, pData);
- pData+=4;
+ pData += 4;
}
*pDestData++ = aColor.GetRed();
*pDestData++ = aColor.GetGreen();
commit f295d36aedd62d957ca391a71bbff530ab32233e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Jul 30 15:51:34 2015 +0200
tdf#92982 vcl: stop creating/disposing the paint buffer in PaintHelper
Instead:
- create it early in Window::ImplInit(), except for the default window
(that one is a chicken-and-egg problem, as creating a VirtualDevice
invokes ImplGetDefaultWindow(), but creating the default window then
would create a VirtualDevice)
- only erase the painted area of the buffer, don't create it
- use a separate bool in the frame state to track if we're in the middle
of a (possibly recursive) buffered paint
And with that, rename CreateBuffer() to StartBufferedPaint(), as it does
not create the buffer anymore.
Change-Id: Ib33e8afa36977aa809f0ea2158a369f288cba8c7
(cherry picked from commit ea5e83abcfa1406c401b8a1ec91efda65373b74b)
Reviewed-on: https://gerrit.libreoffice.org/17445
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 5d39fc4..60f9b1a 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -176,6 +176,7 @@ struct ImplFrameData
bool mbInternalDragGestureRecognizer;
VclPtr<VirtualDevice> mpBuffer; ///< Buffer for the double-buffering
+ bool mbInBufferedPaint; ///< PaintHelper is in the process of painting into this buffer.
};
struct ImplAccessibleInfos
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 8c6e687..406c141 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -85,8 +85,8 @@ public:
}
void DoPaint(const vcl::Region* pRegion);
- /// Create the buffer, and set it up to have the same settings as m_pWindow.
- void CreateBuffer();
+ /// Start buffered paint: set it up to have the same settings as m_pWindow.
+ void StartBufferedPaint();
/// Setup the buffer according to the settings of the current m_pWindow.
void SetupBuffer();
@@ -107,12 +107,17 @@ PaintHelper::PaintHelper(vcl::Window *pWindow, sal_uInt16 nPaintFlags)
{
}
-void PaintHelper::CreateBuffer()
+void PaintHelper::StartBufferedPaint()
{
ImplFrameData* pFrameData = m_pWindow->mpWindowImpl->mpFrameData;
- assert(!pFrameData->mpBuffer);
+ assert(!pFrameData->mbInBufferedPaint);
- pFrameData->mpBuffer = VclPtrInstance<VirtualDevice>();
+ // Instead of creating a new VirtualDevice, just erase the area we'll be
+ // painting over, as VirtualDevice::ImplInitVirDev() would do.
+ pFrameData->mpBuffer->SetBackground(Wallpaper(Color(COL_WHITE)));
+ pFrameData->mpBuffer->Erase(m_aPaintRect);
+
+ pFrameData->mbInBufferedPaint = true;
m_bCreatedBuffer = true;
SetupBuffer();
@@ -164,7 +169,7 @@ void PaintHelper::SetupBuffer()
void PaintHelper::PaintBuffer()
{
ImplFrameData* pFrameData = m_pWindow->mpWindowImpl->mpFrameData;
- assert(pFrameData->mpBuffer);
+ assert(pFrameData->mbInBufferedPaint);
assert(m_bCreatedBuffer);
pFrameData->mpBuffer->mnOutOffX = 0;
@@ -178,7 +183,7 @@ void PaintHelper::PaintBuffer()
if (!getenv("VCL_DOUBLEBUFFERING_AVOID_PAINT"))
{
// The map mode of m_pWindow and/or the buffer may have changed since
- // CreateBuffer(), set it back to what it was, otherwise unwanted
+ // StartBufferedPaint(), set it back to what it was, otherwise unwanted
// scaling or translating may happen.
m_pWindow->SetMapMode(m_aPaintRectMapMode);
pFrameData->mpBuffer->SetMapMode(m_aPaintRectMapMode);
@@ -204,7 +209,7 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
WindowImpl* pWindowImpl = m_pWindow->ImplGetWindowImpl();
vcl::Region* pWinChildClipRegion = m_pWindow->ImplGetWinChildClipRegion();
ImplFrameData* pFrameData = m_pWindow->mpWindowImpl->mpFrameData;
- if (pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL || pFrameData->mpBuffer)
+ if (pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL || pFrameData->mbInBufferedPaint)
{
pWindowImpl->maInvalidateRegion = *pWinChildClipRegion;
}
@@ -231,16 +236,16 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
m_pWindow->BeginPaint();
// double-buffering: setup the buffer if it does not exist
- if (!pFrameData->mpBuffer && m_pWindow->SupportsDoubleBuffering())
- CreateBuffer();
+ if (!pFrameData->mbInBufferedPaint && m_pWindow->SupportsDoubleBuffering())
+ StartBufferedPaint();
// double-buffering: if this window does not support double-buffering,
// but we are in the middle of double-buffered paint, we might be
// losing information
- if (pFrameData->mpBuffer && !m_pWindow->SupportsDoubleBuffering())
+ if (pFrameData->mbInBufferedPaint && !m_pWindow->SupportsDoubleBuffering())
SAL_WARN("vcl.doublebuffering", "non-double buffered window in the double-buffered hierarchy, painting directly: " << typeid(*m_pWindow.get()).name());
- if (pFrameData->mpBuffer && m_pWindow->SupportsDoubleBuffering())
+ if (pFrameData->mbInBufferedPaint && m_pWindow->SupportsDoubleBuffering())
{
// double-buffering
SetupBuffer();
@@ -518,10 +523,10 @@ PaintHelper::~PaintHelper()
// double-buffering: paint in case we created the buffer, the children are
// already painted inside
- if (m_bCreatedBuffer && pFrameData->mpBuffer)
+ if (m_bCreatedBuffer && pFrameData->mbInBufferedPaint)
{
PaintBuffer();
- pFrameData->mpBuffer.disposeAndClear();
+ pFrameData->mbInBufferedPaint = false;
}
// #98943# draw toolbox selection
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 6e3e60e..f24e4bb 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1072,6 +1072,9 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p
mpWindowImpl->mpFrameData->maResizeIdle.SetIdleHdl( LINK( this, Window, ImplHandleResizeTimerHdl ) );
mpWindowImpl->mpFrameData->maResizeIdle.SetDebugName( "vcl::Window maResizeIdle" );
mpWindowImpl->mpFrameData->mbInternalDragGestureRecognizer = false;
+ if (!(nStyle & WB_DEFAULTWIN) && SupportsDoubleBuffering())
+ mpWindowImpl->mpFrameData->mpBuffer = VclPtrInstance<VirtualDevice>();
+ mpWindowImpl->mpFrameData->mbInBufferedPaint = false;
if ( pRealParent && IsTopWindow() )
{
commit e47b4781c0e335ba98dfff7a20da9ecba6e609e9
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Jul 29 18:09:32 2015 +0200
tdf#92982 vcl::Cursor: handle rendercontext
With this, vcl::Cursor does not paint on the vcl::Window directly, and
in case the output should be something other than pRenderContext, it
should be a one-liner change to do that.
(cherry picked from commit 79c9598d0a586f44757954556661ce6eda1f997e)
Conflicts:
vcl/source/window/cursor.cxx
Change-Id: I57833f6f8589286260d96f412f1fcc681e6c5c8c
Reviewed-on: https://gerrit.libreoffice.org/17433
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index bd96802..0bcad80 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -44,8 +44,9 @@ struct ImplCursorData
static void ImplCursorInvert( ImplCursorData* pData )
{
vcl::Window* pWindow = pData->mpWindow;
- bool bMapMode = pWindow->IsMapModeEnabled();
- pWindow->EnableMapMode( false );
+ vcl::RenderContext* pRenderContext = pWindow->GetOutDev();
+ bool bMapMode = pRenderContext->IsMapModeEnabled();
+ pRenderContext->EnableMapMode( false );
sal_uInt16 nInvertStyle;
if ( pData->mnStyle & CURSOR_SHADOW )
nInvertStyle = INVERT_50;
@@ -107,12 +108,12 @@ static void ImplCursorInvert( ImplCursorData* pData )
if ( pData->mnOrientation )
aPoly.Rotate( pData->maPixRotOff, pData->mnOrientation );
- pWindow->Invert( aPoly, nInvertStyle );
+ pRenderContext->Invert( aPoly, nInvertStyle );
}
}
else
- pWindow->Invert( aRect, nInvertStyle );
- pWindow->EnableMapMode( bMapMode );
+ pRenderContext->Invert( aRect, nInvertStyle );
+ pRenderContext->EnableMapMode( bMapMode );
}
void vcl::Cursor::ImplDraw()
commit cfc95e3a73806920b7b620a675ab8839fc0e7b18
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Fri Jul 31 02:24:00 2015 +0200
update credits
Change-Id: Ibb7500527d0ff142a6ba89a20894258cb63eeed5
(cherry picked from commit 2d9db406d301d722649ca539cacad823b89191ca)
diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt
index ce774c7..b287684 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas
is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:
experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
- <office:meta><dc:title>Credits » LibreOffice</dc:title><meta:keyword>Credits</meta:keyword><meta:keyword>contributors</meta:keyword><meta:keyword>coders</meta:keyword><meta:keyword>developers</meta:keyword><dc:description>Credits for the LibreOffice development/coding.</dc:description><meta:generator>LibreOffice/4.4.4.3$Linux_X86_64 LibreOffice_project/2c39ebcf046445232b798108aa8a7e7d89552ea8</meta:generator><dc:date>2012-02-20T22:17:18.060000000</dc:date><meta:editing-duration>PT14M12S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:document-statistic meta:table-count="5" meta:image-count="1" meta:object-count="0" meta:page-count="2" meta:paragraph-count="3230" meta:word-count="11412" meta:character-count="82435" meta:non-whitespace-character-count="72144"/><meta:user-defined meta:name="google-site-verification">JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA</meta:user-defined></office:meta>
+ <office:meta><dc:title>Credits » LibreOffice</dc:title><meta:keyword>Credits</meta:keyword><meta:keyword>contributors</meta:keyword><meta:keyword>coders</meta:keyword><meta:keyword>developers</meta:keyword><dc:description>Credits for the LibreOffice development/coding.</dc:description><meta:generator>LibreOffice/4.4.5.2$Linux_X86_64 LibreOffice_project/a22f674fd25a3b6f45bdebf25400ed2adff0ff99</meta:generator><dc:date>2012-02-20T22:17:18.060000000</dc:date><meta:editing-duration>PT14M12S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:document-statistic meta:table-count="5" meta:image-count="1" meta:object-count="0" meta:page-count="2" meta:paragraph-count="3237" meta:word-count="11435" meta:character-count="82571" meta:non-whitespace-character-count="72258"/><meta:user-defined meta:name="google-site-verification">JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA</meta:user-defined></office:meta>
<office:settings>
<config:config-item-set config:name="ooo:view-settings">
<config:config-item config:name="ViewAreaTop" config:type="long">501</config:config-item>
@@ -83,7 +83,7 @@
<config:config-item config:name="ConsiderTextWrapOnObjPos" config:type="boolean">false</config:config-item>
<config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item>
<config:config-item config:name="RedlineProtectionKey" config:type="base64Binary"/>
- <config:config-item config:name="Rsid" config:type="int">3298233</config:config-item>
+ <config:config-item config:name="Rsid" config:type="int">3308223</config:config-item>
<config:config-item config:name="PrintProspectRTL" config:type="boolean">false</config:config-item>
<config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
<config:config-item config:name="AlignTabStopPosition" config:type="boolean">true</config:config-item>
@@ -310,21 +310,24 @@
</office:styles>
<office:automatic-styles>
<style:style style:name="Tabelle1" style:family="table">
- <style:table-properties style:width="25.83cm" table:align="left"/>
+ <style:table-properties style:width="25.142cm" table:align="left"/>
</style:style>
<style:style style:name="Tabelle1.A" style:family="table-column">
- <style:table-column-properties style:column-width="5.823cm"/>
+ <style:table-column-properties style:column-width="6.59cm"/>
</style:style>
<style:style style:name="Tabelle1.B" style:family="table-column">
<style:table-column-properties style:column-width="6.643cm"/>
</style:style>
<style:style style:name="Tabelle1.C" style:family="table-column">
- <style:table-column-properties style:column-width="6.722cm"/>
+ <style:table-column-properties style:column-width="5.108cm"/>
+ </style:style>
+ <style:style style:name="Tabelle1.D" style:family="table-column">
+ <style:table-column-properties style:column-width="6.802cm"/>
</style:style>
<style:style style:name="Tabelle1.A1" style:family="table-cell">
<style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/>
</style:style>
- <style:style style:name="Tabelle1.C233" style:family="table-cell">
+ <style:style style:name="Tabelle1.D233" style:family="table-cell">
<style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
</style:style>
<style:style style:name="Tabelle2" style:family="table">
@@ -388,7 +391,7 @@
<style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
</style:style>
<style:style style:name="Tabelle5" style:family="table">
- <style:table-properties style:width="31.334cm" table:align="left"/>
+ <style:table-properties style:width="31.228cm" table:align="left"/>
</style:style>
<style:style style:name="Tabelle5.A" style:family="table-column">
<style:table-column-properties style:column-width="6.696cm"/>
@@ -397,17 +400,14 @@
<style:table-column-properties style:column-width="6.458cm"/>
</style:style>
<style:style style:name="Tabelle5.C" style:family="table-column">
- <style:table-column-properties style:column-width="11.564cm"/>
+ <style:table-column-properties style:column-width="6.431cm"/>
</style:style>
<style:style style:name="Tabelle5.D" style:family="table-column">
- <style:table-column-properties style:column-width="6.616cm"/>
+ <style:table-column-properties style:column-width="11.643cm"/>
</style:style>
<style:style style:name="Tabelle5.A1" style:family="table-cell">
<style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/>
</style:style>
- <style:style style:name="Tabelle5.C531" style:family="table-cell">
- <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
- </style:style>
<style:style style:name="P1" style:family="paragraph" style:parent-style-name="Table_20_Contents">
<style:text-properties fo:font-size="2pt" style:font-size-asian="2pt" style:font-size-complex="2pt"/>
</style:style>
@@ -1013,14 +1013,14 @@
</office:binary-data>
</draw:image>
</draw:frame>Credits</text:p>
- <text:p text:style-name="Text_20_body">1065 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2015-07-24 19:45:49.</text:p>
+ <text:p text:style-name="Text_20_body">1066 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2015-07-31 01:47:29.</text:p>
<text:p text:style-name="Text_20_body"><text:span text:style-name="T1">*</text:span> marks developers whose first contributions happened after 2010-09-28.</text:p>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Developers committing code since 2010-09-28</text:h>
<table:table table:name="Tabelle1" table:style-name="Tabelle1">
<table:table-column table:style-name="Tabelle1.A"/>
<table:table-column table:style-name="Tabelle1.B"/>
<table:table-column table:style-name="Tabelle1.C"/>
- <table:table-column table:style-name="Tabelle1.B"/>
+ <table:table-column table:style-name="Tabelle1.D"/>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Ruediger Timm<text:line-break/>Commits: 82464<text:line-break/>Joined: 2000-10-10</text:p>
@@ -1040,10 +1040,10 @@
<text:p text:style-name="Table_20_Contents">Vladimir Glazunov<text:line-break/>Commits: 25434<text:line-break/>Joined: 2000-12-04</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Caolán McNamara<text:line-break/>Commits: 17739<text:line-break/>Joined: 2000-10-10</text:p>
+ <text:p text:style-name="Table_20_Contents">Caolán McNamara<text:line-break/>Commits: 17740<text:line-break/>Joined: 2000-10-10</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Stephan Bergmann<text:line-break/>Commits: 9641<text:line-break/>Joined: 2000-10-04</text:p>
+ <text:p text:style-name="Table_20_Contents">Stephan Bergmann<text:line-break/>Commits: 9642<text:line-break/>Joined: 2000-10-04</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Ivo Hinkelmann<text:line-break/>Commits: 9480<text:line-break/>Joined: 2002-09-09</text:p>
@@ -1051,7 +1051,7 @@
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Tor Lillqvist<text:line-break/>Commits: 6954<text:line-break/>Joined: 2010-03-23</text:p>
+ <text:p text:style-name="Table_20_Contents">Tor Lillqvist<text:line-break/>Commits: 6960<text:line-break/>Joined: 2010-03-23</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Kohei Yoshida<text:line-break/>Commits: 5360<text:line-break/>Joined: 2009-06-19</text:p>
@@ -1060,21 +1060,21 @@
<text:p text:style-name="Table_20_Contents">Frank Schoenheit [fs]<text:line-break/>Commits: 5008<text:line-break/>Joined: 2000-09-19</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Michael Stahl<text:line-break/>Commits: 4732<text:line-break/>Joined: 2008-06-16</text:p>
+ <text:p text:style-name="Table_20_Contents">Michael Stahl<text:line-break/>Commits: 4749<text:line-break/>Joined: 2008-06-16</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Miklos Vajna<text:line-break/>Commits: 4641<text:line-break/>Joined: 2010-07-29</text:p>
+ <text:p text:style-name="Table_20_Contents">Miklos Vajna<text:line-break/>Commits: 4656<text:line-break/>Joined: 2010-07-29</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Noel Grandin<text:line-break/>Commits: 4067<text:line-break/>Joined: <text:span text:style-name="T2">2011-12-12</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Noel Grandin<text:line-break/>Commits: 4102<text:line-break/>Joined: <text:span text:style-name="T2">2011-12-12</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Markus Mohrhard<text:line-break/>Commits: 3696<text:line-break/>Joined: <text:span text:style-name="T2">2011-03-17</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Markus Mohrhard<text:line-break/>Commits: 3743<text:line-break/>Joined: <text:span text:style-name="T2">2011-03-17</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">David Tardon<text:line-break/>Commits: 3071<text:line-break/>Joined: 2009-11-12</text:p>
+ <text:p text:style-name="Table_20_Contents">David Tardon<text:line-break/>Commits: 3073<text:line-break/>Joined: 2009-11-12</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1085,7 +1085,7 @@
<text:p text:style-name="Table_20_Contents">Ocke Janssen [oj]<text:line-break/>Commits: 2850<text:line-break/>Joined: 2000-09-20</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Eike Rathke<text:line-break/>Commits: 2769<text:line-break/>Joined: 2000-10-11</text:p>
+ <text:p text:style-name="Table_20_Contents">Eike Rathke<text:line-break/>Commits: 2774<text:line-break/>Joined: 2000-10-11</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Mathias Bauer<text:line-break/>Commits: 2580<text:line-break/>Joined: 2000-09-20</text:p>
@@ -1099,10 +1099,10 @@
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Thomas Arnhold<text:line-break/>Commits: 2176<text:line-break/>Joined: <text:span text:style-name="T2">2011-01-16</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Jan Holesovsky<text:line-break/>Commits: 2164<text:line-break/>Joined: 2009-06-23</text:p>
+ <text:p text:style-name="Table_20_Contents">Jan Holesovsky<text:line-break/>Commits: 2167<text:line-break/>Joined: 2009-06-23</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Norbert Thiebaud<text:line-break/>Commits: 2106<text:line-break/>Joined: <text:span text:style-name="T2">2010-09-29</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Norbert Thiebaud<text:line-break/>Commits: 2107<text:line-break/>Joined: <text:span text:style-name="T2">2010-09-29</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1116,7 +1116,7 @@
<text:p text:style-name="Table_20_Contents">Christian Lippka<text:line-break/>Commits: 1805<text:line-break/>Joined: 2000-09-25</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Julien Nabet<text:line-break/>Commits: 1758<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-04</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Julien Nabet<text:line-break/>Commits: 1759<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-04</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1135,10 +1135,10 @@
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Fridrich Štrba<text:line-break/>Commits: 1324<text:line-break/>Joined: 2007-02-22</text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Tomaž Vajngerl<text:line-break/>Commits: 1325<text:line-break/>Joined: <text:span text:style-name="T2">2012-06-02</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Tomaž Vajngerl<text:line-break/>Commits: 1323<text:line-break/>Joined: <text:span text:style-name="T2">2012-06-02</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents">Fridrich Štrba<text:line-break/>Commits: 1324<text:line-break/>Joined: 2007-02-22</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Thomas Lange [tl]<text:line-break/>Commits: 1310<text:line-break/>Joined: 2000-09-22</text:p>
@@ -1155,7 +1155,7 @@
<text:p text:style-name="Table_20_Contents">Armin Le Grand<text:line-break/>Commits: 1187<text:line-break/>Joined: 2000-09-25</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Thorsten Behrens<text:line-break/>Commits: 1120<text:line-break/>Joined: 2001-04-25</text:p>
+ <text:p text:style-name="Table_20_Contents">Thorsten Behrens<text:line-break/>Commits: 1121<text:line-break/>Joined: 2001-04-25</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Petr Mladek<text:line-break/>Commits: 958<text:line-break/>Joined: 2006-10-03</text:p>
@@ -1163,16 +1163,16 @@
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Noel Power<text:line-break/>Commits: 950<text:line-break/>Joined: 2002-09-24</text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Matteo Casalin<text:line-break/>Commits: 953<text:line-break/>Joined: <text:span text:style-name="T2">2011-11-13</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Matteo Casalin<text:line-break/>Commits: 950<text:line-break/>Joined: <text:span text:style-name="T2">2011-11-13</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents">Noel Power<text:line-break/>Commits: 950<text:line-break/>Joined: 2002-09-24</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Lionel Elie Mamane<text:line-break/>Commits: 942<text:line-break/>Joined: <text:span text:style-name="T2">2011-01-15</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Takeshi Abe<text:line-break/>Commits: 918<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-08</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Takeshi Abe<text:line-break/>Commits: 923<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-08</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1281,10 +1281,10 @@
<text:p text:style-name="Table_20_Contents">Matthias Huetsch [mhu]<text:line-break/>Commits: 360<text:line-break/>Joined: 2000-09-28</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Xisco Fauli<text:line-break/>Commits: 311<text:line-break/>Joined: <text:span text:style-name="T2">2011-02-06</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Olivier Hallot<text:line-break/>Commits: 312<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-25</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Olivier Hallot<text:line-break/>Commits: 309<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-25</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Xisco Fauli<text:line-break/>Commits: 311<text:line-break/>Joined: <text:span text:style-name="T2">2011-02-06</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1292,7 +1292,7 @@
<text:p text:style-name="Table_20_Contents">Radek Doulik<text:line-break/>Commits: 305<text:line-break/>Joined: 2010-05-03</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Christian Lohmaier<text:line-break/>Commits: 295<text:line-break/>Joined: 2008-06-01</text:p>
+ <text:p text:style-name="Table_20_Contents">Christian Lohmaier<text:line-break/>Commits: 299<text:line-break/>Joined: 2008-06-01</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Chr. Rossmanith<text:line-break/>Commits: 295<text:line-break/>Joined: <text:span text:style-name="T2">2011-01-03</text:span></text:p>
@@ -1309,10 +1309,10 @@
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Pierre-André Jacquod<text:line-break/>Commits: 276<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-13</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Lars Langhans<text:line-break/>Commits: 260<text:line-break/>Joined: 2000-09-22</text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Katarina Behrens<text:line-break/>Commits: 264<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-13</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Katarina Behrens<text:line-break/>Commits: 258<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-13</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents">Lars Langhans<text:line-break/>Commits: 260<text:line-break/>Joined: 2000-09-22</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1326,7 +1326,7 @@
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Yousuf Philips<text:line-break/>Commits: 235<text:line-break/>Joined: <text:span text:style-name="T2">2014-09-21</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>David Ostrovsky<text:line-break/>Commits: 228<text:line-break/>Joined: <text:span text:style-name="T2">2012-04-01</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>David Ostrovsky<text:line-break/>Commits: 234<text:line-break/>Joined: <text:span text:style-name="T2">2012-04-01</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1340,7 +1340,7 @@
<text:p text:style-name="Table_20_Contents">Ingo Schmidt<text:line-break/>Commits: 202<text:line-break/>Joined: 2004-02-05</text:p>
</table:table-cell>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list