sd/sdi/sdraw.sdi | 2 +-
sd/source/ui/view/viewshe3.cxx | 2 +-
sw/source/core/text/itradj.cxx | 17 +++++++++++++++++
3 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit c00c95aa73144f005a287cb53b4e98db0219c305
Author: Gülşah Köse <gulsahk...@collabora.com>
AuthorDate: Tue Aug 20 15:11:00 2024 +0300
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu Aug 22 09:15:13 2024 +0200
ONLINE: Insert slide to specific position
Online was appending new slides at the end.
With this change we can handle position argument.
Signed-off-by: Gülşah Köse <gulsah.k...@collabora.com>
Change-Id: I8d5ff041b7dc4c4bbe6bcfe43d842f8ca87ae2e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172113
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index a765a1fd943d..bfc38f92e51d 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -2196,7 +2196,7 @@ SfxVoidItem InsertLayer SID_INSERTLAYER
]
SfxVoidItem InsertPage SID_INSERTPAGE
-(SfxStringItem PageName ID_VAL_PAGENAME,SfxUInt32Item WhatLayout
ID_VAL_WHATLAYOUT,SfxBoolItem IsPageBack ID_VAL_ISPAGEBACK,SfxBoolItem
IsPageObj ID_VAL_ISPAGEOBJ)
+(SfxStringItem PageName ID_VAL_PAGENAME,SfxUInt32Item WhatLayout
ID_VAL_WHATLAYOUT,SfxBoolItem IsPageBack ID_VAL_ISPAGEBACK,SfxBoolItem
IsPageObj ID_VAL_ISPAGEOBJ,SfxUInt16Item InsertPos ID_INSERT_POS)
[
AutoUpdate = FALSE,
FastCall = FALSE,
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 31383ea7d560..45b6e99cb091 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -344,7 +344,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
eNotesLayout,
bIsPageBack,
bIsPageObj,
- nInsertPosition);
+ pInsertPos ? (pInsertPos->GetValue()*2)+1 :
nInsertPosition);
break;
case SID_DUPLICATE_PAGE:
commit 6b857398a59d16308d6185d01e003e401439f060
Author: László Németh <nem...@numbertext.org>
AuthorDate: Wed Aug 21 23:14:22 2024 +0200
Commit: László Németh <nem...@numbertext.org>
CommitDate: Thu Aug 22 09:15:08 2024 +0200
tdf#162109 sw smart justify: fix overhanging last line
Last line of justified paragraphs is excluded from justification
normally, but not in the case, where it fits only with shrinking
spaces. This line was overhanging because of the missing
justification and space shrinking.
Regression from commit 17eaebee279772b6062ae3448012133897fc71bb
"tdf#119908 sw smart justify: fix justification by shrinking".
Change-Id: I83ac8562b46999d7fd676d737bed0b9c141a89b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172228
Tested-by: Jenkins
Reviewed-by: László Németh <nem...@numbertext.org>
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index 1a49b9aa8819..e93ece45ce29 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -47,6 +47,23 @@ void SwTextAdjuster::FormatBlock( )
bool bSkip = !IsLastBlock() &&
m_nStart + m_pCurr->GetLen() >=
TextFrameIndex(GetInfo().GetText().getLength());
+ // tdf#162109 if the last line is longer, than the paragraph width,
+ // it contains shrinking spaces: don't skip block format here
+ if( bSkip )
+ {
+ // sum width of the text portions to calculate the line width without
shrinking
+ tools::Long nBreakWidth = 0;
+ const SwLinePortion *pPos = m_pCurr->GetNextPortion();
+ while( pPos && bSkip )
+ {
+ if( !pPos->InGlueGrp() )
+ nBreakWidth += pPos->Width();
+ if( nBreakWidth > m_pCurr->Width() )
+ bSkip = false;
+ pPos = pPos->GetNextPortion();
+ }
+ }
+
// Multi-line fields are tricky, because we need to check whether there are
// any other text portions in the paragraph.
if( bSkip )
