core.git: Branch 'distro/collabora/co-23.05' - sc/source
sc/source/ui/view/gridwin4.cxx | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
New commits:
commit fe8f91884b75ec9aca3628ec2db45ee32f01
Author: Pranam Lashkari
AuthorDate: Wed May 29 23:32:34 2024 +0300
Commit: Caolán McNamara
CommitDate: Fri May 31 16:49:57 2024 +0200
LOK: bound provider can give tile indexes in reverse order after undo
make sure we know correct top left and bottom right index and corrdinates
Change-Id: I9277443f9c4d2e8d7d489d09071a3709316ceec0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168234
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index d487afb9db03..13ad72e720b9 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1380,10 +1380,21 @@ namespace
aBoundsProvider.GetStartIndexAndPosition(nStartIndex, nStartPosPx);
++nStartIndex;
aBoundsProvider.GetEndIndexAndPosition(nEndIndex, nEndPosPx);
-nTopLeftTileOffset = nTileStartPosPx - nStartPosPx;
-nTopLeftTileOrigin = nStartPosPx;
-nTopLeftTileIndex = nStartIndex;
-nBottomRightTileIndex = nEndIndex;
+bool reverse = nStartIndex > nEndIndex;
+if (reverse)
+{
+nTopLeftTileOffset = nTileEndPosPx - nEndPosPx;
+nTopLeftTileOrigin = nEndPosPx;
+nTopLeftTileIndex = nEndIndex;
+nBottomRightTileIndex = nStartIndex;
+}
+else {
+nTopLeftTileOffset = nTileStartPosPx - nStartPosPx;
+nTopLeftTileOrigin = nStartPosPx;
+nTopLeftTileIndex = nStartIndex;
+nBottomRightTileIndex = nEndIndex;
+}
+
}
void lcl_RTLAdjustTileColOffset(ScViewData& rViewData, sal_Int32&
nTileColOffset,
core.git: Branch 'distro/collabora/co-23.05' - sw/inc sw/source
sw/inc/PostItMgr.hxx |1 +
sw/source/uibase/docvw/AnnotationWin.cxx |9 ++---
sw/source/uibase/docvw/AnnotationWin2.cxx | 22 --
sw/source/uibase/docvw/PostItMgr.cxx |5 +
4 files changed, 32 insertions(+), 5 deletions(-)
New commits:
commit ff43f55e698292753bfdd511874a4a1405e81d7c
Author: Pranam Lashkari
AuthorDate: Wed May 22 11:57:57 2024 +0100
Commit: Caolán McNamara
CommitDate: Fri May 31 09:29:03 2024 +0200
create comment reply synchronously
so we can bundle the creation of the comment and the insertion
of its "reply" characteristics together as a single Undo group.
wrap the new combination with a single undo operation showing "Insert
Comment" using Rewriter
Change-Id: I5927fa5501da0c49cc1182c60e23be290b8c37c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168171
Reviewed-by: Caolán McNamara
Tested-by: Jenkins CollaboraOffice
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168236
Reviewed-by: Pranam Lashkari
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index f66e38748a64..5a877a6c8afe 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -233,6 +233,7 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public
SfxListener
sw::annotation::SwAnnotationWin* GetNextPostIt( sal_uInt16 aDirection,
sw::annotation::SwAnnotationWin* aPostIt);
SwPostItField* GetLatestPostItField();
+sw::annotation::SwAnnotationWin*
GetOrCreateAnnotationWindowForLatestPostItField();
tools::Long GetNextBorder();
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx
b/sw/source/uibase/docvw/AnnotationWin.cxx
index 16acc0cbf589..adc487422466 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -119,9 +119,12 @@ SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin,
}
#if !ENABLE_WASM_STRIP_ACCESSIBILITY
-mrMgr.ConnectSidebarWinToFrame(
*(mrSidebarItem.maLayoutInfo.mpAnchorFrame),
- mrSidebarItem.GetFormatField(),
- *this );
+if (rSidebarItem.maLayoutInfo.mpAnchorFrame)
+{
+mrMgr.ConnectSidebarWinToFrame(
*(rSidebarItem.maLayoutInfo.mpAnchorFrame),
+ mrSidebarItem.GetFormatField(),
+ *this );
+}
#endif
if (SupportsDoubleBuffering())
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx
b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 4de72ca4d270..ef7300ad8314 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -1101,6 +1101,7 @@ void SwAnnotationWin::ExecuteCommand(sal_uInt16 nSlot)
case FN_POSTIT:
case FN_REPLY:
{
+const bool bReply = nSlot == FN_REPLY;
// if this note is empty, it will be deleted once losing the
focus, so no reply, but only a new note
// will be created
if (!mpOutliner->GetEditEngine().GetText().isEmpty())
@@ -,9 +1112,15 @@ void SwAnnotationWin::ExecuteCommand(sal_uInt16 nSlot)
if (mrMgr.HasActiveSidebarWin())
mrMgr.SetActiveSidebarWin(nullptr);
SwitchToFieldPos();
+
+SwDocShell* pShell = mrView.GetDocShell();
+if (bReply)
+
pShell->GetDoc()->GetIDocumentUndoRedo().StartUndo(SwUndoId::INSERT, nullptr);
+
+// synchronous dispatch
mrView.GetViewFrame()->GetDispatcher()->Execute(FN_POSTIT);
-if (nSlot == FN_REPLY)
+if (bReply)
{
// Get newly created SwPostItField and set its paraIdParent
auto pPostItField = mrMgr.GetLatestPostItField();
@@ -1121,6 +1128,16 @@ void SwAnnotationWin::ExecuteCommand(sal_uInt16 nSlot)
pPostItField->SetParentPostItId(GetTopReplyNote()->GetPostItField()->GetPostItId());
this->GeneratePostItName();
pPostItField->SetParentName(GetTopReplyNote()->GetPostItField()->GetName());
+
+// In this case, force generating the associated window
+// synchronously so we can bundle its use of the registered
+// "Answer" into the same undo group that the synchronous
+// FN_POSTIT was put in
+mrMgr.GetOrCreateAnnotationWindowForLatestPostItField();
+
+SwRewriter aRewriter;
+aRewriter.AddRule(UndoArg1, pPostItField->GetDescription());
+
pShell->GetDoc()->GetIDocumentUndoRedo().EndUndo(SwUndoId::INSERT, );
}
break;
}
@@ -1461,7 +1478,7 @@ void SwAnnotationWin::ChangeSidebarItem( SwSidebarItem
const & rSidebarItem )
{
#if !ENABLE_WASM_STRIP_ACCESSIBILITY
const bool
core.git: sw/inc sw/source
sw/inc/PostItMgr.hxx |1 +
sw/source/uibase/docvw/AnnotationWin2.cxx | 22 +-
sw/source/uibase/docvw/PostItMgr.cxx |5 +
3 files changed, 27 insertions(+), 1 deletion(-)
New commits:
commit 124a988ea99096ea5080060c0d1a801528bd7a5c
Author: Pranam Lashkari
AuthorDate: Wed May 22 11:57:57 2024 +0100
Commit: Caolán McNamara
CommitDate: Wed May 29 14:24:31 2024 +0200
create comment reply synchronously
so we can bundle the creation of the comment and the insertion
of its "reply" characteristics together as a single Undo group.
wrap the new combination with a single undo operation showing "Insert
Comment" using Rewriter
Change-Id: I5927fa5501da0c49cc1182c60e23be290b8c37c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168190
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 1a6dac4a8f62..e2922a045a1c 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -195,6 +195,7 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public
SfxListener
sw::annotation::SwAnnotationWin* GetNextPostIt( sal_uInt16 aDirection,
sw::annotation::SwAnnotationWin* aPostIt);
SwPostItField* GetLatestPostItField();
+sw::annotation::SwAnnotationWin*
GetOrCreateAnnotationWindowForLatestPostItField();
tools::Long GetNextBorder();
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx
b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 75edfe80edb2..a20255f1c37b 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -1053,6 +1053,7 @@ void SwAnnotationWin::ExecuteCommand(sal_uInt16 nSlot)
case FN_POSTIT:
case FN_REPLY:
{
+const bool bReply = nSlot == FN_REPLY;
// if this note is empty, it will be deleted once losing the
focus, so no reply, but only a new note
// will be created
if (!mpOutliner->GetEditEngine().GetText().isEmpty())
@@ -1063,16 +1064,35 @@ void SwAnnotationWin::ExecuteCommand(sal_uInt16 nSlot)
if (mrMgr.HasActiveSidebarWin())
mrMgr.SetActiveSidebarWin(nullptr);
SwitchToFieldPos();
+
+SwDocShell* pShell = mrView.GetDocShell();
+if (bReply)
+
pShell->GetDoc()->GetIDocumentUndoRedo().StartUndo(SwUndoId::START, nullptr);
+
+// synchronous dispatch
mrView.GetViewFrame().GetDispatcher()->Execute(FN_POSTIT);
-if (nSlot == FN_REPLY)
+if (bReply)
{
+SwUndoId nUndoId(SwUndoId::END);
+mrView.GetWrtShell().GetLastUndoInfo(nullptr, );
+
// Get newly created SwPostItField and set its paraIdParent
auto pPostItField = mrMgr.GetLatestPostItField();
pPostItField->SetParentId(GetTopReplyNote()->GetParaId());
pPostItField->SetParentPostItId(GetTopReplyNote()->GetPostItField()->GetPostItId());
this->GeneratePostItName();
pPostItField->SetParentName(GetTopReplyNote()->GetPostItField()->GetName());
+
+// In this case, force generating the associated window
+// synchronously so we can bundle its use of the registered
+// "Answer" into the same undo group that the synchronous
+// FN_POSTIT was put in
+mrMgr.GetOrCreateAnnotationWindowForLatestPostItField();
+
+SwRewriter aRewriter;
+aRewriter.AddRule(UndoArg1, pPostItField->GetDescription());
+pShell->GetDoc()->GetIDocumentUndoRedo().EndUndo(nUndoId,
);
}
break;
}
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx
b/sw/source/uibase/docvw/PostItMgr.cxx
index ebd1223c586d..afb2238c3a04 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -1858,6 +1858,11 @@ SwPostItField* SwPostItMgr::GetLatestPostItField()
return
static_cast(mvPostItFields.back()->GetFormatField().GetField());
}
+sw::annotation::SwAnnotationWin*
SwPostItMgr::GetOrCreateAnnotationWindowForLatestPostItField()
+{
+return GetOrCreateAnnotationWindow(*mvPostItFields.back());
+}
+
SwAnnotationWin* SwPostItMgr::GetNextPostIt( sal_uInt16 aDirection,
SwAnnotationWin* aPostIt )
{
core.git: Branch 'distro/collabora/co-24.04' - sw/inc sw/source
sw/inc/PostItMgr.hxx |1 +
sw/source/uibase/docvw/AnnotationWin2.cxx | 22 +-
sw/source/uibase/docvw/PostItMgr.cxx |5 +
3 files changed, 27 insertions(+), 1 deletion(-)
New commits:
commit 928d0ffc25b95306d94911e4212f5dca1d15256e
Author: Pranam Lashkari
AuthorDate: Wed May 22 11:57:57 2024 +0100
Commit: Caolán McNamara
CommitDate: Wed May 29 12:21:54 2024 +0200
create comment reply synchronously
so we can bundle the creation of the comment and the insertion
of its "reply" characteristics together as a single Undo group.
wrap the new combination with a single undo operation showing "Insert
Comment" using Rewriter
Change-Id: I5927fa5501da0c49cc1182c60e23be290b8c37c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168171
Reviewed-by: Caolán McNamara
Tested-by: Jenkins CollaboraOffice
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index f66e38748a64..5a877a6c8afe 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -233,6 +233,7 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public
SfxListener
sw::annotation::SwAnnotationWin* GetNextPostIt( sal_uInt16 aDirection,
sw::annotation::SwAnnotationWin* aPostIt);
SwPostItField* GetLatestPostItField();
+sw::annotation::SwAnnotationWin*
GetOrCreateAnnotationWindowForLatestPostItField();
tools::Long GetNextBorder();
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx
b/sw/source/uibase/docvw/AnnotationWin2.cxx
index a5e332ef4346..a1f6e5794f1a 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -1049,6 +1049,7 @@ void SwAnnotationWin::ExecuteCommand(sal_uInt16 nSlot)
case FN_POSTIT:
case FN_REPLY:
{
+const bool bReply = nSlot == FN_REPLY;
// if this note is empty, it will be deleted once losing the
focus, so no reply, but only a new note
// will be created
if (!mpOutliner->GetEditEngine().GetText().isEmpty())
@@ -1059,16 +1060,35 @@ void SwAnnotationWin::ExecuteCommand(sal_uInt16 nSlot)
if (mrMgr.HasActiveSidebarWin())
mrMgr.SetActiveSidebarWin(nullptr);
SwitchToFieldPos();
+
+SwDocShell* pShell = mrView.GetDocShell();
+if (bReply)
+
pShell->GetDoc()->GetIDocumentUndoRedo().StartUndo(SwUndoId::START, nullptr);
+
+// synchronous dispatch
mrView.GetViewFrame().GetDispatcher()->Execute(FN_POSTIT);
-if (nSlot == FN_REPLY)
+if (bReply)
{
+SwUndoId nUndoId(SwUndoId::END);
+mrView.GetWrtShell().GetLastUndoInfo(nullptr, );
+
// Get newly created SwPostItField and set its paraIdParent
auto pPostItField = mrMgr.GetLatestPostItField();
pPostItField->SetParentId(GetTopReplyNote()->GetParaId());
pPostItField->SetParentPostItId(GetTopReplyNote()->GetPostItField()->GetPostItId());
this->GeneratePostItName();
pPostItField->SetParentName(GetTopReplyNote()->GetPostItField()->GetName());
+
+// In this case, force generating the associated window
+// synchronously so we can bundle its use of the registered
+// "Answer" into the same undo group that the synchronous
+// FN_POSTIT was put in
+mrMgr.GetOrCreateAnnotationWindowForLatestPostItField();
+
+SwRewriter aRewriter;
+aRewriter.AddRule(UndoArg1, pPostItField->GetDescription());
+pShell->GetDoc()->GetIDocumentUndoRedo().EndUndo(nUndoId,
);
}
break;
}
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx
b/sw/source/uibase/docvw/PostItMgr.cxx
index 0b74e9902f0b..f712188bcba2 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -1854,6 +1854,11 @@ SwPostItField* SwPostItMgr::GetLatestPostItField()
return
static_cast(mvPostItFields.back()->GetFormatField().GetField());
}
+sw::annotation::SwAnnotationWin*
SwPostItMgr::GetOrCreateAnnotationWindowForLatestPostItField()
+{
+return GetOrCreateAnnotationWindow(*mvPostItFields.back());
+}
+
SwAnnotationWin* SwPostItMgr::GetNextPostIt( sal_uInt16 aDirection,
SwAnnotationWin* aPostIt )
{
core.git: Branch 'distro/collabora/co-23.05' - sw/source
sw/source/uibase/docvw/AnnotationWin2.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit fbdd2299a470f852a7c066d878c6a3b586f952a9 Author: Pranam Lashkari AuthorDate: Wed May 15 23:08:23 2024 +0300 Commit: Pranam Lashkari CommitDate: Thu May 23 17:06:27 2024 +0200 Added parent / child relationship to comments. Adding parent name of a comment into odf file when there is a parent. problem: adding reply to any comment, saving and reopening doc will not show reply in same thread. regression from: c0187d9f5e6ab5129b6fc4682555f2f8775d6f67 this part affects core only, similar thing online was done in 62cc2217217650d23c72e4646ccd793f76722d94 Change-Id: I563e3a2785543da69d717f8770f91a514699e604 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167711 Reviewed-by: Gökay ŞATIR Tested-by: Jenkins CollaboraOffice (cherry picked from commit 2a040bfe3e9f58db5c9f6503796778f07e2beba9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167934 Reviewed-by: Pranam Lashkari diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index c5ca676895c0..4de72ca4d270 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -1119,6 +1119,7 @@ void SwAnnotationWin::ExecuteCommand(sal_uInt16 nSlot) auto pPostItField = mrMgr.GetLatestPostItField(); pPostItField->SetParentId(GetTopReplyNote()->GetParaId()); pPostItField->SetParentPostItId(GetTopReplyNote()->GetPostItField()->GetPostItId()); +this->GeneratePostItName(); pPostItField->SetParentName(GetTopReplyNote()->GetPostItField()->GetName()); } break;
core.git: sc/source
sc/source/core/data/table1.cxx | 27 ++-
1 file changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 66f968242ecb17ea82d72ca6198aeec4aa865f05
Author: Pranam Lashkari
AuthorDate: Tue May 21 05:56:18 2024 +0300
Commit: Pranam Lashkari
CommitDate: Tue May 21 22:43:38 2024 +0200
sc: LOK: invalidate sheet geometry on row height changes
sometimes if undo/redeo affected row heights (i.e: undo an autofill)
sheet geometry was not updated in LOK
Change-Id: I995d23752712f6baf3c348f6fe5fb292f7c9043b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167878
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
(cherry picked from commit bb605f31f92eeeca292824931ef0e8d1db750702)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167828
Reviewed-by: Pranam Lashkari
Tested-by: Jenkins
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index c7539a154204..f90c4a73e011 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -52,6 +52,7 @@
#include
#include
#include
+#include
#include
#include
@@ -489,6 +490,18 @@ bool ScTable::SetOptimalHeight(
mpRowHeights->enableTreeSearch(true);
+if (bChanged)
+{
+if (ScViewData* pViewData = ScDocShell::GetViewData())
+{
+ScTabViewShell::notifyAllViewsSheetGeomInvalidation(
+pViewData->GetViewShell(),
+false /* bColsAffected */, true /* bRowsAffected */,
+true /* bSizes*/, false /* bHidden */, false /* bFiltered */,
+false /* bGroups */, nTab);
+}
+}
+
return bChanged;
}
@@ -510,10 +523,22 @@ void ScTable::SetOptimalHeightOnly(
SetRowHeightOnlyFunc aFunc(this);
-SetOptimalHeightsToRows(rCxt, aFunc, pRowFlags.get(), nStartRow, nEndRow,
true);
+bool bChanged = SetOptimalHeightsToRows(rCxt, aFunc, pRowFlags.get(),
nStartRow, nEndRow, true);
if ( pProgress != pOuterProgress )
delete pProgress;
+
+if (bChanged)
+{
+if (ScViewData* pViewData = ScDocShell::GetViewData())
+{
+ScTabViewShell::notifyAllViewsSheetGeomInvalidation(
+pViewData->GetViewShell(),
+false /* bColsAffected */, true /* bRowsAffected */,
+true /* bSizes*/, false /* bHidden */, false /* bFiltered */,
+false /* bGroups */, nTab);
+}
+}
}
bool ScTable::GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const
core.git: Branch 'distro/collabora/co-23.05' - sc/source
sc/source/core/data/table1.cxx | 27 ++-
1 file changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 6a2bb433a0367f91ac7e4867d3988a77db4b7ad6
Author: Pranam Lashkari
AuthorDate: Tue May 21 05:56:18 2024 +0300
Commit: Pranam Lashkari
CommitDate: Tue May 21 18:02:03 2024 +0200
sc: LOK: invalidate sheet geometry on row height changes
sometimes if undo/redeo affected row heights (i.e: undo an autofill)
sheet geometry was not updated in LOK
Change-Id: I995d23752712f6baf3c348f6fe5fb292f7c9043b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167878
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
(cherry picked from commit bb605f31f92eeeca292824931ef0e8d1db750702)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167829
Reviewed-by: Pranam Lashkari
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 9064c5241acf..a2a577bf4e60 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -48,6 +48,7 @@
#include
#include
#include
+#include
#include
#include
@@ -487,6 +488,18 @@ bool ScTable::SetOptimalHeight(
mpRowHeights->enableTreeSearch(true);
+if (bChanged)
+{
+if (ScViewData* pViewData = ScDocShell::GetViewData())
+{
+ScTabViewShell::notifyAllViewsSheetGeomInvalidation(
+pViewData->GetViewShell(),
+false /* bColsAffected */, true /* bRowsAffected */,
+true /* bSizes*/, false /* bHidden */, false /* bFiltered */,
+false /* bGroups */, nTab);
+}
+}
+
return bChanged;
}
@@ -508,10 +521,22 @@ void ScTable::SetOptimalHeightOnly(
SetRowHeightOnlyFunc aFunc(this);
-SetOptimalHeightsToRows(rCxt, aFunc, pRowFlags.get(), nStartRow, nEndRow,
true);
+bool bChanged = SetOptimalHeightsToRows(rCxt, aFunc, pRowFlags.get(),
nStartRow, nEndRow, true);
if ( pProgress != pOuterProgress )
delete pProgress;
+
+if (bChanged)
+{
+if (ScViewData* pViewData = ScDocShell::GetViewData())
+{
+ScTabViewShell::notifyAllViewsSheetGeomInvalidation(
+pViewData->GetViewShell(),
+false /* bColsAffected */, true /* bRowsAffected */,
+true /* bSizes*/, false /* bHidden */, false /* bFiltered */,
+false /* bGroups */, nTab);
+}
+}
}
bool ScTable::GetCellArea( SCCOL& rEndCol, SCROW& rEndRow )
core.git: Branch 'distro/collabora/co-24.04' - sc/source
sc/source/core/data/table1.cxx | 27 ++-
1 file changed, 26 insertions(+), 1 deletion(-)
New commits:
commit bb605f31f92eeeca292824931ef0e8d1db750702
Author: Pranam Lashkari
AuthorDate: Tue May 21 05:56:18 2024 +0300
Commit: Caolán McNamara
CommitDate: Tue May 21 12:25:35 2024 +0200
sc: LOK: invalidate sheet geometry on row height changes
sometimes if undo/redeo affected row heights (i.e: undo an autofill)
sheet geometry was not updated in LOK
Change-Id: I995d23752712f6baf3c348f6fe5fb292f7c9043b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167878
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 4df5d92ec5e5..b1bb083c3f0d 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -51,6 +51,7 @@
#include
#include
#include
+#include
#include
#include
@@ -488,6 +489,18 @@ bool ScTable::SetOptimalHeight(
mpRowHeights->enableTreeSearch(true);
+if (bChanged)
+{
+if (ScViewData* pViewData = ScDocShell::GetViewData())
+{
+ScTabViewShell::notifyAllViewsSheetGeomInvalidation(
+pViewData->GetViewShell(),
+false /* bColsAffected */, true /* bRowsAffected */,
+true /* bSizes*/, false /* bHidden */, false /* bFiltered */,
+false /* bGroups */, nTab);
+}
+}
+
return bChanged;
}
@@ -509,10 +522,22 @@ void ScTable::SetOptimalHeightOnly(
SetRowHeightOnlyFunc aFunc(this);
-SetOptimalHeightsToRows(rCxt, aFunc, pRowFlags.get(), nStartRow, nEndRow,
true);
+bool bChanged = SetOptimalHeightsToRows(rCxt, aFunc, pRowFlags.get(),
nStartRow, nEndRow, true);
if ( pProgress != pOuterProgress )
delete pProgress;
+
+if (bChanged)
+{
+if (ScViewData* pViewData = ScDocShell::GetViewData())
+{
+ScTabViewShell::notifyAllViewsSheetGeomInvalidation(
+pViewData->GetViewShell(),
+false /* bColsAffected */, true /* bRowsAffected */,
+true /* bSizes*/, false /* bHidden */, false /* bFiltered */,
+false /* bGroups */, nTab);
+}
+}
}
bool ScTable::GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const
core.git: sw/source
sw/source/uibase/docvw/AnnotationWin2.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 45e0c28a6911ef19c8c11e0195c6f01362d53611 Author: Pranam Lashkari AuthorDate: Wed May 15 23:08:23 2024 +0300 Commit: Caolán McNamara CommitDate: Fri May 17 12:05:40 2024 +0200 Added parent / child relationship to comments. Adding parent name of a comment into odf file when there is a parent. problem: adding reply to any comment, saving and reopening doc will not show reply in same thread. regression from: c0187d9f5e6ab5129b6fc4682555f2f8775d6f67 this part affects core only, similar thing online was done in 62cc2217217650d23c72e4646ccd793f76722d94 Change-Id: I563e3a2785543da69d717f8770f91a514699e604 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167711 Reviewed-by: Gökay ŞATIR Tested-by: Jenkins CollaboraOffice (cherry picked from commit 2a040bfe3e9f58db5c9f6503796778f07e2beba9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167680 Reviewed-by: Caolán McNamara Tested-by: Jenkins diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index e831ed55f182..75edfe80edb2 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -1071,6 +1071,7 @@ void SwAnnotationWin::ExecuteCommand(sal_uInt16 nSlot) auto pPostItField = mrMgr.GetLatestPostItField(); pPostItField->SetParentId(GetTopReplyNote()->GetParaId()); pPostItField->SetParentPostItId(GetTopReplyNote()->GetPostItField()->GetPostItId()); +this->GeneratePostItName(); pPostItField->SetParentName(GetTopReplyNote()->GetPostItField()->GetName()); } break;
core.git: Branch 'distro/collabora/co-24.04' - sw/source
sw/source/uibase/docvw/AnnotationWin2.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 2a040bfe3e9f58db5c9f6503796778f07e2beba9 Author: Pranam Lashkari AuthorDate: Wed May 15 23:08:23 2024 +0300 Commit: Pranam Lashkari CommitDate: Thu May 16 18:35:43 2024 +0200 Added parent / child relationship to comments. Adding parent name of a comment into odf file when there is a parent. problem: adding reply to any comment, saving and reopening doc will not show reply in same thread. regression from: c0187d9f5e6ab5129b6fc4682555f2f8775d6f67 this part affects core only, similar thing online was done in 62cc2217217650d23c72e4646ccd793f76722d94 Change-Id: I563e3a2785543da69d717f8770f91a514699e604 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167711 Reviewed-by: Gökay ŞATIR Tested-by: Jenkins CollaboraOffice diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index 6b8895f1d9d2..a5e332ef4346 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -1067,6 +1067,7 @@ void SwAnnotationWin::ExecuteCommand(sal_uInt16 nSlot) auto pPostItField = mrMgr.GetLatestPostItField(); pPostItField->SetParentId(GetTopReplyNote()->GetParaId()); pPostItField->SetParentPostItId(GetTopReplyNote()->GetPostItField()->GetPostItId()); +this->GeneratePostItName(); pPostItField->SetParentName(GetTopReplyNote()->GetPostItField()->GetName()); } break;
core.git: Branch 'distro/collabora/co-23.05' - sc/source
sc/source/ui/undo/undobase.cxx | 23 ---
1 file changed, 16 insertions(+), 7 deletions(-)
New commits:
commit 6d2f14936040a60909ec0815f39b2622411bd4ee
Author: Pranam Lashkari
AuthorDate: Fri May 10 02:02:18 2024 +0300
Commit: Pranam Lashkari
CommitDate: Mon May 13 17:41:23 2024 +0200
sc: undo: unify height adjust logic in undo with regular logic
in ScBlockUndo::AdjustHeight now we use device like
ScViewFunc::SetWidthOrHeight
This provides unified behavior with user adjusting height or triggered it
by undo
problem:
in online sometimes undoing would cause wrong selection due to incorrect
height set
steps to reproduce(happened in certain files only):
1. autofill down a couple of cells
2. undo it
3. try to select the same cell again
cell selection will act like auto filled cells are merged cells
Change-Id: I81b798c4150284792ac3953caf822fefab0ccee2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167424
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
(cherry picked from commit 726b133fd8c823c7f05a30c1995de26db372174d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167455
Reviewed-by: Pranam Lashkari
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index c9a233604281..9c7f5571dd71 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
ScSimpleUndo::ScSimpleUndo( ScDocShell* pDocSh ) :
@@ -286,18 +287,26 @@ bool ScBlockUndo::AdjustHeight()
{
ScDocument& rDoc = pDocShell->GetDocument();
-ScopedVclPtrInstance< VirtualDevice > pVirtDev;
+ScSizeDeviceProvider aProv(pDocShell);
Fraction aZoomX( 1, 1 );
Fraction aZoomY = aZoomX;
double nPPTX, nPPTY;
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
{
-ScViewData& rData = pViewShell->GetViewData();
-nPPTX = rData.GetPPTX();
-nPPTY = rData.GetPPTY();
-aZoomX = rData.GetZoomX();
-aZoomY = rData.GetZoomY();
+if (aProv.IsPrinter())
+{
+nPPTX = aProv.GetPPTX();
+nPPTY = aProv.GetPPTY();
+}
+else
+{
+ScViewData& rData = pViewShell->GetViewData();
+nPPTX = rData.GetPPTX();
+nPPTY = rData.GetPPTY();
+aZoomX = rData.GetZoomX();
+aZoomY = rData.GetZoomY();
+}
}
else
{
@@ -306,7 +315,7 @@ bool ScBlockUndo::AdjustHeight()
nPPTY = ScGlobal::nScreenPPTY;
}
-sc::RowHeightContext aCxt(rDoc.MaxRow(), nPPTX, nPPTY, aZoomX, aZoomY,
pVirtDev);
+sc::RowHeightContext aCxt(rDoc.MaxRow(), nPPTX, nPPTY, aZoomX, aZoomY,
aProv.GetDevice());
bool bRet = rDoc.SetOptimalHeight(
aCxt, aBlockRange.aStart.Row(), aBlockRange.aEnd.Row(),
aBlockRange.aStart.Tab(), true);
core.git: sc/source
sc/source/ui/undo/undobase.cxx | 23 ---
1 file changed, 16 insertions(+), 7 deletions(-)
New commits:
commit 2b85bceca88ab119fff5cbdc41fe913435a479ca
Author: Pranam Lashkari
AuthorDate: Fri May 10 02:02:18 2024 +0300
Commit: Pranam Lashkari
CommitDate: Sat May 11 01:48:33 2024 +0200
sc: undo: unify height adjust logic in undo with regular logic
in ScBlockUndo::AdjustHeight now we use device like
ScViewFunc::SetWidthOrHeight
This provides unified behavior with user adjusting height or triggered it
by undo
problem:
in online sometimes undoing would cause wrong selection due to incorrect
height set
steps to reproduce(happened in certain files only):
1. autofill down a couple of cells
2. undo it
3. try to select the same cell again
cell selection will act like auto filled cells are merged cells
Change-Id: I81b798c4150284792ac3953caf822fefab0ccee2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167424
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
(cherry picked from commit 726b133fd8c823c7f05a30c1995de26db372174d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167454
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index 8ce66d95d0c4..a99dec962d89 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
ScSimpleUndo::ScSimpleUndo( ScDocShell* pDocSh ) :
@@ -285,18 +286,26 @@ bool ScBlockUndo::AdjustHeight()
{
ScDocument& rDoc = pDocShell->GetDocument();
-ScopedVclPtrInstance< VirtualDevice > pVirtDev;
+ScSizeDeviceProvider aProv(pDocShell);
Fraction aZoomX( 1, 1 );
Fraction aZoomY = aZoomX;
double nPPTX, nPPTY;
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
{
-ScViewData& rData = pViewShell->GetViewData();
-nPPTX = rData.GetPPTX();
-nPPTY = rData.GetPPTY();
-aZoomX = rData.GetZoomX();
-aZoomY = rData.GetZoomY();
+if (aProv.IsPrinter())
+{
+nPPTX = aProv.GetPPTX();
+nPPTY = aProv.GetPPTY();
+}
+else
+{
+ScViewData& rData = pViewShell->GetViewData();
+nPPTX = rData.GetPPTX();
+nPPTY = rData.GetPPTY();
+aZoomX = rData.GetZoomX();
+aZoomY = rData.GetZoomY();
+}
}
else
{
@@ -305,7 +314,7 @@ bool ScBlockUndo::AdjustHeight()
nPPTY = ScGlobal::nScreenPPTY;
}
-sc::RowHeightContext aCxt(rDoc.MaxRow(), nPPTX, nPPTY, aZoomX, aZoomY,
pVirtDev);
+sc::RowHeightContext aCxt(rDoc.MaxRow(), nPPTX, nPPTY, aZoomX, aZoomY,
aProv.GetDevice());
bool bRet = rDoc.SetOptimalHeight(
aCxt, aBlockRange.aStart.Row(), aBlockRange.aEnd.Row(),
aBlockRange.aStart.Tab(), true);
core.git: Branch 'distro/collabora/co-24.04' - sc/source
sc/source/ui/undo/undobase.cxx | 23 ---
1 file changed, 16 insertions(+), 7 deletions(-)
New commits:
commit 726b133fd8c823c7f05a30c1995de26db372174d
Author: Pranam Lashkari
AuthorDate: Fri May 10 02:02:18 2024 +0300
Commit: Caolán McNamara
CommitDate: Fri May 10 11:09:13 2024 +0200
sc: undo: unify height adjust logic in undo with regular logic
in ScBlockUndo::AdjustHeight now we use device like
ScViewFunc::SetWidthOrHeight
This provides unified behavior with user adjusting height or triggered it
by undo
problem:
in online sometimes undoing would cause wrong selection due to incorrect
height set
steps to reproduce(happened in certain files only):
1. autofill down a couple of cells
2. undo it
3. try to select the same cell again
cell selection will act like auto filled cells are merged cells
Change-Id: I81b798c4150284792ac3953caf822fefab0ccee2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167424
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index c9a233604281..9c7f5571dd71 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
ScSimpleUndo::ScSimpleUndo( ScDocShell* pDocSh ) :
@@ -286,18 +287,26 @@ bool ScBlockUndo::AdjustHeight()
{
ScDocument& rDoc = pDocShell->GetDocument();
-ScopedVclPtrInstance< VirtualDevice > pVirtDev;
+ScSizeDeviceProvider aProv(pDocShell);
Fraction aZoomX( 1, 1 );
Fraction aZoomY = aZoomX;
double nPPTX, nPPTY;
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
{
-ScViewData& rData = pViewShell->GetViewData();
-nPPTX = rData.GetPPTX();
-nPPTY = rData.GetPPTY();
-aZoomX = rData.GetZoomX();
-aZoomY = rData.GetZoomY();
+if (aProv.IsPrinter())
+{
+nPPTX = aProv.GetPPTX();
+nPPTY = aProv.GetPPTY();
+}
+else
+{
+ScViewData& rData = pViewShell->GetViewData();
+nPPTX = rData.GetPPTX();
+nPPTY = rData.GetPPTY();
+aZoomX = rData.GetZoomX();
+aZoomY = rData.GetZoomY();
+}
}
else
{
@@ -306,7 +315,7 @@ bool ScBlockUndo::AdjustHeight()
nPPTY = ScGlobal::nScreenPPTY;
}
-sc::RowHeightContext aCxt(rDoc.MaxRow(), nPPTX, nPPTY, aZoomX, aZoomY,
pVirtDev);
+sc::RowHeightContext aCxt(rDoc.MaxRow(), nPPTX, nPPTY, aZoomX, aZoomY,
aProv.GetDevice());
bool bRet = rDoc.SetOptimalHeight(
aCxt, aBlockRange.aStart.Row(), aBlockRange.aEnd.Row(),
aBlockRange.aStart.Tab(), true);
core.git: sc/source
sc/source/ui/dbgui/scuiasciiopt.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 312740f1ef96ef6fe7e83d5fb1f5d2d4b2d2471c
Author: Pranam Lashkari
AuthorDate: Fri Apr 26 23:51:14 2024 +0100
Commit: Caolán McNamara
CommitDate: Wed May 1 11:03:48 2024 +0200
LOK: hide cancel button in csv import dialog
it did not make any sense to have cancel button in this dialog
because it would not load file at all.
user can still use close button in title bar to close dialog
Change-Id: Id3ba3e4030553db18bdbd068d92b3395f4fb8c3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166764
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
(cherry picked from commit 290d70a476bab7d100baa3568ec547633109033e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166835
(cherry picked from commit 7171c9e8f6fecedac29e89deaeb2afa4d67a2a17)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166844
Reviewed-by: Caolán McNamara
Tested-by: Jenkins
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 6cb73c803c39..22f2867c3545 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -628,6 +628,9 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent,
std::u16string_view aD
mxCkbSkipEmptyCells->set_active(false);
mxCkbSkipEmptyCells->hide();
}
+
+if (comphelper::LibreOfficeKit::isActive())
+m_xBuilder->weld_button("cancel")->hide();
m_xDialog->SetInstallLOKNotifierHdl(LINK(this, ScImportAsciiDlg,
InstallLOKNotifierHdl));
}
core.git: Branch 'distro/collabora/co-23.05' - sc/source
sc/source/ui/dbgui/scuiasciiopt.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 7171c9e8f6fecedac29e89deaeb2afa4d67a2a17
Author: Pranam Lashkari
AuthorDate: Fri Apr 26 23:51:14 2024 +0100
Commit: Szymon Kłos
CommitDate: Mon Apr 29 19:07:31 2024 +0200
LOK: hide cancel button in csv import dialog
it did not make any sense to have cancel button in this dialog
because it would not load file at all.
user can still use close button in title bar to close dialog
Change-Id: Id3ba3e4030553db18bdbd068d92b3395f4fb8c3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166764
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
(cherry picked from commit 290d70a476bab7d100baa3568ec547633109033e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166835
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 126689d7bce8..f1f1224928a1 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -588,6 +588,9 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent,
const OUString& aDatNa
mxCkbSkipEmptyCells->set_active(false);
mxCkbSkipEmptyCells->hide();
}
+
+if (comphelper::LibreOfficeKit::isActive())
+m_xBuilder->weld_button("cancel")->hide();
m_xDialog->SetInstallLOKNotifierHdl(LINK(this, ScImportAsciiDlg,
InstallLOKNotifierHdl));
}
core.git: Branch 'distro/collabora/co-24.04' - sc/source
sc/source/ui/dbgui/scuiasciiopt.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 290d70a476bab7d100baa3568ec547633109033e
Author: Pranam Lashkari
AuthorDate: Fri Apr 26 23:51:14 2024 +0100
Commit: Szymon Kłos
CommitDate: Mon Apr 29 12:15:13 2024 +0200
LOK: hide cancel button in csv import dialog
it did not make any sense to have cancel button in this dialog
because it would not load file at all.
user can still use close button in title bar to close dialog
Change-Id: Id3ba3e4030553db18bdbd068d92b3395f4fb8c3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166764
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 601323a6586d..b4b446ea7d58 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -605,6 +605,9 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent,
std::u16string_view aD
mxCkbSkipEmptyCells->set_active(false);
mxCkbSkipEmptyCells->hide();
}
+
+if (comphelper::LibreOfficeKit::isActive())
+m_xBuilder->weld_button("cancel")->hide();
m_xDialog->SetInstallLOKNotifierHdl(LINK(this, ScImportAsciiDlg,
InstallLOKNotifierHdl));
}
core.git: Branch 'distro/collabora/co-23.05' - 2 commits - desktop/source include/sfx2 sfx2/sdi sfx2/source
desktop/source/lib/init.cxx| 35 ++-
include/sfx2/dinfdlg.hxx |5 -
sfx2/sdi/sfx.sdi |2 +-
sfx2/source/dialog/dinfdlg.cxx | 15 +++
sfx2/source/doc/objserv.cxx|8 +---
5 files changed, 47 insertions(+), 18 deletions(-)
New commits:
commit 2d9396250b62a9b681c07996efd7145fd0fe5617
Author: Pranam Lashkari
AuthorDate: Mon Apr 15 01:22:45 2024 +0100
Commit: Caolán McNamara
CommitDate: Mon Apr 22 20:45:40 2024 +0200
sw lok: .uno:SetDocumentProperties: add file size parameter
problem:
in LOK/online to support async save, files in jails may have
different extensions (ie: .upload, .uploading)
this caused problem to detect files as original file name may not exist.
As result property like file size were always set to 0
Change-Id: I552aef203297470d01032659a266210970129e66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165769
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166454
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 4d7487f554f4..c117cb548ea1 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -74,6 +74,7 @@ private:
OUString m_Keywords;
OUString m_Subject;
OUString m_Title;
+sal_Int64m_nFileSize;
bool m_bHasTemplate;
bool m_bDeleteUserData;
bool m_bUseUserData;
@@ -87,7 +88,7 @@ public:
SfxDocumentInfoItem( const OUString ,
const css::uno::Reference< css::document::XDocumentProperties> &
i_xDocProps,
const css::uno::Sequence< css::document::CmisProperty> & i_cmisProps,
-bool bUseUserData, bool bUseThumbnailSave );
+bool bUseUserData, bool bUseThumbnailSave, sal_Int64 nFileSize );
SfxDocumentInfoItem( const SfxDocumentInfoItem& );
virtual ~SfxDocumentInfoItem() override;
@@ -124,6 +125,8 @@ public:
voidsetSubject(const OUString& i_val) { m_Subject = i_val; }
const OUString& getTitle() const { return m_Title; }
voidsetTitle(const OUString& i_val) { m_Title = i_val; }
+sal_Int64 getFileSize() const { return m_nFileSize; }
+void setFileSize(sal_Int64 i_val) { m_nFileSize = i_val; }
/// reset user-specific data (author, modified-by, ...)
voidresetUserData(const OUString & i_rAuthor);
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index ea3340c426a3..388ec66fff71 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3327,7 +3327,7 @@ SfxBoolItem PrintPreview SID_PRINTPREVIEW
SfxVoidItem SetDocumentProperties SID_DOCINFO
-(SfxDocumentInfoItem Properties SID_DOCINFO, SfxUnoAnyItem UpdatedProperties
FN_PARAM_1)
+(SfxDocumentInfoItem Properties SID_DOCINFO, SfxUnoAnyItem UpdatedProperties
FN_PARAM_1, SfxStringItem FileSize FN_PARAM_2)
[
AutoUpdate = FALSE,
FastCall = FALSE,
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index ec37a70828e0..defda82085b6 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -179,6 +179,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem()
, m_isAutoloadEnabled(false)
, m_EditingCycles(0)
, m_EditingDuration(0)
+, m_nFileSize(-1)
, m_bHasTemplate( true )
, m_bDeleteUserData( false )
, m_bUseUserData( true )
@@ -189,7 +190,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem()
SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile,
const uno::Reference& i_xDocProps,
const uno::Sequence& i_cmisProps,
-bool bIs, bool _bIs )
+bool bIs, bool _bIs, sal_Int64 _nFileSize )
: SfxStringItem( SID_DOCINFO, rFile )
, m_AutoloadDelay( i_xDocProps->getAutoloadSecs() )
, m_AutoloadURL( i_xDocProps->getAutoloadURL() )
@@ -209,6 +210,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString&
rFile,
i_xDocProps->getKeywords()) )
, m_Subject( i_xDocProps->getSubject() )
, m_Title( i_xDocProps->getTitle() )
+, m_nFileSize( _nFileSize )
, m_bHasTemplate( true )
, m_bDeleteUserData( false )
, m_bUseUserData( bIs )
@@ -261,6 +263,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const
SfxDocumentInfoItem& rItem )
, m_Keywords( rItem.getKeywords() )
, m_Subject( rItem.getSubject() )
, m_Title( rItem.getTitle() )
+, m_nFileSize ( rItem.m_nFileSize )
, m_bHasTemplate( rItem.m_bHasTemplate )
, m_bDeleteUserData( rItem.m_bDeleteUserData )
, m_bUseUserData( rItem.m_bUseUserData )
@@ -1011,9 +1014,13 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
// determine size and type
OUString aSizeText( m_aUnknownSize );
-if ( aURL.GetProtocol() == INetProtocol::File ||
-
core.git: include/sfx2 sfx2/sdi sfx2/source
include/sfx2/dinfdlg.hxx |5 -
sfx2/sdi/sfx.sdi |2 +-
sfx2/source/dialog/dinfdlg.cxx | 15 +++
sfx2/source/doc/objserv.cxx|8 +---
4 files changed, 21 insertions(+), 9 deletions(-)
New commits:
commit 11ae1cf4e4415237ed4fce7fa8d77502ab058ab1
Author: Pranam Lashkari
AuthorDate: Mon Apr 15 01:22:45 2024 +0100
Commit: Caolán McNamara
CommitDate: Wed Apr 17 13:32:27 2024 +0200
sw lok: .uno:SetDocumentProperties: add file size parameter
problem:
in LOK/online to support async save, files in jails may have
different extensions (ie: .upload, .uploading)
this caused problem to detect files as original file name may not exist.
As result property like file size were always set to 0
Change-Id: I552aef203297470d01032659a266210970129e66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165769
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
(cherry picked from commit aa4e10efc6e9ac92b0c652f238526aacbe2096c6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166171
Tested-by: Jenkins
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 874e127f20b5..d4743ed00ef5 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -82,6 +82,7 @@ private:
OUString m_Type;
OUString m_Subject;
OUString m_Title;
+sal_Int64m_nFileSize;
bool m_bHasTemplate;
bool m_bDeleteUserData;
bool m_bUseUserData;
@@ -95,7 +96,7 @@ public:
SfxDocumentInfoItem( const OUString ,
const css::uno::Reference< css::document::XDocumentProperties> &
i_xDocProps,
const css::uno::Sequence< css::document::CmisProperty> & i_cmisProps,
-bool bUseUserData, bool bUseThumbnailSave );
+bool bUseUserData, bool bUseThumbnailSave, sal_Int64 nFileSize );
SfxDocumentInfoItem( const SfxDocumentInfoItem& );
virtual ~SfxDocumentInfoItem() override;
@@ -148,6 +149,8 @@ public:
voidsetSubject(const OUString& i_val) { m_Subject = i_val; }
const OUString& getTitle() const { return m_Title; }
voidsetTitle(const OUString& i_val) { m_Title = i_val; }
+sal_Int64 getFileSize() const { return m_nFileSize; }
+void setFileSize(sal_Int64 i_val) { m_nFileSize = i_val; }
/// reset user-specific data (author, modified-by, ...)
voidresetUserData(const OUString & i_rAuthor);
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 21894391ef51..721ab116f60e 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3398,7 +3398,7 @@ SfxBoolItem PrintPreview SID_PRINTPREVIEW
SfxVoidItem SetDocumentProperties SID_DOCINFO
-(SfxDocumentInfoItem Properties SID_DOCINFO, SfxUnoAnyItem UpdatedProperties
FN_PARAM_1)
+(SfxDocumentInfoItem Properties SID_DOCINFO, SfxUnoAnyItem UpdatedProperties
FN_PARAM_1, SfxStringItem FileSize FN_PARAM_2)
[
AutoUpdate = FALSE,
FastCall = FALSE,
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index f103654f04a9..74caea85569e 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -180,6 +180,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem()
, m_isAutoloadEnabled(false)
, m_EditingCycles(0)
, m_EditingDuration(0)
+, m_nFileSize(-1)
, m_bHasTemplate( true )
, m_bDeleteUserData( false )
, m_bUseUserData( true )
@@ -190,7 +191,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem()
SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile,
const uno::Reference& i_xDocProps,
const uno::Sequence& i_cmisProps,
-bool bIs, bool _bIs )
+bool bIs, bool _bIs, sal_Int64 _nFileSize )
: SfxStringItem( SID_DOCINFO, rFile )
, m_AutoloadDelay( i_xDocProps->getAutoloadSecs() )
, m_AutoloadURL( i_xDocProps->getAutoloadURL() )
@@ -210,6 +211,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString&
rFile,
i_xDocProps->getKeywords()) )
, m_Subject( i_xDocProps->getSubject() )
, m_Title( i_xDocProps->getTitle() )
+, m_nFileSize( _nFileSize )
, m_bHasTemplate( true )
, m_bDeleteUserData( false )
, m_bUseUserData( bIs )
@@ -280,6 +282,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const
SfxDocumentInfoItem& rItem )
, m_Type(rItem.getType())
, m_Subject( rItem.getSubject() )
, m_Title( rItem.getTitle() )
+, m_nFileSize ( rItem.m_nFileSize )
, m_bHasTemplate( rItem.m_bHasTemplate )
, m_bDeleteUserData( rItem.m_bDeleteUserData )
, m_bUseUserData( rItem.m_bUseUserData )
@@ -1117,9 +1120,13 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
// determine size and type
OUString aSizeText( m_aUnknownSize );
-if ( aURL.GetProtocol() == INetProtocol::File ||
-
core.git: Branch 'distro/collabora/co-24.04' - include/sfx2 sfx2/sdi sfx2/source
include/sfx2/dinfdlg.hxx |5 -
sfx2/sdi/sfx.sdi |2 +-
sfx2/source/dialog/dinfdlg.cxx | 15 +++
sfx2/source/doc/objserv.cxx|8 +---
4 files changed, 21 insertions(+), 9 deletions(-)
New commits:
commit aa4e10efc6e9ac92b0c652f238526aacbe2096c6
Author: Pranam Lashkari
AuthorDate: Mon Apr 15 01:22:45 2024 +0100
Commit: Caolán McNamara
CommitDate: Mon Apr 15 16:16:19 2024 +0200
sw lok: .uno:SetDocumentProperties: add file size parameter
problem:
in LOK/online to support async save, files in jails may have
different extensions (ie: .upload, .uploading)
this caused problem to detect files as original file name may not exist.
As result property like file size were always set to 0
Change-Id: I552aef203297470d01032659a266210970129e66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165769
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 874e127f20b5..d4743ed00ef5 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -82,6 +82,7 @@ private:
OUString m_Type;
OUString m_Subject;
OUString m_Title;
+sal_Int64m_nFileSize;
bool m_bHasTemplate;
bool m_bDeleteUserData;
bool m_bUseUserData;
@@ -95,7 +96,7 @@ public:
SfxDocumentInfoItem( const OUString ,
const css::uno::Reference< css::document::XDocumentProperties> &
i_xDocProps,
const css::uno::Sequence< css::document::CmisProperty> & i_cmisProps,
-bool bUseUserData, bool bUseThumbnailSave );
+bool bUseUserData, bool bUseThumbnailSave, sal_Int64 nFileSize );
SfxDocumentInfoItem( const SfxDocumentInfoItem& );
virtual ~SfxDocumentInfoItem() override;
@@ -148,6 +149,8 @@ public:
voidsetSubject(const OUString& i_val) { m_Subject = i_val; }
const OUString& getTitle() const { return m_Title; }
voidsetTitle(const OUString& i_val) { m_Title = i_val; }
+sal_Int64 getFileSize() const { return m_nFileSize; }
+void setFileSize(sal_Int64 i_val) { m_nFileSize = i_val; }
/// reset user-specific data (author, modified-by, ...)
voidresetUserData(const OUString & i_rAuthor);
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 9c2b72d5f443..4dca362cea49 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3382,7 +3382,7 @@ SfxBoolItem PrintPreview SID_PRINTPREVIEW
SfxVoidItem SetDocumentProperties SID_DOCINFO
-(SfxDocumentInfoItem Properties SID_DOCINFO, SfxUnoAnyItem UpdatedProperties
FN_PARAM_1)
+(SfxDocumentInfoItem Properties SID_DOCINFO, SfxUnoAnyItem UpdatedProperties
FN_PARAM_1, SfxStringItem FileSize FN_PARAM_2)
[
AutoUpdate = FALSE,
FastCall = FALSE,
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index fc8754e5f12a..d46a1a2bcc62 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -180,6 +180,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem()
, m_isAutoloadEnabled(false)
, m_EditingCycles(0)
, m_EditingDuration(0)
+, m_nFileSize(-1)
, m_bHasTemplate( true )
, m_bDeleteUserData( false )
, m_bUseUserData( true )
@@ -190,7 +191,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem()
SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile,
const uno::Reference& i_xDocProps,
const uno::Sequence& i_cmisProps,
-bool bIs, bool _bIs )
+bool bIs, bool _bIs, sal_Int64 _nFileSize )
: SfxStringItem( SID_DOCINFO, rFile )
, m_AutoloadDelay( i_xDocProps->getAutoloadSecs() )
, m_AutoloadURL( i_xDocProps->getAutoloadURL() )
@@ -210,6 +211,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString&
rFile,
i_xDocProps->getKeywords()) )
, m_Subject( i_xDocProps->getSubject() )
, m_Title( i_xDocProps->getTitle() )
+, m_nFileSize( _nFileSize )
, m_bHasTemplate( true )
, m_bDeleteUserData( false )
, m_bUseUserData( bIs )
@@ -280,6 +282,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const
SfxDocumentInfoItem& rItem )
, m_Type(rItem.getType())
, m_Subject( rItem.getSubject() )
, m_Title( rItem.getTitle() )
+, m_nFileSize ( rItem.m_nFileSize )
, m_bHasTemplate( rItem.m_bHasTemplate )
, m_bDeleteUserData( rItem.m_bDeleteUserData )
, m_bUseUserData( rItem.m_bUseUserData )
@@ -1117,9 +1120,13 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
// determine size and type
OUString aSizeText( m_aUnknownSize );
-if ( aURL.GetProtocol() == INetProtocol::File ||
- aURL.isAnyKnownWebDAVScheme() )
-aSizeText = CreateSizeText( SfxContentHelper::GetSize(
aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) )
core.git: Branch 'distro/collabora/co-24.04' - desktop/source
desktop/source/lib/init.cxx | 35 ++-
1 file changed, 26 insertions(+), 9 deletions(-)
New commits:
commit 4fcaf961e243fb0f03e42df380d9843ed2f2080c
Author: Pranam Lashkari
AuthorDate: Wed Apr 3 00:08:45 2024 +0530
Commit: Caolán McNamara
CommitDate: Wed Apr 3 14:26:01 2024 +0200
LOK: set creation date when online creates file from template
problem:
when online created file using WOPI clients, creation dates were never set.
in online files are created using templates, even empty files are created
using
an empty template
Change-Id: I3f022427745de7204faac9418620e2a87f9cf684
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165705
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index bfe4ff5fd699..2c4fba114092 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3382,6 +3382,19 @@ static void lo_registerCallback (LibreOfficeKit* pThis,
pApp->m_pCallbackData = pLib->mpCallbackData = pData;
}
+static SfxObjectShell* getSfxObjectShell(LibreOfficeKitDocument* pThis)
+{
+LibLODocument_Impl* pDocument = static_cast(pThis);
+if (!pDocument)
+return nullptr;
+
+SfxBaseModel* pBaseModel =
dynamic_cast(pDocument->mxComponent.get());
+if (!pBaseModel)
+return nullptr;
+
+return pBaseModel->GetObjectShell();
+}
+
static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const
char* pFormat, const char* pFilterOptions)
{
comphelper::ProfileZone aZone("doc_saveAs");
@@ -3531,6 +3544,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis,
const char* sUrl, const cha
const uno::Sequence aOptionSeq =
comphelper::string::convertCommaSeparated(aFilterOptions);
std::vector aFilteredOptionVec;
bool bTakeOwnership = false;
+bool bCreateFromTemplate = false;
MediaDescriptor aSaveMediaDescriptor;
for (const auto& rOption : aOptionSeq)
{
@@ -3538,10 +3552,21 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis,
const char* sUrl, const cha
bTakeOwnership = true;
else if (rOption == "NoFileSync")
aSaveMediaDescriptor[u"NoFileSync"_ustr] <<= true;
+else if (rOption == "FromTemplate")
+bCreateFromTemplate = true;
else
aFilteredOptionVec.push_back(rOption);
}
+if (bCreateFromTemplate && bTakeOwnership)
+{
+if (SfxObjectShell* pObjectShell = getSfxObjectShell(pThis))
+{
+DateTime now( ::DateTime::SYSTEM );
+
pObjectShell->getDocProperties()->setCreationDate(now.GetUNODateTime());
+}
+}
+
aSaveMediaDescriptor[u"Overwrite"_ustr] <<= true;
aSaveMediaDescriptor[u"FilterName"_ustr] <<= aFilterName;
@@ -5931,15 +5956,7 @@ static void doc_resetSelection(LibreOfficeKitDocument*
pThis)
static char* getDocReadOnly(LibreOfficeKitDocument* pThis)
{
-LibLODocument_Impl* pDocument = static_cast(pThis);
-if (!pDocument)
-return nullptr;
-
-SfxBaseModel* pBaseModel =
dynamic_cast(pDocument->mxComponent.get());
-if (!pBaseModel)
-return nullptr;
-
-SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+SfxObjectShell* pObjectShell = getSfxObjectShell(pThis);
if (!pObjectShell)
return nullptr;
core.git: 2 commits - chart2/source desktop/source
chart2/source/tools/TitleHelper.cxx |2 +-
desktop/source/lib/init.cxx | 35 ++-
2 files changed, 27 insertions(+), 10 deletions(-)
New commits:
commit dd7e03fe7f1d913b8fad2ade6d3c04d02c0cf92c
Author: Pranam Lashkari
AuthorDate: Wed Apr 3 00:08:45 2024 +0530
Commit: Caolán McNamara
CommitDate: Wed Apr 3 14:26:11 2024 +0200
LOK: set creation date when online creates file from template
problem:
when online created file using WOPI clients, creation dates were never set.
in online files are created using templates, even empty files are created
using
an empty template
Change-Id: I3f022427745de7204faac9418620e2a87f9cf684
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165711
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3963b86eab34..9b49a9c934a6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3354,6 +3354,19 @@ static void lo_registerCallback (LibreOfficeKit* pThis,
pApp->m_pCallbackData = pLib->mpCallbackData = pData;
}
+static SfxObjectShell* getSfxObjectShell(LibreOfficeKitDocument* pThis)
+{
+LibLODocument_Impl* pDocument = static_cast(pThis);
+if (!pDocument)
+return nullptr;
+
+SfxBaseModel* pBaseModel =
dynamic_cast(pDocument->mxComponent.get());
+if (!pBaseModel)
+return nullptr;
+
+return pBaseModel->GetObjectShell();
+}
+
static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const
char* pFormat, const char* pFilterOptions)
{
comphelper::ProfileZone aZone("doc_saveAs");
@@ -3503,6 +3516,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis,
const char* sUrl, const cha
const uno::Sequence aOptionSeq =
comphelper::string::convertCommaSeparated(aFilterOptions);
std::vector aFilteredOptionVec;
bool bTakeOwnership = false;
+bool bCreateFromTemplate = false;
MediaDescriptor aSaveMediaDescriptor;
for (const auto& rOption : aOptionSeq)
{
@@ -3510,10 +3524,21 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis,
const char* sUrl, const cha
bTakeOwnership = true;
else if (rOption == "NoFileSync")
aSaveMediaDescriptor[u"NoFileSync"_ustr] <<= true;
+else if (rOption == "FromTemplate")
+bCreateFromTemplate = true;
else
aFilteredOptionVec.push_back(rOption);
}
+if (bCreateFromTemplate && bTakeOwnership)
+{
+if (SfxObjectShell* pObjectShell = getSfxObjectShell(pThis))
+{
+DateTime now( ::DateTime::SYSTEM );
+
pObjectShell->getDocProperties()->setCreationDate(now.GetUNODateTime());
+}
+}
+
aSaveMediaDescriptor[u"Overwrite"_ustr] <<= true;
aSaveMediaDescriptor[u"FilterName"_ustr] <<= aFilterName;
@@ -5903,15 +5928,7 @@ static void doc_resetSelection(LibreOfficeKitDocument*
pThis)
static char* getDocReadOnly(LibreOfficeKitDocument* pThis)
{
-LibLODocument_Impl* pDocument = static_cast(pThis);
-if (!pDocument)
-return nullptr;
-
-SfxBaseModel* pBaseModel =
dynamic_cast(pDocument->mxComponent.get());
-if (!pBaseModel)
-return nullptr;
-
-SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+SfxObjectShell* pObjectShell = getSfxObjectShell(pThis);
if (!pObjectShell)
return nullptr;
commit 33ca999cb238246709494285bb27d85745e7d112
Author: Andrea Gelmini
AuthorDate: Wed Apr 3 12:22:34 2024 +0200
Commit: Julien Nabet
CommitDate: Wed Apr 3 14:26:07 2024 +0200
Fix typo
Change-Id: Iaa7a84f5568b13f223e9a45c50c5a7de66e08f42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165740
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/chart2/source/tools/TitleHelper.cxx
b/chart2/source/tools/TitleHelper.cxx
index 6fdb4f5adef3..e9f76c619985 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -374,7 +374,7 @@ void TitleHelper::setCompleteString( const OUString&
rNewText
if (bDialogTitle && aNewText.equals(getUnstackedStr(aFullString)))
{
// If the new title setted from a dialog window to a new string
-// the first old text portion will be maintained if its a new
string,
+// the first old text portion will be maintained if it's a new
string,
// otherwise we use the original one.
aNewStringList = aOldStringList;
}
core.git: sd/source
sd/source/ui/view/drviewse.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 437161094d6e19f7cc222b1029801a481ad15618
Author: Pranam Lashkari
AuthorDate: Wed Mar 20 20:53:27 2024 +0530
Commit: Pranam Lashkari
CommitDate: Fri Mar 22 12:33:18 2024 +0100
LOK: enter editing directly after textbox insertion
Change-Id: I3e77a1eb72a12c0e4ffc289ca854e0edb4ae9e2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165007
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 5f95769e6311..da0dbedd1195 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -614,10 +614,6 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
if(!(HasCurrentFunction() && ((rReq.GetModifier() & KEY_MOD1) ||
bCreateDirectly)))
return;
-// disable interactive drawing for LOK
-if (bCreateDirectly)
-GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT,
SfxCallMode::ASYNCHRON);
-
// get SdOptions
SdOptions* pOptions = SD_MOD()->GetSdOptions(GetDoc()->GetDocumentType());
sal_uInt32 nDefaultObjectSizeWidth(pOptions->GetDefaultObjectSizeWidth());
@@ -656,6 +652,10 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
{
case SID_DRAW_CAPTION:
case SID_DRAW_CAPTION_VERTICAL:
+case SID_ATTR_CHAR:
+case SID_ATTR_CHAR_VERTICAL:
+case SID_TEXT_FITTOSIZE:
+case SID_TEXT_FITTOSIZE_VERTICAL:
{
// Make FuText the current function.
SfxUInt16Item aItem (SID_TEXTEDIT, 1);
core.git: Branch 'distro/collabora/co-24.04' - sd/source
sd/source/ui/view/drviewse.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit dd33eeeaffaea1e155d2a6a6e9900dcb80b49411
Author: Pranam Lashkari
AuthorDate: Wed Mar 20 20:53:27 2024 +0530
Commit: Caolán McNamara
CommitDate: Fri Mar 22 10:24:06 2024 +0100
LOK: enter editing directly after textbox insertion
Change-Id: I3e77a1eb72a12c0e4ffc289ca854e0edb4ae9e2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165068
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 0b293773b07a..af81827d40d5 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -614,10 +614,6 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
if(!(HasCurrentFunction() && ((rReq.GetModifier() & KEY_MOD1) ||
bCreateDirectly)))
return;
-// disable interactive drawing for LOK
-if (bCreateDirectly)
-GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT,
SfxCallMode::ASYNCHRON);
-
// get SdOptions
SdOptions* pOptions = SD_MOD()->GetSdOptions(GetDoc()->GetDocumentType());
sal_uInt32 nDefaultObjectSizeWidth(pOptions->GetDefaultObjectSizeWidth());
@@ -656,6 +652,10 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
{
case SID_DRAW_CAPTION:
case SID_DRAW_CAPTION_VERTICAL:
+case SID_ATTR_CHAR:
+case SID_ATTR_CHAR_VERTICAL:
+case SID_TEXT_FITTOSIZE:
+case SID_TEXT_FITTOSIZE_VERTICAL:
{
// Make FuText the current function.
SfxUInt16Item aItem (SID_TEXTEDIT, 1);
core.git: Branch 'distro/collabora/co-23.05' - sd/source
sd/source/ui/annotations/annotationmanager.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit c57b9282a500741812448a4ad3c68956f6764b4a Author: Pranam Lashkari AuthorDate: Wed Mar 13 20:23:47 2024 +0530 Commit: Caolán McNamara CommitDate: Thu Mar 14 09:51:48 2024 +0100 sd:annotation: added missing comment reply undo Change-Id: I63e005aa35faad1ebdaad228a22477cb1dd6de67 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164812 Tested-by: Jenkins CollaboraOffice Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 81d6b3c0176b..734229e36c39 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -553,6 +553,10 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest const & rReq ) if( !pTextApi ) return; +if (mpDoc->IsUndoEnabled()) +mpDoc->BegUndo(SdResId(STR_ANNOTATION_REPLY)); + +CreateChangeUndo(xAnnotation); ::Outliner aOutliner( GetAnnotationPool(),OutlinerMode::TextObject ); SdDrawDocument::SetCalcFieldValueHdl( ); @@ -610,6 +614,9 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest const & rReq ) // Tell our LOK clients about this (comment modification) LOKCommentNotifyAll(CommentNotificationType::Modify, xAnnotation); +if( mpDoc->IsUndoEnabled() ) +mpDoc->EndUndo(); + UpdateTags(true); SelectAnnotation( xAnnotation, true ); }
core.git: Branch 'distro/collabora/co-24.04' - sd/source
sd/source/ui/annotations/annotationmanager.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit 248756493cb7caa860bd558f8ffb0e43a38f2cd0 Author: Pranam Lashkari AuthorDate: Wed Mar 13 20:23:47 2024 +0530 Commit: Caolán McNamara CommitDate: Thu Mar 14 09:51:28 2024 +0100 sd:annotation: added missing comment reply undo Change-Id: I63e005aa35faad1ebdaad228a22477cb1dd6de67 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164801 Tested-by: Jenkins CollaboraOffice Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index dbd9768b554c..ac79f2e15724 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -567,6 +567,10 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest const & rReq ) if( !pTextApi ) return; +if (mpDoc->IsUndoEnabled()) +mpDoc->BegUndo(SdResId(STR_ANNOTATION_REPLY)); + +CreateChangeUndo(xAnnotation); ::Outliner aOutliner( GetAnnotationPool(),OutlinerMode::TextObject ); SdDrawDocument::SetCalcFieldValueHdl( ); @@ -624,6 +628,9 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest const & rReq ) // Tell our LOK clients about this (comment modification) LOKCommentNotifyAll(CommentNotificationType::Modify, xAnnotation); +if( mpDoc->IsUndoEnabled() ) +mpDoc->EndUndo(); + UpdateTags(true); SelectAnnotation( xAnnotation, true ); }
core.git: sd/source
sd/source/ui/annotations/annotationmanager.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit 05022d33be70a76ff14ba2cda84b5fd8a15a47a1 Author: Pranam Lashkari AuthorDate: Wed Mar 13 20:23:47 2024 +0530 Commit: Caolán McNamara CommitDate: Thu Mar 14 09:50:55 2024 +0100 sd:annotation: added missing comment reply undo Change-Id: I63e005aa35faad1ebdaad228a22477cb1dd6de67 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164811 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 2caf48df3f5e..0ab47a7b1a07 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -567,6 +567,10 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest const & rReq ) if( !pTextApi ) return; +if (mpDoc->IsUndoEnabled()) +mpDoc->BegUndo(SdResId(STR_ANNOTATION_REPLY)); + +CreateChangeUndo(xAnnotation); ::Outliner aOutliner( GetAnnotationPool(),OutlinerMode::TextObject ); SdDrawDocument::SetCalcFieldValueHdl( ); @@ -624,6 +628,9 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest const & rReq ) // Tell our LOK clients about this (comment modification) LOKCommentNotifyAll(CommentNotificationType::Modify, xAnnotation); +if( mpDoc->IsUndoEnabled() ) +mpDoc->EndUndo(); + UpdateTags(true); SelectAnnotation( xAnnotation, true ); }
core.git: Branch 'distro/collabora/co-23.05' - svx/source
svx/source/svdraw/svdedxv.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit a3f416e353031b9abb4ecfd3bf703e2238a5599f
Author: Pranam Lashkari
AuthorDate: Mon Mar 11 21:03:30 2024 +0530
Commit: Caolán McNamara
CommitDate: Mon Mar 11 21:49:13 2024 +0100
LOK: send LOK_CALLBACK_SHAPE_INNER_TEXT info on empty textbox initialization
Change-Id: I8bc003f89147c145ec4b1f9a91b6fe82da9f14be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164662
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 90e8e116e807..083f0f1e932b 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2434,8 +2434,10 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet&
rSet, bool bReplaceAll)
mpTextEditOutlinerView->SetAttribs(rSet);
Outliner* pTEOutliner = mpTextEditOutlinerView->GetOutliner();
-if (mpModel && pTEOutliner && pTEOutliner->IsModified())
+if (mpModel && pTEOutliner && pTEOutliner->IsModified()) {
mpModel->SetChanged();
+SetInnerTextAreaForLOKit();
+}
ImpMakeTextCursorAreaVisible();
}
core.git: Branch 'distro/collabora/co-24.04' - svx/source
svx/source/svdraw/svdedxv.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 5c4e77c839988838ead659b9986da8dfebfcf7e0
Author: Pranam Lashkari
AuthorDate: Mon Mar 11 21:03:30 2024 +0530
Commit: Caolán McNamara
CommitDate: Mon Mar 11 21:48:48 2024 +0100
LOK: send LOK_CALLBACK_SHAPE_INNER_TEXT info on empty textbox initialization
Change-Id: I8bc003f89147c145ec4b1f9a91b6fe82da9f14be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164663
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 0efdd449e00e..4afe96b4c657 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2426,7 +2426,10 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet&
rSet, bool bReplaceAll)
Outliner* pTEOutliner = mpTextEditOutlinerView->GetOutliner();
if (pTEOutliner && pTEOutliner->IsModified())
+{
GetModel().SetChanged();
+SetInnerTextAreaForLOKit();
+}
ImpMakeTextCursorAreaVisible();
}
core.git: svx/source
svx/source/svdraw/svdedxv.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit f8bb64a3cffb80793a6b3b9c41f78c5feccb168e
Author: Pranam Lashkari
AuthorDate: Mon Mar 11 21:03:30 2024 +0530
Commit: Caolán McNamara
CommitDate: Mon Mar 11 21:48:33 2024 +0100
LOK: send LOK_CALLBACK_SHAPE_INNER_TEXT info on empty textbox initialization
Change-Id: I8bc003f89147c145ec4b1f9a91b6fe82da9f14be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164673
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index f60baf1b64fe..799d51f85930 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2513,7 +2513,10 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet&
rSet, bool bReplaceAll)
Outliner* pTEOutliner = mpTextEditOutlinerView->GetOutliner();
if (pTEOutliner && pTEOutliner->IsModified())
+{
GetModel().SetChanged();
+SetInnerTextAreaForLOKit();
+}
ImpMakeTextCursorAreaVisible();
}
core.git: Branch 'distro/collabora/co-23.05' - svx/source
svx/source/svdraw/svdmrkv.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 93d9d675e0f17fa18b0876d8f73bb9731a06186d Author: Pranam Lashkari AuthorDate: Mon Mar 11 19:19:01 2024 +0530 Commit: Caolán McNamara CommitDate: Mon Mar 11 20:42:37 2024 +0100 LOK: don't send empty callback for LOK LOK_CALLBACK_SHAPE_INNER_TEXT Change-Id: Id0a3a84fcadc1ab216b856760fd168b23bed2827 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164659 Tested-by: Jenkins CollaboraOffice Reviewed-by: Caolán McNamara diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 67f0f6ffa96c..0636dc28ed64 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -822,8 +822,9 @@ void SdrMarkView::SetInnerTextAreaForLOKit() const if (!comphelper::LibreOfficeKit::isActive()) return; SfxViewShell* pViewShell = GetSfxViewShell(); -if (pViewShell) -pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_SHAPE_INNER_TEXT, CreateInnerTextRectString().getStr()); +OString sRectString = CreateInnerTextRectString(); +if (pViewShell && !sRectString.isEmpty()) +pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_SHAPE_INNER_TEXT, sRectString.getStr()); } void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const SfxViewShell* pOtherShell)
core.git: Branch 'distro/collabora/co-24.04' - svx/source
svx/source/svdraw/svdmrkv.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 663d61986cb529644fbc2385638e95b77b41d245 Author: Pranam Lashkari AuthorDate: Mon Mar 11 19:19:01 2024 +0530 Commit: Caolán McNamara CommitDate: Mon Mar 11 20:42:20 2024 +0100 LOK: don't send empty callback for LOK LOK_CALLBACK_SHAPE_INNER_TEXT Change-Id: Id0a3a84fcadc1ab216b856760fd168b23bed2827 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164660 Tested-by: Jenkins CollaboraOffice Reviewed-by: Caolán McNamara diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 477fb573d722..38e13d8e3857 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -817,8 +817,9 @@ void SdrMarkView::SetInnerTextAreaForLOKit() const if (!comphelper::LibreOfficeKit::isActive()) return; SfxViewShell* pViewShell = GetSfxViewShell(); -if (pViewShell) -pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_SHAPE_INNER_TEXT, CreateInnerTextRectString()); +OString sRectString = CreateInnerTextRectString(); +if (pViewShell && !sRectString.isEmpty()) +pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_SHAPE_INNER_TEXT, sRectString); } void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const SfxViewShell* pOtherShell)
core.git: Branch 'distro/collabora/co-23.05' - desktop/source include/LibreOfficeKit include/svx libreofficekit/source svx/source
desktop/source/lib/init.cxx |1
include/LibreOfficeKit/LibreOfficeKitEnums.h |9
include/svx/svdmrkv.hxx |2
libreofficekit/source/gtk/lokdocview.cxx |1
svx/source/svdraw/svdedxv.cxx|6 ++
svx/source/svdraw/svdmrkv.cxx| 55 ++-
6 files changed, 57 insertions(+), 17 deletions(-)
New commits:
commit 42547334938118511d1052678cbd612160db1b5c
Author: Pranam Lashkari
AuthorDate: Thu Mar 7 23:08:24 2024 +0530
Commit: Pranam Lashkari
CommitDate: Fri Mar 8 18:55:04 2024 +0100
LOK: send inner text boundry information of shapes/textbox on change
instroduced new callback for LOK LOK_CALLBACK_SHAPE_INNER_TEXT
now if innert text is changed LOK is instantly updated about new textarea
Change-Id: I0a88e1dd77556e47f14359ce0a98701a327aceda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164549
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pranam Lashkari
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a5e3da349c1d..c3183f0ae093 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1894,6 +1894,7 @@ void CallbackFlushHandler::queue(const int type,
CallbackData& aCallbackData)
case LOK_CALLBACK_A11Y_FOCUSED_CELL_CHANGED:
case LOK_CALLBACK_COLOR_PALETTES:
case LOK_CALLBACK_TOOLTIP:
+case LOK_CALLBACK_SHAPE_INNER_TEXT:
{
if (removeAll(type))
SAL_INFO("lok", "Removed dups of [" << type << "]: [" <<
aCallbackData.getPayload() << "].");
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index a894bd473ad9..80bb82dc32c7 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -1045,6 +1045,13 @@ typedef enum
*/
LOK_CALLBACK_TOOLTIP = 71,
+/**
+ * Used for sending the rectangle for text inside a shape/textbox
+ *
+ * Payload contains the rectangle details
+ */
+LOK_CALLBACK_SHAPE_INNER_TEXT = 72,
+
}
LibreOfficeKitCallbackType;
@@ -1217,6 +1224,8 @@ static inline const char* lokCallbackTypeToString(int
nType)
return "LOK_CALLBACK_CORE_LOG";
case LOK_CALLBACK_TOOLTIP:
return "LOK_CALLBACK_TOOLTIP";
+case LOK_CALLBACK_SHAPE_INNER_TEXT:
+return "LOK_CALLBACK_SHAPE_INNER_TEXT";
}
assert(!"Unknown LibreOfficeKitCallbackType type.");
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 162581fc5def..6421b51b0dba 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -150,6 +150,7 @@ private:
void UndirtyMrkPnt() const;
void SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const
SfxViewShell* pOtherShell);
+OString CreateInnerTextRectString() const;
bool dumpGluePointsToJSON(boost::property_tree::ptree& rTree);
protected:
@@ -246,6 +247,7 @@ public:
/// whether all x coordinates in use are negated or not
void SetNegativeX(bool bOn) { mbNegativeX = bOn; }
bool IsNegativeX() const { return mbNegativeX; }
+void SetInnerTextAreaForLOKit() const;
// migrate selections
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index f025cf99a140..60c3435ac28d 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1498,6 +1498,7 @@ callback (gpointer pData)
case LOK_CALLBACK_A11Y_SELECTION_CHANGED:
case LOK_CALLBACK_CORE_LOG:
case LOK_CALLBACK_TOOLTIP:
+case LOK_CALLBACK_SHAPE_INNER_TEXT:
{
// TODO: Implement me
break;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 42be2aff97fb..90e8e116e807 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1972,7 +1972,10 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt,
vcl::Window* pWin)
if (mpModel)
{
if (mpTextEditOutliner && mpTextEditOutliner->IsModified())
+{
mpModel->SetChanged();
+SetInnerTextAreaForLOKit();
+}
}
/* Start chaining processing */
@@ -2164,7 +2167,10 @@ bool SdrObjEditView::Command(const CommandEvent& rCEvt,
vcl::Window* pWin)
// It could execute CommandEventId::ExtTextInput, while
SdrObjEditView::KeyInput
// isn't called
if (mpTextEditOutliner && mpTextEditOutliner->IsModified())
+{
mpModel->SetChanged();
+SetInnerTextAreaForLOKit();
+}
}
return true;
}
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 139f9e8ae2a7..67f0f6ffa96c
core.git: desktop/source include/LibreOfficeKit include/svx libreofficekit/source svx/source
desktop/source/lib/init.cxx |1
include/LibreOfficeKit/LibreOfficeKitEnums.h |9
include/svx/svdmrkv.hxx |2
libreofficekit/source/gtk/lokdocview.cxx |1
svx/source/svdraw/svdedxv.cxx|6 ++
svx/source/svdraw/svdmrkv.cxx| 55 ++-
6 files changed, 57 insertions(+), 17 deletions(-)
New commits:
commit 34daf30c7a02208408b83a8ff872736b98a732e0
Author: Pranam Lashkari
AuthorDate: Thu Mar 7 23:08:24 2024 +0530
Commit: Caolán McNamara
CommitDate: Fri Mar 8 10:55:26 2024 +0100
LOK: send inner text boundry information of shapes/textbox on change
instroduced new callback for LOK LOK_CALLBACK_SHAPE_INNER_TEXT
now if innert text is changed LOK is instantly updated about new textarea
Change-Id: I0a88e1dd77556e47f14359ce0a98701a327aceda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164497
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6d221ec84418..d2525bcddcb3 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1871,6 +1871,7 @@ void CallbackFlushHandler::queue(const int type,
CallbackData& aCallbackData)
case LOK_CALLBACK_A11Y_FOCUSED_CELL_CHANGED:
case LOK_CALLBACK_COLOR_PALETTES:
case LOK_CALLBACK_TOOLTIP:
+case LOK_CALLBACK_SHAPE_INNER_TEXT:
{
if (removeAll(type))
SAL_INFO("lok", "Removed dups of [" << type << "]: [" <<
aCallbackData.getPayload() << "].");
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 2b499b091105..9a6f34bbd846 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -1045,6 +1045,13 @@ typedef enum
*/
LOK_CALLBACK_TOOLTIP = 71,
+/**
+ * Used for sending the rectangle for text inside a shape/textbox
+ *
+ * Payload contains the rectangle details
+ */
+LOK_CALLBACK_SHAPE_INNER_TEXT = 72,
+
}
LibreOfficeKitCallbackType;
@@ -1217,6 +1224,8 @@ static inline const char* lokCallbackTypeToString(int
nType)
return "LOK_CALLBACK_CORE_LOG";
case LOK_CALLBACK_TOOLTIP:
return "LOK_CALLBACK_TOOLTIP";
+case LOK_CALLBACK_SHAPE_INNER_TEXT:
+return "LOK_CALLBACK_SHAPE_INNER_TEXT";
}
assert(!"Unknown LibreOfficeKitCallbackType type.");
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 162581fc5def..6421b51b0dba 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -150,6 +150,7 @@ private:
void UndirtyMrkPnt() const;
void SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const
SfxViewShell* pOtherShell);
+OString CreateInnerTextRectString() const;
bool dumpGluePointsToJSON(boost::property_tree::ptree& rTree);
protected:
@@ -246,6 +247,7 @@ public:
/// whether all x coordinates in use are negated or not
void SetNegativeX(bool bOn) { mbNegativeX = bOn; }
bool IsNegativeX() const { return mbNegativeX; }
+void SetInnerTextAreaForLOKit() const;
// migrate selections
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index f025cf99a140..60c3435ac28d 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1498,6 +1498,7 @@ callback (gpointer pData)
case LOK_CALLBACK_A11Y_SELECTION_CHANGED:
case LOK_CALLBACK_CORE_LOG:
case LOK_CALLBACK_TOOLTIP:
+case LOK_CALLBACK_SHAPE_INNER_TEXT:
{
// TODO: Implement me
break;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index c0e1b715ea31..f60baf1b64fe 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2051,7 +2051,10 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt,
vcl::Window* pWin)
if (mpTextEditOutlinerView->PostKeyEvent(rKEvt, pWin))
{
if (mpTextEditOutliner && mpTextEditOutliner->IsModified())
+{
GetModel().SetChanged();
+SetInnerTextAreaForLOKit();
+}
/* Start chaining processing */
ImpChainingEventHdl();
@@ -2242,7 +2245,10 @@ bool SdrObjEditView::Command(const CommandEvent& rCEvt,
vcl::Window* pWin)
// It could execute CommandEventId::ExtTextInput, while
SdrObjEditView::KeyInput
// isn't called
if (mpTextEditOutliner && mpTextEditOutliner->IsModified())
+{
GetModel().SetChanged();
+SetInnerTextAreaForLOKit();
+}
}
return true;
}
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index
core.git: Branch 'distro/collabora/co-24.04' - desktop/source include/LibreOfficeKit include/svx libreofficekit/source svx/source
desktop/source/lib/init.cxx |1
include/LibreOfficeKit/LibreOfficeKitEnums.h |9
include/svx/svdmrkv.hxx |2
libreofficekit/source/gtk/lokdocview.cxx |1
svx/source/svdraw/svdedxv.cxx|6 ++
svx/source/svdraw/svdmrkv.cxx| 55 ++-
6 files changed, 57 insertions(+), 17 deletions(-)
New commits:
commit 12fd51017dc45ba032a9788825d305e4a3e2e131
Author: Pranam Lashkari
AuthorDate: Thu Mar 7 23:08:24 2024 +0530
Commit: Caolán McNamara
CommitDate: Fri Mar 8 10:54:39 2024 +0100
LOK: send inner text boundry information of shapes/textbox on change
instroduced new callback for LOK LOK_CALLBACK_SHAPE_INNER_TEXT
now if innert text is changed LOK is instantly updated about new textarea
Change-Id: I0a88e1dd77556e47f14359ce0a98701a327aceda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164547
Tested-by: Jenkins CollaboraOffice
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 586d9b4d84cc..bde805eedce5 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1876,6 +1876,7 @@ void CallbackFlushHandler::queue(const int type,
CallbackData& aCallbackData)
case LOK_CALLBACK_A11Y_FOCUSED_CELL_CHANGED:
case LOK_CALLBACK_COLOR_PALETTES:
case LOK_CALLBACK_TOOLTIP:
+case LOK_CALLBACK_SHAPE_INNER_TEXT:
{
if (removeAll(type))
SAL_INFO("lok", "Removed dups of [" << type << "]: [" <<
aCallbackData.getPayload() << "].");
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 2b499b091105..9a6f34bbd846 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -1045,6 +1045,13 @@ typedef enum
*/
LOK_CALLBACK_TOOLTIP = 71,
+/**
+ * Used for sending the rectangle for text inside a shape/textbox
+ *
+ * Payload contains the rectangle details
+ */
+LOK_CALLBACK_SHAPE_INNER_TEXT = 72,
+
}
LibreOfficeKitCallbackType;
@@ -1217,6 +1224,8 @@ static inline const char* lokCallbackTypeToString(int
nType)
return "LOK_CALLBACK_CORE_LOG";
case LOK_CALLBACK_TOOLTIP:
return "LOK_CALLBACK_TOOLTIP";
+case LOK_CALLBACK_SHAPE_INNER_TEXT:
+return "LOK_CALLBACK_SHAPE_INNER_TEXT";
}
assert(!"Unknown LibreOfficeKitCallbackType type.");
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 162581fc5def..6421b51b0dba 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -150,6 +150,7 @@ private:
void UndirtyMrkPnt() const;
void SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const
SfxViewShell* pOtherShell);
+OString CreateInnerTextRectString() const;
bool dumpGluePointsToJSON(boost::property_tree::ptree& rTree);
protected:
@@ -246,6 +247,7 @@ public:
/// whether all x coordinates in use are negated or not
void SetNegativeX(bool bOn) { mbNegativeX = bOn; }
bool IsNegativeX() const { return mbNegativeX; }
+void SetInnerTextAreaForLOKit() const;
// migrate selections
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index f025cf99a140..60c3435ac28d 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1498,6 +1498,7 @@ callback (gpointer pData)
case LOK_CALLBACK_A11Y_SELECTION_CHANGED:
case LOK_CALLBACK_CORE_LOG:
case LOK_CALLBACK_TOOLTIP:
+case LOK_CALLBACK_SHAPE_INNER_TEXT:
{
// TODO: Implement me
break;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index c2d35cc75b6b..0efdd449e00e 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1964,7 +1964,10 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt,
vcl::Window* pWin)
if (mpTextEditOutlinerView->PostKeyEvent(rKEvt, pWin))
{
if (mpTextEditOutliner && mpTextEditOutliner->IsModified())
+{
GetModel().SetChanged();
+SetInnerTextAreaForLOKit();
+}
/* Start chaining processing */
ImpChainingEventHdl();
@@ -2155,7 +2158,10 @@ bool SdrObjEditView::Command(const CommandEvent& rCEvt,
vcl::Window* pWin)
// It could execute CommandEventId::ExtTextInput, while
SdrObjEditView::KeyInput
// isn't called
if (mpTextEditOutliner && mpTextEditOutliner->IsModified())
+{
GetModel().SetChanged();
+SetInnerTextAreaForLOKit();
+}
}
return true;
}
diff --git
core.git: svx/source
svx/source/svdraw/svdmrkv.cxx | 52 +-
1 file changed, 51 insertions(+), 1 deletion(-)
New commits:
commit 948cd8b9f62e28883b691084a9bb83177422defd
Author: Pranam Lashkari
AuthorDate: Wed Feb 28 04:55:46 2024 +0530
Commit: Caolán McNamara
CommitDate: Fri Mar 1 21:39:07 2024 +0100
LOK: send inner text boundry information of shapes/textbox
Sends inner rectangle boundry info as part of
LOK_CALLBACK_GRAPHIC_SELECTION message
Change-Id: Idc51e807bec01711c8a4326e3193127f0b2cd765
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164124
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index b0784449f159..b9a492aa35ad 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -60,6 +61,8 @@
#include
#include
+#include
+
#include
#include
@@ -759,6 +762,30 @@ bool
SdrMarkView::dumpGluePointsToJSON(boost::property_tree::ptree& rTree)
return result;
}
+namespace
+{
+class TextBoundsExtractor final : public
drawinglayer::processor2d::TextExtractor2D
+{
+private:
+basegfx::B2DRange maTextRange;
+void processTextPrimitive2D(const
drawinglayer::primitive2d::BasePrimitive2D& rCandidate) override
+{
+maTextRange.expand(rCandidate.getB2DRange(getViewInformation2D()));
+}
+public:
+explicit TextBoundsExtractor(const
drawinglayer::geometry::ViewInformation2D& rViewInformation)
+: drawinglayer::processor2d::TextExtractor2D(rViewInformation)
+{
+}
+
+basegfx::B2DRange getTextBounds(const sdr::contact::ViewObjectContact
, sdr::contact::DisplayInfo )
+{
+this->process(rVOC.getPrimitive2DSequence(raDisplayInfo));
+return maTextRange;
+}
+};
+}
+
void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const
SfxViewShell* pOtherShell)
{
SfxViewShell* pViewShell = GetSfxViewShell();
@@ -837,6 +864,8 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle
const & rRect, const S
bConnectorSelection = dumpGluePointsToJSON(aGluePointsTree);
}
+SdrPageView* pPageView = GetSdrPageView();
+
if (GetMarkedObjectCount())
{
SdrMark* pM = GetSdrMarkByIndex(0);
@@ -853,6 +882,27 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle
const & rRect, const S
+ "\",\"type\":"
+
OString::number(static_cast(pO->GetObjIdentifier(;
+if (mpMarkedObj && !pOtherShell)
+{
+const sdr::contact::ViewObjectContact& rVOC =
mpMarkedObj->GetViewContact().GetViewObjectContact(
+pPageView->GetPageWindow(0)->GetObjectContact());
+
+sdr::contact::DisplayInfo aDisplayInfo;
+TextBoundsExtractor
aTextBoundsExtractor(rVOC.GetObjectContact().getViewInformation2D());
+basegfx::B2DRange aRange =
aTextBoundsExtractor.getTextBounds(rVOC, aDisplayInfo);
+if (!aRange.isEmpty()) {
+tools::Rectangle rect(aRange.getMinX(), aRange.getMinY(),
aRange.getMaxX(), aRange.getMaxY());
+tools::Rectangle aRangeTWIP = o3tl::convert(rect,
o3tl::Length::mm100, o3tl::Length::twip);
+OString innerTextInfo = ",\"innerTextRect\":[" +
+OString::number(aRangeTWIP.getX()) + "," +
+OString::number(aRangeTWIP.getY()) + "," +
+OString::number(aRangeTWIP.GetWidth()) + "," +
+OString::number(aRangeTWIP.GetHeight()) + "]";
+
+aExtraInfo.append(innerTextInfo);
+}
+}
+
// In core, the gridOffset is calculated based on the LogicRect's
TopLeft coordinate
// In online, we have the SnapRect and we calculate it based on
its TopLeft coordinate
// SnapRect's TopLeft and LogicRect's TopLeft match unless there
is rotation
@@ -862,7 +912,7 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle
const & rRect, const S
// whether the shape is rotated or not, we will always have the
correct gridOffset
// Note that the gridOffset is calculated from the first selected
obj
basegfx::B2DVector aGridOffset(0.0, 0.0);
-if(getPossibleGridOffsetForSdrObject(aGridOffset,
GetMarkedObjectByIndex(0), GetSdrPageView()))
+if(getPossibleGridOffsetForSdrObject(aGridOffset,
GetMarkedObjectByIndex(0), pPageView))
{
Point p(aGridOffset.getX(), aGridOffset.getY());
if (convertMapMode)
core.git: Branch 'distro/collabora/co-23.05' - svx/source
svx/source/svdraw/svdmrkv.cxx | 52 +-
1 file changed, 51 insertions(+), 1 deletion(-)
New commits:
commit 63f9297be3e406ba0e7f2300c0a1e684f1e07dd5
Author: Pranam Lashkari
AuthorDate: Wed Feb 28 04:55:46 2024 +0530
Commit: Caolán McNamara
CommitDate: Fri Mar 1 10:42:36 2024 +0100
LOK: send inner text boundry information of shapes/textbox
Sends inner rectangle boundry info as part of
LOK_CALLBACK_GRAPHIC_SELECTION message
Change-Id: Idc51e807bec01711c8a4326e3193127f0b2cd765
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164075
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 5aea593f5f80..139f9e8ae2a7 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -60,6 +61,8 @@
#include
#include
+#include
+
#include
#include
@@ -764,6 +767,30 @@ bool
SdrMarkView::dumpGluePointsToJSON(boost::property_tree::ptree& rTree)
return result;
}
+namespace
+{
+class TextBoundsExtractor final : public
drawinglayer::processor2d::TextExtractor2D
+{
+private:
+basegfx::B2DRange maTextRange;
+void processTextPrimitive2D(const
drawinglayer::primitive2d::BasePrimitive2D& rCandidate) override
+{
+maTextRange.expand(rCandidate.getB2DRange(getViewInformation2D()));
+}
+public:
+explicit TextBoundsExtractor(const
drawinglayer::geometry::ViewInformation2D& rViewInformation)
+: drawinglayer::processor2d::TextExtractor2D(rViewInformation,
true)
+{
+}
+
+basegfx::B2DRange getTextBounds(const sdr::contact::ViewObjectContact
, sdr::contact::DisplayInfo )
+{
+this->process(rVOC.getPrimitive2DSequence(raDisplayInfo));
+return maTextRange;
+}
+};
+}
+
void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const
SfxViewShell* pOtherShell)
{
SfxViewShell* pViewShell = GetSfxViewShell();
@@ -842,6 +869,8 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle
const & rRect, const S
bConnectorSelection = dumpGluePointsToJSON(aGluePointsTree);
}
+SdrPageView* pPageView = GetSdrPageView();
+
if (GetMarkedObjectCount())
{
SdrMark* pM = GetSdrMarkByIndex(0);
@@ -858,6 +887,27 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle
const & rRect, const S
aExtraInfo.append("\",\"type\":");
aExtraInfo.append(static_cast(pO->GetObjIdentifier()));
+if (mpMarkedObj && !pOtherShell)
+{
+const sdr::contact::ViewObjectContact& rVOC =
mpMarkedObj->GetViewContact().GetViewObjectContact(
+pPageView->GetPageWindow(0)->GetObjectContact());
+
+sdr::contact::DisplayInfo aDisplayInfo;
+TextBoundsExtractor
aTextBoundsExtractor(rVOC.GetObjectContact().getViewInformation2D());
+basegfx::B2DRange aRange =
aTextBoundsExtractor.getTextBounds(rVOC, aDisplayInfo);
+if (!aRange.isEmpty()) {
+tools::Rectangle rect(aRange.getMinX(), aRange.getMinY(),
aRange.getMaxX(), aRange.getMaxY());
+tools::Rectangle aRangeTWIP = o3tl::convert(rect,
o3tl::Length::mm100, o3tl::Length::twip);
+OString innerTextInfo = ",\"innerTextRect\":[" +
+OString::number(aRangeTWIP.getX()) + "," +
+OString::number(aRangeTWIP.getY()) + "," +
+OString::number(aRangeTWIP.GetWidth()) + "," +
+OString::number(aRangeTWIP.GetHeight()) + "]";
+
+aExtraInfo.append(innerTextInfo);
+}
+}
+
// In core, the gridOffset is calculated based on the LogicRect's
TopLeft coordinate
// In online, we have the SnapRect and we calculate it based on
its TopLeft coordinate
// SnapRect's TopLeft and LogicRect's TopLeft match unless there
is rotation
@@ -867,7 +917,7 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle
const & rRect, const S
// whether the shape is rotated or not, we will always have the
correct gridOffset
// Note that the gridOffset is calculated from the first selected
obj
basegfx::B2DVector aGridOffset(0.0, 0.0);
-if(getPossibleGridOffsetForSdrObject(aGridOffset,
GetMarkedObjectByIndex(0), GetSdrPageView()))
+if(getPossibleGridOffsetForSdrObject(aGridOffset,
GetMarkedObjectByIndex(0), pPageView))
{
Point p(aGridOffset.getX(), aGridOffset.getY());
if (convertMapMode)
core.git: Branch 'distro/collabora/co-24.04' - svx/source
svx/source/svdraw/svdmrkv.cxx | 52 +-
1 file changed, 51 insertions(+), 1 deletion(-)
New commits:
commit b203c6561a9bc5830f1d3faa74358a9484331918
Author: Pranam Lashkari
AuthorDate: Wed Feb 28 04:55:46 2024 +0530
Commit: Caolán McNamara
CommitDate: Fri Mar 1 10:42:19 2024 +0100
LOK: send inner text boundry information of shapes/textbox
Sends inner rectangle boundry info as part of
LOK_CALLBACK_GRAPHIC_SELECTION message
Change-Id: Idc51e807bec01711c8a4326e3193127f0b2cd765
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163982
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index b0784449f159..8128de702dfd 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -60,6 +61,8 @@
#include
#include
+#include
+
#include
#include
@@ -759,6 +762,30 @@ bool
SdrMarkView::dumpGluePointsToJSON(boost::property_tree::ptree& rTree)
return result;
}
+namespace
+{
+class TextBoundsExtractor final : public
drawinglayer::processor2d::TextExtractor2D
+{
+private:
+basegfx::B2DRange maTextRange;
+void processTextPrimitive2D(const
drawinglayer::primitive2d::BasePrimitive2D& rCandidate) override
+{
+maTextRange.expand(rCandidate.getB2DRange(getViewInformation2D()));
+}
+public:
+explicit TextBoundsExtractor(const
drawinglayer::geometry::ViewInformation2D& rViewInformation)
+: drawinglayer::processor2d::TextExtractor2D(rViewInformation,
true)
+{
+}
+
+basegfx::B2DRange getTextBounds(const sdr::contact::ViewObjectContact
, sdr::contact::DisplayInfo )
+{
+this->process(rVOC.getPrimitive2DSequence(raDisplayInfo));
+return maTextRange;
+}
+};
+}
+
void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const
SfxViewShell* pOtherShell)
{
SfxViewShell* pViewShell = GetSfxViewShell();
@@ -837,6 +864,8 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle
const & rRect, const S
bConnectorSelection = dumpGluePointsToJSON(aGluePointsTree);
}
+SdrPageView* pPageView = GetSdrPageView();
+
if (GetMarkedObjectCount())
{
SdrMark* pM = GetSdrMarkByIndex(0);
@@ -853,6 +882,27 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle
const & rRect, const S
+ "\",\"type\":"
+
OString::number(static_cast(pO->GetObjIdentifier(;
+if (mpMarkedObj && !pOtherShell)
+{
+const sdr::contact::ViewObjectContact& rVOC =
mpMarkedObj->GetViewContact().GetViewObjectContact(
+pPageView->GetPageWindow(0)->GetObjectContact());
+
+sdr::contact::DisplayInfo aDisplayInfo;
+TextBoundsExtractor
aTextBoundsExtractor(rVOC.GetObjectContact().getViewInformation2D());
+basegfx::B2DRange aRange =
aTextBoundsExtractor.getTextBounds(rVOC, aDisplayInfo);
+if (!aRange.isEmpty()) {
+tools::Rectangle rect(aRange.getMinX(), aRange.getMinY(),
aRange.getMaxX(), aRange.getMaxY());
+tools::Rectangle aRangeTWIP = o3tl::convert(rect,
o3tl::Length::mm100, o3tl::Length::twip);
+OString innerTextInfo = ",\"innerTextRect\":[" +
+OString::number(aRangeTWIP.getX()) + "," +
+OString::number(aRangeTWIP.getY()) + "," +
+OString::number(aRangeTWIP.GetWidth()) + "," +
+OString::number(aRangeTWIP.GetHeight()) + "]";
+
+aExtraInfo.append(innerTextInfo);
+}
+}
+
// In core, the gridOffset is calculated based on the LogicRect's
TopLeft coordinate
// In online, we have the SnapRect and we calculate it based on
its TopLeft coordinate
// SnapRect's TopLeft and LogicRect's TopLeft match unless there
is rotation
@@ -862,7 +912,7 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle
const & rRect, const S
// whether the shape is rotated or not, we will always have the
correct gridOffset
// Note that the gridOffset is calculated from the first selected
obj
basegfx::B2DVector aGridOffset(0.0, 0.0);
-if(getPossibleGridOffsetForSdrObject(aGridOffset,
GetMarkedObjectByIndex(0), GetSdrPageView()))
+if(getPossibleGridOffsetForSdrObject(aGridOffset,
GetMarkedObjectByIndex(0), pPageView))
{
Point p(aGridOffset.getX(), aGridOffset.getY());
if (convertMapMode)
core.git: sw/source
sw/source/core/doc/DocumentRedlineManager.cxx | 12 +++-
sw/source/core/doc/docredln.cxx | 36 +++---
2 files changed, 37 insertions(+), 11 deletions(-)
New commits:
commit a0bd028a00165996224c93a4eba4b6affe6743e0
Author: Pranam Lashkari
AuthorDate: Wed Feb 14 15:07:38 2024 +0530
Commit: Caolán McNamara
CommitDate: Sat Feb 17 21:49:28 2024 +0100
writer: LOK: make sure redline comment undo/redo is notified
problem:
when actions were performed on comments and changes were tracked,
LOK was not notified and actions were not reflected
Change-Id: Iad4d9338a6205278b586106e8f39769b731f18dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163357
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Gökay ŞATIR
(cherry picked from commit 0b7a9c231f66b5c2659ab3aa6a0f3c7991b9e721)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163502
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 3f5ccfc0ec5c..710baaf41b94 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -20,6 +20,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -40,6 +41,7 @@
#include
#include
#include
+#include
using namespace com::sun::star;
@@ -383,8 +385,14 @@ void UpdateFramesForRemoveDeleteRedline(SwDoc & rDoc,
SwPaM const& rPam)
// fields last - SwGetRefField::UpdateField requires up-to-date frames
UpdateFieldsForRedline(rDoc.getIDocumentFieldsAccess()); // after footnotes
-// update SwPostItMgr / notes in the margin
-rDoc.GetDocShell()->Broadcast(
+const SwTextNode *pTextNode = rPam.GetPointNode().GetTextNode();
+SwTextAttr* pTextAttr = pTextNode ?
pTextNode->GetFieldTextAttrAt(rPam.GetPoint()->GetContentIndex() - 1,
::sw::GetTextAttrMode::Default) : nullptr;
+SwTextField *const
pTextField(static_txtattr_cast(pTextAttr));
+if (pTextField && comphelper::LibreOfficeKit::isActive() )
+rDoc.GetDocShell()->Broadcast(
+SwFormatFieldHint(>GetFormatField(),
SwFormatFieldHintWhich::INSERTED));
+else
+rDoc.GetDocShell()->Broadcast(
SwFormatFieldHint(nullptr, SwFormatFieldHintWhich::INSERTED) );
}
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index b8bb35056de1..a629d9d6b432 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -1372,6 +1372,22 @@ void SwRedlineData::dumpAsXml(xmlTextWriterPtr pWriter)
const
sal_uInt32 SwRangeRedline::s_nLastId = 1;
+namespace
+{
+void lcl_LOKBroadcastCommentOperation(RedlineType type, const SwPaM& rPam)
+{
+if (comphelper::LibreOfficeKit::isActive())
+{
+auto eHintType = RedlineType::Delete == type ?
SwFormatFieldHintWhich::REDLINED_DELETION: SwFormatFieldHintWhich::INSERTED;
+const SwTextNode *pTextNode = rPam.GetPointNode().GetTextNode();
+SwTextAttr* pTextAttr = pTextNode ?
pTextNode->GetFieldTextAttrAt(rPam.GetPoint()->GetContentIndex() - 1,
::sw::GetTextAttrMode::Default) : nullptr;
+SwTextField *const
pTextField(static_txtattr_cast(pTextAttr));
+if (pTextField)
+
const_cast(pTextField->GetFormatField()).Broadcast(SwFormatFieldHint(>GetFormatField(),
eHintType));
+}
+}
+} // anonymous namespace
+
SwRangeRedline::SwRangeRedline(RedlineType eTyp, const SwPaM& rPam, sal_uInt32
nMovedID )
: SwPaM( *rPam.GetMark(), *rPam.GetPoint() ), m_pRedlineData(
new SwRedlineData(eTyp,
GetDoc().getIDocumentRedlineAccess().GetRedlineAuthor(), nMovedID ) )
@@ -1393,15 +1409,7 @@ SwRangeRedline::SwRangeRedline(RedlineType eTyp, const
SwPaM& rPam, sal_uInt32 n
? SwResId(STR_REDLINE_COMMENT_DELETED)
: SwResId(STR_REDLINE_COMMENT_ADDED) );
-if (comphelper::LibreOfficeKit::isActive())
-{
-auto eHintType = RedlineType::Delete == eTyp ?
SwFormatFieldHintWhich::REDLINED_DELETION: SwFormatFieldHintWhich::INSERTED;
-const SwTextNode *pTextNode = rPam.GetPointNode().GetTextNode();
-SwTextAttr* pTextAttr = pTextNode ?
pTextNode->GetFieldTextAttrAt(rPam.GetPoint()->GetContentIndex() - 1,
::sw::GetTextAttrMode::Default) : nullptr;
-SwTextField *const
pTextField(static_txtattr_cast(pTextAttr));
-if (pTextField)
-
const_cast(pTextField->GetFormatField()).Broadcast(SwFormatFieldHint(>GetFormatField(),
eHintType));
-}
+lcl_LOKBroadcastCommentOperation(eTyp, rPam);
}
}
@@ -1417,6 +1425,16 @@ SwRangeRedline::SwRangeRedline( const SwRedlineData&
rData, const SwPaM& rPam )
m_bIsVisible = true;
if( !rPam.HasMark() )
DeleteMark();
+
+// set default comment for single annotations added or deleted
+if (
core.git: sw/source
sw/source/core/crsr/pam.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 974d6b443208050b0aa3ae8df32e121ab7a474ec
Author: Pranam Lashkari
AuthorDate: Fri Feb 16 00:59:49 2024 +0530
Commit: Caolán McNamara
CommitDate: Sat Feb 17 20:21:06 2024 +0100
avoid using subView on empty OUString
it causes assertion failure
rtl::OUString SwPaM::GetText() const: Assertion `(nEnd-nStart) ==
(aTmpStr.getLength() - nStart)' failed
Change-Id: Ie479f224e8a1516735f96c3a09181d4c46dba10d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163461
Reviewed-by: Noel Grandin
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Gökay ŞATIR
(cherry picked from commit 0b0b70772f2d9836010e523bff0132b626713862)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163501
Tested-by: Jenkins
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 79d9718b59fd..6fc9c6f5d6b7 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -1323,7 +1323,7 @@ OUString SwPaM::GetText() const
}
const OUString& aTmpStr = pTextNode->GetText();
-if (bIsStartNode || bIsEndNode)
+if (!aTmpStr.isEmpty() && (bIsStartNode || bIsEndNode))
{
// Handle corner cases of start/end node(s)
const sal_Int32 nStart = bIsStartNode
core.git: Branch 'distro/collabora/co-24.04' - sw/source
sw/source/core/doc/DocumentRedlineManager.cxx | 12 +++-
sw/source/core/doc/docredln.cxx | 36 +++---
2 files changed, 37 insertions(+), 11 deletions(-)
New commits:
commit 5952bde2ad94f27cc7b5111266abbdd90552e564
Author: Pranam Lashkari
AuthorDate: Wed Feb 14 15:07:38 2024 +0530
Commit: Pranam Lashkari
CommitDate: Fri Feb 16 15:51:50 2024 +0100
writer: LOK: make sure redline comment undo/redo is notified
problem:
when actions were performed on comments and changes were tracked,
LOK was not notified and actions were not reflected
Change-Id: Iad4d9338a6205278b586106e8f39769b731f18dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163357
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Gökay ŞATIR
(cherry picked from commit 0b7a9c231f66b5c2659ab3aa6a0f3c7991b9e721)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163500
Reviewed-by: Pranam Lashkari
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 8d52c814e81a..1c6ba5ccd482 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -20,6 +20,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -40,6 +41,7 @@
#include
#include
#include
+#include
using namespace com::sun::star;
@@ -383,8 +385,14 @@ void UpdateFramesForRemoveDeleteRedline(SwDoc & rDoc,
SwPaM const& rPam)
// fields last - SwGetRefField::UpdateField requires up-to-date frames
UpdateFieldsForRedline(rDoc.getIDocumentFieldsAccess()); // after footnotes
-// update SwPostItMgr / notes in the margin
-rDoc.GetDocShell()->Broadcast(
+const SwTextNode *pTextNode = rPam.GetPointNode().GetTextNode();
+SwTextAttr* pTextAttr = pTextNode ?
pTextNode->GetFieldTextAttrAt(rPam.GetPoint()->GetContentIndex() - 1,
::sw::GetTextAttrMode::Default) : nullptr;
+SwTextField *const
pTextField(static_txtattr_cast(pTextAttr));
+if (pTextField && comphelper::LibreOfficeKit::isActive() )
+rDoc.GetDocShell()->Broadcast(
+SwFormatFieldHint(>GetFormatField(),
SwFormatFieldHintWhich::INSERTED));
+else
+rDoc.GetDocShell()->Broadcast(
SwFormatFieldHint(nullptr, SwFormatFieldHintWhich::INSERTED) );
}
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 45af1e8e3f85..6093001bf086 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -1372,6 +1372,22 @@ void SwRedlineData::dumpAsXml(xmlTextWriterPtr pWriter)
const
sal_uInt32 SwRangeRedline::s_nLastId = 1;
+namespace
+{
+void lcl_LOKBroadcastCommentOperation(RedlineType type, const SwPaM& rPam)
+{
+if (comphelper::LibreOfficeKit::isActive())
+{
+auto eHintType = RedlineType::Delete == type ?
SwFormatFieldHintWhich::REDLINED_DELETION: SwFormatFieldHintWhich::INSERTED;
+const SwTextNode *pTextNode = rPam.GetPointNode().GetTextNode();
+SwTextAttr* pTextAttr = pTextNode ?
pTextNode->GetFieldTextAttrAt(rPam.GetPoint()->GetContentIndex() - 1,
::sw::GetTextAttrMode::Default) : nullptr;
+SwTextField *const
pTextField(static_txtattr_cast(pTextAttr));
+if (pTextField)
+
const_cast(pTextField->GetFormatField()).Broadcast(SwFormatFieldHint(>GetFormatField(),
eHintType));
+}
+}
+} // anonymous namespace
+
SwRangeRedline::SwRangeRedline(RedlineType eTyp, const SwPaM& rPam, sal_uInt32
nMovedID )
: SwPaM( *rPam.GetMark(), *rPam.GetPoint() ), m_pRedlineData(
new SwRedlineData(eTyp,
GetDoc().getIDocumentRedlineAccess().GetRedlineAuthor(), nMovedID ) )
@@ -1393,15 +1409,7 @@ SwRangeRedline::SwRangeRedline(RedlineType eTyp, const
SwPaM& rPam, sal_uInt32 n
? SwResId(STR_REDLINE_COMMENT_DELETED)
: SwResId(STR_REDLINE_COMMENT_ADDED) );
-if (comphelper::LibreOfficeKit::isActive())
-{
-auto eHintType = RedlineType::Delete == eTyp ?
SwFormatFieldHintWhich::REDLINED_DELETION: SwFormatFieldHintWhich::INSERTED;
-const SwTextNode *pTextNode = rPam.GetPointNode().GetTextNode();
-SwTextAttr* pTextAttr = pTextNode ?
pTextNode->GetFieldTextAttrAt(rPam.GetPoint()->GetContentIndex() - 1,
::sw::GetTextAttrMode::Default) : nullptr;
-SwTextField *const
pTextField(static_txtattr_cast(pTextAttr));
-if (pTextField)
-
const_cast(pTextField->GetFormatField()).Broadcast(SwFormatFieldHint(>GetFormatField(),
eHintType));
-}
+lcl_LOKBroadcastCommentOperation(eTyp, rPam);
}
}
@@ -1417,6 +1425,16 @@ SwRangeRedline::SwRangeRedline( const SwRedlineData&
rData, const SwPaM& rPam )
m_bIsVisible = true;
if( !rPam.HasMark() )
DeleteMark();
+
+// set default comment for single annotations added or deleted
+if ( IsAnnotation() )
+{
+
core.git: Branch 'distro/collabora/co-24.04' - sw/source
sw/source/core/crsr/pam.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f7a570fd5d64ba2964a33ac4c5ecfe9f236d316b
Author: Pranam Lashkari
AuthorDate: Fri Feb 16 00:59:49 2024 +0530
Commit: Pranam Lashkari
CommitDate: Fri Feb 16 14:00:05 2024 +0100
avoid using subView on empty OUString
it causes assertion failure
rtl::OUString SwPaM::GetText() const: Assertion `(nEnd-nStart) ==
(aTmpStr.getLength() - nStart)' failed
Change-Id: Ie479f224e8a1516735f96c3a09181d4c46dba10d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163461
Reviewed-by: Noel Grandin
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Gökay ŞATIR
(cherry picked from commit 0b0b70772f2d9836010e523bff0132b626713862)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163499
Reviewed-by: Pranam Lashkari
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 25bf8d0ef68e..14552d33a912 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -1325,7 +1325,7 @@ OUString SwPaM::GetText() const
}
const OUString& aTmpStr = pTextNode->GetText();
-if (bIsStartNode || bIsEndNode)
+if (aTmpStr.getLength() > 0 && (bIsStartNode || bIsEndNode))
{
// Handle corner cases of start/end node(s)
const sal_Int32 nStart = bIsStartNode
core.git: Branch 'distro/collabora/co-23.05' - 2 commits - sw/source
sw/source/core/crsr/pam.cxx |2 -
sw/source/core/doc/DocumentRedlineManager.cxx | 12 +++--
sw/source/core/doc/docredln.cxx | 33 ++
3 files changed, 35 insertions(+), 12 deletions(-)
New commits:
commit 0b7a9c231f66b5c2659ab3aa6a0f3c7991b9e721
Author: Pranam Lashkari
AuthorDate: Wed Feb 14 15:07:38 2024 +0530
Commit: Pranam Lashkari
CommitDate: Fri Feb 16 13:16:54 2024 +0100
writer: LOK: make sure redline comment undo/redo is notified
problem:
when actions were performed on comments and changes were tracked,
LOK was not notified and actions were not reflected
Change-Id: Iad4d9338a6205278b586106e8f39769b731f18dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163357
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Gökay ŞATIR
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 657a67a61720..ffcab9b1f24f 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -20,6 +20,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -39,6 +40,7 @@
#include
#include
#include
+#include
using namespace com::sun::star;
@@ -382,8 +384,14 @@ void UpdateFramesForRemoveDeleteRedline(SwDoc & rDoc,
SwPaM const& rPam)
// fields last - SwGetRefField::UpdateField requires up-to-date frames
UpdateFieldsForRedline(rDoc.getIDocumentFieldsAccess()); // after footnotes
-// update SwPostItMgr / notes in the margin
-rDoc.GetDocShell()->Broadcast(
+const SwTextNode *pTextNode = rPam.GetPointNode().GetTextNode();
+SwTextAttr* pTextAttr = pTextNode ?
pTextNode->GetFieldTextAttrAt(rPam.GetPoint()->GetContentIndex() - 1,
::sw::GetTextAttrMode::Default) : nullptr;
+SwTextField *const
pTextField(static_txtattr_cast(pTextAttr));
+if (pTextField && comphelper::LibreOfficeKit::isActive() )
+rDoc.GetDocShell()->Broadcast(
+SwFormatFieldHint(>GetFormatField(),
SwFormatFieldHintWhich::INSERTED));
+else
+rDoc.GetDocShell()->Broadcast(
SwFormatFieldHint(nullptr, SwFormatFieldHintWhich::INSERTED) );
}
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 4e03aab32ff6..afe7dfed5686 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -1305,6 +1305,19 @@ OUString SwRedlineData::GetDescr() const
sal_uInt32 SwRangeRedline::s_nLastId = 1;
+void lcl_LOKBroadcastCommentOperation(RedlineType type, const SwPaM& rPam)
+{
+if (comphelper::LibreOfficeKit::isActive())
+{
+auto eHintType = RedlineType::Delete == type ?
SwFormatFieldHintWhich::REDLINED_DELETION: SwFormatFieldHintWhich::INSERTED;
+const SwTextNode *pTextNode = rPam.GetPointNode().GetTextNode();
+SwTextAttr* pTextAttr = pTextNode ?
pTextNode->GetFieldTextAttrAt(rPam.GetPoint()->GetContentIndex() - 1,
::sw::GetTextAttrMode::Default) : nullptr;
+SwTextField *const
pTextField(static_txtattr_cast(pTextAttr));
+if (pTextField)
+
const_cast(pTextField->GetFormatField()).Broadcast(SwFormatFieldHint(>GetFormatField(),
eHintType));
+}
+}
+
SwRangeRedline::SwRangeRedline(RedlineType eTyp, const SwPaM& rPam, sal_uInt32
nMovedID )
: SwPaM( *rPam.GetMark(), *rPam.GetPoint() ), m_pRedlineData(
new SwRedlineData(eTyp,
GetDoc().getIDocumentRedlineAccess().GetRedlineAuthor(), nMovedID ) )
@@ -1326,15 +1339,7 @@ SwRangeRedline::SwRangeRedline(RedlineType eTyp, const
SwPaM& rPam, sal_uInt32 n
? SwResId(STR_REDLINE_COMMENT_DELETED)
: SwResId(STR_REDLINE_COMMENT_ADDED) );
-if (comphelper::LibreOfficeKit::isActive())
-{
-auto eHintType = RedlineType::Delete == eTyp ?
SwFormatFieldHintWhich::REDLINED_DELETION: SwFormatFieldHintWhich::INSERTED;
-const SwTextNode *pTextNode = rPam.GetPointNode().GetTextNode();
-SwTextAttr* pTextAttr = pTextNode ?
pTextNode->GetFieldTextAttrAt(rPam.GetPoint()->GetContentIndex() - 1,
::sw::GetTextAttrMode::Default) : nullptr;
-SwTextField *const
pTextField(static_txtattr_cast(pTextAttr));
-if (pTextField)
-
const_cast(pTextField->GetFormatField()).Broadcast(SwFormatFieldHint(>GetFormatField(),
eHintType));
-}
+lcl_LOKBroadcastCommentOperation(eTyp, rPam);
}
}
@@ -1350,6 +1355,16 @@ SwRangeRedline::SwRangeRedline( const SwRedlineData&
rData, const SwPaM& rPam )
m_bIsVisible = true;
if( !rPam.HasMark() )
DeleteMark();
+
+// set default comment for single annotations added or deleted
+if ( IsAnnotation() )
+{
+SetComment( RedlineType::Delete == rData.m_eType
+? SwResId(STR_REDLINE_COMMENT_DELETED)
+: SwResId(STR_REDLINE_COMMENT_ADDED) );
+
+
core.git: Branch 'distro/collabora/co-24.04' - sw/source
sw/source/uibase/docvw/PostItMgr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cdbb0a77d142ee10a3f7a90f14f1ef28463e3cde
Author: Pranam Lashkari
AuthorDate: Tue Feb 6 13:27:41 2024 +0530
Commit: Pranam Lashkari
CommitDate: Tue Feb 13 12:20:20 2024 +0100
writer:LOK: make sure deleted comment is not notified incorrectly
problem:
on saving the existing docummunet with tracked deleted comment,
LOK gets comment added msg for those comments
Change-Id: I5c63a57215bf7416412604530af4a6c69358
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163040
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163156
Tested-by: Jenkins
(cherry picked from commit 7327752ef5d1fa2239cdd8355fb78da41c282717)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163275
Reviewed-by: Gökay ŞATIR
Tested-by: Pranam Lashkari
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx
b/sw/source/uibase/docvw/PostItMgr.cxx
index dee622d4b502..d9eaa7fa324a 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -900,7 +900,7 @@ void SwPostItMgr::LayoutPostIts()
{
if (bLoKitActive && !bTiledAnnotations)
{
-if (visiblePostIt->GetSidebarItem().mbPendingLayout)
+if (visiblePostIt->GetSidebarItem().mbPendingLayout &&
visiblePostIt->GetSidebarItem().mLayoutStatus != SwPostItHelper::DELETED)
lcl_CommentNotification(mpView,
CommentNotificationType::Add, >GetSidebarItem(), 0);
else if (visiblePostIt->IsAnchorRectChanged())
{
core.git: 2 commits - sw/inc sw/source
sw/inc/fmtfld.hxx|3 ++-
sw/source/core/doc/docredln.cxx | 20
sw/source/uibase/docvw/PostItMgr.cxx | 13 +
sw/source/uibase/uno/unotxdoc.cxx|1 +
4 files changed, 32 insertions(+), 5 deletions(-)
New commits:
commit 7327752ef5d1fa2239cdd8355fb78da41c282717
Author: Pranam Lashkari
AuthorDate: Tue Feb 6 13:27:41 2024 +0530
Commit: Caolán McNamara
CommitDate: Fri Feb 9 11:53:30 2024 +0100
writer:LOK: make sure deleted comment is not notified incorrectly
problem:
on saving the existing docummunet with tracked deleted comment,
LOK gets comment added msg for those comments
Change-Id: I5c63a57215bf7416412604530af4a6c69358
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163040
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163156
Tested-by: Jenkins
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx
b/sw/source/uibase/docvw/PostItMgr.cxx
index ad3c39965c84..32d0f938e71c 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -897,7 +897,7 @@ void SwPostItMgr::LayoutPostIts()
{
if (bLoKitActive && !bTiledAnnotations)
{
-if (visiblePostIt->GetSidebarItem().mbPendingLayout)
+if (visiblePostIt->GetSidebarItem().mbPendingLayout &&
visiblePostIt->GetSidebarItem().mLayoutStatus != SwPostItHelper::DELETED)
lcl_CommentNotification(mpView,
CommentNotificationType::Add, >GetSidebarItem(), 0);
else if (visiblePostIt->IsAnchorRectChanged())
{
commit 48d2d456d8bcb296b4b2f6cc2d1184f9d799f070
Author: Gökay Şatır
AuthorDate: Tue Jan 30 16:41:04 2024 +0300
Commit: Caolán McNamara
CommitDate: Fri Feb 9 11:53:23 2024 +0100
Writer: Improve redline communication with libreofficeKit.
When changes are tracked and user adds / removes a comment, we need a
better communication.
This PR improves the communication and sends the layout status of comments.
Still there are things to do, like (while tracking is on):
* We need to communicate when a change in comment is approved / rejected.
* When user performs an undo on the removed comment.
Signed-off-by: Gökay Şatır
Change-Id: Ia3ea4b44c116cc571337e57960aa4f12f934701c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162756
Tested-by: Jenkins CollaboraOffice
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163155
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index ab1953f00114..ff9f06e5dc66 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -177,7 +177,8 @@ enum class SwFormatFieldHintWhich
REMOVED= 2,
FOCUS = 3,
CHANGED= 4,
-RESOLVED = 5
+RESOLVED = 5,
+REDLINED_DELETION = 6
};
/// This SfxHint subclass is produced by code that changes the doc model (e.g.
SwNodes::ChgNode()),
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 3b0f8d7b9f53..45af1e8e3f85 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -1392,6 +1392,16 @@ SwRangeRedline::SwRangeRedline(RedlineType eTyp, const
SwPaM& rPam, sal_uInt32 n
SetComment( RedlineType::Delete == eTyp
? SwResId(STR_REDLINE_COMMENT_DELETED)
: SwResId(STR_REDLINE_COMMENT_ADDED) );
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+auto eHintType = RedlineType::Delete == eTyp ?
SwFormatFieldHintWhich::REDLINED_DELETION: SwFormatFieldHintWhich::INSERTED;
+const SwTextNode *pTextNode = rPam.GetPointNode().GetTextNode();
+SwTextAttr* pTextAttr = pTextNode ?
pTextNode->GetFieldTextAttrAt(rPam.GetPoint()->GetContentIndex() - 1,
::sw::GetTextAttrMode::Default) : nullptr;
+SwTextField *const
pTextField(static_txtattr_cast(pTextAttr));
+if (pTextField)
+
const_cast(pTextField->GetFormatField()).Broadcast(SwFormatFieldHint(>GetFormatField(),
eHintType));
+}
}
}
@@ -1690,6 +1700,16 @@ void SwRangeRedline::InvalidateRange(Invalidation const
eWhy)
sw::RedlineUnDelText const hint(nStart, nLen);
pNd->CallSwClientNotify(hint);
}
+
+if (comphelper::LibreOfficeKit::isActive() && IsAnnotation())
+{
+auto eHintType = eWhy == Invalidation::Add ?
SwFormatFieldHintWhich::INSERTED: SwFormatFieldHintWhich::REMOVED;
+const SwTextNode *pTextNode =
this->GetPointNode().GetTextNode();
+SwTextAttr* pTextAttr = pTextNode ?
core.git: Branch 'distro/collabora/co-23.05' - sw/source
sw/source/uibase/docvw/PostItMgr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 02ea2babaee02896b7dc3be154f10ccf1e412b0b
Author: Pranam Lashkari
AuthorDate: Tue Feb 6 13:27:41 2024 +0530
Commit: Caolán McNamara
CommitDate: Thu Feb 8 20:48:08 2024 +0100
writer:LOK: make sure deleted comment is not notified incorrectly
problem:
on saving the existing docummunet with tracked deleted comment,
LOK gets comment added msg for those comments
Change-Id: I5c63a57215bf7416412604530af4a6c69358
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163040
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx
b/sw/source/uibase/docvw/PostItMgr.cxx
index bbc9b15ca322..ee7cb16685f2 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -912,7 +912,7 @@ void SwPostItMgr::LayoutPostIts()
{
if (bLoKitActive && !bTiledAnnotations)
{
-if (visiblePostIt->GetSidebarItem().mbPendingLayout)
+if (visiblePostIt->GetSidebarItem().mbPendingLayout &&
visiblePostIt->GetSidebarItem().mLayoutStatus != SwPostItHelper::DELETED)
lcl_CommentNotification(mpView,
CommentNotificationType::Add, >GetSidebarItem(), 0);
else if (visiblePostIt->IsAnchorRectChanged())
{
core.git: Branch 'distro/collabora/co-23.05' - vcl/source
vcl/source/control/fmtfield.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f3db33ce067a9ab9b5d060880d5ce6645a667a81
Author: Pranam Lashkari
AuthorDate: Mon Jan 29 20:06:51 2024 +0530
Commit: Pranam Lashkari
CommitDate: Tue Jan 30 08:16:30 2024 +0100
LOK: fixed unused variable warning
Change-Id: I70d82980979540cc998feb12f7bd262c28e44a20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162692
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pranam Lashkari
diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx
index e4b1f1dbfb46..5419164d7c65 100644
--- a/vcl/source/control/fmtfield.cxx
+++ b/vcl/source/control/fmtfield.cxx
@@ -1361,7 +1361,7 @@ void
FormattedField::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
SpinField::DumpAsPropertyTree(rJsonWriter);
Formatter& rFormatter = GetFormatter();
-if (weld::TimeFormatter* timeFormatter =
dynamic_cast())
+if (dynamic_cast())
{
// weld::TimeFormatter uses h24 format
rJsonWriter.put("type", "time");
core.git: Branch 'distro/collabora/co-24.04' - editeng/source
editeng/source/uno/unotext.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit a7ef4590e878f6c8014575c417479ab541f8a028
Author: Pranam Lashkari
AuthorDate: Fri Dec 15 10:10:12 2023 +0530
Commit: Andras Timar
CommitDate: Mon Jan 15 21:26:00 2024 +0100
Keep selection as after copying the text
This also aligns code with 'else' branch behaviour
problem:
in online when coping a slide with comment,
comment text was never copied in online,
it required document to reload to show it correctly
Change-Id: I6d444c10808ef23f282370b4b305c41eb5043b76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160812
Tested-by: Jenkins CollaboraOffice
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
(cherry picked from commit db7faa06762ac902ff56ecbab3fff763951146e1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160943
Tested-by: Jenkins
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index f74d7f67c328..a10fd66fdf9a 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2217,6 +2217,7 @@ void SvxUnoTextBase::copyText(
{
pTextForwarder->CopyText( *pSourceTextForwarder );
pEditSource->UpdateData();
+SetSelection(pSource->GetSelection());
}
}
else
core.git: editeng/source
editeng/source/uno/unotext.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 9ca22d44e5293f3335a2b475ccef157d31c60b94
Author: Pranam Lashkari
AuthorDate: Fri Dec 15 10:10:12 2023 +0530
Commit: Caolán McNamara
CommitDate: Tue Dec 19 17:58:48 2023 +0100
Keep selection as after copying the text
This also aligns code with 'else' branch behaviour
problem:
in online when coping a slide with comment,
comment text was never copied in online,
it required document to reload to show it correctly
Change-Id: I6d444c10808ef23f282370b4b305c41eb5043b76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160812
Tested-by: Jenkins CollaboraOffice
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
(cherry picked from commit db7faa06762ac902ff56ecbab3fff763951146e1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160943
Tested-by: Jenkins
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index f74d7f67c328..a10fd66fdf9a 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2217,6 +2217,7 @@ void SvxUnoTextBase::copyText(
{
pTextForwarder->CopyText( *pSourceTextForwarder );
pEditSource->UpdateData();
+SetSelection(pSource->GetSelection());
}
}
else
core.git: Branch 'distro/collabora/co-23.05' - editeng/source
editeng/source/uno/unotext.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit db7faa06762ac902ff56ecbab3fff763951146e1
Author: Pranam Lashkari
AuthorDate: Fri Dec 15 10:10:12 2023 +0530
Commit: Caolán McNamara
CommitDate: Tue Dec 19 10:30:24 2023 +0100
Keep selection as after copying the text
This also aligns code with 'else' branch behaviour
problem:
in online when coping a slide with comment,
comment text was never copied in online,
it required document to reload to show it correctly
Change-Id: I6d444c10808ef23f282370b4b305c41eb5043b76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160812
Tested-by: Jenkins CollaboraOffice
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index fdc9ca85fd0e..0deca73d6978 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2145,6 +2145,7 @@ void SvxUnoTextBase::copyText(
{
pTextForwarder->CopyText( *pSourceTextForwarder );
pEditSource->UpdateData();
+SetSelection(pSource->GetSelection());
}
}
else
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - drawinglayer/source
drawinglayer/source/processor2d/vclprocessor2d.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 3e180c01f0d304c7b19b623c083a1634079d5c87 Author: Pranam Lashkari AuthorDate: Mon Jun 26 22:28:06 2023 +0700 Commit: Michael Weghorn CommitDate: Wed Nov 22 12:54:39 2023 +0100 vcl: render scaled fonts for LOK problem: In online calc when fonts are not scaled, text box disappears when not active Change-Id: I9c8fdb3c0d14a3e7ed502ddb2b46c0769a855280 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153624 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 6460c685c3bc3f4929263c7681080056b59948fe) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153654 Tested-by: Jenkins Reviewed-by: Pranam Lashkari (cherry picked from commit cf17d5384cc8e254684bc1423176ad8562d49bee) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159752 Reviewed-by: Michael Weghorn diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index ad680803438d..029ee10f9b41 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -23,6 +23,7 @@ #include "vclhelperbufferdevice.hxx" #include #include +#include #include #include #include @@ -162,7 +163,8 @@ void VclProcessor2D::RenderTextSimpleOrDecoratedPortionPrimitive2D( // tdf#153092 Ideally we don't have to scale the font and dxarray, but we might have // to nevertheless if dealing with non integer sizes -const bool bScaleFont(aFontSize.getY() != std::round(aFontSize.getY())); +const bool bScaleFont(aFontSize.getY() != std::round(aFontSize.getY()) + || comphelper::LibreOfficeKit::isActive()); vcl::Font aFont; // Get the VCL font
[Libreoffice-commits] core.git: desktop/source sfx2/source
desktop/source/lib/init.cxx |3 ++-
sfx2/source/control/unoctitm.cxx |3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit b83f069101f1e6d8aaac09a805f02bbc4c619e7a
Author: Pranam Lashkari
AuthorDate: Wed Jul 26 16:39:49 2023 +0700
Commit: Pranam Lashkari
CommitDate: Wed Oct 18 23:57:18 2023 +0200
LOK: send state of protected cells
Change-Id: I432a3af50b6089faa80a28804d95d816af6cd278
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154936
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-by: Pranam Lashkari
(cherry picked from commit 5f13751cefd725cb2a38e66c9484046e6141c6c2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158150
Tested-by: Jenkins
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6d9697d60aed..416265df4099 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3842,7 +3842,8 @@ static void doc_iniUnoCommands ()
OUString(".uno:InsertDropdownContentControl"),
OUString(".uno:InsertPlainTextContentControl"),
OUString(".uno:InsertPictureContentControl"),
-OUString(".uno:DataFilterAutoFilter")
+OUString(".uno:DataFilterAutoFilter"),
+OUString(".uno:CellProtection")
};
util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 89e94caff794..1f3f37f5fc1b 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -935,7 +935,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID,
SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "SpacePara1" ||
aEvent.FeatureURL.Path == "SpacePara15" ||
aEvent.FeatureURL.Path == "SpacePara2" ||
-aEvent.FeatureURL.Path == "DataFilterAutoFilter")
+aEvent.FeatureURL.Path == "DataFilterAutoFilter" ||
+aEvent.FeatureURL.Path == "CellProtection")
{
bool bTemp = false;
aEvent.State >>= bTemp;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - desktop/source sfx2/source
desktop/source/lib/init.cxx |3 ++-
sfx2/source/control/unoctitm.cxx |3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit f3c956ae8825abab59e7dbc1e39da4f5d4a1658c
Author: Pranam Lashkari
AuthorDate: Wed Jul 26 16:39:49 2023 +0700
Commit: Pranam Lashkari
CommitDate: Wed Oct 18 22:54:06 2023 +0200
LOK: send state of protected cells
Change-Id: I432a3af50b6089faa80a28804d95d816af6cd278
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154936
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-by: Pranam Lashkari
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5b50b0d8181c..d4b507004a9d 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3846,7 +3846,8 @@ static void doc_iniUnoCommands ()
OUString(".uno:InsertDropdownContentControl"),
OUString(".uno:InsertPlainTextContentControl"),
OUString(".uno:InsertPictureContentControl"),
-OUString(".uno:DataFilterAutoFilter")
+OUString(".uno:DataFilterAutoFilter"),
+OUString(".uno:CellProtection")
};
util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index fad61699db90..73d2d88ddc1b 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -951,7 +951,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID,
SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "SpacePara1" ||
aEvent.FeatureURL.Path == "SpacePara15" ||
aEvent.FeatureURL.Path == "SpacePara2" ||
-aEvent.FeatureURL.Path == "DataFilterAutoFilter")
+aEvent.FeatureURL.Path == "DataFilterAutoFilter" ||
+aEvent.FeatureURL.Path == "CellProtection")
{
bool bTemp = false;
aEvent.State >>= bTemp;
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/utlui/content.cxx | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 5af582071da444af338c8cd0a9657f73f9a5f52f
Author: Pranam Lashkari
AuthorDate: Tue Aug 29 17:37:38 2023 +0800
Commit: Caolán McNamara
CommitDate: Mon Oct 16 09:43:23 2023 +0200
LOK: update navigator instantly on heading level change
problem:
i.e: when you change the header level,
it was not reflected instantly in navigator and required reopening it.
That was due to header level change was not registed as change in LOK case
Change-Id: I503eb6a3fe9d2801ea5b45b0a1096e8174360ddc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156239
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Attila Szűcs
(cherry picked from commit 1fca94be7fafc305cf02c0134fbc2d7e5cfb2a03)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157967
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index ca4e431f8038..a5079e411331 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3024,18 +3024,24 @@ bool SwContentTree::HasContentChanged()
// In case of LOK, empty contentTypes are hidden, even in all
content view
// so it is not enough to check only the m_xTreeView.
bool bCountChanged = false;
+bool bHasContentChanged = false;
for (ContentTypeId i : o3tl::enumrange())
{
if (m_aActiveContentArr[i])
{
auto nLastTMCount =
m_aActiveContentArr[i]->GetMemberCount();
-m_aActiveContentArr[i]->FillMemberList();
+if (i == ContentTypeId::OUTLINE) // this is required for
checking if header level is changed
+
m_aActiveContentArr[i]->FillMemberList();
+else
+m_aActiveContentArr[i]->FillMemberList();
// If the member count of a type is changed, then the
content is surely changed
if (m_aActiveContentArr[i]->GetMemberCount() !=
nLastTMCount)
bCountChanged = true;
+if (bHasContentChanged)
+bContentChanged = true;
}
}
-if (bCountChanged)
+if (bCountChanged || bContentChanged)
return true;
}
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/processor2d/vclprocessor2d.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit cf17d5384cc8e254684bc1423176ad8562d49bee Author: Pranam Lashkari AuthorDate: Mon Jun 26 22:28:06 2023 +0700 Commit: Pranam Lashkari CommitDate: Mon Oct 9 19:12:34 2023 +0200 vcl: render scaled fonts for LOK problem: In online calc when fonts are not scaled, text box disappears when not active Change-Id: I9c8fdb3c0d14a3e7ed502ddb2b46c0769a855280 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153624 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 6460c685c3bc3f4929263c7681080056b59948fe) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153654 Tested-by: Jenkins Reviewed-by: Pranam Lashkari diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 3ad89f1cab63..2c3521ace0dd 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -23,6 +23,7 @@ #include "vclhelperbufferdevice.hxx" #include #include +#include #include #include #include @@ -162,7 +163,8 @@ void VclProcessor2D::RenderTextSimpleOrDecoratedPortionPrimitive2D( // tdf#153092 Ideally we don't have to scale the font and dxarray, but we might have // to nevertheless if dealing with non integer sizes -const bool bScaleFont(aFontSize.getY() != std::round(aFontSize.getY())); +const bool bScaleFont(aFontSize.getY() != std::round(aFontSize.getY()) + || comphelper::LibreOfficeKit::isActive()); vcl::Font aFont; // Get the VCL font
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source
sw/source/uibase/utlui/content.cxx | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 1fca94be7fafc305cf02c0134fbc2d7e5cfb2a03
Author: Pranam Lashkari
AuthorDate: Tue Aug 29 17:37:38 2023 +0800
Commit: Pranam Lashkari
CommitDate: Wed Aug 30 12:54:05 2023 +0200
LOK: update navigator instantly on heading level change
problem:
i.e: when you change the header level,
it was not reflected instantly in navigator and required reopening it.
That was due to header level change was not registed as change in LOK case
Change-Id: I503eb6a3fe9d2801ea5b45b0a1096e8174360ddc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156239
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Attila Szűcs
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index c837124b723c..03d46e4a8cc2 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2991,18 +2991,24 @@ bool SwContentTree::HasContentChanged()
// In case of LOK, empty contentTypes are hidden, even in all
content view
// so it is not enough to check only the m_xTreeView.
bool bCountChanged = false;
+bool bHasContentChanged = false;
for (ContentTypeId i : o3tl::enumrange())
{
if (m_aActiveContentArr[i])
{
auto nLastTMCount =
m_aActiveContentArr[i]->GetMemberCount();
-m_aActiveContentArr[i]->FillMemberList();
+if (i == ContentTypeId::OUTLINE) // this is required for
checking if header level is changed
+
m_aActiveContentArr[i]->FillMemberList();
+else
+m_aActiveContentArr[i]->FillMemberList();
// If the member count of a type is changed, then the
content is surely changed
if (m_aActiveContentArr[i]->GetMemberCount() !=
nLastTMCount)
bCountChanged = true;
+if (bHasContentChanged)
+bContentChanged = true;
}
}
-if (bCountChanged)
+if (bCountChanged || bContentChanged)
return true;
}
[Libreoffice-commits] core.git: vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit f5dbb93f102033b552ecfc0b959b45c1e9b3bacb Author: Pranam Lashkari AuthorDate: Tue Mar 21 21:22:13 2023 +0530 Commit: Szymon Kłos CommitDate: Wed Jul 12 15:41:46 2023 +0200 jsdialog: enabled readonly content warning dialog Change-Id: I12e9af2e55902862df557ea4fe36a7463d6a95f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149277 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154330 Tested-by: Jenkins diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index d58839e33af7..bc80fa12109f 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -180,6 +180,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/frmtypepage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" || rUIFile == u"modules/swriter/ui/indexentry.ui" +|| rUIFile == u"modules/swriter/ui/inforeadonlydialog.ui" || rUIFile == u"modules/swriter/ui/insertbreak.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" || rUIFile == u"modules/swriter/ui/insertsectiondialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - drawinglayer/source
drawinglayer/source/processor2d/vclprocessor2d.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 6460c685c3bc3f4929263c7681080056b59948fe Author: Pranam Lashkari AuthorDate: Mon Jun 26 22:28:06 2023 +0700 Commit: Caolán McNamara CommitDate: Tue Jun 27 10:58:10 2023 +0200 vcl: render scaled fonts for LOK problem: In online calc when fonts are not scaled, text box disappears when not active Change-Id: I9c8fdb3c0d14a3e7ed502ddb2b46c0769a855280 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153624 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 393c4c64d8e8..0fbeb692dd1a 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -23,6 +23,7 @@ #include "vclhelperbufferdevice.hxx" #include #include +#include #include #include #include @@ -162,7 +163,7 @@ void VclProcessor2D::RenderTextSimpleOrDecoratedPortionPrimitive2D( // tdf#153092 Ideally we don't have to scale the font and dxarray, but we might have // to nevertheless if dealing with non integer sizes -const bool bScaleFont(aFontSize.getY() != std::round(aFontSize.getY())); +const bool bScaleFont(aFontSize.getY() != std::round(aFontSize.getY()) || comphelper::LibreOfficeKit::isActive()); vcl::Font aFont; // Get the VCL font
[Libreoffice-commits] core.git: desktop/source sfx2/source
desktop/source/lib/init.cxx |3 ++-
sfx2/source/control/unoctitm.cxx |3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 1be3ab048d417611055a76d1776a0a69eb6fc6dd
Author: Pranam Lashkari
AuthorDate: Fri Jun 23 23:31:10 2023 +0700
Commit: Aron Budea
CommitDate: Mon Jun 26 22:58:13 2023 +0200
LOK: send state of DataFilterAutoFilter
Change-Id: Ib71dcdb6b02f3c1e9e1c552a718cb03e7cd9a4b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153532
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Aron Budea
(cherry picked from commit 0407d4290617dc717abed3ea48f1abf3cf1d750f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153602
Tested-by: Jenkins
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 102028689451..074a5b81b1ad 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3611,7 +3611,8 @@ static void doc_iniUnoCommands ()
OUString(".uno:InsertDateContentControl"),
OUString(".uno:InsertDropdownContentControl"),
OUString(".uno:InsertPlainTextContentControl"),
-OUString(".uno:InsertPictureContentControl")
+OUString(".uno:InsertPictureContentControl"),
+OUString(".uno:DataFilterAutoFilter")
};
util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 4495873a89af..2feec75dac6c 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -935,7 +935,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID,
SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "SheetRightToLeft" ||
aEvent.FeatureURL.Path == "SpacePara1" ||
aEvent.FeatureURL.Path == "SpacePara15" ||
-aEvent.FeatureURL.Path == "SpacePara2")
+aEvent.FeatureURL.Path == "SpacePara2" ||
+aEvent.FeatureURL.Path == "DataFilterAutoFilter")
{
bool bTemp = false;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - desktop/source sfx2/source
desktop/source/lib/init.cxx |3 ++-
sfx2/source/control/unoctitm.cxx |3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit b83c86b5474f5d760adaed198dfcd842053c5599
Author: Pranam Lashkari
AuthorDate: Fri Jun 23 23:31:10 2023 +0700
Commit: Aron Budea
CommitDate: Mon Jun 26 20:44:55 2023 +0200
LOK: send state of DataFilterAutoFilter
Change-Id: Ib71dcdb6b02f3c1e9e1c552a718cb03e7cd9a4b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153532
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Aron Budea
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 874e3ac1ffb2..5d957a9c89be 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3594,7 +3594,8 @@ static void doc_iniUnoCommands ()
OUString(".uno:InsertDateContentControl"),
OUString(".uno:InsertDropdownContentControl"),
OUString(".uno:InsertPlainTextContentControl"),
-OUString(".uno:InsertPictureContentControl")
+OUString(".uno:InsertPictureContentControl"),
+OUString(".uno:DataFilterAutoFilter")
};
util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index fa131fe09ff6..99bbc2afa7bf 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -951,7 +951,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID,
SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "SheetRightToLeft" ||
aEvent.FeatureURL.Path == "SpacePara1" ||
aEvent.FeatureURL.Path == "SpacePara15" ||
-aEvent.FeatureURL.Path == "SpacePara2")
+aEvent.FeatureURL.Path == "SpacePara2" ||
+aEvent.FeatureURL.Path == "DataFilterAutoFilter")
{
bool bTemp = false;
[Libreoffice-commits] core.git: sd/source
sd/source/ui/unoidl/unomodel.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3924368f4837332bba640906be9a9d2e2e6b22cf Author: Pranam Lashkari AuthorDate: Wed Jun 7 03:59:31 2023 +0700 Commit: Pranam Lashkari CommitDate: Wed Jun 21 14:01:49 2023 +0200 sd: send correct slide visibility status The term visible may be a bit aambiguous here, we try trying to send info about if the slide is hidden or visible in the slide show. The correct property for that is "exclude" Change-Id: Ic505036181b71686656bd2338b9d0329c12d9e74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152688 Tested-by: Jenkins CollaboraOffice Reviewed-by: Pranam Lashkari (cherry picked from commit fe79008f70e7a790e4f78c1714c27ea223512327) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152988 Tested-by: Jenkins diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index e05aee0f91c0..1f2f76d11d1b 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2355,7 +2355,7 @@ OUString SdXImpressDocument::getPartInfo(int nPart) if (!pViewSh) return OUString(); -const bool bIsVisible = pViewSh->IsVisible(nPart); +const bool bIsVisible = !pViewSh->GetDoc()->GetSdPage(nPart, pViewSh->GetPageKind())->IsExcluded(); const bool bIsSelected = pViewSh->IsSelected(nPart); const sal_Int16 nMasterPageCount= pViewSh->GetDoc()->GetMasterSdPageCount(pViewSh->GetPageKind());
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sd/source
sd/source/ui/unoidl/unomodel.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fe79008f70e7a790e4f78c1714c27ea223512327 Author: Pranam Lashkari AuthorDate: Wed Jun 7 03:59:31 2023 +0700 Commit: Pranam Lashkari CommitDate: Tue Jun 13 13:29:09 2023 +0200 sd: send correct slide visibility status The term visible may be a bit aambiguous here, we try trying to send info about if the slide is hidden or visible in the slide show. The correct property for that is "exclude" Change-Id: Ic505036181b71686656bd2338b9d0329c12d9e74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152688 Tested-by: Jenkins CollaboraOffice Reviewed-by: Pranam Lashkari diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 5a88fe21c8f8..92879fcd770a 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2362,7 +2362,7 @@ OUString SdXImpressDocument::getPartInfo(int nPart) if (!pViewSh) return OUString(); -const bool bIsVisible = pViewSh->IsVisible(nPart); +const bool bIsVisible = !pViewSh->GetDoc()->GetSdPage(nPart, pViewSh->GetPageKind())->IsExcluded(); const bool bIsSelected = pViewSh->IsSelected(nPart); const sal_Int16 nMasterPageCount= pViewSh->GetDoc()->GetMasterSdPageCount(pViewSh->GetPageKind());
[Libreoffice-commits] core.git: sd/inc sd/sdi sd/source
sd/inc/app.hrc |2 +-
sd/sdi/sdraw.sdi |2 +-
sd/source/ui/view/viewshe3.cxx | 10 ++
3 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit d7cf5429336ea4cf9a92b3338fe03ef7dc142dcd
Author: Pranam Lashkari
AuthorDate: Fri Jun 2 03:43:05 2023 +0700
Commit: Pranam Lashkari
CommitDate: Wed Jun 7 11:14:05 2023 +0200
sd: introduced impress slide duplication to particular position
Change-Id: I4931f92158c31506b765376639907d2d4f250deb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152512
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-by: Pranam Lashkari
(cherry picked from commit dc007c18097143bdb192955dda730d696d8bcb31)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152656
Tested-by: Jenkins
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index ec0eed81d1f3..e275e4688258 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -246,7 +246,7 @@
#define ID_VAL_ISACTIVE (SID_SD_START+216)
#define ID_VAL_WHATKIND (SID_SD_START+217)
#define ID_VAL_PAGEWIDTH(SID_SD_START+218)
-// FREE
+#define ID_INSERT_POS (SID_SD_START+219)
#define ID_VAL_PAGETOP (SID_SD_START+220)
#define ID_VAL_PAGEBOTTOM (SID_SD_START+221)
#define ID_VAL_PAGELEFT (SID_SD_START+222)
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index cf4d008f6cc8..7bb752c687ac 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -1337,7 +1337,7 @@ SfxBoolItem DrawingMode SID_DRAWINGMODE
]
SfxVoidItem DuplicatePage SID_DUPLICATE_PAGE
-(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 a7d466f6d94b..cb76eaf99844 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -189,7 +189,9 @@ SdPage* ViewShell::CreateOrDuplicatePage (
// 1. Process the arguments.
const SfxItemSet* pArgs = rRequest.GetArgs();
-if (! pArgs)
+const SfxUInt16Item* pInsertPos =
rRequest.GetArg(ID_INSERT_POS);
+
+if (! pArgs || (pArgs->Count() == 1 && pInsertPos))
{
// AutoLayouts must be ready
pDocument->StopWorkStartupDelay();
@@ -206,7 +208,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
eNotesLayout = pNotesTemplatePage->GetAutoLayout();
}
}
-else if (pArgs->Count() == 1)
+else if (pArgs->Count() == 1 || pArgs->Count() == 2)
{
pDocument->StopWorkStartupDelay();
const SfxUInt32Item* pLayout =
rRequest.GetArg(ID_VAL_WHATLAYOUT);
@@ -222,7 +224,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
}
}
}
-else if (pArgs->Count() == 4)
+else if (pArgs->Count() == 4 || pArgs->Count() == 5)
{
// AutoLayouts must be ready
pDocument->StopWorkStartupDelay();
@@ -354,7 +356,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
aNotesPageName,
bIsPageBack,
bIsPageObj,
-nInsertPosition);
+pInsertPos ? (pInsertPos->GetValue()*2)+1 :
nInsertPosition);
break;
default:
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sd/inc sd/sdi sd/source
sd/inc/app.hrc |2 +-
sd/sdi/sdraw.sdi |2 +-
sd/source/ui/view/viewshe3.cxx | 10 ++
3 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit b4ca18af675cce0d68b8504c04cf4c9d755310a4
Author: Pranam Lashkari
AuthorDate: Fri Jun 2 03:43:05 2023 +0700
Commit: Pranam Lashkari
CommitDate: Tue Jun 6 20:38:28 2023 +0200
sd: introduced impress slide duplication to particular position
Change-Id: I4931f92158c31506b765376639907d2d4f250deb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152512
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-by: Pranam Lashkari
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index dcd09a8c7e46..1e9240feace0 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -245,7 +245,7 @@
#define ID_VAL_ISACTIVE (SID_SD_START+216)
#define ID_VAL_WHATKIND (SID_SD_START+217)
#define ID_VAL_PAGEWIDTH(SID_SD_START+218)
-// FREE
+#define ID_INSERT_POS (SID_SD_START+219)
#define ID_VAL_PAGETOP (SID_SD_START+220)
#define ID_VAL_PAGEBOTTOM (SID_SD_START+221)
#define ID_VAL_PAGELEFT (SID_SD_START+222)
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 09124f3f4a81..932eb01e8a21 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -1337,7 +1337,7 @@ SfxBoolItem DrawingMode SID_DRAWINGMODE
]
SfxVoidItem DuplicatePage SID_DUPLICATE_PAGE
-(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 a7d466f6d94b..cb76eaf99844 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -189,7 +189,9 @@ SdPage* ViewShell::CreateOrDuplicatePage (
// 1. Process the arguments.
const SfxItemSet* pArgs = rRequest.GetArgs();
-if (! pArgs)
+const SfxUInt16Item* pInsertPos =
rRequest.GetArg(ID_INSERT_POS);
+
+if (! pArgs || (pArgs->Count() == 1 && pInsertPos))
{
// AutoLayouts must be ready
pDocument->StopWorkStartupDelay();
@@ -206,7 +208,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
eNotesLayout = pNotesTemplatePage->GetAutoLayout();
}
}
-else if (pArgs->Count() == 1)
+else if (pArgs->Count() == 1 || pArgs->Count() == 2)
{
pDocument->StopWorkStartupDelay();
const SfxUInt32Item* pLayout =
rRequest.GetArg(ID_VAL_WHATLAYOUT);
@@ -222,7 +224,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
}
}
}
-else if (pArgs->Count() == 4)
+else if (pArgs->Count() == 4 || pArgs->Count() == 5)
{
// AutoLayouts must be ready
pDocument->StopWorkStartupDelay();
@@ -354,7 +356,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
aNotesPageName,
bIsPageBack,
bIsPageObj,
-nInsertPosition);
+pInsertPos ? (pInsertPos->GetValue()*2)+1 :
nInsertPosition);
break;
default:
[Libreoffice-commits] core.git: sw/source vcl/jsdialog
sw/source/ui/dialog/wordcountdialog.cxx |4 ++--
vcl/jsdialog/enabled.cxx|1 +
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit a4e8c663b613fcd2ec26211faedb6e703f27806b
Author: Pranam Lashkari
AuthorDate: Tue Apr 4 14:52:26 2023 +0100
Commit: Pranam Lashkari
CommitDate: Wed May 3 20:46:27 2023 +0200
jsdialog: enabled word count dialog (writer)
set mobile fields visibility only with mobile phones
Change-Id: I5680effe9df5de01221bcf52e339490aa5dd5a6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150024
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
(cherry picked from commit e7bcf7aa95a31dcefc82f56b23a36424353016c3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151280
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx
b/sw/source/ui/dialog/wordcountdialog.cxx
index 6dbd3c780ac4..a96e1c50b3be 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -87,7 +87,7 @@ void SwWordCountFloatDlg::showCJK(bool bShowCJK)
{
m_xCurrentCjkcharsFT->set_visible(bShowCJK);
m_xDocCjkcharsFT->set_visible(bShowCJK);
-if (m_xCjkcharsLabelFT2)
+if (IS_MOBILE_PHONE && m_xCjkcharsLabelFT2)
m_xCjkcharsLabelFT2->set_visible(bShowCJK);
m_xCjkcharsLabelFT->set_visible(bShowCJK);
}
@@ -96,7 +96,7 @@ void SwWordCountFloatDlg::showStandardizedPages(bool
bShowStandardizedPages)
{
m_xCurrentStandardizedPagesFT->set_visible(bShowStandardizedPages);
m_xDocStandardizedPagesFT->set_visible(bShowStandardizedPages);
-if (m_xStandardizedPagesLabelFT2)
+if (IS_MOBILE_PHONE && m_xStandardizedPagesLabelFT2)
m_xStandardizedPagesLabelFT2->set_visible(bShowStandardizedPages);
m_xStandardizedPagesLabelFT->set_visible(bShowStandardizedPages);
}
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 0ed9c299bc00..86528c4c6ca8 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -198,6 +198,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/swriter/ui/tocstylespage.ui"
|| rUIFile == u"modules/swriter/ui/translationdialog.ui"
|| rUIFile == u"modules/swriter/ui/watermarkdialog.ui"
+|| rUIFile == u"modules/swriter/ui/wordcount.ui"
// sfx
|| rUIFile == u"sfx/ui/cmisinfopage.ui"
|| rUIFile == u"sfx/ui/custominfopage.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source vcl/jsdialog
sw/source/ui/dialog/wordcountdialog.cxx |4 ++--
vcl/jsdialog/enabled.cxx|1 +
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit e7bcf7aa95a31dcefc82f56b23a36424353016c3
Author: Pranam Lashkari
AuthorDate: Tue Apr 4 14:52:26 2023 +0100
Commit: Szymon Kłos
CommitDate: Wed May 3 09:59:23 2023 +0200
jsdialog: enabled word count dialog (writer)
set mobile fields visibility only with mobile phones
Change-Id: I5680effe9df5de01221bcf52e339490aa5dd5a6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150024
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx
b/sw/source/ui/dialog/wordcountdialog.cxx
index 6dbd3c780ac4..a96e1c50b3be 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -87,7 +87,7 @@ void SwWordCountFloatDlg::showCJK(bool bShowCJK)
{
m_xCurrentCjkcharsFT->set_visible(bShowCJK);
m_xDocCjkcharsFT->set_visible(bShowCJK);
-if (m_xCjkcharsLabelFT2)
+if (IS_MOBILE_PHONE && m_xCjkcharsLabelFT2)
m_xCjkcharsLabelFT2->set_visible(bShowCJK);
m_xCjkcharsLabelFT->set_visible(bShowCJK);
}
@@ -96,7 +96,7 @@ void SwWordCountFloatDlg::showStandardizedPages(bool
bShowStandardizedPages)
{
m_xCurrentStandardizedPagesFT->set_visible(bShowStandardizedPages);
m_xDocStandardizedPagesFT->set_visible(bShowStandardizedPages);
-if (m_xStandardizedPagesLabelFT2)
+if (IS_MOBILE_PHONE && m_xStandardizedPagesLabelFT2)
m_xStandardizedPagesLabelFT2->set_visible(bShowStandardizedPages);
m_xStandardizedPagesLabelFT->set_visible(bShowStandardizedPages);
}
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index d620b537c93c..0fd8f6e94293 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -199,6 +199,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/swriter/ui/tocstylespage.ui"
|| rUIFile == u"modules/swriter/ui/translationdialog.ui"
|| rUIFile == u"modules/swriter/ui/watermarkdialog.ui"
+|| rUIFile == u"modules/swriter/ui/wordcount.ui"
// sfx
|| rUIFile == u"sfx/ui/cmisinfopage.ui"
|| rUIFile == u"sfx/ui/custominfopage.ui"
[Libreoffice-commits] core.git: vcl/jsdialog
vcl/jsdialog/enabled.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 066b23115c2a360507e306a88da572554daefab7 Author: Pranam Lashkari AuthorDate: Mon Mar 20 19:58:28 2023 +0530 Commit: Pranam Lashkari CommitDate: Mon Apr 17 10:59:22 2023 +0200 jsdialog: enabled insert index entry dialog (writer) Change-Id: I2540620f7c4f9f640d943fb9e7b0e8661c706c7d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149170 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos (cherry picked from commit 062f0ff0a43a6d5ce610742a73d5b18562168a00) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150088 Tested-by: Jenkins Reviewed-by: Pranam Lashkari diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index acb6e4fd14b3..0619e79785ea 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -173,10 +173,12 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" || rUIFile == u"modules/swriter/ui/formattablepage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" +|| rUIFile == u"modules/swriter/ui/indexentry.ui" || rUIFile == u"modules/swriter/ui/insertbreak.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" || rUIFile == u"modules/swriter/ui/insertsectiondialog.ui" || rUIFile == u"modules/swriter/ui/linenumbering.ui" +|| rUIFile == u"modules/swriter/ui/newuserindexdialog.ui" || rUIFile == u"modules/swriter/ui/numparapage.ui" || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" || rUIFile == u"modules/swriter/ui/paradialog.ui"
[Libreoffice-commits] core.git: 2 commits - vcl/jsdialog
vcl/jsdialog/enabled.cxx | 11 +++ 1 file changed, 11 insertions(+) New commits: commit e82badd95d306c4e6c16a5858b3f1f7365a20df3 Author: Pranam Lashkari AuthorDate: Tue Mar 21 21:19:12 2023 +0530 Commit: Pranam Lashkari CommitDate: Mon Apr 17 10:59:06 2023 +0200 jsdialog: enabled bullets and numbering dialog (writer) Change-Id: I6d5ca75c7f2a91bd1716083fa9929fbeb3bd2e07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149276 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos (cherry picked from commit 4bd57ffda77c884ea1104755af098730f04ef178) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150090 Tested-by: Jenkins Reviewed-by: Pranam Lashkari diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 9ed4b02f75e6..acb6e4fd14b3 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -52,6 +52,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/linetabpage.ui" || rUIFile == u"cui/ui/macroselectordialog.ui" || rUIFile == u"cui/ui/numberingformatpage.ui" +|| rUIFile == u"cui/ui/numberingpositionpage.ui" || rUIFile == u"cui/ui/optlingupage.ui" || rUIFile == u"cui/ui/pageformatpage.ui" || rUIFile == u"cui/ui/paragalignpage.ui" @@ -60,6 +61,10 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/password.ui" || rUIFile == u"cui/ui/pastespecial.ui" || rUIFile == u"cui/ui/patterntabpage.ui" +|| rUIFile == u"cui/ui/pickbulletpage.ui" +|| rUIFile == u"cui/ui/pickgraphicpage.ui" +|| rUIFile == u"cui/ui/picknumberingpage.ui" +|| rUIFile == u"cui/ui/pickoutlinepage.ui" || rUIFile == u"cui/ui/positionpage.ui" || rUIFile == u"cui/ui/positionsizedialog.ui" || rUIFile == u"cui/ui/possizetabpage.ui" @@ -151,6 +156,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/simpress/ui/headerfooterdialog.ui" || rUIFile == u"modules/simpress/ui/headerfootertab.ui" // swriter +|| rUIFile == u"modules/swriter/ui/bulletsandnumbering.ui" || rUIFile == u"modules/swriter/ui/captionoptions.ui" || rUIFile == u"modules/swriter/ui/characterproperties.ui" || rUIFile == u"modules/swriter/ui/charurlpage.ui" commit 84d327698e5107de23bb0d342fb0c68604461790 Author: Pranam Lashkari AuthorDate: Mon Mar 20 19:47:38 2023 +0530 Commit: Pranam Lashkari CommitDate: Mon Apr 17 10:58:53 2023 +0200 jsdialog: enable table of content dialog (writer) Change-Id: I21af621a10e6d483af0174304e3457775068ab2e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149169 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos (cherry picked from commit 6c204682d3b69bdcbb215fa10fbcd66253d0cdba) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150087 Tested-by: Jenkins Reviewed-by: Pranam Lashkari diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 95868c19963f..9ed4b02f75e6 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -180,9 +180,14 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/tablecolumnpage.ui" || rUIFile == u"modules/swriter/ui/tableproperties.ui" || rUIFile == u"modules/swriter/ui/tabletextflowpage.ui" +|| rUIFile == u"modules/swriter/ui/templatedialog1.ui" || rUIFile == u"modules/swriter/ui/templatedialog2.ui" || rUIFile == u"modules/swriter/ui/templatedialog8.ui" || rUIFile == u"modules/swriter/ui/textgridpage.ui" +|| rUIFile == u"modules/swriter/ui/tocdialog.ui" +|| rUIFile == u"modules/swriter/ui/tocentriespage.ui" +|| rUIFile == u"modules/swriter/ui/tocindexpage.ui" +|| rUIFile == u"modules/swriter/ui/tocstylespage.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" || rUIFile == u"modules/swriter/ui/watermarkdialog.ui" // sfx
[Libreoffice-commits] core.git: vcl/jsdialog
vcl/jsdialog/enabled.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit d1c24db3f8329bd798d4f80a94f191e6b43678f6 Author: Pranam Lashkari AuthorDate: Mon Mar 20 20:24:12 2023 +0530 Commit: Pranam Lashkari CommitDate: Fri Apr 14 17:21:10 2023 +0200 jsdialog: enabled footnote endnote settings dialog(writer) Change-Id: I85c6eb0db6ad7123df1c8596951be5bb8ed5ef3a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149171 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos (cherry picked from commit 451939ac9a8cf182ab563412d561562957a60499) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150089 Tested-by: Jenkins Reviewed-by: Pranam Lashkari diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 92399366af15..95868c19963f 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -160,7 +160,10 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" || rUIFile == u"modules/swriter/ui/dropcapspage.ui" || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui" +|| rUIFile == u"modules/swriter/ui/endnotepage.ui" +|| rUIFile == u"modules/swriter/ui/footendnotedialog.ui" || rUIFile == u"modules/swriter/ui/footnoteareapage.ui" +|| rUIFile == u"modules/swriter/ui/footnotepage.ui" || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" || rUIFile == u"modules/swriter/ui/formattablepage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 48c83a18c4b9f82348d064f9301ba03655dcac4b Author: Pranam Lashkari AuthorDate: Tue Mar 21 21:22:13 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Apr 4 11:50:55 2023 +0200 jsdialog: enabled readonly content warning dialog Change-Id: I12e9af2e55902862df557ea4fe36a7463d6a95f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149277 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 847fd360a518..fbc6441a5271 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -173,6 +173,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/formattablepage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" || rUIFile == u"modules/swriter/ui/indexentry.ui" +|| rUIFile == u"modules/swriter/ui/inforeadonlydialog.ui" || rUIFile == u"modules/swriter/ui/insertbreak.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" || rUIFile == u"modules/swriter/ui/insertsectiondialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 4bd57ffda77c884ea1104755af098730f04ef178 Author: Pranam Lashkari AuthorDate: Tue Mar 21 21:19:12 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Apr 4 11:47:08 2023 +0200 jsdialog: enabled bullets and numbering dialog (writer) Change-Id: I6d5ca75c7f2a91bd1716083fa9929fbeb3bd2e07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149276 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index fab409b85076..847fd360a518 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -51,6 +51,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/linetabpage.ui" || rUIFile == u"cui/ui/macroselectordialog.ui" || rUIFile == u"cui/ui/numberingformatpage.ui" +|| rUIFile == u"cui/ui/numberingpositionpage.ui" || rUIFile == u"cui/ui/optlingupage.ui" || rUIFile == u"cui/ui/pageformatpage.ui" || rUIFile == u"cui/ui/paragalignpage.ui" @@ -59,6 +60,10 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/password.ui" || rUIFile == u"cui/ui/pastespecial.ui" || rUIFile == u"cui/ui/patterntabpage.ui" +|| rUIFile == u"cui/ui/pickbulletpage.ui" +|| rUIFile == u"cui/ui/pickgraphicpage.ui" +|| rUIFile == u"cui/ui/picknumberingpage.ui" +|| rUIFile == u"cui/ui/pickoutlinepage.ui" || rUIFile == u"cui/ui/positionpage.ui" || rUIFile == u"cui/ui/positionsizedialog.ui" || rUIFile == u"cui/ui/possizetabpage.ui" @@ -150,6 +155,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/simpress/ui/headerfooterdialog.ui" || rUIFile == u"modules/simpress/ui/headerfootertab.ui" // swriter +|| rUIFile == u"modules/swriter/ui/bulletsandnumbering.ui" || rUIFile == u"modules/swriter/ui/captionoptions.ui" || rUIFile == u"modules/swriter/ui/characterproperties.ui" || rUIFile == u"modules/swriter/ui/charurlpage.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 451939ac9a8cf182ab563412d561562957a60499 Author: Pranam Lashkari AuthorDate: Mon Mar 20 20:24:12 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Apr 4 11:43:07 2023 +0200 jsdialog: enabled footnote endnote settings dialog(writer) Change-Id: I85c6eb0db6ad7123df1c8596951be5bb8ed5ef3a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149171 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index f6289271269b..fab409b85076 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -159,7 +159,10 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" || rUIFile == u"modules/swriter/ui/dropcapspage.ui" || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui" +|| rUIFile == u"modules/swriter/ui/endnotepage.ui" +|| rUIFile == u"modules/swriter/ui/footendnotedialog.ui" || rUIFile == u"modules/swriter/ui/footnoteareapage.ui" +|| rUIFile == u"modules/swriter/ui/footnotepage.ui" || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" || rUIFile == u"modules/swriter/ui/formattablepage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 062f0ff0a43a6d5ce610742a73d5b18562168a00 Author: Pranam Lashkari AuthorDate: Mon Mar 20 19:58:28 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Apr 4 11:41:20 2023 +0200 jsdialog: enabled insert index entry dialog (writer) Change-Id: I2540620f7c4f9f640d943fb9e7b0e8661c706c7d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149170 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 797d185638f8..f6289271269b 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -163,10 +163,12 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" || rUIFile == u"modules/swriter/ui/formattablepage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" +|| rUIFile == u"modules/swriter/ui/indexentry.ui" || rUIFile == u"modules/swriter/ui/insertbreak.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" || rUIFile == u"modules/swriter/ui/insertsectiondialog.ui" || rUIFile == u"modules/swriter/ui/linenumbering.ui" +|| rUIFile == u"modules/swriter/ui/newuserindexdialog.ui" || rUIFile == u"modules/swriter/ui/numparapage.ui" || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" || rUIFile == u"modules/swriter/ui/paradialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 6c204682d3b69bdcbb215fa10fbcd66253d0cdba Author: Pranam Lashkari AuthorDate: Mon Mar 20 19:47:38 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Apr 4 11:39:30 2023 +0200 jsdialog: enable table of content dialog (writer) Change-Id: I21af621a10e6d483af0174304e3457775068ab2e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149169 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 5249e2e1ffdb..797d185638f8 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -176,9 +176,14 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/tablecolumnpage.ui" || rUIFile == u"modules/swriter/ui/tableproperties.ui" || rUIFile == u"modules/swriter/ui/tabletextflowpage.ui" +|| rUIFile == u"modules/swriter/ui/templatedialog1.ui" || rUIFile == u"modules/swriter/ui/templatedialog2.ui" || rUIFile == u"modules/swriter/ui/templatedialog8.ui" || rUIFile == u"modules/swriter/ui/textgridpage.ui" +|| rUIFile == u"modules/swriter/ui/tocdialog.ui" +|| rUIFile == u"modules/swriter/ui/tocentriespage.ui" +|| rUIFile == u"modules/swriter/ui/tocindexpage.ui" +|| rUIFile == u"modules/swriter/ui/tocstylespage.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" || rUIFile == u"modules/swriter/ui/watermarkdialog.ui" // sfx
[Libreoffice-commits] core.git: vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 7e476a24d1f9d58617e3e94630c931dfa0ab3c84 Author: Pranam Lashkari AuthorDate: Mon Mar 20 20:32:32 2023 +0530 Commit: Szymon Kłos CommitDate: Wed Mar 22 07:42:47 2023 + jsdialog: enabled spelling dialog Change-Id: I36c35e82aa17d8e6cb76dbb24f33344870c49629 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149172 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149275 Tested-by: Jenkins diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 47b975fab586..fd82be31c56a 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -57,6 +57,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/positionpage.ui" || rUIFile == u"cui/ui/queryduplicatedialog.ui" || rUIFile == u"cui/ui/similaritysearchdialog.ui" +|| rUIFile == u"cui/ui/spellingdialog.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" || rUIFile == u"cui/ui/textflowpage.ui" || rUIFile == u"cui/ui/thesaurus.ui"
[Libreoffice-commits] core.git: 2 commits - vcl/jsdialog
vcl/jsdialog/enabled.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 65758e25b16db552af7699facbe068e3d4aebc3a Author: Pranam Lashkari AuthorDate: Mon Mar 20 17:47:17 2023 +0530 Commit: Pranam Lashkari CommitDate: Tue Mar 21 22:11:43 2023 + jsdialog: enabled insert break(manual break) dialog(writer) Signed-off-by: Pranam Lashkari Change-Id: I65213cd8822e574eff333b96a8718ebff2946f5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149166 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos (cherry picked from commit 41b7f70981cffb9a04b6b132317915ca51519eab) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149236 Tested-by: Jenkins diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 1dad92a7347c..54ffe823aecf 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -112,6 +112,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/footnoteareapage.ui" || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" +|| rUIFile == u"modules/swriter/ui/insertbreak.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" || rUIFile == u"modules/swriter/ui/insertsectiondialog.ui" || rUIFile == u"modules/swriter/ui/linenumbering.ui" commit e8d56d600f16e137acf765842273feeca5d98b37 Author: Pranam Lashkari AuthorDate: Mon Mar 20 18:50:12 2023 +0530 Commit: Pranam Lashkari CommitDate: Tue Mar 21 22:11:32 2023 + jsdialog: enable watermark dialog (writer) Change-Id: Ie1f5a299fd68bdfd21c04d1ef79514953a2ac5c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149168 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos (cherry picked from commit 8c358c1616a16beb10752f0a60bbacccba15d6ea) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149234 Tested-by: Jenkins Reviewed-by: Pranam Lashkari diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index a99417b50a27..1dad92a7347c 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -124,6 +124,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/templatedialog8.ui" || rUIFile == u"modules/swriter/ui/textgridpage.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" +|| rUIFile == u"modules/swriter/ui/watermarkdialog.ui" // sfx || rUIFile == u"sfx/ui/cmisinfopage.ui" || rUIFile == u"sfx/ui/custominfopage.ui"
[Libreoffice-commits] core.git: vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 11fc8254548d241a972a5f1483609497d8d93ea2 Author: Pranam Lashkari AuthorDate: Mon Mar 20 20:36:45 2023 +0530 Commit: Pranam Lashkari CommitDate: Tue Mar 21 17:03:16 2023 + jsdialog: enabled thesaurus dialog Change-Id: I01059e7a4aaffd5c4a2f5ccff55f83ed3db9bf38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149173 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos (cherry picked from commit 2e75e849e85da86ea33b447350b0e2f7eaede69e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149237 Tested-by: Jenkins Reviewed-by: Pranam Lashkari diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index fdb587c8b1e1..a99417b50a27 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -59,6 +59,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/similaritysearchdialog.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" || rUIFile == u"cui/ui/textflowpage.ui" +|| rUIFile == u"cui/ui/thesaurus.ui" || rUIFile == u"cui/ui/transparencytabpage.ui" || rUIFile == u"cui/ui/twolinespage.ui" || rUIFile == u"cui/ui/widgettestdialog.ui"
[Libreoffice-commits] core.git: sw/source sw/uiconfig vcl/jsdialog
sw/source/ui/frmdlg/column.cxx |2 +-
sw/uiconfig/swriter/ui/columndialog.ui | 20 +---
vcl/jsdialog/enabled.cxx |1 +
3 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit 6c4464a14ce324100df4cf3934c3ddeeac82ab08
Author: Pranam Lashkari
AuthorDate: Mon Mar 20 18:35:31 2023 +0530
Commit: Pranam Lashkari
CommitDate: Tue Mar 21 17:03:01 2023 +
jsdialog: enable column dialog (writer)
Change-Id: I4b91d271d766d8efeaddc3c3775513184036c5f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149167
Reviewed-by: Szymon Kłos
Tested-by: Szymon Kłos
(cherry picked from commit f50d009885c499e55db35571ace83f2ed7effbfe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149235
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 8a82dd04d95c..338e8011ad20 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -89,7 +89,7 @@ SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell&
rSh)
, m_bSectionChanged(false)
, m_bSelSectionChanged(false)
, m_bFrameChanged(false)
-, m_xContentArea(m_xDialog->weld_content_area())
+, m_xContentArea(m_xBuilder->weld_container("content"))
, m_xOkButton(m_xBuilder->weld_button("ok"))
{
SwRect aRect;
diff --git a/sw/uiconfig/swriter/ui/columndialog.ui
b/sw/uiconfig/swriter/ui/columndialog.ui
index 5bf4d5d9d999..2162f1e5b2fd 100644
--- a/sw/uiconfig/swriter/ui/columndialog.ui
+++ b/sw/uiconfig/swriter/ui/columndialog.ui
@@ -17,6 +17,23 @@
False
vertical
12
+
+
+True
+False
+vertical
+12
+
+
+
+
+
+False
+True
+begin
+0
+
+
False
@@ -74,9 +91,6 @@
0
-
-
-
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 9a3699301de1..fdb587c8b1e1 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -102,6 +102,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/swriter/ui/captionoptions.ui"
|| rUIFile == u"modules/swriter/ui/characterproperties.ui"
|| rUIFile == u"modules/swriter/ui/charurlpage.ui"
+|| rUIFile == u"modules/swriter/ui/columndialog.ui"
|| rUIFile == u"modules/swriter/ui/columnpage.ui"
|| rUIFile == u"modules/swriter/ui/contentcontroldlg.ui"
|| rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 2e75e849e85da86ea33b447350b0e2f7eaede69e Author: Pranam Lashkari AuthorDate: Mon Mar 20 20:36:45 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 21 13:22:52 2023 + jsdialog: enabled thesaurus dialog Change-Id: I01059e7a4aaffd5c4a2f5ccff55f83ed3db9bf38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149173 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index c93e80eb17fd..529cffe1dfb7 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -60,6 +60,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/spelloptionsdialog.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" || rUIFile == u"cui/ui/textflowpage.ui" +|| rUIFile == u"cui/ui/thesaurus.ui" || rUIFile == u"cui/ui/transparencytabpage.ui" || rUIFile == u"cui/ui/twolinespage.ui" || rUIFile == u"cui/ui/widgettestdialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 41b7f70981cffb9a04b6b132317915ca51519eab Author: Pranam Lashkari AuthorDate: Mon Mar 20 17:47:17 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 21 13:02:59 2023 + jsdialog: enabled insert break(manual break) dialog(writer) Signed-off-by: Pranam Lashkari Change-Id: I65213cd8822e574eff333b96a8718ebff2946f5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149166 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 7efb9de2bb84..c93e80eb17fd 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -137,6 +137,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/footnoteareapage.ui" || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" +|| rUIFile == u"modules/swriter/ui/insertbreak.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" || rUIFile == u"modules/swriter/ui/insertsectiondialog.ui" || rUIFile == u"modules/swriter/ui/linenumbering.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source sw/uiconfig vcl/jsdialog
sw/source/ui/frmdlg/column.cxx |2 +-
sw/uiconfig/swriter/ui/columndialog.ui | 20 +---
vcl/jsdialog/enabled.cxx |1 +
3 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit f50d009885c499e55db35571ace83f2ed7effbfe
Author: Pranam Lashkari
AuthorDate: Mon Mar 20 18:35:31 2023 +0530
Commit: Szymon Kłos
CommitDate: Tue Mar 21 12:59:32 2023 +
jsdialog: enable column dialog (writer)
Change-Id: I4b91d271d766d8efeaddc3c3775513184036c5f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149167
Reviewed-by: Szymon Kłos
Tested-by: Szymon Kłos
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 5692a906e279..c2a24ad18ef6 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -89,7 +89,7 @@ SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell&
rSh)
, m_bSectionChanged(false)
, m_bSelSectionChanged(false)
, m_bFrameChanged(false)
-, m_xContentArea(m_xDialog->weld_content_area())
+, m_xContentArea(m_xBuilder->weld_container("content"))
, m_xOkButton(m_xBuilder->weld_button("ok"))
{
SwRect aRect;
diff --git a/sw/uiconfig/swriter/ui/columndialog.ui
b/sw/uiconfig/swriter/ui/columndialog.ui
index 5bf4d5d9d999..2162f1e5b2fd 100644
--- a/sw/uiconfig/swriter/ui/columndialog.ui
+++ b/sw/uiconfig/swriter/ui/columndialog.ui
@@ -17,6 +17,23 @@
False
vertical
12
+
+
+True
+False
+vertical
+12
+
+
+
+
+
+False
+True
+begin
+0
+
+
False
@@ -74,9 +91,6 @@
0
-
-
-
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 6595cf7971c0..7efb9de2bb84 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -128,6 +128,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/swriter/ui/captionoptions.ui"
|| rUIFile == u"modules/swriter/ui/characterproperties.ui"
|| rUIFile == u"modules/swriter/ui/charurlpage.ui"
+|| rUIFile == u"modules/swriter/ui/columndialog.ui"
|| rUIFile == u"modules/swriter/ui/columnpage.ui"
|| rUIFile == u"modules/swriter/ui/contentcontroldlg.ui"
|| rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 8c358c1616a16beb10752f0a60bbacccba15d6ea Author: Pranam Lashkari AuthorDate: Mon Mar 20 18:50:12 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 21 12:39:25 2023 + jsdialog: enable watermark dialog (writer) Change-Id: Ie1f5a299fd68bdfd21c04d1ef79514953a2ac5c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149168 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 935a81ba6e6d..6595cf7971c0 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -148,6 +148,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/templatedialog8.ui" || rUIFile == u"modules/swriter/ui/textgridpage.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" +|| rUIFile == u"modules/swriter/ui/watermarkdialog.ui" // sfx || rUIFile == u"sfx/ui/cmisinfopage.ui" || rUIFile == u"sfx/ui/custominfopage.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 38eaa71245954d0dd8805b2140039f126a8ea0e3 Author: Pranam Lashkari AuthorDate: Mon Mar 20 20:32:32 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 21 08:41:03 2023 + jsdialog: enabled spelling dialog Change-Id: I36c35e82aa17d8e6cb76dbb24f33344870c49629 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149172 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 116cc6a5b768..4e5c79c1bf9b 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -55,6 +55,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/queryduplicatedialog.ui" || rUIFile == u"cui/ui/similaritysearchdialog.ui" || rUIFile == u"cui/ui/specialcharacters.ui" +|| rUIFile == u"cui/ui/spellingdialog.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" || rUIFile == u"cui/ui/textflowpage.ui" || rUIFile == u"cui/ui/transparencytabpage.ui"
[Libreoffice-commits] core.git: vcl/jsdialog
vcl/jsdialog/enabled.cxx |4 1 file changed, 4 insertions(+) New commits: commit 87210002a3ea9c785262166efbed59cdf44bb4a6 Author: Pranam Lashkari AuthorDate: Fri Mar 17 21:46:00 2023 +0530 Commit: Pranam Lashkari CommitDate: Mon Mar 20 13:03:26 2023 + jsdialog: enabled page format dialog (writer) Change-Id: I352214af08e7f5f8470aeccc49932d0ea5b191a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149061 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos (cherry picked from commit fcc6e504ff968923f0b17d9e59be56dc5f342711) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149103 Tested-by: Jenkins Reviewed-by: Pranam Lashkari diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index efb8362c414c..9a3699301de1 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -107,6 +107,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" || rUIFile == u"modules/swriter/ui/dropcapspage.ui" || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui" +|| rUIFile == u"modules/swriter/ui/footnoteareapage.ui" || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" @@ -118,6 +119,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/sectionpage.ui" || rUIFile == u"modules/swriter/ui/splittable.ui" || rUIFile == u"modules/swriter/ui/templatedialog2.ui" +|| rUIFile == u"modules/swriter/ui/templatedialog8.ui" +|| rUIFile == u"modules/swriter/ui/textgridpage.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" // sfx || rUIFile == u"sfx/ui/cmisinfopage.ui" @@ -134,6 +137,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"svx/ui/accessibilitycheckentry.ui" || rUIFile == u"svx/ui/findreplacedialog.ui" || rUIFile == u"svx/ui/fontworkgallerydialog.ui" +|| rUIFile == u"svx/ui/headfootformatpage.ui" // uui || rUIFile == u"uui/ui/macrowarnmedium.ui" // vcl
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |4 1 file changed, 4 insertions(+) New commits: commit fcc6e504ff968923f0b17d9e59be56dc5f342711 Author: Pranam Lashkari AuthorDate: Fri Mar 17 21:46:00 2023 +0530 Commit: Szymon Kłos CommitDate: Mon Mar 20 07:31:24 2023 + jsdialog: enabled page format dialog (writer) Change-Id: I352214af08e7f5f8470aeccc49932d0ea5b191a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149061 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index a219ede196b1..116cc6a5b768 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -130,6 +130,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" || rUIFile == u"modules/swriter/ui/dropcapspage.ui" || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui" +|| rUIFile == u"modules/swriter/ui/footnoteareapage.ui" || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" @@ -141,6 +142,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/sectionpage.ui" || rUIFile == u"modules/swriter/ui/splittable.ui" || rUIFile == u"modules/swriter/ui/templatedialog2.ui" +|| rUIFile == u"modules/swriter/ui/templatedialog8.ui" +|| rUIFile == u"modules/swriter/ui/textgridpage.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" // sfx || rUIFile == u"sfx/ui/cmisinfopage.ui" @@ -158,6 +161,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"svx/ui/accessibilitycheckentry.ui" || rUIFile == u"svx/ui/findreplacedialog.ui" || rUIFile == u"svx/ui/fontworkgallerydialog.ui" +|| rUIFile == u"svx/ui/headfootformatpage.ui" // uui || rUIFile == u"uui/ui/macrowarnmedium.ui" // vcl
[Libreoffice-commits] core.git: vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit b12c6c938450dee5092378b543da8bd8e2f1227f Author: Pranam Lashkari AuthorDate: Wed Mar 15 17:48:09 2023 +0530 Commit: Pranam Lashkari CommitDate: Fri Mar 17 16:17:00 2023 + jsdialog: enabled paste special dialog Change-Id: I20833a2d138208ad139d0a4c673f87a0f7eb8f5d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148920 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos (cherry picked from commit 8665bd300f60a3934d9991a877097112edda325f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149015 Tested-by: Jenkins Reviewed-by: Pranam Lashkari diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 2eb5a8e0c51b..efb8362c414c 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -52,6 +52,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/paraindentspacing.ui" || rUIFile == u"cui/ui/paratabspage.ui" || rUIFile == u"cui/ui/password.ui" +|| rUIFile == u"cui/ui/pastespecial.ui" || rUIFile == u"cui/ui/patterntabpage.ui" || rUIFile == u"cui/ui/positionpage.ui" || rUIFile == u"cui/ui/queryduplicatedialog.ui"
[Libreoffice-commits] core.git: vcl/jsdialog
vcl/jsdialog/enabled.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 529c5494c256138c32996d8d95cf7ef542af7900 Author: Pranam Lashkari AuthorDate: Mon Mar 13 20:40:04 2023 +0530 Commit: Pranam Lashkari CommitDate: Fri Mar 17 10:45:07 2023 + jsdialog: enable style dialog (writer) Change-Id: Iaf664deeac5c5887f20c9579881cd921868b652f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148794 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos (cherry picked from commit ae69dc05d3de876dade4fa8a9b6f6f693cc7c865) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148973 Tested-by: Jenkins Reviewed-by: Pranam Lashkari diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 2cb523fab28a..2eb5a8e0c51b 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -116,6 +116,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/paradialog.ui" || rUIFile == u"modules/swriter/ui/sectionpage.ui" || rUIFile == u"modules/swriter/ui/splittable.ui" +|| rUIFile == u"modules/swriter/ui/templatedialog2.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" // sfx || rUIFile == u"sfx/ui/cmisinfopage.ui" @@ -125,6 +126,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"sfx/ui/documentpropertiesdialog.ui" || rUIFile == u"sfx/ui/editdurationdialog.ui" || rUIFile == u"sfx/ui/linefragment.ui" +|| rUIFile == u"sfx/ui/managestylepage.ui" || rUIFile == u"sfx/ui/password.ui" // svx || rUIFile == u"svx/ui/accessibilitycheckdialog.ui"
[Libreoffice-commits] core.git: vcl/jsdialog
vcl/jsdialog/enabled.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit ca12d483ba4c764cf5e9ba083c5376dba772547f Author: Pranam Lashkari AuthorDate: Wed Mar 15 19:15:46 2023 +0530 Commit: Pranam Lashkari CommitDate: Thu Mar 16 17:17:22 2023 + jsdialog: enabled insert section dialog (writer) Change-Id: I556973587c2c7f4baab4cf696afe980186e82f6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148930 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos (cherry picked from commit cd428e3e564b9bca0badb5e947f78a6fe3ea39ec) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149014 Tested-by: Jenkins Reviewed-by: Pranam Lashkari diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 7e4fc5fd7e78..2cb523fab28a 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -101,15 +101,20 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/captionoptions.ui" || rUIFile == u"modules/swriter/ui/characterproperties.ui" || rUIFile == u"modules/swriter/ui/charurlpage.ui" +|| rUIFile == u"modules/swriter/ui/columnpage.ui" || rUIFile == u"modules/swriter/ui/contentcontroldlg.ui" || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" || rUIFile == u"modules/swriter/ui/dropcapspage.ui" || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui" +|| rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" +|| rUIFile == u"modules/swriter/ui/indentpage.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" +|| rUIFile == u"modules/swriter/ui/insertsectiondialog.ui" || rUIFile == u"modules/swriter/ui/linenumbering.ui" || rUIFile == u"modules/swriter/ui/numparapage.ui" || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" || rUIFile == u"modules/swriter/ui/paradialog.ui" +|| rUIFile == u"modules/swriter/ui/sectionpage.ui" || rUIFile == u"modules/swriter/ui/splittable.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" // sfx
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 8665bd300f60a3934d9991a877097112edda325f Author: Pranam Lashkari AuthorDate: Wed Mar 15 17:48:09 2023 +0530 Commit: Szymon Kłos CommitDate: Thu Mar 16 13:06:05 2023 + jsdialog: enabled paste special dialog Change-Id: I20833a2d138208ad139d0a4c673f87a0f7eb8f5d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148920 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 09e3747183a4..61a05cac6b24 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -48,6 +48,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/paraindentspacing.ui" || rUIFile == u"cui/ui/paratabspage.ui" || rUIFile == u"cui/ui/password.ui" +|| rUIFile == u"cui/ui/pastespecial.ui" || rUIFile == u"cui/ui/patterntabpage.ui" || rUIFile == u"cui/ui/positionpage.ui" || rUIFile == u"cui/ui/queryduplicatedialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit cd428e3e564b9bca0badb5e947f78a6fe3ea39ec Author: Pranam Lashkari AuthorDate: Wed Mar 15 19:15:46 2023 +0530 Commit: Szymon Kłos CommitDate: Thu Mar 16 13:03:26 2023 + jsdialog: enabled insert section dialog (writer) Change-Id: I556973587c2c7f4baab4cf696afe980186e82f6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148930 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 3142fba2db59..09e3747183a4 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -116,15 +116,20 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/captionoptions.ui" || rUIFile == u"modules/swriter/ui/characterproperties.ui" || rUIFile == u"modules/swriter/ui/charurlpage.ui" +|| rUIFile == u"modules/swriter/ui/columnpage.ui" || rUIFile == u"modules/swriter/ui/contentcontroldlg.ui" || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" || rUIFile == u"modules/swriter/ui/dropcapspage.ui" || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui" +|| rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" +|| rUIFile == u"modules/swriter/ui/indentpage.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" +|| rUIFile == u"modules/swriter/ui/insertsectiondialog.ui" || rUIFile == u"modules/swriter/ui/linenumbering.ui" || rUIFile == u"modules/swriter/ui/numparapage.ui" || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" || rUIFile == u"modules/swriter/ui/paradialog.ui" +|| rUIFile == u"modules/swriter/ui/sectionpage.ui" || rUIFile == u"modules/swriter/ui/splittable.ui" || rUIFile == u"modules/swriter/ui/templatedialog2.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit ae69dc05d3de876dade4fa8a9b6f6f693cc7c865 Author: Pranam Lashkari AuthorDate: Mon Mar 13 20:40:04 2023 +0530 Commit: Szymon Kłos CommitDate: Wed Mar 15 09:45:40 2023 + jsdialog: enable style dialog (writer) Change-Id: Iaf664deeac5c5887f20c9579881cd921868b652f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148794 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 054a9fde4bef..a779d45f13d2 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -115,6 +115,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" || rUIFile == u"modules/swriter/ui/paradialog.ui" || rUIFile == u"modules/swriter/ui/splittable.ui" +|| rUIFile == u"modules/swriter/ui/templatedialog2.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" // sfx || rUIFile == u"sfx/ui/cmisinfopage.ui" @@ -124,6 +125,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"sfx/ui/documentpropertiesdialog.ui" || rUIFile == u"sfx/ui/editdurationdialog.ui" || rUIFile == u"sfx/ui/linefragment.ui" +|| rUIFile == u"sfx/ui/managestylepage.ui" || rUIFile == u"sfx/ui/password.ui" // svx || rUIFile == u"svx/ui/accessibilitycheckdialog.ui"
[Libreoffice-commits] core.git: vcl/jsdialog
vcl/jsdialog/enabled.cxx | 13 + 1 file changed, 13 insertions(+) New commits: commit f973d0259de40e77709f487e87db5f29437d60db Author: Pranam Lashkari AuthorDate: Tue Mar 7 18:09:46 2023 +0530 Commit: Szymon Kłos CommitDate: Fri Mar 10 09:13:15 2023 + jsdialog: enabled Format Paragraph dialog (writer) can be found from: Tabbed view > Format > Paragraph sidebar > Paragraph Compact view > Format > Paragraph Change-Id: I5b0e59c88017cb039f9e441be76c350bf39f9614 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148398 Tested-by: Jenkins Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 70674c5523b1..7e4fc5fd7e78 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -35,6 +35,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) if (// cui rUIFile == u"cui/ui/areatabpage.ui" +|| rUIFile == u"cui/ui/asiantypography.ui" || rUIFile == u"cui/ui/borderpage.ui" || rUIFile == u"cui/ui/charnamepage.ui" || rUIFile == u"cui/ui/colorpage.ui" @@ -42,13 +43,22 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/eventassigndialog.ui" || rUIFile == u"cui/ui/fontfeaturesdialog.ui" || rUIFile == u"cui/ui/formatnumberdialog.ui" +|| rUIFile == u"cui/ui/gradientpage.ui" +|| rUIFile == u"cui/ui/hatchpage.ui" +|| rUIFile == u"cui/ui/imagetabpage.ui" || rUIFile == u"cui/ui/macroselectordialog.ui" || rUIFile == u"cui/ui/numberingformatpage.ui" +|| rUIFile == u"cui/ui/paragalignpage.ui" +|| rUIFile == u"cui/ui/paraindentspacing.ui" +|| rUIFile == u"cui/ui/paratabspage.ui" || rUIFile == u"cui/ui/password.ui" +|| rUIFile == u"cui/ui/patterntabpage.ui" || rUIFile == u"cui/ui/positionpage.ui" || rUIFile == u"cui/ui/queryduplicatedialog.ui" || rUIFile == u"cui/ui/similaritysearchdialog.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" +|| rUIFile == u"cui/ui/textflowpage.ui" +|| rUIFile == u"cui/ui/transparencytabpage.ui" || rUIFile == u"cui/ui/twolinespage.ui" || rUIFile == u"cui/ui/widgettestdialog.ui" // scalc @@ -93,10 +103,13 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/charurlpage.ui" || rUIFile == u"modules/swriter/ui/contentcontroldlg.ui" || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" +|| rUIFile == u"modules/swriter/ui/dropcapspage.ui" || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" || rUIFile == u"modules/swriter/ui/linenumbering.ui" +|| rUIFile == u"modules/swriter/ui/numparapage.ui" || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" +|| rUIFile == u"modules/swriter/ui/paradialog.ui" || rUIFile == u"modules/swriter/ui/splittable.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" // sfx
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx | 13 + 1 file changed, 13 insertions(+) New commits: commit fdbf7b7d49e3b458969056478a1f235be9f08661 Author: Pranam Lashkari AuthorDate: Tue Mar 7 18:09:46 2023 +0530 Commit: Szymon Kłos CommitDate: Fri Mar 10 09:13:03 2023 + jsdialog: enabled Format Paragraph dialog (writer) can be found from: Tabbed view > Format > Paragraph sidebar > Paragraph Compact view > Format > Paragraph Change-Id: I5b0e59c88017cb039f9e441be76c350bf39f9614 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148418 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 70674c5523b1..7e4fc5fd7e78 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -35,6 +35,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) if (// cui rUIFile == u"cui/ui/areatabpage.ui" +|| rUIFile == u"cui/ui/asiantypography.ui" || rUIFile == u"cui/ui/borderpage.ui" || rUIFile == u"cui/ui/charnamepage.ui" || rUIFile == u"cui/ui/colorpage.ui" @@ -42,13 +43,22 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/eventassigndialog.ui" || rUIFile == u"cui/ui/fontfeaturesdialog.ui" || rUIFile == u"cui/ui/formatnumberdialog.ui" +|| rUIFile == u"cui/ui/gradientpage.ui" +|| rUIFile == u"cui/ui/hatchpage.ui" +|| rUIFile == u"cui/ui/imagetabpage.ui" || rUIFile == u"cui/ui/macroselectordialog.ui" || rUIFile == u"cui/ui/numberingformatpage.ui" +|| rUIFile == u"cui/ui/paragalignpage.ui" +|| rUIFile == u"cui/ui/paraindentspacing.ui" +|| rUIFile == u"cui/ui/paratabspage.ui" || rUIFile == u"cui/ui/password.ui" +|| rUIFile == u"cui/ui/patterntabpage.ui" || rUIFile == u"cui/ui/positionpage.ui" || rUIFile == u"cui/ui/queryduplicatedialog.ui" || rUIFile == u"cui/ui/similaritysearchdialog.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" +|| rUIFile == u"cui/ui/textflowpage.ui" +|| rUIFile == u"cui/ui/transparencytabpage.ui" || rUIFile == u"cui/ui/twolinespage.ui" || rUIFile == u"cui/ui/widgettestdialog.ui" // scalc @@ -93,10 +103,13 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/charurlpage.ui" || rUIFile == u"modules/swriter/ui/contentcontroldlg.ui" || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" +|| rUIFile == u"modules/swriter/ui/dropcapspage.ui" || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" || rUIFile == u"modules/swriter/ui/linenumbering.ui" +|| rUIFile == u"modules/swriter/ui/numparapage.ui" || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui" +|| rUIFile == u"modules/swriter/ui/paradialog.ui" || rUIFile == u"modules/swriter/ui/splittable.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" // sfx
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 2 commits - sw/source vcl/jsdialog
sw/source/ui/chrdlg/chardlg.cxx |6 +- vcl/jsdialog/enabled.cxx| 15 ++- 2 files changed, 19 insertions(+), 2 deletions(-) New commits: commit 7aafc76f1a9df21ae3d9f69461d9bc515b07dc3f Author: Pranam Lashkari AuthorDate: Fri Mar 3 07:00:22 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 7 09:13:23 2023 + jsdialog: enabled format Character dialog (calc) can be found from: Tabbed view > Format > Character Compact view > Format > Character Change-Id: I80c15237a29ef19303c71101965df9a18791cb4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148208 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 5e95b1291d57..42a22b70efa0 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -53,6 +53,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/widgettestdialog.ui" // scalc || rUIFile == u"modules/scalc/ui/analysisofvariancedialog.ui" +|| rUIFile == u"modules/scalc/ui/chardialog.ui" || rUIFile == u"modules/scalc/ui/chisquaretestdialog.ui" || rUIFile == u"modules/scalc/ui/colwidthdialog.ui" || rUIFile == u"modules/scalc/ui/correlationdialog.ui" commit 0b9a589f0cb4a1a0b74788d4a1733a490c58a644 Author: Pranam Lashkari AuthorDate: Fri Mar 3 02:30:55 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 7 09:13:13 2023 + jsdialog: enabled format Character dialog (writer) can be found from: Tabbed view > Format > Character Sidebar > Character Compact view > Format > Character Change-Id: I43f9dc63a1941345a7ef55bfecd8bb38f652208e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148207 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 0cf38a652bec..efa16ce22797 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -167,7 +168,10 @@ SwCharURLPage::SwCharURLPage(weld::Container* pPage, weld::DialogController* pCo m_xCharStyleContainer->hide(); } -m_xURLPB->connect_clicked(LINK( this, SwCharURLPage, InsertFileHdl)); +if(comphelper::LibreOfficeKit::isActive()) +m_xURLPB->hide(); // Hide browse button in online (not supported yet) +else +m_xURLPB->connect_clicked(LINK( this, SwCharURLPage, InsertFileHdl)); m_xEventPB->connect_clicked(LINK( this, SwCharURLPage, EventHdl)); SwView *pView = ::GetActiveView(); diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 3f1abace986e..5e95b1291d57 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -34,12 +34,22 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) } if (// cui -rUIFile == u"cui/ui/formatnumberdialog.ui" +rUIFile == u"cui/ui/areatabpage.ui" +|| rUIFile == u"cui/ui/borderpage.ui" +|| rUIFile == u"cui/ui/charnamepage.ui" +|| rUIFile == u"cui/ui/colorpage.ui" +|| rUIFile == u"cui/ui/effectspage.ui" +|| rUIFile == u"cui/ui/eventassigndialog.ui" +|| rUIFile == u"cui/ui/fontfeaturesdialog.ui" +|| rUIFile == u"cui/ui/formatnumberdialog.ui" || rUIFile == u"cui/ui/macroselectordialog.ui" || rUIFile == u"cui/ui/numberingformatpage.ui" || rUIFile == u"cui/ui/password.ui" +|| rUIFile == u"cui/ui/positionpage.ui" +|| rUIFile == u"cui/ui/queryduplicatedialog.ui" || rUIFile == u"cui/ui/similaritysearchdialog.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" +|| rUIFile == u"cui/ui/twolinespage.ui" || rUIFile == u"cui/ui/widgettestdialog.ui" // scalc || rUIFile == u"modules/scalc/ui/analysisofvariancedialog.ui" @@ -73,6 +83,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/scalc/ui/ztestdialog.ui" // swriter || rUIFile == u"modules/swriter/ui/captionoptions.ui" +|| rUIFile == u"modules/swriter/ui/characterproperties.ui" +|| rUIFile == u"modules/swriter/ui/charurlpage.ui" || rUIFile == u"modules/swriter/ui/contentcontroldlg.ui" || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 5a913f39136a3513c8eaabdfa54a3421ac839d7e
Author: Pranam Lashkari
AuthorDate: Fri Mar 3 02:27:01 2023 +0530
Commit: Szymon Kłos
CommitDate: Tue Mar 7 09:12:40 2023 +
jsdialog: sort enabled UI files by name
this helps avoid repeating them
Change-Id: Iaa1d73ca1e396c18a0486ca89cb3b0a26571569d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148206
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index d58e08bf32d6..3f1abace986e 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -38,8 +38,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"cui/ui/macroselectordialog.ui"
|| rUIFile == u"cui/ui/numberingformatpage.ui"
|| rUIFile == u"cui/ui/password.ui"
-|| rUIFile == u"cui/ui/splitcellsdialog.ui"
|| rUIFile == u"cui/ui/similaritysearchdialog.ui"
+|| rUIFile == u"cui/ui/splitcellsdialog.ui"
|| rUIFile == u"cui/ui/widgettestdialog.ui"
// scalc
|| rUIFile == u"modules/scalc/ui/analysisofvariancedialog.ui"
@@ -75,12 +75,12 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/swriter/ui/captionoptions.ui"
|| rUIFile == u"modules/swriter/ui/contentcontroldlg.ui"
|| rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui"
+|| rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui"
|| rUIFile == u"modules/swriter/ui/insertcaption.ui"
|| rUIFile == u"modules/swriter/ui/linenumbering.ui"
+|| rUIFile == u"modules/swriter/ui/pagenumberdlg.ui"
|| rUIFile == u"modules/swriter/ui/splittable.ui"
|| rUIFile == u"modules/swriter/ui/translationdialog.ui"
-|| rUIFile == u"modules/swriter/ui/pagenumberdlg.ui"
-|| rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui"
// sfx
|| rUIFile == u"sfx/ui/cmisinfopage.ui"
|| rUIFile == u"sfx/ui/custominfopage.ui"
@@ -98,19 +98,19 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
// uui
|| rUIFile == u"uui/ui/macrowarnmedium.ui"
// xmlsec
-|| rUIFile == u"xmlsec/ui/certgeneral.ui"
-|| rUIFile == u"xmlsec/ui/certpage.ui"
-|| rUIFile == u"xmlsec/ui/digitalsignaturesdialog.ui"
-|| rUIFile == u"xmlsec/ui/viewcertdialog.ui"
-|| rUIFile == u"filter/ui/pdfoptionsdialog.ui"
|| rUIFile == u"filter/ui/pdfgeneralpage.ui"
-|| rUIFile == u"filter/ui/pdfviewpage.ui"
-|| rUIFile == u"filter/ui/pdfuserinterfacepage.ui"
-|| rUIFile == u"filter/ui/pdfsecuritypage.ui"
|| rUIFile == u"filter/ui/pdflinkspage.ui"
-|| rUIFile == u"filter/ui/warnpdfdialog.ui"
+|| rUIFile == u"filter/ui/pdfoptionsdialog.ui"
+|| rUIFile == u"filter/ui/pdfsecuritypage.ui"
|| rUIFile == u"filter/ui/pdfsignpage.ui"
+|| rUIFile == u"filter/ui/pdfuserinterfacepage.ui"
+|| rUIFile == u"filter/ui/pdfviewpage.ui"
+|| rUIFile == u"filter/ui/warnpdfdialog.ui"
|| rUIFile == u"writerperfect/ui/exportepub.ui"
+|| rUIFile == u"xmlsec/ui/certgeneral.ui"
+|| rUIFile == u"xmlsec/ui/certpage.ui"
+|| rUIFile == u"xmlsec/ui/digitalsignaturesdialog.ui"
+|| rUIFile == u"xmlsec/ui/viewcertdialog.ui"
)
{
return true;
@@ -189,8 +189,8 @@ bool isBuilderEnabledForSidebar(std::u16string_view rUIFile)
// swriter
|| rUIFile == u"modules/swriter/ui/managechangessidebar.ui"
//|| rUIFile == u"modules/swriter/ui/navigatorpanel.ui"
-|| rUIFile == u"modules/swriter/ui/pageformatpanel.ui"
|| rUIFile == u"modules/swriter/ui/pagefooterpanel.ui"
+|| rUIFile == u"modules/swriter/ui/pageformatpanel.ui"
|| rUIFile == u"modules/swriter/ui/pageheaderpanel.ui"
|| rUIFile == u"modules/swriter/ui/pagestylespanel.ui"
|| rUIFile == u"modules/swriter/ui/sidebarstylepresets.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - include/vcl vcl/inc vcl/jsdialog vcl/source
include/vcl/toolkit/button.hxx |4 ++
vcl/inc/jsdialog/jsdialogbuilder.hxx |8 +
vcl/inc/salvtables.hxx | 51 +
vcl/jsdialog/executor.cxx|5 +++
vcl/jsdialog/jsdialogbuilder.cxx | 18 +++
vcl/source/app/salvtables.cxx| 53 ---
vcl/source/control/button.cxx|2 +
7 files changed, 88 insertions(+), 53 deletions(-)
New commits:
commit cfa3efa7e062ea000db1caee4e2b33072e860c46
Author: Pranam Lashkari
AuthorDate: Fri Mar 3 02:16:08 2023 +0530
Commit: Szymon Kłos
CommitDate: Tue Mar 7 09:11:14 2023 +
JSDialog: implemented jsdialog support for the toggle buttons
Change-Id: I21408f7344f7e100373c368036f81503302b93ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148205
Reviewed-by: Szymon Kłos
Tested-by: Szymon Kłos
diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx
index df67a243c52c..6785dfd7008c 100644
--- a/include/vcl/toolkit/button.hxx
+++ b/include/vcl/toolkit/button.hxx
@@ -181,6 +181,9 @@ public:
void DumpAsPropertyTree(tools::JsonWriter&) override;
+bool isToggleButton() { return mbIsToggleButton; }
+void setToggleButton(bool bIsToggleButton) { mbIsToggleButton =
bIsToggleButton; }
+
protected:
PushButtonDropdownStyle mnDDStyle;
boolmbIsActive;
@@ -218,6 +221,7 @@ private:
TriStatemeState;
boolmbPressed;
boolmbIsAction;
+boolmbIsToggleButton = false;
};
inline void PushButton::Check( bool bCheck )
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 472ff66eac62..b7b0e941f2e0 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -285,6 +285,7 @@ public:
virtual std::unique_ptr weld_label(const OString& id)
override;
virtual std::unique_ptr weld_button(const OString& id)
override;
virtual std::unique_ptr weld_link_button(const OString&
id) override;
+virtual std::unique_ptr weld_toggle_button(const
OString& id) override;
virtual std::unique_ptr weld_entry(const OString& id)
override;
virtual std::unique_ptr weld_combo_box(const OString& id)
override;
virtual std::unique_ptr weld_notebook(const OString& id)
override;
@@ -527,6 +528,13 @@ public:
bool bTakeOwnership);
};
+class JSToggleButton final : public JSWidget
+{
+public:
+JSToggleButton(JSDialogSender* pSender, ::PushButton* pButton,
SalInstanceBuilder* pBuilder,
+ bool bTakeOwnership);
+};
+
class JSEntry final : public JSWidget
{
public:
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index c6af89564b9d..2ce0da43fece 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -1094,6 +1094,57 @@ public:
virtual ~SalInstanceButton() override;
};
+class SalInstanceToggleButton : public SalInstanceButton, public virtual
weld::ToggleButton
+{
+private:
+VclPtr m_xToggleButton;
+
+DECL_LINK(ToggleListener, VclWindowEvent&, void);
+
+public:
+SalInstanceToggleButton(PushButton* pButton, SalInstanceBuilder* pBuilder,
bool bTakeOwnership)
+: SalInstanceButton(pButton, pBuilder, bTakeOwnership)
+, m_xToggleButton(pButton)
+{
+m_xToggleButton->setToggleButton(true);
+}
+
+virtual void connect_toggled(const Link& rLink) override
+{
+assert(!m_aToggleHdl.IsSet());
+m_xToggleButton->AddEventListener(LINK(this, SalInstanceToggleButton,
ToggleListener));
+weld::ToggleButton::connect_toggled(rLink);
+}
+
+virtual void set_active(bool active) override
+{
+disable_notify_events();
+m_xToggleButton->Check(active);
+enable_notify_events();
+}
+
+virtual bool get_active() const override { return
m_xToggleButton->IsChecked(); }
+
+virtual void set_inconsistent(bool inconsistent) override
+{
+disable_notify_events();
+m_xToggleButton->SetState(inconsistent ? TRISTATE_INDET :
TRISTATE_FALSE);
+enable_notify_events();
+}
+
+virtual bool get_inconsistent() const override
+{
+return m_xToggleButton->GetState() == TRISTATE_INDET;
+}
+
+virtual ~SalInstanceToggleButton() override
+{
+if (m_aToggleHdl.IsSet())
+m_xToggleButton->RemoveEventListener(
+LINK(this, SalInstanceToggleButton, ToggleListener));
+}
+};
+
class SalInstanceNotebook : public SalInstanceWidget, public virtual
weld::Notebook
{
private:
diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index acd0e084ae76..be17d4ef353c 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -141,6 +141,11 @@ bool ExecuteAction(const std::string& nWindowId, const
OString& rWidget, StringM
pButton->clicked();
[Libreoffice-commits] core.git: vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 0ba5a856fc8c24d9612bd9a78e9a4f11365571e7 Author: Pranam Lashkari AuthorDate: Fri Mar 3 07:00:22 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 7 08:52:48 2023 + jsdialog: enabled format Character dialog (calc) can be found from: Tabbed view > Format > Character Compact view > Format > Character Change-Id: I80c15237a29ef19303c71101965df9a18791cb4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148243 Tested-by: Jenkins Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index b76bd70597b0..70674c5523b1 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -53,6 +53,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/widgettestdialog.ui" // scalc || rUIFile == u"modules/scalc/ui/analysisofvariancedialog.ui" +|| rUIFile == u"modules/scalc/ui/chardialog.ui" || rUIFile == u"modules/scalc/ui/chisquaretestdialog.ui" || rUIFile == u"modules/scalc/ui/colwidthdialog.ui" || rUIFile == u"modules/scalc/ui/correlationdialog.ui"
[Libreoffice-commits] core.git: 2 commits - sw/source vcl/inc vcl/jsdialog
sw/source/ui/chrdlg/chardlg.cxx |6 +- vcl/inc/jsdialog/jsdialogbuilder.hxx |2 ++ vcl/jsdialog/enabled.cxx | 14 +- vcl/jsdialog/jsdialogbuilder.cxx | 12 4 files changed, 32 insertions(+), 2 deletions(-) New commits: commit f3aca61de33b396bad10d08ddbb6f83e1a29ac13 Author: Pranam Lashkari AuthorDate: Fri Mar 3 02:30:55 2023 +0530 Commit: Szymon Kłos CommitDate: Mon Mar 6 09:47:08 2023 + jsdialog: enabled format Character dialog (writer) can be found from: Tabbed view > Format > Character Sidebar > Character Compact view > Format > Character Change-Id: I43f9dc63a1941345a7ef55bfecd8bb38f652208e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148242 Tested-by: Jenkins Reviewed-by: Szymon Kłos diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 0cf38a652bec..efa16ce22797 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -167,7 +168,10 @@ SwCharURLPage::SwCharURLPage(weld::Container* pPage, weld::DialogController* pCo m_xCharStyleContainer->hide(); } -m_xURLPB->connect_clicked(LINK( this, SwCharURLPage, InsertFileHdl)); +if(comphelper::LibreOfficeKit::isActive()) +m_xURLPB->hide(); // Hide browse button in online (not supported yet) +else +m_xURLPB->connect_clicked(LINK( this, SwCharURLPage, InsertFileHdl)); m_xEventPB->connect_clicked(LINK( this, SwCharURLPage, EventHdl)); SwView *pView = ::GetActiveView(); diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 9a10f5bc0079..b76bd70597b0 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -34,12 +34,22 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) } if (// cui -rUIFile == u"cui/ui/formatnumberdialog.ui" +rUIFile == u"cui/ui/areatabpage.ui" +|| rUIFile == u"cui/ui/borderpage.ui" +|| rUIFile == u"cui/ui/charnamepage.ui" +|| rUIFile == u"cui/ui/colorpage.ui" +|| rUIFile == u"cui/ui/effectspage.ui" +|| rUIFile == u"cui/ui/eventassigndialog.ui" +|| rUIFile == u"cui/ui/fontfeaturesdialog.ui" +|| rUIFile == u"cui/ui/formatnumberdialog.ui" || rUIFile == u"cui/ui/macroselectordialog.ui" || rUIFile == u"cui/ui/numberingformatpage.ui" || rUIFile == u"cui/ui/password.ui" +|| rUIFile == u"cui/ui/positionpage.ui" +|| rUIFile == u"cui/ui/queryduplicatedialog.ui" || rUIFile == u"cui/ui/similaritysearchdialog.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" +|| rUIFile == u"cui/ui/twolinespage.ui" || rUIFile == u"cui/ui/widgettestdialog.ui" // scalc || rUIFile == u"modules/scalc/ui/analysisofvariancedialog.ui" @@ -78,6 +88,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/schart/ui/wizelementspage.ui" // swriter || rUIFile == u"modules/swriter/ui/captionoptions.ui" +|| rUIFile == u"modules/swriter/ui/characterproperties.ui" +|| rUIFile == u"modules/swriter/ui/charurlpage.ui" || rUIFile == u"modules/swriter/ui/contentcontroldlg.ui" || rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui" || rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui" commit 26486cd12f47090fbd505b4b51828ee9e79bf3b7 Author: Szymon Kłos AuthorDate: Sat Mar 4 15:14:49 2023 +0100 Commit: Szymon Kłos CommitDate: Mon Mar 6 09:47:02 2023 + jsdialog: send full update when showing BuilderPage BuilderPage when created welds only container. Detect that case when full update wasn't sent in weld_dialog or weld_assistant so we show new tab pages. Fixes problem in Characters -> Higlight -> Color Change-Id: Iab38493a12feb4fc5e8b258125987856485275a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148221 Tested-by: Jenkins Reviewed-by: Szymon Kłos diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx index b7b0e941f2e0..f9dea1a3987d 100644 --- a/vcl/inc/jsdialog/jsdialogbuilder.hxx +++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx @@ -221,6 +221,8 @@ class JSInstanceBuilder final : public SalInstanceBuilder, public JSDialogSender std::string m_sTypeOfJSON; bool m_bHasTopLevelDialog; bool m_bIsNotebookbar; +/// used to detect when we have to send Full Update in container handler +bool m_bSentInitialUpdate; /// When LOKNotifier is set by jsdialogs code we need to release it VclPtr m_aWindowToRelease; diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index cc1ca91262c8..db2481897fa3 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++
[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/inc vcl/jsdialog vcl/source
include/vcl/toolkit/button.hxx |4 ++
vcl/inc/jsdialog/jsdialogbuilder.hxx |8 +
vcl/inc/salvtables.hxx | 51 +
vcl/jsdialog/enabled.cxx | 26 -
vcl/jsdialog/executor.cxx|5 +++
vcl/jsdialog/jsdialogbuilder.cxx | 18 +++
vcl/source/app/salvtables.cxx| 53 ---
vcl/source/control/button.cxx|2 +
8 files changed, 101 insertions(+), 66 deletions(-)
New commits:
commit 95ee8a692cbc3f8ead72e61eb36b9015f1c57605
Author: Pranam Lashkari
AuthorDate: Fri Mar 3 02:27:01 2023 +0530
Commit: Szymon Kłos
CommitDate: Sat Mar 4 19:52:07 2023 +
jsdialog: sort enabled UI files by name
this helps avoid repeating them
Change-Id: Iaa1d73ca1e396c18a0486ca89cb3b0a26571569d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148241
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 1916c8dfe41f..9a10f5bc0079 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -38,8 +38,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"cui/ui/macroselectordialog.ui"
|| rUIFile == u"cui/ui/numberingformatpage.ui"
|| rUIFile == u"cui/ui/password.ui"
-|| rUIFile == u"cui/ui/splitcellsdialog.ui"
|| rUIFile == u"cui/ui/similaritysearchdialog.ui"
+|| rUIFile == u"cui/ui/splitcellsdialog.ui"
|| rUIFile == u"cui/ui/widgettestdialog.ui"
// scalc
|| rUIFile == u"modules/scalc/ui/analysisofvariancedialog.ui"
@@ -80,12 +80,12 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/swriter/ui/captionoptions.ui"
|| rUIFile == u"modules/swriter/ui/contentcontroldlg.ui"
|| rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui"
+|| rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui"
|| rUIFile == u"modules/swriter/ui/insertcaption.ui"
|| rUIFile == u"modules/swriter/ui/linenumbering.ui"
+|| rUIFile == u"modules/swriter/ui/pagenumberdlg.ui"
|| rUIFile == u"modules/swriter/ui/splittable.ui"
|| rUIFile == u"modules/swriter/ui/translationdialog.ui"
-|| rUIFile == u"modules/swriter/ui/pagenumberdlg.ui"
-|| rUIFile == u"modules/swriter/ui/dropdownfielddialog.ui"
// sfx
|| rUIFile == u"sfx/ui/cmisinfopage.ui"
|| rUIFile == u"sfx/ui/custominfopage.ui"
@@ -105,19 +105,19 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
// vcl
|| rUIFile == u"vcl/ui/wizard.ui"
// xmlsec
-|| rUIFile == u"xmlsec/ui/certgeneral.ui"
-|| rUIFile == u"xmlsec/ui/certpage.ui"
-|| rUIFile == u"xmlsec/ui/digitalsignaturesdialog.ui"
-|| rUIFile == u"xmlsec/ui/viewcertdialog.ui"
-|| rUIFile == u"filter/ui/pdfoptionsdialog.ui"
|| rUIFile == u"filter/ui/pdfgeneralpage.ui"
-|| rUIFile == u"filter/ui/pdfviewpage.ui"
-|| rUIFile == u"filter/ui/pdfuserinterfacepage.ui"
-|| rUIFile == u"filter/ui/pdfsecuritypage.ui"
|| rUIFile == u"filter/ui/pdflinkspage.ui"
-|| rUIFile == u"filter/ui/warnpdfdialog.ui"
+|| rUIFile == u"filter/ui/pdfoptionsdialog.ui"
+|| rUIFile == u"filter/ui/pdfsecuritypage.ui"
|| rUIFile == u"filter/ui/pdfsignpage.ui"
+|| rUIFile == u"filter/ui/pdfuserinterfacepage.ui"
+|| rUIFile == u"filter/ui/pdfviewpage.ui"
+|| rUIFile == u"filter/ui/warnpdfdialog.ui"
|| rUIFile == u"writerperfect/ui/exportepub.ui"
+|| rUIFile == u"xmlsec/ui/certgeneral.ui"
+|| rUIFile == u"xmlsec/ui/certpage.ui"
+|| rUIFile == u"xmlsec/ui/digitalsignaturesdialog.ui"
+|| rUIFile == u"xmlsec/ui/viewcertdialog.ui"
)
{
return true;
@@ -196,8 +196,8 @@ bool isBuilderEnabledForSidebar(std::u16string_view rUIFile)
// swriter
|| rUIFile == u"modules/swriter/ui/managechangessidebar.ui"
//|| rUIFile == u"modules/swriter/ui/navigatorpanel.ui"
-|| rUIFile == u"modules/swriter/ui/pageformatpanel.ui"
|| rUIFile == u"modules/swriter/ui/pagefooterpanel.ui"
+|| rUIFile == u"modules/swriter/ui/pageformatpanel.ui"
|| rUIFile == u"modules/swriter/ui/pageheaderpanel.ui"
|| rUIFile == u"modules/swriter/ui/pagestylespanel.ui"
|| rUIFile == u"modules/swriter/ui/sidebarstylepresets.ui"
commit 542cef171ceed4577c1c71735726b1e7c7c9c8c9
Author: Pranam Lashkari
AuthorDate: Fri Mar 3 02:16:08 2023 +0530
Commit: Szymon Kłos
CommitDate: Sat Mar 4 19:51:58 2023 +
JSDialog: implemented jsdialog support for the toggle buttons
Change-Id: I21408f7344f7e100373c368036f81503302b93ad
Reviewed-on:
[Libreoffice-commits] core.git: sc/source
sc/source/ui/attrdlg/attrdlg.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit feda414f8b70f50a9f6745d2ce8828316d4711cd Author: Pranam Lashkari AuthorDate: Fri Feb 24 22:20:11 2023 +0530 Commit: Pranam Lashkari CommitDate: Sat Mar 4 01:26:35 2023 + sc: remove protect cell tab from cell format dialog Change-Id: I33a32ca756263426abb4dcb733139baf58221554 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147897 Tested-by: Jenkins Reviewed-by: Pranam Lashkari diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 734ae94d606f..4e13eae6dea4 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -30,6 +30,7 @@ #include #include #include +#include ScAttrDlg::ScAttrDlg(weld::Window* pParent, const SfxItemSet* pCellAttrs) : SfxTabDialogController(pParent, "modules/scalc/ui/formatcellsdialog.ui", @@ -57,7 +58,11 @@ ScAttrDlg::ScAttrDlg(weld::Window* pParent, const SfxItemSet* pCellAttrs) AddTabPage( "borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), nullptr ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), "GetTabPageCreatorFunc fail!"); AddTabPage( "background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); -AddTabPage( "cellprotection" , ScTabPageProtection::Create,nullptr ); + +if (!comphelper::LibreOfficeKit::isActive()) +AddTabPage( "cellprotection" , ScTabPageProtection::Create, nullptr ); +else +RemoveTabPage( "cellprotection" ); } ScAttrDlg::~ScAttrDlg()
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/source
sc/source/ui/attrdlg/attrdlg.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit b6fcab0c2e43a726df92b8eaaf13f73a7cf611b4 Author: Pranam Lashkari AuthorDate: Fri Feb 24 22:20:11 2023 +0530 Commit: Andras Timar CommitDate: Mon Feb 27 16:45:24 2023 + sc: remove protect cell tab from cell format dialog Change-Id: I33a32ca756263426abb4dcb733139baf58221554 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147896 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 734ae94d606f..4e13eae6dea4 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -30,6 +30,7 @@ #include #include #include +#include ScAttrDlg::ScAttrDlg(weld::Window* pParent, const SfxItemSet* pCellAttrs) : SfxTabDialogController(pParent, "modules/scalc/ui/formatcellsdialog.ui", @@ -57,7 +58,11 @@ ScAttrDlg::ScAttrDlg(weld::Window* pParent, const SfxItemSet* pCellAttrs) AddTabPage( "borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), nullptr ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), "GetTabPageCreatorFunc fail!"); AddTabPage( "background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); -AddTabPage( "cellprotection" , ScTabPageProtection::Create,nullptr ); + +if (!comphelper::LibreOfficeKit::isActive()) +AddTabPage( "cellprotection" , ScTabPageProtection::Create, nullptr ); +else +RemoveTabPage( "cellprotection" ); } ScAttrDlg::~ScAttrDlg()
