[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sfx2/source

2022-01-12 Thread Mert Tumer (via logerrit) 
 desktop/source/lib/init.cxx |7 ++-
 sfx2/source/view/viewsh.cxx |1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 98d897ff144fa97b9b4db3a0e5657630747feca9
Author: Mert Tumer 
AuthorDate: Mon Jan 10 13:23:03 2022 +0300
Commit: Mert Tumer 
CommitDate: Wed Jan 12 09:47:09 2022 +0100

lok: Fix freshly added comments are not displayed

Signed-off-by: Mert Tumer 
Change-Id: Ice772eff8b9f8ae8c23ec1e66675e33a80492028
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128217
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
(cherry picked from commit 09b30a80a3b2a58d981b712f8bd184410c222535)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128229

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 632deac8fd42..0c93a7f9d626 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1477,13 +1477,18 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 SAL_INFO("lok", "Queue: [" << type << "]: [" << payload << "] on " << 
m_queue1.size() << " entries.");
 
 bool bIsChartActive = false;
+bool bIsComment = false;
 if (type == LOK_CALLBACK_GRAPHIC_SELECTION)
 {
 LokChartHelper aChartHelper(SfxViewShell::Current());
 bIsChartActive = aChartHelper.GetWindow() != nullptr;
 }
+else if (type == LOK_CALLBACK_COMMENT)
+{
+bIsComment = true;
+}
 
-if (callbacksDisabled() && !bIsChartActive)
+if (callbacksDisabled() && !bIsChartActive && !bIsComment)
 {
 // We drop notifications when this is set, except for important ones.
 // When we issue a complex command (such as .uno:InsertAnnotation)
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index c59db5582ea9..f8f4f615966b 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1480,6 +1480,7 @@ void SfxViewShell::libreOfficeKitViewCallback(int nType, 
const char* pPayload) c
 {
 case LOK_CALLBACK_FORM_FIELD_BUTTON:
 case LOK_CALLBACK_TEXT_SELECTION:
+case LOK_CALLBACK_COMMENT:
 break;
 default:
 // Reject e.g. invalidate during paint.

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sfx2/source

2021-04-26 Thread merttumer (via logerrit) 
 desktop/source/lib/lokinteractionhandler.cxx |   23 +++
 desktop/source/lib/lokinteractionhandler.hxx |1 +
 sfx2/source/doc/objstor.cxx  |3 ++-
 3 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit 3f754470815e0dc5ac169a480931282107aad0f9
Author: merttumer 
AuthorDate: Mon Apr 26 08:12:11 2021 +0300
Commit: Mert Tumer 
CommitDate: Mon Apr 26 14:17:05 2021 +0200

lok: Interaction handler for FilterOptions

This will enable Text Import Dialog to be executed
before the document is loaded

Change-Id: I263e69f0739f4971f4c4eec032ebf22ffbdeebb7
Signed-off-by: merttumer 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114638
Tested-by: Jenkins CollaboraOffice 

diff --git a/desktop/source/lib/lokinteractionhandler.cxx 
b/desktop/source/lib/lokinteractionhandler.cxx
index 3ee9c891f6ea..ad480964616c 100644
--- a/desktop/source/lib/lokinteractionhandler.cxx
+++ b/desktop/source/lib/lokinteractionhandler.cxx
@@ -41,6 +41,8 @@
 #include 
 #include 
 
+#include 
+
 #include "../../inc/lib/init.hxx"
 
 #include 
@@ -330,6 +332,24 @@ bool LOKInteractionHandler::handlePasswordRequest(const 
uno::Sequence& xRequest)
+{
+document::FilterOptionsRequest aFilterOptionsRequest;
+uno::Any const request(xRequest->getRequest());
+if (request >>= aFilterOptionsRequest)
+{
+uno::Reference< task::XInteractionHandler2 > xInteraction(
+task::InteractionHandler::createWithParent(
+::comphelper::getProcessComponentContext(), nullptr));
+
+if (xInteraction.is())
+xInteraction->handleInteractionRequest(xRequest);
+
+return true;
+}
+return false;
+}
+
 sal_Bool SAL_CALL LOKInteractionHandler::handleInteractionRequest(
 const uno::Reference& xRequest)
 {
@@ -345,6 +365,9 @@ sal_Bool SAL_CALL 
LOKInteractionHandler::handleInteractionRequest(
 if (handlePasswordRequest(rContinuations, request))
 return true;
 
+if (handleFilterOptionsRequest(xRequest))
+return true;
+
 task::DocumentMacroConfirmationRequest aConfirmRequest;
 if (request >>= aConfirmRequest)
 {
diff --git a/desktop/source/lib/lokinteractionhandler.hxx 
b/desktop/source/lib/lokinteractionhandler.hxx
index f6dc441327d8..dc827b33d78f 100644
--- a/desktop/source/lib/lokinteractionhandler.hxx
+++ b/desktop/source/lib/lokinteractionhandler.hxx
@@ -76,6 +76,7 @@ private:
 bool handleIOException(const 
css::uno::Sequence> 
, const css::uno::Any& rRequest);
 bool handleNetworkException(const 
css::uno::Sequence> 
, const css::uno::Any& rRequest);
 bool handlePasswordRequest(const 
css::uno::Sequence> 
, const css::uno::Any& rRequest);
+bool handleFilterOptionsRequest(const 
::com::sun::star::uno::Reference<::com::sun::star::task::XInteractionRequest>& 
Request);
 
 public:
 void SetPassword(char const* pPassword);
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 9e54c3771f92..0a2dd750dad7 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -874,7 +874,8 @@ ErrCode SfxObjectShell::HandleFilter( SfxMedium* pMedium, 
SfxObjectShell const *
 SfxItemSet* pSet = pMedium->GetItemSet();
 const SfxStringItem* pOptions = SfxItemSet::GetItem(pSet, 
SID_FILE_FILTEROPTIONS, false);
 const SfxUnoAnyItem* pData = SfxItemSet::GetItem(pSet, 
SID_FILTER_DATA, false);
-if ( !pData && !pOptions )
+const bool bTiledRendering = comphelper::LibreOfficeKit::isActive();
+if ( !pData && (bTiledRendering || !pOptions) )
 {
 css::uno::Reference< XMultiServiceFactory > xServiceManager = 
::comphelper::getProcessServiceFactory();
 css::uno::Reference< XNameAccess > xFilterCFG;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sfx2/source

2020-11-15 Thread Pranam Lashkari (via logerrit) 
 desktop/source/lib/init.cxx  |3 ++-
 sfx2/source/control/unoctitm.cxx |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit cc7bf1755c31fcd4c388f25e642c37d0e2fd758a
Author: Pranam Lashkari 
AuthorDate: Sat Nov 7 12:29:33 2020 +0530
Commit: Andras Timar 
CommitDate: Sun Nov 15 17:31:05 2020 +0100

LOK: send state of SheetRightToLeft

Change-Id: I4b58ab74003065a63e4274293b868c909f4f583f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105428
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a36b4aef2052..210ce2d84d34 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2846,7 +2846,8 @@ static void doc_iniUnoCommands ()
 OUString(".uno:FreezePanes"),
 OUString(".uno:FreezePanesColumn"),
 OUString(".uno:FreezePanesRow"),
-OUString(".uno:Sidebar")
+OUString(".uno:Sidebar"),
+OUString(".uno:SheetRightToLeft")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 5bdd6fec44c0..c31064988113 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1018,7 +1018,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
 aEvent.FeatureURL.Path == "TraceChangeMode" ||
 aEvent.FeatureURL.Path == "FormatPaintbrush" ||
 aEvent.FeatureURL.Path == "FreezePanes" ||
-aEvent.FeatureURL.Path == "Sidebar")
+aEvent.FeatureURL.Path == "Sidebar" ||
+aEvent.FeatureURL.Path == "SheetRightToLeft")
 {
 bool bTemp = false;
 aEvent.State >>= bTemp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sfx2/source

2020-08-25 Thread Pranam Lashkari (via logerrit) 
 desktop/source/lib/init.cxx  |3 ++-
 sfx2/source/control/unoctitm.cxx |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c056a7ddd80988c54a1216058ef65eca78818fe9
Author: Pranam Lashkari 
AuthorDate: Sat Aug 22 18:48:34 2020 +0530
Commit: Andras Timar 
CommitDate: Tue Aug 25 15:43:06 2020 +0200

LOK: send status of the sidebar

sidebar button  did not show status initially
similarly view->sidebar did not show checked/unchecked initially
and same problem can be seen in notebookbar

Change-Id: Ie5fdf298d343435514954efaaebfdc628d4a90fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101182
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9e3d24ff8973..6f68fe32a6fc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2834,7 +2834,8 @@ static void doc_iniUnoCommands ()
 OUString(".uno:BorderOuter"),
 OUString(".uno:FreezePanes"),
 OUString(".uno:FreezePanesColumn"),
-OUString(".uno:FreezePanesRow")
+OUString(".uno:FreezePanesRow"),
+OUString(".uno:Sidebar")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 4c86f6eec6a7..64a377668012 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1017,7 +1017,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
 aEvent.FeatureURL.Path == "AlignDown" ||
 aEvent.FeatureURL.Path == "TraceChangeMode" ||
 aEvent.FeatureURL.Path == "FormatPaintbrush" ||
-aEvent.FeatureURL.Path == "FreezePanes")
+aEvent.FeatureURL.Path == "FreezePanes" ||
+aEvent.FeatureURL.Path == "Sidebar")
 {
 bool bTemp = false;
 aEvent.State >>= bTemp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sfx2/source

2020-08-20 Thread Pranam Lashkari (via logerrit) 
 desktop/source/lib/init.cxx  |7 ---
 sfx2/source/control/unoctitm.cxx |3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit ecf66f5b61b362f454fcc0ace6739a5ee03a4cbf
Author: Pranam Lashkari 
AuthorDate: Thu Aug 20 03:57:17 2020 +0530
Commit: Andras Timar 
CommitDate: Thu Aug 20 09:57:22 2020 +0200

LOK: send state of FreezePanes

Change-Id: I817117d05f7f0f75f65c8e6dbf6105d120ab275d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101031
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 4d96e34333ea..9e3d24ff8973 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2804,7 +2804,6 @@ static void doc_iniUnoCommands ()
 OUString(".uno:AcceptTrackedChange"),
 OUString(".uno:RejectTrackedChange"),
 OUString(".uno:ShowResolvedAnnotations"),
-OUString(".uno:FreezePanesColumn"),
 OUString(".uno:InsertBreak"),
 OUString(".uno:InsertEndnote"),
 OUString(".uno:InsertFootnote"),
@@ -2831,9 +2830,11 @@ static void doc_iniUnoCommands ()
 OUString(".uno:Substract"),
 OUString(".uno:DistributeSelection"),
 OUString(".uno:Intersect"),
-OUString(".uno:FreezePanesRow"),
 OUString(".uno:BorderInner"),
-OUString(".uno:BorderOuter")
+OUString(".uno:BorderOuter"),
+OUString(".uno:FreezePanes"),
+OUString(".uno:FreezePanesColumn"),
+OUString(".uno:FreezePanesRow")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 01a398800813..4c86f6eec6a7 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1016,7 +1016,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
 aEvent.FeatureURL.Path == "AlignMiddle" ||
 aEvent.FeatureURL.Path == "AlignDown" ||
 aEvent.FeatureURL.Path == "TraceChangeMode" ||
-aEvent.FeatureURL.Path == "FormatPaintbrush")
+aEvent.FeatureURL.Path == "FormatPaintbrush" ||
+aEvent.FeatureURL.Path == "FreezePanes")
 {
 bool bTemp = false;
 aEvent.State >>= bTemp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sfx2/source

2020-08-04 Thread Szymon Kłos (via logerrit) 
 desktop/source/lib/init.cxx  |6 ++
 sfx2/source/control/unoctitm.cxx |6 ++
 2 files changed, 12 insertions(+)

New commits:
commit 66d48bd6090f826dbbcb0802f0cb05322c1f8b26
Author: Szymon Kłos 
AuthorDate: Tue Aug 4 12:58:49 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Aug 4 14:57:56 2020 +0200

lok: send state updates for shape editing commands

Change-Id: I0fcb8ef76df89723ee74aa96a003e0d49d558872
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100081
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d655a60e6863..89269803af04 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2793,6 +2793,12 @@ static void doc_iniUnoCommands ()
 OUString(".uno:AlignMiddle"),
 OUString(".uno:AlignDown"),
 OUString(".uno:TraceChangeMode"),
+OUString(".uno:Combine"),
+OUString(".uno:Merge"),
+OUString(".uno:Dismantle"),
+OUString(".uno:Substract"),
+OUString(".uno:DistributeSelection"),
+OUString(".uno:Intersect"),
 OUString(".uno:FreezePanesRow")
 };
 
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 5e841bd382c6..01a398800813 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1156,6 +1156,12 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 
nSID, SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "CharmapControl" ||
  aEvent.FeatureURL.Path == "EnterGroup" ||
  aEvent.FeatureURL.Path == "LeaveGroup" ||
+ aEvent.FeatureURL.Path == "Combine" ||
+ aEvent.FeatureURL.Path == "Merge" ||
+ aEvent.FeatureURL.Path == "Dismantle" ||
+ aEvent.FeatureURL.Path == "Substract" ||
+ aEvent.FeatureURL.Path == "DistributeSelection" ||
+ aEvent.FeatureURL.Path == "Intersect" ||
  aEvent.FeatureURL.Path == "ResetAttributes")
 {
 aBuffer.append(aEvent.IsEnabled ? OUStringLiteral("enabled") : 
OUStringLiteral("disabled"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sfx2/source

2020-08-04 Thread Szymon Kłos (via logerrit) 
 desktop/source/lib/init.cxx  |1 +
 sfx2/source/control/unoctitm.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 0d3f588fd53151a4d4dac848bf57f1c66cdad99e
Author: Szymon Kłos 
AuthorDate: Tue Aug 4 12:05:15 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Aug 4 14:57:23 2020 +0200

lok: update track changes status for calc

Change-Id: Ifb5ac3739ff19154b97ea1258c77739bde0cfb80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100075
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 97ef1635c719..d655a60e6863 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2792,6 +2792,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:AlignUp"),
 OUString(".uno:AlignMiddle"),
 OUString(".uno:AlignDown"),
+OUString(".uno:TraceChangeMode"),
 OUString(".uno:FreezePanesRow")
 };
 
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 1cf61d9bab91..5e841bd382c6 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1015,6 +1015,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
 aEvent.FeatureURL.Path == "AlignUp" ||
 aEvent.FeatureURL.Path == "AlignMiddle" ||
 aEvent.FeatureURL.Path == "AlignDown" ||
+aEvent.FeatureURL.Path == "TraceChangeMode" ||
 aEvent.FeatureURL.Path == "FormatPaintbrush")
 {
 bool bTemp = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sfx2/source svx/sdi sw/source

2020-08-03 Thread Szymon Kłos (via logerrit) 
 desktop/source/lib/init.cxx  |3 +++
 sfx2/source/control/unoctitm.cxx |3 +++
 svx/sdi/svx.sdi  |6 +++---
 sw/source/uibase/shells/drwbassh.cxx |   26 ++
 4 files changed, 35 insertions(+), 3 deletions(-)

New commits:
commit ae323ad6c3df8c8185041fbfa89e6c315f6e0eab
Author: Szymon Kłos 
AuthorDate: Mon Aug 3 12:37:06 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon Aug 3 12:55:23 2020 +0200

lok: state updates for vertical alignment

Change-Id: I6767904e3d3366e1316c932555b979a26e77b8c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/8
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a930e2e2cd92..97ef1635c719 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2789,6 +2789,9 @@ static void doc_iniUnoCommands ()
 OUString(".uno:CharmapControl"),
 OUString(".uno:EnterGroup"),
 OUString(".uno:LeaveGroup"),
+OUString(".uno:AlignUp"),
+OUString(".uno:AlignMiddle"),
+OUString(".uno:AlignDown"),
 OUString(".uno:FreezePanesRow")
 };
 
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index a7a14b40d81c..1cf61d9bab91 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1012,6 +1012,9 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
 aEvent.FeatureURL.Path == "ObjectAlignLeft" ||
 aEvent.FeatureURL.Path == "ObjectAlignRight" ||
 aEvent.FeatureURL.Path == "AlignCenter" ||
+aEvent.FeatureURL.Path == "AlignUp" ||
+aEvent.FeatureURL.Path == "AlignMiddle" ||
+aEvent.FeatureURL.Path == "AlignDown" ||
 aEvent.FeatureURL.Path == "FormatPaintbrush")
 {
 bool bTemp = false;
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 5231ebe66fb6..e3cbeaa3adfc 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -124,7 +124,7 @@ SfxBoolItem AlignCenter SID_OBJECT_ALIGN_CENTER
 ]
 
 
-SfxVoidItem AlignDown SID_OBJECT_ALIGN_DOWN
+SfxBoolItem AlignDown SID_OBJECT_ALIGN_DOWN
 ()
 [
 AutoUpdate = FALSE,
@@ -179,7 +179,7 @@ SvxAdjustItem Alignment SID_ATTR_PARA_ADJUST
 ]
 
 
-SfxVoidItem AlignMiddle SID_OBJECT_ALIGN_MIDDLE
+SfxBoolItem AlignMiddle SID_OBJECT_ALIGN_MIDDLE
 ()
 [
 AutoUpdate = FALSE,
@@ -215,7 +215,7 @@ SfxBoolItem ObjectAlignRight SID_OBJECT_ALIGN_RIGHT
 ]
 
 
-SfxVoidItem AlignUp SID_OBJECT_ALIGN_UP
+SfxBoolItem AlignUp SID_OBJECT_ALIGN_UP
 ()
 [
 AutoUpdate = FALSE,
diff --git a/sw/source/uibase/shells/drwbassh.cxx 
b/sw/source/uibase/shells/drwbassh.cxx
index 277b5e092e04..b08e0fbc1f23 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -705,6 +705,8 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet)
 bool bDisableHoriz = false;
 bool bHoriz = (nWhich == SID_OBJECT_ALIGN_LEFT || nWhich 
== SID_OBJECT_ALIGN_CENTER ||
 nWhich == SID_OBJECT_ALIGN_RIGHT);
+bool bVert = (nWhich == SID_OBJECT_ALIGN_UP || nWhich == 
SID_OBJECT_ALIGN_MIDDLE ||
+nWhich == SID_OBJECT_ALIGN_DOWN);
 const SdrMarkList& rMarkList = 
pSdrView->GetMarkedObjectList();
 if ( !rSh.IsAlignPossible() || bProtected )
 {
@@ -748,6 +750,30 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet)
 SwFormatHoriOrient 
aHOrient(pFrameFormat->GetFormatAttr(RES_HORI_ORIENT));
 rSet.Put(SfxBoolItem(nWhich, aHOrient.GetHoriOrient() 
== nHoriOrient));
 }
+
+if (bVert && !bDisableThis && rMarkList.GetMarkCount() == 
1)
+{
+sal_Int16 nVertOrient = -1;
+switch(nWhich)
+{
+case SID_OBJECT_ALIGN_UP:
+nVertOrient = text::VertOrientation::TOP;
+break;
+case SID_OBJECT_ALIGN_MIDDLE:
+nVertOrient = text::VertOrientation::CENTER;
+break;
+case SID_OBJECT_ALIGN_DOWN:
+nVertOrient = text::VertOrientation::BOTTOM;
+break;
+default:
+break;
+}
+
+SdrObject* pObj = 
rMarkList.GetMark(0)->GetMarkedSdrObj();
+SwFrameFormat* pFrameFormat = FindFrameFormat(pObj);
+SwFormatVertOrient 
aVOrient(pFrameFormat->GetFormatAttr(RES_VERT_ORIENT));
+rSet.Put(SfxBoolItem(nWhich,

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sfx2/source

2020-08-03 Thread Szymon Kłos (via logerrit) 
 desktop/source/lib/init.cxx  |   16 
 sfx2/source/control/unoctitm.cxx |   16 
 2 files changed, 32 insertions(+)

New commits:
commit 74adbe34597e0f1ae181b7fa3df6c1430d869dc4
Author: Szymon Kłos 
AuthorDate: Mon Aug 3 12:15:17 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon Aug 3 12:50:39 2020 +0200

lok: state updates for commands in Writer

Change-Id: Id3d429ff4788abce03e9d7c5522655f362d6c249
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/6
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index eb9c42bf816d..a930e2e2cd92 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2773,6 +2773,22 @@ static void doc_iniUnoCommands ()
 OUString(".uno:RejectTrackedChange"),
 OUString(".uno:ShowResolvedAnnotations"),
 OUString(".uno:FreezePanesColumn"),
+OUString(".uno:InsertBreak"),
+OUString(".uno:InsertEndnote"),
+OUString(".uno:InsertFootnote"),
+OUString(".uno:InsertReferenceField"),
+OUString(".uno:InsertBookmark"),
+OUString(".uno:InsertAuthoritiesEntry"),
+OUString(".uno:InsertMultiIndex"),
+OUString(".uno:InsertField"),
+OUString(".uno:InsertPageNumberField"),
+OUString(".uno:InsertPageCountField"),
+OUString(".uno:InsertDateField"),
+OUString(".uno:InsertTitleField"),
+OUString(".uno:InsertFieldCtrl"),
+OUString(".uno:CharmapControl"),
+OUString(".uno:EnterGroup"),
+OUString(".uno:LeaveGroup"),
 OUString(".uno:FreezePanesRow")
 };
 
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 0eff07c01bec..a7a14b40d81c 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1136,6 +1136,22 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 
nSID, SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "FormatLine" ||
  aEvent.FeatureURL.Path == "FormatColumns" ||
  aEvent.FeatureURL.Path == "Watermark" ||
+ aEvent.FeatureURL.Path == "InsertBreak" ||
+ aEvent.FeatureURL.Path == "InsertEndnote" ||
+ aEvent.FeatureURL.Path == "InsertFootnote" ||
+ aEvent.FeatureURL.Path == "InsertReferenceField" ||
+ aEvent.FeatureURL.Path == "InsertBookmark" ||
+ aEvent.FeatureURL.Path == "InsertAuthoritiesEntry" ||
+ aEvent.FeatureURL.Path == "InsertMultiIndex" ||
+ aEvent.FeatureURL.Path == "InsertField" ||
+ aEvent.FeatureURL.Path == "InsertPageNumberField" ||
+ aEvent.FeatureURL.Path == "InsertPageCountField" ||
+ aEvent.FeatureURL.Path == "InsertDateField" ||
+ aEvent.FeatureURL.Path == "InsertTitleField" ||
+ aEvent.FeatureURL.Path == "InsertFieldCtrl" ||
+ aEvent.FeatureURL.Path == "CharmapControl" ||
+ aEvent.FeatureURL.Path == "EnterGroup" ||
+ aEvent.FeatureURL.Path == "LeaveGroup" ||
  aEvent.FeatureURL.Path == "ResetAttributes")
 {
 aBuffer.append(aEvent.IsEnabled ? OUStringLiteral("enabled") : 
OUStringLiteral("disabled"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sfx2/source

2020-07-24 Thread Pranam Lashkari (via logerrit) 
 desktop/source/lib/init.cxx  |3 ++-
 sfx2/source/control/unoctitm.cxx |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1e96228637bd547636fb9084f938c1f822965c19
Author: Pranam Lashkari 
AuthorDate: Thu Jul 23 00:11:20 2020 +0530
Commit: Tamás Zolnai 
CommitDate: Fri Jul 24 12:40:36 2020 +0200

LOK: send state of ShowResolvedAnnotations

Change-Id: Icd8756719bc75bbd780cbf25d21f7834a1d7fc8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99252
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 730c105434fe..e97a4039118e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2766,7 +2766,8 @@ static void doc_iniUnoCommands ()
 OUString(".uno:ParaspaceIncrease"),
 OUString(".uno:ParaspaceDecrease"),
 OUString(".uno:AcceptTrackedChange"),
-OUString(".uno:RejectTrackedChange")
+OUString(".uno:RejectTrackedChange"),
+OUString(".uno:ShowResolvedAnnotations")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index caf91b81c420..edc07fb0416a 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1198,7 +1198,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "NumberFormatCurrency" ||
  aEvent.FeatureURL.Path == "NumberFormatPercent" ||
  aEvent.FeatureURL.Path == "NumberFormatDecimal" ||
- aEvent.FeatureURL.Path == "NumberFormatDate")
+ aEvent.FeatureURL.Path == "NumberFormatDate" ||
+ aEvent.FeatureURL.Path == "ShowResolvedAnnotations")
 {
 bool aBool;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sfx2/source

2020-07-01 Thread Aron Budea (via logerrit) 
 desktop/source/lib/init.cxx  |   12 
 sfx2/source/control/unoctitm.cxx |   15 +--
 2 files changed, 25 insertions(+), 2 deletions(-)

New commits:
commit 5a08b856e5a5f722e6b49d2e5e526593a4ad65de
Author: Aron Budea 
AuthorDate: Fri Apr 24 17:01:47 2020 +0200
Commit: Aron Budea 
CommitDate: Wed Jul 1 23:03:04 2020 +0200

Send various state changes to LOK

Change-Id: I0d5dc63015364cd1586555b6dced81afa50745bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92865
Tested-by: Jenkins
Reviewed-by: Aron Budea 
(cherry picked from commit f2e059ca3b1d55c721c6a698e6761536534224ba)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97585
Tested-by: Jenkins CollaboraOffice 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9bd636910959..29439f85912c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2669,6 +2669,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:InsertRowsAfter"),
 OUString(".uno:InsertColumnsBefore"),
 OUString(".uno:InsertColumnsAfter"),
+OUString(".uno:MergeCells"),
 OUString(".uno:DeleteRows"),
 OUString(".uno:DeleteColumns"),
 OUString(".uno:DeleteTable"),
@@ -2717,9 +2718,20 @@ static void doc_iniUnoCommands ()
 OUString(".uno:InsertPageHeader"),
 OUString(".uno:InsertPageFooter"),
 OUString(".uno:OnlineAutoFormat"),
+OUString(".uno:InsertObjectChart"),
+OUString(".uno:InsertSection"),
+OUString(".uno:InsertAnnotation"),
+OUString(".uno:InsertPagebreak"),
+OUString(".uno:InsertColumnBreak"),
+OUString(".uno:HyperlinkDialog"),
 OUString(".uno:InsertSymbol"),
 OUString(".uno:EditRegion"),
 OUString(".uno:ThesaurusDialog"),
+OUString(".uno:FormatArea"),
+OUString(".uno:FormatLine"),
+OUString(".uno:FormatColumns"),
+OUString(".uno:Watermark"),
+OUString(".uno:ResetAttributes"),
 OUString(".uno:Orientation"),
 OUString(".uno:ObjectAlignLeft"),
 OUString(".uno:ObjectAlignRight"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 693e11746349..5d7ed29ac9f7 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1070,6 +1070,13 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 
nSID, SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "InsertRowsAfter" ||
  aEvent.FeatureURL.Path == "InsertColumnsBefore" ||
  aEvent.FeatureURL.Path == "InsertColumnsAfter" ||
+ aEvent.FeatureURL.Path == "MergeCells" ||
+ aEvent.FeatureURL.Path == "InsertObjectChart" ||
+ aEvent.FeatureURL.Path == "InsertSection" ||
+ aEvent.FeatureURL.Path == "InsertAnnotation" ||
+ aEvent.FeatureURL.Path == "InsertPagebreak" ||
+ aEvent.FeatureURL.Path == "InsertColumnBreak" ||
+ aEvent.FeatureURL.Path == "HyperlinkDialog" ||
  aEvent.FeatureURL.Path == "InsertSymbol" ||
  aEvent.FeatureURL.Path == "InsertPage" ||
  aEvent.FeatureURL.Path == "DeletePage" ||
@@ -1124,8 +1131,12 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 
nSID, SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "OutlineRight" ||
  aEvent.FeatureURL.Path == "OutlineLeft" ||
  aEvent.FeatureURL.Path == "OutlineDown" ||
- aEvent.FeatureURL.Path == "OutlineUp")
-
+ aEvent.FeatureURL.Path == "OutlineUp" ||
+ aEvent.FeatureURL.Path == "FormatArea" ||
+ aEvent.FeatureURL.Path == "FormatLine" ||
+ aEvent.FeatureURL.Path == "FormatColumns" ||
+ aEvent.FeatureURL.Path == "Watermark" ||
+ aEvent.FeatureURL.Path == "ResetAttributes")
 {
 aBuffer.append(aEvent.IsEnabled ? OUStringLiteral("enabled") : 
OUStringLiteral("disabled"));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits