[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 220 commits - accessibility/source basctl/source basebmp/test bin/lo-commit-stat bridges/source canvas/source config_host.mk.in configure.ac connectivity/source cppcanvas/source cui/source cui/uiconfig dbaccess/source desktop/source download.lst embeddedobj/source external/coinmp external/curl external/libetonyek external/libmwaw external/libodfgen external/libwpd external/libwpg external/libwps external/libxslt external/mdds external/nss external/redland filter/source formula/source icon-themes/breeze icon-themes/galaxy icon-themes/sifr include/filter include/formula include/sfx2 include/svx include/unotools include/vcl jvmfwk/plugins Library_merged.mk librelogo/source officecfg/registry oox/source postprocess/CustomTarget_images.mk readlicense_oo/license reportdesign/source RepositoryExternal.mk sal/qa sal/rtl sc/inc sc/Library_scfilt.mk scp2/source sc/source sdext/source sd/source sd/uiconfig sfx2/source sfx2/uiconfig shell/sou rce solenv/gbuild sot/source starmath/source svl/source svtools/source svx/source sw/inc sw/qa sw/source sw/uiconfig unotools/source vcl/generic vcl/headless vcl/inc vcl/Library_vcl.mk vcl/quartz vcl/source vcl/unx writerfilter/source
Katarina Behrens
Katarina.Behrens at cib.de
Thu Aug 6 03:54:54 PDT 2015
Library_merged.mk | 2
RepositoryExternal.mk | 2
accessibility/source/standard/vclxaccessibletabcontrol.cxx | 5
basctl/source/basicide/baside2b.cxx | 2
basctl/source/basicide/basidesh.cxx | 8
basebmp/test/bmpmasktest.cxx | 6
bin/lo-commit-stat | 5
bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx | 1
canvas/source/vcl/spritecanvas.cxx | 2
canvas/source/vcl/spritecanvashelper.cxx | 2
config_host.mk.in | 1
configure.ac | 2
connectivity/source/drivers/dbase/DTable.cxx | 2
connectivity/source/drivers/jdbc/Blob.cxx | 10
connectivity/source/drivers/jdbc/DatabaseMetaData.cxx | 10
connectivity/source/drivers/jdbc/PreparedStatement.cxx | 30
connectivity/source/drivers/jdbc/ResultSet.cxx | 10
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 2
cppcanvas/source/mtfrenderer/emfplus.cxx | 2
cui/source/dialogs/about.cxx | 2
cui/source/dialogs/colorpicker.cxx | 2
cui/source/dialogs/cuicharmap.cxx | 4
cui/source/dialogs/cuigrfflt.cxx | 2
cui/source/tabpages/backgrnd.cxx | 2
cui/source/tabpages/grfpage.cxx | 2
cui/source/tabpages/numfmt.cxx | 2
cui/source/tabpages/numpages.cxx | 2
cui/source/tabpages/tabstpge.cxx | 2
cui/uiconfig/ui/optsecuritypage.ui | 1
dbaccess/source/ui/dlg/dbadmin.cxx | 3
dbaccess/source/ui/querydesign/JoinTableView.cxx | 21
dbaccess/source/ui/querydesign/TableWindowAccess.cxx | 4
dbaccess/source/ui/relationdesign/RelationDesignView.cxx | 2
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2
desktop/source/splash/splash.cxx | 2
download.lst | 13
embeddedobj/source/commonembedding/visobj.cxx | 20
embeddedobj/source/inc/commonembobj.hxx | 1
external/coinmp/ExternalProject_coinmp.mk | 3
external/coinmp/UnpackedTarball_coinmp.mk | 3
external/coinmp/rpath.patch | 50
external/curl/curl-7.26.0_win-proxy.patch | 9
external/curl/curl-msvc-schannel.patch.1 | 4
external/libetonyek/0001-add-missing-breaks.patch.1 | 36
external/libetonyek/0001-add-missing-include.patch.1 | 25
external/libetonyek/0001-missing-include.patch.1 | 25
external/libetonyek/0001-try-to-fix-build-on-Windows.patch.1 | 45
external/libetonyek/0002-remove-surplus-breaks.patch.1 | 38
external/libetonyek/ExternalProject_libetonyek.mk | 10
external/libetonyek/Library_etonyek.mk | 30
external/libetonyek/UnpackedTarball_libetonyek.mk | 6
external/libetonyek/assert.patch | 11
external/libetonyek/generated/IWORKToken.inc | 721 --
external/libetonyek/generated/KEY1Token.inc | 540 --
external/libetonyek/generated/KEY2Token.inc | 216
external/libetonyek/generated/NUM1Token.inc | 147
external/libetonyek/generated/NUMToken.inc | 146
external/libetonyek/generated/PAG1Token.inc | 158
external/libetonyek/generated/PAGToken.inc | 158
external/libetonyek/rpath.patch | 10
external/libetonyek/ubsan.patch | 20
external/libmwaw/ExternalProject_libmwaw.mk | 3
external/libmwaw/UnpackedTarball_libmwaw.mk | 8
external/libmwaw/rpath.patch | 10
external/libodfgen/ExternalProject_libodfgen.mk | 3
external/libodfgen/UnpackedTarball_libodfgen.mk | 6
external/libodfgen/rpath.patch | 10
external/libwpd/ExternalProject_libwpd.mk | 3
external/libwpd/UnpackedTarball_libwpd.mk | 3
external/libwpd/rpath.patch | 10
external/libwpg/ExternalProject_libwpg.mk | 3
external/libwpg/UnpackedTarball_libwpg.mk | 6
external/libwpg/rpath.patch | 10
external/libwps/ExternalProject_libwps.mk | 5
external/libwps/UnpackedTarball_libwps.mk | 1
external/libwps/rpath.patch.0 | 10
external/libxslt/UnpackedTarball_xslt.mk | 1
external/libxslt/rpath.patch.0 | 10
external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 | 55
external/mdds/UnpackedTarball_mdds.mk | 1
external/nss/UnpackedTarball_nss.mk | 2
external/nss/nspr-build-config.patch | 2543 ----------
external/nss/nss-linux-x86.patch.0 | 10
external/nss/nss.patch | 6
external/nss/nss_macosx.patch | 32
external/redland/UnpackedTarball_raptor.mk | 1
external/redland/UnpackedTarball_rasqal.mk | 3
external/redland/UnpackedTarball_redland.mk | 3
external/redland/raptor/rpath.patch | 21
external/redland/rasqal/rpath.patch | 21
external/redland/redland/rpath.patch | 10
filter/source/msfilter/escherex.cxx | 47
formula/source/core/api/token.cxx | 6
icon-themes/breeze/COPYING | 3
icon-themes/breeze/chart2/res/areas3d_52x60.png |binary
icon-themes/breeze/chart2/res/areas_52x60.png |binary
icon-themes/breeze/chart2/res/areasfull3d_52x60.png |binary
icon-themes/breeze/chart2/res/areasfull_52x60.png |binary
icon-themes/breeze/chart2/res/areaspiled3d_52x60.png |binary
icon-themes/breeze/chart2/res/areaspiled_52x60.png |binary
icon-themes/breeze/chart2/res/bar3d_52x60.png |binary
icon-themes/breeze/chart2/res/bar3ddeep_52x60.png |binary
icon-themes/breeze/chart2/res/bar_52x60.png |binary
icon-themes/breeze/chart2/res/barpercent3d_52x60.png |binary
icon-themes/breeze/chart2/res/barpercent_52x60.png |binary
icon-themes/breeze/chart2/res/barstack3d_52x60.png |binary
icon-themes/breeze/chart2/res/barstack_52x60.png |binary
icon-themes/breeze/chart2/res/bubble_52x60.png |binary
icon-themes/breeze/chart2/res/columnline_52x60.png |binary
icon-themes/breeze/chart2/res/columnpercent3d_52x60.png |binary
icon-themes/breeze/chart2/res/columnpercent_52x60.png |binary
icon-themes/breeze/chart2/res/columns3d_52x60.png |binary
icon-themes/breeze/chart2/res/columns3ddeep_52x60.png |binary
icon-themes/breeze/chart2/res/columns_52x60.png |binary
icon-themes/breeze/chart2/res/columnstack3d_52x60.png |binary
icon-themes/breeze/chart2/res/columnstack_52x60.png |binary
icon-themes/breeze/chart2/res/columnstackline_52x60.png |binary
icon-themes/breeze/chart2/res/cone_52x60.png |binary
icon-themes/breeze/chart2/res/conedeep_52x60.png |binary
icon-themes/breeze/chart2/res/conehori_52x60.png |binary
icon-themes/breeze/chart2/res/conehorideep_52x60.png |binary
icon-themes/breeze/chart2/res/conehoripercent_52x60.png |binary
icon-themes/breeze/chart2/res/conehoristack_52x60.png |binary
icon-themes/breeze/chart2/res/conepercent_52x60.png |binary
icon-themes/breeze/chart2/res/conestack_52x60.png |binary
icon-themes/breeze/chart2/res/cylinder_52x60.png |binary
icon-themes/breeze/chart2/res/cylinderdeep_52x60.png |binary
icon-themes/breeze/chart2/res/cylinderhori_52x60.png |binary
icon-themes/breeze/chart2/res/cylinderhorideep_52x60.png |binary
icon-themes/breeze/chart2/res/cylinderhoriprocent_52x60.png |binary
icon-themes/breeze/chart2/res/cylinderhoristack_52x60.png |binary
icon-themes/breeze/chart2/res/cylinderpercent_52x60.png |binary
icon-themes/breeze/chart2/res/cylinderstack_52x60.png |binary
icon-themes/breeze/chart2/res/donut3d_52x60.png |binary
icon-themes/breeze/chart2/res/donut3dexploded_52x60.png |binary
icon-themes/breeze/chart2/res/donut_52x60.png |binary
icon-themes/breeze/chart2/res/donutexploded_52x60.png |binary
icon-themes/breeze/chart2/res/net_52x60.png |binary
icon-themes/breeze/chart2/res/netfill_52x60.png |binary
icon-themes/breeze/chart2/res/netlinepoint_52x60.png |binary
icon-themes/breeze/chart2/res/netlinepointstack_52x60.png |binary
icon-themes/breeze/chart2/res/netpoint_52x60.png |binary
icon-themes/breeze/chart2/res/netpointstack_52x60.png |binary
icon-themes/breeze/chart2/res/netstack_52x60.png |binary
icon-themes/breeze/chart2/res/netstackfill_52x60.png |binary
icon-themes/breeze/chart2/res/nostackdirect3d_52x60.png |binary
icon-themes/breeze/chart2/res/nostackdirectboth_52x60.png |binary
icon-themes/breeze/chart2/res/nostackdirectlines_52x60.png |binary
icon-themes/breeze/chart2/res/nostackdirectpoints_52x60.png |binary
icon-themes/breeze/chart2/res/nostackstepped3d_52x60.png |binary
icon-themes/breeze/chart2/res/nostacksteppedboth_52x60.png |binary
icon-themes/breeze/chart2/res/nostacksteppedlines_52x60.png |binary
icon-themes/breeze/chart2/res/pie3d_52x60.png |binary
icon-themes/breeze/chart2/res/pie3dexploded_52x60.png |binary
icon-themes/breeze/chart2/res/pie_52x60.png |binary
icon-themes/breeze/chart2/res/pieexploded_52x60.png |binary
icon-themes/breeze/chart2/res/valueaxisdirect3d_52x60.png |binary
icon-themes/breeze/chart2/res/valueaxisdirectboth_52x60.png |binary
icon-themes/breeze/chart2/res/valueaxisdirectlines_52x60.png |binary
icon-themes/breeze/chart2/res/valueaxisdirectpoints_52x60.png |binary
icon-themes/breeze/cmd/lc_addprintarea.png |binary
icon-themes/breeze/cmd/lc_addtable.png |binary
icon-themes/breeze/cmd/lc_bezierinsert.png |binary
icon-themes/breeze/cmd/lc_changecasetolower.png |binary
icon-themes/breeze/cmd/lc_changecasetoupper.png |binary
icon-themes/breeze/cmd/lc_config.png |binary
icon-themes/breeze/cmd/lc_dataranges.png |binary
icon-themes/breeze/cmd/lc_dbnewform.png |binary
icon-themes/breeze/cmd/lc_dbnewquery.png |binary
icon-themes/breeze/cmd/lc_dbnewreport.png |binary
icon-themes/breeze/cmd/lc_dbnewtable.png |binary
icon-themes/breeze/cmd/lc_diagramarea.png |binary
icon-themes/breeze/cmd/lc_diagramaxisx.png |binary
icon-themes/breeze/cmd/lc_diagramaxisxyz.png |binary
icon-themes/breeze/cmd/lc_diagramaxisy.png |binary
icon-themes/breeze/cmd/lc_diagramaxisz.png |binary
icon-themes/breeze/cmd/lc_diagramdata.png |binary
icon-themes/breeze/cmd/lc_diagramwall.png |binary
icon-themes/breeze/cmd/lc_draw.png |binary
icon-themes/breeze/cmd/lc_drawchart.png |binary
icon-themes/breeze/cmd/lc_drawtext.png |binary
icon-themes/breeze/cmd/lc_edithyperlink.png |binary
icon-themes/breeze/cmd/lc_hyperlinkdialog.png |binary
icon-themes/breeze/cmd/lc_iconsetformatdialog.png |binary
icon-themes/breeze/cmd/lc_inscellsctrl.png |binary
icon-themes/breeze/cmd/lc_insertctrl.png |binary
icon-themes/breeze/cmd/lc_insertdraw.png |binary
icon-themes/breeze/cmd/lc_insertendnote.png |binary
icon-themes/breeze/cmd/lc_insertgraphic.png |binary
icon-themes/breeze/cmd/lc_inserthyperlink.png |binary
icon-themes/breeze/cmd/lc_insertmath.png |binary
icon-themes/breeze/cmd/lc_insertmenutitles.png |binary
icon-themes/breeze/cmd/lc_insertobjectchart.png |binary
icon-themes/breeze/cmd/lc_insertpage.png |binary
icon-themes/breeze/cmd/lc_inserttable.png |binary
icon-themes/breeze/cmd/lc_legend.png |binary
icon-themes/breeze/cmd/lc_morecontrols.png |binary
icon-themes/breeze/cmd/lc_movepagedown.png |binary
icon-themes/breeze/cmd/lc_movepagefirst.png |binary
icon-themes/breeze/cmd/lc_movepagelast.png |binary
icon-themes/breeze/cmd/lc_movepageup.png |binary
icon-themes/breeze/cmd/lc_newdoc.png |binary
icon-themes/breeze/cmd/lc_objectcatalog.png |binary
icon-themes/breeze/cmd/lc_starshapes.signet.png |binary
icon-themes/breeze/cmd/lc_text.png |binary
icon-themes/breeze/cmd/lc_texttoolbox.png |binary
icon-themes/breeze/cmd/lc_togglelegend.png |binary
icon-themes/breeze/cmd/lc_verticaltext.png |binary
icon-themes/breeze/cmd/sc_changecasetolower.png |binary
icon-themes/breeze/cmd/sc_changecasetoupper.png |binary
icon-themes/breeze/cmd/sc_config.png |binary
icon-themes/breeze/cmd/sc_dataranges.png |binary
icon-themes/breeze/cmd/sc_dbnewform.png |binary
icon-themes/breeze/cmd/sc_dbnewquery.png |binary
icon-themes/breeze/cmd/sc_dbnewreport.png |binary
icon-themes/breeze/cmd/sc_diagramarea.png |binary
icon-themes/breeze/cmd/sc_diagramaxisx.png |binary
icon-themes/breeze/cmd/sc_diagramaxisxyz.png |binary
icon-themes/breeze/cmd/sc_diagramaxisy.png |binary
icon-themes/breeze/cmd/sc_diagramaxisz.png |binary
icon-themes/breeze/cmd/sc_diagramwall.png |binary
icon-themes/breeze/cmd/sc_draw.png |binary
icon-themes/breeze/cmd/sc_edithyperlink.png |binary
icon-themes/breeze/cmd/sc_hyperlinkdialog.png |binary
icon-themes/breeze/cmd/sc_insertendnote.png |binary
icon-themes/breeze/cmd/sc_inserthyperlink.png |binary
icon-themes/breeze/cmd/sc_insertmenutitles.png |binary
icon-themes/breeze/cmd/sc_insertpage.png |binary
icon-themes/breeze/cmd/sc_legend.png |binary
icon-themes/breeze/cmd/sc_morecontrols.png |binary
icon-themes/breeze/cmd/sc_movepagedown.png |binary
icon-themes/breeze/cmd/sc_movepagefirst.png |binary
icon-themes/breeze/cmd/sc_movepagelast.png |binary
icon-themes/breeze/cmd/sc_movepageup.png |binary
icon-themes/breeze/cmd/sc_objectcatalog.png |binary
icon-themes/breeze/cmd/sc_starshapes.signet.png |binary
icon-themes/breeze/cmd/sc_togglelegend.png |binary
icon-themes/breeze/links.txt | 9
icon-themes/breeze/res/recentdoc_remove.png |binary
icon-themes/breeze/res/recentdoc_remove_highlighted.png |binary
icon-themes/breeze/svx/res/markers.png |binary
icon-themes/galaxy/cmd/lc_diagramaxisx.png |binary
icon-themes/galaxy/cmd/lc_diagramaxisy.png |binary
icon-themes/galaxy/cmd/sc_diagramaxisx.png |binary
icon-themes/galaxy/cmd/sc_diagramaxisy.png |binary
icon-themes/sifr/cmd/lc_presentationcurrentslide.png |binary
icon-themes/sifr/cmd/lc_resetattributes.png |binary
icon-themes/sifr/cmd/lc_slidemasterpage.png |binary
icon-themes/sifr/cmd/sc_resetattributes.png |binary
icon-themes/sifr/cmd/sc_slidemasterpage.png |binary
icon-themes/sifr/sw/res/doublepage_10x22.png |binary
icon-themes/sifr/sw/res/emptypage_10x14.png |binary
icon-themes/sifr/sw/res/twopages_10x24.png |binary
include/filter/msfilter/escherex.hxx | 12
include/formula/tokenarray.hxx | 4
include/sfx2/dinfdlg.hxx | 25
include/sfx2/thumbnailview.hxx | 12
include/sfx2/thumbnailviewitem.hxx | 3
include/sfx2/viewsh.hxx | 1
include/svx/charmap.hxx | 3
include/svx/svdpagv.hxx | 5
include/unotools/securityoptions.hxx | 2
include/vcl/ctrl.hxx | 2
include/vcl/outdev.hxx | 2
include/vcl/print.hxx | 3
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 4
librelogo/source/LibreLogo/LibreLogo.py | 4
officecfg/registry/data/org/openoffice/Office/Addons.xcu | 4
officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu | 24
officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu | 2
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 3
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 39
oox/source/export/drawingml.cxx | 58
oox/source/export/vmlexport.cxx | 81
postprocess/CustomTarget_images.mk | 5
readlicense_oo/license/CREDITS.fodt | 1747 +++---
reportdesign/source/ui/report/StartMarker.cxx | 2
reportdesign/source/ui/report/ViewsWindow.cxx | 2
sal/qa/rtl/strings/test_strings_replace.cxx | 12
sal/rtl/ustring.cxx | 4
sc/Library_scfilt.mk | 2
sc/inc/compiler.hxx | 2
sc/inc/dbdata.hxx | 18
sc/inc/refdata.hxx | 14
sc/source/core/data/bcaslot.cxx | 3
sc/source/core/data/dptabsrc.cxx | 2
sc/source/core/inc/refupdat.hxx | 7
sc/source/core/tool/address.cxx | 77
sc/source/core/tool/compiler.cxx | 183
sc/source/core/tool/dbdata.cxx | 97
sc/source/core/tool/grouparealistener.cxx | 33
sc/source/core/tool/interpr1.cxx | 88
sc/source/core/tool/lookupcache.cxx | 2
sc/source/core/tool/rangenam.cxx | 9
sc/source/core/tool/refupdat.cxx | 28
sc/source/core/tool/token.cxx | 92
sc/source/filter/excel/xename.cxx | 3
sc/source/filter/inc/tablebuffer.hxx | 7
sc/source/filter/inc/tablecolumnsbuffer.hxx | 100
sc/source/filter/inc/tablecolumnscontext.hxx | 68
sc/source/filter/inc/workbookhelper.hxx | 4
sc/source/filter/oox/defnamesbuffer.cxx | 7
sc/source/filter/oox/tablebuffer.cxx | 11
sc/source/filter/oox/tablecolumnsbuffer.cxx | 142
sc/source/filter/oox/tablecolumnscontext.cxx | 94
sc/source/filter/oox/tablefragment.cxx | 11
sc/source/filter/oox/workbookfragment.cxx | 5
sc/source/filter/oox/workbookhelper.cxx | 15
sc/source/filter/xml/xmlimprt.cxx | 10
sc/source/ui/Accessibility/AccessibleDocument.cxx | 3
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 12
sc/source/ui/app/inputwin.cxx | 6
sc/source/ui/cctrl/checklistmenu.cxx | 5
sc/source/ui/cctrl/tbinsert.cxx | 2
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 2
sc/source/ui/docshell/docsh4.cxx | 18
sc/source/ui/inc/anyrefdg.hxx | 1
sc/source/ui/inc/checklistmenu.hxx | 4
sc/source/ui/inc/tbinsert.hxx | 4
sc/source/ui/miscdlgs/anyrefdg.cxx | 10
sc/source/ui/view/tabview.cxx | 3
scp2/source/ooo/file_ooo.scp | 2
sd/source/ui/animations/CustomAnimationList.cxx | 4
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 2
sd/source/ui/func/fusel.cxx | 9
sd/source/ui/func/futext.cxx | 9
sd/uiconfig/simpress/toolbar/commontaskbar.xml | 1
sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml | 2
sd/uiconfig/simpress/toolbar/outlinetoolbar.xml | 13
sd/uiconfig/simpress/toolbar/standardbar.xml | 18
sd/uiconfig/simpress/toolbar/textobjectbar.xml | 32
sd/uiconfig/simpress/toolbar/toolbar.xml | 44
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 12
sfx2/source/control/recentdocsview.cxx | 12
sfx2/source/control/templateabstractview.cxx | 2
sfx2/source/control/templatecontaineritem.cxx | 12
sfx2/source/control/templatedefaultview.cxx | 21
sfx2/source/control/templateviewitem.cxx | 8
sfx2/source/control/thumbnailview.cxx | 63
sfx2/source/control/thumbnailviewitem.cxx | 28
sfx2/source/control/unoctitm.cxx | 14
sfx2/source/dialog/backingwindow.cxx | 45
sfx2/source/dialog/backingwindow.hxx | 7
sfx2/source/dialog/dockwin.cxx | 3
sfx2/source/dialog/templdlg.cxx | 60
sfx2/source/dialog/titledockwin.cxx | 2
sfx2/source/view/viewprn.cxx | 2
sfx2/source/view/viewsh.cxx | 1
sfx2/uiconfig/ui/documentinfopage.ui | 7
sfx2/uiconfig/ui/startcenter.ui | 104
shell/source/win32/shlxthandler/infotips/infotips.cxx | 2
solenv/gbuild/ExternalProject.mk | 10
solenv/gbuild/PythonTest.mk | 6
sot/source/base/exchange.cxx | 4
starmath/source/ElementsDockingWindow.cxx | 4
starmath/source/view.cxx | 4
svl/source/numbers/zforscan.cxx | 2
svtools/source/brwbox/brwbox1.cxx | 2
svtools/source/brwbox/brwbox2.cxx | 7
svtools/source/config/optionsdrawinglayer.cxx | 2
svtools/source/contnr/imivctl1.cxx | 2
svtools/source/contnr/treelistbox.cxx | 3
svtools/source/control/calendar.cxx | 2
svtools/source/control/roadmap.cxx | 4
svtools/source/control/tabbar.cxx | 6
svtools/source/control/toolbarmenu.cxx | 6
svtools/source/control/valueset.cxx | 8
svtools/source/toolpanel/toolpaneldrawer.cxx | 2
svx/source/dialog/charmap.cxx | 23
svx/source/dialog/dlgctrl.cxx | 8
svx/source/dialog/paraprev.cxx | 2
svx/source/dialog/swframeexample.cxx | 2
svx/source/sdr/contact/viewobjectcontactofgraphic.cxx | 21
svx/source/svdraw/sdrpaintwindow.cxx | 4
svx/source/svdraw/svdmrkv.cxx | 51
svx/source/tbxctrls/layctrl.cxx | 2
sw/inc/unobaseclass.hxx | 4
sw/inc/viewsh.hxx | 8
sw/qa/core/uwriter.cxx | 7
sw/qa/extras/ooxmlexport/data/fdo60957-2.docx |binary
sw/qa/extras/ooxmlexport/data/kde216114-1.odt |binary
sw/qa/extras/ooxmlexport/data/kde302504-1.odt |binary
sw/qa/extras/ooxmlexport/data/ooo106020-1.odt |binary
sw/qa/extras/ooxmlexport/data/ooo34469-1.odt |binary
sw/qa/extras/ooxmlexport/data/ooo39845-7.odt |binary
sw/qa/extras/ooxmlexport/data/ooo47778-3.odt |binary
sw/qa/extras/ooxmlexport/data/ooo47778-4.odt |binary
sw/qa/extras/ooxmlexport/data/ooo67471-2.odt |binary
sw/qa/extras/ooxmlexport/data/ooo72950-1.odt |binary
sw/qa/extras/ooxmlexport/data/tdf89890.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 23
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 53
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 13
sw/qa/extras/ooxmlimport/data/tdf87460.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 13
sw/qa/extras/rtfimport/data/bin-skipping.rtf | 19
sw/qa/extras/rtfimport/data/tdf92061.rtf | 5
sw/qa/extras/rtfimport/data/tdf92481.rtf | 6
sw/qa/extras/rtfimport/rtfimport.cxx | 18
sw/qa/extras/ww8export/data/fdo66304-1.odt |binary
sw/qa/extras/ww8export/ww8export.cxx | 5
sw/source/core/crsr/crsrsh.cxx | 6
sw/source/core/crsr/crstrvl.cxx | 6
sw/source/core/crsr/swcrsr.cxx | 4
sw/source/core/crsr/trvlcol.cxx | 2
sw/source/core/crsr/viscrs.cxx | 2
sw/source/core/doc/DocumentContentOperationsManager.cxx | 25
sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 10
sw/source/core/doc/doc.cxx | 4
sw/source/core/doc/notxtfrm.cxx | 31
sw/source/core/draw/dflyobj.cxx | 2
sw/source/core/draw/dpage.cxx | 2
sw/source/core/edit/autofmt.cxx | 3
sw/source/core/frmedt/fews.cxx | 6
sw/source/core/frmedt/tblsel.cxx | 4
sw/source/core/inc/bodyfrm.hxx | 2
sw/source/core/inc/cellfrm.hxx | 4
sw/source/core/inc/cntfrm.hxx | 2
sw/source/core/inc/flyfrm.hxx | 6
sw/source/core/inc/flyfrms.hxx | 8
sw/source/core/inc/frame.hxx | 15
sw/source/core/inc/frmtool.hxx | 2
sw/source/core/inc/ftnfrm.hxx | 2
sw/source/core/inc/hffrm.hxx | 2
sw/source/core/inc/layact.hxx | 6
sw/source/core/inc/layfrm.hxx | 6
sw/source/core/inc/notxtfrm.hxx | 6
sw/source/core/inc/pagefrm.hxx | 6
sw/source/core/inc/rootfrm.hxx | 4
sw/source/core/inc/rowfrm.hxx | 4
sw/source/core/inc/sectfrm.hxx | 4
sw/source/core/inc/tabfrm.hxx | 6
sw/source/core/inc/txtfrm.hxx | 6
sw/source/core/inc/viewimp.hxx | 20
sw/source/core/layout/anchoreddrawobject.cxx | 8
sw/source/core/layout/calcmove.cxx | 54
sw/source/core/layout/flowfrm.cxx | 16
sw/source/core/layout/fly.cxx | 27
sw/source/core/layout/flycnt.cxx | 4
sw/source/core/layout/flyincnt.cxx | 15
sw/source/core/layout/flylay.cxx | 8
sw/source/core/layout/frmtool.cxx | 2
sw/source/core/layout/ftnfrm.cxx | 42
sw/source/core/layout/hffrm.cxx | 6
sw/source/core/layout/layact.cxx | 64
sw/source/core/layout/objectformatter.cxx | 3
sw/source/core/layout/objectformattertxtfrm.cxx | 11
sw/source/core/layout/pagechg.cxx | 21
sw/source/core/layout/paintfrm.cxx | 129
sw/source/core/layout/sectfrm.cxx | 37
sw/source/core/layout/tabfrm.cxx | 44
sw/source/core/layout/trvlfrm.cxx | 34
sw/source/core/layout/unusedf.cxx | 4
sw/source/core/layout/wsfrm.cxx | 9
sw/source/core/text/frmform.cxx | 34
sw/source/core/text/frmpaint.cxx | 6
sw/source/core/text/inftxt.cxx | 66
sw/source/core/text/inftxt.hxx | 49
sw/source/core/text/porfly.cxx | 2
sw/source/core/text/txtfly.cxx | 2
sw/source/core/text/txtfrm.cxx | 13
sw/source/core/text/txtftn.cxx | 2
sw/source/core/text/txthyph.cxx | 6
sw/source/core/unocore/unochart.cxx | 4
sw/source/core/unocore/unoflatpara.cxx | 2
sw/source/core/unocore/unoobj2.cxx | 40
sw/source/core/unocore/unosect.cxx | 2
sw/source/core/unocore/unotbl.cxx | 63
sw/source/core/view/pagepreviewlayout.cxx | 14
sw/source/core/view/viewimp.cxx | 22
sw/source/core/view/viewpg.cxx | 2
sw/source/core/view/viewsh.cxx | 128
sw/source/core/view/vnew.cxx | 2
sw/source/core/view/vprint.cxx | 20
sw/source/filter/html/swhtml.cxx | 97
sw/source/filter/ww8/WW8TableInfo.cxx | 95
sw/source/filter/ww8/WW8TableInfo.hxx | 21
sw/source/filter/ww8/docxattributeoutput.cxx | 42
sw/source/filter/ww8/docxexport.cxx | 8
sw/source/filter/ww8/docxsdrexport.cxx | 91
sw/source/filter/ww8/rtfsdrexport.cxx | 79
sw/source/filter/ww8/wrtw8nds.cxx | 63
sw/source/filter/ww8/wrtww8.cxx | 97
sw/source/filter/ww8/wrtww8.hxx | 16
sw/source/filter/xml/xmlimp.cxx | 80
sw/source/ui/chrdlg/drpcps.cxx | 2
sw/source/ui/config/optpage.cxx | 2
sw/source/ui/dbui/mailmergewizard.cxx | 1
sw/source/ui/envelp/envlop1.cxx | 8
sw/source/ui/envelp/labfmt.cxx | 2
sw/source/ui/misc/outline.cxx | 2
sw/source/uibase/app/docsh.cxx | 6
sw/source/uibase/dbui/mailmergehelper.cxx | 4
sw/source/uibase/dbui/mmconfigitem.cxx | 70
sw/source/uibase/docvw/PageBreakWin.cxx | 2
sw/source/uibase/docvw/edtwin2.cxx | 4
sw/source/uibase/frmdlg/colex.cxx | 2
sw/source/uibase/inc/mmconfigitem.hxx | 6
sw/source/uibase/uiview/pview.cxx | 2
sw/source/uibase/uno/unotxvw.cxx | 2
sw/uiconfig/swriter/ui/opttablepage.ui | 2
unotools/source/config/securityoptions.cxx | 8
vcl/Library_vcl.mk | 6
vcl/generic/print/prtsetup.cxx | 7
vcl/generic/print/prtsetup.hxx | 5
vcl/headless/svpgdi.cxx | 158
vcl/headless/svptextrender.cxx | 9
vcl/inc/headless/svpgdi.hxx | 9
vcl/inc/unx/gtk/gtkframe.hxx | 7
vcl/inc/unx/gtk/gtkgdi.hxx | 6
vcl/quartz/CTRunData.cxx | 2
vcl/quartz/CTRunData.hxx | 2
vcl/quartz/ctlayout.cxx | 270 -
vcl/source/control/button.cxx | 8
vcl/source/control/ctrl.cxx | 21
vcl/source/control/edit.cxx | 6
vcl/source/control/ilstbox.cxx | 18
vcl/source/control/prgsbar.cxx | 2
vcl/source/control/scrbar.cxx | 2
vcl/source/control/slider.cxx | 2
vcl/source/gdi/print3.cxx | 19
vcl/source/glyphs/graphite_layout.cxx | 33
vcl/source/outdev/bitmap.cxx | 28
vcl/source/outdev/curvedshapes.cxx | 10
vcl/source/outdev/gradient.cxx | 22
vcl/source/outdev/hatch.cxx | 8
vcl/source/outdev/line.cxx | 5
vcl/source/outdev/mask.cxx | 10
vcl/source/outdev/nativecontrols.cxx | 4
vcl/source/outdev/pixel.cxx | 11
vcl/source/outdev/polygon.cxx | 11
vcl/source/outdev/polyline.cxx | 11
vcl/source/outdev/rect.cxx | 11
vcl/source/outdev/text.cxx | 11
vcl/source/outdev/textline.cxx | 7
vcl/source/outdev/transparent.cxx | 13
vcl/source/outdev/wallpaper.cxx | 14
vcl/source/window/builder.cxx | 2
vcl/source/window/dockingarea.cxx | 3
vcl/source/window/dockmgr.cxx | 2
vcl/source/window/menu.cxx | 9
vcl/source/window/menubarwindow.cxx | 18
vcl/source/window/menufloatingwindow.cxx | 8
vcl/source/window/paint.cxx | 14
vcl/source/window/printdlg.cxx | 2
vcl/source/window/toolbox.cxx | 15
vcl/source/window/window.cxx | 7
vcl/unx/gtk/a11y/atkbridge.cxx | 5
vcl/unx/gtk/a11y/atkfactory.cxx | 5
vcl/unx/gtk/a11y/atkutil.cxx | 12
vcl/unx/gtk/a11y/atkutil.hxx | 1
vcl/unx/gtk/app/gtkinst.cxx | 10
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 35
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 3
vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 34
vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 1
vcl/unx/gtk/window/gtksalframe.cxx | 193
vcl/unx/gtk/window/gtksalmenu.cxx | 85
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 184
vcl/unx/kde4/KDE4FilePicker.cxx | 2
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 12
writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 4
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 8
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 3
writerfilter/source/dmapper/GraphicImport.cxx | 8
writerfilter/source/dmapper/NumberingManager.cxx | 14
writerfilter/source/dmapper/SettingsTable.cxx | 25
writerfilter/source/ooxml/model.xml | 4
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 5
writerfilter/source/rtftok/rtftokenizer.cxx | 6
571 files changed, 5450 insertions(+), 7758 deletions(-)
New commits:
commit 22a84307adee8219614bc2f425280ac3de1c7cdd
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Thu Jul 2 15:34:11 2015 +0200
tdf#91362: Make "printer was modified" status persistent
To test:
Scenario 1:
* go to Writer -> Format -> Page
* select page format and orientation, if possible a different one than the default
in your env.
* File -> Print -> Properties should now show those values (and not the default
values from the printer)
Scenario 2 (aka Scenario 2 from tdf#61186)
* now go to File -> Printer settings
* change page format and orientation, if possible to yet a different one than the
printer default and a page one
* File -> Print -> Properties should now show what was selected in Printer settings
and not the format of the page
Change-Id: Ibc84540f428b79dbec2587c50eefe526a62751b3
Reviewed-on: https://gerrit.libreoffice.org/16716
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit 0251e61640b94094918406b33ee7b05564409feb)
Reviewed-on: https://gerrit.libreoffice.org/16808
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 39effbb..c6e7f4a 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -148,6 +148,7 @@ friend class SfxPrinterController;
SfxShell* pSubShell;
VclPtr<vcl::Window> pWindow;
bool bNoNewWindow;
+ bool mbPrinterSettingsModified;
protected:
virtual void Activate(bool IsMDIActivate) SAL_OVERRIDE;
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 81f8656..35c6109 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -563,6 +563,8 @@ public:
SAL_DLLPRIVATE bool getReversePrint() const;
SAL_DLLPRIVATE void setPapersizeFromSetup( bool i_bPapersizeFromSetup );
SAL_DLLPRIVATE bool getPapersizeFromSetup() const;
+ VCL_PLUGIN_PUBLIC void setPrinterModified( bool i_bPapersizeFromSetup );
+ VCL_PLUGIN_PUBLIC bool getPrinterModified() const;
SAL_DLLPRIVATE void pushPropertiesToPrinter();
SAL_DLLPRIVATE void resetPaperToLastConfigured();
VCL_PLUGIN_PUBLIC void setJobState( com::sun::star::view::PrintableState );
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 3f238fb..13a0aed 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -612,6 +612,7 @@ void SfxViewShell::StartPrint( const uno::Sequence < beans::PropertyValue >& rPr
SfxObjectShell *pObjShell = GetObjectShell();
xNewController->setValue( OUString( "JobName" ),
makeAny( OUString( pObjShell->GetTitle(0) ) ) );
+ xNewController->setPrinterModified( mbPrinterSettingsModified );
}
void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rProps, bool bIsAPI, bool bIsDirect )
@@ -868,6 +869,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
// forget new printer, it was taken over (as pPrinter) or deleted
pDlgPrinter = NULL;
+ mbPrinterSettingsModified = true;
}
else
{
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 431ba97..939c590 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1257,6 +1257,7 @@ SfxViewShell::SfxViewShell
, pSubShell(0)
, pWindow(0)
, bNoNewWindow( nFlags & SfxViewShellFlags::NO_NEWWINDOW )
+, mbPrinterSettingsModified(false)
{
if ( pViewFrame->GetParentViewFrame() )
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index dfca33a..41fd69c 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -282,11 +282,11 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox )
}
if( pKey )
{
- m_pParent->SetDataModified( true );
PPDValue* pValue = static_cast<PPDValue*>(pBox->GetSelectEntryData());
m_pParent->m_aJobData.m_aContext.setValue( pKey, pValue );
update();
}
+ m_pParent->SetDataModified( true );
return 0;
}
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 8ccde00..6bfa81a 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -152,6 +152,7 @@ public:
bool mbLastPage;
bool mbReversePageOrder;
bool mbPapersizeFromSetup;
+ bool mbPrinterModified;
view::PrintableState meJobState;
vcl::PrinterController::MultiPageSetup maMultiPage;
@@ -186,6 +187,7 @@ public:
mbLastPage( false ),
mbReversePageOrder( false ),
mbPapersizeFromSetup( false ),
+ mbPrinterModified( false ),
meJobState( view::PrintableState_JOB_STARTED ),
mpProgress( NULL ),
mnDefaultPaperBin( -1 ),
@@ -817,7 +819,7 @@ bool PrinterController::setupPrinter( vcl::Window* i_pParent )
// whatever happens to be the current page
// (but only if the printer config has changed, otherwise
// don't override printer page auto-detection - tdf#91362)
- if (!mpImplData->mxPrinter->IsDefPrinter())
+ if (getPrinterModified())
{
resetPaperToLastConfigured();
}
@@ -849,8 +851,6 @@ bool PrinterController::setupPrinter( vcl::Window* i_pParent )
{
mpImplData->maPageCache.invalidate();
}
- // Settings have been modified (i.e. this printer is no longer default )
- mpImplData->mxPrinter->SetDefPrinter( false );
}
else
{
@@ -1374,6 +1374,16 @@ bool PrinterController::getPapersizeFromSetup() const
return mpImplData->mbPapersizeFromSetup;
}
+void PrinterController::setPrinterModified( bool i_bPrinterModified )
+{
+ mpImplData->mbPrinterModified = i_bPrinterModified;
+}
+
+bool PrinterController::getPrinterModified() const
+{
+ return mpImplData->mbPrinterModified;
+}
+
Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< PropertyValue >& i_rMergeList ) const
{
std::unordered_set< OUString, OUStringHash > aMergeSet;
commit c5caecc69e1e6fcf24967b74401ecdbbc0a84b44
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 5 13:28:30 2015 +0100
aDBFColumn.db_typ is input controlled
so we can't guarantee that it is valid ascii
Change-Id: Icdc6162db4405df729e548a836de5662255088ed
(cherry picked from commit 7e0b90aff31bc3d1bf3775ecb5fff4e8174f6db4)
Reviewed-on: https://gerrit.libreoffice.org/16779
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 3f05fe6..889d7cc 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -345,7 +345,7 @@ void ODbaseTable::fillColumns()
char cType[2];
cType[0] = aDBFColumn.db_typ;
cType[1] = 0;
- aTypeName = OUString::createFromAscii(cType);
+ aTypeName = OUString(cType, 1, RTL_TEXTENCODING_ASCII_US);
SAL_INFO( "connectivity.drivers","column type: " << aDBFColumn.db_typ);
switch (aDBFColumn.db_typ)
commit bd85b99b42958fed7c7aad440cf6cd76ad32727e
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Sat Jul 4 20:40:32 2015 +0200
tdf#92520: LibO crash when editing .odb database properties
Regression from:
f7424ed710e54bb2437a28380b03ed7c26290edc
Change-Id: I7665d579696f21846abaed21ca8c4f14acdc964c
(cherry picked from commit 9216e5ef76ab718568ebda64ccfa0c010390e11a)
Reviewed-on: https://gerrit.libreoffice.org/16768
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 6f040be..f20c732 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -194,8 +194,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou
// extract all relevant data from the property set of the data source
m_pImpl->translateProperties(_rxDatasource, *GetInputSetImpl());
- // propagate this set as our new input set and reset the example set
- SetInputSet(GetInputSetImpl());
+ // reset the example set
delete pExampleSet;
pExampleSet = new SfxItemSet(*GetInputSetImpl());
commit e7c8d0bbbacc733d8c4fd6c827511591dd6b2dba
Author: Justin Luth <justin_luth at sil.org>
Date: Fri Jul 3 20:45:16 2015 +0300
tdf#87348 enable docx exporting linked textboxes that LO can import
Change-Id: I1f663e1a463919fc0662c94e03b801c7c58f1f5d
Reviewed-on: https://gerrit.libreoffice.org/16745
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 855be57..58d9d0b 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -453,6 +453,7 @@ void DocxExport::ExportDocument_Impl()
WriteEmbeddings();
+ m_aLinkedTextboxesHelper.clear(); //final cleanup
delete m_pStyles, m_pStyles = NULL;
delete m_pSections, m_pSections = NULL;
}
@@ -1314,6 +1315,10 @@ void DocxExport::WriteMainText()
// setup the namespaces
m_pDocumentFS->startElementNS( XML_w, XML_document, MainXmlNamespaces());
+ // reset the incrementing linked-textboxes chain ID before re-saving.
+ m_nLinkedTextboxesChainId=0;
+ m_aLinkedTextboxesHelper.clear();
+
// Write background page color
if (boost::optional<SvxBrushItem> oBrush = getBackground())
{
@@ -1331,6 +1336,9 @@ void DocxExport::WriteMainText()
// the text
WriteText();
+ // clear linked textboxes since old ones can't be linked to frames in a different section (correct?)
+ m_aLinkedTextboxesHelper.clear();
+
// the last section info
m_pAttrOutput->EndParaSdtBlock();
const WW8_SepInfo *pSectionInfo = m_pSections? m_pSections->CurrentSectionInfo(): NULL;
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 13c7bd0..c6207a5 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -144,8 +144,6 @@ struct DocxSdrExport::Impl
sax_fastparser::FastAttributeList* m_pFlyWrapAttrList;
sax_fastparser::FastAttributeList* m_pBodyPrAttrList;
std::unique_ptr<sax_fastparser::FastAttributeList> m_pDashLineStyleAttr;
- sal_Int32 m_nId ;
- sal_Int32 m_nSeq ;
bool m_bDMLAndVMLDrawingOpen;
/// List of TextBoxes in this document: they are exported as part of their shape, never alone.
std::set<const SwFrameFormat*> m_aTextBoxes;
@@ -167,8 +165,6 @@ struct DocxSdrExport::Impl
m_bFlyFrameGraphic(false),
m_pFlyWrapAttrList(0),
m_pBodyPrAttrList(0),
- m_nId(0),
- m_nSeq(0),
m_bDMLAndVMLDrawingOpen(false),
m_aTextBoxes(SwTextBoxHelper::findTextBoxes(m_rExport.m_pDoc)),
m_nDMLandVMLTextFrameRotation(0)
@@ -1476,48 +1472,87 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId, bo
pFS->endElementNS(XML_wps, XML_spPr);
}
+ //first, loop through ALL of the chained textboxes to identify a unique ID for each chain, and sequence number for each textbox in that chain.
+ std::map<OUString, MSWordExportBase::LinkedTextboxInfo>::iterator linkedTextboxesIter;
+ if( !m_pImpl->m_rExport.m_bLinkedTextboxesHelperInitialized )
+ {
+ sal_Int32 nSeq=0;
+ linkedTextboxesIter = m_pImpl->m_rExport.m_aLinkedTextboxesHelper.begin();
+ while ( linkedTextboxesIter != m_pImpl->m_rExport.m_aLinkedTextboxesHelper.end() )
+ {
+ //find the start of a textbox chain: has no PREVIOUS link, but does have NEXT link
+ if ( linkedTextboxesIter->second.sPrevChain.isEmpty() && !linkedTextboxesIter->second.sNextChain.isEmpty() )
+ {
+ //assign this chain a unique ID and start a new sequence
+ nSeq = 0;
+ linkedTextboxesIter->second.nId = ++m_pImpl->m_rExport.m_nLinkedTextboxesChainId;
+ linkedTextboxesIter->second.nSeq = nSeq;
+
+ OUString sCheckForBrokenChains = linkedTextboxesIter->first;
+
+ //follow the chain and assign the same id, and incremental sequence numbers.
+ std::map<OUString, MSWordExportBase::LinkedTextboxInfo>::iterator followChainIter;
+ followChainIter = m_pImpl->m_rExport.m_aLinkedTextboxesHelper.find(linkedTextboxesIter->second.sNextChain);
+ while ( followChainIter != m_pImpl->m_rExport.m_aLinkedTextboxesHelper.end() )
+ {
+ //verify that the NEXT textbox also points to me as the PREVIOUS.
+ // A broken link indicates a leftover remnant that can be ignored.
+ if( followChainIter->second.sPrevChain != sCheckForBrokenChains )
+ break;
+
+ followChainIter->second.nId = m_pImpl->m_rExport.m_nLinkedTextboxesChainId;
+ followChainIter->second.nSeq = ++nSeq;
+
+ //empty next chain indicates the end of the linked chain.
+ if ( followChainIter->second.sNextChain.isEmpty() )
+ break;
+
+ sCheckForBrokenChains = followChainIter->first;
+ followChainIter = m_pImpl->m_rExport.m_aLinkedTextboxesHelper.find(followChainIter->second.sNextChain);
+ }
+ }
+ ++linkedTextboxesIter;
+ }
+ m_pImpl->m_rExport.m_bLinkedTextboxesHelperInitialized = true;
+ }
+
m_pImpl->m_rExport.m_pParentFrame = NULL;
bool skipTxBxContent = false ;
bool isTxbxLinked = false ;
- /* Check if the text box is linked and then decides whether
- to write the tag txbx or linkedTxbx
- */
- if (xPropSetInfo.is() && xPropSetInfo->hasPropertyByName("ChainPrevName") &&
- xPropSetInfo->hasPropertyByName("ChainNextName"))
+ OUString sLinkChainName;
+ if ( xPropSetInfo.is() )
{
- OUString sChainPrevName;
- OUString sChainNextName;
-
- xPropertySet->getPropertyValue("ChainPrevName") >>= sChainPrevName ;
- xPropertySet->getPropertyValue("ChainNextName") >>= sChainNextName ;
+ if ( xPropSetInfo->hasPropertyByName("LinkDisplayName") )
+ xPropertySet->getPropertyValue("LinkDisplayName") >>= sLinkChainName;
+ else if ( xPropSetInfo->hasPropertyByName("ChainName") )
+ xPropertySet->getPropertyValue("ChainName") >>= sLinkChainName;
+ }
- if (!sChainPrevName.isEmpty())
+ // second, check if THIS textbox is linked and then decide whether to write the tag txbx or linkedTxbx
+ linkedTextboxesIter = m_pImpl->m_rExport.m_aLinkedTextboxesHelper.find(sLinkChainName);
+ if ( linkedTextboxesIter != m_pImpl->m_rExport.m_aLinkedTextboxesHelper.end() )
+ {
+ if( (linkedTextboxesIter->second.nId !=0) && (linkedTextboxesIter->second.nSeq != 0) )
{
+ //not the first in the chain, so write the tag as linkedTxbx
+ pFS->singleElementNS(XML_wps, XML_linkedTxbx,
+ XML_id, I32S(linkedTextboxesIter->second.nId),
+ XML_seq, I32S(linkedTextboxesIter->second.nSeq),
+ FSEND);
/* no text content should be added to this tag,
since the textbox is linked, the entire content
is written in txbx block
*/
- ++m_pImpl->m_nSeq ;
- pFS->singleElementNS(XML_wps, XML_linkedTxbx,
- XML_id, I32S(m_pImpl->m_nId),
- XML_seq, I32S(m_pImpl->m_nSeq),
- FSEND);
skipTxBxContent = true ;
-
- //Text box chaining for a group of textboxes ends here,
- //therefore reset the seq.
- if (sChainNextName.isEmpty())
- m_pImpl->m_nSeq = 0 ;
}
- else if (sChainPrevName.isEmpty() && !sChainNextName.isEmpty())
+ else if( (linkedTextboxesIter->second.nId != 0) && (linkedTextboxesIter->second.nSeq == 0) )
{
/* this is the first textbox in the chaining, we add the text content
to this block*/
- ++m_pImpl->m_nId ;
//since the text box is linked, it needs an id.
pFS->startElementNS(XML_wps, XML_txbx,
- XML_id, I32S(m_pImpl->m_nId),
+ XML_id, I32S(linkedTextboxesIter->second.nId),
FSEND);
isTxbxLinked = true ;
}
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index a3779e4..ac7d9c3 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -562,6 +562,69 @@ bool SwWW8AttrIter::IsAnchorLinkedToThisNode( sal_uLong nNodePos )
FlyProcessingState SwWW8AttrIter::OutFlys(sal_Int32 nSwPos)
{
+ // collection point to first gather info about all of the potentially linked textboxes: to be analyzed later.
+ OUString sLinkChainName;
+ sw::FrameIter linkedTextboxesIter = maFlyIter;
+ while ( linkedTextboxesIter != maFlyFrms.end() )
+ {
+ uno::Reference< drawing::XShape > xShape;
+ sw::Frame xFrame = *linkedTextboxesIter;
+ const SdrObject* pSdrObj = xFrame.GetFrameFormat().FindRealSdrObject();
+ if( pSdrObj )
+ xShape = uno::Reference< drawing::XShape >(const_cast<SdrObject*>(pSdrObj)->getUnoShape(), uno::UNO_QUERY);
+ uno::Reference< beans::XPropertySet > xPropertySet(xShape, uno::UNO_QUERY);
+ uno::Reference< beans::XPropertySetInfo > xPropertySetInfo;
+ if( xPropertySet.is() )
+ xPropertySetInfo = xPropertySet->getPropertySetInfo();
+ if( xPropertySetInfo.is() )
+ {
+ MSWordExportBase::LinkedTextboxInfo aLinkedTextboxInfo = MSWordExportBase::LinkedTextboxInfo();
+
+ if( xPropertySetInfo->hasPropertyByName("LinkDisplayName") )
+ xPropertySet->getPropertyValue("LinkDisplayName") >>= sLinkChainName;
+ else if( xPropertySetInfo->hasPropertyByName("ChainName") )
+ xPropertySet->getPropertyValue("ChainName") >>= sLinkChainName;
+
+ if( xPropertySetInfo->hasPropertyByName("ChainNextName") )
+ xPropertySet->getPropertyValue("ChainNextName") >>= aLinkedTextboxInfo.sNextChain;
+ if( xPropertySetInfo->hasPropertyByName("ChainPrevName") )
+ xPropertySet->getPropertyValue("ChainPrevName") >>= aLinkedTextboxInfo.sPrevChain;
+
+ //collect a list of linked textboxes: those with a NEXT or PREVIOUS link
+ if( !aLinkedTextboxInfo.sNextChain.isEmpty() || !aLinkedTextboxInfo.sPrevChain.isEmpty() )
+ {
+ assert( !sLinkChainName.isEmpty() );
+
+ //there are many discarded duplicates in documents - no duplicates allowed in the list, so try to find the real one.
+ //if this LinkDisplayName/ChainName already exists on a different shape...
+ // the earlier processed duplicates are thrown out unless this one can be proved as bad. (last processed duplicate usually is stored)
+ std::map<OUString,MSWordExportBase::LinkedTextboxInfo>::iterator linkFinder;
+ linkFinder = m_rExport.m_aLinkedTextboxesHelper.find(sLinkChainName);
+ if( linkFinder != m_rExport.m_aLinkedTextboxesHelper.end() )
+ {
+ //If my NEXT/PREV targets have already been discovered, but don't match me, then assume I'm an abandoned remnant
+ // (this logic fails if both me and one of my links are duplicated, and the remnants were added first.)
+ linkFinder = m_rExport.m_aLinkedTextboxesHelper.find(aLinkedTextboxInfo.sNextChain);
+ if( (linkFinder != m_rExport.m_aLinkedTextboxesHelper.end()) && (linkFinder->second.sPrevChain != sLinkChainName) )
+ {
+ ++linkedTextboxesIter;
+ break;
+ }
+
+ linkFinder = m_rExport.m_aLinkedTextboxesHelper.find(aLinkedTextboxInfo.sPrevChain);
+ if( (linkFinder != m_rExport.m_aLinkedTextboxesHelper.end()) && (linkFinder->second.sNextChain != sLinkChainName) )
+ {
+ ++linkedTextboxesIter;
+ break;
+ }
+ }
+ m_rExport.m_bLinkedTextboxesHelperInitialized = false;
+ m_rExport.m_aLinkedTextboxesHelper[sLinkChainName] = aLinkedTextboxInfo;
+ }
+ }
+ ++linkedTextboxesIter;
+ }
+
/*
#i2916#
May have an anchored graphic to be placed, loop through sorted array
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 01a95cf..bbf819a 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1728,6 +1728,9 @@ void MSWordExportBase::WriteSpecialText( sal_uLong nStart, sal_uLong nEnd, sal_u
// bOutKF was setted / stored in WriteKF1
SetCurPam(nStart, nEnd);
+ // clear linked textboxes since old ones can't be linked to frames in this section
+ m_aLinkedTextboxesHelper.clear();
+
WriteText();
m_bOutPageDescs = bOldPageDescs;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 957ab28..d2cb89d 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -497,6 +497,18 @@ public:
WW8_WrPlcAnnotations* m_pAtn;
WW8_WrPlcTextBoxes *m_pTextBxs, *m_pHFTextBxs;
+ struct LinkedTextboxInfo //help analyze textbox flow links
+ {
+ sal_Int32 nId;
+ sal_Int32 nSeq;
+ OUString sNextChain;
+ OUString sPrevChain;
+ LinkedTextboxInfo(): nId(0), nSeq(0) {}
+ };
+ std::map<OUString,LinkedTextboxInfo> m_aLinkedTextboxesHelper;
+ bool m_bLinkedTextboxesHelperInitialized = false;
+ sal_Int32 m_nLinkedTextboxesChainId=0;
+
const sw::Frame *m_pParentFrame; // If set we are exporting content inside
// a frame, e.g. a graphic node
commit 893cc01aff0fe0c95e9d46e9c9f5a0e66420dc2a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Jul 6 09:09:41 2015 +0200
tdf#92481 RTF import: handle \widowctrl
(cherry picked from commit ffc7b671e213d366e59d39ddbbef66544ebf01e5)
Change-Id: I1af1d6bc150c16a2c6b0fe788a41c8c18caee6c6
Reviewed-on: https://gerrit.libreoffice.org/16785
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sw/qa/extras/rtfimport/data/tdf92481.rtf b/sw/qa/extras/rtfimport/data/tdf92481.rtf
new file mode 100644
index 0000000..09a6c5e
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf92481.rtf
@@ -0,0 +1,6 @@
+{\rtf1
+\widowctrl
+\pard\plain
+Hello.
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 8a22358..99637e8 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2313,6 +2313,12 @@ DECLARE_RTFIMPORT_TEST(testTdf92061, "tdf92061.rtf")
CPPUNIT_ASSERT_EQUAL(OUString("body-after"), getRun(getParagraph(1), 3)->getString());
}
+DECLARE_RTFIMPORT_TEST(testTdf92481, "tdf92481.rtf")
+{
+ // This was 0, RTF_WIDOWCTRL was not imported.
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int8>(2), getProperty<sal_Int8>(getParagraph(1), "ParaWidows"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index ef4ed92..dbb2da1 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -79,6 +79,7 @@ struct SettingsTable_Impl
bool m_bDoNotUseHTMLParagraphAutoSpacing;
bool m_bNoColumnBalance;
bool m_bAutoHyphenation;
+ bool m_bWidowControl;
bool m_bSplitPgBreakAndParaMark;
bool m_bMirrorMargin;
uno::Sequence<beans::PropertyValue> m_pThemeFontLangProps;
@@ -111,6 +112,7 @@ struct SettingsTable_Impl
, m_bDoNotUseHTMLParagraphAutoSpacing(false)
, m_bNoColumnBalance(false)
, m_bAutoHyphenation(false)
+ , m_bWidowControl(false)
, m_bSplitPgBreakAndParaMark(false)
, m_bMirrorMargin(false)
, m_pThemeFontLangProps(3)
@@ -288,6 +290,9 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
case NS_ooxml::LN_CT_Settings_autoHyphenation:
m_pImpl->m_bAutoHyphenation = nIntValue;
break;
+ case NS_ooxml::LN_CT_Settings_widowControl:
+ m_pImpl->m_bWidowControl = nIntValue;
+ break;
default:
{
#ifdef DEBUG_WRITERFILTER
@@ -373,6 +378,11 @@ uno::Sequence<beans::PropertyValue> SettingsTable::GetCompatSettings() const
return comphelper::containerToSequence(m_pImpl->m_aCompatSettings);
}
+static bool lcl_isDefault(const uno::Reference<beans::XPropertyState>& xPropertyState, const OUString& rPropertyName)
+{
+ return xPropertyState->getPropertyState(rPropertyName) == beans::PropertyState_DEFAULT_VALUE;
+}
+
void SettingsTable::ApplyProperties(uno::Reference<text::XTextDocument> const& xDoc)
{
uno::Reference< beans::XPropertySet> xDocProps( xDoc, uno::UNO_QUERY );
@@ -382,18 +392,29 @@ void SettingsTable::ApplyProperties(uno::Reference<text::XTextDocument> const& x
xDocProps->setPropertyValue("RecordChanges", uno::makeAny( m_pImpl->m_bRecordChanges ) );
// Auto hyphenation: turns on hyphenation by default, <w:suppressAutoHyphens/> may still disable it at a paragraph level.
- if (m_pImpl->m_bAutoHyphenation)
+ // Situation is similar for RTF_WIDOWCTRL, which turns on widow / orphan control by default.
+ if (m_pImpl->m_bAutoHyphenation || m_pImpl->m_bWidowControl)
{
uno::Reference<style::XStyleFamiliesSupplier> xStyleFamiliesSupplier(xDoc, uno::UNO_QUERY);
+ if (!xStyleFamiliesSupplier.is())
+ return;
+
uno::Reference<container::XNameAccess> xStyleFamilies = xStyleFamiliesSupplier->getStyleFamilies();
uno::Reference<container::XNameContainer> xParagraphStyles = xStyleFamilies->getByName("ParagraphStyles").get< uno::Reference<container::XNameContainer> >();
uno::Reference<style::XStyle> xDefault = xParagraphStyles->getByName("Standard").get< uno::Reference<style::XStyle> >();
uno::Reference<beans::XPropertyState> xPropertyState(xDefault, uno::UNO_QUERY);
- if (xPropertyState->getPropertyState("ParaIsHyphenation") == beans::PropertyState_DEFAULT_VALUE)
+ if (m_pImpl->m_bAutoHyphenation && lcl_isDefault(xPropertyState, "ParaIsHyphenation"))
{
uno::Reference<beans::XPropertySet> xPropertySet(xDefault, uno::UNO_QUERY);
xPropertySet->setPropertyValue("ParaIsHyphenation", uno::makeAny(true));
}
+ if (m_pImpl->m_bWidowControl && lcl_isDefault(xPropertyState, "ParaWidows") && lcl_isDefault(xPropertyState, "ParaOrphans"))
+ {
+ uno::Reference<beans::XPropertySet> xPropertySet(xDefault, uno::UNO_QUERY);
+ uno::Any aAny = uno::makeAny(static_cast<sal_Int8>(2));
+ xPropertySet->setPropertyValue("ParaWidows", aAny);
+ xPropertySet->setPropertyValue("ParaOrphans", aAny);
+ }
}
}
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index df0ae0e..9a8c4d0 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -60,6 +60,10 @@
<token tokenid="ooxml:footerl"/>
<token tokenid="ooxml:footerr"/>
<token tokenid="ooxml:footerf"/>
+
+ <!-- Present in RTF, but not in OOXML. -->
+ <token tokenid="ooxml:CT_Settings_widowControl"/>
+
<namespace name="dml-stylesheet">
<start name="theme"/>
<start name="themeOverride"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8a68e6d..b9f65f0 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3515,6 +3515,9 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_SAUTOUPD:
m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Style_autoRedefine, std::make_shared<RTFValue>(1));
break;
+ case RTF_WIDOWCTRL:
+ m_aSettingsTableSprms.set(NS_ooxml::LN_CT_Settings_widowControl, std::make_shared<RTFValue>(1));
+ break;
default:
{
SAL_INFO("writerfilter", "TODO handle flag '" << lcl_RtfToString(nKeyword) << "'");
commit 247a7722642db10a07d6eaac22afda89f1303cbe
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun Jul 5 11:53:39 2015 +0200
tdf#91574: SLIDESHOW: crash when second monitor connected
0 0x00002aaab1f6a803 in VirtualDevice::InnerImplSetOutputSizePixel(Size const&, bool, boost::shared_array<unsigned char> const&, bool) (this=0x0, rNewSize=Size = {...}, bErase=true, pBuffer=..., bTopDown=false) at /home/julien/compile-libreoffice/libreoffice/vcl/source/gdi/virdev.cxx:293
1 0x00002aaab1f6ae54 in VirtualDevice::ImplSetOutputSizePixel(Size const&, bool, boost::shared_array<unsigned char> const&, bool) (this=0x0, rNewSize=Size = {...}, bErase=true, pBuffer=..., bTopDown=false) at /home/julien/compile-libreoffice/libreoffice/vcl/source/gdi/virdev.cxx:396
2 0x00002aaab1f6b1af in VirtualDevice::SetOutputSizePixel(Size const&, bool) (this=0x0, rNewSize=Size = {...}, bErase=true)
at /home/julien/compile-libreoffice/libreoffice/vcl/source/gdi/virdev.cxx:444
3 0x00002aaae650e30f in vclcanvas::SpriteCanvasHelper::updateScreen(bool, bool&) (this=0x69daf50, bUpdateAll=true, io_bSurfaceDirty=@0x69dafe0: true)
at /home/julien/compile-libreoffice/libreoffice/canvas/source/vcl/spritecanvashelper.cxx:316
So initialize maVDev
Change-Id: I4a79ba6e8f13c4a2bed3127742a9a9c928e133cd
Reviewed-on: https://gerrit.libreoffice.org/16770
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
Tested-by: Michael Meeks <michael.meeks at collabora.com>
Signed-off-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 095dae6e..e6fa3e7f7 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -177,7 +177,7 @@ namespace vclcanvas
SpriteCanvasHelper::SpriteCanvasHelper() :
mpRedrawManager( NULL ),
mpOwningSpriteCanvas( NULL ),
- maVDev(),
+ maVDev(VclPtr<VirtualDevice>::Create()),
maLastUpdate(),
mbShowFrameInfo( false ),
mbShowSpriteBounds( false ),
commit ed86d235733ee1e7e25e08bab804c55b6e33d7bb
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 4 23:22:53 2015 +0200
tdf#90377: fix exclude recipient in mail merge
- first, actually use the selection in MergeNew()
- secoond, bring back GetSelection() for that
- third, throw away lots of the old (dead) code that mostly just
stumbled over itself
- e.g. ExcludeRecord() wouldnt work on the last element due to a
off-by-one error
Change-Id: I07d07e086b748b393f2ada7cb22fdb2ce285ad65
Reviewed-on: https://gerrit.libreoffice.org/16762
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 341bede..04bd7f8 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -276,6 +276,7 @@ void SwMailMergeWizard::CreateTargetDocument()
aDescriptor[ svx::daCursor ] <<= m_rConfigItem.GetResultSet();
aDescriptor[ svx::daCommand ] <<= m_rConfigItem.GetCurrentDBData().sCommand;
aDescriptor[ svx::daCommandType ] <<= m_rConfigItem.GetCurrentDBData().nCommandType;
+ aDescriptor[ svx::daSelection ] <<= m_rConfigItem.GetSelection();
SwMergeDescriptor aMergeDesc( DBMGR_MERGE_SHELL, GetSwView()->GetWrtShell(),
aDescriptor);
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index cec51c7..85f6735 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -17,7 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#include <mmconfigitem.hxx>
+#include <vector>
#include <swtypes.hxx>
#include <osl/diagnose.h>
#include <com/sun/star/uno/Any.hxx>
@@ -34,6 +36,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/types.hxx>
#include <com/sun/star/sdb/CommandType.hpp>
+#include <comphelper/sequence.hxx>
#include <rtl/instance.hxx>
#include <unotools/configitem.hxx>
#include <mailmergehelper.hxx>
@@ -1021,57 +1024,34 @@ sal_Int32 SwMailMergeConfigItem::GetResultSetPosition() const
return m_pImpl->nResultSetCursorPos;
}
-bool SwMailMergeConfigItem::IsRecordExcluded(sal_Int32 nRecord)
-{
- bool bRet = false;
- if(nRecord > 0 && nRecord < m_aSelection.getLength())
- {
- sal_Int32 nTemp = 0;
- m_aSelection[nRecord - 1] >>= nTemp;
- bRet = nTemp < 1;
- }
- return bRet;
-}
+bool SwMailMergeConfigItem::IsRecordExcluded(sal_Int32 nRecord) const
+ { return m_aExcludedRecords.find(nRecord) != m_aExcludedRecords.end(); }
void SwMailMergeConfigItem::ExcludeRecord(sal_Int32 nRecord, bool bExclude)
{
- //nRecord is based on 1
- //the selection array contains Anys for all records
- //excluded records contain a '-1'
- if(!m_aSelection.getLength() || nRecord > m_aSelection.getLength())
- {
- if(bExclude)
- {
- //if no selection array is available we need to create one containing the
- //entries for all available records
- if(!m_pImpl->xResultSet.is())
- GetResultSet();
- if(m_pImpl->xResultSet.is())
- {
- m_pImpl->xResultSet->last();
- sal_Int32 nEnd = m_pImpl->xResultSet->getRow();
- sal_Int32 nStart = m_aSelection.getLength();
- m_aSelection.realloc(nEnd);
- Any* pSelection = m_aSelection.getArray();
- for(sal_Int32 nIndex = nStart; nIndex < nEnd; ++nIndex)
- {
- if((nRecord - 1) != nIndex)
- pSelection[nIndex] <<= nIndex + 1;
- else
- pSelection[nIndex] <<= (sal_Int32) -1;
- }
- }
- }
- }
+ if(bExclude)
+ m_aExcludedRecords.insert(nRecord);
else
- {
- if(nRecord > 0 && m_aSelection.getLength() > nRecord)
- {
- m_aSelection[nRecord - 1] <<= bExclude ? -1 : nRecord;
- }
- }
+ m_aExcludedRecords.erase(nRecord);
}
+uno::Sequence<uno::Any> SwMailMergeConfigItem::GetSelection() const
+{
+ if(!m_pImpl->xResultSet.is())
+ GetResultSet();
+ if(!m_pImpl->xResultSet.is())
+ return {};
+ m_pImpl->xResultSet->last();
+ sal_Int32 nResultSetSize = m_pImpl->xResultSet->getRow()+1;
+ std::vector<uno::Any> vResult;
+ vResult.reserve(nResultSetSize);
+ for(sal_Int32 nIdx=1; nIdx<nResultSetSize;++nIdx)
+ if(!IsRecordExcluded(nIdx))
+ vResult.push_back(uno::makeAny<sal_Int32>(nIdx));
+ return comphelper::containerToSequence(vResult);
+}
+
+
const uno::Sequence< OUString>&
SwMailMergeConfigItem::GetSavedDocuments() const
{
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index 7b4115e..07f216c 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -22,6 +22,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <tools/resary.hxx>
+#include <set>
#include <swdbdata.hxx>
#include "swdllapi.h"
#include "sharedconnection.hxx"
@@ -56,7 +57,7 @@ class SW_DLLPUBLIC SwMailMergeConfigItem
bool m_bGreetingInserted;
sal_Int32 m_nGreetingMoves;
OUString m_rAddressBlockFrame;
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSelection;
+ std::set<sal_Int32> m_aExcludedRecords;
sal_uInt16 m_nStartPrint;
sal_uInt16 m_nEndPrint;
@@ -112,8 +113,9 @@ public:
sal_Int32 GetResultSetPosition()const;
bool IsResultSetFirstLast(bool& bIsFirst, bool& bIsLast);
- bool IsRecordExcluded(sal_Int32 nRecord);
+ bool IsRecordExcluded(sal_Int32 nRecord) const;
void ExcludeRecord(sal_Int32 nRecord, bool bExclude);
+ css::uno::Sequence< css::uno::Any> GetSelection() const;
const com::sun::star::uno::Sequence< OUString>&
GetSavedDocuments() const;
commit 35430d7dfbde684f32cbf9946c4ed6dfa0dc7589
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 5 20:24:50 2015 +0100
this SAL_INFO uses brush which might be NULL
Change-Id: Id69b55b266fe62934b53fc765030cfd044d0c74a
(cherry picked from commit 4a121d402f2a66d30cd01ed1b890284d8d4f465a)
Reviewed-on: https://gerrit.libreoffice.org/16777
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 701cfa3..b8480b8 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1288,7 +1288,7 @@ namespace cppcanvas
rState.isFillColorSet = true;
// extract UseBrush
EMFPBrush* brush = static_cast<EMFPBrush*>( aObjects [brushIndexOrColor & 0xff] );
- SAL_INFO("cppcanvas.emf", "EMF+\tbrush fill slot: " << brushIndexOrColor << " (type: " << brush->GetType () << ")");
+ SAL_INFO("cppcanvas.emf", "EMF+\tbrush fill slot: " << brushIndexOrColor << " (type: " << (brush ? brush->GetType() : -1) << ")");
// give up in case something wrong happened
if( !brush )
commit c904a29262920364dc6749dbded246f70153cf1b
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Fri Jul 3 16:37:06 2015 +0100
tdf#92392 - Dispose ScFormulaReferenceHelper properly.
Release the accelerator, and cleanup global references.
Change-Id: Id9931527f1b6d89067bc1e520e521ccfa6e28197
Reviewed-on: https://gerrit.libreoffice.org/16740
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
Tested-by: Michael Meeks <michael.meeks at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/16751
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 5f717ff..395dcaf 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -74,6 +74,7 @@ class ScFormulaReferenceHelper
public:
ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings);
~ScFormulaReferenceHelper();
+ void dispose();
void ShowSimpleReference(const OUString& rStr);
void ShowFormulaReference(const OUString& rStr);
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index aab5194..6208048 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -65,17 +65,24 @@ ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindi
ScFormulaReferenceHelper::~ScFormulaReferenceHelper()
{
+ dispose();
+}
+
+void ScFormulaReferenceHelper::dispose()
+{
if (bAccInserted)
Application::RemoveAccel( pAccel.get() );
+ bAccInserted = false;
// common cleanup for ScAnyRefDlg and ScFormulaDlg is done here
-
HideReference();
enableInput( true );
ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
if ( pInputHdl )
pInputHdl->ResetDelayTimer(); // stop the timer for disabling the input line
+
+ pAccel.reset();
}
void ScFormulaReferenceHelper::enableInput( bool bEnable )
@@ -831,6 +838,7 @@ void ScRefHandler::disposeRefHandler()
m_rWindow.clear();
pActiveWin.clear();
LeaveRefMode();
+ m_aHelper.dispose();
}
bool ScRefHandler::LeaveRefMode()
commit d2b970841ac04d18c4940d5f68ca602422606c96
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Sun Jul 5 10:25:14 2015 +0300
This one should override SfxToolBoxControl::Select
We don't have there Select(bool) since
c3a89936abc7967ebe8916ca83cb38f6837f9aa1.
(cherry picked from commit 4604a6a7cd66907fc29e01aacf2146f17fa19d34)
(cherry picked from commit bc3c7f2557a1871fb1e41fc9cac4426a6b208901)
Conflicts:
sc/source/ui/cctrl/tbinsert.cxx
Change-Id: Id496725d82289d1be004bdc36195877c12f336b0
Reviewed-on: https://gerrit.libreoffice.org/16772
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 8b3469a..2df6456 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -98,7 +98,7 @@ SfxPopupWindowType ScTbxInsertCtrl::GetPopupWindowType() const
return nLastSlotId ? SfxPopupWindowType::ONTIMEOUT : SfxPopupWindowType::ONCLICK;
}
-void ScTbxInsertCtrl::Select( bool /* bMod1 */ )
+void ScTbxInsertCtrl::Select( sal_uInt16 /*nSelectModifier*/ )
{
SfxViewShell* pCurSh( SfxViewShell::Current() );
SfxDispatcher* pDispatch( 0 );
diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx
index dda7018..cfaf4ae 100644
--- a/sc/source/ui/inc/tbinsert.hxx
+++ b/sc/source/ui/inc/tbinsert.hxx
@@ -25,9 +25,7 @@
class ScTbxInsertCtrl : public SfxToolBoxControl
{
sal_uInt16 nLastSlotId;
-
- using SfxToolBoxControl::Select;
- void Select( bool bMod1 = false );
+ virtual void Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE;
public:
SFX_DECL_TOOLBOX_CONTROL();
commit cff9a8c9cd1b226859bac4654d14df20265a2ff8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 6 09:20:53 2015 +0100
a malformed string here can force an out of bounds indexOf
Change-Id: Ic4d922bd27b7f119a7f8b95bbb4d4ed9e89fe51d
(cherry picked from commit 592ee0308a36518137ab8ed965f28de4600909da)
Reviewed-on: https://gerrit.libreoffice.org/16787
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index ba94239..b539782 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -889,7 +889,7 @@ sal_Int32 ImpSvNumberformatScan::Symbol_Division(const OUString& rString)
// Do we have some sort of currency?
OUString sString = pFormatter->GetCharClass()->uppercase(rString);
sal_Int32 nCPos = 0;
- while (nCPos >= 0)
+ while (nCPos >= 0 && nCPos < sString.getLength())
{
nCPos = sString.indexOf(GetCurString(),nCPos);
if (nCPos >= 0)
commit 90bfc0aba0f7520ec00966a5c5f7cca0305a260c
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Fri Jul 3 15:50:38 2015 +0100
tdf#92392 - tolerate Window::SetText post dispose.
Change-Id: I458f8e8665373d3e5ab9ed20e39783f4d34ca128
Reviewed-on: https://gerrit.libreoffice.org/16752
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 372ea7d..8afd412 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3184,7 +3184,7 @@ void Window::SetCursor( vcl::Cursor* pCursor )
void Window::SetText( const OUString& rStr )
{
- if (rStr == mpWindowImpl->maText)
+ if (!mpWindowImpl || rStr == mpWindowImpl->maText)
return;
OUString oldTitle( mpWindowImpl->maText );
commit c10cb611e682a01b233a7bbe57d67592540ebf36
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Jul 3 17:52:44 2015 +0200
SwViewShell::ImplEndAction: avoid direct PaintDesktop()
With double-buffering enabled and typing quickly, one saw blinks in the
text sometimes. The reason was that PaintDesktop() painted directly
outside SwViewShell::Paint().
The problem is more visible with VCL_DOUBLEBUFFERING_AVOID_PAINT=1,
loading a simple document + pressing a key draw an unexpected white
rectangle.
Given that InvalidateWindows() already calls PaintDesktop() inside
Paint() implicitly (via SwViewShell::Paint()), fix the problem by just
avoiding the DLPrePaint2() + PaintDesktop() + DLPostPaint2() calls.
Change-Id: Ib8ce26a0bdd526bf85d362f0e865dd61d29f6d11
(cherry picked from commit c9175a1bd3249ad573ae6827bf19963a3ebe2fbc)
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 3642d1e..9b96a58 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -405,20 +405,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
}
if ( bPaint )
{
- // #i75172# begin DrawingLayer paint
- // need to do begin/end DrawingLayer preparation for each single rectangle of the
- // repaint region. I already tried to prepare only once for the whole Region. This
- // seems to work (and does technically) but fails with transparent objects. Since the
- // region given to BeginDarwLayers() defines the clip region for DrawingLayer paint,
- // transparent objects in the single rectangles will indeed be painted multiple times.
- DLPrePaint2(vcl::Region(aRect.SVRect()));
-
- if ( bPaintsFromSystem )
- PaintDesktop(*GetOut(), aRect);
- pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect.SVRect());
-
- // #i75172# end DrawingLayer paint
- DLPostPaint2(true);
+ InvalidateWindows(aRect.SVRect());
}
lcl_PaintTransparentFormControls(*this, aRect); // i#107365
commit 727fe30899a92cee615fdd293c4b00d8502dac79
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Jul 3 11:52:17 2015 +0200
SwViewShell::DLPrePaint2: fix missing clipping for the non-buffered case
With this, if the sw window is small enough that the page shadow is
supposed to be under the sidebar, we no longer paint the shadow over the
sidebar.
In the non-double-buffered case the output is a window, so
SdrPaintWindow::PreparePreRenderDevice() does its own buffering, and
clipping is taken care of when that buffer is copied to the window in
SdrPreRenderDevice::OutputPreRenderDevice().
This wasn't a problem before, as either the output was a non-screen
device or UI elements were painted (like the sidebar), but never both at
the same time.
Change-Id: Ic02c814fc4deeea86c245c74bd69656533d9f835
(cherry picked from commit 978033d5ed9f93f2d5d9a1ba44acf6b37bc13bfe)
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 6e0a150..3642d1e 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -203,6 +203,9 @@ void SwViewShell::DLPrePaint2(const vcl::Region& rRegion)
mpBufferedOut = mpOut;
mpOut = &(mpTargetPaintWindow->GetTargetOutputDevice());
}
+ else
+ // In case mpOut is used without buffering, need to set clipping.
+ mpOut->SetClipRegion(rRegion);
// remember original paint MapMode for wrapped FlyFrame paints
maPrePostMapMode = mpOut->GetMapMode();
commit e8ae431b402206feb77dcd615cb1edf2414f8e05
Author: László Németh <laszlo.nemeth at collabora.com>
Date: Fri Jul 3 18:50:05 2015 +0200
tdf#92241 fix crashes and rendering of symbol set previews
Change-Id: I43397f2b0caa31c334f87acf11fc96df2e051ad8
Reviewed-on: https://gerrit.libreoffice.org/16744
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index d50382e..e56fe98 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -58,6 +58,7 @@ public:
Link<> GetPreSelectHdl() const { return aHighHdl; }
void SetPreSelectHdl( const Link<>& rHdl ) { aPreSelectHdl = rHdl; }
static sal_uInt32& getSelectedChar();
+ void SetFont( const vcl::Font& rFont );
svx::SvxShowCharSetItem* ImplGetItem( int _nPos );
int FirstInView() const;
@@ -108,12 +109,14 @@ private:
sal_Int32 nSelectedIndex;
FontCharMapPtr mpFontCharMap;
+ Size maFontSize;
VclPtr<ScrollBar> aVscrollSB;
bool mbRecalculateFont : 1;
bool mbUpdateForeground : 1;
bool mbUpdateBackground : 1;
+
private:
void DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1, int n2);
void InitSettings(vcl::RenderContext& rRenderContext);
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 6741a22..69a3569 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -41,6 +41,8 @@ protected:
private:
bool mbHasControlFocus;
+ bool mbFont;
+ bool mbForeground;
Link<> maGetFocusHdl;
Link<> maLoseFocusHdl;
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 9d0c9a5..f5e9595 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -57,6 +57,7 @@ sal_uInt32& SvxShowCharSet::getSelectedChar()
SvxShowCharSet::SvxShowCharSet(vcl::Window* pParent)
: Control(pParent, WB_TABSTOP | WB_BORDER)
, m_pAccessible(nullptr)
+ , maFontSize(0, 0)
, aVscrollSB( VclPtr<ScrollBar>::Create(this, WB_VERT) )
, mbRecalculateFont(true)
, mbUpdateForeground(true)
@@ -114,6 +115,7 @@ void SvxShowCharSet::StateChanged(StateChangedType nType)
Invalidate();
Control::StateChanged( nType );
+
}
@@ -331,6 +333,12 @@ void SvxShowCharSet::Paint( vcl::RenderContext& rRenderContext, const Rectangle&
DrawChars_Impl(rRenderContext, FirstInView(), LastInView());
}
+void SvxShowCharSet::SetFont( const vcl::Font& rFont )
+{
+ Control::SetFont(rFont);
+ Invalidate();
+}
+
void SvxShowCharSet::DeSelect()
{
Invalidate();
@@ -506,6 +514,14 @@ void SvxShowCharSet::InitSettings(vcl::RenderContext& rRenderContext)
mbUpdateBackground = false;
}
+
+ vcl::Font aFont(rRenderContext.GetFont());
+ aFont.SetWeight(WEIGHT_LIGHT);
+ aFont.SetAlign(ALIGN_TOP);
+ aFont.SetSize(maFontSize);
+ aFont.SetTransparent(true);
+ rRenderContext.SetFont(aFont);
+
}
@@ -536,7 +552,8 @@ void SvxShowCharSet::RecalculateFont(vcl::RenderContext& rRenderContext)
aFont.SetWeight(WEIGHT_LIGHT);
aFont.SetAlign(ALIGN_TOP);
int nFontHeight = (aSize.Height() - 5) * 2 / (3 * ROW_COUNT);
- aFont.SetSize(rRenderContext.PixelToLogic(Size(0, nFontHeight)));
+ maFontSize = rRenderContext.PixelToLogic(Size(0, nFontHeight));
+ aFont.SetSize(maFontSize);
aFont.SetTransparent(true);
rRenderContext.SetFont(aFont);
rRenderContext.GetFontCharMap(mpFontCharMap);
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 0c40a34..21056db 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -36,6 +36,8 @@ using namespace vcl;
void Control::ImplInitControlData()
{
mbHasControlFocus = false;
+ mbFont = false;
+ mbForeground = false;
mpControlData = new ImplControlData;
}
@@ -417,16 +419,23 @@ void Control::ApplySettings(vcl::RenderContext& rRenderContext)
{
const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
- vcl::Font rFont(GetCanonicalFont(rStyleSettings));
- ApplyControlFont(rRenderContext, rFont);
-
- ApplyControlForeground(rRenderContext, GetCanonicalTextColor(rStyleSettings));
+ if (mbFont)
+ {
+ vcl::Font rFont(GetCanonicalFont(rStyleSettings));
+ ApplyControlFont(rRenderContext, rFont);
+ }
- rRenderContext.SetTextFillColor();
+ if (mbFont || mbForeground)
+ {
+ ApplyControlForeground(rRenderContext, GetCanonicalTextColor(rStyleSettings));
+ rRenderContext.SetTextFillColor();
+ }
}
-void Control::ImplInitSettings(const bool, const bool)
+void Control::ImplInitSettings(const bool _bFont, const bool _bForeground)
{
+ mbFont = _bFont;
+ mbForeground = _bForeground;
ApplySettings(*this);
}
commit e72e312f12ae68abc0921584455c43ad5b70596a
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Sat Jul 4 17:46:23 2015 +0200
Removed spurious U+200C
Change-Id: Ib01e794b70d611f68ab4a7c048860b28b2dca99f
Reviewed-on: https://gerrit.libreoffice.org/16676
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
(cherry picked from commit 2eea698f5b41b2dbf371e3a6c9d3b242c347206d)
diff --git a/sw/uiconfig/swriter/ui/opttablepage.ui b/sw/uiconfig/swriter/ui/opttablepage.ui
index 0bbc28f..041fcf4 100644
--- a/sw/uiconfig/swriter/ui/opttablepage.ui
+++ b/sw/uiconfig/swriter/ui/opttablepage.ui
@@ -533,7 +533,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Insert cell</property>
+ <property name="label" translatable="yes">Insert cell</property>
</object>
<packing>
<property name="left_attach">0</property>
commit c5138ae589c3dad8189f595d15eaa26ca24ad7ff
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jul 3 13:35:45 2015 -0500
tdf#88941 Revert "vcl quartz: Add support back for DXArray tweaking"
This reverts commit 4a0cb642f18b674f37db8e9bd30942740df08e4c.
MacOSx only (more exactly CoreText only)
The handling of DXArray was buggy and need to be re-worked
so this revert to the previous case where DXArray are esssentially
ignored at the char level and only kept at the fragment size level
and used to redistribute space in a fragment
This create some issue too but on more esoteric case than
the one noticed in tdf#88941
Change-Id: Icb33d0600267c3136f3a6b15de8ecd739898ce04
Reviewed-on: https://gerrit.libreoffice.org/16753
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/quartz/CTRunData.cxx b/vcl/quartz/CTRunData.cxx
index 930f6d17..7ef3891 100644
--- a/vcl/quartz/CTRunData.cxx
+++ b/vcl/quartz/CTRunData.cxx
@@ -17,7 +17,6 @@ CTRunData::CTRunData( CTRunRef pRun, int start)
: ownership_flags(0)
, m_StartPos(start)
, m_pRun(pRun)
- , m_pAdjPositions(NULL)
{
assert(pRun);
@@ -87,7 +86,6 @@ CTRunData::~CTRunData()
{
delete [] m_pPositions;
}
- delete [] m_pAdjPositions;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/quartz/CTRunData.hxx b/vcl/quartz/CTRunData.hxx
index 9151467..3201acf 100644
--- a/vcl/quartz/CTRunData.hxx
+++ b/vcl/quartz/CTRunData.hxx
@@ -32,7 +32,7 @@ public:
const CGPoint* m_pPositions;
const CGSize* m_pAdvances;
const CFIndex* m_pStringIndices;
- CGPoint* m_pAdjPositions;
+
CTRunData(CTRunRef pRun, int start);
~CTRunData();
};
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 82d9c64..20dca01 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -57,7 +57,6 @@ private:
void drawCTLine(AquaSalGraphics& rAquaGraphics, CTLineRef ctline, const CoreTextStyle* const pStyle) const;
CGPoint GetTextDrawPosition() const;
bool CacheGlyphLayout() const;
- void ApplyDXArray( ImplLayoutArgs& rArgs);
const CoreTextStyle* const mpTextStyle;
@@ -103,9 +102,7 @@ CTLayout::~CTLayout()
CFRelease( mpCTLine );
}
if( mpAttrString )
- {
CFRelease( mpAttrString );
- }
}
bool CTLayout::LayoutText( ImplLayoutArgs& rArgs )
@@ -116,7 +113,6 @@ bool CTLayout::LayoutText( ImplLayoutArgs& rArgs )
// release an eventual older layout
if( mpAttrString )
CFRelease( mpAttrString );
-
mpAttrString = NULL;
if( mpCTLine )
{
@@ -164,151 +160,91 @@ bool CTLayout::LayoutText( ImplLayoutArgs& rArgs )
return true;
}
-void CTLayout::ApplyDXArray(ImplLayoutArgs& rArgs)
+void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
{
- CacheGlyphLayout();
-
- for (boost::ptr_vector<CTRunData>::iterator iter = m_vRunData.begin();
- iter != m_vRunData.end();
- ++iter)
+ if( !mpCTLine)
{
- CTRunStatus status = CTRunGetStatus(iter->m_pRun);
- delete[] iter->m_pAdjPositions;
- iter->m_pAdjPositions = new CGPoint[iter->m_nGlyphs];
+ return;
+ }
- SAL_INFO( "vcl.ct", "Apply DXArray Run status:"<< status);
- if(!(status & kCTRunStatusNonMonotonic))
- {
- /* simple 1 to 1 */
- SAL_INFO( "vcl.ct", "nb glyph in vrun:" << iter->m_nGlyphs);
- for(int i = 0 ; i < iter->m_nGlyphs; i++)
- {
- SAL_INFO( "vcl.ct", "StringIndices[ "<< i << " ] = " << iter->m_pStringIndices[i]);
- int j = iter->m_pStringIndices[i];
- if(j == 0)
- {
- iter->m_pAdjPositions[i].x = 0;
- SAL_INFO( "vcl.ct", "m_pAdjPostion[" << i << "] = 0.0");
- }
- else
- {
- iter->m_pAdjPositions[i].x = rArgs.mpDXArray[j - 1];
- SAL_INFO( "vcl.ct", "m_pAdjPostion[" << i << "] = rArgs.mpDXArray[ " << j - 1 << " ]= " << rArgs.mpDXArray[j -1]);
- }
- iter->m_pAdjPositions[i].y = iter->m_pPositions[i].y;
- }
- }
- else
- {
- SAL_INFO( "vcl.ct", "drop DXArray info");
- delete[] iter->m_pAdjPositions;
- iter->m_pAdjPositions = NULL;
- }
- }
-}
+ int nPixelWidth = rArgs.mpDXArray ? rArgs.mpDXArray[ mnCharCount - 1 ] : rArgs.mnLayoutWidth;
+ if( nPixelWidth <= 0)
+ return;
-void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
-{
- if( !mpCTLine)
+ // HACK: justification requests which change the width by just one pixel are probably
+ // #i86038# introduced by lossy conversions between integer based coordinate system
+ int fuzz = (nPixelWidth - GetTextWidth()) / 2;
+ if (!fuzz)
{
return;
}
- if(rArgs.mpDXArray && !(rArgs.mnFlags & SalLayoutFlags::BiDiRtl) )
+ // if the text to be justified has whitespace in it then
+ // - Writer goes crazy with its HalfSpace magic
+ // - CoreText handles spaces specially (in particular at the text end)
+ if( mnTrailingSpaceCount )
{
- DeviceCoordinate nPixelWidth = rArgs.mpDXArray[ mnCharCount - 1 ];
-
- // justification requests which change the width by just one pixel are probably
- // introduced by lossy conversions between integer based coordinate system
- DeviceCoordinate nOrigWidth = lrint( GetTextWidth() );
- if( (nPixelWidth <= 0) || ((nOrigWidth >= rint( nPixelWidth - 1 )) && (nOrigWidth <= rint( nPixelWidth + 1 ))) )
+ if(rArgs.mpDXArray)
{
- return;
- }
- ApplyDXArray( rArgs );
- if( mnTrailingSpaceCount )
- {
- DeviceCoordinate nFullPixelWidth = nPixelWidth;
- nPixelWidth = (mnTrailingSpaceCount == mnCharCount) ? 0 :
- rArgs.mpDXArray[ mnCharCount - mnTrailingSpaceCount - 1];
+ int nFullPixelWidth = nPixelWidth;
+ nPixelWidth = mnTrailingSpaceCount == mnCharCount
+ ? 0 : rArgs.mpDXArray[ mnCharCount - mnTrailingSpaceCount - 1];
mfTrailingSpaceWidth = nFullPixelWidth - nPixelWidth;
- if( nPixelWidth <= 0)
- {
- return;
- }
}
- mfCachedWidth = nPixelWidth;
- }
- else
- {
- DeviceCoordinate nPixelWidth = rArgs.mnLayoutWidth;
-
- if( nPixelWidth <= 0 && rArgs.mnFlags & SalLayoutFlags::BiDiRtl)
- {
- nPixelWidth = GetTextWidth();
- }
-
- if( nPixelWidth <= 0)
- {
- return;
- }
-
- // if the text to be justified has whitespace in it then
- // - Writer goes crazy with its HalfSpace magic
- // - CoreText handles spaces specially (in particular at the text end)
- if( mnTrailingSpaceCount )
+ else
{
if(mfTrailingSpaceWidth <= 0.0)
{
mfTrailingSpaceWidth = CTLineGetTrailingWhitespaceWidth( mpCTLine );
- nPixelWidth -= mfTrailingSpaceWidth;
- }
- if(nPixelWidth <= 0)
- {
- return;
- }
-
- // recreate the CoreText line layout without trailing spaces
- SAL_INFO( "vcl.ct", "CFRelease(" << mpCTLine << ")" );
- CFRelease( mpCTLine );
- CFStringRef aCFText = CFStringCreateWithCharactersNoCopy( NULL,
- rArgs.mpStr + mnMinCharPos,
- mnCharCount - mnTrailingSpaceCount,
- kCFAllocatorNull );
- CFAttributedStringRef pAttrStr = CFAttributedStringCreate( NULL,
- aCFText,
- mpTextStyle->GetStyleDict() );
- mpCTLine = CTLineCreateWithAttributedString( pAttrStr );
- SAL_INFO( "vcl.ct", "CTLineCreateWithAttributedString(\"" << GetOUString(aCFText) << "\") = " << mpCTLine );
- CFRelease( pAttrStr );
- CFRelease( aCFText );
-
- // in RTL-layouts trailing spaces are leftmost
- // TODO: use BiDi-algorithm to thoroughly check this assumption
- if( rArgs.mnFlags & SalLayoutFlags::BiDiRtl)
- {
- mfBaseAdv = mfTrailingSpaceWidth;
+ nPixelWidth -= rint(mfTrailingSpaceWidth);
}
}
- CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, nPixelWidth);
- SAL_INFO( "vcl.ct", "CTLineCreateJustifiedLine(" << mpCTLine << ",1.0," << nPixelWidth << ") = " << pNewCTLine );
-
- if( !pNewCTLine )
+ if(nPixelWidth <= 0)
{
- // CTLineCreateJustifiedLine can and does fail
- // handle failure by keeping the unjustified layout
- // TODO: a better solution such as
- // - forcing glyph overlap
- // - changing the font size
- // - changing the CTM matrix
return;
}
+ // recreate the CoreText line layout without trailing spaces
SAL_INFO( "vcl.ct", "CFRelease(" << mpCTLine << ")" );
CFRelease( mpCTLine );
- mpCTLine = pNewCTLine;
- mfCachedWidth = nPixelWidth + mfTrailingSpaceWidth;
+ CFStringRef aCFText = CFStringCreateWithCharactersNoCopy( NULL,
+ rArgs.mpStr + mnMinCharPos,
+ mnCharCount - mnTrailingSpaceCount,
+ kCFAllocatorNull );
+ CFAttributedStringRef pAttrStr = CFAttributedStringCreate( NULL,
+ aCFText,
+ mpTextStyle->GetStyleDict() );
+ mpCTLine = CTLineCreateWithAttributedString( pAttrStr );
+ SAL_INFO( "vcl.ct", "CTLineCreateWithAttributedString(\"" << GetOUString(aCFText) << "\") = " << mpCTLine );
+ CFRelease( pAttrStr );
+ CFRelease( aCFText );
+
+
+ // in RTL-layouts trailing spaces are leftmost
+ // TODO: use BiDi-algorithm to thoroughly check this assumption
+ if( rArgs.mnFlags & SalLayoutFlags::BiDiRtl)
+ {
+ mfBaseAdv = mfTrailingSpaceWidth;
+ }
+ }
+
+ CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, nPixelWidth);
+ SAL_INFO( "vcl.ct", "CTLineCreateJustifiedLine(" << mpCTLine << ",1.0," << nPixelWidth << ") = " << pNewCTLine );
+
+ if( !pNewCTLine )
+ {
+ // CTLineCreateJustifiedLine can and does fail
+ // handle failure by keeping the unjustified layout
+ // TODO: a better solution such as
+ // - forcing glyph overlap
+ // - changing the font size
+ // - changing the CTM matrix
+ return;
}
+ SAL_INFO( "vcl.ct", "CFRelease(" << mpCTLine << ")" );
+ CFRelease( mpCTLine );
+ mpCTLine = pNewCTLine;
+ mfCachedWidth = nPixelWidth + mfTrailingSpaceWidth;
}
// When drawing right aligned text, rounding errors in the position returned by
@@ -428,92 +364,6 @@ void CTLayout::drawCTLine(AquaSalGraphics& rAquaGraphics, CTLineRef ctline, cons
// set the text color as fill color (see kCTForegroundColorFromContextAttributeName)
CGContextSetFillColor( context, rAquaGraphics.maTextColor.AsArray() );
- /* if we have a m_vRunData that indicate that an ApplyDXArray occurred
- * iow that we want to use DXArray to align glyphs
- * Otherwise we just use CoreText to display the whole line
- */
-
- if(!(mnLayoutFlags & SalLayoutFlags::Vertical))
- {
- boost::ptr_vector<CTRunData>::const_iterator iter = m_vRunData.begin();
- if(iter != m_vRunData.end())
- {
- for(; iter != m_vRunData.end(); ++iter)
- {
- CTRunRef run = iter->m_pRun;
- /* if we do not have Adjusted Positions for a run, just use CoreText to draw it */
- if(iter->m_pAdjPositions)
- {
- CTFontRef runFont = iter->m_pFont;
- CGFloat baseSize = CTFontGetSize(runFont);
- for (CFIndex runGlyphIndex = 0;
- runGlyphIndex < CTRunGetGlyphCount(run);
- runGlyphIndex++)
- {
- CGFontRef cgFont = CTFontCopyGraphicsFont(runFont, NULL);
- CGContextSaveGState(context);
-
- CGContextSetFont(context, cgFont);
- CGContextSetFontSize(context, CTFontGetSize(runFont));
- CGContextSetFillColor( context, rAquaGraphics.maTextColor.AsArray() );
- if(mnLayoutFlags & SalLayoutFlags::Vertical)
- {
- CGContextRotateCTM( context, -F_PI/2 );
- }
- CGContextSetTextPosition( context, aTextPos.x, aTextPos.y );
- SAL_INFO( "vcl.ct", "CGContextSetTextPosition(" << aTextPos.x << ", " << aTextPos.y << ")");
- SAL_INFO( "vcl.ct", "CGContextShowGlyphAt(" << iter->m_pAdjPositions[runGlyphIndex].x << ", " << iter->m_pAdjPositions[runGlyphIndex].y << ")");
-
- CGContextShowGlyphsAtPositions(context, iter->m_pGlyphs + runGlyphIndex,
- iter->m_pAdjPositions + runGlyphIndex, 1);
- CGContextRestoreGState(context);
- CFRelease(cgFont);
- }
- /* Do we want to show 'space' as 'bullet' */
- if(mnLayoutFlags & SalLayoutFlags::DrawBullet)
- {
- for(int i = 0 ; i < iter->m_nGlyphs; i++)
- {
- UniChar curChar = CFStringGetCharacterAtIndex (CFAttributedStringGetString(mpAttrString),
- iter->m_pStringIndices[i]);
- /* is the character associated with the current glyph a space ? */
- if(curChar == ' ')
- {
- /* make a rect that will enclose the bullet we want to draw */
- CFRange glyphRange = CFRangeMake(i, 1);
- CGFloat ascent;
- CGFloat descent;
- CGFloat leading;
- CTRunGetTypographicBounds ( run, glyphRange,
- &ascent, &descent, &leading);
- CGRect bulletRect;
- bulletRect = CGRectMake(aTextPos.x + iter->m_pAdjPositions[i].x + iter->m_pAdvances[i].width / 4,
- aTextPos.y + iter->m_pAdjPositions[i].y + ascent / 3 - baseSize / 5, baseSize / 5, baseSize / 5 );
-
- /* Draw a bullet filled with the 'special' color for non-displayable characters */
- CGContextSaveGState(context);
- RGBAColor bulletColor(MAKE_SALCOLOR(0x26, 0x8b, 0xd2 )); // NON_PRINTING_CHARACTER_COLOR
- CGContextSetFillColor( context, bulletColor.AsArray() );
- CGContextSetStrokeColor(context, bulletColor.AsArray());
- CGContextBeginPath(context);
- CGContextAddEllipseInRect(context, bulletRect);
- CGContextDrawPath(context, kCGPathFillStroke); // Or kCGPathFill
- CGContextRestoreGState(context);
- }
- }
- }
- }
- else
- {
- CTRunDraw(run, context, CFRangeMake( 0, 0 ));
- /* Fixme draw bullet */
- }
- }
- CGContextRestoreGState( context );
- return;
- }
- }
-
SAL_INFO( "vcl.ct", "CTLineDraw(" << ctline << "," << context << ")" );
// draw the text
CTLineDraw( ctline, context );
commit 58cd10552df3aab8425fb80dfc74f32bb82d4c9d
Author: László Németh <laszlo.nemeth at collabora.com>
Date: Sat Jul 4 15:06:01 2015 +0200
tdf#52540 Revert "fdo#52540 refix graphite layout generally"
This reverts commit 12168aeea91a57e63159c3103c904d630c44c62e,
because that caused a regression in hyphenation, see tdf#52540.
Change-Id: I75613b17de241a5c4fa6da5df7fdaf05db1692b6
Reviewed-on: https://gerrit.libreoffice.org/16755
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 474756f..a4aa99c 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -561,36 +561,33 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs)
int limit = rArgs.mnEndCharPos;
if (!(SalLayoutFlags::ComplexDisabled & rArgs.mnFlags))
{
- int nSegCharMin = maximum<int>(0, mnMinCharPos - EXTRA_CONTEXT_LENGTH);
- int nSegCharLimit = minimum(rArgs.mnLength, mnEndCharPos + EXTRA_CONTEXT_LENGTH);
- while (nSegCharMin < mnSegCharOffset)
+ const int nSegCharMin = maximum<int>(0, mnMinCharPos - EXTRA_CONTEXT_LENGTH);
+ const int nSegCharLimit = minimum(rArgs.mnLength, mnEndCharPos + EXTRA_CONTEXT_LENGTH);
+ if (nSegCharMin < mnSegCharOffset)
{
- int sameDirEnd = nSegCharMin + findSameDirLimit(rArgs.mpStr + nSegCharMin,
+ int sameDirEnd = findSameDirLimit(rArgs.mpStr + nSegCharMin,
rArgs.mnEndCharPos - nSegCharMin, bRtl);
- if (sameDirEnd >= rArgs.mnMinCharPos)
- {
+ if (sameDirEnd == rArgs.mnEndCharPos)
mnSegCharOffset = nSegCharMin;
- break;
- }
- else
- nSegCharMin = sameDirEnd;
}
if (nSegCharLimit > limit)
{
limit += findSameDirLimit(rArgs.mpStr + rArgs.mnEndCharPos,
nSegCharLimit - rArgs.mnEndCharPos, bRtl);
- if (limit > rArgs.mnLength)
- limit = rArgs.mnLength;
}
}
- else
- {
- limit = minimum(rArgs.mnLength, mnEndCharPos + EXTRA_CONTEXT_LENGTH);
- mnSegCharOffset = maximum<int>(0, mnMinCharPos - EXTRA_CONTEXT_LENGTH);
- }
size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + mnSegCharOffset,
- rArgs.mpStr + limit, NULL);
+ rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : rArgs.mnLength), NULL);
+ static com::sun::star::uno::Reference< com::sun::star::i18n::XCharacterClassification > xCharClass;
+ if ( !xCharClass.is() )
+ xCharClass = vcl::unohelper::CreateCharacterClassification();
+ size_t numchars2 = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, fdo#68313, fdo#70666 avoid bad ligature replacement, fdo#88051 layout problem
+ if (numchars > numchars2 && (rArgs.mpStr[mnSegCharOffset + numchars2] == '\t' ||
+ xCharClass->getType(rArgs.mpStr + mnSegCharOffset, numchars2 + 1) == ::com::sun::star::i18n::UnicodeType::LOWERCASE_LETTER))
+ {
+ numchars = numchars2;
+ }
if (mpFeatures)
pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), gr_utf16,
rArgs.mpStr + mnSegCharOffset, numchars, bRtl);
commit 1570fd9249b7089ea0d36fde33130140eb4d9e21
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 1 17:15:39 2015 +0200
nss: upgrade to release 3.19.2
- drop nss-linux-x86-patch.0:
this was actually patching OS/2-specific code so is evidently obsolete
- drop nspr-build-config.patch:
there does not appear to be any justification why this huge patch exists
at all, so the only reasonable thing to do is to drop it
- nss_macosx.patch:
drop several hunks relevant only to unuspported MacOSX/PPC platform
Change-Id: Id55fcb8eaa637c10a42203f1897480df8a6ec0fa
(cherry picked from commit 6e7991dfd8c54a833f4a9795a0d57f4690e92e6b)
Reviewed-on: https://gerrit.libreoffice.org/16727
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/download.lst b/download.lst
index 05d9007..ce32fa2 100644
--- a/download.lst
+++ b/download.lst
@@ -110,7 +110,7 @@ export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
-export NSS_TARBALL := b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz
+export NSS_TARBALL := 2100bc5a7ea9685928ff68cda2e60569-nss-3.19.2-with-nspr-4.10.8.tar.gz
export ODFGEN_MD5SUM := 8716be5c22ae8353f9aaa380d74840dc
export ODFGEN_VERSION_MICRO := 4
export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk
index fa798d1..1b9f45d 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -16,13 +16,11 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.aix.patch \
external/nss/nss-3.13.5-zlib-werror.patch \
external/nss/nss_macosx.patch \
- external/nss/nss-linux-x86.patch.0 \
external/nss/nss-win32-make.patch.1 \
$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
external/nss/nss-3.13.3-build.patch.3 \
external/nss/nss.mingw.patch.3) \
- external/nss/nspr-build-config.patch \
external/nss/ubsan.patch.0 \
$(if $(filter IOS,$(OS)), \
external/nss/nss-chromium-nss-static.patch \
diff --git a/external/nss/nspr-build-config.patch b/external/nss/nspr-build-config.patch
deleted file mode 100644
index 5fce0ec..0000000
--- a/external/nss/nspr-build-config.patch
+++ /dev/null
@@ -1,2543 +0,0 @@
---- a/a/nspr/build/autoconf/GPLv3.txt 1970-01-01 01:00:00.000000000 +0100
-+++ b/b/nspr/build/autoconf/GPLv3.txt 2014-07-10 00:56:24.000000000 +0200
-@@ -0,0 +1,674 @@
-+ GNU GENERAL PUBLIC LICENSE
-+ Version 3, 29 June 2007
-+
-+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+ Preamble
-+
-+ The GNU General Public License is a free, copyleft license for
-+software and other kinds of works.
-+
-+ The licenses for most software and other practical works are designed
-+to take away your freedom to share and change the works. By contrast,
-+the GNU General Public License is intended to guarantee your freedom to
-+share and change all versions of a program--to make sure it remains free
-+software for all its users. We, the Free Software Foundation, use the
-+GNU General Public License for most of our software; it applies also to
-+any other work released this way by its authors. You can apply it to
-+your programs, too.
-+
-+ When we speak of free software, we are referring to freedom, not
-+price. Our General Public Licenses are designed to make sure that you
-+have the freedom to distribute copies of free software (and charge for
-+them if you wish), that you receive source code or can get it if you
-+want it, that you can change the software or use pieces of it in new
-+free programs, and that you know you can do these things.
-+
-+ To protect your rights, we need to prevent others from denying you
-+these rights or asking you to surrender the rights. Therefore, you have
-+certain responsibilities if you distribute copies of the software, or if
-+you modify it: responsibilities to respect the freedom of others.
-+
-+ For example, if you distribute copies of such a program, whether
-+gratis or for a fee, you must pass on to the recipients the same
-+freedoms that you received. You must make sure that they, too, receive
-+or can get the source code. And you must show them these terms so they
-+know their rights.
-+
-+ Developers that use the GNU GPL protect your rights with two steps:
-+(1) assert copyright on the software, and (2) offer you this License
-+giving you legal permission to copy, distribute and/or modify it.
-+
-+ For the developers' and authors' protection, the GPL clearly explains
-+that there is no warranty for this free software. For both users' and
-+authors' sake, the GPL requires that modified versions be marked as
-+changed, so that their problems will not be attributed erroneously to
-+authors of previous versions.
-+
-+ Some devices are designed to deny users access to install or run
-+modified versions of the software inside them, although the manufacturer
-+can do so. This is fundamentally incompatible with the aim of
-+protecting users' freedom to change the software. The systematic
-+pattern of such abuse occurs in the area of products for individuals to
-+use, which is precisely where it is most unacceptable. Therefore, we
-+have designed this version of the GPL to prohibit the practice for those
-+products. If such problems arise substantially in other domains, we
-+stand ready to extend this provision to those domains in future versions
-+of the GPL, as needed to protect the freedom of users.
-+
-+ Finally, every program is threatened constantly by software patents.
-+States should not allow patents to restrict development and use of
-+software on general-purpose computers, but in those that do, we wish to
-+avoid the special danger that patents applied to a free program could
-+make it effectively proprietary. To prevent this, the GPL assures that
-+patents cannot be used to render the program non-free.
-+
-+ The precise terms and conditions for copying, distribution and
-+modification follow.
-+
-+ TERMS AND CONDITIONS
-+
-+ 0. Definitions.
-+
-+ "This License" refers to version 3 of the GNU General Public License.
-+
-+ "Copyright" also means copyright-like laws that apply to other kinds of
-+works, such as semiconductor masks.
-+
-+ "The Program" refers to any copyrightable work licensed under this
-+License. Each licensee is addressed as "you". "Licensees" and
-+"recipients" may be individuals or organizations.
-+
-+ To "modify" a work means to copy from or adapt all or part of the work
-+in a fashion requiring copyright permission, other than the making of an
-+exact copy. The resulting work is called a "modified version" of the
-+earlier work or a work "based on" the earlier work.
-+
-+ A "covered work" means either the unmodified Program or a work based
-+on the Program.
-+
-+ To "propagate" a work means to do anything with it that, without
-+permission, would make you directly or secondarily liable for
-+infringement under applicable copyright law, except executing it on a
-+computer or modifying a private copy. Propagation includes copying,
-+distribution (with or without modification), making available to the
-+public, and in some countries other activities as well.
-+
-+ To "convey" a work means any kind of propagation that enables other
-+parties to make or receive copies. Mere interaction with a user through
-+a computer network, with no transfer of a copy, is not conveying.
-+
-+ An interactive user interface displays "Appropriate Legal Notices"
-+to the extent that it includes a convenient and prominently visible
-+feature that (1) displays an appropriate copyright notice, and (2)
-+tells the user that there is no warranty for the work (except to the
-+extent that warranties are provided), that licensees may convey the
-+work under this License, and how to view a copy of this License. If
-+the interface presents a list of user commands or options, such as a
-+menu, a prominent item in the list meets this criterion.
-+
-+ 1. Source Code.
-+
-+ The "source code" for a work means the preferred form of the work
-+for making modifications to it. "Object code" means any non-source
-+form of a work.
-+
-+ A "Standard Interface" means an interface that either is an official
-+standard defined by a recognized standards body, or, in the case of
-+interfaces specified for a particular programming language, one that
-+is widely used among developers working in that language.
-+
-+ The "System Libraries" of an executable work include anything, other
-+than the work as a whole, that (a) is included in the normal form of
-+packaging a Major Component, but which is not part of that Major
-+Component, and (b) serves only to enable use of the work with that
-+Major Component, or to implement a Standard Interface for which an
-+implementation is available to the public in source code form. A
-+"Major Component", in this context, means a major essential component
-+(kernel, window system, and so on) of the specific operating system
-+(if any) on which the executable work runs, or a compiler used to
-+produce the work, or an object code interpreter used to run it.
-+
-+ The "Corresponding Source" for a work in object code form means all
-+the source code needed to generate, install, and (for an executable
-+work) run the object code and to modify the work, including scripts to
-+control those activities. However, it does not include the work's
-+System Libraries, or general-purpose tools or generally available free
-+programs which are used unmodified in performing those activities but
-+which are not part of the work. For example, Corresponding Source
-+includes interface definition files associated with source files for
-+the work, and the source code for shared libraries and dynamically
-+linked subprograms that the work is specifically designed to require,
-+such as by intimate data communication or control flow between those
-+subprograms and other parts of the work.
-+
-+ The Corresponding Source need not include anything that users
-+can regenerate automatically from other parts of the Corresponding
-+Source.
-+
-+ The Corresponding Source for a work in source code form is that
-+same work.
-+
-+ 2. Basic Permissions.
-+
-+ All rights granted under this License are granted for the term of
-+copyright on the Program, and are irrevocable provided the stated
-+conditions are met. This License explicitly affirms your unlimited
-+permission to run the unmodified Program. The output from running a
-+covered work is covered by this License only if the output, given its
-+content, constitutes a covered work. This License acknowledges your
-+rights of fair use or other equivalent, as provided by copyright law.
-+
-+ You may make, run and propagate covered works that you do not
-+convey, without conditions so long as your license otherwise remains
-+in force. You may convey covered works to others for the sole purpose
-+of having them make modifications exclusively for you, or provide you
-+with facilities for running those works, provided that you comply with
-+the terms of this License in conveying all material for which you do
-+not control copyright. Those thus making or running the covered works
-+for you must do so exclusively on your behalf, under your direction
-+and control, on terms that prohibit them from making any copies of
-+your copyrighted material outside their relationship with you.
-+
-+ Conveying under any other circumstances is permitted solely under
-+the conditions stated below. Sublicensing is not allowed; section 10
-+makes it unnecessary.
-+
-+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-+
-+ No covered work shall be deemed part of an effective technological
-+measure under any applicable law fulfilling obligations under article
-+11 of the WIPO copyright treaty adopted on 20 December 1996, or
-+similar laws prohibiting or restricting circumvention of such
-+measures.
-+
-+ When you convey a covered work, you waive any legal power to forbid
-+circumvention of technological measures to the extent such circumvention
-+is effected by exercising rights under this License with respect to
-+the covered work, and you disclaim any intention to limit operation or
-+modification of the work as a means of enforcing, against the work's
-+users, your or third parties' legal rights to forbid circumvention of
-+technological measures.
-+
-+ 4. Conveying Verbatim Copies.
-+
-+ You may convey verbatim copies of the Program's source code as you
-+receive it, in any medium, provided that you conspicuously and
-+appropriately publish on each copy an appropriate copyright notice;
-+keep intact all notices stating that this License and any
-+non-permissive terms added in accord with section 7 apply to the code;
-+keep intact all notices of the absence of any warranty; and give all
-+recipients a copy of this License along with the Program.
-+
-+ You may charge any price or no price for each copy that you convey,
-+and you may offer support or warranty protection for a fee.
-+
-+ 5. Conveying Modified Source Versions.
-+
-+ You may convey a work based on the Program, or the modifications to
-+produce it from the Program, in the form of source code under the
-+terms of section 4, provided that you also meet all of these conditions:
-+
-+ a) The work must carry prominent notices stating that you modified
-+ it, and giving a relevant date.
-+
-+ b) The work must carry prominent notices stating that it is
-+ released under this License and any conditions added under section
-+ 7. This requirement modifies the requirement in section 4 to
-+ "keep intact all notices".
-+
-+ c) You must license the entire work, as a whole, under this
-+ License to anyone who comes into possession of a copy. This
-+ License will therefore apply, along with any applicable section 7
-+ additional terms, to the whole of the work, and all its parts,
-+ regardless of how they are packaged. This License gives no
-+ permission to license the work in any other way, but it does not
-+ invalidate such permission if you have separately received it.
-+
-+ d) If the work has interactive user interfaces, each must display
-+ Appropriate Legal Notices; however, if the Program has interactive
-+ interfaces that do not display Appropriate Legal Notices, your
-+ work need not make them do so.
-+
-+ A compilation of a covered work with other separate and independent
-+works, which are not by their nature extensions of the covered work,
-+and which are not combined with it such as to form a larger program,
-+in or on a volume of a storage or distribution medium, is called an
-+"aggregate" if the compilation and its resulting copyright are not
-+used to limit the access or legal rights of the compilation's users
-+beyond what the individual works permit. Inclusion of a covered work
-+in an aggregate does not cause this License to apply to the other
-+parts of the aggregate.
-+
-+ 6. Conveying Non-Source Forms.
-+
-+ You may convey a covered work in object code form under the terms
-+of sections 4 and 5, provided that you also convey the
-+machine-readable Corresponding Source under the terms of this License,
-+in one of these ways:
-+
-+ a) Convey the object code in, or embodied in, a physical product
-+ (including a physical distribution medium), accompanied by the
-+ Corresponding Source fixed on a durable physical medium
-+ customarily used for software interchange.
-+
-+ b) Convey the object code in, or embodied in, a physical product
-+ (including a physical distribution medium), accompanied by a
-+ written offer, valid for at least three years and valid for as
-+ long as you offer spare parts or customer support for that product
-+ model, to give anyone who possesses the object code either (1) a
-+ copy of the Corresponding Source for all the software in the
-+ product that is covered by this License, on a durable physical
-+ medium customarily used for software interchange, for a price no
-+ more than your reasonable cost of physically performing this
-+ conveying of source, or (2) access to copy the
-+ Corresponding Source from a network server at no charge.
-+
-+ c) Convey individual copies of the object code with a copy of the
-+ written offer to provide the Corresponding Source. This
-+ alternative is allowed only occasionally and noncommercially, and
-+ only if you received the object code with such an offer, in accord
-+ with subsection 6b.
-+
-+ d) Convey the object code by offering access from a designated
-+ place (gratis or for a charge), and offer equivalent access to the
-+ Corresponding Source in the same way through the same place at no
-+ further charge. You need not require recipients to copy the
-+ Corresponding Source along with the object code. If the place to
-+ copy the object code is a network server, the Corresponding Source
-+ may be on a different server (operated by you or a third party)
-+ that supports equivalent copying facilities, provided you maintain
-+ clear directions next to the object code saying where to find the
-+ Corresponding Source. Regardless of what server hosts the
-+ Corresponding Source, you remain obligated to ensure that it is
-+ available for as long as needed to satisfy these requirements.
-+
-+ e) Convey the object code using peer-to-peer transmission, provided
-+ you inform other peers where the object code and Corresponding
-+ Source of the work are being offered to the general public at no
-+ charge under subsection 6d.
-+
-+ A separable portion of the object code, whose source code is excluded
-+from the Corresponding Source as a System Library, need not be
-+included in conveying the object code work.
-+
-+ A "User Product" is either (1) a "consumer product", which means any
-+tangible personal property which is normally used for personal, family,
-+or household purposes, or (2) anything designed or sold for incorporation
-+into a dwelling. In determining whether a product is a consumer product,
-+doubtful cases shall be resolved in favor of coverage. For a particular
-+product received by a particular user, "normally used" refers to a
-+typical or common use of that class of product, regardless of the status
-+of the particular user or of the way in which the particular user
-+actually uses, or expects or is expected to use, the product. A product
-+is a consumer product regardless of whether the product has substantial
-+commercial, industrial or non-consumer uses, unless such uses represent
-+the only significant mode of use of the product.
-+
-+ "Installation Information" for a User Product means any methods,
-+procedures, authorization keys, or other information required to install
-+and execute modified versions of a covered work in that User Product from
-+a modified version of its Corresponding Source. The information must
-+suffice to ensure that the continued functioning of the modified object
-+code is in no case prevented or interfered with solely because
-+modification has been made.
-+
-+ If you convey an object code work under this section in, or with, or
-+specifically for use in, a User Product, and the conveying occurs as
-+part of a transaction in which the right of possession and use of the
-+User Product is transferred to the recipient in perpetuity or for a
-+fixed term (regardless of how the transaction is characterized), the
-+Corresponding Source conveyed under this section must be accompanied
-+by the Installation Information. But this requirement does not apply
-+if neither you nor any third party retains the ability to install
-+modified object code on the User Product (for example, the work has
-+been installed in ROM).
-+
-+ The requirement to provide Installation Information does not include a
-+requirement to continue to provide support service, warranty, or updates
-+for a work that has been modified or installed by the recipient, or for
-+the User Product in which it has been modified or installed. Access to a
-+network may be denied when the modification itself materially and
-+adversely affects the operation of the network or violates the rules and
-+protocols for communication across the network.
-+
-+ Corresponding Source conveyed, and Installation Information provided,
-+in accord with this section must be in a format that is publicly
-+documented (and with an implementation available to the public in
-+source code form), and must require no special password or key for
-+unpacking, reading or copying.
-+
-+ 7. Additional Terms.
-+
-+ "Additional permissions" are terms that supplement the terms of this
-+License by making exceptions from one or more of its conditions.
-+Additional permissions that are applicable to the entire Program shall
-+be treated as though they were included in this License, to the extent
-+that they are valid under applicable law. If additional permissions
-+apply only to part of the Program, that part may be used separately
-+under those permissions, but the entire Program remains governed by
-+this License without regard to the additional permissions.
-+
-+ When you convey a copy of a covered work, you may at your option
-+remove any additional permissions from that copy, or from any part of
-+it. (Additional permissions may be written to require their own
-+removal in certain cases when you modify the work.) You may place
-+additional permissions on material, added by you to a covered work,
-+for which you have or can give appropriate copyright permission.
-+
-+ Notwithstanding any other provision of this License, for material you
-+add to a covered work, you may (if authorized by the copyright holders of
-+that material) supplement the terms of this License with terms:
-+
-+ a) Disclaiming warranty or limiting liability differently from the
-+ terms of sections 15 and 16 of this License; or
-+
-+ b) Requiring preservation of specified reasonable legal notices or
-+ author attributions in that material or in the Appropriate Legal
-+ Notices displayed by works containing it; or
-+
-+ c) Prohibiting misrepresentation of the origin of that material, or
-+ requiring that modified versions of such material be marked in
-+ reasonable ways as different from the original version; or
-+
-+ d) Limiting the use for publicity purposes of names of licensors or
-+ authors of the material; or
-+
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list