connectivity/source/drivers/firebird/Catalog.hxx | 1 connectivity/source/drivers/firebird/Tables.cxx | 10 dev/null |binary emfio/inc/mtftools.hxx | 4 emfio/qa/cppunit/emf/EmfImportTest.cxx | 48 +++ emfio/qa/cppunit/emf/data/TestSetArcDirection.emf |binary emfio/source/reader/emfreader.cxx | 16 - emfio/source/reader/mtftools.cxx | 9 hwpfilter/source/hwpread.cxx | 1 i18npool/inc/cclass_unicode.hxx | 6 i18npool/inc/transliteration_body.hxx | 11 i18npool/source/characterclassification/cclass_unicode.cxx | 19 - i18npool/source/transliteration/transliteration_body.cxx | 8 icon-themes/breeze/cmd/32/autocorrectdlg.png |binary icon-themes/breeze/cmd/32/editframeset.png |binary icon-themes/breeze/cmd/32/insertfooter.png |binary icon-themes/breeze/cmd/32/insertheader.png |binary icon-themes/breeze/cmd/32/pasteonlyformula.png |binary icon-themes/breeze/cmd/32/pasteonlytext.png |binary icon-themes/breeze/cmd/32/pasteonlyvalue.png |binary icon-themes/breeze/cmd/32/pastespecial.png |binary icon-themes/breeze/cmd/32/pasteunformatted.png |binary icon-themes/breeze/cmd/32/scriptorganizer.png |binary icon-themes/breeze/cmd/32/sendfeedback.png |binary icon-themes/breeze/cmd/32/textattributes.png |binary icon-themes/breeze/cmd/lc_autocorrectdlg.png |binary icon-themes/breeze/cmd/lc_editframeset.png |binary icon-themes/breeze/cmd/lc_insertfooter.png |binary icon-themes/breeze/cmd/lc_insertheader.png |binary icon-themes/breeze/cmd/lc_pasteonlyformula.png |binary icon-themes/breeze/cmd/lc_pasteonlytext.png |binary icon-themes/breeze/cmd/lc_pasteonlyvalue.png |binary icon-themes/breeze/cmd/lc_pastespecial.png |binary icon-themes/breeze/cmd/lc_scriptorganizer.png |binary icon-themes/breeze/cmd/lc_sendfeedback.png |binary icon-themes/breeze/cmd/sc_autocorrectdlg.png |binary icon-themes/breeze/cmd/sc_editframeset.png |binary icon-themes/breeze/cmd/sc_insertfooter.png |binary icon-themes/breeze/cmd/sc_insertheader.png |binary icon-themes/breeze/cmd/sc_pastespecial.png |binary icon-themes/breeze/cmd/sc_scriptorganizer.png |binary icon-themes/breeze/links.txt | 12 icon-themes/breeze_dark/cmd/32/autocorrectdlg.png |binary icon-themes/breeze_dark/cmd/32/editframeset.png |binary icon-themes/breeze_dark/cmd/32/insertfooter.png |binary icon-themes/breeze_dark/cmd/32/insertheader.png |binary icon-themes/breeze_dark/cmd/32/pasteonlyformula.png |binary icon-themes/breeze_dark/cmd/32/pasteonlytext.png |binary icon-themes/breeze_dark/cmd/32/pasteonlyvalue.png |binary icon-themes/breeze_dark/cmd/32/pastespecial.png |binary icon-themes/breeze_dark/cmd/32/pasteunformatted.png |binary icon-themes/breeze_dark/cmd/32/scriptorganizer.png |binary icon-themes/breeze_dark/cmd/32/sendfeedback.png |binary icon-themes/breeze_dark/cmd/32/textattributes.png |binary icon-themes/breeze_dark/cmd/lc_autocorrectdlg.png |binary icon-themes/breeze_dark/cmd/lc_editframeset.png |binary icon-themes/breeze_dark/cmd/lc_insertfooter.png |binary icon-themes/breeze_dark/cmd/lc_insertheader.png |binary icon-themes/breeze_dark/cmd/lc_pasteonlyformula.png |binary icon-themes/breeze_dark/cmd/lc_pasteonlytext.png |binary icon-themes/breeze_dark/cmd/lc_pasteonlyvalue.png |binary icon-themes/breeze_dark/cmd/lc_pastespecial.png |binary icon-themes/breeze_dark/cmd/lc_scriptorganizer.png |binary icon-themes/breeze_dark/cmd/lc_sendfeedback.png |binary icon-themes/breeze_dark/cmd/sc_autocorrectdlg.png |binary icon-themes/breeze_dark/cmd/sc_editframeset.png |binary icon-themes/breeze_dark/cmd/sc_insertfooter.png |binary icon-themes/breeze_dark/cmd/sc_insertheader.png |binary icon-themes/breeze_dark/cmd/sc_pastespecial.png |binary icon-themes/breeze_dark/cmd/sc_scriptorganizer.png |binary icon-themes/breeze_dark/links.txt | 12 icon-themes/breeze_dark_svg/cmd/32/autocorrectdlg.svg | 1 icon-themes/breeze_dark_svg/cmd/32/editframeset.svg | 1 icon-themes/breeze_dark_svg/cmd/32/insertfooter.svg | 1 icon-themes/breeze_dark_svg/cmd/32/insertheader.svg | 1 icon-themes/breeze_dark_svg/cmd/32/pasteonlyformula.svg | 1 icon-themes/breeze_dark_svg/cmd/32/pasteonlytext.svg | 1 icon-themes/breeze_dark_svg/cmd/32/pasteonlyvalue.svg | 1 icon-themes/breeze_dark_svg/cmd/32/pastespecial.svg | 1 icon-themes/breeze_dark_svg/cmd/32/pasteunformatted.svg | 1 icon-themes/breeze_dark_svg/cmd/32/scriptorganizer.svg | 1 icon-themes/breeze_dark_svg/cmd/32/sendfeedback.svg | 1 icon-themes/breeze_dark_svg/cmd/32/textattributes.svg | 1 icon-themes/breeze_dark_svg/cmd/lc_autocorrectdlg.svg | 1 icon-themes/breeze_dark_svg/cmd/lc_editframeset.svg | 1 icon-themes/breeze_dark_svg/cmd/lc_insertfooter.svg | 1 icon-themes/breeze_dark_svg/cmd/lc_insertheader.svg | 1 icon-themes/breeze_dark_svg/cmd/lc_pasteonlyformula.svg | 1 icon-themes/breeze_dark_svg/cmd/lc_pasteonlytext.svg | 1 icon-themes/breeze_dark_svg/cmd/lc_pasteonlyvalue.svg | 1 icon-themes/breeze_dark_svg/cmd/lc_pastespecial.svg | 1 icon-themes/breeze_dark_svg/cmd/lc_scriptorganizer.svg | 2 icon-themes/breeze_dark_svg/cmd/lc_sendfeedback.svg | 1 icon-themes/breeze_dark_svg/cmd/sc_autocorrectdlg.svg | 2 icon-themes/breeze_dark_svg/cmd/sc_editframeset.svg | 1 icon-themes/breeze_dark_svg/cmd/sc_insertfooter.svg | 1 icon-themes/breeze_dark_svg/cmd/sc_insertheader.svg | 1 icon-themes/breeze_dark_svg/cmd/sc_pastespecial.svg | 2 icon-themes/breeze_dark_svg/cmd/sc_scriptorganizer.svg | 2 icon-themes/breeze_svg/cmd/32/autocorrectdlg.svg | 1 icon-themes/breeze_svg/cmd/32/editframeset.svg | 1 icon-themes/breeze_svg/cmd/32/insertfooter.svg | 1 icon-themes/breeze_svg/cmd/32/insertheader.svg | 1 icon-themes/breeze_svg/cmd/32/pasteonlyformula.svg | 1 icon-themes/breeze_svg/cmd/32/pasteonlytext.svg | 1 icon-themes/breeze_svg/cmd/32/pasteonlyvalue.svg | 1 icon-themes/breeze_svg/cmd/32/pastespecial.svg | 1 icon-themes/breeze_svg/cmd/32/pasteunformatted.svg | 1 icon-themes/breeze_svg/cmd/32/scriptorganizer.svg | 1 icon-themes/breeze_svg/cmd/32/sendfeedback.svg | 1 icon-themes/breeze_svg/cmd/32/textattributes.svg | 1 icon-themes/breeze_svg/cmd/lc_autocorrectdlg.svg | 1 icon-themes/breeze_svg/cmd/lc_editframeset.svg | 1 icon-themes/breeze_svg/cmd/lc_insertfooter.svg | 1 icon-themes/breeze_svg/cmd/lc_insertheader.svg | 1 icon-themes/breeze_svg/cmd/lc_pasteonlyformula.svg | 1 icon-themes/breeze_svg/cmd/lc_pasteonlytext.svg | 1 icon-themes/breeze_svg/cmd/lc_pasteonlyvalue.svg | 1 icon-themes/breeze_svg/cmd/lc_pastespecial.svg | 1 icon-themes/breeze_svg/cmd/lc_scriptorganizer.svg | 2 icon-themes/breeze_svg/cmd/lc_sendfeedback.svg | 1 icon-themes/breeze_svg/cmd/sc_autocorrectdlg.svg | 2 icon-themes/breeze_svg/cmd/sc_editframeset.svg | 1 icon-themes/breeze_svg/cmd/sc_insertfooter.svg | 1 icon-themes/breeze_svg/cmd/sc_insertheader.svg | 1 icon-themes/breeze_svg/cmd/sc_pastespecial.svg | 2 icon-themes/breeze_svg/cmd/sc_scriptorganizer.svg | 2 icon-themes/colibre/cmd/32/autocorrectdlg.png |binary icon-themes/colibre/cmd/32/basicideappear.png |binary icon-themes/colibre/cmd/32/basicshapes.frame.png |binary icon-themes/colibre/cmd/32/changepicture.png |binary icon-themes/colibre/cmd/32/choosemacro.png |binary icon-themes/colibre/cmd/32/dbchangedesignmode.png |binary icon-themes/colibre/cmd/32/dbclearquery.png |binary icon-themes/colibre/cmd/32/dbnewquery.png |binary icon-themes/colibre/cmd/32/dbnewqueryautopilot.png |binary icon-themes/colibre/cmd/32/dbquerydelete.png |binary icon-themes/colibre/cmd/32/dbqueryedit.png |binary icon-themes/colibre/cmd/32/dbqueryopen.png |binary icon-themes/colibre/cmd/32/dbquerypropertiesdialog.png |binary icon-themes/colibre/cmd/32/dbqueryrename.png |binary icon-themes/colibre/cmd/32/dbviewqueries.png |binary icon-themes/colibre/cmd/32/deletemasterpage.png |binary icon-themes/colibre/cmd/32/hideslide.png |binary icon-themes/colibre/cmd/32/ko/text.png |binary icon-themes/colibre/cmd/32/moduledialog.png |binary icon-themes/colibre/cmd/32/pagebreakmode.png |binary icon-themes/colibre/cmd/32/pickthrough.png |binary icon-themes/colibre/cmd/32/presentationminimizer.png |binary icon-themes/colibre/cmd/32/quit.png |binary icon-themes/colibre/cmd/32/sbaexecutesql.png |binary icon-themes/colibre/cmd/32/scriptorganizer.png |binary icon-themes/colibre/cmd/32/showinvalid.png |binary icon-themes/colibre/cmd/32/tablenumberformatdialog.png |binary icon-themes/colibre/cmd/32/viewrowcolumnheaders.png |binary icon-themes/colibre/cmd/lc_autocorrectdlg.png |binary icon-themes/colibre/cmd/lc_basicideappear.png |binary icon-themes/colibre/cmd/lc_choosemacro.png |binary icon-themes/colibre/cmd/lc_cleararrowprecedents.png |binary icon-themes/colibre/cmd/lc_conditionalformatdialog.png |binary icon-themes/colibre/cmd/lc_controlproperties.png |binary icon-themes/colibre/cmd/lc_dataincolumns.png |binary icon-themes/colibre/cmd/lc_datefield.png |binary icon-themes/colibre/cmd/lc_dbchangedesignmode.png |binary icon-themes/colibre/cmd/lc_dbclearquery.png |binary icon-themes/colibre/cmd/lc_dbnewquery.png |binary icon-themes/colibre/cmd/lc_dbquerydelete.png |binary icon-themes/colibre/cmd/lc_dbqueryopen.png |binary icon-themes/colibre/cmd/lc_dbquerypropertiesdialog.png |binary icon-themes/colibre/cmd/lc_dbqueryrename.png |binary icon-themes/colibre/cmd/lc_dbviewqueries.png |binary icon-themes/colibre/cmd/lc_diagramdata.png |binary icon-themes/colibre/cmd/lc_filldown.png |binary icon-themes/colibre/cmd/lc_formatobjectmenu.png |binary icon-themes/colibre/cmd/lc_hideslide.png |binary icon-themes/colibre/cmd/lc_insertslidetitlefield.png |binary icon-themes/colibre/cmd/lc_mergecells.png |binary icon-themes/colibre/cmd/lc_moduledialog.png |binary icon-themes/colibre/cmd/lc_morecontrols.png |binary icon-themes/colibre/cmd/lc_refreshformcontrol.png |binary icon-themes/colibre/cmd/lc_renamemasterpage.png |binary icon-themes/colibre/cmd/lc_sbaexecutesql.png |binary icon-themes/colibre/cmd/lc_scriptorganizer.png |binary icon-themes/colibre/cmd/lc_showslide.png |binary icon-themes/colibre/cmd/lc_sidebar.png |binary icon-themes/colibre/cmd/lc_splitcell.png |binary icon-themes/colibre/cmd/lc_tablenumberformatdialog.png |binary icon-themes/colibre/cmd/lc_togglemergecells.png |binary icon-themes/colibre/cmd/lc_viewrowcolumnheaders.png |binary icon-themes/colibre/cmd/lc_zoommode.png |binary icon-themes/colibre/cmd/sc_basicideappear.png |binary icon-themes/colibre/cmd/sc_basicshapes.frame.png |binary icon-themes/colibre/cmd/sc_choosemacro.png |binary icon-themes/colibre/cmd/sc_datefield.png |binary icon-themes/colibre/cmd/sc_dbnewquery.png |binary icon-themes/colibre/cmd/sc_dbquerydelete.png |binary icon-themes/colibre/cmd/sc_dbquerypropertiesdialog.png |binary icon-themes/colibre/cmd/sc_dbviewqueries.png |binary icon-themes/colibre/cmd/sc_dbviewtablenames.png |binary icon-themes/colibre/cmd/sc_displaymode.png |binary icon-themes/colibre/cmd/sc_distributecolumns.png |binary icon-themes/colibre/cmd/sc_flowchartshapes.png |binary icon-themes/colibre/cmd/sc_insertcolumnbreak.png |binary icon-themes/colibre/cmd/sc_mergecells.png |binary icon-themes/colibre/cmd/sc_moduledialog.png |binary icon-themes/colibre/cmd/sc_normalmultipanegui.png |binary icon-themes/colibre/cmd/sc_pickthrough.png |binary icon-themes/colibre/cmd/sc_queryrename.png |binary icon-themes/colibre/cmd/sc_sbaexecutesql.png |binary icon-themes/colibre/cmd/sc_signaturelinedialog.png |binary icon-themes/colibre/cmd/sc_splitcell.png |binary icon-themes/colibre/cmd/sc_splittable.png |binary icon-themes/colibre/cmd/sc_togglemergecells.png |binary icon-themes/colibre/reportdesign/res/sx10454.png |binary icon-themes/colibre/reportdesign/res/sx10928.png |binary icon-themes/colibre/reportdesign/res/sx10929.png |binary icon-themes/colibre/reportdesign/res/sx12452.png |binary icon-themes/colibre/reportdesign/res/sx12453.png |binary icon-themes/colibre/reportdesign/res/sx12466.png |binary icon-themes/colibre/reportdesign/res/sx12468.png |binary icon-themes/colibre/reportdesign/res/sx12603.png |binary icon-themes/colibre/res/base_thumbnail_256.png |binary icon-themes/colibre/res/lx03249.png |binary icon-themes/colibre/res/lx03250.png |binary icon-themes/colibre/res/lx03251.png |binary icon-themes/colibre/res/lx03255.png |binary icon-themes/colibre/res/sx16670.png |binary icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_005.png |binary icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_110.png |binary icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_250.png |binary icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_260.png |binary icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_400.png |binary icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_450.png |binary icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_500.png |binary icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_505.png |binary icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_750.png |binary icon-themes/colibre/sd/res/pageobjs.png |binary icon-themes/colibre/sd/res/pagobjex.png |binary icon-themes/colibre_svg/cmd/32/autocorrectdlg.svg | 2 icon-themes/colibre_svg/cmd/32/basicideappear.svg | 2 icon-themes/colibre_svg/cmd/32/basicshapes.frame.svg | 2 icon-themes/colibre_svg/cmd/32/changepicture.svg | 2 icon-themes/colibre_svg/cmd/32/choosemacro.svg | 2 icon-themes/colibre_svg/cmd/32/dbchangedesignmode.svg | 2 icon-themes/colibre_svg/cmd/32/dbclearquery.svg | 2 icon-themes/colibre_svg/cmd/32/dbnewquery.svg | 2 icon-themes/colibre_svg/cmd/32/dbnewqueryautopilot.svg | 2 icon-themes/colibre_svg/cmd/32/dbquerydelete.svg | 2 icon-themes/colibre_svg/cmd/32/dbqueryedit.svg | 2 icon-themes/colibre_svg/cmd/32/dbqueryopen.svg | 2 icon-themes/colibre_svg/cmd/32/dbquerypropertiesdialog.svg | 2 icon-themes/colibre_svg/cmd/32/dbqueryrename.svg | 2 icon-themes/colibre_svg/cmd/32/dbviewqueries.svg | 2 icon-themes/colibre_svg/cmd/32/deletemasterpage.svg | 2 icon-themes/colibre_svg/cmd/32/hideslide.svg | 2 icon-themes/colibre_svg/cmd/32/ko/text.svg | 2 icon-themes/colibre_svg/cmd/32/moduledialog.svg | 2 icon-themes/colibre_svg/cmd/32/pagebreakmode.svg | 2 icon-themes/colibre_svg/cmd/32/pickthrough.svg | 2 icon-themes/colibre_svg/cmd/32/presentationminimizer.svg | 2 icon-themes/colibre_svg/cmd/32/quit.svg | 2 icon-themes/colibre_svg/cmd/32/sbaexecutesql.svg | 2 icon-themes/colibre_svg/cmd/32/scriptorganizer.svg | 2 icon-themes/colibre_svg/cmd/32/showinvalid.svg | 2 icon-themes/colibre_svg/cmd/32/tablenumberformatdialog.svg | 2 icon-themes/colibre_svg/cmd/32/viewrowcolumnheaders.svg | 2 icon-themes/colibre_svg/cmd/lc_autocorrectdlg.svg | 2 icon-themes/colibre_svg/cmd/lc_basicideappear.svg | 2 icon-themes/colibre_svg/cmd/lc_choosemacro.svg | 2 icon-themes/colibre_svg/cmd/lc_cleararrowprecedents.svg | 2 icon-themes/colibre_svg/cmd/lc_conditionalformatdialog.svg | 2 icon-themes/colibre_svg/cmd/lc_controlproperties.svg | 5 icon-themes/colibre_svg/cmd/lc_dataincolumns.svg | 2 icon-themes/colibre_svg/cmd/lc_datefield.svg | 2 icon-themes/colibre_svg/cmd/lc_dbchangedesignmode.svg | 2 icon-themes/colibre_svg/cmd/lc_dbclearquery.svg | 2 icon-themes/colibre_svg/cmd/lc_dbnewquery.svg | 2 icon-themes/colibre_svg/cmd/lc_dbquerydelete.svg | 2 icon-themes/colibre_svg/cmd/lc_dbqueryopen.svg | 2 icon-themes/colibre_svg/cmd/lc_dbquerypropertiesdialog.svg | 2 icon-themes/colibre_svg/cmd/lc_dbqueryrename.svg | 2 icon-themes/colibre_svg/cmd/lc_dbviewqueries.svg | 2 icon-themes/colibre_svg/cmd/lc_diagramdata.svg | 2 icon-themes/colibre_svg/cmd/lc_filldown.svg | 2 icon-themes/colibre_svg/cmd/lc_formatobjectmenu.svg | 2 icon-themes/colibre_svg/cmd/lc_hideslide.svg | 2 icon-themes/colibre_svg/cmd/lc_insertslidetitlefield.svg | 2 icon-themes/colibre_svg/cmd/lc_mergecells.svg | 2 icon-themes/colibre_svg/cmd/lc_moduledialog.svg | 2 icon-themes/colibre_svg/cmd/lc_morecontrols.svg | 6 icon-themes/colibre_svg/cmd/lc_refreshformcontrol.svg | 6 icon-themes/colibre_svg/cmd/lc_renamemasterpage.svg | 2 icon-themes/colibre_svg/cmd/lc_sbaexecutesql.svg | 2 icon-themes/colibre_svg/cmd/lc_scriptorganizer.svg | 2 icon-themes/colibre_svg/cmd/lc_showslide.svg | 2 icon-themes/colibre_svg/cmd/lc_sidebar.svg | 2 icon-themes/colibre_svg/cmd/lc_splitcell.svg | 2 icon-themes/colibre_svg/cmd/lc_tablenumberformatdialog.svg | 2 icon-themes/colibre_svg/cmd/lc_togglemergecells.svg | 2 icon-themes/colibre_svg/cmd/lc_viewrowcolumnheaders.svg | 2 icon-themes/colibre_svg/cmd/lc_zoommode.svg | 2 icon-themes/colibre_svg/cmd/sc_basicideappear.svg | 8 icon-themes/colibre_svg/cmd/sc_basicshapes.frame.svg | 10 icon-themes/colibre_svg/cmd/sc_choosemacro.svg | 7 icon-themes/colibre_svg/cmd/sc_datefield.svg | 4 icon-themes/colibre_svg/cmd/sc_dbnewquery.svg | 2 icon-themes/colibre_svg/cmd/sc_dbquerydelete.svg | 2 icon-themes/colibre_svg/cmd/sc_dbquerypropertiesdialog.svg | 2 icon-themes/colibre_svg/cmd/sc_dbviewqueries.svg | 2 icon-themes/colibre_svg/cmd/sc_dbviewtablenames.svg | 5 icon-themes/colibre_svg/cmd/sc_displaymode.svg | 2 icon-themes/colibre_svg/cmd/sc_distributecolumns.svg | 3 icon-themes/colibre_svg/cmd/sc_flowchartshapes.svg | 36 -- icon-themes/colibre_svg/cmd/sc_insertcolumnbreak.svg | 2 icon-themes/colibre_svg/cmd/sc_mergecells.svg | 2 icon-themes/colibre_svg/cmd/sc_moduledialog.svg | 8 icon-themes/colibre_svg/cmd/sc_normalmultipanegui.svg | 2 icon-themes/colibre_svg/cmd/sc_pickthrough.svg | 2 icon-themes/colibre_svg/cmd/sc_queryrename.svg | 2 icon-themes/colibre_svg/cmd/sc_sbaexecutesql.svg | 2 icon-themes/colibre_svg/cmd/sc_signaturelinedialog.svg | 2 icon-themes/colibre_svg/cmd/sc_splitcell.svg | 2 icon-themes/colibre_svg/cmd/sc_splittable.svg | 2 icon-themes/colibre_svg/cmd/sc_togglemergecells.svg | 2 icon-themes/colibre_svg/reportdesign/res/sx10454.svg | 2 icon-themes/colibre_svg/reportdesign/res/sx10928.svg | 2 icon-themes/colibre_svg/reportdesign/res/sx10929.svg | 2 icon-themes/colibre_svg/reportdesign/res/sx12452.svg | 2 icon-themes/colibre_svg/reportdesign/res/sx12453.svg | 2 icon-themes/colibre_svg/reportdesign/res/sx12466.svg | 2 icon-themes/colibre_svg/reportdesign/res/sx12468.svg | 2 icon-themes/colibre_svg/reportdesign/res/sx12603.svg | 2 icon-themes/colibre_svg/res/base_thumbnail_256.svg | 2 icon-themes/colibre_svg/res/lx03249.svg | 2 icon-themes/colibre_svg/res/lx03250.svg | 2 icon-themes/colibre_svg/res/lx03251.svg | 2 icon-themes/colibre_svg/res/lx03255.svg | 2 icon-themes/colibre_svg/res/sx16670.svg | 2 icon-themes/colibre_svg/sc/res/sidebar/CellBorderLineStyle_005.svg | 2 icon-themes/colibre_svg/sc/res/sidebar/CellBorderLineStyle_110.svg | 2 icon-themes/colibre_svg/sc/res/sidebar/CellBorderLineStyle_250.svg | 2 icon-themes/colibre_svg/sc/res/sidebar/CellBorderLineStyle_260.svg | 2 icon-themes/colibre_svg/sc/res/sidebar/CellBorderLineStyle_400.svg | 2 icon-themes/colibre_svg/sc/res/sidebar/CellBorderLineStyle_450.svg | 2 icon-themes/colibre_svg/sc/res/sidebar/CellBorderLineStyle_500.svg | 2 icon-themes/colibre_svg/sc/res/sidebar/CellBorderLineStyle_505.svg | 2 icon-themes/colibre_svg/sc/res/sidebar/CellBorderLineStyle_750.svg | 2 icon-themes/colibre_svg/sd/res/pageobjs.svg | 2 icon-themes/colibre_svg/sd/res/pagobjex.svg | 2 icon-themes/sifr/cmd/32/autocorrectdlg.png |binary icon-themes/sifr/cmd/32/cleararrows.png |binary icon-themes/sifr/cmd/32/donation.png |binary icon-themes/sifr/cmd/32/editframeset.png |binary icon-themes/sifr/cmd/32/editqrcode.png |binary icon-themes/sifr/cmd/32/insertqrcode.png |binary icon-themes/sifr/cmd/32/normalviewmode.png |binary icon-themes/sifr/cmd/32/pagebreakmode.png |binary icon-themes/sifr/cmd/32/pasteonlyformula.png |binary icon-themes/sifr/cmd/32/pasteonlytext.png |binary icon-themes/sifr/cmd/32/pasteonlyvalue.png |binary icon-themes/sifr/cmd/32/pastespecial.png |binary icon-themes/sifr/cmd/32/pasteunformatted.png |binary icon-themes/sifr/cmd/32/remove.png |binary icon-themes/sifr/cmd/32/saveacopy.png |binary icon-themes/sifr/cmd/32/saveall.png |binary icon-themes/sifr/cmd/32/scan.png |binary icon-themes/sifr/cmd/32/scriptorganizer.png |binary icon-themes/sifr/cmd/32/selecttables.png |binary icon-themes/sifr/cmd/32/sendfeedback.png |binary icon-themes/sifr/cmd/lc_autocorrectdlg.png |binary icon-themes/sifr/cmd/lc_editframeset.png |binary icon-themes/sifr/cmd/lc_editqrcode.png |binary icon-themes/sifr/cmd/lc_insertqrcode.png |binary icon-themes/sifr/cmd/lc_name.png |binary icon-themes/sifr/cmd/lc_normalviewmode.png |binary icon-themes/sifr/cmd/lc_pagebreakmode.png |binary icon-themes/sifr/cmd/lc_pasteonlyformula.png |binary icon-themes/sifr/cmd/lc_pasteonlytext.png |binary icon-themes/sifr/cmd/lc_pasteonlyvalue.png |binary icon-themes/sifr/cmd/lc_pastespecial.png |binary icon-themes/sifr/cmd/lc_pasteunformatted.png |binary icon-themes/sifr/cmd/lc_saveall.png |binary icon-themes/sifr/cmd/lc_scan.png |binary icon-themes/sifr/cmd/lc_scriptorganizer.png |binary icon-themes/sifr/cmd/lc_selecttables.png |binary icon-themes/sifr/cmd/sc_autocorrectdlg.png |binary icon-themes/sifr/cmd/sc_editframeset.png |binary icon-themes/sifr/cmd/sc_editqrcode.png |binary icon-themes/sifr/cmd/sc_insertqrcode.png |binary icon-themes/sifr/cmd/sc_name.png |binary icon-themes/sifr/cmd/sc_scan.png |binary icon-themes/sifr/cmd/sc_scriptorganizer.png |binary icon-themes/sifr/cmd/sc_selecttables.png |binary icon-themes/sifr/links.txt | 46 ++- icon-themes/sifr_dark/cmd/32/autocorrectdlg.png |binary icon-themes/sifr_dark/cmd/32/cleararrows.png |binary icon-themes/sifr_dark/cmd/32/donation.png |binary icon-themes/sifr_dark/cmd/32/editframeset.png |binary icon-themes/sifr_dark/cmd/32/editqrcode.png |binary icon-themes/sifr_dark/cmd/32/insertqrcode.png |binary icon-themes/sifr_dark/cmd/32/normalviewmode.png |binary icon-themes/sifr_dark/cmd/32/pagebreakmode.png |binary icon-themes/sifr_dark/cmd/32/pasteonlyformula.png |binary icon-themes/sifr_dark/cmd/32/pasteonlytext.png |binary icon-themes/sifr_dark/cmd/32/pasteonlyvalue.png |binary icon-themes/sifr_dark/cmd/32/pastespecial.png |binary icon-themes/sifr_dark/cmd/32/pasteunformatted.png |binary icon-themes/sifr_dark/cmd/32/remove.png |binary icon-themes/sifr_dark/cmd/32/saveacopy.png |binary icon-themes/sifr_dark/cmd/32/saveall.png |binary icon-themes/sifr_dark/cmd/32/scan.png |binary icon-themes/sifr_dark/cmd/32/scriptorganizer.png |binary icon-themes/sifr_dark/cmd/32/selecttables.png |binary icon-themes/sifr_dark/cmd/32/sendfeedback.png |binary icon-themes/sifr_dark/cmd/lc_autocorrectdlg.png |binary icon-themes/sifr_dark/cmd/lc_editframeset.png |binary icon-themes/sifr_dark/cmd/lc_editqrcode.png |binary icon-themes/sifr_dark/cmd/lc_insertqrcode.png |binary icon-themes/sifr_dark/cmd/lc_name.png |binary icon-themes/sifr_dark/cmd/lc_normalviewmode.png |binary icon-themes/sifr_dark/cmd/lc_pagebreakmode.png |binary icon-themes/sifr_dark/cmd/lc_pasteonlyformula.png |binary icon-themes/sifr_dark/cmd/lc_pasteonlytext.png |binary icon-themes/sifr_dark/cmd/lc_pasteonlyvalue.png |binary icon-themes/sifr_dark/cmd/lc_pastespecial.png |binary icon-themes/sifr_dark/cmd/lc_pasteunformatted.png |binary icon-themes/sifr_dark/cmd/lc_saveall.png |binary icon-themes/sifr_dark/cmd/lc_scan.png |binary icon-themes/sifr_dark/cmd/lc_scriptorganizer.png |binary icon-themes/sifr_dark/cmd/lc_selecttables.png |binary icon-themes/sifr_dark/cmd/sc_autocorrectdlg.png |binary icon-themes/sifr_dark/cmd/sc_editframeset.png |binary icon-themes/sifr_dark/cmd/sc_editqrcode.png |binary icon-themes/sifr_dark/cmd/sc_insertqrcode.png |binary icon-themes/sifr_dark/cmd/sc_name.png |binary icon-themes/sifr_dark/cmd/sc_scan.png |binary icon-themes/sifr_dark/cmd/sc_scriptorganizer.png |binary icon-themes/sifr_dark/cmd/sc_selecttables.png |binary icon-themes/sifr_dark/links.txt | 46 ++- icon-themes/sifr_dark_svg/cmd/32/autocorrectdlg.svg | 1 icon-themes/sifr_dark_svg/cmd/32/cleararrows.svg | 1 icon-themes/sifr_dark_svg/cmd/32/donation.svg | 1 icon-themes/sifr_dark_svg/cmd/32/editframeset.svg | 1 icon-themes/sifr_dark_svg/cmd/32/editqrcode.svg | 1 icon-themes/sifr_dark_svg/cmd/32/insertqrcode.svg | 1 icon-themes/sifr_dark_svg/cmd/32/normalviewmode.svg | 1 icon-themes/sifr_dark_svg/cmd/32/pagebreakmode.svg | 2 icon-themes/sifr_dark_svg/cmd/32/pasteonlyformula.svg | 1 icon-themes/sifr_dark_svg/cmd/32/pasteonlytext.svg | 1 icon-themes/sifr_dark_svg/cmd/32/pasteonlyvalue.svg | 1 icon-themes/sifr_dark_svg/cmd/32/pastespecial.svg | 1 icon-themes/sifr_dark_svg/cmd/32/pasteunformatted.svg | 1 icon-themes/sifr_dark_svg/cmd/32/remove.svg | 1 icon-themes/sifr_dark_svg/cmd/32/saveacopy.svg | 1 icon-themes/sifr_dark_svg/cmd/32/saveall.svg | 1 icon-themes/sifr_dark_svg/cmd/32/scan.svg | 1 icon-themes/sifr_dark_svg/cmd/32/scriptorganizer.svg | 1 icon-themes/sifr_dark_svg/cmd/32/selecttables.svg | 1 icon-themes/sifr_dark_svg/cmd/32/sendfeedback.svg | 1 icon-themes/sifr_dark_svg/cmd/de/lc_numberformatthousands.svg | 2 icon-themes/sifr_dark_svg/cmd/de/sc_numberformatthousands.svg | 2 icon-themes/sifr_dark_svg/cmd/lc_autocorrectdlg.svg | 1 icon-themes/sifr_dark_svg/cmd/lc_editframeset.svg | 1 icon-themes/sifr_dark_svg/cmd/lc_editqrcode.svg | 1 icon-themes/sifr_dark_svg/cmd/lc_insertqrcode.svg | 1 icon-themes/sifr_dark_svg/cmd/lc_macroorganizer.svg | 1 icon-themes/sifr_dark_svg/cmd/lc_name.svg | 2 icon-themes/sifr_dark_svg/cmd/lc_normalviewmode.svg | 2 icon-themes/sifr_dark_svg/cmd/lc_pagebreakmode.svg | 2 icon-themes/sifr_dark_svg/cmd/lc_pasteonlyformula.svg | 1 icon-themes/sifr_dark_svg/cmd/lc_pasteonlytext.svg | 1 icon-themes/sifr_dark_svg/cmd/lc_pasteonlyvalue.svg | 1 icon-themes/sifr_dark_svg/cmd/lc_pastespecial.svg | 1 icon-themes/sifr_dark_svg/cmd/lc_pasteunformatted.svg | 1 icon-themes/sifr_dark_svg/cmd/lc_renametable.svg | 1 icon-themes/sifr_dark_svg/cmd/lc_saveall.svg | 1 icon-themes/sifr_dark_svg/cmd/lc_scan.svg | 1 icon-themes/sifr_dark_svg/cmd/lc_scriptorganizer.svg | 2 icon-themes/sifr_dark_svg/cmd/lc_selecttables.svg | 1 icon-themes/sifr_dark_svg/cmd/sc_autocorrectdlg.svg | 2 icon-themes/sifr_dark_svg/cmd/sc_editframeset.svg | 1 icon-themes/sifr_dark_svg/cmd/sc_editpastespecialmenu.svg | 1 icon-themes/sifr_dark_svg/cmd/sc_editqrcode.svg | 1 icon-themes/sifr_dark_svg/cmd/sc_insertqrcode.svg | 1 icon-themes/sifr_dark_svg/cmd/sc_macroorganizer.svg | 1 icon-themes/sifr_dark_svg/cmd/sc_name.svg | 2 icon-themes/sifr_dark_svg/cmd/sc_pastespecialmenu.svg | 1 icon-themes/sifr_dark_svg/cmd/sc_renametable.svg | 1 icon-themes/sifr_dark_svg/cmd/sc_scan.svg | 2 icon-themes/sifr_dark_svg/cmd/sc_scriptorganizer.svg | 2 icon-themes/sifr_dark_svg/cmd/sc_selecttables.svg | 2 icon-themes/sifr_svg/cmd/32/autocorrectdlg.svg | 1 icon-themes/sifr_svg/cmd/32/cleararrows.svg | 1 icon-themes/sifr_svg/cmd/32/donation.svg | 1 icon-themes/sifr_svg/cmd/32/editframeset.svg | 1 icon-themes/sifr_svg/cmd/32/editqrcode.svg | 1 icon-themes/sifr_svg/cmd/32/insertqrcode.svg | 1 icon-themes/sifr_svg/cmd/32/normalviewmode.svg | 1 icon-themes/sifr_svg/cmd/32/pagebreakmode.svg | 2 icon-themes/sifr_svg/cmd/32/pasteonlyformula.svg | 1 icon-themes/sifr_svg/cmd/32/pasteonlytext.svg | 1 icon-themes/sifr_svg/cmd/32/pasteonlyvalue.svg | 1 icon-themes/sifr_svg/cmd/32/pastespecial.svg | 1 icon-themes/sifr_svg/cmd/32/pasteunformatted.svg | 1 icon-themes/sifr_svg/cmd/32/remove.svg | 1 icon-themes/sifr_svg/cmd/32/saveacopy.svg | 1 icon-themes/sifr_svg/cmd/32/saveall.svg | 1 icon-themes/sifr_svg/cmd/32/scan.svg | 1 icon-themes/sifr_svg/cmd/32/scriptorganizer.svg | 1 icon-themes/sifr_svg/cmd/32/selecttables.svg | 1 icon-themes/sifr_svg/cmd/32/sendfeedback.svg | 1 icon-themes/sifr_svg/cmd/de/lc_numberformatthousands.svg | 2 icon-themes/sifr_svg/cmd/de/sc_numberformatthousands.svg | 2 icon-themes/sifr_svg/cmd/lc_autocorrectdlg.svg | 1 icon-themes/sifr_svg/cmd/lc_editframeset.svg | 1 icon-themes/sifr_svg/cmd/lc_editqrcode.svg | 1 icon-themes/sifr_svg/cmd/lc_insertqrcode.svg | 1 icon-themes/sifr_svg/cmd/lc_macroorganizer.svg | 1 icon-themes/sifr_svg/cmd/lc_name.svg | 2 icon-themes/sifr_svg/cmd/lc_normalviewmode.svg | 2 icon-themes/sifr_svg/cmd/lc_pagebreakmode.svg | 2 icon-themes/sifr_svg/cmd/lc_pasteonlyformula.svg | 1 icon-themes/sifr_svg/cmd/lc_pasteonlytext.svg | 1 icon-themes/sifr_svg/cmd/lc_pasteonlyvalue.svg | 1 icon-themes/sifr_svg/cmd/lc_pastespecial.svg | 1 icon-themes/sifr_svg/cmd/lc_pasteunformatted.svg | 1 icon-themes/sifr_svg/cmd/lc_renametable.svg | 1 icon-themes/sifr_svg/cmd/lc_saveall.svg | 1 icon-themes/sifr_svg/cmd/lc_scan.svg | 1 icon-themes/sifr_svg/cmd/lc_scriptorganizer.svg | 2 icon-themes/sifr_svg/cmd/lc_selecttables.svg | 1 icon-themes/sifr_svg/cmd/sc_autocorrectdlg.svg | 2 icon-themes/sifr_svg/cmd/sc_editframeset.svg | 1 icon-themes/sifr_svg/cmd/sc_editpastespecialmenu.svg | 1 icon-themes/sifr_svg/cmd/sc_editqrcode.svg | 1 icon-themes/sifr_svg/cmd/sc_insertqrcode.svg | 1 icon-themes/sifr_svg/cmd/sc_macroorganizer.svg | 1 icon-themes/sifr_svg/cmd/sc_name.svg | 2 icon-themes/sifr_svg/cmd/sc_pastespecialmenu.svg | 1 icon-themes/sifr_svg/cmd/sc_renametable.svg | 1 icon-themes/sifr_svg/cmd/sc_scan.svg | 2 icon-themes/sifr_svg/cmd/sc_scriptorganizer.svg | 2 icon-themes/sifr_svg/cmd/sc_selecttables.svg | 2 include/sfx2/weldutils.hxx | 2 include/tools/poly.hxx | 3 include/tools/wldcrd.hxx | 2 lotuswordpro/source/filter/lwpdrawobj.cxx | 6 sc/inc/column.hxx | 5 sc/qa/unit/parallelism.cxx | 30 ++ sc/source/core/data/column4.cxx | 22 + sc/source/core/tool/interpr1.cxx | 8 sc/source/core/tool/interpr4.cxx | 16 - sc/source/core/tool/interpr6.cxx | 2 sc/source/filter/html/htmlpars.cxx | 14 sfx2/source/dialog/recfloat.cxx | 14 sfx2/source/inc/recfloat.hxx | 2 starmath/source/view.cxx | 21 - sw/inc/crsrsh.hxx | 11 sw/inc/crstate.hxx | 4 sw/qa/extras/odfexport/odfexport.cxx | 2 sw/qa/extras/ooxmlexport/data/tdf144563.docx |binary sw/qa/extras/ooxmlexport/data/tdf146851_1.docx |binary sw/qa/extras/ooxmlexport/data/tdf146851_2.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 8 sw/qa/extras/ooxmlexport/ooxmlexport16.cxx | 6 sw/qa/extras/ooxmlexport/ooxmlexport17.cxx | 59 ++++ sw/qa/extras/uiwriter/uiwriter.cxx | 6 sw/qa/extras/uiwriter/uiwriter2.cxx | 76 +++++ sw/qa/python/check_cross_references.py | 10 sw/source/core/crsr/crstrvl.cxx | 41 ++ sw/source/core/doc/DocumentRedlineManager.cxx | 9 sw/source/core/doc/number.cxx | 6 sw/source/core/edit/autofmt.cxx | 2 sw/source/core/edit/edlingu.cxx | 19 + sw/source/core/edit/edws.cxx | 6 sw/source/core/layout/flycnt.cxx | 5 sw/source/core/layout/ftnfrm.cxx | 14 sw/source/core/layout/trvlfrm.cxx | 6 sw/source/core/text/frmcrsr.cxx | 12 sw/source/core/text/itrcrsr.cxx | 30 +- sw/source/core/txtnode/ndtxt.cxx | 3 sw/source/core/undo/undel.cxx | 5 sw/source/filter/ww8/docxattributeoutput.cxx | 147 ++++++---- sw/source/filter/ww8/sprmids.hxx | 1 sw/source/filter/ww8/wrtw8num.cxx | 3 sw/source/filter/ww8/ww8par2.cxx | 8 sw/source/filter/ww8/ww8scan.cxx | 21 - sw/source/uibase/docvw/edtwin.cxx | 35 +- sw/source/uibase/shells/annotsh.cxx | 14 sw/source/uibase/shells/textfld.cxx | 2 sw/source/uibase/uitest/uiobject.cxx | 29 + sw/source/uibase/uiview/viewling.cxx | 9 tools/inc/poly.h | 2 tools/source/fsys/wldcrd.cxx | 38 +- tools/source/generic/poly.cxx | 41 +- vcl/qa/cppunit/pdfexport/pdfexport.cxx | 118 ++++++++ vcl/source/gdi/pdfwriter_impl.cxx | 16 - vcl/source/window/event.cxx | 3 vcl/uiconfig/ui/interimtearableparent.ui | 1 wizards/source/sfdocuments/SF_Form.xba | 1 writerfilter/source/dmapper/NumberingManager.cxx | 9 xmlsecurity/source/component/documentdigitalsignatures.cxx | 9 602 files changed, 1220 insertions(+), 513 deletions(-)
New commits: commit f5eaa816bb7b05a2ae4befccd4b770cfb3bc50bb Author: Vasily Melenchuk <[email protected]> AuthorDate: Sat Mar 12 09:07:53 2022 +0300 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:10 2022 +0100 tdf#146851: sw: even numbering=None is still a numbering Text node containing a numbering rule with numbering format with SVX_NUM_NUMBER_NONE is still a numbering: it will display prefix, suffix and other numbering properties. Change-Id: I52077824b4a1db2e9220701fdd514670490a59db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131410 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131648 diff --git a/sw/qa/extras/ooxmlexport/data/tdf146851_2.docx b/sw/qa/extras/ooxmlexport/data/tdf146851_2.docx new file mode 100644 index 000000000000..fbd5f40a687e Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf146851_2.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx index d8e15116eb48..9937d86b0f88 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx @@ -162,6 +162,25 @@ DECLARE_OOXMLEXPORT_TEST(testTdf146851_1, "tdf146851_1.docx") CPPUNIT_ASSERT_EQUAL(OUString("1/"), getProperty<OUString>(xPara, "ListLabelString")); } +DECLARE_OOXMLEXPORT_TEST(testTdf146851_2, "tdf146851_2.docx") +{ + // Ensure numbering on second para + uno::Reference<beans::XPropertySet> xPara; + xPara.set(getParagraph(2, "."), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("Schedule"), getProperty<OUString>(xPara, "ListLabelString")); + + // Refresh fields and ensure cross-reference to numbered para is okay + uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XEnumerationAccess> xFieldsAccess(xTextFieldsSupplier->getTextFields()); + + uno::Reference<util::XRefreshable>(xFieldsAccess, uno::UNO_QUERY_THROW)->refresh(); + + uno::Reference<container::XEnumeration> xFields(xFieldsAccess->createEnumeration()); + CPPUNIT_ASSERT(xFields->hasMoreElements()); + uno::Reference<text::XTextField> xTextField(xFields->nextElement(), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("Schedule"), xTextField->getPresentation(false)); +} + DECLARE_OOXMLEXPORT_TEST(testTdf81507, "tdf81507.docx") { xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml"); diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 4d576f479e5c..4d109a8add1c 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -3073,8 +3073,7 @@ bool SwTextNode::HasNumber(SwRootFrame const*const pLayout) const const SwNumFormat& aFormat(pRule->Get(lcl_BoundListLevel(GetActualListLevel()))); // #i40041# - bResult = aFormat.IsEnumeration() && - SVX_NUM_NUMBER_NONE != aFormat.GetNumberingType(); + bResult = aFormat.IsEnumeration(); } return bResult; diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 4836678172e9..e61ca56b5a8b 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -473,8 +473,7 @@ void MSWordExportBase::NumberingLevel( else { // Create level string - if (SVX_NUM_NUMBER_NONE != rFormat.GetNumberingType() && - rFormat.HasListFormat()) + if (rFormat.HasListFormat()) { sal_uInt8* pLvlPos = aNumLvlPos; sNumStr = rFormat.GetListFormat(); commit 8cdce6fa83802c83474a29443b285feee4838ab6 Author: Noel Grandin <[email protected]> AuthorDate: Fri Mar 11 19:18:25 2022 +0200 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:10 2022 +0100 tdf#147921 Filesave DOC: wrong layout and then all missing from 7.3 regression from commit 990b2cb056788f7f412656a303456d90c003cf83 Author: Noel Grandin <[email protected]> Date: Mon Jun 21 13:00:07 2021 +0200 simplify and improve Wildcard Cannot pass a string_view into something expecting a char* because then it gets the length wrong. Change-Id: I638660a1e9a8a0d17e4d2f77500b3f01365a43d3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131396 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit a378ac93e1b4e3c0dacdd3f0a3500813714537c7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131595 Reviewed-by: Michael Stahl <[email protected]> diff --git a/include/tools/wldcrd.hxx b/include/tools/wldcrd.hxx index dfb1e9d87bc3..41288f1246b2 100644 --- a/include/tools/wldcrd.hxx +++ b/include/tools/wldcrd.hxx @@ -33,7 +33,7 @@ private: OUString aWildString; char cSepSymbol; - static bool ImpMatch( const sal_Unicode *pWild, const sal_Unicode *pStr ); + static bool ImpMatch( std::u16string_view aWild, std::u16string_view aStr ); public: WildCard() diff --git a/tools/source/fsys/wldcrd.cxx b/tools/source/fsys/wldcrd.cxx index 6e0259696aca..a9867c00ba51 100644 --- a/tools/source/fsys/wldcrd.cxx +++ b/tools/source/fsys/wldcrd.cxx @@ -25,22 +25,26 @@ * '?' in pWild mean match exactly one character. * */ -bool WildCard::ImpMatch( const sal_Unicode *pWild, const sal_Unicode *pStr ) +bool WildCard::ImpMatch( std::u16string_view aWild, std::u16string_view aStr ) { int pos=0; int flag=0; + const sal_Unicode* pWild = aWild.data(); + const sal_Unicode* pWildEnd = aWild.data() + aWild.size(); + const sal_Unicode* pStr = aStr.data(); + const sal_Unicode* pStrEnd = aStr.data() + aStr.size(); - while ( *pWild || flag ) + while ( pWild != pWildEnd || flag ) { switch (*pWild) { case '?': - if ( *pStr == '\0' ) + if ( pStr == pStrEnd ) return false; break; default: - if ( (*pWild == '\\') && ((*(pWild+1)=='?') || (*(pWild+1) == '*')) ) + if ( (*pWild == '\\') && (pWild + 1 != pWildEnd) && ((*(pWild+1)=='?') || (*(pWild+1) == '*')) ) pWild++; if ( *pWild != *pStr ) if ( !pos ) @@ -53,37 +57,37 @@ bool WildCard::ImpMatch( const sal_Unicode *pWild, const sal_Unicode *pStr ) // circumstances! [[fallthrough]]; case '*': - while ( *pWild == '*' ) + while ( pWild != pWildEnd && *pWild == '*' ) pWild++; - if ( *pWild == '\0' ) + if ( pWild == pWildEnd ) return true; flag = 1; pos = 0; - if ( *pStr == '\0' ) - return ( *pWild == '\0' ); - while ( *pStr && *pStr != *pWild ) + if ( pStr == pStrEnd ) + return false; + while ( pStr != pStrEnd && *pStr != *pWild ) { if ( *pWild == '?' ) { pWild++; - while ( *pWild == '*' ) + while ( pWild != pWildEnd && *pWild == '*' ) pWild++; } pStr++; - if ( *pStr == '\0' ) - return ( *pWild == '\0' ); + if ( pStr == pStrEnd ) + return pWild == pWildEnd; } break; } - if ( *pWild != '\0' ) + if ( pWild != pWildEnd ) pWild++; - if ( *pStr != '\0' ) + if ( pStr != pStrEnd ) pStr++; else flag = 0; if ( flag ) pos--; } - return ( *pStr == '\0' ) && ( *pWild == '\0' ); + return ( pStr == pStrEnd ) && ( pWild == pWildEnd ); } bool WildCard::Matches( std::u16string_view rString ) const @@ -97,13 +101,13 @@ bool WildCard::Matches( std::u16string_view rString ) const while ( (nSepPos = aTmpWild.indexOf(cSepSymbol)) != -1 ) { // Check all split wildcards - if ( ImpMatch( aTmpWild.subView( 0, nSepPos ).data(), rString.data() ) ) + if ( ImpMatch( aTmpWild.subView( 0, nSepPos ), rString ) ) return true; aTmpWild = aTmpWild.copy(nSepPos + 1); // remove separator } } - return ImpMatch( aTmpWild.getStr(), rString.data() ); + return ImpMatch( aTmpWild, rString ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 9ae4e939ddf1dd7592c52a3f2af77275da5d423d Author: Michael Stahl <[email protected]> AuthorDate: Mon Mar 14 19:11:21 2022 +0100 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:10 2022 +0100 tdf#135220 sw: fix layout after SwUndoDelete The bugdoc is 398 pages after initial load and 397 pages after Undo. There is really only one problem, on page 6 the fly frame 7370 "Figure 3: Hay Rake in Weeds" anchored on SwTextFrame 5896 should be on page 7 and aligned to the top of its paragraph. First, 5986 moves forward from page 6 to 7, hitting the condition added in commit c799de145f7e289f31e3669646e5bd12814e6c5e debug:1170918:1170918: SwObjectFormatterTextFrame::CheckMovedFwdCondition(): o_rbPageHasFlysAnchoredBelowThis because next chain on same page Then 5986 moves back to page 6. When it is formatted there, the ConsiderObjWrapInfluenceOnObjPos() is true, preventing a formatting of the anchor frame - so it does not move forward. The flag SetTmpConsiderWrapInfluence(true) was set the first time (when it moved forward). Setting this flag for any anchor frame that moves forward was added in 2005 in commit 46297c0923c50a12510c7b15b725c8d2fd80f9c0 and apparently the only way the flag is cleared is when SwDoc's SetModified() is called (or the frame is in a table or column). So it is similar to the InsertMovedFwdFrame() case that was addressed by commit c799de145f7e289f31e3669646e5bd12814e6c5e in that the flag should not be set if bPageHasFlysAnchoredBelowThis is true. (reportedly regression from sw_redlinehide commit 6c7245e789f973cf6dad03f7008ab3f9d12d350c) Change-Id: I27b2a1becf5f7a760e74e801e23472116d0a5ced Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131560 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit d9e38d5830ac278d7180b96fb6cefe3ee8ef6d76) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131590 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index 2ed6bb36b67a..5e9bdfe92ef0 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -426,7 +426,10 @@ void SwFlyAtContentFrame::MakeAll(vcl::RenderContext* pRenderContext) bAnchoredAtMaster, nToPageNum, bDummy, bPageHasFlysAnchoredBelowThis) ) { - bConsiderWrapInfluenceDueToMovedFwdAnchor = true; + if (!bPageHasFlysAnchoredBelowThis) + { + bConsiderWrapInfluenceDueToMovedFwdAnchor = true; + } // mark anchor text frame // directly, that it is moved forward by object positioning. SwTextFrame* pAnchorTextFrame( static_cast<SwTextFrame*>(AnchorFrame()) ); commit 5aeb7efd8e4430b565616c837e0ab524e9fb094f Author: Jean-Pierre Ledure <[email protected]> AuthorDate: Wed Mar 16 11:24:51 2022 +0100 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:09 2022 +0100 ScriptForge - (SF_Form) fix use of BaseForm Context: Base documents. In a form or formcontrol event, a user script might need the name of the form document in which the form or control is located, f.i. to close it. The name of the form document is supposed to be found in the SF_Form.BaseForm property. The property is set correctly when the Base form document to form/formcontrol path is taken (top-down), not when the opposite path is taken (bottom-up), typically in events. In the latter case BaseForm is equal to an empty string. The actual commit initializes correctly the BaseForm property with the hierarchical name of the form document. Fix on master: https://gerrit.libreoffice.org/c/core/+/131618 Change-Id: I1fc98c87c8f72a6b92d456fa74395c7919ce284c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131649 Tested-by: Jenkins Tested-by: Jean-Pierre Ledure <[email protected]> Reviewed-by: Jean-Pierre Ledure <[email protected]> diff --git a/wizards/source/sfdocuments/SF_Form.xba b/wizards/source/sfdocuments/SF_Form.xba index 93beee283c37..034f803b3bf3 100644 --- a/wizards/source/sfdocuments/SF_Form.xba +++ b/wizards/source/sfdocuments/SF_Form.xba @@ -1259,6 +1259,7 @@ Try: Set _Component = oParent If IsNull([_Parent]._FormDocuments) Then Set [_Parent]._FormDocuments = _Component.getFormDocuments() Set _FormDocument = [_Parent]._FindByPersistentName([_Parent]._FormDocuments, sPersistentName) + _FormDocumentName = _FormDocument.HierarchicalName Case Else End Select If oSession.HasUnoProperty(oParent, "Parent") Then Set oParent = oParent.Parent Else Set oParent = Nothing commit 9b11dcff8101c286e00426dc06a64ae1c7f129a7 Author: Vasily Melenchuk <[email protected]> AuthorDate: Thu Mar 10 12:04:20 2022 +0300 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:09 2022 +0100 tdf#146851: writerfilter: do not recreate list levels on override AddLevel() can be called on w:lvl and on w:lvlOverride. But if we have level override and some extra level definition level is recreated and override information is lost. Change-Id: I6f1b9b50bdd3410b4ae2d403e760e4d6df5677d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131304 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131647 Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/data/tdf146851_1.docx b/sw/qa/extras/ooxmlexport/data/tdf146851_1.docx new file mode 100644 index 000000000000..b4456bf40074 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf146851_1.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx index 52465ed66d90..d8e15116eb48 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx @@ -151,6 +151,17 @@ DECLARE_OOXMLEXPORT_TEST(testTdf142407, "tdf142407.docx") CPPUNIT_ASSERT_EQUAL( sal_Int16(36), nGridLines); // was 23, left large space before text. } +DECLARE_OOXMLEXPORT_TEST(testTdf146851_1, "tdf146851_1.docx") +{ + uno::Reference<beans::XPropertySet> xPara; + + xPara.set(getParagraph(1, "qwerty"), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("1."), getProperty<OUString>(xPara, "ListLabelString")); + + xPara.set(getParagraph(2, "asdfg"), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("1/"), getProperty<OUString>(xPara, "ListLabelString")); +} + DECLARE_OOXMLEXPORT_TEST(testTdf81507, "tdf81507.docx") { xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml"); diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 8829aa52697f..1c79e0eece99 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -371,9 +371,12 @@ void AbstractListDef::AddLevel( sal_uInt16 nLvl ) if ( nLvl >= m_aLevels.size() ) m_aLevels.resize( nLvl+1 ); - ListLevel::Pointer pLevel( new ListLevel ); - m_pCurrentLevel = pLevel; - m_aLevels[nLvl] = pLevel; + if (!m_aLevels[nLvl]) + { + m_aLevels[nLvl] = new ListLevel; + } + + m_pCurrentLevel = m_aLevels[nLvl]; } uno::Sequence<uno::Sequence<beans::PropertyValue>> AbstractListDef::GetPropertyValues(bool bDefaults) commit 64c62510f44a16725fad9781aacbefc419cc6b05 Author: Michael Stahl <[email protected]> AuthorDate: Fri Mar 11 17:29:41 2022 +0100 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:09 2022 +0100 hwpfilter: why isn't that path string null terminated Change-Id: Iaedc23bd91d0d46e34d55dcc65760b73c5772b7e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131559 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 4c86ed851bc1c0a2414e254082064760c99437f1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131589 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx index e04e4aa72f6c..a301170accb9 100644 --- a/hwpfilter/source/hwpread.cxx +++ b/hwpfilter/source/hwpread.cxx @@ -457,6 +457,7 @@ bool Picture::Read(HWPFile & hwpf) scale[1] = tmp16; hwpf.ReadBlock(picinfo.picun.path, 256); /* Picture File Name: when type is not a Drawing. */ + picinfo.picun.path[255] = 0; // ensure null terminated hwpf.ReadBlock(reserved3, 9); /* Brightness / Contrast / Picture Effect, etc. */ UpdateBBox(this); commit 6504665fb9a8e3ab3d3b00c8767981d095b05e5d Author: Vasily Melenchuk <[email protected]> AuthorDate: Wed Mar 9 17:00:02 2022 +0300 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:09 2022 +0100 tdf#144563: remove final dot in cross-references to paragraph It looks like in cross-references ending with dot (".") one last dot is removed in case of MS Word. This is not a true for any other suffixes after numeration. Change-Id: I554e62cf45e643bf27823df5344e1689b5b6ae54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131254 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131542 Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index f06778fc25b4..87e2aead4997 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -2794,7 +2794,7 @@ DECLARE_ODFEXPORT_TEST(testReferenceLanguage, "referencelanguage.odt") OUString const aFieldTexts[] = { "A 2", "Az Isten", "Az 50-esek", "A 2018-asok", "Az egyebek", "A fejezetek", u"Az „Őseinket...”", "a 2", - "Az v.", "az 1", "Az e)", "az 1", + "Az v", "az 1", "Az e)", "az 1", "Az (5)", "az 1", "A 2", "az 1" }; uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY); // update "A (4)" to "Az (5)" diff --git a/sw/qa/extras/ooxmlexport/data/tdf144563.docx b/sw/qa/extras/ooxmlexport/data/tdf144563.docx new file mode 100644 index 000000000000..59d64d2d1bf3 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf144563.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx index ec07a5a946f0..52465ed66d90 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx @@ -12,6 +12,9 @@ #include <string_view> #include <com/sun/star/text/XBookmarksSupplier.hpp> +#include <com/sun/star/text/XTextFieldsSupplier.hpp> +#include <com/sun/star/text/XTextField.hpp> +#include <com/sun/star/util/XRefreshable.hpp> #include <comphelper/configuration.hxx> #include <comphelper/scopeguard.hxx> @@ -170,6 +173,32 @@ DECLARE_OOXMLEXPORT_TEST(testTdf81507, "tdf81507.docx") xmlXPathFreeObject(pXmlObj); } +DECLARE_OOXMLEXPORT_TEST(testTdf144563, "tdf144563.docx") +{ + uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XEnumerationAccess> xFieldsAccess(xTextFieldsSupplier->getTextFields()); + + // Refresh all cross-reference fields + uno::Reference<util::XRefreshable>(xFieldsAccess, uno::UNO_QUERY_THROW)->refresh(); + + // Verify values + uno::Reference<container::XEnumeration> xFields(xFieldsAccess->createEnumeration()); + + std::vector<OUString> aExpectedValues = { + // These field values are NOT in order in document: getTextFields did provide + // fields in a strange but fixed order + "1", "1", "1", "1", "1/", "1/", "1/", "1)", "1)", "1)", "1.)", + "1.)", "1.)", "1..", "1..", "1..", "1.", "1.", "1.", "1", "1" + }; + + sal_uInt16 nIndex = 0; + while (xFields->hasMoreElements()) + { + uno::Reference<text::XTextField> xTextField(xFields->nextElement(), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(aExpectedValues[nIndex++], xTextField->getPresentation(false)); + } +} + DECLARE_OOXMLEXPORT_TEST(testTdf144668, "tdf144668.odt") { uno::Reference<beans::XPropertySet> xPara1(getParagraph(1, u"level1"), uno::UNO_QUERY); diff --git a/sw/qa/python/check_cross_references.py b/sw/qa/python/check_cross_references.py index 3c9319200ea7..7778ff5f2100 100644 --- a/sw/qa/python/check_cross_references.py +++ b/sw/qa/python/check_cross_references.py @@ -89,16 +89,16 @@ class CheckCrossReferences(unittest.TestCase): FieldResult1 = "*i*" FieldResult2 = "+b+*i*" FieldResult3 = "-1-+b+*i*" - FieldResult4 = "1." - FieldResult5 = "1." - FieldResult6 = "A.1." + FieldResult4 = "1" + FieldResult5 = "1" + FieldResult6 = "A.1" FieldResult7 = " 2.(a)" FieldResult8 = " 2.(b)" - FieldResult9 = " 2." + FieldResult9 = " 2" FieldResult10 = " 1.(a)" FieldResult11 = "(b)" FieldResult12 = "(a)" - FieldResult13 = " 1." + FieldResult13 = " 1" # variables for current field xField = self.getNextField() diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 93a5c149f15c..8a5b9c5d7c60 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -882,6 +882,12 @@ OUString SwNumRule::MakeRefNumString( const SwNodeNum& rNodeNum, pWorkingNodeNum->GetLevelInListTree() >= nRestrictInclToThisLevel ); } + if (aRefNumStr.endsWith(".")) + { + // tdf#144563: looks like a special case for refs by MS Word: if numbering is ending with dot, this dot is removed + aRefNumStr = aRefNumStr.copy(0, aRefNumStr.getLength() - 1); + } + return aRefNumStr; } commit 96fd2bd5819d67de73022ae005ff04bee1e7056f Author: Xisco Fauli <[email protected]> AuthorDate: Mon Mar 14 16:23:57 2022 +0100 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:09 2022 +0100 tdf#147905: sc_parallelism: Add unittest Change-Id: Ib71a30d7ef8d907c1fd86e35d3e6cae5c15218bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131549 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit bee6568ae5d49f5b697740a23c5a1c6775f64d52) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131483 diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx index 37dcd79e546c..5fc47c23304d 100644 --- a/sc/qa/unit/parallelism.cxx +++ b/sc/qa/unit/parallelism.cxx @@ -35,6 +35,7 @@ public: void testVLOOKUP(); void testVLOOKUPSUM(); void testSingleRef(); + void testTdf147905(); void testSUMIFImplicitRange(); void testFGCycleWithPlainFormulaCell1(); void testFGCycleWithPlainFormulaCell2(); @@ -54,6 +55,7 @@ public: CPPUNIT_TEST(testVLOOKUP); CPPUNIT_TEST(testVLOOKUPSUM); CPPUNIT_TEST(testSingleRef); + CPPUNIT_TEST(testTdf147905); CPPUNIT_TEST(testSUMIFImplicitRange); CPPUNIT_TEST(testFGCycleWithPlainFormulaCell1); CPPUNIT_TEST(testFGCycleWithPlainFormulaCell2); @@ -400,6 +402,34 @@ void ScParallelismTest::testSingleRef() m_pDoc->DeleteTab(0); } +void ScParallelismTest::testTdf147905() +{ + m_pDoc->InsertTab(0, "1"); + + OUString aFormula; + const size_t nNumRows = 500; + for (size_t i = 0; i < nNumRows; ++i) + { + m_pDoc->SetString(0, i, 0, "AAAAAAAA"); + aFormula = "=PROPER($A" + OUString::number(i+1) + ")"; + m_pDoc->SetFormula(ScAddress(1, i, 0), + aFormula, + formula::FormulaGrammar::GRAM_NATIVE_UI); + } + + m_xDocShell->DoHardRecalc(); + + for (size_t i = 0; i < nNumRows; ++i) + { + OString aMsg = "At row " + OString::number(i); + CPPUNIT_ASSERT_EQUAL_MESSAGE(aMsg.getStr(), OUString("AAAAAAAA"), m_pDoc->GetString(0, i, 0)); + + // Without the fix in place, this test would have failed here + CPPUNIT_ASSERT_EQUAL_MESSAGE(aMsg.getStr(), OUString("Aaaaaaaa"), m_pDoc->GetString(1, i, 0)); + } + m_pDoc->DeleteTab(0); +} + // Common test setup steps for testSUMIFImplicitRange*() static void lcl_setupCommon(ScDocument* pDoc, size_t nNumRows, size_t nConstCellValue) { commit 72205dbebae91d8428426fd15f9e952395026340 Author: Noel Grandin <[email protected]> AuthorDate: Mon Mar 14 14:03:56 2022 +0200 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:08 2022 +0100 tdf#147143 Word selection error in Arabic text this reverts commit 563af8fd15aa37e75af8882cccbdf8914ebe8e61 Author: Noel Grandin <[email protected]> Date: Fri Jan 7 22:50:29 2022 +0200 tdf#144890 Invalid selection area when text in LTR run and commit ec50b9e5eaec7c94df35617676077ef0d65cecc7 Author: Noel Grandin <[email protected]> Date: Thu May 27 11:16:11 2021 +0200 no need to allocate Sw2LinesPos separately on heap No idea why the commits caused trouble, clearing there is some "interesting" interaction going on. Change-Id: I606768403db777b61554f378d3f69f9b4d33d493 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131533 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 22be1665dc6eb28ea1d52c7c5e4347628fc5a76b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131477 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx index f3430c714787..9b223319fd93 100644 --- a/sw/inc/crstate.hxx +++ b/sw/inc/crstate.hxx @@ -23,7 +23,7 @@ #include <tools/gen.hxx> #include "swrect.hxx" -#include <optional> +#include <memory> enum class SwFillMode { @@ -132,7 +132,7 @@ enum class CursorMoveState struct SwCursorMoveState { SwFillCursorPos *m_pFill; ///< for automatic filling with tabs etc - std::optional<Sw2LinesPos> m_x2Lines; ///< for selections inside/around 2line portions + std::unique_ptr<Sw2LinesPos> m_p2Lines; ///< for selections inside/around 2line portions SwSpecialPos* m_pSpecialPos; ///< for positions inside fields Point m_aRealHeight; ///< contains then the position/height of the cursor CursorMoveState m_eState; diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 0e99d2b3bd0a..6942dab6a2ba 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -2124,11 +2124,11 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor) //ContentRects to Start- and EndFrames. SwRect aStRect, aEndRect; pStartFrame->GetCharRect( aStRect, *pStartPos, &aTmpState ); - std::optional<Sw2LinesPos> pSt2Pos = std::move(aTmpState.m_x2Lines); + std::unique_ptr<Sw2LinesPos> pSt2Pos = std::move(aTmpState.m_p2Lines); aTmpState.m_nCursorBidiLevel = pEndFrame->IsRightToLeft() ? 1 : 0; pEndFrame->GetCharRect( aEndRect, *pEndPos, &aTmpState ); - std::optional<Sw2LinesPos> pEnd2Pos = std::move(aTmpState.m_x2Lines); + std::unique_ptr<Sw2LinesPos> pEnd2Pos = std::move(aTmpState.m_p2Lines); SwRect aStFrame ( pStartFrame->UnionFrame( true ) ); aStFrame.Intersection( pStartFrame->GetPaintArea() ); @@ -2145,7 +2145,7 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor) // If there's no doubleline portion involved or start and end are both // in the same doubleline portion, all works fine, but otherwise // we need the following... - if( (!pSt2Pos && !pEnd2Pos) && ( !pSt2Pos || !pEnd2Pos || + if( pSt2Pos != pEnd2Pos && ( !pSt2Pos || !pEnd2Pos || pSt2Pos->aPortion != pEnd2Pos->aPortion ) ) { // If we have a start(end) position inside a doubleline portion diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx index 0eb130848f3d..58792ecf80d6 100644 --- a/sw/source/core/text/frmcrsr.cxx +++ b/sw/source/core/text/frmcrsr.cxx @@ -307,10 +307,10 @@ bool SwTextFrame::GetCharRect( SwRect& rOrig, const SwPosition &rPos, { if ( pFrame->IsRightToLeft() ) { - if( pCMS->m_b2Lines && pCMS->m_x2Lines) + if( pCMS->m_b2Lines && pCMS->m_p2Lines) { - pFrame->SwitchLTRtoRTL( pCMS->m_x2Lines->aLine ); - pFrame->SwitchLTRtoRTL( pCMS->m_x2Lines->aPortion ); + pFrame->SwitchLTRtoRTL( pCMS->m_p2Lines->aLine ); + pFrame->SwitchLTRtoRTL( pCMS->m_p2Lines->aPortion ); } } @@ -327,10 +327,10 @@ bool SwTextFrame::GetCharRect( SwRect& rOrig, const SwPosition &rPos, pCMS->m_aRealHeight.Y() ); } } - if( pCMS->m_b2Lines && pCMS->m_x2Lines) + if( pCMS->m_b2Lines && pCMS->m_p2Lines) { - pFrame->SwitchHorizontalToVertical( pCMS->m_x2Lines->aLine ); - pFrame->SwitchHorizontalToVertical( pCMS->m_x2Lines->aPortion ); + pFrame->SwitchHorizontalToVertical( pCMS->m_p2Lines->aLine ); + pFrame->SwitchHorizontalToVertical( pCMS->m_p2Lines->aPortion ); } } diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 7d60210fba7b..d9d87aaa713c 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -676,26 +676,26 @@ void SwTextCursor::GetCharRect_( SwRect* pOrig, TextFrameIndex const nOfst, if( pCMS && pCMS->m_b2Lines ) { - const bool bRecursion (pCMS->m_x2Lines); + const bool bRecursion (pCMS->m_p2Lines); if ( !bRecursion ) { - pCMS->m_x2Lines = Sw2LinesPos(); - pCMS->m_x2Lines->aLine = SwRect(aCharPos, aCharSize); + pCMS->m_p2Lines.reset(new Sw2LinesPos); + pCMS->m_p2Lines->aLine = SwRect(aCharPos, aCharSize); } if( static_cast<SwMultiPortion*>(pPor)->HasRotation() ) { if( static_cast<SwMultiPortion*>(pPor)->IsRevers() ) - pCMS->m_x2Lines->nMultiType = MultiPortionType::ROT_270; + pCMS->m_p2Lines->nMultiType = MultiPortionType::ROT_270; else - pCMS->m_x2Lines->nMultiType = MultiPortionType::ROT_90; + pCMS->m_p2Lines->nMultiType = MultiPortionType::ROT_90; } else if( static_cast<SwMultiPortion*>(pPor)->IsDouble() ) - pCMS->m_x2Lines->nMultiType = MultiPortionType::TWOLINE; + pCMS->m_p2Lines->nMultiType = MultiPortionType::TWOLINE; else if( static_cast<SwMultiPortion*>(pPor)->IsBidi() ) - pCMS->m_x2Lines->nMultiType = MultiPortionType::BIDI; + pCMS->m_p2Lines->nMultiType = MultiPortionType::BIDI; else - pCMS->m_x2Lines->nMultiType = MultiPortionType::RUBY; + pCMS->m_p2Lines->nMultiType = MultiPortionType::RUBY; SwTwips nTmpWidth = pPor->Width(); if( nSpaceAdd ) @@ -705,9 +705,9 @@ void SwTextCursor::GetCharRect_( SwRect* pOrig, TextFrameIndex const nOfst, Size( nTmpWidth, pPor->Height() ) ); if ( ! bRecursion ) - pCMS->m_x2Lines->aPortion = aRect; + pCMS->m_p2Lines->aPortion = aRect; else - pCMS->m_x2Lines->aPortion2 = aRect; + pCMS->m_p2Lines->aPortion2 = aRect; } // In a multi-portion we use GetCharRect()-function @@ -1215,12 +1215,12 @@ void SwTextCursor::GetCharRect( SwRect* pOrig, TextFrameIndex const nOfst, pOrig->Pos().AdjustX(aCharPos.X() ); pOrig->Pos().AdjustY(aCharPos.Y() ); - if( pCMS && pCMS->m_b2Lines && pCMS->m_x2Lines ) + if( pCMS && pCMS->m_b2Lines && pCMS->m_p2Lines ) { - pCMS->m_x2Lines->aLine.Pos().AdjustX(aCharPos.X() ); - pCMS->m_x2Lines->aLine.Pos().AdjustY(aCharPos.Y() ); - pCMS->m_x2Lines->aPortion.Pos().AdjustX(aCharPos.X() ); - pCMS->m_x2Lines->aPortion.Pos().AdjustY(aCharPos.Y() ); + pCMS->m_p2Lines->aLine.Pos().AdjustX(aCharPos.X() ); + pCMS->m_p2Lines->aLine.Pos().AdjustY(aCharPos.Y() ); + pCMS->m_p2Lines->aPortion.Pos().AdjustX(aCharPos.X() ); + pCMS->m_p2Lines->aPortion.Pos().AdjustY(aCharPos.Y() ); } const IDocumentSettingAccess& rIDSA = GetTextFrame()->GetDoc().getIDocumentSettingAccess(); commit b0ac551800e03cd71b230619a642530b49c795a9 Author: Mike Kaganski <[email protected]> AuthorDate: Fri Mar 11 15:19:41 2022 +0300 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:08 2022 +0100 Related: tdf#128610 Avoid use-after-free Creating SvMemoryStream from string makes it non-owning, i.e. pointing to the string's memory. So the string must outlive the stream. Since commit 64bc8b45b5c23efc5fe57585a69aa4263aaf4e83 Date Wed Jul 08 12:31:43 2015 +0000 i#107734 Support for Math Input Panel in Windows 7 Was only working by chance, when destructor didn't clean the memory (e.g., in optimized release builds) and the released memory hasn't been reused yet. Change-Id: I2e0c195de7bd2aff2889a94ef0f2eb084411933f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131373 Tested-by: Mike Kaganski <[email protected]> Reviewed-by: Mike Kaganski <[email protected]> (cherry picked from commit c964700d16d99d1569373a1eb9a1352fb3512915) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131474 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 5bc143ab394b..62e8b01d5348 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1778,31 +1778,18 @@ void SmViewShell::Execute(SfxRequest& rReq) SfxFilter::GetFilterByName(MATHML_XML); aClipboardMedium.SetFilter(pMathFilter); - std::unique_ptr<SvMemoryStream> pStrm; // The text to be imported might asserts encoding like 'encoding="utf-8"' but FORMAT_STRING is UTF-16. // Force encoding to UTF-16, if encoding exists. - bool bForceUTF16 = false; sal_Int32 nPosL = aString.indexOf("encoding=\""); - sal_Int32 nPosU = -1; if ( nPosL >= 0 && nPosL +10 < aString.getLength() ) { nPosL += 10; - nPosU = aString.indexOf( '"',nPosL); + sal_Int32 nPosU = aString.indexOf( '"',nPosL); if (nPosU > nPosL) - { - bForceUTF16 = true; - } + aString = aString.replaceAt(nPosL, nPosU - nPosL, u"UTF-16"); } - if ( bForceUTF16 ) - { - OUString aNewString = aString.replaceAt( nPosL, nPosU-nPosL, u"UTF-16"); - pStrm.reset(new SvMemoryStream( const_cast<sal_Unicode *>(aNewString.getStr()), aNewString.getLength() * sizeof(sal_Unicode), StreamMode::READ)); - } - else - { - pStrm.reset(new SvMemoryStream( const_cast<sal_Unicode *>(aString.getStr()), aString.getLength() * sizeof(sal_Unicode), StreamMode::READ)); - } - uno::Reference<io::XInputStream> xStrm2( new ::utl::OInputStreamWrapper(*pStrm) ); + SvMemoryStream aStrm( const_cast<sal_Unicode *>(aString.getStr()), aString.getLength() * sizeof(sal_Unicode), StreamMode::READ); + uno::Reference<io::XInputStream> xStrm2( new ::utl::OInputStreamWrapper(aStrm) ); aClipboardMedium.setStreamToLoadFrom(xStrm2, true /*bIsReadOnly*/); InsertFrom(aClipboardMedium); GetDoc()->UpdateText(); commit 70b65fa801283d5be21c2fece88620014cf0f289 Author: Eike Rathke <[email protected]> AuthorDate: Fri Mar 11 21:44:21 2022 +0100 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:08 2022 +0100 Related: tdf#111675 Clear global error for arguments if possible ... i.e. if the last result / current stack value is svError already (usually is nowadays in case of error) and error evaluating functions may be pending. Change-Id: I36fc0f169d36dfa7007e8bd3a5c368ed2bb3c919 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131405 Reviewed-by: Eike Rathke <[email protected]> Tested-by: Jenkins (cherry picked from commit efb713febeaaf3e4b17886d405d46845d4a0e676) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131363 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index bc99592a15a8..1a0eed81302f 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4540,6 +4540,18 @@ StackVar ScInterpreter::Interpret() } if ( nErrorFunction >= nErrorFunctionCount ) ++nErrorFunction; // that's it, error => terminate + else if (nErrorFunctionCount && sp && GetStackType() == svError) + { + // Clear global error if we have an individual error result, so + // an error evaluating function can receive multiple arguments + // and not all evaluated arguments inheriting the error. + // This is important for at least IFS() and SWITCH() as long as + // they are classified as error evaluating functions and not + // implemented as short-cutting jump code paths, but also for + // more than one evaluated argument to AGGREGATE() or COUNT() + // that may ignore errors. + nGlobalError = FormulaError::NONE; + } } } commit b03b2706f28765baedfbb898d38a4ce6a54e9165 Author: Eike Rathke <[email protected]> AuthorDate: Fri Mar 11 21:28:19 2022 +0100 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:08 2022 +0100 Related: tdf#111675 Replace Pop() with PopError() where relevant ... to propagate the original (previous) error instead of overriding it with a new error. Pop() may only be used if the stack type is already known to be not svError, or to explicitly ignore a current error. Change-Id: I5a980c29f2d2679c0e2f2fc7e53c458dc147911f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131404 Reviewed-by: Julien Nabet <[email protected]> Tested-by: Jenkins (cherry picked from commit 84720c09ef30e79c56936026c3992240b4ae010b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131362 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 131f76cca889..d40e93608d6e 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2828,7 +2828,7 @@ void ScInterpreter::ScFormula() } break; default: - Pop(); + PopError(); SetError( FormulaError::NotAvailable ); } PushString( aFormula ); @@ -3727,7 +3727,7 @@ void ScInterpreter::ScMin( bool bTextAsZero ) } break; default : - Pop(); + PopError(); SetError(FormulaError::IllegalParameter); } } @@ -3885,7 +3885,7 @@ void ScInterpreter::ScMax( bool bTextAsZero ) } break; default : - Pop(); + PopError(); SetError(FormulaError::IllegalParameter); } } @@ -4096,7 +4096,7 @@ void ScInterpreter::GetStVarParams( bool bTextAsZero, double(*VarResult)( double } break; default : - Pop(); + PopError(); SetError(FormulaError::IllegalParameter); } } diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 929844886b66..bc99592a15a8 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -2701,7 +2701,7 @@ void ScInterpreter::ScExternal() else { while( nParamCount-- > 0) - Pop(); + PopError(); PushIllegalParameter(); } } @@ -3077,7 +3077,7 @@ void ScInterpreter::ScExternal() { while( nParamCount-- > 0) { - Pop(); + PopError(); } PushError( FormulaError::NoAddin ); } diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx index dbeab67fe35c..9dd442624884 100644 --- a/sc/source/core/tool/interpr6.cxx +++ b/sc/source/core/tool/interpr6.cxx @@ -515,7 +515,7 @@ void ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero ) else { while (nParamCount-- > 0) - Pop(); + PopError(); SetError( FormulaError::NoValue ); } } commit 8dc3752f0495768e70e559bc57f2245993101f07 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Mar 14 11:26:52 2022 +0100 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:08 2022 +0100 sw: fix bug id in comment Change-Id: I510a48765b2ad286ddc194f6ca1a96211bcb05f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131528 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 01ec377c04c8dfaebdeb1002fd2d9a0e8f135b8c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131475 Tested-by: Adolfo Jayme Barrientos <[email protected]> Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 4647656a0226..d7fb25861c92 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -1505,7 +1505,7 @@ void SwAnnotationShell::ExecUndo(SfxRequest &rReq) SwWrtShell &rSh = m_rView.GetWrtShell(); SwUndoId nUndoId(SwUndoId::EMPTY); - // tdf#147929 get these before "undo" which may delete this SwAnnotationShell + // tdf#147928 get these before "undo" which may delete this SwAnnotationShell SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr(); SfxBindings& rBindings = m_rView.GetViewFrame()->GetBindings(); commit fe82289835632fd8adca00c5611632ca653ffe14 Author: Julien Nabet <[email protected]> AuthorDate: Sat Mar 12 13:59:48 2022 +0100 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:08 2022 +0100 tdf#147309: Recreating a view with same name and in the same session fails (FB) Since HSQLDB already worked, just do the same. Change-Id: I44929cf36179cc3cdff6e61f05899c9a913c78b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131442 Tested-by: Jenkins Reviewed-by: Julien Nabet <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131447 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/connectivity/source/drivers/firebird/Catalog.hxx b/connectivity/source/drivers/firebird/Catalog.hxx index b6bf02f6b69d..3ffb9238eda7 100644 --- a/connectivity/source/drivers/firebird/Catalog.hxx +++ b/connectivity/source/drivers/firebird/Catalog.hxx @@ -32,6 +32,7 @@ namespace connectivity::firebird virtual void refreshUsers() override; sdbcx::OCollection* getPrivateTables() const { return m_pTables.get(); } + sdbcx::OCollection* getPrivateViews() const { return m_pViews.get(); } }; } // namespace connectivity::firebird diff --git a/connectivity/source/drivers/firebird/Tables.cxx b/connectivity/source/drivers/firebird/Tables.cxx index 06e6806d0a4f..29662ef12643 100644 --- a/connectivity/source/drivers/firebird/Tables.cxx +++ b/connectivity/source/drivers/firebird/Tables.cxx @@ -9,6 +9,7 @@ #include "Table.hxx" #include "Tables.hxx" +#include "Views.hxx" #include "Catalog.hxx" #include "Util.hxx" @@ -202,7 +203,14 @@ void Tables::dropObject(sal_Int32 nPosition, const OUString& sName) const OUString sQuoteString = m_xMetaData->getIdentifierQuoteString(); m_xMetaData->getConnection()->createStatement()->execute( - "DROP " + sType + ::dbtools::quoteName(sQuoteString,sName)); + "DROP " + sType + " " + ::dbtools::quoteName(sQuoteString,sName)); + + if (sType == "VIEW") + { + Views* pViews = static_cast<Views*>(static_cast<Catalog&>(m_rParent).getPrivateViews()); + if ( pViews && pViews->hasByName(sName) ) + pViews->dropByNameImpl(sName); + } } void connectivity::firebird::Tables::appendNew(const OUString& _rsNewTable) commit d1bee045022f6d163608cbdf141a9508f9f7e3e5 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Mar 11 17:03:41 2022 +0000 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:07 2022 +0100 ofz#45488 get WW8+ calculation of sprmTDefTable length right we have the calculation correct for WW7- which is what the special L_VAR2 case is for, but for the WW8+ variant that wasn't understood. Change-Id: Ic9dde07223386df796f57dd1f33e69d16d3abf21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131395 Tested-by: Jenkins Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit 13f2e8ab8d1d8b33f3208f82d21d61250f81057d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131360 Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/source/filter/ww8/sprmids.hxx b/sw/source/filter/ww8/sprmids.hxx index ac1d33cf8a80..1d023c3424a9 100644 --- a/sw/source/filter/ww8/sprmids.hxx +++ b/sw/source/filter/ww8/sprmids.hxx @@ -66,6 +66,7 @@ const sal_uInt16 LN_SGprfIhdt = 0x3014; const sal_uInt16 LN_SBCustomize = 0x301e; const sal_uInt16 LN_SPropRMark = 0xd227; const sal_uInt16 LN_SFFacingCol = 0x3229; +const sal_uInt16 LN_TDefTable = 0xd608; const sal_uInt16 LN_TDefTable10 = 0xd606; const sal_uInt16 LN_THTMLProps = 0x740c; const sal_uInt16 LN_TSetBrc10 = 0xd626; diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 52ad77c6c6ec..3f3c3adfb74f 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -1141,14 +1141,6 @@ WW8TabBandDesc::WW8TabBandDesc( WW8TabBandDesc const & rBand ) // ReadDef reads the cell position and the borders of a band void WW8TabBandDesc::ReadDef(bool bVer67, const sal_uInt8* pS, short nLen) { - if (!bVer67) - { - //the ww8 version of this is unusual in masquerading as a srpm with a - //single byte len arg while it really has a word len arg, after this - //increment nLen is correct to describe the remaining amount of data - pS++; - } - --nLen; //reduce len by expected nCols arg if (nLen < 0) return; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index cf81cc434560..71c424bf4546 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -704,7 +704,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher() {NS_sprm::LN_TDefTable10, { 0, L_VAR} }, // "sprmTDefTable10" tap.rgdxaCenter, // tap.rgtc;complex InfoRow<NS_sprm::TDyaRowHeight>(), // tap.dyaRowHeight;dya;word; - InfoRow<NS_sprm::TDefTable>(), // tap.rgtc;complex + {NS_sprm::LN_TDefTable, { 0, L_VAR2} }, // "sprmTDefTable" tap.rgtc;complex InfoRow<NS_sprm::TDefTableShd80>(), // tap.rgshd;complex InfoRow<NS_sprm::TTlp>(), // tap.tlp;TLP;4 bytes; InfoRow<NS_sprm::TFBiDi>(), // ;;; @@ -8413,18 +8413,6 @@ sal_uInt16 wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm, nL = 2 + 4 * nDel + 3 * nIns; } break; - case 0xD608: - { - sal_uInt8 nIndex = 1 + mnDelta; - if (nIndex + 1 >= nRemLen) - { - SAL_WARN("sw.ww8", "sprm longer than remaining bytes, doc or parser is wrong"); - nL = 0; - } - else - nL = SVBT16ToUInt16(&pSprm[nIndex]); - break; - } default: switch (aSprm.nVari) { @@ -8448,8 +8436,13 @@ sal_uInt16 wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm, nCount = 0; } else + { nCount = SVBT16ToUInt16(&pSprm[nIndex]); - nL = static_cast< sal_uInt16 >(nCount + aSprm.nLen - 1); + SAL_WARN_IF(nCount < 1, "sw.ww8", "length should have been at least 1"); + if (nCount) + --nCount; + } + nL = static_cast<sal_uInt16>(nCount + aSprm.nLen); break; } default: commit b5c395bdd71187e6e0da58872b05b339b5482e32 Author: Caolán McNamara <[email protected]> AuthorDate: Sun Mar 13 10:48:47 2022 +0000 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:07 2022 +0100 ofz#45524 string is presumed to be at least length 1 Change-Id: If8a86e399109b414cf53f6e2bffdd3c7c6faa490 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131467 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx index 404bc6aa1b5d..429a818e1af9 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.cxx +++ b/lotuswordpro/source/filter/lwpdrawobj.cxx @@ -1250,7 +1250,11 @@ void LwpDrawTextArt::Read() - (m_aTextArtRec.aPath[1].n*3 + 1)*4; - if (!m_pStream->good() || m_aTextArtRec.nTextLen > m_pStream->remainingSize()) + if (!m_pStream->good()) + throw BadRead(); + if (m_aTextArtRec.nTextLen > m_pStream->remainingSize()) + throw BadRead(); + if (m_aTextArtRec.nTextLen < 1) throw BadRead(); m_aTextArtRec.pTextString = new sal_uInt8 [m_aTextArtRec.nTextLen]; commit e5f012a3575809507042b3d6d5ddd1b56a6c3e67 Author: Noel Grandin <[email protected]> AuthorDate: Sun Mar 13 19:15:20 2022 +0200 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:07 2022 +0100 tdf#147961 Crash Typing "++" and press Enter (AutoCorrect Create Table) regression from commit 7cd5b35caa8d4fa9d0ba2b2c6ce4b88726ed2be6 Author: Noel Grandin <[email protected]> Date: Fri Sep 24 13:21:35 2021 +0200 return SwCursor from IShellCursorSupplier Change-Id: I6a4e3f90653dc96a91091be1372f27c6303ba346 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131505 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 7c7f00a89a675dad541d32ea60695a7b11210102) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131470 diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 6df314ae55c2..5b41af36d30c 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -2374,7 +2374,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & { //JP 30.09.96: DoTable() builds on PopCursor and MoveCursor after AutoFormat! pEdShell->Pop(SwCursorShell::PopMode::DeleteCurrent); - *pEdShell->GetCursor() = static_cast<SwCursor&>(m_aDelPam); + static_cast<SwPaM&>(*pEdShell->GetCursor()) = m_aDelPam; pEdShell->Push(); eStat = IS_END; commit 7840784365ac7567a531f3e752e510a986ff3a73 Author: Noel Grandin <[email protected]> AuthorDate: Sat Mar 12 14:50:28 2022 +0200 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:07 2022 +0100 tdf#147905 calc PROPER function doesn't like mulithreading regression from commit dac29c278531d5474289eb54aa03987c4958ac83 Author: Noel Grandin <[email protected]> Date: Thu Sep 16 11:03:04 2021 +0200 if you hit Transliteration_casemapping hard enough, like in this test case, the state changes become a problem, so remove that by having multiple copies. Change-Id: I1d795af4370d6f79468387997202ba11c6a9d7b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131441 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131508 diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx index 4ae4f5fd362e..4f63b8ea889b 100644 --- a/i18npool/inc/cclass_unicode.hxx +++ b/i18npool/inc/cclass_unicode.hxx @@ -94,7 +94,11 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: - rtl::Reference<Transliteration_casemapping> trans; + // These are performance sensitive, so we don't want to use locking and switch their state, so just + // have multiple copies. + rtl::Reference<Transliteration_casemapping> transToUpper; + rtl::Reference<Transliteration_casemapping> transToLower; + rtl::Reference<Transliteration_casemapping> transToTitle; // --- parser specific (implemented in cclass_unicode_parser.cxx) --- diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx index a53aa77d15d2..6c3418fd7994 100644 --- a/i18npool/inc/transliteration_body.hxx +++ b/i18npool/inc/transliteration_body.hxx @@ -70,7 +70,16 @@ class Transliteration_casemapping final : public Transliteration_body { public: Transliteration_casemapping(); - void setMappingType(const MappingType rMappingType, const css::lang::Locale& rLocale ); + void setMappingType( const MappingType rMappingType ) + { + if (nMappingType != rMappingType) + nMappingType = rMappingType; + } + void setLocale( const css::lang::Locale& rLocale ) + { + if (aLocale != rLocale) + aLocale = rLocale; + } }; class Transliteration_togglecase final : public Transliteration_body diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx index 2eb3fdf5f27d..13ea1f687b56 100644 --- a/i18npool/source/characterclassification/cclass_unicode.cxx +++ b/i18npool/source/characterclassification/cclass_unicode.cxx @@ -39,7 +39,9 @@ namespace i18npool { // ----------------------------------------------------; cclass_Unicode::cclass_Unicode( const uno::Reference < XComponentContext >& rxContext ) : - trans( new Transliteration_casemapping() ), + transToUpper( new Transliteration_casemapping() ), + transToLower( new Transliteration_casemapping() ), + transToTitle( new Transliteration_casemapping() ), m_xContext( rxContext ), nStartTypes( 0 ), nContTypes( 0 ), @@ -48,6 +50,9 @@ cclass_Unicode::cclass_Unicode( const uno::Reference < XComponentContext >& rxCo cDecimalSep( '.' ), cDecimalSepAlt( 0 ) { + transToUpper->setMappingType(MappingType::ToUpper); + transToLower->setMappingType(MappingType::ToLower); + transToTitle->setMappingType(MappingType::ToTitle); } cclass_Unicode::~cclass_Unicode() { @@ -63,8 +68,8 @@ cclass_Unicode::toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, if (nCount + nPos > len) nCount = len - nPos; - trans->setMappingType(MappingType::ToUpper, rLocale); - return trans->transliterateString2String(Text, nPos, nCount); + transToUpper->setLocale(rLocale); + return transToUpper->transliterateString2String(Text, nPos, nCount); } OUString SAL_CALL @@ -75,8 +80,8 @@ cclass_Unicode::toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, if (nCount + nPos > len) nCount = len - nPos; - trans->setMappingType(MappingType::ToLower, rLocale); - return trans->transliterateString2String(Text, nPos, nCount); + transToLower->setLocale(rLocale); + return transToLower->transliterateString2String(Text, nPos, nCount); } OUString SAL_CALL @@ -89,7 +94,7 @@ cclass_Unicode::toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, if (nCount + nPos > len) nCount = len - nPos; - trans->setMappingType(MappingType::ToTitle, rLocale); + transToTitle->setLocale(rLocale); rtl_uString* pStr = rtl_uString_alloc(nCount); sal_Unicode* out = pStr->buffer; rtl::Reference< BreakIteratorImpl > xBrk(new BreakIteratorImpl(m_xContext)); @@ -100,7 +105,7 @@ cclass_Unicode::toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, bdy = xBrk->nextWord(Text, bdy.endPos, rLocale, WordType::ANYWORD_IGNOREWHITESPACES); *out = (i == bdy.startPos) ? - trans->transliterateChar2Char(Text[i]) : Text[i]; + transToTitle->transliterateChar2Char(Text[i]) : Text[i]; } *out = 0; return OUString( pStr, SAL_NO_ACQUIRE ); diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index e1fc11a8d70a..9b05f05b585c 100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx @@ -191,14 +191,6 @@ Transliteration_casemapping::Transliteration_casemapping() implementationName = "com.sun.star.i18n.Transliteration.Transliteration_casemapping"; } -void -Transliteration_casemapping::setMappingType( const MappingType rMappingType, const Locale& rLocale ) -{ - nMappingType = rMappingType; - if (aLocale != rLocale) - aLocale = rLocale; -} - Transliteration_u2l::Transliteration_u2l() { nMappingType = MappingType::UpperToLower; commit b2b081ca5238ac61caf43e5bf1fc732ddccd53d8 Author: Jim Raykowski <[email protected]> AuthorDate: Mon Feb 7 19:34:51 2022 -0900 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:07 2022 +0100 tdf#140222 make InterimTearableParent docking windows not dockable and only allow dockable type docking windows to be undocked/docked Change-Id: Ia1b0ccbdd911c24f83baf1c0514954e354c9070b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129650 Tested-by: Jenkins Reviewed-by: Jim Raykowski <[email protected]> (cherry picked from commit 99ac14c8ccf89a51de1b3fb9d14789406f2dc95f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131019 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index aca9fbb803da..4b94b70bc11c 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -111,7 +111,8 @@ bool Window::EventNotify( NotifyEvent& rNEvt ) // check for docking window // but do nothing if window is docked and locked ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this ); - if (pWrapper && ( pWrapper->IsFloatingMode() || !pWrapper->IsLocked() )) + if ((GetStyle() & WB_DOCKABLE) && + pWrapper && ( pWrapper->IsFloatingMode() || !pWrapper->IsLocked() )) { const bool bDockingSupportCrippled = !StyleSettings::GetDockingFloatsSupported(); diff --git a/vcl/uiconfig/ui/interimtearableparent.ui b/vcl/uiconfig/ui/interimtearableparent.ui index ad8e952b3582..4ab25d2e9b3e 100644 --- a/vcl/uiconfig/ui/interimtearableparent.ui +++ b/vcl/uiconfig/ui/interimtearableparent.ui @@ -9,7 +9,6 @@ <property name="border_width">4</property> <property name="resizable">False</property> <property name="destroy_with_parent">True</property> - <property name="type_hint">dock</property> <child> <object class="GtkBox" id="box"> <property name="visible">True</property> commit 61083ff2a6c859d727db681fbe5db4bc4bfc63a7 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Mar 12 20:24:45 2022 +0000 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:07 2022 +0100 tdf#147928 "undo" may delete the current SwAnnotationShell Change-Id: I69fb7e65e28743aa73e943e02d5029654b5543cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131366 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> Tested-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index b05fedf7c5ae..4647656a0226 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -1505,8 +1505,12 @@ void SwAnnotationShell::ExecUndo(SfxRequest &rReq) SwWrtShell &rSh = m_rView.GetWrtShell(); SwUndoId nUndoId(SwUndoId::EMPTY); - tools::Long aOldHeight = m_rView.GetPostItMgr()->HasActiveSidebarWin() - ? m_rView.GetPostItMgr()->GetActiveSidebarWin()->GetPostItTextHeight() + // tdf#147929 get these before "undo" which may delete this SwAnnotationShell + SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr(); + SfxBindings& rBindings = m_rView.GetViewFrame()->GetBindings(); + + tools::Long aOldHeight = pPostItMgr->HasActiveSidebarWin() + ? pPostItMgr->GetActiveSidebarWin()->GetPostItTextHeight() : 0; sal_uInt16 nId = rReq.GetSlot(); @@ -1579,10 +1583,10 @@ void SwAnnotationShell::ExecUndo(SfxRequest &rReq) } } - m_rView.GetViewFrame()->GetBindings().InvalidateAll(false); + rBindings.InvalidateAll(false); - if (m_rView.GetPostItMgr()->HasActiveSidebarWin()) - m_rView.GetPostItMgr()->GetActiveSidebarWin()->ResizeIfNecessary(aOldHeight,m_rView.GetPostItMgr()->GetActiveSidebarWin()->GetPostItTextHeight()); + if (pPostItMgr->HasActiveSidebarWin()) + pPostItMgr->GetActiveSidebarWin()->ResizeIfNecessary(aOldHeight, pPostItMgr->GetActiveSidebarWin()->GetPostItTextHeight()); } void SwAnnotationShell::StateUndo(SfxItemSet &rSet) commit 5a13ca3f637af91410a53e35239b8c71175b52a6 Author: Noel Grandin <[email protected]> AuthorDate: Fri Mar 11 18:58:58 2022 +0200 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:06 2022 +0100 tdf#147767 html pasted to calc has very small font regression from commit da9bba7cc3c243e936daea689fea64ecaf110f35 Author: Noel Grandin <[email protected]> Date: Mon Jul 26 10:10:17 2021 +0200 use officecfg for SvxHtmlOptions Change-Id: Ia84d713a18b4c694af98478681996b6156cbb928 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131393 Tested-by: Noel Grandin <[email protected]> Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 15c097010f1567d933abf046bc43447bd7415e4c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131364 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index ae93c3e56021..f86b9e3b145c 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -188,13 +188,13 @@ ScHTMLParser::ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ) : ScEEParser( pEditEngine ), mpDoc( pDoc ) { - maFontHeights[0] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_1::get(); - maFontHeights[1] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_2::get(); - maFontHeights[2] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_3::get(); - maFontHeights[3] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_4::get(); - maFontHeights[4] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_5::get(); - maFontHeights[5] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_6::get(); - maFontHeights[6] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_7::get(); + maFontHeights[0] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_1::get() * 20; + maFontHeights[1] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_2::get() * 20; + maFontHeights[2] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_3::get() * 20; + maFontHeights[3] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_4::get() * 20; + maFontHeights[4] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_5::get() * 20; + maFontHeights[5] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_6::get() * 20; + maFontHeights[6] = officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_7::get() * 20; } ScHTMLParser::~ScHTMLParser() commit 9e3043322e1d3795f7418faf2ecb25cc6aaebd66 Author: Rizal Muttaqin <[email protected]> AuthorDate: Sat Mar 12 02:29:51 2022 +0700 Commit: Andras Timar <[email protected]> CommitDate: Tue Mar 22 10:30:06 2022 +0100 Colibre: Fix wrong color, the ones which doesn not follow Monoline (part2) Change-Id: Ibf021302c6d43bec109969fd7174c3c1532db620 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131402 Tested-by: Rizal Muttaqin <[email protected]> Reviewed-by: Rizal Muttaqin <[email protected]> (cherry picked from commit dd7293e774f3bdaf3eda8d88c427f1a9b3605a8d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131356 Tested-by: Jenkins diff --git a/icon-themes/colibre/cmd/32/basicshapes.frame.png b/icon-themes/colibre/cmd/32/basicshapes.frame.png index 383ced47666f..634278ef9bd2 100644 Binary files a/icon-themes/colibre/cmd/32/basicshapes.frame.png and b/icon-themes/colibre/cmd/32/basicshapes.frame.png differ diff --git a/icon-themes/colibre/cmd/32/changepicture.png b/icon-themes/colibre/cmd/32/changepicture.png index 02746c8ccaae..e6eb96b13b8d 100644 Binary files a/icon-themes/colibre/cmd/32/changepicture.png and b/icon-themes/colibre/cmd/32/changepicture.png differ diff --git a/icon-themes/colibre/cmd/32/dbchangedesignmode.png b/icon-themes/colibre/cmd/32/dbchangedesignmode.png index a9122c67feb6..3b0b6b0574c7 100644 Binary files a/icon-themes/colibre/cmd/32/dbchangedesignmode.png and b/icon-themes/colibre/cmd/32/dbchangedesignmode.png differ diff --git a/icon-themes/colibre/cmd/32/dbclearquery.png b/icon-themes/colibre/cmd/32/dbclearquery.png index 01f522595db3..c59058b9ba62 100644 Binary files a/icon-themes/colibre/cmd/32/dbclearquery.png and b/icon-themes/colibre/cmd/32/dbclearquery.png differ diff --git a/icon-themes/colibre/cmd/32/dbnewquery.png b/icon-themes/colibre/cmd/32/dbnewquery.png index 1b63e4b8a922..1edb04df6a13 100644 Binary files a/icon-themes/colibre/cmd/32/dbnewquery.png and b/icon-themes/colibre/cmd/32/dbnewquery.png differ diff --git a/icon-themes/colibre/cmd/32/dbnewqueryautopilot.png b/icon-themes/colibre/cmd/32/dbnewqueryautopilot.png index 5c47947bbb19..c5d82fab58a9 100644 Binary files a/icon-themes/colibre/cmd/32/dbnewqueryautopilot.png and b/icon-themes/colibre/cmd/32/dbnewqueryautopilot.png differ diff --git a/icon-themes/colibre/cmd/32/dbquerydelete.png b/icon-themes/colibre/cmd/32/dbquerydelete.png index b84f6d6b4382..e389a4865150 100644 Binary files a/icon-themes/colibre/cmd/32/dbquerydelete.png and b/icon-themes/colibre/cmd/32/dbquerydelete.png differ diff --git a/icon-themes/colibre/cmd/32/dbqueryedit.png b/icon-themes/colibre/cmd/32/dbqueryedit.png index 7431dfa128f6..b46435b3b350 100644 Binary files a/icon-themes/colibre/cmd/32/dbqueryedit.png and b/icon-themes/colibre/cmd/32/dbqueryedit.png differ diff --git a/icon-themes/colibre/cmd/32/dbqueryopen.png b/icon-themes/colibre/cmd/32/dbqueryopen.png index 94c06ad4a1ff..b8840999e6ff 100644 Binary files a/icon-themes/colibre/cmd/32/dbqueryopen.png and b/icon-themes/colibre/cmd/32/dbqueryopen.png differ diff --git a/icon-themes/colibre/cmd/32/dbquerypropertiesdialog.png b/icon-themes/colibre/cmd/32/dbquerypropertiesdialog.png index ebd92901bc28..da2179075da8 100644 Binary files a/icon-themes/colibre/cmd/32/dbquerypropertiesdialog.png and b/icon-themes/colibre/cmd/32/dbquerypropertiesdialog.png differ diff --git a/icon-themes/colibre/cmd/32/dbqueryrename.png b/icon-themes/colibre/cmd/32/dbqueryrename.png index c3f023de39b3..d6273604d785 100644 Binary files a/icon-themes/colibre/cmd/32/dbqueryrename.png and b/icon-themes/colibre/cmd/32/dbqueryrename.png differ diff --git a/icon-themes/colibre/cmd/32/dbviewqueries.png b/icon-themes/colibre/cmd/32/dbviewqueries.png index 8a93fda452c3..d6432a47a62e 100644 Binary files a/icon-themes/colibre/cmd/32/dbviewqueries.png and b/icon-themes/colibre/cmd/32/dbviewqueries.png differ diff --git a/icon-themes/colibre/cmd/32/hideslide.png b/icon-themes/colibre/cmd/32/hideslide.png index f5e51247d2fd..7f588078a7a7 100644 Binary files a/icon-themes/colibre/cmd/32/hideslide.png and b/icon-themes/colibre/cmd/32/hideslide.png differ diff --git a/icon-themes/colibre/cmd/32/moduledialog.png b/icon-themes/colibre/cmd/32/moduledialog.png index e69649650ca0..55d62ac53546 100644 Binary files a/icon-themes/colibre/cmd/32/moduledialog.png and b/icon-themes/colibre/cmd/32/moduledialog.png differ diff --git a/icon-themes/colibre/cmd/32/sbaexecutesql.png b/icon-themes/colibre/cmd/32/sbaexecutesql.png index 1039ac6caddc..f5dc19e83777 100644 Binary files a/icon-themes/colibre/cmd/32/sbaexecutesql.png and b/icon-themes/colibre/cmd/32/sbaexecutesql.png differ diff --git a/icon-themes/colibre/cmd/32/showinvalid.png b/icon-themes/colibre/cmd/32/showinvalid.png index f9142757d24b..2a231103d078 100644 Binary files a/icon-themes/colibre/cmd/32/showinvalid.png and b/icon-themes/colibre/cmd/32/showinvalid.png differ diff --git a/icon-themes/colibre/cmd/32/tablenumberformatdialog.png b/icon-themes/colibre/cmd/32/tablenumberformatdialog.png index 1ae246da8d23..471acb861b69 100644 Binary files a/icon-themes/colibre/cmd/32/tablenumberformatdialog.png and b/icon-themes/colibre/cmd/32/tablenumberformatdialog.png differ diff --git a/icon-themes/colibre/cmd/lc_basicideappear.png b/icon-themes/colibre/cmd/lc_basicideappear.png index 46d01b186d91..e3a128bd8f93 100644 Binary files a/icon-themes/colibre/cmd/lc_basicideappear.png and b/icon-themes/colibre/cmd/lc_basicideappear.png differ diff --git a/icon-themes/colibre/cmd/lc_controlproperties.png b/icon-themes/colibre/cmd/lc_controlproperties.png index e33f19899184..328bed8e022c 100644 Binary files a/icon-themes/colibre/cmd/lc_controlproperties.png and b/icon-themes/colibre/cmd/lc_controlproperties.png differ diff --git a/icon-themes/colibre/cmd/lc_dataincolumns.png b/icon-themes/colibre/cmd/lc_dataincolumns.png index 9531eff38ac9..c770a41a9f34 100644 Binary files a/icon-themes/colibre/cmd/lc_dataincolumns.png and b/icon-themes/colibre/cmd/lc_dataincolumns.png differ diff --git a/icon-themes/colibre/cmd/lc_dbchangedesignmode.png b/icon-themes/colibre/cmd/lc_dbchangedesignmode.png index 8aad592ad44b..81f08c116c8a 100644 Binary files a/icon-themes/colibre/cmd/lc_dbchangedesignmode.png and b/icon-themes/colibre/cmd/lc_dbchangedesignmode.png differ diff --git a/icon-themes/colibre/cmd/lc_dbclearquery.png b/icon-themes/colibre/cmd/lc_dbclearquery.png index 2a790e4c0d9a..b1b7347d6b17 100644 Binary files a/icon-themes/colibre/cmd/lc_dbclearquery.png and b/icon-themes/colibre/cmd/lc_dbclearquery.png differ diff --git a/icon-themes/colibre/cmd/lc_dbqueryrename.png b/icon-themes/colibre/cmd/lc_dbqueryrename.png index e143b336d493..826708cd67ab 100644 Binary files a/icon-themes/colibre/cmd/lc_dbqueryrename.png and b/icon-themes/colibre/cmd/lc_dbqueryrename.png differ diff --git a/icon-themes/colibre/cmd/lc_diagramdata.png b/icon-themes/colibre/cmd/lc_diagramdata.png index db7955a3576b..8ab407ded565 100644 Binary files a/icon-themes/colibre/cmd/lc_diagramdata.png and b/icon-themes/colibre/cmd/lc_diagramdata.png differ diff --git a/icon-themes/colibre/cmd/lc_filldown.png b/icon-themes/colibre/cmd/lc_filldown.png index 0ea342e8e40f..bf7c2a770c28 100644 Binary files a/icon-themes/colibre/cmd/lc_filldown.png and b/icon-themes/colibre/cmd/lc_filldown.png differ diff --git a/icon-themes/colibre/cmd/lc_hideslide.png b/icon-themes/colibre/cmd/lc_hideslide.png index c7329dd1bf3d..00302e70cd39 100644 Binary files a/icon-themes/colibre/cmd/lc_hideslide.png and b/icon-themes/colibre/cmd/lc_hideslide.png differ diff --git a/icon-themes/colibre/cmd/lc_insertslidetitlefield.png b/icon-themes/colibre/cmd/lc_insertslidetitlefield.png index 8aebba712369..033a46c04d40 100644 Binary files a/icon-themes/colibre/cmd/lc_insertslidetitlefield.png and b/icon-themes/colibre/cmd/lc_insertslidetitlefield.png differ diff --git a/icon-themes/colibre/cmd/lc_moduledialog.png b/icon-themes/colibre/cmd/lc_moduledialog.png index 0139a10f216b..46abc0ee280c 100644 Binary files a/icon-themes/colibre/cmd/lc_moduledialog.png and b/icon-themes/colibre/cmd/lc_moduledialog.png differ diff --git a/icon-themes/colibre/cmd/lc_morecontrols.png b/icon-themes/colibre/cmd/lc_morecontrols.png index 29e593aada2e..73eb5c640572 100644 Binary files a/icon-themes/colibre/cmd/lc_morecontrols.png and b/icon-themes/colibre/cmd/lc_morecontrols.png differ diff --git a/icon-themes/colibre/cmd/lc_refreshformcontrol.png b/icon-themes/colibre/cmd/lc_refreshformcontrol.png index 8509f6eacafe..6c6048fd728b 100644 Binary files a/icon-themes/colibre/cmd/lc_refreshformcontrol.png and b/icon-themes/colibre/cmd/lc_refreshformcontrol.png differ diff --git a/icon-themes/colibre/cmd/lc_renamemasterpage.png b/icon-themes/colibre/cmd/lc_renamemasterpage.png index 777b6c13a938..0e3cb32243eb 100644 Binary files a/icon-themes/colibre/cmd/lc_renamemasterpage.png and b/icon-themes/colibre/cmd/lc_renamemasterpage.png differ diff --git a/icon-themes/colibre/cmd/lc_sbaexecutesql.png b/icon-themes/colibre/cmd/lc_sbaexecutesql.png index 0f6c62c3ede0..75e16950a80d 100644 Binary files a/icon-themes/colibre/cmd/lc_sbaexecutesql.png and b/icon-themes/colibre/cmd/lc_sbaexecutesql.png differ diff --git a/icon-themes/colibre/cmd/lc_showslide.png b/icon-themes/colibre/cmd/lc_showslide.png index 398cc2ccb3e6..0d310e7e6bb6 100644 Binary files a/icon-themes/colibre/cmd/lc_showslide.png and b/icon-themes/colibre/cmd/lc_showslide.png differ diff --git a/icon-themes/colibre/cmd/lc_tablenumberformatdialog.png b/icon-themes/colibre/cmd/lc_tablenumberformatdialog.png index 6b75392a4ab4..b384fed0b3dc 100644 Binary files a/icon-themes/colibre/cmd/lc_tablenumberformatdialog.png and b/icon-themes/colibre/cmd/lc_tablenumberformatdialog.png differ diff --git a/icon-themes/colibre/cmd/lc_togglemergecells.png b/icon-themes/colibre/cmd/lc_togglemergecells.png index 9bb798f9c578..1c48e086e28b 100644 Binary files a/icon-themes/colibre/cmd/lc_togglemergecells.png and b/icon-themes/colibre/cmd/lc_togglemergecells.png differ diff --git a/icon-themes/colibre/cmd/sc_basicshapes.frame.png b/icon-themes/colibre/cmd/sc_basicshapes.frame.png index 398a8993a66e..453c356ac68e 100644 Binary files a/icon-themes/colibre/cmd/sc_basicshapes.frame.png and b/icon-themes/colibre/cmd/sc_basicshapes.frame.png differ diff --git a/icon-themes/colibre/cmd/sc_dbnewquery.png b/icon-themes/colibre/cmd/sc_dbnewquery.png index e093677c3fcc..c413e9c39389 100644 Binary files a/icon-themes/colibre/cmd/sc_dbnewquery.png and b/icon-themes/colibre/cmd/sc_dbnewquery.png differ diff --git a/icon-themes/colibre/cmd/sc_dbquerydelete.png b/icon-themes/colibre/cmd/sc_dbquerydelete.png index ad8ed0ce267a..8cfc87ad9d59 100644 Binary files a/icon-themes/colibre/cmd/sc_dbquerydelete.png and b/icon-themes/colibre/cmd/sc_dbquerydelete.png differ diff --git a/icon-themes/colibre/cmd/sc_displaymode.png b/icon-themes/colibre/cmd/sc_displaymode.png index e751ce9c8a91..1baa2f625f2f 100644 Binary files a/icon-themes/colibre/cmd/sc_displaymode.png and b/icon-themes/colibre/cmd/sc_displaymode.png differ diff --git a/icon-themes/colibre/cmd/sc_flowchartshapes.png b/icon-themes/colibre/cmd/sc_flowchartshapes.png index 64c9f85e6e82..5296eb372727 100644 Binary files a/icon-themes/colibre/cmd/sc_flowchartshapes.png and b/icon-themes/colibre/cmd/sc_flowchartshapes.png differ diff --git a/icon-themes/colibre/cmd/sc_moduledialog.png b/icon-themes/colibre/cmd/sc_moduledialog.png index 6b7d50fe6c92..a01938d1b45c 100644 Binary files a/icon-themes/colibre/cmd/sc_moduledialog.png and b/icon-themes/colibre/cmd/sc_moduledialog.png differ diff --git a/icon-themes/colibre/cmd/sc_sbaexecutesql.png b/icon-themes/colibre/cmd/sc_sbaexecutesql.png index 37866388ea9e..b7ba41a51109 100644 Binary files a/icon-themes/colibre/cmd/sc_sbaexecutesql.png and b/icon-themes/colibre/cmd/sc_sbaexecutesql.png differ diff --git a/icon-themes/colibre/cmd/sc_splitcell.png b/icon-themes/colibre/cmd/sc_splitcell.png index 117735c703ba..5169ed1eb55a 100644 Binary files a/icon-themes/colibre/cmd/sc_splitcell.png and b/icon-themes/colibre/cmd/sc_splitcell.png differ diff --git a/icon-themes/colibre/cmd/sc_splittable.png b/icon-themes/colibre/cmd/sc_splittable.png index 3440efd5d503..3f8d0e0c07bb 100644 Binary files a/icon-themes/colibre/cmd/sc_splittable.png and b/icon-themes/colibre/cmd/sc_splittable.png differ diff --git a/icon-themes/colibre/res/base_thumbnail_256.png b/icon-themes/colibre/res/base_thumbnail_256.png index 4f369ce87471..59138d5a5182 100644 Binary files a/icon-themes/colibre/res/base_thumbnail_256.png and b/icon-themes/colibre/res/base_thumbnail_256.png differ diff --git a/icon-themes/colibre/res/lx03249.png b/icon-themes/colibre/res/lx03249.png index 037d68b4de7f..1d17ac54d1c8 100644 Binary files a/icon-themes/colibre/res/lx03249.png and b/icon-themes/colibre/res/lx03249.png differ diff --git a/icon-themes/colibre/res/lx03250.png b/icon-themes/colibre/res/lx03250.png index 528ecbbb47b5..8f0a71eb60aa 100644 Binary files a/icon-themes/colibre/res/lx03250.png and b/icon-themes/colibre/res/lx03250.png differ diff --git a/icon-themes/colibre/res/lx03255.png b/icon-themes/colibre/res/lx03255.png index 124a93885b55..8bbb1abdecac 100644 Binary files a/icon-themes/colibre/res/lx03255.png and b/icon-themes/colibre/res/lx03255.png differ diff --git a/icon-themes/colibre/res/sx16670.png b/icon-themes/colibre/res/sx16670.png index 2bb35abb4a22..38f63c7f5b45 100644 Binary files a/icon-themes/colibre/res/sx16670.png and b/icon-themes/colibre/res/sx16670.png differ diff --git a/icon-themes/colibre_svg/cmd/32/basicshapes.frame.svg b/icon-themes/colibre_svg/cmd/32/basicshapes.frame.svg index e555326c9c80..b326bbce87e5 100644 --- a/icon-themes/colibre_svg/cmd/32/basicshapes.frame.svg +++ b/icon-themes/colibre_svg/cmd/32/basicshapes.frame.svg @@ -1 +1 @@ -<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="10.661017" x2="10.62712" y1="28.000002" y2="3.457627"><stop offset="0" stop-color="#e5eefc"/><stop offset="1" stop-color="#fcfdff"/></linearGradient><path d="m3.5 3.5v25h25v-25zm4 4h17v17h-17z" fill="url(#a)" stroke="#3a3a38"/></svg> \ No newline at end of file +<svg height="32" viewBox="0 0 8.4666665 8.4666669" width="32" xmlns="http://www.w3.org/2000/svg";><g transform="translate(0 -288.53331)"><path d="m.79375 289.32706v6.87917h6.8791667v-6.87917zm.2645833.26458h6.35v6.35h-6.35zm.79375.79375v4.7625h4.7625v-4.7625zm.2645834.26459h4.2333333v4.23333h-4.2333333z" fill="#3a3a38"/><path d="m1.0583333 289.59164h6.35v6.35h-6.35zm.79375.79375v4.7625h4.7625v-4.7625z" fill="#fafafa"/></g></svg> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/changepicture.svg b/icon-themes/colibre_svg/cmd/32/changepicture.svg index 3ba795a56aa6..8d2abc15ea9f 100644 --- a/icon-themes/colibre_svg/cmd/32/changepicture.svg +++ b/icon-themes/colibre_svg/cmd/32/changepicture.svg @@ -1 +1 @@ -<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";><path d="m6.9980469 3c-.5527774 0-.9980469.446-.9980469 1v21c0 .554.4452695 1 .9980469 1h21.0039061c.552777 0 .998047-.446.998047-1v-21c0-.554-.44527-1-.998047-1zm13.3535151 1h6 .087891.208985c.729521 0 1.351562.6220415 1.351562 1.3515625v.2089844.0878906 6.0000005c0 .729528-.622032 1.351562-1.351562 1.351562h-.296876c-.729528 0-1.351562-.622038-1.351562-1.351562v-2.5273442l-4.675781 4.6757812c-.517324.51732-1.394786.517324-1.91211 0l-.208984-.208984c-.517322-.517323-.517314-1.394788 0-1.91211l4.675781-4.675781h-2.527344c-.729521 0-1.351562-.6220415-1.351562-1.3515625v-.296875c0-.729521.622041-1.3515625 1.351562-1.3515625z" fill="#3a3a38"/><path d="m7 4v21h21v-13.351562c0 .729528-.622032 1.351562-1.351562 1.351562h-.296876c-.729528 0-1.351562-.622038-1.351562-1.351562v-2.5273442l-4.675781 4.6757812c-.517324.51732-1.394786.517324-1.91211 0l-.208984-.208984c-.517322-.517323-.517314-1.394788 0-1.91211l4.675781-4.675781h-2.5273 44c-.729521 0-1.351562-.6220415-1.351562-1.3515625v-.296875c0-.729521.622041-1.3515625 1.351562-1.3515625zm19.648438 0c.729521 0 1.351562.6220415 1.351562 1.3515625v-1.3515625z" fill="#fff" stroke-width=".916667"/><path d="m3.9980469 6c-.5527774 0-.9980469.446-.9980469 1v21c0 .554.4452695 1 .9980469 1h21.0039061c.552777 0 .998047-.446.998047-1v-15.054688c-.56617-.160877-1-.688937-1-1.296874v-2.5273442l-4.675781 4.6757812c-.517324.51732-1.394786.517324-1.91211 0l-.208984-.208984c-.517322-.517323-.517314-1.394788 0-1.91211l4.675781-4.675781h-2.527344c-.607934 0-1.135996-.4338324-1.296874-1z" fill="#3a3a38"/><path d="m4 7v21h21v-16.351562-2.5273442l-4.675781 4.6757812c-.517324.51732-1.394786.517324-1.91211 0l-.208984-.208984c-.517322-.517323-.517314-1.394788 0-1.91211l4.675781-4.675781h-2.527344z" fill="#fff" stroke-width=".916667"/><path d="m20.351562 5c-.195142 0-.351562.1564199-.351562.3515625v.296875c0 .1951426.15642.3515625.351562.3515625h4.941407l-6.382813 6.382812c-.137986.13798 7-.137986.360061 0 .498047l.208985.208985c.137986.137986.36006.137986.498047 0l6.382812-6.3828128v4.9414068c0 .195141.15642.351562.351562.351562h.296876c.195142 0 .351562-.156421.351562-.351562v-6.0000005-.0878906-.2089844c0-.1951426-.15642-.3515625-.351562-.3515625h-.208985-.087891z" fill="#1e8bcd"/><path d="m12 12a3 3 0 0 1 -3 3 3 3 0 0 1 -3-3 3 3 0 0 1 3-3 3 3 0 0 1 3 3z" fill="#ed8733"/><path d="m11 12a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2 2 2 0 0 1 2-2 2 2 0 0 1 2 2z" fill="#f8db8f"/><g stroke-width="1.333333"><path d="m18.5 17-11 11h17.5v-4.5zm-8 3-6.5 6.5v1.5h2l6.25-6.25z" fill="#83beef"/><path d="m18.5 15.5-5.5 5.5-2.5-2.5-6.5 6.5v1.5l6.5-6.5 1.75 1.75-6.25 6.25h1.5l11-11 6.5 6.5v-1.5z" fill="#0063b1"/></g></svg> \ No newline at end of file +<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";><path d="m6.9980469 3c-.5527774 0-.9980469.446-.9980469 1v21c0 .554.4452695 1 .9980469 1h21.0039061c.552777 0 .998047-.446.998047-1v-21c0-.554-.44527-1-.998047-1zm13.3535151 1h6 .087891.208985c.729521 0 1.351562.6220415 1.351562 1.3515625v.2089844.0878906 6.0000005c0 .729528-.622032 1.351562-1.351562 1.351562h-.296876c-.729528 0-1.351562-.622038-1.351562-1.351562v-2.5273442l-4.675781 4.6757812c-.517324.51732-1.394786.517324-1.91211 0l-.208984-.208984c-.517322-.517323-.517314-1.394788 0-1.91211l4.675781-4.675781h-2.527344c-.729521 0-1.351562-.6220415-1.351562-1.3515625v-.296875c0-.729521.622041-1.3515625 1.351562-1.3515625z" fill="#3a3a38"/><path d="m7 4v21h21v-13.351562c0 .729528-.622032 1.351562-1.351562 1.351562h-.296876c-.729528 0-1.351562-.622038-1.351562-1.351562v-2.5273442l-4.675781 4.6757812c-.517324.51732-1.394786.517324-1.91211 0l-.208984-.208984c-.517322-.517323-.517314-1.394788 0-1.91211l4.675781-4.675781h-2.5273 44c-.729521 0-1.351562-.6220415-1.351562-1.3515625v-.296875c0-.729521.622041-1.3515625 1.351562-1.3515625zm19.648438 0c.729521 0 1.351562.6220415 1.351562 1.3515625v-1.3515625z" fill="#fafafa" stroke-width=".916667"/><path d="m3.9980469 6c-.5527774 0-.9980469.446-.9980469 1v21c0 .554.4452695 1 .9980469 1h21.0039061c.552777 0 .998047-.446.998047-1v-15.054688c-.56617-.160877-1-.688937-1-1.296874v-2.5273442l-4.675781 4.6757812c-.517324.51732-1.394786.517324-1.91211 0l-.208984-.208984c-.517322-.517323-.517314-1.394788 0-1.91211l4.675781-4.675781h-2.527344c-.607934 0-1.135996-.4338324-1.296874-1z" fill="#3a3a38"/><path d="m4 7v21h21v-16.351562-2.5273442l-4.675781 4.6757812c-.517324.51732-1.394786.517324-1.91211 0l-.208984-.208984c-.517322-.517323-.517314-1.394788 0-1.91211l4.675781-4.675781h-2.527344z" fill="#fafafa" stroke-width=".916667"/><path d="m20.351562 5c-.195142 0-.351562.1564199-.351562.3515625v.296875c0 .1951426.15642.3515625.351562.3515625h4.941407l-6.382813 6.382812c-.137986 .137987-.137986.360061 0 .498047l.208985.208985c.137986.137986.36006.137986.498047 0l6.382812-6.3828128v4.9414068c0 .195141.15642.351562.351562.351562h.296876c.195142 0 .351562-.156421.351562-.351562v-6.0000005-.0878906-.2089844c0-.1951426-.15642-.3515625-.351562-.3515625h-.208985-.087891z" fill="#1e8bcd"/><path d="m12 12a3 3 0 0 1 -3 3 3 3 0 0 1 -3-3 3 3 0 0 1 3-3 3 3 0 0 1 3 3z" fill="#ed8733"/><path d="m11 12a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2 2 2 0 0 1 2-2 2 2 0 0 1 2 2z" fill="#f8db8f"/><g stroke-width="1.333333"><path d="m18.5 17-11 11h17.5v-4.5zm-8 3-6.5 6.5v1.5h2l6.25-6.25z" fill="#83beef"/><path d="m18.5 15.5-5.5 5.5-2.5-2.5-6.5 6.5v1.5l6.5-6.5 1.75 1.75-6.25 6.25h1.5l11-11 6.5 6.5v-1.5z" fill="#0063b1"/></g></svg> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/dbchangedesignmode.svg b/icon-themes/colibre_svg/cmd/32/dbchangedesignmode.svg index 9a93779ead92..4bdfc299c10e 100644 --- a/icon-themes/colibre_svg/cmd/32/dbchangedesignmode.svg +++ b/icon-themes/colibre_svg/cmd/32/dbchangedesignmode.svg @@ -1 +1 @@ -<svg height="32" viewBox="0 0 8.4666665 8.4666669" width="32" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="77.99999878125" x2="77.99999878125" xlink:href="#b" y1="36.00005483907" y2="18.00005512032"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="70" x2="70" y1="42" y2="24"><stop offset="0" stop-color="#e9e9e9"/><stop offset=".2857143" stop-color="#f2f2f2"/><stop offset="1" stop-color="#fbfbfb"/></linearGradient><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="69.99999764641" x2="69.99999764641" xlink:href="#b" y1="42.00005474532" y2="24.00005502657"/><g transform="translate(0 -288.53331)"><g stroke-width=".999999" transform="matrix(.26458333 0 0 .26458333 0 288.53331)"><path d="m12 9v13h8.810547l7.189453-7.240234v-5.759766z" fill="url(#a)"/><path d="m4 15v13h10.851562l5.148438-5.183594v-7.816406z" fill="url(#c)"/><path d="m12 3c-.554 0-1 .4459969-1 1v5h-7c-.5539999 0-1 .44 59969-1 1v18c0 .554003.4460001 1 1 1h9.857422l.99414-1h-10.851562v-13h7v7c0 .554003.446 1 1 1h7.816406l1.183594-1.191406v-11.808594c0-.5540031-.446-1-1-1h8v5.759766l1-1.00586v-9.753906c0-.5540031-.446-1-1-1zm0 12h8v7h-8z" fill="#3a3a38"/></g><g fill="#bababa" transform="matrix(.26458333 0 0 .26458333 0 288.53333)"><path d="m6 16h4v1h-4z" fill="#797774"/><path d="m14 16h4v1h-4z" fill="#1e8bcd"/><path d="m6 19h4v1h-4z" fill="#797774"/><path d="m14 19h4v1h-4z" fill="#1e8bcd"/><g fill="#797774"><path d="m6 22h4v1h-4z"/><path d="m6 25h4v1h-4z"/><path d="m14 25v1h2.837891l.992187-1z" transform="translate(0 -.000076)"/><path d="m22 10h4v1h-4z"/><path d="m22 13h4v1h-4z"/><g transform="translate(0 -.000076)"><path d="m22 16v1h3.775391l.224609-.226562v-.773438z"/><path d="m22 19v1h.796875l.992187-1z"/></g></g></g><g stroke-width=".264583"><path d="m1.0583333 290.91458c-.14657913 0-.2645833.11801-.2645833.26459v.26458 1.05833h4.7625v-1.05833-.26458c0-.14658-.1180042-.26459-.2645833-.26459z" fi ll="#3a3a38"/><path d="m1.0583333 291.17917v1.05833h1.8520834v-1.05833zm2.1166667 0v1.05833h2.1166667v-1.05833z" fill="#797774"/><path d="m3.175 289.32708c-.1465792 0-.2645833.11801-.2645833.26459v.26458 1.05833h4.7625v-1.05833-.26458c0-.14658-.1180042-.26459-.2645834-.26459z" fill="#3a3a38"/></g><path d="m3.175 289.59167h4.2333333v1.05833h-4.2333333z" fill="#797774" stroke-width=".42281"/></g><path d="m7.5406062 4.365625-3.175 3.175h3.175zm-.5291666 1.3229167v.3906287.9322879h-1.1906248-.1322919z" style="fill:#f8db8f;fill-rule:evenodd;stroke:#ed8733;stroke-width:.264583;stroke-linecap:round;stroke-linejoin:round"/></svg> \ No newline at end of file +<svg height="32" viewBox="0 0 8.4666665 8.4666669" width="32" xmlns="http://www.w3.org/2000/svg";><g transform="translate(0 -288.53331)"><g stroke-width=".999999" transform="matrix(.26458333 0 0 .26458333 0 288.53331)"><path d="m12 9v13h8.810547l7.189453-7.240234v-5.759766z" fill="#fafafa"/><path d="m4 15v13h10.851562l5.148438-5.183594v-7.816406z" fill="#fafafa"/><path d="m12 3c-.554 0-1 .4459969-1 1v5h-7c-.5539999 0-1 .4459969-1 1v18c0 .554003.4460001 1 1 1h9.857422l.99414-1h-10.851562v-13h7v7c0 .554003.446 1 1 1h7.816406l1.183594-1.191406v-11.808594c0-.5540031-.446-1-1-1h8v5.759766l1-1.00586v-9.753906c0-.5540031-.446-1-1-1zm0 12h8v7h-8z" fill="#3a3a38"/></g><g fill="#bababa" transform="matrix(.26458333 0 0 .26458333 0 288.53333)"><path d="m6 16h4v1h-4z" fill="#797774"/><path d="m14 16h4v1h-4z" fill="#1e8bcd"/><path d="m6 19h4v1h-4z" fill="#797774"/><path d="m14 19h4v1h-4z" fill="#1e8bcd"/><g fill="#797774"><path d="m6 22h4v1h-4z"/><path d="m6 25h4v1h-4z"/><path d="m14 25v1h2.837891 l.992187-1z" transform="translate(0 -.000076)"/><path d="m22 10h4v1h-4z"/><path d="m22 13h4v1h-4z"/><g transform="translate(0 -.000076)"><path d="m22 16v1h3.775391l.224609-.226562v-.773438z"/><path d="m22 19v1h.796875l.992187-1z"/></g></g></g><g stroke-width=".264583"><path d="m1.0583333 290.91458c-.14657913 0-.2645833.11801-.2645833.26459v.26458 1.05833h4.7625v-1.05833-.26458c0-.14658-.1180042-.26459-.2645833-.26459z" fill="#3a3a38"/><path d="m1.0583333 291.17917v1.05833h1.8520834v-1.05833zm2.1166667 0v1.05833h2.1166667v-1.05833z" fill="#797774"/><path d="m3.175 289.32708c-.1465792 0-.2645833.11801-.2645833.26459v.26458 1.05833h4.7625v-1.05833-.26458c0-.14658-.1180042-.26459-.2645834-.26459z" fill="#3a3a38"/></g><path d="m3.175 289.59167h4.2333333v1.05833h-4.2333333z" fill="#797774" stroke-width=".42281"/><path d="m7.5406062 292.89894-3.175 3.175h3.175zm-.5291667 1.32292v.39063.93228h-1.1906247-.1322919z" style="fill:#f8db8f;fill-rule:evenodd;stroke:#ed8733;stroke-width:.264583;str oke-linecap:round;stroke-linejoin:round"/></g></svg> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/dbclearquery.svg b/icon-themes/colibre_svg/cmd/32/dbclearquery.svg index 8e7fe4c72c34..5c70ac9fcd1f 100644 --- a/icon-themes/colibre_svg/cmd/32/dbclearquery.svg +++ b/icon-themes/colibre_svg/cmd/32/dbclearquery.svg @@ -1 +1 @@ -<svg height="32" viewBox="0 0 8.4666665 8.4666669" width="32" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="77.99999878125" x2="77.99999878125" xlink:href="#b" y1="36.00005483907" y2="18.00005512032"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="70" x2="70" y1="42" y2="24"><stop offset="0" stop-color="#e9e9e9"/><stop offset=".2857143" stop-color="#f2f2f2"/><stop offset="1" stop-color="#fbfbfb"/></linearGradient><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="69.99999764641" x2="69.99999764641" xlink:href="#b" y1="42.00005474532" y2="24.00005502657"/><g transform="translate(0 -288.53331)"><g stroke-width=".999999" transform="matrix(.26458333 0 0 .26458333 0 288.53331)"><path d="m12 9v13h5.1875l7.849609-7.726562c.188603-.188078.442676-.295882.708985-.300782.278882-.005418.548059.102393.746094.298828l1.507812 1.498047v-6.769531z" fill="url(#a)"/><path d="m4 15v13h11.152344l- .664063-.654297c-.0013-.002-.002606-.003859-.003906-.005859-.729355-.728937-.729353-1.948798 0-2.677735.00447-.00457.009072-.009172.013672-.013671l5.501953-5.416016v-4.232422z" fill="url(#c)"/><path d="m12 3c-.554 0-1 .4459969-1 1v5h-7c-.5539999 0-1 .4459969-1 1v18c0 .554003.4460001 1 1 1h12.166016l-1.013672-1h-11.152344v-13h7v7c0 .554003.446 1 1 1h4.171875l1.015625-1h-5.1875v-7h8v4.232422l1-.984375v-8.248047c0-.5540031-.446-1-1-1h8v6.769531l1 .992188v-12.761719c0-.5540031-.446-1-1-1z" fill="#3a3a38"/></g><g fill="#bababa" transform="matrix(.26458333 0 0 .26458333 0 288.53333)"><path d="m6 16h4v1h-4z" fill="#797774"/><path d="m14 16h4v1h-4z" fill="#1e8bcd"/><path d="m6 19h4v1h-4z" fill="#797774"/><path d="m14 19h4v1h-4z" fill="#1e8bcd"/><g fill="#797774"><path d="m6 22h4v1h-4z"/><path d="m6 25h4v1h-4z"/><path d="m22 10h4v1h-4z"/><path d="m22 13h4v1h-4z"/><path d="m22 16v1h.267578l1.015625-1z" transform="translate(0 -.000076)"/></g></g><g stroke-width=".264583"><path d="m1.0583333 29 0.91458c-.14657913 0-.2645833.11801-.2645833.26459v.26458 1.05833h4.7625v-1.05833-.26458c0-.14658-.1180042-.26459-.2645833-.26459z" fill="#3a3a38"/><path d="m1.0583333 291.17917v1.05833h1.8520834v-1.05833zm2.1166667 0v1.05833h2.1166667v-1.05833z" fill="#797774"/><path d="m3.175 289.32708c-.1465792 0-.2645833.11801-.2645833.26459v.26458 1.05833h4.7625v-1.05833-.26458c0-.14658-.1180042-.26459-.2645834-.26459z" fill="#3a3a38"/></g><path d="m3.175 289.59167h4.2333333v1.05833h-4.2333333z" fill="#797774" stroke-width=".42281"/></g><g fill="#d42314" transform="matrix(.30831933 0 0 .30854608 .84182 .84094)"><path d="m16.518661 20.388672 6.495399-6.642082-3.634029-3.606159-6.590273 6.561871z" fill="#d42314"/><path d="m13.579208 23c.189562 0 .378184-.07172.523438-.216797l2.416015-2.394531-3.740622-3.703948-2.453125 2.363281c-.290506.290127-.290506.756747 0 1.046875l2.728904 2.688323c.145254.145064.335828.216797.52539.216797z" fill="#d42314"/><path d="m19.380859 11.455078-5.267578 5.244141 2.3 96485 2.367187 5.189453-5.310547z" fill="#ff9198"/></g></svg> \ No newline at end of file ... etc. - the rest is truncated
