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

[Arnaud Versini (via logerrit)]

 basic/source/classes/image.cxx|4 
 basic/source/classes/propacc.cxx  |9 ++---
 basic/source/classes/sbintern.cxx |   11 +--
 3 files changed, 3 insertions(+), 21 deletions(-)

New commits:
commit 24ad718a94eee2103a5a5e995619a844b8670f24
Author: Arnaud Versini 
AuthorDate: Wed May 20 14:03:43 2020 +0200
Commit: Noel Grandin 
CommitDate: Sat Jun 20 08:58:43 2020 +0200

BASIC : don't initialize and destroy manually std::unique_ptr

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

diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index e6e277647459..ec4901a549ff 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -31,9 +31,6 @@
 
 SbiImage::SbiImage()
 {
-pStrings   = nullptr;
-pCode  = nullptr;
-pLegacyPCode = nullptr;
 nFlags = SbiImageFlags::NONE;
 nStringSize= 0;
 nCodeSize  = 0;
@@ -49,7 +46,6 @@ SbiImage::SbiImage()
 
 SbiImage::~SbiImage()
 {
-Clear();
 }
 
 void SbiImage::Clear()
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 45d13ffbbb1d..e4765fa2249c 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -44,15 +44,10 @@ static bool 
SbCompare_UString_PropertyValue_Impl(PropertyValue const & lhs, cons
 }
 
 
-SbPropertyValues::SbPropertyValues()
-{
-}
+SbPropertyValues::SbPropertyValues() = default;
 
 
-SbPropertyValues::~SbPropertyValues()
-{
-m_xInfo.clear();
-}
+SbPropertyValues::~SbPropertyValues() = default;
 
 Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo()
 {
diff --git a/basic/source/classes/sbintern.cxx 
b/basic/source/classes/sbintern.cxx
index aaf26ee2a34c..91c1c2a772ad 100644
--- a/basic/source/classes/sbintern.cxx
+++ b/basic/source/classes/sbintern.cxx
@@ -33,8 +33,6 @@ SbiGlobals* GetSbData()
 SbiGlobals::SbiGlobals()
 {
 pInst = nullptr;
-pSbFac = nullptr;
-pUnoFac = nullptr;
 pTypeFac = nullptr;
 pClassFac = nullptr;
 pOLEFac = nullptr;
@@ -48,17 +46,10 @@ SbiGlobals::SbiGlobals()
 bCompilerError = false;
 bGlobalInitErr = false;
 bRunInit = false;
-pTransliterationWrapper = nullptr;
 bBlockCompilerError = false;
-pAppBasMgr = nullptr;
 pMSOMacroRuntimLib = nullptr;
 }
 
-SbiGlobals::~SbiGlobals()
-{
-pSbFac.reset();
-pUnoFac.reset();
-pTransliterationWrapper.reset();
-}
+SbiGlobals::~SbiGlobals() = default;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |2 +-
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx|5 +++--
 drawinglayer/source/processor2d/vclpixelprocessor2d.hxx|4 +++-
 drawinglayer/source/processor2d/vclprocessor2d.cxx |5 +++--
 drawinglayer/source/processor2d/vclprocessor2d.hxx |3 ++-
 5 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 66613a37ea258727838608d1b503f8d5ee9f6007
Author: Mike Kaganski 
AuthorDate: Fri Jun 19 12:17:18 2020 +0300
Commit: Mike Kaganski 
CommitDate: Sat Jun 20 07:40:50 2020 +0200

tdf#134134: consider color modifier stack when pixel-processing

Add initial color stack as an optional processor ctor argument,
so that it wouldn't be possibe to modify it after construction
from outside randomly (which could break the stack state).

Change-Id: I8aae4b806531fa61cc67def865297f5de1cf0755
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96684
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 4f4c99c6659e78e5d28e38808148e4284a0f0832)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96696

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 297fd725c7b7..1de36cd9f47d 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -2397,7 +2397,7 @@ void 
VclMetafileProcessor2D::processPrimitive2DOnPixelProcessor(
 auto pBufferDevice(CreateBufferDevice(aViewRange, 50, aViewInfo, 
aRectLogic, aSizePixel));
 if (pBufferDevice)
 {
-VclPixelProcessor2D aBufferProcessor(aViewInfo, *pBufferDevice);
+VclPixelProcessor2D aBufferProcessor(aViewInfo, *pBufferDevice, 
maBColorModifierStack);
 
 // draw content using pixel renderer
 primitive2d::Primitive2DReference aRef(
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 8d217dcf18db..c7ec6525fce1 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -80,8 +80,9 @@ struct VclPixelProcessor2D::Impl
 };
 
 VclPixelProcessor2D::VclPixelProcessor2D(const geometry::ViewInformation2D& 
rViewInformation,
- OutputDevice& rOutDev)
-: VclProcessor2D(rViewInformation, rOutDev)
+ OutputDevice& rOutDev,
+ const basegfx::BColorModifierStack& 
rInitStack)
+: VclProcessor2D(rViewInformation, rOutDev, rInitStack)
 , m_pImpl(new Impl(rOutDev))
 {
 // prepare maCurrentTransformation matrix with viewTransformation to 
target directly to pixels
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
index e78d1f08225a..edda8e7f021d 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
@@ -100,7 +100,9 @@ class VclPixelProcessor2D final : public VclProcessor2D
 
 public:
 /// constructor/destructor
-VclPixelProcessor2D(const geometry::ViewInformation2D& rViewInformation, 
OutputDevice& rOutDev);
+VclPixelProcessor2D(const geometry::ViewInformation2D& rViewInformation, 
OutputDevice& rOutDev,
+const basegfx::BColorModifierStack& rInitStack
+= basegfx::BColorModifierStack());
 virtual ~VclPixelProcessor2D() override;
 };
 } // end of namespace drawinglayer::processor2d
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index e64995c8b50a..5a0a85f911ef 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -1485,10 +1485,11 @@ void VclProcessor2D::adaptTextToFillDrawMode() const
 // process support
 
 VclProcessor2D::VclProcessor2D(const geometry::ViewInformation2D& 
rViewInformation,
-   OutputDevice& rOutDev)
+   OutputDevice& rOutDev,
+   const basegfx::BColorModifierStack& rInitStack)
 : BaseProcessor2D(rViewInformation)
 , mpOutputDevice(&rOutDev)
-, maBColorModifierStack()
+, maBColorModifierStack(rInitStack)
 , maCurrentTransformation()
 , maDrawinglayerOpt()
 , mnPolygonStrokePrimitive2D(0)
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.hxx 
b/drawinglayer/source/processor2d/vclprocessor2d.hxx
index 3b1b997a7cc4..dbca9ed4ba25 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.hxx
@@ -120,7 +120,8 @@ protected:
 
 public:
 // constructor/destructor
-VclPr

Libre office write page number error when using . . .

[Pauli Ojala]

When in word processing (Writer) gives a transition to a page number, 
Writer only numbers as many pages as there are in the document. That is, 
the number of pages left in the end is not numbered.
The offset should also be considered when entering the total number of 
pages.


The same thing can be done: formatting, paragraph, text wrapping, 
exchanges through functions by entering a page number on the line.

Page numbering is okey, but total pages is not okey.

The latter way I think is strange.

BR.

Pauli Ojala
 
Puh. 040-5656635



--
Avast Antivirus on tarkistanut tämän sähköpostin virusten varalta.
https://www.avast.com/antivirus

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

Re: More information about hung Jenkins builds

[Christian Lohmaier]

Hi *,

On Fri, Jun 19, 2020 at 2:51 PM Stephan Bergmann  wrote:
> On 28/05/2020 22:19, Stephan Bergmann wrote:
> […]
> @Cloph:  Besides tb7{5,6,9}, some of those jobs are also serviced by
> hc-{1,2,3}, which are currently offline.

Those won't stick, as the hc workers are setup by restoring a snapshot.
(and all are using the very same snapshot)
When I'll bring them up next time I'll update lode and will create a
refreshed snapshot.

>  I've queued
>  jobs for all three now
> (#108--110), as they will need an updated lode checked out to have a
> working kill-wrapper.  (And lets hope that lode's bin/kill-wrapper, a
> binary executable built from bin/kill-wrapper.c on tb75, also works on
> the hc-{1,2,3} machines. […]

The hetzner cloud workers are using the same Centos baseline and lode
setup as the other jenkins bots, so shouldn't be any problem here...

ciao
Christian
-- 
Christian Lohmaier, Release Engineer
Tel: +49 30 5557992-60 | IRC: cloph on Freenode
The Document Foundation, Kurfürstendamm 188, 10707 Berlin, DE
Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: http://www.documentfoundation.org/imprint
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Serge Krot (via logerrit)]

 sw/source/core/text/portxt.cxx |   23 +++
 1 file changed, 23 insertions(+)

New commits:
commit 63d4e8aa10186b4ed0e3106c116ad25c5fb5ed6d
Author: Serge Krot 
AuthorDate: Fri Jun 19 13:06:33 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Jun 20 01:47:03 2020 +0200

tdf#101830 sw: highlight empty 'invisible' input fields

Change-Id: Ibcf4f7ce88c7bf364510c522e224028aa4737790
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96717
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index ea16142b9f33..84bbee847d72 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::sw::mark;
 using namespace ::com::sun::star;
@@ -689,6 +690,28 @@ void SwTextInputFieldPortion::Paint( const SwTextPaintInfo 
&rInf ) const
 SwTextSlot aPaintText( &rInf, this, true, true, OUString() );
 SwTextPortion::Paint( rInf );
 }
+else
+{
+// highlight empty input field, elsewhere they are completely 
invisible for the user
+SwRect aIntersect;
+rInf.CalcRect(*this, &aIntersect);
+const sal_uInt16 aAreaWidth = rInf.GetTextSize(OUString(' ')).Width();
+aIntersect.Left(aIntersect.Left() - aAreaWidth/2);
+aIntersect.Width(aAreaWidth);
+
+if (aIntersect.HasArea()
+&& rInf.OnWin()
+&& SwViewOption::IsFieldShadings()
+&& !rInf.GetOpt().IsPagePreview())
+{
+OutputDevice* pOut = const_cast(rInf.GetOut());
+pOut->Push(PushFlags::LINECOLOR | PushFlags::FILLCOLOR);
+pOut->SetFillColor(SwViewOption::GetFieldShadingsColor());
+pOut->SetLineColor();
+pOut->DrawRect(aIntersect.SVRect());
+pOut->Pop();
+}
+}
 }
 
 bool SwTextInputFieldPortion::GetExpText( const SwTextSizeInfo &rInf, OUString 
&rText ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ilhan Yesil (via logerrit)]

 vcl/source/control/roadmap.cxx   |1 +
 vcl/source/control/roadmapwizard.cxx |5 +
 2 files changed, 6 insertions(+)

New commits:
commit 54a3daec02f2eeada04efcd7958da4152db4611a
Author: Ilhan Yesil 
AuthorDate: Wed Jun 10 10:01:00 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Jun 20 01:45:22 2020 +0200

tdf#133859 Wizard service: disable 'Next' button if path has only base item

If the wizard dialog for extensions has only the base item in the first
path, there is no need to proceed to the next page, as there is no one.
This will be checked and if so, the 'Next' button disabled.

In libreoffice versions before 6.4, an ORoadmap class was used in the
wizard. There, if the ORoadmap data are reinitialized, the
InCompleteHyperLabel object must be destroyed first, before it will
be set to nullptr.

Change-Id: I5b4b2e6b3666b58acccace385c622f0a065fc368
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95969
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx
index 3b954c156ccf..9f7e6a0e12ef 100644
--- a/vcl/source/control/roadmap.cxx
+++ b/vcl/source/control/roadmap.cxx
@@ -208,6 +208,7 @@ ORoadmap::ORoadmap(vcl::Window* _pParent, WinBits 
_nWinStyle)
 
 void ORoadmap::implInit(vcl::RenderContext& rRenderContext)
 {
+delete m_pImpl->InCompleteHyperLabel;
 m_pImpl->InCompleteHyperLabel = nullptr;
 m_pImpl->setCurItemID(-1);
 m_pImpl->setComplete(true);
diff --git a/vcl/source/control/roadmapwizard.cxx 
b/vcl/source/control/roadmapwizard.cxx
index 3e887ad922b7..d73cc1a18a5b 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -586,6 +586,11 @@ namespace vcl
 {
 // check how many paths are still allowed
 const WizardPath& rActivePath( m_pImpl->aPaths[ 
m_pImpl->nActivePath ] );
+
+// if current path has only the base item, it is not possible to 
proceed without activating another path
+if(rActivePath.size()<=1)
+return false;
+
 sal_Int32 nCurrentStatePathIndex = 
RoadmapWizardImpl::getStateIndexInPath( getCurrentState(), rActivePath );
 
 size_t nPossiblePaths(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/box2d

[Sarper Akdemir (via logerrit)]

 external/box2d/UnpackedTarball_box2d.mk   |7 +++
 external/box2d/disable-shadow-warning-for-drawh.patch |   18 ++
 external/box2d/fix-strict-aliasing-error.patch|   13 +
 3 files changed, 38 insertions(+)

New commits:
commit a46ab778d93d535d5866c7d0cc4a609bcf38182e
Author: Sarper Akdemir 
AuthorDate: Tue Jun 16 09:33:14 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Sat Jun 20 01:41:37 2020 +0200

box2d: fix strict aliasing error and ignore -Wshadow

Adding two patches to static external library box2d
getting rid of strict aliasing error and ignoring
-Wshadow in b2Draw.h to get rid of errors while building.

Change-Id: I5752eb484d6aafe057c9102b1ed87aaf31d6555c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96559
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/external/box2d/UnpackedTarball_box2d.mk 
b/external/box2d/UnpackedTarball_box2d.mk
index 340a17511711..4dd03e69f2d0 100644
--- a/external/box2d/UnpackedTarball_box2d.mk
+++ b/external/box2d/UnpackedTarball_box2d.mk
@@ -11,4 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,box2d))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,box2d,$(BOX2D_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,box2d,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,box2d, \
+   external/box2d/fix-strict-aliasing-error.patch \
+   external/box2d/disable-shadow-warning-for-drawh.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/box2d/disable-shadow-warning-for-drawh.patch 
b/external/box2d/disable-shadow-warning-for-drawh.patch
new file mode 100644
index ..316a6ff9e284
--- /dev/null
+++ b/external/box2d/disable-shadow-warning-for-drawh.patch
@@ -0,0 +1,18 @@
+diff -ur box2d/Box2D/Box2D/Box2D.h box2d_patched/Box2D/Box2D/Box2D.h
+--- box2d/Box2D/Box2D/Box2D.h  2014-04-06 03:43:12.0 +0300
 box2d_patched/Box2D/Box2D/Box2D.h  2020-06-17 18:44:25.920658966 +0300
+@@ -32,7 +32,14 @@
+ // These include files constitute the main Box2D API
+ 
+ #include 
++#if defined __GNUC__
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wshadow"
++#endif
+ #include 
++#if defined __GNUC__
++#pragma GCC diagnostic pop
++#endif
+ #include 
+ 
+ #include 
diff --git a/external/box2d/fix-strict-aliasing-error.patch 
b/external/box2d/fix-strict-aliasing-error.patch
new file mode 100644
index ..20b5e49eb936
--- /dev/null
+++ b/external/box2d/fix-strict-aliasing-error.patch
@@ -0,0 +1,13 @@
+diff -ru box2d/Box2D/Box2D/Common/b2Math.h 
box2d_patched/Box2D/Box2D/Common/b2Math.h
+--- box2d/Box2D/Box2D/Common/b2Math.h  2014-04-06 03:43:12.0 +0300
 box2d_patched/Box2D/Box2D/Common/b2Math.h  2020-06-16 07:37:31.713248714 
+0300
+@@ -25,8 +25,7 @@
+ /// This function is used to ensure that a floating point number is not a NaN 
or infinity.
+ inline bool b2IsValid(float32 x)
+ {
+-  int32 ix = *reinterpret_cast(&x);
+-  return (ix & 0x7f80) != 0x7f80;
++  return isfinite(x);
+ }
+ 
+ /// This is a approximate yet fast inverse square-root.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/docnode/ndsect.cxx |5 -
 sw/source/core/edit/eddel.cxx |   12 +++-
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 1d58ce59eb1ce7c9921a6827077349a9da315f78
Author: Michael Stahl 
AuthorDate: Thu Jun 18 18:32:24 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Jun 20 01:26:02 2020 +0200

tdf#133990 sw_redlinehide: fix Undo with section before table

... at start of document.

The section node wasn't included in the PaM passed to SwUndoDelete,
so on Undo it called MakeFrames() starting from the contained table
node and crashed when reaching the section's end node.

Fixed, then it crashes in Redo, because SwDoc::DelSectionFormat()
calls SetModified() which calls some event listener which causes
EndAllAction() to be called, which by itself is scary and then it
crashes because the nodes array contains a bunch of deleted nodes.

Not sure if that SetModified() serves any purpose, but it's pointless
in Undo.

(1st crash is regression from 68880a3004623553bf1920ad8a4a4d2be4bca234)

Change-Id: Iafdd073ca9577bf54dd5a8ad2eb8f8f110db93b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96620
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 57d488660572d62ef0371e50dcdd4ca7a6d98a14)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96634
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/docnode/ndsect.cxx 
b/sw/source/core/docnode/ndsect.cxx
index 8655874fe858..ef388242fa67 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -598,7 +598,10 @@ void SwDoc::DelSectionFormat( SwSectionFormat *pFormat, 
bool bDelNodes )
 
 GetIDocumentUndoRedo().EndUndo(SwUndoId::DELSECTION, nullptr);
 
-getIDocumentState().SetModified();
+if (GetIDocumentUndoRedo().DoesUndo())
+{   // TODO is this ever needed?
+getIDocumentState().SetModified();
+}
 }
 
 void SwDoc::UpdateSection( size_t const nPos, SwSectionData & rNewData,
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 2951b56b4cd5..74e845353566 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -106,7 +106,17 @@ void SwEditShell::DeleteSel( SwPaM& rPam, bool* pUndo )
 pNewPam.reset(new SwPaM(*rPam.GetMark(), *rPam.GetPoint()));
 // Selection starts at the first para of the first cell, but we
 // want to delete the table node before the first cell as well.
-pNewPam->Start()->nNode = 
pNewPam->Start()->nNode.GetNode().FindTableNode()->GetIndex();
+while (SwTableNode const* pTableNode =
+
pNewPam->Start()->nNode.GetNode().StartOfSectionNode()->FindTableNode())
+{
+pNewPam->Start()->nNode = *pTableNode;
+}
+// tdf#133990 ensure section is included in SwUndoDelete
+while (SwSectionNode const* pSectionNode =
+
pNewPam->Start()->nNode.GetNode().StartOfSectionNode()->FindSectionNode())
+{
+pNewPam->Start()->nNode = *pSectionNode;
+}
 pNewPam->Start()->nContent.Assign(nullptr, 0);
 pPam = pNewPam.get();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

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

New commits:
commit 5a53c9262a3c7623b7d29e8afe46fddcbea003d3
Author: Michael Stahl 
AuthorDate: Wed Jun 17 18:53:49 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Jun 20 01:24:57 2020 +0200

tdf#134009 sw: prevent spurious undos in SwColumnFrame::DestroyImpl()

SwUndoFrameFormatDelete is created for every destroyed column frame.

Change-Id: I11e0399487a41c52768175faf3a3699b302ad317
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96558
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 102a99e46bca9fb292cc1b2e7604020eb9ca43f4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96576
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index b241257b4bda..dfb438953688 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -52,6 +52,9 @@ void SwColumnFrame::DestroyImpl()
 //I'm the only one, delete the format.
 //Get default format before, so the base class can cope with it.
 pDoc->GetDfltFrameFormat()->Add( this );
+// tdf#134009, like #i32968# avoid SwUndoFrameFormatDelete creation,
+// the format is owned by the SwColumnFrame, see lcl_AddColumns()
+::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
 pDoc->DelFrameFormat( pFormat );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/undo/undel.cxx |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 139bf8208a7f59b742afac0eefb60e2e73316145
Author: Michael Stahl 
AuthorDate: Thu Jun 18 14:19:12 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Jun 20 01:23:46 2020 +0200

tdf#134021 sw_redlinehide: fix crash if document contains only table

This sets the m_bTableDelLastNd flag in SwUndoDelete, so a SwTextNode is
created so that there's something in the document, and there are 2
problems with Undo:

1. ~SwIndexReg assert because there's a shell cursor on the text node;
   could fix this with some PaMCorrAbs() but let's just call
   DelFullPara() which takes care of that.
   (this likely isn't possible in the !m_bTableDelLastNd case)

2. no frames are created in MakeFrames() because there's no node in the
   document with layout frames, so delete it at the end.
   (regression from 723728cd358693b8f4bc9d913541aa4479f2bd48)

Change-Id: I6d8535ae1a2e607d665660f149b344e817bc8ab0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96604
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 5d836621326c68decaae09f1911d2d036a251b43)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96632
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 0510ea64dc37..504bfee25164 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -860,6 +860,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & 
rContext)
 SwPosition aPos( aIdx );
 if( !m_bDelFullPara )
 {
+assert(!m_bTableDelLastNd || pInsNd->IsTextNode());
 if( pInsNd->IsTableNode() )
 {
 pInsNd = rDoc.GetNodes().MakeTextNode( aIdx,
@@ -1046,8 +1047,11 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & 
rContext)
 }
 }
 // delete the temporarily added Node
-if( pInsNd )
+if (pInsNd && !m_bTableDelLastNd)
+{
+assert(&aIdx.GetNode() == pInsNd);
 rDoc.GetNodes().Delete( aIdx );
+}
 if( m_pRedlSaveData )
 SetSaveData(rDoc, *m_pRedlSaveData);
 
@@ -1139,6 +1143,15 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & 
rContext)
 lcl_MakeAutoFrames(*rDoc.GetSpzFrameFormats(), pMovedNode->GetIndex());
 }
 
+// tdf#134021 only after MakeFrames(), because it may be the only node
+// that has layout frames
+if (pInsNd && m_bTableDelLastNd)
+{
+assert(&aIdx.GetNode() == pInsNd);
+SwPaM tmp(aIdx, aIdx);
+rDoc.getIDocumentContentOperations().DelFullPara(tmp);
+}
+
 AddUndoRedoPaM(rContext, true);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/doc/DocumentContentOperationsManager.cxx |   14 +-
 sw/source/core/docnode/nodes.cxx|6 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 088324bbd391c858dd17832708b465eb5b6046e6
Author: Michael Stahl 
AuthorDate: Fri Jun 19 15:05:42 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Jun 20 01:22:39 2020 +0200

tdf#132326 sw_redlinehide: no frames allowed in Undo SwNodesArray

This crashes in SwAccessibleParagraph::GetRealHeadingLevel(); the a11y
should have been disposed earlier because the node it's connected to is
in the Undo SwNodesArray.

When SwUndoDelete::SwUndoDelete() calls SwNodes::MoveNodes(), all
existing frames must be destroyed; the MoveNodes() would reset its flag
temporarily inside a section, to delay creating the frames inside the
section when moving to the live SwNodesArray, but this also prevents
the deletion when moving in the other direction.

(crash is regression from 723728cd358693b8f4bc9d913541aa4479f2bd48)

Change-Id: I13719bf98ea96b8d68db3ee78cf7f4b61a99e7e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96734
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit a60dd9ef1361c5925803acaa5292e99277d1faf3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96701
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 2feef62276df..10f4ba61be03 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -661,7 +661,11 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, 
SwNodes & rNodes,
 {
 pSctNd->NodesArrChgd();
 ++nSectNdCnt;
-bNewFrames = false;
+// tdf#132326 do not let frames survive in undo nodes
+if 
(!GetDoc()->GetIDocumentUndoRedo().IsUndoNodes(rNodes))
+{
+bNewFrames = false;
+}
 }
 }
 }
commit fbb87a3d51efb6fdc502c0f5501c5cb5b3158681
Author: Michael Stahl 
AuthorDate: Fri Jun 19 16:32:19 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Jun 20 01:22:28 2020 +0200

tdf#127635 sw_redlinehide: put point at the end of deletion

SwWrtShell::Insert() is called with a selection, so it first calls
DeleteAndJoin() to get rid of the selection.

With redlining enabled, this leaves the cursor as it was before, so if
the point was at the start it still is at the start, so the following
Insert will insert at the start of the selection.

But then AutoCorrect wants to do things and it uses TextFrameIndex and
ViewToModelPos and gets a result at the end of the delete redline,
while the cursor remains at the start of the delete redline.

Avoid this by swapping the selection after DeleteAndJoin() (and also
DeleteRange() for consistency) so that insertion happens at end of
redline (swap "above" DoWithBreaks because it creates temporary PaMs).

(regression from sw_redlinehide)

Change-Id: Ib5b0475f610c2ce426e9202e9d325dd0cc451d5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96743
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 398ba26077f9029bdf6f7378bfc9ce8376b6f02d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96705
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 456b1ba60f93..08d7eb6f09fa 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -2007,6 +2007,11 @@ void DocumentContentOperationsManager::DeleteRange( 
SwPaM & rPam )
 {
 lcl_DoWithBreaks( *this, rPam, 
&DocumentContentOperationsManager::DeleteRangeImpl );
 
+if (m_rDoc.getIDocumentRedlineAccess().IsRedlineOn())
+{
+rPam.Normalize(false); // tdf#127635 put point at the end of deletion
+}
+
 if (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline()
 && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty())
 {
@@ -2178,10 +2183,17 @@ bool DocumentContentOperationsManager::DeleteAndJoin( 
SwPaM & rPam,
 if ( lcl_StrLenOverflow( rPam ) )
 return false;
 
-return lcl_DoWithBreaks( *this, rPam, 
(m_rDoc.getIDocumentRedlineAccess().IsRedlineOn())
+bool const ret = lcl_DoWithBreaks( *this, rPam, 
(m_rDoc.getIDocumentRedlineAccess().IsRedlineOn())
 ? 
&DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl
 : &DocumentContentOperationsManager::DeleteAndJoinImpl,
 bForceJoinNext );
+
+if (m_rDoc.getIDocumentRedli

[Libreoffice-commits] core.git: include/unotest test/signing-keys unotest/source xmlsecurity/qa

[Miklos Vajna (via logerrit)]

 dev/null  |binary
 include/unotest/macros_test.hxx   |   12 
 unotest/source/cpp/macros_test.cxx|   65 ++
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx |   21 +++-
 xmlsecurity/qa/unit/signing/signing.cxx   |   56 --
 5 files changed, 88 insertions(+), 66 deletions(-)

New commits:
commit 81c0b6410ae7a604a97994c7f31113f24665167f
Author: Miklos Vajna 
AuthorDate: Fri Jun 19 17:56:54 2020 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jun 19 22:32:16 2020 +0200

Move data for signing tests to test/

This was duplicated under xmlsecurity and made it hard to have test code
outside xmlsecurity, even if the core of the pdf signing is nowadays
under svl/.

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

diff --git a/include/unotest/macros_test.hxx b/include/unotest/macros_test.hxx
index c60ea1fe97ce..2960dc0fbb23 100644
--- a/include/unotest/macros_test.hxx
+++ b/include/unotest/macros_test.hxx
@@ -13,6 +13,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
@@ -27,6 +28,11 @@ struct TestMacroInfo
 
 class BasicDLL;
 
+namespace test
+{
+class Directories;
+}
+
 namespace unotest {
 
 class OOO_DLLPUBLIC_UNOTEST MacrosTest
@@ -43,11 +49,17 @@ public:
 const OUString& rCommand,
 const css::uno::Sequence& 
rPropertyValues);
 
+void setUpNssGpg(const test::Directories& rDirectories, const OUString& 
rTestName);
+void tearDownNssGpg();
+
 protected:
 css::uno::Reference< css::frame::XDesktop2> mxDesktop;
 
 private:
 std::unique_ptr mpDll;
+#if HAVE_GPGCONF_SOCKETDIR
+OString m_gpgconfCommandPrefix;
+#endif
 };
 
 }
diff --git a/xmlsecurity/qa/unit/signing/data/cert8.db 
b/test/signing-keys/cert8.db
similarity index 100%
rename from xmlsecurity/qa/unit/signing/data/cert8.db
rename to test/signing-keys/cert8.db
diff --git a/xmlsecurity/qa/unit/signing/data/key3.db 
b/test/signing-keys/key3.db
similarity index 100%
rename from xmlsecurity/qa/unit/signing/data/key3.db
rename to test/signing-keys/key3.db
diff --git a/xmlsecurity/qa/unit/signing/data/pubring.gpg 
b/test/signing-keys/pubring.gpg
similarity index 100%
rename from xmlsecurity/qa/unit/signing/data/pubring.gpg
rename to test/signing-keys/pubring.gpg
diff --git a/xmlsecurity/qa/unit/signing/data/random_seed 
b/test/signing-keys/random_seed
similarity index 100%
rename from xmlsecurity/qa/unit/signing/data/random_seed
rename to test/signing-keys/random_seed
diff --git a/xmlsecurity/qa/unit/signing/data/secring.gpg 
b/test/signing-keys/secring.gpg
similarity index 100%
rename from xmlsecurity/qa/unit/signing/data/secring.gpg
rename to test/signing-keys/secring.gpg
diff --git a/xmlsecurity/qa/unit/signing/data/trustdb.gpg 
b/test/signing-keys/trustdb.gpg
similarity index 100%
rename from xmlsecurity/qa/unit/signing/data/trustdb.gpg
rename to test/signing-keys/trustdb.gpg
diff --git a/unotest/source/cpp/macros_test.cxx 
b/unotest/source/cpp/macros_test.cxx
index 20c56950fcaf..dfd7d758153f 100644
--- a/unotest/source/cpp/macros_test.cxx
+++ b/unotest/source/cpp/macros_test.cxx
@@ -19,6 +19,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 
 using namespace css;
 
@@ -76,6 +80,67 @@ void MacrosTest::dispatchCommand(const 
uno::Reference& xCompon
 
 xDispatchHelper->executeDispatch(xFrame, rCommand, OUString(), 0, 
rPropertyValues);
 }
+
+void MacrosTest::setUpNssGpg(const test::Directories& rDirectories, const 
OUString& rTestName)
+{
+OUString aSourceDir = rDirectories.getURLFromSrc("/test/signing-keys/");
+OUString aTargetDir = rDirectories.getURLFromWorkdir("CppunitTest/" + 
rTestName + ".test.user");
+
+// Set up cert8.db in workdir/CppunitTest/
+osl::File::copy(aSourceDir + "cert8.db", aTargetDir + "/cert8.db");
+osl::File::copy(aSourceDir + "key3.db", aTargetDir + "/key3.db");
+
+// Make gpg use our own defined setup & keys
+osl::File::copy(aSourceDir + "pubring.gpg", aTargetDir + "/pubring.gpg");
+osl::File::copy(aSourceDir + "random_seed", aTargetDir + "/random_seed");
+osl::File::copy(aSourceDir + "secring.gpg", aTargetDir + "/secring.gpg");
+osl::File::copy(aSourceDir + "trustdb.gpg", aTargetDir + "/trustdb.gpg");
+
+OUString aTargetPath;
+osl::FileBase::getSystemPathFromFileURL(aTargetDir, aTargetPath);
+
+#ifndef _WIN32
+OUString mozCertVar("MOZILLA_CERTIFICATE_FOLDER");
+osl_setEnvironment(mozCertVar.pData, aTargetPath.pData);
+#endif
+OUString gpgHomeVar("GNUPGHOME");
+osl_setEnvironment(gpgHomeVar.pData, aTargetPath.pData);
+
+#if HAVE_GPGCONF_SOCKETDIR
+auto const ldPath = std::getenv("LIBO_LD_PATH");
+m_gpgconfCommandPrefix
+= ldPath == nullptr ? OString() : OStringLiteral("LD_LIBRARY_PATH=") + 

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

[Miklos Vajna (via logerrit)]

 vcl/qa/cppunit/pdfexport/pdfexport.cxx |  101 +
 1 file changed, 40 insertions(+), 61 deletions(-)

New commits:
commit ed7ae218dd51ad80c03645b9c43b42d8b8e90400
Author: Miklos Vajna 
AuthorDate: Fri Jun 19 17:57:06 2020 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jun 19 22:04:28 2020 +0200

CppunitTest_vcl_pdfexport: clean up custom pdfium scopers

Upstream now provides the same, just with a different name.

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

diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 754f86af2bd0..dc6c01fcf719 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -59,28 +60,6 @@ static std::ostream& operator<<(std::ostream& rStrm, const 
Color& rColor)
 namespace
 {
 
-struct CloseDocument {
-void operator ()(FPDF_DOCUMENT doc) {
-if (doc != nullptr) {
-FPDF_CloseDocument(doc);
-}
-}
-};
-
-using DocumentHolder =
-std::unique_ptr::type, 
CloseDocument>;
-
-struct ClosePage {
-void operator ()(FPDF_PAGE page) {
-if (page != nullptr) {
-FPDF_ClosePage(page);
-}
-}
-};
-
-using PageHolder =
-std::unique_ptr::type, ClosePage>;
-
 /// Tests the PDF export filter.
 class PdfExportTest : public test::BootstrapFixture, public unotest::MacrosTest
 {
@@ -88,7 +67,7 @@ class PdfExportTest : public test::BootstrapFixture, public 
unotest::MacrosTest
 utl::TempFile maTempFile;
 SvMemoryStream maMemory;
 // Export the document as PDF, then parse it with PDFium.
-DocumentHolder exportAndParse(const OUString& rURL, const 
utl::MediaDescriptor& rDescriptor);
+ScopedFPDFDocument exportAndParse(const OUString& rURL, const 
utl::MediaDescriptor& rDescriptor);
 std::shared_ptr mpPDFium;
 
 public:
@@ -204,7 +183,7 @@ PdfExportTest::PdfExportTest()
 maTempFile.EnableKillingFile();
 }
 
-DocumentHolder PdfExportTest::exportAndParse(const OUString& rURL, const 
utl::MediaDescriptor& rDescriptor)
+ScopedFPDFDocument PdfExportTest::exportAndParse(const OUString& rURL, const 
utl::MediaDescriptor& rDescriptor)
 {
 // Import the bugdoc and export as PDF.
 mxComponent = loadFromDesktop(rURL);
@@ -216,7 +195,7 @@ DocumentHolder PdfExportTest::exportAndParse(const 
OUString& rURL, const utl::Me
 // Parse the export result with pdfium.
 SvFileStream aFile(maTempFile.GetURL(), StreamMode::READ);
 maMemory.WriteStream(aFile);
-DocumentHolder pPdfDocument(
+ScopedFPDFDocument pPdfDocument(
 FPDF_LoadMemDocument(maMemory.GetData(), maMemory.GetSize(), 
/*password=*/nullptr));
 CPPUNIT_ASSERT(pPdfDocument);
 return pPdfDocument;
@@ -357,12 +336,12 @@ void PdfExportTest::testTdf105461()
 SvFileStream aFile(maTempFile.GetURL(), StreamMode::READ);
 SvMemoryStream aMemory;
 aMemory.WriteStream(aFile);
-DocumentHolder pPdfDocument(FPDF_LoadMemDocument(aMemory.GetData(), 
aMemory.GetSize(), /*password=*/nullptr));
+ScopedFPDFDocument pPdfDocument(FPDF_LoadMemDocument(aMemory.GetData(), 
aMemory.GetSize(), /*password=*/nullptr));
 CPPUNIT_ASSERT(pPdfDocument);
 
 // The document has one page.
 CPPUNIT_ASSERT_EQUAL(1, FPDF_GetPageCount(pPdfDocument.get()));
-PageHolder pPdfPage(FPDF_LoadPage(pPdfDocument.get(), /*page_index=*/0));
+ScopedFPDFPage pPdfPage(FPDF_LoadPage(pPdfDocument.get(), 
/*page_index=*/0));
 CPPUNIT_ASSERT(pPdfPage);
 
 // Make sure there is a filled rectangle inside.
@@ -410,7 +389,7 @@ void PdfExportTest::testTdf107868()
 SvFileStream aFile(maTempFile.GetURL(), StreamMode::READ);
 SvMemoryStream aMemory;
 aMemory.WriteStream(aFile);
-DocumentHolder pPdfDocument(FPDF_LoadMemDocument(aMemory.GetData(), 
aMemory.GetSize(), /*password=*/nullptr));
+ScopedFPDFDocument pPdfDocument(FPDF_LoadMemDocument(aMemory.GetData(), 
aMemory.GetSize(), /*password=*/nullptr));
 if (!pPdfDocument)
 // Printing to PDF failed in a non-interesting way, e.g. CUPS is not
 // running, there is no printer defined, etc.
@@ -418,7 +397,7 @@ void PdfExportTest::testTdf107868()
 
 // The document has one page.
 CPPUNIT_ASSERT_EQUAL(1, FPDF_GetPageCount(pPdfDocument.get()));
-PageHolder pPdfPage(FPDF_LoadPage(pPdfDocument.get(), /*page_index=*/0));
+ScopedFPDFPage pPdfPage(FPDF_LoadPage(pPdfDocument.get(), 
/*page_index=*/0));
 CPPUNIT_ASSERT(pPdfPage);
 
 // Make sure there is no filled rectangle inside.
@@ -671,12 +650,12 @@ void PdfExportTest::testSofthyphenPos()
 // running, there is no printer defined, etc.
 return;
 }
-DocumentHolder pPdfDocument(FPDF_LoadMemDocument(aMemory.GetData()

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

[Stephan Bergmann (via logerrit)]

 tools/source/misc/json_writer.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b3155a3bf5c906ce6653504f6612e84fa7140068
Author: Stephan Bergmann 
AuthorDate: Thu Jun 18 11:29:41 2020 +0200
Commit: Aron Budea 
CommitDate: Fri Jun 19 21:48:09 2020 +0200

Avoid unhelpful -Werror=stringop-truncation

...emitted at least by recent GCC 11 trunk (even with --disable-optimized, 
where
optimization level traditionally has some impact on what warnings of this 
kind
are emitted exactly):

> tools/source/misc/json_writer.cxx: In member function 
‘tools::ScopedJsonWriterNode tools::JsonWriter::startNode(const char*)’:
> tools/source/misc/json_writer.cxx:42:12: error: ‘char* strncpy(char*, 
const char*, size_t)’ output truncated before terminating nul copying 5 bytes 
from a string of the same length [-Werror=stringop-truncation]
>42 | strncpy(mPos, "\": { ", 5);
>   | ~~~^~~

etc.

Change-Id: Id96964b178b61879cf2373c5b418f5c9df4a226f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96593
Reviewed-by: Noel Grandin 
Reviewed-by: Justin Luth 
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
(cherry picked from commit de32eb539bbcf291f9968ae12696e1317fdb855d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96749
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 

diff --git a/tools/source/misc/json_writer.cxx 
b/tools/source/misc/json_writer.cxx
index 5bba05a4c21d..3040fda8a080 100644
--- a/tools/source/misc/json_writer.cxx
+++ b/tools/source/misc/json_writer.cxx
@@ -43,7 +43,7 @@ ScopedJsonWriterNode JsonWriter::startNode(const char* 
pNodeName)
 ++mPos;
 memcpy(mPos, pNodeName, len);
 mPos += len;
-strncpy(mPos, "\": { ", 5);
+memcpy(mPos, "\": { ", 5);
 mPos += 5;
 mStartNodeCount++;
 mbFirstFieldInNode = true;
@@ -70,7 +70,7 @@ void JsonWriter::put(const char* pPropName, const OUString& 
rPropVal)
 ++mPos;
 memcpy(mPos, pPropName, nPropNameLength);
 mPos += nPropNameLength;
-strncpy(mPos, "\": \"", 4);
+memcpy(mPos, "\": \"", 4);
 mPos += 4;
 
 // Convert from UTF-16 to UTF-8 and perform escaping
@@ -129,7 +129,7 @@ void JsonWriter::put(const char* pPropName, const OString& 
rPropVal)
 ++mPos;
 memcpy(mPos, pPropName, nPropNameLength);
 mPos += nPropNameLength;
-strncpy(mPos, "\": \"", 4);
+memcpy(mPos, "\": \"", 4);
 mPos += 4;
 
 // copy and perform escaping
@@ -173,7 +173,7 @@ void JsonWriter::put(const char* pPropName, const char* 
pPropVal)
 ++mPos;
 memcpy(mPos, pPropName, nPropNameLength);
 mPos += nPropNameLength;
-strncpy(mPos, "\": \"", 4);
+memcpy(mPos, "\": \"", 4);
 mPos += 4;
 
 // copy and perform escaping
@@ -219,7 +219,7 @@ void JsonWriter::put(const char* pPropName, int nPropVal)
 ++mPos;
 memcpy(mPos, pPropName, nPropNameLength);
 mPos += nPropNameLength;
-strncpy(mPos, "\": ", 3);
+memcpy(mPos, "\": ", 3);
 mPos += 3;
 
 mPos += sprintf(mPos, "%d", nPropVal);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Chris Sherlock (via logerrit)]

 include/vcl/outdev.hxx |3 +++
 include/vcl/print.hxx  |6 ++
 vcl/source/gdi/graph.cxx   |   19 +--
 vcl/source/outdev/rect.cxx |   19 +++
 4 files changed, 29 insertions(+), 18 deletions(-)

New commits:
commit f4b4b27af975504fd9b85451eaa333e75b580305
Author: Chris Sherlock 
AuthorDate: Sat May 23 23:41:50 2020 +1000
Commit: Mike Kaganski 
CommitDate: Fri Jun 19 21:20:34 2020 +0200

tdf#74702 vcl: extract DrawBorder()

Change-Id: Iba9cc10daa1b6b0ab7097145a3f40832d2165435
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94721
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 86c18f06782e..8c258a48f790 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -699,6 +699,9 @@ private:
 SAL_DLLPRIVATE void SetDeviceClipRegion( const vcl::Region* 
pRegion );
 ///@}
 
+public:
+virtual voidDrawBorder(tools::Rectangle aBorderRect);
+
 
 /** @name Pixel functions
  */
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index e17e5e1dcc6d..8c91df7d8ec8 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -237,6 +237,12 @@ public:
 
 boolIsScreenComp() const override { return false; }
 
+void DrawBorder(tools::Rectangle aBorderRect) override
+{
+SetLineColor(COL_BLACK);
+DrawRect(aBorderRect);
+}
+
 protected:
 virtual voidDrawDeviceMask( const Bitmap& rMask, const 
Color& rMaskColor,
 const Point& rDestPt, const Size& 
rDestSize,
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 4c635b454fd3..05ad9657d8d9 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -50,24 +50,7 @@ void ImplDrawDefault( OutputDevice* pOutDev, const OUString* 
pText,
 pOutDev->SetFillColor();
 
 // On the printer a black rectangle and on the screen one with 3D effect
-if ( pOutDev->GetOutDevType() == OUTDEV_PRINTER )
-pOutDev->SetLineColor( COL_BLACK );
-else
-{
-aBorderRect.AdjustLeft(nPixel );
-aBorderRect.AdjustTop(nPixel );
-
-pOutDev->SetLineColor( COL_LIGHTGRAY );
-pOutDev->DrawRect( aBorderRect );
-
-aBorderRect.AdjustLeft( -nPixel );
-aBorderRect.AdjustTop( -nPixel );
-aBorderRect.AdjustRight( -nPixel );
-aBorderRect.AdjustBottom( -nPixel );
-pOutDev->SetLineColor( COL_GRAY );
-}
-
-pOutDev->DrawRect( aBorderRect );
+pOutDev->DrawBorder(aBorderRect);
 
 aPoint.AdjustX(nPixelWidth + 2*nPixel );
 aPoint.AdjustY(nPixelWidth + 2*nPixel );
diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx
index ecbeb12fbfee..2d8fe4524155 100644
--- a/vcl/source/outdev/rect.cxx
+++ b/vcl/source/outdev/rect.cxx
@@ -29,6 +29,25 @@
 
 #include 
 
+void OutputDevice::DrawBorder(tools::Rectangle aBorderRect)
+{
+sal_uInt16 nPixel = static_cast(PixelToLogic(Size(1, 
1)).Width());
+
+aBorderRect.AdjustLeft(nPixel);
+aBorderRect.AdjustTop(nPixel);
+
+SetLineColor(COL_LIGHTGRAY);
+DrawRect(aBorderRect);
+
+aBorderRect.AdjustLeft(-nPixel);
+aBorderRect.AdjustTop(-nPixel);
+aBorderRect.AdjustRight(-nPixel);
+aBorderRect.AdjustBottom(-nPixel);
+SetLineColor(COL_GRAY);
+
+DrawRect(aBorderRect);
+}
+
 void OutputDevice::DrawRect( const tools::Rectangle& rRect )
 {
 assert(!is_double_buffered_window());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 pyuno/source/loader/pyuno_loader.cxx |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 327153471ae38abe90463f6272e00aaa996c5ba3
Author: Caolán McNamara 
AuthorDate: Fri Jun 19 11:32:00 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jun 19 21:14:16 2020 +0200

tdf#121384 don't leave a bare trailing : in PYTHONPATH

and don't insert any empty path entries if that situation
was to arise

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

diff --git a/pyuno/source/loader/pyuno_loader.cxx 
b/pyuno/source/loader/pyuno_loader.cxx
index 8556dfdde11f..07dc748235f9 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -140,6 +140,7 @@ static void setPythonHome ( const OUString & pythonHome )
 static void prependPythonPath( const OUString & pythonPathBootstrap )
 {
 OUStringBuffer bufPYTHONPATH( 256 );
+bool bAppendSep = false;
 sal_Int32 nIndex = 0;
 while( true )
 {
@@ -155,15 +156,24 @@ static void prependPythonPath( const OUString & 
pythonPathBootstrap )
 }
 OUString systemPath;
 osl_getSystemPathFromFileURL( fileUrl.pData, &(systemPath.pData) );
-bufPYTHONPATH.append( systemPath );
-bufPYTHONPATH.append( static_cast(SAL_PATHSEPARATOR) );
+if (!systemPath.isEmpty())
+{
+if (bAppendSep)
+
bufPYTHONPATH.append(static_cast(SAL_PATHSEPARATOR));
+bufPYTHONPATH.append(systemPath);
+bAppendSep = true;
+}
 if( nNew == -1 )
 break;
 nIndex = nNew + 1;
 }
 const char * oldEnv = getenv( "PYTHONPATH");
 if( oldEnv )
+{
+if (bAppendSep)
+bufPYTHONPATH.append( static_cast(SAL_PATHSEPARATOR) 
);
 bufPYTHONPATH.append( OUString(oldEnv, strlen(oldEnv), 
osl_getThreadTextEncoding()) );
+}
 
 OUString envVar("PYTHONPATH");
 OUString envValue(bufPYTHONPATH.makeStringAndClear());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 svx/source/tbxctrls/tbxcolorupdate.cxx |   18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit a3dec7a0b3714ff74c32c8cedc62a9aae6fb6b9b
Author: Caolán McNamara 
AuthorDate: Fri Jun 19 15:06:23 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jun 19 21:12:13 2020 +0200

tdf#134084 use the desired image size, not the current image size

when updating the color bar

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

diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx 
b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 31948678b7a7..f21ad6b9c0d0 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -120,8 +120,22 @@ namespace svx
 {
 if (mbWideButton)
 return mpTbx->GetItemContentSize(mnBtnId);
-Image aImage(mpTbx->GetItemImage(mnBtnId));
-return aImage.GetSizePixel();
+vcl::ImageType eImageType = GetImageSize();
+int nHeight(16);
+switch (eImageType)
+{
+case vcl::ImageType::Size16:
+nHeight = 16;
+break;
+case vcl::ImageType::Size26:
+nHeight = 26;
+break;
+case vcl::ImageType::Size32:
+nHeight = 32;
+break;
+}
+int nWidth = nHeight;
+return Size(nWidth, nHeight);
 }
 
 ToolboxButtonColorUpdaterBase::~ToolboxButtonColorUpdaterBase()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/doc/DocumentContentOperationsManager.cxx |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 92dbbf840c1da7628bcdd9e8f67375efc2a2fa14
Author: Michael Stahl 
AuthorDate: Fri Jun 19 16:32:19 2020 +0200
Commit: Michael Stahl 
CommitDate: Fri Jun 19 20:50:58 2020 +0200

tdf#127635 sw_redlinehide: put point at the end of deletion

SwWrtShell::Insert() is called with a selection, so it first calls
DeleteAndJoin() to get rid of the selection.

With redlining enabled, this leaves the cursor as it was before, so if
the point was at the start it still is at the start, so the following
Insert will insert at the start of the selection.

But then AutoCorrect wants to do things and it uses TextFrameIndex and
ViewToModelPos and gets a result at the end of the delete redline,
while the cursor remains at the start of the delete redline.

Avoid this by swapping the selection after DeleteAndJoin() (and also
DeleteRange() for consistency) so that insertion happens at end of
redline (swap "above" DoWithBreaks because it creates temporary PaMs).

(regression from sw_redlinehide)

Change-Id: Ib5b0475f610c2ce426e9202e9d325dd0cc451d5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96743
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 398ba26077f9029bdf6f7378bfc9ce8376b6f02d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96704

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index dc262426ff1e..6d048e248c3c 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -2008,6 +2008,11 @@ void DocumentContentOperationsManager::DeleteRange( 
SwPaM & rPam )
 {
 lcl_DoWithBreaks( *this, rPam, 
&DocumentContentOperationsManager::DeleteRangeImpl );
 
+if (m_rDoc.getIDocumentRedlineAccess().IsRedlineOn())
+{
+rPam.Normalize(false); // tdf#127635 put point at the end of deletion
+}
+
 if (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline()
 && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty())
 {
@@ -2179,10 +2184,17 @@ bool DocumentContentOperationsManager::DeleteAndJoin( 
SwPaM & rPam,
 if ( lcl_StrLenOverflow( rPam ) )
 return false;
 
-return lcl_DoWithBreaks( *this, rPam, 
(m_rDoc.getIDocumentRedlineAccess().IsRedlineOn())
+bool const ret = lcl_DoWithBreaks( *this, rPam, 
(m_rDoc.getIDocumentRedlineAccess().IsRedlineOn())
 ? 
&DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl
 : &DocumentContentOperationsManager::DeleteAndJoinImpl,
 bForceJoinNext );
+
+if (m_rDoc.getIDocumentRedlineAccess().IsRedlineOn())
+{
+rPam.Normalize(false); // tdf#127635 put point at the end of deletion
+}
+
+return ret;
 }
 
 // It seems that this is mostly used by SwDoc internals; the only
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/docnode/nodes.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 461e9f2ad21046526c6644136f0abda91b0e4798
Author: Michael Stahl 
AuthorDate: Fri Jun 19 15:05:42 2020 +0200
Commit: Michael Stahl 
CommitDate: Fri Jun 19 19:52:58 2020 +0200

tdf#132326 sw_redlinehide: no frames allowed in Undo SwNodesArray

This crashes in SwAccessibleParagraph::GetRealHeadingLevel(); the a11y
should have been disposed earlier because the node it's connected to is
in the Undo SwNodesArray.

When SwUndoDelete::SwUndoDelete() calls SwNodes::MoveNodes(), all
existing frames must be destroyed; the MoveNodes() would reset its flag
temporarily inside a section, to delay creating the frames inside the
section when moving to the live SwNodesArray, but this also prevents
the deletion when moving in the other direction.

(crash is regression from 723728cd358693b8f4bc9d913541aa4479f2bd48)

Change-Id: I13719bf98ea96b8d68db3ee78cf7f4b61a99e7e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96734
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit a60dd9ef1361c5925803acaa5292e99277d1faf3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96700

diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index b0a6055d782f..0a7207545381 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -661,7 +661,11 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, 
SwNodes & rNodes,
 {
 pSctNd->NodesArrChgd();
 ++nSectNdCnt;
-bNewFrames = false;
+// tdf#132326 do not let frames survive in undo nodes
+if 
(!GetDoc()->GetIDocumentUndoRedo().IsUndoNodes(rNodes))
+{
+bNewFrames = false;
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/doc/DocumentContentOperationsManager.cxx |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 398ba26077f9029bdf6f7378bfc9ce8376b6f02d
Author: Michael Stahl 
AuthorDate: Fri Jun 19 16:32:19 2020 +0200
Commit: Michael Stahl 
CommitDate: Fri Jun 19 19:50:41 2020 +0200

tdf#127635 sw_redlinehide: put point at the end of deletion

SwWrtShell::Insert() is called with a selection, so it first calls
DeleteAndJoin() to get rid of the selection.

With redlining enabled, this leaves the cursor as it was before, so if
the point was at the start it still is at the start, so the following
Insert will insert at the start of the selection.

But then AutoCorrect wants to do things and it uses TextFrameIndex and
ViewToModelPos and gets a result at the end of the delete redline,
while the cursor remains at the start of the delete redline.

Avoid this by swapping the selection after DeleteAndJoin() (and also
DeleteRange() for consistency) so that insertion happens at end of
redline (swap "above" DoWithBreaks because it creates temporary PaMs).

(regression from sw_redlinehide)

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

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index ebb7c988f04a..ea1aa8b001be 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -2010,6 +2010,11 @@ void DocumentContentOperationsManager::DeleteRange( 
SwPaM & rPam )
 {
 lcl_DoWithBreaks( *this, rPam, 
&DocumentContentOperationsManager::DeleteRangeImpl );
 
+if (m_rDoc.getIDocumentRedlineAccess().IsRedlineOn())
+{
+rPam.Normalize(false); // tdf#127635 put point at the end of deletion
+}
+
 if (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline()
 && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty())
 {
@@ -2181,10 +2186,17 @@ bool DocumentContentOperationsManager::DeleteAndJoin( 
SwPaM & rPam,
 if ( lcl_StrLenOverflow( rPam ) )
 return false;
 
-return lcl_DoWithBreaks( *this, rPam, 
(m_rDoc.getIDocumentRedlineAccess().IsRedlineOn())
+bool const ret = lcl_DoWithBreaks( *this, rPam, 
(m_rDoc.getIDocumentRedlineAccess().IsRedlineOn())
 ? 
&DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl
 : &DocumentContentOperationsManager::DeleteAndJoinImpl,
 bForceJoinNext );
+
+if (m_rDoc.getIDocumentRedlineAccess().IsRedlineOn())
+{
+rPam.Normalize(false); // tdf#127635 put point at the end of deletion
+}
+
+return ret;
 }
 
 // It seems that this is mostly used by SwDoc internals; the only
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 6f11ed5087e4a6570a9e0c824f63a30a88786444
Author: Johnny_M 
AuthorDate: Fri Jun 19 19:20:47 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 19 19:20:47 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to f1a2ae9b979d0c698b841a23c1d25b879545a138
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index f4e2ad7f3633..f1a2ae9b979d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f4e2ad7f36334f6a4d3cd995e2450ba642b176bb
+Subproject commit f1a2ae9b979d0c698b841a23c1d25b879545a138
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit bbcede94b952967098875f3ed1149f585c7b4cbd
Author: Johnny_M 
AuthorDate: Fri Jun 19 19:21:27 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 19 19:21:27 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to a7657f2303d9a59182957f574d58a0899a55e855
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index f1a2ae9b979d..a7657f2303d9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f1a2ae9b979d0c698b841a23c1d25b879545a138
+Subproject commit a7657f2303d9a59182957f574d58a0899a55e855
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/01/0102.xhp  |4 ++--
 source/text/swriter/01/04120200.xhp |2 +-
 source/text/swriter/01/04120201.xhp |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a7657f2303d9a59182957f574d58a0899a55e855
Author: Johnny_M 
AuthorDate: Fri Jun 19 13:17:12 2020 +0200
Commit: Olivier Hallot 
CommitDate: Fri Jun 19 19:21:27 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/01/0102.xhp 
b/source/text/shared/01/0102.xhp
index cdc1888e6..1b80b6c51 100644
--- a/source/text/shared/01/0102.xhp
+++ b/source/text/shared/01/0102.xhp
@@ -55,7 +55,7 @@
 
 %PRODUCTNAME uses 
the native file picker dialog of the window manager of your operating system 
for the Open command.
 
-If the file 
that you want to open contains styles, special 
rules apply.
+If the file 
that you want to open contains styles, special 
rules apply.
 
 Display area
 Displays the files and folders in the folder that 
you are in. To open a file, select the file, and then click 
Open.
@@ -100,7 +100,7 @@
 Plays the selected sound 
file. Click again to stop playing the sound file.
 
 
-
+
 
 Opening Documents With Templates
 %PRODUCTNAME recognizes templates that are located in any 
folder from the following list:
diff --git a/source/text/swriter/01/04120200.xhp 
b/source/text/swriter/01/04120200.xhp
index 6464b8c3b..386d24c92 100644
--- a/source/text/swriter/01/04120200.xhp
+++ b/source/text/swriter/01/04120200.xhp
@@ -42,7 +42,7 @@
   Depending on 
the type of index or table that you select, the following tabs are 
present.
   
   
-  
+  
   
   Use this tab 
to specify the column layout for the index or table of contents. By default, 
the index title is one-column wide and extends out from left page 
margin.
   
diff --git a/source/text/swriter/01/04120201.xhp 
b/source/text/swriter/01/04120201.xhp
index 1d234a3c9..21431e1cb 100644
--- a/source/text/swriter/01/04120201.xhp
+++ b/source/text/swriter/01/04120201.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 
 
 Styles
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/01/0604.xhp |2 +-
 source/text/shared/01/06040200.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f1a2ae9b979d0c698b841a23c1d25b879545a138
Author: Johnny_M 
AuthorDate: Fri Jun 19 13:26:38 2020 +0200
Commit: Olivier Hallot 
CommitDate: Fri Jun 19 19:20:47 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/01/0604.xhp 
b/source/text/shared/01/0604.xhp
index 6c16d007e..6323d4d17 100644
--- a/source/text/shared/01/0604.xhp
+++ b/source/text/shared/01/0604.xhp
@@ -43,7 +43,7 @@
 
 
 The 
AutoCorrect settings are applied when you press the Spacebar after you enter a 
word.
-To turn on or 
to turn off the AutoCorrect feature, in $[officename] Calc choose Tools - 
AutoInput, and in $[officename] Writer choose Tools - AutoCorrect 
- While Typing. To apply the AutoCorrect settings to an entire text 
document, choose Tools - AutoCorrect - Apply.
+To turn on or 
to turn off the AutoCorrect feature, in $[officename] Calc choose Tools - 
AutoInput, and in $[officename] Writer choose Tools - AutoCorrect 
- While Typing. To apply the AutoCorrect settings to an entire text 
document, choose Tools - AutoCorrect - Apply.
 
 
 
diff --git a/source/text/shared/01/06040200.xhp 
b/source/text/shared/01/06040200.xhp
index b85884df0..86ee9e821 100644
--- a/source/text/shared/01/06040200.xhp
+++ b/source/text/shared/01/06040200.xhp
@@ -27,7 +27,7 @@
 
 
 
-
+
 AutoCorrect function; replacement 
table
 replacement table
 replacing; AutoCorrect function
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 409cab9fa88b5ca2d025da54e07f11a93f1cf454
Author: Johnny_M 
AuthorDate: Fri Jun 19 19:19:53 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 19 19:19:53 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to f4e2ad7f36334f6a4d3cd995e2450ba642b176bb
  - tdf#132643 Remove unused German section ID

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

diff --git a/helpcontent2 b/helpcontent2
index bd65c7cde8bb..f4e2ad7f3633 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit bd65c7cde8bbd01252f12f683094721784f5715d
+Subproject commit f4e2ad7f36334f6a4d3cd995e2450ba642b176bb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/01/0203.xhp |2 --
 1 file changed, 2 deletions(-)

New commits:
commit f4e2ad7f36334f6a4d3cd995e2450ba642b176bb
Author: Johnny_M 
AuthorDate: Fri Jun 19 13:19:42 2020 +0200
Commit: Olivier Hallot 
CommitDate: Fri Jun 19 19:19:53 2020 +0200

tdf#132643 Remove unused German section ID

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

diff --git a/source/text/shared/01/0203.xhp 
b/source/text/shared/01/0203.xhp
index 6ee4a2490..3e9dcb4b1 100644
--- a/source/text/shared/01/0203.xhp
+++ b/source/text/shared/01/0203.xhp
@@ -26,7 +26,6 @@
 
 
 
-
 repeating; commands
 commands; repeating
 
@@ -35,7 +34,6 @@
 Repeat
   Repeats the last command. This command is available in Writer 
and Calc.
 
-
 UFI: had to remove switch construct because help-ids don't work any 
more inside switches, see i47727
 although this invalidates the fix of i34949
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 56bbe483701ec8d536661ce581e129d188eeb30c
Author: Johnny_M 
AuthorDate: Fri Jun 19 19:11:47 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 19 19:11:47 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1c842279a41a855ce4a556aa86d72c45fa445b19
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 06ff6003288d..1c842279a41a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 06ff6003288de9438e311a0a04cc2391257c96b0
+Subproject commit 1c842279a41a855ce4a556aa86d72c45fa445b19
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sdraw/main0101.xhp |2 +-
 source/text/shared/01/0118.xhp |2 --
 source/text/smath/main0101.xhp |2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit bd65c7cde8bbd01252f12f683094721784f5715d
Author: Johnny_M 
AuthorDate: Fri Jun 19 13:12:01 2020 +0200
Commit: Olivier Hallot 
CommitDate: Fri Jun 19 19:12:37 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sdraw/main0101.xhp b/source/text/sdraw/main0101.xhp
index 0a360caab..e63af462e 100644
--- a/source/text/sdraw/main0101.xhp
+++ b/source/text/sdraw/main0101.xhp
@@ -43,7 +43,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/shared/01/0118.xhp 
b/source/text/shared/01/0118.xhp
index 73b49ca18..e6ba96dbd 100644
--- a/source/text/shared/01/0118.xhp
+++ b/source/text/shared/01/0118.xhp
@@ -26,11 +26,9 @@
 
 
 
-  Can we remove this?
 
 Save All
   Saves all modified $[officename] 
documents.
-  
 
 
   
diff --git a/source/text/smath/main0101.xhp b/source/text/smath/main0101.xhp
index 4d869d355..fca81312d 100644
--- a/source/text/smath/main0101.xhp
+++ b/source/text/smath/main0101.xhp
@@ -41,7 +41,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit e3dd6e882566c57d27ba5ea4bc623f2b79076530
Author: Johnny_M 
AuthorDate: Fri Jun 19 19:12:37 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 19 19:12:37 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to bd65c7cde8bbd01252f12f683094721784f5715d
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 1c842279a41a..bd65c7cde8bb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1c842279a41a855ce4a556aa86d72c45fa445b19
+Subproject commit bd65c7cde8bbd01252f12f683094721784f5715d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sdraw/main0101.xhp |2 +-
 source/text/shared/01/0116.xhp |2 --
 source/text/smath/main0101.xhp |2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 1c842279a41a855ce4a556aa86d72c45fa445b19
Author: Johnny_M 
AuthorDate: Fri Jun 19 13:08:52 2020 +0200
Commit: Olivier Hallot 
CommitDate: Fri Jun 19 19:11:47 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sdraw/main0101.xhp b/source/text/sdraw/main0101.xhp
index 33c27c137..0a360caab 100644
--- a/source/text/sdraw/main0101.xhp
+++ b/source/text/sdraw/main0101.xhp
@@ -48,7 +48,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/shared/01/0116.xhp 
b/source/text/shared/01/0116.xhp
index 6760be2c8..0dbbd114f 100644
--- a/source/text/shared/01/0116.xhp
+++ b/source/text/shared/01/0116.xhp
@@ -29,11 +29,9 @@
 
 
 
-  Can this be deleted?
 
 Send
 Sends a copy of the current document to different 
applications.
-  
 
 
   
diff --git a/source/text/smath/main0101.xhp b/source/text/smath/main0101.xhp
index f23d0239c..4d869d355 100644
--- a/source/text/smath/main0101.xhp
+++ b/source/text/smath/main0101.xhp
@@ -45,7 +45,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 84ccf3f3505d233b8d738874be40558de0639676
Author: Johnny_M 
AuthorDate: Fri Jun 19 19:10:38 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 19 19:10:38 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 06ff6003288de9438e311a0a04cc2391257c96b0
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index fc2818cb2194..06ff6003288d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fc2818cb219474b18497305aa9eb880c44749e92
+Subproject commit 06ff6003288de9438e311a0a04cc2391257c96b0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/02/1114.xhp |4 ++--
 source/text/sbasic/shared/main0211.xhp|4 ++--
 source/text/shared/00/0004.xhp|2 +-
 source/text/shared/optionen/0104.xhp  |2 +-
 source/text/shared/optionen/01040900.xhp  |2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 06ff6003288de9438e311a0a04cc2391257c96b0
Author: Johnny_M 
AuthorDate: Fri Jun 19 13:01:45 2020 +0200
Commit: Olivier Hallot 
CommitDate: Fri Jun 19 19:10:38 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sbasic/shared/02/1114.xhp 
b/source/text/sbasic/shared/02/1114.xhp
index 156aae60d..a33237355 100644
--- a/source/text/sbasic/shared/02/1114.xhp
+++ b/source/text/sbasic/shared/02/1114.xhp
@@ -30,13 +30,13 @@
 
 
 
-
+
 
 Insert 
Source Text
 Opens the Basic source text in the Basic IDE 
window.
 
 Place the 
cursor in the code where you want to insert the source text, and then click the 
Insert source text icon. Locate the file that contains the Basic 
source text that you want to insert, and then click 
Open.
-
+
 
 
 
diff --git a/source/text/sbasic/shared/main0211.xhp 
b/source/text/sbasic/shared/main0211.xhp
index 6a723a7b1..899e90c09 100644
--- a/source/text/sbasic/shared/main0211.xhp
+++ b/source/text/sbasic/shared/main0211.xhp
@@ -64,8 +64,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
diff --git a/source/text/shared/00/0004.xhp 
b/source/text/shared/00/0004.xhp
index 1b3353af4..8397e05be 100644
--- a/source/text/shared/00/0004.xhp
+++ b/source/text/shared/00/0004.xhp
@@ -365,7 +365,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/shared/optionen/0104.xhp 
b/source/text/shared/optionen/0104.xhp
index b6959d91c..76d9b45a1 100644
--- a/source/text/shared/optionen/0104.xhp
+++ b/source/text/shared/optionen/0104.xhp
@@ -37,7 +37,7 @@
 
   
 
-
+
 
 
 
diff --git a/source/text/shared/optionen/01040900.xhp 
b/source/text/shared/optionen/01040900.xhp
index f313abbf2..36c32af1f 100644
--- a/source/text/shared/optionen/01040900.xhp
+++ b/source/text/shared/optionen/01040900.xhp
@@ -28,7 +28,7 @@
 
 
 
-
+
 
   links; updating options (Writer)
   updating; links in text documents
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/02/1103.xhp |4 ++--
 source/text/sbasic/shared/main0211.xhp|4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit fc2818cb219474b18497305aa9eb880c44749e92
Author: Johnny_M 
AuthorDate: Fri Jun 19 12:41:15 2020 +0200
Commit: Olivier Hallot 
CommitDate: Fri Jun 19 19:09:29 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sbasic/shared/02/1103.xhp 
b/source/text/sbasic/shared/02/1103.xhp
index 6bafb5cde..91d2c92f4 100644
--- a/source/text/sbasic/shared/02/1103.xhp
+++ b/source/text/sbasic/shared/02/1103.xhp
@@ -30,12 +30,12 @@
 
 
 
-
+
 
 Run
 Runs the first macro of the current 
module.
 
-
+
 
 
 
diff --git a/source/text/sbasic/shared/main0211.xhp 
b/source/text/sbasic/shared/main0211.xhp
index c57b39ecb..6a723a7b1 100644
--- a/source/text/sbasic/shared/main0211.xhp
+++ b/source/text/sbasic/shared/main0211.xhp
@@ -40,8 +40,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 0a7f99a4acf344398d47cd4748a98cb8626cdfd1
Author: Johnny_M 
AuthorDate: Fri Jun 19 19:09:29 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 19 19:09:29 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to fc2818cb219474b18497305aa9eb880c44749e92
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index b87c66dbbe22..fc2818cb2194 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b87c66dbbe22afa72b8285f37c5d3774253f81e5
+Subproject commit fc2818cb219474b18497305aa9eb880c44749e92
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 41d525a78b963bfd22abd7cba3dec037837c09ff
Author: Johnny_M 
AuthorDate: Fri Jun 19 19:08:51 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 19 19:08:51 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to b87c66dbbe22afa72b8285f37c5d3774253f81e5
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 6a08ee38a2d8..b87c66dbbe22 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6a08ee38a2d84f5a132e4b043127cee69279d780
+Subproject commit b87c66dbbe22afa72b8285f37c5d3774253f81e5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/01/05020300.xhp |2 +-
 source/text/shared/01/05020301.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6a08ee38a2d84f5a132e4b043127cee69279d780
Author: Johnny_M 
AuthorDate: Fri Jun 19 13:23:38 2020 +0200
Commit: Olivier Hallot 
CommitDate: Fri Jun 19 19:08:08 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/01/05020300.xhp 
b/source/text/shared/01/05020300.xhp
index 696b8e9a9..12c31c2d2 100644
--- a/source/text/shared/01/05020300.xhp
+++ b/source/text/shared/01/05020300.xhp
@@ -58,7 +58,7 @@
 
   Currency category list boxes
   Select a currency, and then scroll 
to the top of the Format list to view the formatting options for 
the currency.
-  
+  
 The format code for currencies uses the form 
[$xxx-nnn], where xxx is the currency symbol, and nnn the country code. Special 
banking symbols, such as EUR (for Euro), do not require the country code. The 
currency format is not dependent on the language that you select in the 
Language box. 
   
 
diff --git a/source/text/shared/01/05020301.xhp 
b/source/text/shared/01/05020301.xhp
index 7e0178fea..172d1ab33 100644
--- a/source/text/shared/01/05020301.xhp
+++ b/source/text/shared/01/05020301.xhp
@@ -283,7 +283,7 @@
 Number 
Format Codes of Currency Formats
 The default 
currency format for the cells in your spreadsheet is determined by the regional 
setting of your operating system. If you want, you can apply a custom currency 
symbol to a cell. For example, enter #,##0.00 € to display 4.50 € 
(Euros).Translators: use the decimal delimiter of your language 
(period or comma) for all number format codes in Calc.
 You can also 
specify the locale setting for the currency by entering the locale code for the 
country after the symbol. For example, [$€-407] represents Euros 
in Germany. To view the locale code for a country, select the country in the 
Language list on the Numbers tab of the Format 
Cells dialog.
-
+
 
 Date 
and Time Formats
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 261e02f8758eba8ab71a13997c33b399ca388807
Author: Johnny_M 
AuthorDate: Fri Jun 19 19:08:08 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 19 19:08:08 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 6a08ee38a2d84f5a132e4b043127cee69279d780
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index e86897a96ba3..6a08ee38a2d8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e86897a96ba396c80a199a539af83b435cec8cea
+Subproject commit 6a08ee38a2d84f5a132e4b043127cee69279d780
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/02/1109.xhp |4 ++--
 source/text/sbasic/shared/main0211.xhp|4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b87c66dbbe22afa72b8285f37c5d3774253f81e5
Author: Johnny_M 
AuthorDate: Fri Jun 19 12:38:13 2020 +0200
Commit: Olivier Hallot 
CommitDate: Fri Jun 19 19:08:51 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sbasic/shared/02/1109.xhp 
b/source/text/sbasic/shared/02/1109.xhp
index 3fdc5cc77..b4f68b8a9 100644
--- a/source/text/sbasic/shared/02/1109.xhp
+++ b/source/text/sbasic/shared/02/1109.xhp
@@ -32,13 +32,13 @@
 
 
 
-
+
 
 Object 
Catalog
 Opens the Objects pane, where you can 
view Basic objects.
 
 Double click 
the name of a function or sub to load the module that contains that function or 
sub, and to position the cursor. Double click the name of a module or dialog to 
load and display that module or dialog.
-
+
 
 
 
diff --git a/source/text/sbasic/shared/main0211.xhp 
b/source/text/sbasic/shared/main0211.xhp
index 3e70c6a82..c57b39ecb 100644
--- a/source/text/sbasic/shared/main0211.xhp
+++ b/source/text/sbasic/shared/main0211.xhp
@@ -56,8 +56,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 26a5f6dadb1115ab9c67947f869ea0da590fb9dd
Author: Johnny_M 
AuthorDate: Fri Jun 19 19:07:03 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 19 19:07:03 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to e86897a96ba396c80a199a539af83b435cec8cea
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 79b88ef30847..e86897a96ba3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 79b88ef30847c5f6aa72ed8a1695879eecb81113
+Subproject commit e86897a96ba396c80a199a539af83b435cec8cea
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/02/1106.xhp |4 ++--
 source/text/sbasic/shared/main0211.xhp|4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e86897a96ba396c80a199a539af83b435cec8cea
Author: Johnny_M 
AuthorDate: Fri Jun 19 12:30:41 2020 +0200
Commit: Olivier Hallot 
CommitDate: Fri Jun 19 19:07:03 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sbasic/shared/02/1106.xhp 
b/source/text/sbasic/shared/02/1106.xhp
index 6543c8e9b..dd497d144 100644
--- a/source/text/sbasic/shared/02/1106.xhp
+++ b/source/text/sbasic/shared/02/1106.xhp
@@ -30,13 +30,13 @@
 
 
 
-
+
 
 Procedure 
Step
 Runs the macro and stops it after the next 
procedure.
 
 You can use 
this command in conjunction with the Watch command to 
troubleshoot errors.
-
+
 
 
 
diff --git a/source/text/sbasic/shared/main0211.xhp 
b/source/text/sbasic/shared/main0211.xhp
index 18344f360..3e70c6a82 100644
--- a/source/text/sbasic/shared/main0211.xhp
+++ b/source/text/sbasic/shared/main0211.xhp
@@ -44,8 +44,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Alain Romedenne (via logerrit)]

 source/media/helpimg/sbasic/ElseIf_fragment.svg   |   22 ++-
 source/media/helpimg/sbasic/If_statement.svg  |   24 ++--
 source/media/helpimg/sbasic/Select-Case_statement.svg |   29 ++--
 source/text/sbasic/shared/03090101.xhp|   68 +++
 source/text/sbasic/shared/03090102.xhp|   20 ++-
 source/text/sbasic/shared/03090103.xhp|   15 +-
 source/text/sbasic/shared/03090201.xhp|  107 --
 source/text/sbasic/shared/03090203.xhp|   50 +---
 8 files changed, 198 insertions(+), 137 deletions(-)

New commits:
commit 79b88ef30847c5f6aa72ed8a1695879eecb81113
Author: Alain Romedenne 
AuthorDate: Mon Jun 15 16:44:54 2020 +0200
Commit: Olivier Hallot 
CommitDate: Fri Jun 19 19:05:57 2020 +0200

tdf#131416 Basic statements syntax diagrams

- Do Until/Do While
- If ElseIf EndIf
- While

- minor fix to Select Case statement

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

diff --git a/source/media/helpimg/sbasic/ElseIf_fragment.svg 
b/source/media/helpimg/sbasic/ElseIf_fragment.svg
index b423bc7fb..49759d441 100644
--- a/source/media/helpimg/sbasic/ElseIf_fragment.svg
+++ b/source/media/helpimg/sbasic/ElseIf_fragment.svg
@@ -1,4 +1,4 @@
-http://www.w3.org/2000/svg";>
+http://www.w3.org/2000/svg";>
 
 /*  */
 
 
-
-
-
-
-ElseIf
-condition
-Then
-statements
-
\ No newline at end of file
+
+
+
+
+
+ElseIf
+Else If
+expression
+Then
+statements
+
\ No newline at end of file
diff --git a/source/media/helpimg/sbasic/If_statement.svg 
b/source/media/helpimg/sbasic/If_statement.svg
index 2717455dc..cd37c12b5 100644
--- a/source/media/helpimg/sbasic/If_statement.svg
+++ b/source/media/helpimg/sbasic/If_statement.svg
@@ -1,4 +1,4 @@
-http://www.w3.org/2000/svg";>
+http://www.w3.org/2000/svg";>
 
 /*  */
 
-
-If
-condition
-Then
-statements
-
-
-Else 
options
-End If
\ No newline at end of file
+
+If
+condition
+Then
+statements
+
+
+Else 
options
+
+
+
+EndIf
+End If
\ No newline at end of file
diff --git a/source/media/helpimg/sbasic/Select-Case_statement.svg 
b/source/media/helpimg/sbasic/Select-Case_statement.svg
index 199819461..97c2b49a5 100644
--- a/source/media/helpimg/sbasic/Select-Case_statement.svg
+++ b/source/media/helpimg/sbasic/Select-Case_statement.svg
@@ -1,4 +1,4 @@
-http://www.w3.org/2000/svg";>
+http://www.w3.org/2000/svg";>
 
 /*  */
 
 
-
-Select Case
-
-
-Case
-
-Else
-
-expression
-,
-statements
-
-End Select
\ No newline at end of file
+
+Select Case
+expression
+
+
+Case
+
+Else
+
+value
+,
+statements
+
+End Select
\ No newline at end of file
diff --git a/source/text/sbasic/shared/03090101.xhp 
b/source/text/sbasic/shared/03090101.xhp
index 71832b815..bd9875630 100644
--- a/source/text/sbasic/shared/03090101.xhp
+++ b/source/text/sbasic/shared/03090101.xhp
@@ -27,48 +27,72 @@
 
 
 
-
 
 
   If statement
+  ElseIf; If statement
+  Else If;If statement
+  Else;If statement
+  Else;If statement
+  End If;If statement
+  EndIf;If statement
 
 
-
-If...Then...Else Statement
-Defines one or 
more statement blocks that you only want to execute if a given condition is 
True.
+If...Then...Else Statement
+Defines one or 
more statement blocks that you only want to execute if a given condition or 
expression is True.
 
 
-Syntax:
+
+If...EndIf statement
+ElseIf fragment
+Else fragment
+
+
+  If condition 
Then 
+  
statements
+  [{ElseIf|Else If} expression Then
+  
statements]
+  [Else 

+  
statements]
+  {EndIf|End If}
+
+  Instead of 
Else If you can write ElseIf, instead of End 
If you can write EndIf.
+  If statements can be shortened 
to one line when using single statement blocks.
 
-If 
condition=true Then Statement block [ElseIf condition=true Then] Statement 
block [Else] Statement block EndIf
+  If 
condition Then statement [Else statement]
 
-Instead of 
Else If you can write ElseIf, instead of End If you can write EndIf.
 
-Parameters:
-The 
If...Then statement executes program blocks depending on given 
conditions. When $[officename] Basic encounters an If statement, 
the condition is tested. If the condition is True, all subsequent statements up 
to the next Else or ElseIf statement are executed. If 
the condition is False, and an ElseIf statement follows, 
$[officename] Basic tests the next condition and executes the following 
statements if the condition is True. If False, the program continues either 
with the next ElseIf or Else statement. Statements 
following Else are executed only if none of the previously tested 
conditions were True. After all conditions are evaluated, and the corresponding 
state

[Libreoffice-commits] core.git: helpcontent2

[Alain Romedenne (via logerrit)]

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

New commits:
commit 9294c63893cf51f7d3964afb3abb0afbfe95a636
Author: Alain Romedenne 
AuthorDate: Fri Jun 19 19:05:57 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 19 19:05:57 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 79b88ef30847c5f6aa72ed8a1695879eecb81113
  - tdf#131416 Basic statements syntax diagrams

- Do Until/Do While
- If ElseIf EndIf
- While

- minor fix to Select Case statement

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

diff --git a/helpcontent2 b/helpcontent2
index 7f5ff553b266..79b88ef30847 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7f5ff553b266093767378d7feab9220e24a27d96
+Subproject commit 79b88ef30847c5f6aa72ed8a1695879eecb81113
___
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 3e019fce8e5ee9c7b9e5cb3d814078d2e2245056
Author: Olivier Hallot 
AuthorDate: Fri Jun 19 13:55:14 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Jun 19 18:55:14 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7f5ff553b266093767378d7feab9220e24a27d96
  - tdf#131825 3D Effects help pages

* Rescued 3 buttons from OO.org 1.1.5
* add icons here and there
* deleted extra page in IMPRESS
* entry "3dEffects" in Index
* entry in Contents

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

diff --git a/helpcontent2 b/helpcontent2
index e1867b2cfa96..7f5ff553b266 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e1867b2cfa96b646f9692855897166f5732ca087
+Subproject commit 7f5ff553b266093767378d7feab9220e24a27d96
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 AllLangHelp_simpress.mk  |1 
 source/auxiliary/sdraw.tree  |1 
 source/text/shared/00/0010.xhp   |   29 +++
 source/text/shared/00/0406.xhp   |2 
 source/text/shared/01/0535.xhp   |   91 +-
 source/text/shared/01/05350200.xhp   |  101 +
 source/text/shared/01/05350300.xhp   |   39 ++---
 source/text/shared/01/05350400.xhp   |   50 +++-
 source/text/shared/01/05350500.xhp   |  139 ++-
 source/text/shared/01/05350600.xhp   |   38 ++---
 source/text/shared/main0201.xhp  |   26 ++
 source/text/simpress/02/1013.xhp |   46 ---
 12 files changed, 317 insertions(+), 246 deletions(-)

New commits:
commit 7f5ff553b266093767378d7feab9220e24a27d96
Author: Olivier Hallot 
AuthorDate: Fri Jun 19 01:52:11 2020 -0300
Commit: Olivier Hallot 
CommitDate: Fri Jun 19 18:55:14 2020 +0200

tdf#131825 3D Effects help pages

* Rescued 3 buttons from OO.org 1.1.5
* add icons here and there
* deleted extra page in IMPRESS
* entry "3dEffects" in Index
* entry in Contents

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

diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index fd781c4c4..9f878a356 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -135,7 +135,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
 helpcontent2/source/text/simpress/02/1010 \
 helpcontent2/source/text/simpress/02/1011 \
 helpcontent2/source/text/simpress/02/1012 \
-helpcontent2/source/text/simpress/02/1013 \
 helpcontent2/source/text/simpress/02/1106 \
 helpcontent2/source/text/simpress/02/1107 \
 helpcontent2/source/text/simpress/02/1108 \
diff --git a/source/auxiliary/sdraw.tree b/source/auxiliary/sdraw.tree
index afc2c2b11..f90a96438 100644
--- a/source/auxiliary/sdraw.tree
+++ b/source/auxiliary/sdraw.tree
@@ -61,6 +61,7 @@
  
  
  Cross-Fading 
Two Objects
+ 3D Effects
  
  
  Combining 
Objects and Constructing Shapes
diff --git a/source/text/shared/00/0010.xhp 
b/source/text/shared/00/0010.xhp
index b62efc8c4..28854b973 100644
--- a/source/text/shared/00/0010.xhp
+++ b/source/text/shared/00/0010.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
 
 
 
@@ -30,12 +27,16 @@
 
 
 
+
+3D Effects
+
+
 
-
+
 
 
-3D 
Effects
-Specifies the properties of 3D object(s) in the current 
document.
+3D Effects
+Specifies the properties of 3D object(s) in the current 
document or converts a 2D object to 3D.
 
 
   
@@ -45,5 +46,83 @@
 
 
 
+
+
+Apply
+Click here to apply the 
properties shown in the dialog to the selected object.
+
+
+
+
+Apply 
icon
+
+
+
+Apply
+
+
+
+
+Update
+Click here to view in 
the dialog all the properties of the selected object.
+
+
+
+
+Update Icon
+
+
+
+Update
+
+
+
+
+
+Convert to 3-D
+Use this 
icon to convert a selected 2D object to a 3D object. You can also 
select several 2D objects and convert them to one single 3D object. To convert 
a group of 2D objects to 3D, you must first ungroup the selected 
objects.
+
+
+
+
+Icon 
Convert to 3-D
+
+
+
+Convert to 3-D
+
+
+
+
+Convert to Rotation Object
+Click 
here to convert a selected 2D object to a 3D rotation object. You can 
also select several 2D objects and convert them to one single 3D rotation 
object. To convert a group of 2D objects to 3D, you must first ungroup the 
selected objects.
+
+
+
+
+
+Icon 
Convert to Rotation Object
+
+
+
+Convert to Rotation Object
+
+
+
+Perspective On/Off
+Click 
here to turn the perspective view on or off.
+
+
+
+
+Icon 
Perspective On/Off
+
+
+
+Perspective On/Off
+
+
+
+
 
 
diff --git a/source/text/shared/01/05350200.xhp 
b/source/text/shared/01/05350200.xhp
index 9280de54c..cb0a3e33c 100644
--- a/source/text/shared/01/05350200.xhp
+++ b/source/text/shared/01/05350200.xhp
@@ -1,7 +1,4 @@
 
-
-
-
 
-
-
-   
+
 
 
 Geometry
@@ -30,113 +25,125 @@
 
 
 
-Geometry
+Geometry
 Adjusts the shape of the selected 3D 
object. You can only modify the shape of a 3D object that was created by 
converting a 2D object. To convert a 2D object to 3D, select the object, 
right-click, and then choose Convert - To 3D, or Convert - 
To 3D Rotation Object.
+
+
+
+
+Geometry Ic

[Libreoffice-commits] dev-tools.git: help3/xhpeditor

[Olivier Hallot (via logerrit)]

 help3/xhpeditor/index.php |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 301a8919a2de90c5998790b39b5551b17102c4c0
Author: Olivier Hallot 
AuthorDate: Fri Jun 19 12:59:03 2020 -0300
Commit: Olivier Hallot 
CommitDate: Fri Jun 19 18:53:57 2020 +0200

Add CHART in app selector

Change-Id: I9abeaa6e92cc69602d3ed41cf7ed30af962bd6e4
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/96747
Tested-by: Olivier Hallot 
Reviewed-by: Olivier Hallot 

diff --git a/help3/xhpeditor/index.php b/help3/xhpeditor/index.php
index 9b6dacc..2e08fac 100644
--- a/help3/xhpeditor/index.php
+++ b/help3/xhpeditor/index.php
@@ -28,7 +28,7 @@ $xhp = $_POST["xhpdoc"];
 
 
 
- 
+
 
 
 
@@ -41,7 +41,7 @@ $xhp = $_POST["xhpdoc"];
 
 
 
-
+
 
 
 
@@ -70,7 +70,7 @@ $xhp = $_POST["xhpdoc"];
echo ''.$value.' ';
}
 echo ' Module: ';
-$appModule = array("WRITER", "CALC", "IMPRESS", "DRAW", "BASE", 
"MATH");
+$appModule = array("WRITER", "CALC", "IMPRESS", "DRAW", "BASE", 
"MATH", "CHART");
 foreach ($appModule as $value){
 echo ''.$value.' ';
 }
@@ -91,7 +91,7 @@ $xhp = $_POST["xhpdoc"];
 libxml_clear_errors();
 $root = 'helpdocument';
 $old = new DOMDocument;
-
+
 echo 'Help File Verification: 
'.$xhp_filename[0];
 echo '';
 echo 'Check XML Formation';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: help3/xhpeditor

[Olivier Hallot (via logerrit)]

 help3/xhpeditor/ed_transform.xsl |2 
 help3/xhpeditor/links.txt.xsl| 3674 +++
 2 files changed, 2257 insertions(+), 1419 deletions(-)

New commits:
commit 836931e1597d80643680f30d904c7a0f34262cbd
Author: Olivier Hallot 
AuthorDate: Fri Jun 19 13:22:51 2020 -0300
Commit: Olivier Hallot 
CommitDate: Fri Jun 19 18:54:32 2020 +0200

Update transforma and icons replacement table

Change-Id: I2195dba51ce026e94cda19cbb1e6ae22f3555c5e
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/96748
Tested-by: Olivier Hallot 
Reviewed-by: Olivier Hallot 

diff --git a/help3/xhpeditor/ed_transform.xsl b/help3/xhpeditor/ed_transform.xsl
index b07c226..2cab011 100644
--- a/help3/xhpeditor/ed_transform.xsl
+++ b/help3/xhpeditor/ed_transform.xsl
@@ -21,7 +21,7 @@
 
 
 
-
+
 

[Libreoffice-commits] dev-tools.git: help3/xhpeditor

[Olivier Hallot (via logerrit)]

 help3/xhpeditor/snippets.js |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 14a98242ebba28662ca75d9d33bd958a267044d7
Author: Olivier Hallot 
AuthorDate: Fri Jun 19 11:43:07 2020 -0300
Commit: Olivier Hallot 
CommitDate: Fri Jun 19 18:52:43 2020 +0200

Improve snippet for icon table and table cell

Change-Id: I6bce115d3b6d041a4c08c2b79b7b17ec4dce762f
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/96742
Tested-by: Olivier Hallot 
Reviewed-by: Olivier Hallot 

diff --git a/help3/xhpeditor/snippets.js b/help3/xhpeditor/snippets.js
index b34fec9..82b3b4f 100644
--- a/help3/xhpeditor/snippets.js
+++ b/help3/xhpeditor/snippets.js
@@ -74,19 +74,21 @@ function image_par() {
 }
 // Tables
 // simple table cell
-function tCell (role){
-return '   \n   \n   \n';
+function tCell (role,text){
+var newtext = (text == '') ? 'CHANGE ME' : text;
+return '   \n   '+ newtext +'\n   \n';
 }
 
 function iconTable() {
 var a1 = '\n\n
\n';
-var a2 = '\nIcon\n';
-var a3 = '\n   \n' + tCell("paragraph") + '
\n\n';
-editor.replaceRange(a1 + a2 + a3, editor.doc.getCursor());
+var a2 = '\nIcon ';
+var a3 = '\n\n   \n';
+var a4 = tCell("paragraph", editor.doc.getSelection()) + '
\n\n';
+editor.replaceSelection(a1 + a2 + editor.doc.getSelection() + a3 + a4,'');
 }
 
 function tableCell() {
-editor.replaceRange(tCell('tablecontent'), editor.doc.getCursor());
+editor.replaceSelection(tCell('tablecontent',editor.doc.getSelection()), 
'');
 }
 
 function table2R3C() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk xmlsecurity/CppunitTest_xmlsecurity_signing.mk xmlsecurity/qa

[Miklos Vajna (via logerrit)]

 RepositoryExternal.mk  |1 
 xmlsecurity/CppunitTest_xmlsecurity_signing.mk |3 
 xmlsecurity/qa/unit/signing/data/add-visible-signature.pdf |binary
 xmlsecurity/qa/unit/signing/signing.cxx|   76 +
 4 files changed, 80 insertions(+)

New commits:
commit fb8f0ef26d57986bd27c6c5088939c32453e6b06
Author: Miklos Vajna 
AuthorDate: Fri Jun 19 17:21:58 2020 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jun 19 18:42:42 2020 +0200

sd signature line: add testcase

Fails with commit 9b7a890fd59744459692d7f66402c6bdd25acec4 (sd signature
line: include shape in the appearance widget, 2020-06-19) reverted.

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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c2f8383aa02e..05e07c4bc5ea 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4157,6 +4157,7 @@ endef
 ifneq ($(ENABLE_PDFIUM),)
 define gb_LinkTarget__use_pdfium
 $(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,pdfium) \
-I$(call gb_UnpackedTarball_get_dir,pdfium)/public \
-DCOMPONENT_BUILD \
$$(INCLUDE) \
diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk 
b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
index c748c644aecb..11a00d0482b4 100644
--- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
+++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
@@ -22,16 +22,19 @@ $(eval $(call 
gb_CppunitTest_use_libraries,xmlsecurity_signing, \
sal \
sax \
sfx \
+   svx \
test \
tl \
unotest \
utl \
+   vcl \
xmlsecurity \
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,xmlsecurity_signing,\
 boost_headers \
 libxml2 \
+$(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,xmlsecurity_signing,\
diff --git a/xmlsecurity/qa/unit/signing/data/add-visible-signature.pdf 
b/xmlsecurity/qa/unit/signing/data/add-visible-signature.pdf
new file mode 100644
index ..8dedb6998b23
Binary files /dev/null and 
b/xmlsecurity/qa/unit/signing/data/add-visible-signature.pdf differ
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx 
b/xmlsecurity/qa/unit/signing/signing.cxx
index 637e5057bd05..4373a5a5bb26 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -26,6 +26,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -50,6 +52,16 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+
+#if HAVE_FEATURE_PDFIUM
+#include 
+#include 
+#include 
+#endif
 
 using namespace com::sun::star;
 
@@ -623,6 +635,70 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testPDFNo)
  
static_cast(pObjectShell->GetDocumentSignatureState()));
 }
 
+#if HAVE_FEATURE_PDFIUM
+CPPUNIT_TEST_FIXTURE(SigningTest, testPDFAddVisibleSignature)
+{
+// Given: copy the test document to a temporary file, as it'll be modified.
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+OUString aSourceURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"add-visible-signature.pdf";
+OUString aURL = aTempFile.GetURL();
+osl::File::RC eRet = osl::File::copy(aSourceURL, aURL);
+CPPUNIT_ASSERT_EQUAL(osl::File::RC::E_None, eRet);
+
+// Open it.
+uno::Sequence aArgs = { 
comphelper::makePropertyValue("ReadOnly", true) };
+mxComponent = loadFromDesktop(aURL, 
"com.sun.star.drawing.DrawingDocument", aArgs);
+SfxBaseModel* pBaseModel = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pBaseModel);
+SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+CPPUNIT_ASSERT(pObjectShell);
+
+// Add a signature line.
+uno::Reference xFactory(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xShape(
+xFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"), 
uno::UNO_QUERY);
+xShape->setPosition(awt::Point(1000, 15000));
+xShape->setSize(awt::Size(1, 1));
+uno::Reference xSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xDrawPages = xSupplier->getDrawPages();
+uno::Reference xDrawPage(xDrawPages->getByIndex(0), 
uno::UNO_QUERY);
+xDrawPage->add(xShape);
+
+// Select it and assign a certificate.
+uno::Reference 
xSelectionSupplier(pBaseModel->getCurrentController(),
+
uno::UNO_QUERY);
+xSelectionSupplier->select(uno::makeAny(xShape));
+uno::Sequence> aCertificates
+= 
mxSecurityContext->getSecurityEnvironment()->getPersonalCertificates();
+if (!aCertificates.hasElements())
+{
+return;
+}
+SdrView* pView = SfxViewShell::Current()->GetDrawView();
+svx::SignatureLineHelper::s

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

[Caolán McNamara (via logerrit)]

 svx/source/tbxctrls/tbxcolorupdate.cxx |   18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 3c17bb91f29d431f99a742bd14ffc9612f25a7af
Author: Caolán McNamara 
AuthorDate: Fri Jun 19 15:06:23 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jun 19 17:23:29 2020 +0200

tdf#134084 use the desired image size, not the current image size

when updating the color bar

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

diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx 
b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 31948678b7a7..f21ad6b9c0d0 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -120,8 +120,22 @@ namespace svx
 {
 if (mbWideButton)
 return mpTbx->GetItemContentSize(mnBtnId);
-Image aImage(mpTbx->GetItemImage(mnBtnId));
-return aImage.GetSizePixel();
+vcl::ImageType eImageType = GetImageSize();
+int nHeight(16);
+switch (eImageType)
+{
+case vcl::ImageType::Size16:
+nHeight = 16;
+break;
+case vcl::ImageType::Size26:
+nHeight = 26;
+break;
+case vcl::ImageType::Size32:
+nHeight = 32;
+break;
+}
+int nWidth = nHeight;
+return Size(nWidth, nHeight);
 }
 
 ToolboxButtonColorUpdaterBase::~ToolboxButtonColorUpdaterBase()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sfx2/source/doc/objmisc.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit ac65ade24aa10c0a39d7d38576ad54bd00724455
Author: Caolán McNamara 
AuthorDate: Mon Jun 8 21:22:58 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jun 19 17:14:31 2020 +0200

tdf#128006 allow documents inside odbs to be as trusted as their container

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

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index e3e07dd5c306..7f0656d7b310 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1744,7 +1744,12 @@ OUString SfxObjectShell_Impl::getDocumentLocation() const
 // for documents made from a template: get the name of the template
 sLocation = rDocShell.getDocProperties()->getTemplateURL();
 }
+
+// tdf#128006 take document base url as location
+if (sLocation.isEmpty())
+sLocation = rDocShell.getDocumentBaseURL();
 }
+
 return sLocation;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sfx2/source/doc/objmisc.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 02e20dfa733d050e9d37285ad36323b2aad46ffe
Author: Caolán McNamara 
AuthorDate: Mon Jun 8 21:22:58 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jun 19 17:13:44 2020 +0200

tdf#128006 allow documents inside odbs to be as trusted as their container

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

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index e9adb018eae0..1961a7282ef5 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1742,7 +1742,12 @@ OUString SfxObjectShell_Impl::getDocumentLocation() const
 // for documents made from a template: get the name of the template
 sLocation = rDocShell.getDocProperties()->getTemplateURL();
 }
+
+// tdf#128006 take document base url as location
+if (sLocation.isEmpty())
+sLocation = rDocShell.getDocumentBaseURL();
 }
+
 return sLocation;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 008d4ea32f475a669668394f6b886d255a586090
Author: Tamás Zolnai 
AuthorDate: Fri Jun 19 16:24:23 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Fri Jun 19 17:11:22 2020 +0200

cypress: stabilize calc/cell_appearance_spec.js test.

Change-Id: I3695e3e5608dee9b6f1f7f1dfc43dad76d9844f1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96740
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js 
b/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
index e4edc648d..c34af53cd 100644
--- a/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
+++ b/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
@@ -20,6 +20,9 @@ function removeTextSelection() {
cy.get('.spreadsheet-cell-resize-marker')
.invoke('attr', 'style')
.should('contain', '-8px,');
+
+   cy.get('input#addressInput')
+   .should('have.prop', 'value', 'B1:B1048576');
}
 
cy.log('Removing text selection - end.');
@@ -41,6 +44,9 @@ function selectAllMobile(removeSelection = true) {
.invoke('attr', 'style')
.should('contain', '(-9px, -8px,');
 
+   cy.get('input#addressInput')
+   .should('have.prop', 'value', 'A1:AMJ1048576');
+
cy.log('Selecting all text - end.');
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

[Stephan Bergmann (via logerrit)]

 configure.ac|3 +++
 solenv/gbuild/gbuild.mk |7 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 2f00ece21d4d51b553fd905b9a2e8eed12adf195
Author: Stephan Bergmann 
AuthorDate: Fri Jun 19 15:33:04 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jun 19 17:02:55 2020 +0200

Make --enable-sal-log orthogonal to --enable-debug

...for consistency with other options like --enable-assert-always-abort

Change-Id: I3734485e03203aaee065e1435dfd33f980b1b5eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96736
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 553402e33515..ccc9c07b21cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4146,6 +4146,9 @@ printf ("hello world\n");
 fi
 AC_SUBST(ENABLE_GDB_INDEX)
 
+if test -z "$enable_sal_log" && test "$ENABLE_DEBUG" = TRUE; then
+enable_sal_log=yes
+fi
 if test "$enable_sal_log" = yes; then
 ENABLE_SAL_LOG=TRUE
 fi
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 97d2879dcc9b..64ca8184e2fa 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -235,18 +235,13 @@ gb_GLOBALDEFS += -DNDEBUG \
 
 endif
 
-ifeq ($(gb_DEBUGLEVEL),0)
-
 ifeq ($(ENABLE_SAL_LOG),TRUE)
 gb_GLOBALDEFS += -DSAL_LOG_INFO \
 -DSAL_LOG_WARN \
 
 endif
 
-else
-gb_GLOBALDEFS += -DSAL_LOG_INFO \
--DSAL_LOG_WARN \
-
+ifneq ($(gb_DEBUGLEVEL),0)
 ifneq ($(gb_DEBUGLEVEL),1) # 2 or more
 gb_GLOBALDEFS += -DDEBUG \
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/docnode/nodes.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit a60dd9ef1361c5925803acaa5292e99277d1faf3
Author: Michael Stahl 
AuthorDate: Fri Jun 19 15:05:42 2020 +0200
Commit: Michael Stahl 
CommitDate: Fri Jun 19 16:42:08 2020 +0200

tdf#132326 sw_redlinehide: no frames allowed in Undo SwNodesArray

This crashes in SwAccessibleParagraph::GetRealHeadingLevel(); the a11y
should have been disposed earlier because the node it's connected to is
in the Undo SwNodesArray.

When SwUndoDelete::SwUndoDelete() calls SwNodes::MoveNodes(), all
existing frames must be destroyed; the MoveNodes() would reset its flag
temporarily inside a section, to delay creating the frames inside the
section when moving to the live SwNodesArray, but this also prevents
the deletion when moving in the other direction.

(crash is regression from 723728cd358693b8f4bc9d913541aa4479f2bd48)

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

diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index e854f0935861..2486821850c1 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -661,7 +661,11 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, 
SwNodes & rNodes,
 {
 pSctNd->NodesArrChgd();
 ++nSectNdCnt;
-bNewFrames = false;
+// tdf#132326 do not let frames survive in undo nodes
+if 
(!GetDoc()->GetIDocumentUndoRedo().IsUndoNodes(rNodes))
+{
+bNewFrames = false;
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Java and LO 7.0.beta2+ / master

[Stephan Bergmann]

On 19/06/2020 15:53, Jean-Baptiste Faure wrote:

Le 19/06/2020 à 10:45, Stephan Bergmann a écrit :

On 19/06/2020 10:41, Jean-Baptiste Faure wrote:

Does the --enable-sal-log option need a make clean before make build ?


sure  (note that it it would already be implicitly enabled in an 
--enable-debug or --enable-dbgutil build, though)


Well, LO7 rebuild. Now I get the following error message in the terminal 
when I get the message box saying that the JRE 8 is defective:


warn:stoc:1767:1767:stoc/source/javaloader/javaloader.cxx:165: 
getJavaVM returned null
warn:dbaccess:1767:1767:dbaccess/source/ui/misc/linkeddocuments.cxx:188: 
DBG_UNHANDLED_EXCEPTION in void 
dbaui::OLinkedDocumentsAccess::impl_newWithPilot(const char*, 
sal_Int32, const rtl::OUString&) exception: 
com.sun.star.loader.CannotActivateFactoryException message: Could not 
create Java implementation loader 
/home/libo/7/stoc/source/javaloader/javaloader.cxx:325


Complete log is attached.


I'd dig into that


Error occurred during initialization of VM
Could not allocate metaspace: 1073741824 bytes


issue.  No idea what's going wrong for you.

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

[Libreoffice-commits] online.git: cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/calc/alignment_options_spec.js |   25 
+++---
 cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js|3 +
 cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js |3 +
 3 files changed, 15 insertions(+), 16 deletions(-)

New commits:
commit 08428824cbd4ea74c68682fe36043c4e5fa6048d
Author: Tamás Zolnai 
AuthorDate: Fri Jun 19 14:51:15 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Fri Jun 19 16:19:00 2020 +0200

cypress: stabilize 'Merge cells' test case.

Change-Id: I9661c00c26ea47cd1dd5f8121801b2e0ff083b53
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96733
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git 
a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js 
b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
index 93ac85162..4ed008fe4 100644
--- a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
@@ -328,26 +328,19 @@ describe('Change alignment settings.', function() {
// Select the full row
calcMobileHelper.selectFirstRow();
 
-   // Even after we get the cell row selection the merge cell 
options is still disabled
-   // So we open mobile wizard again and again until merge cells 
get the right state
+   // Despite the selection is there, merge cells needs more time 
here.
+   cy.wait(1000);
+
mobileHelper.openMobileWizard();
-   cy.get('body')
-   .should(function() {
-   mobileHelper.closeMobileWizard();
-   mobileHelper.openMobileWizard();
 
-   cy.get('#ScAlignmentPropertyPanel')
-   .click();
+   cy.get('#ScAlignmentPropertyPanel')
+   .click();
 
-   cy.get('#AlignLeft')
-   .should('be.visible');
+   cy.get('#AlignLeft')
+   .should('be.visible');
 
-   cy.get('input#mergecells')
-   .then(function(items) {
-   
expect(items).to.have.lengthOf(1);
-   
expect(items[0]).to.not.have.attr('disabled');
-   });
-   });
+   cy.get('input#mergecells')
+   .should('not.have.attr', 'disabled');
 
// Click merge cells
cy.get('input#mergecells')
diff --git a/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js 
b/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js
index d1c2a02a6..e62a05501 100644
--- a/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js
@@ -124,6 +124,9 @@ describe('Interact with bottom toolbar.', function() {
// Select the full row
calcMobileHelper.selectFirstRow();
 
+   // Despite the selection is there, merge cells needs more time 
here.
+   cy.wait(1000);
+
cy.get('.w2ui-tb-image.w2ui-icon.togglemergecells')
.click();
 
diff --git a/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js 
b/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
index e0f95f287..e4edc648d 100644
--- a/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
+++ b/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
@@ -60,6 +60,9 @@ function selectFirstRow() {
 
cy.get('.spreadsheet-cell-resize-marker:nth-of-type(2)')
.should('not.be.visible');
+
+   cy.get('input#addressInput')
+   .should('have.prop', 'value', 'A1:AMJ1');
 }
 
 module.exports.removeTextSelection = removeTextSelection;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-5' - sdext/source

[Martin Whitaker (via logerrit)]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 0c27277b90c9ddd6d16c66b895f56739c791d705
Author: Martin Whitaker 
AuthorDate: Fri May 8 21:47:25 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Jun 19 16:12:44 2020 +0200

tdf#131353: Fix build with poppler 0.86.0

Change-Id: I89b4635a6a3e3a5522172d6f4c3f14e6c14994b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93789
Tested-by: René Engelhard 
Tested-by: Jenkins
Reviewed-by: Tomáš Chvátal 
(cherry picked from commit b42ab78fb871924896b3cc38a7b2f1257151f711)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96640
Tested-by: Adolfo Jayme Barrientos 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index e9c2a407c279..16ad04bf660a 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
 if (!(pAction && pAction->getKind() == actionURI))
 return;
 
-#if POPPLER_CHECK_VERSION(0, 72, 0)
+#if POPPLER_CHECK_VERSION(0, 86, 0)
+const char* pURI = static_cast(pAction)->getURI().c_str();
+#elif POPPLER_CHECK_VERSION(0, 72, 0)
 const char* pURI = static_cast(pAction)->getURI()->c_str();
 #else
 const char* pURI = static_cast(pAction)->getURI()->getCString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sdext/source

[Martin Whitaker (via logerrit)]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d40f36bf47814c324a1ec467c566255fb187444b
Author: Martin Whitaker 
AuthorDate: Fri May 8 21:47:25 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Jun 19 16:12:26 2020 +0200

tdf#131353: Fix build with poppler 0.86.0

Change-Id: I89b4635a6a3e3a5522172d6f4c3f14e6c14994b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93789
Tested-by: René Engelhard 
Tested-by: Jenkins
Reviewed-by: Tomáš Chvátal 
(cherry picked from commit b42ab78fb871924896b3cc38a7b2f1257151f711)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96639
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index e9c2a407c279..16ad04bf660a 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
 if (!(pAction && pAction->getKind() == actionURI))
 return;
 
-#if POPPLER_CHECK_VERSION(0, 72, 0)
+#if POPPLER_CHECK_VERSION(0, 86, 0)
+const char* pURI = static_cast(pAction)->getURI().c_str();
+#elif POPPLER_CHECK_VERSION(0, 72, 0)
 const char* pURI = static_cast(pAction)->getURI()->c_str();
 #else
 const char* pURI = static_cast(pAction)->getURI()->getCString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/integration_tests cypress_test/support

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js|2 
++
 cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js |2 
++
 cypress_test/integration_tests/mobile/writer/insert_object_spec.js |2 
++
 cypress_test/support/index.js  |1 -
 4 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit da6f94a3eda08de57a64d00aa14f8fb58eb29f55
Author: Tamás Zolnai 
AuthorDate: Fri Jun 19 13:26:20 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Fri Jun 19 16:10:42 2020 +0200

cypress: fix attachFile is not a function error.

Include the related package directly in the test files,
where we use it. Somtimes supportfile is not handled correctly
in parallel build, which lead to missing function error.

Change-Id: Id4740a9384f0fe170a26b76ecd393a5beda1f5c5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96723
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git 
a/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js 
b/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
index e4dfbb142..04ec7cf6a 100644
--- a/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
@@ -1,5 +1,7 @@
 /* global describe it cy beforeEach require afterEach expect*/
 
+require('cypress-file-upload');
+
 var helper = require('../../common/helper');
 var calcHelper = require('../../common/calc_helper');
 var mobileHelper = require('../../common/mobile_helper');
diff --git 
a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js 
b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
index 16d2703e8..e41d6f826 100644
--- a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
@@ -1,5 +1,7 @@
 /* global describe it cy beforeEach require expect afterEach*/
 
+require('cypress-file-upload');
+
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
 var impressMobileHelper = require('./impress_mobile_helper');
diff --git a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js 
b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
index df72aef3f..e9daa39ee 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
@@ -1,5 +1,7 @@
 /* global describe it cy beforeEach require expect afterEach */
 
+require('cypress-file-upload');
+
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
 var writerMobileHelper = require('./writer_mobile_helper');
diff --git a/cypress_test/support/index.js b/cypress_test/support/index.js
index 453ced414..8f683db34 100644
--- a/cypress_test/support/index.js
+++ b/cypress_test/support/index.js
@@ -1,4 +1,3 @@
 /* global require */
 
 require('cypress-failed-log');
-require('cypress-file-upload');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - desktop/source include/tools include/vcl sc/inc sc/source sw/inc sw/source tools/CppunitTest_tools_test.mk tools/Library_

[Noel Grandin (via logerrit)]

 desktop/source/lib/init.cxx   |   31 +---
 include/tools/json_writer.hxx |   88 +++
 include/vcl/ITiledRenderable.hxx  |4 
 sc/inc/chgtrack.hxx   |3 
 sc/inc/docuno.hxx |2 
 sc/source/core/tool/chgtrack.cxx  |   30 +--
 sc/source/ui/unoobj/docuno.cxx|8 -
 sw/inc/unotxdoc.hxx   |2 
 sw/source/uibase/uno/unotxdoc.cxx |   36 +---
 tools/CppunitTest_tools_test.mk   |1 
 tools/Library_tl.mk   |1 
 tools/qa/cppunit/test_json_writer.cxx |   65 
 tools/source/misc/json_writer.cxx |  259 ++
 13 files changed, 458 insertions(+), 72 deletions(-)

New commits:
commit 37db9d6876e6f64153d37d53bc0ab7022d8f2b68
Author: Noel Grandin 
AuthorDate: Fri Jun 19 09:57:58 2020 +0200
Commit: Michael Meeks 
CommitDate: Fri Jun 19 14:53:53 2020 +0100

asan: need to use malloc instead of new for tools::JsonWriter

because the LOK API expects memory returned from those calls to be
malloc'ed

Change-Id: If6fbfb60c433bd6e58bc90a9a90a90663e2e1c60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96676
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/tools/json_writer.hxx b/include/tools/json_writer.hxx
index e811bb90e277..34930584730d 100644
--- a/include/tools/json_writer.hxx
+++ b/include/tools/json_writer.hxx
@@ -11,6 +11,7 @@
 #include 
 #include 
 #include 
+#include 
 
 /** Simple JSON encoder designed specifically for LibreOfficeKit purposes.
  *
@@ -27,7 +28,7 @@ class TOOLS_DLLPUBLIC JsonWriter
 friend class ScopedJsonWriterNode;
 
 int mSpaceAllocated;
-std::unique_ptr maBuffer;
+char* mpBuffer;
 int mStartNodeCount;
 char* mPos;
 bool mbFirstFieldInNode;
@@ -53,14 +54,15 @@ private:
 
 inline void ensureSpace(int noMoreBytesRequired)
 {
-int currentUsed = mPos - maBuffer.get();
+int currentUsed = mPos - mpBuffer;
 if (currentUsed + noMoreBytesRequired >= mSpaceAllocated)
 {
 auto newSize = std::max(mSpaceAllocated * 2, (currentUsed + 
noMoreBytesRequired) * 2);
-auto pNew = new char[newSize];
-memcpy(pNew, maBuffer.get(), currentUsed);
-maBuffer.reset(pNew);
-mPos = maBuffer.get();
+char* pNew = static_cast(malloc(newSize));
+memcpy(pNew, mpBuffer, currentUsed);
+free(mpBuffer);
+mpBuffer = pNew;
+mPos = mpBuffer;
 }
 }
 };
diff --git a/tools/qa/cppunit/test_json_writer.cxx 
b/tools/qa/cppunit/test_json_writer.cxx
index c4e9331c8d17..e27afc95f712 100644
--- a/tools/qa/cppunit/test_json_writer.cxx
+++ b/tools/qa/cppunit/test_json_writer.cxx
@@ -7,6 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -44,7 +48,11 @@ void JsonWriterTest::test1()
 aJson.put("int", 12);
 }
 
-std::unique_ptr result(aJson.extractData());
+struct Free
+{
+void operator()(void* p) const { std::free(p); }
+};
+std::unique_ptr result(aJson.extractData());
 
 CPPUNIT_ASSERT_EQUAL(std::string("{ \"node\": { \"oustring\": \"val1\", 
\"ostring\": \"val2\", "
  "\"charptr\": \"val3\", \"int\": 12}}"),
diff --git a/tools/source/misc/json_writer.cxx 
b/tools/source/misc/json_writer.cxx
index a233381038c4..5bba05a4c21d 100644
--- a/tools/source/misc/json_writer.cxx
+++ b/tools/source/misc/json_writer.cxx
@@ -19,9 +19,9 @@ constexpr int DEFAULT_BUFFER_SIZE = 2048;
 
 JsonWriter::JsonWriter()
 : mSpaceAllocated(DEFAULT_BUFFER_SIZE)
-, maBuffer(new char[mSpaceAllocated])
+, mpBuffer(static_cast(malloc(mSpaceAllocated)))
 , mStartNodeCount(0)
-, mPos(maBuffer.get())
+, mPos(mpBuffer)
 {
 *mPos = '{';
 ++mPos;
@@ -29,7 +29,11 @@ JsonWriter::JsonWriter()
 ++mPos;
 }
 
-JsonWriter::~JsonWriter() { assert(!maBuffer && "forgot to extract data?"); }
+JsonWriter::~JsonWriter()
+{
+assert(!mpBuffer && "forgot to extract data?");
+free(mpBuffer);
+}
 
 ScopedJsonWriterNode JsonWriter::startNode(const char* pNodeName)
 {
@@ -239,14 +243,16 @@ void JsonWriter::addCommaBeforeField()
 char* JsonWriter::extractData()
 {
 assert(mStartNodeCount == 0 && "did not close all nodes");
-assert(maBuffer && "data already extracted");
+assert(mpBuffer && "data already extracted");
 // add closing brace
 *mPos = '}';
 ++mPos;
 // null-terminate
 *mPos = 0;
 mPos = nullptr;
-return maBuffer.release();
+char* pRet = nullptr;
+std::swap(pRet, mpBuffer);
+return pRet;
 }
 
 } // namespace tools
commit aac0764cae772d4ace7a279ae9800319dc61f46c
Author: Noel Grandin 
AuthorDate: Mon Jun 15 20:32:25 2020 +0200
Commit: Michael Meeks 
CommitDate: Fri Jun 19 14:46:16 2020 +0100

ne

Re: Need Help uploading code

[julien2412]

Hello Dante,

Great work for the patches!
Did you take a look at
https://wiki.documentfoundation.org/Development/GetInvolved ?
It explains what it needs to contribute on LO from development point of
view.

Julien



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/data3/tdf133990.odt |binary
 sw/qa/extras/uiwriter/uiwriter3.cxx   |   27 +++
 2 files changed, 27 insertions(+)

New commits:
commit 8e4c79472644452431381733a5e4b21f98fcdcf3
Author: Xisco Fauli 
AuthorDate: Fri Jun 19 12:46:30 2020 +0200
Commit: Xisco Fauli 
CommitDate: Fri Jun 19 16:01:34 2020 +0200

tdf#133990: sw: Add unittest

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

diff --git a/sw/qa/extras/uiwriter/data3/tdf133990.odt 
b/sw/qa/extras/uiwriter/data3/tdf133990.odt
new file mode 100644
index ..8eaca8161701
Binary files /dev/null and b/sw/qa/extras/uiwriter/data3/tdf133990.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 95d72d82f9a3..dda897ee2ee3 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -179,6 +179,33 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf125261)
  getProperty(getRun(getParagraph(1), 1), 
"HyperLinkURL"));
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf133990)
+{
+load(DATA_DIRECTORY, "tdf133990.odt");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xIndexAccess(xTextTablesSupplier->getTextTables(),
+ uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(6), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+//Use selectAll 3 times in a row
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+
+dispatchCommand(mxComponent, ".uno:Delete", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
+
+//Without the fix in place, it would have crashed here
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(6), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf133982)
 {
 load(DATA_DIRECTORY, "tdf133982.docx");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Java and LO 7.0.beta2+ / master

[Jean-Baptiste Faure]

Le 19/06/2020 à 10:45, Stephan Bergmann a écrit :

On 19/06/2020 10:41, Jean-Baptiste Faure wrote:

Does the --enable-sal-log option need a make clean before make build ?


sure  (note that it it would already be implicitly enabled in an 
--enable-debug or --enable-dbgutil build, though)


Well, LO7 rebuild. Now I get the following error message in the terminal 
when I get the message box saying that the JRE 8 is defective:



warn:stoc:1767:1767:stoc/source/javaloader/javaloader.cxx:165: getJavaVM 
returned null
warn:dbaccess:1767:1767:dbaccess/source/ui/misc/linkeddocuments.cxx:188: 
DBG_UNHANDLED_EXCEPTION in void 
dbaui::OLinkedDocumentsAccess::impl_newWithPilot(const char*, sal_Int32, const 
rtl::OUString&) exception: com.sun.star.loader.CannotActivateFactoryException 
message: Could not create Java implementation loader 
/home/libo/7/stoc/source/javaloader/javaloader.cxx:325


Complete log is attached.

Best regards.

JBF
--
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
@JBF-zenbook:~$ lo7
info:jfw.level2:1747:1747:jvmfwk/inc/fwkutil.hxx:57: Using configuration file 
file:///home/libo/7/instdir/program/jvmfwk3rc
info:jfw:1747:1747:jvmfwk/source/fwkbase.cxx:67: Using bootstrap parameter 
UNO_JAVA_JFW_USER_DATA = 
"file:///home//.config/libreoffice/70//user/config/javasettings_Linux_X86_64.xml"
info:jfw:1747:1747:jvmfwk/source/fwkbase.cxx:67: Using bootstrap parameter 
UNO_JAVA_JFW_USER_DATA = 
"file:///home//.config/libreoffice/70//user/config/javasettings_Linux_X86_64.xml"
info:jfw:1747:1747:jvmfwk/source/fwkbase.cxx:67: Using bootstrap parameter 
UNO_JAVA_JFW_USER_DATA = 
"file:///home//.config/libreoffice/70//user/config/javasettings_Linux_X86_64.xml"
info:jfw:1747:1747:jvmfwk/source/fwkbase.cxx:67: Using bootstrap parameter 
UNO_JAVA_JFW_SHARED_DATA = 
"file:///home/libo/7/instdir/program/../share/config/javasettings_Linux_X86_64.xml"
info:jfw:1747:1747:jvmfwk/source/fwkbase.cxx:67: Using bootstrap parameter 
UNO_JAVA_JFW_USER_DATA = 
"file:///home//.config/libreoffice/70//user/config/javasettings_Linux_X86_64.xml"
info:jfw:1747:1747:jvmfwk/source/fwkbase.cxx:67: Using bootstrap parameter 
UNO_JAVA_JFW_USER_DATA = 
"file:///home//.config/libreoffice/70//user/config/javasettings_Linux_X86_64.xml"
info:jfw:1747:1747:jvmfwk/source/fwkbase.cxx:67: Using bootstrap parameter 
UNO_JAVA_JFW_USER_DATA = 
"file:///home//.config/libreoffice/70//user/config/javasettings_Linux_X86_64.xml"
info:jfw:1747:1747:jvmfwk/source/fwkbase.cxx:67: Using bootstrap parameter 
UNO_JAVA_JFW_SHARED_DATA = 
"file:///home/libo/7/instdir/program/../share/config/javasettings_Linux_X86_64.xml"
info:jfw.level2:1747:1747:jvmfwk/source/fwkbase.cxx:295: Using bootstrap 
parameter UNO_JAVA_JFW_VENDOR_SETTINGS = 
file:///home/libo/7/instdir/program/javavendors.xml
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx:858:
 Checking existence of Java runtime library
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx:865:
 Java runtime library exist: 
file:///usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:400: 
Executing: file:///usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:425: Java 
executed successfully
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:434: 
Properties found:
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:444:   
"java.runtime.name=OpenJDK Runtime Environment"
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:444:   
"sun.boot.library.path=/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64"
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:444:   
"java.vm.version=25.252-b09"
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:444:   
"java.vm.vendor=Private Build"
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:444:   
"java.vendor.url=http://java.oracle.com/";
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:444:   
"path.separator=:"
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:444:   
"java.vm.name=OpenJDK 64-Bit Server VM"
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:444:   
"file.encoding.pkg=sun.io"
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:444:   
"user.country=FR"
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:444:   
"sun.java.launcher=SUN_STANDARD"
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:444:   
"sun.os.patch.level=unknown"
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:444:   
"java.vm.specification.name=Java Virtual Machine Specification"
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx:444:   
"user.dir=/home/"
info:jfw.level2:1747:1747:jvmfwk/plugins/sunmajor/pluginlib/util.cxx

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 8 commits - android/Bootstrap configure.ac external/nss sc/source sd/source

[Henry Castro (via logerrit)]

 android/Bootstrap/Makefile.shared |6 +++---
 configure.ac  |1 +
 external/nss/nss-android.patch.1  |   12 
 sc/source/ui/app/inputhdl.cxx |   22 ++
 sc/source/ui/unoobj/docuno.cxx|2 +-
 sd/source/ui/view/drviews2.cxx|3 ++-
 6 files changed, 29 insertions(+), 17 deletions(-)

New commits:
commit 398782041dde160cf31a69cd015340ad425b3514
Author: Henry Castro 
AuthorDate: Fri Jun 5 08:59:26 2020 -0400
Commit: Michael Meeks 
CommitDate: Fri Jun 19 14:26:23 2020 +0100

android: fix the build output directory

When compiling in a different build output directory,
the "liblo-native-code.so" file is created in the source directory and
it fails compiling the "online" project

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

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index 3e38e14617cc..eb3812f1b9fb 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -14,8 +14,8 @@
 # configurability on platforms like Android and iOS where apps based on LO
 # code are very much self-contained pre-packaged thingies.
 
-SODEST=jniLibs/$(ANDROID_APP_ABI)
-OBJLOCAL=obj/local/$(ANDROID_APP_ABI)
+SODEST=$(BUILDDIR)/android/jniLibs/$(ANDROID_APP_ABI)
+OBJLOCAL=$(BUILDDIR)/android/obj/local/$(ANDROID_APP_ABI)
 
 #
 # Helpful rules ...
commit 6ab1c24b6c927cd00f482f50008b2048d3720fae
Author: Michael Weghorn 
AuthorDate: Mon Dec 16 10:46:29 2019 +0100
Commit: Michael Meeks 
CommitDate: Fri Jun 19 14:26:21 2020 +0100

android: Fix linking of liblo-native-code.so on x86_64

This is similar to commit c6dadf5035c8e1c31dbd3fccec167bd4a906bf54
("commit android: Fix linking of liblo-native-code.so on aarch64.").

Build previously failed with

Linking obj/local/x86_64/liblo-native-code.so
.../x86_64-linux-android/bin/ld.gold: error: cannot find 
-landroid_support
clang++: error: linker command failed with exit code 1 (use -v to see 
invocation)
make[2]: *** [../Bootstrap/Makefile.shared:62: 
obj/local/x86_64/liblo-native-code.so] Error 1
make[1]: *** [.../android/CustomTarget_lo_android.mk:18: 
.../workdir/CustomTarget/android/source/done] Error 2
make: *** [Makefile:282: build] Error 2

I quickly checked that the app actually runs on an x86_64 AVD
and is able to open and display documents after successfully
building with this commit in place.

Change-Id: I92b3759af6a86a6717c287d035b6a1add3a9af7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85204
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95601
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index 00ad02285cf1..3e38e14617cc 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -59,7 +59,7 @@ WHOLELIBS = \
 $(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS)
@echo "Linking $@"
mkdir -p $(OBJLOCAL)
-   $(CXX) -fuse-ld=gold -Wl,--build-id=sha1 -Wl,--gc-sections 
-Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped 
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared 
-Wl,-soname,liblo-native-code.so -o $(OBJLOCAL)/liblo-native-code.so 
-I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx 
-L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lc++_static -lc++abi $(if 
$(filter-out arm64-v8a,$(ANDROID_APP_ABI)),-landroid_support) $(if $(filter 
armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) $(addprefix -l,$(NSSLIBS)) -lGLESv2 
-landroid -ljnigraphics -llog -lz
+   $(CXX) -fuse-ld=gold -Wl,--build-id=sha1 -Wl,--gc-sections 
-Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped 
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared 
-Wl,-soname,liblo-native-code.so -o $(OBJLOCAL)/liblo-native-code.so 
-I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx 
-L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lc++_static -lc++abi $(if 
$(filter-out arm64-v8a x86_64,$(ANDROID_APP_ABI)),-landroid_support) $(if 
$(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) $(addprefix -l,$(NSSLIBS)) 
-lGLESv2 -landroid -ljnigraphics -llog -lz
 
 $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
mkdir -p $(SODEST)
commit 2977df872f9ff29f69071195a929e95b873a1a78
Author: Michael Weghorn 
AuthorDate: Tue Dec 3 14:49:59 2019 +0100
Commit: Michael Meeks 
CommitDate: Fri Jun 19 14:26:18 2020 +0100

nss: Fix Android build for x86 and x86_64

... which previously failed with

cd freebl; make libs
error: unknown 

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

[Noel Grandin (via logerrit)]

 include/tools/json_writer.hxx |   14 +++---
 tools/qa/cppunit/test_json_writer.cxx |   10 +-
 tools/source/misc/json_writer.cxx |   16 +++-
 3 files changed, 27 insertions(+), 13 deletions(-)

New commits:
commit 8df7447139b1171d8fd29f5d682b053df5936006
Author: Noel Grandin 
AuthorDate: Fri Jun 19 09:57:58 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jun 19 15:38:52 2020 +0200

asan: need to use malloc instead of new for tools::JsonWriter

because the LOK API expects memory returned from those calls to be
malloc'ed

Change-Id: If6fbfb60c433bd6e58bc90a9a90a90663e2e1c60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96676
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/tools/json_writer.hxx b/include/tools/json_writer.hxx
index c1438783de78..c0312f6c581d 100644
--- a/include/tools/json_writer.hxx
+++ b/include/tools/json_writer.hxx
@@ -11,7 +11,6 @@
 #include 
 #include 
 #include 
-#include 
 
 /** Simple JSON encoder designed specifically for LibreOfficeKit purposes.
  *
@@ -28,7 +27,7 @@ class TOOLS_DLLPUBLIC JsonWriter
 friend class ScopedJsonWriterNode;
 
 int mSpaceAllocated;
-std::unique_ptr maBuffer;
+char* mpBuffer;
 int mStartNodeCount;
 char* mPos;
 bool mbFirstFieldInNode;
@@ -54,14 +53,15 @@ private:
 
 inline void ensureSpace(int noMoreBytesRequired)
 {
-int currentUsed = mPos - maBuffer.get();
+int currentUsed = mPos - mpBuffer;
 if (currentUsed + noMoreBytesRequired >= mSpaceAllocated)
 {
 auto newSize = std::max(mSpaceAllocated * 2, (currentUsed + 
noMoreBytesRequired) * 2);
-auto pNew = new char[newSize];
-memcpy(pNew, maBuffer.get(), currentUsed);
-maBuffer.reset(pNew);
-mPos = maBuffer.get();
+char* pNew = static_cast(malloc(newSize));
+memcpy(pNew, mpBuffer, currentUsed);
+free(mpBuffer);
+mpBuffer = pNew;
+mPos = mpBuffer;
 }
 }
 };
diff --git a/tools/qa/cppunit/test_json_writer.cxx 
b/tools/qa/cppunit/test_json_writer.cxx
index c4e9331c8d17..e27afc95f712 100644
--- a/tools/qa/cppunit/test_json_writer.cxx
+++ b/tools/qa/cppunit/test_json_writer.cxx
@@ -7,6 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -44,7 +48,11 @@ void JsonWriterTest::test1()
 aJson.put("int", 12);
 }
 
-std::unique_ptr result(aJson.extractData());
+struct Free
+{
+void operator()(void* p) const { std::free(p); }
+};
+std::unique_ptr result(aJson.extractData());
 
 CPPUNIT_ASSERT_EQUAL(std::string("{ \"node\": { \"oustring\": \"val1\", 
\"ostring\": \"val2\", "
  "\"charptr\": \"val3\", \"int\": 12}}"),
diff --git a/tools/source/misc/json_writer.cxx 
b/tools/source/misc/json_writer.cxx
index 81b22e92a2d1..8a57e2ac337f 100644
--- a/tools/source/misc/json_writer.cxx
+++ b/tools/source/misc/json_writer.cxx
@@ -19,9 +19,9 @@ constexpr int DEFAULT_BUFFER_SIZE = 2048;
 
 JsonWriter::JsonWriter()
 : mSpaceAllocated(DEFAULT_BUFFER_SIZE)
-, maBuffer(new char[mSpaceAllocated])
+, mpBuffer(static_cast(malloc(mSpaceAllocated)))
 , mStartNodeCount(0)
-, mPos(maBuffer.get())
+, mPos(mpBuffer)
 {
 *mPos = '{';
 ++mPos;
@@ -29,7 +29,11 @@ JsonWriter::JsonWriter()
 ++mPos;
 }
 
-JsonWriter::~JsonWriter() { assert(!maBuffer && "forgot to extract data?"); }
+JsonWriter::~JsonWriter()
+{
+assert(!mpBuffer && "forgot to extract data?");
+free(mpBuffer);
+}
 
 ScopedJsonWriterNode JsonWriter::startNode(const char* pNodeName)
 {
@@ -239,14 +243,16 @@ void JsonWriter::addCommaBeforeField()
 char* JsonWriter::extractData()
 {
 assert(mStartNodeCount == 0 && "did not close all nodes");
-assert(maBuffer && "data already extracted");
+assert(mpBuffer && "data already extracted");
 // add closing brace
 *mPos = '}';
 ++mPos;
 // null-terminate
 *mPos = 0;
 mPos = nullptr;
-return maBuffer.release();
+char* pRet = nullptr;
+std::swap(pRet, mpBuffer);
+return pRet;
 }
 
 } // namespace tools
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 vcl/source/filter/ipdf/pdfdocument.cxx |   55 ++---
 1 file changed, 51 insertions(+), 4 deletions(-)

New commits:
commit 9b7a890fd59744459692d7f66402c6bdd25acec4
Author: Miklos Vajna 
AuthorDate: Fri Jun 19 14:08:44 2020 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jun 19 15:27:46 2020 +0200

sd signature line: include shape in the appearance widget

With this, finally the following works:

1) file -> digital signatures -> sign existing pdf

2) file -> digital signatures -> signature line

3) draw a rectangle

4) popup appears, select signing certificate

5) click on the "finish signing" button on the infobar

The resulting pdf will have a signature on it, together with the pdf
export of the signature line shape.

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

diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx 
b/vcl/source/filter/ipdf/pdfdocument.cxx
index 09439604996d..06324f22b4fd 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -28,6 +28,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace com::sun::star;
 
 namespace vcl::filter
@@ -269,6 +271,10 @@ sal_Int32 PDFDocument::WriteSignatureObject(const 
OUString& rDescription, bool b
 
 sal_Int32 PDFDocument::WriteAppearanceObject(tools::Rectangle& 
rSignatureRectangle)
 {
+PDFDocument aPDFDocument;
+filter::PDFObjectElement* pPage = nullptr;
+std::vector aContentStreams;
+
 if (!m_aSignatureLine.empty())
 {
 // Parse the PDF data of signature line: we can set the signature 
rectangle to non-empty
@@ -276,7 +282,6 @@ sal_Int32 
PDFDocument::WriteAppearanceObject(tools::Rectangle& rSignatureRectang
 SvMemoryStream aPDFStream;
 aPDFStream.WriteBytes(m_aSignatureLine.data(), 
m_aSignatureLine.size());
 aPDFStream.Seek(0);
-filter::PDFDocument aPDFDocument;
 if (!aPDFDocument.Read(aPDFStream))
 {
 SAL_WARN("vcl.filter",
@@ -291,7 +296,7 @@ sal_Int32 
PDFDocument::WriteAppearanceObject(tools::Rectangle& rSignatureRectang
 return -1;
 }
 
-filter::PDFObjectElement* pPage = aPages[0];
+pPage = aPages[0];
 if (!pPage)
 {
 SAL_WARN("vcl.filter", "PDFDocument::WriteAppearanceObject: no 
page");
@@ -322,6 +327,17 @@ sal_Int32 
PDFDocument::WriteAppearanceObject(tools::Rectangle& rSignatureRectang
 return -1;
 }
 rSignatureRectangle.setHeight(pHeight->GetValue());
+
+if (PDFObjectElement* pContentStream = pPage->LookupObject("Contents"))
+{
+aContentStreams.push_back(pContentStream);
+}
+
+if (aContentStreams.empty())
+{
+SAL_WARN("vcl.filter", "PDFDocument::WriteAppearanceObject: no 
content stream");
+return -1;
+}
 }
 m_aSignatureLine.clear();
 
@@ -334,14 +350,45 @@ sal_Int32 
PDFDocument::WriteAppearanceObject(tools::Rectangle& rSignatureRectang
 aEditBuffer.WriteUInt32AsString(nAppearanceId);
 aEditBuffer.WriteCharPtr(" 0 obj\n");
 aEditBuffer.WriteCharPtr("<>\n");
-aEditBuffer.WriteCharPtr("stream\n\nendstream\nendobj\n\n");
+aEditBuffer.WriteCharPtr("]\n/Length ");
 
 // Add the object to the doc-level edit buffer and update the offset.
+SvMemoryStream aStream;
+bool bCompressed = false;
+sal_Int32 nLength = 0;
+if (!aContentStreams.empty())
+{
+nLength = PDFObjectCopier::copyPageStreams(aContentStreams, aStream, 
bCompressed);
+}
+aEditBuffer.WriteOString(OString::number(nLength));
+if (bCompressed)
+{
+aEditBuffer.WriteOString(" /Filter/FlateDecode");
+}
+
+aEditBuffer.WriteCharPtr("\n>>\n");
+
+aEditBuffer.WriteCharPtr("stream\n");
+
+// Copy the original page streams to the form XObject stream.
+aStream.Seek(0);
+aEditBuffer.WriteStream(aStream);
+
+aEditBuffer.WriteCharPtr("\nendstream\nendobj\n\n");
+
 aEditBuffer.Seek(0);
 XRefEntry aAppearanceEntry;
 aAppearanceEntry.SetOffset(m_aEditBuffer.Tell());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 9 commits - i18npool/inc i18npool/source sc/qa sc/source sc/uiconfig sd/source sw/inc sw/source

[Michael Stahl (via logerrit)]

 i18npool/inc/calendarImpl.hxx   |2 
 i18npool/source/calendar/calendarImpl.cxx   |7 ++
 sc/qa/unit/data/xls/pass/ofz20904-1.xls |binary
 sc/source/core/data/dociter.cxx |   11 ++-
 sc/source/ui/app/transobj.cxx   |2 
 sc/source/ui/dialogs/searchresults.cxx  |   31 ++
 sc/source/ui/inc/searchresults.hxx  |2 
 sc/uiconfig/scalc/ui/searchresults.ui   |3 
 sd/source/ui/dlg/dlgsnap.cxx|6 +
 sw/inc/undobj.hxx   |3 
 sw/source/core/crsr/crsrsh.cxx  |6 +
 sw/source/core/doc/DocumentContentOperationsManager.cxx |5 +
 sw/source/core/doc/DocumentRedlineManager.cxx   |   22 +++
 sw/source/core/edit/eddel.cxx   |7 +-
 sw/source/core/edit/edglss.cxx  |7 +-
 sw/source/core/inc/UndoDelete.hxx   |3 
 sw/source/core/undo/undel.cxx   |   49 
 sw/source/core/undo/undobj.cxx  |   33 ++
 18 files changed, 162 insertions(+), 37 deletions(-)

New commits:
commit fdff2aa16b8e4790c2732307973f23bace9f79bc
Author: Michael Stahl 
AuthorDate: Wed Jun 17 17:40:48 2020 +0200
Commit: Michael Meeks 
CommitDate: Fri Jun 19 10:27:50 2020 +0100

tdf#133982 sw: fix Copy of document that starts with nested table

Started to assert with ef8427d12a63127a2eb867637699343d630545dd
because a bookmark was created on the wrong node but this never worked.

Change-Id: Ife01a3c8041b4c7d08b2d749dde77ced388f7215
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96556
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 4de190d55900387bc07971bac84f7cd52e329146)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96578
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 99e242ba61de..ed46482bf933 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -232,7 +232,12 @@ bool SwEditShell::CopySelToDoc( SwDoc* pInsDoc )
 // Selection starts at the first para of the first 
cell,
 // but we want to copy the table and the start node 
before
 // the first cell as well.
-aPaM.Start()->nNode = 
aPaM.Start()->nNode.GetNode().FindTableNode()->GetIndex();
+// tdf#133982 tables can be nested
+while (SwTableNode const* pTableNode =
+
aPaM.Start()->nNode.GetNode().StartOfSectionNode()->FindTableNode())
+{
+aPaM.Start()->nNode = *pTableNode;
+}
 aPaM.Start()->nContent.Assign(nullptr, 0);
 }
 bRet = 
GetDoc()->getIDocumentContentOperations().CopyRange( aPaM, aPos, 
/*bCopyAll=*/false, /*bCheckPos=*/true, /*bCopyText=*/false ) || bRet;
commit 8e2b94ff8022bf2bb52a4d7f9d42da7bd7160680
Author: Caolán McNamara 
AuthorDate: Thu Feb 27 09:17:11 2020 +
Commit: Michael Meeks 
CommitDate: Fri Jun 19 10:27:46 2020 +0100

tdf#134019: ofz#20904 check bounds

Change-Id: I5d6d381ebd359b233b309e08131f3dda21310d80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89620
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 8e3a29110c8ad739bedeea90932663608d8d3935)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96573
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
Reviewed-by: Noel Grandin 

diff --git a/sc/qa/unit/data/xls/pass/ofz20904-1.xls 
b/sc/qa/unit/data/xls/pass/ofz20904-1.xls
new file mode 100644
index ..44dbe8f6e222
Binary files /dev/null and b/sc/qa/unit/data/xls/pass/ofz20904-1.xls differ
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index f501bb8da0d0..5331e8ac33ae 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -892,14 +892,17 @@ void ScCellIterator::init()
 if (maStartPos.Tab() > maEndPos.Tab())
 maStartPos.SetTab(maEndPos.Tab());
 
-maCurPos = maStartPos;
-
-if (!mpDoc->maTabs[maCurPos.Tab()])
+if (!mpDoc->maTabs[maStartPos.Tab()])
 {
 OSL_FAIL("Table not found");
 maStartPos = ScAddress(mpDoc->MaxCol()+1, mpDoc->MaxRow()+1, 
MAXTAB+1); // -> Abort on GetFirst.
-maCurPos = maStartPos;
 }
+else
+{
+
maStartPos.SetCol(mpDoc->maTabs[maStartPos.Tab()]->ClampToAllocatedColumns(maStartPos.Col()));
+}
+
+maCurPos = maStartPos;
 }
 
 bool ScCellIterator::getCurrent()
commit aa3d6bfaa2a7ddf375c87dc4096de9fab9a67d07
Author: M

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

[Attila Bakos (via logerrit)]

 sw/qa/extras/uiwriter/data3/tdf130805.odt |binary
 sw/qa/extras/uiwriter/uiwriter3.cxx   |   31 ++
 sw/source/core/doc/textboxhelper.cxx  |   14 +++--
 3 files changed, 43 insertions(+), 2 deletions(-)

New commits:
commit 2479ae3ee20fc5f3cbb0c88eb09110a36e86710c
Author: Attila Bakos 
AuthorDate: Tue May 26 10:09:51 2020 +0200
Commit: Xisco Fauli 
CommitDate: Fri Jun 19 15:12:34 2020 +0200

tdf#130805 SwTextBoxHelper::create: fix frame position in shape

Text frame added by menu option "Add Text Box" of a shape
was misplaced if there were more paragraphs after the
shape anchor position.

Co-authored-by: Tibor Nagy (NISZ)

Change-Id: I8a47aff57d3a60f7dbd2a1b75296e2664a1f745f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94822
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 06e2cbb31d0ea703df872b91eb8eacdcaced7653)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95976
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/uiwriter/data3/tdf130805.odt 
b/sw/qa/extras/uiwriter/data3/tdf130805.odt
new file mode 100644
index ..12e215123aa3
Binary files /dev/null and b/sw/qa/extras/uiwriter/data3/tdf130805.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 2ba1db6974d2..cdb1e5c3bb41 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -13,6 +13,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -525,6 +529,33 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf80663)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTextTable->getColumns()->getCount());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf130805)
+{
+load(DATA_DIRECTORY, "tdf130805.odt");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+SwWrtShell* pWrtSh = pTextDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtSh);
+
+const SwFrameFormats& rFrmFormats = 
*pWrtSh->GetDoc()->GetSpzFrameFormats();
+CPPUNIT_ASSERT(rFrmFormats.size() >= size_t(o3tl::make_unsigned(1)));
+auto pShape = rFrmFormats.front();
+CPPUNIT_ASSERT(pShape);
+
+SwTextBoxHelper::create(pShape);
+auto pTxBxFrm = SwTextBoxHelper::getOtherTextBoxFormat(getShape(1));
+CPPUNIT_ASSERT(pTxBxFrm);
+
+auto pTxAnch = pTxBxFrm->GetAnchor().GetContentAnchor();
+auto pShpAnch = pShape->GetAnchor().GetContentAnchor();
+CPPUNIT_ASSERT(pTxAnch);
+CPPUNIT_ASSERT(pShpAnch);
+
+CPPUNIT_ASSERT_EQUAL_MESSAGE("The textbox got apart!", pTxAnch->nNode, 
pShpAnch->nNode);
+//CPPUNIT_ASSERT_EQUAL_MESSAGE("", xShp->getPosition().Y, 
xShp2->getPosition().Y);
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf96067)
 {
 mxComponent = loadFromDesktop("private:factory/swriter", 
"com.sun.star.text.TextDocument");
diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index e2b1e9fa6498..ae7084605e4c 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -63,8 +63,18 @@ void SwTextBoxHelper::create(SwFrameFormat* pShape)
 pShape->GetDoc()->GetDocShell()->GetBaseModel(), uno::UNO_QUERY);
 uno::Reference 
xTextContentAppend(xTextDocument->getText(),
 
uno::UNO_QUERY);
-
-xTextContentAppend->appendTextContent(xTextFrame, 
uno::Sequence());
+try
+{
+SdrObject* pSourceSDRShape = pShape->FindRealSdrObject();
+uno::Reference 
XSourceShape(pSourceSDRShape->getUnoShape(),
+uno::UNO_QUERY_THROW);
+xTextContentAppend->insertTextContentWithProperties(
+xTextFrame, uno::Sequence(), 
XSourceShape->getAnchor());
+}
+catch (uno::Exception&)
+{
+xTextContentAppend->appendTextContent(xTextFrame, 
uno::Sequence());
+}
 // Link FLY and DRAW formats, so it becomes a text box (needed for 
syncProperty calls).
 uno::Reference xRealTextFrame(xTextFrame, 
uno::UNO_QUERY);
 auto pTextFrame = dynamic_cast(xRealTextFrame.get());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Attila Bakos (via logerrit)]

 sw/source/core/doc/textboxhelper.cxx |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit c1c93987acbb83d8352656d77ee515e98c63d46b
Author: Attila Bakos 
AuthorDate: Fri May 29 14:09:30 2020 +0200
Commit: Xisco Fauli 
CommitDate: Fri Jun 19 15:11:47 2020 +0200

tdf#130802 SwTextBoxHelper::syncFlyFrameAttr: fix dragging

Dragging the selected shapes resulted broken text boxes:
the text showed outside of the shapes. This is fixed in
the case of paragraph, character and page anchoring.

Co-authored-by: Tibor Nagy (NISZ)

Change-Id: Iaea65ee26bad60c09ada4875636416d4a7c7e80b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95136
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit a0bdc5df1f2f51477ae2b22d91623a94caac1a3e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95980
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index 1dcc7e242016..e2b1e9fa6498 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -687,6 +688,12 @@ void SwTextBoxHelper::syncFlyFrameAttr(SwFrameFormat& 
rShape, SfxItemSet const&
 const SfxPoolItem* pItem = aIter.GetCurItem();
 do
 {
+if (rShape.GetAnchor().GetAnchorId() != RndStdIds::FLY_AS_CHAR)
+{
+SwFormatAnchor pShapeAnch = rShape.GetAnchor();
+aTextBoxSet.Put(pShapeAnch);
+}
+
 switch (pItem->Which())
 {
 case RES_VERT_ORIENT:
@@ -698,6 +705,10 @@ void SwTextBoxHelper::syncFlyFrameAttr(SwFrameFormat& 
rShape, SfxItemSet const&
 if (!aRect.IsEmpty())
 aOrient.SetPos(aOrient.GetPos() + aRect.getY());
 
+if (rShape.GetAnchor().GetAnchorId() == 
RndStdIds::FLY_AT_PAGE)
+{
+
aOrient.SetRelationOrient(rShape.GetVertOrient().GetRelationOrient());
+}
 aTextBoxSet.Put(aOrient);
 
 // restore height (shrunk for extending beyond the page 
bottom - tdf#91260)
@@ -718,6 +729,10 @@ void SwTextBoxHelper::syncFlyFrameAttr(SwFrameFormat& 
rShape, SfxItemSet const&
 if (!aRect.IsEmpty())
 aOrient.SetPos(aOrient.GetPos() + aRect.getX());
 
+if (rShape.GetAnchor().GetAnchorId() == 
RndStdIds::FLY_AT_PAGE)
+{
+
aOrient.SetRelationOrient(rShape.GetHoriOrient().GetRelationOrient());
+}
 aTextBoxSet.Put(aOrient);
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pedro Pinto Silva (via logerrit)]

 cui/uiconfig/ui/pageformatpage.ui|3 ++-
 cui/uiconfig/ui/paraindentspacing.ui |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 7cd5cddce02a6e005c0fcd45b9b720c2ca877cfc
Author: Pedro Pinto Silva 
AuthorDate: Tue Jun 16 12:16:35 2020 +0200
Commit: Pedro Silva 
CommitDate: Fri Jun 19 15:01:40 2020 +0200

tdf#127279 Register-true with better labelling

Change-Id: I2cf7a47a59b863b9b5de4463043af0e23290d752
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96424
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
Reviewed-by: Pedro Silva 

diff --git a/cui/uiconfig/ui/pageformatpage.ui 
b/cui/uiconfig/ui/pageformatpage.ui
index 1f4e4e323c84..031f34efc762 100644
--- a/cui/uiconfig/ui/pageformatpage.ui
+++ b/cui/uiconfig/ui/pageformatpage.ui
@@ -527,10 +527,11 @@
 
 
   
-Register-tr_ue
+Page li_ne spacing
 True
 False
 True
+All paragraph styles 
with the option Page line spacing checked will be affected, assuming the line 
spacing defined here. This will align them to an invisible vertical page grid, 
regardless of their font size, so that each line is the same height.
 True
 0
 True
diff --git a/cui/uiconfig/ui/paraindentspacing.ui 
b/cui/uiconfig/ui/paraindentspacing.ui
index c5977b219aa3..7ee2107c63bc 100644
--- a/cui/uiconfig/ui/paraindentspacing.ui
+++ b/cui/uiconfig/ui/paraindentspacing.ui
@@ -502,7 +502,7 @@
   
 True
 False
-Register-true
+Follow Page line spacing
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/skia

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

 vcl/skia/gdiimpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 17c7cff57d574a041e7cc574ebf9bb59be4b2395
Author: Luboš Luňák 
AuthorDate: Fri Jun 19 11:36:34 2020 +0200
Commit: Luboš Luňák 
CommitDate: Fri Jun 19 14:56:46 2020 +0200

fix coordinate typo in Skia drawTransformedBitmap() (tdf#134129)

Change-Id: I562aae9f55701477acd6b5d2cc8a556f3449ecb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96688
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 18a7ecf78fcbee8101313f81bea8fbd5449a2482)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96695

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 7acb0f35d07f..b632f6369363 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1407,7 +1407,7 @@ bool SkiaSalGraphicsImpl::drawTransformedBitmap(const 
basegfx::B2DPoint& rNull,
 SAL_INFO("vcl.skia.trace", "drawtransformedbitmap(" << this << "): " << 
aSize << " " << rNull
 << ":" << rX << ":" << 
rY);
 
-const Size imageSize(aXRel.getLength(), aXRel.getLength());
+const Size imageSize(aXRel.getLength(), aYRel.getLength());
 sk_sp imageToDraw = mergeBitmaps(rSkiaBitmap, pSkiaAlphaBitmap, 
imageSize);
 if (!imageToDraw)
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: More information about hung Jenkins builds

[Stephan Bergmann]

On 28/05/2020 22:19, Stephan Bergmann wrote:
For now, I have updated 
 to use the 
new kill-wrapper timeout feature instead of Jenkins' "Abort the build if 
it's stuck" option.  (And am planning to roll it out to other Linux 
Jenkins jobs that could benefit from it, once it has proven sufficiently 
stable.)


I have rolled out the kill-wrapper and its timeout feature now also for 
, 
, and 
.


@Cloph:  Besides tb7{5,6,9}, some of those jobs are also serviced by 
hc-{1,2,3}, which are currently offline.  I've queued 
 jobs for all three now 
(#108--110), as they will need an updated lode checked out to have a 
working kill-wrapper.  (And lets hope that lode's bin/kill-wrapper, a 
binary executable built from bin/kill-wrapper.c on tb75, also works on 
the hc-{1,2,3} machines.  If that's a problem, we should probably build 
it on each individual machine via lode's setup script instead.)


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

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.NotebookbarBuilder.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2a538bbb84d64301fd029f42e907b9a55c872beb
Author: Szymon Kłos 
AuthorDate: Fri Jun 19 13:01:05 2020 +0200
Commit: Szymon Kłos 
CommitDate: Fri Jun 19 14:48:15 2020 +0200

notebookbar: removed not working button

Change-Id: I22e68b3237a555ef35a8f66ad343a3e2eb17c81b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96716
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js 
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index be08a9948..e344e693f 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -127,6 +127,7 @@ L.Control.NotebookbarBuilder = 
L.Control.JSDialogBuilder.extend({
this._toolitemHandlers['.uno:ImportFromFile'] = function() {};
this._toolitemHandlers['.uno:PhotoAlbumDialog'] = function() {};
this._toolitemHandlers['.uno:AutoFormat'] = function() {};
+   this._toolitemHandlers['.uno:Spacing'] = function() {};
 
this._toolitemHandlers['vnd.sun.star.findbar:FocusToFindbar'] = 
function() {};
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js|9 -
 loleaflet/src/control/Control.NotebookbarBuilder.js |4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 668c25bff0c01bc7916cf9fe08ceb6945b13ff02
Author: Szymon Kłos 
AuthorDate: Fri Jun 19 12:50:24 2020 +0200
Commit: Szymon Kłos 
CommitDate: Fri Jun 19 14:48:06 2020 +0200

notebookbar: fix font size combobox

Change-Id: I0542e6a6bb21e1ae3bf164ef774da2cef2bb5706
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96715
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js 
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 861b61ca5..be08a9948 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -138,7 +138,7 @@ L.Control.NotebookbarBuilder = 
L.Control.JSDialogBuilder.extend({
if (commandName === '.uno:CharFontName') {
$('#fontnamecombobox').val(state).trigger('change');
} else if (commandName === '.uno:FontHeight') {
-   $('#fontsizecombobox').val(state).trigger('change');
+   $('#fontsize').val(state).trigger('change');
} else if (commandName === '.uno:StyleApply') {
$('#applystyle').val(state).trigger('change');
}
@@ -157,7 +157,7 @@ L.Control.NotebookbarBuilder = 
L.Control.JSDialogBuilder.extend({
var state = items.getItemValue('.uno:CharFontName');
$(combobox).val(state).trigger('change');
}
-   else if (id === 'fontsizecombobox') {
+   else if (id === 'fontsize') {
$(combobox).on('select2:select', function (e) {
builder.map.applyFontSize(e.target.value);
builder.map.focus();
commit 708c988aa760004c4e083b08df1f85cbd41bc9fd
Author: Szymon Kłos 
AuthorDate: Fri Jun 19 14:12:14 2020 +0200
Commit: Szymon Kłos 
CommitDate: Fri Jun 19 14:47:54 2020 +0200

jsdialog: fix tabs switching

Change-Id: I9303daadcfc0888386f72e74ff35a26ab8233949
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96731
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 09cb585d8..c18986d67 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -648,13 +648,12 @@ L.Control.JSDialogBuilder = L.Control.extend({
_createTabClick: function(builder, t, tabs, contentDivs, tabIds)
{
return function() {
+   $(tabs[t]).addClass('selected');
for (var i = 0; i < tabs.length; i++) {
-   if (tabs[i].number != t)
+   if (i !== t)
{
$(tabs[i]).removeClass('selected');
$(contentDivs[i]).hide();
-   } else {
-   $(tabs[i]).addClass('selected');
}
}
$(contentDivs[t]).show();
@@ -702,10 +701,10 @@ L.Control.JSDialogBuilder = L.Control.extend({
var fn = function(id) {
return function() {

builder._createTabClick(builder, id, tabs, contentDivs, tabIds)();
-   
builder.callback('tabcontrol', 'selecttab', tabsContainer, id, builder);
+   
builder.callback('tabcontrol', 'selecttab', tabsContainer, data.tabs[id].id - 
1, builder);
};
};
-   $(tabs[t]).click(fn(data.tabs[t].id - 
1));
+   $(tabs[t]).click(fn(t));
}
} else {
console.debug('Builder used outside of mobile 
wizard: please implement the click handler');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Balazs Varga (via logerrit)]

 chart2/qa/extras/chart2import.cxx  |2 -
 chart2/source/view/charttypes/PieChart.cxx |   45 ++---
 2 files changed, 23 insertions(+), 24 deletions(-)

New commits:
commit c66cb6d6e4a843dc7c7d06e1c2c0723a6ff85fc5
Author: Balazs Varga 
AuthorDate: Tue Jun 16 12:07:45 2020 +0200
Commit: László Németh 
CommitDate: Fri Jun 19 14:43:20 2020 +0200

tdf#134029 Chart view: enable to move data label

if the position is 'Best Fit' and the data label is
outside from the pie chart.

To check the functionality of the patch: open the attached file
http://bugs.documentfoundation.org/attachment.cgi?id=162039 and
move the data label.

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

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 804f154333e8..6e78a08d67d1 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -2521,7 +2521,7 @@ void Chart2ImportTest::testTdf133376()
 CPPUNIT_ASSERT(xDataPointLabel.is());
 // Check the position of the 3rd data point label, which is out from the 
pie slice
 awt::Point aLabelPosition = xDataPointLabel->getPosition();
-CPPUNIT_ASSERT_DOUBLES_EQUAL(1466, aLabelPosition.X, 30);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(1071, aLabelPosition.X, 30);
 CPPUNIT_ASSERT_DOUBLES_EQUAL(5269, aLabelPosition.Y, 30);
 }
 
diff --git a/chart2/source/view/charttypes/PieChart.cxx 
b/chart2/source/view/charttypes/PieChart.cxx
index 03e928a85c23..9032b40977f1 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -1581,16 +1581,10 @@ void PieChart::performLabelBestFit(ShapeParam& 
rShapeParam, PieLabelInfo const &
 return;
 
 // If it does not fit inside, let's put it outside
-PolarLabelPositionHelper 
aPolarPosHelper(m_pPosHelper.get(),m_nDimension,m_xLogicTarget,m_pShapeFactory);
-auto eAlignment = LABEL_ALIGN_CENTER;
-awt::Point aScreenPosition2D(
-
aPolarPosHelper.getLabelScreenPositionAndAlignmentForUnitCircleValues(eAlignment,
 css::chart::DataLabelPlacement::OUTSIDE
-, rShapeParam.mfUnitCircleStartAngleDegree, 
rShapeParam.mfUnitCircleWidthAngleDegree
-, rShapeParam.mfUnitCircleInnerRadius, 
rShapeParam.mfUnitCircleOuterRadius, rShapeParam.mfLogicZ+0.5, 0 ));
+awt::Point aOldPos(rPieLabelInfo.xLabelGroupShape->getPosition());
 basegfx::B2IVector aTranslationVector = rPieLabelInfo.aFirstPosition - 
rPieLabelInfo.aOrigin;
-aTranslationVector.setLength(150);
-aScreenPosition2D.X += aTranslationVector.getX();
-aScreenPosition2D.Y += aTranslationVector.getY();
+awt::Point aScreenPosition2D(aOldPos.X + aTranslationVector.getX(),
+aOldPos.Y + aTranslationVector.getY());
 
 double fAngleDegree = rShapeParam.mfUnitCircleStartAngleDegree + 
rShapeParam.mfUnitCircleWidthAngleDegree / 2.0;
 ::basegfx::B2IRectangle aBb(lcl_getRect(rPieLabelInfo.xLabelGroupShape));
@@ -1602,29 +1596,34 @@ void PieChart::performLabelBestFit(ShapeParam& 
rShapeParam, PieLabelInfo const &
 while (fAngleDegree < 0.0)
 fAngleDegree += 360.0;
 
-if( fAngleDegree <= 22.5 || fAngleDegree >= 337.5 )
-aScreenPosition2D.Y -= fLabelHeight / 2;
-else if( fAngleDegree < 67.5 )
-aScreenPosition2D.Y -= fLabelHeight;
-else if( fAngleDegree < 112.5 )
+if (fAngleDegree <= 22.5 || fAngleDegree >= 337.5)
+aScreenPosition2D.X += fLabelWidth / 2;
+else if (fAngleDegree < 67.5)
 {
-aScreenPosition2D.X -= fLabelWidth / 2;
-aScreenPosition2D.Y -= fLabelHeight;
+aScreenPosition2D.X += fLabelWidth / 2;
+aScreenPosition2D.Y -= fLabelHeight / 2;
 }
+else if (fAngleDegree < 112.5)
+aScreenPosition2D.Y -= fLabelHeight / 2;
 else if (fAngleDegree <= 157.5)
 {
-aScreenPosition2D.X -= fLabelWidth;
-aScreenPosition2D.Y -= fLabelHeight;
+aScreenPosition2D.X -= fLabelWidth / 2;
+aScreenPosition2D.Y -= fLabelHeight / 2;
 }
 else if (fAngleDegree <= 202.5)
+aScreenPosition2D.X -= fLabelWidth / 2;
+else if (fAngleDegree < 247.5)
 {
-aScreenPosition2D.X -= fLabelWidth;
-aScreenPosition2D.Y -= fLabelHeight / 2;
+aScreenPosition2D.X -= fLabelWidth / 2;
+aScreenPosition2D.Y += fLabelHeight / 2;
 }
-else if (fAngleDegree < 247.5)
-aScreenPosition2D.X -= fLabelWidth;
 else if (fAngleDegree < 292.5)
-aScreenPosition2D.X -= fLabelWidth / 2;
+aScreenPosition2D.Y += fLabelHeight / 2;
+else
+{
+aScreenPosition2D.X += fLabelWidth / 2;
+aScreenPosition2D.Y += fLabelHeight / 2;
+}
 
 rPieLabelInfo.xLabelGroupShape->setPosition(aScreenPosition2D);
 }
___
Libreoffi

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

[Tibor Nagy (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf133924.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx|   12 +++-
 sw/source/filter/ww8/docxattributeoutput.cxx |   11 ---
 3 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit 9bbc60c0d5e60eacecd624f343aecc94e4219c84
Author: Tibor Nagy 
AuthorDate: Sun Jun 14 16:23:54 2020 +0200
Commit: László Németh 
CommitDate: Fri Jun 19 14:17:14 2020 +0200

tdf#133924 DOCX export: fix text wraps around frame

Co-authored-by: Attila Bakos (NISZ)

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf133924.docx 
b/sw/qa/extras/ooxmlexport/data/tdf133924.docx
new file mode 100644
index ..3bdbe8d6f1e0
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf133924.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index df0ee671c9c1..123a339c6232 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -977,7 +977,17 @@ DECLARE_OOXMLEXPORT_TEST(testTdf133457, "tdf133457.docx")
 if (!pXmlDocument)
 return;
 
-assertXPath(pXmlDocument, 
"/w:document/w:body/w:p[4]/w:pPr/w:framePr","vAnchor","text");
+assertXPath(pXmlDocument, "/w:document/w:body/w:p[4]/w:pPr/w:framePr", 
"vAnchor", "text");
+}
+
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf133924, "tdf133924.docx")
+{
+xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml");
+if (!pXmlDocument)
+return;
+
+assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/w:pPr/w:framePr", 
"wrap", "around");
+assertXPath(pXmlDocument, "/w:document/w:body/w:p[3]/w:pPr/w:framePr", 
"wrap", "notBeside");
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0ebda68eed20..3bd7ae8fbf43 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -583,17 +583,14 @@ void DocxAttributeOutput::PopulateFrameProperties(const 
SwFrameFormat* pFrameFor
 switch (pFrameFormat->GetSurround().GetValue())
 {
 case css::text::WrapTextMode_NONE:
-attrList->add( FSNS( XML_w, XML_wrap), "none");
-break;
-case css::text::WrapTextMode_THROUGH:
-attrList->add( FSNS( XML_w, XML_wrap), "through");
-break;
-case css::text::WrapTextMode_PARALLEL:
 attrList->add( FSNS( XML_w, XML_wrap), "notBeside");
 break;
 case css::text::WrapTextMode_DYNAMIC:
+attrList->add(FSNS(XML_w, XML_wrap), "auto");
+break;
+case css::text::WrapTextMode_PARALLEL:
 default:
-attrList->add( FSNS( XML_w, XML_wrap), "auto");
+attrList->add(FSNS(XML_w, XML_wrap), "around");
 break;
 }
 attrList->add( FSNS( XML_w, XML_vAnchor), relativeFromV );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tibor Nagy (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf133701.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx|   10 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |9 -
 3 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit a2113f5f46921c38a0c4929bb564183009a838e9
Author: Tibor Nagy 
AuthorDate: Tue Jun 9 13:38:35 2020 +0200
Commit: László Németh 
CommitDate: Fri Jun 19 14:01:30 2020 +0200

tdf#133701 DOXC export: fix frame distance from text

Vertical and horizontal minimum distances of frame
and the text wrapping around the frame were not exported.

Note: different left/right, top/bottom values aren't
supported by OOXML hSpace, vSpace, so calculate
average values to keep the page layout.

Co-authored-by: Attila Bakos (NISZ)

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf133701.docx 
b/sw/qa/extras/ooxmlexport/data/tdf133701.docx
new file mode 100644
index ..dfef409c268c
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf133701.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index 877594f9f2f2..df0ee671c9c1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -42,6 +42,16 @@ protected:
 }
 };
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf133701, "tdf133701.docx")
+{
+xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml");
+if (!pXmlDocument)
+return;
+
+assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/w:pPr/w:framePr", 
"hSpace", "567");
+assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/w:pPr/w:framePr", 
"vSpace", "284");
+}
+
 DECLARE_OOXMLEXPORT_TEST(testDmlShapeTitle, "dml-shape-title.docx")
 {
 CPPUNIT_ASSERT_EQUAL(OUString("Title"), getProperty(getShape(1), 
"Title"));
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index d8479c410a37..0ebda68eed20 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -559,7 +559,6 @@ static void lcl_deleteAndResetTheLists( 
rtl::ReferenceGetHoriOrient().GetPos(), 
pFrameFormat->GetVertOrient().GetPos());
@@ -570,6 +569,14 @@ void DocxAttributeOutput::PopulateFrameProperties(const 
SwFrameFormat* pFrameFor
 attrList->add( FSNS( XML_w, XML_x), OString::number(aPos.X));
 attrList->add( FSNS( XML_w, XML_y), OString::number(aPos.Y));
 
+sal_Int16 nLeft = pFrameFormat->GetLRSpace().GetLeft();
+sal_Int16 nRight = pFrameFormat->GetLRSpace().GetRight();
+sal_Int16 nUpper = pFrameFormat->GetULSpace().GetUpper();
+sal_Int16 nLower = pFrameFormat->GetULSpace().GetLower();
+
+attrList->add(FSNS(XML_w, XML_hSpace), OString::number((nLeft + nRight) / 
2));
+attrList->add(FSNS(XML_w, XML_vSpace), OString::number((nUpper + nLower) / 
2));
+
 OString relativeFromH = convertToOOXMLHoriOrientRel( 
pFrameFormat->GetHoriOrient().GetRelationOrient() );
 OString relativeFromV = convertToOOXMLVertOrientRel( 
pFrameFormat->GetVertOrient().GetRelationOrient() );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf108505.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx|   12 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   13 +
 3 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 833dd75c6956f5a0d395468575aa416a6853a1f9
Author: Gabor Kelemen 
AuthorDate: Sun Mar 22 22:59:05 2020 +0100
Commit: László Németh 
CommitDate: Fri Jun 19 13:29:57 2020 +0200

tdf#108505 DOCX: fix legacy dropdown fields direct font setting

if it is at the beginning of the paragraph.

See also commit 22ad4d69d771708f28a2d9e137cfd43ac846cf3a
(tdf#121045 DOCX import: fix checkbox size in table).

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf108505.docx 
b/sw/qa/extras/ooxmlexport/data/tdf108505.docx
new file mode 100644
index ..50ebc3770895
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf108505.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 99e1d29c93d8..781dfa872081 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -1136,6 +1136,18 @@ DECLARE_OOXMLEXPORT_TEST(testLineWidthRounding, 
"tdf126363_LineWidthRounding.doc
 assertXPath(pXml, 
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln",
 "w", "57150");
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf108505, "tdf108505.docx")
+{
+uno::Reference xParagraph = getParagraph(3);
+uno::Reference xText
+= getRun(xParagraph, 1, "Wrong font when alone on the line");
+
+// Without the fix in place this would have become Times New Roman
+CPPUNIT_ASSERT_EQUAL(
+OUString("Trebuchet MS"),
+getProperty(xText, "CharFontName"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8cc1f7c02358..95b8e5e46647 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4887,7 +4887,7 @@ void DomainMapper_Impl::CloseFieldCommand()
 OUString const sFirstParam(vArguments.empty() ? OUString() : 
vArguments.front());
 
 // apply font size to the form control
-if (!m_aTextAppendStack.empty() &&  m_pLastCharacterContext && 
m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT) )
+if (!m_aTextAppendStack.empty() &&  m_pLastCharacterContext && ( 
m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT) || 
m_pLastCharacterContext->isSet(PROP_CHAR_FONT_NAME )))
 {
 uno::Reference< text::XTextAppend >  xTextAppend = 
m_aTextAppendStack.top().xTextAppend;
 if (xTextAppend.is())
@@ -4897,9 +4897,14 @@ void DomainMapper_Impl::CloseFieldCommand()
 {
 xCrsr->gotoEnd(false);
 uno::Reference< beans::XPropertySet > xProp( xCrsr, 
uno::UNO_QUERY );
-
xProp->setPropertyValue(getPropertyName(PROP_CHAR_HEIGHT), 
m_pLastCharacterContext->getProperty(PROP_CHAR_HEIGHT)->second);
-if ( 
m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT_COMPLEX) )
-
xProp->setPropertyValue(getPropertyName(PROP_CHAR_HEIGHT_COMPLEX), 
m_pLastCharacterContext->getProperty(PROP_CHAR_HEIGHT_COMPLEX)->second);
+if (m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT))
+{
+
xProp->setPropertyValue(getPropertyName(PROP_CHAR_HEIGHT), 
m_pLastCharacterContext->getProperty(PROP_CHAR_HEIGHT)->second);
+if 
(m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT_COMPLEX))
+
xProp->setPropertyValue(getPropertyName(PROP_CHAR_HEIGHT_COMPLEX), 
m_pLastCharacterContext->getProperty(PROP_CHAR_HEIGHT_COMPLEX)->second);
+}
+if 
(m_pLastCharacterContext->isSet(PROP_CHAR_FONT_NAME))
+
xProp->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME), 
m_pLastCharacterContext->getProperty(PROP_CHAR_FONT_NAME)->second);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |2 +-
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx|5 +++--
 drawinglayer/source/processor2d/vclpixelprocessor2d.hxx|4 +++-
 drawinglayer/source/processor2d/vclprocessor2d.cxx |5 +++--
 drawinglayer/source/processor2d/vclprocessor2d.hxx |3 ++-
 5 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 0a618246fc83f6ba7bd48de6164de7efc123f06f
Author: Mike Kaganski 
AuthorDate: Fri Jun 19 12:17:18 2020 +0300
Commit: Mike Kaganski 
CommitDate: Fri Jun 19 13:06:56 2020 +0200

tdf#134134: consider color modifier stack when pixel-processing

Add initial color stack as an optional processor ctor argument,
so that it wouldn't be possibe to modify it after construction
from outside randomly (which could break the stack state).

Change-Id: I8aae4b806531fa61cc67def865297f5de1cf0755
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96684
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 297fd725c7b7..1de36cd9f47d 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -2397,7 +2397,7 @@ void 
VclMetafileProcessor2D::processPrimitive2DOnPixelProcessor(
 auto pBufferDevice(CreateBufferDevice(aViewRange, 50, aViewInfo, 
aRectLogic, aSizePixel));
 if (pBufferDevice)
 {
-VclPixelProcessor2D aBufferProcessor(aViewInfo, *pBufferDevice);
+VclPixelProcessor2D aBufferProcessor(aViewInfo, *pBufferDevice, 
maBColorModifierStack);
 
 // draw content using pixel renderer
 primitive2d::Primitive2DReference aRef(
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 864f5ca107b6..b91bf57c360d 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -81,8 +81,9 @@ struct VclPixelProcessor2D::Impl
 };
 
 VclPixelProcessor2D::VclPixelProcessor2D(const geometry::ViewInformation2D& 
rViewInformation,
- OutputDevice& rOutDev)
-: VclProcessor2D(rViewInformation, rOutDev)
+ OutputDevice& rOutDev,
+ const basegfx::BColorModifierStack& 
rInitStack)
+: VclProcessor2D(rViewInformation, rOutDev, rInitStack)
 , m_pImpl(new Impl(rOutDev))
 {
 // prepare maCurrentTransformation matrix with viewTransformation to 
target directly to pixels
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
index 5a23499f9a9b..c3bd19141669 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
@@ -102,7 +102,9 @@ class VclPixelProcessor2D final : public VclProcessor2D
 
 public:
 /// constructor/destructor
-VclPixelProcessor2D(const geometry::ViewInformation2D& rViewInformation, 
OutputDevice& rOutDev);
+VclPixelProcessor2D(const geometry::ViewInformation2D& rViewInformation, 
OutputDevice& rOutDev,
+const basegfx::BColorModifierStack& rInitStack
+= basegfx::BColorModifierStack());
 virtual ~VclPixelProcessor2D() override;
 };
 } // end of namespace drawinglayer::processor2d
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index e64995c8b50a..5a0a85f911ef 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -1485,10 +1485,11 @@ void VclProcessor2D::adaptTextToFillDrawMode() const
 // process support
 
 VclProcessor2D::VclProcessor2D(const geometry::ViewInformation2D& 
rViewInformation,
-   OutputDevice& rOutDev)
+   OutputDevice& rOutDev,
+   const basegfx::BColorModifierStack& rInitStack)
 : BaseProcessor2D(rViewInformation)
 , mpOutputDevice(&rOutDev)
-, maBColorModifierStack()
+, maBColorModifierStack(rInitStack)
 , maCurrentTransformation()
 , maDrawinglayerOpt()
 , mnPolygonStrokePrimitive2D(0)
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.hxx 
b/drawinglayer/source/processor2d/vclprocessor2d.hxx
index 3b1b997a7cc4..dbca9ed4ba25 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.hxx
@@ -120,7 +120,8 @@ protected:
 
 public:
 // constructor/destructor
-VclProcessor2D(const geometry::ViewInformation2D& rViewInformation, 
OutputDevice& rOutDev);
+VclProcessor2D(const geometry::ViewInformat

Re: Need Help uploading code

[Ilmari Lauhakangas]

Dante Doménech kirjoitti 19.6.2020 klo 4.24:

Hello,
I've worked on math 7.0, but don't understand Gerrit.
Can someone explain to me where to upload the code, please?
Implemented: *Bug 47914* 
 (include 
laplace symbol: laplace).
Implemented: *Bug 40436* 
 (custom math 
colors: color rgb r g b)
Prepared implementation: *Bug 49990* 
 (include 
setP, but for some reason does not render the symbol: setP)
Prepared implementation: *Bug 81267* 
 (repeat 
operator, but for some reason does not render the symbol: repeat)
Prepared implementation: mathbb as font for double stroke, but not 
implem ented.

Prepared implementation: script as font for script, but not implemented.
*Also, could not implement changes on UI since don't know how works the 
UI yet.

*


To add some details on Julien's reply: follow this to set up gerrit access:
https://wiki.documentfoundation.org/Development/gerrit/setup#Setting_yourself_up_for_gerrit_-_the_easy_way

Follow this to submit your patches to gerrit:
https://wiki.documentfoundation.org/Development/gerrit/SubmitPatch#Submitting_patches_for_review

It is a good idea to have a separate local branch for each of your fixes.

The first line of your bug fix commit message should start with the 
identifying bug number like so:


tdf#40436

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

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

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

 vcl/skia/gdiimpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7d70eb43f3a301750a7bc1c0afa06d423a7eca69
Author: Luboš Luňák 
AuthorDate: Fri Jun 19 11:36:34 2020 +0200
Commit: Luboš Luňák 
CommitDate: Fri Jun 19 12:58:24 2020 +0200

fix coordinate typo in Skia drawTransformedBitmap() (tdf#134129)

Change-Id: I562aae9f55701477acd6b5d2cc8a556f3449ecb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96688
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index c9e420057fd4..47f857235f4f 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1400,7 +1400,7 @@ bool SkiaSalGraphicsImpl::drawTransformedBitmap(const 
basegfx::B2DPoint& rNull,
 SAL_INFO("vcl.skia.trace", "drawtransformedbitmap(" << this << "): " << 
aSize << " " << rNull
 << ":" << rX << ":" << 
rY);
 
-const Size imageSize(aXRel.getLength(), aXRel.getLength());
+const Size imageSize(aXRel.getLength(), aYRel.getLength());
 sk_sp imageToDraw = mergeBitmaps(rSkiaBitmap, pSkiaAlphaBitmap, 
imageSize);
 if (!imageToDraw)
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: More information about hung Jenkins builds

[Mike Kaganski]

On 19.06.2020 13:38, Stephan Bergmann wrote:
> With
> 
> "Print backtraces of leftover processes from kill-wrapper" (and its
> follow-up
> 
> "Don't generate full backtraces, for performance reasons") we now get
> backtraces of hung processes, for those Jenkins jobs that use kill-wrapper.
> 
> And---instant success---as soon as I had updated lode on the TDF tb7X
> Linux machines,
> 
> caught one of those dreaded sporadic deadlocks of UITest_writer_dialogs
> and printed the long-sought information.  (Fix at
>  "Don't call out to UNO
> with SolarMutex locked".)

\o/ Fantastic!

-- 
Best regards,
Mike Kaganski


pEpkey.asc
Description: application/pgp-keys
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Andras Timar (via logerrit)]

 loleaflet/src/layer/marker/ProgressOverlay.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a0d547ab0e84e9c21667d57893d4535eb8bbce7d
Author: Andras Timar 
AuthorDate: Fri Jun 19 12:45:20 2020 +0200
Commit: Andras Timar 
CommitDate: Fri Jun 19 12:45:20 2020 +0200

default brandProductName should be LibreOffice Online

Change-Id: Iaf95f6963f19be6065c77dfc2d8693178ee527d6

diff --git a/loleaflet/src/layer/marker/ProgressOverlay.js 
b/loleaflet/src/layer/marker/ProgressOverlay.js
index 090f8b078..aeebfe495 100644
--- a/loleaflet/src/layer/marker/ProgressOverlay.js
+++ b/loleaflet/src/layer/marker/ProgressOverlay.js
@@ -53,7 +53,7 @@ L.ProgressOverlay = L.Layer.extend({
this._spinner = L.DomUtil.create('div', 
'leaflet-progress-spinner', this._container);
this._spinnerCanvas = L.DomUtil.create('canvas', 
'leaflet-progress-spinner-canvas', this._spinner);
 
-   var productName = (typeof brandProductName !== 'undefined') ? 
brandProductName : 'LibreOffice Online (Unsupported)';
+   var productName = (typeof brandProductName !== 'undefined') ? 
brandProductName : 'LibreOffice Online';
this._brandLabel = L.DomUtil.create('div', 
'leaflet-progress-label', this._container);
this._brandLabel.innerHTML = productName;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 80354885fd393a70be410d1c9be24ff72b12e514
Author: Szymon Kłos 
AuthorDate: Wed Jun 17 09:19:10 2020 +0200
Commit: Szymon Kłos 
CommitDate: Fri Jun 19 12:41:06 2020 +0200

jsdialog: send real tab id not displayed order

Change-Id: I44770160f1e25cc8d75ff19fadb423f9e93a1ff1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96689
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index b3bd9cfcd..09cb585d8 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -648,12 +648,13 @@ L.Control.JSDialogBuilder = L.Control.extend({
_createTabClick: function(builder, t, tabs, contentDivs, tabIds)
{
return function() {
-   $(tabs[t]).addClass('selected');
for (var i = 0; i < tabs.length; i++) {
-   if (i !== t)
+   if (tabs[i].number != t)
{
$(tabs[i]).removeClass('selected');
$(contentDivs[i]).hide();
+   } else {
+   $(tabs[i]).addClass('selected');
}
}
$(contentDivs[t]).show();
@@ -677,6 +678,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
var tab = L.DomUtil.create('div', 'ui-tab ' + 
builder.options.cssClass, tabsContainer);
tab.id = data.tabs[tabIdx].name;
+   tab.number = data.tabs[tabIdx].id - 1;
if (data.selected == data.tabs[tabIdx].id)
$(tab).addClass('selected');
tabs[tabIdx] = tab;
@@ -703,7 +705,7 @@ L.Control.JSDialogBuilder = L.Control.extend({

builder.callback('tabcontrol', 'selecttab', tabsContainer, id, builder);
};
};
-   $(tabs[t]).click(fn(t));
+   $(tabs[t]).click(fn(data.tabs[t].id - 
1));
}
} else {
console.debug('Builder used outside of mobile 
wizard: please implement the click handler');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/images

[Szymon Kłos (via logerrit)]

 loleaflet/images/lc_accepttrackedchange.svg  |1 +
 loleaflet/images/lc_spellingandgrammardialog.svg |1 +
 loleaflet/images/lc_thesaurusdialog.svg  |1 +
 3 files changed, 3 insertions(+)

New commits:
commit b5925d8e3d5a78b039cf931930fc23b1d58af966
Author: Szymon Kłos 
AuthorDate: Fri Jun 19 12:07:30 2020 +0200
Commit: Szymon Kłos 
CommitDate: Fri Jun 19 12:40:50 2020 +0200

notebookbar: missing icons

Change-Id: I33dd19cbb5b07b6888b267ddc65dde41c8a3943e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96710
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/images/lc_accepttrackedchange.svg 
b/loleaflet/images/lc_accepttrackedchange.svg
new file mode 100644
index 0..4171c3929
--- /dev/null
+++ b/loleaflet/images/lc_accepttrackedchange.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_spellingandgrammardialog.svg 
b/loleaflet/images/lc_spellingandgrammardialog.svg
new file mode 100644
index 0..15faa1553
--- /dev/null
+++ b/loleaflet/images/lc_spellingandgrammardialog.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_thesaurusdialog.svg 
b/loleaflet/images/lc_thesaurusdialog.svg
new file mode 100644
index 0..fc47705dc
--- /dev/null
+++ b/loleaflet/images/lc_thesaurusdialog.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: More information about hung Jenkins builds

[Stephan Bergmann]

On 28/05/2020 22:19, Stephan Bergmann wrote:
Now, 
 
"Incorporate timeout-on-idle into kill-wrapper, renaming to 
timeout-kill-wrapper" and its follow-up 
 
"Simplify transition from old kill-wrapper to new timeout kill-wrapper" 
fix that, by moving the timeout handling from Jenkins into lode's 
bin/kill-wrapper.  (Which accepts an optional second argument now, 
specifying a stdout/-err inactivity timeout in seconds, after which the 
pstree output is generated and the process tree gets killed.  Leaving 
the argument out or specifying it as zero disables that timeout logic.)


With 
 
"Print backtraces of leftover processes from kill-wrapper" (and its 
follow-up 
 
"Don't generate full backtraces, for performance reasons") we now get 
backtraces of hung processes, for those Jenkins jobs that use kill-wrapper.


And---instant success---as soon as I had updated lode on the TDF tb7X 
Linux machines, 
 
caught one of those dreaded sporadic deadlocks of UITest_writer_dialogs 
and printed the long-sought information.  (Fix at 
 "Don't call out to UNO 
with SolarMutex locked".)


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

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

[Andras Timar (via logerrit)]

Tag 'cp-6.2-17' created by Andras Timar  at 
2020-06-19 10:32 +

cp-6.2-17

Changes since cp-6.2-16-13:
---
 0 files changed
---
___
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' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 207471efd99fe953f8d057691833f903ceb4b18a
Author: Andras Timar 
AuthorDate: Fri Jun 19 12:32:02 2020 +0200
Commit: Andras Timar 
CommitDate: Fri Jun 19 12:32:02 2020 +0200

Bump version to 6.2-17

Change-Id: I6a0d5f39e8a0876fe747974b73386d96547c6e11

diff --git a/configure.ac b/configure.ac
index be9851960312..2e8e9b19c7da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.2.10.16],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.17],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar (via logerrit)]

Tag 'cp-6.2-17' created by Andras Timar  at 
2020-06-19 10:32 +

cp-6.2-17

Changes since CODE-4.2.2-2:
Andras Timar (1):
  [cp] add info about xapian omega search and the cp-query template

---
 xapian/cp-query   |  141 ++
 xapian/xapian.txt |  109 +
 2 files changed, 250 insertions(+)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar (via logerrit)]

Tag 'cp-6.2-17' created by Andras Timar  at 
2020-06-19 10:32 +

cp-6.2-17

Changes since CP-Android-iOS-4.2.0:
Andras Timar (1):
  tdf#130999 fix registration of Greek dictionary

---
 el_GR/META-INF/manifest.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar (via logerrit)]

Tag 'cp-6.2-17' created by Andras Timar  at 
2020-06-19 10:32 +

cp-6.2-17

Changes since CP-Android-iOS-4.2.0-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - 15 commits - common/Message.hpp cypress_test/integration_tests debian/changelog .gitreview ios/Mobile kit/ChildSession.cpp loleaf

[Andras Timar (via logerrit)]

 .gitreview |2 
 common/Message.hpp |2 
 cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js |4 -
 debian/changelog   |6 
++
 ios/Mobile/Info.plist.in   |2 
 kit/ChildSession.cpp   |   22 
--
 loleaflet/css/toolbar.css  |   22 
+++---
 loleaflet/html/loleaflet.html.m4   |1 
 loleaflet/src/control/Control.DocumentNameInput.js |   11 
+
 loleaflet/src/control/Control.UIManager.js |2 
 loleaflet/src/control/Ruler.js |4 +
 loleaflet/src/layer/marker/ProgressOverlay.js  |7 
+++
 loolwsd.spec.in|2 
 loolwsd.xml.in |5 
+-
 net/Socket.cpp |   11 
-
 sysconfig.loolwsd  |7 
---
 wsd/LOOLWSD.cpp|   14 
--
 17 files changed, 93 insertions(+), 31 deletions(-)

New commits:
commit 542e28bf23747aa34f8fd5661150817bca93e0a8
Author: Andras Timar 
AuthorDate: Fri Jun 19 12:27:54 2020 +0200
Commit: Andras Timar 
CommitDate: Fri Jun 19 12:27:54 2020 +0200

Bump package version to 4.2.4-5

Change-Id: Ib2c32c6db3a676ba1057a4823c37fcb8afec7f89

diff --git a/debian/changelog b/debian/changelog
index a3139c31b..ca451348e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.2.4-5) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-5
+
+ -- Andras Timar   Fri, 19 Jun 2020 12:30:00 +0200
+
 loolwsd (4.2.4-4) unstable; urgency=medium
 
   * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-4
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 67b759986..3918d5d1b 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:4%{?dist}
+Release:5%{?dist}
 Vendor: %{vendor}
 Summary:LibreOffice Online WebSocket Daemon
 License:EULA
commit 54fd9180a3f51cc09bd7fa1b1dcfc781e7c2eec9
Author: Pranam Lashkari 
AuthorDate: Thu Jun 18 17:56:29 2020 +0530
Commit: Andras Timar 
CommitDate: Fri Jun 19 12:25:39 2020 +0200

leaflet: show brand name on splashscreen

Change-Id: Ie7d93a134e869e14b5e4c1f8599feb8a9e130c07
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96602
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit 10d75ea4e7cc515d3e2d68518f4c5ddd22241fd6)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96694
Tested-by: Andras Timar 

diff --git a/loleaflet/src/layer/marker/ProgressOverlay.js 
b/loleaflet/src/layer/marker/ProgressOverlay.js
index 7100243d8..090f8b078 100644
--- a/loleaflet/src/layer/marker/ProgressOverlay.js
+++ b/loleaflet/src/layer/marker/ProgressOverlay.js
@@ -3,6 +3,7 @@
  * L.ProgressOverlay is used to overlay progress images over the map.
  */
 
+ /* global brandProductName */
 L.ProgressOverlay = L.Layer.extend({
 
options: {
@@ -51,6 +52,12 @@ L.ProgressOverlay = L.Layer.extend({
this._container = L.DomUtil.create('div', 
'leaflet-progress-layer');
this._spinner = L.DomUtil.create('div', 
'leaflet-progress-spinner', this._container);
this._spinnerCanvas = L.DomUtil.create('canvas', 
'leaflet-progress-spinner-canvas', this._spinner);
+
+   var productName = (typeof brandProductName !== 'undefined') ? 
brandProductName : 'LibreOffice Online (Unsupported)';
+   this._brandLabel = L.DomUtil.create('div', 
'leaflet-progress-label', this._container);
+   this._brandLabel.innerHTML = productName;
+
+
this._label = L.DomUtil.create('div', 'leaflet-progress-label', 
this._container);
this._progress = L.DomUtil.create('div', 'leaflet-progress', 
this._container);
this._bar = L.DomUtil.create('span', '', this._progress);
commit e9841a99d5b5afb6ff2856eea9a6ff517b47bebe
Author: Andras Timar 
AuthorDate: Sun Jun 14 17:33:37 2020 +0200
Commit: Andras Timar 
CommitDate: Fri Jun 19 12:25:34 2020 +0200

Add LOKit logging option to configuration file

Environment variable in sysconfig.loolwsd was not good, because:
1) it was a systemd antipattern
2) this systemd environment file was not present 

[Libreoffice-commits] online.git: Changes to 'refs/tags/cp-4.2.4-5'

[Andras Timar (via logerrit)]

Tag 'cp-4.2.4-5' created by Andras Timar  at 
2020-06-19 10:28 +

cp-4.2.4-5

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

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/src/layer/marker/ProgressOverlay.js |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 8be8327a81e7cf78b41699e5d3366d58521106b3
Author: Pranam Lashkari 
AuthorDate: Thu Jun 18 17:56:29 2020 +0530
Commit: Andras Timar 
CommitDate: Fri Jun 19 12:21:50 2020 +0200

leaflet: show brand name on splashscreen

Change-Id: Ie7d93a134e869e14b5e4c1f8599feb8a9e130c07
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96602
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit 10d75ea4e7cc515d3e2d68518f4c5ddd22241fd6)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96694
Tested-by: Andras Timar 

diff --git a/loleaflet/src/layer/marker/ProgressOverlay.js 
b/loleaflet/src/layer/marker/ProgressOverlay.js
index 7100243d8..090f8b078 100644
--- a/loleaflet/src/layer/marker/ProgressOverlay.js
+++ b/loleaflet/src/layer/marker/ProgressOverlay.js
@@ -3,6 +3,7 @@
  * L.ProgressOverlay is used to overlay progress images over the map.
  */
 
+ /* global brandProductName */
 L.ProgressOverlay = L.Layer.extend({
 
options: {
@@ -51,6 +52,12 @@ L.ProgressOverlay = L.Layer.extend({
this._container = L.DomUtil.create('div', 
'leaflet-progress-layer');
this._spinner = L.DomUtil.create('div', 
'leaflet-progress-spinner', this._container);
this._spinnerCanvas = L.DomUtil.create('canvas', 
'leaflet-progress-spinner-canvas', this._spinner);
+
+   var productName = (typeof brandProductName !== 'undefined') ? 
brandProductName : 'LibreOffice Online (Unsupported)';
+   this._brandLabel = L.DomUtil.create('div', 
'leaflet-progress-label', this._container);
+   this._brandLabel.innerHTML = productName;
+
+
this._label = L.DomUtil.create('div', 'leaflet-progress-label', 
this._container);
this._progress = L.DomUtil.create('div', 'leaflet-progress', 
this._container);
this._bar = L.DomUtil.create('span', '', this._progress);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/layout/frmtool.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8e917d54483d916661467dac110e0c5e9774bcc2
Author: Michael Stahl 
AuthorDate: Thu Jun 18 19:16:27 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Jun 19 12:12:13 2020 +0200

tdf#133981 sw_redlinehide: oops, InsertCnt_() is missing null...

... pointer check.

(regression from 55576842ec72a748d0bad123d41fa03c89fc136d)

Change-Id: I4478c45d10ac516afd6360e4083b00d667c678fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96621
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 17f47b3972301273716466656e775f3f09d681d8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96692
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index 2a2a59377636..9765451c3aca 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1701,7 +1701,8 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
 SwFrame *const pNext(
 // if there's a parent section, it has been split
 // into 2 SwSectionFrame already :(
-(   pFrame->GetNext()->IsSctFrame()
+(   pFrame->GetNext()
+ && pFrame->GetNext()->IsSctFrame()
  && pActualSection->GetUpper()
  && pActualSection->GetUpper()->GetSectionNode() ==
  static_cast(pFrame->GetNext())->GetSection()->GetFormat()->GetSectionNode())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loolwsd.xml.in sysconfig.loolwsd wsd/LOOLWSD.cpp

[Andras Timar (via logerrit)]

 loolwsd.xml.in|5 -
 sysconfig.loolwsd |7 ---
 wsd/LOOLWSD.cpp   |3 +++
 3 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit eb81d18ef19b6ca4c84ecb63983665c46fa95b8d
Author: Andras Timar 
AuthorDate: Sun Jun 14 17:33:37 2020 +0200
Commit: Jan Holesovsky 
CommitDate: Fri Jun 19 12:10:16 2020 +0200

Add LOKit logging option to configuration file

Environment variable in sysconfig.loolwsd was not good, because:
1) it was a systemd antipattern
2) this systemd environment file was not present on all distros
3) we had to take care about this separately, when we did not start
   loolwsd from systemd

Change-Id: I5c47668ca388c2f4b0afd6da8c575a3fb3cfab3b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96277
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 27e1d6e87..951b96079 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -49,7 +49,10 @@
 
 true
 @LOOLWSD_LOGLEVEL@
-@ENABLE_DEBUG_PROTOCOL@
+@ENABLE_DEBUG_PROTOCOL@
+
+-INFO-WARN
 
 @LOOLWSD_LOGFILE@
 never
diff --git a/sysconfig.loolwsd b/sysconfig.loolwsd
index 69e59adc5..a2747d27e 100644
--- a/sysconfig.loolwsd
+++ b/sysconfig.loolwsd
@@ -4,10 +4,3 @@
 ## Default:""
 ## ServiceRestart: loolwsd
 #
-
-# warning/info logging from LOKit
-# read the documentation at https://docs.libreoffice.org/sal/html/sal_log.html
-# Example:
-# Log WebDAV-related messages, that is interesting for debugging Insert - 
Image operation
-# SAL_LOG="+TIMESTAMP+INFO.ucb.ucp.webdav+WARN.ucb.ucp.webdav"
-SAL_LOG="-INFO-WARN"
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index d15e25902..5c77a8a12 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -897,6 +897,7 @@ void LOOLWSD::initialize(Application& self)
 { "logging.file.property[7][@name]", "archive" },
 { "logging.file[@enable]", "false" },
 { "logging.level", "trace" },
+{ "logging.lokit_sal_log", "-INFO-WARN" },
 { "loleaflet_html", "loleaflet.html" },
 { "loleaflet_logging", "false" },
 { "net.listen", "any" },
@@ -994,6 +995,8 @@ void LOOLWSD::initialize(Application& self)
 // Set the log-level after complete initialization to force maximum 
details at startup.
 LogLevel = getConfigValue(conf, "logging.level", "trace");
 setenv("LOOL_LOGLEVEL", LogLevel.c_str(), true);
+std::string SalLog = getConfigValue(conf, 
"logging.lokit_sal_log", "-INFO-WARN");
+setenv("SAL_LOG", SalLog.c_str(), 0);
 const bool withColor = getConfigValue(conf, "logging.color", true) 
&& isatty(fileno(stderr));
 if (withColor)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranam Lashkari (via logerrit)]

 loleaflet/src/layer/marker/ProgressOverlay.js |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit e8204c9213dd221ae432babd6fa717cf621a4b48
Author: Pranam Lashkari 
AuthorDate: Thu Jun 18 17:56:29 2020 +0530
Commit: Andras Timar 
CommitDate: Fri Jun 19 11:55:11 2020 +0200

leaflet: show brand name on splashscreen

Change-Id: Ie7d93a134e869e14b5e4c1f8599feb8a9e130c07
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96602
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/layer/marker/ProgressOverlay.js 
b/loleaflet/src/layer/marker/ProgressOverlay.js
index 7100243d8..090f8b078 100644
--- a/loleaflet/src/layer/marker/ProgressOverlay.js
+++ b/loleaflet/src/layer/marker/ProgressOverlay.js
@@ -3,6 +3,7 @@
  * L.ProgressOverlay is used to overlay progress images over the map.
  */
 
+ /* global brandProductName */
 L.ProgressOverlay = L.Layer.extend({
 
options: {
@@ -51,6 +52,12 @@ L.ProgressOverlay = L.Layer.extend({
this._container = L.DomUtil.create('div', 
'leaflet-progress-layer');
this._spinner = L.DomUtil.create('div', 
'leaflet-progress-spinner', this._container);
this._spinnerCanvas = L.DomUtil.create('canvas', 
'leaflet-progress-spinner-canvas', this._spinner);
+
+   var productName = (typeof brandProductName !== 'undefined') ? 
brandProductName : 'LibreOffice Online (Unsupported)';
+   this._brandLabel = L.DomUtil.create('div', 
'leaflet-progress-label', this._container);
+   this._brandLabel.innerHTML = productName;
+
+
this._label = L.DomUtil.create('div', 'leaflet-progress-label', 
this._container);
this._progress = L.DomUtil.create('div', 'leaflet-progress', 
this._container);
this._bar = L.DomUtil.create('span', '', this._progress);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky (via logerrit)]

 common/Authorization.cpp |5 ++-
 common/Util.cpp  |   45 +
 common/Util.hpp  |   27 +++-
 test/WhiteBoxTests.cpp   |   63 +++
 4 files changed, 116 insertions(+), 24 deletions(-)

New commits:
commit 2c246eed85e065f07b756ec065d12b47cdac5f17
Author: Jan Holesovsky 
AuthorDate: Thu Jun 18 11:07:54 2020 +0200
Commit: Andras Timar 
CommitDate: Fri Jun 19 11:48:44 2020 +0200

Sanitize the access_header.

The access_header can contain a lot of nonsense, like whitespace around
or additional \n's or \r's.  We used to sanitize that, but then
regressed in e95413d151c3f0d9476063c8520dd477342ed235 where the
"tokenize by any of \n\r" was by mistake replaced with "tokenize by
string '\n\r'".

Unfortunately the unit test didn't uncover that, and the further
refactorings of the related code have hidden that even more.

Change-Id: Ie2bf950d0426292770b599e40ee2401101162ff2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96638
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/common/Authorization.cpp b/common/Authorization.cpp
index abaddae26..ad4381ef5 100644
--- a/common/Authorization.cpp
+++ b/common/Authorization.cpp
@@ -52,8 +52,9 @@ void Authorization::authorizeRequest(Poco::Net::HTTPRequest& 
request) const
 // there might be more headers in here; like
 //   Authorization: Basic 
 //   X-Something-Custom: Huh
-// Regular expression evaluates and finds "\n\r" and tokenizes 
accordingly
-StringVector tokens(Util::tokenize(_data, "\n\r"));
+// Split based on \n's or \r's and trim, to avoid nonsense in the
+// headers
+StringVector tokens(Util::tokenizeAnyOf(_data, "\n\r"));
 for (auto it = tokens.begin(); it != tokens.end(); ++it)
 {
 std::string token = tokens.getParam(*it);
diff --git a/common/Util.cpp b/common/Util.cpp
index 347fc4562..ee1aa19b1 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -987,6 +987,51 @@ namespace Util
 }
 #endif
 
+StringVector tokenizeAnyOf(const std::string& s, const char* delimiters)
+{
+// trim from the end so that we do not have to check this exact case
+// later
+std::size_t length = s.length();
+while (length > 0 && s[length - 1] == ' ')
+--length;
+
+if (length == 0)
+return StringVector();
+
+std::size_t delimitersLength = std::strlen(delimiters);
+std::size_t start = 0;
+
+std::vector tokens;
+tokens.reserve(16);
+
+while (start < length)
+{
+// ignore the leading whitespace
+while (start < length && s[start] == ' ')
+++start;
+
+// anything left?
+if (start == length)
+break;
+
+std::size_t end = s.find_first_of(delimiters, start, 
delimitersLength);
+if (end == std::string::npos)
+end = length;
+
+// trim the trailing whitespace
+std::size_t trimEnd = end;
+while (start < trimEnd && s[trimEnd - 1] == ' ')
+--trimEnd;
+
+// add only non-empty tokens
+if (start < trimEnd)
+tokens.emplace_back(start, trimEnd - start);
+
+start = end + 1;
+}
+
+return StringVector(s, std::move(tokens));
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Util.hpp b/common/Util.hpp
index fed1525e6..9c82b3068 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -433,29 +433,12 @@ namespace Util
 return StringVector(s, std::move(tokens));
 }
 
-inline StringVector tokenize(const std::string& s, const char* delimiter)
-{
-if (s.empty())
-return StringVector();
-
-std::size_t start = 0;
-std::size_t end = s.find(delimiter, start);
-
-std::vector tokens;
-tokens.reserve(16);
+/** Tokenize based on any of the characters in 'delimiters'.
 
-tokens.emplace_back(start, end - start);
-start = end + std::strlen(delimiter);
-
-while (end != std::string::npos)
-{
-end = s.find(delimiter, start);
-tokens.emplace_back(start, end - start);
-start = end + std::strlen(delimiter);
-}
-
-return StringVector(s, std::move(tokens));
-}
+Ie. when there is '\n\r' in there, any of them means a delimiter.
+In addition, trim the values so there are no leadiding or trailing 
spaces.
+*/
+StringVector tokenizeAnyOf(const std::string& s, const char* delimiters);
 
 #ifdef IOS
 
diff --git a/test/WhiteBoxTests.cpp b/test/WhiteBoxTests.cpp
index bb2f57e4c..a2e676198 100644
--- 

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

[Andras Timar (via logerrit)]

 i18npool/source/collator/collator_unicode.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 7d932fa99219e2395e169941f96f94452c2f6bb6
Author: Andras Timar 
AuthorDate: Fri Jun 19 11:05:36 2020 +0200
Commit: Andras Timar 
CommitDate: Fri Jun 19 11:46:04 2020 +0200

Fix a chrash in LOKit (Japanese-only)

Change-Id: I09c8d3a129c0d1d2fab561add0447869156b193f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96682
Reviewed-by: Jan Holesovsky 
Tested-by: Andras Timar 

diff --git a/i18npool/source/collator/collator_unicode.cxx 
b/i18npool/source/collator/collator_unicode.cxx
index b731d8879fed..c9d696fc6046 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -393,6 +393,11 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& 
rAlgorithm, const lang::
 icu::Locale icuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( 
rLocale),
 "", rAlgorithm.isEmpty() ? OUString("") : "collation=" 
+ rAlgorithm));
 
+// FIXME: apparently we get here in LOKit case only. When the 
language is Japanese, we pass "ja@collation=phonetic (alphanumeric first)" to 
ICU
+// and ICU does not like this (U_ILLEGAL_ARGUMENT_ERROR). 
Subsequently LOKit crashes, because collator is nullptr.
+if (!strcmp(icuLocale.getLanguage(), "ja"))
+icuLocale = icu::Locale::getJapanese();
+
 // load ICU collator
 collator.reset( static_cast( 
icu::Collator::createInstance(icuLocale, status) ) );
 if (! U_SUCCESS(status)) {
___
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' - external/serf

[Andras Timar (via logerrit)]

 external/serf/UnpackedTarball_serf.mk |1 +
 external/serf/ssl.verify.none.patch.1 |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 459134ea842ad8238ab3c4efffef26843a3853c9
Author: Andras Timar 
AuthorDate: Fri May 1 21:41:37 2020 +0200
Commit: Andras Timar 
CommitDate: Fri Jun 19 11:45:14 2020 +0200

[cp] Be more relaxed with accepting certs in serf

The Desktop product uses neon, so this patch is for Online.
When the WOPI-like host uses a self-signed SSL certificate,
serf refuses to fetch resources from it, so Insert - Image
and Create from Template operations fail.

Related commit: a08552a8c36754930a3268e27aefee70d5cf21df
But in case of serf somehow we do not trigger the interaction
handler, we get an information message box with the text
"Image file cannot be opened"

So I decided to patch serf. The result is the same.
* In Collabora Online 4.0.x we do not check the cert of
  WOPI-like host anyway.
* In Collabora Online 4.2.x we optionally check the cert
  of WOPI-like host. The Create from Template and Insert -
  Image cases will be exceptional, where we won't check it.
  Generally it should not make a big difference.

Change-Id: I3937bf450ef70f3a793ec1c793336d18209b6e62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96652
Reviewed-by: Jan Holesovsky 
Tested-by: Andras Timar 

diff --git a/external/serf/UnpackedTarball_serf.mk 
b/external/serf/UnpackedTarball_serf.mk
index e6e950920b95..3cea304dbcc4 100644
--- a/external/serf/UnpackedTarball_serf.mk
+++ b/external/serf/UnpackedTarball_serf.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,serf,\
 
 $(eval $(call gb_UnpackedTarball_add_patches,serf,\
external/serf/windows.build.patch.1 \
+   external/serf/ssl.verify.none.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/serf/ssl.verify.none.patch.1 
b/external/serf/ssl.verify.none.patch.1
new file mode 100644
index ..3bf48e0fc5c2
--- /dev/null
+++ b/external/serf/ssl.verify.none.patch.1
@@ -0,0 +1,11 @@
+--- serf.org/buckets/ssl_buckets.c 2020-05-01 20:45:32.463464917 +0200
 serf/buckets/ssl_buckets.c 2020-05-01 20:46:00.643301728 +0200
+@@ -1205,7 +1205,7 @@
+ ssl_ctx->server_cert_callback = NULL;
+ ssl_ctx->server_cert_chain_callback = NULL;
+
+-SSL_CTX_set_verify(ssl_ctx->ctx, SSL_VERIFY_PEER,
++SSL_CTX_set_verify(ssl_ctx->ctx, SSL_VERIFY_NONE,
+validate_server_certificate);
+ SSL_CTX_set_options(ssl_ctx->ctx, SSL_OP_ALL);
+ /* Disable SSL compression by default. */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits