configure.ac | 14 +++++++-- sc/inc/dbdata.hxx | 3 +- sc/source/core/tool/dbdata.cxx | 6 ++-- scripting/source/pyprov/pythonscript.py | 30 +++++++++++++++++++- sw/source/core/unocore/unochart.cxx | 47 +++++++++++--------------------- sw/source/filter/ww8/ww8par3.cxx | 2 - 6 files changed, 62 insertions(+), 40 deletions(-)
New commits: commit 3af852c1a4cb4bf2a0c5b0a891ee30162305c3ce Author: Andras Timar <[email protected]> AuthorDate: Sun Oct 21 10:48:36 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sun Oct 21 10:48:36 2018 +0200 Bump version to 5.3-58 Change-Id: I4883e408a2211e812f010912e8e99ea34bf1eac5 diff --git a/configure.ac b/configure.ac index 93bf839fb815..fe3a33592480 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.3.10.57],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.3.10.58],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) commit 4c0d9942ebd56e83e83ac3079528e62ce5644008 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Oct 18 20:39:23 2018 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sun Oct 21 10:44:25 2018 +0200 keep pyuno script processing below base uri Change-Id: Icc13fb7193fb1e7c50e0df286161a10b4ed636c7 Reviewed-on: https://gerrit.libreoffice.org/61969 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit b1c85cdb37a47998f8ab135fbc96f186334b171c) (cherry picked from commit a9d81dd30d809b9c5ce2d3e4752039f19be70494) diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py index 68a1bacd1462..d96a7afcba6f 100644 --- a/scripting/source/pyprov/pythonscript.py +++ b/scripting/source/pyprov/pythonscript.py @@ -25,6 +25,7 @@ import imp import time import ast import platform +from com.sun.star.uri.RelativeUriExcessParentSegments import RETAIN try: unicode @@ -212,8 +213,33 @@ class MyUriHelper: def scriptURI2StorageUri( self, scriptURI ): try: - myUri = self.m_uriRefFac.parse(scriptURI) - ret = self.m_baseUri + "/" + myUri.getName().replace( "|", "/" ) + # base path to the python script location + sBaseUri = self.m_baseUri + "/" + xBaseUri = self.m_uriRefFac.parse(sBaseUri) + + # path to the .py file + "$functionname, arguments, etc + xStorageUri = self.m_uriRefFac.parse(scriptURI) + sStorageUri = xStorageUri.getName().replace( "|", "/" ); + + # path to the .py file, relative to the base + sFileUri = sStorageUri[0:sStorageUri.find("$")] + xFileUri = self.m_uriRefFac.parse(sFileUri) + if not xFileUri: + message = "pythonscript: invalid relative uri '" + sFileUri+ "'" + log.debug( message ) + raise RuntimeException( message ) + + # absolute path to the .py file + xAbsScriptUri = self.m_uriRefFac.makeAbsolute(xBaseUri, xFileUri, True, RETAIN) + sAbsScriptUri = xAbsScriptUri.getUriReference() + + # ensure py file is under the base path + if not sAbsScriptUri.startswith(sBaseUri): + message = "pythonscript: storage uri '" + sAbsScriptUri + "' not in base uri '" + self.m_baseUri + "'" + log.debug( message ) + raise RuntimeException( message ) + + ret = sBaseUri + sStorageUri log.debug( "converting scriptURI="+scriptURI + " to storageURI=" + ret ) return ret except UnoException as e: commit 188fa45c366e12540cfe37266c8ad25846d361c9 Author: Stephan Bergmann <[email protected]> AuthorDate: Tue Sep 18 08:39:21 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sun Oct 21 10:43:03 2018 +0200 macOS SDK 10.14 is out Reviewed-on: https://gerrit.libreoffice.org/60657 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit a8eb515599526b5b69647a842b2889b6f56de2c8) Change-Id: Iab7bc66db94fe02bb3714234d68b3e2fc3569fdf (cherry picked from commit 35196c456ae1ffb9d826c8ec3b8967d6656779f0) diff --git a/configure.ac b/configure.ac index d7be9959e8b8..93bf839fb815 100644 --- a/configure.ac +++ b/configure.ac @@ -2741,8 +2741,7 @@ if test $_os = Darwin; then # higher than or equal to the minimum required should be found. AC_MSG_CHECKING([what Mac OS X SDK to use]) - - for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11 10.12 10.13; do + for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11 10.12 10.13 10.14; do MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> /dev/null` if test -d "$MACOSX_SDK_PATH"; then with_macosx_sdk="${_macosx_sdk}" @@ -2779,6 +2778,9 @@ if test $_os = Darwin; then 10.13) MACOSX_SDK_VERSION=101300 ;; + 10.14) + MACOSX_SDK_VERSION=101400 + ;; *) AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.8--13]) ;; @@ -2818,6 +2820,9 @@ if test $_os = Darwin; then 10.13) MAC_OS_X_VERSION_MIN_REQUIRED="101300" ;; + 10.14) + MAC_OS_X_VERSION_MIN_REQUIRED="101400" + ;; *) AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.8--13]) ;; @@ -2861,6 +2866,9 @@ if test $_os = Darwin; then 10.13) MAC_OS_X_VERSION_MAX_ALLOWED="101300" ;; + 10.14) + MAC_OS_X_VERSION_MAX_ALLOWED="101400" + ;; *) AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.8--13]) ;; commit d20db10442dcc6c0c93d11219c1e60ba6d91245f Author: Caolán McNamara <[email protected]> AuthorDate: Wed Aug 15 14:13:02 2018 +0100 Commit: Andras Timar <[email protected]> CommitDate: Fri Sep 21 10:53:35 2018 +0200 outer loop unrelated to inner loop since original checkin of... commit 9cddf9da7fb256418e1bc3b4719abb55e3b0604c Date: Tue May 22 15:33:44 2007 +0000 INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED ... 2006/12/13 12:31:03 tl 1.1.2.38: #i71244# update charts in writer where I think this LockUnlockAllCharts chart2 loop was modelled on the previous chart[1] styles loop of e.g. DoUpdateAllCharts which loop over tables. chart2 objects are unrelated to these tables, so remove the outer loop, which then means the ofz#9689 ofz#9856 ofz9874 crashes that made me look at it will get fixed Change-Id: I7d7ba0a2aa257b5aa399f20d902f01306fbaecff Reviewed-on: https://gerrit.libreoffice.org/59112 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit eadf6f4551416430b58efc42a5756556df0a237d) (cherry picked from commit 74de907344923a9f9575927fca8d43260f86f4c9) (cherry picked from commit c7b0292184c0942ca00633b88e76367092f3ea91) diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 8ae7d5bc8652..a8f8898507e3 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -119,43 +119,30 @@ void SwChartLockController_Helper::LockUnlockAllCharts( bool bLock ) if (!pDoc) return; - const SwFrameFormats& rTableFormats = *pDoc->GetTableFrameFormats(); - for( size_t n = 0; n < rTableFormats.size(); ++n ) + uno::Reference< frame::XModel > xRes; + SwOLENode *pONd; + SwStartNode *pStNd; + SwNodeIndex aIdx( *pDoc->GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 ); + while( nullptr != (pStNd = aIdx.GetNode().GetStartNode()) ) { - SwTable* pTmpTable; - const SwTableNode* pTableNd; - const SwFrameFormat* pFormat = rTableFormats[ n ]; - - if( nullptr != ( pTmpTable = SwTable::FindTable( pFormat ) ) && - nullptr != ( pTableNd = pTmpTable->GetTableNode() ) && - pTableNd->GetNodes().IsDocNodes() ) + ++aIdx; + if (nullptr != ( pONd = aIdx.GetNode().GetOLENode() ) && + !pONd->GetChartTableName().isEmpty() /* is chart object? */) { - uno::Reference< frame::XModel > xRes; - SwOLENode *pONd; - SwStartNode *pStNd; - SwNodeIndex aIdx( *pDoc->GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 ); - while( nullptr != (pStNd = aIdx.GetNode().GetStartNode()) ) + uno::Reference < embed::XEmbeddedObject > xIP = pONd->GetOLEObj().GetOleRef(); + if ( svt::EmbeddedObjectRef::TryRunningState( xIP ) ) { - ++aIdx; - if (nullptr != ( pONd = aIdx.GetNode().GetOLENode() ) && - !pONd->GetChartTableName().isEmpty() /* is chart object? */) + xRes.set( xIP->getComponent(), uno::UNO_QUERY ); + if (xRes.is()) { - uno::Reference < embed::XEmbeddedObject > xIP = pONd->GetOLEObj().GetOleRef(); - if ( svt::EmbeddedObjectRef::TryRunningState( xIP ) ) - { - xRes.set( xIP->getComponent(), uno::UNO_QUERY ); - if (xRes.is()) - { - if (bLock) - xRes->lockControllers(); - else - xRes->unlockControllers(); - } - } + if (bLock) + xRes->lockControllers(); + else + xRes->unlockControllers(); } - aIdx.Assign( *pStNd->EndOfSectionNode(), + 1 ); } } + aIdx.Assign( *pStNd->EndOfSectionNode(), + 1 ); } bIsLocked = bLock; commit 15ce830eb8994bf1c01389b53c05aed7ed9daba4 Author: Eike Rathke <[email protected]> AuthorDate: Thu Sep 20 18:12:03 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Fri Sep 21 10:53:30 2018 +0200 Resolves: tdf#119954 do not copy the old parent, init with new parent instead The parent is always the ScDBCollection that contains the ScDBCollection::NamedDBs container, not the one the ScDBCollection::NamedDBs was copy-constructed from. Change-Id: Ia409347f3aeb9ad7a5e68da7af727adfac98d6a2 Reviewed-on: https://gerrit.libreoffice.org/60833 Reviewed-by: Eike Rathke <[email protected]> Tested-by: Jenkins (cherry picked from commit 7ea5d339dc4d8412f436f3affa589bfbd0b1ef68) (cherry picked from commit 3298d3c68fa17b350ef7bec8271fcfc673b5e1a7) diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index df6b88d4dbb9..27a7cb77b4ac 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -241,7 +241,8 @@ public: DBsType m_DBs; ScDBCollection& mrParent; NamedDBs(ScDBCollection& rParent, ScDocument& rDoc); - NamedDBs(const NamedDBs& r); + NamedDBs(const NamedDBs& r, ScDBCollection& rParent); + NamedDBs(const NamedDBs&) = delete; virtual ~NamedDBs() override; NamedDBs & operator=(NamedDBs const&) = delete; void initInserted( ScDBData* p ); diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 1d62a479981b..31c1977ca064 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -1071,9 +1071,9 @@ ScRangeList& ScDBDataContainerBase::GetDirtyTableColumnNames() ScDBCollection::NamedDBs::NamedDBs(ScDBCollection& rParent, ScDocument& rDoc) : ScDBDataContainerBase(rDoc), mrParent(rParent) {} -ScDBCollection::NamedDBs::NamedDBs(const NamedDBs& r) +ScDBCollection::NamedDBs::NamedDBs(const NamedDBs& r, ScDBCollection& rParent) : ScDBDataContainerBase(r.mrDoc) - , mrParent(r.mrParent) + , mrParent(rParent) { for (auto const& it : r.m_DBs) { @@ -1288,7 +1288,7 @@ ScDBCollection::ScDBCollection(ScDocument* pDocument) : pDoc(pDocument), nEntryIndex(1), maNamedDBs(*this, *pDocument) {} ScDBCollection::ScDBCollection(const ScDBCollection& r) : - pDoc(r.pDoc), nEntryIndex(r.nEntryIndex), maNamedDBs(r.maNamedDBs), maAnonDBs(r.maAnonDBs) {} + pDoc(r.pDoc), nEntryIndex(r.nEntryIndex), maNamedDBs(r.maNamedDBs, *this), maAnonDBs(r.maAnonDBs) {} const ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, ScDBDataPortion ePortion) const { commit 40d91027e70518dff8404aaf10fd9830995d9409 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Sep 20 16:03:24 2018 +0100 Commit: Andras Timar <[email protected]> CommitDate: Fri Sep 21 10:53:22 2018 +0200 ofz#10523 guard aginst 0 pF->nLCode Change-Id: I8ef476e06f54ddd57be907488a8a65314abda3ee (cherry picked from commit 108eca19c9043895f26c889c90b3f4081113a3fb) diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 5f334ad3361e..e1031167416a 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -102,7 +102,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, OUString& rStr ) { WW8FormulaEditBox aFormula(*this); - if (rStr[pF->nLCode-1]==0x01) { + if (pF->nLCode && rStr[pF->nLCode-1]==0x01) { ImportFormulaControl(aFormula,pF->nSCode+pF->nLCode-1, WW8_CT_EDIT); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
