subject:"\[Libreoffice\-commits\] core.git\: desktop\/source sfx2\/source"

[Libreoffice-commits] core.git: desktop/source sfx2/source svx/source

2023-10-22 Thread Marco Cecchetti (via logerrit)

 desktop/source/lib/init.cxx  |2 
 sfx2/source/view/viewsh.cxx  |  135 ---
 svx/source/accessibility/ChildrenManagerImpl.cxx |8 -
 3 files changed, 126 insertions(+), 19 deletions(-)

New commits:
commit c34f465a21dab492afec12011f4a16584a663d9f
Author: Marco Cecchetti 
AuthorDate: Tue Oct 3 12:34:45 2023 +0200
Commit: Caolán McNamara 
CommitDate: Sun Oct 22 16:39:59 2023 +0200

lok: a11y: impress: screen reader support for text shape editing

Now accessibility support can be enabled in Impress.
Fixed an issue that prevented to receive accessibility event when a
shape text content was edited.
Some rectangles overlapping check is performed for excluding not
visible shapes from the a11y tree
Anyway client and core visible area can differ some shape was wrongly
pruned from the a11y tree.
The problem has been fixed by not performing the overlapping test in
the LOK case: we already do the same for shape area invalidation.
In order to avoid the screen reader to report no more focused
paragraph we send an empty paragraph to clear the editable area when
shape selection state changes. When shape ediding becomes active the
text content of the shape is sent to the client.

Change-Id: Ia9ee08d060162891725d26efd2aa36e47b38ed50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157525
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tomaž Vajngerl 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158329
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index bbb32dd3d74f..57869a7540ef 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -7293,7 +7293,7 @@ static void 
doc_setAccessibilityState(SAL_UNUSED_PARAMETER LibreOfficeKitDocumen
 SolarMutexGuard aGuard;
 
 int nDocType = getDocumentType(pThis);
-if (nDocType != LOK_DOCTYPE_TEXT)
+if (!(nDocType == LOK_DOCTYPE_TEXT || nDocType == 
LOK_DOCTYPE_PRESENTATION))
 return;
 
 SfxLokHelper::setAccessibilityState(nId, nEnabled);
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 68c99691fb4c..34edb460d4e3 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -271,6 +271,28 @@ bool isFocused(const accessibility::AccessibleEventObject& 
aEvent)
 return hasState(aEvent, accessibility::AccessibleStateType::FOCUSED);
 }
 
+sal_Int16 getParentRole(const uno::Reference& 
xAccObject)
+{
+if (!xAccObject.is())
+return 0;
+
+uno::Reference xContext(xAccObject, 
uno::UNO_QUERY);
+if (xContext.is())
+{
+uno::Reference xParent = 
xContext->getAccessibleParent();
+if (xParent.is())
+{
+uno::Reference 
xParentContext(xParent,
+ 
uno::UNO_QUERY);
+if (xParentContext.is())
+{
+return xParentContext->getAccessibleRole();
+}
+}
+}
+return 0;
+}
+
 // Put in rAncestorList all ancestors of xTable up to xAncestorTable or
 // up to the first not-a-table ancestor if xAncestorTable is not an ancestor.
 // xTable is included in the list, xAncestorTable is not included.
@@ -364,6 +386,16 @@ void aboutEvent(std::string msg, const 
accessibility::AccessibleEventObject& aEv
 << "\n  parent: " << 
xContext->getAccessibleParent().get()
 << "\n  child count: " << 
xContext->getAccessibleChildCount());
 }
+else
+{
+SAL_INFO("lok.a11y", msg << ": event id: " << aEvent.EventId
+ << ", no accessible context!");
+}
+}
+else
+{
+SAL_INFO("lok.a11y", msg << ": event id: " << aEvent.EventId
+ << ", no accessible source!");
 }
 uno::Reference< accessibility::XAccessible > xOldValue;
 aEvent.OldValue >>= xOldValue;
@@ -690,6 +722,7 @@ private:
  bool force, std::string msg = "");
 void updateAndNotifyParagraph(const 
uno::Reference& xAccText,
   bool force, std::string msg = "");
+void resetParagraphInfo();
 };
 
 LOKDocumentFocusListener::LOKDocumentFocusListener(const SfxViewShell* 
pViewShell)
@@ -891,6 +924,20 @@ bool LOKDocumentFocusListener::updateParagraphInfo(const 
uno::ReferencegetSelectionEnd();
 m_nListPrefixLength = getListPrefixSize(xAccText);
 
+// Inside a text shape when there is no selection, selection-start and 
selection-end are
+// set to current caret position instead of -1. Moreover, inside a 
text shape pressing
+// delete or backspace with an empty selection really deletes text and 
not only the empty
+

[Libreoffice-commits] core.git: desktop/source sfx2/source

2023-10-18 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 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: desktop/source sfx2/source uui/source

2023-10-02 Thread Szymon Kłos (via logerrit)

 desktop/source/lib/lokinteractionhandler.cxx |   21 +
 desktop/source/lib/lokinteractionhandler.hxx |1 +
 sfx2/source/doc/sfxbasemodel.cxx |4 +++-
 uui/source/iahndl.cxx|2 +-
 4 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit e2ee3dd61ab8ea5d970d8da5df3233e7bba5909e
Author: Szymon Kłos 
AuthorDate: Fri Sep 22 11:11:06 2023 +0200
Commit: Miklos Vajna 
CommitDate: Mon Oct 2 17:55:04 2023 +0200

lok: add broken package interaction handler

in case of repair don't use template flag to not make
file readonly so we can overwrite it and upload to storage
updated version

Conflicts:
desktop/source/lib/lokinteractionhandler.cxx
desktop/source/lib/lokinteractionhandler.hxx
sfx2/source/doc/sfxbasemodel.cxx

Change-Id: Ia460009fc3b77582dde06dd6f94a85aef3aee11b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157493
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/desktop/source/lib/lokinteractionhandler.cxx 
b/desktop/source/lib/lokinteractionhandler.cxx
index ec3d2e365c45..6df4fe2d98e5 100644
--- a/desktop/source/lib/lokinteractionhandler.cxx
+++ b/desktop/source/lib/lokinteractionhandler.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -350,6 +351,23 @@ bool 
LOKInteractionHandler::handleMacroConfirmationRequest(const uno::Reference<
 return false;
 }
 
+bool LOKInteractionHandler::handlePackageReparationRequest(const 
uno::Reference& xRequest)
+{
+uno::Any const request(xRequest->getRequest());
+
+document::BrokenPackageRequest aBrokenPackageRequest;
+if (request >>= aBrokenPackageRequest)
+{
+auto 
xInteraction(task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(),
 nullptr));
+
+if (xInteraction.is())
+xInteraction->handleInteractionRequest(xRequest);
+
+return true;
+}
+return false;
+}
+
 bool LOKInteractionHandler::handleFilterOptionsRequest(const 
uno::Reference& xRequest)
 {
 document::FilterOptionsRequest aFilterOptionsRequest;
@@ -389,6 +407,9 @@ sal_Bool SAL_CALL 
LOKInteractionHandler::handleInteractionRequest(
 if (handleMacroConfirmationRequest(xRequest))
 return true;
 
+if (handlePackageReparationRequest(xRequest))
+return true;
+
 // TODO: perform more interactions 'for real' like the above
 selectApproved(rContinuations);
 
diff --git a/desktop/source/lib/lokinteractionhandler.hxx 
b/desktop/source/lib/lokinteractionhandler.hxx
index 5c6c6f87de6d..fc2bf12b48cc 100644
--- a/desktop/source/lib/lokinteractionhandler.hxx
+++ b/desktop/source/lib/lokinteractionhandler.hxx
@@ -77,6 +77,7 @@ private:
 static bool handleMacroConfirmationRequest(const 
css::uno::Reference& xRequest);
 
 static bool handleFilterOptionsRequest(const 
::com::sun::star::uno::Reference<::com::sun::star::task::XInteractionRequest>& 
Request);
+static bool handlePackageReparationRequest(const 
css::uno::Reference& xRequest);
 
 public:
 void SetPassword(char const* pPassword);
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index e5eb0177fe6d..761bd16d2a76 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1980,9 +1980,11 @@ void SAL_CALL SfxBaseModel::load(   const Sequence< 
beans::PropertyValue >& seqA
 xHandler->handle( aRequest.GetRequest() );
 if( aRequest.isApproved() )
 {
+// lok: we want to overwrite file in jail, so don't use 
template flag
+bool bIsLOK = comphelper::LibreOfficeKit::isActive();
 // broken package: try second loading and allow repair
 pMedium->GetItemSet().Put( SfxBoolItem( SID_REPAIRPACKAGE, 
true ) );
-pMedium->GetItemSet().Put( SfxBoolItem( SID_TEMPLATE, true 
) );
+pMedium->GetItemSet().Put( SfxBoolItem( SID_TEMPLATE, 
!bIsLOK ) );
 pMedium->GetItemSet().Put( SfxStringItem( 
SID_DOCINFO_TITLE, aDocName ) );
 
 // the error must be reset and the storage must be 
reopened in new mode
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index b6e88bcd3e40..e4aedbfc72dd 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -936,7 +936,7 @@ executeMessageBox(
 SolarMutexGuard aGuard;
 
 std::unique_ptr 
xBox(Application::CreateMessageDialog(pParent, eMessageType,
-eMessageType == VclMessageType::Question ? VclButtonsType::YesNo : 
VclButtonsType::Ok, rMessage));
+eMessageType == VclMessageType::Question ? VclButtonsType::YesNo : 
VclButtonsType::Ok, rMessage, GetpApp()));
 xBox->set_title(rTitle);
 
 short nMessResult = xBox->run();

[Libreoffice-commits] core.git: desktop/source sfx2/source

2023-08-11 Thread Marco Cecchetti (via logerrit)

 desktop/source/lib/init.cxx |1 
 sfx2/source/view/viewsh.cxx |  558 +---
 2 files changed, 374 insertions(+), 185 deletions(-)

New commits:
commit 5964796de82a4050081d25ab20151020de0a16cc
Author: Marco Cecchetti 
AuthorDate: Mon May 22 16:32:50 2023 +0200
Commit: Miklos Vajna 
CommitDate: Fri Aug 11 16:13:36 2023 +0200

lok: a11y: paragraph notifyied on text change, even coming from another view

Debug code has been re-organized.
Paragraph content is notifyied on any text change.
That fixed issues related to fast typing.
Paragraph content is also notified on text changed performed in
another view.
A paragraph is regarded as focused whenever the cursor position is
valid.

(cherry picked from commit cd726ba43c22e723b243dd6dfd5e3c253e81000b)

Conflicts:
sfx2/source/view/viewsh.cxx

Change-Id: I33a187ced368b74824e55265be921804a492349c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155574
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 932810fd4758..42d838b889b6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -7023,7 +7023,6 @@ static void doc_setViewTimezone(SAL_UNUSED_PARAMETER 
LibreOfficeKitDocument* /*p
 static void doc_setAccessibilityState(SAL_UNUSED_PARAMETER 
LibreOfficeKitDocument* pThis, int nId, bool nEnabled)
 {
 SolarMutexGuard aGuard;
-SetLastExceptionMsg();
 
 int nDocType = getDocumentType(pThis);
 if (nDocType != LOK_DOCTYPE_TEXT)
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index cef69764bb14..0d61e2f3f005 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -54,6 +54,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -237,6 +238,246 @@ void SAL_CALL 
SfxClipboardChangeListener::changedContents( const datatransfer::c
 delete pInfo;
 }
 
+namespace
+{
+
+bool hasState(const accessibility::AccessibleEventObject& aEvent, ::sal_Int64 
nState)
+{
+bool res = false;
+uno::Reference< accessibility::XAccessibleContext > 
xContext(aEvent.Source, uno::UNO_QUERY);
+if (xContext.is())
+{
+::sal_Int64 nStateSet = xContext->getAccessibleStateSet();
+res = (nStateSet & nState) != 0;
+}
+return res;
+}
+
+bool isFocused(const accessibility::AccessibleEventObject& aEvent)
+{
+return hasState(aEvent, accessibility::AccessibleStateType::FOCUSED);
+}
+
+std::string stateSetToString(::sal_Int64 stateSet)
+{
+static const std::string states[34] = {
+"ACTIVE", "ARMED", "BUSY", "CHECKED", "DEFUNC",
+"EDITABLE", "ENABLED", "EXPANDABLE", "EXPANDED", "FOCUSABLE",
+"FOCUSED", "HORIZONTAL", "ICONIFIED", "INDETERMINATE", 
"MANAGES_DESCENDANTS",
+"MODAL", "MULTI_LINE", "MULTI_SELECTABLE", "OPAQUE", "PRESSED",
+"RESIZABLE", "SELECTABLE", "SELECTED", "SENSITIVE", "SHOWING",
+"SINGLE_LINE", "STALE", "TRANSIENT", "VERTICAL", "VISIBLE",
+"MOVEABLE", "DEFAULT", "OFFSCREEN", "COLLAPSE"
+};
+
+if (stateSet == 0)
+return "INVALID";
+::sal_Int64 state = 1;
+std::string s;
+for (int i = 0; i < 34; ++i)
+{
+if (stateSet & state)
+{
+s += states[i];
+s += "|";
+}
+state <<= 1;
+}
+return s;
+}
+
+void aboutView(std::string msg,  const void* pInstance, const SfxViewShell* 
pViewShell)
+{
+if (!pViewShell)
+return;
+
+SAL_INFO("lok.a11y", ">>> " << msg << ": instance: " << pInstance
+<< ", VIED ID: " <<  pViewShell->GetViewShellId().get() << " <<<");
+}
+
+void aboutEvent(std::string msg, const accessibility::AccessibleEventObject& 
aEvent)
+{
+try
+{
+uno::Reference< accessibility::XAccessible > xSource(aEvent.Source, 
uno::UNO_QUERY);
+if (xSource.is())
+{
+uno::Reference< accessibility::XAccessibleContext > xContext =
+xSource->getAccessibleContext();
+
+if (xContext.is())
+{
+SAL_INFO("lok.a11y", msg << ": event id: " << aEvent.EventId
+<< "\n  xSource: " << xSource.get()
+<< "\n  role: " << xContext->getAccessibleRole()
+<< "\n  name: " << xContext->getAccessibleName()
+<< "\n  index in parent: " << 
xContext->getAccessibleIndexInParent()
+<< "\n  state set: " << 
stateSetToString(xContext->getAccessibleStateSet())
+<< "\n  parent: " << 
xContext->getAccessibleParent().get()
+<< "\n  child count: " << 
xContext->getAccessibleChildCount());
+}
+}
+uno::Reference< accessibility::XAccessible > xOldValue;
+aEvent.OldValue >>=

[Libreoffice-commits] core.git: desktop/source sfx2/source

2023-07-30 Thread Aron Budea (via logerrit)

 desktop/source/lib/init.cxx  |3 +++
 sfx2/source/control/unoctitm.cxx |3 +++
 2 files changed, 6 insertions(+)

New commits:
commit c93267f2901805aa6fe7b7ea44d4ba24e47233da
Author: Aron Budea 
AuthorDate: Mon Jul 17 03:37:05 2023 +0200
Commit: Aron Budea 
CommitDate: Sun Jul 30 14:51:39 2023 +0200

Send Calc pivot table command state changes to LOK

Change-Id: I0d9e04b0a0452f66cb9703d9f34fe6cb44d724c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154506
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 
(cherry picked from commit b62f9f484a0fc9215e34153daac4a8bdb9698d4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155034
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6e8c0db99223..08609ef442d9 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3606,6 +3606,9 @@ static void doc_iniUnoCommands ()
 OUString(".uno:GroupSparklines"),
 OUString(".uno:UngroupSparklines"),
 OUString(".uno:FormatSparklineMenu"),
+OUString(".uno:DataDataPilotRun"),
+OUString(".uno:RecalcPivotTable"),
+OUString(".uno:DeletePivotTable"),
 OUString(".uno:Protect"),
 OUString(".uno:UnsetCellsReadOnly"),
 OUString(".uno:ContentControlProperties"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 20ae855ab6f3..9b75d0a51118 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1097,6 +1097,9 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "GroupSparklines" ||
  aEvent.FeatureURL.Path == "UngroupSparklines" ||
  aEvent.FeatureURL.Path == "FormatSparklineMenu" ||
+ aEvent.FeatureURL.Path == "DataDataPilotRun" ||
+ aEvent.FeatureURL.Path == "RecalcPivotTable" ||
+ aEvent.FeatureURL.Path == "DeletePivotTable" ||
  aEvent.FeatureURL.Path == "NumberFormatDecDecimals" ||
  aEvent.FeatureURL.Path == "NumberFormatIncDecimals" ||
  aEvent.FeatureURL.Path == "Protect" ||

[Libreoffice-commits] core.git: desktop/source sfx2/source

2023-07-28 Thread Jaume Pujantell (via logerrit)

 desktop/source/lib/init.cxx  |   21 +
 sfx2/source/doc/sfxbasemodel.cxx |   18 +-
 2 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit a52ba26e6a3567a1f63aeb8d20c084eb286974b4
Author: Jaume Pujantell 
AuthorDate: Fri Jul 14 09:11:07 2023 +0200
Commit: Caolán McNamara 
CommitDate: Fri Jul 28 10:04:50 2023 +0200

Added possibility to set password on save through arguments

Change-Id: I579ed7487f87515a21d83912d9c0d12e9edc5eea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154415
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8d830c0cbd00..6e8c0db99223 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3270,6 +3270,23 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, 
const char* sUrl, const cha
 
 bool bFullSheetPreview = sFullSheetPreview == u"true";
 
+OUString filePassword;
+if ((aIndex = aFilterOptions.indexOf(",Password=")) >= 0)
+{
+int bIndex = aFilterOptions.indexOf("PASSWORDEND");
+filePassword = aFilterOptions.subView(aIndex + 10, bIndex - 
(aIndex + 10));
+aFilterOptions = OUString::Concat(aFilterOptions.subView(0, 
aIndex))
+ + aFilterOptions.subView(bIndex + 11);
+}
+OUString filePasswordToModify;
+if ((aIndex = aFilterOptions.indexOf(",PasswordToModify=")) >= 0)
+{
+int bIndex = aFilterOptions.indexOf("PASSWORDTOMODIFYEND");
+filePassword = aFilterOptions.subView(aIndex + 18, bIndex - 
(aIndex + 18));
+aFilterOptions = OUString::Concat(aFilterOptions.subView(0, 
aIndex))
+ + aFilterOptions.subView(bIndex + 19);
+}
+
 // Select a pdf version if specified a valid one. If not specified 
then ignore.
 // If invalid then fail.
 sal_Int32 pdfVer = 0;
@@ -3344,6 +3361,10 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, 
const char* sUrl, const cha
 {
 aSaveMediaDescriptor["FilterData"] <<= 
aFilterDataMap.getAsConstPropertyValueList();
 }
+if (!filePassword.isEmpty())
+aSaveMediaDescriptor["Password"] <<= filePassword;
+if (!filePasswordToModify.isEmpty())
+aSaveMediaDescriptor["PasswordToModify"] <<= filePasswordToModify;
 
 // add interaction handler too
 if (gImpl)
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 2b34d5fd5b46..ac0de0cc89a5 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -131,6 +131,7 @@
 #include 
 #include "printhelper.hxx"
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -3046,13 +3047,13 @@ void SfxBaseModel::impl_store(  const   OUString&   
sURL
 throw frame::IllegalArgumentIOException();
 
 bool bSaved = false;
+::comphelper::SequenceAsHashMap aArgHash(seqArguments);
 if ( !bSaveTo && m_pData->m_pObjectShell.is() && !sURL.isEmpty()
   && !sURL.startsWith( "private:stream" )
   && ::utl::UCBContentHelper::EqualURLs( getLocation(), sURL ) )
 {
 // this is the same file URL as the current document location, try to 
use storeOwn if possible
 
-::comphelper::SequenceAsHashMap aArgHash( seqArguments );
 static constexpr OUStringLiteral aFilterString( u"FilterName"  );
 const OUString aFilterName( aArgHash.getUnpackedValueOrDefault( 
aFilterString, OUString() ) );
 if ( !aFilterName.isEmpty() )
@@ -3122,11 +3123,26 @@ void SfxBaseModel::impl_store(  const   OUString&   
sURL
 SfxGetpApp()->NotifyEvent( SfxEventHint( bSaveTo ? 
SfxEventHintId::SaveToDoc : SfxEventHintId::SaveAsDoc, 
GlobalEventConfig::GetEventName( bSaveTo ? GlobalEventId::SAVETODOC : 
GlobalEventId::SAVEASDOC ),
 m_pData->m_pObjectShell.get() ) );
 
+const OUString 
aFilterName(aArgHash.getUnpackedValueOrDefault("FilterName", OUString()));
+OUString aPassword, aPasswordToModify;
+if (!aArgHash.getUnpackedValueOrDefault("EncryptionData", 
Sequence())
+ .hasElements())
+aPassword = aArgHash.getUnpackedValueOrDefault("Password", OUString());
+if (!aArgHash.getUnpackedValueOrDefault("ModifyPasswordInfo", 
Sequence())
+ .hasElements()
+&& aArgHash.getUnpackedValueOrDefault("ModifyPasswordInfo", 
static_cast(0)) == 0)
+aPasswordToModify = 
aArgHash.getUnpackedValueOrDefault("PasswordToModify", OUString());
+aArgHash.erase("PasswordToModify");
+
 std::optional pItemSet(SfxGetpApp()->GetPool());
 pItemSet->Put(SfxStringItem(SID_FILE_NAME, sURL));
 if ( bSaveTo )
 pItemSet->Put(SfxBoolItem(SID_SAVETO, true));
 
+if (!aFilterName.isEmpty() && (!aPassword.isEmpty() ||

[Libreoffice-commits] core.git: desktop/source sfx2/source

2023-06-26 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 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: desktop/source sfx2/source

2022-07-27 Thread Miklos Vajna (via logerrit)

 desktop/source/lib/init.cxx  |1 +
 sfx2/source/control/unoctitm.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit db4ac0542a33ba2ff4e64717ca1eb6de563f1a8c
Author: Miklos Vajna 
AuthorDate: Wed Jul 27 14:32:59 2022 +0200
Commit: Miklos Vajna 
CommitDate: Wed Jul 27 16:27:15 2022 +0200

sw content controls, plain text: send state changes to LOK

This is similar to commit 373f655acbdad88ff5d76324f32650fe3a005e2e (Send
state changes of content control UNO commands to LOK, 2022-07-22), but
plain text was not a type at that point.

Change-Id: Ia317c60411280c07e1e063ee4b23f12e0d9f6dd2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137502
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b2e38b699e2e..029e8b72c667 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3176,6 +3176,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:InsertContentControl"),
 OUString(".uno:InsertDateContentControl"),
 OUString(".uno:InsertDropdownContentControl"),
+OUString(".uno:InsertPlainTextContentControl"),
 OUString(".uno:InsertPictureContentControl")
 };
 
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 516c10d6e2ed..f2046acaecfe 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1122,6 +1122,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "InsertContentControl" ||
  aEvent.FeatureURL.Path == "InsertDateContentControl" ||
  aEvent.FeatureURL.Path == "InsertDropdownContentControl" ||
+ aEvent.FeatureURL.Path == "InsertPlainTextContentControl" ||
  aEvent.FeatureURL.Path == "InsertPictureContentControl")
 {
 aBuffer.append(aEvent.IsEnabled ? std::u16string_view(u"enabled") : 
std::u16string_view(u"disabled"));

[Libreoffice-commits] core.git: desktop/source sfx2/source

2022-07-25 Thread Aron Budea (via logerrit)

 desktop/source/lib/init.cxx  |8 +++-
 sfx2/source/control/unoctitm.cxx |8 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 373f655acbdad88ff5d76324f32650fe3a005e2e
Author: Aron Budea 
AuthorDate: Fri Jul 22 23:22:49 2022 +0200
Commit: Aron Budea 
CommitDate: Mon Jul 25 20:15:00 2022 +0200

Send state changes of content control UNO commands to LOK

Change-Id: Id6b3f9a35c129078b564f7906e03f6aa9306a5f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137415
Tested-by: Jenkins
Reviewed-by: Aron Budea 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 4b135250c538..b2e38b699e2e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3170,7 +3170,13 @@ static void doc_iniUnoCommands ()
 OUString(".uno:UngroupSparklines"),
 OUString(".uno:FormatSparklineMenu"),
 OUString(".uno:Protect"),
-OUString(".uno:UnsetCellsReadOnly")
+OUString(".uno:UnsetCellsReadOnly"),
+OUString(".uno:ContentControlProperties"),
+OUString(".uno:InsertCheckboxContentControl"),
+OUString(".uno:InsertContentControl"),
+OUString(".uno:InsertDateContentControl"),
+OUString(".uno:InsertDropdownContentControl"),
+OUString(".uno:InsertPictureContentControl")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 01eee96f5ddf..516c10d6e2ed 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1116,7 +1116,13 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 
nSID, SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "NumberFormatDecDecimals" ||
  aEvent.FeatureURL.Path == "NumberFormatIncDecimals" ||
  aEvent.FeatureURL.Path == "Protect" ||
- aEvent.FeatureURL.Path == "UnsetCellsReadOnly")
+ aEvent.FeatureURL.Path == "UnsetCellsReadOnly" ||
+ aEvent.FeatureURL.Path == "ContentControlProperties" ||
+ aEvent.FeatureURL.Path == "InsertCheckboxContentControl" ||
+ aEvent.FeatureURL.Path == "InsertContentControl" ||
+ aEvent.FeatureURL.Path == "InsertDateContentControl" ||
+ aEvent.FeatureURL.Path == "InsertDropdownContentControl" ||
+ aEvent.FeatureURL.Path == "InsertPictureContentControl")
 {
 aBuffer.append(aEvent.IsEnabled ? std::u16string_view(u"enabled") : 
std::u16string_view(u"disabled"));
 }

[Libreoffice-commits] core.git: desktop/source sfx2/source

2022-06-13 Thread Pranam Lashkari (via logerrit)

 desktop/source/lib/init.cxx  |2 ++
 sfx2/source/control/unoctitm.cxx |4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 9518a72e71a70cee07c2ab3491a147edf9e63f68
Author: Pranam Lashkari 
AuthorDate: Mon Jun 6 19:30:35 2022 +0530
Commit: Pranam Lashkari 
CommitDate: Mon Jun 13 11:04:30 2022 +0200

LOK: send state of Protect, UnsetCellsReadOnly

Signed-off-by: Pranam Lashkari 
Change-Id: I92675ed0033088233fb442138b39a3c8d663c614
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135454
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Gökay ŞATIR 
(cherry picked from commit b8626e85a799fd0807749cab9e712652240f13cd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135389
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 52fd35a23104..776eba17c6c4 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3169,6 +3169,8 @@ static void doc_iniUnoCommands ()
 OUString(".uno:GroupSparklines"),
 OUString(".uno:UngroupSparklines"),
 OUString(".uno:FormatSparklineMenu"),
+OUString(".uno:Protect"),
+OUString(".uno:UnsetCellsReadOnly")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 57ef3404b8be..4ee282227107 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1113,7 +1113,9 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "UngroupSparklines" ||
  aEvent.FeatureURL.Path == "FormatSparklineMenu" ||
  aEvent.FeatureURL.Path == "NumberFormatDecDecimals" ||
- aEvent.FeatureURL.Path == "NumberFormatIncDecimals")
+ aEvent.FeatureURL.Path == "NumberFormatIncDecimals" ||
+ aEvent.FeatureURL.Path == "Protect" ||
+ aEvent.FeatureURL.Path == "UnsetCellsReadOnly")
 {
 aBuffer.append(aEvent.IsEnabled ? std::u16string_view(u"enabled") : 
std::u16string_view(u"disabled"));
 }

[Libreoffice-commits] core.git: desktop/source sfx2/source

2022-04-14 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 63abdec59d2fc23c988cb7c160bd4625e7e464a9
Author: Szymon Kłos 
AuthorDate: Tue Apr 5 19:07:26 2022 +0200
Commit: Szymon Kłos 
CommitDate: Thu Apr 14 08:30:42 2022 +0200

lok: send status update for .uno:SplitCell

Change-Id: Ic972d3ff3334f4c3a507868a95ac955c9ffbc614
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132585
Reviewed-by: Mert Tumer 
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132871
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index dd9c3874b93c..d8e0ca6c95ee 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3109,6 +3109,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:InsertCaptionDialog"),
 OUString(".uno:FormatGroup"),
 OUString(".uno:SplitTable"),
+OUString(".uno:SplitCell"),
 OUString(".uno:MergeCells"),
 OUString(".uno:DeleteNote"),
 OUString(".uno:AcceptChanges"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index dde7c4cc6e6b..3ea0a1f9e397 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1053,6 +1053,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "InsertCaptionDialog" ||
  aEvent.FeatureURL.Path == "MergeCells" ||
  aEvent.FeatureURL.Path == "SplitTable" ||
+ aEvent.FeatureURL.Path == "SplitCell" ||
  aEvent.FeatureURL.Path == "DeleteNote" ||
  aEvent.FeatureURL.Path == "AcceptChanges" ||
  aEvent.FeatureURL.Path == "SetDefault" ||

[Libreoffice-commits] core.git: desktop/source sfx2/source

2022-03-14 Thread Aron Budea (via logerrit)

 desktop/source/lib/init.cxx  |1 +
 sfx2/source/control/unoctitm.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit b456297ced6f5111cf311556a2904cbb27598289
Author: Aron Budea 
AuthorDate: Thu Mar 10 06:30:23 2022 +0100
Commit: Aron Budea 
CommitDate: Mon Mar 14 19:59:32 2022 +0100

Send Calc Insert Headers and Footers state change to LOK

Change-Id: Id51b4cf1eb962f22ee1e381873f4670789675525
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131293
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131543
Tested-by: Jenkins
Reviewed-by: Aron Budea 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c8fd1be5ce88..933a119d696d 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3050,6 +3050,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:NumberFormatPercent"),
 OUString(".uno:NumberFormatDecimal"),
 OUString(".uno:NumberFormatDate"),
+OUString(".uno:EditHeaderAndFooter"),
 OUString(".uno:FrameLineColor"),
 OUString(".uno:SortAscending"),
 OUString(".uno:SortDescending"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index e7da4f4274f6..dde7c4cc6e6b 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1102,6 +1102,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "ResetAttributes" ||
  aEvent.FeatureURL.Path == "IncrementIndent" ||
  aEvent.FeatureURL.Path == "DecrementIndent" ||
+ aEvent.FeatureURL.Path == "EditHeaderAndFooter" ||
  aEvent.FeatureURL.Path == "NumberFormatDecDecimals" ||
  aEvent.FeatureURL.Path == "NumberFormatIncDecimals")
 {

[Libreoffice-commits] core.git: desktop/source sfx2/source

2021-06-03 Thread merttumer (via logerrit)

 desktop/source/lib/lokinteractionhandler.cxx |   23 +++
 desktop/source/lib/lokinteractionhandler.hxx |2 ++
 sfx2/source/doc/objstor.cxx  |3 ++-
 3 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit 8c26772822e2f768e48be72feb29ec06f00d9cf2
Author: merttumer 
AuthorDate: Mon Apr 26 08:12:11 2021 +0300
Commit: Mert Tumer 
CommitDate: Fri Jun 4 07:46:39 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116294
Tested-by: Jenkins

diff --git a/desktop/source/lib/lokinteractionhandler.cxx 
b/desktop/source/lib/lokinteractionhandler.cxx
index eb7d120a5e3e..325e5893184a 100644
--- a/desktop/source/lib/lokinteractionhandler.cxx
+++ b/desktop/source/lib/lokinteractionhandler.cxx
@@ -40,6 +40,8 @@
 #include 
 #include 
 
+#include 
+
 #include "../../inc/lib/init.hxx"
 
 #include 
@@ -350,6 +352,24 @@ bool 
LOKInteractionHandler::handleMacroConfirmationRequest(const uno::Reference<
 return false;
 }
 
+bool LOKInteractionHandler::handleFilterOptionsRequest(const 
uno::Reference& 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)
 {
@@ -365,6 +385,9 @@ sal_Bool SAL_CALL 
LOKInteractionHandler::handleInteractionRequest(
 if (handlePasswordRequest(rContinuations, request))
 return true;
 
+if (handleFilterOptionsRequest(xRequest))
+return true;
+
 if (handleMacroConfirmationRequest(xRequest))
 return true;
 
diff --git a/desktop/source/lib/lokinteractionhandler.hxx 
b/desktop/source/lib/lokinteractionhandler.hxx
index 9c15f85f4bc8..108343ec22e3 100644
--- a/desktop/source/lib/lokinteractionhandler.hxx
+++ b/desktop/source/lib/lokinteractionhandler.hxx
@@ -76,6 +76,8 @@ private:
 bool handlePasswordRequest(const 
css::uno::Sequence> 
, const css::uno::Any& rRequest);
 static bool handleMacroConfirmationRequest(const 
css::uno::Reference& xRequest);
 
+static 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 0b5080d23230..d30e52f25c03 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -853,7 +853,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: desktop/source sfx2/source

2020-11-29 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 218b61fd1b2c7e614a877bb38f92affc6915c3fd
Author: Pranam Lashkari 
AuthorDate: Sat Nov 7 12:29:33 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Sun Nov 29 14:37:35 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 
(cherry picked from commit cc7bf1755c31fcd4c388f25e642c37d0e2fd758a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106810
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index bc8b46a94c43..8395e81057b9 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2819,7 +2819,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 d51e5f3b443f..68d97a8edf5b 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1019,7 +1019,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: desktop/source sfx2/source

2020-09-02 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 4824218c896ae2dfec8a5ca21a116dcc8f44ceee
Author: Szymon Kłos 
AuthorDate: Tue Aug 4 12:58:49 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Sep 2 09:10:10 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101520
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f3ba0d498b98..f28718093836 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2821,6 +2821,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:BorderInner"),
 OUString(".uno:BorderOuter"),
 OUString(".uno:FreezePanes"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 782e005a4247..aa9dfb6019c5 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1158,6 +1158,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(u"enabled") : 
OUStringLiteral(u"disabled"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2020-08-27 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 fb763b5236c6859290902e69dc31a4793e63146c
Author: Pranam Lashkari 
AuthorDate: Sat Aug 22 18:48:34 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Fri Aug 28 00:18:11 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101509
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9c8c51c3672b..d7ac2603fab8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2825,7 +2825,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 c9cb75dacbf9..c3c48b5305c4 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: desktop/source sfx2/source

2020-08-27 Thread Pranam Lashkari (via logerrit)

 desktop/source/lib/init.cxx  |9 -
 sfx2/source/control/unoctitm.cxx |3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e7f81a8bcb481df4daa17ae9ef7210c68af5f337
Author: Pranam Lashkari 
AuthorDate: Thu Aug 20 03:57:17 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Thu Aug 27 18:56:11 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101372
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b61767ff4a88..9c8c51c3672b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2800,10 +2800,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:ParaspaceDecrease"),
 OUString(".uno:AcceptTrackedChange"),
 OUString(".uno:RejectTrackedChange"),
-OUString(".uno:FreezePanesColumn"),
-OUString(".uno:FreezePanesRow"),
 OUString(".uno:ShowResolvedAnnotations"),
-OUString(".uno:FreezePanesColumn"),
 OUString(".uno:InsertBreak"),
 OUString(".uno:InsertEndnote"),
 OUString(".uno:InsertFootnote"),
@@ -2824,9 +2821,11 @@ static void doc_iniUnoCommands ()
 OUString(".uno:AlignMiddle"),
 OUString(".uno:AlignDown"),
 OUString(".uno:TraceChangeMode"),
-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 d0f935f248bd..c9cb75dacbf9 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: desktop/source sfx2/source

2020-08-12 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 53e745b4d2450a80485273f96abe4f8e6479972b
Author: Szymon Kłos 
AuthorDate: Tue Aug 4 12:05:15 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Aug 12 09:39:08 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100460
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d28bb2bc64d0..51a5e4bf28fe 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2822,6 +2822,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 3fe778493188..d0f935f248bd 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: desktop/source sfx2/source

2020-08-11 Thread Szymon Kłos (via logerrit)

 desktop/source/lib/init.cxx  |   20 +++-
 sfx2/source/control/unoctitm.cxx |   16 
 2 files changed, 35 insertions(+), 1 deletion(-)

New commits:
commit 48215f9e925c6dfda1c75f97c381ae5a724345d9
Author: Szymon Kłos 
AuthorDate: Mon Aug 3 12:15:17 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Aug 11 10:33:41 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100458
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index db6dc07262a0..db2a16179bfe 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2801,7 +2801,25 @@ static void doc_iniUnoCommands ()
 OUString(".uno:RejectTrackedChange"),
 OUString(".uno:FreezePanesColumn"),
 OUString(".uno:FreezePanesRow"),
-OUString(".uno:ShowResolvedAnnotations")
+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")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 125c243aa9c6..e66edd9313ea 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: desktop/source sfx2/source svx/sdi sw/source

2020-08-11 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 a67da1808d0085cb587b300ffbb58a5d65c1aed8
Author: Szymon Kłos 
AuthorDate: Mon Aug 3 12:37:06 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Aug 11 10:33:59 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100459
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index db2a16179bfe..d28bb2bc64d0 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2819,6 +2819,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 e66edd9313ea..3fe778493188 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 b647dbeb3676..d2ba31f57608 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 c707b803736b..fea15d78428a 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -701,6 +701,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 )
 {
@@ -744,6 +746,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

[Libreoffice-commits] core.git: desktop/source sfx2/source

2020-07-29 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 02bbed0e23121b93fd574a557f54739a25f88394
Author: Pranam Lashkari 
AuthorDate: Thu Jul 23 00:11:20 2020 +0530
Commit: Tamás Zolnai 
CommitDate: Wed Jul 29 10:19:59 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 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99256
Tested-by: Tamás Zolnai 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 02dcab22ec7c..bac4d4da4cbd 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2770,7 +2770,8 @@ static void doc_iniUnoCommands ()
 OUString(".uno:AcceptTrackedChange"),
 OUString(".uno:RejectTrackedChange"),
 OUString(".uno:FreezePanesColumn"),
-OUString(".uno:FreezePanesRow")
+OUString(".uno:FreezePanesRow"),
+OUString(".uno:ShowResolvedAnnotations")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index c47bf565279c..125c243aa9c6 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1200,7 +1200,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: 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 b0a3883a45edac3c8f9bccf6926b34d9da8f30e8
Author: Aron Budea 
AuthorDate: Fri Apr 24 17:01:47 2020 +0200
Commit: Aron Budea 
CommitDate: Wed Jul 1 20:02:10 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 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8b86eb2e4b8f..eabca148f850 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2639,6 +2639,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"),
@@ -2687,9 +2688,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 c9ae7b6e32fe..760376d7b767 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

[Libreoffice-commits] core.git: desktop/source sfx2/source

2020-06-17 Thread Szymon Kłos (via logerrit)

 desktop/source/lib/init.cxx  |   27 ++-
 sfx2/source/control/unoctitm.cxx |   27 +++
 2 files changed, 53 insertions(+), 1 deletion(-)

New commits:
commit 27381dc1b76e4aee5459b3d85e6fc5919d2b8f98
Author: Szymon Kłos 
AuthorDate: Fri May 8 09:25:13 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Jun 17 14:13:43 2020 +0200

notebookbar: send uno items state update

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 1b8013350983..8b3ba76bfaf9 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2695,7 +2695,32 @@ static void doc_iniUnoCommands ()
 OUString(".uno:TransformPosX"),
 OUString(".uno:TransformPosY"),
 OUString(".uno:TransformWidth"),
-OUString(".uno:TransformHeight")
+OUString(".uno:TransformHeight"),
+OUString(".uno:ObjectBackOne"),
+OUString(".uno:SendToBack"),
+OUString(".uno:ObjectForwardOne"),
+OUString(".uno:BringToFront"),
+OUString(".uno:WrapRight"),
+OUString(".uno:WrapThrough"),
+OUString(".uno:WrapLeft"),
+OUString(".uno:WrapIdeal"),
+OUString(".uno:WrapOn"),
+OUString(".uno:WrapOff"),
+OUString(".uno:UpdateCurIndex"),
+OUString(".uno:InsertCaptionDialog"),
+OUString(".uno:FormatGroup"),
+OUString(".uno:SplitTable"),
+OUString(".uno:MergeCells"),
+OUString(".uno:DeleteNote"),
+OUString(".uno:AcceptChanges"),
+OUString(".uno:FormatPaintbrush"),
+OUString(".uno:SetDefault"),
+OUString(".uno:ParaLeftToRight"),
+OUString(".uno:ParaRightToLeft"),
+OUString(".uno:ParaspaceIncrease"),
+OUString(".uno:ParaspaceDecrease"),
+OUString(".uno:AcceptTrackedChange"),
+OUString(".uno:RejectTrackedChange")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 00b9c7188d67..c9ae7b6e32fe 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1085,6 +1085,33 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 
nSID, SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "SortDescending" ||
  aEvent.FeatureURL.Path == "AcceptAllTrackedChanges" ||
  aEvent.FeatureURL.Path == "RejectAllTrackedChanges" ||
+ aEvent.FeatureURL.Path == "AcceptTrackedChange" ||
+ aEvent.FeatureURL.Path == "RejectTrackedChange" ||
+ aEvent.FeatureURL.Path == "NextTrackedChange" ||
+ aEvent.FeatureURL.Path == "PreviousTrackedChange" ||
+ aEvent.FeatureURL.Path == "FormatGroup" ||
+ aEvent.FeatureURL.Path == "ObjectBackOne" ||
+ aEvent.FeatureURL.Path == "SendToBack" ||
+ aEvent.FeatureURL.Path == "ObjectForwardOne" ||
+ aEvent.FeatureURL.Path == "BringToFront" ||
+ aEvent.FeatureURL.Path == "WrapRight" ||
+ aEvent.FeatureURL.Path == "WrapThrough" ||
+ aEvent.FeatureURL.Path == "WrapLeft" ||
+ aEvent.FeatureURL.Path == "WrapIdeal" ||
+ aEvent.FeatureURL.Path == "WrapOn" ||
+ aEvent.FeatureURL.Path == "WrapOff" ||
+ aEvent.FeatureURL.Path == "UpdateCurIndex" ||
+ aEvent.FeatureURL.Path == "InsertCaptionDialog" ||
+ aEvent.FeatureURL.Path == "MergeCells" ||
+ aEvent.FeatureURL.Path == "SplitTable" ||
+ aEvent.FeatureURL.Path == "DeleteNote" ||
+ aEvent.FeatureURL.Path == "AcceptChanges" ||
+ aEvent.FeatureURL.Path == "FormatPaintbrush" ||
+ aEvent.FeatureURL.Path == "SetDefault" ||
+ aEvent.FeatureURL.Path == "ParaLeftToRight" ||
+ aEvent.FeatureURL.Path == "ParaRightToLeft" ||
+ aEvent.FeatureURL.Path == "ParaspaceIncrease" ||
+ aEvent.FeatureURL.Path == "ParaspaceDecrease" ||
  aEvent.FeatureURL.Path == "TableDialog" ||
  aEvent.FeatureURL.Path == "FormatCellDialog" ||
  aEvent.FeatureURL.Path == "FontDialog" ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2020-04-15 Thread Mert Tumer (via logerrit)

 desktop/source/lib/init.cxx  |1 +
 sfx2/source/control/unoctitm.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit df619066c1c20d757cb6d2a5b29a566787b9173f
Author: Mert Tumer 
AuthorDate: Tue Apr 14 18:19:09 2020 +0300
Commit: Andras Timar 
CommitDate: Wed Apr 15 23:20:06 2020 +0200

send state changes of .uno:NumberFormatDecimal command to LOK

Change-Id: I7872c0a0c123865c77d3aa8937775116368f1ffa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92203
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit 2f6cbb67099edde535a81e7b0a32c1418805d6d6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92290
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8f42bd2883a4..b8228bfe8639 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2647,6 +2647,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:ToggleMergeCells"),
 OUString(".uno:NumberFormatCurrency"),
 OUString(".uno:NumberFormatPercent"),
+OUString(".uno:NumberFormatDecimal"),
 OUString(".uno:NumberFormatDate"),
 OUString(".uno:FrameLineColor"),
 OUString(".uno:SortAscending"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index d6e6c8673e38..9d4bc6612be0 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1153,6 +1153,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, 
SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "WrapText" ||
  aEvent.FeatureURL.Path == "NumberFormatCurrency" ||
  aEvent.FeatureURL.Path == "NumberFormatPercent" ||
+ aEvent.FeatureURL.Path == "NumberFormatDecimal" ||
  aEvent.FeatureURL.Path == "NumberFormatDate")
 {
 bool aBool;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2020-03-31 Thread Michael Meeks (via logerrit)

 desktop/source/lib/init.cxx  |1 +
 sfx2/source/control/unoctitm.cxx |3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 908d3dc957c8ff119e55f91c464212266fd73d66
Author: Michael Meeks 
AuthorDate: Tue Mar 31 20:27:00 2020 +0100
Commit: Andras Timar 
CommitDate: Tue Mar 31 22:48:59 2020 +0200

listen for and broadcast FrameLineColor state changes.

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 706d826d6722..c54fb771080c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2646,6 +2646,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:NumberFormatCurrency"),
 OUString(".uno:NumberFormatPercent"),
 OUString(".uno:NumberFormatDate"),
+OUString(".uno:FrameLineColor"),
 OUString(".uno:SortAscending"),
 OUString(".uno:SortDescending"),
 OUString(".uno:TrackChanges"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 4d8bff24f497..c2aa21ad2191 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1037,7 +1037,8 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "BackgroundColor" ||
  aEvent.FeatureURL.Path == "CharBackColor" ||
  aEvent.FeatureURL.Path == "Color" ||
- aEvent.FeatureURL.Path == "FontColor")
+ aEvent.FeatureURL.Path == "FontColor" ||
+ aEvent.FeatureURL.Path == "FrameLineColor")
 {
 sal_Int32 nColor = -1;
 aEvent.State >>= nColor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source svx/sdi sw/source

2020-02-12 Thread Dennis Francis (via logerrit)

 desktop/source/lib/init.cxx   |5 -
 sfx2/source/control/unoctitm.cxx  |5 -
 svx/sdi/svx.sdi   |   12 ++--
 sw/source/uibase/shells/frmsh.cxx |   23 +++
 4 files changed, 37 insertions(+), 8 deletions(-)

New commits:
commit da076834794a1fa00c51ffeb09ee3f724001dc89
Author: Dennis Francis 
AuthorDate: Thu Feb 6 12:23:21 2020 +0530
Commit: Andras Timar 
CommitDate: Wed Feb 12 14:24:52 2020 +0100

Allow boolean valued statechange messages for...

object align commands :

ObjectAlignLeft [SID_OBJECT_ALIGN_LEFT]
ObjectAlignRight [SID_OBJECT_ALIGN_RIGHT]
AlignCenter [SID_OBJECT_ALIGN_CENTER]

What is pending is to set correct align state items for Impress in
DrawViewShell::GetMenuStateSel(). For doing that we need to store
the object align state somewhere when we execute SID_OBJECT_ALIGN_*
in DrawViewShell::FuTemporary().

For Writer the align state information was already available in
frame-format-manager object.

Change-Id: I86fcf59cfc66af98097611277201ecaa3b8c22cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88077
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88452
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 90989c45df96..34b6155975c5 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2655,7 +2655,10 @@ static void doc_iniUnoCommands ()
 OUString(".uno:InsertSymbol"),
 OUString(".uno:EditRegion"),
 OUString(".uno:ThesaurusDialog"),
-OUString(".uno:Orientation")
+OUString(".uno:Orientation"),
+OUString(".uno:ObjectAlignLeft"),
+OUString(".uno:ObjectAlignRight"),
+OUString(".uno:AlignCenter")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 28276ddf3df7..1eac0a9c7964 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1006,7 +1006,10 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 aEvent.FeatureURL.Path == "AlignLeft" ||
 aEvent.FeatureURL.Path == "AlignHorizontalCenter" ||
 aEvent.FeatureURL.Path == "AlignRight" ||
-aEvent.FeatureURL.Path == "DocumentRepair")
+aEvent.FeatureURL.Path == "DocumentRepair" ||
+aEvent.FeatureURL.Path == "ObjectAlignLeft" ||
+aEvent.FeatureURL.Path == "ObjectAlignRight" ||
+aEvent.FeatureURL.Path == "AlignCenter")
 {
 bool bTemp = false;
 aEvent.State >>= bTemp;
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 2567e08906b0..d8a8af6c71e6 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -106,10 +106,10 @@ SfxBoolItem Polygon SID_DRAW_POLYGON
 GroupId = SfxGroupId::Drawing;
 ]
 
-SfxVoidItem AlignCenter SID_OBJECT_ALIGN_CENTER
+SfxBoolItem AlignCenter SID_OBJECT_ALIGN_CENTER
 ()
 [
-AutoUpdate = FALSE,
+AutoUpdate = TRUE,
 FastCall = FALSE,
 ReadOnlyDoc = FALSE,
 Toggle = FALSE,
@@ -142,10 +142,10 @@ SfxVoidItem AlignDown SID_OBJECT_ALIGN_DOWN
 ]
 
 
-SfxVoidItem ObjectAlignLeft SID_OBJECT_ALIGN_LEFT
+SfxBoolItem ObjectAlignLeft SID_OBJECT_ALIGN_LEFT
 ()
 [
-AutoUpdate = FALSE,
+AutoUpdate = TRUE,
 FastCall = FALSE,
 ReadOnlyDoc = FALSE,
 Toggle = FALSE,
@@ -197,10 +197,10 @@ SfxVoidItem AlignMiddle SID_OBJECT_ALIGN_MIDDLE
 ]
 
 
-SfxVoidItem ObjectAlignRight SID_OBJECT_ALIGN_RIGHT
+SfxBoolItem ObjectAlignRight SID_OBJECT_ALIGN_RIGHT
 ()
 [
-AutoUpdate = FALSE,
+AutoUpdate = TRUE,
 FastCall = FALSE,
 ReadOnlyDoc = FALSE,
 Toggle = FALSE,
diff --git a/sw/source/uibase/shells/frmsh.cxx 
b/sw/source/uibase/shells/frmsh.cxx
index 3f139e81f0cc..61ab59bfc00e 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -793,7 +793,30 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
  bProtect ||
  ((nWhich == FN_FRAME_ALIGN_HORZ_CENTER  || nWhich == 
SID_OBJECT_ALIGN_CENTER) &&
   bHtmlMode ))
+{
 rSet.DisableItem( nWhich );
+}
+else
+{
+sal_Int16 nHoriOrient = -1;
+switch(nWhich)
+{
+case SID_OBJECT_ALIGN_LEFT:
+nHoriOrient = text::HoriOrientation::LEFT;
+break;
+case SID_OBJECT_ALIGN_CENTER:
+nHoriOrient = text::HoriOrientation::CENTER;
+break;
+case SID_OBJECT_ALIGN_RIGHT:
+

[Libreoffice-commits] core.git: desktop/source sfx2/source

2019-10-16 Thread Szymon Kłos (via logerrit)

 desktop/source/lib/init.cxx   |   10 +-
 sfx2/source/view/ipclient.cxx |8 
 2 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 786f380394b23f5a804981a719d2b51ded1302c4
Author: Szymon Kłos 
AuthorDate: Fri May 31 11:31:34 2019 +0200
Commit: Szymon Kłos 
CommitDate: Wed Oct 16 13:23:50 2019 +0200

Send 'INPLACE EXIT' on inplace deactivation

Change-Id: Ieb44fb356966df0eb92141a5f22f1df13683f6fc
Reviewed-on: https://gerrit.libreoffice.org/80694
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 1790bdbfa478..d2e9cfb7161e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1187,7 +1187,6 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 case LOK_CALLBACK_TEXT_SELECTION_START:
 case LOK_CALLBACK_TEXT_SELECTION_END:
 case LOK_CALLBACK_TEXT_SELECTION:
-case LOK_CALLBACK_GRAPHIC_SELECTION:
 case LOK_CALLBACK_MOUSE_POINTER:
 case LOK_CALLBACK_CELL_CURSOR:
 case LOK_CALLBACK_CELL_FORMULA:
@@ -1249,6 +1248,15 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 if (processWindowEvent(aCallbackData))
 return;
 break;
+
+case LOK_CALLBACK_GRAPHIC_SELECTION:
+{
+// remove only selection ranges and 'EMPTY' messages
+// always send 'INPLACE' and 'INPLACE EXIT' messages
+removeAll([type, payload] (const queue_type::value_type& elem)
+{ return (elem.Type == type && elem.PayloadString[0] != 
'I'); });
+}
+break;
 }
 }
 
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index f2d6d4e78bcd..00063e7b1ed6 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -72,6 +72,7 @@
 #include 
 
 #include 
+#include 
 
 #define SFX_CLIENTACTIVATE_TIMEOUT 100
 
@@ -353,6 +354,13 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedInplace()
 {
 if ( !m_pClient || !m_pClient->GetViewShell() )
 throw uno::RuntimeException();
+
+if ( comphelper::LibreOfficeKit::isActive() )
+{
+if ( SfxViewShell* pViewShell = m_pClient->GetViewShell() ) {
+pViewShell->libreOfficeKitViewCallback( 
LOK_CALLBACK_GRAPHIC_SELECTION, "INPLACE EXIT" );
+}
+}
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2019-03-21 Thread Libreoffice Gerrit user

 desktop/source/lib/init.cxx  |3 ++-
 sfx2/source/control/unoctitm.cxx |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit ddf1e93c740901503c92e289c70cb4d54c38dd6e
Author: Henry Castro 
AuthorDate: Thu Mar 14 09:16:59 2019 -0400
Commit: Aron Budea 
CommitDate: Thu Mar 21 12:48:26 2019 +0100

lok: intercept the UNO command ".uno:ThesaurusDialog"

Change-Id: I085cb646037f260ada4d4d04c2419638dd235048
Reviewed-on: https://gerrit.libreoffice.org/69264
Tested-by: Jenkins
Reviewed-by: Aron Budea 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index bc5c9b74beba..84d9b4b59976 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2087,7 +2087,8 @@ static void doc_iniUnoCommands ()
 OUString(".uno:InsertPageFooter"),
 OUString(".uno:OnlineAutoFormat"),
 OUString(".uno:InsertSymbol"),
-OUString(".uno:EditRegion")
+OUString(".uno:EditRegion"),
+OUString(".uno:ThesaurusDialog")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index d25601a362ca..4a18c9fc587e 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1079,7 +1079,8 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "OutlineBullet" ||
  aEvent.FeatureURL.Path == "InsertIndexesEntry" ||
  aEvent.FeatureURL.Path == "TransformDialog" ||
- aEvent.FeatureURL.Path == "EditRegion")
+ aEvent.FeatureURL.Path == "EditRegion" ||
+ aEvent.FeatureURL.Path == "ThesaurusDialog")
 
 {
 aBuffer.append(aEvent.IsEnabled ? OUString("enabled") : 
OUString("disabled"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2019-02-07 Thread Libreoffice Gerrit user

 desktop/source/lib/init.cxx  |3 ++-
 sfx2/source/control/unoctitm.cxx |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 467324f1071c65f6189e7ea567088918b51d2228
Author: Henry Castro 
AuthorDate: Wed Feb 6 17:38:35 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Thu Feb 7 10:57:31 2019 +0100

lok: intercept the UNO command ".uno:EditRegion"

Change-Id: I3a1072e6ededbd0322c4b1dcd0ef4b16ace219d1
Reviewed-on: https://gerrit.libreoffice.org/67478
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 32555d9b5c9ef37276984eaa9d9b84007fd02038)
Reviewed-on: https://gerrit.libreoffice.org/67482
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a2845e0cc3e8..6135ebdea78a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1992,7 +1992,8 @@ static void doc_iniUnoCommands ()
 OUString(".uno:InsertPageHeader"),
 OUString(".uno:InsertPageFooter"),
 OUString(".uno:OnlineAutoFormat"),
-OUString(".uno:InsertSymbol")
+OUString(".uno:InsertSymbol"),
+OUString(".uno:EditRegion")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index e6a590a4053f..c2a66b443bd7 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1078,7 +1078,8 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "ParagraphDialog" ||
  aEvent.FeatureURL.Path == "OutlineBullet" ||
  aEvent.FeatureURL.Path == "InsertIndexesEntry" ||
- aEvent.FeatureURL.Path == "TransformDialog")
+ aEvent.FeatureURL.Path == "TransformDialog" ||
+ aEvent.FeatureURL.Path == "EditRegion")
 
 {
 aBuffer.append(aEvent.IsEnabled ? OUString("enabled") : 
OUString("disabled"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2018-12-14 Thread Libreoffice Gerrit user

 desktop/source/lib/init.cxx  |3 ++-
 sfx2/source/control/unoctitm.cxx |1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 13998b050f445bac3593a8bb77b7320d1be9990d
Author: Tamás Zolnai 
AuthorDate: Fri Dec 14 17:36:41 2018 +0100
Commit: Tamás Zolnai 
CommitDate: Fri Dec 14 22:04:41 2018 +0100

lok: Handle Special character menu item's state correctly in online

Change-Id: Iaa962fe5a590ef16e710fdd49d02d564f10f0f9f
Reviewed-on: https://gerrit.libreoffice.org/65188
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 65ccfdf4a411..e9675be766f6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1911,7 +1911,8 @@ static void doc_iniUnoCommands ()
 OUString(".uno:TransformDialog"),
 OUString(".uno:InsertPageHeader"),
 OUString(".uno:InsertPageFooter"),
-OUString(".uno:OnlineAutoFormat")
+OUString(".uno:OnlineAutoFormat"),
+OUString(".uno:InsertSymbol")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 2af30984afe9..94e4b16cc764 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1062,6 +1062,7 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "InsertRowsAfter" ||
  aEvent.FeatureURL.Path == "InsertColumnsBefore" ||
  aEvent.FeatureURL.Path == "InsertColumnsAfter" ||
+ aEvent.FeatureURL.Path == "InsertSymbol" ||
  aEvent.FeatureURL.Path == "DeleteRows" ||
  aEvent.FeatureURL.Path == "DeleteColumns" ||
  aEvent.FeatureURL.Path == "DeleteTable" ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source sw/qa

2018-04-14 Thread Andrea Gelmini

 desktop/source/app/app.cxx |2 +-
 sfx2/source/appl/openuriexternally.cxx |2 +-
 sw/qa/extras/odfexport/odfexport.cxx   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5203027d74c73f865c53d0be488757ce150130d0
Author: Andrea Gelmini 
Date:   Thu Apr 12 21:12:32 2018 +0200

Fix typos

Change-Id: I9ea95f5b7b6cd056cc1aad146c8841877d187d55
Reviewed-on: https://gerrit.libreoffice.org/52742
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c238d53529d8..e452529fbac3 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2243,7 +2243,7 @@ OUString GetURL_Impl(
 const OUString& rName, boost::optional< OUString > const & cwdUrl )
 {
 // if rName is a vnd.sun.star.script URL do not attempt to parse it
-// as INetURLObj does not handle handle there URLs
+// as INetURLObj does not handle URLs there
 if (rName.startsWith("vnd.sun.star.script"))
 {
 return rName;
diff --git a/sfx2/source/appl/openuriexternally.cxx 
b/sfx2/source/appl/openuriexternally.cxx
index bff5534495d6..5d1b13df8234 100644
--- a/sfx2/source/appl/openuriexternally.cxx
+++ b/sfx2/source/appl/openuriexternally.cxx
@@ -65,7 +65,7 @@ void URITools::openURI(const OUString& sURI, bool 
bHandleSystemShellExecuteExcep
 // tdf#116305 Workaround: Use timer to bring browsers to the front
 aOpenURITimer.SetInvokeHandler(LINK(this, URITools, onOpenURI));
 #ifdef WNT
-// 200ms seems to be the the best compromise between responsiveness and 
success rate
+// 200ms seems to be the best compromise between responsiveness and 
success rate
 aOpenURITimer.SetTimeout(200);
 #else
 aOpenURITimer.SetTimeout(0);
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 219ef5bd8b07..6872be59ebab 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -208,7 +208,7 @@ void testTdf43569_CheckIfFieldParse()
 
 // Input document contains only one IF-field,
 // and it should be imported as com.sun.star.text.TextField.ConditionalText in 
any case,
-// instead of insertion of the the pair of two field-marks: 
 + .
+// instead of insertion of the pair of two field-marks: 
 + .
 DECLARE_ODFEXPORT_TEST(testTdf43569, "tdf43569_conditionalfield.doc")
 {
 // check if our parser is valid
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2018-02-20 Thread Andras Timar

 desktop/source/lib/init.cxx  |3 ++-
 sfx2/source/control/unoctitm.cxx |1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e73cba0cea07eedee5507535f585e89e42ea0124
Author: Andras Timar 
Date:   Tue Feb 20 23:21:34 2018 +0100

lok: support of AutoCorrect -> While Typing menu in Writer

Change-Id: I7c07f3a6269cd4b92cc50f7aaf847faf04665029
Reviewed-on: https://gerrit.libreoffice.org/50068
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8d0611c21d07..1953b05daf70 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1764,7 +1764,8 @@ static void doc_iniUnoCommands ()
 OUString(".uno:DocumentRepair"),
 OUString(".uno:TransformDialog"),
 OUString(".uno:InsertPageHeader"),
-OUString(".uno:InsertPageFooter")
+OUString(".uno:InsertPageFooter"),
+OUString(".uno:OnlineAutoFormat")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 31364d8f84a3..023ab89701e3 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1005,6 +1005,7 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 aEvent.FeatureURL.Path == "RightPara" ||
 aEvent.FeatureURL.Path == "Shadowed" ||
 aEvent.FeatureURL.Path == "SpellOnline" ||
+aEvent.FeatureURL.Path == "OnlineAutoFormat" ||
 aEvent.FeatureURL.Path == "SubScript" ||
 aEvent.FeatureURL.Path == "SuperScript" ||
 aEvent.FeatureURL.Path == "Strikeout" ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2018-01-25 Thread Jan Holesovsky

 desktop/source/lib/init.cxx  |1 +
 sfx2/source/control/unoctitm.cxx |3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit dd42329b4a204d9d9dcac102095f144ea3eca791
Author: Jan Holesovsky 
Date:   Wed Jan 24 20:07:40 2018 +0100

lok: Send the enabled / disabled state of .uno:TransformDialog.

Change-Id: If2d8e0da6c289deb65dc8a6b38a21dfd5bbfc1bd
Reviewed-on: https://gerrit.libreoffice.org/48534
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 381e727ee954..dfff8646fef6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1762,6 +1762,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:OutlineBullet"),
 OUString(".uno:InsertIndexesEntry"),
 OUString(".uno:DocumentRepair"),
+OUString(".uno:TransformDialog"),
 OUString(".uno:InsertPageHeader"),
 OUString(".uno:InsertPageFooter")
 };
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 2193914465f2..894b88f79dbd 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1092,7 +1092,8 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "FontDialog" ||
  aEvent.FeatureURL.Path == "ParagraphDialog" ||
  aEvent.FeatureURL.Path == "OutlineBullet" ||
- aEvent.FeatureURL.Path == "InsertIndexesEntry")
+ aEvent.FeatureURL.Path == "InsertIndexesEntry" ||
+ aEvent.FeatureURL.Path == "TransformDialog")
 
 {
 aBuffer.append(aEvent.IsEnabled ? OUString("enabled") : 
OUString("disabled"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source sw/qa sw/source

2017-12-08 Thread Henry Castro

 desktop/source/lib/init.cxx|4 +
 sfx2/source/control/unoctitm.cxx   |4 +
 sw/qa/extras/tiledrendering/tiledrendering.cxx |   75 -
 sw/source/uibase/shells/textsh1.cxx|   36 +++-
 4 files changed, 115 insertions(+), 4 deletions(-)

New commits:
commit 3ba914c229adfed5c917d1ee23d35b9184b092c4
Author: Henry Castro 
Date:   Mon Jul 10 17:33:38 2017 -0400

sw lok: enable Page Header/Footer

Change-Id: I5e0d080c53079069a086f06c2a314b6372bf6391
Reviewed-on: https://gerrit.libreoffice.org/39782
Tested-by: Jenkins 
Reviewed-by: Henry Castro 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 51bcd2e34afb..f5361bdb834a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1748,7 +1748,9 @@ static void doc_iniUnoCommands ()
 OUString(".uno:ParagraphDialog"),
 OUString(".uno:OutlineBullet"),
 OUString(".uno:InsertIndexesEntry"),
-OUString(".uno:DocumentRepair")
+OUString(".uno:DocumentRepair"),
+OUString(".uno:InsertPageHeader"),
+OUString(".uno:InsertPageFooter")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index d5adabbaa598..5f4c2edf5241 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1019,7 +1019,9 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 aEvent.FeatureURL.Path == "AlignLeft" ||
 aEvent.FeatureURL.Path == "AlignHorizontalCenter" ||
 aEvent.FeatureURL.Path == "AlignRight" ||
-aEvent.FeatureURL.Path == "DocumentRepair")
+aEvent.FeatureURL.Path == "DocumentRepair" ||
+aEvent.FeatureURL.Path == "InsertPageHeader" ||
+aEvent.FeatureURL.Path == "InsertPageFooter")
 {
 bool bTemp = false;
 aEvent.State >>= bTemp;
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index d6f95df456e7..9c8f35dcc6d2 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -96,6 +97,8 @@ public:
 void testDisableUndoRepair();
 void testAllTrackedChanges();
 void testDocumentRepair();
+void testPageHeader();
+void testPageFooter();
 
 CPPUNIT_TEST_SUITE(SwTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -143,7 +146,8 @@ public:
 CPPUNIT_TEST(testDisableUndoRepair);
 CPPUNIT_TEST(testAllTrackedChanges);
 CPPUNIT_TEST(testDocumentRepair);
-
+CPPUNIT_TEST(testPageHeader);
+CPPUNIT_TEST(testPageFooter);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1933,6 +1937,75 @@ void SwTiledRenderingTest::testDocumentRepair()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+namespace {
+
+void checkPageHeaderOrFooter(const SfxViewShell* pViewShell, sal_uInt16 
nWhich, bool bValue)
+{
+const SfxPoolItem* pState = nullptr;
+pViewShell->GetDispatcher()->QueryState(nWhich, pState);
+CPPUNIT_ASSERT(dynamic_cast< const SfxBoolItem * >(pState));
+CPPUNIT_ASSERT_EQUAL(bValue, dynamic_cast< const SfxBoolItem * 
>(pState)->GetValue());
+};
+
+}
+
+void SwTiledRenderingTest::testPageHeader()
+{
+comphelper::LibreOfficeKit::setActive();
+
+createDoc("dummy.fodt");
+SfxViewShell* pViewShell = SfxViewShell::Current();
+// Check Page Header State
+checkPageHeaderOrFooter(pViewShell, FN_INSERT_PAGEHEADER, false);
+// Insert Page Header
+{
+SfxBoolItem aItem(FN_PARAM_1, true);
+pViewShell->GetDispatcher()->ExecuteList(FN_INSERT_PAGEHEADER, 
SfxCallMode::SYNCHRON, {});
+}
+// Check Page Header State
+checkPageHeaderOrFooter(pViewShell, FN_INSERT_PAGEHEADER, true);
+
+// Remove Page Header
+{
+SfxBoolItem aItem(FN_PARAM_1, false);
+pViewShell->GetDispatcher()->ExecuteList(FN_INSERT_PAGEHEADER, 
SfxCallMode::SYNCHRON, {});
+}
+// Check Page Header State
+checkPageHeaderOrFooter(pViewShell, FN_INSERT_PAGEHEADER, false);
+
+mxComponent->dispose();
+mxComponent.clear();
+comphelper::LibreOfficeKit::setActive(false);
+}
+
+void SwTiledRenderingTest::testPageFooter()
+{
+comphelper::LibreOfficeKit::setActive();
+
+createDoc("dummy.fodt");
+SfxViewShell* pViewShell = SfxViewShell::Current();
+// Check Page Footer State
+checkPageHeaderOrFooter(pViewShell, FN_INSERT_PAGEFOOTER, false);
+// Insert Page Footer
+{
+SfxBoolItem aItem(FN_PARAM_1, true);
+pViewShell->GetDispatcher()->ExecuteList(FN_INSERT_PAGEFOOTER, 
SfxCallMode::SYNCHRON, {});
+}
+// Check Page Footer State
+checkPageHeaderOrFooter(pViewShell,

[Libreoffice-commits] core.git: desktop/source sfx2/source

2017-12-06 Thread Pranav Kant

 desktop/source/lib/init.cxx  |8 +++-
 sfx2/source/control/unoctitm.cxx |8 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 98da350c7c9bcb96937f1397a34c2c68ede44011
Author: Pranav Kant 
Date:   Wed Dec 6 17:32:53 2017 +0530

lokdialog: State change events for dialogs uno commands

Change-Id: I92f60e717cd2a0695c8b86b103076d26c0c22cef

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b5bc0f56a845..94afb956ebc7 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1741,7 +1741,13 @@ static void doc_iniUnoCommands ()
 OUString(".uno:NextTrackedChange"),
 OUString(".uno:PreviousTrackedChange"),
 OUString(".uno:AcceptAllTrackedChanges"),
-OUString(".uno:RejectAllTrackedChanges")
+OUString(".uno:RejectAllTrackedChanges"),
+OUString(".uno:TableDialog"),
+OUString(".uno:FormatCellDialog"),
+OUString(".uno:FontDialog"),
+OUString(".uno:ParagraphDialog"),
+OUString(".uno:OutlineBullet"),
+OUString(".uno:InsertIndexesEntry")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index af1df14d68a8..9fd42581036f 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1085,7 +1085,13 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "SortAscending" ||
  aEvent.FeatureURL.Path == "SortDescending" ||
  aEvent.FeatureURL.Path == "AcceptAllTrackedChanges" ||
- aEvent.FeatureURL.Path == "RejectAllTrackedChanges")
+ aEvent.FeatureURL.Path == "RejectAllTrackedChanges" ||
+ aEvent.FeatureURL.Path == "TableDialog" ||
+ aEvent.FeatureURL.Path == "FormatCellDialog" ||
+ aEvent.FeatureURL.Path == "FontDialog" ||
+ aEvent.FeatureURL.Path == "ParagraphDialog" ||
+ aEvent.FeatureURL.Path == "OutlineBullet" ||
+ aEvent.FeatureURL.Path == "InsertIndexesEntry")
 
 {
 aBuffer.append(aEvent.IsEnabled ? OUString("enabled") : 
OUString("disabled"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2017-10-01 Thread Henry Castro

 desktop/source/lib/init.cxx  |   47 ++-
 sfx2/source/control/unoctitm.cxx |8 ++
 2 files changed, 50 insertions(+), 5 deletions(-)

New commits:
commit b3de468de84289f06a5eec858ba6493b2c9f408d
Author: Henry Castro 
Date:   Sun Oct 1 11:11:18 2017 -0400

lok: handle .uno:LanguageStatus command

Change-Id: I3828113bce3b7d32e90e461a299986e363115a83
Reviewed-on: https://gerrit.libreoffice.org/43002
Tested-by: Jenkins 
Reviewed-by: Henry Castro 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e195ae5a0430..4566a01dac37 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -59,6 +59,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -74,7 +75,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1492,7 +1495,36 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, 
const char* sUrl, const cha
 return false;
 }
 
-static void doc_iniUnoCommands ()
+static void doc_iniUnoCommand(const SfxViewShell* pViewShell, const OUString& 
aUnoCommand)
+{
+OUStringBuffer aBuffer;
+
+if (aUnoCommand.endsWith("LanguageStatus"))
+{
+uno::Reference< css::linguistic2::XLinguServiceManager2 > xLangSrv = 
css::linguistic2::LinguServiceManager::create(xContext);
+uno::Reference< css::linguistic2::XSpellChecker > xSpell(xLangSrv.is() 
? xLangSrv->getSpellChecker() : nullptr, uno::UNO_QUERY);
+uno::Reference< css::linguistic2::XSupportedLocales > xLocales(xSpell, 
uno::UNO_QUERY);
+uno::Sequence< css::lang::Locale > aLocales(xLocales.is() ? 
xLocales->getLocales() : uno::Sequence< css::lang::Locale >());
+
+aBuffer.append(aUnoCommand);
+aBuffer.append("?[");
+for ( sal_Int32 itLocale = 0; itLocale < aLocales.getLength(); 
itLocale++ )
+{
+aBuffer.append("\"" + 
SvtLanguageTable::GetLanguageString(LanguageTag::convertToLanguageType(aLocales[itLocale]))
 + "\"");
+if (itLocale + 1 != aLocales.getLength())
+aBuffer.append(",");
+}
+aBuffer.append("]");
+}
+
+if (pViewShell && !aBuffer.isEmpty())
+{
+OUString payload = aBuffer.makeStringAndClear();
+pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED, 
payload.toUtf8().getStr());
+}
+}
+
+static void doc_iniUnoCommands (const SfxViewShell* pViewShell)
 {
 SolarMutexGuard aGuard;
 
@@ -1520,6 +1552,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:JustifyPara"),
 OUString(".uno:OutlineFont"),
 OUString(".uno:LeftPara"),
+OUString(".uno:LanguageStatus"),
 OUString(".uno:RightPara"),
 OUString(".uno:Shadowed"),
 OUString(".uno:SubScript"),
@@ -1580,7 +1613,6 @@ static void doc_iniUnoCommands ()
 };
 
 util::URL aCommandURL;
-SfxViewShell* pViewShell = SfxViewShell::Current();
 SfxViewFrame* pViewFrame = pViewShell? pViewShell->GetViewFrame(): nullptr;
 
 // check if Frame-Controller were created.
@@ -1614,7 +1646,11 @@ static void doc_iniUnoCommands ()
 if (pSlot)
 {
 // Initialize slot to dispatch .uno: Command.
-pViewFrame->GetBindings().GetDispatch(pSlot, aCommandURL, false);
+uno::Reference 
xDispatch(pViewFrame->GetBindings().GetDispatch(pSlot, aCommandURL, false));
+if (xDispatch.is())
+{
+doc_iniUnoCommand(pViewShell, sUnoCommand);
+}
 }
 }
 }
@@ -1964,8 +2000,6 @@ static void 
doc_initializeForRendering(LibreOfficeKitDocument* pThis,
 ITiledRenderable* pDoc = getTiledRenderable(pThis);
 if (pDoc)
 {
-doc_iniUnoCommands();
-
 pDoc->initializeForTiledRendering(
 
comphelper::containerToSequence(jsonToPropertyValuesVector(pArguments)));
 }
@@ -2021,7 +2055,10 @@ static void doc_registerCallback(LibreOfficeKitDocument* 
pThis,
 }
 
 if (SfxViewShell* pViewShell = SfxViewShell::Current())
+{
 
pViewShell->registerLibreOfficeKitViewCallback(CallbackFlushHandler::callback, 
pDocument->mpCallbackFlushHandlers[nView].get());
+doc_iniUnoCommands(pViewShell);
+}
 }
 
 /// Returns the JSON representation of all the comments in the document
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 3556a9c4acb2..c609bf21bbd5 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1159,6 +1159,14 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 aBuffer.append(OUString::number(aSize.Width) + " x " + 
OUString::number(aSize.Height));
 }
 }
+else if (aEvent.FeatureURL.Path == "LanguageStatus")
+{
+css::uno::Sequence< OUString > aSeq;
+

[Libreoffice-commits] core.git: desktop/source sfx2/source

2017-09-20 Thread Jan Holesovsky

 desktop/source/lib/init.cxx  |1 +
 sfx2/source/control/unoctitm.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 012f153259d7541604ba78f1cb0b4b2df968672d
Author: Jan Holesovsky 
Date:   Tue Sep 19 16:47:17 2017 +0200

lok: Expose the automatic spell checking state in the UI.

Change-Id: I5c22ff70d3895b0f4a86eb8be85dde971604874a
Reviewed-on: https://gerrit.libreoffice.org/42480
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f9a825564c88..e195ae5a0430 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1556,6 +1556,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:RowColSelCount"),
 OUString(".uno:StatusPageStyle"),
 OUString(".uno:InsertMode"),
+OUString(".uno:SpellOnline"),
 OUString(".uno:StatusSelectionMode"),
 OUString(".uno:StateTableCell"),
 OUString(".uno:StatusBarFunc"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 433dfbbf66ea..3556a9c4acb2 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -997,6 +997,7 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 aEvent.FeatureURL.Path == "OutlineFont" ||
 aEvent.FeatureURL.Path == "RightPara" ||
 aEvent.FeatureURL.Path == "Shadowed" ||
+aEvent.FeatureURL.Path == "SpellOnline" ||
 aEvent.FeatureURL.Path == "SubScript" ||
 aEvent.FeatureURL.Path == "SuperScript" ||
 aEvent.FeatureURL.Path == "Strikeout" ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2017-05-29 Thread Jan Holesovsky

 desktop/source/lib/init.cxx  |1 +
 sfx2/source/control/unoctitm.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 20c15b2994dc433c873805ca6ef26338f0713840
Author: Jan Holesovsky 
Date:   Mon May 29 16:55:49 2017 +0200

lok: Notify about the Formatting Marks changes.

Change-Id: Ibcbd370c99cf63789637ad6642c91775066ecfad
Reviewed-on: https://gerrit.libreoffice.org/38157
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3c88929d4683..41bd367cd1b8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1517,6 +1517,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:CharBackgroundExt"),
 OUString(".uno:CharFontName"),
 OUString(".uno:Color"),
+OUString(".uno:ControlCodes"),
 OUString(".uno:DecrementIndent"),
 OUString(".uno:DefaultBullet"),
 OUString(".uno:DefaultNumbering"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 3294bc0e9913..895bacb5e19d 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -994,6 +994,7 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 if (aEvent.FeatureURL.Path == "Bold" ||
 aEvent.FeatureURL.Path == "CenterPara" ||
 aEvent.FeatureURL.Path == "CharBackgroundExt" ||
+aEvent.FeatureURL.Path == "ControlCodes" ||
 aEvent.FeatureURL.Path == "DefaultBullet" ||
 aEvent.FeatureURL.Path == "DefaultNumbering" ||
 aEvent.FeatureURL.Path == "Italic" ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2017-03-03 Thread Pranav Kant

 desktop/source/lib/init.cxx  |4 +++-
 sfx2/source/control/unoctitm.cxx |4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 67dad2676dbbe1557f51a4fb16975499c16829f5
Author: Pranav Kant 
Date:   Wed Mar 1 15:20:53 2017 +0530

lok: Listen to change tracking related commands

Change-Id: Ieafd31342b356d7e95e4321cc49580b57f32e5be

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 89659fa..c068915 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1518,7 +1518,9 @@ static void doc_iniUnoCommands ()
 OUString(".uno:SortAscending"),
 OUString(".uno:SortDescending"),
 OUString(".uno:TrackChanges"),
-OUString(".uno:AcceptTrackedChange"),
+OUString(".uno:ShowTrackedChanges"),
+OUString(".uno:NextTrackedChange"),
+OUString(".uno:PreviousTrackedChange")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 2191cd8..f82460a 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -996,7 +996,9 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 aEvent.FeatureURL.Path == "Underline" ||
 aEvent.FeatureURL.Path == "ModifiedStatus" ||
 aEvent.FeatureURL.Path == "TrackChanges" ||
-aEvent.FeatureURL.Path == "AcceptTrackedChange" ||
+aEvent.FeatureURL.Path == "ShowTrackedChanges" ||
+aEvent.FeatureURL.Path == "NextTrackedChange" ||
+aEvent.FeatureURL.Path == "PreviousTrackedChange" ||
 aEvent.FeatureURL.Path == "AlignLeft" ||
 aEvent.FeatureURL.Path == "AlignHorizontalCenter" ||
 aEvent.FeatureURL.Path == "AlignRight")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2017-02-20 Thread Pranav Kant

 desktop/source/lib/init.cxx  |1 +
 sfx2/source/control/unoctitm.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 866582435fa8ea0a76ad08d07e7df3a344072c94
Author: Pranav Kant 
Date:   Mon Feb 20 13:30:13 2017 +0530

lok: listen for DeleteAnnotation state changes

Change-Id: I2ea0d237cbbfd912b012ed400a328bfb6546cdfb

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c11e161..ae63d49 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1395,6 +1395,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:Paste"),
 OUString(".uno:SelectAll"),
 OUString(".uno:InsertAnnotation"),
+OUString(".uno:DeleteAnnotation"),
 OUString(".uno:ReplyComment"),
 OUString(".uno:InsertRowsBefore"),
 OUString(".uno:InsertRowsAfter"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 9eca383..a34c140 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1039,6 +1039,7 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "Paste" ||
  aEvent.FeatureURL.Path == "SelectAll" ||
  aEvent.FeatureURL.Path == "InsertAnnotation" ||
+ aEvent.FeatureURL.Path == "DeleteAnnotation" ||
  aEvent.FeatureURL.Path == "InsertRowsBefore" ||
  aEvent.FeatureURL.Path == "InsertRowsAfter" ||
  aEvent.FeatureURL.Path == "InsertColumnsBefore" ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2016-12-16 Thread Pranav Kant

 desktop/source/lib/init.cxx  |1 -
 sfx2/source/control/unoctitm.cxx |   15 +--
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit c5ceb0134dddb79207d3b8ddb7a36ee1ca294329
Author: Pranav Kant 
Date:   Fri Dec 16 19:35:02 2016 +0530

lok: Fix state feedback for ToggleMergeCells

Now it broadcasts "disabled" to disable the command and
true/false to tell the status of the command which automatically
means "enabled"

Change-Id: I3314da77fb2b84d97f64b9832d65791b84fcd7df
Reviewed-on: https://gerrit.libreoffice.org/32086
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ea947b8..26c18df 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1316,7 +1316,6 @@ static void doc_iniUnoCommands ()
 OUString(".uno:EntireRow"),
 OUString(".uno:EntireColumn"),
 OUString(".uno:EntireCell"),
-OUString(".uno:MergeCells"),
 OUString(".uno:AssignLayout"),
 OUString(".uno:StatusDocPos"),
 OUString(".uno:RowColSelCount"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 26252a36..ad66f45 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1050,7 +1050,6 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "EntireRow" ||
  aEvent.FeatureURL.Path == "EntireColumn" ||
  aEvent.FeatureURL.Path == "EntireCell" ||
- aEvent.FeatureURL.Path == "MergeCells" ||
  aEvent.FeatureURL.Path == "SortAscending" ||
  aEvent.FeatureURL.Path == "SortDescending")
 {
@@ -1095,7 +1094,6 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 }
 else if (aEvent.FeatureURL.Path == "InsertMode" ||
  aEvent.FeatureURL.Path == "WrapText" ||
- aEvent.FeatureURL.Path == "ToggleMergeCells" ||
  aEvent.FeatureURL.Path == "NumberFormatCurrency" ||
  aEvent.FeatureURL.Path == "NumberFormatPercent" ||
  aEvent.FeatureURL.Path == "NumberFormatDate")
@@ -1107,6 +1105,19 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 aBuffer.append(OUString::boolean(aBool));
 }
 }
+else if (aEvent.FeatureURL.Path == "ToggleMergeCells")
+{
+if (aEvent.IsEnabled)
+{
+sal_Bool aBool;
+aEvent.State >>= aBool;
+aBuffer.append(OUString::boolean(aBool));
+}
+else
+{
+aBuffer.append(OUString("disabled"));
+}
+}
 else if (aEvent.FeatureURL.Path == "Position")
 {
 css::awt::Point aPoint;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source starmath/source svl/source sw/source

2016-11-30 Thread Miklos Vajna

 desktop/source/lib/lokclipboard.cxx   |2 +-
 sfx2/source/view/classificationcontroller.cxx |2 +-
 starmath/source/rtfexport.cxx |8 
 starmath/source/unofilter.cxx |4 ++--
 starmath/source/wordexportbase.cxx|2 +-
 svl/source/items/grabbagitem.cxx  |2 +-
 sw/source/core/doc/rdfhelper.cxx  |2 +-
 sw/source/core/doc/textboxhelper.cxx  |   12 ++--
 sw/source/filter/ww8/docxsdrexport.cxx|4 ++--
 9 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit b18b1e80e9f3359fdfc06dc36dd4f0c15e9344af
Author: Miklos Vajna 
Date:   Wed Nov 30 09:08:43 2016 +0100

sw: use auto when initializing with a cast to avoid duplicating the type 
name

Change-Id: Ide7bd0f1f444824b78aa53cfe1db0129cbca1a5d
Reviewed-on: https://gerrit.libreoffice.org/31397
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/desktop/source/lib/lokclipboard.cxx 
b/desktop/source/lib/lokclipboard.cxx
index fa74fa0..deab34f 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -42,7 +42,7 @@ throw(datatransfer::UnsupportedFlavorException, 
io::IOException, uno::RuntimeExc
 uno::Any aRet;
 if (rFlavor.DataType == cppu::UnoType::get())
 {
-sal_Char* pText = reinterpret_cast(m_aSequence.getArray());
+auto pText = reinterpret_cast(m_aSequence.getArray());
 aRet <<= OUString(pText, m_aSequence.getLength(), 
RTL_TEXTENCODING_UTF8);
 }
 else
diff --git a/sfx2/source/view/classificationcontroller.cxx 
b/sfx2/source/view/classificationcontroller.cxx
index 1b069cc..fd19278 100644
--- a/sfx2/source/view/classificationcontroller.cxx
+++ b/sfx2/source/view/classificationcontroller.cxx
@@ -154,7 +154,7 @@ void ClassificationCategoriesController::dispose() throw 
(uno::RuntimeException,
 uno::Reference 
ClassificationCategoriesController::createItemWindow(const 
uno::Reference& rParent) throw (uno::RuntimeException, 
std::exception)
 {
 VclPtr pParent = VCLUnoHelper::GetWindow(rParent);
-ToolBox* pToolbar = dynamic_cast(pParent.get());
+auto pToolbar = dynamic_cast(pParent.get());
 if (pToolbar)
 {
 m_pClassification = VclPtr::Create(pToolbar);
diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
index b0e947d..9acd9d4 100644
--- a/starmath/source/rtfexport.cxx
+++ b/starmath/source/rtfexport.cxx
@@ -54,7 +54,7 @@ void SmRtfExport::HandleText(const SmNode* pNode, int 
/*nLevel*/)
 if (pNode->GetToken().eType == TTEXT)  // literal text
 m_pBuffer->append(LO_STRING_SVTOOLS_RTF_MNOR " ");
 
-const SmTextNode* pTemp = static_cast(pNode);
+auto pTemp = static_cast(pNode);
 SAL_INFO("starmath.rtf", "Text: " << pTemp->GetText());
 for (sal_Int32 i = 0; i < pTemp->GetText().getLength(); i++)
 {
@@ -180,7 +180,7 @@ namespace
 OString mathSymbolToString(const SmNode* node, rtl_TextEncoding nEncoding)
 {
 assert(node->GetType() == NMATH || node->GetType() == NMATHIDENT);
-const SmTextNode* txtnode = static_cast(node);
+auto txtnode = static_cast(node);
 if (txtnode->GetText().isEmpty())
 return OString();
 assert(txtnode->GetText().getLength() == 1);
@@ -405,7 +405,7 @@ void SmRtfExport::HandleBrace(const SmBraceNode* pNode, int 
nLevel)
 std::vector< const SmNode* > subnodes;
 if (pNode->Body()->GetType() == NBRACEBODY)
 {
-const SmBracebodyNode* body = static_cast(pNode->Body());
+auto body = static_cast(pNode->Body());
 bool separatorWritten = false; // assume all separators are the same
 for (int i = 0; i < body->GetNumSubNodes(); ++i)
 {
@@ -413,7 +413,7 @@ void SmRtfExport::HandleBrace(const SmBraceNode* pNode, int 
nLevel)
 if (subnode->GetType() == NMATH || subnode->GetType() == 
NMATHIDENT)
 {
 // do not write, but write what separator it is
-const SmMathSymbolNode* math = static_cast(subnode);
+auto math = static_cast(subnode);
 if (!separatorWritten)
 {
 m_pBuffer->append("{" LO_STRING_SVTOOLS_RTF_MSEPCHR " ");
diff --git a/starmath/source/unofilter.cxx b/starmath/source/unofilter.cxx
index 95fc3e8..d24d0b2 100644
--- a/starmath/source/unofilter.cxx
+++ b/starmath/source/unofilter.cxx
@@ -67,9 +67,9 @@ sal_Bool MathTypeFilter::filter(const 
uno::Sequence& rDesc
 // Is this a MathType Storage?
 if (aStorage->IsStream("Equation Native"))
 {
-if (SmModel* pModel = 
dynamic_cast(m_xDstDoc.get()))
+if (auto pModel = dynamic_cast(m_xDstDoc.get()))
 {
-SmDocShell*

[Libreoffice-commits] core.git: desktop/source sfx2/source

2016-09-01 Thread Miklos Vajna

 desktop/source/lib/init.cxx|   19 +++
 sfx2/source/view/lokhelper.cxx |4 
 2 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit f96fa389f950dd97bd213402fb5ea6eb114f9ab7
Author: Miklos Vajna 
Date:   Thu Sep 1 10:04:24 2016 +0200

sfx2: nullptr pViewShell was seen in SfxLokHelper::getView()

I'm not sure how to trigger this reliably, but Pranav got this:

#0  0x7fb2f471bbf0 in SfxLokHelper::getView(SfxViewShell*) 
(pViewShell=0x0) at sfx2/source/view/lokhelper.cxx:82
#1  0x7fb2f75edf4f in doc_paintPartTile(LibreOfficeKitDocument*, 
unsigned char*, int, int, int, int, int, int, int) (pThis=0x7fb290253c40, 
pBuffer=0x281fbd0 "", nPart=0, nCanvasWidth=1024, nCanvasHeight=256, 
nTilePosX=0, nTilePosY=11520, nTileWidth=15360, nTileHeight=3840) at 
desktop/source/lib/init.cxx:1338

Given that SfxViewShell::Current() may indeed return nullptr (e.g.
during shutdown), change SfxLokHelper::getView() to return -1 in that
case, and adapt client code to handle that.

Change-Id: Ia191c843c8a993f3d7157de432af57964c0a8f63
Reviewed-on: https://gerrit.libreoffice.org/28583
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f4f4622..5f7ac7a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1365,7 +1365,10 @@ static void doc_paintPartTile(LibreOfficeKitDocument* 
pThis,
 
 // Disable callbacks while we are painting.
 LibLODocument_Impl* pDocument = static_cast(pThis);
-std::size_t nView = SfxLokHelper::getView();
+int nView = SfxLokHelper::getView();
+if (nView < 0)
+return;
+
 pDocument->mpCallbackFlushHandlers[nView]->setPartTilePainting(true);
 try
 {
@@ -1438,7 +1441,10 @@ static void doc_registerCallback(LibreOfficeKitDocument* 
pThis,
 SolarMutexGuard aGuard;
 LibLODocument_Impl* pDocument = static_cast(pThis);
 
-std::size_t nView = SfxLokHelper::getView();
+int nView = SfxLokHelper::getView();
+if (nView < 0)
+return;
+
 pDocument->mpCallbackFlushHandlers[nView].reset(new 
CallbackFlushHandler(pThis, pCallback, pData));
 
 if (SfxViewShell* pViewShell = SfxViewFrame::Current()->GetViewShell())
@@ -1507,7 +1513,9 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 LibLODocument_Impl* pDocument = static_cast(pThis);
 
 std::vector 
aPropertyValuesVector(jsonToPropertyValuesVector(pArguments));
-std::size_t nView = SfxLokHelper::getView();
+int nView = SfxLokHelper::getView();
+if (nView < 0)
+return;
 
 // handle potential interaction
 if (gImpl && aCommand == ".uno:Save")
@@ -1593,7 +1601,10 @@ static void doc_postMouseEvent(LibreOfficeKitDocument* 
pThis, int nType, int nX,
 }
 
 LibLODocument_Impl* pLib = static_cast(pThis);
-std::size_t nView = SfxLokHelper::getView();
+int nView = SfxLokHelper::getView();
+if (nView < 0)
+return;
+
 if (pLib->mpCallbackFlushHandlers[nView])
 {
 
pLib->mpCallbackFlushHandlers[nView]->queue(LOK_CALLBACK_MOUSE_POINTER, 
aPointerString.getStr());
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index c5fb171..8225474 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -83,6 +83,10 @@ int SfxLokHelper::getView(SfxViewShell* pViewShell)
 {
 if (!pViewShell)
 pViewShell = SfxViewShell::Current();
+// Still no valid view shell? Then no idea.
+if (!pViewShell)
+return -1;
+
 return pViewShell->GetViewShellId();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2016-07-14 Thread Henry Castro

 desktop/source/lib/init.cxx  |4 +++-
 sfx2/source/control/unoctitm.cxx |   10 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 4dd0d77675dd13c9de7c9ac5dbc0cb6b8ca53865
Author: Henry Castro 
Date:   Thu Jul 14 10:59:47 2016 -0400

sc lok: add more toolbar items

.uno:SortAscending
.uno:SortDescending

Change-Id: I3d307b43fb18ffce75b00a0b919b63320bf6db05
Reviewed-on: https://gerrit.libreoffice.org/27223
Tested-by: Jenkins 
Reviewed-by: Henry Castro 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 72b74bd..b319167 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1013,7 +1013,9 @@ static void doc_iniUnoCommands ()
 OUString(".uno:ToggleMergeCells"),
 OUString(".uno:NumberFormatCurrency"),
 OUString(".uno:NumberFormatPercent"),
-OUString(".uno:NumberFormatDate")
+OUString(".uno:NumberFormatDate"),
+OUString(".uno:SortAscending"),
+OUString(".uno:SortDescending")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 68b1ea9..b799330 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1017,14 +1017,17 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 }
 else if (aEvent.FeatureURL.Path == "InsertPage" ||
  aEvent.FeatureURL.Path == "DeletePage" ||
- aEvent.FeatureURL.Path == "DuplicatePage")
+ aEvent.FeatureURL.Path == "DuplicatePage" ||
+ aEvent.FeatureURL.Path == "SortAscending" ||
+ aEvent.FeatureURL.Path == "SortDescending")
 {
 aBuffer.append(OUString::boolean(aEvent.IsEnabled));
 }
 else if (aEvent.FeatureURL.Path == "AssignLayout" ||
  aEvent.FeatureURL.Path == "StatusSelectionMode" ||
  aEvent.FeatureURL.Path == "Signature" ||
- aEvent.FeatureURL.Path == "SelectionMode")
+ aEvent.FeatureURL.Path == "SelectionMode" ||
+ aEvent.FeatureURL.Path == "StatusBarFunc")
 {
 sal_Int32 aInt32;
 
@@ -1074,8 +1077,7 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 aBuffer.append(OUString::number(aPoint.X) + " / " + 
OUString::number(aPoint.Y));
 }
 }
-else if (aEvent.FeatureURL.Path == "StatusBarFunc" ||
- aEvent.FeatureURL.Path == "Size")
+else if (aEvent.FeatureURL.Path == "Size")
 {
 css::awt::Size aSize;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2016-07-03 Thread Henry Castro

 desktop/source/lib/init.cxx  |5 -
 sfx2/source/control/unoctitm.cxx |5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit bad68fd0b4a40062990c96a1a3f8d7a31bd84180
Author: Henry Castro 
Date:   Sun Jul 3 09:40:50 2016 -0400

sd: add status bar UNO commands

Change-Id: I7da065edf76ccdbf9e410756c4d1fe81462975ed
Reviewed-on: https://gerrit.libreoffice.org/26881
Tested-by: Jenkins 
Reviewed-by: Henry Castro 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 60553a6..7048da7 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1006,7 +1006,10 @@ static void doc_iniUnoCommands ()
 OUString(".uno:StatePageNumber"),
 OUString(".uno:StateWordCount"),
 OUString(".uno:PageStyleName"),
-OUString(".uno:SelectionMode")
+OUString(".uno:SelectionMode"),
+OUString(".uno:PageStatus"),
+OUString(".uno:LayoutStatus"),
+OUString(".uno:Context")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 934c6b2..116d7b6 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1039,7 +1039,10 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "StateTableCell" ||
  aEvent.FeatureURL.Path == "StatePageNumber" ||
  aEvent.FeatureURL.Path == "StateWordCount" ||
- aEvent.FeatureURL.Path == "PageStyleName")
+ aEvent.FeatureURL.Path == "PageStyleName" ||
+ aEvent.FeatureURL.Path == "PageStatus" ||
+ aEvent.FeatureURL.Path == "LayoutStatus" ||
+ aEvent.FeatureURL.Path == "Context")
 {
 OUString aString;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2016-07-02 Thread Henry Castro

 desktop/source/lib/init.cxx  |6 +-
 sfx2/source/control/unoctitm.cxx |8 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit f41c20dc2384ba7765278adce0cd817781beb43a
Author: Henry Castro 
Date:   Sat Jul 2 23:25:28 2016 -0400

sw lok: add status bar UNO commands

Change-Id: I4ffa3a3e07d00cfac48e67a0c32e85de0eda803d
Reviewed-on: https://gerrit.libreoffice.org/26876
Tested-by: Jenkins 
Reviewed-by: Henry Castro 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ad60d39..60553a6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1002,7 +1002,11 @@ static void doc_iniUnoCommands ()
 OUString(".uno:Position"),
 OUString(".uno:StateTableCell"),
 OUString(".uno:StatusBarFunc"),
-OUString(".uno:Size")
+OUString(".uno:Size"),
+OUString(".uno:StatePageNumber"),
+OUString(".uno:StateWordCount"),
+OUString(".uno:PageStyleName"),
+OUString(".uno:SelectionMode")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 1711553..934c6b2 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1023,7 +1023,8 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 }
 else if (aEvent.FeatureURL.Path == "AssignLayout" ||
  aEvent.FeatureURL.Path == "StatusSelectionMode" ||
- aEvent.FeatureURL.Path == "Signature")
+ aEvent.FeatureURL.Path == "Signature" ||
+ aEvent.FeatureURL.Path == "SelectionMode")
 {
 sal_Int32 aInt32;
 
@@ -1035,7 +1036,10 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 else if (aEvent.FeatureURL.Path == "StatusDocPos" ||
  aEvent.FeatureURL.Path == "RowColSelCount" ||
  aEvent.FeatureURL.Path == "StatusPageStyle" ||
- aEvent.FeatureURL.Path == "StateTableCell")
+ aEvent.FeatureURL.Path == "StateTableCell" ||
+ aEvent.FeatureURL.Path == "StatePageNumber" ||
+ aEvent.FeatureURL.Path == "StateWordCount" ||
+ aEvent.FeatureURL.Path == "PageStyleName")
 {
 OUString aString;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2016-07-02 Thread Henry Castro

 desktop/source/lib/init.cxx  |   12 +++-
 sfx2/source/control/unoctitm.cxx |   56 +++
 2 files changed, 62 insertions(+), 6 deletions(-)

New commits:
commit 7e3e55c39e0f01321aee9875f55627f4eefcec27
Author: Henry Castro 
Date:   Thu Jun 30 10:33:20 2016 -0400

sc lok: add status bar UNO commands

Change-Id: I2dbed808a23609773baf9154820a7121c7919c70
Reviewed-on: https://gerrit.libreoffice.org/26809
Tested-by: Jenkins 
Reviewed-by: Henry Castro 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9762cd82..ad60d39 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -992,7 +992,17 @@ static void doc_iniUnoCommands ()
 OUString(".uno:EntireColumn"),
 OUString(".uno:EntireCell"),
 OUString(".uno:MergeCells"),
-OUString(".uno:AssignLayout")
+OUString(".uno:AssignLayout"),
+OUString(".uno:StatusDocPos"),
+OUString(".uno:RowColSelCount"),
+OUString(".uno:StatusPageStyle"),
+OUString(".uno:InsertMode"),
+OUString(".uno:StatusSelectionMode"),
+OUString(".uno:Signature"),
+OUString(".uno:Position"),
+OUString(".uno:StateTableCell"),
+OUString(".uno:StatusBarFunc"),
+OUString(".uno:Size")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 3ade4be..1711553 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -942,7 +942,7 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 
 OUStringBuffer aBuffer;
 aBuffer.append(aEvent.FeatureURL.Complete);
-aBuffer.append("=");
+aBuffer.append(static_cast('='));
 
 if (aEvent.FeatureURL.Path == "Bold" ||
 aEvent.FeatureURL.Path == "CenterPara" ||
@@ -1021,16 +1021,62 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 {
 aBuffer.append(OUString::boolean(aEvent.IsEnabled));
 }
-else if (aEvent.FeatureURL.Path == "AssignLayout")
+else if (aEvent.FeatureURL.Path == "AssignLayout" ||
+ aEvent.FeatureURL.Path == "StatusSelectionMode" ||
+ aEvent.FeatureURL.Path == "Signature")
 {
-sal_Int32 nLayout = 0;
-aEvent.State >>= nLayout;
-aBuffer.append(nLayout);
+sal_Int32 aInt32;
+
+if (aEvent.IsEnabled && (aEvent.State >>= aInt32))
+{
+aBuffer.append(OUString::number(aInt32));
+}
+}
+else if (aEvent.FeatureURL.Path == "StatusDocPos" ||
+ aEvent.FeatureURL.Path == "RowColSelCount" ||
+ aEvent.FeatureURL.Path == "StatusPageStyle" ||
+ aEvent.FeatureURL.Path == "StateTableCell")
+{
+OUString aString;
+
+if (aEvent.IsEnabled && (aEvent.State >>= aString))
+{
+aBuffer.append(aString);
+}
+}
+else if (aEvent.FeatureURL.Path == "InsertMode")
+{
+sal_Bool aBool;
+
+if (aEvent.IsEnabled && (aEvent.State >>= aBool))
+{
+aBuffer.append(OUString::boolean(aBool));
+}
+}
+else if (aEvent.FeatureURL.Path == "Position")
+{
+css::awt::Point aPoint;
+
+if (aEvent.IsEnabled && (aEvent.State >>= aPoint))
+{
+aBuffer.append(OUString::number(aPoint.X) + OUString(" / ") + 
OUString::number(aPoint.Y));
+}
+}
+else if (aEvent.FeatureURL.Path == "StatusBarFunc" ||
+ aEvent.FeatureURL.Path == "Size")
+{
+css::awt::Size aSize;
+
+if (aEvent.IsEnabled && (aEvent.State >>= aSize))
+{
+aBuffer.append(OUString::number(aSize.Width) + OUString(" x ") + 
OUString::number(aSize.Height));
+}
 }
 else
 {
 return;
 }
+
 OUString payload = aBuffer.makeStringAndClear();
 if (const SfxViewShell* pViewShell = pViewFrame->GetViewShell())
 pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED, 
payload.toUtf8().getStr());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2016-05-27 Thread Henry Castro

 desktop/source/lib/init.cxx  |3 ++-
 sfx2/source/control/unoctitm.cxx |6 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 05ba8e567bd4fca2bef9bcf7a43d4c3d6c0cc5ad
Author: Henry Castro 
Date:   Fri May 27 16:38:47 2016 -0400

lok: add uno command AssignLayout

Change-Id: I959d1a57945a3b5aa3f2c273c4b885ed5f628f6e
Reviewed-on: https://gerrit.libreoffice.org/25569
Tested-by: Jenkins 
Reviewed-by: Henry Castro 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2ea994d..ccb27c1 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -780,7 +780,8 @@ static void doc_iniUnoCommands ()
 OUString(".uno:EntireRow"),
 OUString(".uno:EntireColumn"),
 OUString(".uno:EntireCell"),
-OUString(".uno:MergeCells")
+OUString(".uno:MergeCells"),
+OUString(".uno:AssignLayout")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index a2eaff9..7c1fefe 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1013,6 +1013,12 @@ void 
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
 {
 aBuffer.append(OUString::boolean(aEvent.IsEnabled));
 }
+else if (aEvent.FeatureURL.Path == "AssignLayout")
+{
+sal_Int32 nLayout = 0;
+aEvent.State >>= nLayout;
+aBuffer.append(nLayout);
+}
 else
 {
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2016-05-23 Thread Pranav Kant

 desktop/source/lib/init.cxx  |   19 ++-
 sfx2/source/control/unoctitm.cxx |   19 ++-
 2 files changed, 36 insertions(+), 2 deletions(-)

New commits:
commit 5c7ab8259c7016441df45e04fd3be242e6205c1d
Author: Pranav Kant 
Date:   Mon May 23 13:32:47 2016 +0530

lok: Subcribe to more uno commands for state change

Change-Id: Id2870b176de4163fbe01e4ac380b4981d3187d90

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 09f6883..2ea994d 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -763,7 +763,24 @@ static void doc_iniUnoCommands ()
 OUString(".uno:Redo"),
 OUString(".uno:InsertPage"),
 OUString(".uno:DeletePage"),
-OUString(".uno:DuplicatePage")
+OUString(".uno:DuplicatePage"),
+OUString(".uno:Cut"),
+OUString(".uno:Copy"),
+OUString(".uno:Paste"),
+OUString(".uno:SelectAll"),
+OUString(".uno:InsertAnnotation"),
+OUString(".uno:InsertRowsBefore"),
+OUString(".uno:InsertRowsAfter"),
+OUString(".uno:InsertColumnsBefore"),
+OUString(".uno:InsertColumnsAfter"),
+OUString(".uno:DeleteRows"),
+OUString(".uno:DeleteColumns"),
+OUString(".uno:DeleteTable"),
+OUString(".uno:SelectTable"),
+OUString(".uno:EntireRow"),
+OUString(".uno:EntireColumn"),
+OUString(".uno:EntireCell"),
+OUString(".uno:MergeCells")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 899fcd8..a2eaff9 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -986,7 +986,24 @@ void 
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
 aBuffer.append(nColor);
 }
 else if (aEvent.FeatureURL.Path == "Undo" ||
- aEvent.FeatureURL.Path == "Redo")
+ aEvent.FeatureURL.Path == "Redo" ||
+ aEvent.FeatureURL.Path == "Cut" ||
+ aEvent.FeatureURL.Path == "Copy" ||
+ aEvent.FeatureURL.Path == "Paste" ||
+ aEvent.FeatureURL.Path == "SelectAll" ||
+ aEvent.FeatureURL.Path == "InsertAnnotation" ||
+ aEvent.FeatureURL.Path == "InsertRowsBefore" ||
+ aEvent.FeatureURL.Path == "InsertRowsAfter" ||
+ aEvent.FeatureURL.Path == "InsertColumnsBefore" ||
+ aEvent.FeatureURL.Path == "InsertColumnsAfter" ||
+ aEvent.FeatureURL.Path == "DeleteRows" ||
+ aEvent.FeatureURL.Path == "DeleteColumns" ||
+ aEvent.FeatureURL.Path == "DeleteTable" ||
+ aEvent.FeatureURL.Path == "SelectTable" ||
+ aEvent.FeatureURL.Path == "EntireRow" ||
+ aEvent.FeatureURL.Path == "EntireColumn" ||
+ aEvent.FeatureURL.Path == "EntireCell" ||
+ aEvent.FeatureURL.Path == "MergeCells")
 {
 aBuffer.append(aEvent.IsEnabled ? OUString("enabled") : 
OUString("disabled"));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2016-02-08 Thread Henry Castro

 desktop/source/lib/init.cxx  |7 ++-
 sfx2/source/control/unoctitm.cxx |   11 +++
 2 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 255ac8fc28ef9717be69363927bd071c9a90d75d
Author: Henry Castro 
Date:   Sun Feb 7 18:29:03 2016 -0400

lok: notify the states of undo and redo toolbar items

Also included .uno:InsertPage, .uno:DeletePage and
.uno:DuplicatePage

Change-Id: I91dd2609d6a48be75005a44490614bcf8bcf62e9
Reviewed-on: https://gerrit.libreoffice.org/22195
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 92caf5c..eaac992 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -704,7 +704,12 @@ static void doc_iniUnoCommands ()
 OUString(".uno:Strikeout"),
 OUString(".uno:StyleApply"),
 OUString(".uno:Underline"),
-OUString(".uno:ModifiedStatus")
+OUString(".uno:ModifiedStatus"),
+OUString(".uno:Undo"),
+OUString(".uno:Redo"),
+OUString(".uno:InsertPage"),
+OUString(".uno:DeletePage"),
+OUString(".uno:DuplicatePage")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index e1671b8..97ed49b 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1142,6 +1142,17 @@ void 
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
 aEvent.State >>= nColor;
 aBuffer.append(nColor);
 }
+else if (aEvent.FeatureURL.Path == "Undo" ||
+ aEvent.FeatureURL.Path == "Redo")
+{
+aBuffer.append(aEvent.IsEnabled ? OUString("enabled") : 
OUString("disabled"));
+}
+else if (aEvent.FeatureURL.Path == "InsertPage" ||
+ aEvent.FeatureURL.Path == "DeletePage" ||
+ aEvent.FeatureURL.Path == "DuplicatePage")
+{
+aBuffer.append(OUString::boolean(aEvent.IsEnabled));
+}
 else
 {
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2016-02-05 Thread Jan Holesovsky

 desktop/source/lib/init.cxx  |1 +
 sfx2/source/control/unoctitm.cxx |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0966c344b48991820dddce4e47f01752e82e195b
Author: Jan Holesovsky 
Date:   Fri Feb 5 12:20:11 2016 +0100

lok: Notify also about the states of .uno:CharBackgroundExt.

.uno:CharBackgroundExt is supplementary to .uno:BackColor.

When .uno:BackColor is set, Writer turns into a 'watercan' mode, where the
user directly marks parts of the text with the wanted background color.

.uno:CharBackgroundExt then controls this watercan mode - dispatching it
toggles the watercan mode on/off, and also the StateChanged events reflect 
the
on/off mode accordingly.

Change-Id: I6472eb39129d1b1517fba14bad584cbd125e826a

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 74df353..92caf5c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -684,6 +684,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:Bold"),
 OUString(".uno:CenterPara"),
 OUString(".uno:CharBackColor"),
+OUString(".uno:CharBackgroundExt"),
 OUString(".uno:CharFontName"),
 OUString(".uno:Color"),
 OUString(".uno:DecrementIndent"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 9fa0887..e1671b8 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1095,6 +1095,7 @@ void 
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
 
 if (aEvent.FeatureURL.Path == "Bold" ||
 aEvent.FeatureURL.Path == "CenterPara" ||
+aEvent.FeatureURL.Path == "CharBackgroundExt" ||
 aEvent.FeatureURL.Path == "DefaultBullet" ||
 aEvent.FeatureURL.Path == "DefaultNumbering" ||
 aEvent.FeatureURL.Path == "Italic" ||
@@ -1112,7 +1113,6 @@ void 
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
 bool bTemp = false;
 aEvent.State >>= bTemp;
 aBuffer.append(bTemp);
-
 }
 else if (aEvent.FeatureURL.Path == "CharFontName")
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2015-12-18 Thread Mihai Varga

 desktop/source/lib/init.cxx  |3 +++
 sfx2/source/control/unoctitm.cxx |7 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 8a7a20f67567ee94a5d3a77230c8e260f0142c1c
Author: Mihai Varga 
Date:   Fri Dec 18 16:55:25 2015 +0200

LOK: get feedback for all of the font/back color commands

Change-Id: Id4aac707666420752b985bcfd03b5b9bb99f79f1

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8fa8e0e..3b0c7d7 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -661,9 +661,12 @@ static void doc_iniUnoCommands ()
 OUString sUnoCommands[] =
 {
 OUString(".uno:BackColor"),
+OUString(".uno:BackgroundColor"),
 OUString(".uno:Bold"),
 OUString(".uno:CenterPara"),
+OUString(".uno:CharBackColor"),
 OUString(".uno:CharFontName"),
+OUString(".uno:Color"),
 OUString(".uno:DecrementIndent"),
 OUString(".uno:DefaultBullet"),
 OUString(".uno:DefaultNumbering"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 00c76e2..8645826 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1102,8 +1102,11 @@ void 
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
 aEvent.State >>= aTemplate;
 aBuffer.append(aTemplate.StyleName);
 }
-else if (aEvent.FeatureURL.Path == "FontColor" ||
- aEvent.FeatureURL.Path == "BackColor")
+else if (aEvent.FeatureURL.Path == "BackColor" ||
+ aEvent.FeatureURL.Path == "BackgroundColor" ||
+ aEvent.FeatureURL.Path == "CharBackColor" ||
+ aEvent.FeatureURL.Path == "Color" ||
+ aEvent.FeatureURL.Path == "FontColor")
 {
 sal_Int32 nColor = -1;
 aEvent.State >>= nColor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2015-11-30 Thread Mihai Varga

 desktop/source/lib/init.cxx  |   26 +++---
 sfx2/source/control/unoctitm.cxx |   14 +-
 2 files changed, 24 insertions(+), 16 deletions(-)

New commits:
commit b8627ad4db379bfa5b9411aaccb1663d7c66c933
Author: Mihai Varga 
Date:   Mon Nov 30 14:45:27 2015 +0200

LOK: get state change feedback for more uno commands

I've also ordered them alphabetically so we can read them easier.

Change-Id: Ia332f1662a91de4a4068f0056a3d969fe978a744

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d2f14de..49a1ef1 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -661,23 +661,27 @@ static void doc_iniUnoCommands ()
 {
 OUString sUnoCommands[] =
 {
+OUString(".uno:BackColor"),
 OUString(".uno:Bold"),
-OUString(".uno:Italic"),
-OUString(".uno:Underline"),
-OUString(".uno:Strikeout"),
+OUString(".uno:CenterPara"),
+OUString(".uno:CharFontName"),
+OUString(".uno:DecrementIndent"),
 OUString(".uno:DefaultBullet"),
 OUString(".uno:DefaultNumbering"),
+OUString(".uno:FontColor"),
+OUString(".uno:FontHeight"),
+OUString(".uno:IncrementIndent"),
+OUString(".uno:Italic"),
+OUString(".uno:JustifyPara"),
+OUString(".uno:OutlineFont"),
 OUString(".uno:LeftPara"),
-OUString(".uno:CenterPara"),
 OUString(".uno:RightPara"),
-OUString(".uno:JustifyPara"),
-OUString(".uno:IncrementIndent"),
-OUString(".uno:DecrementIndent"),
-OUString(".uno:CharFontName"),
-OUString(".uno:FontHeight"),
+OUString(".uno:Shadowed"),
+OUString(".uno:SubScript"),
+OUString(".uno:SuperScript"),
+OUString(".uno:Strikeout"),
 OUString(".uno:StyleApply"),
-OUString(".uno:FontColor"),
-OUString(".uno:BackColor")
+OUString(".uno:Underline")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index cb3050a..efb7026 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1064,15 +1064,19 @@ void 
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
 aBuffer.append("=");
 
 if (aEvent.FeatureURL.Path == "Bold" ||
-aEvent.FeatureURL.Path == "Italic" ||
-aEvent.FeatureURL.Path == "Underline" ||
-aEvent.FeatureURL.Path == "Strikeout" ||
+aEvent.FeatureURL.Path == "CenterPara" ||
 aEvent.FeatureURL.Path == "DefaultBullet" ||
 aEvent.FeatureURL.Path == "DefaultNumbering" ||
+aEvent.FeatureURL.Path == "Italic" ||
+aEvent.FeatureURL.Path == "JustifyPara" ||
 aEvent.FeatureURL.Path == "LeftPara" ||
-aEvent.FeatureURL.Path == "CenterPara" ||
+aEvent.FeatureURL.Path == "OutlineFont" ||
 aEvent.FeatureURL.Path == "RightPara" ||
-aEvent.FeatureURL.Path == "JustifyPara")
+aEvent.FeatureURL.Path == "Shadowed" ||
+aEvent.FeatureURL.Path == "SubScript" ||
+aEvent.FeatureURL.Path == "SuperScript" ||
+aEvent.FeatureURL.Path == "Strikeout" ||
+aEvent.FeatureURL.Path == "Underline")
 {
 bool bTemp = false;
 aEvent.State >>= bTemp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source

2015-10-29 Thread Mihai Varga

 desktop/source/lib/init.cxx  |4 +++-
 sfx2/source/control/unoctitm.cxx |7 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 8e3685228d833233fc9a912a5e97df0e14597928
Author: Mihai Varga 
Date:   Thu Oct 29 16:28:37 2015 +0200

LOK: font/back color feedback

This is used to know the current font/back color

Change-Id: Ic524fcb5c26e1c15ec9c50b2879465152ac8ee34

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8f12ee2..8e3b88e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -566,7 +566,9 @@ static void doc_iniUnoCommands ()
 OUString(".uno:DecrementIndent"),
 OUString(".uno:CharFontName"),
 OUString(".uno:FontHeight"),
-OUString(".uno:StyleApply")
+OUString(".uno:StyleApply"),
+OUString(".uno:FontColor"),
+OUString(".uno:BackColor")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index f6658be..bd9fd16 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1097,6 +1097,13 @@ void 
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
 aEvent.State >>= aTemplate;
 aBuffer.append(aTemplate.StyleName);
 }
+else if (aEvent.FeatureURL.Path == "FontColor" ||
+ aEvent.FeatureURL.Path == "BackColor")
+{
+long nColor;
+aEvent.State >>= nColor;
+aBuffer.append(nColor);
+}
 else
 {
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source sw/source vcl/source

2013-02-20 Thread Julien Nabet

 desktop/source/app/appinit.cxx  |5 +
 desktop/source/deployment/gui/dp_gui_updatedata.hxx |2 +-
 sfx2/source/doc/doctempl.cxx|3 +--
 sw/source/ui/misc/pgfnote.cxx   |3 +--
 vcl/source/glyphs/graphite_layout.cxx   |3 +--
 5 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit eda11cbfaf974905183ea10e4ffa89b90a401d98
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed Feb 20 22:38:38 2013 +0100

Some cppcheck cleaning

Change-Id: I0b9d3b5f8283e2fddc96b220a755ba6bcdd11606

diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index cbb7a32..d16cdcc 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -123,14 +123,11 @@ void Desktop::RegisterServices(Reference 
XComponentContext  const  context)
 {
 RTL_LOGFILE_CONTEXT( aLog, desktop (cd13) ::registerServices );
 
-// read command line parameters
-sal_BoolbHeadlessMode = sal_False;
-
 // interpret command line arguments
 CommandLineArgs rCmdLine = GetCommandLineArgs();
 
 // Headless mode for FAT Office
-bHeadlessMode   = rCmdLine.IsHeadless();
+sal_Bool bHeadlessMode = rCmdLine.IsHeadless();
 if ( bHeadlessMode )
 Application::EnableHeadlessMode(false);
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx 
b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index 870227e..d611947 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -40,7 +40,7 @@ namespace dp_gui {
 struct UpdateData
 {
 UpdateData( ::com::sun::star::uno::Reference 
::com::sun::star::deployment::XPackage  const  aExt):
-bIsShared(false), aInstalledPackage(aExt){};
+bIsShared(false), aInstalledPackage(aExt), aUpdateSource(NULL), 
m_nID(0), m_bIgnored(false){};
 
 //When entries added to the listbox then there can be one for the user 
update and one
 //for the shared update. However, both list entries will contain the same 
UpdateData.
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 9c171ee..4d8ea07 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -1048,7 +1048,6 @@ sal_Bool SfxDocumentTemplates::SetName( const OUString 
rName, sal_uInt16 nRegio
 return sal_False;
 
 RegionData_Impl *pRegion = pImp-GetRegion( nRegion );
-DocTempl_EntryData_Impl *pEntry = NULL;
 
 if ( !pRegion )
 return sal_False;
@@ -1072,7 +1071,7 @@ sal_Bool SfxDocumentTemplates::SetName( const OUString 
rName, sal_uInt16 nRegio
 }
 else
 {
-pEntry = pRegion-GetEntry( nIdx );
+DocTempl_EntryData_Impl *pEntry = pRegion-GetEntry( nIdx );
 
 if ( !pEntry )
 return sal_False;
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 7cb69a4..c369b2b 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -221,14 +221,13 @@ void SwFootNotePage::Reset(const SfxItemSet rSet)
 
 // Separator Color
 SfxObjectShell* pDocSh  = SfxObjectShell::Current();
-const SfxPoolItem*  pColorItem  = NULL;
 XColorListRef pColorList;
 
 OSL_ENSURE( pDocSh, DocShell not found! );
 
 if ( pDocSh )
 {
-pColorItem = pDocSh-GetItem( SID_COLOR_TABLE );
+const SfxPoolItem* pColorItem = pDocSh-GetItem( SID_COLOR_TABLE );
 if ( pColorItem != NULL )
 pColorList = ( (SvxColorListItem*)pColorItem )-GetColorList();
 }
diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 7b663bd..5183c71 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -526,11 +526,10 @@ void GraphiteLayout::clear()
 // This method shouldn't be called on windows, since it needs the dc reset
 bool GraphiteLayout::LayoutText(ImplLayoutArgs  rArgs)
 {
-gr_segment * pSegment = NULL;
 bool success = true;
 if (rArgs.mnMinCharPos  rArgs.mnEndCharPos)
 {
-pSegment = CreateSegment(rArgs);
+gr_segment * pSegment = CreateSegment(rArgs);
 if (!pSegment)
 return false;
 success = LayoutGlyphs(rArgs, pSegment);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

55 matches

Mail list logo