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

[Noel Grandin (via logerrit)]

 sd/inc/Outliner.hxx|2 -
 sd/inc/anminfo.hxx |2 -
 sd/inc/drawdoc.hxx |   14 

 sd/inc/sdpage.hxx  |2 -
 sd/inc/textapi.hxx |2 -
 sd/source/core/PageListWatcher.cxx |2 -
 sd/source/core/PageListWatcher.hxx |2 -
 sd/source/core/anminfo.cxx |2 -
 sd/source/core/drawdoc.cxx |2 -
 sd/source/core/drawdoc2.cxx|2 -
 sd/source/core/text/textapi.cxx|6 +--
 sd/source/filter/eppt/epptbase.hxx |2 -
 sd/source/filter/eppt/pptx-animations.cxx  |   10 
+++---
 sd/source/filter/eppt/pptx-text.cxx|2 -
 sd/source/filter/eppt/text.hxx |2 -
 sd/source/filter/html/pubdlg.cxx   |4 +-
 sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx |2 -
 sd/source/ui/animations/CustomAnimationPane.cxx|2 -
 sd/source/ui/animations/CustomAnimationPane.hxx|2 -
 sd/source/ui/annotations/annotationwindow.hxx  |2 -
 sd/source/ui/dlg/BulletAndPositionDlg.cxx  |6 +--
 sd/source/ui/dlg/dlgfield.cxx  |2 -
 sd/source/ui/dlg/filedlg.cxx   |2 -
 sd/source/ui/dlg/inspagob.cxx  |2 -
 sd/source/ui/dlg/navigatr.cxx  |2 -
 sd/source/ui/dlg/sdtreelb.cxx  |4 +-
 sd/source/ui/framework/configuration/ConfigurationUpdater.cxx  |2 -
 sd/source/ui/framework/configuration/ConfigurationUpdater.hxx  |2 -
 sd/source/ui/framework/tools/FrameworkHelper.cxx   |2 -
 sd/source/ui/func/fuconbez.cxx |2 -
 sd/source/ui/func/fuconrec.cxx |2 -
 sd/source/ui/func/fudraw.cxx   |4 +-
 sd/source/ui/func/fupage.cxx   |2 -
 sd/source/ui/func/fusel.cxx|2 -
 sd/source/ui/inc/AccessibleSlideSorterObject.hxx   |2 -
 sd/source/ui/inc/BulletAndPositionDlg.hxx  |6 +--
 sd/source/ui/inc/DrawViewShell.hxx |   14 

 sd/source/ui/inc/FrameView.hxx |   16 
+-
 sd/source/ui/inc/OutlineView.hxx   |2 -
 sd/source/ui/inc/SdUnoDrawView.hxx |2 -
 sd/source/ui/inc/View.hxx  |2 -
 sd/source/ui/inc/ViewShell.hxx |6 +--
 sd/source/ui/inc/ViewShellBase.hxx |4 +-
 sd/source/ui/inc/ViewShellImplementation.hxx   |2 -
 sd/source/ui/inc/ViewTabBar.hxx|2 -
 sd/source/ui/inc/Window.hxx|   16 
+-
 sd/source/ui/inc/dlgfield.hxx  |2 -
 sd/source/ui/inc/drawview.hxx  |2 -
 sd/source/ui/inc/filedlg.hxx   |2 -
 sd/source/ui/inc/framework/FrameworkHelper.hxx |2 -
 sd/source/ui/inc/framework/ViewShellWrapper.hxx|2 -
 sd/source/ui/inc/fuconbez.hxx  |2 -
 sd/source/ui/inc/fudraw.hxx|4 +-
 sd/source/ui/inc/fupage.hxx|2 -
 sd/source/ui/inc/fusel.hxx |4 +-
 sd/source/ui/inc/inspagob.hxx  |2 -
 sd/source/ui/inc/navigatr.hxx  |6 +--
 sd/source/ui/inc/sdtreelb.hxx  |6 +--
 sd/source/ui/inc/slideshow.hxx |6 +--
 sd/source/ui/inc/unopage.hxx   |2 -
 sd/source/ui/sidebar/LayoutMenu.cxx|2 -
 sd/source/ui/sidebar/LayoutMenu.hxx|2 -
 sd/source/ui/slideshow/slideshow.cxx   |6 +--
 sd/source/ui/slideshow/slideshowimpl.cxx   |2 -
 sd/sou

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

[Mark Hung (via logerrit)]

 sw/source/core/txtnode/fntcache.cxx |   28 ++--
 1 file changed, 10 insertions(+), 18 deletions(-)

New commits:
commit d744838991594eebe27acc4c7d9fb4579d654853
Author: Mark Hung 
AuthorDate: Mon Sep 23 22:13:10 2019 +0800
Commit: Mark Hung 
CommitDate: Sun Sep 29 05:44:27 2019 +0200

tdf#127422 draw text with correct pKernArray values.

Prior to 5f62b97ae7891b8c601f6093a1ec5358feb20790,

Starting position was specified and DrawText was used to render
the text without referring to pKernArray. After the patch,
DrawTextArray was used but pKernArray was not update correctly.

Instead of draw each substring seprated by space, this patch
increases the values pKernArray when a space is encountered
and call DrawTextArray only once.

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

diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index a73ebe3ce9ec..085317e4a259 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1203,28 +1203,20 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 }
 else
 {
-Point aTmpPos( aTextOriginPos );
 sal_Int32 i;
-sal_Int32 j = 0;
 long nSpaceSum = 0;
-for (i = 0; i < sal_Int32(rInf.GetLen()); i++ )
+for (i = 0; i < sal_Int32(rInf.GetLen()); i++)
 {
-if( CH_BLANK == rInf.GetText()[ 
sal_Int32(rInf.GetIdx()) + i ] )
-{
-nSpaceSum += nSpaceAdd;
-if( j < i)
-rInf.GetOut().DrawTextArray( aTmpPos, 
rInf.GetText(),
-pKernArray.get() + j,
-sal_Int32(rInf.GetIdx()) + j, i - j );
-j = i + 1;
-pKernArray[i] = pKernArray[i] + nSpaceSum;
-aTmpPos.setX( aTextOriginPos.X() + pKernArray[ 
i ] + nKernSum );
-}
+if(CH_BLANK == 
rInf.GetText()[sal_Int32(rInf.GetIdx()) + i])
+nSpaceSum += nSpaceAdd + nKernSum;
+
+pKernArray[i] += nSpaceSum;
 }
-if( j < i )
-rInf.GetOut().DrawTextArray( aTmpPos, 
rInf.GetText(),
-pKernArray.get() + j,
-sal_Int32(rInf.GetIdx()) + j, i - j );
+
+rInf.GetOut().DrawTextArray(aTextOriginPos,
+rInf.GetText(), pKernArray.get(),
+sal_Int32(rInf.GetIdx()),
+sal_Int32(rInf.GetLen()));
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

CppCheck Report Update

[cppcheck.libreoff...@gmail.com]

A new cppcheck report is available at : 
http://dev-builds.libreoffice.org/cppcheck_reports/master/


Note:
The script generating this report was run at :
2019-29-09 02:54:51 with user buildslave at host vm140 as 
/home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s 
/home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w 
/home/buildslave/tmp/www

It can be found and improved here:

https://gerrit.libreoffice.org/plugins/gitiles/dev-tools/+/master/cppcheck/cppcheck-report.sh


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

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

[Andrea Gelmini (via logerrit)]

 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java |  
  6 +++---
 sw/source/filter/ww8/writerwordglue.cxx |  
  2 +-
 sw/source/filter/ww8/wrtw8esh.cxx   |  
  2 +-
 sw/source/filter/ww8/ww8par3.cxx|  
  2 +-
 xmloff/source/draw/ximpstyl.cxx |  
  2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f4a07458fbf1679ce1f115ecbed16d47ccbc530d
Author: Andrea Gelmini 
AuthorDate: Sat Sep 28 20:56:51 2019 +0200
Commit: Julien Nabet 
CommitDate: Sun Sep 29 00:09:20 2019 +0200

Fix typos

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

diff --git 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index 6907990f1c68..1fca1419f4aa 100644
--- 
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ 
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -711,9 +711,9 @@ public class ParcelContainer implements XNameAccess {
 // parse location
 parsedUri.location = sfUri.getParameter("location");
 
-// TODO basic sanity check on language, location, functioname, parcel
-// should be correct e.g. verified  by MSP and LangProvider by the
-// time its got to here
+// TODO basic sanity check on language, location, function name, parcel
+// should be correct e.g. verified by MSP and LangProvider by the
+// time it's got to here
 
 LogUtils.DEBUG("** location = " + parsedUri.location +
"\nfunction = " + parsedUri.function +
diff --git a/sw/source/filter/ww8/writerwordglue.cxx 
b/sw/source/filter/ww8/writerwordglue.cxx
index ff17f3ccbcec..9853bb36fee6 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -296,7 +296,7 @@ namespace myImplHelpers
 {
 //If the style collides first stick WW- in front of it, unless
 //it already has it and then successively add a larger and
-//larger number after it, its got to work at some stage!
+//larger number after it, it's got to work at some stage!
 if (!aName.startsWith("WW-"))
 aName = "WW-" + aName;
 
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index 10272bac7467..3d38d9ced1e8 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -534,7 +534,7 @@ PlcDrawObj::~PlcDrawObj()
 {
 }
 
-//Its irritating to have to change the RTL frames position into LTR ones
+//It's irritating to have to change the RTL frames position into LTR ones
 //so that word will have to place them in the right place. Doubly so that
 //the SO drawings and writer frames have different ideas themselves as to
 //how to be positioned when in RTL mode!
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 3f618e6dc99e..1fd69d154894 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1964,7 +1964,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const 
sal_uInt8* pData,
 /*
 If you have a paragraph in word with left and/or hanging indent
 and remove its numbering, then the indentation appears to get
-reset, but not back to the base style, instead its goes to a blank
+reset, but not back to the base style, instead it goes to a blank
 setting.
 Unless it's a broken ww6 list in 97 in which case more hackery is
 required, some more details about broken ww6 list in
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 08b345dcaa48..a27dd8e7c1d1 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1167,7 +1167,7 @@ void SdXMLStylesContext::ImpSetCellStyles() const
 
 //Resolves: fdo#34987 if the style's auto height before and after is the same
 //then don't reset it back to the underlying default of true for the small
-//period before its going to be reset to false again. Doing this avoids the
+//period before it's going to be reset to false again. Doing this avoids the
 //master page shapes from resizing themselves due to autoheight becoming
 //enabled before having autoheight turned off again and getting stuck on that
 //autosized height
___
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.2' - sot/source

[Jan Holesovsky (via logerrit)]

 sot/source/base/formats.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b5492fe63c1b08af4e47b9b466ae0b81db5bab45
Author: Jan Holesovsky 
AuthorDate: Thu Sep 26 13:35:55 2019 +0200
Commit: Andras Timar 
CommitDate: Sat Sep 28 21:22:03 2019 +0200

tdf#116685: Make the RICHTEXT take precedence over EMBED_SOURCE.

Before this patch, copy in Calc, Paste in Writer produced an embedded
sheet.  I suspect is it not what the people usually want; working with
the embedded sheets in Writer is non-intuitive, I suspect people will be
happier with a normal table which they can style etc. appropriately.

OTOH - this is a general change, so it might have some unwanted
side-effects; let's see what if we get bugreports :-)

tdf#127673 was related; but in my view, we shouldn't create the embedded
objects in the first place.

Change-Id: I73710168d8924fdd6275d65e20cf55f38971a3f9
Reviewed-on: https://gerrit.libreoffice.org/79609
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index b3199f39142e..f83d10b663db 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -895,6 +895,7 @@ SotAction_Impl const aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] =
 { SotClipboardFormatId::DRAWING, EXCHG_OUT_ACTION_INSERT_DRAWOBJ, 
SotExchangeActionFlags::InsertImageMap | 
SotExchangeActionFlags::InsertTargetUrl, 0 },
 { SotClipboardFormatId::SVXB, EXCHG_OUT_ACTION_INSERT_SVXB, 
SotExchangeActionFlags::InsertImageMap | 
SotExchangeActionFlags::InsertTargetUrl, 0 },
 { SotClipboardFormatId::SD_OLE, EXCHG_OUT_ACTION_INSERT_OLE, 
SotExchangeActionFlags::InsertImageMap | 
SotExchangeActionFlags::InsertTargetUrl, 0 },
+{ SotClipboardFormatId::RICHTEXT, EXCHG_IN_ACTION_COPY, 
SotExchangeActionFlags::InsertImageMap | 
SotExchangeActionFlags::InsertTargetUrl, 0 },
 { SotClipboardFormatId::EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE, 
SotExchangeActionFlags::InsertTargetUrl, 0 },
 { SotClipboardFormatId::EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE, 
SotExchangeActionFlags::InsertTargetUrl, 0 },
 #ifndef MACOSX
___
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.2' - vcl/source

[Henry Castro (via logerrit)]

 vcl/source/window/paint.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 287d46b192d0da14cac30468d33e9486aaa0e4de
Author: Henry Castro 
AuthorDate: Wed Sep 25 07:11:24 2019 -0400
Commit: Andras Timar 
CommitDate: Sat Sep 28 21:21:28 2019 +0200

tdf#126967:vcl: lok: avoid starting idle paint task

In the Tiled rendering case the invalidation is handled
by sending logic invalidate notifications to client side.
Starting an idle paint task, it provokes an infinity loop
that it does not have the chance to process client side messages
(mpPollCallback).

Change-Id: I6ef1bbd6270592eebfeef0c8a37945bf5ddd3580
Reviewed-on: https://gerrit.libreoffice.org/79537
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit bb11efa477b6700744560d3999190c65d016600b)
Reviewed-on: https://gerrit.libreoffice.org/79662
Tested-by: Jenkins CollaboraOffice 

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index a94689cc42ad..979adc09dd0a 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -653,6 +653,9 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
 else if ( mpWindowImpl->mbReallyVisible )
 {
 ImplCallOverlapPaint();
+if (comphelper::LibreOfficeKit::isActive() &&
+mpWindowImpl->mpFrameData->maPaintIdle.IsActive())
+mpWindowImpl->mpFrameData->maPaintIdle.Stop();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Regina Henschel (via logerrit)]

 svx/qa/unit/customshapes.cxx  |   45 ++
 svx/qa/unit/data/tdf127785_Mirror.odp |binary
 svx/source/customshapes/EnhancedCustomShape2d.cxx |   10 ++--
 3 files changed, 50 insertions(+), 5 deletions(-)

New commits:
commit 7830a9d42926a9c5265230d42fce4a4858b303c1
Author: Regina Henschel 
AuthorDate: Sat Sep 28 00:34:35 2019 +0200
Commit: Regina Henschel 
CommitDate: Sat Sep 28 20:00:51 2019 +0200

tdf#127785 correct calculation of text rectangle in flipped shape

The calculation had used a wrong corner. That resulted in negative
width or height. Thus the entire shape frame was used as fallback
instead of the smaller text rectangle.

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

diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx
index 5d1d4c3f44fe..5f5983776e15 100644
--- a/svx/qa/unit/customshapes.cxx
+++ b/svx/qa/unit/customshapes.cxx
@@ -460,6 +460,51 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, 
testTdf126512_OOXML_handle_in_ODP)
 }
 CPPUNIT_ASSERT_EQUAL(OUString(), sErrors);
 }
+
+CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf127785_Mirror)
+{
+// The document contains two shapes, one with horizontal flip, the other 
with vertical
+// flip. They are diamonds, so their text frame is symmetric to the center 
of the shape.
+// The shapes have not stroke and no fill, so that the bounding box 
sourrounds the text
+// and therefore equals approximately the text frame.
+// Error was, that because of wrong calculation, the flipped shapes do not 
use the
+// text frame but the frame rectangle for their text.
+const OUString sFileName("tdf127785_Mirror.odp");
+OUString sURL = m_directories.getURLFromSrc(sDataDirectory) + sFileName;
+mxComponent = loadFromDesktop(sURL, 
"com.sun.star.comp.drawing.DrawingDocument");
+CPPUNIT_ASSERT_MESSAGE("Could not load document", mxComponent.is());
+OUString sErrors; // sErrors collects the errors and should be empty in 
case all is OK.
+
+uno::Reference xShapeV(getShape(0));
+uno::Reference xShapeVProps(xShapeV, uno::UNO_QUERY);
+CPPUNIT_ASSERT_MESSAGE("Could not get the shape properties", 
xShapeVProps.is());
+awt::Rectangle aBoundRectV;
+xShapeVProps->getPropertyValue(UNO_NAME_MISC_OBJ_BOUNDRECT) >>= 
aBoundRectV;
+const sal_Int32 nHeightV = aBoundRectV.Height;
+const sal_Int32 nWidthV = aBoundRectV.Width;
+const sal_Int32 nLeftV = aBoundRectV.X;
+const sal_Int32 nTopV = aBoundRectV.Y;
+if (abs(nHeightV - 4149) > 5 || abs(nWidthV - 3819) > 5)
+sErrors += "Flip vertical wrong size.";
+if (abs(nLeftV - 3155) > 5 || abs(nTopV - 3736) > 5)
+sErrors += " Flip vertical wrong position.";
+
+uno::Reference xShapeH(getShape(1));
+uno::Reference xShapeHProps(xShapeH, uno::UNO_QUERY);
+CPPUNIT_ASSERT_MESSAGE("Could not get the shape properties", 
xShapeHProps.is());
+awt::Rectangle aBoundRectH;
+xShapeHProps->getPropertyValue(UNO_NAME_MISC_OBJ_BOUNDRECT) >>= 
aBoundRectH;
+const sal_Int32 nHeightH = aBoundRectH.Height;
+const sal_Int32 nWidthH = aBoundRectH.Width;
+const sal_Int32 nLeftH = aBoundRectH.X;
+const sal_Int32 nTopH = aBoundRectH.Y;
+if (abs(nHeightH - 4149) > 5 || abs(nWidthH - 3819) > 5)
+sErrors += " Flip horizontal wrong size.";
+if (abs(nLeftH - 15026) > 5 || abs(nTopH - 4115) > 5)
+sErrors += " Flip horizontal wrong position.";
+
+CPPUNIT_ASSERT_EQUAL(OUString(), sErrors);
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/qa/unit/data/tdf127785_Mirror.odp 
b/svx/qa/unit/data/tdf127785_Mirror.odp
new file mode 100644
index ..ff867839f4ac
Binary files /dev/null and b/svx/qa/unit/data/tdf127785_Mirror.odp differ
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index ee0331987c65..6151ea928e47 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1101,17 +1101,17 @@ tools::Rectangle EnhancedCustomShape2d::GetTextRect() 
const
 sal_Int32 nIndex = 0;
 Point aTopLeft( GetPoint( seqTextFrames[ nIndex ].TopLeft, !bOOXMLShape, 
true ) );
 Point aBottomRight( GetPoint( seqTextFrames[ nIndex ].BottomRight, 
!bOOXMLShape, true ) );
+tools::Rectangle aRect( aTopLeft, aBottomRight );
 if ( bFlipH )
 {
-aTopLeft.setX( aLogicRect.GetWidth() - aTopLeft.X() );
-aBottomRight.setX( aLogicRect.GetWidth() - aBottomRight.X() );
+aRect.SetLeft(aLogicRect.GetWidth() - 1 - aBottomRight.X());
+aRect.SetRight( aLogicRect.GetWidth() - 1 - aTopLeft.X());
 }
 if ( bFlipV )
 {
-aTopLeft.setY( aLogicRect.GetHeight() - aTopLeft.Y() );
-aBottomRight.setY(

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

[Noel Grandin (via logerrit)]

 xmlsecurity/inc/certificatechooser.hxx |4 ++--
 xmlsecurity/inc/certificateviewer.hxx  |2 +-
 xmlsecurity/inc/digitalsignaturesdialog.hxx|2 +-
 xmlsecurity/inc/documentsignaturemanager.hxx   |8 
 xmlsecurity/source/dialogs/certificatechooser.cxx  |4 ++--
 xmlsecurity/source/dialogs/certificateviewer.cxx   |2 +-
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |4 ++--
 xmlsecurity/source/helper/documentsignaturemanager.cxx |4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 4ea413542ebb142dcdec81f43b1b5e565dbe7316
Author: Noel Grandin 
AuthorDate: Sat Sep 28 14:22:40 2019 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 28 17:57:07 2019 +0200

loplugin:constmethod in xmlsecurity

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

diff --git a/xmlsecurity/inc/certificatechooser.hxx 
b/xmlsecurity/inc/certificatechooser.hxx
index 328fdc24f2b3..d84af0fcc92f 100644
--- a/xmlsecurity/inc/certificatechooser.hxx
+++ b/xmlsecurity/inc/certificatechooser.hxx
@@ -85,9 +85,9 @@ public:
 short run() override;
 
 css::uno::Sequence > 
GetSelectedCertificates();
-css::uno::Reference< css::xml::crypto::XXMLSecurityContext > 
GetSelectedSecurityContext();
+css::uno::Reference< css::xml::crypto::XXMLSecurityContext > 
GetSelectedSecurityContext() const;
 /// Gets the description string provided when selecting the certificate.
-OUString GetDescription();
+OUString GetDescription() const;
 
 /// Returns the usage string of the selected certificate, if any.
 OUString GetUsageText();
diff --git a/xmlsecurity/inc/certificateviewer.hxx 
b/xmlsecurity/inc/certificateviewer.hxx
index b787ad4b08b2..d531dd1fc205 100644
--- a/xmlsecurity/inc/certificateviewer.hxx
+++ b/xmlsecurity/inc/certificateviewer.hxx
@@ -148,7 +148,7 @@ private:
 
 DECL_LINK(ViewCertHdl, weld::Button&, void);
 DECL_LINK(CertSelectHdl, weld::TreeView&, void);
-voidInsertCert(weld::TreeIter* pParent, const OUString& 
_rName,
+voidInsertCert(const weld::TreeIter* pParent, const 
OUString& _rName,
const css::uno::Reference< 
css::security::XCertificate >& rxCert,
bool bValid);
 
diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx 
b/xmlsecurity/inc/digitalsignaturesdialog.hxx
index 459beafcc956..363dfdeb2d41 100644
--- a/xmlsecurity/inc/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx
@@ -106,7 +106,7 @@ private:
 bool canAddRemove();
 
 public:
-DigitalSignaturesDialog(weld::Window* pParent, css::uno::Reference<
+DigitalSignaturesDialog(weld::Window* pParent, const css::uno::Reference<
 css::uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
 bool bReadOnly, const OUString& sODFVersion, bool 
bHasDocumentSignature);
 virtual ~DigitalSignaturesDialog() override;
diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx 
b/xmlsecurity/inc/documentsignaturemanager.hxx
index 1bf98ba5b8cf..5bdc679c4726 100644
--- a/xmlsecurity/inc/documentsignaturemanager.hxx
+++ b/xmlsecurity/inc/documentsignaturemanager.hxx
@@ -116,16 +116,16 @@ public:
 /// Get the security environment.
 css::uno::Reference 
getSecurityEnvironment();
 css::uno::Reference 
getGpgSecurityEnvironment();
-css::uno::Reference const& 
getSecurityContext();
-css::uno::Reference const& 
getGpgSecurityContext();
+css::uno::Reference const& 
getSecurityContext() const;
+css::uno::Reference const& 
getGpgSecurityContext() const;
 void setStore(const css::uno::Reference& xStore) { 
mxStore = xStore; }
 XMLSignatureHelper& getSignatureHelper() { return maSignatureHelper; }
-bool hasPDFSignatureHelper() { return mpPDFSignatureHelper.get(); }
+bool hasPDFSignatureHelper() const { return mpPDFSignatureHelper.get(); }
 void setSignatureStream(const css::uno::Reference& 
xSignatureStream)
 {
 mxSignatureStream = xSignatureStream;
 }
-const css::uno::Reference& getStore() { return 
mxStore; }
+const css::uno::Reference& getStore() const { return 
mxStore; }
 DocumentSignatureMode getSignatureMode() const { return meSignatureMode; }
 SignatureInformations& getCurrentSignatureInformations()
 {
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx 
b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 795e9bf3ae07..75467a6a2e6f 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -271,7 +271,7 @@ uno::Sequence 
> CertificateChooser
 return comphelper::containerToSequence(aRet);
 }
 
-uno::Reference 
CertificateChooser::GetSelectedSecurityContext()
+uno::Reference 

[Libreoffice-commits] core.git: 2 commits - basegfx/source chart2/source compilerplugins/clang include/basegfx

[Noel Grandin (via logerrit)]

 basegfx/source/tools/systemdependentdata.cxx   |8 
--
 chart2/source/controller/dialogs/ChartTypeDialogController.cxx |8 
--
 chart2/source/controller/dialogs/ChartTypeDialogController.hxx |2 -
 chart2/source/controller/dialogs/tp_ChartType.cxx  |2 -
 chart2/source/controller/sidebar/ChartAreaPanel.cxx|4 ---
 chart2/source/controller/sidebar/ChartAreaPanel.hxx|1 
 chart2/source/controller/sidebar/ChartAxisPanel.cxx|4 ---
 chart2/source/controller/sidebar/ChartAxisPanel.hxx|1 
 chart2/source/controller/sidebar/ChartLinePanel.cxx|4 ---
 chart2/source/controller/sidebar/ChartLinePanel.hxx|1 
 chart2/source/controller/sidebar/ChartSeriesPanel.cxx  |4 ---
 chart2/source/controller/sidebar/ChartSeriesPanel.hxx  |1 
 chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx |1 
 chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx |2 -
 compilerplugins/clang/virtualdead.results  |   12 
--
 include/basegfx/utils/systemdependentdata.hxx  |6 -
 16 files changed, 2 insertions(+), 59 deletions(-)

New commits:
commit 664f8632b1f4720475e6cb7176a08d3d204affd5
Author: Noel Grandin 
AuthorDate: Thu Sep 26 14:11:14 2019 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 28 17:56:57 2019 +0200

loplugin:virtualdead in basegfx

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

diff --git a/basegfx/source/tools/systemdependentdata.cxx 
b/basegfx/source/tools/systemdependentdata.cxx
index 2c1c173eff96..6f1e789d16c8 100644
--- a/basegfx/source/tools/systemdependentdata.cxx
+++ b/basegfx/source/tools/systemdependentdata.cxx
@@ -77,7 +77,7 @@ namespace basegfx
 if(0 == mnCalculatedCycles)
 {
 const sal_Int64 nBytes(estimateUsageInBytes());
-const sal_uInt32 nSeconds(getHoldCyclesInSeconds());
+const sal_uInt32 nSeconds = 60; // HoldCyclesInSeconds
 
 // default is Seconds (minimal is one)
 sal_uInt32 nResult(0 == nSeconds ? 1 : nSeconds);
@@ -115,12 +115,6 @@ namespace basegfx
 return mnCalculatedCycles;
 }
 
-sal_uInt32 SystemDependentData::getHoldCyclesInSeconds() const
-{
-// default implementation returns 60(s)
-return 60;
-}
-
 sal_Int64 SystemDependentData::estimateUsageInBytes() const
 {
 // default implementation has no idea
diff --git a/compilerplugins/clang/virtualdead.results 
b/compilerplugins/clang/virtualdead.results
index f7a6ff3dce54..70b36c5e14a9 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -31,12 +31,6 @@ Gui/qaccessible.h:613
 Gui/qaccessible.h:619
 void QAccessibleTableInterface::modelChange(class 
QAccessibleTableModelChangeEvent *,)
 empty
-include/basegfx/utils/systemdependentdata.hxx:122
-unsigned int basegfx::SystemDependentData::getHoldCyclesInSeconds()const
-60
-include/basegfx/utils/unopolypolygon.hxx:97
-void basegfx::unotools::UnoPolyPolygon::modifying()const
-empty
 include/canvas/base/bitmapcanvasbase.hxx:80
 unsigned char canvas::BitmapCanvasBase::hasAlpha()
 1
diff --git a/include/basegfx/utils/systemdependentdata.hxx 
b/include/basegfx/utils/systemdependentdata.hxx
index 32f02bea6fa2..f3befe06085f 100644
--- a/include/basegfx/utils/systemdependentdata.hxx
+++ b/include/basegfx/utils/systemdependentdata.hxx
@@ -115,12 +115,6 @@ namespace basegfx
 // mnCalculatedCycles
 sal_uInt32 calculateCombinedHoldCyclesInSeconds() const;
 
-// Number of cycles a SystemDependentDataManager should/might
-// hold this instance in seconds - does not have to be used,
-// but should be. Default implementation returns 60(s). Override to
-// offer useful data if you want to have better caching.
-virtual sal_uInt32 getHoldCyclesInSeconds() const;
-
 // Size estimation of the entry in bytes - does not have to
 // be used, but should be. Default returns zero what
 // means there is no size estimation available. Override to
commit ef98596d62304d64d89b04de04c2bebff76286a0
Author: Noel Grandin 
AuthorDate: Thu Sep 26 13:52:09 2019 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 28 17:56:49 2019 +0200

loplugin:virtualdead in chart2

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

diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx 
b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 2b6a98c61d02..eeebd989e5ed 100644

[Libreoffice-commits] online.git: 2 commits - kit/ChildSession.cpp loleaflet/css loleaflet/images loleaflet/src

[Szymon Kłos (via logerrit)]

 kit/ChildSession.cpp |5 +
 loleaflet/css/toolbar.css|1 
 loleaflet/images/lc_functiondialog.svg   |1 
 loleaflet/src/control/Control.Tabs.js|1 
 loleaflet/src/control/Control.Toolbar.js |2 
 loleaflet/src/control/Parts.js   |1 
 loleaflet/src/layer/tile/TileLayer.js|   83 +++
 loleaflet/src/unocommands.js |1 
 8 files changed, 92 insertions(+), 3 deletions(-)

New commits:
commit d712d97e3c7ac84352001405dc5f1fa9ac5a3630
Author: Szymon Kłos 
AuthorDate: Wed Oct 3 20:51:32 2018 +0200
Commit: Tamás Zolnai 
CommitDate: Sat Sep 28 16:42:19 2019 +0200

Draw reference marks for formulas

(cherry picked from commit fd1b3b2a744388309fbbbcb73b2060183780109e)

Change-Id: I3e361bd94cd6e0664e96494504064c2505c30774

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 1f4ea15a5..815a8c54d 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -2111,7 +2111,8 @@ void ChildSession::rememberEventsForInactiveUser(const 
int type, const std::stri
  type == LOK_CALLBACK_GRAPHIC_SELECTION ||
  type == LOK_CALLBACK_DOCUMENT_SIZE_CHANGED ||
  type == LOK_CALLBACK_INVALIDATE_HEADER ||
- type == LOK_CALLBACK_CELL_ADDRESS)
+ type == LOK_CALLBACK_CELL_ADDRESS ||
+ type == LOK_CALLBACK_REFERENCE_MARKS)
 {
 std::unique_lock lock(getLock());
 _stateRecorder.recordEvent(type, payload);
@@ -2400,7 +2401,7 @@ void ChildSession::loKitCallback(const int type, const 
std::string& payload)
 sendTextFrame("tableselected: " + payload);
 break;
 case LOK_CALLBACK_REFERENCE_MARKS:
-// TODO
+sendTextFrame("referencemarks: " + payload);
 break;
 case LOK_CALLBACK_JSDIALOG:
 sendTextFrame("jsdialog: " + payload);
diff --git a/loleaflet/src/control/Control.Tabs.js 
b/loleaflet/src/control/Control.Tabs.js
index 5855c584e..eac204c3b 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -165,6 +165,7 @@ L.Control.Tabs = L.Control.extend({
_setPart: function (e) {
var part =  e.target.id.match(/\d+/g)[0];
if (part !== null) {
+   this._map._docLayer._clearReferences();
this._map.setPart(parseInt(part), /*external:*/ false, 
/*calledFromSetPartHandler:*/ true);
}
}
diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index 95e5bc2a0..5acee51fb 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -19,6 +19,7 @@ L.Map.include({
}
else if (typeof (part) === 'number' && part >= 0 && part < 
docLayer._parts) {
docLayer._selectedPart = part;
+   docLayer._updateReferenceMarks();
}
else {
return;
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 08a8abafc..8a39c97b7 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -25,6 +25,24 @@ function hex2string(inData)
return hexified.join('');
 }
 
+function marksAreEqual(mark1, mark2)
+{
+   return mark1._bounds._northEast.lat == mark2._bounds._northEast.lat
+   && mark1._bounds._northEast.lng == mark2._bounds._northEast.lng
+   && mark1._bounds._southWest.lat == mark2._bounds._southWest.lat
+   && mark1._bounds._southWest.lng == mark2._bounds._southWest.lng;
+}
+
+function hasMark(collection, mark)
+{
+   for (var i = 0; i < collection.length; i++) {
+   if (marksAreEqual(mark, collection[i])) {
+   return true;
+   }
+   }
+   return false;
+}
+
 L.TileLayer = L.GridLayer.extend({
 
options: {
@@ -179,8 +197,10 @@ L.TileLayer = L.GridLayer.extend({
this._initContainer();
this._getToolbarCommandsValues();
this._selections = new L.LayerGroup();
+   this._references = new L.LayerGroup();
if (this.options.permission !== 'readonly') {
map.addLayer(this._selections);
+   map.addLayer(this._references);
}
 
// This layergroup contains all the layers corresponding to 
other's view
@@ -415,6 +435,12 @@ L.TileLayer = L.GridLayer.extend({
else if (textMsg.startsWith('cellformula:')) {
this._onCellFormulaMsg(textMsg);
}
+   else if (textMsg.startsWith('referencemarks:')) {
+   this._onReferencesMsg(textMsg);
+   }
+   else if (textMsg.startsWith('referenceclear:')) {
+   this._clearReferences();
+ 

Re: Calc and auto-corrupt (again)

[Terrence Enger]

On Mon, 2019-09-16 at 14:58 +0100, Wols Lists wrote:
> I guess this is something to do with the input
engine, but I had some
> fun with formulae yesterday,

Is there a reason why you are reporting this here instead of in
bugzilla ?  Do you need help
filing a bug report?

> On a different note in the same place, the formula tooltip was a pain in
> the neck - it placed itself half over the input box which is all very
> well if you're entering a new formula, but if you're trying to correct
> an existing formula, it's obscuring what you're trying to correct!

Is this something other than one of the nuisances implicit in using a
GUI?  Does the tooltip persist after you move the mouse cursor away?

This may be grounds for another bug report.

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

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 66e45a1ae861d50edf65fed9e39c9c9d5b15e0ac
Author: Olivier Hallot 
AuthorDate: Sat Sep 28 15:35:01 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Sep 28 15:42:13 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Mute l10n of standard attributes

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

diff --git a/helpcontent2 b/helpcontent2
index 4967952d329d..5b3e68e1ce0a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4967952d329d7c96e76d3b5dfe40003d3a8fe1a5
+Subproject commit 5b3e68e1ce0a3bc5893bb487c6d85ef4d3f9bfed
___
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/shared/02/01170101.xhp |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 5b3e68e1ce0a3bc5893bb487c6d85ef4d3f9bfed
Author: Olivier Hallot 
AuthorDate: Sat Sep 28 15:35:01 2019 +0200
Commit: Olivier Hallot 
CommitDate: Sat Sep 28 15:42:13 2019 +0200

Mute l10n of standard attributes

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

diff --git a/source/text/shared/02/01170101.xhp 
b/source/text/shared/02/01170101.xhp
index 790efdf7d..621370b99 100644
--- a/source/text/shared/02/01170101.xhp
+++ b/source/text/shared/02/01170101.xhp
@@ -289,7 +289,7 @@
   
   
 
-  L
+  L
 
 
   A 
text constant. This position cannot be edited. The character is displayed at 
the corresponding position of the Literal Mask.
@@ -297,7 +297,7 @@
   
   
 
-  a
+  a
 
 
   The 
characters a-z and A-Z can be entered. Capital 
characters are not converted to lowercase characters.
@@ -305,7 +305,7 @@
   
   
 
-  A
+  A
 
 
   The 
characters A-Z can be entered. If a lowercase letter is entered, 
it is automatically converted to a capital letter.
@@ -313,7 +313,7 @@
   
   
 
-  c
+  c
 
 
   The 
characters a-z, A-Z, and 0-9 can be 
entered. Capital characters are not converted to lowercase 
characters.
@@ -321,7 +321,7 @@
   
   
 
-  C
+  C
 
 
   The 
characters A-Z and 0-9 can be entered. If a lowercase 
letter is entered, it is automatically converted to a capital 
letter.
@@ -329,7 +329,7 @@
   
   
 
-  N
+  N
 
 
   Only 
the characters 0-9 can be entered.
@@ -337,7 +337,7 @@
   
   
 
-  x
+  x
 
 
   All 
printable characters can be entered.
@@ -345,7 +345,7 @@
   
   
 
-  X
+  X
 
 
   All 
printable characters can be entered. If a lowercase letter is entered, it is 
automatically converted to a capital letter.
@@ -376,7 +376,7 @@
   
   
 
-  _blank
+  _blank
 
 
   The next 
document is created in a new empty frame.
@@ -384,7 +384,7 @@
   
   
 
-  _parent
+  _parent
 
 
   The next 
document is created in a parent frame. If no parent exists, the document is 
created in the same frame.
@@ -392,7 +392,7 @@
   
   
 
-  _self
+  _self
 
 
   The next 
document is created in the same frame.
@@ -400,7 +400,7 @@
   
   
 
-  _top
+  _top
 
 
   The next 
document is created in a top-level window, that is, in the highest frame of the 
hierarchy; if the current frame is already a top window, the document is 
created in the current frame.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 24d81a3a2a586c41e126447716152d26b8586fa2
Author: Olivier Hallot 
AuthorDate: Sat Sep 28 14:01:22 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Sep 28 15:18:14 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Improve readability of events Help page.

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

diff --git a/helpcontent2 b/helpcontent2
index e420ffe1b6e0..4967952d329d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e420ffe1b6e0909a7303881b6a9ab6c0073663ee
+Subproject commit 4967952d329d7c96e76d3b5dfe40003d3a8fe1a5
___
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/shared/02/01170202.xhp |   14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 4967952d329d7c96e76d3b5dfe40003d3a8fe1a5
Author: Olivier Hallot 
AuthorDate: Sat Sep 28 14:01:22 2019 +0200
Commit: Olivier Hallot 
CommitDate: Sat Sep 28 15:18:14 2019 +0200

Improve readability of events Help page.

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

diff --git a/source/text/shared/02/01170202.xhp 
b/source/text/shared/02/01170202.xhp
index 061720b42..998a2c523 100644
--- a/source/text/shared/02/01170202.xhp
+++ b/source/text/shared/02/01170202.xhp
@@ -43,18 +43,12 @@
  
 Displaying an error message,
  
-  
-  
  
 Confirming a delete process (for data records),
  
-  
-  
  
 Querying parameters,
  
-  
-  
  
 Checking input when saving a data record.
  
@@ -66,13 +60,13 @@
 
 
  Before update
- The Before update event occurs before the 
control content changed by the user is written into the data source. 
The linked macro can, for example, prevent this action by returning 
"FALSE".
+ The Before update event occurs 
before the control content changed by the user is written into the data 
source. The linked macro can, for example, prevent this action by 
returning "FALSE".
 
 After 
update
- The After update event occurs after the control 
content changed by the user has been written into the data 
source.
+ The After update event occurs 
after the control content changed by the user has been written into the data 
source.
 
 Prior 
to reset
- The Prior to reset event occurs 
before a form is reset. The linked macro can, for example, prevent this 
action by returning "FALSE".
+ The Prior to reset event occurs 
before a form is reset. The linked macro can, for example, prevent this 
action by returning "FALSE".
  A 
form is reset if one of the following conditions is met:
  
 
@@ -145,7 +139,7 @@
 
 Fill 
parameters
  The Fill parameters event occurs 
when the form to be loaded has parameters that must be filled out. For 
example, the data source of the form can be the following SQL 
command:
- SELECT * FROM address WHERE name=:name
+ SELECT * FROM address WHERE 
name=:name
  Here 
:name is a parameter that must be filled out when loading. The parameter is 
automatically filled out from the parent form if possible. If the parameter 
cannot be filled out, this event is called and a linked macro can fill out the 
parameter.
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Arkadiy Illarionov (via logerrit)]

 vcl/unx/gtk/gloactiongroup.cxx |   13 ++---
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit efc1d001821747dc72140aeb3e0f0b48b1eed005
Author: Arkadiy Illarionov 
AuthorDate: Fri Sep 27 00:25:57 2019 +0300
Commit: Arkadiy Illarionov 
CommitDate: Sat Sep 28 14:23:53 2019 +0200

Use G_ADD_PRIVATE and *_get_instance_private

G_TYPE_INSTANCE_GET_PRIVATE and g_type_class_add_private are deprecated

Change-Id: Id2a03e1ddc523d088682fd29f6b9d4e25f0cd4a2
Reviewed-on: https://gerrit.libreoffice.org/79663
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov 

diff --git a/vcl/unx/gtk/gloactiongroup.cxx b/vcl/unx/gtk/gloactiongroup.cxx
index 73a432769a08..56782e2cd46f 100644
--- a/vcl/unx/gtk/gloactiongroup.cxx
+++ b/vcl/unx/gtk/gloactiongroup.cxx
@@ -112,6 +112,7 @@ static void g_lo_action_group_iface_init 
(GActionGroupInterface *);
 #endif
 G_DEFINE_TYPE_WITH_CODE (GLOActionGroup,
 g_lo_action_group, G_TYPE_OBJECT,
+G_ADD_PRIVATE(GLOActionGroup)
 G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_GROUP,
g_lo_action_group_iface_init));
 #ifdef __GNUC__
@@ -314,9 +315,7 @@ static void
 g_lo_action_group_init (GLOActionGroup *group)
 {
 SAL_INFO("vcl.unity", "g_lo_action_group_init on " << group);
-group->priv = G_TYPE_INSTANCE_GET_PRIVATE (group,
- G_TYPE_LO_ACTION_GROUP,
- GLOActionGroupPrivate);
+group->priv = static_cast(g_lo_action_group_get_instance_private (group));
 group->priv->table = g_hash_table_new_full (g_str_hash, g_str_equal,
   g_free, g_object_unref);
 }
@@ -327,14 +326,6 @@ g_lo_action_group_class_init (GLOActionGroupClass *klass)
 GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
 object_class->finalize = g_lo_action_group_finalize;
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-g_type_class_add_private (klass, sizeof (GLOActionGroupPrivate));
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
 }
 
 static void
___
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' - sd/source

[Regina Henschel (via logerrit)]

 sd/source/ui/unoidl/unolayer.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit a955330e052cc12c622982f38c5f5d138484013a
Author: Regina Henschel 
AuthorDate: Fri Sep 27 14:12:39 2019 +0200
Commit: Xisco Faulí 
CommitDate: Sat Sep 28 14:22:30 2019 +0200

tdf#125585 write default layer status for OLE objects

The layer status is taken from the active view, when saving the
document. But embedded documents have no view. Error was, that for
all layers value 'false' was written in that case. With this patch
the defaults (visible, printable, not locked) (true, true, false)
are written.

Change-Id: I2388ce31cc208fba075083889ec1bb2f874ef482
Reviewed-on: https://gerrit.libreoffice.org/79701
Tested-by: Jenkins
Reviewed-by: Regina Henschel 
(cherry picked from commit 12f9a9f341fd8f8a98f7cd98f296a8729d279e0d)
Reviewed-on: https://gerrit.libreoffice.org/79785
Reviewed-by: Xisco Faulí 

diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index d1750c7eaca8..a7a4f46a9823 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -264,6 +264,15 @@ bool SdLayer::get( LayerAttribute what ) throw()
 case LOCKED:return 
pFrameView->GetLockedLayers().IsSet(pLayer->GetID());
 }
 }
+
+// no view at all, e.g. Draw embedded as OLE in text document, ODF 
default values
+switch(what)
+{
+case VISIBLE:   return true;
+case PRINTABLE: return true;
+case LOCKED:return false;
+}
+
 }
 return false; //TODO: uno::Exception?
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 writerfilter/source/dmapper/BorderHandler.hxx |2 
 writerfilter/source/dmapper/CellColorHandler.cxx  |2 
 writerfilter/source/dmapper/CellColorHandler.hxx  |2 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   14 ++--
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |   62 +-
 writerfilter/source/dmapper/GraphicHelpers.cxx|2 
 writerfilter/source/dmapper/GraphicHelpers.hxx|2 
 writerfilter/source/dmapper/GraphicImport.cxx |2 
 writerfilter/source/dmapper/GraphicImport.hxx |2 
 writerfilter/source/dmapper/NumberingManager.cxx  |2 
 writerfilter/source/dmapper/NumberingManager.hxx  |   20 ++---
 writerfilter/source/dmapper/OLEHandler.hxx|4 -
 writerfilter/source/dmapper/PropertyMap.cxx   |4 -
 writerfilter/source/dmapper/PropertyMap.hxx   |   12 +--
 writerfilter/source/dmapper/SdtHelper.cxx |4 -
 writerfilter/source/dmapper/SdtHelper.hxx |8 +-
 writerfilter/source/dmapper/StyleSheetTable.cxx   |   10 +-
 writerfilter/source/dmapper/StyleSheetTable.hxx   |8 +-
 writerfilter/source/dmapper/TableData.hxx |   14 ++--
 writerfilter/source/dmapper/TableManager.hxx  |   14 ++--
 writerfilter/source/dmapper/TablePositionHandler.hxx  |   20 ++---
 writerfilter/source/dmapper/TblStylePrHandler.cxx |2 
 writerfilter/source/dmapper/TblStylePrHandler.hxx |6 -
 writerfilter/source/dmapper/TextEffectsHandler.hxx|2 
 writerfilter/source/dmapper/WrapPolygonHandler.hxx|2 
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx   |2 
 writerfilter/source/ooxml/OOXMLDocumentImpl.hxx   |6 -
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |4 -
 writerfilter/source/rtftok/rtfdocumentimpl.hxx|4 -
 writerfilter/source/rtftok/rtflookahead.hxx   |4 -
 writerfilter/source/rtftok/rtfsdrimport.hxx   |4 -
 writerfilter/source/rtftok/rtftokenizer.hxx   |2 
 32 files changed, 124 insertions(+), 124 deletions(-)

New commits:
commit 7a1bf5c10deb5f9d2e5b282dac9493d84aede659
Author: Noel Grandin 
AuthorDate: Sat Sep 28 10:33:20 2019 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 28 13:47:45 2019 +0200

loplugin:constmethod in writerfilter

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

diff --git a/writerfilter/source/dmapper/BorderHandler.hxx 
b/writerfilter/source/dmapper/BorderHandler.hxx
index b986b2ed997a..230cae5dcac3 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -71,7 +71,7 @@ public:
 PropertyMapPtr  getProperties();
 css::table::BorderLine2 getBorderLine();
 sal_Int32   getLineDistance() const { 
return m_nLineDistance;}
-boolgetShadow() { return 
m_bShadow;}
+boolgetShadow() const { return 
m_bShadow;}
 void enableInteropGrabBag(const OUString& aName);
 css::beans::PropertyValue getInteropGrabBag(const OUString& aName = 
OUString());
 };
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx 
b/writerfilter/source/dmapper/CellColorHandler.cxx
index 41248036ae40..b5889742c29a 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -324,7 +324,7 @@ void CellColorHandler::disableInteropGrabBag()
 m_aInteropGrabBag.clear();
 }
 
-bool CellColorHandler::isInteropGrabBagEnabled()
+bool CellColorHandler::isInteropGrabBagEnabled() const
 {
 return !(m_aInteropGrabBagName.isEmpty());
 }
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx 
b/writerfilter/source/dmapper/CellColorHandler.hxx
index 8e77c1c080be..3c98b8368b2c 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -62,7 +62,7 @@ public:
 void enableInteropGrabBag(const OUString& aName);
 css::beans::PropertyValue getInteropGrabBag();
 void disableInteropGrabBag();
-bool isInteropGrabBagEnabled();
+bool isInteropGrabBagEnabled() const;
 };
 }}
 
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f8d67f0710c1..ec8728122337 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -508,7 +508,7 @@ void DomainMapper_Impl::SetIsFirstParagraphInSection( bool 
bIsFirst )
 m_bIsFirstParaInSection = bIsFirst;
 }
 
-bool DomainMapper_Impl::GetIsFirstParagraphInSection()
+bool DomainMapper_Impl::GetIsFirstParagraphInSection() const
 {
 // Anchored objects may include multiple paragraphs,
 // and none of them should be

[Libreoffice-commits] core.git: 2 commits - include/vcl sdext/source slideshow/source starmath/inc starmath/source vcl/inc vcl/qt5 vcl/source

[Noel Grandin (via logerrit)]

 include/vcl/wizardmachine.hxx  |2 +-
 sdext/source/minimizer/optimizerdialog.hxx |2 +-
 sdext/source/pdfimport/inc/pdfiprocessor.hxx   |4 ++--
 sdext/source/pdfimport/tree/pdfiprocessor.cxx  |2 +-
 sdext/source/presenter/PresenterScrollBar.hxx  |2 +-
 sdext/source/presenter/PresenterTextView.cxx   |4 ++--
 sdext/source/presenter/PresenterTextView.hxx   |4 ++--
 slideshow/source/engine/shapes/shapeimporter.cxx   |2 +-
 slideshow/source/engine/slide/userpaintoverlay.cxx |4 ++--
 slideshow/source/engine/slide/userpaintoverlay.hxx |2 +-
 slideshow/source/engine/slidebitmap.cxx|2 +-
 slideshow/source/inc/shapeimporter.hxx |4 ++--
 slideshow/source/inc/slidebitmap.hxx   |2 +-
 starmath/inc/cursor.hxx|2 +-
 starmath/inc/document.hxx  |8 
 starmath/inc/visitors.hxx  |2 +-
 starmath/source/cursor.cxx |4 ++--
 starmath/source/document.cxx   |2 +-
 starmath/source/mathmlexport.hxx   |2 +-
 starmath/source/mathmlimport.hxx   |4 ++--
 vcl/inc/TypeSerializer.hxx |2 +-
 vcl/inc/bitmap/Octree.hxx  |2 +-
 vcl/inc/qt5/Qt5FilePicker.hxx  |2 +-
 vcl/inc/qt5/Qt5Menu.hxx|4 ++--
 vcl/inc/qt5/Qt5Widget.hxx  |   10 +-
 vcl/qt5/Qt5FilePicker.cxx  |2 +-
 vcl/qt5/Qt5Menu.cxx|2 +-
 vcl/qt5/Qt5Widget.cxx  |2 +-
 vcl/source/bitmap/Octree.cxx   |2 +-
 vcl/source/control/wizardmachine.cxx   |2 +-
 vcl/source/gdi/TypeSerializer.cxx  |2 +-
 31 files changed, 46 insertions(+), 46 deletions(-)

New commits:
commit 1141b6b0ce6581b587e174c9bbdddb88d36ea8c2
Author: Noel Grandin 
AuthorDate: Sat Sep 28 10:32:30 2019 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 28 13:47:35 2019 +0200

loplugin:constmethod in vcl

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

diff --git a/include/vcl/wizardmachine.hxx b/include/vcl/wizardmachine.hxx
index 8b37a5d10ac2..cbe4b40b4202 100644
--- a/include/vcl/wizardmachine.hxx
+++ b/include/vcl/wizardmachine.hxx
@@ -147,7 +147,7 @@ namespace vcl
 bool ShowPrevPage();
 
 voidAddPage( std::unique_ptr xPage );
-voidRemovePage( BuilderPage* pPage );
+voidRemovePage( const BuilderPage* pPage );
 voidSetPage( WizardTypes::WizardState nLevel, 
std::unique_ptr xPage );
 BuilderPage*GetPage( WizardTypes::WizardState eState ) const;
 
diff --git a/vcl/inc/TypeSerializer.hxx b/vcl/inc/TypeSerializer.hxx
index 99d4609d5d2a..45f7219300d6 100644
--- a/vcl/inc/TypeSerializer.hxx
+++ b/vcl/inc/TypeSerializer.hxx
@@ -30,7 +30,7 @@ public:
 TypeSerializer(SvStream& rStream);
 
 void readGradient(Gradient& rGradient);
-void writeGradient(Gradient& rGradient);
+void writeGradient(const Gradient& rGradient);
 };
 
 #endif
diff --git a/vcl/inc/bitmap/Octree.hxx b/vcl/inc/bitmap/Octree.hxx
index 0bc060d450d9..86a911fa4adf 100644
--- a/vcl/inc/bitmap/Octree.hxx
+++ b/vcl/inc/bitmap/Octree.hxx
@@ -41,7 +41,7 @@ class VCL_PLUGIN_PUBLIC Octree
 {
 private:
 void CreatePalette(OctreeNode* pNode);
-void GetPalIndex(OctreeNode* pNode);
+void GetPalIndex(const OctreeNode* pNode);
 
 SAL_DLLPRIVATE void add(std::unique_ptr& rpNode);
 SAL_DLLPRIVATE void reduce();
diff --git a/vcl/inc/qt5/Qt5FilePicker.hxx b/vcl/inc/qt5/Qt5FilePicker.hxx
index d4e74b92ba15..35ca687f8dcb 100644
--- a/vcl/inc/qt5/Qt5FilePicker.hxx
+++ b/vcl/inc/qt5/Qt5FilePicker.hxx
@@ -155,7 +155,7 @@ public:
 virtual void SAL_CALL setDescription(const OUString& rDescription) 
override;
 
 protected:
-static css::uno::Any handleGetListValue(QComboBox* pWidget, sal_Int16 
nControlAction);
+static css::uno::Any handleGetListValue(const QComboBox* pWidget, 
sal_Int16 nControlAction);
 static void handleSetListValue(QComboBox* pQComboBox, sal_Int16 nAction,
const css::uno::Any& rValue);
 virtual void addCustomControl(sal_Int16 controlId);
diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index cf60ee2c0bb7..efcfb8eeb81c 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -45,7 +45,7 @@ private:
 
 void ReinitializeActionGroup(unsigned nPos);
 void ResetAllActionGroups();
-void UpdateActionGroupItem(Qt5MenuItem* pSalMenuItem);
+void UpdateActionGroupItem(const Qt5MenuItem* pSalMenuItem)

[Libreoffice-commits] core.git: 2 commits - basctl/source compilerplugins/clang dbaccess/source

[Noel Grandin (via logerrit)]

 basctl/source/basicide/baside2.cxx   |5 -
 basctl/source/basicide/baside2.hxx   |1 -
 basctl/source/basicide/basides1.cxx  |   14 --
 basctl/source/basicide/basidesh.cxx  |   20 ++--
 basctl/source/basicide/bastypes.cxx  |5 -
 basctl/source/inc/bastypes.hxx   |1 -
 compilerplugins/clang/virtualdead.results|6 --
 dbaccess/source/ui/inc/IUpdateHelper.hxx |1 -
 dbaccess/source/ui/misc/HtmlReader.cxx   |   14 +-
 dbaccess/source/ui/misc/RtfReader.cxx|   14 --
 dbaccess/source/ui/misc/UpdateHelperImpl.hxx |3 ---
 11 files changed, 3 insertions(+), 81 deletions(-)

New commits:
commit c1e31ee0433232104c73cfa56e24e056833213dc
Author: Noel Grandin 
AuthorDate: Thu Sep 26 13:47:08 2019 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 28 13:46:26 2019 +0200

loplugin:virtualdead in dbaccess

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

diff --git a/compilerplugins/clang/virtualdead.results 
b/compilerplugins/clang/virtualdead.results
index 3b6f2193714c..119fde6bb849 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -13,9 +13,6 @@ 
chart2/source/controller/dialogs/ChartTypeDialogController.hxx:99
 chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx:30
 void 
chart::sidebar::ChartSidebarSelectionListenerParent::SelectionInvalid()
 empty
-dbaccess/source/ui/inc/IUpdateHelper.hxx:38
-void dbaui::IUpdateHelper::moveToInsertRow()
-empty
 desktop/source/deployment/registry/inc/dp_backenddb.hxx:119
 class rtl::OUString dp_registry::backend::BackendDb::getDbNSName()
 "http://openoffi
diff --git a/dbaccess/source/ui/inc/IUpdateHelper.hxx 
b/dbaccess/source/ui/inc/IUpdateHelper.hxx
index 93491a2989d6..975eef75c442 100644
--- a/dbaccess/source/ui/inc/IUpdateHelper.hxx
+++ b/dbaccess/source/ui/inc/IUpdateHelper.hxx
@@ -35,7 +35,6 @@ namespace dbaui
 virtual void updateDate(sal_Int32 _nPos,const css::util::Date& 
_nValue) = 0;
 virtual void updateTime(sal_Int32 _nPos,const css::util::Time& 
_nValue) = 0;
 virtual void updateTimestamp(sal_Int32 _nPos,const 
css::util::DateTime& _nValue) = 0;
-virtual void moveToInsertRow() = 0;
 virtual void insertRow() = 0;
 
 protected:
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx 
b/dbaccess/source/ui/misc/HtmlReader.cxx
index 3dc3c38b558b..310361483932 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -156,19 +156,7 @@ void OHTMLReader::NextToken( HtmlTokenId nToken )
 }
 break;
 case HtmlTokenId::TABLEROW_ON:
-if ( m_pUpdateHelper.get() )
-{
-try
-{
-m_pUpdateHelper->moveToInsertRow(); // otherwise 
append new line
-}
-catch(SQLException& e)
-// handling update failure
-{
-showErrorDialog(e);
-}
-}
-else
+if ( !m_pUpdateHelper.get() )
 m_bError = true;
 break;
 case HtmlTokenId::TEXTTOKEN:
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx 
b/dbaccess/source/ui/misc/RtfReader.cxx
index 1d71e1b81c78..aaae01c33a96 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -134,31 +134,17 @@ void ORTFReader::NextToken( int nToken )
 
 case RTF_TROWD:
 {
-bool bInsertRow = true;
 if ( !m_xTable.is() ) // use first line as header
 {
 sal_uInt64 const nTell = rInput.Tell(); // perhaps 
alters position of the stream
 
 m_bError = !CreateTable(nToken);
-bInsertRow = m_bAppendFirstLine;
 if ( m_bAppendFirstLine )
 {
 rInput.Seek(nTell);
 rInput.ResetError();
 }
 }
-if ( bInsertRow && !m_bError)
-{
-try
-{
-m_pUpdateHelper->moveToInsertRow(); // otherwise 
append new line
-}
-catch(SQLException& e)
-// handling update failure
-{
-showErrorDialog(e);
-}
-}
 }
 break;
 case RTF_INTBL:
diff --git a/dbac

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

[Julien Nabet (via logerrit)]

 vcl/unx/gtk3_kde5/kde5_filepicker.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit f453d2b0c7f27211d9c9061aa5c522cda37e37c6
Author: Julien Nabet 
AuthorDate: Sat Sep 28 10:19:25 2019 +0200
Commit: Julien Nabet 
CommitDate: Sat Sep 28 12:57:08 2019 +0200

"KWINDOWSYSTEM_DEPRECATED static void setMainWindow" (take 2)

/home/julien/lo/libreoffice/vcl/unx/gtk3_kde5/kde5_filepicker.cxx: In 
member function ‘virtual bool KDE5FilePicker::eventFilter(QObject*, QEvent*)’:
/home/julien/lo/libreoffice/vcl/unx/gtk3_kde5/kde5_filepicker.cxx:271:51: 
error: ‘static void KWindowSystem::setMainWindow(QWidget*, WId)’ is deprecated 
[-Werror=deprecated-declarations]
  271 | KWindowSystem::setMainWindow(w, _winId);
  |   ^
In file included from /usr/include/KF5/KWindowSystem/KWindowSystem:1,
 from 
/home/julien/lo/libreoffice/vcl/unx/gtk3_kde5/kde5_filepicker.cxx:24:
/usr/include/KF5/KWindowSystem/kwindowsystem.h:255:42: note: declared here
  255 | KWINDOWSYSTEM_DEPRECATED static void setMainWindow(QWidget 
*subwindow, WId mainwindow);
  |  ^

There's a new method we could use but it's only possible when baseline will 
include kwindowsystem >= 5.62

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

diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx 
b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
index a3c2ecf63483..4fba409eb615 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
@@ -268,7 +268,14 @@ bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e)
 auto* w = static_cast(o);
 if (!w->parentWidget() && w->isModal())
 {
+/*
+ To replace when baseline will include kwindowsystem >= 5.62 with:
+ w->setAttribute(Qt::WA_NativeWindow, true);
+ KWindowSystem::setMainWindow(w->windowHandle(), _winId);
+*/
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 KWindowSystem::setMainWindow(w, _winId);
+SAL_WNODEPRECATED_DECLARATIONS_POP
 if (auto* fileWidget = w->findChild({}, 
Qt::FindDirectChildrenOnly))
 {
 fileWidget->setCustomWidget(_extraControls);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: kit/ChildSession.cpp kit/Kit.cpp test/UnitPrefork.cpp

[DarkByt31 (via logerrit)]

 kit/ChildSession.cpp |   17 +++--
 kit/Kit.cpp  |   22 ++
 test/UnitPrefork.cpp |7 ---
 3 files changed, 29 insertions(+), 17 deletions(-)

New commits:
commit ef90709ad1cb6c8cbb649425d0f0c539bbd5f83f
Author: DarkByt31 
AuthorDate: Sun Sep 15 07:34:06 2019 +0530
Commit: Michael Meeks 
CommitDate: Sat Sep 28 12:51:18 2019 +0200

tdf#107038 Poco::Timestamp replacement with std::chrono

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

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index b201e4d34..1f4ea15a5 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -46,7 +46,6 @@
 using Poco::JSON::Object;
 using Poco::JSON::Parser;
 using Poco::StringTokenizer;
-using Poco::Timestamp;
 using Poco::URI;
 
 using namespace LOOLProtocol;
@@ -662,7 +661,7 @@ bool ChildSession::sendFontRendering(const char* 
/*buffer*/, int /*length*/, con
 output.resize(response.size());
 std::memcpy(output.data(), response.data(), response.size());
 
-Timestamp timestamp;
+const auto start = std::chrono::system_clock::now();
 // renderFont use a default font size (25) when width and height are 0
 int width = 0, height = 0;
 unsigned char* ptrFont = nullptr;
@@ -671,7 +670,9 @@ bool ChildSession::sendFontRendering(const char* 
/*buffer*/, int /*length*/, con
 
 ptrFont = getLOKitDocument()->renderFont(decodedFont.c_str(), 
decodedChar.c_str(), &width, &height);
 
-LOG_TRC("renderFont [" << font << "] rendered in " << 
(timestamp.elapsed()/1000.) << "ms");
+const auto duration = std::chrono::system_clock::now() - start;
+const auto elapsed = 
std::chrono::duration_cast(duration).count();
+LOG_TRC("renderFont [" << font << "] rendered in " << elapsed << "ms");
 
 if (!ptrFont)
 {
@@ -1457,14 +1458,18 @@ bool ChildSession::renderWindow(const char* /*buffer*/, 
int /*length*/, const st
 std::vector pixmap(pixmapDataSize);
 int width = bufferWidth, height = bufferHeight;
 std::string response;
-Timestamp timestamp;
+const auto start = std::chrono::system_clock::now();
 getLOKitDocument()->paintWindow(winId, pixmap.data(), startX, startY, 
width, height, dpiScale);
 const double area = width * height;
+
+const auto duration = std::chrono::system_clock::now() - start;
+const auto elapsed = 
std::chrono::duration_cast(duration).count();
+const double totalTime = elapsed/1000.;
 LOG_TRC("paintWindow for " << winId << " returned " << width << "X" << 
height
 << "@(" << startX << "," << startY << ")"
 << " with dpi scale: " << dpiScale
-<< " and rendered in " << (timestamp.elapsed()/1000.)
-<< "ms (" << area / (timestamp.elapsed()) << " MP/s).");
+<< " and rendered in " << totalTime
+<< "ms (" << area / elapsed << " MP/s).");
 
 response = "windowpaint: id=" + tokens[1] +
 " width=" + std::to_string(width) + " height=" + 
std::to_string(height);
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index b2a4a8b23..0dd75ff7b 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -97,7 +97,6 @@ using Poco::JSON::Object;
 using Poco::JSON::Parser;
 using Poco::StringTokenizer;
 using Poco::Thread;
-using Poco::Timestamp;
 using Poco::URI;
 using Poco::Util::Application;
 
@@ -1119,17 +1118,19 @@ public:
 
 // Render the whole area
 const double area = pixmapWidth * pixmapHeight;
-Timestamp timestamp;
+auto start = std::chrono::system_clock::now();
 LOG_TRC("Calling paintPartTile(" << (void*)pixmap.data() << ")");
 _loKitDocument->paintPartTile(pixmap.data(),
   tileCombined.getPart(),
   pixmapWidth, pixmapHeight,
   renderArea.getLeft(), 
renderArea.getTop(),
   renderArea.getWidth(), 
renderArea.getHeight());
-Timestamp::TimeDiff elapsed = timestamp.elapsed();
+auto duration = std::chrono::system_clock::now() - start;
+auto elapsed = 
std::chrono::duration_cast(duration).count();
+double totalTime = elapsed/1000.;
 LOG_DBG("paintTile (combined) at (" << renderArea.getLeft() << ", " << 
renderArea.getTop() << "), (" <<
 renderArea.getWidth() << ", " << renderArea.getHeight() << ") 
" <<
-" rendered in " << (elapsed/1000.) << " ms (" << area / 
elapsed << " MP/s).");
+" rendered in " << totalTime << " ms (" << area / elapsed << " 
MP/s).");
 const auto mode = 
static_cast(_loKitDocument->getTileMode());
 
 std::vector output;
@@ -1267,10 +1268,12 @@ public:
 
 _pngCache.balanceCache();
 
-elapsed = timestamp.elapsed();
+duration = std::chrono::system_clock::now() - star

[Libreoffice-commits] online.git: common/Util.cpp common/Util.hpp test/UnitWOPITemplate.cpp test/WhiteBoxTests.cpp test/WopiTestServer.hpp

[DarkByt31 (via logerrit)]

 common/Util.cpp   |   10 ++
 common/Util.hpp   |3 +++
 test/UnitWOPITemplate.cpp |6 +++---
 test/WhiteBoxTests.cpp|6 ++
 test/WopiTestServer.hpp   |   20 +---
 5 files changed, 31 insertions(+), 14 deletions(-)

New commits:
commit dd014e7029628dd95d2026bcb4fe4a66d75785aa
Author: DarkByt31 
AuthorDate: Fri Sep 27 22:26:16 2019 +0530
Commit: Michael Meeks 
CommitDate: Sat Sep 28 12:26:32 2019 +0200

tdf#107038 Poco::Timestamp replacement with std::chrono

Util added getHttpTime
WhiteBoxTests added test for getHttpTime

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

diff --git a/common/Util.cpp b/common/Util.cpp
index 4433fe6d2..4fc35f370 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -784,6 +784,16 @@ namespace Util
 return time_now;
 }
 
+std::string getHttpTime(std::chrono::system_clock::time_point time)
+{
+char http_time[64];
+std::time_t time_c = std::chrono::system_clock::to_time_t(time);
+std::tm time_tm = *std::gmtime(&time_c);
+strftime(http_time, sizeof(http_time), "%a, %d %b %Y %T", &time_tm);
+
+return http_time;
+}
+
 size_t findInVector(const std::vector& tokens, const char *cstring)
 {
 assert(cstring);
diff --git a/common/Util.hpp b/common/Util.hpp
index c1f799941..6c97eceb1 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -926,6 +926,9 @@ int main(int argc, char**argv)
  Return current time in HTTP format.
 std::string getHttpTimeNow();
 
+ Return time in HTTP format.
+std::string getHttpTime(std::chrono::system_clock::time_point time);
+
  Return timestamp of file
 std::chrono::system_clock::time_point getFileTimestamp(std::string 
str_path);
 
diff --git a/test/UnitWOPITemplate.cpp b/test/UnitWOPITemplate.cpp
index 9416ea3cc..d133178ec 100644
--- a/test/UnitWOPITemplate.cpp
+++ b/test/UnitWOPITemplate.cpp
@@ -54,7 +54,7 @@ public:
 fileInfo->set("UserFriendlyName", "test");
 fileInfo->set("UserCanWrite", "true");
 fileInfo->set("PostMessageOrigin", "localhost");
-fileInfo->set("LastModifiedTime", 
Poco::DateTimeFormatter::format(Poco::DateTime(getFileLastModifiedTime()), 
Poco::DateTimeFormat::ISO8601_FRAC_FORMAT));
+fileInfo->set("LastModifiedTime", 
Util::getIso8601FracformatTime(getFileLastModifiedTime()));
 fileInfo->set("EnableOwnerTermination", "true");
 
 std::ostringstream jsonStream;
@@ -65,7 +65,7 @@ public:
 
 std::ostringstream oss;
 oss << "HTTP/1.1 200 OK\r\n"
-<< "Last-Modified: " << 
Poco::DateTimeFormatter::format(getFileLastModifiedTime(), 
Poco::DateTimeFormat::HTTP_FORMAT) << "\r\n"
+<< "Last-Modified: " << 
Util::getHttpTime(getFileLastModifiedTime()) << "\r\n"
 << "User-Agent: " << WOPI_AGENT_STRING << "\r\n"
 << "Content-Length: " << responseString.size() << "\r\n"
 << "Content-Type: " << mimeType << "\r\n"
@@ -113,7 +113,7 @@ public:
 oss << "HTTP/1.1 200 OK\r\n"
 << "User-Agent: " << WOPI_AGENT_STRING << "\r\n"
 << "\r\n"
-<< "{\"LastModifiedTime\": \"" << 
Poco::DateTimeFormatter::format(getFileLastModifiedTime(), 
Poco::DateTimeFormat::ISO8601_FRAC_FORMAT) << "\" }";
+<< "{\"LastModifiedTime\": \"" << 
Util::getHttpTime(getFileLastModifiedTime()) << "\" }";
 
 socket->send(oss.str());
 socket->shutdown();
diff --git a/test/WhiteBoxTests.cpp b/test/WhiteBoxTests.cpp
index e3a6d52a8..6bb74f677 100644
--- a/test/WhiteBoxTests.cpp
+++ b/test/WhiteBoxTests.cpp
@@ -762,6 +762,12 @@ void WhiteBoxTests::testTime()
 oss.str(std::string());
 oss << t.time_since_epoch().count();
 CPPUNIT_ASSERT_EQUAL(first, oss.str());
+
+t = std::chrono::system_clock::time_point();
+CPPUNIT_ASSERT_EQUAL(std::string("Thu, 01 Jan 1970 00:00:00"), 
Util::getHttpTime(t));
+
+t = 
std::chrono::system_clock::time_point(std::chrono::nanoseconds(1569592993495336798));
+CPPUNIT_ASSERT_EQUAL(std::string("Fri, 27 Sep 2019 14:03:13"), 
Util::getHttpTime(t));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(WhiteBoxTests);
diff --git a/test/WopiTestServer.hpp b/test/WopiTestServer.hpp
index bdeecd96d..0845ba1a9 100644
--- a/test/WopiTestServer.hpp
+++ b/test/WopiTestServer.hpp
@@ -41,7 +41,7 @@ private:
 std::string _fileContent;
 
 /// Last modified time of the file
-Poco::Timestamp _fileLastModifiedTime;
+std::chrono::system_clock::time_point _fileLastModifiedTime;
 
 protected:
 const std::string& getWopiSrc() const { return _wopiSrc; }
@@ -54,10 +54,10 @@ protected:
 void setFileContent(const std::string& fileContent)
 {
 _fi

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

[Noel Grandin (via logerrit)]

 ucb/source/cacher/cachedcontentresultset.cxx |4 ++--
 ucb/source/cacher/cachedcontentresultset.hxx |4 ++--
 ucb/source/ucp/file/filinpstr.hxx|2 +-
 ucb/source/ucp/file/filrset.hxx  |2 +-
 ucb/source/ucp/file/filstr.hxx   |2 +-
 ucb/source/ucp/file/filtask.hxx  |6 +++---
 ucb/source/ucp/ftp/ftpdirp.hxx   |2 +-
 ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx |2 +-
 ucb/source/ucp/webdav-neon/NeonSession.hxx   |2 +-
 ucb/source/ucp/webdav-neon/PropfindCache.hxx |2 +-
 unoxml/source/dom/documentbuilder.hxx|2 +-
 unoxml/source/rdf/librdf_repository.cxx  |2 +-
 uui/source/iahndl.cxx|2 +-
 uui/source/iahndl.hxx|4 ++--
 14 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 08519ce8265b9b785f369623e1d6ad396c36d349
Author: Noel Grandin 
AuthorDate: Sat Sep 28 10:31:41 2019 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 28 11:30:49 2019 +0200

loplugin:constmethod in ucb..uui

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

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx 
b/ucb/source/cacher/cachedcontentresultset.cxx
index 15f35adcfea1..2cccf730066b 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -162,7 +162,7 @@ bool CachedContentResultSet::CCRS_Cache
 }
 
 sal_Int32 CachedContentResultSet::CCRS_Cache
-::getMaxRow()
+::getMaxRow() const
 {
 if( !m_pResult )
 return 0;
@@ -174,7 +174,7 @@ sal_Int32 CachedContentResultSet::CCRS_Cache
 }
 
 bool CachedContentResultSet::CCRS_Cache
-::hasKnownLast()
+::hasKnownLast() const
 {
 if( !m_pResult )
 return false;
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx 
b/ucb/source/cacher/cachedcontentresultset.hxx
index 174fb91ff568..e6febb183b6a 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -87,10 +87,10 @@ class CachedContentResultSet
 hasCausedException( sal_Int32 nRow );
 
 sal_Int32
-getMaxRow();
+getMaxRow() const;
 
 bool
-hasKnownLast();
+hasKnownLast() const;
 
 /// @throws css::sdbc::SQLException
 /// @throws css::uno::RuntimeException
diff --git a/ucb/source/ucp/file/filinpstr.hxx 
b/ucb/source/ucp/file/filinpstr.hxx
index fffa47f62317..1818e52b8f93 100644
--- a/ucb/source/ucp/file/filinpstr.hxx
+++ b/ucb/source/ucp/file/filinpstr.hxx
@@ -47,7 +47,7 @@ namespace fileaccess {
  */
 
 sal_Int32 CtorSuccess() { return m_nErrorCode;}
-sal_Int32 getMinorError() { return m_nMinorErrorCode;}
+sal_Int32 getMinorError() const { return m_nMinorErrorCode;}
 
 virtual sal_Int32 SAL_CALL
 readBytes(
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index 82c1db908fd2..d9995386714b 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -60,7 +60,7 @@ class XResultSet_impl :
 virtual ~XResultSet_impl() override;
 
 sal_Int32 CtorSuccess() { return m_nErrorCode;}
-sal_Int32 getMinorError() { return m_nMinorErrorCode;}
+sal_Int32 getMinorError() const { return m_nMinorErrorCode;}
 
 // XEventListener
 virtual void SAL_CALL
diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx
index adad07239928..f2f617428af5 100644
--- a/ucb/source/ucp/file/filstr.hxx
+++ b/ucb/source/ucp/file/filstr.hxx
@@ -56,7 +56,7 @@ class XStream_impl :  public cppu::WeakImplHelper<
  */
 
 sal_Int32 CtorSuccess() { return m_nErrorCode;}
-sal_Int32 getMinorError() { return m_nMinorErrorCode;}
+sal_Int32 getMinorError() const { return m_nMinorErrorCode;}
 
 virtual ~XStream_impl() override;
 
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index c57ed1978c8a..d3bc3041ec99 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -128,12 +128,12 @@ namespace fileaccess
 m_nMinorCode = nMinorCode;
 }
 
-sal_Int32 getInstalledError()
+sal_Int32 getInstalledError() const
 {
 return m_nErrorCode;
 }
 
-sal_Int32 getMinorErrorCode()
+sal_Int32 getMinorErrorCode() const
 {
 return m_nMinorCode;
 }
@@ -148,7 +148,7 @@ namespace fileaccess
 }
 
 const css::uno::Reference< css::ucb::XCommandEnvironment >&
-getCommandEnvironment()
+getCommandEnvironment() const
 {
 return m_xCommandEnvironmen

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

[Noel Grandin (via logerrit)]

 sw/inc/AnnotationWin.hxx|   34 
 sw/inc/PostItMgr.hxx|8 ++---
 sw/inc/SwAppletImpl.hxx |2 -
 sw/inc/breakit.hxx  |2 -
 sw/inc/calbck.hxx   |2 -
 sw/inc/calc.hxx |4 +-
 sw/inc/crsrsh.hxx   |6 ++--
 sw/inc/dbmgr.hxx|4 +-
 sw/inc/doc.hxx  |8 ++---
 sw/inc/docsh.hxx|2 -
 sw/inc/editsh.hxx   |4 +-
 sw/inc/expfld.hxx   |2 -
 sw/inc/fesh.hxx |4 +-
 sw/inc/fmtmeta.hxx  |2 -
 sw/inc/hints.hxx|6 ++--
 sw/inc/modcfg.hxx   |2 -
 sw/inc/ndgrf.hxx|2 -
 sw/inc/ndtxt.hxx|2 -
 sw/inc/node.hxx |2 -
 sw/inc/prtopt.hxx   |2 -
 sw/inc/shellio.hxx  |6 ++--
 sw/inc/splargs.hxx  |2 -
 sw/inc/swmodule.hxx |4 +-
 sw/inc/tblafmt.hxx  |2 -
 sw/inc/unodraw.hxx  |2 -
 sw/inc/unosett.hxx  |2 -
 sw/inc/unostyle.hxx |2 -
 sw/inc/view.hxx |   18 ++--
 sw/inc/viewsh.hxx   |6 ++--
 sw/qa/api/SwXTextFrame.cxx  |2 -
 sw/qa/extras/inc/swmodeltestbase.hxx|4 +-
 sw/qa/extras/uiwriter/uiwriter.cxx  |6 ++--
 sw/source/core/access/acccontext.hxx|2 -
 sw/source/core/doc/acmplwrd.cxx |2 -
 sw/source/core/docnode/threadmanager.cxx|2 -
 sw/source/core/docnode/threadmanager.hxx|2 -
 sw/source/core/edit/edfcol.cxx  |2 -
 sw/source/core/edit/editsh.cxx  |2 -
 sw/source/core/fields/expfld.cxx|2 -
 sw/source/core/fields/reffld.cxx|2 -
 sw/source/core/fields/textapi.cxx   |2 -
 sw/source/core/frmedt/fews.cxx  |4 +-
 sw/source/core/inc/UndoCore.hxx |4 +-
 sw/source/core/inc/dialoghelp.hxx   |4 +-
 sw/source/core/inc/flowfrm.hxx  |4 +-
 sw/source/core/inc/frmtool.hxx  |4 +-
 sw/source/core/inc/ftnfrm.hxx   |4 +-
 sw/source/core/inc/rolbck.hxx   |6 ++--
 sw/source/core/inc/rootfrm.hxx  |4 +-
 sw/source/core/inc/swblocks.hxx |2 -
 sw/source/core/inc/tabfrm.hxx   |2 -
 sw/source/core/inc/textapi.hxx  |4 +-
 sw/source/core/inc/unotextmarkup.hxx|2 -
 sw/source/core/layout/frmtool.cxx   |4 +-
 sw/source/core/swg/swblocks.cxx |2 -
 sw/source/core/text/frmpaint.cxx|6 ++--
 sw/source/core/text/inftxt.hxx  |2 -
 sw/source/core/text/itrcrsr.cxx |2 -
 sw/source/core/text/porlay.hxx  |2 -
 sw/source/core/txtnode/fmtatr2.cxx  |2 -
 sw/source/core/txtnode/fntcap.cxx   |2 -
 sw/source/core/txtnode/thints.cxx   |2 -
 sw/source/core/undo/rolbck.cxx  |6 ++--
 sw/source/core/undo/undobj1.cxx |2 -
 sw/source/core/undo/unfmco.cxx  |2 -
 sw/source/core/unocore/unoftn.cxx   |2 -
 sw/source/core/unocore/unoidx.cxx   |4 +-
 sw/source/core/unocore/unoportenum.cxx  |6 ++--
 sw/source/core/unocore/unostyle.cxx |2 -
 sw/source/core/unocore/unotbl.cxx   |   10 +++
 sw/source/core/unocore/unotextmarkup.cxx|2 -
 sw/source/core/view/dialoghelp.cxx  |4 +-
 sw/source/core/view/viewsh.cxx  |2 -
 sw/source/filter/inc/fltshell.hxx   |4 +-
 sw/source/filter/ww8/WW8TableInfo.cxx   |8 ++---
 sw/source/filter/ww8/WW8TableInfo.hxx   |8 ++---
 sw/source/filter/ww8/attributeoutputbase.hxx|   10 +++
 sw/source/filter/ww8/docxattributeoutput.cxx|2 -
 sw/source/filter/ww8/docxattributeoutput.hxx|8 ++---
 sw/source/filter/ww8/docxexport.hxx |4 +-
 sw/source/filter/ww8/docxsdrexport.cxx  |   16 +--
 sw/source/filter/ww8/docxsdrexport.hxx  |   12 
 sw/source/filter/ww8/escher.hxx |4 +-
 sw/source/filter/ww8/rtfexport.hxx  |2

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

[Eike Rathke (via logerrit)]

 i18nlangtag/source/languagetag/languagetag.cxx |   30 -
 1 file changed, 20 insertions(+), 10 deletions(-)

New commits:
commit 99782b52c3cc25a32661c382ca98a32f6ec87003
Author: Eike Rathke 
AuthorDate: Fri Sep 27 22:35:13 2019 +0200
Commit: Xisco Faulí 
CommitDate: Sat Sep 28 11:23:07 2019 +0200

Resolves: tdf#127786 cache Glibc locale string in LanguageTagImpl

... for non-simple @modifier strings that are constructed using
liblangtag, as loading resource strings needs it over and over and
over again.

Change-Id: Ib6a74e5ddb44508aa41f101c200a508bfa4a13bd
Reviewed-on: https://gerrit.libreoffice.org/79770
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 24c7c12224f1c1d66f335f6fe085595352137646)
Reviewed-on: https://gerrit.libreoffice.org/79775
Reviewed-by: Xisco Faulí 

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index ad9c2ceea898..98caa83c6a3f 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -253,11 +253,12 @@ private:
 
 mutable css::lang::Locale   maLocale;
 mutable OUStringmaBcp47;
-mutable OUStringmaCachedLanguage;   ///< cache 
getLanguage()
-mutable OUStringmaCachedScript; ///< cache 
getScript()
-mutable OUStringmaCachedCountry;///< cache 
getCountry()
-mutable OUStringmaCachedVariants;   ///< cache 
getVariants()
-mutable lt_tag_t*   mpImplLangtag;  ///< 
liblangtag pointer
+mutable OUStringmaCachedLanguage;///< cache 
getLanguage()
+mutable OUStringmaCachedScript;  ///< cache 
getScript()
+mutable OUStringmaCachedCountry; ///< cache 
getCountry()
+mutable OUStringmaCachedVariants;///< cache 
getVariants()
+mutable OUStringmaCachedGlibcString; ///< cache 
getGlibcLocaleString()
+mutable lt_tag_t*   mpImplLangtag;   ///< 
liblangtag pointer
 mutable LanguageTypemnLangID;
 mutable LanguageTag::ScriptType meScriptType;
 mutable DecisionmeIsValid;
@@ -272,6 +273,7 @@ private:
 mutable boolmbCachedScript  : 1;
 mutable boolmbCachedCountry : 1;
 mutable boolmbCachedVariants: 1;
+mutable boolmbCachedGlibcString : 1;
 
 OUString const &getBcp47() const;
 OUString const &getLanguage() const;
@@ -385,7 +387,8 @@ LanguageTagImpl::LanguageTagImpl( const LanguageTag & 
rLanguageTag )
 mbCachedLanguage( false),
 mbCachedScript( false),
 mbCachedCountry( false),
-mbCachedVariants( false)
+mbCachedVariants( false),
+mbCachedGlibcString( false)
 {
 }
 
@@ -398,6 +401,7 @@ LanguageTagImpl::LanguageTagImpl( const LanguageTagImpl & 
rLanguageTagImpl )
 maCachedScript( rLanguageTagImpl.maCachedScript),
 maCachedCountry( rLanguageTagImpl.maCachedCountry),
 maCachedVariants( rLanguageTagImpl.maCachedVariants),
+maCachedGlibcString( rLanguageTagImpl.maCachedGlibcString),
 mpImplLangtag( rLanguageTagImpl.mpImplLangtag ?
 lt_tag_copy( rLanguageTagImpl.mpImplLangtag) : nullptr),
 mnLangID( rLanguageTagImpl.mnLangID),
@@ -413,7 +417,8 @@ LanguageTagImpl::LanguageTagImpl( const LanguageTagImpl & 
rLanguageTagImpl )
 mbCachedLanguage( rLanguageTagImpl.mbCachedLanguage),
 mbCachedScript( rLanguageTagImpl.mbCachedScript),
 mbCachedCountry( rLanguageTagImpl.mbCachedCountry),
-mbCachedVariants( rLanguageTagImpl.mbCachedVariants)
+mbCachedVariants( rLanguageTagImpl.mbCachedVariants),
+mbCachedGlibcString( rLanguageTagImpl.mbCachedGlibcString)
 {
 if (mpImplLangtag)
 theDataRef::get().init();
@@ -431,6 +436,7 @@ LanguageTagImpl& LanguageTagImpl::operator=( const 
LanguageTagImpl & rLanguageTa
 maCachedScript  = rLanguageTagImpl.maCachedScript;
 maCachedCountry = rLanguageTagImpl.maCachedCountry;
 maCachedVariants= rLanguageTagImpl.maCachedVariants;
+maCachedGlibcString = rLanguageTagImpl.maCachedGlibcString;
 lt_tag_t * oldTag = mpImplLangtag;
 mpImplLangtag   = rLanguageTagImpl.mpImplLangtag ?
 lt_tag_copy( rLanguageTagImpl.mpImplLangtag) : 
nullptr;
@@ -449,6 +455,7 @@ LanguageTagImpl& LanguageTagImpl::operator=( const 
LanguageTagImpl & rLanguageTa
 mbCachedScript  = rLanguageTagImpl.mbCachedScript;
 mbCachedCountry = rLanguageTagImpl.mbCachedCountry;
 m

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

[Michael Meeks (via logerrit)]

 sw/source/uibase/sidebar/PageSizeControl.cxx |6 ++
 vcl/source/control/button.cxx|9 +
 2 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit fc79f23922ccae8b494b31a5dd7bb4767e50c87e
Author: Michael Meeks 
AuthorDate: Fri Sep 27 22:02:06 2019 +0100
Commit: Michael Meeks 
CommitDate: Sat Sep 28 11:01:18 2019 +0200

Hold reference on parent dialog while emitting EndDialog.

Also cleanup the code.

Change-Id: I5f9d562319dc244ee22feb2e3fd64023bc229c4e
Reviewed-on: https://gerrit.libreoffice.org/79771
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/79777
Tested-by: Michael Meeks 

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 0036d6dbb90d..b130686d82ee 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1691,13 +1691,14 @@ void OKButton::Click()
 {
 if ( pParent->IsDialog() )
 {
-if ( static_cast(pParent)->IsInExecute() )
-static_cast(pParent)->EndDialog( RET_OK );
+VclPtr xParent( static_cast(pParent) );
+if ( xParent->IsInExecute() )
+xParent->EndDialog( RET_OK );
 // prevent recursive calls
-else if ( !static_cast(pParent)->IsInClose() )
+else if ( !xParent->IsInClose() )
 {
 if ( pParent->GetStyle() & WB_CLOSEABLE )
-static_cast(pParent)->Close();
+xParent->Close();
 }
 }
 else
commit 40c2e33ce47ff1e51f412e20f306b0849517ebcb
Author: Xisco Fauli 
AuthorDate: Fri Sep 27 19:45:46 2019 +0200
Commit: Xisco Faulí 
CommitDate: Sat Sep 28 11:01:08 2019 +0200

tdf#126321: avoid flickering in page size popup

In a Tabbed notebookbar, Layout - Page Size

Change-Id: I74ab54e96486de960d1ccc7bcb3c2679e25a6e9e
Reviewed-on: https://gerrit.libreoffice.org/79752
Reviewed-by: Xisco Faulí 
Tested-by: Xisco Faulí 

diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx 
b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 6901d54ea284..02dbfe007343 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -77,6 +77,12 @@ PageSizeControl::PageSizeControl( sal_uInt16 nId, 
vcl::Window* pParent )
 get(maMoreButton, "moreoptions");
 get(maContainer, "container");
 mpSizeValueSet = VclPtr::Create( 
maContainer.get(), WB_BORDER );
+
+// Avoid flicker when hovering over the menu items.
+if (!IsNativeControlSupported(ControlType::Pushbutton, ControlPart::Focus))
+// If NWF renders the focus rects itself, that breaks double-buffering.
+mpSizeValueSet->RequestDoubleBuffering(true);
+
 maWidthHeightField = VclPtr::Create( maContainer.get(), 0 );
 maWidthHeightField->Hide();
 maWidthHeightField->SetUnit(FieldUnit::CM);
___
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.2' - chart2/source sc/source svtools/source sw/source

[Szymon Kłos (via logerrit)]

 chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx |   54 ++--
 chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx |   16 -
 sc/source/ui/drawfunc/fuins2.cxx|  130 ++--
 sc/source/ui/inc/fuinsert.hxx   |   14 +
 sc/source/ui/inc/tabvwsh.hxx|3 
 sc/source/ui/view/tabvwsh4.cxx  |1 
 sc/source/ui/view/tabvwshb.cxx  |2 
 svtools/source/dialogs/wizardmachine.cxx|9 
 sw/source/uibase/inc/chartins.hxx   |8 
 sw/source/uibase/inc/textsh.hxx |3 
 sw/source/uibase/shells/textsh.cxx  |   23 ++
 sw/source/uibase/table/chartins.cxx |   32 +-
 12 files changed, 176 insertions(+), 119 deletions(-)

New commits:
commit cb01bb34713f39b55b5994c7a756d95db4a81231
Author: Szymon Kłos 
AuthorDate: Wed Apr 17 17:33:10 2019 +0200
Commit: Michael Meeks 
CommitDate: Sat Sep 28 11:00:00 2019 +0200

Make Chart Creation Wizard async

* FuInsertChart as a memeber in ScTabViewShell
  stores instance is needed to react on the dialog's result
* CreationWizardUnoDlg converted to XAsynchronousExecutableDialog
  added dialog close handler which notifies listeners
  In the Online dialog become dead after closing, additional
  PostUserEvent was needed to kill the dialog after real close
  (without it user needed to select any cell to close dialog)
* Reuse in Writer

Change-Id: I9fe123d5c189d568f0edb4d36173a224a820a8a3
Reviewed-on: https://gerrit.libreoffice.org/79654
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx 
b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 9606ae805c6f..ba08b5b7ed55 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace chart
 {
@@ -83,9 +84,9 @@ void SAL_CALL CreationWizardUnoDlg::release() throw ()
 }
 uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & 
rType )
 {
-if (rType == cppu::UnoType::get())
+if (rType == 
cppu::UnoType::get())
 {
-void * p = static_cast< ui::dialogs::XExecutableDialog * >( this );
+void * p = static_cast< ui::dialogs::XAsynchronousExecutableDialog * 
>( this );
 return uno::Any( &p, rType );
 }
 else if (rType == cppu::UnoType::get())
@@ -120,9 +121,8 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes()

cppu::UnoType::get(),

cppu::UnoType::get(),

cppu::UnoType::get(),
-   
cppu::UnoType::get(),
+   
cppu::UnoType::get(),

cppu::UnoType::get() };
-
 return aTypeList;
 }
 
@@ -147,7 +147,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing( const 
lang::EventObject& /*Source
 //Listener should deregister himself and release all references to the 
closing object.
 }
 
-void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ )
+void SAL_CALL CreationWizardUnoDlg::setDialogTitle( const OUString& /*rTitle*/ 
)
 {
 }
 void CreationWizardUnoDlg::createDialogOnDemand()
@@ -176,32 +176,34 @@ void CreationWizardUnoDlg::createDialogOnDemand()
 }
 uno::Reference< XComponent > xComp( this );
 if( m_xChartModel.is() )
-{
 m_pDialog = VclPtr::Create( pParent, 
m_xChartModel, m_xCC );
-m_pDialog->AddEventListener( LINK( this, CreationWizardUnoDlg, 
DialogEventHdl ) );
-}
 }
 }
-IMPL_LINK( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent&, rEvent, void 
)
-{
-if(rEvent.GetId() == VclEventId::ObjectDying)
-m_pDialog = nullptr;//avoid duplicate destruction of m_pDialog
-}
 
-sal_Int16 SAL_CALL CreationWizardUnoDlg::execute(  )
+void SAL_CALL CreationWizardUnoDlg::startExecuteModal( const 
css::uno::Reference& xListener )
 {
-sal_Int16 nRet = RET_CANCEL;
-{
-SolarMutexGuard aSolarGuard;
-createDialogOnDemand();
-if( !m_pDialog )
-return nRet;
-TimerTriggeredControllerLock aTimerTriggeredControllerLock( 
m_xChartModel );
-if( m_bUnlockControllersOnExecute && m_xChartModel.is() )
-m_xChartModel->unlockControllers();
-nRet = m_pDialog->Execute();
-}
-return nRet;
+SolarMutexGuard aSolarGuard;
+m_xDlgClosedListener = xListener;
+createDialogOnDemand();
+
+if( !m_pDialog )
+return;
+
+TimerTriggeredControl

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

[Michael Meeks (via logerrit)]

 vcl/source/window/dialog.cxx |   23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

New commits:
commit ab09184efffdd70c5c89f20895132c7900777f7d
Author: Michael Meeks 
AuthorDate: Fri Sep 27 22:04:49 2019 +0100
Commit: Michael Meeks 
CommitDate: Sat Sep 28 10:59:26 2019 +0200

Avoid lambda being destroyed while it is being called.

Also armor against mpDialogImpl going down during EndDialog.
This can happen during an insert chart wizard cancel, as
out of place embedded dialog cleanup occurs.

Change-Id: I1b666f07d4ec72e07fdf6888cea44a5a13976073
Reviewed-on: https://gerrit.libreoffice.org/79772
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/79778
Tested-by: Jenkins

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 1748abd0272a..080b64416e01 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1163,13 +1163,13 @@ void Dialog::EndDialog( long nResult )
 if ( mpDialogImpl->mbStartedModal )
 ImplEndExecuteModal();
 
-if (mpDialogImpl->maEndCtx.isSet())
+if ( mpDialogImpl && mpDialogImpl->maEndCtx.isSet() )
 {
-mpDialogImpl->maEndCtx.maEndDialogFn(nResult);
-mpDialogImpl->maEndCtx.maEndDialogFn = nullptr;
+auto fn = std::move(mpDialogImpl->maEndCtx.maEndDialogFn);
+fn(nResult);
 }
 
-if ( mpDialogImpl->mbStartedModal )
+if ( mpDialogImpl && mpDialogImpl->mbStartedModal )
 {
 mpDialogImpl->mbStartedModal = false;
 mpDialogImpl->mnResult = -1;
@@ -1177,12 +1177,15 @@ void Dialog::EndDialog( long nResult )
 
 mbInExecute = false;
 
-// Destroy ourselves (if we have a context with VclPtr owner)
-std::shared_ptr xOwnerDialogController = 
std::move(mpDialogImpl->maEndCtx.mxOwnerDialogController);
-std::shared_ptr xOwnerSelf = 
std::move(mpDialogImpl->maEndCtx.mxOwnerSelf);
-mpDialogImpl->maEndCtx.mxOwner.disposeAndClear();
-xOwnerDialogController.reset();
-xOwnerSelf.reset();
+if ( mpDialogImpl )
+{
+// Destroy ourselves (if we have a context with VclPtr owner)
+std::shared_ptr xOwnerDialogController = 
std::move(mpDialogImpl->maEndCtx.mxOwnerDialogController);
+std::shared_ptr xOwnerSelf = 
std::move(mpDialogImpl->maEndCtx.mxOwnerSelf);
+mpDialogImpl->maEndCtx.mxOwner.disposeAndClear();
+xOwnerDialogController.reset();
+xOwnerSelf.reset();
+}
 }
 
 void Dialog::EndAllDialogs( vcl::Window const * pParent )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 vcl/unx/gtk3_kde5/kde5_filepicker.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 7d30fd55813a035a10715d92474df482b11782a7
Author: Julien Nabet 
AuthorDate: Sat Sep 28 09:20:23 2019 +0200
Commit: Julien Nabet 
CommitDate: Sat Sep 28 10:16:13 2019 +0200

Revert "KWINDOWSYSTEM_DEPRECATED static void setMainWindow"

the function is only available from kwindowsystem 5.62, so more recent that 
our baseline.

This reverts commit 94e22f5a2fcc9f193ce0370805156ad5320d4141.

Change-Id: I6957a7d4438cd57c4a0eab29a9c615d45eaa2235
Reviewed-on: https://gerrit.libreoffice.org/79776
Reviewed-by: Michael Weghorn 
Tested-by: Julien Nabet 

diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx 
b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
index 0138a9cbb5d6..a3c2ecf63483 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
@@ -268,8 +268,7 @@ bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e)
 auto* w = static_cast(o);
 if (!w->parentWidget() && w->isModal())
 {
-w->setAttribute(Qt::WA_NativeWindow, true);
-KWindowSystem::setMainWindow(w->windowHandle(), _winId);
+KWindowSystem::setMainWindow(w, _winId);
 if (auto* fileWidget = w->findChild({}, 
Qt::FindDirectChildrenOnly))
 {
 fileWidget->setCustomWidget(_extraControls);
___
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.2' - vcl/source

[Michael Meeks (via logerrit)]

 vcl/source/control/button.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit f5308a09498cde2fc6ab039e17649c5b3ea33e54
Author: Michael Meeks 
AuthorDate: Fri Sep 27 22:02:06 2019 +0100
Commit: Michael Meeks 
CommitDate: Sat Sep 28 09:24:41 2019 +0200

Hold reference on parent dialog while emitting EndDialog.

Also cleanup the code.

Change-Id: I5f9d562319dc244ee22feb2e3fd64023bc229c4e
Reviewed-on: https://gerrit.libreoffice.org/79771
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 4fcd195ae535..c90a280639f6 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1737,13 +1737,14 @@ void OKButton::Click()
 {
 if ( pParent->IsDialog() )
 {
-if ( static_cast(pParent)->IsInExecute() )
-static_cast(pParent)->EndDialog( RET_OK );
+VclPtr xParent( static_cast(pParent) );
+if ( xParent->IsInExecute() )
+xParent->EndDialog( RET_OK );
 // prevent recursive calls
-else if ( !static_cast(pParent)->IsInClose() )
+else if ( !xParent->IsInClose() )
 {
 if ( pParent->GetStyle() & WB_CLOSEABLE )
-static_cast(pParent)->Close();
+xParent->Close();
 }
 }
 else
___
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.2' - vcl/source

[Michael Meeks (via logerrit)]

 vcl/source/window/dialog.cxx |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 4faf8989c52eaa21c3f4a9e7b30e014d9fb01c6d
Author: Michael Meeks 
AuthorDate: Fri Sep 27 22:04:49 2019 +0100
Commit: Michael Meeks 
CommitDate: Sat Sep 28 09:24:24 2019 +0200

Avoid lambda being destroyed while it is being called.

Also armor against mpDialogImpl going down during EndDialog.
This can happen during an insert chart wizard cancel, as
out of place embedded dialog cleanup occurs.

Change-Id: I1b666f07d4ec72e07fdf6888cea44a5a13976073
Reviewed-on: https://gerrit.libreoffice.org/79772
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 1f912fff6cdb..b5d1b013b97e 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1179,13 +1179,13 @@ void Dialog::EndDialog( long nResult )
 if ( mpDialogImpl->mbStartedModal )
 ImplEndExecuteModal();
 
-if (mpDialogImpl->maEndCtx.isSet())
+if ( mpDialogImpl && mpDialogImpl->maEndCtx.isSet() )
 {
-mpDialogImpl->maEndCtx.maEndDialogFn(nResult);
-mpDialogImpl->maEndCtx.maEndDialogFn = nullptr;
+auto fn = std::move(mpDialogImpl->maEndCtx.maEndDialogFn);
+fn(nResult);
 }
 
-if ( mpDialogImpl->mbStartedModal )
+if ( mpDialogImpl && mpDialogImpl->mbStartedModal )
 {
 mpDialogImpl->mbStartedModal = false;
 mpDialogImpl->mnResult = -1;
@@ -1193,10 +1193,13 @@ void Dialog::EndDialog( long nResult )
 
 mbInExecute = false;
 
-// Destroy ourselves (if we have a context with VclPtr owner)
-std::shared_ptr xOwnerDialog = 
std::move(mpDialogImpl->maEndCtx.mxOwnerDialog);
-mpDialogImpl->maEndCtx.mxOwner.disposeAndClear();
-xOwnerDialog.reset();
+if ( mpDialogImpl )
+{
+// Destroy ourselves (if we have a context with VclPtr owner)
+std::shared_ptr xOwnerDialog = 
std::move(mpDialogImpl->maEndCtx.mxOwnerDialog);
+mpDialogImpl->maEndCtx.mxOwner.disposeAndClear();
+xOwnerDialog.reset();
+}
 }
 
 void Dialog::EndAllDialogs( vcl::Window const * pParent )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang editeng/inc editeng/source include/editeng

[Noel Grandin (via logerrit)]

 compilerplugins/clang/virtualdead.results |3 ---
 editeng/inc/edtspell.hxx  |1 -
 editeng/source/editeng/edtspell.cxx   |5 -
 editeng/source/misc/splwrap.cxx   |   15 +--
 include/editeng/splwrap.hxx   |1 -
 5 files changed, 1 insertion(+), 24 deletions(-)

New commits:
commit dd5947b852a2c84e6d35ca6d1e4cb0fd09a49b8d
Author: Noel Grandin 
AuthorDate: Thu Sep 26 13:41:06 2019 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 28 08:59:30 2019 +0200

loplugin:virtualdead in editeng

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

diff --git a/compilerplugins/clang/virtualdead.results 
b/compilerplugins/clang/virtualdead.results
index 37118ffe3d6f..740ef0bedbd6 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -70,9 +70,6 @@ include/canvas/base/graphicdevicebase.hxx:319
 include/connectivity/sdbcx/IRefreshable.hxx:31
 void connectivity::sdbcx::IRefreshableGroups::refreshGroups()
 empty
-include/editeng/splwrap.hxx:105
-_Bool SvxSpellWrapper::HasOtherCnt()
-0
 include/filter/msfilter/msdffimp.hxx:546
 _Bool SvxMSDffManager::ShapeHasText(unsigned long,unsigned long,)const
 1
diff --git a/editeng/inc/edtspell.hxx b/editeng/inc/edtspell.hxx
index 53565fd71d9e..d21ce140cf8c 100644
--- a/editeng/inc/edtspell.hxx
+++ b/editeng/inc/edtspell.hxx
@@ -48,7 +48,6 @@ protected:
 virtual voidSpellContinue() override;// Check area
 virtual voidReplaceAll( const OUString &rNewText ) override;
 virtual boolSpellMore() override;
-virtual boolHasOtherCnt() override;
 
 public:
 EditSpellWrapper( vcl::Window* pWin,
diff --git a/editeng/source/editeng/edtspell.cxx 
b/editeng/source/editeng/edtspell.cxx
index 9d6b86f6d414..93bdb213da52 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -108,11 +108,6 @@ void EditSpellWrapper::SpellContinue()
 SetLast( pEditView->GetImpEditEngine()->ImpSpell( pEditView ) );
 }
 
-bool EditSpellWrapper::HasOtherCnt()
-{
-return false;
-}
-
 bool EditSpellWrapper::SpellMore()
 {
 EditEngine* pEE = pEditView->GetEditEngine();
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 5e9cddc5d841..a7b582b66d6a 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -230,12 +230,6 @@ void SvxSpellWrapper::SpellStart( SvxSpellArea /*eSpell*/ )
 } // given area.
 
 
-bool SvxSpellWrapper::HasOtherCnt()
-{
-return false; // Is there a special area?
-}
-
-
 bool SvxSpellWrapper::SpellMore()
 {
 return false; // Should additional documents be examined?
@@ -343,14 +337,7 @@ bool SvxSpellWrapper::SpellNext( )
 }
 else if ( bStartDone && bEndDone )
 {
-bool bIsSpellSpecial = xProp.is() && xProp->getIsSpellSpecial();
-// Body area done, ask for special area
-if( !IsHyphen() && bIsSpellSpecial && HasOtherCnt() )
-{
-SpellStart( SvxSpellArea::Other );
-bOtherCntnt = bGoOn = true;
-}
-else if ( SpellMore() )  // check another document?
+if ( SpellMore() )  // check another document?
 {
 bOtherCntnt = false;
 bStartDone = !bReverse;
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index 705fedd8ea33..c73a778983c0 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -102,7 +102,6 @@ protected:
 void SetLast(const css::uno::Reference< css::uno::XInterface > 
 &xNewLast)
 { xLast = xNewLast; }
 virtual bool SpellMore();   // examine further documents?
-virtual bool HasOtherCnt(); // Are there any special areas?
 virtual void SpellStart( SvxSpellArea eSpell ); // Preparing the area
 virtual void SpellContinue(); // Check Areas
   // Result available through GetLast
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang extensions/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/virtualdead.results   |3 ---
 extensions/source/bibliography/formcontrolcontainer.cxx |4 
 extensions/source/bibliography/formcontrolcontainer.hxx |1 -
 extensions/source/bibliography/loadlisteneradapter.cxx  |4 +---
 extensions/source/bibliography/loadlisteneradapter.hxx  |1 -
 5 files changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 8de4e81b0ce0aed324e30ae55ba286715f8273f6
Author: Noel Grandin 
AuthorDate: Thu Sep 26 11:51:20 2019 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 28 08:59:07 2019 +0200

loplugin:virtualdead in extensions

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

diff --git a/compilerplugins/clang/virtualdead.results 
b/compilerplugins/clang/virtualdead.results
index 7972fabdabd2..37118ffe3d6f 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -22,9 +22,6 @@ dbaccess/source/ui/inc/IUpdateHelper.hxx:38
 desktop/source/deployment/registry/inc/dp_backenddb.hxx:119
 class rtl::OUString dp_registry::backend::BackendDb::getDbNSName()
 "http://openoffi
-extensions/source/bibliography/loadlisteneradapter.hxx:111
-void bib::OLoadListener::_unloaded(const struct 
com::sun::star::lang::EventObject &,)
-empty
 Gui/qaccessible.h:465
 class QObject * QAccessibleInterface::object()const
 0
diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx 
b/extensions/source/bibliography/formcontrolcontainer.cxx
index 2fc1f1e1018b..fcb4851d91bc 100644
--- a/extensions/source/bibliography/formcontrolcontainer.cxx
+++ b/extensions/source/bibliography/formcontrolcontainer.cxx
@@ -114,10 +114,6 @@ namespace bib
 implSetDesignMode( true );
 }
 
-void FormControlContainer::_unloaded( const css::lang::EventObject& 
/*_rEvent*/ )
-{
-}
-
 void FormControlContainer::_reloading( const css::lang::EventObject& 
/*_rEvent*/ )
 {
 implSetDesignMode( true );
diff --git a/extensions/source/bibliography/formcontrolcontainer.hxx 
b/extensions/source/bibliography/formcontrolcontainer.hxx
index 78673eb0fd1d..fc119a7eb1fa 100644
--- a/extensions/source/bibliography/formcontrolcontainer.hxx
+++ b/extensions/source/bibliography/formcontrolcontainer.hxx
@@ -54,7 +54,6 @@ namespace bib
 // XLoadListener equivalents
 virtual void _loaded( const css::lang::EventObject& _rEvent ) override;
 virtual void _unloading( const css::lang::EventObject& _rEvent ) 
override;
-virtual void _unloaded( const css::lang::EventObject& _rEvent ) 
override;
 virtual void _reloading( const css::lang::EventObject& _rEvent ) 
override;
 virtual void _reloaded( const css::lang::EventObject& _rEvent ) 
override;
 
diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx 
b/extensions/source/bibliography/loadlisteneradapter.cxx
index 32ae7fff3888..dd9a7774db0b 100644
--- a/extensions/source/bibliography/loadlisteneradapter.cxx
+++ b/extensions/source/bibliography/loadlisteneradapter.cxx
@@ -160,10 +160,8 @@ namespace bib
 }
 
 
-void SAL_CALL OLoadListenerAdapter::unloaded( const EventObject& _rEvent )
+void SAL_CALL OLoadListenerAdapter::unloaded( const EventObject& )
 {
-if ( getLoadListener( ) )
-getLoadListener( )->_unloaded( _rEvent );
 }
 
 
diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx 
b/extensions/source/bibliography/loadlisteneradapter.hxx
index e0cceb66c3d4..6cb578063bd3 100644
--- a/extensions/source/bibliography/loadlisteneradapter.hxx
+++ b/extensions/source/bibliography/loadlisteneradapter.hxx
@@ -108,7 +108,6 @@ namespace bib
 // XLoadListener equivalents
 virtual void _loaded( const css::lang::EventObject& aEvent ) = 0;
 virtual void _unloading( const css::lang::EventObject& aEvent ) = 0;
-virtual void _unloaded( const css::lang::EventObject& aEvent ) = 0;
 virtual void _reloading( const css::lang::EventObject& aEvent ) = 0;
 virtual void _reloaded( const css::lang::EventObject& aEvent ) = 0;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits