diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-10-16 13:25:29 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2023-12-06 01:00:45 +0100 |
| commit | f7d2bbabe818c0fb8634f79c649b71b502081f30 (patch) | |
| tree | 8274c7bf9ad264a5133b36c952a8e1aff4cefcf6 | |
| parent | 3e533861d7613cefc05b6be92ef19d53a2a82e64 (diff) | |
retain Referer information available in OCommonEmbeddedObject ctor
Conflicts:
embeddedobj/source/commonembedding/persistence.cxx
svx/source/unodraw/unoshap4.cxx
Change-Id: I2cb901e81de3b7db73cd2088348ddad46ae603dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158052
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
(cherry picked from commit 267be127f2899f2e1b1f15b5a06707a9b83fcab4)
| -rw-r--r-- | embeddedobj/source/commonembedding/persistence.cxx | 2 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshap4.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index f162dfef5f31..f5e7bcdd09e4 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -75,7 +75,7 @@ uno::Sequence< beans::PropertyValue > GetValuableArgs_Impl( const uno::Sequence< || aMedDescr[nInd].Name == "StartPresentation" || aMedDescr[nInd].Name == "RepairPackage" || aMedDescr[nInd].Name == "StatusIndicator" || aMedDescr[nInd].Name == "ViewData" || aMedDescr[nInd].Name == "ViewId" || aMedDescr[nInd].Name == "MacroExecutionMode" - || aMedDescr[nInd].Name == "UpdateDocMode" + || aMedDescr[nInd].Name == "UpdateDocMode" || aMedDescr[nInd].Name == "Referer" || (aMedDescr[nInd].Name == "DocumentBaseURL" && bCanUseDocumentBaseURL) ) { aResult.realloc( ++nResLen ); diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 8765aa737a57..0a4f5055ee02 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -481,7 +481,7 @@ void SvxOle2Shape::createLink( const OUString& aLinkURL ) awt::Size aSz = xObj->getVisualAreaSize( pOle2Obj->GetAspect() ); aRect.SetSize( Size( aSz.Width, aSz.Height ) ); } - catch( embed::NoVisualAreaSizeException& ) + catch( const uno::Exception& ) {} pOle2Obj->SetLogicRect( aRect ); } |