sd/source/ui/app/sdmod1.cxx | 6 +++---
sd/source/ui/table/tableobjectbar.cxx | 6 +++---
svx/source/sdr/contact/viewobjectcontact.cxx | 4 +++-
3 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit d1b0dbcbd7016fea59b4a509d95045f643b9eeec
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri May 26 08:17:07 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri May 26 10:57:13 2023 +0200
sal_uLong->sal_uInt16
Change-Id: I5e62c090978cabe3cc9b065fdd2b0e2a235557f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152293
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 573ee853069b..881d5aa1eefd 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -77,7 +77,7 @@ private:
void SdModule::Execute(SfxRequest& rReq)
{
const SfxItemSet* pSet = rReq.GetArgs();
- sal_uLong nSlotId = rReq.GetSlot();
+ sal_uInt16 nSlotId = rReq.GetSlot();
switch ( nSlotId )
{
@@ -160,9 +160,9 @@ void SdModule::Execute(SfxRequest& rReq)
LanguageType eLanguage = static_cast<const
SvxLanguageItem*>(pItem)->GetValue();
SdDrawDocument* pDoc = pDocSh->GetDoc();
- if( nSlotId == sal_uInt16(SID_ATTR_CHAR_CJK_LANGUAGE) )
+ if( nSlotId == SID_ATTR_CHAR_CJK_LANGUAGE )
pDoc->SetLanguage( eLanguage, EE_CHAR_LANGUAGE_CJK );
- else if( nSlotId == sal_uInt16(SID_ATTR_CHAR_CTL_LANGUAGE)
)
+ else if( nSlotId == SID_ATTR_CHAR_CTL_LANGUAGE )
pDoc->SetLanguage( eLanguage, EE_CHAR_LANGUAGE_CTL );
else
pDoc->SetLanguage( eLanguage, EE_CHAR_LANGUAGE );
diff --git a/sd/source/ui/table/tableobjectbar.cxx
b/sd/source/ui/table/tableobjectbar.cxx
index 62d81d9805df..6dfd86928530 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -116,7 +116,7 @@ void TableObjectBar::Execute( SfxRequest& rReq )
SfxBindings* pBindings = &mpViewSh->GetViewFrame()->GetBindings();
rtl::Reference< sdr::SelectionController > xController(
mpView->getSelectionController() );
- sal_uLong nSlotId = rReq.GetSlot();
+ sal_uInt16 nSlotId = rReq.GetSlot();
if( xController.is() )
{
switch( nSlotId )
@@ -160,10 +160,10 @@ void TableObjectBar::Execute( SfxRequest& rReq )
else
nSlotId = SID_TABLE_INSERT_COL;
- rReq.AppendItem(SfxInt16Item(static_cast<sal_uInt16>(nSlotId),
nCount));
+ rReq.AppendItem(SfxInt16Item(nSlotId, nCount));
rReq.AppendItem(SfxBoolItem(SID_TABLE_PARAM_INSERT_AFTER,
bInsertAfter));
- rReq.SetSlot( static_cast<sal_uInt16>(nSlotId) );
+ rReq.SetSlot( nSlotId );
}
}
commit 8061cd765c7854667550d6aafda5832715648876
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu May 25 19:43:56 2023 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri May 26 10:57:03 2023 +0200
tdf#155436 svx: PDF export: fix crash on SdrMediaObj without URL
Both sw and sd don't call CreateScreen() if there is no URL.
(regression from commit e84b310b59825fd572d79def98c3d21566aac603)
Change-Id: I087511bb6ed41b0e39321f6ca8684f60261f01cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152282
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx
b/svx/source/sdr/contact/viewobjectcontact.cxx
index 00f30f4248c5..fb6f0fc73ff1 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -31,6 +31,7 @@
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
#include <drawinglayer/primitive2d/structuretagprimitive2d.hxx>
#include <svx/svdobj.hxx>
+#include <svx/svdomedia.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdotext.hxx>
@@ -433,7 +434,8 @@ drawinglayer::primitive2d::Primitive2DContainer const &
ViewObjectContact::getPr
}
::std::vector<sal_Int32> annotIds;
- if (eElement == vcl::PDFWriter::Annot)
+ if (eElement == vcl::PDFWriter::Annot
+ &&
!static_cast<SdrMediaObj*>(pSdrObj)->getURL().isEmpty())
{
auto const
pPDFExtOutDevData(GetObjectContact().GetPDFExtOutDevData());
assert(pPDFExtOutDevData);
