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

[Szymon Kłos (via logerrit)]

 desktop/source/lib/init.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5ce822d50a5ede02dc685b63c12080e84e6624ec
Author: Szymon Kłos 
AuthorDate: Tue Jan 26 11:48:16 2021 +0100
Commit: Tomaž Vajngerl 
CommitDate: Fri Feb 5 06:44:20 2021 +0100

lok: send paragraph spacing state

Change-Id: Ibb2fcbcb077ad364159ce77ad7d4c6a67443deef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109940
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tomaž Vajngerl 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2f730cd3b930..922e39697011 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2840,7 +2840,10 @@ static void doc_iniUnoCommands ()
 OUString(".uno:FreezePanesRow"),
 OUString(".uno:Sidebar"),
 OUString(".uno:SheetRightToLeft"),
-OUString(".uno:RunMacro")
+OUString(".uno:RunMacro"),
+OUString(".uno:SpacePara1"),
+OUString(".uno:SpacePara15"),
+OUString(".uno:SpacePara2")
 };
 
 util::URL aCommandURL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 0 files changed

New commits:
commit b7d2acfe34238e4aa9e71f2a843978576f608c12
Author: Andrea Gelmini 
AuthorDate: Thu Feb 4 22:51:18 2021 +0100
Commit: Andrea Gelmini 
CommitDate: Fri Feb 5 06:40:00 2021 +0100

Removed executable permission on files

Change-Id: I99a689398865cb424be1c363906b11c159d3debb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110430
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini 

diff --git a/sw/qa/extras/layout/data/tdf138951.odt 
b/sw/qa/extras/layout/data/tdf138951.odt
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/ooxmlexport/data/tdf136059.odt 
b/sw/qa/extras/ooxmlexport/data/tdf136059.odt
old mode 100755
new mode 100644
diff --git a/sw/qa/uitest/data/tdf138512.odt b/sw/qa/uitest/data/tdf138512.odt
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sw/qa/extras/layout/layout2.cxx|2 +-
 sw/source/filter/ww8/docxsdrexport.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ad3b581774c6c3006eca645b4aca7f375b2ec682
Author: Andrea Gelmini 
AuthorDate: Thu Feb 4 22:54:00 2021 +0100
Commit: Andrea Gelmini 
CommitDate: Fri Feb 5 06:39:30 2021 +0100

Fix typos

Change-Id: I51a158b2dafc7eb37f374f338968941e53b7c74d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110429
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini 

diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index b84a2c51d5e5..7ed0094924a0 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -312,7 +312,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testtdf138951)
 = *pShFrm->GetAnchor().GetContentAnchor() == 
*pShFrm->GetAnchor().GetContentAnchor();
 CPPUNIT_ASSERT_MESSAGE("The anchor is different for the textbox and 
shape!", bIsAnchTheSame);
 CPPUNIT_ASSERT_MESSAGE("The textbox has fallen apart!", 
aShpRect.IsInside(aTxtFrmRect));
-// Without the fix the anchor differs, and the frame ouside of the shape
+// Without the fix the anchor differs, and the frame outside of the shape
 }
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testRedlineNumberInNumbering)
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 297ecf30a2f6..27116bceb349 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -862,7 +862,7 @@ void DocxSdrExport::startDMLAnchorInline(const 
SwFrameFormat* pFrameFormat, cons
 catch (uno::Exception& e)
 {
 TOOLS_WARN_EXCEPTION(
-"sw.ww8", "DocxSdrExport::startDMLAnchorInline: 
exeption: " << e.Message);
+"sw.ww8", "DocxSdrExport::startDMLAnchorInline: 
exception: " << e.Message);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/inc vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/inc/jsdialog/jsdialogbuilder.hxx |   11 +++
 vcl/jsdialog/executor.cxx|   21 +++--
 vcl/jsdialog/jsdialogbuilder.cxx |   27 +++
 3 files changed, 57 insertions(+), 2 deletions(-)

New commits:
commit d25609cbd53404d3e53739a5fa3ccd9aeee10f21
Author: Szymon Kłos 
AuthorDate: Tue Jan 19 09:19:03 2021 +0100
Commit: Tomaž Vajngerl 
CommitDate: Fri Feb 5 05:27:51 2021 +0100

jsdialog: implemented RadioButton

Change-Id: Iad182d96cb4ff86b1a3fc8bfcca37ea62763fe67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109615
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109610
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 4693393bdabb..4e6ce0d2f909 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -206,6 +206,8 @@ public:
   bool bTakeOwnership 
= false) override;
 virtual std::unique_ptr weld_icon_view(const OString& id,
bool bTakeOwnership 
= false) override;
+virtual std::unique_ptr
+weld_radio_button(const OString& id, bool bTakeOwnership = false) override;
 
 static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent,
 VclMessageType 
eMessageType,
@@ -494,4 +496,13 @@ public:
 virtual void unselect(int pos) override;
 };
 
+class JSRadioButton : public JSWidget
+{
+public:
+JSRadioButton(JSDialogSender* pSender, ::RadioButton* pRadioButton,
+  SalInstanceBuilder* pBuilder, bool bTakeOwnership);
+
+virtual void set_active(bool active) override;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 834962561acb..75a474b08433 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -122,8 +122,10 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& 
rWidget, StringMap& rDat
 if (separatorPos > 0)
 {
 // x;y
-OString clickPosX = 
OUStringToOString(rData["data"].copy(0, separatorPos),  
RTL_TEXTENCODING_ASCII_US);
-OString  clickPosY = 
OUStringToOString(rData["data"].copy(separatorPos + 1),  
RTL_TEXTENCODING_ASCII_US);
+OString clickPosX = 
OUStringToOString(rData["data"].copy(0, separatorPos),
+  
RTL_TEXTENCODING_ASCII_US);
+OString clickPosY = 
OUStringToOString(rData["data"].copy(separatorPos + 1),
+  
RTL_TEXTENCODING_ASCII_US);
 if (!clickPosX.isEmpty() && !clickPosY.isEmpty())
 {
 double posX = std::atof(clickPosX.getStr());
@@ -332,6 +334,21 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& 
rWidget, StringMap& rDat
 }
 }
 }
+else if (sControlType == "radiobutton")
+{
+auto pRadioButton = dynamic_cast(pWidget);
+if (pRadioButton)
+{
+if (sAction == "change")
+{
+bool bChecked = rData["data"] == "true";
+pRadioButton->set_state(bChecked ? TRISTATE_TRUE : 
TRISTATE_FALSE);
+
LOKTrigger::trigger_clicked(*static_cast(pRadioButton));
+
LOKTrigger::trigger_toggled(*static_cast(pRadioButton));
+return true;
+}
+}
+}
 }
 
 return false;
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 765177ad8a9d..dca72aa5ebf1 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -688,6 +688,20 @@ std::unique_ptr 
JSInstanceBuilder::weld_icon_view(const OString&
 return pWeldWidget;
 }
 
+std::unique_ptr JSInstanceBuilder::weld_radio_button(const 
OString& id,
+bool 
bTakeOwnership)
+{
+::RadioButton* pRadioButton = m_xBuilder->get<::RadioButton>(id);
+auto pWeldWidget
+= pRadioButton ? std::make_unique(this, pRadioButton, 
this, bTakeOwnership)
+   : nullptr;
+
+if (pWeldWidget)
+RememberWidget(id, pWeldWidget.get());
+
+return pWeldWidget;
+}
+
 weld::MessageDialog* JSInstanceBuilder::CreateMessageDialog(weld::Widget* 
pParent,
 VclMessageType 
eMessageType,
 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 413c6ea09b1be588e64d8f10fa096f7375949467
Author: Szymon Kłos 
AuthorDate: Tue Jan 19 08:40:30 2021 +0100
Commit: Tomaž Vajngerl 
CommitDate: Fri Feb 5 05:26:54 2021 +0100

jsdialog: clear notifications when sent

Change-Id: I78b3904685b45d7c859bde07c78607671e215e98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109611
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109908
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index ea06e2518d0e..765177ad8a9d 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -142,6 +142,8 @@ void JSDialogNotifyIdle::Invoke()
 break;
 }
 }
+
+m_aMessageQueue.clear();
 }
 
 void JSDialogSender::notifyDialogState(bool bForce)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/inc vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/inc/jsdialog/jsdialogbuilder.hxx |   24 ++--
 vcl/jsdialog/jsdialogbuilder.cxx |  102 ---
 2 files changed, 66 insertions(+), 60 deletions(-)

New commits:
commit 0d8a5a686a2779e65c96d5e881717b22964a5493
Author: Szymon Kłos 
AuthorDate: Wed Jan 13 13:16:30 2021 +0100
Commit: Tomaž Vajngerl 
CommitDate: Fri Feb 5 05:26:15 2021 +0100

jsdialog: enqueue messages in order

Change-Id: Ib50cf6e2b57c591d1d3cffbe823162d7a17474cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109262
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109907
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 0119f6a5c8c0..4693393bdabb 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -27,6 +27,8 @@
 #include 
 #include 
 
+#include 
+
 class ToolBox;
 class SfxViewShell;
 class VclMultiLineEdit;
@@ -34,6 +36,16 @@ class IconView;
 
 typedef std::map WidgetMap;
 
+namespace jsdialog
+{
+enum MessageType
+{
+FullUpdate,
+WidgetUpdate,
+Close
+};
+}
+
 class JSDialogNotifyIdle : public Idle
 {
 // used to send message
@@ -44,19 +56,21 @@ class JSDialogNotifyIdle : public Idle
 std::string m_LastNotificationMessage;
 bool m_bForce;
 
+std::deque>> 
m_aMessageQueue;
+
 public:
 JSDialogNotifyIdle(VclPtr aNotifierWindow, 
VclPtr aContentWindow,
std::string sTypeOfJSON);
 
 void Invoke() override;
-void ForceUpdate();
-void sendClose();
-VclPtr getNotifierWindow() { return m_aNotifierWindow; }
-void updateStatus(VclPtr pWindow);
+
+void forceUpdate();
+void sendMessage(jsdialog::MessageType eType, VclPtr pWindow);
 
 private:
 void send(const boost::property_tree::ptree& rTree);
-boost::property_tree::ptree dumpStatus() const;
+boost::property_tree::ptree generateFullUpdate() const;
+boost::property_tree::ptree generateWidgetUpdate(VclPtr 
pWindow) const;
 boost::property_tree::ptree generateCloseMessage() const;
 };
 
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 576f2bba5b3b..ea06e2518d0e 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -17,6 +17,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace weld;
 
@@ -32,7 +33,7 @@ JSDialogNotifyIdle::JSDialogNotifyIdle(VclPtr 
aNotifierWindow,
 SetPriority(TaskPriority::POST_PAINT);
 }
 
-void JSDialogNotifyIdle::ForceUpdate() { m_bForce = true; }
+void JSDialogNotifyIdle::forceUpdate() { m_bForce = true; }
 
 void JSDialogNotifyIdle::send(const boost::property_tree::ptree& rTree)
 {
@@ -61,7 +62,12 @@ void JSDialogNotifyIdle::send(const 
boost::property_tree::ptree& rTree)
 }
 }
 
-boost::property_tree::ptree JSDialogNotifyIdle::dumpStatus() const
+void JSDialogNotifyIdle::sendMessage(jsdialog::MessageType eType, 
VclPtr pWindow)
+{
+m_aMessageQueue.push_back(std::make_pair(eType, pWindow));
+}
+
+boost::property_tree::ptree JSDialogNotifyIdle::generateFullUpdate() const
 {
 if (!m_aContentWindow || !m_aNotifierWindow)
 return boost::property_tree::ptree();
@@ -91,54 +97,17 @@ boost::property_tree::ptree 
JSDialogNotifyIdle::dumpStatus() const
 return aTree;
 }
 
-void JSDialogNotifyIdle::updateStatus(VclPtr pWindow)
+boost::property_tree::ptree
+JSDialogNotifyIdle::generateWidgetUpdate(VclPtr pWindow) const
 {
-if (!m_aNotifierWindow)
-return;
-
-// will be deprecated soon
-if (m_aNotifierWindow->IsReallyVisible())
-{
-if (const vcl::ILibreOfficeKitNotifier* pNotifier = 
m_aNotifierWindow->GetLOKNotifier())
-{
-boost::property_tree::ptree aTree;
-
-aTree.put("commandName", ".uno:jsdialog");
-aTree.put("success", "true");
-{
-boost::property_tree::ptree aResult;
-aResult.put("dialog_id", m_aNotifierWindow->GetLOKWindowId());
-aResult.put("control_id", pWindow->get_id());
-{
-boost::property_tree::ptree aControl;
-aControl = pWindow->DumpAsPropertyTree();
-aResult.add_child("control", aControl);
-}
-aTree.add_child("result", aResult);
-}
-
-std::stringstream aStream;
-boost::property_tree::write_json(aStream, aTree);
-const std::string message = aStream.str();
-
pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_UNO_COMMAND_RESULT, 
message.c_str());
-}
-}
-
-// new approach - update also if hidden
-if (const vcl::ILibreOfficeKitNotifier* pNotifier = 
m_aNotifierWindow->GetLOKNotifier())
-{
-boost::property_tree::ptree aTree;
+boost::property_tree::ptree 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/inc vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/inc/jsdialog/jsdialogbuilder.hxx |  140 +++--
 vcl/jsdialog/jsdialogbuilder.cxx |  230 +++
 2 files changed, 177 insertions(+), 193 deletions(-)

New commits:
commit 83d5bf410912f00dd6fb2ecca4fa18db88e772f9
Author: Szymon Kłos 
AuthorDate: Tue Jan 12 14:30:05 2021 +0100
Commit: Tomaž Vajngerl 
CommitDate: Fri Feb 5 05:24:50 2021 +0100

jsdialog: use shared sender

Change-Id: I6d1047715cf6c29e9281c66d266ed4b888ed784c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109171
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109906
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 08218512fa2b..0119f6a5c8c0 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -65,10 +65,11 @@ class VCL_DLLPUBLIC JSDialogSender
 std::unique_ptr mpIdleNotify;
 
 public:
+JSDialogSender() = default;
 JSDialogSender(VclPtr aNotifierWindow, VclPtr 
aContentWindow,
std::string sTypeOfJSON)
-: mpIdleNotify(new JSDialogNotifyIdle(aNotifierWindow, aContentWindow, 
sTypeOfJSON))
 {
+initializeSender(aNotifierWindow, aContentWindow, sTypeOfJSON);
 }
 
 virtual ~JSDialogSender() = default;
@@ -76,6 +77,13 @@ public:
 virtual void notifyDialogState(bool bForce = false);
 void sendClose();
 virtual void sendUpdate(VclPtr pWindow);
+
+protected:
+void initializeSender(VclPtr aNotifierWindow, 
VclPtr aContentWindow,
+  std::string sTypeOfJSON)
+{
+mpIdleNotify.reset(new JSDialogNotifyIdle(aNotifierWindow, 
aContentWindow, sTypeOfJSON));
+}
 };
 
 class JSDropTarget final
@@ -112,7 +120,7 @@ public:
 void fire_dragEnter(const 
css::datatransfer::dnd::DropTargetDragEnterEvent& dtde);
 };
 
-class JSInstanceBuilder : public SalInstanceBuilder
+class JSInstanceBuilder : public SalInstanceBuilder, public JSDialogSender
 {
 sal_uInt64 m_nWindowId;
 /// used in case of tab pages where dialog is not a direct top level
@@ -191,24 +199,36 @@ public:
 const OUString& 
rPrimaryMessage);
 
 private:
+const std::string& GetTypeOfJSON();
 VclPtr& GetContentWindow();
 VclPtr& GetNotifierWindow();
 };
 
-template 
-class JSWidget : public BaseInstanceClass, public JSDialogSender
+template  class JSWidget : public 
BaseInstanceClass
 {
 protected:
 rtl::Reference m_xDropTarget;
 bool m_bIsFreezed;
 
+JSDialogSender* m_pSender;
+
 public:
-JSWidget(VclPtr aNotifierWindow, VclPtr 
aContentWindow,
- VclClass* pObject, SalInstanceBuilder* pBuilder, bool 
bTakeOwnership,
- std::string sTypeOfJSON)
+JSWidget(JSDialogSender* pSender, VclClass* pObject, SalInstanceBuilder* 
pBuilder,
+ bool bTakeOwnership)
 : BaseInstanceClass(pObject, pBuilder, bTakeOwnership)
-, JSDialogSender(aNotifierWindow, aContentWindow, sTypeOfJSON)
 , m_bIsFreezed(false)
+, m_pSender(pSender)
+{
+}
+
+template 
+JSWidget(JSDialogSender* pSender, T* pObject, SalInstanceBuilder* pBuilder,
+ const a11yref& rAlly, FactoryFunction pUITestFactoryFunction, 
void* pUserData,
+ bool bTakeOwnership)
+: BaseInstanceClass(pObject, pBuilder, rAlly, pUITestFactoryFunction, 
pUserData,
+bTakeOwnership)
+, m_bIsFreezed(false)
+, m_pSender(pSender)
 {
 }
 
@@ -251,25 +271,30 @@ public:
 m_bIsFreezed = false;
 }
 
-virtual void sendUpdate(VclPtr pWindow) override
+void sendClose()
+{
+if (m_pSender)
+m_pSender->sendClose();
+}
+
+void sendUpdate(VclPtr pWindow)
 {
-if (!m_bIsFreezed)
-JSDialogSender::sendUpdate(pWindow);
+if (!m_bIsFreezed && m_pSender)
+m_pSender->sendUpdate(pWindow);
 }
 
-virtual void notifyDialogState(bool bForce = false) override
+void notifyDialogState(bool bForce = false)
 {
-if (!m_bIsFreezed || bForce)
-JSDialogSender::notifyDialogState(bForce);
+if ((!m_bIsFreezed || bForce) && m_pSender)
+m_pSender->notifyDialogState(bForce);
 }
 };
 
 class VCL_DLLPUBLIC JSDialog : public JSWidget
 {
 public:
-JSDialog(VclPtr aNotifierWindow, VclPtr 
aContentWindow,
- ::Dialog* pDialog, SalInstanceBuilder* pBuilder, bool 
bTakeOwnership,
- std::string sTypeOfJSON);
+JSDialog(JSDialogSender* pSender, ::Dialog* pDialog, SalInstanceBuilder* 
pBuilder,
+ bool bTakeOwnership);
 
 virtual void collapse(weld::Widget* pEdit, weld::Widget* pButton) override;
 virtual void undo_collapse() override;
@@ -279,34 +304,31 @@ public:
 c

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 47b70da552622d1aca02751df5788e18fd3b6179
Author: Seth Chaiklin 
AuthorDate: Fri Feb 5 03:33:09 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Feb 5 03:33:09 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5c476f480cddb8a6dd7b0020564953b22fe0660a
  - tdf#140096  add Ctrl+F6 and Ctrl+Shift+F10 to shortcut keys

also clarify meaning of "subwindow" for F6

Change-Id: I050fe63a4a927a95689188234d2174cae3e40a6d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110298
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index a23f1e3eb559..5c476f480cdd 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a23f1e3eb559a1561ac45f3cc31c919d2d52f323
+Subproject commit 5c476f480cddb8a6dd7b0020564953b22fe0660a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Seth Chaiklin (via logerrit)]

 source/text/shared/04/0101.xhp |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 5c476f480cddb8a6dd7b0020564953b22fe0660a
Author: Seth Chaiklin 
AuthorDate: Tue Feb 2 21:13:39 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Fri Feb 5 03:33:09 2021 +0100

tdf#140096  add Ctrl+F6 and Ctrl+Shift+F10 to shortcut keys

also clarify meaning of "subwindow" for F6

Change-Id: I050fe63a4a927a95689188234d2174cae3e40a6d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110298
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/source/text/shared/04/0101.xhp 
b/source/text/shared/04/0101.xhp
index 80bae7687..ac5984474 100644
--- a/source/text/shared/04/0101.xhp
+++ b/source/text/shared/04/0101.xhp
@@ -308,7 +308,7 @@
   F6
 
 
-  Sets 
focus in next subwindow, for example, document/data source view.
+  Sets 
focus in next visible subwindow, including menu bar, toolbars, windows such as 
Sidebar and Navigator, and document canvas/data source.
 
   
   
@@ -319,6 +319,14 @@
   Sets 
focus in previous subwindow.
 
   
+  
+
+  CommandCtrl+F6
+
+
+  Sets focus in 
the document canvas/data source.
+
+  
   
 
   F10
@@ -335,6 +343,14 @@
   Opens 
the context menu.
 
   
+  
+
+  CommandCtrl+Shift+F10
+
+
+  Docks and 
undocks floating subwindows such as unlocked toolbars, Sidebar and 
Navigator.
+
+  
   
 
   Ctrl+Alt+Shift+Home
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 86c1b7831ac797a67f72de5c5c8e49ce676956ad
Author: Seth Chaiklin 
AuthorDate: Fri Feb 5 03:22:20 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Feb 5 03:22:20 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to a23f1e3eb559a1561ac45f3cc31c919d2d52f323
  - remove duplicated paragraph

Change-Id: I596b1ec6b46cf32bdee6335e91917a7497ae4112
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110432
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index 57222f5d4710..a23f1e3eb559 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 57222f5d4710b0a2fc43e4273ccad8c952dc6510
+Subproject commit a23f1e3eb559a1561ac45f3cc31c919d2d52f323
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Seth Chaiklin (via logerrit)]

 source/text/shared/01/06040100.xhp |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a23f1e3eb559a1561ac45f3cc31c919d2d52f323
Author: Seth Chaiklin 
AuthorDate: Fri Feb 5 03:04:06 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Fri Feb 5 03:22:20 2021 +0100

remove duplicated paragraph

Change-Id: I596b1ec6b46cf32bdee6335e91917a7497ae4112
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110432
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/source/text/shared/01/06040100.xhp 
b/source/text/shared/01/06040100.xhp
index f0b81539b..77361a8dc 100644
--- a/source/text/shared/01/06040100.xhp
+++ b/source/text/shared/01/06040100.xhp
@@ -183,7 +183,6 @@
 To create a 
single line, type three or more hyphens (-), or underscores 
(_), and then press Enter. To create a 
double line, type three or more equal signs (=), asterisks 
(*), tildes (~), or hash marks 
(#), and then press Enter.
   
   
-  To delete 
the created line, click the paragraph above the line, choose Format - 
Paragraph - Borders, delete the bottom border.
   The 
following table summarizes the line thickness for the different characters: 

   
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source comphelper/source desktop/source include/osl sal/osl sal/qa sdext/source tools/source ucbhelper/source ucb/source unoidl/source vcl/source vcl/unx xmlhelp/

[Andrea Gelmini (via logerrit)]

 basic/source/runtime/iosys.cxx |2 +-
 comphelper/source/misc/backupfilehelper.cxx|   10 +-
 comphelper/source/streaming/oslfile2streamwrap.cxx |4 ++--
 desktop/source/deployment/dp_persmap.cxx   |4 ++--
 include/osl/file.h |4 ++--
 sal/osl/unx/file.cxx   |2 +-
 sal/osl/w32/file.cxx   |2 +-
 sal/qa/osl/file/osl_File.cxx   |   18 +-
 sdext/source/pdfimport/filterdet.cxx   |4 ++--
 sdext/source/pdfimport/test/pdfunzip.cxx   |4 ++--
 tools/source/stream/strmunx.cxx|2 +-
 ucb/source/ucp/file/filinpstr.cxx  |2 +-
 ucb/source/ucp/file/filrec.cxx |2 +-
 ucb/source/ucp/file/filstr.cxx |4 ++--
 ucb/source/ucp/ftp/ftpurl.cxx  |2 +-
 ucbhelper/source/provider/fd_inputstream.cxx   |4 ++--
 unoidl/source/unoidl-write.cxx |2 +-
 vcl/source/gdi/pdfwriter_impl.cxx  |   16 
 vcl/unx/generic/print/genprnpsp.cxx|2 +-
 vcl/unx/generic/print/printerjob.cxx   |2 +-
 xmlhelp/source/cxxhelp/provider/inputstream.cxx|4 ++--
 21 files changed, 48 insertions(+), 48 deletions(-)

New commits:
commit 3ed9bba283a6a67864c0928186e277240be0d9ba
Author: Andrea Gelmini 
AuthorDate: Thu Feb 4 10:18:28 2021 +0100
Commit: Andrea Gelmini 
CommitDate: Thu Feb 4 22:56:54 2021 +0100

Fix typo in code

Change-Id: Ib8b306a27d25a34e784aeeb72708b0d5d1511f3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110394
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini 

diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 4c991c6676c7..24407c670698 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -239,7 +239,7 @@ sal_uInt64 OslStream::SeekPos( sal_uInt64 nPos )
 }
 else
 {
-rc = maFile.setPos( osl_Pos_Absolut, nPos );
+rc = maFile.setPos( osl_Pos_Absolute, nPos );
 }
 OSL_VERIFY(rc == ::osl::FileBase::E_None);
 sal_uInt64 nRealPos(0);
diff --git a/comphelper/source/misc/backupfilehelper.cxx 
b/comphelper/source/misc/backupfilehelper.cxx
index c7bcd4253ed0..8db40af9f76f 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -70,7 +70,7 @@ namespace
 // set offset in source file - should be zero due to crc32 should
 // only be needed to be created for new entries, gets loaded with 
old
 // ones
-if (osl::File::E_None == rCandidate->setPos(osl_Pos_Absolut, 
sal_Int64(nOffset)))
+if (osl::File::E_None == rCandidate->setPos(osl_Pos_Absolute, 
sal_Int64(nOffset)))
 {
 while (nSize != 0)
 {
@@ -815,7 +815,7 @@ namespace
 sal_uInt64 nSize(getPackFileSize());
 
 // set offset in source file - when this is zero, a new file 
is to be added
-if (osl::File::E_None == maFile->setPos(osl_Pos_Absolut, 
sal_Int64(getOffset(
+if (osl::File::E_None == maFile->setPos(osl_Pos_Absolute, 
sal_Int64(getOffset(
 {
 while (nSize != 0)
 {
@@ -856,7 +856,7 @@ namespace
 if (Z_OK == deflateInit(zstream.get(), Z_BEST_COMPRESSION))
 {
 // set offset in source file - when this is zero, a new 
file is to be added
-if (osl::File::E_None == maFile->setPos(osl_Pos_Absolut, 
sal_Int64(getOffset(
+if (osl::File::E_None == maFile->setPos(osl_Pos_Absolute, 
sal_Int64(getOffset(
 {
 bool bOkay(true);
 
@@ -939,7 +939,7 @@ namespace
 if (Z_OK == inflateInit(zstream.get()))
 {
 // set offset in source file - when this is zero, a new 
file is to be added
-if (osl::File::E_None == maFile->setPos(osl_Pos_Absolut, 
sal_Int64(getOffset(
+if (osl::File::E_None == maFile->setPos(osl_Pos_Absolute, 
sal_Int64(getOffset(
 {
 bool bOkay(true);
 
@@ -1314,7 +1314,7 @@ namespace
 if (bRetval)
 {
 // seek back to header start (at position 8)
-if (osl_File_E_None != osl_setFilePos(aHandle, 
osl_Pos_Absolut, sal_Int64(8)))
+if (osl_File_E_None != osl_setFilePos(aHandle, 
osl_Pos_Absolute, sal_Int64(8)))
 {
 bRetval = false;
 }
diff --g

[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 include/vcl/weld.hxx |2 +-
 vcl/inc/salvtables.hxx   |2 +-
 vcl/source/app/salvtables.cxx|   15 +--
 vcl/source/control/InterimItemWindow.cxx |4 +---
 vcl/unx/gtk3/gtk3gtkinst.cxx |8 
 5 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 955fd7d8dc9da29717371c8fcb25d9954ff975bd
Author: Caolán McNamara 
AuthorDate: Wed Feb 3 17:27:02 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 4 21:49:22 2021 +0100

split rect arg into dest pos and source rect

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

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 70a340c85b30..18e0cd6abdbc 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -315,7 +315,7 @@ public:
 virtual void connect_get_property_tree(const Link& rLink) = 0;
 
 // render the widget to an output device
-virtual void draw(OutputDevice& rOutput, const tools::Rectangle& rRect) = 
0;
+virtual void draw(OutputDevice& rOutput, const Point& rPos, const Size& 
rSizePixel) = 0;
 
 virtual ~Widget() {}
 };
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 8d8138690bf1..6f3fccc87005 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -366,7 +366,7 @@ public:
 
 virtual void set_background(const Color& rColor) override;
 
-virtual void draw(OutputDevice& rOutput, const tools::Rectangle& rRect) 
override;
+virtual void draw(OutputDevice& rOutput, const Point& rPos, const Size& 
rSizePixel) override;
 
 SystemWindow* getSystemWindow();
 };
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index e9e675e1645b..c1ac2432ff7c 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1188,7 +1188,7 @@ void DoRecursivePaint(vcl::Window* pWindow, const Point& 
rPos, OutputDevice& rOu
 bool bRVisible = pImpl->mbReallyVisible;
 pImpl->mbReallyVisible = pWindow->IsVisible();
 
-pWindow->Paint(*xOutput, tools::Rectangle(Point(), aSize));
+pWindow->Paint(*xOutput, tools::Rectangle(Point(), 
pWindow->PixelToLogic(aSize)));
 
 pImpl->mbReallyVisible = bRVisible;
 
@@ -1201,19 +1201,22 @@ void DoRecursivePaint(vcl::Window* pWindow, const 
Point& rPos, OutputDevice& rOu
 {
 if (!pChild->IsVisible())
 continue;
-DoRecursivePaint(pChild, rPos + pChild->GetPosPixel(), rOutput);
+DoRecursivePaint(pChild, rPos + 
rOutput.PixelToLogic(pChild->GetPosPixel()), rOutput);
 }
 }
 }
 
-void SalInstanceWidget::draw(OutputDevice& rOutput, const tools::Rectangle& 
rRect)
+void SalInstanceWidget::draw(OutputDevice& rOutput, const Point& rPos, const 
Size& rSizePixel)
 {
 Size aOrigSize(m_xWidget->GetSizePixel());
+bool bChangeSize = aOrigSize != rSizePixel;
+if (bChangeSize)
+m_xWidget->SetSizePixel(rSizePixel);
 
-m_xWidget->SetSizePixel(rRect.GetSize());
-DoRecursivePaint(m_xWidget, rRect.TopLeft(), rOutput);
+DoRecursivePaint(m_xWidget, rPos, rOutput);
 
-m_xWidget->SetSizePixel(aOrigSize);
+if (bChangeSize)
+m_xWidget->SetSizePixel(aOrigSize);
 }
 
 namespace
diff --git a/vcl/source/control/InterimItemWindow.cxx 
b/vcl/source/control/InterimItemWindow.cxx
index 97d64b617648..3817e01893f1 100644
--- a/vcl/source/control/InterimItemWindow.cxx
+++ b/vcl/source/control/InterimItemWindow.cxx
@@ -163,9 +163,7 @@ bool InterimItemWindow::ChildKeyInput(const KeyEvent& rKEvt)
 
 void InterimItemWindow::Draw(OutputDevice* pDevice, const Point& rPos, 
DrawFlags /*nFlags*/)
 {
-if (!m_pWidget)
-return;
-m_pWidget->draw(*pDevice, tools::Rectangle(rPos, GetSizePixel()));
+m_xContainer->draw(*pDevice, rPos, GetSizePixel());
 }
 
 void InterimItemWindow::ImplPaintToDevice(::OutputDevice* pTargetOutDev, const 
Point& rPos)
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index cfd8eacabff4..967531bfc4d4 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3152,7 +3152,7 @@ public:
 return xRet;
 }
 
-virtual void draw(OutputDevice& rOutput, const tools::Rectangle& rRect) 
override
+virtual void draw(OutputDevice& rOutput, const Point& rPos, const Size& 
rPixelSize) override
 {
 // detect if we have to manually setup its size
 bool bAlreadyRealized = gtk_widget_get_realized(m_pWidget);
@@ -3177,7 +3177,7 @@ public:
 if (bAnimations)
 g_object_set(pSettings, "gtk-enable-animations", false, nullptr);
 
-Size aSize(rRect.GetSize());
+Size aSize(rPixelSize);
 
 GtkAllocation aOrigAllocation;
 gtk_widget_get_allocation(m_pWidget, &aOrigAllocation);
@@ -3193,7 +3193,7 @@ public:
 
 VclPtr 
xOutput(VclPtr::Create(DeviceFormat::DEFAULT));
 

[Libreoffice-commits] core.git: bin/check-missing-unittests.py

[Xisco Fauli (via logerrit)]

 bin/check-missing-unittests.py |   43 -
 1 file changed, 42 insertions(+), 1 deletion(-)

New commits:
commit 948207edfbb6a8bcce2573ec758bacf818bbd2c7
Author: Xisco Fauli 
AuthorDate: Thu Feb 4 15:40:01 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 4 21:30:32 2021 +0100

check-missing-unittests: use bugzilla rest api

to ignore open bugs or performance issues

Change-Id: Id43ef8bae4936213a65fded3ce138bbf43de397e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110420
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/bin/check-missing-unittests.py b/bin/check-missing-unittests.py
index 3ce385f82f0d..847aa524f1ad 100755
--- a/bin/check-missing-unittests.py
+++ b/bin/check-missing-unittests.py
@@ -11,6 +11,15 @@ import datetime
 import subprocess
 import sys
 import re
+import json
+import requests
+
+def isOpen(status):
+return status == 'NEW' or status == 'ASSIGNED' or status == 'REOPENED'
+
+def splitList(lst, n):
+for i in range(0, len(lst), n):
+yield lst[i:i + n]
 
 def main(ignoredBugs):
 results = {
@@ -34,6 +43,7 @@ def main(ignoredBugs):
 },
 'impress': {
 'drawingml': {},
+'slidesorter': {},
 'others': {},
 },
 
@@ -116,6 +126,9 @@ def main(ignoredBugs):
 elif 'drawingml' in changedFiles:
 results['impress']['drawingml'][bugId] = infoList
 
+elif 'sd/source/ui/slidesorter/' in changedFiles:
+results['impress']['slidesorter'][bugId] = infoList
+
 elif 'sc/source/core/tool/interpr' in changedFiles:
 results['calc']['import'][bugId] = infoList
 
@@ -130,6 +143,22 @@ def main(ignoredBugs):
 elif 'sd/source/core/' in changedFiles:
 results['impress']['others'][bugId] = infoList
 
+listOfBugIdsWithoutTest = []
+for k,v in results.items():
+for k1, v1 in v.items():
+for bugId, info in v1.items():
+if bugId not in hasTestSet:
+listOfBugIdsWithoutTest.append(bugId)
+
+bugzillaJson = []
+#Split the list into different chunks for the requests, otherwise it fails
+for chunk in splitList(listOfBugIdsWithoutTest, 50):
+urlGet = 'https://bugs.documentfoundation.org/rest/bug?id=' + 
','.join(chunk)
+rGet = requests.get(urlGet)
+rawData = json.loads(rGet.text)
+rGet.close()
+bugzillaJson.extend(rawData['bugs'])
+
 print()
 print('{{TopMenu}}')
 print('{{Menu}}')
@@ -142,15 +171,27 @@ def main(ignoredBugs):
 print('Branch: ' + branch.decode().strip())
 print()
 print('Hash: ' + str(last_hash.decode().strip()))
+
 for k,v in results.items():
 print('\n== ' + k + ' ==')
 for k1, v1 in v.items():
 print('\n=== ' + k1 + ' ===')
 for bugId, info in v1.items():
-if bugId not in hasTestSet:
+
+status = ''
+keywords = []
+for bug in bugzillaJson:
+if str(bug['id']) == str(bugId):
+status = bug['status']
+keywords = bug['keywords']
+break
+
+#Ignore open bugs and performance bugs
+if status and not isOpen(status) and 'perf' not in keywords:
 print(
 "# {} - {} - 
[https://bugs.documentfoundation.org/show_bug.cgi?id={} tdf#{}]".format(
 info[0], info[1], bugId, bugId))
+
 print('\n== ignored bugs ==')
 print(' '.join(ignoredBugs))
 print()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: forms/source

[Julien Nabet (via logerrit)]

 forms/source/component/clickableimage.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a444a8dd40cf7035c44ee8ef168be2b3e3144c86
Author: Julien Nabet 
AuthorDate: Thu Feb 4 19:55:55 2021 +0100
Commit: Julien Nabet 
CommitDate: Thu Feb 4 21:20:08 2021 +0100

tdf#140151: revert fix for tdf#46579 which caused regression

Change-Id: I48468d4cef1f4d68dab4759c8da30aead6b99e5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110425
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/forms/source/component/clickableimage.cxx 
b/forms/source/component/clickableimage.cxx
index 6c5c80313251..f46bbb562545 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -311,9 +311,9 @@ namespace frm
 }
 else
 {
-URL aHyperLink = 
m_pFeatureInterception->getTransformer().getStrictURL(aURL.Complete);
+URL aHyperLink = 
m_pFeatureInterception->getTransformer().getStrictURL( ".uno:OpenHyperlink" );
 
-Reference< XDispatch > xDisp =  
m_pFeatureInterception->queryDispatch(aHyperLink);
+Reference< XDispatch >  xDisp = Reference< 
XDispatchProvider > (xFrame,UNO_QUERY_THROW)->queryDispatch(aHyperLink, 
OUString() , 0);
 
 if ( xDisp.is() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sw/source/uibase/utlui/content.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit adff0a290109954fbea63adaca8345a31d669ad5
Author: Andrea Gelmini 
AuthorDate: Mon Feb 1 18:36:47 2021 +0100
Commit: Julien Nabet 
CommitDate: Thu Feb 4 21:06:03 2021 +0100

Fix typo in code

Change-Id: I50bc2e4909bc34b431fcff8047b9184fa5cd7d9c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110267
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 0de0d6a3c03f..aa639d399055 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -109,7 +109,7 @@ namespace {
 1513 make the outline content of the selected outline entry and children 
not visible
 1514 make the outline content of the selected entry and children visible
 */
-const sal_uInt32 TOGGLE_OUTLINE_CONTENT_VISIBLITY = 1512;
+const sal_uInt32 TOGGLE_OUTLINE_CONTENT_VISIBILITY = 1512;
 const sal_uInt32 HIDE_OUTLINE_CONTENT_VISIBILITY = 1513;
 const sal_uInt32 SHOW_OUTLINE_CONTENT_VISIBILITY = 1514;
 
@@ -1190,7 +1190,7 @@ static bool lcl_InsertExpandCollapseAllItem(const 
weld::TreeView& rContentTree,
 
 static void lcl_SetOutlineContentEntriesSensitivities(SwContentTree* pThis, 
const weld::TreeView& rContentTree, const weld::TreeIter& rEntry, weld::Menu& 
rPop)
 {
-rPop.set_sensitive(OString::number(TOGGLE_OUTLINE_CONTENT_VISIBLITY), 
false);
+rPop.set_sensitive(OString::number(TOGGLE_OUTLINE_CONTENT_VISIBILITY), 
false);
 rPop.set_sensitive(OString::number(HIDE_OUTLINE_CONTENT_VISIBILITY), 
false);
 rPop.set_sensitive(OString::number(SHOW_OUTLINE_CONTENT_VISIBILITY), 
false);
 
@@ -1301,8 +1301,8 @@ static void 
lcl_SetOutlineContentEntriesSensitivities(SwContentTree* pThis, cons
 rPop.set_sensitive(OString::number(SHOW_OUTLINE_CONTENT_VISIBILITY), 
bHasFolded);
 }
 
-bIsRoot ? rPop.remove(OString::number(TOGGLE_OUTLINE_CONTENT_VISIBLITY))
-: 
rPop.set_sensitive(OString::number(TOGGLE_OUTLINE_CONTENT_VISIBLITY), true);
+bIsRoot ? rPop.remove(OString::number(TOGGLE_OUTLINE_CONTENT_VISIBILITY))
+: 
rPop.set_sensitive(OString::number(TOGGLE_OUTLINE_CONTENT_VISIBILITY), true);
 }
 
 IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, rCEvt, bool)
@@ -1321,7 +1321,7 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, 
rCEvt, bool)
 
 std::unique_ptr xSubPopOutlineContent = 
xBuilder->weld_menu("outlinecontent");
 
-
xSubPopOutlineContent->append(OUString::number(TOGGLE_OUTLINE_CONTENT_VISIBLITY),
+
xSubPopOutlineContent->append(OUString::number(TOGGLE_OUTLINE_CONTENT_VISIBILITY),
   
SwResId(STR_OUTLINE_CONTENT_VISIBILITY_TOGGLE));
 
xSubPopOutlineContent->append(OUString::number(HIDE_OUTLINE_CONTENT_VISIBILITY),
   
SwResId(STR_OUTLINE_CONTENT_VISIBILITY_HIDE_ALL));
@@ -3793,14 +3793,14 @@ void SwContentTree::ExecuteContextMenuAction(const 
OString& rSelectedPopupEntry)
 auto nSelectedPopupEntry = rSelectedPopupEntry.toUInt32();
 switch (nSelectedPopupEntry)
 {
-case TOGGLE_OUTLINE_CONTENT_VISIBLITY:
+case TOGGLE_OUTLINE_CONTENT_VISIBILITY:
 case HIDE_OUTLINE_CONTENT_VISIBILITY:
 case SHOW_OUTLINE_CONTENT_VISIBILITY:
 {
 m_pActiveShell->EnterStdMode();
 m_bIgnoreViewChange = true;
 SwOutlineContent* pCntFirst = 
reinterpret_cast(m_xTreeView->get_id(*xFirst).toInt64());
-if (nSelectedPopupEntry == TOGGLE_OUTLINE_CONTENT_VISIBLITY)
+if (nSelectedPopupEntry == TOGGLE_OUTLINE_CONTENT_VISIBILITY)
 {
 
m_pActiveShell->ToggleOutlineContentVisibility(pCntFirst->GetOutlinePos());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.4-22'

[Andras Timar (via logerrit)]

Tag 'cp-6.4-22' created by Andras Timar  at 
2021-02-04 19:46 +

cp-6.4-22

Changes since cp-6.4-21-5:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-22'

[Andras Timar (via logerrit)]

Tag 'cp-6.4-22' created by Andras Timar  at 
2021-02-04 19:46 +

cp-6.4-22

Changes since cp-6.4-15-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-22'

[Andras Timar (via logerrit)]

Tag 'cp-6.4-22' created by Andras Timar  at 
2021-02-04 19:46 +

cp-6.4-22

Changes since cp-6.4-branch-point-11:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.4-22'

[Andras Timar (via logerrit)]

Tag 'cp-6.4-22' created by Andras Timar  at 
2021-02-04 19:46 +

cp-6.4-22

Changes since co-6.4-20:
Andras Timar (1):
  update Danish dictionary

---
 da_DK/README_da_DK.txt |4 
 da_DK/da_DK.aff| 3401 
 da_DK/da_DK.dic|288016 
+++--
 da_DK/description.xml  |9 
 4 files changed, 139245 insertions(+), 152185 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - configure.ac

[Andras Timar (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 893f7920d104cc5335725342bb3aba9a29a83997
Author: Andras Timar 
AuthorDate: Thu Feb 4 20:42:53 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Feb 4 20:42:53 2021 +0100

Bump version to 6.4-22

Change-Id: I59d30de34d57675277d1e7e8502874e850c8dfe0

diff --git a/configure.ac b/configure.ac
index eac77e24d3f5..0c0948ced907 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.4.10.21],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.4.10.22],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/source

[dante (via logerrit)]

 oox/source/export/drawingml.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 99ffc6fbb3f1d33697a47d08277d99ddff81678f
Author: dante 
AuthorDate: Wed Feb 3 10:58:16 2021 +0100
Commit: Noel Grandin 
CommitDate: Thu Feb 4 19:50:40 2021 +0100

Fix -Wmaybe-uninitialized

Any operator >>= does not guarantee initialization.

(code was introduced with 

 "introduce Degree100 strong_int type")

.../libreoffice/oox/source/export/drawingml.cxx: In member function ‘void 
oox::drawingml::DrawingML::WriteShapeTransformation(const 
com::sun::star::uno::Reference&, sal_Int32, 
bool, bool, bool, bool, bool)’:
...s/libreoffice/oox/source/export/drawingml.cxx:1790:79: warning: ‘nTmp’ 
may be used uninitialized in this function [-Wmaybe-uninitialized]
 1790 | nCameraRotation = 
NormAngle36000(Degree100(nTmp / -600));

Change-Id: I93bee48bc050c29d831e78afcf62aef154c72fc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110341
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 54003cd32fc7..486fb90bd3ec 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1785,7 +1785,7 @@ void DrawingML::WriteShapeTransformation( const 
Reference< XShape >& rXShape, sa
 [](const PropertyValue& rProp) { return rProp.Name == 
"rotRev"; });
 if (pZRotationProp != std::cend(aCameraProps))
 {
-sal_Int32 nTmp;
+sal_Int32 nTmp = 0;
 pZRotationProp->Value >>= nTmp;
 nCameraRotation = NormAngle36000(Degree100(nTmp / 
-600));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 2 commits - configure.ac include/sfx2 sfx2/source

[Thorsten Behrens (via logerrit)]

 configure.ac |2 +-
 include/sfx2/docmacromode.hxx|7 ++-
 sfx2/source/doc/docmacromode.cxx |   23 ---
 sfx2/source/doc/objmisc.cxx  |3 +--
 4 files changed, 8 insertions(+), 27 deletions(-)

New commits:
commit 40b1ed9c0fe8ddf97a8bd42e1278860060ea0740
Author: Thorsten Behrens 
AuthorDate: Thu Feb 4 19:42:41 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Feb 4 19:42:41 2021 +0100

Bump version to 6.1.7.24

Change-Id: I8eb044d0bb91d19ccf5b3d3c2e79da8d0fa4829d

diff --git a/configure.ac b/configure.ac
index 236c50527d40..e72c658aad46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice powered by 
CIB],[6.1.7.23],[],[],[https://libreoffice.cib.eu/])
+AC_INIT([LibreOffice powered by 
CIB],[6.1.7.24],[],[],[https://libreoffice.cib.eu/])
 
 AC_PREREQ([2.59])
 
commit ab495359f6e4eadbf6a14dd44eb05b775fb5f989
Author: Thorsten Behrens 
AuthorDate: Thu Feb 4 19:41:47 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Feb 4 19:41:47 2021 +0100

Revert "Improve macro checks"

This reverts commit 7df8b437b721b25561995346abfb55dca0d500b5.

diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx
index 19199f7a410e..7e1511625086 100644
--- a/include/sfx2/docmacromode.hxx
+++ b/include/sfx2/docmacromode.hxx
@@ -218,8 +218,7 @@ namespace sfx2
  if and only if macro execution in this document is 
allowed.
 */
 booladjustMacroMode(
-const css::uno::Reference< css::task::XInteractionHandler 
>& _rxInteraction,
-bool bHasValidContentSignature = false
+const css::uno::Reference< css::task::XInteractionHandler 
>& _rxInteraction
 );
 
 /** determines whether macro execution is disallowed
@@ -285,13 +284,11 @@ namespace sfx2
 */
 bool
 checkMacrosOnLoading(
-const css::uno::Reference< css::task::XInteractionHandler 
>& _rxInteraction,
-bool bHasValidContentSignature = false
+const css::uno::Reference< css::task::XInteractionHandler 
>& _rxInteraction
 );
 
 private:
 std::shared_ptr< DocumentMacroMode_Data >   m_xData;
-bool m_bNeedsContentSigned;
 };
 
 
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 4c27b767c80d..dc84f4e58598 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -111,10 +111,6 @@ namespace sfx2
 #endif
 }
 
-void lcl_showMacrosDisabledUnsignedContentError( const Reference< 
XInteractionHandler >& rxHandler, bool& rbAlreadyShown )
-{
-lcl_showGeneralSfxErrorOnce( rxHandler, 
ERRCODE_SFX_DOCUMENT_MACRO_DISABLED, rbAlreadyShown );
-}
 
 bool lcl_showMacroWarning( const Reference< XInteractionHandler >& 
rxHandler,
 const OUString& rDocumentLocation )
@@ -127,8 +123,7 @@ namespace sfx2
 
 //= DocumentMacroMode
 DocumentMacroMode::DocumentMacroMode( IMacroDocumentAccess& 
rDocumentAccess )
-:m_xData( new DocumentMacroMode_Data( rDocumentAccess ) ),
-m_bNeedsContentSigned(false)
+:m_xData( new DocumentMacroMode_Data( rDocumentAccess ) )
 {
 }
 
@@ -144,7 +139,7 @@ namespace sfx2
 return false;
 }
 
-bool DocumentMacroMode::adjustMacroMode( const Reference< 
XInteractionHandler >& rxInteraction, bool bHasValidContentSignature )
+bool DocumentMacroMode::adjustMacroMode( const Reference< 
XInteractionHandler >& rxInteraction )
 {
 sal_uInt16 nMacroExecutionMode = 
m_xData->m_rDocumentAccess.getCurrentMacroExecMode();
 
@@ -241,14 +236,6 @@ namespace sfx2
 lcl_showDocumentMacrosDisabledError(rxInteraction, 
m_xData->m_bDocMacroDisabledMessageShown);
 return disallowMacroExecution();
 }
-else if ( 
m_xData->m_rDocumentAccess.macroCallsSeenWhileLoading() &&
-  bHasTrustedMacroSignature &&
-  !bHasValidContentSignature)
-{
-// When macros are signed, and the document has events 
which call macros, the document content needs to be signed too.
-lcl_showMacrosDisabledUnsignedContentError(rxInteraction, 
m_xData->m_bDocMacroDisabledMessageShown);
-return disallowMacroExecution();
-}
 else if ( bHasTrustedMacroSignature )
 {
 // there is trusted macro signature, allow macro execution
@@ -408,7 +395,7 @@ namespace sfx2
 }
 
 
-bool DocumentM

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

[Michael Meeks (via logerrit)]

 sc/source/ui/app/inputwin.cxx  |4 
 sc/source/ui/unoobj/docuno.cxx |5 -
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 91319ad56887f932b2da334db560d5d0a79a0280
Author: Michael Meeks 
AuthorDate: Thu Feb 4 14:35:04 2021 +
Commit: Henry Castro 
CommitDate: Thu Feb 4 19:35:01 2021 +0100

lok: sc - suppress LOK editengine events for the calc input bar.

The calc input uses an EditEngine - but it emits events as if it is
part of the document - as well as emitting events as if it is a dialog
window. This causes horrible jumping artifacts to the top of the
document with word auto-completion and typing in cells a few page down.

Also remove obsolete tweak to turn off autocorrect for LOK, since
it was contradicted by: 1f0943e5e9432f96daff9f3b006388d5bc7415b2

Change-Id: I7352cd3b5ca6d18645cfd9e18959b0e44ec969d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110419
Tested-by: Jenkins CollaboraOffice 
Tested-by: Henry Castro 
Reviewed-by: Henry Castro 

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 20ef9abf3742..b106a188dbd3 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1518,6 +1518,10 @@ void ScTextWnd::InitEditEngine()
 mpEditEngine->SetText(aString); // At least the right text then
 
 mpEditView = std::make_unique(mpEditEngine.get(), this);
+
+// we get cursor, selection etc. messages from the VCL/window layer
+// otherwise these are injected into the document causing confusion.
+mpEditView->SupressLOKMessages(true);
 mpEditView->SetInsertMode(bIsInsertMode);
 
 if (comphelper::LibreOfficeKit::isActive())
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 9d2539a25bcd..0e74d7dd5cda 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1177,11 +1177,6 @@ void ScModelObj::initializeForTiledRendering(const 
css::uno::SequenceGetAppOptions() );
-aAppOptions.SetAutoComplete(false);
-SC_MOD()->SetAppOptions(aAppOptions);
-
 for (const beans::PropertyValue& rValue : rArguments)
 {
 if (rValue.Name == ".uno:SpellOnline" && rValue.Value.has())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract3753' - 3 commits - sw/inc sw/qa sw/source vcl/unx

[Michael Stahl (via logerrit)]

 sw/inc/doc.hxx |8 
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |4 
 sw/qa/extras/unowriter/data/tdf134252_onlytable_protected.fodt |   87 
++
 sw/qa/extras/unowriter/unowriter.cxx   |   59 ++
 sw/source/core/docnode/ndtbl.cxx   |   18 +-
 sw/source/core/frmedt/fecopy.cxx   |   20 --
 sw/source/core/frmedt/fetab.cxx|3 
 sw/source/core/unocore/unoobj2.cxx |2 
 sw/source/core/unocore/unotbl.cxx  |2 
 vcl/unx/generic/app/i18n_cb.cxx|4 
 10 files changed, 179 insertions(+), 28 deletions(-)

New commits:
commit c13103179b9c1a8472d5d7b215075f25afaec252
Author: Michael Stahl 
AuthorDate: Thu Feb 4 12:36:41 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 4 19:20:05 2021 +0100

sw: fix copying and deleting of table in section via API

This is a follow-up to 7ab349296dac79dad3fec09f60348efcbb9ea17e.

The first problem was that tables that contain protected cells refused
to be deleted, which caused an infinite loop in
SwXTextRange::DeleteAndInsert().

This also affected SwXTextTable::dispose(), and DDE tables.

Fix this by forcibly deleting even protected cells from UNO APIs;
protection is an UI feature.

The second problem was that pasting the table SwFEShell::Paste() would
set up aCpyPam so that it selects from the start node of the table to
the last text node in the table, excluding the table cell and table end
nodes, which caused:

DocumentContentOperationsManager.cxx:3548: An insufficient number of nodes 
were copied!

Fix this by setting up aCpyPam over the entire body section of the
clipboard document.

Change-Id: I8c6caee5e75260dff79f106efc11f9669feddc0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110411
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit c598e0accf24e149520a22a8c062249f147844c7)

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index b80e1157a7c9..7a2096f303ad 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -21,6 +21,7 @@
 
 // SwDoc interfaces
 #include 
+#include 
 #include 
 #include "swdllapi.h"
 #include "swtypes.hxx"
@@ -1189,7 +1190,8 @@ public:
 sal_uInt16 nCnt = 1, bool bBehind = true );
 
 // Delete Columns/Rows in table.
-bool DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn = false );
+enum class RowColMode { DeleteRow = 0, DeleteColumn = 1, DeleteProtected = 
2 };
+bool DeleteRowCol(const SwSelBoxes& rBoxes, RowColMode eMode = 
RowColMode::DeleteRow);
 void DeleteRow( const SwCursor& rCursor );
 void DeleteCol( const SwCursor& rCursor );
 
@@ -1658,6 +1660,10 @@ private:
 
 };
 
+namespace o3tl {
+template<> struct typed_flags : 
is_typed_flags {};
+}
+
 // This method is called in Dtor of SwDoc and deletes cache of ContourObjects.
 void ClrContourCache();
 
diff --git a/sw/qa/extras/unowriter/data/tdf134252_onlytable_protected.fodt 
b/sw/qa/extras/unowriter/data/tdf134252_onlytable_protected.fodt
new file mode 100644
index ..f588fdba0515
--- /dev/null
+++ b/sw/qa/extras/unowriter/data/tdf134252_onlytable_protected.fodt
@@ -0,0 +1,87 @@
+
+
+http://openoffice.org/2009/office"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns
 :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xm

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

[Miklos Vajna (via logerrit)]

 vcl/source/window/event.cxx   |   10 ++
 vcl/source/window/window2.cxx |5 +
 2 files changed, 15 insertions(+)

New commits:
commit f4c06cd4669e286d62c3067ba9e905c03f402630
Author: Miklos Vajna 
AuthorDate: Tue Feb 11 21:06:06 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Thu Feb 4 19:19:25 2021 +0100

vcl: fix UB in Window::ImplGetFirstOverlapWindow()

mpWindowImpl can be nullptr here, see online.git's
unit-load-torture test:

vcl/source/window/window2.cxx:882:24: runtime error: member access within 
null pointer of type 'WindowImpl'
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior 
vcl/source/window/window2.cxx:882:24 in

Surrouding code already checks for nullptr mpWindowImpl, so fix it directly
where the problem is reported, not a caller.

(Also fix a similar case in Window::ImplCallFocusChangeActivate().)

Change-Id: I34dee0fd49483c428a78fd48b54c00b2f0a26417
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88474
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit d1378b92c6697c09def7b3db8b36c3cf883b55c4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110417
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 82e248bf3710..23bb7b00a43c 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -592,7 +592,17 @@ void Window::ImplCallFocusChangeActivate( vcl::Window* 
pNewOverlapWindow,
 bool bCallActivate = true;
 bool bCallDeactivate = true;
 
+if (!pOldOverlapWindow)
+{
+return;
+}
+
 pOldRealWindow = pOldOverlapWindow->ImplGetWindow();
+if (!pNewOverlapWindow)
+{
+return;
+}
+
 pNewRealWindow = pNewOverlapWindow->ImplGetWindow();
 if ( (pOldRealWindow->GetType() != WindowType::FLOATINGWINDOW) ||
  pOldRealWindow->GetActivateMode() != ActivateModeFlags::NONE )
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 7a5437dee1d8..b4c69e49d0ff 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -879,6 +879,11 @@ vcl::Window* Window::ImplGetBorderWindow() const
 
 vcl::Window* Window::ImplGetFirstOverlapWindow()
 {
+if (!mpWindowImpl)
+{
+return nullptr;
+}
+
 if ( mpWindowImpl->mbOverlapWin )
 return this;
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/qa

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests8/tdf126248.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 618f5623464cfd4be10b4d445910e7cf41b10e19
Author: Xisco Fauli 
AuthorDate: Thu Feb 4 16:50:08 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 4 18:48:02 2021 +0100

sc: uitest: blind fix for test failing sporadically in jenkins

Change-Id: I085e23fa94cbd303263c35a8234da9f0eea2ad5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110421
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests8/tdf126248.py 
b/sc/qa/uitest/calc_tests8/tdf126248.py
index 0731c839a5d9..fad0e3081c43 100644
--- a/sc/qa/uitest/calc_tests8/tdf126248.py
+++ b/sc/qa/uitest/calc_tests8/tdf126248.py
@@ -40,6 +40,8 @@ class tdf126248(UITestCase):
 
 self.ui_test.create_doc_in_start_center("calc")
 
+self.changeLocalSetting("Chinese (traditional)")
+
 self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog")
 xCellsDlg = self.xUITest.getTopFocusWindow()
 select_pos(xCellsDlg, "2")
@@ -51,8 +53,6 @@ class tdf126248(UITestCase):
 okBtn = xCellsDlg.getChild("ok")
 self.ui_test.close_dialog_through_button(okBtn)
 
-self.changeLocalSetting("Chinese (traditional)")
-
 xCalcDoc = self.xUITest.getTopFocusWindow()
 gridwin = xCalcDoc.getChild("grid_window")
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/inc/doc.hxx |8 
 sw/qa/extras/unowriter/data/tdf134252_onlytable_protected.fodt |   87 
++
 sw/qa/extras/unowriter/unowriter.cxx   |   59 ++
 sw/source/core/docnode/ndtbl.cxx   |   18 +-
 sw/source/core/frmedt/fecopy.cxx   |   20 --
 sw/source/core/frmedt/fetab.cxx|3 
 sw/source/core/unocore/unoobj2.cxx |2 
 sw/source/core/unocore/unotbl.cxx  |2 
 8 files changed, 175 insertions(+), 24 deletions(-)

New commits:
commit c598e0accf24e149520a22a8c062249f147844c7
Author: Michael Stahl 
AuthorDate: Thu Feb 4 12:36:41 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 4 18:34:49 2021 +0100

sw: fix copying and deleting of table in section via API

This is a follow-up to 7ab349296dac79dad3fec09f60348efcbb9ea17e.

The first problem was that tables that contain protected cells refused
to be deleted, which caused an infinite loop in
SwXTextRange::DeleteAndInsert().

This also affected SwXTextTable::dispose(), and DDE tables.

Fix this by forcibly deleting even protected cells from UNO APIs;
protection is an UI feature.

The second problem was that pasting the table SwFEShell::Paste() would
set up aCpyPam so that it selects from the start node of the table to
the last text node in the table, excluding the table cell and table end
nodes, which caused:

DocumentContentOperationsManager.cxx:3548: An insufficient number of nodes 
were copied!

Fix this by setting up aCpyPam over the entire body section of the
clipboard document.

Change-Id: I8c6caee5e75260dff79f106efc11f9669feddc0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110411
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 987f660960c2..124403befa9b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -21,6 +21,7 @@
 
 // SwDoc interfaces
 #include 
+#include 
 #include 
 #include 
 #include "swdllapi.h"
@@ -1196,7 +1197,8 @@ public:
 sal_uInt16 nCnt = 1, bool bBehind = true );
 
 // Delete Columns/Rows in table.
-bool DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn = false );
+enum class RowColMode { DeleteRow = 0, DeleteColumn = 1, DeleteProtected = 
2 };
+bool DeleteRowCol(const SwSelBoxes& rBoxes, RowColMode eMode = 
RowColMode::DeleteRow);
 void DeleteRow( const SwCursor& rCursor );
 void DeleteCol( const SwCursor& rCursor );
 
@@ -1668,6 +1670,10 @@ private:
 
 };
 
+namespace o3tl {
+template<> struct typed_flags : 
is_typed_flags {};
+}
+
 // This method is called in Dtor of SwDoc and deletes cache of ContourObjects.
 void ClrContourCache();
 
diff --git a/sw/qa/extras/unowriter/data/tdf134252_onlytable_protected.fodt 
b/sw/qa/extras/unowriter/data/tdf134252_onlytable_protected.fodt
new file mode 100644
index ..f588fdba0515
--- /dev/null
+++ b/sw/qa/extras/unowriter/data/tdf134252_onlytable_protected.fodt
@@ -0,0 +1,87 @@
+
+
+http://openoffice.org/2009/office"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns
 :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.or

Fwd: GSOC 2021

[Dante Doménech]

Can add my contact data, but can not participate.
Have no technological formation nor experience outside starmath.
Just can code because understand english and logic.
If I knew how to fix that kind of stuff it would be already implemented.


El jue, 4 feb 2021 a las 11:12, Thorsten Behrens ()
escribió:

> Dante Doménech wrote:
> > Hello. Would it be fine if I edited this?
> > https://wiki.documentfoundation.org/Development/GSoC/Ideas
> >
> Please do!
>
> (would you also be interested in participating? as either student or
> mentor?)
>
> Cheers,
>
> -- Thorsten
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - external/postgresql

[Michael Stahl (via logerrit)]

 external/postgresql/ExternalProject_postgresql.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 0b8459333735f1fcbbc3a93eb672593c59720f14
Author: Michael Stahl 
AuthorDate: Wed Feb 3 18:59:41 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Feb 4 18:12:50 2021 +0100

postgresql: try to cargo-cult MSBuild arguments

Extremely unclear to me whether these are useful or necessary,
but the other MSBuild ones have them.

Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit bbc5cc71fd1723db8cb5020f83db5cafc0f8a52a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110404
Reviewed-by: Caolán McNamara 

diff --git a/external/postgresql/ExternalProject_postgresql.mk 
b/external/postgresql/ExternalProject_postgresql.mk
index 2ffd6b1c9196..7f300a167759 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -25,7 +25,9 @@ $(eval $(call gb_ExternalProject_use_nmake,postgresql,build))
 $(call gb_ExternalProject_get_state_target,postgresql,build) :
$(call gb_Trace_StartRange,postgresql,EXTERNAL)
$(call gb_ExternalProject_run,build,\
-   MSBFLAGS=/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
+   MSBFLAGS="/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
+   $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 
/p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
+   $(if $(filter 
10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \
$(PERL) build.pl $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) 
libpq \
,src/tools/msvc)
$(call gb_Trace_EndRange,postgresql,EXTERNAL)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - external/postgresql

[Michael Stahl (via logerrit)]

 external/postgresql/ExternalProject_postgresql.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b7a5f5ed9fcfce61eccf116a6cccb2ceb9a75d75
Author: Michael Stahl 
AuthorDate: Wed Feb 3 18:59:41 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Feb 4 18:12:02 2021 +0100

postgresql: try to cargo-cult MSBuild arguments

Extremely unclear to me whether these are useful or necessary,
but the other MSBuild ones have them.

Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit bbc5cc71fd1723db8cb5020f83db5cafc0f8a52a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110361
Reviewed-by: Caolán McNamara 

diff --git a/external/postgresql/ExternalProject_postgresql.mk 
b/external/postgresql/ExternalProject_postgresql.mk
index cec1fb62b541..c0713161878f 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -25,7 +25,9 @@ $(eval $(call gb_ExternalProject_use_nmake,postgresql,build))
 $(call gb_ExternalProject_get_state_target,postgresql,build) :
$(call gb_Trace_StartRange,postgresql,EXTERNAL)
$(call gb_ExternalProject_run,build,\
-   MSBFLAGS=/p:Platform=$(gb_MSBUILD_PLATFORM) \
+   MSBFLAGS="/p:Platform=$(gb_MSBUILD_PLATFORM) \
+   $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 
/p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
+   $(if $(filter 
10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \
$(PERL) build.pl $(gb_MSBUILD_CONFIG) libpq \
,src/tools/msvc)
$(call gb_Trace_EndRange,postgresql,EXTERNAL)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/inc sw/source

[Miklos Vajna (via logerrit)]

 sw/inc/IDocumentSettingAccess.hxx |1 +
 sw/source/core/doc/DocumentSettingManager.cxx |8 +++-
 sw/source/core/inc/DocumentSettingManager.hxx |2 ++
 sw/source/uibase/uno/SwXDocumentSettings.cxx  |   16 
 4 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit 97abf85bb152b8a665dff6fd8b65fffea5365dc8
Author: Miklos Vajna 
AuthorDate: Thu Feb 4 16:55:13 2021 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 4 18:08:51 2021 +0100

tdf#91920 sw page gutter margin, from top: add doc model & UNO API

Do this per-doc, rather than per-page-desc, because Word doesn't support
it per-section, so we would just create interop problems for ourselves
with supporting it per-page-desc.

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

diff --git a/sw/inc/IDocumentSettingAccess.hxx 
b/sw/inc/IDocumentSettingAccess.hxx
index 8273954f4a71..059694ff1ceb 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -112,6 +112,7 @@ enum class DocumentSettingId
 PROTECT_FIELDS,
 HEADER_SPACING_BELOW_LAST_PARA,
 FRAME_AUTOWIDTH_WITH_MORE_PARA,
+GUTTER_AT_TOP,
 };
 
 /** Provides access to settings of a document
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index f6c15065a453..e811fd88174c 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -99,7 +99,8 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc 
&rDoc)
 mbProtectBookmarks(false),
 mbProtectFields(false),
 mbHeaderSpacingBelowLastPara(false),
-mbFrameAutowidthWithMorePara(false)
+mbFrameAutowidthWithMorePara(false),
+mbGutterAtTop(false)
 
 // COMPATIBILITY FLAGS END
 {
@@ -232,6 +233,8 @@ bool sw::DocumentSettingManager::get(/*[in]*/ 
DocumentSettingId id) const
 case DocumentSettingId::PROTECT_FIELDS: return mbProtectFields;
 case DocumentSettingId::HEADER_SPACING_BELOW_LAST_PARA: return 
mbHeaderSpacingBelowLastPara;
 case DocumentSettingId::FRAME_AUTOWIDTH_WITH_MORE_PARA: return 
mbFrameAutowidthWithMorePara;
+case DocumentSettingId::GUTTER_AT_TOP:
+return mbGutterAtTop;
 default:
 OSL_FAIL("Invalid setting id");
 }
@@ -486,6 +489,9 @@ void sw::DocumentSettingManager::set(/*[in]*/ 
DocumentSettingId id, /*[in]*/ boo
 case DocumentSettingId::FRAME_AUTOWIDTH_WITH_MORE_PARA:
 mbFrameAutowidthWithMorePara = value;
 break;
+case DocumentSettingId::GUTTER_AT_TOP:
+mbGutterAtTop = value;
+break;
 default:
 OSL_FAIL("Invalid setting id");
 }
diff --git a/sw/source/core/inc/DocumentSettingManager.hxx 
b/sw/source/core/inc/DocumentSettingManager.hxx
index 17ea950700ce..387be04a4c15 100644
--- a/sw/source/core/inc/DocumentSettingManager.hxx
+++ b/sw/source/core/inc/DocumentSettingManager.hxx
@@ -168,6 +168,8 @@ class DocumentSettingManager final :
 bool mbProtectFields;
 bool mbHeaderSpacingBelowLastPara;
 bool mbFrameAutowidthWithMorePara; //tdf#124423
+/// Gutter position: false means left (not a compatibility setting).
+bool mbGutterAtTop;
 
 public:
 
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx 
b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index faa0ef5e7d2b..19dabb9ea6b8 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -146,6 +146,7 @@ enum SwDocumentSettingsPropertyHandles
 HANDLE_PROTECT_FIELDS,
 HANDLE_HEADER_SPACING_BELOW_LAST_PARA,
 HANDLE_FRAME_AUTOWIDTH_WITH_MORE_PARA,
+HANDLE_GUTTER_AT_TOP,
 };
 
 }
@@ -239,6 +240,7 @@ static MasterPropertySetInfo * lcl_createSettingsInfo()
 { OUString("ProtectFields"), HANDLE_PROTECT_FIELDS, 
cppu::UnoType::get(), 0 },
 { OUString("HeaderSpacingBelowLastPara"), 
HANDLE_HEADER_SPACING_BELOW_LAST_PARA, cppu::UnoType::get(), 0 },
 { OUString("FrameAutowidthWithMorePara"), 
HANDLE_FRAME_AUTOWIDTH_WITH_MORE_PARA, cppu::UnoType::get(), 0 },
+{ OUString("GutterAtTop"), HANDLE_GUTTER_AT_TOP, 
cppu::UnoType::get(), 0 },
 
 /*
  * As OS said, we don't have a view when we need to set this, so I have to
@@ -1000,6 +1002,15 @@ void SwXDocumentSettings::_setSingleValue( const 
comphelper::PropertyInfo & rInf
 }
 }
 break;
+case HANDLE_GUTTER_AT_TOP:
+{
+bool bTmp;
+if (rValue >>= bTmp)
+{
+
mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::GUTTER_AT_TOP, bTmp);
+}
+}
+break;
 default:
 throw UnknownPropertyException(OUString::number(rInfo.mnHandle));
 }
@@ -1496,6 +1507,11 @@ void SwXD

[Libreoffice-commits] core.git: editeng/source include/svx include/tools oox/source sc/inc sc/qa sc/source svx/source sw/source

[Noel (via logerrit)]

 editeng/source/uno/unoipset.cxx |   14 +---
 include/svx/unopage.hxx |6 -
 include/tools/helpers.hxx   |9 +-
 oox/source/drawingml/textparagraphpropertiescontext.cxx |7 +-
 sc/inc/global.hxx   |2 
 sc/qa/unit/helper/qahelper.cxx  |4 -
 sc/qa/unit/subsequent_filters-test.cxx  |6 -
 sc/qa/unit/ucalc.cxx|8 +-
 sc/source/core/data/drwlayer.cxx|   55 ++--
 sc/source/core/data/patattr.cxx |4 -
 sc/source/core/tool/docoptio.cxx|2 
 sc/source/filter/excel/xetable.cxx  |5 -
 sc/source/filter/oox/worksheethelper.cxx|5 -
 sc/source/ui/unoobj/cellsuno.cxx|4 -
 sc/source/ui/unoobj/defltuno.cxx|2 
 sc/source/ui/unoobj/docuno.cxx  |3 
 sc/source/ui/unoobj/styleuno.cxx|4 -
 sc/source/ui/view/cellsh3.cxx   |1 
 sc/source/ui/view/drawview.cxx  |   12 +--
 sc/source/ui/view/tabvwsh2.cxx  |4 -
 svx/source/table/tablertfexporter.cxx   |8 --
 svx/source/table/tablertfimporter.cxx   |8 --
 svx/source/unodraw/unoshape.cxx |8 +-
 sw/source/core/doc/textboxhelper.cxx|6 -
 sw/source/filter/ww8/wrtw8esh.cxx   |4 -
 25 files changed, 76 insertions(+), 115 deletions(-)

New commits:
commit 10943505162d515f16acfb4d195d171421ff834f
Author: Noel 
AuthorDate: Thu Feb 4 13:01:25 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 4 17:36:48 2021 +0100

have one set of twips<->mm conversions

Change-Id: I510f4a0524a7c72eb124cba103cbf398024976d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110407
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index 523b29794461..417e62d771e0 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -260,10 +260,6 @@ uno::Reference< beans::XPropertySetInfo > const &  
SvxItemPropertySet::getProper
 }
 
 
-#ifndef TWIPS_TO_MM
-#define TWIPS_TO_MM(val) ((val * 127 + 36) / 72)
-#endif
-
 /** converts the given any with a metric to 100th/mm if needed */
 void SvxUnoConvertToMM( const MapUnit eSourceMapUnit, uno::Any & rMetric ) 
throw()
 {
@@ -275,19 +271,19 @@ void SvxUnoConvertToMM( const MapUnit eSourceMapUnit, 
uno::Any & rMetric ) throw
 switch( rMetric.getValueTypeClass() )
 {
 case uno::TypeClass_BYTE:
-rMetric <<= 
static_cast(TWIPS_TO_MM(*o3tl::forceAccess(rMetric)));
+rMetric <<= 
static_cast(TwipsToHMM(*o3tl::forceAccess(rMetric)));
 break;
 case uno::TypeClass_SHORT:
-rMetric <<= 
static_cast(TWIPS_TO_MM(*o3tl::forceAccess(rMetric)));
+rMetric <<= 
static_cast(TwipsToHMM(*o3tl::forceAccess(rMetric)));
 break;
 case uno::TypeClass_UNSIGNED_SHORT:
-rMetric <<= 
static_cast(TWIPS_TO_MM(*o3tl::forceAccess(rMetric)));
+rMetric <<= 
static_cast(TwipsToHMM(*o3tl::forceAccess(rMetric)));
 break;
 case uno::TypeClass_LONG:
-rMetric <<= 
static_cast(TWIPS_TO_MM(*o3tl::forceAccess(rMetric)));
+rMetric <<= 
static_cast(TwipsToHMM(*o3tl::forceAccess(rMetric)));
 break;
 case uno::TypeClass_UNSIGNED_LONG:
-rMetric <<= 
static_cast(TWIPS_TO_MM(*o3tl::forceAccess(rMetric)));
+rMetric <<= 
static_cast(TwipsToHMM(*o3tl::forceAccess(rMetric)));
 break;
 default:
 SAL_WARN("editeng", "AW: Missing unit translation to 100th mm, 
" << OString::number(static_cast(rMetric.getValueTypeClass(;
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index bff0aa5fd5e3..b3bf6bfe47d3 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -46,12 +46,6 @@ class SvxShapeGroup;
 class SvxShapeConnector;
 enum class SdrInventor : sal_uInt32;
 
-/**
-* Macros to convert Twips<->100tel mm
-*/
-#define TWIPS_TO_MM(val) ((val * 127 + 36) / 72)
-#define MM_TO_TWIPS(val) ((val * 72 + 63) / 127)
-
 class SVXCORE_DLLPUBLIC SvxDrawPage : protected cppu::BaseMutex,
 public ::cppu::WeakAggImplHelper7< 
css::drawing::XDrawPage,
css::drawing::XShapeGrouper,
diff --git a/include/tools/helpers.hxx b/include/tools/helpers.hxx
index e105ed355b66..381ecb206d18 100644
--- a/include/tools/helpers.hxx
+

[Libreoffice-commits] core.git: sc/source sd/source starmath/source sw/source

[Andrea Gelmini (via logerrit)]

 sc/source/filter/excel/impop.cxx  |2 +-
 sd/source/filter/eppt/epptso.cxx  |2 +-
 starmath/source/mathtype.cxx  |2 +-
 starmath/source/ooxmlexport.cxx   |2 +-
 sw/source/filter/ww8/wrtw8nds.cxx |2 +-
 sw/source/filter/ww8/ww8atr.cxx   |2 +-
 sw/source/filter/ww8/ww8par.cxx   |2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 4887f113d3bb3ffaf7bd93e2e0dba13fdb11afee
Author: Andrea Gelmini 
AuthorDate: Wed Feb 3 11:47:46 2021 +0100
Commit: Andrea Gelmini 
CommitDate: Thu Feb 4 17:13:07 2021 +0100

Fix typo

Change-Id: I7cc5e98fe967da00228c1540ac28a0074e6d5e4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110344
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index abb1e8934758..b834ecb8ed46 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -487,7 +487,7 @@ void ImportExcel::Columndefault()
 for( sal_uInt16 nCol = nColMic ; nCol <= nColMac ; nCol++ )
 {
 nOpt0 = aIn.ReaduInt8();
-aIn.Ignore( 2 );   // only 0. Attribut-Byte used
+aIn.Ignore( 2 );   // only 0. Attribute-Byte used
 
 if( nOpt0 & 0x80 )  // Col hidden?
 pColRowBuff->HideCol( nCol );
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 0c5ab79f3c82..c42848ae4aff 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -709,7 +709,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, 
TextObj& rTextObj )
 
 rOut.WriteUInt32( nCharCount )
 .WriteUInt16( pPara->nDepth )   // Level
-.WriteUInt32( nPropertyFlags ); // Paragraph Attribut Set
+.WriteUInt32( nPropertyFlags ); // Paragraph Attribute Set
 
 if ( nPropertyFlags & 0xf )
 rOut.WriteInt16( nBulletFlags );
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index fc6529e53d6f..4bf9bcf0a7e2 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -3304,7 +3304,7 @@ void MathType::HandleText(SmNode *pNode)
 //central mathtype character so that it does pretty much
 //what the user probably has in mind. The attributes
 //filled in here are dummy ones which are replaced in the
-//ATTRIBUT handler if a suitable location for the
+//ATTRIBUTE handler if a suitable location for the
 //attributes was found here. Unfortunately it is
 //possible for starmath to place character attributes on
 //entities which cannot occur in mathtype e.g. a Summation
diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index ba1b7b34c2da..984447a35f24 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -147,7 +147,7 @@ void SmOoxmlExport::HandleText( const SmNode* pNode, int 
/*nLevel*/)
 //central mathtype character so that it does pretty much
 //what the user probably has in mind. The attributes
 //filled in here are dummy ones which are replaced in the
-//ATTRIBUT handler if a suitable location for the
+//ATTRIBUTE handler if a suitable location for the
 //attributes was found here. Unfortunately it is
 //possible for starmath to place character attributes on
 //entities which cannot occur in mathtype e.g. a Summation
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 77cdab41e879..12066cc8697a 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1248,7 +1248,7 @@ void WW8AttributeOutput::FieldVanish( const OUString& 
rText, ww::eField /*eType*
 
 sal_uInt16 nStt_sprmCFSpec = aItems.size();
 
-// sprmCFSpec --  fSpec-Attribut true
+// sprmCFSpec --  fSpec-Attribute true
 SwWW8Writer::InsUInt16( aItems, 0x855 );
 aItems.push_back( 1 );
 
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index a536d444c5c3..7d9a00391858 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3397,7 +3397,7 @@ void WW8Export::WriteFootnoteBegin( const 
SwFormatFootnote& rFootnote, ww::bytes
 SwWW8Writer::InsUInt16( aAttrArr, NS_sprm::CIstd::val );
 SwWW8Writer::InsUInt16( aAttrArr, GetId( pCFormat ) );
 
-// fSpec-Attribut true
+// fSpec-Attribute true
 // For Auto-Number a special character must go
 // into the text and therefore a fSpec attribute
 m_pChpPlc->AppendFkpEntry( Strm().Tell() );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 3bb0686b2d85..ea9e4a42d728 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3835,7

[Libreoffice-commits] core.git: starmath/inc starmath/qa starmath/source

[Andrea Gelmini (via logerrit)]

 starmath/inc/node.hxx   |   18 +-
 starmath/inc/parse.hxx  |4 ++--
 starmath/inc/visitors.hxx   |   12 ++--
 starmath/qa/cppunit/mock-visitor.hxx|6 +++---
 starmath/source/mathml/mathmlexport.cxx |2 +-
 starmath/source/mathml/mathmlimport.cxx |4 ++--
 starmath/source/mathtype.cxx|2 +-
 starmath/source/node.cxx|   28 ++--
 starmath/source/ooxmlexport.cxx |2 +-
 starmath/source/ooxmlexport.hxx |2 +-
 starmath/source/parse.cxx   |8 
 starmath/source/rtfexport.cxx   |2 +-
 starmath/source/rtfexport.hxx   |2 +-
 starmath/source/visitors.cxx|   18 +-
 starmath/source/wordexportbase.cxx  |4 ++--
 starmath/source/wordexportbase.hxx  |4 ++--
 16 files changed, 59 insertions(+), 59 deletions(-)

New commits:
commit e3ea88c6db5facde01ad0c46d8f9393c4db08c5c
Author: Andrea Gelmini 
AuthorDate: Thu Feb 4 10:16:38 2021 +0100
Commit: Andrea Gelmini 
CommitDate: Thu Feb 4 17:11:57 2021 +0100

Fix typo in code

Here it passed "make build-nocheck" on Linux

Change-Id: I1f6ea440e54f87a90abb1b6e9983443764516e06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110373
Reviewed-by: Julien Nabet 
Reviewed-by: Dante DM 
Reviewed-by: Andrea Gelmini 
Tested-by: Jenkins

diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index d0b81737a31d..3c267bb4a9ad 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -40,7 +40,7 @@
   * SmVerticalBraceNode overbrace; underbrace;
   * SmOperNode  sum from to; int from 
to;
   * SmAlignNode text alignment
-  * SmAttributNode  font attributes; bold;
+  * SmAttributeNode font attributes; bold;
   * SmFontNode  font serif; ...
   * SmMatrixNodematrix
   * SmVisibleNode   drawable node
@@ -127,7 +127,7 @@ enum class SmScaleMode
 enum class SmNodeType
 {
 /* 0*/ Table,   Brace, Bracebody, Oper,Align,
-/* 5*/ Attribut,Font,  UnHor, BinHor,  BinVer,
+/* 5*/ Attribute,   Font,  UnHor, BinHor,  BinVer,
 /*10*/ BinDiagonal, SubSup,Matrix,Place,   Text,
 /*15*/ Special, GlyphSpecial,  Math,  Blank,   Error,
 /*20*/ Line,Expression,PolyLine,  Root,RootSymbol,
@@ -225,7 +225,7 @@ public:
  * @param nAttrib
  * @return
  */
-void SetAttribut(FontAttribute nAttrib);
+void SetAttribute(FontAttribute nAttrib);
 
 /**
  * Clears the font attribute nAttrib.
@@ -233,7 +233,7 @@ public:
  * @param nAttrib
  * @return
  */
-void ClearAttribut(FontAttribute nAttrib);
+void ClearAttribute(FontAttribute nAttrib);
 
 /**
  * Gets the font.
@@ -1902,11 +1902,11 @@ public:
  * 1: Body
  * None of these may be NULL.
  */
-class SmAttributNode final : public SmStructureNode
+class SmAttributeNode final : public SmStructureNode
 {
 public:
-explicit SmAttributNode(const SmToken &rNodeToken)
-: SmStructureNode(SmNodeType::Attribut, rNodeToken, 2) {}
+explicit SmAttributeNode(const SmToken &rNodeToken)
+: SmStructureNode(SmNodeType::Attribute, rNodeToken, 2) {}
 
 /**
  * Prepares the SmRect to render.
@@ -1928,14 +1928,14 @@ public:
  * Gets the attribute data.
  * @return attribute data
  */
-const SmNode* Attribute() const { return const_cast(this)->Attribute(); }
+const SmNode* Attribute() const { return const_cast(this)->Attribute(); }
   SmNode* Attribute()   { assert( GetNumSubNodes() == 2 ); return 
GetSubNode( 0 ); }
 
 /**
  * Gets the body data ( the nodes affected by the attribute ).
  * @return body data
  */
-const SmNode* Body() const { return const_cast(this)->Body(); }
+const SmNode* Body() const { return const_cast(this)->Body(); }
   SmNode* Body()  { assert( GetNumSubNodes() == 2 ); return 
GetSubNode( 1 ); }
 };
 
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index dde0c3454958..b010db941832 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -115,8 +115,8 @@ class SmParser
 std::unique_ptr DoOper();
 std::unique_ptr DoUnOper();
 std::unique_ptr DoAlign(bool bUseExtraSpaces = true);
-std::unique_ptr DoFontAttribut();
-std::unique_ptr DoAttribut();
+std::unique_ptr DoFontAttribute();
+std::unique_ptr DoAttribute();
 std::unique_ptr DoFont();
 std::unique_ptr DoFontSize();
 std::unique_ptr DoColor();
diff --git a/starmath/inc/visitors.hxx b/s

[Libreoffice-commits] core.git: cui/source cui/uiconfig

[Miklos Vajna (via logerrit)]

 cui/source/inc/page.hxx   |2 ++
 cui/source/tabpages/page.cxx  |   24 +++-
 cui/uiconfig/ui/pageformatpage.ui |   32 
 3 files changed, 57 insertions(+), 1 deletion(-)

New commits:
commit e1d7242341ec148b631a96e6d63697bce6a497c9
Author: Miklos Vajna 
AuthorDate: Thu Feb 4 14:07:21 2021 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 4 16:52:03 2021 +0100

tdf#91920 sw page gutter margin: add UI

Also update the preview widget and hide the new UI in Calc/Impress.

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

diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 1513347e481f..d4a39f9b68e3 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -106,6 +106,8 @@ private:
 std::unique_ptr m_xRightMarginEdit;
 std::unique_ptr m_xTopMarginEdit;
 std::unique_ptr m_xBottomMarginEdit;
+std::unique_ptr m_xGutterMarginLbl;
+std::unique_ptr m_xGutterMarginEdit;
 // layout settings
 std::unique_ptr m_xPageText;
 std::unique_ptr m_xLayoutBox;
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index e478fbc5f492..9a4ee5003f59 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -162,6 +162,8 @@ SvxPageDescPage::SvxPageDescPage(weld::Container* pPage, 
weld::DialogController*
 , m_xRightMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargRight", 
FieldUnit::CM))
 , m_xTopMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargTop", 
FieldUnit::CM))
 , m_xBottomMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargBot", 
FieldUnit::CM))
+, m_xGutterMarginLbl(m_xBuilder->weld_label("labelGutterMargin"))
+, m_xGutterMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargGut", 
FieldUnit::CM))
 , m_xPageText(m_xBuilder->weld_label("labelPageLayout"))
 , m_xLayoutBox(m_xBuilder->weld_combo_box("comboPageLayout"))
 , m_xNumberFormatText(m_xBuilder->weld_label("labelPageNumbers"))
@@ -231,6 +233,7 @@ SvxPageDescPage::SvxPageDescPage(weld::Container* pPage, 
weld::DialogController*
 SetFieldUnit( *m_xRightMarginEdit, eFUnit );
 SetFieldUnit( *m_xTopMarginEdit, eFUnit );
 SetFieldUnit( *m_xBottomMarginEdit, eFUnit );
+SetFieldUnit(*m_xGutterMarginEdit, eFUnit);
 SetFieldUnit( *m_xPaperWidthEdit, eFUnit );
 SetFieldUnit( *m_xPaperHeightEdit, eFUnit );
 
@@ -281,6 +284,9 @@ SvxPageDescPage::SvxPageDescPage(weld::Container* pPage, 
weld::DialogController*
 
m_xRightMarginEdit->set_max(m_xRightMarginEdit->normalize(aDrawinglayerOpt.GetMaximumPaperRightMargin()),
 FieldUnit::MM);
 
m_xTopMarginEdit->set_max(m_xTopMarginEdit->normalize(aDrawinglayerOpt.GetMaximumPaperTopMargin()),
 FieldUnit::MM);
 
m_xBottomMarginEdit->set_max(m_xBottomMarginEdit->normalize(aDrawinglayerOpt.GetMaximumPaperBottomMargin()),
 FieldUnit::MM);
+m_xGutterMarginEdit->set_max(
+
m_xGutterMarginEdit->normalize(aDrawinglayerOpt.GetMaximumPaperLeftMargin()),
+FieldUnit::MM);
 
 // Get the i18n framework numberings and add them to the listbox.
 
SvxNumOptionsTabPageHelper::GetI18nNumbering(m_xNumberFormatBox->get_widget(), 
std::numeric_limits::max());
@@ -311,6 +317,7 @@ void SvxPageDescPage::Init_Impl()
 m_xRightMarginEdit->connect_value_changed(aLink);
 m_xTopMarginEdit->connect_value_changed(aLink);
 m_xBottomMarginEdit->connect_value_changed(aLink);
+m_xGutterMarginEdit->connect_value_changed(aLink);
 
 m_xHorzBox->connect_toggled(LINK(this, SvxPageDescPage, CenterHdl_Impl));
 m_xVertBox->connect_toggled(LINK(this, SvxPageDescPage, CenterHdl_Impl));
@@ -329,6 +336,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
 {
 const SvxLRSpaceItem& rLRSpace = static_cast(*pItem);
 SetMetricValue( *m_xLeftMarginEdit, rLRSpace.GetLeft(), eUnit );
+SetMetricValue(*m_xGutterMarginEdit, rLRSpace.GetGutterMargin(), 
eUnit);
 m_aBspWin.SetLeft(
 static_cast(ConvertLong_Impl( rLRSpace.GetLeft(), 
eUnit )) );
 SetMetricValue( *m_xRightMarginEdit, rLRSpace.GetRight(), eUnit );
@@ -470,6 +478,9 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
 m_aBspWin.SetHorz(m_xHorzBox->get_active());
 m_aBspWin.SetVert(m_xVertBox->get_active());
 
+m_xGutterMarginLbl->hide();
+m_xGutterMarginEdit->hide();
+
 break;
 }
 
@@ -485,6 +496,9 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
 m_xLayoutBox->hide();
 m_xPageText->hide();
 
+m_xGutterMarginLbl->hide();
+m_xGutterMarginEdit->hide();
+
 break;
 }
 default: ;//prevent warning
@@ -506,6 +520,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
 m_xRightMarg

ESC meeting minutes: 2021-02-04

[Miklos Vajna]

* Present:
+ Heiko, Michael W, Cloph, Stephan, Caolan, Miklos, Olivier, Eike, Xisco, 
Thorsten, Michael S

* Completed Action Items:

* Pending Action Items:
+ get GSoC 2021 application kicked off until 29th January (Thorsten)
+ data of mentoring update / qa stats look outdated, investigate (Xisco)

* Release Engineering update (Cloph)
+ 7.1 status
  + better late than never: don’t forget to add your features to the 
release notes (Miklos)
+ see https://wiki.documentfoundation.org/ReleaseNotes/7.1
  + 7.1.0 is out now, released yesterday
+ mac install problem: language pack installer doesn’t handle the case 
when Finder is configured to always show file extensions
  + so can be worked around
+ icons in the start center: affects Windows as well (Xisco)
  + already fixed (Heiko)
+ another .ui problem
  + only affects old gtk3 versions (Heiko)
+ 7.0 status
  + 7.0.5 in 2 weeks
+ Remotes: Android, iOS
+ Android viewer

* RC4 needed? (Xisco)
+ 
http://document-foundation-mail-archive.969070.n3.nabble.com/Going-to-need-an-rc4-build-of-7-1-0-some-unacceptable-omissions-td4295433.html
  + mentions the missing icon problem
  + buttons for the new UI chooser → already fixed in master
  + the release is out, 7.1.0 rc1 is near (Cloph)
+ agree, these bugs are not critical (Xisco)

* Documentation (Olivier)
+ Helpcontent2
   + Updates (S. Chailkin, ohallot, R lima, LibreOfficiant)
   + Fixes  (A Gelmini, ohallot, S. Chaiklin)
   + Refactors  (Johnny_M, ohallot)
+ Guides
   + work in progress

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
243(243) (topicUI) bugs open, 248(248) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month   3 months12 months
 added  9(-3) 29(-3) 56(-6) 161(-3)
 commented 95(-35)   408(-9)   1016(-32)   4074(-57)
   removed  1(0)   4(1)   7(-1)  52(0)
  resolved 12(-1) 60(6) 156(-2) 513(3)
+ top 10 contributors:
  Heiko Tietze made 332 changes in 1 month, and 2523 changes in 1 year
  Telesto made 160 changes in 1 month, and 931 changes in 1 year
  Foote, V Stuart made 92 changes in 1 month, and 705 changes in 1 year
  Ilmari Lauhakangas made 47 changes in 1 month, and 321 changes in 1 
year
  Seth Chaiklin made 46 changes in 1 month, and 184 changes in 1 year
  Dieter Praas made 33 changes in 1 month, and 456 changes in 1 year
  Kaganski, Mike made 27 changes in 1 month, and 175 changes in 1 year
  Roman Kuznetsov made 19 changes in 1 month, and 252 changes in 1 year
  Jim Raykowski made 16 changes in 1 month, and 30 changes in 1 year
  Rizal Muttaqin made 16 changes in 1 month, and 28 changes in 1 year

 * New tickets with needsUXEval Jan/28-Feb/04

  ->   * Remove "Collect usage data…" section and checkbox in the LibreOffice
 general options
 + https://bugs.documentfoundation.org/show_bug.cgi?id=140107
 + where is this sent to?
   + 2 features: “collect UI info”, LO_COLLECT_UIINFO, for ui testing; 
vs collecting data that is never sent (Xisco, Miklos)
   * Tools -> Customize dialog search 'All Commands' does not include
 controls from Styles or Macros categories
 + https://bugs.documentfoundation.org/show_bug.cgi?id=140070
   * Considerations about improving UI for Bullets and Numbering (as DF)
 and List Styles
 + https://bugs.documentfoundation.org/show_bug.cgi?id=140058
   * Do not autoformat numbers in brackets
 + https://bugs.documentfoundation.org/show_bug.cgi?id=140050
   * EDITING: Fault in Spelling and Grammar dialog box operation.
 + https://bugs.documentfoundation.org/show_bug.cgi?id=57667
   ->  * AutoCorrect: Writer not recognizing a URL's trailing carat, hash mark,
question mark, backslash, or pipe
 + https://bugs.documentfoundation.org/show_bug.cgi?id=91192
 + URLs enclosed in parentheses, square/angle brackets, or even pipes
 + following RFC3986/3987 and stick to this (Guilhem)
 + pipe should not appear in a URL (Stephan)
   ->  * freeze/crash when creating a diagram from many thousand cells
 + https://bugs.documentfoundation.org/show_bug.cgi?id=69977
 + large data → slow, not too surprising
 + Noel gave some tip
   * Setting cell background to None, changes row background from Color
 to None.
 + https://bugs.documentfoundation.org/show_bug.cgi?id=139983
   * Add an "Extensions" sidebar (similar to the "Extensions" tab)
 + https://bugs.documentfoundation.org/show_bug.cgi?id=139979


* Crash Testing (Caolan)
+ 14(+2) import failure, 2(+2) export failures
+ 0 coverity issues
+ 17 ossfuzz i

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/source

[Miklos Vajna (via logerrit)]

 vcl/source/window/event.cxx   |   10 ++
 vcl/source/window/window2.cxx |5 +
 2 files changed, 15 insertions(+)

New commits:
commit 7c4435b8c69ca3a9d5ff1d280152cec1bfc51a1e
Author: Miklos Vajna 
AuthorDate: Tue Feb 11 21:06:06 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Thu Feb 4 16:31:07 2021 +0100

vcl: fix UB in Window::ImplGetFirstOverlapWindow()

mpWindowImpl can be nullptr here, see online.git's
unit-load-torture test:

vcl/source/window/window2.cxx:882:24: runtime error: member access within 
null pointer of type 'WindowImpl'
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior 
vcl/source/window/window2.cxx:882:24 in

Surrouding code already checks for nullptr mpWindowImpl, so fix it directly
where the problem is reported, not a caller.

(Also fix a similar case in Window::ImplCallFocusChangeActivate().)

Change-Id: I34dee0fd49483c428a78fd48b54c00b2f0a26417
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88474
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit d1378b92c6697c09def7b3db8b36c3cf883b55c4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110418
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 797d40a79912..e7752ae77043 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -576,7 +576,17 @@ void Window::ImplCallFocusChangeActivate( vcl::Window* 
pNewOverlapWindow,
 bool bCallActivate = true;
 bool bCallDeactivate = true;
 
+if (!pOldOverlapWindow)
+{
+return;
+}
+
 pOldRealWindow = pOldOverlapWindow->ImplGetWindow();
+if (!pNewOverlapWindow)
+{
+return;
+}
+
 pNewRealWindow = pNewOverlapWindow->ImplGetWindow();
 if ( (pOldRealWindow->GetType() != WindowType::FLOATINGWINDOW) ||
  pOldRealWindow->GetActivateMode() != ActivateModeFlags::NONE )
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 61ea3d80c3d0..3037491703fd 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -893,6 +893,11 @@ vcl::Window* Window::ImplGetBorderWindow() const
 
 vcl::Window* Window::ImplGetFirstOverlapWindow()
 {
+if (!mpWindowImpl)
+{
+return nullptr;
+}
+
 if ( mpWindowImpl->mbOverlapWin )
 return this;
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmlsecurity/source

[Caolán McNamara (via logerrit)]

 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |   13 +-
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 6f7f9e4d19b38d6f51f032ee3d7b99d5bbdb5b75
Author: Caolán McNamara 
AuthorDate: Thu Feb 4 11:44:50 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 4 16:14:59 2021 +0100

log why status wasn't SECSuccess

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

diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx 
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index ccf61e106e57..1d2a7c2ec08f 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -448,7 +448,11 @@ X509Certificate_NssImpl* 
SecurityEnvironment_NssImpl::createAndAddCertificateFro
 aStatus = CERT_DecodeTrustString(&aTrust, aTrustString.getStr());
 
 if (aStatus != SECSuccess)
+{
+PRIntn err = PR_GetError();
+SAL_WARN("xmlsecurity.xmlsec", "Error: " <<  err << ": " << 
getCertError(err));
 return nullptr;
+}
 
 PK11SlotInfo* pSlot = PK11_GetInternalKeySlot();
 
@@ -458,13 +462,20 @@ X509Certificate_NssImpl* 
SecurityEnvironment_NssImpl::createAndAddCertificateFro
 aStatus = PK11_ImportCert(pSlot, pCERTCertificate, CK_INVALID_HANDLE, 
nullptr, PR_FALSE);
 
 if (aStatus != SECSuccess)
+{
+PRIntn err = PR_GetError();
+SAL_WARN("xmlsecurity.xmlsec", "Error: " <<  err << ": " << 
getCertError(err));
 return nullptr;
+}
 
 aStatus = CERT_ChangeCertTrust(CERT_GetDefaultCertDB(), pCERTCertificate, 
&aTrust);
 
 if (aStatus != SECSuccess)
+{
+PRIntn err = PR_GetError();
+SAL_WARN("xmlsecurity.xmlsec", "Error: " <<  err << ": " << 
getCertError(err));
 return nullptr;
-
+}
 
 PK11_FreeSlot(pSlot);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/inc

[Szymon Kłos (via logerrit)]

 vcl/inc/jsdialog/jsdialogbuilder.hxx |   30 +-
 1 file changed, 29 insertions(+), 1 deletion(-)

New commits:
commit 3e8018d8336dc1a34530142a917ccaeb8100fe5a
Author: Szymon Kłos 
AuthorDate: Wed Dec 30 09:57:00 2020 +0100
Commit: Tomaž Vajngerl 
CommitDate: Thu Feb 4 16:08:31 2021 +0100

jsdialog: support for freeze/thaw

Change-Id: Ia3ca2c3c06a95e295e400780540c176cd9606ee7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108498
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109905
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index f254a5ea3592..08218512fa2b 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -71,7 +71,9 @@ public:
 {
 }
 
-void notifyDialogState(bool bForce = false);
+virtual ~JSDialogSender() = default;
+
+virtual void notifyDialogState(bool bForce = false);
 void sendClose();
 virtual void sendUpdate(VclPtr pWindow);
 };
@@ -198,6 +200,7 @@ class JSWidget : public BaseInstanceClass, public 
JSDialogSender
 {
 protected:
 rtl::Reference m_xDropTarget;
+bool m_bIsFreezed;
 
 public:
 JSWidget(VclPtr aNotifierWindow, VclPtr 
aContentWindow,
@@ -205,6 +208,7 @@ public:
  std::string sTypeOfJSON)
 : BaseInstanceClass(pObject, pBuilder, bTakeOwnership)
 , JSDialogSender(aNotifierWindow, aContentWindow, sTypeOfJSON)
+, m_bIsFreezed(false)
 {
 }
 
@@ -234,6 +238,30 @@ public:
 
 return m_xDropTarget.get();
 }
+
+virtual void freeze() override
+{
+BaseInstanceClass::freeze();
+m_bIsFreezed = true;
+}
+
+virtual void thaw() override
+{
+BaseInstanceClass::thaw();
+m_bIsFreezed = false;
+}
+
+virtual void sendUpdate(VclPtr pWindow) override
+{
+if (!m_bIsFreezed)
+JSDialogSender::sendUpdate(pWindow);
+}
+
+virtual void notifyDialogState(bool bForce = false) override
+{
+if (!m_bIsFreezed || bForce)
+JSDialogSender::notifyDialogState(bForce);
+}
 };
 
 class VCL_DLLPUBLIC JSDialog : public JSWidget
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/vcl vcl/inc vcl/jsdialog vcl/source

[Szymon Kłos (via logerrit)]

 include/vcl/window.hxx   |3 -
 vcl/inc/jsdialog/jsdialogbuilder.hxx |   17 +-
 vcl/inc/window.h |2 -
 vcl/jsdialog/jsdialogbuilder.cxx |   57 ---
 vcl/source/window/window.cxx |   14 
 5 files changed, 11 insertions(+), 82 deletions(-)

New commits:
commit 809c30d1518bcc3c0ca43ea6f0fda99dcc2016a2
Author: Szymon Kłos 
AuthorDate: Wed Dec 30 10:05:26 2020 +0100
Commit: Tomaž Vajngerl 
CommitDate: Thu Feb 4 16:08:08 2021 +0100

Revert "jsdialog: disable idle notify"

This reverts commit 71ec214d7583f637fefcb5eca13c637cc6b38029.
and partially 54b5e6b4e083ce7a71e16ef622753898f38dc8ab

freeze/thaw functionality was added so no longer needed.

Change-Id: Iee29fa79bcebfd409fd3cea4f11cb1d48053daa6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108509
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109904
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 9d6867f94c76..002ca15f01cf 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1206,9 +1206,6 @@ public:
 /// Find an existing Window based on the LOKWindowId.
 static VclPtr  FindLOKWindow(vcl::LOKWindowId 
nWindowId);
 
-boolIsDisableIdleNotify();
-voidSetDisableIdleNotify(bool bValue);
-
 /// check if LOK Window container is empty
 static bool IsLOKWindowsEmpty();
 
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 61447cdeaf2f..f254a5ea3592 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -73,8 +73,7 @@ public:
 
 void notifyDialogState(bool bForce = false);
 void sendClose();
-void dumpStatus();
-void sendUpdate(VclPtr pWindow);
+virtual void sendUpdate(VclPtr pWindow);
 };
 
 class JSDropTarget final
@@ -151,8 +150,8 @@ public:
 const OUString& 
rUIFile);
 
 virtual ~JSInstanceBuilder() override;
-virtual std::unique_ptr weld_message_dialog(const 
OString& id,
- bool 
bTakeOwnership = true) override;
+virtual std::unique_ptr
+weld_message_dialog(const OString& id, bool bTakeOwnership = true) 
override;
 virtual std::unique_ptr weld_dialog(const OString& id,
   bool bTakeOwnership = 
true) override;
 virtual std::unique_ptr weld_label(const OString& id,
@@ -239,11 +238,6 @@ public:
 
 class VCL_DLLPUBLIC JSDialog : public JSWidget
 {
-DECL_LINK(on_dump_status, void*, void);
-DECL_LINK(on_window_event, VclWindowEvent&, void);
-
-bool m_bNotifyCreated;
-
 public:
 JSDialog(VclPtr aNotifierWindow, VclPtr 
aContentWindow,
  ::Dialog* pDialog, SalInstanceBuilder* pBuilder, bool 
bTakeOwnership,
@@ -332,11 +326,6 @@ public:
 
 class JSMessageDialog : public SalInstanceMessageDialog, public JSDialogSender
 {
-DECL_LINK(on_dump_status, void*, void);
-DECL_LINK(on_window_event, VclWindowEvent&, void);
-
-bool m_bNotifyCreated;
-
 public:
 JSMessageDialog(::MessageDialog* pDialog, VclPtr 
aContentWindow,
 SalInstanceBuilder* pBuilder, bool bTakeOwnership);
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index bcdc5e20f7ad..89c0ff8cf3b9 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -116,8 +116,6 @@ struct ImplWinData
 sal_uInt16  mnIsTopWindow;
 boolmbMouseOver;//< tracks mouse over for 
native widget paint effect
 boolmbEnableNativeWidget;   //< toggle native widget 
rendering
-boolmbDisableIdleNotify;
-
 ::std::list< VclPtr >
 maTopWindowChildren;
 
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 2282342239a3..e096209828a6 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -158,8 +158,7 @@ void JSDialogNotifyIdle::sendClose() { 
send(generateCloseMessage()); }
 
 void JSDialogSender::notifyDialogState(bool bForce)
 {
-auto aNotifierWnd = mpIdleNotify->getNotifierWindow();
-if (aNotifierWnd && aNotifierWnd->IsDisableIdleNotify())
+if (!mpIdleNotify->getNotifierWindow())
 return;
 
 if (bForce)
@@ -169,8 +168,6 @@ void JSDialogSender::notifyDialogState(bool bForce)
 
 void JSDialogSender::sendClose() { mpIdleNotify->sendClose(); }
 
-void JSDialogSender::dumpStatus() { mpIdleNotify->Invoke(); }
-
 void JSDialogSender::sendUpdate(VclPtr pWindow)
 {
 mpIdleNotify->updateStatus(pWindow);
@@ -457,17 +454,13 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialo

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 86790ab0a582e0efc2f535221997bac99db0dd40
Author: Olivier Hallot 
AuthorDate: Thu Feb 4 15:54:14 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Feb 4 15:54:14 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 57222f5d4710b0a2fc43e4273ccad8c952dc6510
  - Revert "Create Help page for the SF_String service"

This reverts commit a6f6fa2254ced7120ac0fb0075b4fd5195c334af.

Reason for revert: was not yet ready

Change-Id: Ibc95e08e2cb2a1f2220b503f3ab472518f98a047
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110365
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index a6f6fa2254ce..57222f5d4710 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a6f6fa2254ced7120ac0fb0075b4fd5195c334af
+Subproject commit 57222f5d4710b0a2fc43e4273ccad8c952dc6510
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: AllLangHelp_sbasic.mk source/text

[Olivier Hallot (via logerrit)]

 AllLangHelp_sbasic.mk|1 
 source/text/sbasic/shared/03/lib_ScriptForge.xhp |2 
 source/text/sbasic/shared/03/sf_array.xhp|2 
 source/text/sbasic/shared/03/sf_document.xhp |   28 
 source/text/sbasic/shared/03/sf_string.xhp   | 1368 ---
 5 files changed, 16 insertions(+), 1385 deletions(-)

New commits:
commit 57222f5d4710b0a2fc43e4273ccad8c952dc6510
Author: Olivier Hallot 
AuthorDate: Thu Feb 4 15:48:01 2021 +0100
Commit: Olivier Hallot 
CommitDate: Thu Feb 4 15:54:14 2021 +0100

Revert "Create Help page for the SF_String service"

This reverts commit a6f6fa2254ced7120ac0fb0075b4fd5195c334af.

Reason for revert: was not yet ready

Change-Id: Ibc95e08e2cb2a1f2220b503f3ab472518f98a047
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110365
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index 3db5bbb4d..2fad16c6d 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -85,7 +85,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/03/sf_exception \
 helpcontent2/source/text/sbasic/shared/03/sf_ui \
 helpcontent2/source/text/sbasic/shared/03/sf_document \
-helpcontent2/source/text/sbasic/shared/03/sf_string \
 helpcontent2/source/text/sbasic/shared/03/sf_timer \
 helpcontent2/source/text/sbasic/shared/03/lib_schedule \
 helpcontent2/source/text/sbasic/shared/03/lib_template \
diff --git a/source/text/sbasic/shared/03/lib_ScriptForge.xhp 
b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
index 4a1fdfedc..98db6187d 100644
--- a/source/text/sbasic/shared/03/lib_ScriptForge.xhp
+++ b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
@@ -86,7 +86,7 @@
 Platform Service
 Services class Service
 Session Service
-
+String Service
 TextStream class Service
 
 
diff --git a/source/text/sbasic/shared/03/sf_array.xhp 
b/source/text/sbasic/shared/03/sf_array.xhp
index c4df6ba66..45f976099 100644
--- a/source/text/sbasic/shared/03/sf_array.xhp
+++ b/source/text/sbasic/shared/03/sf_array.xhp
@@ -17,7 +17,7 @@
 
 
 
-   ScriptForge.Array 
service
+ScriptForge.Array 
service
Provides a collection of methods for manipulating and 
transforming arrays of one dimension (vectors) and arrays of two dimensions 
(matrices). This includes set operations, sorting, importing to and exporting 
from text files.
Arrays with more 
than two dimensions cannot be used with the methods in this service, the only 
exception being the CountDims method that accepts Arrays 
with any number of dimensions.
 
diff --git a/source/text/sbasic/shared/03/sf_document.xhp 
b/source/text/sbasic/shared/03/sf_document.xhp
index 066990c40..35370f889 100644
--- a/source/text/sbasic/shared/03/sf_document.xhp
+++ b/source/text/sbasic/shared/03/sf_document.xhp
@@ -111,7 +111,7 @@
 No
 
 
-SF_Dictionary
+Dictionary
 
 
 Returns a ScriptForge.Dictionary object. 
After update, can be passed again to the property for updating the document.Individual items of the dictionary may be either strings, numbers, (Basic) 
dates or https://api.libreoffice.org/docs/idl/ref/structcom_1_1sun_1_1star_1_1util_1_1Duration.html";
 name="Duration API">com.sun.star.util.Duration 
items.
@@ -125,7 +125,7 @@
 No
 
 
-String
+String
 
 
 Gives access to the Description property of the document 
(also known as "Comments")
@@ -139,7 +139,7 @@
 Yes
 
 
-SF_Dictionary
+Dictionary
 
 
 Returns a ScriptForge.Dictionary object 
containing all the entries. Document statistics are included. Note that they 
are specific to the type of document. As an example, a Calc document includes a 
"CellCount" entry. Other documents do not.
@@ -153,7 +153,7 @@
 Yes
 
 
-String
+String
 
 
 String value with the document type ("Base", "Calc", 
"Writer", etc)
@@ -167,7 +167,7 @@
 Yes
 
 
-Boolean
+Boolean
 
 
 Exactly one of these properties is True 
for a given document.
@@ -181,10 +181,10 @@
 No
 
 
-String
+String
 
 
-Gives access to the Keywords property of the document. 
Represented as a comma-separated list of keywords
+Gives access to the Keywords property of the document. 
Represented as a comma-separated list of keywords
 
 
 
@@ -195,10 +195,10 @@
 Yes
 
 
-Boolean
+Boolean
 
 
-True if the document is actually in 
read-onl

Going to need an rc4 build of 7.1.0, some unacceptable omissions

[V Stuart Foote]

Prominent UI warts suggest 7.1.0 is not ready to go out the door:

tdf#139781 - missing icons from Start Center
tdf#138051 - buttons for the "new" UI Picker feature are blocked

Another rc with those patches applied, please.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/qa

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests9/pivotTable.py |   92 +
 sc/qa/uitest/data/basicPivotTable.ods  |binary
 2 files changed, 92 insertions(+)

New commits:
commit e89debccbbe7029ebf97b934cf0dee3c15c53b22
Author: Xisco Fauli 
AuthorDate: Thu Feb 4 11:40:26 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 4 15:48:31 2021 +0100

sc: uitest: Add test for cf93998eb5abc193d95ae5433bf4dfd11a9d62d8

Change-Id: I063b4999ad9d04ec658da923e088e16c5edd507e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110405
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests9/pivotTable.py 
b/sc/qa/uitest/calc_tests9/pivotTable.py
new file mode 100644
index ..d85894bf9af6
--- /dev/null
+++ b/sc/qa/uitest/calc_tests9/pivotTable.py
@@ -0,0 +1,92 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+
+class pivotTable(UITestCase):
+
+   def test_cancelButton(self):
+
+# This is basically a test for cf93998eb5abc193d95ae5433bf4dfd11a9d62d8
+# Without the fix in place, this test would have crashed
+
+self.ui_test.load_file(get_url_for_data_file("basicPivotTable.ods"))
+
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+
+gridwin.executeAction("SELECT", mkPropertyValues({"TABLE": "1"}))
+
+self.xUITest.executeCommand(".uno:GoUp")
+
+
+self.ui_test.execute_dialog_through_command(".uno:DataDataPilotRun")
+
+xDialog = self.xUITest.getTopFocusWindow()
+
+xFields = xDialog.getChild("listbox-fields")
+self.assertEqual(2, len(xFields.getChildren()))
+self.assertEqual("qtX", 
get_state_as_dict(xFields.getChild('0'))['Text'])
+self.assertEqual("qtY", 
get_state_as_dict(xFields.getChild('1'))['Text'])
+
+xColumns = xDialog.getChild("listbox-column")
+self.assertEqual(1, len(xColumns.getChildren()))
+self.assertEqual("Data", 
get_state_as_dict(xColumns.getChild('0'))['Text'])
+
+xPage = xDialog.getChild("listbox-page")
+self.assertEqual(1, len(xPage.getChildren()))
+xPageChild = xPage.getChild('0')
+self.assertEqual("qtX", get_state_as_dict(xPageChild)['Text'])
+
+def handle_dataField_dialog(dialog):
+optionBtn = dialog.getChild("options")
+
+def handle_options_dialog_first_time(dialog2):
+xEmptyLine = dialog2.getChild("emptyline")
+
+xEmptyLine.executeAction("CLICK", tuple())
+self.assertEqual('true', 
get_state_as_dict(xEmptyLine)['Selected'])
+
+xOKBtn = dialog2.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+def handle_options_dialog_second_time(dialog2):
+xEmptyLine = dialog2.getChild("emptyline")
+
+xEmptyLine.executeAction("CLICK", tuple())
+self.assertEqual('false', 
get_state_as_dict(xEmptyLine)['Selected'])
+
+xCancelBtn = dialog2.getChild("cancel")
+self.ui_test.close_dialog_through_button(xCancelBtn)
+
+def handle_options_dialog_third_time(dialog2):
+xEmptyLine = dialog2.getChild("emptyline")
+
+self.assertEqual('true', 
get_state_as_dict(xEmptyLine)['Selected'])
+
+xOKBtn = dialog2.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+self.ui_test.execute_blocking_action(optionBtn.executeAction, 
args=('CLICK', ()),
+dialog_handler=handle_options_dialog_first_time)
+
+self.ui_test.execute_blocking_action(optionBtn.executeAction, 
args=('CLICK', ()),
+dialog_handler=handle_options_dialog_second_time)
+
+self.ui_test.execute_blocking_action(optionBtn.executeAction, 
args=('CLICK', ()),
+dialog_handler=handle_options_dialog_third_time)
+
+xOkBtn = dialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOkBtn)
+
+self.ui_test.execute_blocking_action(xPageChild.executeAction, 
args=('DOUBLECLICK', ()),
+dialog_handler=handle_dataField_dialog)
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/data/basicPivotTable.ods 
b/sc/qa/uitest/data/basicPivotTable.ods
new file mode 100644
index ..27487fd05a11
Binary files /dev/null and b/sc/qa/uitest/data/basicPivotTable.ods differ
_

[Libreoffice-commits] core.git: helpcontent2

[Rafael Lima (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 82502e59d2f6fbd2ecdb2968113e9521d8094d82
Author: Rafael Lima 
AuthorDate: Thu Feb 4 15:31:36 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Feb 4 15:31:36 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to a6f6fa2254ced7120ac0fb0075b4fd5195c334af
  - Create Help page for the SF_String service

SF_Array:
- Adds a  tag

SF_Document:
- Fixes localization issues pointed out by translators on WebLate

Change-Id: Ifa0a3c7665796ea2e5464dc3f2bd9508b3f7847c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110360
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 268d92a454d7..a6f6fa2254ce 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 268d92a454d7839eefb1c4c97bba805141bb874f
+Subproject commit a6f6fa2254ced7120ac0fb0075b4fd5195c334af
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: AllLangHelp_sbasic.mk source/text

[Rafael Lima (via logerrit)]

 AllLangHelp_sbasic.mk|1 
 source/text/sbasic/shared/03/lib_ScriptForge.xhp |2 
 source/text/sbasic/shared/03/sf_array.xhp|2 
 source/text/sbasic/shared/03/sf_document.xhp |   28 
 source/text/sbasic/shared/03/sf_string.xhp   | 1368 +++
 5 files changed, 1385 insertions(+), 16 deletions(-)

New commits:
commit a6f6fa2254ced7120ac0fb0075b4fd5195c334af
Author: Rafael Lima 
AuthorDate: Thu Feb 4 01:15:38 2021 +0100
Commit: Olivier Hallot 
CommitDate: Thu Feb 4 15:31:36 2021 +0100

Create Help page for the SF_String service

SF_Array:
- Adds a  tag

SF_Document:
- Fixes localization issues pointed out by translators on WebLate

Change-Id: Ifa0a3c7665796ea2e5464dc3f2bd9508b3f7847c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110360
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index 2fad16c6d..3db5bbb4d 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/03/sf_exception \
 helpcontent2/source/text/sbasic/shared/03/sf_ui \
 helpcontent2/source/text/sbasic/shared/03/sf_document \
+helpcontent2/source/text/sbasic/shared/03/sf_string \
 helpcontent2/source/text/sbasic/shared/03/sf_timer \
 helpcontent2/source/text/sbasic/shared/03/lib_schedule \
 helpcontent2/source/text/sbasic/shared/03/lib_template \
diff --git a/source/text/sbasic/shared/03/lib_ScriptForge.xhp 
b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
index 98db6187d..4a1fdfedc 100644
--- a/source/text/sbasic/shared/03/lib_ScriptForge.xhp
+++ b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
@@ -86,7 +86,7 @@
 Platform Service
 Services class Service
 Session Service
-String Service
+
 TextStream class Service
 
 
diff --git a/source/text/sbasic/shared/03/sf_array.xhp 
b/source/text/sbasic/shared/03/sf_array.xhp
index 45f976099..c4df6ba66 100644
--- a/source/text/sbasic/shared/03/sf_array.xhp
+++ b/source/text/sbasic/shared/03/sf_array.xhp
@@ -17,7 +17,7 @@
 
 
 
-ScriptForge.Array 
service
+   ScriptForge.Array 
service
Provides a collection of methods for manipulating and 
transforming arrays of one dimension (vectors) and arrays of two dimensions 
(matrices). This includes set operations, sorting, importing to and exporting 
from text files.
Arrays with more 
than two dimensions cannot be used with the methods in this service, the only 
exception being the CountDims method that accepts Arrays 
with any number of dimensions.
 
diff --git a/source/text/sbasic/shared/03/sf_document.xhp 
b/source/text/sbasic/shared/03/sf_document.xhp
index 35370f889..066990c40 100644
--- a/source/text/sbasic/shared/03/sf_document.xhp
+++ b/source/text/sbasic/shared/03/sf_document.xhp
@@ -111,7 +111,7 @@
 No
 
 
-Dictionary
+SF_Dictionary
 
 
 Returns a ScriptForge.Dictionary object. 
After update, can be passed again to the property for updating the document.Individual items of the dictionary may be either strings, numbers, (Basic) 
dates or https://api.libreoffice.org/docs/idl/ref/structcom_1_1sun_1_1star_1_1util_1_1Duration.html";
 name="Duration API">com.sun.star.util.Duration 
items.
@@ -125,7 +125,7 @@
 No
 
 
-String
+String
 
 
 Gives access to the Description property of the document 
(also known as "Comments")
@@ -139,7 +139,7 @@
 Yes
 
 
-Dictionary
+SF_Dictionary
 
 
 Returns a ScriptForge.Dictionary object 
containing all the entries. Document statistics are included. Note that they 
are specific to the type of document. As an example, a Calc document includes a 
"CellCount" entry. Other documents do not.
@@ -153,7 +153,7 @@
 Yes
 
 
-String
+String
 
 
 String value with the document type ("Base", "Calc", 
"Writer", etc)
@@ -167,7 +167,7 @@
 Yes
 
 
-Boolean
+Boolean
 
 
 Exactly one of these properties is True 
for a given document.
@@ -181,10 +181,10 @@
 No
 
 
-String
+String
 
 
-Gives access to the Keywords property of the document. 
Represented as a comma-separated list of keywords
+Gives access to the Keywords property of the document. 
Represented as a comma-separated list of keywords
 
 
 
@@ -195,10 +195,10 @@
 Yes
 
 
-Boolean
+Boolean
 
 
-True if the document is actually in 
read-onl

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

[Szymon Kłos (via logerrit)]

 vcl/source/treelist/svimpbox.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 50e345d50b72aad07776d4af343f41028640d83e
Author: Szymon Kłos 
AuthorDate: Wed Feb 3 16:44:35 2021 +0100
Commit: Szymon Kłos 
CommitDate: Thu Feb 4 15:12:36 2021 +0100

Don't skip lines if only one row in the list

Mouse wheel emits delta > 1 so if we see only one row
but delta is 3 we skip then 2 rows.

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

diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index 186810ff84c9..7397305e0aba 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -293,6 +293,10 @@ IMPL_LINK( SvImpLBox, ScrollUpDownHdl, ScrollBar *, 
pScrollBar, void )
 if( !nDelta )
 return;
 
+// when only one row don't skip lines
+if (pScrollBar->GetPageSize() == 1)
+nDelta = nDelta > 0 ? 1 : -1;
+
 m_nFlags &= ~LBoxFlags::Filling;
 
 m_bInVScrollHdl = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 vcl/source/treelist/iconview.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 217b9423e4bdabba096a9ab2440d796a69cdf5b5
Author: Szymon Kłos 
AuthorDate: Wed Feb 3 17:21:54 2021 +0100
Commit: Szymon Kłos 
CommitDate: Thu Feb 4 15:12:02 2021 +0100

Resize IconView entry if there is no space

If IconView has only one row and there is no space for
default 100px height - scale down the entries.

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

diff --git a/vcl/source/treelist/iconview.cxx b/vcl/source/treelist/iconview.cxx
index 7786a6976c2a..44fc3db789d4 100644
--- a/vcl/source/treelist/iconview.cxx
+++ b/vcl/source/treelist/iconview.cxx
@@ -104,6 +104,10 @@ void IconView::PaintEntry(SvTreeListEntry& rEntry, 
tools::Long nX, tools::Long n
 const Color aHighlightTextColor(rSettings.GetHighlightTextColor());
 aHighlightFont.SetColor(aHighlightTextColor);
 
+Size aOutputSize = GetOutputSizePixel();
+if (aOutputSize.getHeight() < nTempEntryHeight)
+nTempEntryHeight = aOutputSize.getHeight();
+
 Size aRectSize(nTempEntryWidth, nTempEntryHeight);
 
 SvViewDataEntry* pViewDataEntry = GetViewDataEntry(&rEntry);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 vcl/source/treelist/svimpbox.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7b4fa321200263f9aefb36c7b3b163b9d3116de6
Author: Szymon Kłos 
AuthorDate: Wed Feb 3 16:17:29 2021 +0100
Commit: Szymon Kłos 
CommitDate: Thu Feb 4 15:11:54 2021 +0100

Invalidate IconView on scroll if has only one row

When we have only one row the page size for scrollbar is
set to 1 so delta is always 1. This prevents from invalidation
when scrolling up using a scrollbar button and results in artifacts
on the screen.

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

diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index 7d9bfbcfefb3..186810ff84c9 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -305,7 +305,7 @@ IMPL_LINK( SvImpLBox, ScrollUpDownHdl, ScrollBar *, 
pScrollBar, void )
 
 if( nDelta > 0 )
 {
-if( nDelta == 1 )
+if( nDelta == 1 && pScrollBar->GetPageSize() > 1)
 CursorDown();
 else
 PageDown( static_cast(nDelta) );
@@ -313,7 +313,7 @@ IMPL_LINK( SvImpLBox, ScrollUpDownHdl, ScrollBar *, 
pScrollBar, void )
 else
 {
 nDelta *= -1;
-if( nDelta == 1 )
+if( nDelta == 1 && pScrollBar->GetPageSize() > 1)
 CursorUp();
 else
 PageUp( static_cast(nDelta) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source include/editeng include/svx svx/source

[Noel (via logerrit)]

 editeng/source/uno/unofield.cxx |4 ++--
 include/editeng/mutxhelp.hxx|   36 
 include/editeng/unofield.hxx|4 ++--
 include/svx/unopage.hxx |9 +
 svx/source/unodraw/unopage.cxx  |2 +-
 5 files changed, 10 insertions(+), 45 deletions(-)

New commits:
commit 011d0d0078841a8ccebfdd1b360172314493c750
Author: Noel 
AuthorDate: Thu Feb 4 10:43:10 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 4 14:29:36 2021 +0100

remove svx/mutxhelp.hxx

which is a clone of cppu::BaseMutex

Change-Id: I6db266a4b67ac2d8b6c389cd27bf5bc7b9ecc754
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110402
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 59772b594490..081ccec809db 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -249,7 +249,7 @@ sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const 
css::uno::Sequence< sal_
 }
 
 SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw()
-:   OComponentHelper( getMutex() )
+:   OComponentHelper( m_aMutex )
 ,   mpPropSet(nullptr)
 ,   mnServiceId(nServiceId)
 ,   mpImpl( new SvxUnoFieldData_Impl )
@@ -315,7 +315,7 @@ SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) 
throw()
 }
 
 SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > const & 
xAnchor, const OUString& rPresentation, const SvxFieldData* pData ) throw()
-:   OComponentHelper( getMutex() )
+:   OComponentHelper( m_aMutex )
 ,   mxAnchor( xAnchor )
 ,   mpPropSet(nullptr)
 ,   mnServiceId(text::textfield::Type::UNSPECIFIED)
diff --git a/include/editeng/mutxhelp.hxx b/include/editeng/mutxhelp.hxx
deleted file mode 100644
index 7487fee48e46..
--- a/include/editeng/mutxhelp.hxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_EDITENG_MUTXHELP_HXX
-#define INCLUDED_EDITENG_MUTXHELP_HXX
-
-#include 
-
-class SvxMutexHelper
-{
-private:
-::osl::Mutex maMutex;
-
-public:
-::osl::Mutex& getMutex() { return maMutex; }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/unofield.hxx b/include/editeng/unofield.hxx
index 8eb521066347..173bb4b11121 100644
--- a/include/editeng/unofield.hxx
+++ b/include/editeng/unofield.hxx
@@ -27,7 +27,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 
 namespace com::sun::star::beans { class XPropertySetInfo; }
@@ -41,7 +41,7 @@ class SvxFieldData;
 css::uno::Reference< css::uno::XInterface > EDITENG_DLLPUBLIC 
SvxUnoTextCreateTextField(
 const OUString& ServiceSpecifier );
 
-class EDITENG_DLLPUBLIC SvxUnoTextField final : public SvxMutexHelper,
+class EDITENG_DLLPUBLIC SvxUnoTextField final : public cppu::BaseMutex,
 public ::cppu::OComponentHelper,
 public css::text::XTextField,
 public css::beans::XPropertySet,
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index a428254f6af7..bff0aa5fd5e3 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -27,7 +27,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -52,14 +52,15 @@ enum class SdrInventor : sal_uInt32;
 #define TWIPS_TO_MM(val) ((val * 127 + 36) / 72)
 #define MM_TO_TWIPS(val) ((val * 72 + 63) / 127)
 
-class SVXCORE_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper7< 
css::drawing::XDrawPage,
+class SVXCORE_DLLPUBLIC SvxDrawPage : protected cppu::BaseMutex,
+public ::cppu::WeakAggImplHelper7< 
css::drawing::XDrawPage,
css::drawing::XShapeGrouper,
css::drawing::XShapes2,
css::drawing::XShapes3,
css::lang::XServiceInfo,
css::lang::XUnoTunnel,
-

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

[Andrea Gelmini (via logerrit)]

 vcl/source/font/font.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ef98a5aae0449cb93f11e46ea9c802326a5dd8ef
Author: Andrea Gelmini 
AuthorDate: Thu Feb 4 10:14:53 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Feb 4 13:46:57 2021 +0100

Fix typo

Change-Id: I2202a3208b2b65f2ca7fb887c48fce311aef8f7f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110390
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index a47a811dbb64..b4f685e63967 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -500,7 +500,7 @@ SvStream& ReadFont( SvStream& rIStm, vcl::Font& rFont )
 // the writing producer was on a windows system, correct 
pre-multiplied value
 // is already set, nothing to do. Ignore 2nd value. Here a check
 // could be done if adapting the 2nd, NormedFontScaling value 
would be similar to
-// the set value for plausability reasons
+// the set value for plausibility reasons
 }
 #else
 // we do not run on windows and a NormedFontScaling was written
@@ -511,7 +511,7 @@ SvStream& ReadFont( SvStream& rIStm, vcl::Font& rFont )
 }
 else
 {
-// the writing producer was on a windows system, correct 
FontScvaling.
+// the writing producer was on a windows system, correct 
FontScaling.
 // The correct non-pre-multiplied value is the 2nd one, use it
 rFont.SetAverageFontWidth(nNormedFontScaling);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Attila Bakos (NISZ) (via logerrit)]

 sw/qa/uitest/data/tdf138512.odt |binary
 sw/qa/uitest/writer_tests7/tdf138512.py |   56 
 sw/source/uibase/shells/drwbassh.cxx|   38 +
 3 files changed, 86 insertions(+), 8 deletions(-)

New commits:
commit 54302a574a98d6fc071472f1fa64adaf70864a26
Author: Attila Bakos (NISZ) 
AuthorDate: Wed Jan 20 10:52:26 2021 +0100
Commit: László Németh 
CommitDate: Thu Feb 4 13:45:13 2021 +0100

tdf#138512 sw: fix crash on textbox alignment

Regression from 3347d71b23595919e167bd49932675e77cbbdbbb
(sw: fix text position at textbox alignment) has been
fixed by this commit. Hopefully there won't not be newer
regressions.

Please note the crash only occur on GTK vcl backend so,
the py-test only with that case will show the problem.
In the other case there were no crash.

Change-Id: I3280547a6195e240e5b33e0d0931fb60d4d19fff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109669
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/sw/qa/uitest/data/tdf138512.odt b/sw/qa/uitest/data/tdf138512.odt
new file mode 100755
index ..e72fb8eb37d5
Binary files /dev/null and b/sw/qa/uitest/data/tdf138512.odt differ
diff --git a/sw/qa/uitest/writer_tests7/tdf138512.py 
b/sw/qa/uitest/writer_tests7/tdf138512.py
new file mode 100755
index ..5b0191051d85
--- /dev/null
+++ b/sw/qa/uitest/writer_tests7/tdf138512.py
@@ -0,0 +1,56 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from com.sun.star.text.TextContentAnchorType import  AS_CHARACTER
+import org.libreoffice.unotest
+import pathlib
+import time
+
+
+def get_url_for_data_file(file_name):
+return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+class tdf138512(UITestCase):
+
+def test_tdf138512(self):
+
+# Open the bugdoc
+self.ui_test.load_file(get_url_for_data_file("tdf138512.odt"))
+
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+document = self.ui_test.get_component()
+
+# Check that the anchortype is as_char
+self.assertEqual( AS_CHARACTER, 
document.DrawPage.getByIndex(0).AnchorType)
+
+# Select the textbox
+self.xUITest.executeCommand(".uno:JumpToNextFrame")
+self.xUITest.executeCommand(".uno:JumpToNextFrame")
+
+# Align the shape to bottom
+time.sleep(1)
+self.xUITest.executeCommand(".uno:AlignDown")
+time.sleep(1)
+
+# Align the shape up
+self.xUITest.executeCommand(".uno:AlignUp")
+time.sleep(1)
+
+# Deselect the shape
+xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"}))
+xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "ESC"}))
+
+# Without the fix this will crash at this point with gtk vcl backend
+time.sleep(1)
+self.assertEqual( AS_CHARACTER, 
document.DrawPage.getByIndex(0).AnchorType)
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/source/uibase/shells/drwbassh.cxx 
b/sw/source/uibase/shells/drwbassh.cxx
index f901f32cc15d..b73dccb6036d 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -443,8 +443,7 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq)
 if ( bAlignPossible )
 {
 const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-if (rMarkList.GetMarkCount() == 1
-&& 
!SwTextBoxHelper::hasTextFrame(rMarkList.GetMark(0)->GetMarkedSdrObj()))
+if (rMarkList.GetMarkCount() == 1)
 {
 sal_Int16 nHorizOrient = -1, nVertOrient = -1;
 
@@ -472,13 +471,16 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq)
 break;
 }
 
+SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
+SwFrameFormat* pFrameFormat = FindFrameFormat(pObj);
+SwFrameFormat* pTextBox
+= SwTextBoxHelper::getOtherTextBoxFormat(pFrameFormat, 
RES_DRAWFRMFMT);
+
 if (nHorizOrient != -1)
 {
 pSh->StartAction();
-SdrObject* pObj = 
rMarkList.GetMark(0)->GetMarkedSdrObj();
-SwFrameFormat* pFrameFormat = FindFrameFormat( pObj );
 SwFormatHoriOrient 
aHOri

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

[Attila Bakos (NISZ) (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf136059.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport16.cxx  |7 ++
 sw/source/filter/ww8/docxsdrexport.cxx  |   74 
 3 files changed, 81 insertions(+)

New commits:
commit ec33be1d135c1523b4d872eb2f86c515f0419509
Author: Attila Bakos (NISZ) 
AuthorDate: Thu Jan 7 11:31:39 2021 +0100
Commit: László Németh 
CommitDate: Thu Feb 4 13:26:04 2021 +0100

tdf#136059 OOXML export: fix shape wrap "Contour"

Custom shapes lost their contour setting, e.g. the
text was wrapped around the bounding box of a diamond
instead of the shape.

Change-Id: Ic1e276b8957751aad95cc2624e9f54dcb853ddad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108930
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf136059.odt 
b/sw/qa/extras/ooxmlexport/data/tdf136059.odt
new file mode 100755
index ..50d808d12f2f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf136059.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index c35db2c88cd1..37610a23f43f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -31,6 +31,13 @@ protected:
 }
 };
 
+DECLARE_OOXMLEXPORT_TEST(testTdf136059, "tdf136059.odt")
+{
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Contour has not been exported!", true,
+getProperty(getShape(1), "SurroundContour"));
+// With the fix this shall pass, see tdf136059.
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf138892_noNumbering, 
"tdf138892_noNumbering.docx")
 {
 CPPUNIT_ASSERT_MESSAGE("Para1: Bullet point", 
!getProperty(getParagraph(1), "NumberingStyleName").isEmpty());
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 1af1dce13942..297ecf30a2f6 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -10,6 +10,7 @@
 #include "docxsdrexport.hxx"
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -34,6 +35,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace com::sun::star;
 using namespace oox;
 
@@ -792,6 +795,77 @@ void DocxSdrExport::startDMLAnchorInline(const 
SwFrameFormat* pFrameFormat, cons
 m_pImpl->getSerializer()->endElementNS(XML_wp, nWrapToken);
 }
 }
+else
+{
+// In this case we likely had an odt document to be exported to 
docx.
+// There is no grab-bag or something else so for a workaround,
+// let's export the geometry of the shape...
+// First get the UNO-shape
+uno::Reference xShape(
+
const_cast(pFrameFormat->FindRealSdrObject())->getUnoShape(),
+uno::UNO_QUERY);
+
+if (xShape && xShape->getShapeType() == 
u"com.sun.star.drawing.CustomShape")
+{
+try
+{
+// Get the properties of the Xshape
+uno::Reference XProps(xShape, 
uno::UNO_QUERY);
+// Get the "CustomShapeGeometry" property and from its 
Any() make a hashMap
+comphelper::SequenceAsHashMap aCustomShapeGeometry(
+XProps->getPropertyValue("CustomShapeGeometry"));
+// Get the "Path" property and from its Any() make a 
hashMap
+comphelper::SequenceAsHashMap 
aPath(aCustomShapeGeometry.getValue("Path"));
+// From the Any() of the "Coordinates" property get the 
points
+
uno::Sequence aCoords
+= aPath.getValue("Coordinates")
+  
.get>();
+
+// Check if only one side wrap allowed
+OUString sWrapType;
+switch (pFrameFormat->GetSurround().GetSurround())
+{
+case text::WrapTextMode_DYNAMIC:
+sWrapType = OUString("largest");
+break;
+case text::WrapTextMode_LEFT:
+sWrapType = OUString("left");
+break;
+case text::WrapTextMode_RIGHT:
+sWrapType = OUString("right");
+break;
+case text::WrapTextMode_PARALLEL:
+default:
+sWrapType = OUString("bothSides");
+break;
+}
+
+// And export:
+nWrapToken = XML_wrapTight;
+m_pImpl->getSerializer()->startElementNS(XML_wp, 
nWrapToken, XML_wrapText,
+ sWrapType);
+
+m_pImpl->getSerializer()->startElementN

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ca50dae1860e19ed4c236f315dc4eb729f007185
Author: Tor Lillqvist 
AuthorDate: Tue Jan 26 23:01:30 2021 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 4 13:20:19 2021 +0100

Accept iOS SDK 14.4

Change-Id: Ibb7800fe407ec6145fed4bb7903b18d40eba9d37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109997
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110409
Tested-by: Jenkins CollaboraOffice 

diff --git a/configure.ac b/configure.ac
index 8dc97511c0f0..eac77e24d3f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3148,8 +3148,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=14.3
-older_sdk_vers="14.2 14.1 14.0 13.7 13.6 13.5 13.4 13.2 13.1 13.0 12.4 
12.2"
+current_sdk_ver=14.4
+older_sdk_vers="14.3 14.2 14.1 14.0 13.7 13.6 13.5 13.4 13.2 13.1 13.0 
12.4 12.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Creating new Easy Hacks

[Aditya Pratap Singh]

Cool, thanks!

On Thu, 4 Feb 2021, 5:29 pm Ilmari Lauhakangas, <
ilmari.lauhakan...@libreoffice.org> wrote:

> On 4.2.2021 12.25, Aditya Pratap Singh wrote:
> > Since a scan-build report
> >  is now
> > available for the core repo, should I create new easy hacks as said here
> >  ?
>
> No, this is something for veteran contributors to tacke.
>
> Ilmari
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Updating the FindTheExpert wiki table

[Ilmari Lauhakangas]

Some updates were made recently to 
https://wiki.documentfoundation.org/FindTheExpert


Everyone is encouraged to review it further and add themselves into 
existing or new categories.


Ilmari
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/inc vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/inc/jsdialog/jsdialogbuilder.hxx |5 +++--
 vcl/jsdialog/jsdialogbuilder.cxx |   27 ++-
 2 files changed, 17 insertions(+), 15 deletions(-)

New commits:
commit 9197a43ac2e247c9688e9372d0446871876cbb14
Author: Szymon Kłos 
AuthorDate: Tue Dec 29 09:03:14 2020 +0100
Commit: Tomaž Vajngerl 
CommitDate: Thu Feb 4 13:01:49 2021 +0100

jsdialog: direct updates for treeview

We should use only weld:: interfaces methods
to detect moment of control's updates as all
the modifications goes through weld:: API.
Let's use higher abstraction layer and not use
vcl implementation details.

this reverts partially: 32bfa0e1c7e859aedc3988d5bfdf86f5d7bab98a

Change-Id: I2dd25c08dae3f5a95d077e2715788d636be47fe4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108433
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109605
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index eec95e714d64..61447cdeaf2f 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -389,8 +389,6 @@ public:
 
 class JSTreeView : public JSWidget
 {
-DECL_LINK(on_window_event, VclWindowEvent&, void);
-
 public:
 JSTreeView(VclPtr aNotifierWindow, VclPtr 
aContentWindow,
::SvTabListBox* pTextView, SalInstanceBuilder* pBuilder, bool 
bTakeOwnership,
@@ -415,6 +413,9 @@ public:
 virtual void set_text(int row, const OUString& rText, int col = -1) 
override;
 virtual void set_text(const weld::TreeIter& rIter, const OUString& rStr, 
int col = -1) override;
 
+virtual void expand_row(const weld::TreeIter& rIter) override;
+virtual void collapse_row(const weld::TreeIter& rIter) override;
+
 void drag_start();
 void drag_end();
 };
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 9829ca49d9ae..2282342239a3 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1044,8 +1044,6 @@ JSTreeView::JSTreeView(VclPtr 
aNotifierWindow, VclPtr
 : JSWidget(aNotifierWindow, 
aContentWindow, pTreeView,
 pBuilder, bTakeOwnership, 
sTypeOfJSON)
 {
-if (aNotifierWindow && aNotifierWindow->IsDisableIdleNotify())
-pTreeView->AddEventListener(LINK(this, JSTreeView, on_window_event));
 }
 
 void JSTreeView::set_toggle(int pos, TriState eState, int col)
@@ -1060,7 +1058,7 @@ void JSTreeView::set_toggle(int pos, TriState eState, int 
col)
 SalInstanceTreeView::set_toggle(pEntry, eState, col);
 signal_toggled(iter_col(SalInstanceTreeIter(pEntry), col));
 
-notifyDialogState();
+sendUpdate(m_xTreeView);
 }
 }
 
@@ -1106,7 +1104,7 @@ void JSTreeView::drag_end()
 
 m_xDropTarget->fire_drop(aEvent);
 
-notifyDialogState();
+sendUpdate(m_xTreeView);
 }
 
 g_DragSource = nullptr;
@@ -1120,28 +1118,31 @@ void JSTreeView::insert(const weld::TreeIter* pParent, 
int pos, const OUString*
 SalInstanceTreeView::insert(pParent, pos, pStr, pId, pIconName, 
pImageSurface, pExpanderName,
 bChildrenOnDemand, pRet);
 
-notifyDialogState();
+sendUpdate(m_xTreeView);
 }
 
 void JSTreeView::set_text(int row, const OUString& rText, int col)
 {
 SalInstanceTreeView::set_text(row, rText, col);
-notifyDialogState();
+sendUpdate(m_xTreeView);
 }
 
 void JSTreeView::set_text(const weld::TreeIter& rIter, const OUString& rStr, 
int col)
 {
 SalInstanceTreeView::set_text(rIter, rStr, col);
-notifyDialogState();
+sendUpdate(m_xTreeView);
 }
 
-IMPL_LINK(JSTreeView, on_window_event, VclWindowEvent&, rEvent, void)
+void JSTreeView::expand_row(const weld::TreeIter& rIter)
 {
-if (rEvent.GetId() == VclEventId::WindowPaint && get_visible() && 
m_xTreeView->IsDirtyModel())
-{
-sendUpdate(m_xTreeView);
-m_xTreeView->SetDirtyModel(false);
-}
+SalInstanceTreeView::expand_row(rIter);
+sendUpdate(m_xTreeView);
+}
+
+void JSTreeView::collapse_row(const weld::TreeIter& rIter)
+{
+SalInstanceTreeView::collapse_row(rIter);
+sendUpdate(m_xTreeView);
 }
 
 JSExpander::JSExpander(VclPtr aNotifierWindow, 
VclPtr aContentWindow,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |   23 ---
 1 file changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 9fd34175c7439dc48fd81a69fe4c1bc824c4c92d
Author: Szymon Kłos 
AuthorDate: Tue Dec 29 09:36:50 2020 +0100
Commit: Tomaž Vajngerl 
CommitDate: Thu Feb 4 13:00:24 2021 +0100

jsdialog: updates in similar fashion like other messages

to unify all jsdialog interactions

Change-Id: I22e14282f5a2c52ef44e68cb3933864c4e24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108435
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109783
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index d3c7f8f8764c..9829ca49d9ae 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -96,6 +96,7 @@ void JSDialogNotifyIdle::updateStatus(VclPtr 
pWindow)
 if (!m_aNotifierWindow)
 return;
 
+// will be deprecated soon
 if (m_aNotifierWindow->IsReallyVisible())
 {
 if (const vcl::ILibreOfficeKitNotifier* pNotifier = 
m_aNotifierWindow->GetLOKNotifier())
@@ -119,10 +120,25 @@ void JSDialogNotifyIdle::updateStatus(VclPtr 
pWindow)
 std::stringstream aStream;
 boost::property_tree::write_json(aStream, aTree);
 const std::string message = aStream.str();
-
pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_UNO_COMMAND_RESULT,
-  message.c_str());
+
pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_UNO_COMMAND_RESULT, 
message.c_str());
 }
 }
+
+// new approach - update also if hidden
+if (const vcl::ILibreOfficeKitNotifier* pNotifier = 
m_aNotifierWindow->GetLOKNotifier())
+{
+boost::property_tree::ptree aTree;
+
+aTree.put("jsontype", m_sTypeOfJSON);
+aTree.put("action", "update");
+aTree.put("id", m_aNotifierWindow->GetLOKWindowId());
+aTree.add_child("control", pWindow->DumpAsPropertyTree());
+
+std::stringstream aStream;
+boost::property_tree::write_json(aStream, aTree);
+const std::string message = aStream.str();
+pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, 
message.c_str());
+}
 }
 
 boost::property_tree::ptree JSDialogNotifyIdle::generateCloseMessage() const
@@ -465,7 +481,8 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialog(const OString& id,
 return pRet;
 }
 
-std::unique_ptr 
JSInstanceBuilder::weld_message_dialog(const OString& id, bool bTakeOwnership)
+std::unique_ptr 
JSInstanceBuilder::weld_message_dialog(const OString& id,
+
bool bTakeOwnership)
 {
 std::unique_ptr pRet;
 ::MessageDialog* pMessageDialog = m_xBuilder->get<::MessageDialog>(id);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Creating new Easy Hacks

[Ilmari Lauhakangas]

On 4.2.2021 12.25, Aditya Pratap Singh wrote:
Since a scan-build report 
 is now 
available for the core repo, should I create new easy hacks as said here 
 ?


No, this is something for veteran contributors to tacke.

Ilmari
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Attila Bakos (NISZ) (via logerrit)]

 sw/qa/extras/layout/data/tdf138951.odt|binary
 sw/qa/extras/layout/layout2.cxx   |   32 ++
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx |   15 --
 sw/source/core/doc/textboxhelper.cxx  |   28 ++
 4 files changed, 73 insertions(+), 2 deletions(-)

New commits:
commit c96c386c5db45dc4d5e358915caad7474e373068
Author: Attila Bakos (NISZ) 
AuthorDate: Fri Jan 15 14:45:29 2021 +0100
Commit: László Németh 
CommitDate: Thu Feb 4 12:56:11 2021 +0100

tdf#136516 add positioning to SwTextBoxHelper::syncProperty()

Before when the shape of the textbox moved, the anchor
and the position synched. However if the new position
of the shape required new anchor position, that was not
handled. In addition after positioning and new anchor
position the sync is necessary again, because anchor
moving can change the calculated position values and
that can change the anchor etc...

The OOXMLImport test modification was necessary because
a test failed during Jenkins tests however there was
no difference between the test document before and after the
fix. In addition I can not reproduce the fail of the test
in my local repository, and only the Linux- and Windows
builds showed the problem.

Solved also tdf#138951, tdf#139686 and tdf#139092.

Change-Id: Ibdfff89db01d75aeae74948e2ea41ce5a613b6fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109365
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/layout/data/tdf138951.odt 
b/sw/qa/extras/layout/data/tdf138951.odt
new file mode 100755
index ..5cb4940bd5fe
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf138951.odt differ
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index 253783a9e146..b84a2c51d5e5 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -26,6 +26,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -283,6 +284,37 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, 
testRedlineShowHideFootnotePagination)
 "zzz. zzz  7 zzz zzz zzz zzz  zz 
 ");
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testtdf138951)
+{
+// Open the bugdoc
+auto pDoc = createDoc("tdf138951.odt");
+
+// Get the only shape
+uno::Reference xShape(getShape(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xShape);
+
+// Gather its formats: the shape and textbox
+const SwFrameFormat* pTxFrm = 
SwTextBoxHelper::getOtherTextBoxFormat(xShape);
+CPPUNIT_ASSERT(pTxFrm);
+const SwFrameFormat* pShFrm = 
SwTextBoxHelper::getOtherTextBoxFormat(pTxFrm, RES_FLYFRMFMT);
+CPPUNIT_ASSERT(pShFrm);
+
+pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout();
+
+// Get the bound rectangle of the textframe
+tools::Rectangle aTxtFrmRect(pTxFrm->FindRealSdrObject()->GetLogicRect());
+
+// Get the bound rectangle of the shape
+tools::Rectangle aShpRect(pShFrm->FindRealSdrObject()->GetLogicRect());
+
+// Check the anchor the same and the textbox is inside the shape
+const bool bIsAnchTheSame
+= *pShFrm->GetAnchor().GetContentAnchor() == 
*pShFrm->GetAnchor().GetContentAnchor();
+CPPUNIT_ASSERT_MESSAGE("The anchor is different for the textbox and 
shape!", bIsAnchTheSame);
+CPPUNIT_ASSERT_MESSAGE("The textbox has fallen apart!", 
aShpRect.IsInside(aTxtFrmRect));
+// Without the fix the anchor differs, and the frame ouside of the shape
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testRedlineNumberInNumbering)
 {
 SwDoc* pDoc = createDoc("tdf42748.fodt");
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index f7114235cc77..474cfbe2b13d 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -28,6 +28,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -36,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class Test : public SwModelTestBase
 {
@@ -398,8 +400,17 @@ DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
 {
 // the position of the flying text frame should be off page
 // 30624 below its anchor
-OUString aTop = parseDump("//fly[1]/infos/bounds", "top");
-CPPUNIT_ASSERT_EQUAL(OUString("30624"), aTop);
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+SwRootFrame* pRootFrame = 
pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+const SwRect aPageRect = pRootFrame->getFrameArea();
+const SwRect aShapeRect(getShape(1)->getPosition().X, 
getShape(1)->getPosition().Y,
+getShape(1)->getSize().Width, 
getShape(1)->getSize().Height);
+CPPUNIT_ASSERT_MESSAGE("The textframe must be off-p

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - external/postgresql

[Michael Stahl (via logerrit)]

 external/postgresql/ExternalProject_postgresql.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 1248fa8e34ae331339a608d9b09558ef199bc59f
Author: Michael Stahl 
AuthorDate: Wed Feb 3 18:59:41 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 4 12:55:15 2021 +0100

postgresql: try to cargo-cult MSBuild arguments

Extremely unclear to me whether these are useful or necessary,
but the other MSBuild ones have them.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit bbc5cc71fd1723db8cb5020f83db5cafc0f8a52a)

Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110406
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/external/postgresql/ExternalProject_postgresql.mk 
b/external/postgresql/ExternalProject_postgresql.mk
index 1e0c7d848047..2d360134e6ba 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -24,7 +24,10 @@ $(eval $(call gb_ExternalProject_use_nmake,postgresql,build))
 
 $(call gb_ExternalProject_get_state_target,postgresql,build) :
$(call gb_ExternalProject_run,build,\
-   MSBFLAGS=/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
+   MSBFLAGS="/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
+   $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 
/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
+   $(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 
/p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
+   $(if $(filter 
150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))"
 \
$(PERL) build.pl $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) 
libpq \
,src/tools/msvc)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 2 commits - external/postgresql

[Michael Stahl (via logerrit)]

 external/postgresql/ExternalProject_postgresql.mk |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 815a8346e1cadfcf9861f5341f3bb0cbc00e3e28
Author: Michael Stahl 
AuthorDate: Wed Feb 3 18:59:41 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 4 11:51:00 2021 +0100

postgresql: try to cargo-cult MSBuild arguments

Extremely unclear to me whether these are useful or necessary,
but the other MSBuild ones have them.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit bbc5cc71fd1723db8cb5020f83db5cafc0f8a52a)

Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1

diff --git a/external/postgresql/ExternalProject_postgresql.mk 
b/external/postgresql/ExternalProject_postgresql.mk
index 1e0c7d848047..2d360134e6ba 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -24,7 +24,10 @@ $(eval $(call gb_ExternalProject_use_nmake,postgresql,build))
 
 $(call gb_ExternalProject_get_state_target,postgresql,build) :
$(call gb_ExternalProject_run,build,\
-   MSBFLAGS=/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
+   MSBFLAGS="/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
+   $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 
/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
+   $(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 
/p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
+   $(if $(filter 
150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))"
 \
$(PERL) build.pl $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) 
libpq \
,src/tools/msvc)
 
commit 27928a11cd150d7538937109326da295adebe844
Author: Michael Stahl 
AuthorDate: Thu Feb 4 11:50:41 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 4 11:50:41 2021 +0100

Revert "postgresql: try to cargo-cult MSBuild arguments"

This reverts commit 02c1cd9f93e5b5da469e9d6ff8668f415965ecfc.

diff --git a/external/postgresql/ExternalProject_postgresql.mk 
b/external/postgresql/ExternalProject_postgresql.mk
index 151b62397dd4..1e0c7d848047 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -24,9 +24,7 @@ $(eval $(call gb_ExternalProject_use_nmake,postgresql,build))
 
 $(call gb_ExternalProject_get_state_target,postgresql,build) :
$(call gb_ExternalProject_run,build,\
-   MSBFLAGS="/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
-   $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 
/p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
-   $(if $(filter 
10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \
+   MSBFLAGS=/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
$(PERL) build.pl $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) 
libpq \
,src/tools/msvc)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - external/postgresql

[Michael Stahl (via logerrit)]

 external/postgresql/ExternalProject_postgresql.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit aad28ac2ac2b76d7ab1ffad7d7fe62229f59d066
Author: Michael Stahl 
AuthorDate: Wed Feb 3 18:59:41 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 4 11:36:03 2021 +0100

postgresql: try to cargo-cult MSBuild arguments

Extremely unclear to me whether these are useful or necessary,
but the other MSBuild ones have them.

Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit bbc5cc71fd1723db8cb5020f83db5cafc0f8a52a)

diff --git a/external/postgresql/ExternalProject_postgresql.mk 
b/external/postgresql/ExternalProject_postgresql.mk
index 001c3f961ac8..9df01cae9ef3 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -24,7 +24,10 @@ $(eval $(call gb_ExternalProject_use_nmake,postgresql,build))
 
 $(call gb_ExternalProject_get_state_target,postgresql,build) :
$(call gb_ExternalProject_run,build,\
-   MSBFLAGS=/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
+   MSBFLAGS="/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
+   $(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 
/p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
+   $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 
/p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
+   $(if $(filter 
10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \
$(PERL) build.pl $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) 
libpq \
,src/tools/msvc)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - external/postgresql

[Michael Stahl (via logerrit)]

 external/postgresql/ExternalProject_postgresql.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c2b8d2adca8830d5e893edc2c2c560b11dba4802
Author: Michael Stahl 
AuthorDate: Wed Feb 3 18:59:41 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 4 11:34:21 2021 +0100

postgresql: try to cargo-cult MSBuild arguments

Extremely unclear to me whether these are useful or necessary,
but the other MSBuild ones have them.

Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit bbc5cc71fd1723db8cb5020f83db5cafc0f8a52a)

diff --git a/external/postgresql/ExternalProject_postgresql.mk 
b/external/postgresql/ExternalProject_postgresql.mk
index 001c3f961ac8..9df01cae9ef3 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -24,7 +24,10 @@ $(eval $(call gb_ExternalProject_use_nmake,postgresql,build))
 
 $(call gb_ExternalProject_get_state_target,postgresql,build) :
$(call gb_ExternalProject_run,build,\
-   MSBFLAGS=/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
+   MSBFLAGS="/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
+   $(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 
/p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
+   $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 
/p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
+   $(if $(filter 
10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \
$(PERL) build.pl $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) 
libpq \
,src/tools/msvc)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Creating new Easy Hacks

[Aditya Pratap Singh]

Since a scan-build report
 is now
available for the core repo, should I create new easy hacks as said here
 ?


-- 
Regards,
Aditya
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/source

[Noel Grandin (via logerrit)]

 sc/source/core/data/dociter.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 04ccd7f247dd6be93e7f44e11333852ae65dbef2
Author: Noel Grandin 
AuthorDate: Wed Feb 3 15:19:20 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 4 11:20:11 2021 +0100

tdf#140014 calc crash on COUNTIF

regression from jumbo-sheets work

Change-Id: I207cf3cc4c6d295688936ea3b672b32f9c09d89a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110349
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit c4540f86925609a54d473051ceb8dcf46d0e22aa)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110358

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 44de36f1ab7b..fe01559db1dd 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1460,6 +1460,8 @@ ScCountIfCellIterator::ScCountIfCellIterator(ScDocument* 
pDocument, const ScInte
 mrContext( rContext ),
 nTab( nTable)
 {
+maParam.nCol1 = 
pDoc->maTabs[nTable]->ClampToAllocatedColumns(maParam.nCol1);
+maParam.nCol2 = 
pDoc->maTabs[nTable]->ClampToAllocatedColumns(maParam.nCol2);
 nCol = maParam.nCol1;
 nRow = maParam.nRow1;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source filter/source oox/source reportdesign/source sc/source sd/source slideshow/source svx/source sw/source

[Noel (via logerrit)]

 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |4 -
 chart2/source/view/charttypes/BarChart.cxx|   10 --
 chart2/source/view/diagram/VDiagram.cxx   |7 -
 chart2/source/view/main/ChartView.cxx |   36 +++--
 filter/source/msfilter/eschesdo.cxx   |   10 --
 oox/source/drawingml/shape.cxx|   10 +-
 reportdesign/source/core/api/Shape.cxx|   14 +--
 reportdesign/source/core/sdr/RptPage.cxx  |3 
 reportdesign/source/ui/report/ReportSection.cxx   |6 -
 reportdesign/source/ui/report/ViewsWindow.cxx |3 
 sc/source/filter/xml/XMLTableShapeImportHelper.cxx|   17 +---
 sc/source/filter/xml/xmlexprt.cxx |   12 ---
 sc/source/ui/Accessibility/AccessibleDocument.cxx |   11 +--
 sc/source/ui/unoobj/docuno.cxx|   29 +++
 sc/source/ui/unoobj/shapeuno.cxx  |7 -
 sc/source/ui/unoobj/viewuno.cxx   |   40 --
 sc/source/ui/vba/vbasheetobject.cxx   |4 -
 sd/source/ui/unoidl/SdUnoDrawView.cxx |   11 +--
 sd/source/ui/unoidl/unolayer.cxx  |6 -
 sd/source/ui/unoidl/unomodel.cxx  |   21 ++---
 sd/source/ui/unoidl/unopage.cxx   |   22 +-
 slideshow/source/engine/slide/shapemanagerimpl.cxx|3 
 slideshow/source/engine/slide/slideimpl.cxx   |3 
 svx/source/accessibility/ShapeTypeHandler.cxx |4 -
 svx/source/unodraw/unopage.cxx|   51 +-
 svx/source/unodraw/unoshap2.cxx   |   18 +---
 svx/source/unodraw/unoshap3.cxx   |   11 ---
 sw/source/core/unocore/unodraw.cxx|4 -
 28 files changed, 135 insertions(+), 242 deletions(-)

New commits:
commit 18982376918c88ec09c2c7fd42ef635e93897b05
Author: Noel 
AuthorDate: Thu Feb 4 10:22:58 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 4 11:19:35 2021 +0100

use more getSdrObjectFromXShape

Change-Id: Ia237643ab040425f231f781c86e7e060f0b53717
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110400
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx 
b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 9d448b4119fe..ced8421d211b 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -345,9 +345,7 @@ SdrObject* DrawViewWrapper::getSdrObject( const 
uno::Reference<
 uno::Reference< lang::XTypeProvider > xTypeProvider( xShape, 
uno::UNO_QUERY );
 if(xTypeProvider.is())
 {
-SvxShape* pSvxShape = 
comphelper::getUnoTunnelImplementation(xShape);
-if(pSvxShape)
-pRet = pSvxShape->GetSdrObject();
+pRet = SdrObject::getSdrObjectFromXShape(xShape);
 }
 return pRet;
 }
diff --git a/chart2/source/view/charttypes/BarChart.cxx 
b/chart2/source/view/charttypes/BarChart.cxx
index da7461f38e7a..a1de2d065003 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -441,15 +441,7 @@ void BarChart::adaptOverlapAndGapwidthForGroupBarsPerAxis()
 
 static E3dScene* lcl_getE3dScene(uno::Reference const & 
xInterface)
 {
-E3dScene* pScene = nullptr;
-
-SvxShape* pSvxShape = 
comphelper::getUnoTunnelImplementation(xInterface);
-if (pSvxShape)
-{
-SdrObject* pObject = pSvxShape->GetSdrObject();
-pScene = dynamic_cast(pObject);
-}
-return pScene;
+return 
dynamic_cast(SdrObject::getSdrObjectFromXShape(xInterface));
 }
 
 void BarChart::createShapes()
diff --git a/chart2/source/view/diagram/VDiagram.cxx 
b/chart2/source/view/diagram/VDiagram.cxx
index 670dfab90424..bf3c96e82d53 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -205,12 +205,7 @@ static E3dScene* lcl_getE3dScene( const uno::Reference< 
drawing::XShape >& xShap
 uno::Reference< lang::XTypeProvider > xTypeProvider( xShape, 
uno::UNO_QUERY );
 if(xTypeProvider.is())
 {
-SvxShape* pSvxShape = 
comphelper::getUnoTunnelImplementation(xShape);
-if(pSvxShape)
-{
-SdrObject* pObj = pSvxShape->GetSdrObject();
-pRet = dynamic_cast< E3dScene* >(pObj);
-}
+pRet = dynamic_cast< E3dScene* 
>(SdrObject::getSdrObjectFromXShape(xShape));
 }
 return pRet;
 }
diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index e449680daf4c..c88144137721 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1791,22 +1791,18 @@ awt::Rectan

Re: GSOC 2021

[Thorsten Behrens]

Dante Doménech wrote:
> Hello. Would it be fine if I edited this?
> https://wiki.documentfoundation.org/Development/GSoC/Ideas
> 
Please do!

(would you also be interested in participating? as either student or
mentor?)

Cheers,

-- Thorsten


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac

[Caolán McNamara (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 380ab85b6594a013f34f5e6ec69fb569336bbb48
Author: Caolán McNamara 
AuthorDate: Wed Feb 3 15:37:03 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 4 10:55:46 2021 +0100

don't need FindBin if --disable-openssl used

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

diff --git a/configure.ac b/configure.ac
index 75f5543703f2..e6607334b067 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5985,7 +5985,7 @@ fi
 if test "$with_system_hsqldb" = "yes"; then
 perl_use_string="$perl_use_string ; use Archive::Zip"
 fi
-if test "$with_system_openssl" != "yes"; then
+if test "$enable_openssl" = "yes" -a "$with_system_openssl" != "yes"; then
 # OpenSSL needs that to build
 perl_use_string="$perl_use_string ; use FindBin"
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: wizards/source

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/scriptforge/SF_Exception.xba   |4 
 wizards/source/scriptforge/SF_Root.xba|   10 ++
 wizards/source/scriptforge/po/ScriptForge.pot |   15 ++-
 wizards/source/scriptforge/po/en.po   |   15 ++-
 wizards/source/sfdocuments/SF_FormControl.xba |   15 ---
 5 files changed, 50 insertions(+), 9 deletions(-)

New commits:
commit 304571f88154ec1cf3e605b37ef54492b77451ef
Author: Jean-Pierre Ledure 
AuthorDate: Wed Feb 3 17:05:24 2021 +0100
Commit: Jean-Pierre Ledure 
CommitDate: Thu Feb 4 10:53:44 2021 +0100

ScriptForge - (SF_FormControl) Review error checking

- separate error message vs corresponding message for dialogs
- more precision on form naming: form document.form name
- add new error message in SF_Exception and SF_Root messages lists
- add new message in po files

Change-Id: I1f7f2dc7b5627d12a8c5ecf238e6cbd3aa1505fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110380
Tested-by: Jean-Pierre Ledure 
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure 

diff --git a/wizards/source/scriptforge/SF_Exception.xba 
b/wizards/source/scriptforge/SF_Exception.xba
index 8739e0edfa8e..18d562b21e7b 100644
--- a/wizards/source/scriptforge/SF_Exception.xba
+++ b/wizards/source/scriptforge/SF_Exception.xba
@@ -110,6 +110,7 @@ Const CALCFORMNOTFOUNDERROR =   
"CALCFORMNOTFOUNDERROR"
 Const WRITERFORMNOTFOUNDERROR  =   "WRITERFORMNOTFOUNDERROR"
 Const BASEFORMNOTFOUNDERROR=   
"BASEFORMNOTFOUNDERROR"
 Const SUBFORMNOTFOUNDERROR =   "SUBFORMNOTFOUNDERROR"
+Const FORMCONTROLTYPEERROR =   "FORMCONTROLTYPEERROR"
 
 ' SF_Dialog
 Const DIALOGNOTFOUNDERROR  =   "DIALOGNOTFOUNDERROR"
@@ -847,6 +848,9 @@ Try:
Case SUBFORMNOTFOUNDERROR   '  
SF_Form.Subforms(Subform, Mainform)
sMessage = sLocation _
& "\n" & 
"\n" & .GetText("SUBFORMNOTFOUND", pvArgs(0), pvArgs(1))
+   Case FORMCONTROLTYPEERROR   '  
SF_FormControl._SetProperty(ControlName, FormName, ControlType, Property)
+   sMessage = sLocation _
+   & "\n" & 
"\n" & .GetText("FORMCONTROLTYPE", pvArgs(0), 
pvArgs(1), pvArgs(2), pvArgs(3))
Case DIALOGNOTFOUNDERROR'  
SF_Dialog._NewDialog(Service, DialogName, WindowName)
sMessage = sLocation _
& "\n" & 
"\n" & .GetText("DIALOGNOTFOUND", pvArgs(0), pvArgs(1), 
pvArgs(2), pvArgs(3), pvArgs(4) _
diff --git a/wizards/source/scriptforge/SF_Root.xba 
b/wizards/source/scriptforge/SF_Root.xba
index 3d643acdd121..334e4798018c 100644
--- a/wizards/source/scriptforge/SF_Root.xba
+++ b/wizards/source/scriptforge/SF_Root.xba
@@ -774,6 +774,16 @@ Try:
&   
"%1: A form name\n" _
&   
"%2: A form name" _
)
+   '  SF_FormControl._SetProperty
+   .AddText(   Context := "FORMCONTROLTYPE" _
+   , MsgId := "The control 
'%1' in form '%2' is of type '%3'.\n" _
+   & 
"The property or method '%4' is not applicable on that type of 
form controls." _
+   , Comment :=
"SF_FormControl property setting\n" _
+   &   
"%1: An identifier\n" _
+   &   
"%2: An identifier\n" _
+   &   
"%3: A string\n" _
+   &   
"%4: An identifier" _
+   )
'  SF_Dialog._NewDialog
.AddText(   Context := "DIALOGNOTFOUND" _
, MsgId := "The requested 
dialog could not be located in the given container or library.\n" _
diff --git a/wizards/source/scriptforge/po/ScriptForge.pot 
b/wizards/source/scriptforge/po/ScriptForge.pot
index d75dbab0a991..a4c6ff514bc4 100644
--- a/wizards/source/scriptforge/po/ScriptForge.pot
+++ b/wizards/source/scriptforge/po/ScriptForge.pot
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2020-12-29 18:05:28\n"
+"POT-Creation-Date: 2021-02-03 15:55:36\n"
 "PO-Revision-Date: -MM-DD HH:MM:SS\n"
 "Last-Translator: FULL NAME \n

Re: GSOC 2021

[Ilmari Lauhakangas]

On 4.2.2021 11.26, Dante Doménech wrote:

Hello. Would it be fine if I edited this?
https://wiki.documentfoundation.org/Development/GSoC/Ideas 



There are a couple of things on starmath that would be long enough to 
take multiple weeks.


Add this one:
This is one of the biggest newbies slayer:
https://bugs.documentfoundation.org/show_bug.cgi?id=121484 


Which causes:
https://bugs.documentfoundation.org/show_bug.cgi?id=127100 

Basically when you are in a ribbon mode and open an OLE formula, the 
ribbon from the calling module does not hide because starmath does not 
have one.
That makes the newbies try to use the ribbon from the invoker module 
(does not work) and go crazy.


And also add this one:
https://bugs.documentfoundation.org/show_bug.cgi?id=35033 


Basically inline graphics in impress and draw text boxes.


If you want to mentor an idea, yes, you can add it and your contact 
info. I actually emailed you about this topic some time ago.


Ilmari
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - configure.ac

[Caolán McNamara (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 12520fd5c5d5a7191fbe17ddd503764b0c7368fa
Author: Caolán McNamara 
AuthorDate: Wed Feb 3 15:37:03 2021 +
Commit: Michael Stahl 
CommitDate: Thu Feb 4 10:48:09 2021 +0100

don't need FindBin if --disable-openssl used

Change-Id: I786ca760b8f4e606945acfc9b2667c2305c014d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110353
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index 42158d2613b2..6a74bd3c6060 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6014,7 +6014,7 @@ fi
 if test "$with_system_hsqldb" = "yes"; then
 perl_use_string="$perl_use_string ; use Archive::Zip"
 fi
-if test "$with_system_openssl" != "yes"; then
+if test "$enable_openssl" = "yes" -a "$with_system_openssl" != "yes"; then
 # OpenSSL needs that to build
 perl_use_string="$perl_use_string ; use FindBin"
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/rtfexport/data/gutter-left.rtf |4 
 sw/qa/extras/rtfexport/rtfexport4.cxx   |   15 +++
 sw/source/filter/ww8/rtfattributeoutput.cxx |5 +
 writerfilter/source/rtftok/rtfdispatchvalue.cxx |5 +
 4 files changed, 29 insertions(+)

New commits:
commit 113e7c1be4ca87f936738270cf763800e8ec5832
Author: Miklos Vajna 
AuthorDate: Thu Feb 4 09:31:11 2021 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 4 10:35:46 2021 +0100

tdf#91920 sw page gutter margin: add RTF filter

Map between \gutter and SvxLRSpaceItem::m_nGutterMargin.

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

diff --git a/sw/qa/extras/rtfexport/data/gutter-left.rtf 
b/sw/qa/extras/rtfexport/data/gutter-left.rtf
new file mode 100644
index ..66016045c9d1
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/gutter-left.rtf
@@ -0,0 +1,4 @@
+{\rtf1
+\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter720
+\pard\plain Half in gutter on the left\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport4.cxx 
b/sw/qa/extras/rtfexport/rtfexport4.cxx
index cf9a25e40d7c..2bfdf0a13c87 100644
--- a/sw/qa/extras/rtfexport/rtfexport4.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport4.cxx
@@ -385,6 +385,21 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf126309)
 
static_cast(getProperty(getParagraph(1), 
"ParaAdjust")));
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testGutterLeft)
+{
+load(mpTestDocumentPath, "gutter-left.rtf");
+reload(mpFilter, "gutter-left.rtf");
+uno::Reference xPageStyle;
+getStyles("PageStyles")->getByName("Standard") >>= xPageStyle;
+sal_Int32 nGutterMargin{};
+xPageStyle->getPropertyValue("GutterMargin") >>= nGutterMargin;
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 1270
+// - Actual  : 0
+// i.e. gutter margin was lost.
+CPPUNIT_ASSERT_EQUAL(static_cast(1270), nGutterMargin);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 3f39c585a0ab..79f88ab22ba0 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3163,6 +3163,11 @@ void RtfAttributeOutput::FormatLRSpace(const 
SvxLRSpaceItem& rLRSpace)
 m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGRSXN);
 
m_aSectionBreaks.append(static_cast(rLRSpace.GetRight()));
 }
+if (rLRSpace.GetGutterMargin())
+{
+m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_GUTTER);
+
m_aSectionBreaks.append(static_cast(rLRSpace.GetGutterMargin()));
+}
 if (!m_bBufferSectionBreaks)
 
m_rExport.Strm().WriteOString(m_aSectionBreaks.makeStringAndClear());
 }
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx 
b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index 930c613c9750..f9198baafb12 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -1375,6 +1375,11 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword 
nKeyword, int nParam)
NS_ooxml::LN_EG_SectPrContents_pgMar, 
NS_ooxml::LN_CT_PageMar_footer,
pIntValue);
 break;
+case RTF_GUTTER:
+putNestedAttribute(m_aStates.top().getSectionSprms(),
+   NS_ooxml::LN_EG_SectPrContents_pgMar, 
NS_ooxml::LN_CT_PageMar_gutter,
+   pIntValue);
+break;
 case RTF_DEFTAB:
 m_aSettingsTableSprms.set(NS_ooxml::LN_CT_Settings_defaultTabStop, 
pIntValue);
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libre-Calc, Auto-Filter] Hint to improve the auto-filter in Libre-calc

[yonatan jose mejia vargas]

Best regards!.

I am writing to report a problem that I have in Libre-Calc with the Auto-Filter.

I made a long list of products with their prices and I used the
auto-filter to search by name or by price and everything worked
wonderfully (this tool is really great), my only drawback with this
filter is that it does not stay protected if it is activated The
"protect sheet" function, this means that if the user deactivates it
by mistake, they will not know how to activate it again (for example
if the user has no experience using libre-calc).

See my question here:
https://ask.libreoffice.org/en/question/272257/calc-autofiltro-protect-automatic-filters-to-avoid-accidental-deactivation-deletion/

Do you think this will be improved in the future? I would also like
you to consider protecting the auto-filter as a request for a new
function or improvement.

I leave, greetings and thanks in advance !.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

GSOC 2021

[Dante Doménech]

Hello. Would it be fine if I edited this?
https://wiki.documentfoundation.org/Development/GSoC/Ideas

There are a couple of things on starmath that would be long enough to take
multiple weeks.

Add this one:
This is one of the biggest newbies slayer:
https://bugs.documentfoundation.org/show_bug.cgi?id=121484
Which causes:
https://bugs.documentfoundation.org/show_bug.cgi?id=127100
Basically when you are in a ribbon mode and open an OLE formula, the ribbon
from the calling module does not hide because starmath does not have one.
That makes the newbies try to use the ribbon from the invoker module (does
not work) and go crazy.

And also add this one:
https://bugs.documentfoundation.org/show_bug.cgi?id=35033
Basically inline graphics in impress and draw text boxes.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/win

[Noel Grandin (via logerrit)]

 vcl/win/app/salinst.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 14eff34dd10c047de222813eb16198b295b31d54
Author: Noel Grandin 
AuthorDate: Thu Feb 4 08:44:45 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 4 09:22:18 2021 +0100

fix sporadic crash in sd_misc_tests on windows

we end up trying to process a timer message, but from inside
the vcl de-init function, which means the timer stuff has already
been de-initialised.

Change-Id: I94703219754f1ccabd3065fc5ea437f39264197b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110397
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 828bd8fec248..ea4c9420beb0 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -557,6 +557,12 @@ LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM 
wParam, LPARAM lParam, b
 SAL_INFO("vcl.gdi.wndproc", "SalComWndProc(nMsg=" << nMsg << ", wParam=" 
<< wParam
 << ", lParam=" << lParam << "); inSendMsg: " 
<< bIsOtherThreadMessage);
 
+if (ImplGetSVData()->mbDeInit)
+{
+SAL_WARN("vcl.gdi.wndproc", "ignoring timer event because we are 
shutting down");
+return 0;
+}
+
 switch ( nMsg )
 {
 case SAL_MSG_THREADYIELD:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl vcl/source

[Miklos Vajna (via logerrit)]

 include/vcl/filter/PDFiumLibrary.hxx   |3 +-
 include/vcl/pdf/PDFFindFlags.hxx   |   34 +
 vcl/source/graphic/VectorGraphicSearch.cxx |   14 +--
 vcl/source/pdf/PDFiumLibrary.cxx   |   11 +++--
 4 files changed, 52 insertions(+), 10 deletions(-)

New commits:
commit 71c32c31dab86fe9c6d5893eee6821beaa3a3f43
Author: Miklos Vajna 
AuthorDate: Wed Feb 3 21:00:58 2021 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 4 09:11:14 2021 +0100

pdfium: add PDFFindFlags wrapper

So that vcl::pdf::PDFiumTextPage::findStart() can be called without
including fpdf_text.h.

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

diff --git a/include/vcl/filter/PDFiumLibrary.hxx 
b/include/vcl/filter/PDFiumLibrary.hxx
index 667fa614da70..ab0b5db7e608 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -180,7 +181,7 @@ public:
 
 int countChars();
 unsigned int getUnicode(int index);
-std::unique_ptr findStart(const OUString& rFindWhat, 
sal_uInt64 nFlags,
+std::unique_ptr findStart(const OUString& rFindWhat, 
PDFFindFlags nFlags,
   sal_Int32 nStartIndex);
 };
 
diff --git a/include/vcl/pdf/PDFFindFlags.hxx b/include/vcl/pdf/PDFFindFlags.hxx
new file mode 100644
index ..f43efc7a6f7d
--- /dev/null
+++ b/include/vcl/pdf/PDFFindFlags.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#pragma once
+
+#include 
+
+namespace vcl::pdf
+{
+enum class PDFFindFlags : sal_uInt32
+{
+MatchCase = 0x0001,
+MatchWholeWord = 0x0002,
+Consecutive = 0x0004,
+};
+
+} // namespace vcl::pdf
+
+namespace o3tl
+{
+template <>
+struct typed_flags : 
is_typed_flags
+{
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/graphic/VectorGraphicSearch.cxx 
b/vcl/source/graphic/VectorGraphicSearch.cxx
index 01b76fb28b06..59e51ea795e2 100644
--- a/vcl/source/graphic/VectorGraphicSearch.cxx
+++ b/vcl/source/graphic/VectorGraphicSearch.cxx
@@ -101,15 +101,15 @@ public:
 if (mnCurrentIndex >= 0)
 nStartIndex = mnCurrentIndex;
 
-// FPDF_MATCHCASE, FPDF_MATCHWHOLEWORD, FPDF_CONSECUTIVE
-// FPDF_MATCHCASE - If not set, it will not match case by default.
-// FPDF_MATCHWHOLEWORD - If not set, it will not match the whole word 
by default.
-// FPDF_CONSECUTIVE - If not set, it will skip past the current match 
to look for the next match.
-int nSearchFlags = 0;
+// vcl::pdf::PDFFindFlags::MatchCase, 
vcl::pdf::PDFFindFlags::MatchWholeWord, vcl::pdf::PDFFindFlags::Consecutive
+// vcl::pdf::PDFFindFlags::MatchCase - If not set, it will not match 
case by default.
+// vcl::pdf::PDFFindFlags::MatchWholeWord - If not set, it will not 
match the whole word by default.
+// vcl::pdf::PDFFindFlags::Consecutive - If not set, it will skip past 
the current match to look for the next match.
+vcl::pdf::PDFFindFlags nSearchFlags{};
 if (maOptions.mbMatchCase)
-nSearchFlags |= FPDF_MATCHCASE;
+nSearchFlags |= vcl::pdf::PDFFindFlags::MatchCase;
 if (maOptions.mbMatchWholeWord)
-nSearchFlags |= FPDF_MATCHWHOLEWORD;
+nSearchFlags |= vcl::pdf::PDFFindFlags::MatchWholeWord;
 
 mpSearchHandle = mpTextPage->findStart(maSearchString, nSearchFlags, 
nStartIndex);
 
diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx
index c1571682f4b3..9a13ae930fb5 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -114,6 +114,13 @@ 
static_assert(static_cast(vcl::pdf::PDFFillMode::Alternate) == FPDF_FILLMOD
 static_assert(static_cast(vcl::pdf::PDFFillMode::Winding) == 
FPDF_FILLMODE_WINDING,
   "PDFFillMode::Winding value mismatch");
 
+static_assert(static_cast(vcl::pdf::PDFFindFlags::MatchCase) == 
FPDF_MATCHCASE,
+  "PDFFindFlags::MatchCase value mismatch");
+static_assert(static_cast(vcl::pdf::PDFFindFlags::MatchWholeWord) == 
FPDF_MATCHWHOLEWORD,
+  "PDFFindFlags::MatchWholeWord value mismatch");
+static_assert(static_cast(vcl::pdf::PDFFindFlags::Consecutive) == 
FPDF_CONSECUTIVE,
+  "PDFFindFlags::Consecutive value mismatch");
+
 namespace
 {
 /// Callback class to be used with FPDF_SaveWithVersion().
@@ -1101,11 +1108,11 @@ unsigned int PD