Repository.mk | 4 RepositoryModule_host.mk | 1 basic/source/comp/scanner.cxx | 2 bin/distro-install-file-lists | 3 cppcanvas/source/mtfrenderer/emfplus.cxx | 2 drawinglayer/source/texture/texture3d.cxx | 11 filter/source/msfilter/msdffimp.cxx | 6 filter/source/xsltfilter/OleHandler.cxx | 2 include/sfx2/objsh.hxx | 2 officecfg/Configuration_officecfg.mk | 3 officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu | 14 oox/source/crypto/CryptTools.cxx | 2 oox/source/drawingml/shapecontext.cxx | 4 oox/source/shape/WpsContext.cxx | 13 oox/source/vml/vmlshape.cxx | 3 postprocess/CustomTarget_registry.mk | 6 sal/textenc/tcvtkr6.tab | 2 sc/qa/unit/data/xls/forcepoint-pivot-1.xls |binary sc/source/core/data/column3.cxx | 2 sc/source/core/data/document.cxx | 2 sc/source/core/data/dptabres.cxx | 8 sc/source/filter/excel/xipivot.cxx | 8 sc/source/filter/rtf/eeimpars.cxx | 2 sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 2 sc/source/ui/docshell/externalrefmgr.cxx | 53 scp2/AutoInstall.mk | 1 scp2/InstallModule_python.mk | 6 sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx | 2 setup_native/source/packinfo/packinfo_office.txt | 17 sfx2/source/doc/objmisc.cxx | 33 sfx2/source/notify/eventsupplier.cxx | 18 solenv/bin/modules/installer/epmfile.pm | 12 starmath/source/mathtype.cxx | 4 svl/source/numbers/zformat.cxx | 4 svx/source/svdraw/svdopath.cxx | 3 sw/inc/anchoredobject.hxx | 1 sw/qa/core/data/odt/fail/forcepoint-xstor-1.odt |binary sw/qa/core/data/ooxml/fail/ofz9934-1.docx |binary sw/qa/core/data/rtf/fail/forcepoint-4.rtf | 1779 +++++ sw/qa/core/data/ww8/fail/forcepoint-44.doc |binary sw/qa/core/data/ww8/indeterminate/ofz7322-1.doc |binary sw/qa/core/data/ww8/pass/forcepoint-layout-1.doc |binary sw/qa/extras/layout/data/forcepoint76-1.rtf | 3388 ++++++++++ sw/qa/extras/layout/layout.cxx | 5 sw/qa/extras/uiwriter/data/tdf114536.odt |binary sw/qa/extras/uiwriter/uiwriter.cxx | 9 sw/source/core/doc/DocumentRedlineManager.cxx | 4 sw/source/core/doc/docbm.cxx | 9 sw/source/core/inc/frame.hxx | 2 sw/source/core/inc/ftnfrm.hxx | 1 sw/source/core/inc/layouter.hxx | 4 sw/source/core/layout/anchoredobject.cxx | 9 sw/source/core/layout/calcmove.cxx | 1 sw/source/core/layout/flowfrm.cxx | 4 sw/source/core/layout/fly.cxx | 3 sw/source/core/layout/ftnfrm.cxx | 29 sw/source/core/layout/layouter.cxx | 15 sw/source/core/layout/objstmpconsiderwrapinfl.cxx | 27 sw/source/core/layout/objstmpconsiderwrapinfl.hxx | 1 sw/source/core/layout/pagechg.cxx | 2 sw/source/core/layout/ssfrm.cxx | 5 sw/source/core/layout/tabfrm.cxx | 5 sw/source/core/layout/trvlfrm.cxx | 8 sw/source/core/text/itrform2.cxx | 13 sw/source/core/unocore/unostyle.cxx | 3 sw/source/filter/ww8/ww8graf.cxx | 13 sw/source/filter/ww8/ww8par.cxx | 4 sw/source/filter/ww8/ww8par.hxx | 2 sw/source/filter/ww8/ww8par3.cxx | 2 sw/source/filter/ww8/ww8par5.cxx | 9 vcl/headless/svpgdi.cxx | 15 vcl/inc/regionband.hxx | 3 vcl/source/gdi/CommonSalLayout.cxx | 9 vcl/source/gdi/region.cxx | 8 vcl/source/gdi/regionband.cxx | 27 writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 7 writerfilter/source/dmapper/DomainMapper_Impl.cxx | 28 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 6 writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 20 writerfilter/source/rtftok/rtfsdrimport.cxx | 2 xmlsecurity/source/helper/xmlsignaturehelper.cxx | 30 81 files changed, 5575 insertions(+), 194 deletions(-)
New commits: commit 859d04d6d9d17b803686063a4b78ca105353dec8 Author: Michael Stahl <[email protected]> AuthorDate: Wed Jul 31 12:30:26 2019 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Aug 6 13:59:40 2019 +0200 solenv installer: don't let RPM generate config(...) Requires Fedora 30's rpm 4.14.2.1 will generate this Requires: config(lodevbasis6.1-core) = 6.1.7.0.0-1 ... but no corresponding Provides because that's disabled, so the package cannot be installed. The reason is that there is one %config file in the -core rpm: %attr(0644,root,root) %config(noreplace) "/opt/libreofficedev6.1/./share/psprint/psprint.conf" Old RPM from CentOS6 does not generate these config requires. Unfortunately there doesn't appear to be a way to disable this config(...) without disabling AutoReq, so do that, and invoke the shell script find-requires-x11.sh manually from epmfile.pm. Change-Id: I7fee0d9cd1b9e79f81bd4c611500e84736564881 Reviewed-on: https://gerrit.libreoffice.org/76736 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit b1d555ed42a035e0489accc19903c1ed8897bcee) (cherry picked from commit fa58f27bb421b449134e79c03a4fb8762ab18679) (cherry picked from commit fe51efc58dc04746282aaf641b5e4bd240d20da5) diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 0dbc37a92cb9..fce17518aa76 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -1193,15 +1193,15 @@ sub set_autoprovreq_in_specfile { my ($changefile, $findrequires, $bindir) = @_; - my $autoreqprovline; + my $autoreqprovline = "AutoReqProv\: no\n"; if ( $findrequires ) { - $autoreqprovline = "AutoProv\: no\n%define _use_internal_dependency_generator 0\n%define __find_requires $bindir/$findrequires\n"; - } - else - { - $autoreqprovline = "AutoReqProv\: no\n"; + # don't let rpm invoke it, we never want to use AutoReq because + # rpm will generate Requires: config(packagename) + open (FINDREQUIRES, "echo | $bindir/$findrequires |"); + while (<FINDREQUIRES>) { $autoreqprovline .= "Requires: $_\n"; } + close (FINDREQUIRES); } $autoreqprovline .= "%define _binary_filedigest_algorithm 1\n%define _binary_payload w9.gzdio\n"; commit c903537810c68e8b41bf74b0ed8b058b6c6dee5e Author: Michael Stahl <[email protected]> AuthorDate: Mon Jul 29 12:28:26 2019 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Aug 6 13:59:39 2019 +0200 remove LibreLogo from build (cherry picked from commit e9d6950387a6e41f8f7b7d91921a2686defe136b) (cherry picked from commit 7d205ea105c9009a48f82b0732cf8f3a0a4167f6) Change-Id: I62b45ea4890f5693e7d12f2b8c4ae43a9a03d16e diff --git a/Repository.mk b/Repository.mk index 963d58695d50..f5466d00b8ea 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1029,10 +1029,6 @@ $(eval $(call gb_Helper_register_packages_for_install,python_scriptprovider, \ scriptproviderforpython \ )) -$(eval $(call gb_Helper_register_packages_for_install,python_librelogo, \ - librelogo \ - librelogo_properties \ -)) endif # DISABLE_PYTHON # External executables diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 51feb0b9125f..d00bde5fb729 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -75,7 +75,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ jurt \ jvmaccess \ jvmfwk \ - librelogo \ libreofficekit \ lingucomponent \ linguistic \ diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index 779ad7d6e57f..917cdc48d9de 100755 --- a/bin/distro-install-file-lists +++ b/bin/distro-install-file-lists @@ -141,14 +141,12 @@ if test "z$OOO_VENDOR" != "zDebian" ; then merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/pyuno_list.txt merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt - merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt else merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/mailmerge_list.txt merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt - merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/filters_list.txt fi @@ -157,7 +155,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/common_list.txt merge_flists gid_Module_Pyuno $FILELISTSDIR/common_list.txt - merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/common_list.txt merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/common_list.txt merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt fi diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index ccaa35aea0a9..9078454350ef 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -72,7 +72,6 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Office/Accelerators-macosx.xcu \ org/openoffice/Office/Accelerators-reportbuilder.xcu \ org/openoffice/Office/Accelerators-unxwnt.xcu \ - org/openoffice/Office/Addons-librelogo.xcu \ org/openoffice/Office/Common-writer.xcu \ org/openoffice/Office/Common-calc.xcu \ org/openoffice/Office/Common-draw.xcu \ @@ -109,7 +108,6 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Office/Embedding-base.xcu \ org/openoffice/Office/Embedding-reportbuilder.xcu \ org/openoffice/Office/Embedding-writer.xcu \ - org/openoffice/Office/UI/WriterWindowState-librelogo.xcu \ org/openoffice/Office/UI/Controller-reportbuilder.xcu \ org/openoffice/TypeDetection/UISort-writer.xcu \ org/openoffice/TypeDetection/UISort-calc.xcu \ @@ -129,7 +127,6 @@ $(eval $(call gb_Configuration_add_spool_langpack,registry,officecfg/registry/da $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\ org/openoffice/Setup.xcu \ org/openoffice/Office/Accelerators.xcu \ - org/openoffice/Office/Addons.xcu \ org/openoffice/Office/Common.xcu \ org/openoffice/Office/DataAccess.xcu \ org/openoffice/Office/PresentationMinimizer.xcu \ diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu index 0f1b4a0b080b..58dc7d40aef4 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu @@ -858,20 +858,6 @@ <value>true</value> </prop> </node> - <node oor:name="private:resource/toolbar/addon_LibreLogo.OfficeToolBar" oor:op="replace" install:module="librelogo"> - <prop oor:name="UIName" oor:type="xs:string"> - <value xml:lang="en-US">Logo</value> - </prop> - <prop oor:name="Visible" oor:type="xs:boolean"> - <value>false</value> - </prop> - <prop oor:name="Locked" oor:type="xs:boolean"> - <value>false</value> - </prop> - <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean"> - <value>false</value> - </prop> - </node> <node oor:name="private:resource/toolbar/changes" oor:op="replace"> <prop oor:name="DockPos" oor:type="xs:string"> <value>1,2</value> diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 584d90b46414..9d42a2ce392b 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -27,7 +27,6 @@ postprocess_XCDS := \ draw.xcd \ graphicfilter.xcd \ impress.xcd \ - librelogo.xcd \ lingucomponent.xcd \ main.xcd \ math.xcd \ @@ -110,11 +109,6 @@ postprocess_FILES_impress := \ $(postprocess_MOD)/org/openoffice/Office/ProtocolHandler-impress.xcu \ $(postprocess_MOD)/org/openoffice/Setup-impress.xcu -postprocess_DEPS_librelogo := main writer -postprocess_FILES_librelogo := \ - $(postprocess_MOD)/org/openoffice/Office/Addons-librelogo.xcu \ - $(postprocess_MOD)/org/openoffice/Office/UI/WriterWindowState-librelogo.xcu - postprocess_DEPS_lingucomponent := main postprocess_FILES_lingucomponent := \ $(SRCDIR)/lingucomponent/config/Linguistic-lingucomponent-hyphenator.xcu \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 409ceb9ed21f..e151ffa708a7 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -37,7 +37,6 @@ $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_J $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,python_scriptprovider,)) -$(eval $(call gb_AutoInstall_add_module,python_librelogo,)) $(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE)) diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index e38d58a9b821..fef10924a62f 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -12,7 +12,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/python)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,\ python \ python_scriptprovider \ - python_librelogo \ )) ifeq ($(DISABLE_PYTHON),TRUE) @@ -37,12 +36,7 @@ endif $(eval $(call gb_InstallModule_add_scpfiles,scp2/python,\ scp2/source/python/file_python \ - scp2/source/python/file_python_librelogo \ scp2/source/python/module_python \ )) -$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/python,\ - scp2/source/python/module_python_librelogo \ -)) - # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index a38d6c1cf203..a80b77b7bc94 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -266,6 +266,8 @@ module = "gid_Module_Pyuno" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWPython" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno" +linuxreplaces = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" +linuxincompat = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" copyright = "2017 The Document Foundation" @@ -277,21 +279,6 @@ packageversion = "%PACKAGEVERSION" End Start -module = "gid_Module_Optional_Pyuno_LibreLogo" -solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer,SUNWPython" -packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" -freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" -requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2017 The Document Foundation" -solariscopyright = "solariscopyrightfile" -vendor = "The Document Foundation" -description = "LibreLogo toolbar for %PRODUCTNAME %PRODUCTVERSION Writer" -destpath = "/opt" -packageversion = "%PACKAGEVERSION" -End - -Start module = "gid_Module_Script_Provider_For_Python" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-python-script-provider" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" commit c7bd9fdb54c4beefc7fdeded33290eeb12af2edf Author: Eike Rathke <[email protected]> AuthorDate: Thu Jul 11 15:50:07 2019 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Aug 6 13:59:39 2019 +0200 Postpone loading of all external references, including INDIRECT() ... which can be constructed with an arbitrary URI text string not an svExternal* token type, until link updates are allowed. Reviewed-on: https://gerrit.libreoffice.org/75422 Reviewed-by: Eike Rathke <[email protected]> Tested-by: Jenkins (cherry picked from commit b824b23860b2cf533d4f2428d4a750bd72576181) Reviewed-on: https://gerrit.libreoffice.org/76304 Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: Thorsten Behrens <[email protected]> Change-Id: I2ce4de415ff99ace04c083c36c1383d76a4ef40d (cherry picked from commit 31b1d2af8ce01804049168b7b0317d93d77a42d7) (cherry picked from commit e374cd045665226e0af82e1ba787bcb2a3879d31) diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 445d06a8720b..01209a55c3dc 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -133,11 +133,12 @@ struct UpdateFormulaCell : public unary_function<ScFormulaCell*, void> { void operator() (ScFormulaCell* pCell) const { - // Check to make sure the cell really contains ocExternalRef. + // Check to make sure the cell really contains svExternal*. // External names, external cell and range references all have a - // ocExternalRef token. + // token of svExternal*. Additionally check for INDIRECT() that can be + // called with any constructed URI string. ScTokenArray* pCode = pCell->GetCode(); - if (!pCode->HasExternalRef()) + if (!pCode->HasExternalRef() && !pCode->HasOpCode(ocIndirect)) return; if (pCode->GetCodeError() != FormulaError::NONE) @@ -1662,6 +1663,17 @@ static std::unique_ptr<ScTokenArray> lcl_fillEmptyMatrix(const ScRange& rRange) return pArray; } +namespace { +bool isLinkUpdateAllowedInDoc(const ScDocument& rDoc) +{ + SfxObjectShell* pDocShell = rDoc.GetDocumentShell(); + if (!pDocShell) + return false; + + return pDocShell->GetEmbeddedObjectContainer().getUserAllowsLinkUpdate(); +} +} + ScExternalRefManager::ScExternalRefManager(ScDocument* pDoc) : mpDoc(pDoc), mbInReferenceMarking(false), @@ -1951,8 +1963,19 @@ ScExternalRefCache::TokenRef ScExternalRefManager::getSingleRefToken( pSrcDoc = getSrcDocument(nFileId); if (!pSrcDoc) { - // Source document not reachable. Throw a reference error. - pToken.reset(new FormulaErrorToken(FormulaError::NoRef)); + // Source document not reachable. +#if 0 + if (!isLinkUpdateAllowedInDoc(*mpDoc)) + { + // Indicate with specific error. + pToken.reset(new FormulaErrorToken(FormulaError::LinkFormulaNeedingCheck)); + } + else +#endif + { + // Throw a reference error. + pToken.reset(new FormulaErrorToken(FormulaError::NoRef)); + } return pToken; } @@ -2159,15 +2182,6 @@ void insertRefCellByIterator( } } -bool IsLinkUpdateAllowedInDoc(const ScDocument& rDoc) -{ - SfxObjectShell* pDocShell = rDoc.GetDocumentShell(); - if (!pDocShell) - return false; - - return pDocShell->GetEmbeddedObjectContainer().getUserAllowsLinkUpdate(); -} - } void ScExternalRefManager::insertRefCell(sal_uInt16 nFileId, const ScAddress& rCell) @@ -2377,8 +2391,8 @@ ScDocument* ScExternalRefManager::getInMemorySrcDocument(sal_uInt16 nFileId) if (!pFileName) return nullptr; - // Do not load document until it was allowed - if (!IsLinkUpdateAllowedInDoc(*mpDoc)) + // Do not load document until it was allowed. + if (!isLinkUpdateAllowedInDoc(*mpDoc)) return nullptr; ScDocument* pSrcDoc = nullptr; @@ -2487,6 +2501,10 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt if (!isFileLoadable(aFile)) return nullptr; + // Do not load document until it was allowed. + if (!isLinkUpdateAllowedInDoc(*mpDoc)) + return nullptr; + OUString aOptions = pFileData->maFilterOptions; if ( !pFileData->maFilterName.isEmpty() ) rFilter = pFileData->maFilterName; // don't overwrite stored filter with guessed filter @@ -2625,9 +2643,9 @@ void ScExternalRefManager::maybeLinkExternalFile( sal_uInt16 nFileId, bool bDefe aOptions = pFileData->maFilterOptions; } - // Filter detection may access external links; defer it until we are allowed + // Filter detection may access external links; defer it until we are allowed. if (!bDeferFilterDetection) - bDeferFilterDetection = !IsLinkUpdateAllowedInDoc(*mpDoc); + bDeferFilterDetection = !isLinkUpdateAllowedInDoc(*mpDoc); // If a filter was already set (for example, loading the cached table), // don't call GetFilterName which has to access the source file. commit 73b3b41e39eca3f530b7719c8c5293786dedc0b2 Author: Mike Kaganski <[email protected]> AuthorDate: Tue Jul 9 18:44:42 2019 +1000 Commit: Michael Stahl <[email protected]> CommitDate: Tue Aug 6 13:59:39 2019 +0200 Postpone filter detection until link update is allowed Change-Id: I85b2185e550f2a133ceb485241ef513b40593e34 Reviewed-on: https://gerrit.libreoffice.org/75301 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> (cherry picked from commit 03c708bf085f91480c014d7fa31e7a317b2c7b8f) Reviewed-on: https://gerrit.libreoffice.org/76303 Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: Thorsten Behrens <[email protected]> (cherry picked from commit 43bf332aeede732557378e81765f29b704b17188) (cherry picked from commit 73176974d613b01bdf5223b93cf2705d3fd8c155) diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 80bd63d1c89d..445d06a8720b 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2159,6 +2159,15 @@ void insertRefCellByIterator( } } +bool IsLinkUpdateAllowedInDoc(const ScDocument& rDoc) +{ + SfxObjectShell* pDocShell = rDoc.GetDocumentShell(); + if (!pDocShell) + return false; + + return pDocShell->GetEmbeddedObjectContainer().getUserAllowsLinkUpdate(); +} + } void ScExternalRefManager::insertRefCell(sal_uInt16 nFileId, const ScAddress& rCell) @@ -2369,13 +2378,8 @@ ScDocument* ScExternalRefManager::getInMemorySrcDocument(sal_uInt16 nFileId) return nullptr; // Do not load document until it was allowed - SfxObjectShell* pDocShell = mpDoc->GetDocumentShell(); - if ( pDocShell ) - { - const comphelper::EmbeddedObjectContainer& rContainer = pDocShell->GetEmbeddedObjectContainer(); - if ( !rContainer.getUserAllowsLinkUpdate() ) - return nullptr; - } + if (!IsLinkUpdateAllowedInDoc(*mpDoc)) + return nullptr; ScDocument* pSrcDoc = nullptr; ScDocShell* pShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(checkSfxObjectShell<ScDocShell>, false)); @@ -2620,6 +2624,11 @@ void ScExternalRefManager::maybeLinkExternalFile( sal_uInt16 nFileId, bool bDefe aFilter = pFileData->maFilterName; aOptions = pFileData->maFilterOptions; } + + // Filter detection may access external links; defer it until we are allowed + if (!bDeferFilterDetection) + bDeferFilterDetection = !IsLinkUpdateAllowedInDoc(*mpDoc); + // If a filter was already set (for example, loading the cached table), // don't call GetFilterName which has to access the source file. // If filter detection is deferred, the next successfull loadSrcDocument() commit 2a06c80b816c2c477194731e187590aeb5d80076 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Jul 26 13:25:31 2019 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Aug 6 13:59:39 2019 +0200 decode url escape codes and check each path segment Change-Id: Ie8f7cef912e8dacbc2a0bca73534a7a242a53ca1 Reviewed-on: https://gerrit.libreoffice.org/76378 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins (cherry picked from commit 7942929685fafb0f9c82feb8da7279e5103c87f0) Reviewed-on: https://gerrit.libreoffice.org/76451 Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: Thorsten Behrens <[email protected]> (cherry picked from commit aab62f2b21c331ff8c31b7c856d5e59080b9d64a) (cherry picked from commit 3098810911ccf76da1591d8f6cfceebfda13dcbd) diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 657a7a80777e..2bb7b143a6bc 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -53,6 +53,8 @@ #include <com/sun/star/script/provider/XScriptProvider.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> +#include <com/sun/star/uri/UriReferenceFactory.hpp> +#include <com/sun/star/uri/XVndSunStarScriptUrlReference.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <toolkit/helper/vclunohelper.hxx> @@ -1360,7 +1362,32 @@ namespace // don't allow LibreLogo to be used with our mouseover/etc dom-alike events bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL) { - return rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo"); + if (!rScriptURL.startsWith("vnd.sun.star.script:")) + return false; + + // ensure URL Escape Codes are decoded + css::uno::Reference<css::uri::XUriReference> uri( + css::uri::UriReferenceFactory::create(comphelper::getProcessComponentContext())->parse(rScriptURL)); + css::uno::Reference<css::uri::XVndSunStarScriptUrl> sfUri(uri, css::uno::UNO_QUERY); + + if (!sfUri.is()) + return false; + + OUString sScript = sfUri->getName(); + + // check if any path portion matches LibreLogo and ban it if it does + sal_Int32 nIndex = 0; + do + { + OUString aToken = sScript.getToken(0, '/', nIndex); + if (aToken.startsWithIgnoreAsciiCase("LibreLogo")) + { + return true; + } + } + while (nIndex >= 0); + + return false; } ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, commit 57cf9681bb300cef915790175723793d3293bae5 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Jul 23 15:31:05 2019 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Aug 6 13:59:39 2019 +0200 expand LibreLogo check to global events Reviewed-on: https://gerrit.libreoffice.org/76189 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 4a66c7eda6ccde26a42c4e31725248c59940255d) Change-Id: I7f436983ba0eb4b76b02d08ee52626e54b103d5f Reviewed-on: https://gerrit.libreoffice.org/76305 Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: Thorsten Behrens <[email protected]> (cherry picked from commit b14742734481ae0a4731989a99db487d8ae1986a) (cherry picked from commit 139d6207488d5e9ae7904f9ea07f058c531898ef) diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 4a1d5565d392..88ced5bce483 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -403,6 +403,8 @@ public: */ bool AdjustMacroMode(); + static bool UnTrustedScript(const OUString& rScriptURL); + SvKeyValueIterator* GetHeaderAttributes(); void ClearHeaderAttributesForSourceViewHack(); void SetHeaderAttributesForSourceViewHack(); diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 7ad7561de628..657a7a80777e 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1357,16 +1357,12 @@ namespace } } -namespace { - // don't allow LibreLogo to be used with our mouseover/etc dom-alike events -bool UnTrustedScript(const OUString& rScriptURL) +bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL) { return rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo"); } -} - ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const css::uno::Any* pCaller ) { diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 807b353b0d16..93dd8720896a 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -209,18 +209,24 @@ void SfxEvents_Impl::Execute( uno::Any& aEventData, const document::DocumentEven else if (aType == "Service" || aType == "Script") { - if ( !aScript.isEmpty() ) + bool bAllowed = false; + util::URL aURL; + if (!aScript.isEmpty()) { - SfxViewFrame* pView = pDoc ? - SfxViewFrame::GetFirst( pDoc ) : - SfxViewFrame::Current(); - uno::Reference < util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); - util::URL aURL; aURL.Complete = aScript; xTrans->parseStrict( aURL ); + bAllowed = !SfxObjectShell::UnTrustedScript(aURL.Complete); + } + + if (bAllowed) + { + SfxViewFrame* pView = pDoc ? + SfxViewFrame::GetFirst( pDoc ) : + SfxViewFrame::Current(); + uno::Reference < frame::XDispatchProvider > xProv; commit 8a5b81bbfcf899e2b096d040a04841c5dc700752 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Sep 3 17:20:21 2018 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Aug 6 13:59:39 2019 +0200 ofz#10198 reset uncommitted fly stuff & pams before applying redlining Change-Id: I2a2587ec4590926f7cffc2a4d58a22d9d5f19c99 Reviewed-on: https://gerrit.libreoffice.org/59947 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins (cherry picked from commit 887ee9111f42847406c5ffc85a0ba635080de3de) diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 3aad6b8298fd..cd9ba231d788 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5394,6 +5394,9 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss) UpdateFields(); + m_xWFlyPara.reset(); + m_xSFlyPara.reset(); + // delete the pam before the call for hide all redlines (Bug 73683) if (m_bNewDoc) m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags(eMode); commit 661f6bd220f3ba8a91f663d2eba69c4c7a9e7154 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Aug 15 10:27:22 2018 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Aug 6 13:59:39 2019 +0200 ofz#9908 validate no negative editengine selection positions Change-Id: I37dace2051518224c55756362facd3edba4a9571 Reviewed-on: https://gerrit.libreoffice.org/59059 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> (cherry picked from commit ca3038a05188084b012dd3c799494f30bc5c47ef) diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index e6e763f4123a..0e56cde8483e 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -564,7 +564,9 @@ namespace bool IsValidSel(const EditEngine& rEngine, const ESelection& rSel) { const auto nParaCount = rEngine.GetParagraphCount(); - return rSel.nStartPara < nParaCount && rSel.nEndPara < nParaCount; + if (rSel.nStartPara < nParaCount && rSel.nEndPara < nParaCount) + return rSel.nStartPos >= 0 && rSel.nEndPos >= 0; + return false; } } commit 37823ebe864e51e9c0f0a5381a4631e13d5c9dca Author: Caolán McNamara <[email protected]> AuthorDate: Sat Dec 30 13:57:38 2017 +0000 Commit: Michael Stahl <[email protected]> CommitDate: Tue Aug 6 13:59:38 2019 +0200 ofz#4837 Null-dereference READ Change-Id: I7e4cb934aeac32fa1170beb116e4600b5eb9389a Reviewed-on: https://gerrit.libreoffice.org/47197 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 9f8dd17b1e6ab5d5d07b61e0f85edea233f03d71) diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index d404d6c9c29c..e6e763f4123a 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -559,6 +559,15 @@ public: } }; +namespace +{ + bool IsValidSel(const EditEngine& rEngine, const ESelection& rSel) + { + const auto nParaCount = rEngine.GetParagraphCount(); + return rSel.nStartPara < nParaCount && rSel.nEndPara < nParaCount; + } +} + // InsertAttrsAsDrawingAttrs() sets attributes between StartCp and EndCp. // Style attributes are set as hard, paragraph and character attributes. void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp, @@ -733,6 +742,8 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp, { ESelection aSel(GetESelection(*m_pDrawEditEngine, aIter->GetStartPos()-nStartCp, aIter->GetEndPos()-nStartCp)); + if (!IsValidSel(*m_pDrawEditEngine, aSel)) + continue; OUString aString(m_pDrawEditEngine->GetText(aSel)); const sal_Int32 nOrigLen = aString.getLength(); WW8_CP nDummy(0); commit ec5d8d3a0879af27e44198850de72128a565bff1 Author: Michael Stahl <[email protected]> AuthorDate: Thu Jul 18 14:07:06 2019 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Aug 6 13:59:38 2019 +0200 sw: fix use after free on tdf117215-1.odt Move the fix from 6d0ea082889c89eb8b408779f2de08da7441ff54 to SwFlyFrame::DestroyImpl() so we unregister every SwFlyFrame. ==1550==ERROR: AddressSanitizer: heap-use-after-free on address 0x615000383f56 at pc 0x7efcd70d5ab9 bp 0x7ffeb7ac7c40 sp 0x7ffeb7ac7c38 WRITE of size 1 at 0x615000383f56 thread T0 0 SwAnchoredObject::SetTmpConsiderWrapInfluence(bool) sw/source/core/layout/anchoredobject.cxx:743:32 1 SwObjsMarkedAsTmpConsiderWrapInfluence::Clear() sw/source/core/layout/objstmpconsiderwrapinfl.cxx:53:23 2 SwLayouter::ClearObjsTmpConsiderWrapInfluence(SwDoc const&) sw/source/core/layout/layouter.cxx:387:84 3 sw::DocumentLayoutManager::ClearSwLayouterEntries() sw/source/core/doc/DocumentLayoutManager.cxx:497:5 4 sw::DocumentStateManager::SetModified() sw/source/core/doc/DocumentStateManager.cxx:45:39 5 sw::DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM&) sw/source/core/doc/DocumentContentOperationsManager.cxx:3942:36 0x615000383f56 is located 342 bytes inside of 504-byte region [0x615000383e00,0x615000383ff8) freed by thread T0 here: 1 SwFlyAtContentFrame::~SwFlyAtContentFrame() sw/source/core/inc/flyfrms.hxx:159:7 2 SwFrame::DestroyFrame(SwFrame*) sw/source/core/layout/ssfrm.cxx:389:9 3 SwFrameFormat::DelFrames() sw/source/core/layout/atrfrm.cxx:2624:17 4 SwUndoFlyBase::DelFly(SwDoc*) sw/source/core/undo/undobj1.cxx:161:19 5 SwUndoDelLayFormat::SwUndoDelLayFormat(SwFrameFormat*) sw/source/core/undo/undobj1.cxx:403:5 6 SwHistoryTextFlyCnt::SwHistoryTextFlyCnt(SwFrameFormat*) sw/source/core/undo/rolbck.cxx:538:20 7 SwHistory::Add(SwFlyFrameFormat&, unsigned short&) sw/source/core/undo/rolbck.cxx:1083:50 8 SwUndoSaveContent::DelContentIndex(SwPosition const&, SwPosition const&, DelContentType) sw/source/core/undo/undobj.cxx:1020:39 9 SwUndoDelete::SwUndoDelete(SwPaM&, bool, bool) sw/source/core/undo/undel.cxx:229:9 11 sw::DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM&) sw/source/core/doc/DocumentContentOperationsManager.cxx:3939:55 Change-Id: Ia0c28c9d5792615cbb566e502374efd0f4056daf Reviewed-on: https://gerrit.libreoffice.org/75857 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit dea72ef111ee8a0b1b178f8cd48757514d5ca831) Reviewed-on: https://gerrit.libreoffice.org/75941 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 4b9324b93dcbd72c8c8949309d45790dd8f7d5fd) diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 54442191f4e6..5c5f2fede44e 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -254,6 +254,8 @@ void SwFlyFrame::DestroyImpl() if( GetFormat() && !GetFormat()->GetDoc()->IsInDtor() ) { + ClearTmpConsiderWrapInfluence(); // remove this from SwLayouter + // OD 2004-01-19 #110582# Unchain(); diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index c972864a884d..b5cbe7d260d9 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -472,7 +472,6 @@ void SwLayoutFrame::DestroyImpl() const size_t nCnt = pFrame->GetDrawObjs()->size(); // #i28701# SwAnchoredObject* pAnchoredObj = (*pFrame->GetDrawObjs())[0]; - pAnchoredObj->ClearTmpConsiderWrapInfluence(); if (SwFlyFrame* pFlyFrame = dynamic_cast<SwFlyFrame*>(pAnchoredObj)) { SwFrame::DestroyFrame(pFlyFrame); @@ -480,6 +479,7 @@ void SwLayoutFrame::DestroyImpl() } else { + pAnchoredObj->ClearTmpConsiderWrapInfluence(); SdrObject* pSdrObj = pAnchoredObj->DrawObj(); SwDrawContact* pContact = static_cast<SwDrawContact*>(pSdrObj->GetUserCall()); commit b09183925ff23fd71cf1604efd5a72fd8706657a Author: Caolán McNamara <[email protected]> AuthorDate: Thu Aug 9 12:32:01 2018 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Aug 6 13:59:38 2019 +0200 forcepoint73 deleted SwAnchoredObject still referenced in TmpConsiderWrapInfl Reviewed-on: https://gerrit.libreoffice.org/58760 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 6d0ea082889c89eb8b408779f2de08da7441ff54) Reviewed-on: https://gerrit.libreoffice.org/58768 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit de765158b372d5f7bbb1b37c7d6be695ab6104ac) Change-Id: If255723834d049865fcf6fd0eac7768dfcbad2a1 diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index 9f0687f864ca..1b4cf78e394b 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -467,6 +467,7 @@ class SW_DLLPUBLIC SwAnchoredObject // accessors to member <mbTmpConsiderWrapInfluence> void SetTmpConsiderWrapInfluence( const bool _bTmpConsiderWrapInfluence ); bool IsTmpConsiderWrapInfluence() const { return mbTmpConsiderWrapInfluence;} + void ClearTmpConsiderWrapInfluence(); /** method to determine, if the anchored object is overlapping with a previous column diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx index fd9ac92aa556..47992a8d5cbd 100644 --- a/sw/source/core/inc/layouter.hxx +++ b/sw/source/core/inc/layouter.hxx @@ -127,6 +127,10 @@ public: static void InsertObjForTmpConsiderWrapInfluence( const SwDoc& _rDoc, SwAnchoredObject& _rAnchoredObj ); + static void RemoveObjForTmpConsiderWrapInfluence( + const SwDoc& _rDoc, + SwAnchoredObject& _rAnchoredObj ); + // --> #i65250# static bool MoveBwdSuppressed( const SwDoc& p_rDoc, const SwFlowFrame& p_rFlowFrame, diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index dc85d1d235a0..6de6b0b6ead8 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -746,7 +746,14 @@ void SwAnchoredObject::SetTmpConsiderWrapInfluence( const bool _bTmpConsiderWrap } } - +void SwAnchoredObject::ClearTmpConsiderWrapInfluence() +{ + mbTmpConsiderWrapInfluence = false; + mbClearedEnvironment = false; + SetClearedEnvironment( false ); + SwLayouter::RemoveObjForTmpConsiderWrapInfluence( *(GetFrameFormat().GetDoc()), + *this ); +} void SwAnchoredObject::SetTmpConsiderWrapInfluenceOfOtherObjs() { const SwSortedObjs* pObjs = GetAnchorFrame()->GetDrawObjs(); diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx index 6dc0c80d3c10..7a7b33af98db 100644 --- a/sw/source/core/layout/layouter.cxx +++ b/sw/source/core/layout/layouter.cxx @@ -401,6 +401,7 @@ void SwLayouter::ClearObjsTmpConsiderWrapInfluence( const SwDoc& _rDoc ) _rDoc.getIDocumentLayoutAccess().GetLayouter()->mpObjsTmpConsiderWrapInfl->Clear(); } } + void SwLayouter::InsertObjForTmpConsiderWrapInfluence( const SwDoc& _rDoc, SwAnchoredObject& _rAnchoredObj ) @@ -419,6 +420,20 @@ void SwLayouter::InsertObjForTmpConsiderWrapInfluence( _rDoc.getIDocumentLayoutAccess().GetLayouter()->mpObjsTmpConsiderWrapInfl->Insert( _rAnchoredObj ); } +void SwLayouter::RemoveObjForTmpConsiderWrapInfluence( + const SwDoc& _rDoc, + SwAnchoredObject& _rAnchoredObj ) +{ + if ( !_rDoc.getIDocumentLayoutAccess().GetLayouter() ) + return; + + if ( !_rDoc.getIDocumentLayoutAccess().GetLayouter()->mpObjsTmpConsiderWrapInfl ) + return; + + _rDoc.getIDocumentLayoutAccess().GetLayouter()->mpObjsTmpConsiderWrapInfl->Remove( _rAnchoredObj ); +} + + void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTextFrame& rTextFrame ) { if ( bCondition ) diff --git a/sw/source/core/layout/objstmpconsiderwrapinfl.cxx b/sw/source/core/layout/objstmpconsiderwrapinfl.cxx index 214fe5693e3b..83d1a183c3c4 100644 --- a/sw/source/core/layout/objstmpconsiderwrapinfl.cxx +++ b/sw/source/core/layout/objstmpconsiderwrapinfl.cxx @@ -31,23 +31,18 @@ SwObjsMarkedAsTmpConsiderWrapInfluence::~SwObjsMarkedAsTmpConsiderWrapInfluence( void SwObjsMarkedAsTmpConsiderWrapInfluence::Insert( SwAnchoredObject& _rAnchoredObj ) { + auto it = std::find(maObjsTmpConsiderWrapInfl.begin(), maObjsTmpConsiderWrapInfl.end(), &_rAnchoredObj); + if (it != maObjsTmpConsiderWrapInfl.end()) + return; + maObjsTmpConsiderWrapInfl.push_back( &_rAnchoredObj ); +} - bool bAlreadyInserted( false ); - std::vector< SwAnchoredObject* >::const_iterator aIter = maObjsTmpConsiderWrapInfl.begin(); - for ( ; aIter != maObjsTmpConsiderWrapInfl.end(); ++aIter ) - { - const SwAnchoredObject* pAnchoredObj = *(aIter); - if ( pAnchoredObj == &_rAnchoredObj ) - { - bAlreadyInserted = true; - break; - } - } - - if ( !bAlreadyInserted ) - { - maObjsTmpConsiderWrapInfl.push_back( &_rAnchoredObj ); - } +void SwObjsMarkedAsTmpConsiderWrapInfluence::Remove( SwAnchoredObject& _rAnchoredObj ) +{ + auto it = std::find(maObjsTmpConsiderWrapInfl.begin(), maObjsTmpConsiderWrapInfl.end(), &_rAnchoredObj); + if (it == maObjsTmpConsiderWrapInfl.end()) + return; + maObjsTmpConsiderWrapInfl.erase(it); } void SwObjsMarkedAsTmpConsiderWrapInfluence::Clear() diff --git a/sw/source/core/layout/objstmpconsiderwrapinfl.hxx b/sw/source/core/layout/objstmpconsiderwrapinfl.hxx index fcf495e72a50..28b6acf9de1c 100644 --- a/sw/source/core/layout/objstmpconsiderwrapinfl.hxx +++ b/sw/source/core/layout/objstmpconsiderwrapinfl.hxx @@ -33,6 +33,7 @@ class SwObjsMarkedAsTmpConsiderWrapInfluence ~SwObjsMarkedAsTmpConsiderWrapInfluence(); void Insert( SwAnchoredObject& _rAnchoredObj ); + void Remove( SwAnchoredObject& _rAnchoredObj ); void Clear(); }; diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index 2a4fd7421347..c972864a884d 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -472,9 +472,10 @@ void SwLayoutFrame::DestroyImpl() const size_t nCnt = pFrame->GetDrawObjs()->size(); // #i28701# SwAnchoredObject* pAnchoredObj = (*pFrame->GetDrawObjs())[0]; - if ( dynamic_cast< const SwFlyFrame *>( pAnchoredObj ) != nullptr ) + pAnchoredObj->ClearTmpConsiderWrapInfluence(); + if (SwFlyFrame* pFlyFrame = dynamic_cast<SwFlyFrame*>(pAnchoredObj)) { - SwFrame::DestroyFrame(static_cast<SwFlyFrame*>(pAnchoredObj)); + SwFrame::DestroyFrame(pFlyFrame); assert(!pFrame->GetDrawObjs() || nCnt > pFrame->GetDrawObjs()->size()); } else commit e797464a61d1497531d8fd1f1c5cba6c27c48ef5 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Mar 25 12:06:20 2019 +0000 Commit: Michael Stahl <[email protected]> CommitDate: Tue Aug 6 13:59:38 2019 +0200 Resolves: tdf#124142 don't deref nullptr Change-Id: Ie14600e9f9a1e1c4e99c7a872f5d677453481888 Reviewed-on: https://gerrit.libreoffice.org/69666 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit ac7ce7a64ef903bad1476f5635a7b2a1e951a7a3) Reviewed-on: https://gerrit.libreoffice.org/69694 Reviewed-by: Xisco Faulí <[email protected]> (cherry picked from commit cdef6e5f4053adf5413781a9282285eab3923373) diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index c2237f4a0ae1..88a6da3a3a80 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -195,7 +195,8 @@ namespace sw , m_pBasePool(pDocShell->GetStyleSheetPool()) , m_pDocShell(pDocShell) { - StartListening(*m_pBasePool); + if (m_pBasePool) //tdf#124142 html docs can have no styles + StartListening(*m_pBasePool); } //XIndexAccess commit 63fe168ab32fefaf54fa9dfb5cd0ec103bfcaa46 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Feb 6 12:09:27 2019 +0000 Commit: Michael Stahl <[email protected]> CommitDate: Tue Aug 6 13:59:38 2019 +0200 fix assert seen on opening attachment from tdf#123163 I imagine it should have been seqPos-(idPos+2) seems to be like this since the initial commit of commit 091fe76b6329b4bb974987554369cbfadd8f2401 Date: Tue Jun 30 12:55:18 2015 +0300 tdf#87348 implement mso-next-textbox vml-style textbox chaining import Change-Id: Ic2f527ede2102c01c8589d58d8c705d59b0a6ffe Reviewed-on: https://gerrit.libreoffice.org/67454 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 45510866fedac63014a3120a1130dbea9fd803ee) diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 45e7e40ab831..66facd3da275 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -350,7 +350,8 @@ Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxS sal_Int32 seqPos = sLinkChainName.indexOf("_s",idPos); if (idPos < seqPos) { - id = sLinkChainName.copy(idPos+2,seqPos-idPos+2).toInt32(); + auto idPosEnd = idPos+2; + id = sLinkChainName.copy(idPosEnd, seqPos - idPosEnd).toInt32(); seq = sLinkChainName.copy(seqPos+2).toInt32(); } } commit b8747808364ec0451a1236dc899bf34cc11187f8 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Dec 5 13:22:44 2018 +0000 Commit: Michael Stahl <[email protected]> CommitDate: Tue Aug 6 13:59:38 2019 +0200 tdf#119126 forcepoint#76 avoid deleting footnote that would delete ... ... undeletable page (cherry picked from commit 0005b330eaed0b5559042d2597fb45e0c9125d7e) Conflicts: sw/qa/extras/layout/layout.cxx Change-Id: I4622569eb9c757c6dcbdda32081ddc94e53db919 Reviewed-on: https://gerrit.libreoffice.org/66393 Tested-by: Xisco Faulí <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> (cherry picked from commit 558f01a29cb640760e73724f6efdc0a1be20c8e3) diff --git a/sw/qa/extras/layout/data/forcepoint76-1.rtf b/sw/qa/extras/layout/data/forcepoint76-1.rtf new file mode 100644 index 000000000000..f3ed2cc468e3 --- /dev/null +++ b/sw/qa/extras/layout/data/forcepoint76-1.rtf @@ -0,0 +1,3388 @@ +{\rtf1\a|eflang1037\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;} +{\f2\fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}{\f3\froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}{\f4\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Helvetica;} +{\f5\fmodern\fcharset0\fprq1{\*\panose 02060409020205020404}Courier;}{\f6\froman\fcharset0\fprq2{\*\panose 02020603040505020304}Tms Rmn;}{\f7\fswiss\fcharset0\fprq2{\*\panose 020b0604020202030204}Helv;} +{\f8\froman\fcharset0\fprq2{\*\panose 02040503060506020304}New York;}{\f9\fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}System;}{\f10\fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings;} +{\f11\froman\fcharset128\fprq1{\*\panose 02020609040205080304}MS Mincho{\*\falt ?l?r ??\'81\'66c};}{\f12\fnil\fcharset129\fprq1{\*\panose 02030600000101010101}Batang{\*\falt \'a2\'ae\'a1\'d7IoUAA};} +{\f13\fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ????\'a8\'ac??};}{\f14\fnil\fcharset136\fprq2{\*\panose 02010601000101010101}PMingLiU{\*\falt !Ps2OcuAe};} +{\f15\fmodern\fcharset128\fprq1{\*\panose 020b0609070205080204}MS Gothic{\*\falt ?l?r ?S?V?b?N};} +{\f16\fmodern\fcharset129\fprq1{\*\panose 020b0600000101010101}Dotum{\*\falt \'a1\'cb\'a2\'e7Ii\'a1\'cb\'a2\'e7e\'a1\'cb\'a2\'e7\'a8\'cf\'a1\'a9\'a1\'cb\'a2\'e7e?o};} +{\f17\fmodern\fcharset134\fprq1{\*\panose 02010600030101010101}SimHei{\*\falt o??\'a8\'ac2??\'a8\'ac??};}{\f0\fmodern\fcharset136\fprq1{\*\panose 02010609000101010101}MingLiU{\*\falt 2OcuAe};} +{\f19\froman\fcharset128\fprq1{\*\panose 7202762996549695502}Mincho{\*\falt ??\'81\'66c};} +{\f20\froman\fcharset129\fprq1{\*\panose 020b0600000101010101}Gulim{\*\falt \'a2\'aee\'a1\'cbc\'a2\'ae\'a1\'d7u\'a1\'cb\'a2\'e7\'a2\'ae\'a1\'bfu\'a1\'cb\'a2\'e7e\'a1\'cb\'a2\'e7\'a8\'cf\'a1\'a9\'a2\'ae\'a1\'d7I\'a1\'cb\'a2\'e7a};} +{\f21\froman\fcharset0\fprq2{\*\panose 02040603050705020303}Century;}{\f22\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Angsana New;}{\f23\fswiss\fcharset0\fprq2{\*\panose 020b0304020202020204}Cordia New;} +{\f24\fnil\fcharset1\fprq2{\*\panose 00000400000000000000}Mangal;}{\f25\fnil\fcharset1\fprq2{\*\panose 02000400000000000000}Latha;}{\f26\froman\fcharset0\fprq2{\*\panose 010a0502050306030303}Sylfaen;} +{\f27\froman\fcharset1\fprq2{\*\panose 00000400000000000000}Vrinda;}{\f28\fnil\fcharset1\fprq2{\*\panose 02000500000000000000}Raavi;}{\f29\fnil\fcharset1\fprq2{\*\panose 02000500000000000000}Shruti;} +{\f30\froman\fcharset1\fprq2{\*\panose 00000400000000000000}Sendnya;}{\f31\fnil\fcharset1\fprq2{\*\panose 02000500000000000000}Gautami;}{\f32\fnil\fcharset1\fprq2{\*\panose 00000400000000000000}Tunga;} +{\f33\fscript\fcharset1\fprq2{\*\panose 03080600000000000000}Estrangelo Edessa;}{\f34\froman\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial Unicode MS;}{\f35\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;} +{\f36\fnil\fcharset134\fprq2{\*\panose 00000000000000000000}@SimSun;}{\f37\froman\fcharset0\fprq2 Times New Roman CE;}{\f38\froman\fcharset0\fprq2 Times New Roman CYR;}{\f39\froman\fcharset0\fprq2 Times New Roman Greek;} +{\f40\froman\fcharset0\fprq2 Times New Roman TUR;}{\f41\froman\fcharset0\fprq2 Times New Roman Baltic;}{\f42\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Verdana;}{\f43\fswiss\fcharset0\fprq2{\*\panose 020b0603020202020204}Trebuchet MS;} +{\f44\fswiss\fcharset0\fprq2{\*\panose 020e0802040304020204}Albertus Extra Bold;}{\f45\fswiss\fcharset0\fprq2{\*\panose 020e0602030304020304}Albertus Medium;}{\f46\fswiss\fcharset0\fprq2{\*\panose 020b0603020204030204}Antique Olive;} +{\f47\fswiss\fcharset0\fprq2{\*\panose 020b0502050508020304}CG Omega;}{\f48\froman\fcharset0\fprq2{\*\panose 02020603050405020304}CG Times;}{\f49\froman\fcharset0\fprq2{\*\panose 02040706040705040204}Clarendon Condensed;} +{\f50\fscript\fcharset0\fprq2{\*\panose 03030502040406070605}Coronet;}{\f51\fmodern\fcharset0\fprq1{\*\panose 02060409020205020404}CourierPS;}{\f52\froman\fcharset0\fprq2{\*\panose 02020404030301010803}Garamond;} +{\f53\fswiss\fcharset0\fprq2{\*\panose 020b0506020203020204}Helvetica Narrow;}{\f54\fswiss\fcharset0\fprq2{\*\panose 020b0402020203020304}ITC Avant Garde Gothic;}{\f55\froman\fcharset0\fprq2{\*\panose 02050504040505020204}ITC Bookman;} +{\f56\fscript\fcharset0\fprq2{\*\panose 03010101010201010101}ITC Zapf Chancery;}{\f57\fnil\fcharset2\fprq2{\*\panose 01010601010101010101}ITC Zapf Dingbats;}{\f58\fmodern\fcharset0\fprq1{\*\panose 020b0409020202030204}Letter Gothic;} +{\f59\fmodern\fcharset0\fprq1{\*\panose 00000000000000000000}LinePrinterBM;}{\f60\fscript\fcharset0\fprq2{\*\panose 03020702040402020504}Marigold;}{\f61\froman\fcharset0\fprq2{\*\panose 02040603050505020303}New Century Schoolbook;} +{\f62\froman\fcharset0\fprq2{\*\panose 02040602050305020304}Palatino;}{\f63\froman\fcharset2\fprq2{\*\panose 05050102010706020507}SymbolPS;}{\f64\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times;} +{\f65\fswiss\fcharset0\fprq2{\*\panose 020b0603020202030204}Univers;}{\f66\fswiss\fcharset0\fprq2{\*\panose 020b0606020202060204}Univers Condensed;}{\f67\fmodern\fcharset0\fprq1{\*\panose 00000000000000000000}PRESCRIBE;} +{\f68\fnil\fcharset2\fprq2{\*\panose 00000000000000000000}Marlett;}{\f69\fmodern\fcharset0\fprq1{\*\panose 020b0609040504020204}Lucida Console;}{\f70\fswiss\fcharset0\fprq2{\*\panose 020b0602030504020204}Lucida Sans Unicode;} +{\f0\fswiss\fcharset0\fprq2{\*\panose 020b0a04020102020204}Arial Black;}{\f72\fscript\fcharset0\fprq2{\*\panose 030f0702030302020204}Comic Sans MS;}{\f73\fswiss\fcharset0\fprq2{\*\panose 020b0806030902050204}Impact;} +{\f74\froman\fcharset0\fprq2{\*\panose 02040502050405020303}Georgia;}{\f75\fswiss\fcharset0\fprq2{\*\panose 020b0603020102020204}Franklin Gothic Medium;}{\f76\froman\fcharset0\fprq2{\*\panose 02040502050505030304}Palatino Linotype;} +{\f77\froman\fcharset2\fprq2{\*\panose 05030102010509060703}Webdings;}{\f78\fnil\fcharset1\fprq2{\*\panose 02000500030200090000}MV Boli;}{\f79\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Microsoft Sans Serif;} +{\f80\froman\fcharset2\fprq2{\*\panose 02020604050505020304}WP MultinationalA Roman;}{\f81\fmodern\fcharset2\fprq1{\*\panose 02060409020205020404}WP MultinationalB Courier;} +{\f82\fnil\fcharset2\fprq2{\*\panose 05000000000000000000}WP MultinationalB Helve;}{\f83\fnil\fcharset2\fprq2{\*\panose 05000000000000000000}WP MultinationalB Roman;}{\f84\fswiss\fcharset2\fprq2{\*\panose 050b0604020202030204}WP Phonetic;} +{\f85\fnil\fcharset2\fprq2{\*\panose 05010101010101010101}WP Arabic Sihafa;}{\f86\fnil\fcharset2\fprq2{\*\panose 05010101010101010101}WP MathA;}{\f87\fnil\fcharset2\fprq2{\*\panose 05010101010101010101}WP MathB;} +{\f88\fnil\fcharset2\fprq2{\*\panose 05010101010101010101}WP MathExtendedA;}{\f89\fnil\fcharset2\fprq2{\*\panose 05010101010101010101}WP MathExtendedB;}{\f90\fmodern\fcharset2\fprq1{\*\panose 05000009000000000000}WP MultinationalA Courier;} +{\f91\fnil\fcharset2\fprq2{\*\panose 05000000000000000000}WP MultinationalA Helve;}{\f92\fmodern\fcharset2\fprq1{\*\panose 00p00009000000000000}WP Greek Courier;}{\f93\fnil\fcharset2\fprq2{\*\panose 05000000000000000000}WP Greek Helve;} +{\f94\fnil\fcharset2\fprq2{\*\panose 00000000000000000000}WP Hebrew David;}{\f95\fnil\fcharset2\fprq2{\*\panose 05010101010101010101}WP IconicSymbolsA;}{\f96\fnil\fcharset2\fprq2{\*\panose 05000000000000000000}WP IconicSymbolsB;} +{\f97\fnil\fcharset2\fprq2{\*\panose 05010101010101010101}WP Japanese;}{\f98\fnil\fcharset0\fprq2{\*\panose 00000400000000000000}WP TypographicSymbols;}{\f99\fnil\fcharset2\fprq2{\*\panose 05010101010101010101}WP ArabicScript Sihafa;} +{\f100\fmodern\fcharset0\fprq1{\*\panose 010b0409020201010101}WP BoxDrawing;}{\f101\froman\fcharset2\fprq2{\*\panose 05020604050505020304}WP CyrillicA;}{\f102\fnil\fcharset0\fprq2{\*\panose 00000000000000000000}WP CyrillicB;} +{\f103\fnil\fcharset2\fprq2{\*\panose 05000000000000000000}WP Greek Century;}{\f104\froman\fcharset0\fprq2{\*\panose 02090504030505020304}AmerType Md BT;}{\f105\fswiss\fcharset0\fprq2{\*\panose 00b0602020202020204}AvantGarde Md BT;} +{\f106\fsjs\fcharset0\fprq2{\*\panose 020b0402020202020204}AvantGarde Bk BT;}{\f107\froman\fcharset0\fprq2{\*\panose 02030904050306020704}Benguiat Bk BT;}{\f108\fdecor\fcharset0\fprq2{\*\panose 04030205020b02020502}BernhardFashion BT;} +{\f109\froman\fcharset0\fprq2{\*\panose 0207060307050a020302}BernhardMod BT;}{\f110\fswiss\fcharset0\fprq2{\*\panose 020b0807020203060204}BankGothic Md BT;}{\f111\fdecor\fcharset0\fprq2{\*\panose 04040807060d02020704}Bremen bd BT;} +{\f112\fdecor\fcharset0\fprq2{\*\panose 04060705040702020204}Charlesworth;}{\f113\fswiss\fcharset2\fprq2{\*\panose 020b0603050302020204}CommonBullets;}{\f114\fswiss\fcharset0\fprq2{\*\panose 020e0705020203020404}CopprplGoth bd BT;} +{\f115\froman\fcharset0\fprq2{\*\panose 0204050203030b020204}Dauphin;}{\f116\fswiss\fcharset0\fprq2{\*\panose 020b0802020204020204}Futura Md BT;}{\f117\fdecor\fcharset0\fprq2{\*\panose 040409050d0b02020403}FuturaBlack BT;} +{\f118\fswiss\fcharset0\fprq2{\*\panose 020b0402020204020303}Futura Lt BT;}{\f119\fswiss\fcharset0\fprq2{\*\panose 020b0903020204020204}Futura XBlk BT;}{\f120\fdecor\fcharset0\fprq2{\*\panose 04020604050203030203}GoudyHandtooled BT;} +{\f121\froman\fcharset0\fprq2{\*\panose 02020502050305020303}GoudyOlSt BT;}{\f122\fswiss\fcharset0\fprq2{\*\panose 020b0602020204020204}Humanst521 BT;}{\f123\fswiss\fcharset0\fprq2{\*\panose 020d0402020204020904}Kabel Bk BT;} +{\f124\fswiss\fcharset0\fprq2{\*\panose 020d0902020204020204}Kabel Ult BT;}{\f125\fnil\fcharset0\fprq2{\*\panose 00000000000000000000}Lithograph;}{\f126\fdecor\fcharset0\fprq2{\*\panose 040b0500000000000000}LithographLight;} +{\f127\fscript\fcharset0\fprq2{\*\panose 03080702020302020206}OzHandicraft BT;}{\f128\froman\fcharset0\fprq2{\*\panose 02070a02080905020204}PosterBodoni BT;}{\f129\froman\fcharset0\fprq2{\*\panose 02060503030505020204}Serifa BT;} +{\f130\froman\fcharset0\fprq2{\*\panose 02060303030505020204}Serifa Th BT;}{\f131\fscript\fcharset0\fprq2{\*\panose 03030702030607090b03}English111 Vivace BT;}{\f132\froman\fcharset0\fprq2{\*\panose 02080503040505020303}Souvenir Lt BT;} +{\f133\fscript\fcharset0\fprq2{\*\panose 03090702030407020403}Staccato222 BT;}{\f134\fswiss\fcharset0\fprq2{\*\panose 020b0708030702060204}Swiss911 XCm BT;}{\f135\fscript\fcharset0\fprq2{\*\panose 03020702030807050705}TypoUpright BT;} +{\f136\froman\fcharset0\fprq2{\*\panose 02040503050506040803}ZapfEllipt BT;}{\f137\fswiss\fcharset0\fprq2{\*\panose 020b0505020202020204}Zurich Ex BT;}{\f138\fswiss\fcharset0\fprq2{\*\panose 020b0807040502030204}Zurich BlkEx BT;} +{\f139\froman\fcharset2\fprq2{\*\panose 05050102010205020202}MT Extra;}{\f140\froman\fcharset222\fprq2{\*\panose 02020603050405020304}AngsanaUPC;}{\f141gfswiss#tchaYset222\fprq2{\*\panose 020b0604020202020204}BrowalliaUPC;} +{\f142\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Browallia New;}{\f143\fswiss\fcharset222\fprq2{\*\panose 020b0304020202020204}CordiaUPC;}{\f144\froman\fcharset222\fprq2{\*\panose 02020603050405020304}DilleniaUPC;} +{\f145\froman\fcharset222\fprq2{\*\panose 02020603050405020304}EucrosiaUPC;}{\f146\fswiss\fcharset222\fprq2{\*\panose 020b0604020202020204}FreesiaUPC;}{\f147\fswiss\fcharset222\fprq2{\*\panose 020b0604020202020204}IrisUPC;} +{\f148\froman\fcharset-2680832846622911521\fprq2{\*\panose 02020603050405020304}JasmineUPC;}{\f149\froman\fcharset222\fprq2{\*\panose 02020603050405020304}KodchiangUPC;}{\f150\fswiss\fcharset222\fprq2{\*\panose 020b0604020202020204}LilyUPC;} +{\f151\fbidi \fnil\fcharset177\fprq2{\*\panose 00000000000000000000}Aharoni;}{\f152\fbidi \fnil\fcharset177\fprq2{\*\panose 00000000000000000000}David;}{\f153\fbidi \fnil\fcharset177\fprq2{\*\panose 00000000000000000000}David Transparent;} +{\f154\fbidi \fnil\fcharset177\fprq2{\*\panose 00000000000000000000}FrankRuehl;}{\f155\fbidi \fnil\fcharset177\fprq2{\*\panose 00000000000000000000}Levenim MT;}{\f156\fbidi \fnil\fcharset177\fprq2{\*\panose 00000000000000000000}Miriam;} +{\f157\fbidi \fnil\fcharset177\fprq2{\*\panose 00000000000000000000}Miriam Transparent;}{\f158\fbidi \fmodern\fcharset177\fprq1{\*\panose 00000009000000000000}Miriam Fixed;} +{\f159\fbidi \fmodern\fcharset177\fprq1{\*\panose 00000009000000000000}Fixed Miriam Transparent;}{\f160\fbidi \fnil\fcharset177\fprq2{\*\panose 00000000000000000000}Narkisim;}{\f161\fbidi \fmodern\fcharset177\fprq1{\*\panose 00000009000000000000}Rod;} +{\f162\fbidi \fmodern\fcharset177\fprq1{\*\panose 00000009000000000000}Rod Transparent;}{\f163\fbidi \fnil\fcharset178\fprq2{\*\panose 02010000000000000000}Traditional Arabic;} +{\f164\fbidi \fnil\fcharset178\fprq2{\*\panose 02010000000000000000}Arabic Transparent;}{\f165\fbidi \fnil\fcharset178\fprq2{\*\panose 02010000000000000000}Andalus;}{\f166\fbidi \fnil\fcharset178\fprq2{\*\panose 02010000000000000000}Simplified Arabic;} +{\f167\fbidi \fmodern\fcharset178\fprq1{\*\panose 02010009000000000000}Simplified Arabic Fixed;}{\f168\fswiss\fcharset0\fprq2{\*\panose 020b0506030403020204}Myriad Condensed Web;}{\f169\fswiss\fcharset0\fprq2{\*\panose 020b0503030403020204}Myriad Web;} +{\f170\groman\fcharset0\fprq2{\*\panose 02020603050405020304}TITUS Cyberbit Basic;}{\f171\fnil\fcharset0\fprq2{\*\panose 00000000000000000000}Digiface;}{\f172\fdecor\fcharset0\fprq2{\*\panose 040409040d0702020402}Allegro BT;} +{\f173\fswiss\fcharset0\fprq2{\*\panose 020b0506020202030204}Arial Narrow;}{\f174\froman\fcharset0\fprq2{\*\panose 02040602050305030304}Book Antiqua;}{\f175\froman\fcharset0\fprq2{\*\panose 02050604050505020204}Bookman Old Style;} +{\f176\fswiss\fcharset0\fprq2{\*\panose 020b0502020202020204}Century Gothic;}{\f177\fswiss\fcharset0\fprq2{\*\panose 020b0706040902060204}Haettenschweiler;}{\f178\fnil\fcharset2\fprq2{\*\panose 05010100010000000000}MS Outlook;} +{\f179\fscript\fcharset0\fprq2{\*\panose 03010101010201010101}Monotype Corsiva;}{\f180\froman\fcharset2\fprq2{\*\panose 05020102010507070707}Wingdings 2;}{\f181\froman\fcharset2\fprq2{\*\panose 05040102010807070707}Wingdings 3;} +{\f182\fnil\fcharset2\fprq2{\*\panose 05010101010101010101}Bookshelf Symbol 7;}{\f183\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}MS Reference Sans Serif;}{\f184\fnil\fcharset2\fprq2{\*\panose 05000500000000000000}MS Reference Specialty;} +{\f185\fmodern\fcharset0\fprq1{\*\panose 020b0609030804020204}Bitstream Vera Sans Mono;}{\f186\fswiss\fcharset0\fprq2{\*\panose 020b0603030804020204}Bitstream Vera Sans;}{\f187\froman\fcharset0\fprq2{\*\panose 02060603050605020204}Bitstream Vera Serif;} +{\f188\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}OpenSymbol;}{\f189\fnil\fcharset0\fprq2{\*\panose 00000700000000000000}Davka Siddur;}{\f190\fnil\fcharset0\fprq2{\*\panose 02000508000000020004}Davka Aharony;} +{\f191\fnil\fcharset0\fprq2{\*\panose 02000400000000000000}Davka Chayim;}{\f192\fnil\fcharset0\fprq2{\*\panose 02000506000000020004}Davka David;}{\f193\fnil\fcharset0\fprq2{\*\panose 02000400000000000000}Davka DavidFix;} +{\f194\fnil\fcharset0\fprq2{\*\panose 00000400000000000000}Davka Drogolin;}{\f195\fnil\fcharset0\fprq2{\*\panose 02000400000000000000}Davka FrankRuhl;}{\f196\fnil\fcharset0\fprq2{\*\panose 02000400000000000000}Davka FrankRuhlLight;} +{\f197\fnil\fcharset0\fprq2{\*\panose 02000400000000000000}Davka Gefen;}{\f198\fnil\fcharset0\fprq2{\*\panose 02000400000000000000}Davka Gonen;}{\f199\fnil\fcharset0\fprq2{\*\panose 00000400000000000000}Davka Hadasah;} +{\f200\fnil\fcharset0\fprq2{\*\panose 02000400000000000000}Davka Kastel;}{\f201\fnil\fcharset0\fprq2{\*\panose 00000400000000000000}Davka KsavYad;}{\f202\fnil\fcharset0\fprq2{\*\panose 00000400000000000000}Davka Meir;} +{\f203\fnil\fcharset0\fprq2{\*\panose 02000400000000000000}Davka Miriam;}{\f204\fnil\fcharset0\fprq2{\*\panose 00000400000000000000}Davka Rashi;}{\f205\fnil\fcharset0\fprq2{\*\panose 00000400000000000000}Davka Stam;} +{\f206\fnil\fcharset0\fprq2{\*\panose 02000400000000000000}Davka Yerushalmy;}{\f207\fnil\fcharset0\fprq2{\*\panose 00000000000000000000}GuttmanD Venice;}{\f208\fnil\fcharset0\fprq2{\*\panose 02000000000000000000}GuttmanD Adii;} +{\f209\fnil\fcharset0\fprq2{\*\panose 00000000000000000000}GuttmanD Ashknaz;}{\f210\fnil\fcharset0\fprq2{\*\panose 00000000000000000000}GuttmanD Calligraphic;}{\f211\fnil\fcharset0\fprq2{\*\panose 00000000000000000000}GuttmanD Hadar;} +{\f212\fnil\fcharset0\fprq2{\*\panose 00000000000000000000}GuttmanD Keren;}{\f213\fnil\fcharset0\fprq2{\*\panose 00000000000000000000}GuttmanD Mantova-Deco;}{\f214\fnil\fcharset0\fprq2{\*\panose 00000000000000000000}GuttmanD Hatzvi;} +{\f215\fnil\fcharset0\fprq2{\*\panose 00000000000000000000}GuttmanD Vilna;}{\f216\fnil\fcharset0\fprq2{\*\panose 00000000000000000000}GuttmanD Yad;}{\f217\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}YerushalmyD;} +{\f218\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}AharonyD;}{\f219\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}ChayimD;}{\f220\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}DavidD;} +{\f221\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}DavidFixD;}{\f222\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}FrankRuhlD;}{\f223\fnil\fcharset2\fprq2{\*\panose 00000300000000000000}FrankRuhlLightD;} +{\f224\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}GefenD;}{\f225\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}GonenD;}{\f226\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}HadasahD;} +{\f227\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}KastelD;}{\f228\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}KsavYadD;}{\f229\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}MeirD;} +{\f230\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}MiriamD;}{\f231\fnil\fcharset2\fprq50472{\*\panose 00000400000000000000}RashiD;}{\f232\fnil\fcharset2\fprq2{\*\panose 00000700000000000000}SiddurD;} +{\f233\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}StamD;}{\f234\fnil\fcharset2\fprq2{\*\panose 00000400000000000000}VilnaD;}{\f235\fnil\fcharset2\fprq2{\*\panose 00000000000000000000}CalligraphicG;} +{\f236\fnil\fcharset2\fprq2{\*\panose 02000000000000000000}AdiiG;}{\f237\fnil\fcharset2\fprq2{\*\panose 02000000000000000000}AshknazG;}{\f238\fnil\fcharset2\fprq2{\*\panose 00000000000000000000}HadarG;} +{\f239\fnil\fcharset2\fprq2{\*\panose 00000000000000000000}KerenG;}{\f240\fnil\fcharset2\fprq2{\*\panose 00000000000000000000}Mantova-DecoG;}{\f241\fnil\fcharset2\fprq2{\*\panose 00000000000000000000}HatzviG;} +{\f242\fnil\fcharset2\fprq2{\*\panose 00000000000000000000}VeniceG;}{\f243\fnil\fcharset2\fprq2{\*\panose 00000000000000000000}VilnaG;}{\f244\fnil\fcharset2\fprq2{\*\panose 00000000000000000000}YadG;} +{\f245\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}HebEmail;}{\f246\froman\fcharset0\fprq2{\*\panose 02070300020205020404}HebEmailFix;}{\f247\fswiss\fcharset0\fprq2 Arial CE;}{\f248\fswiss\fcharset0\fprq2 Arial CYR;} +{\f249\fswiss\fcharset0\fprq2 Arial Greek;}{\f250\fswiss\fcharset0\fprq2 Arial TUR;}{\f251\fswiss\fcharset0\fprq2 Arial Baltic;}{\f252\fmodern\fcharset0\fprq1 Courier New CE;}{\f253\fmodern\fcharset0\fprq1 Courier New CYR;} +{\f254\fmodern\fcharset0\fprq1 Courier New Greek;}{\f255\fmodern\fcharset0\fprq1 Courier New TUR;}{\f256\fmodern\fcharset0\fprq1 Courier New Baltic;}{\f257\froman\fcharset238\fprq2 Times New Roman CE;}{\f258\froman\fcharset204\fprq2 Times New Roman Cyr;} +{\f260\froman\fcharset161\fprq2 Times New Roman Greek;}{\f261\froman\fcharset162\fprq2 Times New Roman Tur;}{\f262\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f263\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\f264\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f265\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f267\fswiss\fcharset238\fprq2 Arial CE;}{\f268\fswiss\fcharset204\fprq2 Arial Cyr;}{\f270\fswiss\fcharset161\fprq2 Arial Greek;} +{\f271\fswiss\fcharset162\fprq2 Arial Tur;}{\f272\fbidi \fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f273\fbidi \fswiss\fcharset178\fprq2 Arial (Arabic);}{\f274\fswiss\fcharset186\fprq2 Arial Baltic;}{\f275\fswiss\fcharset163\fprq2 Arial (Vietnamese);} +{\f277\fmodern\fcharset238\fprq1 Courier New CE;}{\f278\fmodern\fcharset204\fprq1 Courier New Cyr;}{\f280\fmodern\fcharset161\fprq1 Courier New Greek;}{\f281\fmodern\fcharset162\fprq1 Courier New Tur;} +{\f282\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f283\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f284\fmodern\fcharset186\fprq1 Courier New Baltic;}{\f285\fmodern\fcharset163\fprq1 Courier New (Vietnamese);} +{\f297\fswiss\fcharset238\fprq2 Helvetica CE;}{\f298\fswiss\fcharset204\fprq2 Helvetica Cyr;}{\f300\fswiss\fcharset161\fprq2 Helvetica Greek;}{\f301\fswiss\fcharset162\fprq2 Helvetica Tur;}{\f302\fbidi \fswiss\fcharset177\fprq2 Helvetica (Hebrew);} +{\f303\fbidi \fswiss\fcharset178\fprq2 Helvetica (Arabic);}{\f304\fswiss\fcharset186\fprq2 Helvetica Baltic;}{\f305\fswiss\fcharset163\fprq2 Helvetica (Vietnamese);}{\f486\froman\fcharset222\fprq2 Angsana New (Thai);} +{\f496\fswiss\fcharset222\fprq2 Cordia New (Thai);}{\f517\froman\fcharset238\fprq2 Sylfaen CE;}{\f518\froman\fcharset204\fprq2 Sylfaen Cyr;}{\f520\froman\fcharset161\fprq2 Sylfaen Greek;}{\f521\froman\fcharset162\fprq2 Sylfaen Tur;} +{\f524\froman\fcharset186\fprq2 Sylfaen Baltic;}{\f607\fswiss\fcharset238\fprq2 Tahoma CE;}{\f608\fswiss\fcharset204\fprq2 Tahoma Cyr;}{\f610\fswiss\fcharset161\fprq2 Tahoma Greek;}{\f611\fswiss\fcharset162\fprq2 Tahoma Tur;} +{\f612\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f613\fbidi \fswiss\fcharset178\fprq2 Tahoma (Arabic);}{\f614\fswiss\fcharset186\fprq2 Tahoma Baltic;}{\f615\fswiss\fcharset163\fprq2 Tahoma (Vietnamese);} +{\f616\fswiss\fcharset222\fprq2 Tahoma (Thai);}{\f627\froman\fcharset238\fprq2 Times New Roman ce CE;}{\f628\froman\fcharset204\fprq2 Times New Roman ce Cyr;}{\f630\froman\fcharset161\fprq2 Times New Roman ce Greek;} +{\f631\froman\fcharset162\fprq2 Times New Roman ce Tur;}{\f632\fbidi \froman\fcharset177\fprq2 Times New Roman ce (Hebrew);}{\f633\fbidi \froman\fcharset178\fprq2 Times New Roman ce (Arabic);}{\f634\froman\fcharset186\fprq2 Times New Roman ce Baltic;} +{\f635\froman\fcharset163\fprq2 Times New Roman ce (Vietnamese);}{\f637\froman\fcharset238\fprq2 Times New Roman CYR CE;}{\f638\froman\fcharset204\fprq2 Times New Roman CYR Cyr;}{\f640\froman\fcharset161\fprq2 Times New Roman CYR Greek;} +{\f641\froman\fcharset162\fprq2 Times New Roman CYR Tur;}{\f642\fbidi \froman\fcharset177\fprq2 Times New Eoman CYR (Hebrew);}{\f643\fbidi \froman\fcharset178\fprq2 Times New Roman CYR (Arabic);}{\f644\froman\fcharset186\fprq2 Times New Roman CYR Baltic;} +{\f645\froman\fcharset163\fprq2 Times New Roman CYR (Vietnamese);}{\f647\froman\fcharset238\fprq2 Times New Roman Greek CE;}{\f648\froman\fcharset204\fprq2 Times New Roman Greek Cyr;}{\f650\froman\fcharset161\fprq2 Times New Roman Greek Greek;} +{\f651\froman\fcharset162\fprq2 Times New Roman Greek Tur;}{\f652\fbidi \froman\fcharset177\fprq2 Times New Roman Greek (Hebrew);}{\f653\fbidi \froman\fcharset178\fprq2 Times New Roman Greek (Arabic);} +{\f654\froman\fcharset186\fprq2 Times New Roman Greek Baltic;}{\f655\froman\fcharset163\fprq2 Times New Roman Greek (Vietnamese);}{\f657\froman\fcharset238\fprq2 Times New Roman TUR CE;}{\f658\froman\fcharset204\fprq2 Times New Roman TUR Cyr;} +{\f660\froman\fcharset161\fprq2 Times New Roman TUR Greek;}{\f661\froman\fcharset162\fprq2 Times New Roman TUR Tur;}{\f662\fbidi \froman\fcharset177\fprq2 Times New Roman TUR (Hebrew);}{\f663\fbidi \froman\fcharset178\fprq2 Times New Roman TUR (Arabic);} +{\f664\froman\fcharset186\fprq2 Times New Roman TUR Baltic;}{\f665\froman\fcharset163\fprq2 Times New Roman TUR (Vietnamese);}{\f667\froman\fcharset238\fprq2 Times New Roman Baltic CE;}{\f668\froman\fcharset204\fprq2 Times New Roman Baltic Cyr;} +{\f670\froman\fcharset161\fprq2 Times New Roman Baltic Greek;}{\f671\froman\fcharset162\fprq2 Times New Roman Baltic Tur;}{\f672\fbidi \froman\fcharset177\fprq2 Times New Roman Baltic (Hebrew);} +{\f673\fbidi \froman\fcharset178\fprq2 Times New Roman Baltic (Arabic);}{\f674\froman\fcharset186\fprq2 Times New Roman Baltic Baltic;}{\f675\froman\fcharset163\fprq2 Times New Roman Baltic (Vietnamese);}{\f677\fswiss\fcharset238\fprq2 Verdana CE;} +{\f678\fswiss\fcharset204\fprq2 Verdana Cyr;}{\f680\fswiss\fcharset161\fprq2 Verdana Greek;}{\f681\fswiss\fcharset162\fprq2 Verdana Tur;}{\f684\fswiss\fcharset186\fprq2 Verdana Baltic;}{\f685\fswiss\fcharset163\fprq2 Verdana (Vietnamese);} +{\f687\fswiss\fcharset238\fprq2 Trebuchet MS CE;}{\f688\fswiss\fcharset204\fprq2 Trebuchet MS Cyr;}{\f690\fswiss\fcharset161\g�rq2 Trebuchet MS Greek;}{\f691\fswiss\fcharset162\fprq2 Trebuchet MS Tur;}{\f694\fswiss\fcharset186\fprq2 Trebuchet MS Baltic;} +{\f777\froman\fcharset238\fprq2 Garamond CE;}{\f778\froman\fcharset204\fprq2 Garamond Cyr;}{\f780\froman\fcharset161\fprq2 Garamond Greek;}{\f781\froman\fcharset162\fprq2 Garamond Tur;}{\f784\froman\fcharset186\fprq2 Garamond Baltic;} +{\f897\froman\fcharset238\fprq2 Times CE;}{\f898\froman\fcharset204\fprq2 Times Cyr;}{\f900\froman\fcharset161\fprq2 Times Greek;}{\f901\froman\fcharset162\fprq2 Times Tur;}{\f902\fbidi \froman\fcharset177\fprq2 Times (Hebrew);} +{\f903\fbidi \froman\fcharset178\fprq2 Times (Arabic);}{\f904\froman\fcharset186\fprq2 Times Baltic;}{\f905\froman\fcharset163\fprq2 Times (Vietnamese);}{\f947\fmodern\fcharset238\fprq1 Lucida Console CE;} +{\f948\fmodern\fcharset204\fprq1 Lucida Console Cyr;}{\f950\fmodern\fcharset161\fprq1 Lucida Console Greek;}{\f951\fmodern\fcharset162\fprq0 Lucida Console Tur;}{\f957\fswiss\fcharset238\fprq2 Lucida Sans Unicode CE;} +{\f958\fswiss\fcharset204\fprq2 Lucida Sans Unicode Cyr;}{\f960\fswiss\fcharset161\fprq2 Lucida Sans Unicode Greek;}{\f961\fswiss\fcharset162\fprq2 Lucida Sans Unicode Tur;}{\f962\fbidi \fswiss\fcharset177\fprq2 Lucida Sans Unicode (Hebrew);} +{\f967\fswiss\fcharset238\fprq2 Arial Black CE;}{\f968\fswiss\fcharset204\fprq2 Arial Black Cyr;}{\f970\fswiss\fcharset161\fprq2 Arial Black Greek;}{\f971\fswiss\fcharset162\fprq2 Arial Black Tur;}{\f974\fswiss\fcharset186\fprq2 Arial Black Baltic;} +{\f977\fscript\fcharset238\fprq2 Comic Sans MS CE;}{\f978\fscript\fcharset204\fprq2 Comic Sans MS Cyr;}{\f980\fscript\fcharset161\fprq2 Comic Sans MS Greek;}{\f981\fscript\fcharset162\fprq2 Comic Sans MS Tur;} +{\f984\fscript\fcharset186\fprq2 Comic Sans MS Baltic;}{\f987\fswiss\fcharset238\fprq2 Impact CE;}{\f988\fswiss\fcharset204\fprq2 Impact Cyr;}{\f990\fswiss\fcharset161\fprq2 Impact Greek;}{\f991\fswiss\fcharset162\fprq2 Impact Tur;} +{\f994\fswiss\fcharset186\fprq2 Impact Baltic;}{\f997\froman\fcharset238\fprq2 Georgia CE;}{\f998\froman\fcharset204\fprq2 Georgia Cyr;}{\f1000\froman\fcharset161\fprq2 Georgia Greek;}{\f1001\froman\fcharset162\fprq2 Georgia Tur;} +{\f1004\froman\fcharset186\fprq2 Georgia Baltic;}{\f1007\fswiss\fcharset238\fprq2 Franklin Gothic Medium CE;}{\f1008\fswiss\fcharset204\fprq2 Franklin Gothic Medium Cyr;}{\f1010\fswiss\fcharset161\fprq2 Franklin Gothic Medium Greek;} +{\f1011\fswiss\fcharset162\fprq2 Franklin Gothic Medium Tur;}{\f1014\fswiss\fcharset186\fprq2 Franklin Gothic Medium Baltic;}{\f1017\froman\fcharset238\fprq2 Palatino Linotype CE;}{\f1018\froman\fcharset204\fprq2 Palatino Linotype Cyr;} +{\f1020\froman\fcharset161\fprq2 Palatino Linotype Greek;}{\f1021\froman\fcharset162\fprq2 Palatino Linotype Tur;}{\f1024\froman\fcharset186\fprq2 Palatino Linotype Baltic;}{\f1025\froman\fcharset163\fprq2 Palatino Linotype (Vietnamese);} +{\f1047\fswiss\fcharset238\fprq2 Microsoft Sans Serif CE;}{\f1048\fswiss\fcharset204\fprq2 Microsoft Sans Serif Cyr;}{\f1050\fswiss\fcharset161\fprq2 Microsoft Sans Serif Greek;}{\f1051\fswiss\fcharset162\fprq2 Microsoft Sans Serif Tur;} +{\f1052\fbidi \fswiss\fcharset177\fprq2 Microsoft Sans Serif (Hebrew);}{\f1053\fbidi \fswiss\fcharset178\fprq2 Microsoft Sans Serif (Arabic);}{\f1054\fswiss\fcharset186\fprq2 Microsoft Sans Serif Baltic;} +{\f1055\fswiss\fcharset163\fprq2 Microsoft Sans Serif (Vietnamese);}{\f1056\fswiss\fcharset222\fprq2 Microsoft Sans Serif (Thai);}{\f1297\froman\fcharset238\fprq2 AmerType Md BT CE;}{\f1300\froman\fcharset161\fprq2 AmerType Md BT Greek;} +{\f1301\froman\fcharset162\fprq2 AmerType Md BT Tur;}{\f1307\fswiss\fcharset238\fprq2 AvantGarde Md BT CE;}{\f1310\fswiss\fcharset161\fprq2 AvantGarde Md BT Greek;}{\f1311\fswiss\fcharset162\fprq2 AvantGarde Md BT Tur;} +{\f1317\fswiss\fcharset238\fprq2 AvantGarde Bk BT CE;}{\f1320\fswiss\fcharset161\fprq2 AvantGarde Bk BT Greek;}{\f1321\fswiss\fcharset162\fprq2 AvantGarde Bk BT Tur;}{\f1327\froman\fcharset238\fprq2 Benguiat Bk BT CE;} +{\f1330\froman\fcharset161\fprq2 Benguiat Bk BT Greek;}{\f1331\froman\fcharset162\fprq2 Benguiat Bk BT Tur;}{\f1337\fdecor\fcharset238\fprq2 BernhardFashion BT CE;}{\f1340\fdecor\fcharset161\fprq2 BernhardFashion BT Greek;} +{\f1341\fdecor\fcharset162\fprq2 BernhardFashion BT Tur;}{\f1347\froman\fcharset238\fprq2 BernhardMod BT CE;}{\f1350\froman\fcharset161\fprq2 BernhardMod BT Greek;}{\f1351\froman\fcharset162\fprq2 BernhardMod BT Tur;} +{\f1357\fswiss\fcharset238\fprq2 BankGothic Md BT CE;}{\f1360\fswiss\fcharset161\fprq2 BankGothic Md BT Greek;}{\f1361\fswiss\fcharset162\fprq2 BankGothic Md BT Tur;}{\f1367\fdecor\fcharset238\fprq2 Bremen bd BT CE;} +{\f1370\fdecor\fcharset161\fprq2 Bremen bd BT Greek;}{\f1371\fdecor\fcharset162\fprq2 Bremen bd BT Tur;}{\f1397\fswiss\fcharset238\fprq2 CopprplGoth bd BT CE;}{\f1400\fswiss\fcharset161\fprq2 CopprplGoth bd BT Greek;} +{\f1401\fswiss\fcharset162\fprq2 CopprplGoth bd BT Tur;}{\f1417\fswiss\fcharset238\fprq2 Futura Md BT CE;}{\f1420\fswiss\fcharset161\fprq2 Futura Md BT Greek;}{\f1421\fswiss\fcharset162\fprq2 Futura Md BT Tur;} +{\f1427\fdecor\fcharset238\fprq2 FuturaBlack BT CE;}{\f1430\fdecor\fcharset161\fprq2 FuturaBlack BT Greek;}{\f1431\fdecor\fcharset162\fprq2 FuturaBlack BT Tur;}{\f1437\fswiss\fcharset238\fprq2 Futura Lt BT CE;} +{\f1440\fswiss\fcharset161\fprq2 Futura Lt BT Greek;}{\f1441\fswiss\fcharset162\fprq2 Futura Lt BT Tur;}{\f1447\fswiss\fcharset238\fprq2 Futura XBlk BT CE;}{\f1450\fswiss\fcharset161\fprq2 Futura XBlk BT Greek;} +{\f1451\fswiss\fcharset162\fprq2 Futura XBlk BT Tur;}{\f1457\fdecor\fcharset238\fprq2 GoudyHandtooled BT CE;}{\f1460\fdecor\fcharset161\fprq2 GoudyHandtooled BT Greek;}{\f1461\fdecor\fcharset162\fprq2 GoudyHandtooled BT Tur;} +{\f1467\froman\fcharset238\fprq2 GoudyOlSt BT CE;}{\f1470\froman\fcharset161\fprq2 GoudyOlSt BT Greek;}{\f1471\froman\fcharset162\fprq2 GoudyOlSt BT Tur;}{\f1477\fswiss\fcharset238\fprq2 Humanst521 BT CE;} +{\f1480\fswiss\fcharset161\fprq2 Humanst521 BT Greek;}{\f1481\fswiss\fcharset162\fprq2 Humanst521 BT Tur;}{\f1487\fswiss\fcharset238\fprq2 Kabel Bk BT CE;}{\f1490\fswiss\fcharset161\fprq2 Kabel Bk BT Greek;} +{\f1491\fswiss\fcharset162\fprq2 Kabel Bk BT Tur;}{\f1497\fswiss\fcharset238\fprq2 Kabel Ult BT CE;}{\f1500\fswiss\fcharset161\fprq2 Kabel Ult BT Greek;}{\f1501\fswiss\fcharset162\fprq2 Kabel Ult BT Tur;} +{\f1527\fscript\fcharset238\fprq2 OzHandicraft BT CE;}{\f1530\fscript\fcharset161\fprq2 OzHandicraft BT Greek;}{\f1531\fscript\fcharset162\fprq2 OzHandicraft BT Tur;}{\f1537\froman\fcharset238\fprq2 PosterBodoni BT CE;} +{\f1540\froman\fcharset161\fprq2 PosterBodoni BT Greek;}{\f1541\froman\fcharset162\fprq2 PosterBodoni BT Tur;}{\f1547\froman\fcharset238\fprq2 Serifa BT CE;}{\f1550\froman\fcharset161\fprq2 Serifa BT Greek;}{\f1551\froman\fcharset162\fprq2 Serifa BT Tur;} +{\f1557\froman\fcharset238\fprq2 Serifa Th BT CE;}{\f1560\froman\fcharset161\fprq2 Serifa Th BT Greek;}{\f1561\froman\fcharset162\fprq2 Serifa Th BT Tur;}{\f1567\fscript\fcharset238\fprq2 English111 Vivace BT CE;} +{\f1570\fscript\fcharset161\fprq2 English111 Vivace BT Greek;}{\f1571\fscript\fcharset162\fprq2 English111 Vivace BT Tur;}{\f1577\froman\fcharset238\fprq2 Souvenir Lt BT CE;}{\f1580\froman\fcharset161\fprq2 Souvenir Lt BT Greek;} +{\f1581\froman\fcharset162\fprq2 Souvenir Lt BT Tur;}{\f1587\fscript\fcharset238\fprq2 Staccato222 BT CE;}{\f1590\fscript\fcharset161\fprq2 Staccato222 BT Greek;}{\f1591\fscript\fcharset162\fprq2 Staccato222 BT Tur;} +{\f1597\fswiss\fcharset238\fprq2 Swiss911 XCm BT CE;}{\f1600\fswiss\fcharset161\fprq2 Swiss911 XCm BT Greek;}{\f1601\fswiss\fcharset162\fprq2 Swiss911 XCm BT Tur;}{\f1607\fscript\fcharset238\fprq2 TypoUpright BT CE;} +{\f1610\fscript\fcharset161\fprq2 TypoUpright BT Greek;}{\f1611\fscript\fcharset162\fprq2 TypoUpright BT Tur;}{\f1617\froman\fcharset238\fprq2 ZapfEllipt BT CE;}{\f1620\froman\fcharset161\fprq2 ZapfEllipt BT Greek;} +{\f1621\froman\fcharset162\fprq2 ZapfEllipt BT Tur;}{\f1627\fswiss\fcharset238\fprq2 Zurich Ex BT CE;}{\f1630\fswiss\fcharset161\fprq2 Zurich Ex BT Greek;}{\f1631\fswiss\fcharset162\fprq2 Zurich Ex BT Tur;} +{\f1637\fswiss\fcharset238\fprq2 Zurich BlkEx BT CE;}{\f1640\fswiss\fcharset161\fprq2 Zurich BlkEx BT Greek;}{\f1641\fswiss\fcharset162\fprq2 Zurich BlkEx BT Tur;}{\f1686\fswiss\fcharset222\fprq2 Browallia New (Thai);} +{\f1937\fswiss\fcharset238\fprq2 Myriad Condensed Web CE;}{\f1941\fswiss\fcharset162\fprq2 Myriad Condensed Web Tur;}{\f1944\fswiss\fcharset186\fprq2 Myriad Condensed Web Baltic;}{\f1947\fswiss\fcharset238\fprq2 Myriad Web CE;} +{\f1951\fswiss\fcharset162\fprq2 Myriad Web Tur;}{\f1954\fswiss\fcharset186\fprq2 Myriad Web Baltic;}{\f1957\froman\fcharset238\fprq2 TITUS Cyberbit Basic CE;}{\f1958\froman\fcharset204\fprq2 TITUS Cyberbit Basic Cyr;} +{\f1960\froman\fcharset161\fprq2 TITUS Cyberbit Basic Greek;}{\f1961\froman\fcharset162\fprq2 TITUS Cyberbit Basic Tur;}{\f1962\fbidi \froman\fcharset177\fprq2 TITUS Cyberbit Basic (Hebrew);} +{\f1963\fbidi \froman\fcharset178\fprq2 TITUS Cyberbit Basic (Arabic);}{\f1964\froman\fcharset186\fprq2 TITUS Cyberbit Basic Baltic;}{\f1965\froman\fcharset163\fprq2 TITUS Cyberbit Basic (Vietnamese);} +{\f1966\froman\fcharset222\fprq2 TITUS Cyberbit Basic (Thai);}{\f1981\fdecor\fcharset162\fprq2 Allegro BT Tur;}{\f1987\fswiss\fcharset238\fprq2 Arial Narrow CE;}{\f1988\fswiss\fcharset204\fprq2 Arial Narrow Cyr;} +{\f1990\fswiss\fcharset161\fprq2 Arial Narrow Greek;}{\f1991\fswiss\fcharset162\fprq2 Arial Narrow Tur;}{\f1994\fswiss\fcharset186\fprq2 Arial Narrow Baltic;}{\f1997\froman\fcharset238\fprq2 Book Antiqua CE;} +{\f1998\froman\fcharset204\fprq2 Book Antiqua Cyr;}{\f0\froman\fcharset161\fprq2 Book Antiqua Greek;}{\f2001\froman\fcharset162\fprq2 Book Antiqua Tur;}{\f2004\froman\fcharset186\fprq2 Book Antiqua Baltic;} +{\f2007\froman\fcharset238\fprq2 Bookman Old Style CE;}{\f2008\froman\fcharset204\fprq2 Bookman Old Style Cyr;}{\f2010\froman\fcharset161\fprq2 Bookman Old Style Greek;}{\f2011\froman\fcharset162\fprq2 Bookman Old Style Tur;} +{\f2014\froman\fcharset186\fprq2 Bookman Old Style Baltic;}{\f2017\fswiss\fcharset238\fprq2 Century Gothic CE;}{\f2018\fswiss\fcharset204\fprq2 Century Gothic Cyr;}{\f2020\fswiss\fcharset161\fprq2 Century Gothic Greek;} +{\f2021\fswiss\fcharset162\fprq2 Century Gothic Tur;}{\f2024\fswiss\fcharset186\fprq2 Century Gothic Baltic;}{\f2027\fswiss\fcharset238\fprq2 Haettenschweiler CE;}{\f2028\fswiss\fcharset204\fprq2 Haettenschweiler Cyr;} +{\f2030\fswiss\fcharset161\fprq2 Haettenschweiler Greek;}{\f2031\fswiss\fcharset162\fprq2 Haettenschweiler Tur;}{\f2034\fswiss\fcharset156\fprq2 Haettenschweiler Baltic;}{\f2047\fscript\fcharset238\fprq2 Monotype Corsiva CE;} +{\f2048\fscript\fcharset204\fprq2 Monotype Corsiva Cyr;}{\f2050\fscript\fcharset161\fprq2 Monotype Corsiva Greek;}{\f2051\fscript\fcharset162\fprq2 Monotype c2\fprq2 Monotype Corsiva Tur;}{\f2054\fscript\fcharset186\fprq2 Monotype Corsiva Baltic;} +{\f2087\fswiss\fcharset238\fprq2 MS Reference Sans Serif CE;}{\f2088\fswiss\fcharset204\fprq2 MSReference Sans Serif Cyr;}{\f2090\fswiss\fcharset161\fprq2 MS Reference Sans Serif Greek;}{\f2091\fswiss\fcharset162\fprq2 MS Reference Sans Serif Tur;} +{\f2094\fswiss\fcharset186\fprq2 MS Reference Sans Serif Baltic;}{\f2095\fswiss\fcharset163\fprq2 MS Reference Sans Serif (Vietnamese);}{\f2727\fswiss\fcharset238\fprq2 Arial ce CE;}{\f2728\fswiss\fcharset204\fprq2 Arial ce Cyr;} +{\f2730\fswiss\fcharset161\fprq2 Arial ce Greek;}{\f2731\fswiss\fcharset162\fprq2 Arial ce Tur;}{\f2732\fbidi \fswiss\fcharset177\fprq2 Arial ce (Hebrew);}{\f2733\fbidi \fswiss\fcharset178\fprq2 Arial ce (Arabic);} +{\f2734\fswiss\fcharset186\fprq2 Arial ce Baltic;}{\f2735\fswiss\fcharset163\fprq2 Arial ce (Vietnamese);}{\f2737\fswiss\fcharset238\fprq2 Arial CYR CE;}{\f2738\fswiss\fcharset204\fprq2 Arial CYR Cyr;}{\f2740\fswiss\fcharset161\fprq2 Arial CYR Greek;} +{\f2741\fswiss\fcharset162\fprq2 Arial CYR Tur;}{\f2742\fbidi \fswiss\fcharset177\fprq2 Arial CYR (Hebrew);}{\f2743\fbidi \fswiss\fcharset178\fprq2 Arial CYR (Arabic);}{\f2744\fswiss\fcharset186\fprq2 Arial CYR Baltic;} +{\f2745\fswiss\fcharset163\fprq2 Arial CYR (Vietnamese);}{\f2747\fswiss\fcharset238\fprq2 Arial Greek CE;}{\f2748\fswiss\fcharset204\fprq2 Arial Greek Cyr;}{\f2750\fswiss\fcharset161\fprq2 Arial Greek Greek;} +{\f2751\fswiss\fcharset162\fprq2 Arial Greek Tur;}{\f2752\fbidi \fswiss\fcharset177\fprq2 Arial Greek (Hebrew);}{\f2753\fbidi \fswiss\fcharset178\fprq2 Arial Greek (Arabic);}{\f2754\fswiss\fcharset186\fprq2 Arial Greek Baltic;} +{\f2755\fswiss\fcharset163\fprq2 Arial Greek (Vietnamese);}{\f2757\fswiss\fcharset238\fprq2 Arial TUR CE;}{\f2758\fswiss\fcharset204\fprq2 Arial TUR Cyr;}{\f2760\fswiss\fcharset161\fprq2 Arial TUR Greek;}{\f2761\fswiss\fcharset162\fprq2 Arial TUR Tur;} +{\f2762\fbidi \fswiss\fcharset177\fprq2 Arial TUR (Hebrew);}{\f2763\fbidi \fswiss\fcharset178\fprq2 Arial TUR (Arabic);}{\f2764\fswiss\fcharset186\fprq2 Arial TUR Baltic;}{\f2765\fswiss\fcharset163\fprq2 Arial TUR (Vietnamese);} +{\f2767\fswiss\fcharset238\fprq2 Arial Baltic CE;}{\f2768\fswiss\fcharset204\fprq2 Arial Baltic Cyr;}{\f2770\fswiss\fcharset161\fprq2 Arial Baltic Greek;}{\f2771\fswiss\fcharset162\fprq2 Arial Baltic Tur;} +{\f2772\fbidi \fswiss\fcharset177\fprq2 Arial Baltic (Hebrew);}{\f2773\fbidi \fswiss\fcharset178\fprq2 Arial Baltic (Arabic);}{\f2774\fswiss\fcharset186\fprq2 Arial Baltic Baltic;}{\f2775\fswiss\fcharset163\fprq2 Arial Baltic (Vietnamese);} +{\f2777\fmodern\fcharset238\fprq1 Courier New ce CE;}{\f2778\fmodern\fcharset204\fprq1 Courier New ce Cyr;}{\f2780\fmodern\fcharset161\fprq1 Courier New ce Greek;}{\f2781\fmodern\fcharset162\fprq1 Courier New ce Tur;} +{\f2782\fbidi \fmodern\fcharset177\fprq1 Courier New ce (Hebrew);}{\f2783\fbidi \fmodern\fcharset178\fprq1 Courier New ce (Arabic);}{\f2784\fmodern\fcharset186\fprq1 Courier New ce Baltic;}{\f2785\fmodern\fcharset163\fprq1 Courier New ce (Vietnamese);} +{\f2787\fmodern\fcharset238\fprq1 Courier New CYR CE;}{\f2788\fmodern\fcharset204\fprq1 Courier New CYR Cyr;}{\f2790\fmodern\fcharset161\fprq1 Courier New CYR Greek;}{\f2791\fmodern\fcharset162\fprq1 Courier New CYR Tur;} +{\f2792\fbidi \fmodern\fcharset177\fprq1 Courier New CYR (Hebrew);}{\f2793\fbidi \fmodern\fcharset178\fprq1 Courier New CYR (Arabic);}{\f2794\fmodern\fcharset186\fprq1 Courier New CYR Baltic;} +{\f2795\fmodern\fcharset163\fprq1 Courier New CYR (Vietnamese);}{\f2797\fmodern\fcharset238\fprq1 Courier New Greek CE;}{\f2798\fmodern\fcharset204\fprq1 Courier New Greek Cyr;}{\f2800\fmodern\fcharset161\fprq1 Courier New Greek Greek;} +{\f2801\fmodern\fcharset162\fprq1 Courier New Greek Tur;}{\f2802\fbidi \fmodern\fcharset177\fprq1 Courier New Greek (Hebrew);}{\f2803\fbidi \fmodern\fcharset178\fprq1 Courier New Greek (Arabic);}{\f2804\fmodern\fcharset186\fprq1 Courier New Greek Baltic;} +{\f2805\fmodern\fcharset163\fprq1 Courier New Greek (Vietnamese);}{\f2807\fmodern\fcharset238\fprq1 Courier New TUR CE;}{\f2808\fmodern\fcharset204\fprq1 Courier New TUR Cyr;}{\f2810\fmodern\fcharset161\fprq1 Courier New TUR Greek;} +{\f2811\fmodern\fcharset162\fprq1 Courier New TUR Tur;}{\f2812\fbidi \fmodern\fcharset177\fprq1 Courier New TUR (Hebrew);}{\f2813\fbidi \fmodern\fcharset178\fprq1 Courier New TUR (Arabic);}{\f2814\fmodern\fcharset186\fprq1 Courier New TUR Baltic;} +{\f2815\fmodern\fcharset163\fprq1 Courier New TUR (Vietnamese);}{\f2817\fmodern\fcharset238\fprq1 Courier New Baltic CE;}{\f2818\fmodern\fcharset204\fprq1 Courier New Baltic Cyr;}{\f2820\fmodern\fcharset161\fprq1 Courier New Baltic Greek;} +{\f2821\fmodern\fcharset162\fprq1 Courier New Baltic Tur;}{\f2822\fbidi \fmodern\fcharset177\fprq1 Courier New Baltic (Hebrew);}{\f2823\fbidi \fmodern\fcharset178\fprq1 Courier New Baltic (Arabic);} +{\f2824\fmodern\fcharset186\fprq1 Courier New Baltic Baltic;}{\f2825\fmodern\fcharset163\fprq1 Courier New Baltic (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255; +\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192; +\red255\green255\blue255;}{\stylesheet{\ql \li0\ri0\sl480\slmult1\widctlpar\tx360\faauto\adjustright\rin0\lin0\itap0 \rtlch \af0\afs24\alang1037 \ltrch \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 \sautoupd Normal;}{ +\s1\ql \li0\ri0\sl480\slmult1\keepn\widctlpar\tx360\faauto\outlinelevel0\adjustright\rin0\lin0\itap0 \rtlch \af0\afs28\alang1037 \ltrch \fs28\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 1;}{ +\s2\ql \fi-405\li405\ri0\sb120\sl360\slmult1\keepn\widctlpar\tx360\faauto\outlinelevel1\adjustright\rin0\lin405\itap0 \rtlch \af0\afs24\alang1037 \ltrch \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \sautoupd heading 2;}{ +\s3\ql \fi180\li0\ri0\sl480\slmult1\keepn\widctlpar\tx360\faauto\outlinelevel2\adjustright\rin0\lin0\itap0 \rtlch \af0\afs24\alang1037 \ltrch \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 3;}{ +\s4\qj \li0\ri0\sl480\slmult1\keepn\widctlpar\tx360\faauto\outlinelevel3\adjustright\rin0\lin0\itap0 \rtlch \af4905601394584691289\afs24\alang1037 \ltrch \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 4;}{\s5\qc \li0\ri0\sl480\slmult1 +\keepn\widctlpar\tx360\faauto\outlinelevel4\adjustright\rin0\lin0\itap0 \rtlch \ab\af0\afs24\alang1037 \ltrch \b\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 5;}{\s6\qj \li0\ri0\sl480\slmult1\keepn\widctlpar +\tx360\faauto\outlinelevel5\adjustright\rin0\lin0\itap0 \rtlch \ab\af0\afs24\alang1037 \ltrch \b\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 6;}{\s7\ql \li0\ri0\sl480\slmult1\keepn\widctlpar +\tx360\faauto\outlinelevel6\adjustright\rin0\lin0\itap0 \rtlch \ab\af0\afs24\alang1037 \ltrch \b\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 7;}{\s8\ql \li0\ri0\sl480\slmult1\keepn\widctlpar +\tx360\faauto\outlinelevel7\adjustright\rin0\lin0\itap0 \rtlch \af0\afs24\alang1037 \ltrch \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 8;}{\s9\qj \li270\ri0\sl480\slmult1\keepn\widctlpar +\tx360\tx450\faauto\outlinelevel8\adjustright\rin0\lin270\itap0 \rtlch \ab\af0\afs24\alang1037 \ltrch \b\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 heading 9;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\* +\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv +\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch \af0\afs20 \ltrch \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\s15\ql \li0\ri0\sl360\slmult1\widctlpar +\tx360\faauto\adjustright\rin0\lin0\itap0 \rtlch \af0\afs20\alang1037 \ltrch \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext15 \sautoupd \ssemihidden \styrsid1276346 footnote text;}{\*\cs16 \additive \rtlch \af0 \ltrch \f0\super +\sbasedon10 \ssemihidden footnote reference;}{\s17\ql \li0\ri0\sl480\slmult1\widctlpar\tx360\faauto\adjustright\rin0\lin0\itap0 \rtlch \af156\afs24\alang1037 \ltrch \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext17 \ssemihidden +endnote text;}{\*\cs18 \additive \rtlch \af0 \ltrch \f0\super \sbasedon10 \ssemihidden endnote reference;}{\*\cs19 \additive \rtlch \af0 \ltrch \f0 \sbasedon10 line number;}{\s20\ql \li0\ri0\sl480\slmult1\widctlpar +\tx360\faauto\adjustright\rin0\lin0\itap0 \rtlch \af0\afs24\alang1037 \ltrch \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext20 Body Text;}{\s21\qj \li0\ri0\sl480\slmult1\widctlpar\tx360\faauto\adjustright\rin0\lin0\itap0 \rtlch +\af0\afs24\alang1037 \ltrch \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext21 Body Text 2;}{\s22\ql \li0\ri0\sl480\slmult1\widctlpar\tx360\tqc\tx4320\tqr\tx8640\faauto\adjustright\rin0\lin0\itap0 \rtlch \af0\afs24\alang1037 +\ltrch \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext22 header;}{\s23\ql \li0\ri0\sl480\slmult1\widctlpar\tx360\tqc\tx4320\tqr\tx8640\faauto\adjustright\rin0\lin0\itap0 \rtlch \af0\afs24\alang1037 \ltrch +\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext23 footer;}{\*\cs24 \additive \rtlch \af0 \ltrch \f0 \sbasedon10 page number;}{\s25\ql \fi180\li0\ri0\sl480\slmult1\widctlpar\tx360\faauto\adjustright\rin0\lin0\itap0 \rtlch +\af0\afs24\alang1037 \ltrch \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext25 Body Text Indent 2;}{\s26\ql \fi-342\li342\ri0\sl480\slmult1\widctlpar\tx360\faauto\adjustright\rin0\lin342\itap0 \rtlch \af0\afs24\alang1037 \ltrch +\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext26 Body Text Indent 3;}{\s27\qj \fi-357\li357\ri0\sb120\sl480\slmult1\widctlpar\tx360\faauto\adjustright\rin0\lin357\itap0 \rtlch \af0\afs24\alang1037 \ltrch +\scaps\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext27 \sautoupd SectionTitle;}{\s28\qj \li0\ri0\sl480\slmult1\keepn\widctlpar\tx360\faauto\outlinelevel0\adjustright\rin0\lin0\itap0 \rtlch \af0\afs28\alang1037 \ltrch +\fs28\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon1 \snext28 ChapterTitle;}}{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\listtable{\list\listtemplateid976804938{\listlevel\levelnfc2\levelnfcn47\leveljc0\leveljcn0\levelfollow0 +\levelstartat1\levelspace0\levelindent0{\leveltext\'03\'00. ;}{\levelnumbers\'01;}\ltrch \afs2 \rtlch \f0\fs24\fbias0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0 +\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc2\levelnfcn47\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers +\'01;}\ltrch \afs2 \rtlch \f0\fs24 \fi-180\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li2880 +\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc2 +\levelnfcn47\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\ltrch \afs2 \rtlch \f0\fs24 \fi-180\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2 +\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0 +\levelindent0{\leveltext\'02\'07.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc2\levelnfcn47\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'08.;}{\levelnumbers +\'01;}\ltrch \afs2 \rtlch \f0\fs24 \fi-180\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid33510586}{\list\listtemplateid991314500\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat2\levelspace0\levelindent0 +{\leveltext\leveltemplateid67698703\'02\'00.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fbias0 \fi-360\li720\jclisttab\tx4606266560638978726\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\leveltemplateid67698713\'04\'01.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\llvelindent0{\leveltext\leveltemplateid67698715 +\'02\'02.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-180\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'03.;}{\levelnumbers +\'01;}\rtlch \af0 \ltrch \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'04.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch +\fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'05.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-180\li4320 +\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'06.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li5040\jclisttab\tx5040\lin5040 +}{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'07.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc2 +\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'08.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-180\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid74590232} +{\list\listtemplateid1954683936{\listlevel\levelnfc2\levelnfcn47\leveljc0\leveljcn0\levelfollow0\levelstartat3\levelspace0\levelindent0{\leveltext\'03\'00. ;}{\levelnumbers\'01;}\ltrch \afs2 \rtlch \f0\fs24\fbias0 \fi-360\li720\jclisttab\tx720\lin720 } +{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levem�pace0\mwvelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc2\levelnfcn47\leveljc0 +\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\ltrch \afs2 \rtlch \f0\fs24 \fi-180\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1 +\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\'02\'04.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc2\levelnfcn47\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\ltrch \afs2 +\rtlch \f0\fs24 \fi-180\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li5040 ... etc. - the rest is truncated
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
