basic/source/classes/sb.cxx | 2 basic/source/classes/sbxmod.cxx | 42 basic/source/comp/parser.cxx | 6 basic/source/runtime/runtime.cxx | 12 basic/source/runtime/stdobj.cxx | 2 basic/source/sbx/sbxexec.cxx | 66 chart2/source/controller/sidebar/ChartAreaPanel.cxx | 3 chart2/source/tools/RegressionCurveCalculator.cxx | 2 download.lst | 4 hwpfilter/source/hbox.cxx | 7 include/basic/sbmod.hxx | 10 include/basic/sbxobj.hxx | 3 include/svx/fillctrl.hxx | 1 include/unotest/macros_test.hxx | 3 include/vcl/ctrl.hxx | 1 include/vcl/outdev.hxx | 2 include/vcl/toolkit/calendar.hxx | 1 include/vcl/wizardmachine.hxx | 3 readlicense_oo/license/CREDITS.fodt | 5462 +++++----- sc/qa/extras/testdocuments/ForEachInSelection.ods |binary sc/qa/extras/vba-macro-test.cxx | 61 sc/sdi/scalc.sdi | 4 sc/source/core/tool/interpr1.cxx | 34 sc/source/core/tool/interpr4.cxx | 2 sc/source/filter/oox/condformatbuffer.cxx | 9 sc/source/ui/app/inputwin.cxx | 1 starmath/source/cursor.cxx | 7 starmath/source/dialog.cxx | 7 starmath/source/document.cxx | 8 svtools/source/control/tabbar.cxx | 15 svtools/source/uno/wizard/wizardshell.cxx | 10 svtools/source/uno/wizard/wizardshell.hxx | 3 svx/source/tbxctrls/fillctrl.cxx | 9 sw/qa/extras/ooxmlexport/data/tdf153526_commentInNumbering.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport18.cxx | 7 sw/qa/uitest/data/tdf132714.odt |binary sw/qa/uitest/writer_tests7/tdf132714.py | 23 sw/source/core/unocore/unochart.cxx | 6 sw/source/ui/fldui/fldpage.cxx | 3 sw/source/ui/misc/pggrid.cxx | 3 sw/source/uibase/app/appenv.cxx | 3 sw/source/uibase/app/applab.cxx | 1 sw/source/uibase/dbui/dbmgr.cxx | 84 sw/source/uibase/docvw/AnnotationWin.cxx | 14 sw/source/uibase/docvw/AnnotationWin2.cxx | 82 sw/source/uibase/docvw/edtwin2.cxx | 6 sw/source/uibase/misc/redlndlg.cxx | 37 sw/source/uibase/ribbar/inputwin.cxx | 13 sw/source/uibase/shells/langhelper.cxx | 31 sw/source/uibase/uiview/view.cxx | 19 sw/source/uibase/uno/unomailmerge.cxx | 2 sw/source/uibase/uno/unotxdoc.cxx | 29 sw/source/uibase/uno/unotxvw.cxx | 25 sw/source/uibase/utlui/content.cxx | 12 sw/source/uibase/utlui/navipi.cxx | 5 unotest/source/cpp/macros_test.cxx | 9 vcl/inc/listbox.hxx | 1 vcl/qt5/QtData.cxx | 293 vcl/qt5/QtGraphics_Controls.cxx | 4 vcl/source/control/calendar.cxx | 7 vcl/source/control/ctrl.cxx | 7 vcl/source/control/imp_listbox.cxx | 36 vcl/source/control/listbox.cxx | 14 vcl/source/control/roadmapwizard.cxx | 16 vcl/source/control/wizardmachine.cxx | 12 vcl/source/outdev/textline.cxx | 21 writerfilter/source/dmapper/DomainMapper_Impl.cxx | 11 67 files changed, 3519 insertions(+), 3119 deletions(-)
New commits: commit ea3a42b146174d01163109bc4f8bdd92fa3fc2eb Author: Gabor Kelemen <[email protected]> AuthorDate: Fri Feb 17 11:38:42 2023 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 25 22:33:42 2023 +0100 tdf#63965 Hide one extra Rename Sheet command from Customize dialog from sc/source/ui/view/tabvwshf.cxx: // FID_TAB_MENU_RENAME - "rename" in menu // FID_TAB_RENAME - "name"-property for basic FID_TAB_RENAME is not meant for the menu - it also just showed the sheet name when added as .uno:Name Change-Id: I2ed7b51bece688e50260e639012b9b1b68cf5df4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147222 Tested-by: Jenkins Reviewed-by: Heiko Tietze <[email protected]> (cherry picked from commit 5b7e54ce8fb57203068f1c2e610758523687ef9a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147438 Reviewed-by: Gabor Kelemen <[email protected]> diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 7295dd3ef978..9da8595a56d5 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -3612,8 +3612,8 @@ SfxVoidItem Name FID_TAB_RENAME RecordAbsolute = FALSE, RecordPerSet; - AccelConfig = TRUE, - MenuConfig = TRUE, + AccelConfig = FALSE, + MenuConfig = FALSE, ToolBoxConfig = FALSE, GroupId = SfxGroupId::Format; ] commit 5377745e7f5d1ae036e0fd34dab9b00250c7ecb7 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Feb 21 08:23:10 2023 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 25 22:33:42 2023 +0100 tdf#144302 tdf#153333 qt: Load cursor from icon theme Load cursor from the icon theme similar to how the gtk VCL plugins do it. This not only allows using the themed cursor icons, but also helps avoid QTBUG-95434 [1] ("Bitmap cursors not supported on QtWayland") that would result in no cursor being shown on Wayland at all when our custom bitmap cursors are used. [1] https://bugreports.qt.io/browse/QTBUG-95434 Change-Id: Id65db4e7d71b8cee8a514c06c21c59dcc2afa889 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147379 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> (cherry picked from commit db6ed07f4c1a086e4962ff16d3ede9aea9e60952) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147357 Reviewed-by: Michael Stahl <[email protected]> diff --git a/vcl/qt5/QtData.cxx b/vcl/qt5/QtData.cxx index 7d2d0418e80e..cc2883ae80ca 100644 --- a/vcl/qt5/QtData.cxx +++ b/vcl/qt5/QtData.cxx @@ -24,135 +24,13 @@ #include <QtWidgets/QApplication> #include <QtWidgets/QStyle> +#include <i18nlangtag/languagetag.hxx> #include <sal/log.hxx> +#include <tools/stream.hxx> +#include <vcl/ImageTree.hxx> -#include <unx/x11_cursors/ase_curs.h> -#include <unx/x11_cursors/ase_mask.h> -#include <unx/x11_cursors/asn_curs.h> -#include <unx/x11_cursors/asn_mask.h> -#include <unx/x11_cursors/asne_curs.h> -#include <unx/x11_cursors/asne_mask.h> -#include <unx/x11_cursors/asns_curs.h> -#include <unx/x11_cursors/asns_mask.h> -#include <unx/x11_cursors/asnswe_curs.h> -#include <unx/x11_cursors/asnswe_mask.h> -#include <unx/x11_cursors/asnw_curs.h> -#include <unx/x11_cursors/asnw_mask.h> -#include <unx/x11_cursors/ass_curs.h> -#include <unx/x11_cursors/ass_mask.h> -#include <unx/x11_cursors/asse_curs.h> -#include <unx/x11_cursors/asse_mask.h> -#include <unx/x11_cursors/assw_curs.h> -#include <unx/x11_cursors/assw_mask.h> -#include <unx/x11_cursors/asw_curs.h> -#include <unx/x11_cursors/asw_mask.h> -#include <unx/x11_cursors/aswe_curs.h> -#include <unx/x11_cursors/aswe_mask.h> -#include <unx/x11_cursors/chain_curs.h> -#include <unx/x11_cursors/chain_mask.h> -#include <unx/x11_cursors/chainnot_curs.h> -#include <unx/x11_cursors/chainnot_mask.h> -#include <unx/x11_cursors/chart_curs.h> -#include <unx/x11_cursors/chart_mask.h> -#include <unx/x11_cursors/copydata_curs.h> -#include <unx/x11_cursors/copydata_mask.h> -#include <unx/x11_cursors/copydlnk_curs.h> -#include <unx/x11_cursors/copydlnk_mask.h> -#include <unx/x11_cursors/copyfile_curs.h> -#include <unx/x11_cursors/copyfile_mask.h> -#include <unx/x11_cursors/copyfiles_curs.h> -#include <unx/x11_cursors/copyfiles_mask.h> -#include <unx/x11_cursors/copyflnk_curs.h> -#include <unx/x11_cursors/copyflnk_mask.h> -#include <unx/x11_cursors/crook_curs.h> -#include <unx/x11_cursors/crook_mask.h> -#include <unx/x11_cursors/crop_curs.h> -#include <unx/x11_cursors/crop_mask.h> -#include <unx/x11_cursors/detective_curs.h> -#include <unx/x11_cursors/detective_mask.h> -#include <unx/x11_cursors/drawarc_curs.h> -#include <unx/x11_cursors/drawarc_mask.h> -#include <unx/x11_cursors/drawbezier_curs.h> -#include <unx/x11_cursors/drawbezier_mask.h> -#include <unx/x11_cursors/drawcaption_curs.h> -#include <unx/x11_cursors/drawcaption_mask.h> -#include <unx/x11_cursors/drawcirclecut_curs.h> -#include <unx/x11_cursors/drawcirclecut_mask.h> -#include <unx/x11_cursors/drawconnect_curs.h> -#include <unx/x11_cursors/drawconnect_mask.h> -#include <unx/x11_cursors/drawellipse_curs.h> -#include <unx/x11_cursors/drawellipse_mask.h> -#include <unx/x11_cursors/drawfreehand_curs.h> -#include <unx/x11_cursors/drawfreehand_mask.h> -#include <unx/x11_cursors/drawline_curs.h> -#include <unx/x11_cursors/drawline_mask.h> -#include <unx/x11_cursors/drawpie_curs.h> -#include <unx/x11_cursors/drawpie_mask.h> -#include <unx/x11_cursors/drawpolygon_curs.h> -#include <unx/x11_cursors/drawpolygon_mask.h> -#include <unx/x11_cursors/drawrect_curs.h> -#include <unx/x11_cursors/drawrect_mask.h> -#include <unx/x11_cursors/drawtext_curs.h> -#include <unx/x11_cursors/drawtext_mask.h> -#include <unx/x11_cursors/fill_curs.h> -#include <unx/x11_cursors/fill_mask.h> -#include <unx/x11_cursors/hshear_curs.h> -#include <unx/x11_cursors/hshear_mask.h> -#include <unx/x11_cursors/linkdata_curs.h> -#include <unx/x11_cursors/linkdata_mask.h> -#include <unx/x11_cursors/linkfile_curs.h> -#include <unx/x11_cursors/linkfile_mask.h> -#include <unx/x11_cursors/magnify_curs.h> -#include <unx/x11_cursors/magnify_mask.h> -#include <unx/x11_cursors/mirror_curs.h> -#include <unx/x11_cursors/mirror_mask.h> -#include <unx/x11_cursors/movebezierweight_curs.h> -#include <unx/x11_cursors/movebezierweight_mask.h> -#include <unx/x11_cursors/movedata_curs.h> -#include <unx/x11_cursors/movedata_mask.h> -#include <unx/x11_cursors/movedlnk_curs.h> -#include <unx/x11_cursors/movedlnk_mask.h> -#include <unx/x11_cursors/movefile_curs.h> -#include <unx/x11_cursors/movefile_mask.h> -#include <unx/x11_cursors/movefiles_curs.h> -#include <unx/x11_cursors/movefiles_mask.h> -#include <unx/x11_cursors/moveflnk_curs.h> -#include <unx/x11_cursors/moveflnk_mask.h> -#include <unx/x11_cursors/movepoint_curs.h> -#include <unx/x11_cursors/movepoint_mask.h> -#include <unx/x11_cursors/nodrop_curs.h> -#include <unx/x11_cursors/nodrop_mask.h> -#include <unx/x11_cursors/pivotcol_curs.h> -#include <unx/x11_cursors/pivotcol_mask.h> -#include <unx/x11_cursors/pivotdel_curs.h> -#include <unx/x11_cursors/pivotdel_mask.h> -#include <unx/x11_cursors/pivotfld_curs.h> -#include <unx/x11_cursors/pivotfld_mask.h> -#include <unx/x11_cursors/pivotrow_curs.h> -#include <unx/x11_cursors/pivotrow_mask.h> -#include <unx/x11_cursors/rotate_curs.h> -#include <unx/x11_cursors/rotate_mask.h> -#include <unx/x11_cursors/tblsele_curs.h> -#include <unx/x11_cursors/tblsele_mask.h> -#include <unx/x11_cursors/tblsels_curs.h> -#include <unx/x11_cursors/tblsels_mask.h> -#include <unx/x11_cursors/tblselse_curs.h> -#include <unx/x11_cursors/tblselse_mask.h> -#include <unx/x11_cursors/tblselsw_curs.h> -#include <unx/x11_cursors/tblselsw_mask.h> -#include <unx/x11_cursors/tblselw_curs.h> -#include <unx/x11_cursors/tblselw_mask.h> -#include <unx/x11_cursors/vertcurs_curs.h> -#include <unx/x11_cursors/vertcurs_mask.h> -#include <unx/x11_cursors/vshear_curs.h> -#include <unx/x11_cursors/vshear_mask.h> -#include <unx/x11_cursors/wshide_curs.h> -#include <unx/x11_cursors/wshide_mask.h> -#include <unx/x11_cursors/wsshow_curs.h> -#include <unx/x11_cursors/wsshow_mask.h> -#include <unx/x11_cursors/fatcross_curs.h> -#include <unx/x11_cursors/fatcross_mask.h> - +#include <bitmaps.hlst> +#include <cursor_hotspots.hxx> #include <unx/glyphcache.hxx> QtData::QtData() @@ -176,17 +54,29 @@ QtData::QtData() // outline dtor b/c of FreetypeManager incomplete type QtData::~QtData() {} -static QCursor* getQCursorFromXBM(const unsigned char* pBitmap, const unsigned char* pMask, - int nWidth, int nHeight, int nXHot, int nYHot) +static QCursor* getQCursorFromIconTheme(const OUString& rIconName, int nXHot, int nYHot) { - QBitmap aPixmap = QBitmap::fromData(QSize(nWidth, nHeight), pBitmap); - QBitmap aMask = QBitmap::fromData(QSize(nWidth, nHeight), pMask); - return new QCursor(aPixmap, aMask, nXHot, nYHot); + const OUString sIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme(); + const OUString sUILang = Application::GetSettings().GetUILanguageTag().getBcp47(); + auto xMemStream = ImageTree::get().getImageStream(rIconName, sIconTheme, sUILang); + if (!xMemStream) + return nullptr; + auto nLength = xMemStream->TellEnd(); + if (!nLength) + { + SAL_WARN("vcl.qt", "Cannot load cursor pixmap from empty stream."); + return nullptr; + } + + const unsigned char* pData = static_cast<const unsigned char*>(xMemStream->GetData()); + QPixmap aPixmap; + aPixmap.loadFromData(pData, nLength); + return new QCursor(aPixmap, nXHot, nYHot); } -#define MAKE_CURSOR(vcl_name, name) \ + +#define MAKE_CURSOR(vcl_name, name, icon_name) \ case vcl_name: \ - pCursor = getQCursorFromXBM(name##curs##_bits, name##mask##_bits, name##curs_width, \ - name##curs_height, name##curs_x_hot, name##curs_y_hot); \ + pCursor = getQCursorFromIconTheme(icon_name, name##curs_x_hot, name##curs_y_hot); \ break #define MAP_BUILTIN(vcl_name, qt_enum) \ @@ -239,72 +129,73 @@ QCursor& QtData::getCursor(PointerStyle ePointerStyle) MAP_BUILTIN(PointerStyle::Move, Qt::SizeAllCursor); MAP_BUILTIN(PointerStyle::Null, Qt::BlankCursor); - MAKE_CURSOR(PointerStyle::Magnify, magnify_); - MAKE_CURSOR(PointerStyle::Fill, fill_); - MAKE_CURSOR(PointerStyle::MoveData, movedata_); - MAKE_CURSOR(PointerStyle::CopyData, copydata_); - MAKE_CURSOR(PointerStyle::MoveFile, movefile_); - MAKE_CURSOR(PointerStyle::CopyFile, copyfile_); - MAKE_CURSOR(PointerStyle::MoveFiles, movefiles_); - MAKE_CURSOR(PointerStyle::CopyFiles, copyfiles_); - MAKE_CURSOR(PointerStyle::NotAllowed, nodrop_); - MAKE_CURSOR(PointerStyle::Rotate, rotate_); - MAKE_CURSOR(PointerStyle::HShear, hshear_); - MAKE_CURSOR(PointerStyle::VShear, vshear_); - MAKE_CURSOR(PointerStyle::DrawLine, drawline_); - MAKE_CURSOR(PointerStyle::DrawRect, drawrect_); - MAKE_CURSOR(PointerStyle::DrawPolygon, drawpolygon_); - MAKE_CURSOR(PointerStyle::DrawBezier, drawbezier_); - MAKE_CURSOR(PointerStyle::DrawArc, drawarc_); - MAKE_CURSOR(PointerStyle::DrawPie, drawpie_); - MAKE_CURSOR(PointerStyle::DrawCircleCut, drawcirclecut_); - MAKE_CURSOR(PointerStyle::DrawEllipse, drawellipse_); - MAKE_CURSOR(PointerStyle::DrawConnect, drawconnect_); - MAKE_CURSOR(PointerStyle::DrawText, drawtext_); - MAKE_CURSOR(PointerStyle::Mirror, mirror_); - MAKE_CURSOR(PointerStyle::Crook, crook_); - MAKE_CURSOR(PointerStyle::Crop, crop_); - MAKE_CURSOR(PointerStyle::MovePoint, movepoint_); - MAKE_CURSOR(PointerStyle::MoveBezierWeight, movebezierweight_); - MAKE_CURSOR(PointerStyle::DrawFreehand, drawfreehand_); - MAKE_CURSOR(PointerStyle::DrawCaption, drawcaption_); - MAKE_CURSOR(PointerStyle::LinkData, linkdata_); - MAKE_CURSOR(PointerStyle::MoveDataLink, movedlnk_); - MAKE_CURSOR(PointerStyle::CopyDataLink, copydlnk_); - MAKE_CURSOR(PointerStyle::LinkFile, linkfile_); - MAKE_CURSOR(PointerStyle::MoveFileLink, moveflnk_); - MAKE_CURSOR(PointerStyle::CopyFileLink, copyflnk_); - MAKE_CURSOR(PointerStyle::Chart, chart_); - MAKE_CURSOR(PointerStyle::Detective, detective_); - MAKE_CURSOR(PointerStyle::PivotCol, pivotcol_); - MAKE_CURSOR(PointerStyle::PivotRow, pivotrow_); - MAKE_CURSOR(PointerStyle::PivotField, pivotfld_); - MAKE_CURSOR(PointerStyle::PivotDelete, pivotdel_); - MAKE_CURSOR(PointerStyle::Chain, chain_); - MAKE_CURSOR(PointerStyle::ChainNotAllowed, chainnot_); - MAKE_CURSOR(PointerStyle::AutoScrollN, asn_); - MAKE_CURSOR(PointerStyle::AutoScrollS, ass_); - MAKE_CURSOR(PointerStyle::AutoScrollW, asw_); - MAKE_CURSOR(PointerStyle::AutoScrollE, ase_); - MAKE_CURSOR(PointerStyle::AutoScrollNW, asnw_); - MAKE_CURSOR(PointerStyle::AutoScrollNE, asne_); - MAKE_CURSOR(PointerStyle::AutoScrollSW, assw_); - MAKE_CURSOR(PointerStyle::AutoScrollSE, asse_); - MAKE_CURSOR(PointerStyle::AutoScrollNS, asns_); - MAKE_CURSOR(PointerStyle::AutoScrollWE, aswe_); - MAKE_CURSOR(PointerStyle::AutoScrollNSWE, asnswe_); - MAKE_CURSOR(PointerStyle::TextVertical, vertcurs_); - - MAKE_CURSOR(PointerStyle::TabSelectS, tblsels_); - MAKE_CURSOR(PointerStyle::TabSelectE, tblsele_); - MAKE_CURSOR(PointerStyle::TabSelectSE, tblselse_); - MAKE_CURSOR(PointerStyle::TabSelectW, tblselw_); - MAKE_CURSOR(PointerStyle::TabSelectSW, tblselsw_); - - MAKE_CURSOR(PointerStyle::HideWhitespace, hidewhitespace_); - MAKE_CURSOR(PointerStyle::ShowWhitespace, showwhitespace_); - - MAKE_CURSOR(PointerStyle::FatCross, fatcross_); + MAKE_CURSOR(PointerStyle::Magnify, magnify_, RID_CURSOR_MAGNIFY); + MAKE_CURSOR(PointerStyle::Fill, fill_, RID_CURSOR_FILL); + MAKE_CURSOR(PointerStyle::MoveData, movedata_, RID_CURSOR_MOVE_DATA); + MAKE_CURSOR(PointerStyle::CopyData, copydata_, RID_CURSOR_COPY_DATA); + MAKE_CURSOR(PointerStyle::MoveFile, movefile_, RID_CURSOR_MOVE_FILE); + MAKE_CURSOR(PointerStyle::CopyFile, copyfile_, RID_CURSOR_COPY_FILE); + MAKE_CURSOR(PointerStyle::MoveFiles, movefiles_, RID_CURSOR_MOVE_FILES); + MAKE_CURSOR(PointerStyle::CopyFiles, copyfiles_, RID_CURSOR_COPY_FILES); + MAKE_CURSOR(PointerStyle::NotAllowed, nodrop_, RID_CURSOR_NOT_ALLOWED); + MAKE_CURSOR(PointerStyle::Rotate, rotate_, RID_CURSOR_ROTATE); + MAKE_CURSOR(PointerStyle::HShear, hshear_, RID_CURSOR_H_SHEAR); + MAKE_CURSOR(PointerStyle::VShear, vshear_, RID_CURSOR_V_SHEAR); + MAKE_CURSOR(PointerStyle::DrawLine, drawline_, RID_CURSOR_DRAW_LINE); + MAKE_CURSOR(PointerStyle::DrawRect, drawrect_, RID_CURSOR_DRAW_RECT); + MAKE_CURSOR(PointerStyle::DrawPolygon, drawpolygon_, RID_CURSOR_DRAW_POLYGON); + MAKE_CURSOR(PointerStyle::DrawBezier, drawbezier_, RID_CURSOR_DRAW_BEZIER); + MAKE_CURSOR(PointerStyle::DrawArc, drawarc_, RID_CURSOR_DRAW_ARC); + MAKE_CURSOR(PointerStyle::DrawPie, drawpie_, RID_CURSOR_DRAW_PIE); + MAKE_CURSOR(PointerStyle::DrawCircleCut, drawcirclecut_, RID_CURSOR_DRAW_CIRCLE_CUT); + MAKE_CURSOR(PointerStyle::DrawEllipse, drawellipse_, RID_CURSOR_DRAW_ELLIPSE); + MAKE_CURSOR(PointerStyle::DrawConnect, drawconnect_, RID_CURSOR_DRAW_CONNECT); + MAKE_CURSOR(PointerStyle::DrawText, drawtext_, RID_CURSOR_DRAW_TEXT); + MAKE_CURSOR(PointerStyle::Mirror, mirror_, RID_CURSOR_MIRROR); + MAKE_CURSOR(PointerStyle::Crook, crook_, RID_CURSOR_CROOK); + MAKE_CURSOR(PointerStyle::Crop, crop_, RID_CURSOR_CROP); + MAKE_CURSOR(PointerStyle::MovePoint, movepoint_, RID_CURSOR_MOVE_POINT); + MAKE_CURSOR(PointerStyle::MoveBezierWeight, movebezierweight_, + RID_CURSOR_MOVE_BEZIER_WEIGHT); + MAKE_CURSOR(PointerStyle::DrawFreehand, drawfreehand_, RID_CURSOR_DRAW_FREEHAND); + MAKE_CURSOR(PointerStyle::DrawCaption, drawcaption_, RID_CURSOR_DRAW_CAPTION); + MAKE_CURSOR(PointerStyle::LinkData, linkdata_, RID_CURSOR_LINK_DATA); + MAKE_CURSOR(PointerStyle::MoveDataLink, movedlnk_, RID_CURSOR_MOVE_DATA_LINK); + MAKE_CURSOR(PointerStyle::CopyDataLink, copydlnk_, RID_CURSOR_COPY_DATA_LINK); + MAKE_CURSOR(PointerStyle::LinkFile, linkfile_, RID_CURSOR_LINK_FILE); + MAKE_CURSOR(PointerStyle::MoveFileLink, moveflnk_, RID_CURSOR_MOVE_FILE_LINK); + MAKE_CURSOR(PointerStyle::CopyFileLink, copyflnk_, RID_CURSOR_COPY_FILE_LINK); + MAKE_CURSOR(PointerStyle::Chart, chart_, RID_CURSOR_CHART); + MAKE_CURSOR(PointerStyle::Detective, detective_, RID_CURSOR_DETECTIVE); + MAKE_CURSOR(PointerStyle::PivotCol, pivotcol_, RID_CURSOR_PIVOT_COLUMN); + MAKE_CURSOR(PointerStyle::PivotRow, pivotrow_, RID_CURSOR_PIVOT_ROW); + MAKE_CURSOR(PointerStyle::PivotField, pivotfld_, RID_CURSOR_PIVOT_FIELD); + MAKE_CURSOR(PointerStyle::PivotDelete, pivotdel_, RID_CURSOR_PIVOT_DELETE); + MAKE_CURSOR(PointerStyle::Chain, chain_, RID_CURSOR_CHAIN); + MAKE_CURSOR(PointerStyle::ChainNotAllowed, chainnot_, RID_CURSOR_CHAIN_NOT_ALLOWED); + MAKE_CURSOR(PointerStyle::AutoScrollN, asn_, RID_CURSOR_AUTOSCROLL_N); + MAKE_CURSOR(PointerStyle::AutoScrollS, ass_, RID_CURSOR_AUTOSCROLL_S); + MAKE_CURSOR(PointerStyle::AutoScrollW, asw_, RID_CURSOR_AUTOSCROLL_W); + MAKE_CURSOR(PointerStyle::AutoScrollE, ase_, RID_CURSOR_AUTOSCROLL_E); + MAKE_CURSOR(PointerStyle::AutoScrollNW, asnw_, RID_CURSOR_AUTOSCROLL_NW); + MAKE_CURSOR(PointerStyle::AutoScrollNE, asne_, RID_CURSOR_AUTOSCROLL_NE); + MAKE_CURSOR(PointerStyle::AutoScrollSW, assw_, RID_CURSOR_AUTOSCROLL_SW); + MAKE_CURSOR(PointerStyle::AutoScrollSE, asse_, RID_CURSOR_AUTOSCROLL_SE); + MAKE_CURSOR(PointerStyle::AutoScrollNS, asns_, RID_CURSOR_AUTOSCROLL_NS); + MAKE_CURSOR(PointerStyle::AutoScrollWE, aswe_, RID_CURSOR_AUTOSCROLL_WE); + MAKE_CURSOR(PointerStyle::AutoScrollNSWE, asnswe_, RID_CURSOR_AUTOSCROLL_NSWE); + MAKE_CURSOR(PointerStyle::TextVertical, vertcurs_, RID_CURSOR_TEXT_VERTICAL); + + MAKE_CURSOR(PointerStyle::TabSelectS, tblsels_, RID_CURSOR_TAB_SELECT_S); + MAKE_CURSOR(PointerStyle::TabSelectE, tblsele_, RID_CURSOR_TAB_SELECT_E); + MAKE_CURSOR(PointerStyle::TabSelectSE, tblselse_, RID_CURSOR_TAB_SELECT_SE); + MAKE_CURSOR(PointerStyle::TabSelectW, tblselw_, RID_CURSOR_TAB_SELECT_W); + MAKE_CURSOR(PointerStyle::TabSelectSW, tblselsw_, RID_CURSOR_TAB_SELECT_SW); + + MAKE_CURSOR(PointerStyle::HideWhitespace, hidewhitespace_, RID_CURSOR_HIDE_WHITESPACE); + MAKE_CURSOR(PointerStyle::ShowWhitespace, showwhitespace_, RID_CURSOR_SHOW_WHITESPACE); + + MAKE_CURSOR(PointerStyle::FatCross, fatcross_, RID_CURSOR_FATCROSS); default: break; } commit 8ca54a162e9dd9787b1fc7ad9d199475ec219d8e Author: Khaled Hosny <[email protected]> AuthorDate: Wed Feb 22 19:45:51 2023 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 25 22:33:42 2023 +0100 tdf#151968: Fix vertical position of RTL spelling wavy line The code was guessing orientation based on the start and end points and mistakenly considered Arabic text to be 180° rotated which ended up raising the wavy line above baseline and covering the RTL text. Use font orientation instead of guessing it. Caching wavy line seems broken with RTL text as well (it was skipped for RTL before because of the wrong guessed orientation, so probably never worked), so we skip it explicitly as well for now. Change-Id: I4b0f5c4d6be2c6e3d33ea79b917b14927374acfa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147488 Tested-by: Jenkins Reviewed-by: خالد حسني <[email protected]> (cherry picked from commit 5899b27e71430e490c2d3a6b87ae52c10f383ba7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147441 Reviewed-by: Michael Stahl <[email protected]> diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index b2053f412b49..d4ff7a457a9a 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -758,7 +758,7 @@ private: SAL_DLLPRIVATE void ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPolygon& rB2DPolyPoly); ///@} - SAL_DLLPRIVATE void ImplDrawWaveLineBezier(tools::Long nStartX, tools::Long nStartY, tools::Long nEndX, tools::Long nEndY, tools::Long nWaveHeight, double fOrientation, tools::Long nLineWidth); + SAL_DLLPRIVATE void ImplDrawWaveLineBezier(tools::Long nStartX, tools::Long nStartY, tools::Long nEndX, tools::Long nEndY, tools::Long nWaveHeight, Degree10 nOrientation, tools::Long nLineWidth); /** @name Curved shape functions diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx index 7c0f2f55d7ce..f88861d4c2f9 100644 --- a/vcl/source/outdev/textline.cxx +++ b/vcl/source/outdev/textline.cxx @@ -996,14 +996,13 @@ void OutputDevice::DrawWaveLine(const Point& rStartPos, const Point& rEndPos, to tools::Long nStartY = aStartPt.Y(); tools::Long nEndX = aEndPt.X(); tools::Long nEndY = aEndPt.Y(); - double fOrientation = 0.0; + auto nOrientation = mpFontInstance->mnOrientation; // handle rotation - if (nStartY != nEndY || nStartX > nEndX) + if (nOrientation) { - fOrientation = basegfx::rad2deg(std::atan2(nStartY - nEndY, nEndX - nStartX)); // un-rotate the end point - aStartPt.RotateAround(nEndX, nEndY, Degree10(static_cast<sal_Int16>(-fOrientation * 10.0))); + aStartPt.RotateAround(nEndX, nEndY, nOrientation); } // Handle HiDPI @@ -1030,7 +1029,9 @@ void OutputDevice::DrawWaveLine(const Point& rStartPos, const Point& rEndPos, to nLineWidth = 0; } - if ( fOrientation == 0.0 ) + // The code below does not work for RTL text, that is what nEndX > nStartX + // check is for. + if ( nOrientation == 0_deg10 && nEndX > nStartX ) { static vcl::DeleteOnDeinit< WavyLineCache > snLineCache {}; if ( !snLineCache.get() ) @@ -1049,7 +1050,7 @@ void OutputDevice::DrawWaveLine(const Point& rStartPos, const Point& rEndPos, to pVirtDev->SetBackground( Wallpaper( COL_TRANSPARENT ) ); pVirtDev->Erase(); pVirtDev->SetAntialiasing( AntialiasingFlags::Enable ); - pVirtDev->ImplDrawWaveLineBezier( 0, 0, nWordLength, 0, nWaveHeight, fOrientation, nLineWidth ); + pVirtDev->ImplDrawWaveLineBezier( 0, 0, nWordLength, 0, nWaveHeight, nOrientation, nLineWidth ); BitmapEx aBitmapEx(pVirtDev->GetBitmapEx(Point(0, 0), pVirtDev->GetOutputSize())); // Ideally we don't need this block, but in the split rgb surface + separate alpha surface @@ -1070,10 +1071,10 @@ void OutputDevice::DrawWaveLine(const Point& rStartPos, const Point& rEndPos, to return; } - ImplDrawWaveLineBezier( nStartX, nStartY, nEndX, nEndY, nWaveHeight, fOrientation, nLineWidth ); + ImplDrawWaveLineBezier( nStartX, nStartY, nEndX, nEndY, nWaveHeight, nOrientation, nLineWidth ); } -void OutputDevice::ImplDrawWaveLineBezier(tools::Long nStartX, tools::Long nStartY, tools::Long nEndX, tools::Long nEndY, tools::Long nWaveHeight, double fOrientation, tools::Long nLineWidth) +void OutputDevice::ImplDrawWaveLineBezier(tools::Long nStartX, tools::Long nStartY, tools::Long nEndX, tools::Long nEndY, tools::Long nWaveHeight, Degree10 nOrientation, tools::Long nLineWidth) { // we need a graphics if( !mpGraphics && !AcquireGraphics() ) @@ -1091,7 +1092,7 @@ void OutputDevice::ImplDrawWaveLineBezier(tools::Long nStartX, tools::Long nStar const basegfx::B2DRectangle aWaveLineRectangle(nStartX, nStartY, nEndX, nEndY + nWaveHeight); const basegfx::B2DPolygon aWaveLinePolygon = basegfx::createWaveLinePolygon(aWaveLineRectangle); - const basegfx::B2DHomMatrix aRotationMatrix = basegfx::utils::createRotateAroundPoint(nStartX, nStartY, basegfx::deg2rad(-fOrientation)); + const basegfx::B2DHomMatrix aRotationMatrix = basegfx::utils::createRotateAroundPoint(nStartX, nStartY, toRadians(nOrientation)); const bool bPixelSnapHairline(mnAntialiasing & AntialiasingFlags::PixelSnapHairline); mpGraphics->SetLineColor(GetLineColor()); @@ -1108,7 +1109,7 @@ void OutputDevice::ImplDrawWaveLineBezier(tools::Long nStartX, tools::Long nStar *this); if( mpAlphaVDev ) - mpAlphaVDev->ImplDrawWaveLineBezier(nStartX, nStartY, nEndX, nEndY, nWaveHeight, fOrientation, nLineWidth); + mpAlphaVDev->ImplDrawWaveLineBezier(nStartX, nStartY, nEndX, nEndY, nWaveHeight, nOrientation, nLineWidth); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 0155f82df610fb8e357769d947d55b4d251a62fd Author: Caolán McNamara <[email protected]> AuthorDate: Thu Feb 23 21:12:41 2023 +0000 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 25 22:33:42 2023 +0100 crashtesting: null-deref seen on loading forum-mso-en4-399427.xlsx and others. A problem since: commit 8c9a6abf30e9ff1ebd5647f7c271e0d64643860a Date: Thu Feb 2 20:16:04 2023 +0100 tdf#138601 XLSX import: fix priority of conditional formatting rules Change-Id: I663b193c5bd7c5c92d3c423e70b0f7a24e3e5d76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147552 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 1abb3bf91938..ac5c2738aa47 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -1172,11 +1172,12 @@ void CondFormatBuffer::finalizeImport() minIndex = i; for (size_t j = i + 1; j < maCondFormats.size(); ++j) { - if (maCondFormats[j]->maRules.begin()->first - < maCondFormats[minIndex]->maRules.begin()->first) - { + const CondFormat::CondFormatRuleMap& rNextRules = maCondFormats[j]->maRules; + const CondFormat::CondFormatRuleMap& rMinRules = maCondFormats[minIndex]->maRules; + if (rNextRules.empty() || rMinRules.empty()) + continue; + if (rNextRules.begin()->first < rMinRules.begin()->first) minIndex = j; - } } if (i != minIndex) std::swap(maCondFormats[i], maCondFormats[minIndex]); commit 5764e4f7e2a0d550199d10becc3569dbdd6b9b93 Author: Caolán McNamara <[email protected]> AuthorDate: Sun Feb 19 17:33:20 2023 +0000 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 25 22:33:42 2023 +0100 crashtesting: crash on import of forum-mso-en4-702161.xlsx vConditions is empty at this point for row 5 git show -w Change-Id: I05d984d73d4dd5a0ece894f854263528c9c00be9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147303 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit 35e3c499cb64ed647fc8cc0a42a2d83948abcbdf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147287 Reviewed-by: Eike Rathke <[email protected]> diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 405d9fe00023..5673bb7ecda2 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -6491,25 +6491,29 @@ void ScInterpreter::IterateParametersIfs( double(*ResultFunc)( const sc::ParamIf if (nRefArrayMainPos < vRefArrayConditions.size()) vConditions = vRefArrayConditions[nRefArrayMainPos]; - std::vector<sal_uInt8>::const_iterator itRes = vConditions.begin(); - for (SCCOL nCol = 0; nCol < nDimensionCols; ++nCol) + SAL_WARN_IF(nDimensionCols && nDimensionRows && vConditions.empty(), "sc", "ScInterpreter::IterateParametersIfs vConditions is empty"); + if (!vConditions.empty()) { - for (SCROW nRow = 0; nRow < nDimensionRows; ++nRow, ++itRes) + std::vector<sal_uInt8>::const_iterator itRes = vConditions.begin(); + for (SCCOL nCol = 0; nCol < nDimensionCols; ++nCol) { - if (*itRes == nQueryCount) + for (SCROW nRow = 0; nRow < nDimensionRows; ++nRow, ++itRes) { - aAdr.SetCol( nCol + nMainCol1); - aAdr.SetRow( nRow + nMainRow1); - ScRefCellValue aCell(mrDoc, aAdr); - if (aCell.hasNumeric()) + if (*itRes == nQueryCount) { - fVal = GetCellValue(aAdr, aCell); - ++aRes.mfCount; - aRes.mfSum += fVal; - if ( aRes.mfMin > fVal ) - aRes.mfMin = fVal; - if ( aRes.mfMax < fVal ) - aRes.mfMax = fVal; + aAdr.SetCol( nCol + nMainCol1); + aAdr.SetRow( nRow + nMainRow1); + ScRefCellValue aCell(mrDoc, aAdr); + if (aCell.hasNumeric()) + { + fVal = GetCellValue(aAdr, aCell); + ++aRes.mfCount; + aRes.mfSum += fVal; + if ( aRes.mfMin > fVal ) + aRes.mfMin = fVal; + if ( aRes.mfMax < fVal ) + aRes.mfMax = fVal; + } } } } commit 247978767207a98265fec3f4159b0d82af6325ec Author: Noel Grandin <[email protected]> AuthorDate: Thu Feb 23 12:11:48 2023 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 25 22:33:41 2023 +0100 blind fix for crashes in RegressionCurveCalculator if mPeriod is < 0, then we could crash in calculateValuesCentral Change-Id: I554b46ed7bf5b5b0a32fcf69829aa1c2c75833f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147508 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 37751d878b87765a4d2cfb50d0a39280c585ece1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147453 diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index fd2ca4329e42..8f22f9834bdc 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -75,6 +75,8 @@ void RegressionCurveCalculator::setRegressionProperties( sal_Int32 aPeriod, sal_Int32 nMovingType ) { + if( aPeriod < 0 ) + throw lang::IllegalArgumentException("aPeriod may not be < 0", static_cast<cppu::OWeakObject*>(this), 3); mDegree = aDegree; mForceIntercept = aForceIntercept; mInterceptValue = aInterceptValue; commit 336485a141d9c80a99319b7f99ee17c72fcb4caa Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Mon Feb 20 22:20:59 2023 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 25 22:33:41 2023 +0100 tdf#153640 Fix changing chart background color back to None Change-Id: I653028d6016ca0caa72cb2a877cd23592c322a18 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147351 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <[email protected]> (cherry picked from commit a2732de4bd080e3ed8894ba3618f48bc4c6d9abe) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147445 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx index 71e978e14543..b8bd8198b9bc 100644 --- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx @@ -408,9 +408,10 @@ void ChartAreaPanel::setFillStyleAndBitmap(const XFillStyleItem* pStyleItem, xPropSet->setPropertyValue("FillBitmapName", aBitmap); } -void ChartAreaPanel::setFillUseBackground(const XFillStyleItem* /*pStyleItem*/, +void ChartAreaPanel::setFillUseBackground(const XFillStyleItem* pStyleItem, const XFillUseSlideBackgroundItem& /*rItem*/) { + setFillStyle(*pStyleItem); } void ChartAreaPanel::updateData() commit 9f6cb1842a608958e3e7797734d988b645fd322f Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Mon Feb 20 23:58:55 2023 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 25 22:33:41 2023 +0100 tdf#151745 Fix input line redraw issue after resizing calc window Change-Id: Ia8a7e1ab6b68f10f19733d8ce7f36d9ea02d4785 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147352 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <[email protected]> (cherry picked from commit 228caa2bafe214a0b502db4ac288dd70169ac2b8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147447 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 0f159ad0b4c6..269fd460e0e9 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -934,7 +934,6 @@ void ScInputBarGroup::Resize() { mxTextWndGroup->SetScrollPolicy(); InterimItemWindow::Resize(); - TriggerToolboxLayout(); } void ScInputBarGroup::StopEditEngine(bool bAll) commit 4c9dc9443787241b5e54b24783884b9fe17b97a0 Author: Justin Luth <[email protected]> AuthorDate: Wed Feb 22 11:19:40 2023 -0500 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 25 22:33:41 2023 +0100 tdf#153526 writerfilter: catch exception from no NumberingRules This fixes a LO 7.5 regression (well, exposed some other flaws) from commit cf02b94bc513ee1b742b4c5d7174632b568e8b72. I first tried testing if hasPropertyByName, but that returns true(????), even though this is an editeng component. Well, ignoring the fundamental issues at play here (and there are many - like having a comment take over m_xPreviousParagraph) the issue is easily solved with a try/catch instead of a redundant if clause. Change-Id: I4f27fce3e2984235df19dc3ed4be558891b28a90 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147486 Tested-by: Jenkins Reviewed-by: Justin Luth <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147494 Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/data/tdf153526_commentInNumbering.docx b/sw/qa/extras/ooxmlexport/data/tdf153526_commentInNumbering.docx new file mode 100644 index 000000000000..f26240092c10 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf153526_commentInNumbering.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx index 4efc1a5e8052..47992f819bf6 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx @@ -80,6 +80,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf147646, "tdf147646_mergedCellNumbering.docx") CPPUNIT_ASSERT_EQUAL(OUString("2."),parseDump("/root/page/body/tab/row[4]/cell/txt/SwParaPortion/SwLineLayout/child::*[@type='PortionType::Number']","expand")); } +DECLARE_OOXMLEXPORT_TEST(testTdf153526_commentInNumbering, "tdf153526_commentInNumbering.docx") +{ + // an exception was prematurely ending finishParagraph, losing numbering and CRs + // so before the patch, this was 6. + CPPUNIT_ASSERT_EQUAL(13, getParagraphs()); +} + CPPUNIT_TEST_FIXTURE(Test, testTdf149551_mongolianVert) { // Given a docx document with a shape with vert="mongolianVert". diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index d0a11cd47988..7550cc6ff0f7 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2329,11 +2329,14 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con uno::Reference<container::XNamed> xCurrentNumberingRules(itNumberingRules->Value, uno::UNO_QUERY); if (xCurrentNumberingRules.is()) aCurrentNumberingName = xCurrentNumberingRules->getName(); - if (m_xPreviousParagraph.is()) + try + { + uno::Reference<container::XNamed> xPreviousNumberingRules(m_xPreviousParagraph->getPropertyValue("NumberingRules"), uno::UNO_QUERY_THROW); + aPreviousNumberingName = xPreviousNumberingRules->getName(); + } + catch (const uno::Exception&) { - uno::Reference<container::XNamed> xPreviousNumberingRules(m_xPreviousParagraph->getPropertyValue("NumberingRules"), uno::UNO_QUERY); - if (xPreviousNumberingRules.is()) - aPreviousNumberingName = xPreviousNumberingRules->getName(); + TOOLS_WARN_EXCEPTION("writerfilter", "DomainMapper_Impl::finishParagraph NumberingRules"); } } else if ( m_xPreviousParagraph->getPropertySetInfo()->hasPropertyByName("NumberingStyleName") && commit 1f8554abc72d2e375d56a332bf4fbe8730dd471d Author: Christian Lohmaier <[email protected]> AuthorDate: Wed Feb 22 20:47:03 2023 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 25 22:33:41 2023 +0100 update credits Change-Id: Ic974dbd48cb9b1b2e417430325e4611a66d1aa7c (cherry picked from commit 1e12a4cc980ebabadde592d3159b93cc12e733a7) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index b80c8112ec20..44b061a8df35 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - <office:meta><dc:title>Credits » LibreOffice</dc:title><meta:keyword>Credits</meta:keyword><meta:keyword>contributors</meta:keyword><meta:keyword>coders</meta:keyword><meta:keyword>developers</meta:keyword><dc:description>Credits for the LibreOffice development/coding.</dc:description><meta:generator>LibreOffice/7.4.2.3$Linux_X86_64 LibreOffice_project/382eef1f22670f7f4118c8c2dd222ec7ad009daf</meta:generator><dc:date>2012-02-20T22:17:18.060000000</dc:date><meta:editing-duration>PT14M12S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:document-statistic meta:table-count="5" meta:image-count="1" meta:object-count="0" meta:page-count="2" meta:paragraph-count="4642" meta:word-count="17254" meta:character-count="124681" meta:non-whitespace-character-count="109313"/><meta:user-defined meta:name="google-site-verification">JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA</meta:user-defined></office:meta> + <office:meta><dc:title>Credits » LibreOffice</dc:title><meta:keyword>Credits</meta:keyword><meta:keyword>contributors</meta:keyword><meta:keyword>coders</meta:keyword><meta:keyword>developers</meta:keyword><dc:description>Credits for the LibreOffice development/coding.</dc:description><meta:generator>LibreOffice/7.5.0.3$Linux_X86_64 LibreOffice_project/c21113d003cd3efa8c53188764377a8272d9d6de</meta:generator><dc:date>2012-02-20T22:17:18.060000000</dc:date><meta:editing-duration>PT14M12S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:document-statistic meta:table-count="5" meta:image-count="1" meta:object-count="0" meta:page-count="2" meta:paragraph-count="4700" meta:word-count="17488" meta:character-count="126387" meta:non-whitespace-character-count="110815"/><meta:user-defined meta:name="google-site-verification">JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA</meta:user-defined></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> - <config:config-item config:name="ViewAreaTop" config:type="long">1972</config:config-item> + <config:config-item config:name="ViewAreaTop" config:type="long">549</config:config-item> <config:config-item config:name="ViewAreaLeft" config:type="long">501</config:config-item> <config:config-item config:name="ViewAreaWidth" config:type="long">32307</config:config-item> - <config:config-item config:name="ViewAreaHeight" config:type="long">28180</config:config-item> + <config:config-item config:name="ViewAreaHeight" config:type="long">27122</config:config-item> <config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item> <config:config-item config:name="InBrowseMode" config:type="boolean">true</config:config-item> <config:config-item-map-indexed config:name="Views"> @@ -16,9 +16,9 @@ <config:config-item config:name="ViewLeft" config:type="long">3649</config:config-item> <config:config-item config:name="ViewTop" config:type="long">3434</config:config-item> <config:config-item config:name="VisibleLeft" config:type="long">501</config:config-item> - <config:config-item config:name="VisibleTop" config:type="long">1972</config:config-item> + <config:config-item config:name="VisibleTop" config:type="long">549</config:config-item> <config:config-item config:name="VisibleRight" config:type="long">32807</config:config-item> - <config:config-item config:name="VisibleBottom" config:type="long">30150</config:config-item> + <config:config-item config:name="VisibleBottom" config:type="long">27668</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ViewLayoutColumns" config:type="short">0</config:config-item> <config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item> @@ -31,64 +31,47 @@ </config:config-item-map-indexed> </config:config-item-set> <config:config-item-set config:name="ooo:configuration-settings"> - <config:config-item config:name="PrintProspect" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintReversed" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintSingleJobs" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrintRightPages" config:type="boolean">true</config:config-item> + <config:config-item config:name="PrintProspectRTL" config:type="boolean">false</config:config-item> <config:config-item config:name="PrintLeftPages" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrintTables" config:type="boolean">true</config:config-item> + <config:config-item config:name="PrintPaperFromSetup" config:type="boolean">false</config:config-item> <config:config-item config:name="PrintControls" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrintPageBackground" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrintDrawings" config:type="boolean">true</config:config-item> + <config:config-item config:name="PrintProspect" config:type="boolean">false</config:config-item> <config:config-item config:name="PrintBlackFonts" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrintEmptyPages" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrintSingleJobs" config:type="boolean">false</config:config-item> <config:config-item config:name="PrintAnnotationMode" config:type="short">0</config:config-item> - <config:config-item config:name="PrintTextPlaceholder" config:type="boolean">false</config:config-item> - <config:config-item config:name="ProtectFields" config:type="boolean">false</config:config-item> + <config:config-item config:name="WordLikeWrapForAsCharFlys" config:type="boolean">false</config:config-item> + <config:config-item config:name="AutoFirstLineIndentDisregardLineSpace" config:type="boolean">false</config:config-item> + <config:config-item config:name="HeaderSpacingBelowLastPara" config:type="boolean">false</config:config-item> <config:config-item config:name="ProtectBookmarks" config:type="boolean">false</config:config-item> - <config:config-item config:name="EmptyDbFieldHidesPara" config:type="boolean">false</config:config-item> + <config:config-item config:name="ContinuousEndnotes" config:type="boolean">false</config:config-item> <config:config-item config:name="DisableOffPagePositioning" config:type="boolean">true</config:config-item> + <config:config-item config:name="PrintTables" config:type="boolean">true</config:config-item> <config:config-item config:name="SubtractFlysAnchoredAtFlys" config:type="boolean">true</config:config-item> - <config:config-item config:name="PropLineSpacingShrinksFirstLine" config:type="boolean">false</config:config-item> <config:config-item config:name="ApplyParagraphMarkFormatToNumbering" config:type="boolean">false</config:config-item> - <config:config-item config:name="GutterAtTop" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrintFaxName" config:type="string"/> + <config:config-item config:name="SurroundTextWrapSmall" config:type="boolean">false</config:config-item> <config:config-item config:name="TreatSingleColumnBreakAsPageBreak" config:type="boolean">false</config:config-item> - <config:config-item config:name="EmbedSystemFonts" config:type="boolean">false</config:config-item> + <config:config-item config:name="PropLineSpacingShrinksFirstLine" config:type="boolean">false</config:config-item> + <config:config-item config:name="TabOverSpacing" config:type="boolean">false</config:config-item> + <config:config-item config:name="TabOverMargin" config:type="boolean">false</config:config-item> <config:config-item config:name="EmbedComplexScriptFonts" config:type="boolean">true</config:config-item> - <config:config-item config:name="EmbedAsianScriptFonts" config:type="boolean">true</config:config-item> <config:config-item config:name="EmbedLatinScriptFonts" config:type="boolean">true</config:config-item> <config:config-item config:name="EmbedOnlyUsedFonts" config:type="boolean">false</config:config-item> - <config:config-item config:name="WordLikeWrapForAsCharFlys" config:type="boolean">false</config:config-item> - <config:config-item config:name="ContinuousEndnotes" config:type="boolean">false</config:config-item> <config:config-item config:name="EmbedFonts" config:type="boolean">false</config:config-item> <config:config-item config:name="ClippedPictures" config:type="boolean">false</config:config-item> + <config:config-item config:name="FrameAutowidthWithMorePara" config:type="boolean">false</config:config-item> <config:config-item config:name="FloattableNomargins" config:type="boolean">false</config:config-item> <config:config-item config:name="UnbreakableNumberings" config:type="boolean">false</config:config-item> - <config:config-item config:name="HeaderSpacingBelowLastPara" config:type="boolean">false</config:config-item> <config:config-item config:name="AllowPrintJobCancel" config:type="boolean">true</config:config-item> - <config:config-item config:name="UseOldPrinterMetrics" config:type="boolean">false</config:config-item> - <config:config-item config:name="TabOverMargin" config:type="boolean">false</config:config-item> - <config:config-item config:name="TabsRelativeToIndent" config:type="boolean">true</config:config-item> + <config:config-item config:name="UseFormerObjectPositioning" config:type="boolean">false</config:config-item> <config:config-item config:name="UseOldNumbering" config:type="boolean">false</config:config-item> - <config:config-item config:name="InvertBorderSpacing" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintPaperFromSetup" config:type="boolean">false</config:config-item> + <config:config-item config:name="RsidRoot" config:type="int">1557161</config:config-item> + <config:config-item config:name="PrinterPaperFromSetup" config:type="boolean">false</config:config-item> + <config:config-item config:name="CurrentDatabaseDataSource" config:type="string">Adressen</config:config-item> <config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item> - <config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item> - <config:config-item config:name="LinkUpdateMode" config:type="short">1</config:config-item> - <config:config-item config:name="AddParaSpacingToTableCells" config:type="boolean">true</config:config-item> - <config:config-item config:name="FrameAutowidthWithMorePara" config:type="boolean">false</config:config-item> - <config:config-item config:name="CurrentDatabaseCommand" config:type="string"/> - <config:config-item config:name="PrinterIndependentLayout" config:type="string">high-resolution</config:config-item> - <config:config-item config:name="ApplyUserData" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintFaxName" config:type="string"/> - <config:config-item config:name="CurrentDatabaseDataSource" config:type="string"/> - <config:config-item config:name="ClipAsCharacterAnchoredWriterFlyFrames" config:type="boolean">false</config:config-item> - <config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item> - <config:config-item config:name="SaveThumbnail" config:type="boolean">true</config:config-item> - <config:config-item config:name="UseFormerTextWrapping" config:type="boolean">false</config:config-item> - <config:config-item config:name="AutoFirstLineIndentDisregardLineSpace" config:type="boolean">false</config:config-item> - <config:config-item config:name="AddExternalLeading" config:type="boolean">true</config:config-item> - <config:config-item config:name="AddParaTableSpacing" config:type="boolean">true</config:config-item> - <config:config-item config:name="StylesNoDefault" config:type="boolean">false</config:config-item> - <config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item> + <config:config-item config:name="AddFrameOffsets" config:type="boolean">false</config:config-item> <config:config-item-map-indexed config:name="ForbiddenCharacters"> <config:config-item-map-entry> <config:config-item config:name="Language" config:type="string">hu</config:config-item> @@ -98,54 +81,72 @@ <config:config-item config:name="EndLine" config:type="string"/> </config:config-item-map-entry> </config:config-item-map-indexed> - <config:config-item config:name="PrinterSetup" config:type="base64Binary"/> - <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item> - <config:config-item config:name="Rsid" config:type="int">11613166</config:config-item> - <config:config-item config:name="EmbeddedDatabaseName" config:type="string"/> - <config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item> - <config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item> + <config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item> + <config:config-item config:name="Rsid" config:type="int">11743652</config:config-item> <config:config-item config:name="FootnoteInColumnToPageEnd" config:type="boolean">true</config:config-item> - <config:config-item config:name="AlignTabStopPosition" config:type="boolean">true</config:config-item> - <config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item> - <config:config-item config:name="PrinterName" config:type="string"/> + <config:config-item config:name="ProtectFields" config:type="boolean">false</config:config-item> <config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrinterPaperFromSetup" config:type="boolean">false</config:config-item> - <config:config-item config:name="UseFormerLineSpacing" config:type="boolean">false</config:config-item> - <config:config-item config:name="AddParaLineSpacingToTableCells" config:type="boolean">false</config:config-item> - <config:config-item config:name="UseFormerObjectPositioning" config:type="boolean">false</config:config-item> + <config:config-item config:name="ClipAsCharacterAnchoredWriterFlyFrames" config:type="boolean">false</config:config-item> + <config:config-item config:name="LinkUpdateMode" config:type="short">1</config:config-item> + <config:config-item config:name="AddExternalLeading" config:type="boolean">true</config:config-item> <config:config-item config:name="PrintGraphics" config:type="boolean">true</config:config-item> + <config:config-item config:name="EmbedSystemFonts" config:type="boolean">false</config:config-item> + <config:config-item config:name="IsLabelDocument" config:type="boolean">false</config:config-item> + <config:config-item config:name="AddParaLineSpacingToTableCells" config:type="boolean">false</config:config-item> + <config:config-item config:name="UseFormerTextWrapping" config:type="boolean">false</config:config-item> + <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item> + <config:config-item config:name="TabsRelativeToIndent" config:type="boolean">true</config:config-item> + <config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item> + <config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item> + <config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item> <config:config-item config:name="ImagePreferredDPI" config:type="int">0</config:config-item> - <config:config-item config:name="SurroundTextWrapSmall" config:type="boolean">false</config:config-item> - <config:config-item config:name="ConsiderTextWrapOnObjPos" config:type="boolean">false</config:config-item> - <config:config-item config:name="MsWordCompTrailingBlanks" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary"/> + <config:config-item config:name="SmallCapsPercentage66" config:type="boolean">true</config:config-item> + <config:config-item config:name="AlignTabStopPosition" config:type="boolean">true</config:config-item> + <config:config-item config:name="DropCapPunctuation" config:type="boolean">false</config:config-item> + <config:config-item config:name="MathBaselineAlignment" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrinterName" config:type="string"/> + <config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item> + <config:config-item config:name="AddParaTableSpacing" config:type="boolean">true</config:config-item> + <config:config-item config:name="DoNotJustifyLinesWithManualBreak" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrintHiddenText" config:type="boolean">false</config:config-item> + <config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrinterIndependentLayout" config:type="string">high-resolution</config:config-item> + <config:config-item config:name="TabOverflow" config:type="boolean">false</config:config-item> + <config:config-item config:name="AddParaSpacingToTableCells" config:type="boolean">true</config:config-item> + <config:config-item config:name="AddVerticalFrameOffsets" config:type="boolean">false</config:config-item> <config:config-item config:name="TabAtLeftIndentForParagraphsInList" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintRightPages" config:type="boolean">true</config:config-item> - <config:config-item config:name="TabOverSpacing" config:type="boolean">false</config:config-item> + <config:config-item config:name="ApplyUserData" config:type="boolean">false</config:config-item> + <config:config-item config:name="MsWordCompMinLineHeightByFly" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrintTextPlaceholder" config:type="boolean">false</config:config-item> <config:config-item config:name="IgnoreFirstLineIndentInNumbering" config:type="boolean">false</config:config-item> - <config:config-item config:name="NoNumberingShowFollowBy" config:type="boolean">false</config:config-item> + <config:config-item config:name="UseFormerLineSpacing" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrintPageBackground" config:type="boolean">true</config:config-item> <config:config-item config:name="RedlineProtectionKey" config:type="base64Binary"/> - <config:config-item config:name="DoNotJustifyLinesWithManualBreak" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintProspectRTL" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintEmptyPages" config:type="boolean">false</config:config-item> + <config:config-item config:name="EmbedAsianScriptFonts" config:type="boolean">true</config:config-item> + <config:config-item config:name="BackgroundParaOverDrawings" config:type="boolean">false</config:config-item> + <config:config-item config:name="SaveThumbnail" config:type="boolean">true</config:config-item> + <config:config-item config:name="ConsiderTextWrapOnObjPos" config:type="boolean">false</config:config-item> + <config:config-item config:name="EmbeddedDatabaseName" config:type="string"/> + <config:config-item config:name="ProtectForm" config:type="boolean">false</config:config-item> <config:config-item config:name="DoNotResetParaAttrsForNumFont" config:type="boolean">false</config:config-item> - <config:config-item config:name="AddFrameOffsets" config:type="boolean">false</config:config-item> + <config:config-item config:name="MsWordCompTrailingBlanks" config:type="boolean">false</config:config-item> + <config:config-item config:name="EmptyDbFieldHidesPara" config:type="boolean">false</config:config-item> + <config:config-item config:name="TableRowKeep" config:type="boolean">false</config:config-item> + <config:config-item config:name="NoNumberingShowFollowBy" config:type="boolean">false</config:config-item> + <config:config-item config:name="InvertBorderSpacing" config:type="boolean">false</config:config-item> <config:config-item config:name="IgnoreTabsAndBlanksForLineCalculation" config:type="boolean">false</config:config-item> - <config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item> <config:config-item config:name="DoNotCaptureDrawObjsOnPage" config:type="boolean">false</config:config-item> - <config:config-item config:name="AddVerticalFrameOffsets" config:type="boolean">false</config:config-item> + <config:config-item config:name="GutterAtTop" config:type="boolean">false</config:config-item> + <config:config-item config:name="StylesNoDefault" config:type="boolean">false</config:config-item> <config:config-item config:name="UnxForceZeroExtLeading" config:type="boolean">false</config:config-item> - <config:config-item config:name="IsLabelDocument" config:type="boolean">false</config:config-item> - <config:config-item config:name="TableRowKeep" config:type="boolean">false</config:config-item> - <config:config-item config:name="RsidRoot" config:type="int">1557161</config:config-item> - <config:config-item config:name="PrintHiddenText" config:type="boolean">false</config:config-item> - <config:config-item config:name="ProtectForm" config:type="boolean">false</config:config-item> - <config:config-item config:name="MsWordCompMinLineHeightByFly" config:type="boolean">false</config:config-item> - <config:config-item config:name="BackgroundParaOverDrawings" config:type="boolean">false</config:config-item> - <config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item> - <config:config-item config:name="MathBaselineAlignment" config:type="boolean">false</config:config-item> - <config:config-item config:name="SmallCapsPercentage66" config:type="boolean">true</config:config-item> + <config:config-item config:name="PrintReversed" config:type="boolean">false</config:config-item> + <config:config-item config:name="UseOldPrinterMetrics" config:type="boolean">false</config:config-item> + <config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item> + <config:config-item config:name="PrintDrawings" config:type="boolean">true</config:config-item> + <config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item> + <config:config-item config:name="CurrentDatabaseCommand" config:type="string"/> <config:config-item config:name="CollapseEmptyCellPara" config:type="boolean">true</config:config-item> - <config:config-item config:name="TabOverflow" config:type="boolean">false</config:config-item> </config:config-item-set> </office:settings> <office:scripts> @@ -156,29 +157,29 @@ </office:script> </office:scripts> <office:font-face-decls> - <style:font-face style:name="Mangal1" svg:font-family="Mangal"/> - <style:font-face style:name="OpenSymbol" svg:font-family="OpenSymbol"/> - <style:font-face style:name="sans-serif" svg:font-family="sans-serif"/> + <style:font-face style:name="Albany" svg:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable"/> <style:font-face style:name="Arial Unicode MS" svg:font-family="'Arial Unicode MS'" style:font-pitch="variable"/> <style:font-face style:name="HG Mincho Light J" svg:font-family="'HG Mincho Light J'" style:font-pitch="variable"/> - <style:font-face style:name="Thorndale AMT" svg:font-family="'Thorndale AMT'" style:font-family-generic="roman" style:font-pitch="variable"/> - <style:font-face style:name="Albany" svg:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable"/> - <style:font-face style:name="Liberation Sans1" svg:font-family="'Liberation Sans'" style:font-adornments="Bold" style:font-family-generic="swiss" style:font-pitch="variable"/> - <style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-adornments="Regular" style:font-family-generic="swiss" style:font-pitch="variable"/> - <style:font-face style:name="Mangal" svg:font-family="Mangal" style:font-family-generic="system" style:font-pitch="variable"/> + <style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-adornments="Bold" style:font-family-generic="swiss" style:font-pitch="variable"/> + <style:font-face style:name="Liberation Sans1" svg:font-family="'Liberation Sans'" style:font-adornments="Regular" style:font-family-generic="swiss" style:font-pitch="variable"/> + <style:font-face style:name="Mangal" svg:font-family="Mangal"/> + <style:font-face style:name="Mangal1" svg:font-family="Mangal" style:font-family-generic="system" style:font-pitch="variable"/> + <style:font-face style:name="OpenSymbol" svg:font-family="OpenSymbol"/> <style:font-face style:name="SimSun" svg:font-family="SimSun" style:font-family-generic="system" style:font-pitch="variable"/> + <style:font-face style:name="Thorndale AMT" svg:font-family="'Thorndale AMT'" style:font-family-generic="roman" style:font-pitch="variable"/> + <style:font-face style:name="sans-serif" svg:font-family="sans-serif"/> </office:font-face-decls> <office:styles> <style:default-style style:family="graphic"> - <style:graphic-properties svg:stroke-color="#3465a4" draw:fill-color="#729fcf" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:flow-with-text="true"/> - <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false"> + <style:graphic-properties svg:stroke-color="#3465a4" draw:fill-color="#729fcf" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:writing-mode="lr-tb" style:flow-with-text="true"/> + <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:font-independent-line-spacing="false"> <style:tab-stops/> </style:paragraph-properties> - <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Thorndale AMT" fo:font-size="12pt" fo:language="hu" fo:country="HU" style:letter-kerning="true" style:font-name-asian="SimSun" style:font-size-asian="12pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Mangal" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN"/> + <style:text-properties style:use-window-font-color="true" loext:opacity="0%" loext:color-lum-mod="100%" loext:color-lum-off="0%" style:font-name="Thorndale AMT" fo:font-size="12pt" fo:language="hu" fo:country="HU" style:letter-kerning="true" style:font-name-asian="SimSun" style:font-size-asian="12pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Mangal1" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN"/> </style:default-style> <style:default-style style:family="paragraph"> <style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page"/> - <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Thorndale AMT" fo:font-size="12pt" fo:language="hu" fo:country="HU" style:letter-kerning="true" style:font-name-asian="SimSun" style:font-size-asian="12pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Mangal" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2" loext:hyphenation-no-caps="false"/> + <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Thorndale AMT" fo:font-size="12pt" fo:language="hu" fo:country="HU" style:letter-kerning="true" style:font-name-asian="SimSun" style:font-size-asian="12pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Mangal1" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false" loext:hyphenation-word-char-count="5" loext:hyphenation-zone="no-limit"/> </style:default-style> <style:default-style style:family="table"> <style:table-properties table:border-model="collapsing"/> @@ -195,18 +196,18 @@ </style:style> <style:style style:name="Text_20_body" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text"> <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.499cm" style:contextual-spacing="false"/> - <style:text-properties style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-style-name="Regular" style:font-family-generic="swiss" style:font-pitch="variable" fo:language="en" fo:country="US"/> + <style:text-properties style:font-name="Liberation Sans1" fo:font-family="'Liberation Sans'" style:font-style-name="Regular" style:font-family-generic="swiss" style:font-pitch="variable" fo:language="en" fo:country="US"/> </style:style> <style:style style:name="List" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="list"> - <style:text-properties style:font-size-asian="12pt" style:font-name-complex="Mangal1" style:font-family-complex="Mangal"/> + <style:text-properties style:font-size-asian="12pt" style:font-name-complex="Mangal" style:font-family-complex="Mangal"/> </style:style> <style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"> <style:paragraph-properties fo:margin-top="0.212cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false" text:number-lines="false" text:line-number="0"/> - <style:text-properties fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="italic" style:font-name-complex="Mangal1" style:font-family-complex="Mangal" style:font-size-complex="12pt" style:font-style-complex="italic"/> + <style:text-properties fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="italic" style:font-name-complex="Mangal" style:font-family-complex="Mangal" style:font-size-complex="12pt" style:font-style-complex="italic"/> </style:style> <style:style style:name="Index" style:family="paragraph" style:parent-style-name="Standard" style:class="index"> <style:paragraph-properties text:number-lines="false" text:line-number="0"/> - <style:text-properties style:font-size-asian="12pt" style:font-name-complex="Mangal1" style:font-family-complex="Mangal"/> + <style:text-properties style:font-size-asian="12pt" style:font-name-complex="Mangal" style:font-family-complex="Mangal"/> </style:style> <style:style style:name="Horizontal_20_Line" style:display-name="Horizontal Line" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="html"> <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.499cm" style:contextual-spacing="false" style:border-line-width-bottom="0.002cm 0.035cm 0.002cm" fo:padding="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="1.11pt double #808080"/> @@ -241,7 +242,7 @@ </style:paragraph-properties> </style:style> <style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:class="text"> - <style:text-properties style:font-name="Liberation Sans1" fo:font-family="'Liberation Sans'" style:font-style-name="Bold" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="24pt" fo:language="en" fo:country="US" fo:font-weight="bold" style:font-name-asian="HG Mincho Light J" style:font-family-asian="'HG Mincho Light J'" style:font-pitch-asian="variable" style:font-size-asian="24pt" style:font-weight-asian="bold" style:font-name-complex="Arial Unicode MS" style:font-family-complex="'Arial Unicode MS'" style:font-pitch-complex="variable" style:font-size-complex="24pt" style:font-weight-complex="bold"/> + <style:text-properties style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-style-name="Bold" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="24pt" fo:language="en" fo:country="US" fo:font-weight="bold" style:font-name-asian="HG Mincho Light J" style:font-family-asian="'HG Mincho Light J'" style:font-pitch-asian="variable" style:font-size-asian="24pt" style:font-weight-asian="bold" style:font-name-complex="Arial Unicode MS" style:font-family-complex="'Arial Unicode MS'" style:font-pitch-complex="variable" style:font-size-complex="24pt" style:font-weight-complex="bold"/> </style:style> <style:style style:name="Quotations" style:family="paragraph" style:parent-style-name="Standard" style:class="html"> <style:paragraph-properties fo:margin-left="1cm" fo:margin-right="1cm" fo:margin-top="0cm" fo:margin-bottom="0.499cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false"/> @@ -250,14 +251,14 @@ <style:text-properties fo:font-variant="small-caps"/> </style:style> <style:style style:name="Heading_20_3" style:display-name="Heading 3" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="3" style:list-style-name="" style:class="text"> - <style:text-properties style:font-name="Liberation Sans1" fo:font-family="'Liberation Sans'" style:font-style-name="Bold" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="14pt" fo:language="en" fo:country="US" fo:font-weight="bold" style:font-name-asian="SimSun" style:font-family-asian="SimSun" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-name-complex="Mangal" style:font-family-complex="Mangal" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="14pt" style:font-weight-complex="bold"/> + <style:text-properties style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-style-name="Bold" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="14pt" fo:language="en" fo:country="US" fo:font-weight="bold" style:font-name-asian="SimSun" style:font-family-asian="SimSun" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-name-complex="Mangal1" style:font-family-complex="Mangal" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="14pt" style:font-weight-complex="bold"/> </style:style> <style:style style:name="Table_20_Heading" style:display-name="Table Heading" style:family="paragraph" style:parent-style-name="Table_20_Contents" style:class="extra"> <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" text:number-lines="false" text:line-number="0"/> <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> </style:style> <style:style style:name="Heading_20_2" style:display-name="Heading 2" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="2" style:list-style-name="" style:class="text"> - <style:text-properties style:font-name="Liberation Sans1" fo:font-family="'Liberation Sans'" style:font-style-name="Bold" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="18pt" fo:language="en" fo:country="US" fo:font-weight="bold" style:font-name-asian="SimSun" style:font-family-asian="SimSun" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="18pt" style:font-weight-asian="bold" style:font-name-complex="Mangal" style:font-family-complex="Mangal" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="18pt" style:font-weight-complex="bold"/> + <style:text-properties style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-style-name="Bold" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="18pt" fo:language="en" fo:country="US" fo:font-weight="bold" style:font-name-asian="SimSun" style:font-family-asian="SimSun" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="18pt" style:font-weight-asian="bold" style:font-name-complex="Mangal1" style:font-family-complex="Mangal" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="18pt" style:font-weight-complex="bold"/> </style:style> <style:style style:name="Frame_20_contents" style:display-name="Frame contents" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="extra"/> <style:style style:name="Title" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:class="chapter"> @@ -292,52 +293,52 @@ <style:graphic-properties text:anchor-type="paragraph" svg:x="0cm" svg:y="0cm" style:wrap="none" style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="center" style:horizontal-rel="paragraph"/> </style:style> <text:outline-style style:name="Outline"> - <text:outline-level-style text:level="1" style:num-format=""> + <text:outline-level-style text:level="1" loext:num-list-format="%1%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.762cm" fo:text-indent="-0.762cm" fo:margin-left="0.762cm"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="2" style:num-format=""> + <text:outline-level-style text:level="2" loext:num-list-format="%2%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.016cm" fo:text-indent="-1.016cm" fo:margin-left="1.016cm"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="3" style:num-format=""> + <text:outline-level-style text:level="3" loext:num-list-format="%3%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.27cm" fo:text-indent="-1.27cm" fo:margin-left="1.27cm"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="4" style:num-format=""> + <text:outline-level-style text:level="4" loext:num-list-format="%4%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.524cm" fo:text-indent="-1.524cm" fo:margin-left="1.524cm"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="5" style:num-format=""> + <text:outline-level-style text:level="5" loext:num-list-format="%5%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.778cm" fo:text-indent="-1.778cm" fo:margin-left="1.778cm"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="6" style:num-format=""> + <text:outline-level-style text:level="6" loext:num-list-format="%6%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.032cm" fo:text-indent="-2.032cm" fo:margin-left="2.032cm"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="7" style:num-format=""> + <text:outline-level-style text:level="7" loext:num-list-format="%7%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.286cm" fo:text-indent="-2.286cm" fo:margin-left="2.286cm"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="8" style:num-format=""> + <text:outline-level-style text:level="8" loext:num-list-format="%8%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.54cm" fo:text-indent="-2.54cm" fo:margin-left="2.54cm"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="9" style:num-format=""> + <text:outline-level-style text:level="9" loext:num-list-format="%9%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.794cm" fo:text-indent="-2.794cm" fo:margin-left="2.794cm"/> </style:list-level-properties> </text:outline-level-style> - <text:outline-level-style text:level="10" style:num-format=""> + <text:outline-level-style text:level="10" loext:num-list-format="%10%" style:num-format=""> <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="3.048cm" fo:text-indent="-3.048cm" fo:margin-left="3.048cm"/> </style:list-level-properties> @@ -352,21 +353,21 @@ <style:table-properties style:width="26.174cm" table:align="left"/> </style:style> <style:style style:name="Tabelle1.A" style:family="table-column"> - <style:table-column-properties style:column-width="6.854cm"/> + <style:table-column-properties style:column-width="6.775cm"/> </style:style> <style:style style:name="Tabelle1.B" style:family="table-column"> - <style:table-column-properties style:column-width="6.272cm"/> + <style:table-column-properties style:column-width="6.219cm"/> </style:style> <style:style style:name="Tabelle1.C" style:family="table-column"> - <style:table-column-properties style:column-width="6.749cm"/> + <style:table-column-properties style:column-width="6.828cm"/> </style:style> <style:style style:name="Tabelle1.D" style:family="table-column"> - <style:table-column-properties style:column-width="6.299cm"/> + <style:table-column-properties style:column-width="6.352cm"/> </style:style> <style:style style:name="Tabelle1.A1" style:family="table-cell"> <style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/> </style:style> - <style:style style:name="Tabelle1.B425" style:family="table-cell"> + <style:style style:name="Tabelle1.C428" style:family="table-cell"> <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/> </style:style> <style:style style:name="Tabelle2" style:family="table"> @@ -430,19 +431,19 @@ <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/> </style:style> <style:style style:name="Tabelle5" style:family="table"> - <style:table-properties style:width="32.921cm" table:align="left"/> + <style:table-properties style:width="31.884cm" table:align="left"/> </style:style> <style:style style:name="Tabelle5.A" style:family="table-column"> - <style:table-column-properties style:column-width="6.696cm"/> + <style:table-column-properties style:column-width="10.881cm"/> </style:style> <style:style style:name="Tabelle5.B" style:family="table-column"> - <style:table-column-properties style:column-width="8.072cm"/> + <style:table-column-properties style:column-width="6.537cm"/> </style:style> <style:style style:name="Tabelle5.C" style:family="table-column"> - <style:table-column-properties style:column-width="11.829cm"/> + <style:table-column-properties style:column-width="6.431cm"/> </style:style> <style:style style:name="Tabelle5.D" style:family="table-column"> - <style:table-column-properties style:column-width="6.325cm"/> + <style:table-column-properties style:column-width="8.035cm"/> </style:style> <style:style style:name="Tabelle5.A1" style:family="table-cell"> <style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/> @@ -459,91 +460,91 @@ <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Table_20_Contents"> <style:text-properties officeooo:paragraph-rsid="00aed2a1"/> </style:style> - <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Table_20_Contents"> - <style:text-properties officeooo:paragraph-rsid="00af6e70"/> - </style:style> - <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> + <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> <style:paragraph-properties style:page-number="auto"/> + <style:text-properties officeooo:paragraph-rsid="00aed2a1"/> </style:style> - <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> - <style:paragraph-properties style:page-number="auto"/> + <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Text_20_body"> + <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/> <style:text-properties officeooo:paragraph-rsid="00aed2a1"/> </style:style> - <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> + <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Text_20_body"> + <style:text-properties officeooo:paragraph-rsid="00aed2a1"/> + </style:style> + <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Heading_20_2"> + <style:text-properties officeooo:paragraph-rsid="00aed2a1"/> + </style:style> + <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Heading_20_3"> + <style:text-properties officeooo:paragraph-rsid="00aed2a1"/> + </style:style> + <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:text-properties officeooo:paragraph-rsid="00af6e70"/> + </style:style> + <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> <style:paragraph-properties style:page-number="auto"/> <style:text-properties officeooo:paragraph-rsid="00af6e70"/> </style:style> - <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> + <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Text_20_body"> + <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/> + <style:text-properties officeooo:paragraph-rsid="00af6e70"/> + </style:style> + <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Text_20_body"> + <style:text-properties officeooo:paragraph-rsid="00af6e70"/> + </style:style> + <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Heading_20_2"> + <style:text-properties officeooo:paragraph-rsid="00af6e70"/> + </style:style> + <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Heading_20_3"> + <style:text-properties officeooo:paragraph-rsid="00af6e70"/> + </style:style> + <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> + <style:paragraph-properties style:page-number="auto"/> + </style:style> + <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> <style:paragraph-properties style:page-number="auto" fo:padding="0cm" fo:border="none"/> </style:style> - <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> + <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> <style:paragraph-properties style:page-number="auto" fo:padding="0cm" fo:border="none"/> <style:text-properties officeooo:paragraph-rsid="00378072"/> </style:style> - <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> + <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Text_20_body"> + <style:paragraph-properties fo:padding="0cm" fo:border="none"/> + <style:text-properties officeooo:paragraph-rsid="00378072"/> + </style:style> + <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> <style:paragraph-properties style:page-number="auto" fo:padding="0cm" fo:border="none"/> <style:text-properties officeooo:rsid="001cf3c0" officeooo:paragraph-rsid="001cf3c0"/> </style:style> - <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> + <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> <style:paragraph-properties style:page-number="auto" fo:padding="0cm" fo:border="none"/> <style:text-properties officeooo:paragraph-rsid="001cf3c0"/> </style:style> - <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> + <style:style style:name="P22" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> <style:paragraph-properties style:page-number="auto" fo:padding="0cm" fo:border="none"/> <style:text-properties officeooo:rsid="0020b307" officeooo:paragraph-rsid="0020b307"/> </style:style> - <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> + <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> <style:paragraph-properties style:page-number="auto" fo:padding="0cm" fo:border="none"/> <style:text-properties officeooo:paragraph-rsid="0020b307"/> </style:style> - <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> + <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> <style:paragraph-properties style:page-number="auto" fo:padding="0cm" fo:border="none"/> <style:text-properties officeooo:rsid="00378072" officeooo:paragraph-rsid="00378072"/> </style:style> - <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Text_20_body"> - <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/> - </style:style> - <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Text_20_body"> - <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/> - <style:text-properties officeooo:paragraph-rsid="00aed2a1"/> - </style:style> - <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Text_20_body"> + <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Text_20_body"> <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/> - <style:text-properties officeooo:paragraph-rsid="00af6e70"/> </style:style> - <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Text_20_body"> + <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Text_20_body"> <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" style:writing-mode="lr-tb"/> </style:style> - <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Text_20_body"> - <style:text-properties officeooo:paragraph-rsid="00aed2a1"/> - </style:style> - <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Text_20_body"> - <style:text-properties officeooo:paragraph-rsid="00af6e70"/> - </style:style> - <style:style style:name="P22" style:family="paragraph" style:parent-style-name="Text_20_body"> + <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Text_20_body"> <style:text-properties officeooo:paragraph-rsid="0036e394"/> </style:style> - <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Text_20_body"> - <style:text-properties officeooo:paragraph-rsid="00586a23"/> - </style:style> - <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Heading_20_2"> - <style:text-properties officeooo:paragraph-rsid="00aed2a1"/> - </style:style> - <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Heading_20_2"> - <style:text-properties officeooo:paragraph-rsid="00af6e70"/> - </style:style> - <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Heading_20_3"> - <style:text-properties officeooo:paragraph-rsid="00aed2a1"/> - </style:style> - <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Heading_20_3"> - <style:text-properties officeooo:paragraph-rsid="00af6e70"/> - </style:style> <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Text_20_body"> - <style:paragraph-properties fo:padding="0cm" fo:border="none"/> + <style:text-properties officeooo:paragraph-rsid="00586a23"/> </style:style> <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Text_20_body"> <style:paragraph-properties fo:padding="0cm" fo:border="none"/> - <style:text-properties officeooo:paragraph-rsid="00378072"/> </style:style> <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name="HTML"> <style:paragraph-properties style:page-number="auto"/> @@ -553,14 +554,33 @@ <style:text-properties fo:font-size="2pt" style:font-size-asian="2pt" style:font-size-complex="2pt"/> </style:style> ... etc. - the rest is truncated
