[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/Qt5Timer.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f85d99ede4054876f608819e808c9b03c6a03481
Author: Jan-Marek Glogowski 
AuthorDate: Sat Jun 1 22:23:58 2019 +
Commit: Michael Weghorn 
CommitDate: Tue Jun 4 08:43:03 2019 +0200

Qt5 use precise timer to prevent unneeded restarts

We just have one driving timer. Not much to sync with. Gets rid
of these annoying scheduler restart messages. The idea of coarse,
synced timer events sounds nice to have, but LO currently can't
handle it in a sensible sense..

Change-Id: I169c2bb582aca0e03b00e24dc364ac9b19162c3b
Reviewed-on: https://gerrit.libreoffice.org/73392
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 677db60166106e33bc2329f868f96cf2fb85f11b)
Reviewed-on: https://gerrit.libreoffice.org/73411
Reviewed-by: Michael Weghorn 

diff --git a/vcl/qt5/Qt5Timer.cxx b/vcl/qt5/Qt5Timer.cxx
index 9868052dd85f..bbc2800e868d 100644
--- a/vcl/qt5/Qt5Timer.cxx
+++ b/vcl/qt5/Qt5Timer.cxx
@@ -29,6 +29,7 @@
 Qt5Timer::Qt5Timer()
 {
 m_aTimer.setSingleShot(true);
+m_aTimer.setTimerType(Qt::PreciseTimer);
 connect(&m_aTimer, SIGNAL(timeout()), this, SLOT(timeoutActivated()));
 connect(this, SIGNAL(startTimerSignal(int)), this, SLOT(startTimer(int)));
 connect(this, SIGNAL(stopTimerSignal()), this, SLOT(stopTimer()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sc/source/core/opencl/op_spreadsheet.cxx |2 ++
 xmlsecurity/inc/xmlsignaturehelper.hxx   |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit bb847b448f8b04e40ba66e7feab42f2b697383b4
Author: Stephan Bergmann 
AuthorDate: Mon Jun 3 18:46:51 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jun 4 08:27:38 2019 +0200

Missing include

Change-Id: I4c733df9c5a01f911c6a99fca21a2dd70aeecf18
Reviewed-on: https://gerrit.libreoffice.org/73407
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sc/source/core/opencl/op_spreadsheet.cxx 
b/sc/source/core/opencl/op_spreadsheet.cxx
index 10b22b045aa6..9df0447d7e1d 100644
--- a/sc/source/core/opencl/op_spreadsheet.cxx
+++ b/sc/source/core/opencl/op_spreadsheet.cxx
@@ -11,6 +11,8 @@
 
 #include 
 #include 
+
+#include 
 #include 
 
 using namespace formula;
commit 1ae6523a3aded9fef63c688f63fa6e80c0592502
Author: Stephan Bergmann 
AuthorDate: Mon Jun 3 18:47:16 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jun 4 08:27:26 2019 +0200

XSecController must be a complete type here (Windows --disable-pch)

...when instantiating implicitly defined special member functions of
XMLSECURITY_DLLPUBLIC XMLSignatureHelper, due to mpXSecController member

Change-Id: Ifd504c1b215a8a1a86d7a9d660aa569b75e07d50
Reviewed-on: https://gerrit.libreoffice.org/73406
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx 
b/xmlsecurity/inc/xmlsignaturehelper.hxx
index 2e6c2ce7f2b9..0fcbd665251f 100644
--- a/xmlsecurity/inc/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper.hxx
@@ -26,10 +26,10 @@
 #include 
 #include "xmlsecuritydllapi.h"
 #include "xmlsignaturehelper.hxx"
+#include "xsecctl.hxx"
 
 class DateTime;
 class UriBindingHelper;
-class XSecController;
 
 namespace com {
 namespace sun {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 include/svx/EnhancedCustomShape2d.hxx |2 +-
 include/svx/sdasitm.hxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7fd5ec69807ffe89c8414048996c1ea6945deb2
Author: Stephan Bergmann 
AuthorDate: Mon Jun 3 18:45:00 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jun 4 08:27:08 2019 +0200

css::beans::PropertyValue must be a complete type here (Windows 
--disable-pch)

...when instantiating implicitly defined special member functions of
SVX_DLLPUBLIC SdrCustomShapeGeometryItem, due to aPropSeq member

Change-Id: I7fc0ba1db3aa67bdd5c4d8878504a31f32b42ffd
Reviewed-on: https://gerrit.libreoffice.org/73405
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 9b70de0e8e4b..e0aeaddab83a 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -22,12 +22,12 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 
-namespace com::sun::star::beans { struct PropertyValue; }
 namespace com::sun::star::uno { class Any; }
 
 class SVX_DLLPUBLIC SdrCustomShapeGeometryItem : public SfxPoolItem
commit 3dfaee0d6eded9668c3e949e026cd3375f0ee663
Author: Stephan Bergmann 
AuthorDate: Mon Jun 3 18:42:59 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jun 4 08:26:55 2019 +0200

css::awt::Size must be a complete type here (Windows --disable-pch)

...when instantiating implicitly defined special member functions of
SVX_DLLPUBLIC EnhancedCustomShape2d, due to seqSubViewSize member

Change-Id: I7dd22ba0602461c1bbe2e1e5351e161f2e098c37
Reviewed-on: https://gerrit.libreoffice.org/73404
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/svx/EnhancedCustomShape2d.hxx 
b/include/svx/EnhancedCustomShape2d.hxx
index dfc67806cc05..ea5e4fc1f1b3 100644
--- a/include/svx/EnhancedCustomShape2d.hxx
+++ b/include/svx/EnhancedCustomShape2d.hxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -40,7 +41,6 @@
 #include 
 
 namespace com::sun::star::awt { struct Point; }
-namespace com::sun::star::awt { struct Size; }
 
 class Color;
 class SdrObject;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - starmath/source

[Jan-Marek Glogowski (via logerrit)]

 starmath/source/ElementsDockingWindow.cxx |2 +-
 starmath/source/edit.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7303ca75d9fd0cf98cd38950711c32c892d94285
Author: Jan-Marek Glogowski 
AuthorDate: Wed May 29 16:32:24 2019 +0200
Commit: Michael Weghorn 
CommitDate: Tue Jun 4 07:53:57 2019 +0200

SM add a border to the editor and the element list

Change-Id: I708476919ce7750df6a691d75fe594c3f44d9126
Reviewed-on: https://gerrit.libreoffice.org/73173
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 501b935d057547b1a785147a32e4e090ebd91a12)
Reviewed-on: https://gerrit.libreoffice.org/73385
Reviewed-by: Michael Weghorn 

diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index 7491e71823b1..9483c650 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -259,7 +259,7 @@ const std::tuple SmElementsControl::
 const size_t SmElementsControl::m_aCategoriesSize = 
SAL_N_ELEMENTS(m_aCategories);
 
 SmElementsControl::SmElementsControl(vcl::Window *pParent)
-: Control(pParent, WB_TABSTOP)
+: Control(pParent, WB_TABSTOP | WB_BORDER)
 , mpDocShell(new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT))
 , m_nCurrentElement(SAL_MAX_UINT16)
 , m_nCurrentRolloverElement(SAL_MAX_UINT16)
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 643ef04a1960..515b924ee1ef 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -73,7 +73,7 @@ bool SmEditWindow::IsInlineEditEnabled()
 
 
 SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) :
-Window  (&rMyCmdBoxWin),
+Window  (&rMyCmdBoxWin, WB_BORDER),
 DropTargetHelper( this ),
 rCmdBox (rMyCmdBoxWin),
 aModifyIdle ("SmEditWindow ModifyIdle"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 filter/source/xsltfilter/OleHandler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 44c21ca9324997b8a3001e316c774b4ba34c2f0b
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:23:36 2019 +
Commit: Julien Nabet 
CommitDate: Tue Jun 4 07:11:57 2019 +0200

Fix typo

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

diff --git a/filter/source/xsltfilter/OleHandler.cxx 
b/filter/source/xsltfilter/OleHandler.cxx
index 1f727e363558..107dc49e 100644
--- a/filter/source/xsltfilter/OleHandler.cxx
+++ b/filter/source/xsltfilter/OleHandler.cxx
@@ -86,7 +86,7 @@ namespace XSLT
 Reference xSeek(m_rootStream->getInputStream(), UNO_QUERY);
 xSeek->seek(0);
 
-//create an com.sun.star.embed.OLESimpleStorage from the temp stream
+//create a com.sun.star.embed.OLESimpleStorage from the temp stream
 Sequence args(1);
 args[0] <<= xSeek;
 Reference cont(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 forms/source/xforms/propertysetbase.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 466a98b5ad26245f182166eece19fe16219feed3
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:23:15 2019 +
Commit: Julien Nabet 
CommitDate: Tue Jun 4 07:12:28 2019 +0200

Fix typo

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

diff --git a/forms/source/xforms/propertysetbase.hxx 
b/forms/source/xforms/propertysetbase.hxx
index 409a4a6ebc8c..d46901e0a39c 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -240,7 +240,7 @@ protected:
 any notifications if the "current value" is also  - which 
might be wrong, since
 the guessing of the "old value" differed from the real initial value 
which was .
 
-Too confusing? Okay, than just call this method for every property you 
have.
+Too confusing? Okay, then just call this method for every property you 
have.
 
 @param nHandle
 the handle of the property. Must denote a property supported by 
this instance, i.e.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 forms/qa/complex/forms/CheckOGroupBoxModel.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1dfcec6ae560a0d7fdafbb5f9298e7d71f253b37
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:23:35 2019 +
Commit: Julien Nabet 
CommitDate: Tue Jun 4 07:09:06 2019 +0200

Fix typo

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

diff --git a/forms/qa/complex/forms/CheckOGroupBoxModel.java 
b/forms/qa/complex/forms/CheckOGroupBoxModel.java
index 284840de3649..807d14c4fff1 100644
--- a/forms/qa/complex/forms/CheckOGroupBoxModel.java
+++ b/forms/qa/complex/forms/CheckOGroupBoxModel.java
@@ -113,7 +113,7 @@ public class CheckOGroupBoxModel
 }
 } // endfor
 
-//get a array of bound properties
+//get an array of bound properties
 String[] testPropsNames = tNames.toArray(new String[tNames.size()]);
 return testPropsNames;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mark Hung (via logerrit)]

 sw/source/ui/misc/pggrid.cxx |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit c1c3a3c619bd596e2a64e2c9b9328b4adfa990eb
Author: Mark Hung 
AuthorDate: Fri May 31 23:22:43 2019 +0800
Commit: Mark Hung 
CommitDate: Tue Jun 4 06:44:31 2019 +0200

tdf#104922 recover text grid setting properly.

Lines per page and chars per line can not be set before the
max values determined, otherwise we may get incorrect result
because of truncating to incorrect max values.

Change-Id: I9829af0dcfd744f4383a5f9034270b00fdfb15b8
Reviewed-on: https://gerrit.libreoffice.org/73280
Tested-by: Jenkins
Reviewed-by: Mark Hung 

diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index dbef0e81300b..860f913985cd 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -171,6 +171,8 @@ bool SwTextGridPage::FillItemSet(SfxItemSet *rSet)
 
 voidSwTextGridPage::Reset(const SfxItemSet *rSet)
 {
+sal_Int32 nLinesPerPage = 0;
+
 if(SfxItemState::DEFAULT <= rSet->GetItemState(RES_TEXTGRID))
 {
 const SwTextGridItem& rGridItem = rSet->Get(RES_TEXTGRID);
@@ -185,7 +187,8 @@ voidSwTextGridPage::Reset(const SfxItemSet *rSet)
 m_xDisplayCB->set_active(rGridItem.IsDisplayGrid());
 GridTypeHdl(*pButton);
 m_xSnapToCharsCB->set_active(rGridItem.IsSnapToChars());
-m_xLinesPerPageNF->set_value(rGridItem.GetLines());
+nLinesPerPage = rGridItem.GetLines();
+
 SetLinesOrCharsRanges(*m_xLinesRangeFT , m_xLinesPerPageNF->get_max());
 m_nRubyUserValue = rGridItem.GetBaseHeight();
 m_bRubyUserValue = true;
@@ -198,6 +201,9 @@ voidSwTextGridPage::Reset(const SfxItemSet *rSet)
 }
 UpdatePageSize(*rSet);
 
+if (nLinesPerPage > 0)
+m_xLinesPerPageNF->set_value(nLinesPerPage);
+
 m_xNoGridRB->save_state();
 m_xLinesGridRB->save_state();
 m_xSnapToCharsCB->save_state();
@@ -301,8 +307,9 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet)
 
 if ( m_bSquaredMode )
 {
-m_xCharsPerLineNF->set_value(m_aPageSize.Width() / nTextSize);
-m_xCharsPerLineNF->set_max(m_xCharsPerLineNF->get_value());
+sal_Int32 nCharsPerLine = m_aPageSize.Width() / nTextSize;
+m_xCharsPerLineNF->set_max(nCharsPerLine);
+m_xCharsPerLineNF->set_value(nCharsPerLine);
 m_xLinesPerPageNF->set_max(m_aPageSize.Height() /
 (   
m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FieldUnit::TWIP)) +
 
m_xRubySizeMF->denormalize(m_xRubySizeMF->get_value(FieldUnit::TWIP;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 vcl/inc/qt5/Qt5Frame.hxx |1 
 vcl/qt5/Qt5Frame.cxx |  123 ++-
 2 files changed, 28 insertions(+), 96 deletions(-)

New commits:
commit d8d8cdecdb760500b06cacef3d17c8e05332967d
Author: Jan-Marek Glogowski 
AuthorDate: Sun Jun 2 15:38:25 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Tue Jun 4 02:25:33 2019 +0200

Qt5 introduce Qt5Frame::asChild() helper

Just a little refactoring.

Gets rid of the common used idom in the code:
  m_pTopLevel ? m_pTopLevel : m_pQWidget

Change-Id: I3e96687d9d02c0b1a5537c6b6cea53e1ca3a2067
Reviewed-on: https://gerrit.libreoffice.org/73414
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 16743edc0fc6..3b590bd8e28c 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -123,6 +123,7 @@ public:
 
 QWidget* GetQWidget() const { return m_pQWidget; }
 Qt5MainWindow* GetTopLevelWindow() const { return m_pTopLevel; }
+QWidget* asChild() const;
 
 void Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32 
nExtentsWidth,
 sal_Int32 nExtentsHeight) const;
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index a4ad672bab16..a9ffbf7756aa 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -140,13 +140,7 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags 
nStyle, bool bUseCairo)
 
 if (aWinFlags == Qt::Window)
 {
-QWidget* pParentWidget = nullptr;
-if (m_pParent)
-{
-pParentWidget
-= (m_pParent->m_pTopLevel) ? m_pParent->m_pTopLevel : 
m_pParent->m_pQWidget;
-}
-
+QWidget* pParentWidget = m_pParent ? m_pParent->asChild() : nullptr;
 m_pTopLevel = new Qt5MainWindow(*this, pParentWidget, aWinFlags);
 m_pQWidget = new Qt5Widget(*this, aWinFlags);
 m_pTopLevel->setCentralWidget(m_pQWidget);
@@ -160,8 +154,7 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags 
nStyle, bool bUseCairo)
 if (pParent && !(pParent->m_nStyle & SalFrameStyleFlags::PLUG))
 {
 QWindow* pParentWindow = 
pParent->GetQWidget()->window()->windowHandle();
-QWindow* pChildWindow = (m_pTopLevel ? 
m_pTopLevel->window()->windowHandle()
- : 
m_pQWidget->window()->windowHandle());
+QWindow* pChildWindow = asChild()->window()->windowHandle();
 if (pParentWindow && pChildWindow && (pParentWindow != pChildWindow))
 pChildWindow->setTransientParent(pParentWindow);
 }
@@ -218,10 +211,7 @@ Qt5Frame::~Qt5Frame()
 {
 Qt5Instance* pInst = static_cast(GetSalData()->m_pInstance);
 pInst->eraseFrame(this);
-if (m_pTopLevel)
-delete m_pTopLevel;
-else
-delete m_pQWidget;
+delete asChild();
 m_aSystemData.aShellWindow = 0;
 }
 
@@ -303,60 +293,31 @@ bool Qt5Frame::PostEvent(std::unique_ptr 
pData)
 return true;
 }
 
-bool Qt5Frame::isWindow() const
-{
-if (m_pTopLevel)
-return m_pTopLevel->isWindow();
-else
-return m_pQWidget->isWindow();
-}
+QWidget* Qt5Frame::asChild() const { return m_pTopLevel ? m_pTopLevel : 
m_pQWidget; }
+
+bool Qt5Frame::isWindow() const { return asChild()->isWindow(); }
 
 QWindow* Qt5Frame::windowHandle() const
 {
 // set attribute 'Qt::WA_NativeWindow' first to make sure a window handle 
actually exists
-if (m_pTopLevel)
-{
-m_pTopLevel->setAttribute(Qt::WA_NativeWindow);
-return m_pTopLevel->windowHandle();
-}
-else
-{
-m_pQWidget->setAttribute(Qt::WA_NativeWindow);
-return m_pQWidget->windowHandle();
-}
+QWidget* pChild = asChild();
+pChild->setAttribute(Qt::WA_NativeWindow);
+return pChild->windowHandle();
 }
 
 QScreen* Qt5Frame::screen() const
 {
 QWindow* const pWindow = windowHandle();
-if (pWindow)
-return pWindow->screen();
-else
-return nullptr;
+return pWindow ? pWindow->screen() : nullptr;
 }
 
-bool Qt5Frame::isMinimized() const
-{
-if (m_pTopLevel)
-return m_pTopLevel->isMinimized();
-else
-return m_pQWidget->isMinimized();
-}
+bool Qt5Frame::isMinimized() const { return asChild()->isMinimized(); }
 
-bool Qt5Frame::isMaximized() const
-{
-if (m_pTopLevel)
-return m_pTopLevel->isMaximized();
-else
-return m_pQWidget->isMaximized();
-}
+bool Qt5Frame::isMaximized() const { return asChild()->isMaximized(); }
 
 void Qt5Frame::SetWindowStateImpl(Qt::WindowStates eState)
 {
-if (m_pTopLevel)
-m_pTopLevel->setWindowState(eState);
-else
-m_pQWidget->setWindowState(eState);
+return asChild()->setWindowState(eState);
 }
 
 void Qt5Frame::SetTitle(const OUString& rTitle)
@@ -400,13 +361,7 @@ void Qt5Frame::DrawMenuBar() { /* not needed */}
 
 void Qt5Frame::SetExtendedFrameStyle(SalExtStyle /*nExtSty

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/layout/calcmove.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 344275e11e24084c970ff19acfeed3ddf50d58bb
Author: Michael Stahl 
AuthorDate: Sun Jun 2 13:58:01 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Jun 4 01:00:06 2019 +0200

tdf#119109 sw: tweak assertion in PrepareMake()

Empty section frames cause trouble for the assert added in
e14056e6e88d9b8d988b7b88b2776a8fc952031b:

* existing ones may be skipped by MoveBwd(), so a SwTextFrame moves to
  the previous page but the SwSectionFrame that was its mpPrev remains
  on this page; e.g. ooo110854-1.rtf

* a SwSectionFrame moves backward, then some SwTextFrame in it splits
  and the follow tries to move forward, resulting in *new*
  SwSectionFrames on this page that are empty (because the follow is
  eventually joined again); e.g. abi3213-1.rtf

So if there's a section frame, assume it's SNAFU and don't assert.

Change-Id: Ibdca2aa39fae123583e5edf5173f80e8b70ef335
Reviewed-on: https://gerrit.libreoffice.org/7
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 1416c5426a757d32f223cab46bf9038bd7f21d48)
Reviewed-on: https://gerrit.libreoffice.org/73380
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/layout/calcmove.cxx 
b/sw/source/core/layout/calcmove.cxx
index 051bd6ca5a9c..fc4bc4567079 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -319,6 +319,8 @@ void SwFrame::PrepareMake(vcl::RenderContext* 
pRenderContext)
 if (isLast && pFrame->GetUpper() != GetUpper())
 {
 assert(GetUpper()->Lower() == this
+// empty section frames are created all the time...
+|| GetUpper()->Lower()->IsSctFrame()
 // tab frame/section frame may split multiple times
 || (   SwFlowFrame::CastFlowFrame(pFrame)
 && 
SwFlowFrame::CastFlowFrame(GetUpper()->Lower())
@@ -441,6 +443,8 @@ void SwFrame::PrepareCursor()
 if (isLast && pFrame->GetUpper() != GetUpper())
 {
 assert(GetUpper()->Lower() == this
+// empty section frames are created all the time...
+|| GetUpper()->Lower()->IsSctFrame()
 // tab frame/section frame may split multiple times
 || (   SwFlowFrame::CastFlowFrame(pFrame)
 && SwFlowFrame::CastFlowFrame(GetUpper()->Lower())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sd/source

[Katarina Behrens (via logerrit)]

 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |  102 
--
 sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx |2 
 2 files changed, 51 insertions(+), 53 deletions(-)

New commits:
commit 901a356a4e2ce7b598fb600025baa1c09267a2bc
Author: Katarina Behrens 
AuthorDate: Mon Jun 3 18:14:31 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Jun 4 00:56:03 2019 +0200

tdf#120774: in 6.2, restrict workaround to kde4 vclplug only

Fix of tdf#41996 is a workaround of kde4-specific condition and
has been since disabled on OS X (as tdf#51023). kde5 comes with
a new implementation of DnD and slide sorter in Impress now
exhibits exactly the same symptoms as on OS X in tdf#51023

Assuming that in 6.2 kde5 doesn't need this workaround anymore and
remaining platforms -- gtk[23] and Win -- never had issues with DnD
in slide sorter, keep it active only for kde4 vclplug.

We can't kill it with fire in its entirety, because kde4 has been
obsoleted only post-6.2

Change-Id: I1fd8bb9e5142ebd43f3a8bead417832c808c
Reviewed-on: https://gerrit.libreoffice.org/73403
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 4a3b05b1..2505486e5a8a 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -61,6 +61,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -225,17 +226,12 @@ public:
 MultiSelectionModeHandler (
 SlideSorter& rSlideSorter,
 SelectionFunction& rSelectionFunction,
-#ifndef MACOSX
-const Point& rMouseModelPosition);
-#else
 const Point& rMouseModelPosition,
-const sal_uInt32 nEventCode);
-#endif
+const sal_uInt32 nEventCode,
+bool bKDE4);
 virtual ~MultiSelectionModeHandler() override;
 
-#ifndef MACOSX
 void Initialize(const sal_uInt32 nEventCode);
-#endif
 
 virtual SelectionFunction::Mode GetMode() const override;
 virtual void Abort() override;
@@ -258,6 +254,7 @@ private:
 bool mbAutoScrollInstalled;
 sal_Int32 mnAnchorIndex;
 sal_Int32 mnSecondIndex;
+bool mbKDE4;
 
 void UpdateModelPosition (const Point& rMouseModelPosition);
 void UpdateSelection();
@@ -281,18 +278,13 @@ class DragAndDropModeHandler : public 
SelectionFunction::ModeHandler
 public:
 DragAndDropModeHandler (
 SlideSorter& rSlideSorter,
-#ifndef MACOSX
-SelectionFunction& rSelectionFunction);
-#else
 SelectionFunction& rSelectionFunction,
 const Point& rMousePosition,
-vcl::Window* pWindow);
-#endif
+vcl::Window* pWindow,
+bool bKDE4);
 virtual ~DragAndDropModeHandler() override;
 
-#ifndef MACOSX
 void Initialize(const Point& rMousePosition, vcl::Window* pWindow);
-#endif
 
 virtual SelectionFunction::Mode GetMode() const override;
 virtual void Abort() override;
@@ -303,6 +295,7 @@ protected:
 
 private:
 std::unique_ptr> mpDragAndDropContext;
+bool mbKDE4;
 };
 
 //= SelectionFunction =
@@ -322,6 +315,7 @@ SelectionFunction::SelectionFunction (
   mnShiftKeySelectionAnchor(-1),
   mpModeHandler(new NormalModeHandler(rSlideSorter, *this))
 {
+mbKDE4 = Application::GetToolkitName() == "kde4";
 }
 
 SelectionFunction::~SelectionFunction()
@@ -684,18 +678,21 @@ void SelectionFunction::SwitchToDragAndDropMode (const 
Point& rMousePosition)
 {
 if (mpModeHandler->GetMode() != DragAndDropMode)
 {
-#ifndef MACOSX
-std::shared_ptr handler(
-new DragAndDropModeHandler(mrSlideSorter, *this));
-SwitchMode(handler);
-// Delayed initialization, only after mpModeHanler is set, otherwise 
DND initialization
-// could already trigger DND events, which would recursively trigger 
this code again,
-// and without mpModeHandler set it would again try to set a new 
handler.
-handler->Initialize(rMousePosition, mpWindow);
-#else
-SwitchMode(std::shared_ptr(
-new DragAndDropModeHandler(mrSlideSorter, *this, rMousePosition, 
mpWindow)));
-#endif
+if (mbKDE4)
+{
+std::shared_ptr handler(
+new DragAndDropModeHandler(mrSlideSorter, *this, 
rMousePosition, mpWindow, mbKDE4));
+SwitchMode(handler);
+// Delayed initialization, only after mpModeHanler is set, 
otherwise DND initialization
+// could already trigger DND events, which would recursively 
trigger this code again,
+// and without mpModeHandler set it would again try to set a new 
handler.
+handler->Initialize(rMousePosition, mpWindow);
+}
+else
+{
+SwitchMode(std::

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 84771b5cc0caa60bcd6f15868fe9b516c3e8f3a7
Author: Olivier Hallot 
AuthorDate: Sat Jun 1 13:11:27 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Jun 4 00:36:42 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - fix icon size

Change-Id: I9550ef8ccf4d10ad393ed615573ab9893632f371
Reviewed-on: https://gerrit.libreoffice.org/73305
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 3e4a49f5e61c..9a0f4fb18ab7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3e4a49f5e61c535044538a23eaf7a6b222a7c57a
+Subproject commit 9a0f4fb18ab7832dbafb4b789279411f5aa8cecd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 source/text/swriter/guide/arrange_chapters.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9a0f4fb18ab7832dbafb4b789279411f5aa8cecd
Author: Olivier Hallot 
AuthorDate: Sat Jun 1 13:11:27 2019 +0200
Commit: Olivier Hallot 
CommitDate: Tue Jun 4 00:36:42 2019 +0200

fix icon size

Change-Id: I9550ef8ccf4d10ad393ed615573ab9893632f371
Reviewed-on: https://gerrit.libreoffice.org/73305
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/swriter/guide/arrange_chapters.xhp 
b/source/text/swriter/guide/arrange_chapters.xhp
index 3a330cab2..693b024fb 100644
--- a/source/text/swriter/guide/arrange_chapters.xhp
+++ b/source/text/swriter/guide/arrange_chapters.xhp
@@ -59,12 +59,12 @@
   
 
 
-
+
   
 Drag a 
heading to a new location in the Navigator list.
   
   
-Click a 
heading in the Navigator list, and then click the Promote 
Chapter Icon or Demote Chapter icon 
Icon.
+Click a 
heading in the Navigator list, and then click the Promote 
Chapter Icon 
promote or Demote Chapter icon Icon 
demote.
   
 
 To move the heading 
without the subordinate text, hold down CommandCtrl
 while you drag or click the Promote Chapter or Demote 
Chapter icons.
@@ -76,7 +76,7 @@
 Select the 
heading in the Navigator list.
   
   
-Click the 
Promote Level Icon 
promote level or Demote Level icon Icon.
+Click the 
Promote Level Icon 
promote level or Demote Level icon Icon demote 
level.
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/item_refactor2' - basctl/source include/item item/source item/test svx/source

[Armin Le Grand (via logerrit)]

 basctl/source/basicide/sbxitem.cxx |1 
 include/item/base/ItemBase.hxx |5 +
 include/item/base/ItemControlBlock.hxx |   19 
 include/item/base/ItemSet.hxx  |   50 ---
 item/source/base/ItemControlBlock.cxx  |   57 
 item/source/base/ItemSet.cxx   |  150 ++---
 item/test/ItemTest.cxx |   10 --
 svx/source/items/TransformAnchor.cxx   |1 
 8 files changed, 125 insertions(+), 168 deletions(-)

New commits:
commit 6c2f575f1ace404e6f97bec5cd740b6340851667
Author: Armin Le Grand 
AuthorDate: Mon Jun 3 21:36:34 2019 +0200
Commit: Armin Le Grand 
CommitDate: Mon Jun 3 21:36:34 2019 +0200

WIP: Use ItemControlBlock as TypeInfo

Removed last big change to have a global static
ItemControlBlock registry. Thought about things
and what is needed/wanted is RTTI for the Items.
Instead of using typeid(T).hash_code() it is
equally possible to use the ItemControlBlock of
each Item - it exists once as global static
instance. So use it's address. That way e.g. the
ItemSet holding it *will* hjave a direct reference
to the ItemControlBlock, so no need for a global
registration.
Checked, tested, adapted, works.

Change-Id: I4c9b6bfe4ba6858b234238d6125793378574af87

diff --git a/basctl/source/basicide/sbxitem.cxx 
b/basctl/source/basicide/sbxitem.cxx
index b8488d3e04d8..3618bcb5d8b8 100644
--- a/basctl/source/basicide/sbxitem.cxx
+++ b/basctl/source/basicide/sbxitem.cxx
@@ -32,7 +32,6 @@ namespace Item
 static ::Item::ItemControlBlock aItemControlBlock(
 [](){ return new 
Sbx(ScriptDocument::getApplicationScriptDocument()); },
 [](const ItemBase& rRef){ return new Sbx(static_cast(rRef)); },
-typeid(Sbx).hash_code(),
 "Sbx");
 
 return aItemControlBlock;
diff --git a/include/item/base/ItemBase.hxx b/include/item/base/ItemBase.hxx
index ee465ad7f0f9..b780df6308ab 100644
--- a/include/item/base/ItemBase.hxx
+++ b/include/item/base/ItemBase.hxx
@@ -101,7 +101,12 @@ namespace Item
 // this way accessible for all incarnations - at the cost of
 // one local reference
 friend bool isDefault(const ItemBase& rCandidate);
+friend class ItemSet;
 ItemControlBlock& m_rItemControlBlock;
+const ItemControlBlock& getItemControlBlock() const
+{
+return m_rItemControlBlock;
+}
 
 protected:
 // PutValue/Any interface for automated instance creation from SfxType
diff --git a/include/item/base/ItemControlBlock.hxx 
b/include/item/base/ItemControlBlock.hxx
index 0b9e5a03069b..8029f79a8d9e 100755
--- a/include/item/base/ItemControlBlock.hxx
+++ b/include/item/base/ItemControlBlock.hxx
@@ -38,19 +38,14 @@ namespace Item
 std::unique_ptr m_aDefaultItem;
 std::function  m_aConstructDefaultItem;
 std::function   m_aCloneItem;
-size_t  m_aHashCode;
 OUStringm_aName;
 
-// EmptyItemControlBlock: default constructor *only* for internal use
-ItemControlBlock();
-
 public:
 ItemControlBlock(
 std::functionaConstructDefaultItem,
 std::functionaCloneItem,
-size_t aHashCode,
 const OUString& rName);
-~ItemControlBlock();
+~ItemControlBlock() = default;
 
 const ItemBase& getDefault() const;
 bool isDefault(const ItemBase& rItem) const;
@@ -60,23 +55,11 @@ namespace Item
 return m_aName;
 }
 
-size_t getHashCode() const
-{
-return m_aHashCode;
-}
-
 // clone-op, secured by returning a std::unique_ptr to make
 // explicit the ownership you get when calling this
 std::unique_ptr clone(const ItemBase&) const;
 
 std::unique_ptr createFromAny(const 
ItemBase::AnyIDArgs& rArgs);
-
-// static access to registered ItemControlBlocks
-static ItemControlBlock* getItemControlBlock(size_t HashCode);
-template< typename TItem > ItemControlBlock* getItemControlBlock()
-{
-return getItemControlBlock(typeid(TItem).HashCode());
-}
 };
 } // end of namespace Item
 
diff --git a/include/item/base/ItemSet.hxx b/include/item/base/ItemSet.hxx
index e78d8a55565f..e400fff73959 100644
--- a/include/item/base/ItemSet.hxx
+++ b/include/item/base/ItemSet.hxx
@@ -216,14 +216,14 @@ namespace Item
 ModelSpecificItemValues::SharedPtr m_aModelSpecificIValues;
 
 // the items as content
-std::unordered_map m_aItems;
+std::unordered_map m_aItems;
 
 // helpers for reduction of template member implementations,
-// all based on typeid().hash_code()
-const ItemBase* implGetStateAndItem(size_t hash_code, IState& rIState, 
bool bSearchParent) 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - avmedia/source

[Caolán McNamara (via logerrit)]

 avmedia/source/gstreamer/gstplayer.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e8eb9cf446ea6525284749f78fce6623170cb39b
Author: Caolán McNamara 
AuthorDate: Tue Feb 19 10:18:16 2019 +
Commit: Katarina Behrens 
CommitDate: Mon Jun 3 22:28:40 2019 +0200

gst 0.10 doesn't have gst_video_overlay_set_render_rectangle

Change-Id: I499e32ce86fabd18c52ac2f99713af0933572f7c
(cherry picked from commit abd6f2a38506f512d4846cf43a9fc9576d96ceb3)
Reviewed-on: https://gerrit.libreoffice.org/73395
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/avmedia/source/gstreamer/gstplayer.cxx 
b/avmedia/source/gstreamer/gstplayer.cxx
index fb2193b3f67d..e900ed96ba47 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -515,9 +515,10 @@ GstBusSyncReply Player::processSyncMessage( GstMessage 
*message )
 if ( mnWindowID != 0 )
 {
 gst_video_overlay_set_window_handle( mpXOverlay, mnWindowID );
-
+#ifndef AVMEDIA_GST_0_10
 if (maArea.Width > 0 && maArea.Height > 0)
 gst_video_overlay_set_render_rectangle(mpXOverlay, 
maArea.X, maArea.Y, maArea.Width, maArea.Height);
+#endif
 }
 
 return GST_BUS_DROP;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Saving documents with broken zip streams (Re: minutes of ESC call ...)

[Jan-Marek Glogowski]

Am 03.06.19 um 21:52 schrieb Luboš Luňák:
> On Monday 03 of June 2019, Caolán McNamara wrote:
>> On Mon, 2019-06-03 at 12:23 +0200, Luboš Luňák wrote:
>>> On Thursday 30 of May 2019, Michael Meeks wrote:
   + some in the zip area - assuming they are threading related.
>>>
>>>  Is this about those documents such
>>> as /srv/crashtestdata/files/caolan/opendocument_stack_overflow_2.odt
>>> ? How
>>> can I reproduce that problem? If I try to fetch
>>> buildsl...@vm138.documentfoundation.org:
>>> an/opendocument_stack_overflow_2.odt ,
>>> it doesn't exist.
>>
>> I attach two of the examples here. The input name was foo.sample, the
>> output to odt name appears higher up in the bt during the export.
>>
>> ./instdir/program/soffice.bin --headless --convert-to odt
>> opendocument_stack_overflow.sample
> 
> 
>  Ok, so it's not a problem with my code, my changes just happened to show the 
> problem, and the problem is that those documents are broken. If you try to 
> unzip the documents, it will complain about incorrect CRC (although it still 
> will uncompress them). And what happens is that when we try to save the file, 
> apparently only by that point we'll read those zip streams, there will be a 
> ZipException about that, and the code in package/ is not exception-safe. So 
> ZipOutputStream::writeLOC() gets called but not the matching 
> ZipOutputStream::rawCloseEntry().
> 
>  But this is actually broken on several levels. If I make the code to catch 
> the exception better, I'll need to make it somehow handle the fact that 
> writeLOC() prepared for writing en entry, but then there's nothing to write. 
> But that's actually not important, since ZipPackageStream::saveChild() will 
> still return failure, so ZipPackageFolder::saveContents() will throw an 
> exception, making the whole document saving fail. Which in turn means this 
> whole save business is irrelevant, as there's just no way to save the 
> document, even though we can load it and we can edit it. Which seems rather 
> lame.
> 
>  Any idea what to do about that? Is it really ok that we just refuse to save 
> it? Or should we save it even though the contents may be broken?

IMHO the only sane solution would be to detect the broken CRCs on read and
report a broken file to the user. Eventually we could offer some recovery
option: mark the broken CRCs to be recalculated and keep the stuff or drop the
broken ZIP entries. I guess most users can't make this decision, so I would opt
for optional recovery of the entries, ignoring the CRCs.

Easier solution: we just deny / abort loading the file and tell the user babout
the broken file.

It really strange that the broken CRCs are just detected on write and the
document loads without a problem. Or do we ignore all ZIP entries, which we
don't know, which would be strange too?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - include/svx sc/source svx/source

[Caolán McNamara (via logerrit)]

 include/svx/ctredlin.hxx   |1 +
 sc/source/ui/miscdlgs/acredlin.cxx |2 +-
 svx/source/dialog/ctredlin.cxx |7 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 418c1d6143dd42e48ef52e0fb8c3d6e5d22c3cfa
Author: Caolán McNamara 
AuthorDate: Sun Jun 2 15:52:28 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jun 3 22:15:54 2019 +0200

Resolves: tdf#125589 we are initially unsorted

so turn on sorting on first sort request

Change-Id: I897f64c0695be8cca6d93e234a7d7c4718c94f78
Reviewed-on: https://gerrit.libreoffice.org/73345
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index b6ae656d586f..16147e60bd08 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -92,6 +92,7 @@ private:
 boolbAuthor;
 boolbDate;
 boolbComment;
+boolbSorted;
 SvxRedlinDateMode nDaTiMode;
 DateTimeaDaTiFirst;
 DateTimeaDaTiLast;
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx 
b/sc/source/ui/miscdlgs/acredlin.cxx
index c04fa55f0b85..44d89d2669be 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1748,7 +1748,7 @@ int ScAcceptChgDlg::ColCompareHdl(const weld::TreeIter& 
rLeft, const weld::TreeI
 weld::TreeView& rTreeView = pTheView->GetWidget();
 
 sal_Int32 nCompare = 0;
-SCCOL nSortCol= rTreeView.get_sort_column();
+SCCOL nSortCol = rTreeView.get_sort_column();
 
 if (CALC_DATE == nSortCol)
 {
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 22595f923e2a..9cdfe60d40d5 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -83,6 +83,7 @@ 
SvxRedlinTable::SvxRedlinTable(std::unique_ptr xWriterControl,
 , bAuthor(false)
 , bDate(false)
 , bComment(false)
+, bSorted(false)
 , nDaTiMode(SvxRedlinDateMode::BEFORE)
 , aDaTiFirst( DateTime::EMPTY )
 , aDaTiLast( DateTime::EMPTY )
@@ -121,6 +122,12 @@ SvxRedlinTable::~SvxRedlinTable()
 
 IMPL_LINK(SvxRedlinTable, HeaderBarClick, int, nColumn, void)
 {
+if (!bSorted)
+{
+pTreeView->make_sorted();
+bSorted = true;
+}
+
 bool bSortAtoZ = pTreeView->get_sort_order();
 
 //set new arrow positions in headerbar
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/svx/ctredlin.hxx   |1 +
 sc/source/ui/miscdlgs/acredlin.cxx |2 +-
 svx/source/dialog/ctredlin.cxx |7 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit e620291e7ce0d7c63a4e23bfcce3fdbd54789469
Author: Caolán McNamara 
AuthorDate: Sun Jun 2 15:52:28 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jun 3 22:15:38 2019 +0200

Resolves: tdf#125589 we are initially unsorted

so turn on sorting on first sort request

Change-Id: I897f64c0695be8cca6d93e234a7d7c4718c94f78
Reviewed-on: https://gerrit.libreoffice.org/73344
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index b6ae656d586f..16147e60bd08 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -92,6 +92,7 @@ private:
 boolbAuthor;
 boolbDate;
 boolbComment;
+boolbSorted;
 SvxRedlinDateMode nDaTiMode;
 DateTimeaDaTiFirst;
 DateTimeaDaTiLast;
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx 
b/sc/source/ui/miscdlgs/acredlin.cxx
index c04fa55f0b85..44d89d2669be 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1748,7 +1748,7 @@ int ScAcceptChgDlg::ColCompareHdl(const weld::TreeIter& 
rLeft, const weld::TreeI
 weld::TreeView& rTreeView = pTheView->GetWidget();
 
 sal_Int32 nCompare = 0;
-SCCOL nSortCol= rTreeView.get_sort_column();
+SCCOL nSortCol = rTreeView.get_sort_column();
 
 if (CALC_DATE == nSortCol)
 {
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 22595f923e2a..9cdfe60d40d5 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -83,6 +83,7 @@ 
SvxRedlinTable::SvxRedlinTable(std::unique_ptr xWriterControl,
 , bAuthor(false)
 , bDate(false)
 , bComment(false)
+, bSorted(false)
 , nDaTiMode(SvxRedlinDateMode::BEFORE)
 , aDaTiFirst( DateTime::EMPTY )
 , aDaTiLast( DateTime::EMPTY )
@@ -121,6 +122,12 @@ SvxRedlinTable::~SvxRedlinTable()
 
 IMPL_LINK(SvxRedlinTable, HeaderBarClick, int, nColumn, void)
 {
+if (!bSorted)
+{
+pTreeView->make_sorted();
+bSorted = true;
+}
+
 bool bSortAtoZ = pTreeView->get_sort_order();
 
 //set new arrow positions in headerbar
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Saving documents with broken zip streams (Re: minutes of ESC call ...)

[Luboš Luňák]

On Monday 03 of June 2019, Caolán McNamara wrote:
> On Mon, 2019-06-03 at 12:23 +0200, Luboš Luňák wrote:
> > On Thursday 30 of May 2019, Michael Meeks wrote:
> > >   + some in the zip area - assuming they are threading related.
> >
> >  Is this about those documents such
> > as /srv/crashtestdata/files/caolan/opendocument_stack_overflow_2.odt
> > ? How
> > can I reproduce that problem? If I try to fetch
> > buildsl...@vm138.documentfoundation.org:
> > an/opendocument_stack_overflow_2.odt ,
> > it doesn't exist.
>
> I attach two of the examples here. The input name was foo.sample, the
> output to odt name appears higher up in the bt during the export.
>
> ./instdir/program/soffice.bin --headless --convert-to odt
> opendocument_stack_overflow.sample


 Ok, so it's not a problem with my code, my changes just happened to show the 
problem, and the problem is that those documents are broken. If you try to 
unzip the documents, it will complain about incorrect CRC (although it still 
will uncompress them). And what happens is that when we try to save the file, 
apparently only by that point we'll read those zip streams, there will be a 
ZipException about that, and the code in package/ is not exception-safe. So 
ZipOutputStream::writeLOC() gets called but not the matching 
ZipOutputStream::rawCloseEntry().

 But this is actually broken on several levels. If I make the code to catch 
the exception better, I'll need to make it somehow handle the fact that 
writeLOC() prepared for writing en entry, but then there's nothing to write. 
But that's actually not important, since ZipPackageStream::saveChild() will 
still return failure, so ZipPackageFolder::saveContents() will throw an 
exception, making the whole document saving fail. Which in turn means this 
whole save business is irrelevant, as there's just no way to save the 
document, even though we can load it and we can edit it. Which seems rather 
lame.

 Any idea what to do about that? Is it really ok that we just refuse to save 
it? Or should we save it even though the contents may be broken?

-- 
 Luboš Luňák
 l.lu...@collabora.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sc/qa sc/source

[László Németh (via logerrit)]

 sc/qa/unit/data/ods/tdf112567.ods |binary
 sc/qa/unit/subsequent_export-test.cxx |   31 +++
 sc/source/filter/excel/xename.cxx |   25 -
 3 files changed, 55 insertions(+), 1 deletion(-)

New commits:
commit ac8368767d3c50c46a764987bf0fd783579f3d9f
Author: László Németh 
AuthorDate: Thu May 30 19:57:41 2019 +0200
Commit: Xisco Faulí 
CommitDate: Mon Jun 3 21:37:47 2019 +0200

tdf#112567 XLSX export: correct built-in names

Non-en_US locale setting resulted broken XLSX export
with incorrect localized range separator. The previous
commit 19976f079800ec4c1d0d5d7e226986cb41f834c2
"tdf#112567 XLSX export: fix broken built-in names"
only avoided of the bad export of the XSLX documents
with correct definedName.

Note: this commit fixes the bad XLSX documents
during the next import/export cycle.

Change-Id: I9101c5df0f29c7a42fd49f4c2765dcf47a711916
Reviewed-on: https://gerrit.libreoffice.org/73220
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 32a11727a0f709c11685d4200b1db08dac211dec)
Reviewed-on: https://gerrit.libreoffice.org/73381

diff --git a/sc/qa/unit/data/ods/tdf112567.ods 
b/sc/qa/unit/data/ods/tdf112567.ods
new file mode 100644
index ..fda79997e534
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf112567.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 94bfd5ae4f36..416fb9f32139 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -220,6 +220,7 @@ public:
 void testTdf91634XLSX();
 void testTdf115159();
 void testTdf112567();
+void testTdf112567b();
 void testTdf123645XLSX();
 void testTdf125173XLSX();
 void testTdf79972XLSX();
@@ -348,6 +349,7 @@ public:
 CPPUNIT_TEST(testTdf91634XLSX);
 CPPUNIT_TEST(testTdf115159);
 CPPUNIT_TEST(testTdf112567);
+CPPUNIT_TEST(testTdf112567b);
 CPPUNIT_TEST(testTdf123645XLSX);
 CPPUNIT_TEST(testTdf125173XLSX);
 CPPUNIT_TEST(testTdf79972XLSX);
@@ -4334,6 +4336,35 @@ void ScExportTest::testTdf112567()
 xDocSh->DoClose();
 }
 
+void ScExportTest::testTdf112567b()
+{
+// Set the system locale to Hungarian (a language with different range 
separator)
+SvtSysLocaleOptions aOptions;
+aOptions.SetLocaleConfigString("hu-HU");
+aOptions.Commit();
+comphelper::ScopeGuard g([&aOptions] {
+aOptions.SetLocaleConfigString(OUString());
+aOptions.Commit();
+});
+
+ScDocShellRef xShell = loadDoc("tdf112567.", FORMAT_ODS);
+CPPUNIT_ASSERT(xShell.is());
+ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+xShell->DoClose();
+
+xmlDocPtr pDoc = XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory, 
"xl/workbook.xml", FORMAT_XLSX);
+CPPUNIT_ASSERT(pDoc);
+
+//assert the existing OOXML built-in name is not duplicated
+assertXPath(pDoc, "/x:workbook/x:definedNames/x:definedName", 1);
+
+//and it contains "," instead of ";"
+assertXPathContent(pDoc, "/x:workbook/x:definedNames/x:definedName[1]", 
"Sheet1!$A:$A,Sheet1!$1:$1");
+
+xDocSh->DoClose();
+}
+
 void ScExportTest::testTdf123645XLSX()
 {
 ScDocShellRef xDocSh = loadDoc("chart_hyperlink.", FORMAT_XLSX);
diff --git a/sc/source/filter/excel/xename.cxx 
b/sc/source/filter/excel/xename.cxx
index ee418fb80d5c..35d84b86194e 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -92,6 +92,8 @@ public:
 private:
 /** Writes the body of the NAME record to the passed stream. */
 virtual voidWriteBody( XclExpStream& rStrm ) override;
+/** Convert localized range separators */
+OUStringGetWithDefaultRangeSeparator( const OUString& rSymbol 
) const;
 
 private:
 OUStringmaOrigName; /// The original user-defined name.
@@ -294,6 +296,27 @@ void XclExpName::Save( XclExpStream& rStrm )
 XclExpRecord::Save( rStrm );
 }
 
+OUString XclExpName::GetWithDefaultRangeSeparator( const OUString& rSymbol ) 
const
+{
+sal_Int32 nPos = rSymbol.indexOf(';');
+if ( nPos > -1 )
+{
+// convert with validation
+ScRange aRange;
+ScAddress::Details detailsXL( ::formula::FormulaGrammar::CONV_XL_A1 );
+ScRefFlags nRes = aRange.Parse( rSymbol.copy(0, nPos), &GetDocRef(), 
detailsXL );
+if ( nRes & ScRefFlags::VALID )
+{
+nRes = aRange.Parse( rSymbol.copy(nPos+1), &GetDocRef(), detailsXL 
);
+if ( nRes & ScRefFlags::VALID )
+{
+return rSymbol.replaceFirst(";", ",");
+}
+}
+}
+return rSymbol;
+}
+
 void XclExpName::SaveXml( XclExpXmlStream& rStrm )
 {
 sax_fastparser::FSHelperPtr& rWorkbook = rStrm.GetCurrentStream();
@@ -314,7 +337,7 @@ void XclExpName::SaveXml( XclExpXm

[Libreoffice-commits] core.git: desktop/scripts

[Luboš Luňák (via logerrit)]

 desktop/scripts/soffice.sh |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a5fa2d2d64c7fc2ef096ae61fe2db327a42db2b4
Author: Luboš Luňák 
AuthorDate: Mon Jun 3 13:38:27 2019 +0200
Commit: Luboš Luňák 
CommitDate: Mon Jun 3 20:49:56 2019 +0200

LD_BIND_NOW=1 if running under callgrind

It avoids all those calls to _dl_runtime_resolve_xsave that
in KCachegrind's call graph lead to nowhere and make navigating harder.

Change-Id: Ie3843676298d92b8ed6d598ead16f4d410ba8b2b
Reviewed-on: https://gerrit.libreoffice.org/73382
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 6f969b5af321..579915d1d6b3 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -126,6 +126,9 @@ for arg in "$@" $EXTRAOPT ; do
 export G_SLICE=always-malloc
 export GLIBCXX_FORCE_NEW=1
 ;;
+callgrind)
+export LD_BIND_NOW=1
+;;
 esac
 else
 echo "Error: Can't find the tool \"valgrind\", --valgrind 
option will be ignored"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/CustomTarget_kde5_moc.mk vcl/unx

[Jan-Marek Glogowski (via logerrit)]

 vcl/CustomTarget_kde5_moc.mk |1 
 vcl/unx/kde5/KDE5FilePicker.hxx  |   35 
 vcl/unx/kde5/KDE5FilePicker2.cxx |   42 +++
 vcl/unx/kde5/KDE5SalInstance.cxx |6 -
 vcl/unx/kde5/KDE5SalInstance.hxx |9 
 5 files changed, 5 insertions(+), 88 deletions(-)

New commits:
commit 81307dd74f26ba5c054dccd32dad507dc1510298
Author: Jan-Marek Glogowski 
AuthorDate: Sun Jun 2 19:58:50 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Mon Jun 3 20:18:47 2019 +0200

KDE5 header cleanup and Q_OBJECT drop

Uneeded since the merge of most of the KDE5FilePicker code into
Qt5FilePicker. KDE5SalInstance also uses no signals or slots, so
Q_OBJECT + moc can go for them.

Change-Id: If48c677106b78c759ca165563ad3c081ca5442a5
Reviewed-on: https://gerrit.libreoffice.org/73393
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/CustomTarget_kde5_moc.mk b/vcl/CustomTarget_kde5_moc.mk
index 7d68658fc279..5c7fea94428b 100644
--- a/vcl/CustomTarget_kde5_moc.mk
+++ b/vcl/CustomTarget_kde5_moc.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde5))
 
 $(call gb_CustomTarget_get_target,vcl/unx/kde5) : \
-   $(call gb_CustomTarget_get_workdir,vcl/unx/kde5)/KDE5SalInstance.moc \
$(call gb_CustomTarget_get_workdir,vcl/unx/kde5)/KDE5FilePicker.moc \
$(call 
gb_CustomTarget_get_workdir,vcl/unx/kde5)/tst_exclude_socket_notifiers.moc \
$(call 
gb_CustomTarget_get_workdir,vcl/unx/kde5)/tst_exclude_posted_events.moc
diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx
index dc3f5c0f63a4..32cbd4c92e7d 100644
--- a/vcl/unx/kde5/KDE5FilePicker.hxx
+++ b/vcl/unx/kde5/KDE5FilePicker.hxx
@@ -21,34 +21,12 @@
 
 #include 
 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-class QFileDialog;
 class QGridLayout;
-class QWidget;
-class QComboBox;
 
 class KDE5FilePicker : public Qt5FilePicker
 {
 Q_OBJECT
+
 protected:
 //layout for extra custom controls
 QGridLayout* _layout;
@@ -70,17 +48,6 @@ public:
 virtual void SAL_CALL setLabel(sal_Int16 nControlId, const OUString& 
rLabel) override;
 virtual OUString SAL_CALL getLabel(sal_Int16 nControlId) override;
 
-/* TODO XFilePreview
-
-virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( 
 );
-virtual sal_Int32 SAL_CALL  getTargetColorDepth(  );
-virtual sal_Int32 SAL_CALL  getAvailableWidth(  );
-virtual sal_Int32 SAL_CALL  getAvailableHeight(  );
-virtual void SAL_CALL   setImage( sal_Int16 aImageFormat, const 
css::uno::Any &rImage );
-virtual sal_Bool SAL_CALL   setShowState( sal_Bool bShowState );
-virtual sal_Bool SAL_CALL   getShowState(  );
-*/
-
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
 virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) 
override;
diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index 6eab819a1c03..ac99b5d21066 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -18,53 +18,21 @@
  */
 
 #include "KDE5FilePicker.hxx"
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
-#include 
-#include 
-
+#include 
 #include 
-#include 
-
-#undef Region
 
-#include 
-#include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
 #include 
-#include 
 #include 
-#include 
 #include 
 
-#include 
-#include 
-
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
-using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
-using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::uno;
-
-// helper functions
+using 
::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION;
 
 namespace
 {
@@ -238,6 +206,4 @@ bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e)
 return QObject::eventFilter(o, e);
 }
 
-#include 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
index b7e2952fd347..63ce689518f5 100644
--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
@@ -21,13 +21,8 @@
 
 #include 
 
-#include 
-#include 
 #include 
-#include 
-#include 
 
-#include 
 #include 
 
 #include 
@@ -105,5 +100,4 @@ VCLPLUG_KDE5_PUBLIC SalInstance* create_SalInstance()
 }
 }
 
-#include 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde5/K

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/Qt5Timer.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 677db60166106e33bc2329f868f96cf2fb85f11b
Author: Jan-Marek Glogowski 
AuthorDate: Sat Jun 1 22:23:58 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Mon Jun 3 20:16:19 2019 +0200

Qt5 use precise timer to prevent unneeded restarts

We just have one driving timer. Not much to sync with. Gets rid
of these annoying scheduler restart messages. The idea of coarse,
synced timer events sounds nice to have, but LO currently can't
handle it in a sensible sense..

Change-Id: I169c2bb582aca0e03b00e24dc364ac9b19162c3b
Reviewed-on: https://gerrit.libreoffice.org/73392
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/qt5/Qt5Timer.cxx b/vcl/qt5/Qt5Timer.cxx
index 9868052dd85f..bbc2800e868d 100644
--- a/vcl/qt5/Qt5Timer.cxx
+++ b/vcl/qt5/Qt5Timer.cxx
@@ -29,6 +29,7 @@
 Qt5Timer::Qt5Timer()
 {
 m_aTimer.setSingleShot(true);
+m_aTimer.setTimerType(Qt::PreciseTimer);
 connect(&m_aTimer, SIGNAL(timeout()), this, SLOT(timeoutActivated()));
 connect(this, SIGNAL(startTimerSignal(int)), this, SLOT(startTimer(int)));
 connect(this, SIGNAL(stopTimerSignal()), this, SLOT(stopTimer()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/cu_RU.xml  |   13 ++---
 i18npool/source/localedata/data/cv_RU.xml  |   19 +--
 i18npool/source/localedata/data/myv_RU.xml |9 -
 i18npool/source/localedata/data/ru_RU.xml  |   13 ++---
 i18npool/source/localedata/data/tt_RU.xml  |   23 +++
 5 files changed, 56 insertions(+), 21 deletions(-)

New commits:
commit 4ace5fdb0472cdfbbd64f52eac473d21baea6601
Author: Eike Rathke 
AuthorDate: Mon Jun 3 16:15:18 2019 +0200
Commit: Eike Rathke 
CommitDate: Mon Jun 3 19:54:15 2019 +0200

Resolves: tdf#96711 RUB currency symbol is ₽ U+20BD RUBLE SIGN

Change-Id: Ie9781713f04076174cdbbc34bf802df45c169727
Reviewed-on: https://gerrit.libreoffice.org/73389
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit d83e831747c1e7a57296c7f1d64a5d51a97cef91)
Reviewed-on: https://gerrit.libreoffice.org/73410
Tested-by: Eike Rathke 

diff --git a/i18npool/source/localedata/data/cu_RU.xml 
b/i18npool/source/localedata/data/cu_RU.xml
index 95d82c4451ff..5dcfe38feecf 100644
--- a/i18npool/source/localedata/data/cu_RU.xml
+++ b/i18npool/source/localedata/data/cu_RU.xml
@@ -52,7 +52,7 @@
 по по́лꙋд.
 metric
   
-  
+  
 D.M.
 D/M/
 
@@ -396,14 +396,21 @@
 
   
   
-
+
+  RUB
+  ₽
+  RUB
+  рꙋ́бль рѡссі́йскїй
+  2
+
+
   RUB
   рꙋб.
   RUB
   рꙋ́бль рѡссі́йскїй
   2
 
-
+
   RUR
   р.
   RUR
diff --git a/i18npool/source/localedata/data/cv_RU.xml 
b/i18npool/source/localedata/data/cv_RU.xml
index 2e7eb69d0e7f..7b09492fd816 100644
--- a/i18npool/source/localedata/data/cv_RU.xml
+++ b/i18npool/source/localedata/data/cv_RU.xml
@@ -51,7 +51,7 @@
 PM
 metric
   
-  
+  
 D.M
 
   Standard
@@ -87,22 +87,22 @@
   0,00%
 
 
-  # ##0[$тен.-635];-# ##0[$тен.-635]
+  # ##0[CURRENCY];-# ##0[CURRENCY]
 
 
-  # ##0,00[$тен.-635];-# ##0,00[$тен.-635]
+  # ##0,00[CURRENCY];-# ##0,00[CURRENCY]
 
 
-  # ##0[$тен.-635];[RED]-# ##0[$тен.-635]
+  # ##0[CURRENCY];[RED]-# ##0[CURRENCY]
 
 
-  # ##0,00[$тен.-635];[RED]-# ##0,00[$тен.-635]
+  # ##0,00[CURRENCY];[RED]-# ##0,00[CURRENCY]
 
 
   # ##0,00 CCC
 
 
-  # ##0,--[$тен.-635];[RED]-# ##0,--[$тен.-635]
+  # ##0,--[CURRENCY];[RED]-# ##0,--[CURRENCY]
 
 
   D.M.YY
@@ -326,6 +326,13 @@
   
 
   RUB
+  ₽
+  RUB
+  Раççей тенки
+  2
+
+
+  RUB
   тен.
   RUB
   Раççей тенки
diff --git a/i18npool/source/localedata/data/myv_RU.xml 
b/i18npool/source/localedata/data/myv_RU.xml
index c356e2acfdc5..3cb6899e6b0d 100644
--- a/i18npool/source/localedata/data/myv_RU.xml
+++ b/i18npool/source/localedata/data/myv_RU.xml
@@ -51,7 +51,7 @@
 ч.л.
 metric
   
-  
+  
 M/D
 
   General
@@ -336,6 +336,13 @@
   
 
   RUB
+  ₽
+  RUB
+  Цельковой
+  2
+
+
+  RUB
   цел
   RUB
   Цельковой
diff --git a/i18npool/source/localedata/data/ru_RU.xml 
b/i18npool/source/localedata/data/ru_RU.xml
index 1ebf8cd3360c..b0ddb3352689 100644
--- a/i18npool/source/localedata/data/ru_RU.xml
+++ b/i18npool/source/localedata/data/ru_RU.xml
@@ -51,7 +51,7 @@
 PM
 metric
   
-  
+  
 D.M.
 D/M/
 
@@ -387,14 +387,21 @@
 
   
   
-
+
+  RUB
+  ₽
+  RUB
+  Российский рубль
+  2
+
+
   RUB
   руб.
   RUB
   Российский рубль
   2
 
-
+
   RUR
   р.
   RUR
diff --git a/i18npool/source/localedata/data/tt_RU.xml 
b/i18npool/source/localedata/data/tt_RU.xml
index 488e11c6ad30..e3118f8f1a53 100644
--- a/i18npool/source/localedata/data/tt_RU.xml
+++ b/i18npool/source/localedata/data/tt_RU.xml
@@ -51,7 +51,7 @@
 кич
 metric
 
-
+
   D.M.
 
 Standard
@@ -87,22 +87,22 @@
 0,00%
 
 
-# ##0 [$р.-444];-# ##0 [$р.-444]
+# ##0 [CURRENCY];-# ##0 [CURRENCY]
 
 
-# ##0,00 [$р.-444];-# ##0,00 [$р.-444]
+# ##0,00 [CURRENCY];-# ##0,00 [CURRENCY]
 
 
-# ##0 [$р.-444];[RED]-# ##0 [$р.-444]
+# ##0 [CURRENCY];[RED]-# ##0 [CURRENCY]
 
 
-# ##0,00 [$р.-444];[RED]-# ##0,00 
[$р.-444]
+# ##0,00 [CURRENCY];[RED]-# ##0,00 
[CURRENCY]
 
 
 # ##0,00 CCC
 
 
-# ##0,-- [$р.-444];[RED]-# ##0,-- 
[$р.-444]
+# ##0,-- [CURRENCY];[RED]-# ##0,-- 
[CURRENCY]
 
 
 D.M.YY
@@ -325,14 +325,21 @@
 
 
 
-
+
+RUB
+₽
+RUB
+Рәсәй сумы
+2
+
+
 RUB
 руб.
 

[Libreoffice-commits] online.git: Changes to 'refs/tags/libreoffice-6-3-branch-point'

[Andras Timar (via logerrit)]

Tag 'libreoffice-6-3-branch-point' created by Andras Timar 
 at 2019-06-03 17:53 +

libreoffice-6-3-branch-point

Changes since collabora-online-4-branch-point-758:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/cu_RU.xml  |   13 ++---
 i18npool/source/localedata/data/cv_RU.xml  |   19 +--
 i18npool/source/localedata/data/myv_RU.xml |9 -
 i18npool/source/localedata/data/ru_RU.xml  |   13 ++---
 i18npool/source/localedata/data/tt_RU.xml  |   23 +++
 5 files changed, 56 insertions(+), 21 deletions(-)

New commits:
commit d83e831747c1e7a57296c7f1d64a5d51a97cef91
Author: Eike Rathke 
AuthorDate: Mon Jun 3 16:15:18 2019 +0200
Commit: Eike Rathke 
CommitDate: Mon Jun 3 19:53:33 2019 +0200

Resolves: tdf#96711 RUB currency symbol is ₽ U+20BD RUBLE SIGN

Change-Id: Ie9781713f04076174cdbbc34bf802df45c169727
Reviewed-on: https://gerrit.libreoffice.org/73389
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/cu_RU.xml 
b/i18npool/source/localedata/data/cu_RU.xml
index 95d82c4451ff..5dcfe38feecf 100644
--- a/i18npool/source/localedata/data/cu_RU.xml
+++ b/i18npool/source/localedata/data/cu_RU.xml
@@ -52,7 +52,7 @@
 по по́лꙋд.
 metric
   
-  
+  
 D.M.
 D/M/
 
@@ -396,14 +396,21 @@
 
   
   
-
+
+  RUB
+  ₽
+  RUB
+  рꙋ́бль рѡссі́йскїй
+  2
+
+
   RUB
   рꙋб.
   RUB
   рꙋ́бль рѡссі́йскїй
   2
 
-
+
   RUR
   р.
   RUR
diff --git a/i18npool/source/localedata/data/cv_RU.xml 
b/i18npool/source/localedata/data/cv_RU.xml
index 2e7eb69d0e7f..7b09492fd816 100644
--- a/i18npool/source/localedata/data/cv_RU.xml
+++ b/i18npool/source/localedata/data/cv_RU.xml
@@ -51,7 +51,7 @@
 PM
 metric
   
-  
+  
 D.M
 
   Standard
@@ -87,22 +87,22 @@
   0,00%
 
 
-  # ##0[$тен.-635];-# ##0[$тен.-635]
+  # ##0[CURRENCY];-# ##0[CURRENCY]
 
 
-  # ##0,00[$тен.-635];-# ##0,00[$тен.-635]
+  # ##0,00[CURRENCY];-# ##0,00[CURRENCY]
 
 
-  # ##0[$тен.-635];[RED]-# ##0[$тен.-635]
+  # ##0[CURRENCY];[RED]-# ##0[CURRENCY]
 
 
-  # ##0,00[$тен.-635];[RED]-# ##0,00[$тен.-635]
+  # ##0,00[CURRENCY];[RED]-# ##0,00[CURRENCY]
 
 
   # ##0,00 CCC
 
 
-  # ##0,--[$тен.-635];[RED]-# ##0,--[$тен.-635]
+  # ##0,--[CURRENCY];[RED]-# ##0,--[CURRENCY]
 
 
   D.M.YY
@@ -326,6 +326,13 @@
   
 
   RUB
+  ₽
+  RUB
+  Раççей тенки
+  2
+
+
+  RUB
   тен.
   RUB
   Раççей тенки
diff --git a/i18npool/source/localedata/data/myv_RU.xml 
b/i18npool/source/localedata/data/myv_RU.xml
index c356e2acfdc5..3cb6899e6b0d 100644
--- a/i18npool/source/localedata/data/myv_RU.xml
+++ b/i18npool/source/localedata/data/myv_RU.xml
@@ -51,7 +51,7 @@
 ч.л.
 metric
   
-  
+  
 M/D
 
   General
@@ -336,6 +336,13 @@
   
 
   RUB
+  ₽
+  RUB
+  Цельковой
+  2
+
+
+  RUB
   цел
   RUB
   Цельковой
diff --git a/i18npool/source/localedata/data/ru_RU.xml 
b/i18npool/source/localedata/data/ru_RU.xml
index 1ebf8cd3360c..b0ddb3352689 100644
--- a/i18npool/source/localedata/data/ru_RU.xml
+++ b/i18npool/source/localedata/data/ru_RU.xml
@@ -51,7 +51,7 @@
 PM
 metric
   
-  
+  
 D.M.
 D/M/
 
@@ -387,14 +387,21 @@
 
   
   
-
+
+  RUB
+  ₽
+  RUB
+  Российский рубль
+  2
+
+
   RUB
   руб.
   RUB
   Российский рубль
   2
 
-
+
   RUR
   р.
   RUR
diff --git a/i18npool/source/localedata/data/tt_RU.xml 
b/i18npool/source/localedata/data/tt_RU.xml
index 488e11c6ad30..e3118f8f1a53 100644
--- a/i18npool/source/localedata/data/tt_RU.xml
+++ b/i18npool/source/localedata/data/tt_RU.xml
@@ -51,7 +51,7 @@
 кич
 metric
 
-
+
   D.M.
 
 Standard
@@ -87,22 +87,22 @@
 0,00%
 
 
-# ##0 [$р.-444];-# ##0 [$р.-444]
+# ##0 [CURRENCY];-# ##0 [CURRENCY]
 
 
-# ##0,00 [$р.-444];-# ##0,00 [$р.-444]
+# ##0,00 [CURRENCY];-# ##0,00 [CURRENCY]
 
 
-# ##0 [$р.-444];[RED]-# ##0 [$р.-444]
+# ##0 [CURRENCY];[RED]-# ##0 [CURRENCY]
 
 
-# ##0,00 [$р.-444];[RED]-# ##0,00 
[$р.-444]
+# ##0,00 [CURRENCY];[RED]-# ##0,00 
[CURRENCY]
 
 
 # ##0,00 CCC
 
 
-# ##0,-- [$р.-444];[RED]-# ##0,-- 
[$р.-444]
+# ##0,-- [CURRENCY];[RED]-# ##0,-- 
[CURRENCY]
 
 
 D.M.YY
@@ -325,14 +325,21 @@
 
 
 
-
+
+RUB
+₽
+RUB
+Рәсәй сумы
+2
+
+
 RUB
 руб.
 RUB
 Рәсәй сумы
 2
 
-
+
 RUR
 р.
 RUR

[Libreoffice-commits] online.git: Changes to 'libreoffice-6-3'

[Andras Timar (via logerrit)]

New branch 'libreoffice-6-3' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/o3tl

[Noel Grandin (via logerrit)]

 include/o3tl/lru_map.hxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit c27e92b29efe573e2cda9844e9ca38965f502443
Author: Noel Grandin 
AuthorDate: Mon Jun 3 16:07:40 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon Jun 3 19:19:08 2019 +0200

fix crash in lru_map/SalBitmap on shutdown

When we shut down, we destroy the various caches, in the process of
which SalBitmap calls back into it's owning cache, causing a SIGSEGV.

Found while loading files from tdf#83426

Change-Id: I53db1621a0fdb75a8e66582662b0e2666499192b
Reviewed-on: https://gerrit.libreoffice.org/73387
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
index 003da59551b5..54378a319ece 100644
--- a/include/o3tl/lru_map.hxx
+++ b/include/o3tl/lru_map.hxx
@@ -69,6 +69,14 @@ public:
 lru_map(size_t nMaxSize)
 : mMaxSize(nMaxSize ? nMaxSize : std::min(mLruMap.max_size(), 
mLruList.max_size()))
 {}
+~lru_map()
+{
+// Some code .e.g. SalBitmap likes to remove itself from a cache 
during it's destructor, which means we
+// get calls into lru_map while we are in destruction, so use the 
swap-and-clear idiom to avoid those problems.
+mLruMap.clear();
+list_t aLruListTemp;
+aLruListTemp.swap(mLruList);
+}
 
 void insert(key_value_pair_t& rPair)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sc/source/core/data/column2.cxx  |9 ++---
 sc/source/core/data/fillinfo.cxx |6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit d4dd07320d931d8d979b6667bd894763d909cbb1
Author: Stephan Bergmann 
AuthorDate: Fri May 31 16:31:18 2019 +0200
Commit: Eike Rathke 
CommitDate: Mon Jun 3 19:00:36 2019 +0200

Avoid overflow with large row heights

With -fsanitize=float-cast-overflow, opening csv/fdo54919-3.csv as obtained 
by
bin/get-bugzilla-attachments-by-mimetype (i.e., the attachment at
) fails first 
with

> sc/source/core/data/column2.cxx:942:75: runtime error: 73940.3 is outside 
the range of representable values of type 'unsigned short'
>  #0 in ScColumn::GetOptimalHeight(sc::RowHeightContext&, int, int, 
unsigned short, int) at sc/source/core/data/column2.cxx:942:75 
(instdir/program/../program/libsclo.so +0xc93bfaf)
>  #1 in (anonymous 
namespace)::GetOptimalHeightsInColumn(sc::RowHeightContext&, ScColContainer&, 
int, int, ScProgress*, unsigned long) at sc/source/core/data/table1.cxx:114:20 
(instdir/program/../program/libsclo.so +0xe02fd57)
>  #2 in ScTable::SetOptimalHeight(sc::RowHeightContext&, int, int, 
ScProgress*, unsigned long) at sc/source/core/data/table1.cxx:466:5 
(instdir/program/../program/libsclo.so +0xe02ec69)
>  #3 in ScDocument::SetOptimalHeight(sc::RowHeightContext&, int, int, 
short) at sc/source/core/data/document.cxx:4267:18 
(instdir/program/../program/libsclo.so +0xd18bc12)
>  #4 in ScDocShell::AdjustRowHeight(int, int, short) at 
sc/source/ui/docshell/docsh5.cxx:411:32 (instdir/program/../program/libsclo.so 
+0x111eb5c6)
>  #5 in ScImportExport::ExtText2Doc(SvStream&) at 
sc/source/ui/docshell/impex.cxx:1469:29 (instdir/program/../program/libsclo.so 
+0x11498773)
>  #6 in ScImportExport::ImportStream(SvStream&, rtl::OUString const&, 
SotClipboardFormatId) at sc/source/ui/docshell/impex.cxx:379:13 
(instdir/program/../program/libsclo.so +0x11492715)
>  #7 in ScDocShell::ConvertFrom(SfxMedium&) at 
sc/source/ui/docshell/docsh.cxx:1299:35 (instdir/program/../program/libsclo.so 
+0x110b0cee)
>  #8 in SfxObjectShell::DoLoad(SfxMedium*) at 
sfx2/source/doc/objstor.cxx:768:23 (instdir/program/libsfxlo.so +0x49d934a)
[...]

and then with

> sc/source/core/data/fillinfo.cxx:216:59: runtime error: 113431 is outside 
the range of representable values of type 'unsigned short'
>  #0 in (anonymous namespace)::initRowInfo(ScDocument const*, RowInfo*, 
unsigned long, double, int, short, int&, unsigned long&, int&) at 
sc/source/core/data/fillinfo.cxx:216:59 (instdir/program/../program/libsclo.so 
+0xdb8ebcf)
>  #1 in ScDocument::FillInfo(ScTableInfo&, short, int, short, int, short, 
double, double, bool, bool, ScMarkData const*) at 
sc/source/core/data/fillinfo.cxx:401:5 (instdir/program/../program/libsclo.so 
+0xdb7896e)
>  #2 in ScPrintFunc::DrawToDev(ScDocument*, OutputDevice*, double, 
tools::Rectangle const&, ScViewData*, bool) at 
sc/source/ui/view/printfun.cxx:544:11 (instdir/program/../program/libsclo.so 
+0x1309d461)
>  #3 in ScDocShell::Draw(OutputDevice*, JobSetup const&, unsigned short) 
at sc/source/ui/docshell/docsh4.cxx:2036:9 
(instdir/program/../program/libsclo.so +0x111aabd7)
>  #4 in SfxObjectShell::DoDraw_Impl(OutputDevice*, Point const&, Fraction 
const&, Fraction const&, JobSetup const&, unsigned short) at 
sfx2/source/doc/objembed.cxx:229:5 (instdir/program/libsfxlo.so +0x491e953)
>  #5 in SfxObjectShell::DoDraw(OutputDevice*, Point const&, Size const&, 
JobSetup const&, unsigned short) at sfx2/source/doc/objembed.cxx:176:9 
(instdir/program/libsfxlo.so +0x491cbb3)
>  #6 in SfxObjectShell::CreatePreviewMetaFile_Impl(bool) const at 
sfx2/source/doc/objcont.cxx:171:40 (instdir/program/libsfxlo.so +0x48ffc5a)
>  #7 in SfxObjectShell::GetPreviewMetaFile(bool) const at 
sfx2/source/doc/objcont.cxx:118:12 (instdir/program/libsfxlo.so +0x48fdc15)
>  #8 in SfxPickListImpl::AddDocumentToPickList(SfxObjectShell*) at 
sfx2/source/appl/sfxpicklist.cxx:135:62 (instdir/program/libsfxlo.so +0x361c3e5)
[...]

These are similar to  "Avoid 
overflow
when scaling column width" and 
"Avoid overflow in ScColumn::GetOptimalColWidth", respectively, for column 
width
calculations, and given csv/fdo54919-3.csv has a rather tall fifth row, 
these
values do not look completely implausible---which of course begs the 
question
whether sal_uInt16 is an appropriate data type here.

But assuming sal_uInt16 is a useful choice, just clamp the calculated 
heights
accordingly.  (Using std::clamp, we can get rid of the following lines in
initRowInfo that ensure nHeight >= 1.)

Change-Id: I99f97c1dedcd8c6d2daa63f2e10011a3ce837fe4
Reviewed

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

[Tamas Bunth (via logerrit)]

 connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx |   11 
++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 1489620499d25a8f5188cc83f6a3558e9a1f9b61
Author: Tamas Bunth 
AuthorDate: Thu May 30 18:34:03 2019 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 3 18:44:38 2019 +0200

mysqlc: Add support for mysql type INT24

Which is mapped to sal_Int32.

Change-Id: Ibf12e92a20034440fa990ed0c6f1196f4ca3f40f
Reviewed-on: https://gerrit.libreoffice.org/73218
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index cc9348860d7a..7d261160bfae 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace rtl;
 #include 
@@ -66,6 +67,7 @@ const std::type_index getTypeFromMysqlType(enum_field_types 
type)
 case MYSQL_TYPE_SHORT:
 return std::type_index(typeid(sal_Int16));
 case MYSQL_TYPE_LONG:
+case MYSQL_TYPE_INT24:
 return std::type_index(typeid(sal_Int32));
 case MYSQL_TYPE_LONGLONG:
 return std::type_index(typeid(sal_Int64));
@@ -88,7 +90,6 @@ const std::type_index getTypeFromMysqlType(enum_field_types 
type)
 case MYSQL_TYPE_BLOB:
 case MYSQL_TYPE_YEAR:
 case MYSQL_TYPE_BIT:
-case MYSQL_TYPE_INT24:
 case MYSQL_TYPE_SET:
 case MYSQL_TYPE_ENUM:
 case MYSQL_TYPE_GEOMETRY:
@@ -269,6 +270,7 @@ ORowSetValue OPreparedResultSet::getRowSetValue(sal_Int32 
nColumnIndex)
 case MYSQL_TYPE_SHORT:
 return getShort(nColumnIndex);
 case MYSQL_TYPE_LONG:
+case MYSQL_TYPE_INT24:
 return getInt(nColumnIndex);
 case MYSQL_TYPE_LONGLONG:
 return getLong(nColumnIndex);
@@ -288,9 +290,10 @@ ORowSetValue OPreparedResultSet::getRowSetValue(sal_Int32 
nColumnIndex)
 case MYSQL_TYPE_NEWDECIMAL:
 return getString(nColumnIndex);
 default:
-mysqlc_sdbc_driver::throwFeatureNotImplementedException(
-"OPreparedResultSet::getRowSetValue", *this);
-return ORowSetValue();
+SAL_WARN("connectivity.mysqlc", 
"OPreparedResultSet::getRowSetValue: unknown type: "
+<< m_aFields[nColumnIndex - 
1].type);
+throw SQLException("Unknown column type when fetching result", 
*this, OUString(), 1,
+   Any());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamas Bunth (via logerrit)]

 connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx |   11 
++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 3a4c4482ecdc7a7ef4dd944a49d17a9d30d27b78
Author: Tamas Bunth 
AuthorDate: Thu May 30 18:34:03 2019 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 3 18:44:07 2019 +0200

mysqlc: Add support for mysql type INT24

Which is mapped to sal_Int32.

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

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index b3630072c143..3b9e4a2aeb57 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace rtl;
 #include 
@@ -66,6 +67,7 @@ const std::type_index getTypeFromMysqlType(enum_field_types 
type)
 case MYSQL_TYPE_SHORT:
 return std::type_index(typeid(sal_Int16));
 case MYSQL_TYPE_LONG:
+case MYSQL_TYPE_INT24:
 return std::type_index(typeid(sal_Int32));
 case MYSQL_TYPE_LONGLONG:
 return std::type_index(typeid(sal_Int64));
@@ -88,7 +90,6 @@ const std::type_index getTypeFromMysqlType(enum_field_types 
type)
 case MYSQL_TYPE_BLOB:
 case MYSQL_TYPE_YEAR:
 case MYSQL_TYPE_BIT:
-case MYSQL_TYPE_INT24:
 case MYSQL_TYPE_SET:
 case MYSQL_TYPE_ENUM:
 case MYSQL_TYPE_GEOMETRY:
@@ -266,6 +267,7 @@ ORowSetValue OPreparedResultSet::getRowSetValue(sal_Int32 
nColumnIndex)
 case MYSQL_TYPE_SHORT:
 return getShort(nColumnIndex);
 case MYSQL_TYPE_LONG:
+case MYSQL_TYPE_INT24:
 return getInt(nColumnIndex);
 case MYSQL_TYPE_LONGLONG:
 return getLong(nColumnIndex);
@@ -285,9 +287,10 @@ ORowSetValue OPreparedResultSet::getRowSetValue(sal_Int32 
nColumnIndex)
 case MYSQL_TYPE_NEWDECIMAL:
 return getString(nColumnIndex);
 default:
-mysqlc_sdbc_driver::throwFeatureNotImplementedException(
-"OPreparedResultSet::getRowSetValue", *this);
-return ORowSetValue();
+SAL_WARN("connectivity.mysqlc", 
"OPreparedResultSet::getRowSetValue: unknown type: "
+<< m_aFields[nColumnIndex - 
1].type);
+throw SQLException("Unknown column type when fetching result", 
*this, OUString(), 1,
+   Any());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/item_refactor2' - include/item include/svl include/svx sc/inc sc/source svl/source svx/source sw/inc sw/source

[Armin Le Grand (via logerrit)]

 include/item/base/ItemBase.hxx  |   55 
 include/svl/itempool.hxx|2 -
 include/svx/svdpool.hxx |2 -
 sc/inc/docpool.hxx  |2 -
 sc/source/core/data/docpool.cxx |2 -
 svl/source/items/itempool.cxx   |2 -
 svl/source/items/style.cxx  |2 -
 svx/source/dialog/srchdlg.cxx   |2 -
 svx/source/svdraw/svdattr.cxx   |4 +-
 sw/inc/format.hxx   |4 +-
 sw/inc/swatrset.hxx |2 -
 sw/source/core/crsr/crstrvl.cxx |2 -
 sw/source/uibase/app/docstyle.cxx   |4 +-
 sw/source/uibase/utlui/attrdesc.cxx |4 +-
 14 files changed, 72 insertions(+), 17 deletions(-)

New commits:
commit 203d0f02f5bbe89ed4c30c3addcd1a212e3c1787
Author: Armin Le Grand 
AuthorDate: Mon Jun 3 18:28:14 2019 +0200
Commit: Armin Le Grand 
CommitDate: Mon Jun 3 18:28:14 2019 +0200

WIP: Discussion methods at ItemBase

Isloated quite some funcs in code to deep-dive
functionality, commented quite some how to refactor
these.

Change-Id: Ie8808de6bc096449186af86d8a578269911890c1

diff --git a/include/item/base/ItemBase.hxx b/include/item/base/ItemBase.hxx
index d099bb4a93ea..ee465ad7f0f9 100644
--- a/include/item/base/ItemBase.hxx
+++ b/include/item/base/ItemBase.hxx
@@ -129,10 +129,63 @@ namespace Item
 
 // clone-op, secured by returning a std::unique_ptr to make
 // explicit the ownership you get when calling this
+// -> no longer virtual, no impls at the Items, one central method
 std::unique_ptr clone() const;
 
 // ca. 220 impls
 // /**  @return true if it has a valid string representation */
+//
+// Notes:
+// used as 'GetPresentation' in old environment, at least in three
+// incarnations:
+// - virtual SfxPoolItem::GetPresentation inm all Items implementing 
this
+//   -> needs to be taken over for all transformend items (of course)
+// - virtual SfxItemPool::GetPresentation in two forms: -> 
ItemPoolGetPresentation
+//  SfxItemPool::GetPresentation:
+//  Base impl just adds metric using GetMetric(rItem.Which())
+//  thus usually from SfxItemPool, except that Items in Calc 
(see
+//  other comments about metrics)
+//  -> replace using metic from ModelSpecificItemValues 
directly
+//  -> for the mentioned Items in Calc: use fixed metric in the
+// items GetPresentation implementation
+//  ScDocumentPool::GetPresentation
+//  Fallback to base impl, except for Items which use
+//  case ATTR_PAGE_TOPDOWN:
+//  case ATTR_PAGE_HEADERS:
+//  case ATTR_PAGE_NULLVALS:
+//  case ATTR_PAGE_FORMULAS:
+//  case ATTR_PAGE_NOTES:
+//  case ATTR_PAGE_GRID:
+//  case ATTR_PAGE_SCALETOPAGES:
+//  case ATTR_PAGE_FIRSTPAGENO:
+//  case ATTR_PAGE_SCALE:
+//  case ATTR_PAGE_HEADERSET:
+//  case ATTR_PAGE_FOOTERSET:
+//  -> adapt thse Items GetPresentation impl as needed, we
+// will have one ItemType (derivation) per ID in the future
+//  -> also uses helper lcl_HFPresentation that iterates over 
ItemSet of
+// SetItem to create a combined string using SfxItemIter 
for the
+// WhichIDs
+//  ATTR_PAGE_ON:
+//  ATTR_PAGE_DYNAMIC:
+//  ATTR_PAGE_SHARED:
+//  ATTR_LRSPACE:
+// So need to adapt GetPresentation for the new Items 
which will
+// be used for this
+//  SdrItemPool::GetPresentation
+//  Uses fallback to rItem.GetPresentation, but adds 
'TakeItemName'
+//  in front of the result. See SdrItemPool::TakeItemName 
which uses
+//  ResIDs to get the ItemNames. All that for Items in the 
WhichID ragnes of
+//  (nWhich>=SDRATTR_SHADOW_FIRST && nWhich<=SDRATTR_END)
+//  -> for Items SDRATTR_SHADOW_FIRST..SDRATTR_END use the 
WhichIDs from that
+// ressoures as ItemName (already prepared for new Items) 
and
+// add that in front of usual result in GetPresentation 
impl of those Items
+// - SwAttrSet::GetPresentation -> AttrSetGetPresentation
+//  non-virtual, local helper at SwAttrSet
+//  uses SfxItemIter to create a combined presentation
+//  -> extend to include new items from itemSet()
+// - SwFormat::GetPresentation -> SwFormatGetPresentation
+//  simple forwarder to SwAttrSet::GetPresentation
  

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

[Jan Holesovsky (via logerrit)]

 sfx2/source/control/unoctitm.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 0a8eefb55a2cd473bb7f07f19e23051d3e3a22c1
Author: Jan Holesovsky 
AuthorDate: Mon Jun 3 12:50:01 2019 +0200
Commit: Szymon Kłos 
CommitDate: Mon Jun 3 18:20:05 2019 +0200

lok: Fix status of InsertPage, DeletePage and DuplicatePage.

Status true / false means checked, status enabled / disabled means the
visibility (enablement) of the uno command.

Change-Id: Ib2671984f59ffd5e6f1823a65ea42b33bdfe67d6
Reviewed-on: https://gerrit.libreoffice.org/73384
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 357fd4be74a2..7390a3328fa3 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1078,6 +1078,9 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "InsertColumnsBefore" ||
  aEvent.FeatureURL.Path == "InsertColumnsAfter" ||
  aEvent.FeatureURL.Path == "InsertSymbol" ||
+ aEvent.FeatureURL.Path == "InsertPage" ||
+ aEvent.FeatureURL.Path == "DeletePage" ||
+ aEvent.FeatureURL.Path == "DuplicatePage" ||
  aEvent.FeatureURL.Path == "DeleteRows" ||
  aEvent.FeatureURL.Path == "DeleteColumns" ||
  aEvent.FeatureURL.Path == "DeleteTable" ||
@@ -1102,12 +1105,6 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 {
 aBuffer.append(aEvent.IsEnabled ? OUString("enabled") : 
OUString("disabled"));
 }
-else if (aEvent.FeatureURL.Path == "InsertPage" ||
- aEvent.FeatureURL.Path == "DeletePage" ||
- aEvent.FeatureURL.Path == "DuplicatePage")
-{
-aBuffer.append(OUString::boolean(aEvent.IsEnabled));
-}
 else if (aEvent.FeatureURL.Path == "AssignLayout" ||
  aEvent.FeatureURL.Path == "StatusSelectionMode" ||
  aEvent.FeatureURL.Path == "Signature" ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/qt5

[Michael Weghorn (via logerrit)]

 vcl/qt5/Qt5AccessibleWidget.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 5b54a62b086726f854a474623e1330b28b7984b7
Author: Michael Weghorn 
AuthorDate: Thu May 30 23:41:10 2019 +0200
Commit: Michael Weghorn 
CommitDate: Mon Jun 3 18:15:51 2019 +0200

tdf#122200 Qt5AccessibleWidget: Handle special offset values

Handle special values for offset in 'Qt5AccessibleWidget::attributes'
the same way that the base class's 'QAccessibleTextWidget::attributes'
does, s. [1].

In particular, an offset matching the text length can
be passed e.g. by "accerciser" or screen readers,
which previously resulted in an 'IndexOutOfBoundsException'
being thrown when the index was later checked in the
call to 'VCLXAccessibleStatusBarItem::getCharacterAttributes'.

See also 'IAccessibleText::attributes' documentation at [2] and
the page on special offset values referenced there [3].

[1] 
https://code.qt.io/cgit/qt/qtbase.git/tree/src/widgets/accessible/qaccessiblewidgets.cpp?h=5.12.4#n791
[2] 
https://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/interface_i_accessible_text.html#a29e5c8f69ec13c683ed6bca5e6a5
[3] 
https://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/_general_info.html#_specialOffsets

Change-Id: I623995aeb689b31c5b49fb3ace8e4dd4c18927d2
Reviewed-on: https://gerrit.libreoffice.org/73225
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 93c81657c6111b4bb97a2bb9ec155465f9a6f523)
Reviewed-on: https://gerrit.libreoffice.org/73378
Reviewed-by: Michael Weghorn 

diff --git a/vcl/qt5/Qt5AccessibleWidget.cxx b/vcl/qt5/Qt5AccessibleWidget.cxx
index 2c31a2bdb92a..9757eab27837 100644
--- a/vcl/qt5/Qt5AccessibleWidget.cxx
+++ b/vcl/qt5/Qt5AccessibleWidget.cxx
@@ -830,6 +830,22 @@ QString Qt5AccessibleWidget::attributes(int offset, int* 
startOffset, int* endOf
 if (!xText.is())
 return QString();
 
+// handle special values for offset the same way base class's 
QAccessibleTextWidget::attributes does
+// (as defined in IAccessible 2: -1 -> length, -2 -> cursor position)
+if (offset == -2)
+offset = cursorPosition(); // currently always returns 0
+
+const int nTextLength = characterCount();
+if (offset == -1 || offset == nTextLength)
+offset = nTextLength - 1;
+
+if (offset < 0 || offset > nTextLength)
+{
+*startOffset = -1;
+*endOffset = -1;
+return QString();
+}
+
 Sequence attribs = xText->getCharacterAttributes(offset, 
Sequence());
 const PropertyValue* pValues = attribs.getConstArray();
 OUString aRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/qt5

[Michael Weghorn (via logerrit)]

 vcl/qt5/Qt5AccessibleWidget.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 0b904a8b3ceb648cf6466cb33f07310a3c70f793
Author: Michael Weghorn 
AuthorDate: Thu May 30 23:41:10 2019 +0200
Commit: Katarina Behrens 
CommitDate: Mon Jun 3 18:12:45 2019 +0200

tdf#122200 Qt5AccessibleWidget: Handle special offset values

Handle special values for offset in 'Qt5AccessibleWidget::attributes'
the same way that the base class's 'QAccessibleTextWidget::attributes'
does, s. [1].

In particular, an offset matching the text length can
be passed e.g. by "accerciser" or screen readers,
which previously resulted in an 'IndexOutOfBoundsException'
being thrown when the index was later checked in the
call to 'VCLXAccessibleStatusBarItem::getCharacterAttributes'.

See also 'IAccessibleText::attributes' documentation at [2] and
the page on special offset values referenced there [3].

[1] 
https://code.qt.io/cgit/qt/qtbase.git/tree/src/widgets/accessible/qaccessiblewidgets.cpp?h=5.12.4#n791
[2] 
https://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/interface_i_accessible_text.html#a29e5c8f69ec13c683ed6bca5e6a5
[3] 
https://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/_general_info.html#_specialOffsets

Change-Id: I623995aeb689b31c5b49fb3ace8e4dd4c18927d2
Reviewed-on: https://gerrit.libreoffice.org/73225
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 93c81657c6111b4bb97a2bb9ec155465f9a6f523)
Reviewed-on: https://gerrit.libreoffice.org/73379

diff --git a/vcl/qt5/Qt5AccessibleWidget.cxx b/vcl/qt5/Qt5AccessibleWidget.cxx
index b76acb4a1c57..e2cc0a31765c 100644
--- a/vcl/qt5/Qt5AccessibleWidget.cxx
+++ b/vcl/qt5/Qt5AccessibleWidget.cxx
@@ -830,6 +830,22 @@ QString Qt5AccessibleWidget::attributes(int offset, int* 
startOffset, int* endOf
 if (!xText.is())
 return QString();
 
+// handle special values for offset the same way base class's 
QAccessibleTextWidget::attributes does
+// (as defined in IAccessible 2: -1 -> length, -2 -> cursor position)
+if (offset == -2)
+offset = cursorPosition(); // currently always returns 0
+
+const int nTextLength = characterCount();
+if (offset == -1 || offset == nTextLength)
+offset = nTextLength - 1;
+
+if (offset < 0 || offset > nTextLength)
+{
+*startOffset = -1;
+*endOffset = -1;
+return QString();
+}
+
 Sequence attribs = xText->getCharacterAttributes(offset, 
Sequence());
 const PropertyValue* pValues = attribs.getConstArray();
 OUString aRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Regina Henschel (via logerrit)]

 svx/source/customshapes/EnhancedCustomShapeGeometry.cxx |   20 
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit d2702aea99a93f6d3de498fda97cc1ca4f642356
Author: Regina Henschel 
AuthorDate: Sun Jun 2 22:52:52 2019 +0200
Commit: Regina Henschel 
CommitDate: Mon Jun 3 17:29:27 2019 +0200

tdf#125640 correct Beziercurve control points in doublewave shapes

To follow the way doublewave shapes are drawn in MS Office binary
format and specified for DrawingML, it is necessary, that the paths
for the two wave parts are equal. That was not the case.

Change-Id: Ieeb3f7cf9feca7dd3263f813a074821ea84ef902
Reviewed-on: https://gerrit.libreoffice.org/73358
Tested-by: Jenkins
Reviewed-by: Regina Henschel 

diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx 
b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index ce4223582ff1..c0d81e213951 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -6109,8 +6109,8 @@ static const mso_CustomShape msoWave =
 
 static const SvxMSDffVertPair mso_sptDoubleWaveVert[] = // adjustment1 : 0 - 
2230
 {   // adjustment2 : 8640 
- 12960
-{ 7 MSO_I, 0 MSO_I }, { 15 MSO_I, 9 MSO_I }, { 0x1e MSO_I, 10 MSO_I }, { 
0x12 MSO_I, 0 MSO_I }, { 0x1f MSO_I, 9 MSO_I }, { 16 MSO_I, 10 MSO_I }, { 12 
MSO_I, 0 MSO_I },
-{ 24 MSO_I, 1 MSO_I }, { 25 MSO_I, 26 MSO_I }, { 0x21 MSO_I, 28 MSO_I }, { 
0x13 MSO_I, 1 MSO_I }, { 0x20 MSO_I, 26 MSO_I }, { 27 MSO_I, 28 MSO_I }, { 29 
MSO_I, 1 MSO_I }
+{ 7 MSO_I, 0 MSO_I }, { 15 MSO_I, 9 MSO_I }, { 0x1f MSO_I, 10 MSO_I }, { 
0x12 MSO_I, 0 MSO_I }, { 0x1e MSO_I, 9 MSO_I }, { 16 MSO_I, 10 MSO_I }, { 12 
MSO_I, 0 MSO_I },
+{ 24 MSO_I, 1 MSO_I }, { 25 MSO_I, 26 MSO_I }, { 0x20 MSO_I, 28 MSO_I }, { 
0x13 MSO_I, 1 MSO_I }, { 0x21 MSO_I, 26 MSO_I }, { 27 MSO_I, 28 MSO_I }, { 29 
MSO_I, 1 MSO_I }
 };
 static const SvxMSDffCalculationData mso_sptDoubleWaveCalc[] =
 {
@@ -6148,10 +6148,10 @@ static const SvxMSDffCalculationData 
mso_sptDoubleWaveCalc[] =
 { 0xa000, { 0x401, 0, 0x408 } },//41c
 
 { 0x8000, { 21600, 0, 0x40c } },//41d p3
-{ 0xa000, { 0x412, 0, 0x40e } },//41e
-{ 0x6000, { 0x412, 0x40e, 0 } },//41f
-{ 0xa000, { 0x413, 0, 0x40e } },//420
-{ 0x6000, { 0x413, 0x40e, 0 } } //421
+{ 0xa000, { 0x412, 3600, 0x40e } }, //41e
+{ 0x6000, { 0x412, 0x40e, 3600 } }, //41f
+{ 0xa000, { 0x413, 3600, 0x40e } }, //420
+{ 0x6000, { 0x413, 0x40e, 3600 } }  //421
 };
 static const SvxMSDffVertPair mso_sptDoubleWaveGluePoints[] =
 {
@@ -7560,8 +7560,8 @@ static const mso_CustomShape msoTextWave2 =
 
 static const SvxMSDffVertPair mso_sptTextWave3Vert[] =  // adjustment1 : 0 - 
2230
 {   // adjustment2 : 8640 
- 12960
-{ 7 MSO_I, 0 MSO_I }, { 15 MSO_I, 9 MSO_I }, { 0x1e MSO_I, 10 MSO_I }, { 
0x12 MSO_I, 0 MSO_I }, { 0x1f MSO_I, 9 MSO_I }, { 16 MSO_I, 10 MSO_I }, { 12 
MSO_I, 0 MSO_I },
-{ 29 MSO_I, 1 MSO_I }, { 27 MSO_I, 28 MSO_I }, { 0x20 MSO_I, 26 MSO_I }, { 
0x13 MSO_I, 1 MSO_I }, { 0x21 MSO_I, 28 MSO_I }, { 25 MSO_I, 26 MSO_I }, { 24 
MSO_I, 1 MSO_I }
+{ 7 MSO_I, 0 MSO_I }, { 15 MSO_I, 9 MSO_I }, { 0x1f MSO_I, 10 MSO_I }, { 
0x12 MSO_I, 0 MSO_I }, { 0x1e MSO_I, 9 MSO_I }, { 16 MSO_I, 10 MSO_I }, { 12 
MSO_I, 0 MSO_I },
+{ 29 MSO_I, 1 MSO_I }, { 27 MSO_I, 28 MSO_I }, { 0x21 MSO_I, 26 MSO_I }, { 
0x13 MSO_I, 1 MSO_I }, { 0x20 MSO_I, 28 MSO_I }, { 25 MSO_I, 26 MSO_I }, { 24 
MSO_I, 1 MSO_I }
 };
 static const sal_uInt16 mso_sptTextWave3Segm[] =
 {
@@ -7583,8 +7583,8 @@ static const mso_CustomShape msoTextWave3 =
 
 static const SvxMSDffVertPair mso_sptTextWave4Vert[] =  // adjustment1 : 0 - 
2230
 {   // adjustment2 : 8640 
- 12960
-{ 7 MSO_I, 0 MSO_I }, { 15 MSO_I, 10 MSO_I }, { 0x1e MSO_I, 9 MSO_I }, { 
0x12 MSO_I, 0 MSO_I }, { 0x1f MSO_I, 10 MSO_I }, { 16 MSO_I, 9 MSO_I }, { 12 
MSO_I, 0 MSO_I },
-{ 29 MSO_I, 1 MSO_I }, { 27 MSO_I, 26 MSO_I }, { 0x20 MSO_I, 28 MSO_I }, { 
0x13 MSO_I, 1 MSO_I }, { 0x21 MSO_I, 26 MSO_I }, { 25 MSO_I, 28 MSO_I }, { 24 
MSO_I, 1 MSO_I }
+{ 7 MSO_I, 0 MSO_I }, { 15 MSO_I, 10 MSO_I }, { 0x1f MSO_I, 9 MSO_I }, { 
0x12 MSO_I, 0 MSO_I }, { 0x1e MSO_I, 10 MSO_I }, { 16 MSO_I, 9 MSO_I }, { 12 
MSO_I, 0 MSO_I },
+{ 29 MSO_I, 1 MSO_I }, { 27 MSO_I, 26 MSO_I }, { 0x21 MSO_I, 28 MSO_I }, { 
0x13 MSO_I, 1 MSO_I }, { 0x20 MSO_I, 26 MSO_I }, { 25 MSO_I, 28 MSO_I }, { 24 
MSO_I, 1 MSO_I }
 };
 static const mso_CustomShape msoTextWave4 =
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: tdf#120047 Support attribute harpoon/wideharpoon in Math

[Takeshi Abe]

Hi Regina,

On Sun, 2 Jun 2019 15:20:21 +0200, Regina Henschel  
wrote:
> With the new font file installed, the two harpoon commands results in 
> correctly
> rendered harpoon symbols in Math formulas now.
Great.

> 
> I have tested the new glyph in ordinary text too. I have looked, how it is
> placed in other fonts. The solutions vary. "STIX Two Text" puts it over the
> character, so that the next character has the same place as if no combined
> character is before. "Segoe UI Symbol" puts it half to the right and the next
> character tight, so that the harpoon goes into the next character. "Arial
> Unicode MS" and "Cambria" puts it entire on the right side and the next
> character after the harpoon. That is the same as I see it in OpenSymbol. So 
> now
> reason to object.
> 
> What is needed, that the new OpenSymbol font is generated during the
> build-process?
If you have FontForge (fontforge in PATH) installed, autogen.sh will find it
given --enable-build-opensymbol option, which has been introduced recently:
, and the .ttf will be built.

> The export to MathML is OK, import from pure MathML works too.
> 
> Tooltips and texts in context menu are OK. But the text in section 
> "Attributes"
> in the help needs to be updated. So in case you do not write it yourself, 
> please
> add the bug to the "depends on" list in Meta-bug 120200, when your commit your
> patch.
Right, I will file an issue once merged.

> 
> So for me it looks usable.
> 
> In the long term, I would prefer to get a general solution for the MathML
> attributes 'accent' and 'stretchy'. But because no one is working on it, I
> support to solve this special request in the way you suggest.
I agree with your preference for a general solution, and admit that my patch
is just a one-more-pile thing.

Thank you very much for your throughly inspection.

Cheers,
-- Takeshi Abe
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: tdf#120047 Support attribute harpoon/wideharpoon in Math

[Takeshi Abe]

Hi Regina,

(I have sent the following message last sunday, but the mailing list put it down
due to the size limit exceeded with attached files.  Retrying the same but with
links instead.)

Thank you for checking the changeset.

On Sat, 1 Jun 2019 17:53:10 +0200, Regina Henschel  
wrote:
> Hi Takeshi,
> 
> can you please provide the changed OpenSymbol font? For example attach it to 
> the
> bug report?
Uploaded opens___.ttf to bugzilla generated from the modified OpenSymbol.sfd.
I have given --enable-build-opensymbol to configure to build it on macOS.

> 
> Currently the symbol is not only the harpoon, but the placeholder dotted 
> circle
> in addition, see attachment.
I see.  I am not sure why, but I do have observed that combining the harpoon/vec
symbol can produce some awkward layout when using a different font for 
variables,
etc.  Although it is not exactly what you faced, for example, see attached
screenshots [1][2];  they differs only with respect to the font chosen for
variables, however in the bad one the symbols are too close to their underlying
glyphs.

[1] https://www.fixedpoint.jp/libreoffice/20190602/vec-harpoon-good.png
[2] https://www.fixedpoint.jp/libreoffice/20190602/vec-harpoon-bad.png

Cheers,
-- Takeshi Abe

> 
> I would like to test it with your version of the font.
> 
> Kind regards
> Regina
> 
> Takeshi Abe schrieb am 01-Jun-19 um 03:36:
>> Hi,
>> To solve tdf#120047 [1], I am going to add a couple of new attributes
>> harpoon/wideharpoon to the starmath command syntax [2].
>> At the same time the patch introduces a new glyph to OpenSymbol font
>> to make sure that the harpoon symbol (U+20D1) has the consistent width
>> with COMBINING RIGHT ARROW ABOVE (U+20D7), which is the one shown
>> as the arrow for attributes vec/widevec so far.
>> Review and suggestions are highly appreciated.
>> [1] https://bugs.documentfoundation.org/show_bug.cgi?id=120047
>> [2] https://gerrit.libreoffice.org/#/c/72987/
>> Cheers,
>> -- Takeshi Abe
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>> 
> 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Weekly Report [27-May - 2 June] - Improvement to Notebookbar

[Sumit Chauhan]

* Worked on the UI of the Notebookbar customization tab.
* Facing the problem to load entries in UI in the form of Tree and
currently working on it.
* The patch:  https://gerrit.libreoffice.org/#/c/73261/

The patch is raw and will be finished by this week.

Thanks
Sumit Chauhan
IRC nick : sumitcn
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/inc vcl/Library_vclplug_qt5.mk vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 vcl/Library_vclplug_qt5.mk  |1 
 vcl/inc/qt5/Qt5Clipboard.hxx|   22 -
 vcl/inc/qt5/Qt5DragAndDrop.hxx  |   18 
 vcl/inc/qt5/Qt5Transferable.hxx |   56 +
 vcl/qt5/Qt5Clipboard.cxx|  131 ++-
 vcl/qt5/Qt5DragAndDrop.cxx  |   79 --
 vcl/qt5/Qt5Frame.cxx|1 
 vcl/qt5/Qt5Transferable.cxx |  167 
 8 files changed, 239 insertions(+), 236 deletions(-)

New commits:
commit 2f0114b6244af429def59e107bd0b2835818913c
Author: Jan-Marek Glogowski 
AuthorDate: Sat Jun 1 03:36:36 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Mon Jun 3 16:34:49 2019 +0200

Qt5 refactor and move XTransferable implementations

There is already duplicate code getTransferDataFlavorsAsVector.
Maybe getTransferData can be also merged later.

Change-Id: Iaa1c16990c1f19757f04944bcd21f395f6b8f69b
Reviewed-on: https://gerrit.libreoffice.org/73301
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index 4b49eba7504d..3231672c8743 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -107,6 +107,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\
 vcl/qt5/Qt5System \
 vcl/qt5/Qt5Timer \
 vcl/qt5/Qt5Tools \
+vcl/qt5/Qt5Transferable \
 vcl/qt5/Qt5VirtualDevice \
 vcl/qt5/Qt5Widget \
 vcl/qt5/Qt5XAccessible \
diff --git a/vcl/inc/qt5/Qt5Clipboard.hxx b/vcl/inc/qt5/Qt5Clipboard.hxx
index fb79ec463717..2c2bb93f5016 100644
--- a/vcl/inc/qt5/Qt5Clipboard.hxx
+++ b/vcl/inc/qt5/Qt5Clipboard.hxx
@@ -10,36 +10,16 @@
 
 #pragma once
 
-#include 
-
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
-class Qt5Transferable : public 
cppu::WeakImplHelper
-{
-public:
-explicit Qt5Transferable(QClipboard::Mode aMode);
-
-virtual css::uno::Any SAL_CALL
-getTransferData(const css::datatransfer::DataFlavor& rFlavor) override;
-
-virtual std::vector 
getTransferDataFlavorsAsVector();
-
-virtual css::uno::Sequence
-SAL_CALL getTransferDataFlavors() override;
-virtual sal_Bool SAL_CALL
-isDataFlavorSupported(const css::datatransfer::DataFlavor& rFlavor) 
override;
-
-private:
-QClipboard::Mode m_aClipboardMode;
-};
-
 class Qt5Clipboard
 : public QObject,
   public 
cppu::WeakComponentImplHelper
-#include "Qt5Clipboard.hxx"
-
 #include 
 #include 
 #include 
 #include 
+#include 
 
 class Qt5Frame;
-class QMimeData;
-
-class Qt5DnDTransferable : public Qt5Transferable
-{
-public:
-Qt5DnDTransferable(const QMimeData* pMimeData);
-virtual css::uno::Any SAL_CALL
-getTransferData(const css::datatransfer::DataFlavor& rFlavor) override;
-
-virtual std::vector 
getTransferDataFlavorsAsVector() override;
-
-private:
-const QMimeData* m_pMimeData;
-};
 
 class Qt5DragSource
 : public cppu::WeakComponentImplHelperhttp://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#pragma once
+
+#include 
+#include 
+
+#include 
+
+/**
+ * Abstract XTransferable used for clipboard and D'n'D transfers
+ **/
+class Qt5Transferable : public 
cppu::WeakImplHelper
+{
+Qt5Transferable() = delete;
+Qt5Transferable(const Qt5Transferable&) = delete;
+
+protected:
+const QMimeData* m_pMimeData;
+
+Qt5Transferable(const QMimeData* pMimeData);
+std::vector 
getTransferDataFlavorsAsVector();
+
+public:
+~Qt5Transferable() override;
+
+css::uno::Sequence SAL_CALL 
getTransferDataFlavors() override;
+sal_Bool SAL_CALL isDataFlavorSupported(const 
css::datatransfer::DataFlavor& rFlavor) override;
+};
+
+class Qt5ClipboardTransferable final : public Qt5Transferable
+{
+public:
+explicit Qt5ClipboardTransferable(QClipboard::Mode aMode);
+~Qt5ClipboardTransferable() override;
+
+css::uno::Any SAL_CALL getTransferData(const 
css::datatransfer::DataFlavor& rFlavor) override;
+};
+
+class Qt5DnDTransferable final : public Qt5Transferable
+{
+public:
+Qt5DnDTransferable(const QMimeData* pMimeData);
+
+css::uno::Any SAL_CALL getTransferData(const 
css::datatransfer::DataFlavor& rFlavor) override;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qt5/Qt5Clipboard.cxx b/vcl/qt5/Qt5Clipboard.cxx
index 8f9c373836bb..2fc97caeb16b 100644
--- a/vcl/qt5/Qt5Clipboard.cxx
+++ b/vcl/qt5/Qt5Clipboard.cxx
@@ -14,13 +14,13 @@
 #include 
 #include 
 
-#include 
-#include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -29,26 +29,20 @@ using namespace com::sun::star;
 
 namespace
 {
-std::map g_nameToClipboardMap
-= { { "CLIPBOARD", QClipboard::Clipboard }, { "PRIMARY", 
QClipboard::Selection } };
-
 QClipboard::Mode getClipboardTypeFromName(const OUString& aString)
 {
-// use QClipboard::Clipboard as fallback if requested type isn't found
+static const std::map aNameToClipboard

[Libreoffice-commits] core.git: vcl/inc vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 vcl/inc/qt5/Qt5Clipboard.hxx |   44 +++-
 vcl/qt5/Qt5Clipboard.cxx |   76 ++-
 vcl/qt5/Qt5DragAndDrop.cxx   |   33 +-
 vcl/qt5/Qt5Instance.cxx  |   12 +++---
 4 files changed, 84 insertions(+), 81 deletions(-)

New commits:
commit 6e8448cdf0541f017e8b54734dd0928e935c73fa
Author: Jan-Marek Glogowski 
AuthorDate: Fri May 31 16:34:37 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Mon Jun 3 16:24:44 2019 +0200

Qt5 remove header using namespaces and Vcl prefix

This is mainly about the using namespace in the Qt5Clipboard
header. While at it get rid of the Vcl prefix.

Change-Id: I62a804a83afe2feb4bf130eb5475790bc52365c4
Reviewed-on: https://gerrit.libreoffice.org/73287
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/inc/qt5/Qt5Clipboard.hxx b/vcl/inc/qt5/Qt5Clipboard.hxx
index 7539b748dc23..fb79ec463717 100644
--- a/vcl/inc/qt5/Qt5Clipboard.hxx
+++ b/vcl/inc/qt5/Qt5Clipboard.hxx
@@ -21,10 +21,6 @@
 
 #include 
 
-using namespace com::sun::star;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-
 class Qt5Transferable : public 
cppu::WeakImplHelper
 {
 public:
@@ -44,31 +40,30 @@ private:
 QClipboard::Mode m_aClipboardMode;
 };
 
-class VclQt5Clipboard
+class Qt5Clipboard
 : public QObject,
-  public 
cppu::WeakComponentImplHelper
+  public 
cppu::WeakComponentImplHelper
 {
 Q_OBJECT
 
-private Q_SLOTS:
-void handleClipboardChange(QClipboard::Mode mode);
-
-private:
 osl::Mutex m_aMutex;
-Reference m_aContents;
-Reference m_aOwner;
-std::vector> 
m_aListeners;
+css::uno::Reference m_aContents;
+css::uno::Reference 
m_aOwner;
+
std::vector>
 m_aListeners;
 OUString m_aClipboardName;
 QClipboard::Mode m_aClipboardMode;
 // custom MIME type to detect whether clipboard content was added by self 
or externally
 const QString m_sMimeTypeUuid = "application/x-libreoffice-clipboard-uuid";
 const QByteArray m_aUuid;
 
+private Q_SLOTS:
+void handleClipboardChange(QClipboard::Mode mode);
+
 public:
-explicit VclQt5Clipboard(const OUString& aModeString);
-virtual ~VclQt5Clipboard() override;
+explicit Qt5Clipboard(const OUString& aModeString);
+virtual ~Qt5Clipboard() override;
 
 /*
  * XServiceInfo
@@ -76,17 +71,18 @@ public:
 
 virtual OUString SAL_CALL getImplementationName() override;
 virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) 
override;
-virtual Sequence SAL_CALL getSupportedServiceNames() override;
+virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() 
override;
 
 /*
  * XClipboard
  */
 
-virtual Reference SAL_CALL getContents() 
override;
+virtual css::uno::Reference SAL_CALL 
getContents() override;
 
 virtual void SAL_CALL setContents(
-const Reference& xTrans,
-const Reference& 
xClipboardOwner) override;
+const css::uno::Reference& xTrans,
+const 
css::uno::Reference& 
xClipboardOwner)
+override;
 
 virtual OUString SAL_CALL getName() override;
 
@@ -105,10 +101,12 @@ public:
  * XClipboardNotifier
  */
 virtual void SAL_CALL addClipboardListener(
-const Reference& 
listener) override;
+const 
css::uno::Reference& listener)
+override;
 
 virtual void SAL_CALL removeClipboardListener(
-const Reference& 
listener) override;
+const 
css::uno::Reference& listener)
+override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qt5/Qt5Clipboard.cxx b/vcl/qt5/Qt5Clipboard.cxx
index 6d333d498ff2..8f9c373836bb 100644
--- a/vcl/qt5/Qt5Clipboard.cxx
+++ b/vcl/qt5/Qt5Clipboard.cxx
@@ -25,6 +25,8 @@
 
 #include 
 
+using namespace com::sun::star;
+
 namespace
 {
 std::map g_nameToClipboardMap
@@ -95,7 +97,7 @@ std::vector 
Qt5Transferable::getTransferDataFlavo
 else
 {
 aFlavor.MimeType = toOUString(rMimeType);
-aFlavor.DataType = cppu::UnoType>::get();
+aFlavor.DataType = 
cppu::UnoType>::get();
 aVector.push_back(aFlavor);
 }
 }
@@ -143,7 +145,8 @@ Qt5Transferable::getTransferData(const 
css::datatransfer::DataFlavor& rFlavor)
 {
 QString clipboardContent = mimeData->html();
 std::string aStr = clipboardContent.toStdString();
-Sequence aSeq(reinterpret_cast(aStr.c_str()), aStr.length());
+uno::Sequence aSeq(reinterpret_cast(aStr.c_str()),
+ aStr.length());
 aRet <<= aSeq;
 }
 else if (rFlavor.MimeType.startsWith("image") && mimeData->hasImage())
@@ -157,7 +160,7 @@ Qt5Transferable::getTransferData(const 
css::datatransfer::DataFlavor& rFlavor)
 buffer.open(QIODevice::WriteOnly);
 i

[Libreoffice-commits] online.git: 4 commits - ios/Mobile

[Libreoffice Gerrit user]

 ios/Mobile/Info.plist.in |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 13e99e83c3affcb37cb3516df5211a6728e35d9a
Author: Tor Lillqvist 
AuthorDate: Mon Jun 3 10:13:11 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Jun 3 17:19:57 2019 +0300

Improve wording for NSCameraUsageDescription

Change-Id: If8fb70b2c87e6abc00cc706cb81c561e28edc254

diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in
index 27d1a13aa..103b720d9 100644
--- a/ios/Mobile/Info.plist.in
+++ b/ios/Mobile/Info.plist.in
@@ -572,7 +572,7 @@
 
 
 NSCameraUsageDescription
-$(PRODUCT_NAME) requires access to the camera in order for you to 
be able to take images to be inserted while editing a document.
+$(PRODUCT_NAME) requires access to the camera in order for you to 
be able to take photos to be inserted while editing a document.
NSPhotoLibraryUsageDescription
 $(PRODUCT_NAME) requires access to the photo library in order for 
you to be able to insert images into documents.
 
commit c2c7d098e5fa521751b87024e4535c3fba65f083
Author: Tor Lillqvist 
AuthorDate: Mon Jun 3 10:10:58 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Jun 3 17:19:52 2019 +0300

Typo

Change-Id: Ic5b149f7d3f51c0095ffa975d477df0ed0f183d7

diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in
index 5c29ef8f2..27d1a13aa 100644
--- a/ios/Mobile/Info.plist.in
+++ b/ios/Mobile/Info.plist.in
@@ -574,6 +574,6 @@
 NSCameraUsageDescription
 $(PRODUCT_NAME) requires access to the camera in order for you to 
be able to take images to be inserted while editing a document.
NSPhotoLibraryUsageDescription
-$(PRODUCT_NAME) requires access to the photo library in order for 
you to be able to insertt images into documents.
+$(PRODUCT_NAME) requires access to the photo library in order for 
you to be able to insert images into documents.
 
 
commit 75347f27e74d037ebc8e657a773e4e52adc8a6c2
Author: Tor Lillqvist 
AuthorDate: Mon Jun 3 10:01:25 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Jun 3 17:19:46 2019 +0300

Add NSPhotoLibraryUsageDescription, too

Change-Id: Ib46c36a18e84c2b88bed7aef3ec8235b32eb5332

diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in
index 93779cb76..5c29ef8f2 100644
--- a/ios/Mobile/Info.plist.in
+++ b/ios/Mobile/Info.plist.in
@@ -573,5 +573,7 @@
 
 NSCameraUsageDescription
 $(PRODUCT_NAME) requires access to the camera in order for you to 
be able to take images to be inserted while editing a document.
+   NSPhotoLibraryUsageDescription
+$(PRODUCT_NAME) requires access to the photo library in order for 
you to be able to insertt images into documents.
 
 
commit dc1f9a9955dd7e8d953f272a56a959c83d77dcc0
Author: Tor Lillqvist 
AuthorDate: Mon Jun 3 09:54:14 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Jun 3 17:19:40 2019 +0300

Use a more specific NSCameraUsageDescription

Change-Id: Idc780a3b5dacf0bed5b8c49f758f3fc5696d7338

diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in
index 34f675d18..93779cb76 100644
--- a/ios/Mobile/Info.plist.in
+++ b/ios/Mobile/Info.plist.in
@@ -572,6 +572,6 @@
 
 
 NSCameraUsageDescription
-$(PRODUCT_NAME) camera use
+$(PRODUCT_NAME) requires access to the camera in order for you to 
be able to take images to be inserted while editing a document.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/source include/editeng nlpsolver/src writerfilter/source xmloff/source

[László Németh (via logerrit)]

 cui/source/tabpages/chardlg.cxx|2 -
 include/editeng/escapementitem.hxx |5 +--
 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java |4 +-
 writerfilter/source/dmapper/DomainMapper.cxx   |   16 
--
 xmloff/source/style/escphdl.cxx|7 ++--
 5 files changed, 23 insertions(+), 11 deletions(-)

New commits:
commit 32262b0a537207832d7d126d8427d8949b9e821d
Author: László Németh 
AuthorDate: Wed May 29 16:36:41 2019 +0200
Commit: László Németh 
CommitDate: Mon Jun 3 16:12:27 2019 +0200

tdf#120412 char formatting UI: clean-up DFLT_ESC_AUTO

Default auto values must be outside of the new
enlarged range of the superscript/subscript percent values.

Note: the raising limit was modified to 13999 from 14400,
because the RTF unit test tdf112208_hangingIndent.rtf
lost its hanging from the bigger value.

Change-Id: I3a7e9715a27570278ee4ee70f9fc9ad29457e100
Reviewed-on: https://gerrit.libreoffice.org/73166
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index d1340a4463b3..8fa64293fe87 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -2705,7 +2705,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet )
 m_nSubProp = static_cast(sUser.getToken( 0, ';', nIdx 
).toInt32());
 
 // tdf#120412 up to 14400% (eg. 1584 pt with 11 pt letters)
-m_xHighLowMF->set_max(14400, FieldUnit::PERCENT);
+m_xHighLowMF->set_max(MAX_ESC_POS, FieldUnit::PERCENT);
 
 //fdo#75307 validate all the entries and discard all of them if any are
 //out of range
diff --git a/include/editeng/escapementitem.hxx 
b/include/editeng/escapementitem.hxx
index 86e148361051..82f9dde70823 100644
--- a/include/editeng/escapementitem.hxx
+++ b/include/editeng/escapementitem.hxx
@@ -28,8 +28,9 @@
 #define DFLT_ESC_SUPER   33 // 1/3
 #define DFLT_ESC_SUB-33 // also 1/3 previously 8/100
 #define DFLT_ESC_PROP58
-#define DFLT_ESC_AUTO_SUPER 101
-#define DFLT_ESC_AUTO_SUB  -101
+#define MAX_ESC_POS  13999
+#define DFLT_ESC_AUTO_SUPER  (MAX_ESC_POS+1)
+#define DFLT_ESC_AUTO_SUB-DFLT_ESC_AUTO_SUPER
 
 /*  [Description]
 
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 6276d56a1b01..195e360a671d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -68,6 +68,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2206,9 +2207,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 sal_Int16 nEscapement = 0;
 sal_Int8 nProp  = 58;
 if ( sStringValue == "superscript" )
-nEscapement = 101;
+nEscapement = DFLT_ESC_AUTO_SUPER;
 else if ( sStringValue == "subscript" )
-nEscapement = -101;
+nEscapement = DFLT_ESC_AUTO_SUB;
 else
 nProp = 100;
 
@@ -2839,8 +2840,17 @@ void DomainMapper::processDeferredCharacterProperties( 
const std::map< sal_Int32
 nEscapement = ( nIntValue > 0 ) ? 58: -58;
 }
 }
+
 // tdf#120412 up to 14400% (eg. 1584 pt with 11 pt letters)
-if( nEscapement > 14400 ) nEscapement = 14400;
+if ( nEscapement > MAX_ESC_POS )
+{
+nEscapement = MAX_ESC_POS;
+}
+else if ( nEscapement < -MAX_ESC_POS )
+{
+nEscapement = -MAX_ESC_POS;
+}
+
 rContext->Insert(PROP_CHAR_ESCAPEMENT, uno::makeAny( 
nEscapement ) );
 rContext->Insert(PROP_CHAR_ESCAPEMENT_HEIGHT,  uno::makeAny( nProp 
) );
 }
diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx
index f97ca6ee1f2f..f52c360d0865 100644
--- a/xmloff/source/style/escphdl.cxx
+++ b/xmloff/source/style/escphdl.cxx
@@ -28,10 +28,11 @@
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
-// this is a copy of defines in svx/inc/escpitem.hxx
+// this is a copy of defines in include/editeng/escapementitem.hxx
 #define DFLT_ESC_PROP58
-#define DFLT_ESC_AUTO_SUPER 101
-#define DFLT_ESC_AUTO_SUB  -101
+#define MAX_ESC_POS  13999
+#define DFLT_ESC_AUTO_SUPER  (MAX_ESC_POS+1)
+#define DFLT_ESC_AUTO_SUB-DFLT_ESC_AUTO_SUPER
 
 
 // class XMLEscapementPropHdl
commit a2720a24328fcee3bde431dc632c068b266228c9
Author: Todor Balabanov 
AuthorDate: Fri May 17 17:13:13 2019 +0300
Commit: Tomaž Vajngerl 
CommitDate: Mon Jun 3 16:12:17 2019 +0200

Checking of min and max factor value was added.

It is possible user to swap these two values.

Change-Id: Ib375d705

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

[Balazs Varga (via logerrit)]

 chart2/qa/extras/chart2import.cxx  |   55 +
 chart2/qa/extras/data/pptx/tdf48041.pptx   |binary
 chart2/source/view/axes/VCartesianAxis.cxx |   32 
 3 files changed, 87 insertions(+)

New commits:
commit 7f373a4c88961348f35e4f990182628488878efe
Author: Balazs Varga 
AuthorDate: Thu May 30 13:30:26 2019 +0200
Commit: László Németh 
CommitDate: Mon Jun 3 16:11:06 2019 +0200

tdf#48041 Chart: do not duplicate major value

axis labels and vertical axis lines. If the same
value labels follow each other, because of
the number format, only display them once.

Change-Id: I3c5577a0e86c475cb2fafb62d63f991cef7229d8
Reviewed-on: https://gerrit.libreoffice.org/73200
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 5c7255a0e632..a55107b36318 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -118,6 +118,8 @@ public:
 
 void testTdf116163();
 
+void testTdf48041();
+
 void testTdf121205();
 
 void testTdf114179();
@@ -199,6 +201,8 @@ public:
 
 CPPUNIT_TEST(testTdf116163);
 
+CPPUNIT_TEST(testTdf48041);
+
 CPPUNIT_TEST(testTdf121205);
 
 CPPUNIT_TEST(testTdf114179);
@@ -1746,6 +1750,57 @@ void Chart2ImportTest::testTdf116163()
 CPPUNIT_ASSERT_EQUAL(OUString("Dddd..."), xLabel3->getString());
 }
 
+void Chart2ImportTest::testTdf48041()
+{
+load("/chart2/qa/extras/data/pptx/", "tdf48041.pptx");
+
+Reference xChartDoc(getChartDocFromDrawImpress(0, 
0), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Reference xYAxis = getAxisFromDoc(xChartDoc, 0, 1, 0);
+CPPUNIT_ASSERT(xYAxis.is());
+
+chart2::ScaleData aScaleData = xYAxis->getScaleData();
+CPPUNIT_ASSERT(aScaleData.Scaling.is());
+
+// Check visible text
+uno::Reference xDrawPageSupplier(xChartDoc, 
uno::UNO_QUERY);
+uno::Reference xDrawPage = 
xDrawPageSupplier->getDrawPage();
+uno::Reference xShapes(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xShapes.is());
+
+const OUString sYAxisName = "CID/D=0:CS=0:Axis=1,0"; // Y Axis
+uno::Reference xYAxisShape = getShapeByName(xShapes, 
sYAxisName,
+// Axis occurs twice in chart xshape representation so need to get the 
one related to labels
+[](const uno::Reference& rXShape) -> bool
+{
+uno::Reference xAxisShapes(rXShape, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xAxisShapes.is());
+uno::Reference 
xChildShape(xAxisShapes->getByIndex(0), uno::UNO_QUERY);
+uno::Reference< drawing::XShapeDescriptor > 
xShapeDescriptor(xChildShape, uno::UNO_QUERY_THROW);
+return (xShapeDescriptor->getShapeType() == 
"com.sun.star.drawing.TextShape");
+});
+CPPUNIT_ASSERT(xYAxisShape.is());
+
+// Check label count
+uno::Reference xIndexAccess(xYAxisShape, 
UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(static_cast(6), xIndexAccess->getCount());
+
+// Check text
+uno::Reference xLabel0(xIndexAccess->getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("0"), xLabel0->getString());
+uno::Reference xLabel1(xIndexAccess->getByIndex(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("1"), xLabel1->getString());
+uno::Reference xLabel2(xIndexAccess->getByIndex(2), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("2"), xLabel2->getString());
+uno::Reference xLabel3(xIndexAccess->getByIndex(3), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("3"), xLabel3->getString());
+uno::Reference xLabel4(xIndexAccess->getByIndex(4), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("4"), xLabel4->getString());
+uno::Reference xLabel5(xIndexAccess->getByIndex(5), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("5"), xLabel5->getString());
+}
+
 void Chart2ImportTest::testTdf121205()
 {
 load("/chart2/qa/extras/data/pptx/", "tdf121205.pptx");
diff --git a/chart2/qa/extras/data/pptx/tdf48041.pptx 
b/chart2/qa/extras/data/pptx/tdf48041.pptx
new file mode 100644
index ..b0872f84f2f6
Binary files /dev/null and b/chart2/qa/extras/data/pptx/tdf48041.pptx differ
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index 4fac1f83b72e..99eb1b085185 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -28,6 +28,7 @@
 #include 
 #include "Tickmarks_Equidistant.hxx"
 #include 
+#include 
 
 #include 
 #include 
@@ -1551,11 +1552,35 @@ sal_Int32 
VCartesianAxis::estimateMaximumAutoMainIncrementCount()
 
 sal_Int32 nTotalAvailable = nMaxHeight;
 sal_Int32 nSingleNeeded = m_nMaximumTextHeightSoFar;
+sal_Int32 nMaxSameLabel = 0;
 
 //for horizontal axis:
 if( (m_nDimensionIndex == 0 && !m_aAxisProperties.m_bSwapXAndY)
 || (m_nDimensionIndex == 1 && m_aAxisProperties.m_bSwapXAndY) 

[Libreoffice-commits] core.git: nlpsolver/src nlpsolver/ThirdParty

[Todor Balabanov (via logerrit)]

 
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
 |7 +--
 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java 
 |9 ++---
 nlpsolver/src/locale/NLPSolverCommon_en_US.properties  
 |3 ++-
 3 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 90ace7be71d41257e29a28fa2e7c0adf8f84050d
Author: Todor Balabanov 
AuthorDate: Wed May 15 19:54:21 2019 +0300
Commit: Tomaž Vajngerl 
CommitDate: Mon Jun 3 15:53:30 2019 +0200

Range for DE scaling factor was implemented.

Change-Id: I5b8d3cd69a6138d7eebf37c299626019b32d639a
Reviewed-on: https://gerrit.libreoffice.org/72373
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git 
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
 
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
index 645318341108..0e68f856d912 100644
--- 
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
+++ 
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
@@ -41,7 +41,10 @@ public class DEGTBehavior extends AbsGTBehavior implements 
ILibEngine {
   private static final int DVNum = 2;
 
   //scale constant: (0, 1.2], normally be 0.5
-  public double FACTOR = 0.5;
+  public double MIN_FACTOR = 0.5;
+
+  //scale constant: (0, 1.2], normally be 0.5
+  public double MAX_FACTOR = 0.5;
 
   //crossover constant: [0, 1], normally be 0.1 or 0.9
   public double CR = 0.9;
@@ -70,7 +73,7 @@ public class DEGTBehavior extends AbsGTBehavior implements 
ILibEngine {
   delta += (i % 2 == 0 ? +1D : -1D) * 
differenceVectors[i].getLocation()[index];
 }
 
-trialVector[index] = globalVector[index] + FACTOR * delta;
+trialVector[index] = globalVector[index] + 
RandomGenerator.doubleRangeRandom(MIN_FACTOR, MAX_FACTOR) * delta;
   }
 
   @Override
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java 
b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java
index 716a79b79438..2e5c38d0d179 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java
@@ -59,7 +59,8 @@ public final class DEPSSolverImpl extends 
BaseEvolutionarySolver
 super(context, "DEPS Evolutionary Algorithm");
 
 registerProperty(m_agentSwitchRate);
-registerProperty(m_factor);
+registerProperty(m_minFactor);
+registerProperty(m_maxFactor);
 registerProperty(m_CR);
 registerProperty(m_c1);
 registerProperty(m_c2);
@@ -102,7 +103,8 @@ public final class DEPSSolverImpl extends 
BaseEvolutionarySolver
 
 private final PropertyInfo m_agentSwitchRate = new 
PropertyInfo("AgentSwitchRate", 0.5, "Agent Switch Rate (DE 
Probability)");
 // --DE
-private final PropertyInfo m_factor = new 
PropertyInfo("DEFactor", 0.5, "DE: Scaling Factor (0-1.2)");
+private final PropertyInfo m_minFactor = new 
PropertyInfo("DEFactorMin", 0.5, "DE: Min Scaling Factor (0-1.2)");
+private final PropertyInfo m_maxFactor = new 
PropertyInfo("DEFactorMax", 0.5, "DE: Max Scaling Factor (0-1.2)");
 private final PropertyInfo m_CR = new PropertyInfo("DECR", 
0.9, "DE: Crossover Probability (0-1)");
 // --PS
 private final PropertyInfo m_c1 = new PropertyInfo("PSC1", 
1.494, "PS: Cognitive Constant");
@@ -126,7 +128,8 @@ public final class DEPSSolverImpl extends 
BaseEvolutionarySolver
 agents[i].setPbest(m_library.getSelectedPoint(i));
 
 DEGTBehavior deGTBehavior = new DEGTBehavior();
-deGTBehavior.FACTOR = m_factor.getValue();
+deGTBehavior.MIN_FACTOR = m_minFactor.getValue();
+deGTBehavior.MAX_FACTOR = m_maxFactor.getValue();
 deGTBehavior.CR = m_CR.getValue();
 
 PSGTBehavior psGTBehavior = new PSGTBehavior();
diff --git a/nlpsolver/src/locale/NLPSolverCommon_en_US.properties 
b/nlpsolver/src/locale/NLPSolverCommon_en_US.properties
index 3f8baf0d43d7..84262674ddb9 100644
--- a/nlpsolver/src/locale/NLPSolverCommon_en_US.properties
+++ b/nlpsolver/src/locale/NLPSolverCommon_en_US.properties
@@ -15,7 +15,8 @@ NLPSolverCommon.Properties.EnhancedSolverStatus=Show enhanced 
solver status
 
 #DEPS
 NLPSolverCommon.Properties.AgentSwitchRate=Agent Switch Rate (DE Probability)
-NLPSolverCommon.Properties.DEFactor=DE: Scaling Factor (0-1.2)
+NLPSolverCommon.Properties.DEFactorMin=DE: Min Scaling Factor (0-1.2)
+NLPSolverCommon.Properties.DEFactorMax=DE: Max Scaling Factor (0-1.2)
 NLPSolverCommon.Properties.DECR=DE: Crossover Probability (0-1)
 NLPSolverCommon.Properties.PSC1=PS: Cognitive Constant
 NLPSolverCommon.Properties.PSC2=PS: Social Constant
___
Libr

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

[Noel Grandin (via logerrit)]

 sc/source/filter/orcus/filterdetect.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7bf2515fc48ed0d4c436aef298fa9c35e573352b
Author: Noel Grandin 
AuthorDate: Mon Jun 3 10:04:58 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon Jun 3 15:24:14 2019 +0200

tdf#67538 XTypeDetection::queryTypeByDescriptor poor performance, part3

Size the OUStringBuffer in OrcusFormatDetect::detect better at
construction, to avoid re-alloc.

This is specifically fixing the performance of queryTypeByDescriptor
when called from a basic macro on a local test file.

This takes my test macro from 9s to 8s

Change-Id: Id4c2bf386de172b1deed98efece8c1f040c599a5
Reviewed-on: https://gerrit.libreoffice.org/73376
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/source/filter/orcus/filterdetect.cxx 
b/sc/source/filter/orcus/filterdetect.cxx
index a9b064b01fbb..fb142d86b579 100644
--- a/sc/source/filter/orcus/filterdetect.cxx
+++ b/sc/source/filter/orcus/filterdetect.cxx
@@ -68,11 +68,11 @@ OUString 
OrcusFormatDetect::detect(css::uno::Sequence
 return OUString();
 
 css::uno::Reference 
xInputStream(aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()], 
css::uno::UNO_QUERY );
+OStringBuffer aContent(xInputStream->available());
 
 static const sal_Int32 nBytes = 4096;
 css::uno::Sequence aSeq(nBytes);
 bool bEnd = false;
-OStringBuffer aContent;
 while(!bEnd)
 {
 sal_Int32 nReadBytes = xInputStream->readBytes(aSeq, nBytes);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/osl

[Noel Grandin (via logerrit)]

 sal/osl/unx/file.cxx |8 +---
 sal/osl/w32/file.cxx |9 ++---
 2 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 0d04315c17a6df9f971237d45d9e5e8af765dd17
Author: Noel Grandin 
AuthorDate: Mon Jun 3 11:27:17 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon Jun 3 15:23:16 2019 +0200

tdf#67538 XTypeDetection::queryTypeByDescriptor poor performance, part4

WPXSvInputStreamImpl was hammering on getFilePos pretty hard, and
getFilePos uses a mutex, which is slow when it is called from every
single read. So switch to using std::atomic to access position.

This is specifically fixing the performance of queryTypeByDescriptor
when called from a basic macro on a local test file.

This takes my test macro from 8s to 4s.

Change-Id: Iab707a374359e2ee0e92425b2d9a903d67cb53d4
Reviewed-on: https://gerrit.libreoffice.org/73377
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 1f04802aa9e6..0ee0b8887dd4 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -36,6 +36,7 @@
 #include "unixerrnostring.hxx"
 
 #include 
+#include 
 #include 
 #include 
 
@@ -84,7 +85,8 @@ struct FileHandle_Impl
 
 sal_uInt64   m_size;/*< file size */
 off_tm_offset;  /*< physical offset from begin of file */
-off_tm_fileptr; /*< logical offset from begin of file */
+// m_fileptr is hit hard in some situations, where the overhead of a mutex 
starts to show up, so use an atomic
+std::atomic m_fileptr; /*< logical offset from begin of file */
 
 off_tm_bufptr;  /*< buffer offset from begin of file */
 size_t   m_buflen;  /*< buffer filled [0, m_bufsiz - 1] */
@@ -224,7 +226,7 @@ size_t FileHandle_Impl::getpagesize()
 
 sal_uInt64 FileHandle_Impl::getPos() const
 {
-return sal::static_int_cast< sal_uInt64 >(m_fileptr);
+return sal::static_int_cast< sal_uInt64 >(m_fileptr.load());
 }
 
 void FileHandle_Impl::setPos(sal_uInt64 uPos)
@@ -1421,7 +1423,7 @@ oslFileError SAL_CALL osl_getFilePos(oslFileHandle 
Handle, sal_uInt64* pPos)
 if ((!pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && 
(pImpl->m_fd == -1)) || (!pPos))
 return osl_File_E_INVAL;
 
-FileHandle_Impl::Guard lock(&(pImpl->m_mutex));
+// no need to lock because pos is atomic
 *pPos = pImpl->getPos();
 
 return osl_File_E_None;
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index a3600844fd29..7fda6107adeb 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -29,6 +29,7 @@
 #include "file_url.hxx"
 #include "file_error.hxx"
 
+#include 
 #include 
 #include 
 #include 
@@ -60,7 +61,8 @@ struct FileHandle_Impl
 
 sal_uInt64m_size;/*< file size */
 LONGLONG  m_offset;  /*< physical offset from begin of file */
-LONGLONG  m_filepos; /*< logical offset from begin of file */
+// m_filepos is hit hard in some situations, where the overhead of a mutex 
starts to show up, so use an atomic
+std::atomic m_filepos; /*< logical offset from begin of file */
 
 LONGLONG  m_bufptr;  /*< buffer offset from begin of file */
 SIZE_Tm_buflen;  /*< buffer filled [0, m_bufsiz - 1] */
@@ -185,7 +187,7 @@ SIZE_T FileHandle_Impl::getpagesize()
 
 sal_uInt64 FileHandle_Impl::getPos() const
 {
-return sal::static_int_cast< sal_uInt64 >(m_filepos);
+return sal::static_int_cast< sal_uInt64 >(m_filepos.load());
 }
 
 oslFileError FileHandle_Impl::setPos(sal_uInt64 uPos)
@@ -946,8 +948,9 @@ oslFileError SAL_CALL osl_getFilePos(oslFileHandle Handle, 
sal_uInt64 *pPos)
 if ((!pImpl) || !IsValidHandle(pImpl->m_hFile) || (!pPos))
 return osl_File_E_INVAL;
 
-FileHandle_Impl::Guard lock(&(pImpl->m_mutex));
+// no need to lock because pos is atomic
 *pPos = pImpl->getPos();
+
 return osl_File_E_None;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/quartz

[Xisco Fauli (via logerrit)]

 vcl/quartz/salgdicommon.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 0236e29bd0197e96e63bc784e6a581e50b022752
Author: Xisco Fauli 
AuthorDate: Sat Jun 1 19:45:53 2019 +0200
Commit: Xisco Faulí 
CommitDate: Mon Jun 3 15:18:48 2019 +0200

tdf#125506: use rObjectToDevice if needed

Use same logic as in vcl/unx/generic/gdi/gdiimpl.cxx

Regression from 16091ff88aaab9ba9103c4e369bf79b97f431f40

See https://bugs.documentfoundation.org/show_bug.cgi?id=125506#c13
Thanks to Thorsten Wagner for pinpointing

Change-Id: I7a7a8c4b3355f5621ba1603939a3757cd03e
Reviewed-on: https://gerrit.libreoffice.org/73319
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 
(cherry picked from commit 93477d1a963e38e3319013e43835a8ffef200972)
Reviewed-on: https://gerrit.libreoffice.org/73328

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 913d2ac43f19..333c23c93035 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -874,10 +874,15 @@ bool AquaSalGraphics::drawPolyLine(
 return false;
 #endif
 
+// need to check/handle LineWidth when ObjectToDevice transformation is 
used
+const basegfx::B2DVector aDeviceLineWidths(rObjectToDevice * rLineWidths);
+const bool bCorrectLineWidth(aDeviceLineWidths.getX() < 1.0 && 
rLineWidths.getX() >= 1.0);
+const basegfx::B2DVector aLineWidths(bCorrectLineWidth ? rLineWidths : 
aDeviceLineWidths);
+
 // #i101491# Aqua does not support B2DLineJoin::NONE; return false to use
 // the fallback (own geometry preparation)
 // #i104886# linejoin-mode and thus the above only applies to "fat" lines
-if( (basegfx::B2DLineJoin::NONE == eLineJoin) && (rLineWidths.getX() > 
1.3) )
+if( (basegfx::B2DLineJoin::NONE == eLineJoin) && (aLineWidths.getX() > 
1.3) )
 return false;
 
 // Transform to DeviceCoordinates, get DeviceLineWidth, execute 
PixelSnapHairline
@@ -946,7 +951,7 @@ bool AquaSalGraphics::drawPolyLine(
 CGContextSetAlpha( maContextHolder.get(), 1.0 - fTransparency );
 CGContextSetLineJoin( maContextHolder.get(), aCGLineJoin );
 CGContextSetLineCap( maContextHolder.get(), aCGLineCap );
-CGContextSetLineWidth( maContextHolder.get(), rLineWidths.getX() );
+CGContextSetLineWidth( maContextHolder.get(), aLineWidths.getX() );
 CGContextSetMiterLimit(maContextHolder.get(), fCGMiterLimit);
 SAL_INFO( "vcl.cg", "CGContextDrawPath(" << maContextHolder.get() << 
",kCGPathStroke)" );
 CGContextDrawPath( maContextHolder.get(), kCGPathStroke );
___
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-5-2+backports' - filter/source sd/qa svx/source xmloff/inc xmloff/source

[Michael Stahl (via logerrit)]

 filter/source/msfilter/escherex.cxx |3 
 sd/qa/unit/data/fit-to-size.fodp|  724 
 sd/qa/unit/export-tests.cxx |  101 ++
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx |5 
 svx/source/toolbars/fontworkbar.cxx |   10 
 xmloff/inc/xmlsdtypes.hxx   |1 
 xmloff/source/draw/sdpropls.cxx |   71 +
 7 files changed, 902 insertions(+), 13 deletions(-)

New commits:
commit e8b99db2ddd1998b41b804335ca8a78852ef02c8
Author: Michael Stahl 
AuthorDate: Tue Oct 17 17:24:03 2017 +0200
Commit: Michael Weghorn 
CommitDate: Mon Jun 3 15:06:00 2019 +0200

tdf#97630 xmloff: ODF extended draw:fit-to-size mess

The plan:

1. As Regina points out, there is already (in ODF 1.2, but not ODF 1.1)
   a style:shrink-to-fit attribute for shapes, so use this to represent
   the AUTOFIT value.

   The fallback from AUTOFIT to draw:fit-to-size="true" was a stupid
   idea anyway, probably "false" is less annoying in practice.

   There are 2 different shapes that implement TextFitToSize property:

   a) text shapes already interpret ALLLINES and PROPORTIONAL exactly
  the same
   b) fontwork custom shapes interpret ALLLINES but do nothing for
  PROPORTIONAL

   As Regina points out, there is no shape that needs to distinguish
   between ALLLINES and PROPORTIONAL, so we do a minor behavioral
   API CHANGE and from now on interpret PROPORTIONAL as ALLLINES
   on fontwork custom shapes.  This obviates the need to distinguish
   the values in ODF and so we don't need a new attribute,
   just use draw:fit-to-size="true" for both.

   On import, use MID_FLAG_MERGE_PROPERTY to combine the 2 attributes
   into one value.

2. Restrict the export of draw:fit-to-size to only the standard
   values "true"/"false".

This implements step 1, the step 2 will be done in the future when
most users have the import of the style:shrink-to-fit.

Change-Id: I4a378aa110fdb82db7a99a839d7ff207248a73e7
Reviewed-on: https://gerrit.libreoffice.org/43521
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 33eb9fdb61033b3fd35d923900b1f5791f4b71c8)
Reviewed-on: https://gerrit.libreoffice.org/43596
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
(cherry picked from commit 244dfe2f3fa874d99dacea191e2265a288457a98)
Reviewed-on: https://gerrit.libreoffice.org/73274
Tested-by: Michael Stahl 
Reviewed-by: Michael Weghorn 

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index deeca0380f6d..efeb5af63795 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3488,7 +3488,8 @@ void 
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
 case drawing::TextHorizontalAdjust_BLOCK:
 {
 SdrFitToSizeType  eFTS( 
static_cast(pCustoShape->GetMergedItem( 
SDRATTR_TEXT_FITTOSIZE )).GetValue() );
-if ( eFTS == SDRTEXTFIT_ALLLINES)
+if (eFTS == SDRTEXTFIT_ALLLINES ||
+eFTS == SDRTEXTFIT_PROPORTIONAL)
 {
 gTextAlign = mso_alignTextStretch;
 }
diff --git a/sd/qa/unit/data/fit-to-size.fodp b/sd/qa/unit/data/fit-to-size.fodp
new file mode 100644
index ..734cf8a3a6c6
--- /dev/null
+++ b/sd/qa/unit/data/fit-to-size.fodp
@@ -0,0 +1,724 @@
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:smil="urn:oasis:names:tc:opendocument:xml

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

[Jan-Marek Glogowski (via logerrit)]

 starmath/source/ElementsDockingWindow.cxx |2 +-
 starmath/source/edit.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 501b935d057547b1a785147a32e4e090ebd91a12
Author: Jan-Marek Glogowski 
AuthorDate: Wed May 29 16:32:24 2019 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Mon Jun 3 14:25:12 2019 +0200

SM add a border to the editor and the element list

Change-Id: I708476919ce7750df6a691d75fe594c3f44d9126
Reviewed-on: https://gerrit.libreoffice.org/73173
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index 7491e71823b1..9483c650 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -259,7 +259,7 @@ const std::tuple SmElementsControl::
 const size_t SmElementsControl::m_aCategoriesSize = 
SAL_N_ELEMENTS(m_aCategories);
 
 SmElementsControl::SmElementsControl(vcl::Window *pParent)
-: Control(pParent, WB_TABSTOP)
+: Control(pParent, WB_TABSTOP | WB_BORDER)
 , mpDocShell(new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT))
 , m_nCurrentElement(SAL_MAX_UINT16)
 , m_nCurrentRolloverElement(SAL_MAX_UINT16)
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 643ef04a1960..515b924ee1ef 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -73,7 +73,7 @@ bool SmEditWindow::IsInlineEditEnabled()
 
 
 SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) :
-Window  (&rMyCmdBoxWin),
+Window  (&rMyCmdBoxWin, WB_BORDER),
 DropTargetHelper( this ),
 rCmdBox (rMyCmdBoxWin),
 aModifyIdle ("SmEditWindow ModifyIdle"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - oox/source sd/qa

[Grzegorz Araminowicz (via logerrit)]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   78 
 sd/qa/unit/import-tests-smartart.cxx|   10 +-
 2 files changed, 54 insertions(+), 34 deletions(-)

New commits:
commit 55e531de9c1fecc73b8a42e18dda34aa4de02f8b
Author: Grzegorz Araminowicz 
AuthorDate: Thu May 30 13:29:08 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jun 3 14:15:55 2019 +0200

SmartArt: more constraints used in linear algorithm

* both width and height of children and space is taken from constraints
* better handling of space between children (not lost in some cases)
* children centered in the other axis

Change-Id: I25b8360790de0292b2b5c313dfa55e58dc042193
Reviewed-on: https://gerrit.libreoffice.org/73201
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/73259

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index e27c573b3d28..d7d6fda1e1e0 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -788,7 +788,8 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 const sal_Int32 nIncY = nDir==XML_fromT ? 1 : (nDir==XML_fromB ? 
-1 : 0);
 
 sal_Int32 nCount = rShape->getChildren().size();
-double fSpace = 0.3;
+
+awt::Size aSpaceSize;
 
 // Find out which constraint is relevant for which (internal) name.
 LayoutPropertyMap aProperties;
@@ -800,17 +801,25 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 LayoutProperty& rProperty = aProperties[rConstraint.msForName];
 if (rConstraint.mnType == XML_w)
 rProperty[XML_w] = rShape->getSize().Width * 
rConstraint.mfFactor;
+if (rConstraint.mnType == XML_h)
+rProperty[XML_h] = rShape->getSize().Height * 
rConstraint.mfFactor;
 
 // TODO: get values from differently named constraints as well
-if (rConstraint.msForName == "sibTrans" && rConstraint.mnType 
== XML_w)
-fSpace = rConstraint.mfFactor;
+if (rConstraint.msForName == "sp" || rConstraint.msForName == 
"space" || rConstraint.msForName == "sibTrans")
+{
+if (rConstraint.mnType == XML_w)
+aSpaceSize.Width = rShape->getSize().Width * 
rConstraint.mfFactor;
+if (rConstraint.mnType == XML_h)
+aSpaceSize.Height = rShape->getSize().Height * 
rConstraint.mfFactor;
+}
 }
 
+// first approximation of children size
 awt::Size aChildSize = rShape->getSize();
 if (nDir == XML_fromL || nDir == XML_fromR)
-aChildSize.Width /= (nCount + (nCount-1)*fSpace);
+aChildSize.Width /= nCount;
 else if (nDir == XML_fromT || nDir == XML_fromB)
-aChildSize.Height /= (nCount + (nCount-1)*fSpace);
+aChildSize.Height /= nCount;
 
 awt::Point aCurrPos(0, 0);
 if (nIncX == -1)
@@ -820,51 +829,58 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 
 // See if children requested more than 100% space in total: scale
 // down in that case.
-sal_Int32 nTotalWidth = 0;
-bool bSpaceFromConstraints = false;
+awt::Size aTotalSize;
 for (auto & aCurrShape : rShape->getChildren())
 {
-oox::OptValue oWidth
-= findProperty(aProperties, aCurrShape->getInternalName(), 
XML_w);
-
+oox::OptValue oWidth = findProperty(aProperties, 
aCurrShape->getInternalName(), XML_w);
+oox::OptValue oHeight = findProperty(aProperties, 
aCurrShape->getInternalName(), XML_h);
 awt::Size aSize = aChildSize;
 if (oWidth.has())
-{
 aSize.Width = oWidth.get();
-bSpaceFromConstraints = true;
-}
-if (nDir == XML_fromL || nDir == XML_fromR)
-nTotalWidth += aSize.Width;
+if (oHeight.has())
+aSize.Height = oHeight.get();
+aTotalSize.Width += aSize.Width;
+aTotalSize.Height += aSize.Height;
 }
 
-double fWidthScale = 1.0;
-if (nTotalWidth > rShape->getSize().Width && nTotalWidth)
-{
-fWidthScale = rShape->getSize().Width;
-fWidthScale /= nTotalWidth;
-}
+aTotalSize.Width += (nCount-1) * aSpaceSize.Width;
+aTotalSize.Height += (nCount-1) * aSpaceSize.Height;
 
-// Don't add automatic space if we take space from constraints.
-if (bSpaceFromConstraints)
-  

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - oox/source

[Grzegorz Araminowicz (via logerrit)]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   22 ++--
 oox/source/drawingml/diagram/layoutatomvisitors.cxx |6 -
 2 files changed, 8 insertions(+), 20 deletions(-)

New commits:
commit 83d101158ef3726d005ae7bd47437ab22ad2a036
Author: Grzegorz Araminowicz 
AuthorDate: Tue May 28 17:37:19 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jun 3 14:15:38 2019 +0200

SmartArt: keep parent constraints instead of merging every time

currently for every node we were additionaly loading constraints from
parent node, merging them and then deleting
it makes more sense just to keep already loaded constraints from parent node

Change-Id: I3fcd669547f24eeeac0b77876950ff7436bd5cb3
Reviewed-on: https://gerrit.libreoffice.org/73116
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/73258

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 808960093f29..e27c573b3d28 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -499,24 +499,8 @@ void AlgAtom::accept( LayoutAtomVisitor& rVisitor )
 }
 
 void AlgAtom::layoutShape( const ShapePtr& rShape,
-   const std::vector& rOwnConstraints )
+   const std::vector& rConstraints )
 {
-// Algorithm result may depend on the parent constraints as well.
-std::vector aMergedConstraints;
-const LayoutNode* pParent = getLayoutNode().getParentLayoutNode();
-if (pParent)
-{
-for (const auto& pChild : pParent->getChildren())
-{
-auto pConstraintAtom = dynamic_cast(pChild.get());
-if (pConstraintAtom)
-pConstraintAtom->parseConstraint(aMergedConstraints, 
/*bRequireForName=*/true);
-}
-}
-aMergedConstraints.insert(aMergedConstraints.end(), 
rOwnConstraints.begin(),
-  rOwnConstraints.end());
-const std::vector& rConstraints = aMergedConstraints;
-
 switch(mnType)
 {
 case XML_composite:
@@ -629,7 +613,7 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 {
 // There is no shape type "conn", replace it by an arrow based
 // on the direction of the parent linear layout.
-sal_Int32 nType = getConnectorType(pParent);
+sal_Int32 nType = 
getConnectorType(getLayoutNode().getParentLayoutNode());
 
 rShape->setSubType(nType);
 rShape->getCustomShapeProperties()->setShapePresetType(nType);
@@ -759,7 +743,7 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 sal_Int32 nXOffset = 0;
 double fWidthScale = 1.0;
 if (mnType == XML_hierChild)
-calculateHierChildOffsetScale(rShape, pParent, nXOffset, 
fWidthScale);
+calculateHierChildOffsetScale(rShape, 
getLayoutNode().getParentLayoutNode(), nXOffset, fWidthScale);
 
 awt::Size aChildSize = rShape->getSize();
 if (nDir == XML_fromT)
diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.cxx 
b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
index 602130b6b3e3..4e1a3689e3e4 100644
--- a/oox/source/drawingml/diagram/layoutatomvisitors.cxx
+++ b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
@@ -291,14 +291,18 @@ void ShapeLayoutingVisitor::visit(LayoutNode& rAtom)
 if (meLookFor != LAYOUT_NODE)
 return;
 
+size_t nParentConstraintsNumber = maConstraints.size();
+
 // process alg atoms first, nested layout nodes afterwards
 meLookFor = CONSTRAINT;
 defaultVisit(rAtom);
 meLookFor = ALGORITHM;
 defaultVisit(rAtom);
-maConstraints.clear();
 meLookFor = LAYOUT_NODE;
 defaultVisit(rAtom);
+
+// delete added constraints, keep parent constraints
+maConstraints.erase(maConstraints.begin() + nParentConstraintsNumber, 
maConstraints.end());
 }
 
 void ShapeLayoutingVisitor::visit(ShapeAtom& /*rAtom*/)
___
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.0' - officecfg/registry

[Miklos Vajna (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit af2d914921f655960801fb14f41fa9cdcdba54d0
Author: Miklos Vajna 
AuthorDate: Tue May 28 09:25:17 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jun 3 13:47:36 2019 +0200

[cp] sw HTML import: change config default to always ignore comments

Change-Id: Iae6191fbcf1d02e9e5dd29613eaf5c36646afccc
Reviewed-on: https://gerrit.libreoffice.org/73084
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 855bbe13cb07..63838504eebd 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -5857,7 +5857,7 @@
   Specifies whether HTML comments should be ignored or 
imported as postits / annotations.
   Ignore HTML comments
 
-false
+true
   
 
   
___
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.0' - 2 commits - officecfg/registry sw/source

[Miklos Vajna (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |   12 
 sw/source/filter/html/swhtml.cxx   |6 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit d2de8aec8fa928c37cef9798535dc6b150205a91
Author: Miklos Vajna 
AuthorDate: Mon May 27 10:46:40 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jun 3 13:47:29 2019 +0200

sw HTML import: add an option to ignore comments by default

No function change, default behavior is still mapping them to postits.

(cherry picked from commit 256107622c252afdce35d1c77fe70eb4e4bc57ce)

Conflicts:
sw/source/filter/html/swhtml.cxx

Change-Id: I55041452909e9f0b83d6c5d113af3067b3c0afdb
Reviewed-on: https://gerrit.libreoffice.org/73083
Reviewed-by: Michael Meeks 
Tested-by: Miklos Vajna 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 7a21b5bbd344..855bbe13cb07 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -5848,6 +5848,18 @@
 true
   
 
+
+  
+Contains settings for importing HTML.
+  
+  
+
+  Specifies whether HTML comments should be ignored or 
imported as postits / annotations.
+  Ignore HTML comments
+
+false
+  
+
   
 
 
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 07ea0ca88639..cfacf93d1a67 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -109,6 +109,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -301,6 +302,10 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, 
SvStream& rIn,
 m_isInTableStructure(false),
 m_pTempViewFrame(nullptr)
 {
+// If requested explicitly, then force ignoring of comments (don't create 
postits for them).
+if (officecfg::Office::Writer::Filter::Import::HTML::IgnoreComments::get())
+m_bIgnoreHTMLComments = true;
+
 m_nEventId = nullptr;
 m_bUpperSpace = m_bViewCreated = m_bChkJumpMark = false;
 
commit 509d7aa8493a3c98cbfb75ed86cc39ca8fc03079
Author: Miklos Vajna 
AuthorDate: Tue May 28 09:23:25 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jun 3 13:47:20 2019 +0200

Revert "[cp] sw HTML import: ignore comments unconditionally"

This reverts commit f6d2125bf3511701d261b83bbfc50785b707d026. No need to
hardcode this, we'll have a proper option instead.

Change-Id: I9778c19715d52bfa066585791b2002e9837e1d14
Reviewed-on: https://gerrit.libreoffice.org/73082
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index c052d0d55740..07ea0ca88639 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -301,7 +301,6 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, 
SvStream& rIn,
 m_isInTableStructure(false),
 m_pTempViewFrame(nullptr)
 {
-m_bIgnoreHTMLComments = true;
 m_nEventId = nullptr;
 m_bUpperSpace = m_bViewCreated = m_bChkJumpMark = false;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - distro-configs/LibreOfficeiOS.conf distro-configs/LibreOfficeiOS_Sim.conf

[Tomaž Vajngerl (via logerrit)]

 distro-configs/LibreOfficeiOS.conf |2 +-
 distro-configs/LibreOfficeiOS_Sim.conf |   33 +
 2 files changed, 34 insertions(+), 1 deletion(-)

New commits:
commit 114df62a7e86e96b1faa2ff842cee4201889c704
Author: Tomaž Vajngerl 
AuthorDate: Mon Jun 3 14:42:44 2019 +0900
Commit: Tor Lillqvist 
CommitDate: Mon Jun 3 13:38:35 2019 +0200

Add distro config for iOS simulator to make building easier

Change-Id: Iff70622732792224b3c0a080f95d69f86c167ae6
Reviewed-on: https://gerrit.libreoffice.org/73369
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/distro-configs/LibreOfficeiOS.conf 
b/distro-configs/LibreOfficeiOS.conf
index c9aeca61e1b3..06f3cb516005 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -28,5 +28,5 @@
 
 --without-tls
 
-#--enable-ios-simulator
+# iOS device
 --host=arm64-apple-darwin
diff --git a/distro-configs/LibreOfficeiOS_Sim.conf 
b/distro-configs/LibreOfficeiOS_Sim.conf
new file mode 100644
index ..54bb7142ca92
--- /dev/null
+++ b/distro-configs/LibreOfficeiOS_Sim.conf
@@ -0,0 +1,33 @@
+--disable-breakpad
+--disable-firebird-sdbc
+--disable-online-update
+--disable-systray
+
+--without-export-validation
+--without-helppack-integration
+--without-java
+--without-junit
+
+--with-theme=colibre tango
+
+--with-build-platform-configure-options=--with-system-jpeg=no
+--with-macosx-version-min-required=10.11
+
+--disable-avahi
+--disable-avmedia
+--disable-compiler-plugins
+--disable-cups
+--disable-database-connectivity
+--disable-dconf
+--disable-extensions
+--disable-kde5
+--disable-odk
+--disable-openssl
+--disable-pdfium
+--disable-python
+
+--without-tls
+
+# iOS simulator (debug)
+--enable-ios-simulator
+--enable-debug
___
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.0' - desktop/source

[Tomaž Vajngerl (via logerrit)]

 desktop/source/lib/init.cxx |   71 +++-
 1 file changed, 44 insertions(+), 27 deletions(-)

New commits:
commit b85aa20fc2d5037dcbcd687673f194167405b671
Author: Tomaž Vajngerl 
AuthorDate: Mon Jun 3 12:50:47 2019 +0900
Commit: Tor Lillqvist 
CommitDate: Mon Jun 3 13:38:01 2019 +0200

LOK: Factor out iOS painting code

Change-Id: Ica706842003fe60ba864e013614eb535580446bb
Reviewed-on: https://gerrit.libreoffice.org/73365
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index bd17b54eea8d..2342d6a8f10a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1673,6 +1673,45 @@ ITiledRenderable* 
getTiledRenderable(LibreOfficeKitDocument* pThis)
 return dynamic_cast(pDocument->mxComponent.get());
 }
 
+#ifdef IOS
+void paintTileToCGContext(ITiledRenderable* pDocument,
+  void* rCGContext, const Size nCanvasSize,
+  const int nTilePosX, const int nTilePosY,
+  const int nTileWidth, const int nTileHeight)
+{
+SystemGraphicsData aData;
+aData.rCGContext = reinterpret_cast(rCGContext);
+
+ScopedVclPtrInstance pDevice(&aData, Size(1, 1), 
DeviceFormat::DEFAULT);
+pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
+pDevice->SetOutputSizePixel(nCanvasSize);
+pDocument->paintTile(*pDevice.get(), nCanvasSize.Width(), 
nCanvasSize.Height(),
+nTilePosX, nTilePosY, nTileWidth, nTileHeight);
+}
+
+void paintTileIOS(LibreOfficeKitDocument* pThis,
+ unsigned char* pBuffer,
+ const int nCanvasWidth, const int nCanvasHeight, const double 
fDPIScale,
+ const int nTilePosX, const int nTilePosY,
+ const int nTileWidth, const int nTileHeight)
+{
+CGContextRef pCGContext = CGBitmapContextCreate(pBuffer, nCanvasWidth, 
nCanvasHeight, 8,
+nCanvasWidth * 4, 
CGColorSpaceCreateDeviceRGB(),
+
kCGImageAlphaPremultipliedFirst | kCGImageByteOrder32Little);
+
+// Use the vcl.cg tag even if this code is not in vcl, to match all other 
SAL_INFO logging about Core Graphics, in vcl.
+SAL_INFO("vcl.cg", "CGBitmapContextCreate(" << nCanvasWidth << "x" << 
nCanvasHeight << "x32) = " << pCGContext);
+
+CGContextTranslateCTM(pCGContext, 0, nCanvasHeight);
+CGContextScaleCTM(pCGContext, fDPIScale, -fDPIScale);
+
+doc_paintTileToCGContext(pThis, (void*) pCGContext, nCanvasWidth, 
nCanvasHeight, nTilePosX, nTilePosY, nTileWidth, nTileHeight);
+
+SAL_INFO("vcl.cg", "CGContextRelease(" << pCGContext << ")");
+CGContextRelease(pCGContext);
+}
+#endif
+
 } // anonymous namespace
 
 // Wonder global state ...
@@ -2548,7 +2587,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 // what Calc's internal scaling would do - because that one is trying to
 // fit the lines between cells to integer multiples of pixels.
 comphelper::ScopeGuard dpiScaleGuard([]() { 
comphelper::LibreOfficeKit::setDPIScale(1.0); });
-double fDPIScaleX = 1;
+double fDPIScaleX = 1.0;
 if (doc_getDocumentType(pThis) == LOK_DOCTYPE_SPREADSHEET)
 {
 fDPIScaleX = (nCanvasWidth * 3840.0) / (256.0 * nTileWidth);
@@ -2559,18 +2598,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 #if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS)
 
 #if defined(IOS)
-CGContextRef cgc = CGBitmapContextCreate(pBuffer, nCanvasWidth, 
nCanvasHeight, 8, nCanvasWidth*4, CGColorSpaceCreateDeviceRGB(), 
kCGImageAlphaPremultipliedFirst | kCGImageByteOrder32Little);
-
-// Use the vcl.cg tag even if this code is not in vcl, to match all other 
SAL_INFO logging about Core Graphics, in vcl.
-SAL_INFO( "vcl.cg", "CGBitmapContextCreate(" << nCanvasWidth << "x" << 
nCanvasHeight << "x32) = " << cgc );
-
-CGContextTranslateCTM(cgc, 0, nCanvasHeight);
-CGContextScaleCTM(cgc, fDPIScaleX, -fDPIScaleX);
-
-doc_paintTileToCGContext(pThis, (void*) cgc, nCanvasWidth, nCanvasHeight, 
nTilePosX, nTilePosY, nTileWidth, nTileHeight);
-
-SAL_INFO( "vcl.cg", "CGContextRelease(" << cgc << ")" );
-CGContextRelease(cgc);
+paintTileIOS(pThis, pBuffer, nCanvasWidth, nCanvasHeight, fDPIScaleX, 
nTilePosX, nTilePosY, nTileWidth, nTileHeight);
 #else
 ScopedVclPtrInstance< VirtualDevice > pDevice(nullptr, Size(1, 1), 
DeviceFormat::DEFAULT) ;
 
@@ -2608,8 +2636,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 #ifdef IOS
 
 // This function is separate only to be used by LibreOfficeLight. If that app 
can be retired, this
-// function's code can be inlined into the iOS part of doc_paintTile().
-
+// function's code can be inlined.
 static void doc_paintTileToCGContext(LibreOfficeKitDocument* pThis,
  void* rCGContext,

[Libreoffice-commits] dev-tools.git: git-hooks/contrib git-hooks/dictionaries.git git-hooks/help.git git-hooks/online.git git-hooks/translations.git

[Libreoffice Gerrit user]

 git-hooks/contrib/dev-tools.git/hooks/update |3 ++-
 git-hooks/dictionaries.git/hooks/update  |3 ++-
 git-hooks/help.git/hooks/update  |3 ++-
 git-hooks/online.git/hooks/update|3 ++-
 git-hooks/translations.git/hooks/update  |3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit fc514a83d009b854b1aac233e45d4940dacd61f4
Author: Miklos Vajna 
AuthorDate: Mon Jun 3 09:13:17 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jun 3 13:35:33 2019 +0200

git-hooks mention author names in From field again

Sync dictionaries, help, translations, dev-tools and online with core in
this regard.

Change-Id: I962e239abf467d4f7a6987bf993ab9847f999af7
Reviewed-on: https://gerrit.libreoffice.org/73373
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/git-hooks/contrib/dev-tools.git/hooks/update 
b/git-hooks/contrib/dev-tools.git/hooks/update
index 181bb00..2e180b1 100755
--- a/git-hooks/contrib/dev-tools.git/hooks/update
+++ b/git-hooks/contrib/dev-tools.git/hooks/update
@@ -14,6 +14,7 @@ if [ "$(id -u -n )" != "logerrit" ] ; then
echo "*** The reference for this repo is gerrit. do not push directly 
to fdo" >&2
exit 1
 fi
+from="\"$(git show -s --pretty=format:'%an' $3^{}) (via logerrit)\" 
"
 
 project=$(cat $GIT_DIR/description)
 recipients="libreoffice-comm...@lists.freedesktop.org"
@@ -135,5 +136,5 @@ else
done
 fi |
 mail -s "$subject" -a "X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/contrib/dev-tools.git" \
- -a "List-Post: " $recipients
+ -a "List-Post: " -a "From: 
$from" $recipients
 exit 0
diff --git a/git-hooks/dictionaries.git/hooks/update 
b/git-hooks/dictionaries.git/hooks/update
index 395ed17..01434af 100755
--- a/git-hooks/dictionaries.git/hooks/update
+++ b/git-hooks/dictionaries.git/hooks/update
@@ -14,6 +14,7 @@ if [ "$(id -u -n )" != "logerrit" ] ; then
echo "*** The reference for this repo is gerrit. do not push directly 
to fdo" >&2
exit 1
 fi
+from="\"$(git show -s --pretty=format:'%an' $3^{}) (via logerrit)\" 
"
 
 project=$(cat $GIT_DIR/description)
 recipients="libreoffice-comm...@lists.freedesktop.org"
@@ -135,5 +136,5 @@ else
done
 fi |
 mail -s "$subject" -a "X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/core.git" \
- -a "List-Post: " $recipients
+ -a "List-Post: " -a "From: 
$from" $recipients
 exit 0
diff --git a/git-hooks/help.git/hooks/update b/git-hooks/help.git/hooks/update
index 395ed17..01434af 100755
--- a/git-hooks/help.git/hooks/update
+++ b/git-hooks/help.git/hooks/update
@@ -14,6 +14,7 @@ if [ "$(id -u -n )" != "logerrit" ] ; then
echo "*** The reference for this repo is gerrit. do not push directly 
to fdo" >&2
exit 1
 fi
+from="\"$(git show -s --pretty=format:'%an' $3^{}) (via logerrit)\" 
"
 
 project=$(cat $GIT_DIR/description)
 recipients="libreoffice-comm...@lists.freedesktop.org"
@@ -135,5 +136,5 @@ else
done
 fi |
 mail -s "$subject" -a "X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/core.git" \
- -a "List-Post: " $recipients
+ -a "List-Post: " -a "From: 
$from" $recipients
 exit 0
diff --git a/git-hooks/online.git/hooks/update 
b/git-hooks/online.git/hooks/update
index 81a6171..45ac5c5 100755
--- a/git-hooks/online.git/hooks/update
+++ b/git-hooks/online.git/hooks/update
@@ -14,6 +14,7 @@ if [ "$(id -u -n )" != "logerrit" ] ; then
echo "*** The reference for this repo is gerrit. do not push directly 
to fdo" >&2
exit 1
 fi
+from="\"$(git show -s --pretty=format:'%an' $3^{}) (via logerrit)\" 
"
 
 project=$(cat $GIT_DIR/description)
 recipients="libreoffice-comm...@lists.freedesktop.org"
@@ -135,5 +136,5 @@ else
done
 fi |
 mail -s "$subject" -a "X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/online.git" \
- -a "List-Post: " $recipients
+ -a "List-Post: " -a "From: 
$from" $recipients
 exit 0
diff --git a/git-hooks/translations.git/hooks/update 
b/git-hooks/translations.git/hooks/update
index 395ed17..01434af 100755
--- a/git-hooks/translations.git/hooks/update
+++ b/git-hooks/translations.git/hooks/update
@@ -14,6 +14,7 @@ if [ "$(id -u -n )" != "logerrit" ] ; then
echo "*** The reference for this repo is gerrit. do not push directly 
to fdo" >&2
exit 1
 fi
+from="\"$(git show -s --pretty=format:'%an' $3^{}) (via logerrit)\" 
"
 
 project=$(cat $GIT_DIR/description)
 recipients="libreoffice-comm...@lists.freedesktop.org"
@@ -135,5 +136,5 @@ else
do

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

[Tomaž Vajngerl (via logerrit)]

 desktop/source/lib/init.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4d02d0dd5007c0f1135f3b362829487703dd02b6
Author: Tomaž Vajngerl 
AuthorDate: Mon Jun 3 13:15:35 2019 +0900
Commit: Tor Lillqvist 
CommitDate: Mon Jun 3 13:30:00 2019 +0200

tdf#123697 we need to create a bitmap context with alpha

Change-Id: Ib934314e56163983e70a0b04eb667e6b8527c783
Reviewed-on: https://gerrit.libreoffice.org/73364
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3d30f5d637ea..bd17b54eea8d 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2559,7 +2559,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 #if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS)
 
 #if defined(IOS)
-CGContextRef cgc = CGBitmapContextCreate(pBuffer, nCanvasWidth, 
nCanvasHeight, 8, nCanvasWidth*4, CGColorSpaceCreateDeviceRGB(), 
kCGImageAlphaNoneSkipFirst | kCGImageByteOrder32Little);
+CGContextRef cgc = CGBitmapContextCreate(pBuffer, nCanvasWidth, 
nCanvasHeight, 8, nCanvasWidth*4, CGColorSpaceCreateDeviceRGB(), 
kCGImageAlphaPremultipliedFirst | kCGImageByteOrder32Little);
 
 // Use the vcl.cg tag even if this code is not in vcl, to match all other 
SAL_INFO logging about Core Graphics, in vcl.
 SAL_INFO( "vcl.cg", "CGBitmapContextCreate(" << nCanvasWidth << "x" << 
nCanvasHeight << "x32) = " << cgc );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/css loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/css/loleaflet.css |6 +-
 loleaflet/src/control/Control.ContextToolbar.js |5 -
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 291d9dd1011d13cf63292f35245c408babf20c66
Author: Tor Lillqvist 
AuthorDate: Mon Jun 3 14:04:43 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Jun 3 14:10:45 2019 +0300

tdf#122572: Avoid thin rectangular border around context toolbar on iOS

Change-Id: Ifaf710b03eb860455ffb99473d82898c1de8190c

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index adeb1ac05..576931f8d 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -361,6 +361,11 @@ body {
background: url('images/lc_paste.svg') no-repeat center 
!important;
 }
 
+.loleaflet-ios-context-toolbar {
+   position: absolute;
+   float: none;
+}
+
 .loleaflet-ios-context-table {
color: white;
font-size: 15px;
diff --git a/loleaflet/src/control/Control.ContextToolbar.js 
b/loleaflet/src/control/Control.ContextToolbar.js
index 60dec30dc..532cbbd62 100644
--- a/loleaflet/src/control/Control.ContextToolbar.js
+++ b/loleaflet/src/control/Control.ContextToolbar.js
@@ -36,7 +36,10 @@ L.Control.ContextToolbar = L.Control.extend({
},
 
_initLayout: function () {
-   this._container = L.DomUtil.create('div', 
'loleaflet-context-toolbar');
+   if (window.ThisIsTheiOSApp)
+   this._container = L.DomUtil.create('div', 
'loleaflet-ios-context-toolbar');
+   else
+   this._container = L.DomUtil.create('div', 
'loleaflet-context-toolbar');
 
var tagTd = 'td',
onUp = 'mouseup',
commit fd3fa85426736db8933adbc7e050236dbf1e4782
Author: Tor Lillqvist 
AuthorDate: Mon Jun 3 13:20:32 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Jun 3 14:10:40 2019 +0300

tdf#122572: Don't underline the entries in the iOS selection context menu

The entries in the native edit menus appeared underlined for me
because I had turned on “Button Shapes” in Settings > General >
Accessibility. They are not supposed to be underlined normally.

Change-Id: I9b85774f3c8300e014092f6ea08953a404156899

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index ca6e9c9f7..adeb1ac05 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -363,7 +363,6 @@ body {
 
 .loleaflet-ios-context-table {
color: white;
-   text-decoration: underline;
font-size: 15px;
border-spacing: 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 include/sfx2/docfile.hxx|6 +++---
 sfx2/source/doc/docfile.cxx |   14 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit c0d372d7c0d9284aad8b0d5142dff7c34c062fa9
Author: Noel Grandin 
AuthorDate: Mon Jun 3 10:03:34 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon Jun 3 12:48:43 2019 +0200

tdf#67538 XTypeDetection::queryTypeByDescriptor poor performance, part2

SfxMedium was creating a temporary file and copying the input file, when
CloseInStream_Impl was called from the destructor. Very very bad for
performance.

This is specifically fixing the performance of queryTypeByDescriptor
when called from a basic macro on a local test file.

This takes my test macro from 16.1s to 9s.

Change-Id: If52f8e0587c7b11666893f6cb79b3180d45cce43
Reviewed-on: https://gerrit.libreoffice.org/73375
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index a8fae8409bb9..77950a473197 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -60,9 +60,9 @@ class SFX2_DLLPUBLIC SfxMedium : public SvRefBase
 std::unique_ptr< SfxMedium_Impl > pImpl;
 
 SAL_DLLPRIVATE void SetIsRemote_Impl();
-SAL_DLLPRIVATE void CloseInStream_Impl();
+SAL_DLLPRIVATE void CloseInStream_Impl(bool bInDestruction = false);
 SAL_DLLPRIVATE void CloseOutStream_Impl();
-SAL_DLLPRIVATE void CloseStreams_Impl();
+SAL_DLLPRIVATE void CloseStreams_Impl(bool bInDestruction = false);
 
 SAL_DLLPRIVATE void SetEncryptionDataToStorage_Impl();
 
@@ -121,7 +121,7 @@ public:
 const OUString& GetOrigURL() const;
 
 SfxItemSet  *   GetItemSet() const;
-voidClose();
+voidClose(bool bInDestruction = false);
 voidCloseAndRelease();
 voidReOpen();
 voidCompleteReOpen();
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 177104414099..265fd4edd5b4 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -593,7 +593,7 @@ void SfxMedium::CloseInStream()
 CloseInStream_Impl();
 }
 
-void SfxMedium::CloseInStream_Impl()
+void SfxMedium::CloseInStream_Impl(bool bInDestruction)
 {
 // if there is a storage based on the InStream, we have to
 // close the storage, too, because otherwise the storage
@@ -604,7 +604,7 @@ void SfxMedium::CloseInStream_Impl()
 CloseStorage();
 }
 
-if ( pImpl->m_pInStream && !GetContent().is() )
+if ( pImpl->m_pInStream && !GetContent().is() && !bInDestruction )
 {
 CreateTempFile();
 return;
@@ -2905,14 +2905,14 @@ sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const 
OUString& aPasswd, bool
 }
 
 
-void SfxMedium::Close()
+void SfxMedium::Close(bool bInDestruction)
 {
 if ( pImpl->xStorage.is() )
 {
 CloseStorage();
 }
 
-CloseStreams_Impl();
+CloseStreams_Impl(bInDestruction);
 
 UnlockFile( false );
 }
@@ -3081,9 +3081,9 @@ void SfxMedium::CloseAndReleaseStreams_Impl()
 }
 
 
-void SfxMedium::CloseStreams_Impl()
+void SfxMedium::CloseStreams_Impl(bool bInDestruction)
 {
-CloseInStream_Impl();
+CloseInStream_Impl(bInDestruction);
 CloseOutStream_Impl();
 
 if ( pImpl->m_pSet )
@@ -3326,7 +3326,7 @@ SfxMedium::~SfxMedium()
 // if there is a requirement to clean the backup this is the last 
possibility to do it
 ClearBackup_Impl();
 
-Close();
+Close(/*bInDestruction*/true);
 
 if( !pImpl->bIsTemp || pImpl->m_aName.isEmpty() )
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

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

New commits:
commit e2fdcd2ac03d3c916eccdd38c4025fdbd5d442f6
Author: Jan-Marek Glogowski 
AuthorDate: Sun Jun 2 20:04:28 2019 +0200
Commit: Michael Weghorn 
CommitDate: Mon Jun 3 12:13:04 2019 +0200

Qt5 return expected QVariants int sizes

Grep'ing the Qt source code, most of the places call toInt()
on the QVariants returned from Qt::ImCursorPosition and
Qt::ImAnchorPosition (toUInt() is probably a bug). So actually
deliver these (and fix the 32bit build with the sal_Int32
ambiguity - there is no "signed long" QVariant constructor).

Change-Id: Id6b8fbabb8156692592bdef48437db140c6b7cca
Reviewed-on: https://gerrit.libreoffice.org/73356
Tested-by: Rene Engelhard 
Reviewed-by: Michael Weghorn 

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index d2a2d8140026..a6b3d29e69a8 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -629,7 +629,7 @@ QVariant Qt5Widget::inputMethodQuery(Qt::InputMethodQuery 
property) const
 {
 sal_Int32 nCursorPos, nAnchor;
 if (lcl_retrieveSurrounding(nCursorPos, nAnchor, nullptr, nullptr))
-return QVariant(nCursorPos);
+return QVariant(static_cast(nCursorPos));
 [[fallthrough]];
 }
 case Qt::ImCursorRectangle:
@@ -643,7 +643,7 @@ QVariant Qt5Widget::inputMethodQuery(Qt::InputMethodQuery 
property) const
 {
 sal_Int32 nCursorPos, nAnchor;
 if (lcl_retrieveSurrounding(nCursorPos, nAnchor, nullptr, nullptr))
-return QVariant(nAnchor);
+return QVariant(static_cast(nAnchor));
 [[fallthrough]];
 }
 case Qt::ImCurrentSelection:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 ucb/source/ucp/file/filstr.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1439a09a13516f72baa735e5af332b0647d0cff7
Author: Noel Grandin 
AuthorDate: Mon Jun 3 10:00:58 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon Jun 3 12:14:41 2019 +0200

tdf#67538 XTypeDetection::queryTypeByDescriptor poor performance, part1

Skip creating an intermediary buffer in XStream_impl::readBytes, and
just read directly into the destination.

This is specifically fixing the performance of queryTypeByDescriptor
when called from a basic macro on a local test file.

This takes my test macro from 17.1s to 16.1s.

Change-Id: Iaa7d38c6a90a3b3f01a4b748c4512dd8fda690c7
Reviewed-on: https://gerrit.libreoffice.org/73374
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index a2419042de45..8b23813abdc4 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -130,10 +130,9 @@ XStream_impl::readBytes(
 if( ! m_nIsOpen )
 throw io::IOException( THROW_WHERE );
 
-std::unique_ptr buffer;
 try
 {
-buffer.reset(new sal_Int8[nBytesToRead]);
+aData.realloc(nBytesToRead);
 }
 catch (const std::bad_alloc&)
 {
@@ -142,12 +141,13 @@ XStream_impl::readBytes(
 }
 
 sal_uInt64 nrc(0);
-if(m_aFile.read( buffer.get(),sal_uInt64(nBytesToRead),nrc )
+if(m_aFile.read( aData.getArray(), sal_uInt64(nBytesToRead), nrc )
!= osl::FileBase::E_None)
 {
 throw io::IOException( THROW_WHERE );
 }
-aData = uno::Sequence< sal_Int8 > ( buffer.get(), 
static_cast(nrc) );
+if (nrc != static_cast(nBytesToRead))
+aData.realloc(nrc);
 return static_cast(nrc);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/Library_avmediagst.mk avmedia/source

[Michael Weghorn (via logerrit)]

 avmedia/Library_avmediagst.mk  |1 -
 avmedia/source/gstreamer/gstplayer.cxx |8 
 avmedia/source/gstreamer/gstplayer.hxx |6 --
 3 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 34bbf192a7753205bb64d14e4eec4ce303317396
Author: Michael Weghorn 
AuthorDate: Fri May 31 13:26:32 2019 +0200
Commit: Katarina Behrens 
CommitDate: Mon Jun 3 11:14:39 2019 +0200

Drop extra define ENABLE_GTKSINK

Directly use 'ENABLE_GTK3' instead, s.a. discussion at
https://gerrit.libreoffice.org/#/c/72968/ .

Change-Id: I9713cd942e3f7308974eebc432dce0d2bc5adadc
Reviewed-on: https://gerrit.libreoffice.org/73270
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index 9b9622b7edc5..cd651c82e60b 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_Library_add_libs,avmediagst,\
 ifneq ($(ENABLE_GTK3),)
 $(eval $(call gb_Library_add_cxxflags,avmediagst,\
 $$(GTK3_CFLAGS) \
--DENABLE_GTKSINK \
 ))
 
 $(eval $(call gb_Library_add_libs,avmediagst,\
diff --git a/avmedia/source/gstreamer/gstplayer.cxx 
b/avmedia/source/gstreamer/gstplayer.cxx
index b2e5382353f9..e12259ad0bec 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -292,7 +292,7 @@ Player::Player() :
 GstPlayer_BASE( m_aMutex ),
 mpPlaybin( nullptr ),
 mpVolumeControl( nullptr ),
-#if defined(ENABLE_GTKSINK)
+#if ENABLE_GTK3
 mpGtkWidget( nullptr ),
 #endif
 mbUseGtkSink( false ),
@@ -352,7 +352,7 @@ void SAL_CALL Player::disposing()
 // Release the elements and pipeline
 if( mbInitialized )
 {
-#if defined(ENABLE_GTKSINK)
+#if ENABLE_GTK3
 if (mpGtkWidget)
 {
 gtk_widget_destroy(mpGtkWidget);
@@ -642,7 +642,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage 
*message )
 
 void Player::preparePlaybin( const OUString& rURL, GstElement *pSink )
 {
-#if defined(ENABLE_GTKSINK)
+#if ENABLE_GTK3
 if (mpGtkWidget)
 {
 gtk_widget_destroy(mpGtkWidget);
@@ -981,7 +981,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL 
Player::createPlayerWindow( co
 }
 
 GstElement *pVideosink = nullptr;
-#if defined(ENABLE_GTKSINK)
+#if ENABLE_GTK3
 pVideosink = (aToolkit == "gtk3") ?
   gst_element_factory_make("gtksink", "gtksink") : 
nullptr;
 if (pVideosink)
diff --git a/avmedia/source/gstreamer/gstplayer.hxx 
b/avmedia/source/gstreamer/gstplayer.hxx
index c57f60a7802f..9bc0e3eb4cb5 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX
 #define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX
 
+#include 
+
 #include 
 #include "gstcommon.hxx"
 
@@ -27,7 +29,7 @@
 #include 
 #include 
 
-#if defined(ENABLE_GTKSINK)
+#if ENABLE_GTK3
 #include 
 #endif
 
@@ -83,7 +85,7 @@ private:
 // Add elements and pipeline here
 GstElement* mpPlaybin;  // the playbin is also a pipeline
 GstElement* mpVolumeControl;  // the playbin is also a pipeline
-#if defined(ENABLE_GTKSINK)
+#if ENABLE_GTK3
 GtkWidget*  mpGtkWidget;
 #endif
 boolmbUseGtkSink;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host/config_gtk3_kde5.h.in config_host/config_kde5.h.in config_host/config_qt5.h.in config_host/config_vclplug.h.in configure.ac

[Michael Weghorn (via logerrit)]

 config_host/config_gtk3_kde5.h.in |   10 --
 config_host/config_kde5.h.in  |   10 --
 config_host/config_qt5.h.in   |   11 ---
 config_host/config_vclplug.h.in   |6 --
 configure.ac  |5 +
 5 files changed, 5 insertions(+), 37 deletions(-)

New commits:
commit 593e8c671361ba5a1229001ce9d1da92f4aae842
Author: Michael Weghorn 
AuthorDate: Fri May 31 09:29:17 2019 +0200
Commit: Katarina Behrens 
CommitDate: Mon Jun 3 11:14:04 2019 +0200

Have all VCL plugin related defines in config_vclplug.h

Add the 'ENABLE_GTK3' and 'ENABLE_QT5' there
to allow using sth like

#include 
#if ENABLE_GTK3
// your code here
#endif

for these as well.

Remove 'config_gtk3_kde5.h{,.in}', 'config_kde5.h{,.in}'
and 'config_qt5.h{,.in}'; they aren't included anywhere.
('QT5_HAVE_GLIB' is only used in Makefiles, so there's no
need to have it in a config header and 'KDE5_HAVE_GLIB' is
not used anywhere at all.)

Change-Id: Iea7906880f57dde782c50f2520e8d9b358f6bc82
Reviewed-on: https://gerrit.libreoffice.org/73204
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/config_host/config_gtk3_kde5.h.in 
b/config_host/config_gtk3_kde5.h.in
deleted file mode 100644
index 06c672d4bb69..
--- a/config_host/config_gtk3_kde5.h.in
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-Settings for GTK3/KDE5 integration.
-*/
-
-#ifndef CONFIG_GTK3_KDE5_H
-#define CONFIG_GTK3_KDE5_H
-
-#define ENABLE_GTK3_KDE5 0
-
-#endif
diff --git a/config_host/config_kde5.h.in b/config_host/config_kde5.h.in
deleted file mode 100644
index af42a5edcf6a..
--- a/config_host/config_kde5.h.in
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-Settings for KDE5 integration.
-*/
-
-#ifndef CONFIG_KDE5_H
-#define CONFIG_KDE5_H
-
-#define KDE5_HAVE_GLIB 0
-
-#endif
diff --git a/config_host/config_qt5.h.in b/config_host/config_qt5.h.in
deleted file mode 100644
index 51bb58566f2b..
--- a/config_host/config_qt5.h.in
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
-Settings for QT5 integration.
-*/
-
-#ifndef CONFIG_QT5_H
-#define CONFIG_QT5_H
-
-#define ENABLE_QT5 0
-#define QT5_HAVE_GLIB 0
-
-#endif
diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in
index 5bd9b4b98fe4..0b9ca095e5ec 100644
--- a/config_host/config_vclplug.h.in
+++ b/config_host/config_vclplug.h.in
@@ -1,6 +1,6 @@
 /*
 
-Settings about which X11 desktops have support enabled.
+Settings about which desktops have support enabled.
 
 */
 
@@ -8,7 +8,9 @@ Settings about which X11 desktops have support enabled.
 #define CONFIG_VCLPLUG_H
 
 #define ENABLE_GTK 0
-#define ENABLE_KDE5 0
+#define ENABLE_GTK3 0
 #define ENABLE_GTK3_KDE5 0
+#define ENABLE_KDE5 0
+#define ENABLE_QT5 0
 
 #endif
diff --git a/configure.ac b/configure.ac
index 09a21db2e37f..7f98a4a429b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10229,6 +10229,7 @@ if test "x$enable_gtk3" = "xyes"; then
 : ${with_system_cairo:=yes}
 PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.18 gtk+-unix-print-3.0 
gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", 
ENABLE_GTK3="")
 if test "x$ENABLE_GTK3" = "xTRUE"; then
+AC_DEFINE(ENABLE_GTK3)
 R="gtk3"
 dnl Avoid installed by unpackaged files for now.
 if test -z "$PKGFORMAT"; then
@@ -11171,7 +11172,6 @@ the root of your Qt installation by exporting QT5DIR 
before running "configure".
 PKG_CHECK_MODULES(QT5_GLIB,[glib-2.0 >= 2.4],
 [
 QT5_HAVE_GLIB=1
-AC_DEFINE(QT5_HAVE_GLIB,1)
 ],
 AC_MSG_WARN([[No Glib found, Qt5 support will not use native file 
pickers!]])
 )
@@ -12710,9 +12710,6 @@ AC_CONFIG_HEADERS([config_host/config_liblangtag.h])
 AC_CONFIG_HEADERS([config_host/config_libnumbertext.h])
 AC_CONFIG_HEADERS([config_host/config_locales.h])
 AC_CONFIG_HEADERS([config_host/config_mpl.h])
-AC_CONFIG_HEADERS([config_host/config_qt5.h])
-AC_CONFIG_HEADERS([config_host/config_kde5.h])
-AC_CONFIG_HEADERS([config_host/config_gtk3_kde5.h])
 AC_CONFIG_HEADERS([config_host/config_oox.h])
 AC_CONFIG_HEADERS([config_host/config_options.h])
 AC_CONFIG_HEADERS([config_host/config_options_calc.h])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/find-unneeded-includes

[Gabor Kelemen (via logerrit)]

 bin/find-unneeded-includes |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cef975478815369c5456e4ebc934fb855f358f83
Author: Gabor Kelemen 
AuthorDate: Sat Jun 1 22:21:38 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon Jun 3 11:12:03 2019 +0200

find-unneeded-includes: don't propose to remove ...

..and replace with debug header if multimap is used.

As seen in include/svx/SmartTagMgr.hxx

Change-Id: If239cd6e9471f74f3035c659077ed7515a9df473
Reviewed-on: https://gerrit.libreoffice.org/73367
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes
index bea49fd7a267..9cce1cad1bdf 100755
--- a/bin/find-unneeded-includes
+++ b/bin/find-unneeded-includes
@@ -45,7 +45,7 @@ def ignoreRemoval(include, toAdd, absFileName, moduleRules):
 "deque": ("debug/deque", ),
 "forward_list": ("debug/forward_list", ),
 "list": ("debug/list", ),
-"map": ("debug/map.h", ),
+"map": ("debug/map.h", "debug/multimap.h"),
 "set": ("debug/set.h", "debug/multiset.h"),
 "unordered_map": ("debug/unordered_map", ),
 "unordered_set": ("debug/unordered_set", ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/layout/calcmove.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 1416c5426a757d32f223cab46bf9038bd7f21d48
Author: Michael Stahl 
AuthorDate: Sun Jun 2 13:58:01 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon Jun 3 10:42:08 2019 +0200

tdf#119109 sw: tweak assertion in PrepareMake()

Empty section frames cause trouble for the assert added in
e14056e6e88d9b8d988b7b88b2776a8fc952031b:

* existing ones may be skipped by MoveBwd(), so a SwTextFrame moves to
  the previous page but the SwSectionFrame that was its mpPrev remains
  on this page; e.g. ooo110854-1.rtf

* a SwSectionFrame moves backward, then some SwTextFrame in it splits
  and the follow tries to move forward, resulting in *new*
  SwSectionFrames on this page that are empty (because the follow is
  eventually joined again); e.g. abi3213-1.rtf

So if there's a section frame, assume it's SNAFU and don't assert.

Change-Id: Ibdca2aa39fae123583e5edf5173f80e8b70ef335
Reviewed-on: https://gerrit.libreoffice.org/7
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/layout/calcmove.cxx 
b/sw/source/core/layout/calcmove.cxx
index 051bd6ca5a9c..fc4bc4567079 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -319,6 +319,8 @@ void SwFrame::PrepareMake(vcl::RenderContext* 
pRenderContext)
 if (isLast && pFrame->GetUpper() != GetUpper())
 {
 assert(GetUpper()->Lower() == this
+// empty section frames are created all the time...
+|| GetUpper()->Lower()->IsSctFrame()
 // tab frame/section frame may split multiple times
 || (   SwFlowFrame::CastFlowFrame(pFrame)
 && 
SwFlowFrame::CastFlowFrame(GetUpper()->Lower())
@@ -441,6 +443,8 @@ void SwFrame::PrepareCursor()
 if (isLast && pFrame->GetUpper() != GetUpper())
 {
 assert(GetUpper()->Lower() == this
+// empty section frames are created all the time...
+|| GetUpper()->Lower()->IsSctFrame()
 // tab frame/section frame may split multiple times
 || (   SwFlowFrame::CastFlowFrame(pFrame)
 && SwFlowFrame::CastFlowFrame(GetUpper()->Lower())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/source/core/inc/UndoTable.hxx |   18 ++--
 sw/source/core/undo/untbl.cxx|   58 +++
 2 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 2c2edfe3fe2c1ea692a6fa9488bbdab4e56dd8b9
Author: Miklos Vajna 
AuthorDate: Mon Jun 3 09:04:44 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jun 3 10:33:23 2019 +0200

sw: prefix members of SwUndoInsTable

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

diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 65a62d284682..ecfa87745ef7 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -45,15 +45,15 @@ class SwTableSortBoxes;
 
 class SwUndoInsTable : public SwUndo
 {
-OUString sTableNm;
-SwInsertTableOptions const aInsTableOpts;
-std::unique_ptr pDDEFieldType;
-std::unique_ptr> pColWidth;
-std::unique_ptr  pRedlData;
-std::unique_ptr pAutoFormat;
-sal_uLong nSttNode;
-sal_uInt16 nRows, nCols;
-sal_uInt16 const nAdjust;
+OUString m_sTableName;
+SwInsertTableOptions const m_aInsTableOptions;
+std::unique_ptr m_pDDEFieldType;
+std::unique_ptr> m_pColumnWidth;
+std::unique_ptr  m_pRedlineData;
+std::unique_ptr m_pAutoFormat;
+sal_uLong m_nStartNode;
+sal_uInt16 m_nRows, m_nColumns;
+sal_uInt16 const m_nAdjust;
 
 public:
 SwUndoInsTable( const SwPosition&, sal_uInt16 nCols, sal_uInt16 nRows,
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 026aa6f8dea4..4ad7ccc0cf95 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -221,39 +221,39 @@ SwUndoInsTable::SwUndoInsTable( const SwPosition& rPos, 
sal_uInt16 nCl, sal_uInt
 const std::vector *pColArr,
 const OUString & rName)
 : SwUndo( SwUndoId::INSTABLE, rPos.GetDoc() ),
-aInsTableOpts( rInsTableOpts ),
-nSttNode( rPos.nNode.GetIndex() ), nRows( nRw ), nCols( nCl ), nAdjust( 
nAdj )
+m_aInsTableOptions( rInsTableOpts ),
+m_nStartNode( rPos.nNode.GetIndex() ), m_nRows( nRw ), m_nColumns( nCl ), 
m_nAdjust( nAdj )
 {
 if( pColArr )
 {
-pColWidth.reset( new std::vector(*pColArr) );
+m_pColumnWidth.reset( new std::vector(*pColArr) );
 }
 if( pTAFormat )
-pAutoFormat.reset( new SwTableAutoFormat( *pTAFormat ) );
+m_pAutoFormat.reset( new SwTableAutoFormat( *pTAFormat ) );
 
 // consider redline
 SwDoc& rDoc = *rPos.nNode.GetNode().GetDoc();
 if( rDoc.getIDocumentRedlineAccess().IsRedlineOn() )
 {
-pRedlData.reset( new SwRedlineData( RedlineType::Insert, 
rDoc.getIDocumentRedlineAccess().GetRedlineAuthor() ) );
+m_pRedlineData.reset( new SwRedlineData( RedlineType::Insert, 
rDoc.getIDocumentRedlineAccess().GetRedlineAuthor() ) );
 SetRedlineFlags( rDoc.getIDocumentRedlineAccess().GetRedlineFlags() );
 }
 
-sTableNm = rName;
+m_sTableName = rName;
 }
 
 SwUndoInsTable::~SwUndoInsTable()
 {
-pDDEFieldType.reset();
-pColWidth.reset();
-pRedlData.reset();
-pAutoFormat.reset();
+m_pDDEFieldType.reset();
+m_pColumnWidth.reset();
+m_pRedlineData.reset();
+m_pAutoFormat.reset();
 }
 
 void SwUndoInsTable::UndoImpl(::sw::UndoRedoContext & rContext)
 {
 SwDoc & rDoc = rContext.GetDoc();
-SwNodeIndex aIdx( rDoc.GetNodes(), nSttNode );
+SwNodeIndex aIdx( rDoc.GetNodes(), m_nStartNode );
 
 SwTableNode* pTableNd = aIdx.GetNode().GetTableNode();
 OSL_ENSURE( pTableNd, "no TableNode" );
@@ -261,7 +261,7 @@ void SwUndoInsTable::UndoImpl(::sw::UndoRedoContext & 
rContext)
 
 if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() ))
 rDoc.getIDocumentRedlineAccess().DeleteRedline( *pTableNd, true, 
RedlineType::Any );
-RemoveIdxFromSection( rDoc, nSttNode );
+RemoveIdxFromSection( rDoc, m_nStartNode );
 
 // move hard page breaks into next node
 SwContentNode* pNextNd = rDoc.GetNodes()[ pTableNd->EndOfSectionIndex()+1 
]->GetContentNode();
@@ -279,9 +279,9 @@ void SwUndoInsTable::UndoImpl(::sw::UndoRedoContext & 
rContext)
 pNextNd->SetAttr( *pItem );
 }
 
-sTableNm = pTableNd->GetTable().GetFrameFormat()->GetName();
+m_sTableName = pTableNd->GetTable().GetFrameFormat()->GetName();
 if( auto pDDETable = dynamic_cast(&pTableNd->GetTable()) )
-
pDDEFieldType.reset(static_cast(pDDETable->GetDDEFieldType()->Copy().release()));
+
m_pDDEFieldType.reset(static_cast(pDDETable->GetDDEFieldType()->Copy().release()));
 
 rDoc.GetNodes().Delete( aIdx, pTableNd->EndOfSectionIndex() -
 aIdx.GetIndex() + 1 );
@@ -296,24 +296,24 @@ void SwUndoInsTable::RedoImpl(::sw::UndoRedoContext & 
rContext)
 {
 SwDoc & rDoc = rContext.GetD

[Libreoffice-commits] core.git: 2 commits - desktop/source distro-configs/LibreOfficeiOS.conf distro-configs/LibreOfficeiOS_Sim.conf

[Tomaž Vajngerl (via logerrit)]

 desktop/source/lib/init.cxx|   72 -
 distro-configs/LibreOfficeiOS.conf |   11 -
 distro-configs/LibreOfficeiOS_Sim.conf |   32 ++
 3 files changed, 77 insertions(+), 38 deletions(-)

New commits:
commit b4653db6504a7e12203d5defeea536a0decf76d8
Author: Tomaž Vajngerl 
AuthorDate: Mon Jun 3 14:42:44 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Jun 3 10:32:15 2019 +0200

Add distro config for iOS simulator to make building easier

Change-Id: Iff70622732792224b3c0a080f95d69f86c167ae6
Reviewed-on: https://gerrit.libreoffice.org/73370
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/distro-configs/LibreOfficeiOS.conf 
b/distro-configs/LibreOfficeiOS.conf
index 411ba8d69798..7786120e2279 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -27,15 +27,6 @@
 
 --without-tls
 
-# iOS simulator (debug)
-#--enable-ios-simulator
-#--enable-debug
-
-# iOS Device (debug)
-#--enable-ios-simulator
-#--enable-debug
-#--host=arm64-apple-darwin
-
-# iOS Device (release)
+# iOS device
 --host=arm64-apple-darwin
 
diff --git a/distro-configs/LibreOfficeiOS_Sim.conf 
b/distro-configs/LibreOfficeiOS_Sim.conf
new file mode 100644
index ..146be2bd3bcc
--- /dev/null
+++ b/distro-configs/LibreOfficeiOS_Sim.conf
@@ -0,0 +1,32 @@
+--disable-breakpad
+--disable-firebird-sdbc
+--disable-online-update
+
+--without-export-validation
+--without-helppack-integration
+--without-java
+--without-junit
+
+--with-theme=colibre tango
+
+--with-build-platform-configure-options=--with-system-jpeg=no
+--with-macosx-version-min-required=10.11
+
+--disable-avahi
+--disable-avmedia
+--disable-compiler-plugins
+--disable-cups
+--disable-database-connectivity
+--disable-dconf
+--disable-extensions
+--disable-kde5
+--disable-odk
+--disable-openssl
+--disable-pdfium
+--disable-python
+
+--without-tls
+
+# iOS simulator (debug)
+--enable-ios-simulator
+--enable-debug
commit 80c5c68fede7af89e7a3732408e97364498fbbcd
Author: Tomaž Vajngerl 
AuthorDate: Mon Jun 3 12:50:47 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Jun 3 10:32:02 2019 +0200

LOK: Factor out iOS painting code

Change-Id: Ica706842003fe60ba864e013614eb535580446bb
Reviewed-on: https://gerrit.libreoffice.org/73363
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index aea40f41a2cb..2a19ef820c1a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1598,6 +1598,45 @@ ITiledRenderable* 
getTiledRenderable(LibreOfficeKitDocument* pThis)
 return dynamic_cast(pDocument->mxComponent.get());
 }
 
+#ifdef IOS
+void paintTileToCGContext(ITiledRenderable* pDocument,
+  void* rCGContext, const Size nCanvasSize,
+  const int nTilePosX, const int nTilePosY,
+  const int nTileWidth, const int nTileHeight)
+{
+SystemGraphicsData aData;
+aData.rCGContext = reinterpret_cast(rCGContext);
+
+ScopedVclPtrInstance pDevice(&aData, Size(1, 1), 
DeviceFormat::DEFAULT);
+pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
+pDevice->SetOutputSizePixel(nCanvasSize);
+pDocument->paintTile(*pDevice, nCanvasSize.Width(), nCanvasSize.Height(),
+nTilePosX, nTilePosY, nTileWidth, nTileHeight);
+}
+
+void paintTileIOS(LibreOfficeKitDocument* pThis,
+ unsigned char* pBuffer,
+ const int nCanvasWidth, const int nCanvasHeight, const double 
fDPIScale,
+ const int nTilePosX, const int nTilePosY,
+ const int nTileWidth, const int nTileHeight)
+{
+CGContextRef pCGContext = CGBitmapContextCreate(pBuffer, nCanvasWidth, 
nCanvasHeight, 8,
+nCanvasWidth * 4, 
CGColorSpaceCreateDeviceRGB(),
+
kCGImageAlphaPremultipliedFirst | kCGImageByteOrder32Little);
+
+// Use the vcl.cg tag even if this code is not in vcl, to match all other 
SAL_INFO logging about Core Graphics, in vcl.
+SAL_INFO("vcl.cg", "CGBitmapContextCreate(" << nCanvasWidth << "x" << 
nCanvasHeight << "x32) = " << pCGContext);
+
+CGContextTranslateCTM(pCGContext, 0, nCanvasHeight);
+CGContextScaleCTM(pCGContext, fDPIScale, -fDPIScale);
+
+doc_paintTileToCGContext(pThis, (void*) pCGContext, nCanvasWidth, 
nCanvasHeight, nTilePosX, nTilePosY, nTileWidth, nTileHeight);
+
+SAL_INFO("vcl.cg", "CGContextRelease(" << pCGContext << ")");
+CGContextRelease(pCGContext);
+}
+#endif
+
 } // anonymous namespace
 
 // Wonder global state ...
@@ -2446,7 +2485,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 // would do - because that one is trying to fit the lines between cells to 
integer multiples of
 // pixels.
 comphelper::ScopeGuard dpiScaleGuard([]() { 
comphelper::Libre

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

[Andrea Gelmini (via logerrit)]

 forms/source/component/Button.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8b8c3a95e42965c997f3bfd2e7459e83034d33da
Author: Andrea Gelmini 
AuthorDate: Sun Jun 2 17:55:27 2019 +
Commit: Julien Nabet 
CommitDate: Mon Jun 3 10:28:36 2019 +0200

Fix typo

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

diff --git a/forms/source/component/Button.cxx 
b/forms/source/component/Button.cxx
index 5f48bdb74f58..68c7d153fbbc 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -468,7 +468,7 @@ IMPL_LINK_NOARG(OButtonControl, OnClick, void*, void)
 #endif
 catch( const Exception& )
 {
-OSL_FAIL( "OButtonControl::OnClick: caught a exception 
other than RuntimeException!" );
+OSL_FAIL( "OButtonControl::OnClick: caught an exception 
other than RuntimeException!" );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/table.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 34b2429b7617729b524f90ba704d4077fbd92f98
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:23:38 2019 +
Commit: Julien Nabet 
CommitDate: Mon Jun 3 10:27:51 2019 +0200

Fix typo

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

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/table.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/table.xsl
index 91c6393516a1..8448665d20b3 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/table.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/table.xsl
@@ -159,7 +159,7 @@
 
 
 
+therefore a non breakable space ( / ) have been 
inserted.-->
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 filter/source/xsltfilter/LibXSLTTransformer.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dbabaed92cdc8f18eee2173c752532a2812eb612
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:23:37 2019 +
Commit: Julien Nabet 
CommitDate: Mon Jun 3 10:27:18 2019 +0200

Fix typo

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

diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx 
b/filter/source/xsltfilter/LibXSLTTransformer.hxx
index fb0b222ed29f..2b31a87914bd 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.hxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx
@@ -80,7 +80,7 @@ namespace XSLT
 };
 
 /*
- * LibXSLTTransformer provides an transforming pipe service to XSLTFilter.
+ * LibXSLTTransformer provides a transforming pipe service to XSLTFilter.
  *
  * It implements XActiveDataSource, XActiveDataSink and XActiveDataControl
  * to consume data. It also notifies upstream of important events such as
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 configure.ac |  153 ---
 1 file changed, 153 deletions(-)

New commits:
commit 4a4dcb38a99e76fd4429d7ad715466a57d252fde
Author: Stephan Bergmann 
AuthorDate: Mon Jan 28 11:19:04 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Jun 3 10:07:31 2019 +0200

Remove obsolete configure checks after libreoffice-6-3 branch off

By now, any outdated builders where this would fail should have been 
identified
and taken care of.

Change-Id: Ie94b76838cc3c8a6d3ee6e5a9e16ba32ed7c600a
Reviewed-on: https://gerrit.libreoffice.org/66998
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 8748ae4ed916..09a21db2e37f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6550,39 +6550,6 @@ return !(i != 0 && j != 0);
 AC_LANG_POP([C++])
 CXXFLAGS=$save_CXXFLAGS
 
-dnl This check can eventually be removed completely (e.g., after 
libreoffice-6-3 branch off):
-AC_MSG_CHECKING([that $CXX supports C++14 constexpr])
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
-AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-// A somewhat over-complicated way of checking for
-//  "ICE using __func__
-// in constexpr function":
-#include 
-template inline constexpr T f(T x) { return x; }
-template inline constexpr T g(T x) {
-assert(f(static_cast(x)));
-return x;
-}
-enum E { e };
-auto v = g(E::e);
-
-struct S {
-int n_;
-constexpr bool f() {
-int n = n_;
-int i = 0;
-while (n > 0) { --n; ++i; }
-assert(i >= 0);
-return i == 0;
-}
-};
-constexpr auto v2 = S{10}.f();
-]])], AC_MSG_RESULT([yes]), AC_MSG_ERROR([$CXX lacks required C++14 
constexpr support]))
-AC_LANG_POP([C++])
-CXXFLAGS=$save_CXXFLAGS
-
 dnl _Pragma support (may require C++11)
 if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 AC_MSG_CHECKING([whether $CXX supports _Pragma operator])
@@ -6616,66 +6583,6 @@ if test "$GCC" = yes; then
 fi
 AC_SUBST([HAVE_GCC_FNO_SIZED_DEALLOCATION])
 
-dnl This check can eventually be removed completely (e.g., after 
libreoffice-6-3 branch off):
-AC_MSG_CHECKING([[that $CXX supports [[fallthrough)
-AC_LANG_PUSH([C++])
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
-dnl Unknown attributes must be ignored by compilers, but they do emit warnings 
about them:
-if test "$COM" = MSC; then
-CXXFLAGS="$CXXFLAGS /we5030"
-else
-CXXFLAGS="$CXXFLAGS -Werror"
-fi
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-// There appears to be no feature-test macro for __has_cpp_attribute 
in C++2a, approximate
-// by checking for __cplusplus:
-#if __cplusplus > 201703L
-#if !__has_cpp_attribute(fallthrough)
-#error
-#endif
-#else
-void f(int & x) {
-switch (x) {
-case 0:
-++x;
-[[fallthrough]];
-default:
-++x;
-}
-}
-#endif
-]])],
-AC_MSG_RESULT([yes]), AC_MSG_ERROR([$CXX lacks required [[fallthrough]] 
support]))
-CXXFLAGS=$save_CXXFLAGS
-AC_LANG_POP([C++])
-
-dnl This check can eventually be removed completely (e.g., after 
libreoffice-6-3 branch off):
-AC_MSG_CHECKING([[that $CXX supports [[nodiscard)
-AC_LANG_PUSH([C++])
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
-dnl Unknown attributes must be ignored by compilers, but they do emit warnings 
about them:
-if test "$COM" = MSC; then
-CXXFLAGS="$CXXFLAGS /we5030"
-else
-CXXFLAGS="$CXXFLAGS -Werror"
-fi
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-// There appears to be no feature-test macro for __has_cpp_attribute 
in C++2a, approximate
-// by checking for __cplusplus:
-#if __cplusplus > 201703L
-#if !__has_cpp_attribute(nodiscard)
-#error
-#endif
-#else
-[[nodiscard]] int f();
-#endif
-]])],
-AC_MSG_RESULT([yes]), AC_MSG_ERROR([$CXX lacks required [[nodiscard]] 
support]))
-CXXFLAGS=$save_CXXFLAGS
-AC_LANG_POP([C++])
-
 AC_MSG_CHECKING([whether $CXX supports guaranteed copy elision])
 AC_LANG_PUSH([C++])
 save_CXXFLAGS=$CXXFLAGS
@@ -6701,24 +6608,6 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 CXXFLAGS=$save_CXXFLAGS
 AC_LANG_POP([C++])
 
-dnl This check can eventually be removed completely (e.g., after 
libreoffice-6-3 branch off):
-AC_MSG_CHECKING([that $CXX has a fix for CWG1579])
-AC_LANG_PUSH([C++])
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include 
-struct S1 {};
-struct S2: S1 {};
-std::unique_ptr f() {
-std::unique_ptr s2(new S2);
-return s2;
-}
-])],
-AC_MSG_RESULT([yes]), AC_MSG_ERROR([$CXX lacks a requ

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

[Michael Weghorn (via logerrit)]

 vcl/qt5/Qt5AccessibleWidget.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 93c81657c6111b4bb97a2bb9ec155465f9a6f523
Author: Michael Weghorn 
AuthorDate: Thu May 30 23:41:10 2019 +0200
Commit: Katarina Behrens 
CommitDate: Mon Jun 3 09:58:48 2019 +0200

tdf#122200 Qt5AccessibleWidget: Handle special offset values

Handle special values for offset in 'Qt5AccessibleWidget::attributes'
the same way that the base class's 'QAccessibleTextWidget::attributes'
does, s. [1].

In particular, an offset matching the text length can
be passed e.g. by "accerciser" or screen readers,
which previously resulted in an 'IndexOutOfBoundsException'
being thrown when the index was later checked in the
call to 'VCLXAccessibleStatusBarItem::getCharacterAttributes'.

See also 'IAccessibleText::attributes' documentation at [2] and
the page on special offset values referenced there [3].

[1] 
https://code.qt.io/cgit/qt/qtbase.git/tree/src/widgets/accessible/qaccessiblewidgets.cpp?h=5.12.4#n791
[2] 
https://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/interface_i_accessible_text.html#a29e5c8f69ec13c683ed6bca5e6a5
[3] 
https://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/_general_info.html#_specialOffsets

Change-Id: I623995aeb689b31c5b49fb3ace8e4dd4c18927d2
Reviewed-on: https://gerrit.libreoffice.org/73225
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/vcl/qt5/Qt5AccessibleWidget.cxx b/vcl/qt5/Qt5AccessibleWidget.cxx
index 2c31a2bdb92a..9757eab27837 100644
--- a/vcl/qt5/Qt5AccessibleWidget.cxx
+++ b/vcl/qt5/Qt5AccessibleWidget.cxx
@@ -830,6 +830,22 @@ QString Qt5AccessibleWidget::attributes(int offset, int* 
startOffset, int* endOf
 if (!xText.is())
 return QString();
 
+// handle special values for offset the same way base class's 
QAccessibleTextWidget::attributes does
+// (as defined in IAccessible 2: -1 -> length, -2 -> cursor position)
+if (offset == -2)
+offset = cursorPosition(); // currently always returns 0
+
+const int nTextLength = characterCount();
+if (offset == -1 || offset == nTextLength)
+offset = nTextLength - 1;
+
+if (offset < 0 || offset > nTextLength)
+{
+*startOffset = -1;
+*endOffset = -1;
+return QString();
+}
+
 Sequence attribs = xText->getCharacterAttributes(offset, 
Sequence());
 const PropertyValue* pValues = attribs.getConstArray();
 OUString aRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ed02a72816659bc4dbedace36aba33a16280aa45
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:23:39 2019 +
Commit: Julien Nabet 
CommitDate: Mon Jun 3 09:55:55 2019 +0200

Fix typo

Change-Id: I5598ed9aca8c985b1783928f74a143ef08e2c369
Reviewed-on: https://gerrit.libreoffice.org/73357
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
index dc93115eab5d..d59ea006a9be 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
@@ -81,16 +81,16 @@
 
 
 
-
 
 
-
 
 
 
@@ -98,7 +98,7 @@
 
 
+ This URL session is used for example when links to graphics are 
created by XSLT. Otherwise the user have to log again in for every graphic he 
likes to see. -->
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - oox/source sd/qa

[Grzegorz Araminowicz (via logerrit)]

 oox/source/drawingml/diagram/diagram.cxx   |   42 +
 oox/source/drawingml/diagram/layoutatomvisitors.cxx|   32 
 sd/qa/unit/data/pptx/smartart-vertical-block-list.pptx |binary
 sd/qa/unit/import-tests-smartart.cxx   |   41 
 4 files changed, 83 insertions(+), 32 deletions(-)

New commits:
commit 8fce4133bd427351ac269c50e02e305d9eb34321
Author: Grzegorz Araminowicz 
AuthorDate: Tue May 28 13:36:59 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jun 3 09:48:49 2019 +0200

SmartArt: sort shapes by Z order after layout algorithms

so that they are laid out in correct order

Change-Id: I82baa61311197880654d09f356decc666e6fa4c7
Reviewed-on: https://gerrit.libreoffice.org/73094
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/73255

diff --git a/oox/source/drawingml/diagram/diagram.cxx 
b/oox/source/drawingml/diagram/diagram.cxx
index 8efefe139dbf..be49c85d40aa 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -134,6 +134,46 @@ static sal_Int32 calcDepth( const OUString& rNodeName,
 return 0;
 }
 
+static void sortChildrenByZOrder(const ShapePtr& pShape)
+{
+std::vector& rChildren = pShape->getChildren();
+
+// Offset the children from their default z-order stacking, if necessary.
+for (size_t i = 0; i < rChildren.size(); ++i)
+rChildren[i]->setZOrder(i);
+
+for (size_t i = 0; i < rChildren.size(); ++i)
+{
+const ShapePtr& pChild = rChildren[i];
+sal_Int32 nZOrderOff = pChild->getZOrderOff();
+if (nZOrderOff <= 0)
+continue;
+
+// Increase my ZOrder by nZOrderOff.
+pChild->setZOrder(pChild->getZOrder() + nZOrderOff);
+pChild->setZOrderOff(0);
+
+for (sal_Int32 j = 0; j < nZOrderOff; ++j)
+{
+size_t nIndex = i + j + 1;
+if (nIndex >= rChildren.size())
+break;
+
+// Decrease the ZOrder of the next nZOrderOff elements by one.
+const ShapePtr& pNext = rChildren[nIndex];
+pNext->setZOrder(pNext->getZOrder() - 1);
+}
+}
+
+// Now that the ZOrders are adjusted, sort the children.
+std::sort(rChildren.begin(), rChildren.end(),
+  [](const ShapePtr& a, const ShapePtr& b) { return a->getZOrder() 
< b->getZOrder(); });
+
+// Apply also for children.
+for (auto& rChild : rChildren)
+sortChildrenByZOrder(rChild);
+}
+
 void Diagram::build(  )
 {
 // build name-object maps
@@ -317,6 +357,8 @@ void Diagram::addTo( const ShapePtr & pParentShape )
 // layout shapes - now all shapes are created
 ShapeLayoutingVisitor aLayoutingVisitor;
 mpLayout->getNode()->accept(aLayoutingVisitor);
+
+sortChildrenByZOrder(pParentShape);
 }
 
 ShapePtr pBackground(new Shape("com.sun.star.drawing.CustomShape"));
diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.cxx 
b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
index a45317f9ffe4..602130b6b3e3 100644
--- a/oox/source/drawingml/diagram/layoutatomvisitors.cxx
+++ b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
@@ -187,38 +187,6 @@ void ShapeCreationVisitor::visit(LayoutNode& rAtom)
 std::remove_if(pCurrParent->getChildren().begin(), 
pCurrParent->getChildren().end(),
 [] (const ShapePtr & aChild) { return aChild->getServiceName() == 
"com.sun.star.drawing.GroupShape" && aChild->getChildren().empty(); }),
 pCurrParent->getChildren().end());
-
-// Offset the children from their default z-order stacking, if necessary.
-std::vector& rChildren = pCurrParent->getChildren();
-for (size_t i = 0; i < rChildren.size(); ++i)
-rChildren[i]->setZOrder(i);
-
-for (size_t i = 0; i < rChildren.size(); ++i)
-{
-const ShapePtr& pChild = rChildren[i];
-sal_Int32 nZOrderOff = pChild->getZOrderOff();
-if (nZOrderOff <= 0)
-continue;
-
-// Increase my ZOrder by nZOrderOff.
-pChild->setZOrder(pChild->getZOrder() + nZOrderOff);
-pChild->setZOrderOff(0);
-
-for (sal_Int32 j = 0; j < nZOrderOff; ++j)
-{
-size_t nIndex = i + j + 1;
-if (nIndex >= rChildren.size())
-break;
-
-// Decrease the ZOrder of the next nZOrderOff elements by one.
-const ShapePtr& pNext = rChildren[nIndex];
-pNext->setZOrder(pNext->getZOrder() - 1);
-}
-}
-
-// Now that the ZOrders are adjusted, sort the children.
-std::sort(rChildren.begin(), rChildren.end(),
-  [](const ShapePtr& a, const ShapePtr& b) { return a->getZOrder() 
< b->getZOrder(); });
 }
 
 void ShapeCreationVisitor::visit(ShapeAtom& /*rAtom*/)
diff --git a/sd/qa/unit/data/pptx/smartart-vertical-block-list.pptx 
b/sd/qa/unit/data/pptx/smartart-v

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - oox/source sd/qa

[Grzegorz Araminowicz (via logerrit)]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   16 -
 sd/qa/unit/data/pptx/smartart-font-size.pptx|binary
 sd/qa/unit/import-tests-smartart.cxx|   34 
 3 files changed, 49 insertions(+), 1 deletion(-)

New commits:
commit 9b4cb15e41618fb1943c6c2cb150582dccc5c96c
Author: Grzegorz Araminowicz 
AuthorDate: Mon May 27 20:00:42 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jun 3 09:48:01 2019 +0200

SmartArt: adjust text size to fit shapes

up to maximal size of primFontSz constraint.
Do not override text size changed by user.

Change-Id: If7ea6bbb96cb839831d877edc274a1b0eefdaf21
Reviewed-on: https://gerrit.libreoffice.org/73050
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/73251

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index bc30ec38e219..808960093f29 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -1105,6 +1106,7 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 // adjust text alignment
 
 // Parse constraints, only self margins as a start.
+double fFontSize = 0;
 for (const auto& rConstr : rConstraints)
 {
 if (rConstr.mnRefType == XML_w)
@@ -1124,9 +1126,10 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 
 rShape->getShapeProperties().setProperty(nProperty, 
nValue);
 }
+if (rConstr.mnType == XML_primFontSz)
+fFontSize = rConstr.mfValue;
 }
 
-// TODO: adjust text size to fit shape
 TextBodyPtr pTextBody = rShape->getTextBody();
 if (!pTextBody ||
 pTextBody->getParagraphs().empty() ||
@@ -1135,6 +1138,17 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 break;
 }
 
+// adjust text size to fit shape
+if (fFontSize != 0)
+{
+for (auto& aParagraph : pTextBody->getParagraphs())
+for (auto& aRun : aParagraph->getRuns())
+if (!aRun->getTextCharacterProperties().moHeight.has())
+aRun->getTextCharacterProperties().moHeight = 
fFontSize * 100;
+}
+
pTextBody->getTextProperties().maPropertyMap.setProperty(PROP_TextFitToSize, 
drawing::TextFitToSizeType_AUTOFIT);
+
+// ECMA-376-1:2016 21.4.7.5 ST_AutoTextRotation (Auto Text 
Rotation)
 const sal_Int32 nautoTxRot = maMap.count(XML_autoTxRot) ? 
maMap.find(XML_autoTxRot)->second : XML_upr;
 
 switch(nautoTxRot)
diff --git a/sd/qa/unit/data/pptx/smartart-font-size.pptx 
b/sd/qa/unit/data/pptx/smartart-font-size.pptx
new file mode 100644
index ..253cd4c73b65
Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-font-size.pptx differ
diff --git a/sd/qa/unit/import-tests-smartart.cxx 
b/sd/qa/unit/import-tests-smartart.cxx
index 682c775b80fe..624205c5380a 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -10,6 +10,8 @@
 #include "sdmodeltestbase.hxx"
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -71,6 +73,7 @@ public:
 void testInteropGrabBag();
 void testBackground();
 void testBackgroundDrawingmlFallback();
+void testFontSize();
 
 CPPUNIT_TEST_SUITE(SdImportTestSmartArt);
 
@@ -106,6 +109,7 @@ public:
 CPPUNIT_TEST(testInteropGrabBag);
 CPPUNIT_TEST(testBackground);
 CPPUNIT_TEST(testBackgroundDrawingmlFallback);
+CPPUNIT_TEST(testFontSize);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -997,6 +1001,36 @@ void 
SdImportTestSmartArt::testBackgroundDrawingmlFallback()
 xDocShRef->DoClose();
 }
 
+void SdImportTestSmartArt::testFontSize()
+{
+sd::DrawDocShellRef xDocShRef = loadURL(
+
m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-font-size.pptx"), 
PPTX);
+
+uno::Reference xGroup1(getShapeFromPage(0, 0, 
xDocShRef), uno::UNO_QUERY);
+uno::Reference xShape1(xGroup1->getByIndex(1), 
uno::UNO_QUERY);
+uno::Reference xParagraph1(getParagraphFromShape(0, 
xShape1));
+uno::Reference xRun1(getRunFromParagraph(0, 
xParagraph1));
+uno::Reference xPropSet1(xRun1, uno::UNO_QUERY);
+double fFontSize1 = 
xPropSet1->getPropertyValue("CharHeight").get();
+CPPUNIT_ASSERT_DOUBLES_EQUAL(65.0, fFontSize1, 0.01);
+
+uno::Reference xGroup2(getShapeFromPage(1, 0, 
xDocShRef), uno::UNO_QUERY);
+uno::Reference xShape2(xGroup2->getByIndex(1), 
uno::UNO_QUERY);
+uno::Reference xParagraph2(getParagraphFromShape(0, 
xShape2));
+uno::Re

[Libreoffice-commits] core.git: dbaccess/source include/comphelper include/sfx2 include/svl include/svx include/xmloff sc/inc sc/source sfx2/source svl/source svx/source xmloff/inc xmloff/source xmlse

[Arkadiy Illarionov (via logerrit)]

 dbaccess/source/ui/browser/sbagrid.cxx|   29 
---
 dbaccess/source/ui/inc/sbagrid.hxx|5 
 include/comphelper/servicehelper.hxx  |2 
 include/sfx2/asyncfunc.hxx|7 
 include/svl/numuno.hxx|7 
 include/svx/AccessibleShape.hxx   |5 
 include/svx/fmgridif.hxx  |5 
 include/xmloff/attrlist.hxx   |6 
 include/xmloff/xmlexp.hxx |6 
 sc/inc/afmtuno.hxx|7 
 sc/inc/cellsuno.hxx   |   12 -
 sc/inc/datauno.hxx|6 
 sc/inc/fielduno.hxx   |6 
 sc/inc/fmtuno.hxx |   11 -
 sc/inc/srchuno.hxx|7 
 sc/inc/styleuno.hxx   |7 
 sc/inc/textuno.hxx|   16 -
 sc/inc/viewuno.hxx|7 
 sc/source/ui/unoobj/afmtuno.cxx   |   32 
---
 sc/source/ui/unoobj/cellsuno.cxx  |   64 
--
 sc/source/ui/unoobj/datauno.cxx   |   32 
---
 sc/source/ui/unoobj/fielduno.cxx  |   32 
---
 sc/source/ui/unoobj/fmtuno.cxx|   63 
--
 sc/source/ui/unoobj/srchuno.cxx   |   32 
---
 sc/source/ui/unoobj/styleuno.cxx  |   31 
---
 sc/source/ui/unoobj/textuno.cxx   |   94 
--
 sc/source/ui/unoobj/viewuno.cxx   |   32 
---
 sfx2/source/control/asyncfunc.cxx |   35 
---
 svl/source/numbers/numuno.cxx |   36 
---
 svx/source/accessibility/AccessibleShape.cxx  |   39 

 svx/source/fmcomp/fmgridif.cxx|   39 

 xmloff/inc/StyleMap.hxx   |8 
 xmloff/source/core/attrlist.cxx   |   36 
---
 xmloff/source/core/xmlexp.cxx |   36 
---
 xmloff/source/style/StyleMap.cxx  |   39 

 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx |   29 
---
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx |6 
 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx |   27 --
 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx |6 
 39 files changed, 66 insertions(+), 833 deletions(-)

New commits:
commit 09c657ebe69fe1c2516a10a4452996870f4237d2
Author: Arkadiy Illarionov 
AuthorDate: Sat Jun 1 20:50:37 2019 +0300
Commit: Stephan Bergmann 
CommitDate: Mon Jun 3 09:32:50 2019 +0200

tdf#39593 use UNO3_GETIMPLEMENTATION* macros

Change-Id: I4e9af3b43a5baf19e100f42b3f37a2ade89ada5d
Reviewed-on: https://gerrit.libreoffice.org/73320
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/dbaccess/source/ui/browser/sbagrid.cxx 
b/dbaccess/source/ui/browser/sbagrid.cxx
index c41a4e395c67..0bf3e8a4fec8 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -71,7 +71,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -506,16 +505,6 @@ void SAL_CALL SbaXGridPeer::removeStatusListener(const 
Reference< css::frame::XS
 pCont->removeInterface(xControl);
 }
 
-namespace
-{
-class theSbaXGridPeerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, 
theSbaXGridPeerUnoTunnelId > {};
-}
-
-const Sequence< sal_Int8 > & SbaXGridPeer::getUnoTunnelId()
-{
-return theSbaXGridPeerUnoTunnelId::get().getSeq();
-}
-
 Sequence< Type > SAL_CALL SbaXGridPeer::getTypes()
 {
 return comphelper::concatSequences(
@@ -523,23 +512,7 @@ Sequence< Type > SAL_CALL SbaXGridPeer::getTypes()
 Sequence { cppu::UnoType::get() });
 }
 
-// return implementation specific data
-sal_Int64 SAL_CALL SbaXGridPeer::getSomething( const Sequence< sal_Int8 > & 
rId )
-{
-if( rId.getLength() == 16 && 0 == memcmp( 
getUnoTunnelId().getConstArray(),  rId.getConstArray(), 16 ) )
-return reinterpret_cast< sal_Int64 >( this );
-
-return FmXGridPeer::getSomething(rId);
-}
-
-SbaXGridPeer* SbaXGridPeer::getImplementation(cons

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

[Gabor Kelemen (via logerrit)]

 include/svx/sdr/animation/animationstate.hxx |1 -
 include/svx/sdr/animation/objectanimator.hxx |4 
 include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx |1 -
 include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx |1 -
 include/svx/sdr/attribute/sdrshadowtextattribute.hxx |1 -
 include/svx/sdr/contact/objectcontact.hxx|2 +-
 include/svx/sdr/contact/viewobjectcontact.hxx|3 ---
 include/svx/sdr/overlay/overlaymanager.hxx   |1 -
 include/svx/sdr/overlay/overlayobject.hxx|1 -
 include/svx/sdr/overlay/overlaypolypolygon.hxx   |1 -
 include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx |1 -
 include/svx/sdr/overlay/overlayselection.hxx |1 -
 include/svx/sdr/table/tablecontroller.hxx|1 -
 13 files changed, 1 insertion(+), 18 deletions(-)

New commits:
commit 675a3928e1cab27cf310c316be65acdbb764ed65
Author: Gabor Kelemen 
AuthorDate: Sat Jun 1 21:56:43 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jun 3 09:28:21 2019 +0200

tdf#42949 Fix IWYU warnings in include/svx/sdr/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

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

diff --git a/include/svx/sdr/animation/animationstate.hxx 
b/include/svx/sdr/animation/animationstate.hxx
index 368583820d6f..fb19740644b8 100644
--- a/include/svx/sdr/animation/animationstate.hxx
+++ b/include/svx/sdr/animation/animationstate.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_SDR_ANIMATION_ANIMATIONSTATE_HXX
 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/include/svx/sdr/animation/objectanimator.hxx 
b/include/svx/sdr/animation/objectanimator.hxx
index eab4fe79653c..f8cb8ce8c5b1 100644
--- a/include/svx/sdr/animation/objectanimator.hxx
+++ b/include/svx/sdr/animation/objectanimator.hxx
@@ -20,11 +20,7 @@
 #ifndef INCLUDED_SVX_SDR_ANIMATION_OBJECTANIMATOR_HXX
 #define INCLUDED_SVX_SDR_ANIMATION_OBJECTANIMATOR_HXX
 
-#include 
-#include 
-#include 
 #include 
-#include 
 
 
 namespace sdr
diff --git a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx 
b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx
index 077a3455e7c4..510b481d5922 100644
--- a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX
 #define INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX
 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx 
b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx
index 039228e007bf..c084013b59b9 100644
--- a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX
 #define INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX
 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx 
b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx
index e9841662f90f..9bac9712adf1 100644
--- a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX
 #define INCLUDED_SVX_SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX
 
-#include 
 #include 
 #include 
 
diff --git a/include/svx/sdr/contact/objectcontact.hxx 
b/include/svx/sdr/contact/objectcontact.hxx
index ca24cbc79633..e65630d1ec7e 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACT_HXX
 
 #include 
+#include 
 #include 
 #include 
-#include 
 
 class SdrLayerIDSet;
 namespace tools { class Rectangle; }
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx 
b/include/svx/sdr/contact/viewobjectcontact.hxx
index a6d929c6c203..460dd83b51f1 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -20,10 +20,7 @@
 #ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACT_HXX
 #define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACT_HXX
 
-#include 
-
 #include 
-#include 
 #include 
 #include 
 
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx 
b/include/svx/sdr/overlay/overlaymanager.hxx
index ae49f2d59b75..c84a3cbf2bc1 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
d

[Libreoffice-commits] online.git: kit/Kit.cpp wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 kit/Kit.cpp |2 --
 wsd/LOOLWSD.cpp |2 --
 2 files changed, 4 deletions(-)

New commits:
commit a4fd83794e8fcfda46dbb1d033088ebcaeecf4cd
Author: Miklos Vajna 
AuthorDate: Mon Jun 3 09:05:58 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jun 3 09:06:11 2019 +0200

Remove unused using declarations

Change-Id: I0d4336fc8f85a18b2c41de233166e725166385f6

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 892289f23..99d34bf73 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -95,7 +95,6 @@ using Poco::File;
 using Poco::JSON::Array;
 using Poco::JSON::Object;
 using Poco::JSON::Parser;
-using Poco::Runnable;
 using Poco::StringTokenizer;
 using Poco::Thread;
 using Poco::Timestamp;
@@ -104,7 +103,6 @@ using Poco::Util::Application;
 
 #ifndef BUILDING_TESTS
 using Poco::Path;
-using Poco::Process;
 #endif
 
 using namespace LOOLProtocol;
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 28c91dbdf..80f657b22 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -155,7 +155,6 @@ using Poco::Net::HTTPResponse;
 using Poco::Net::MessageHeader;
 using Poco::Net::NameValueCollection;
 using Poco::Path;
-using Poco::Process;
 using Poco::StreamCopier;
 using Poco::StringTokenizer;
 using Poco::TemporaryFile;
@@ -165,7 +164,6 @@ using Poco::Thread;
 using Poco::URI;
 using Poco::Util::Application;
 using Poco::Util::HelpFormatter;
-using Poco::Util::IncompatibleOptionsException;
 using Poco::Util::MissingOptionException;
 using Poco::Util::Option;
 using Poco::Util::OptionSet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits