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

[Caolán McNamara (via logerrit)]

 editeng/source/editeng/impedit.cxx |   21 +++--
 editeng/source/editeng/impedit.hxx |2 ++
 2 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 6281c306badf7f3f01c1264f24af4e0a75c15525
Author: Caolán McNamara 
AuthorDate: Tue Jun 18 14:04:27 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 18 16:32:06 2019 +0200

fix crash in header/footer calc dialog

cut and paste can happen when the EditView isn't in a vcl::Window

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

diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 0fa84e2d90a2..9618c1fb604d 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -38,8 +39,9 @@
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
+#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -1268,6 +1270,13 @@ Pair ImpEditView::Scroll( long ndX, long ndY, 
ScrollRangeCheck nRangeCheck )
 return Pair( nRealDiffX, nRealDiffY );
 }
 
+Reference ImpEditView::GetClipboard()
+{
+if (vcl::Window* pWindow = GetWindow())
+return pWindow->GetClipboard();
+return 
css::datatransfer::clipboard::SystemClipboard::create(comphelper::getProcessComponentContext());
+}
+
 bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window const * 
pFrameWin )
 {
 bool bDone = false;
@@ -1281,7 +1290,7 @@ bool ImpEditView::PostKeyEvent( const KeyEvent& 
rKeyEvent, vcl::Window const * p
 {
 if ( !bReadOnly )
 {
-Reference 
aClipBoard(GetWindow()->GetClipboard());
+Reference 
aClipBoard(GetClipboard());
 CutCopy( aClipBoard, true );
 bDone = true;
 }
@@ -1289,7 +1298,7 @@ bool ImpEditView::PostKeyEvent( const KeyEvent& 
rKeyEvent, vcl::Window const * p
 break;
 case KeyFuncType::COPY:
 {
-Reference 
aClipBoard(GetWindow()->GetClipboard());
+Reference 
aClipBoard(GetClipboard());
 CutCopy( aClipBoard, false );
 bDone = true;
 }
@@ -1299,7 +1308,7 @@ bool ImpEditView::PostKeyEvent( const KeyEvent& 
rKeyEvent, vcl::Window const * p
 if ( !bReadOnly && IsPasteEnabled() )
 {
 pEditEngine->pImpEditEngine->UndoActionStart( 
EDITUNDO_PASTE );
-Reference 
aClipBoard(GetWindow()->GetClipboard());
+Reference 
aClipBoard(GetClipboard());
 Paste( aClipBoard, 
pEditEngine->pImpEditEngine->GetStatus().AllowPasteSpecial() );
 pEditEngine->pImpEditEngine->UndoActionEnd();
 bDone = true;
@@ -1329,12 +1338,12 @@ bool ImpEditView::MouseButtonUp( const MouseEvent& 
rMouseEvent )
 if ( rMouseEvent.IsMiddle() && !bReadOnly &&
  ( 
pWindow->GetSettings().GetMouseSettings().GetMiddleButtonAction() == 
MouseMiddleButtonAction::PasteSelection ) )
 {
-Reference 
aClipBoard(pWindow->GetPrimarySelection());
+Reference 
aClipBoard(GetClipboard());
 Paste( aClipBoard );
 }
 else if ( rMouseEvent.IsLeft() && GetEditSelection().HasRange() )
 {
-Reference 
aClipBoard(pWindow->GetPrimarySelection());
+Reference 
aClipBoard(GetClipboard());
 CutCopy( aClipBoard, false );
 }
 }
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index 8f09ca8f13d0..b7f7d5db0323 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -282,6 +282,8 @@ private:
 
 void InvalidateAtWindow(const tools::Rectangle& rRect);
 
+css::uno::Reference 
GetClipboard();
+
 protected:
 
 // DragAndDropClient
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Grzegorz Araminowicz (via logerrit)]

 oox/source/drawingml/diagram/diagram.hxx|   10 
 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   14 ++
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx |6 ++
 oox/source/drawingml/diagram/layoutatomvisitors.cxx |   14 ++
 oox/source/drawingml/diagram/layoutnodecontext.cxx  |5 +-
 sd/qa/unit/data/pptx/smartart-recursion.pptx|binary
 sd/qa/unit/import-tests-smartart.cxx|   42 
 7 files changed, 90 insertions(+), 1 deletion(-)

New commits:
commit 76478f9938a5f6d96ac65b3b633280024b60baed
Author: Grzegorz Araminowicz 
AuthorDate: Tue Jun 11 08:31:18 2019 +0200
Commit: Grzegorz Araminowicz 
CommitDate: Tue Jun 18 16:10:50 2019 +0200

SmartArt: support ForEach references

ForEach 'ref' parameter causes specified ForEach node to be used instead.
Used to create recursive structures like organisation charts.

Change-Id: Iee61b2e103759355b59beb8d3f33eb3cce47c590
Reviewed-on: https://gerrit.libreoffice.org/74271
Tested-by: Jenkins
Reviewed-by: Grzegorz Araminowicz 

diff --git a/oox/source/drawingml/diagram/diagram.hxx 
b/oox/source/drawingml/diagram/diagram.hxx
index 91cb0f39fd2c..cf12dce576a7 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -149,6 +149,8 @@ typedef std::vector< Point >Points;
 class Diagram;
 class LayoutNode;
 typedef std::shared_ptr< LayoutNode > LayoutNodePtr;
+class LayoutAtom;
+typedef std::shared_ptr LayoutAtomPtr;
 
 typedef std::map< OUString, css::uno::Reference > 
DiagramDomMap;
 
@@ -205,6 +207,8 @@ private:
 
 typedef std::shared_ptr< DiagramData > DiagramDataPtr;
 
+typedef std::map LayoutAtomMap;
+
 class DiagramLayout
 {
 public:
@@ -233,6 +237,8 @@ public:
 { return mpStyleData; }
 const DiagramDataPtr & getStyleData() const
 { return mpStyleData; }
+LayoutAtomMap & getLayoutAtomMap()
+{ return maLayoutAtomMap; }
 
 private:
 const Diagram& mrDgm;
@@ -248,6 +254,8 @@ private:
 // TODO
 // catLst
 // clrData
+
+LayoutAtomMap maLayoutAtomMap;
 };
 
 typedef std::shared_ptr< DiagramLayout > DiagramLayoutPtr;
@@ -283,6 +291,8 @@ public:
 { return mpData; }
 void setLayout( const DiagramLayoutPtr & pLayout )
 { mpLayout = pLayout; }
+const DiagramLayoutPtr& getLayout() const
+{ return mpLayout; }
 
 DiagramQStyleMap& getStyles() { return maStyles; }
 const DiagramQStyleMap& getStyles() const { return maStyles; }
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index f9c443c5d626..6497e3ba22cf 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -229,6 +229,20 @@ void ForEachAtom::accept( LayoutAtomVisitor& rVisitor )
 rVisitor.visit(*this);
 }
 
+LayoutAtomPtr ForEachAtom::getRefAtom()
+{
+if (!msRef.isEmpty())
+{
+const LayoutAtomMap& rLayoutAtomMap = 
getLayoutNode().getDiagram().getLayout()->getLayoutAtomMap();
+LayoutAtomMap::const_iterator pRefAtom = rLayoutAtomMap.find(msRef);
+if (pRefAtom != rLayoutAtomMap.end())
+return pRefAtom->second;
+else
+SAL_WARN("oox.drawingml", "ForEach reference \"" << msRef << "\" 
not found");
+}
+return LayoutAtomPtr();
+}
+
 void ChooseAtom::accept( LayoutAtomVisitor& rVisitor )
 {
 rVisitor.visit(*this);
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 8a11ed5cbac8..9fff33686dd6 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -188,10 +188,16 @@ public:
 
 IteratorAttr & iterator()
 { return maIter; }
+void setRef(const OUString& rsRef)
+{ msRef = rsRef; }
+const OUString& getRef() const
+{ return msRef; }
 virtual void accept( LayoutAtomVisitor& ) override;
+LayoutAtomPtr getRefAtom();
 
 private:
 IteratorAttr maIter;
+OUString msRef;
 };
 
 typedef std::shared_ptr< ForEachAtom > ForEachAtomPtr;
diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.cxx 
b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
index cd7b82aa9efd..5d6f0065241d 100644
--- a/oox/source/drawingml/diagram/layoutatomvisitors.cxx
+++ b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
@@ -48,6 +48,13 @@ void ShapeCreationVisitor::visit(AlgAtom& rAtom)
 
 void ShapeCreationVisitor::visit(ForEachAtom& rAtom)
 {
+if (!rAtom.getRef().isEmpty())
+{
+if (LayoutAtomPtr pRefAtom = rAtom.getRefAtom())
+pRefAtom->accept(*this);
+return;
+}
+
 if (rAtom.iterator().mbHideLastTrans && rAtom.iterator().mnAxis == 
XML_followSib)
 {
 // If last transition is hidden and the axis is the follow sibling,
@@ -276,6 +283,13 

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter2.cxx  |   16 
 sw/source/core/layout/anchoreddrawobject.cxx |   18 --
 sw/source/filter/docx/swdocxreader.cxx   |9 -
 3 files changed, 36 insertions(+), 7 deletions(-)

New commits:
commit 92cd37efd22d4b80982fa87bcc336e4be5123b2c
Author: Miklos Vajna 
AuthorDate: Thu Feb 7 11:06:24 2019 +0100
Commit: Miklos Vajna 
CommitDate: Tue Jun 18 16:08:50 2019 +0200

tdf#123032 sw, AddVerticalFrameOffsets: fix shape pos after mouse move

Regression from commit 50223ea6e212b60b7d33839c2753c5601fb50f95
(tdf#98987 sw: add AddVerticalFrameOffsets compat mode, 2016-03-31),
the problem was that vertical position of the shape was wrong after
mouse move, even if we attempted to take fly frames of the paragraph
into account. (Similar situation is when saving and loading the file;
which is much easier to test.)

Fly frames are created as the
text frames is formatted, and then SwTextFrame::CalcBaseOfstForFly() can
calculate the vertical offset correctly. But in the "move with mouse"
case SwToContentAnchoredObjectPosition::CalcPosition() was invoked by
the time the old flys of the text frame were already removed, but the
new ones were not yet added.

Solve the problem by formatting the text frame from
SwAnchoredDrawObject::MakeObjPosAnchoredAtPara() (if any of its validity
flags are set to false) -- this is expected to be safe, as the object
formatter is invoked by SwLayAction::FormatContent(), i.e. there is no
recursive SwFrame::Calc() call here.

(cherry picked from commit 961ba62df045473e5793d9e103be86eaad8d9575)

Change-Id: I95851874e3da3f50f304421537c6743e04bdfc7b
Reviewed-on: https://gerrit.libreoffice.org/71127
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 
(cherry picked from commit da21956366a13b62b056d6074262f44c1559b29d)

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 01ee96f67ee6..745e2459de6c 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -640,6 +640,22 @@ void SwUiWriterTest2::testTdf122942()
 // paragraph mark, not above it.
 const SwFormatVertOrient& rVert = rFormats[1]->GetVertOrient();
 CPPUNIT_ASSERT_LESS(static_cast(0), rVert.GetPos());
+
+reload("writer8", "tdf122942.odt");
+pTextDoc = dynamic_cast(mxComponent.get());
+pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+pDoc = pWrtShell->GetDoc();
+const SwFrameFormats& rFormats2 = *pDoc->GetSpzFrameFormats();
+CPPUNIT_ASSERT_EQUAL(static_cast(2), rFormats2.size());
+
+SdrObject* pObject = rFormats2[1]->FindSdrObject();
+CPPUNIT_ASSERT(pObject);
+
+const tools::Rectangle& rOutRect = pObject->GetLastBoundRect();
+// Without the accompanying fix in place, this test would have failed with
+// 'Expected greater than: 5000; Actual  : 2817', i.e. the shape moved up
+// after a reload(), while it's expected to not change its position (5773).
+CPPUNIT_ASSERT_GREATER(static_cast(5000), rOutRect.Top());
 }
 
 void SwUiWriterTest2::testDocxAttributeTableExport()
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx 
b/sw/source/core/layout/anchoreddrawobject.cxx
index 88f9969a422f..de969773d8b9 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -374,12 +374,18 @@ void SwAnchoredDrawObject::MakeObjPosAnchoredAtPara()
 // --> #i50356# - format anchor frame containing the anchor
 // position. E.g., for at-character anchored object this can be the follow
 // frame of the anchor frame, which contains the anchor character.
-const bool bFormatAnchor =
-!static_cast( 
GetAnchorFrameContainingAnchPos() )->IsAnyJoinLocked() &&
-!ConsiderObjWrapInfluenceOnObjPos() &&
-!ConsiderObjWrapInfluenceOfOtherObjs();
-
-if ( bFormatAnchor )
+bool bJoinLocked
+= static_cast(GetAnchorFrameContainingAnchPos())->IsAnyJoinLocked();
+const bool bFormatAnchor = !bJoinLocked && 
!ConsiderObjWrapInfluenceOnObjPos()
+   && !ConsiderObjWrapInfluenceOfOtherObjs();
+
+// Format of anchor is needed for (vertical) fly offsets, otherwise the
+// lack of fly portions will result in an incorrect 0 offset.
+bool bAddVerticalFlyOffsets = 
GetFrameFormat().getIDocumentSettingAccess().get(
+DocumentSettingId::ADD_VERTICAL_FLY_OFFSETS);
+bool bFormatAnchorOnce = !bJoinLocked && bAddVerticalFlyOffsets;
+
+if (bFormatAnchor || bFormatAnchorOnce)
 {
 // --> #i50356#
 
GetAnchorFrameContainingAnchPos()->Calc(GetAnchorFrameContainingAnchPos()->getRootFrame()->GetCurrShell()->GetOut());
commit 58632afd2413fcc075cad08f5b4418fb613f0ed5
Author: Miklos Vajna 
AuthorDate: Thu Mar 14 15:51:07 2019 +0100
Commit: Miklos Vajna 
CommitDate: Tue 

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sfx2/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit 17046049d5028ab6ef3e0d3bddf18d49e6213126
Author: Caolán McNamara 
AuthorDate: Fri Jun 7 14:04:07 2019 +0100
Commit: Michael Stahl 
CommitDate: Tue Jun 18 18:10:22 2019 +0200

explictly exclude LibreLogo from XScript usage

Change-Id: I567647f0e2f8b82e4ef2995c673abe82f4564228
Reviewed-on: https://gerrit.libreoffice.org/73659
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit cb0024e3668979dfdef44db5aa15ddfaf035e695)
Reviewed-on: https://gerrit.libreoffice.org/74282
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 902e96ccea05..3016315cd17b 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1461,6 +1461,16 @@ namespace
 }
 }
 
+namespace {
+
+// don't allow LibreLogo to be used with our mouseover/etc dom-alike events
+bool UnTrustedScript(const OUString& rScriptURL)
+{
+return 
rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo");
+}
+
+}
+
 ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& 
_rxScriptContext, const OUString& _rScriptURL,
 const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& 
aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const 
css::uno::Any* pCaller )
 {
@@ -1473,6 +1483,9 @@ ErrCode SfxObjectShell::CallXScript( const Reference< 
XInterface >& _rxScriptCon
 if ( bIsDocumentScript && !lcl_isScriptAccessAllowed_nothrow( 
_rxScriptContext ) )
 return ERRCODE_IO_ACCESSDENIED;
 
+if ( UnTrustedScript(_rScriptURL) )
+return ERRCODE_IO_ACCESSDENIED;
+
 bool bCaughtException = false;
 Any aException;
 try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sw/inc sw/source

[Stephan Bergmann (via logerrit)]

 sw/inc/unosett.hxx |2 +-
 sw/source/core/text/porfld.cxx |4 ++--
 sw/source/core/text/porfld.hxx |1 +
 sw/source/core/text/txtfld.cxx |   12 +++-
 sw/source/core/unocore/unosett.cxx |   15 ---
 sw/source/uibase/config/StoredChapterNumbering.cxx |2 +-
 6 files changed, 28 insertions(+), 8 deletions(-)

New commits:
commit 940bd4b4680f780c2e9efd9c6565c94d11b72b5d
Author: Stephan Bergmann 
AuthorDate: Fri Jun 7 09:28:12 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Jun 18 18:39:00 2019 +0200

More uses of referer URL with SvxBrushItem

Reviewed-on: https://gerrit.libreoffice.org/73643
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit b518882de8213ef71a8003f95fbdf7689069c06d)
Conflicts:
sw/source/core/text/porfld.cxx
sw/source/core/unocore/unosett.cxx

Reviewed-on: https://gerrit.libreoffice.org/73860
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 87c418a98650ab6e4a62a0b4b72e02fee358dced)

Change-Id: I04b524784df4ef453d8b1feec13b62f183a17e23
Reviewed-on: https://gerrit.libreoffice.org/74283
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index dff4f1f8aee0..0aa6daefce36 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -208,7 +208,7 @@ public:
 
 static css::uno::Sequence 
GetPropertiesForNumFormat(
 const SwNumFormat& rFormat, OUString const& rCharFormatName,
-OUString const* pHeadingStyleName);
+OUString const* pHeadingStyleName, OUString const & referer);
 static void SetPropertiesToNumFormat(
 SwNumFormat & aFormat,
 OUString & rCharStyleName,
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 8c489de68590..c3de3a25128e 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -756,7 +756,7 @@ SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet,
 SwGrfNumPortion::SwGrfNumPortion(
 SwFrame*,
 const OUString& rGraphicFollowedBy,
-const SvxBrushItem* pGrfBrush,
+const SvxBrushItem* pGrfBrush, OUString const & referer,
 const SwFormatVertOrient* pGrfOrient, const Size& rGrfSize,
 const bool bLft, const bool bCntr, const sal_uInt16 nMinDst,
 const bool bLabelAlignmentPosAndSpaceModeActive ) :
@@ -770,7 +770,7 @@ SwGrfNumPortion::SwGrfNumPortion(
 if( pGrfBrush )
 {
 *pBrush = *pGrfBrush;
-const Graphic* pGraph = pGrfBrush->GetGraphic();
+const Graphic* pGraph = pGrfBrush->GetGraphic(referer);
 if( pGraph )
 SetAnimated( pGraph->IsAnimated() );
 else
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index cc5e350dbefa..a4f94d5147a1 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -172,6 +172,7 @@ public:
 SwGrfNumPortion( SwFrame *pFrame,
  const OUString& rGraphicFollowedBy,
  const SvxBrushItem* pGrfBrush,
+ OUString const & referer,
  const SwFormatVertOrient* pGrfOrient,
  const Size& rGrfSize,
  const bool bLeft,
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index d024e556ea43..26725e1cba3a 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -52,6 +52,7 @@
 #include "flddat.hxx"
 #include "fmtautofmt.hxx"
 #include 
+#include 
 #include 
 
 static bool lcl_IsInBody( SwFrame *pFrame )
@@ -478,9 +479,18 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( 
SwTextFormatInfo  ) con
 
 if( SVX_NUM_BITMAP == rNumFormat.GetNumberingType() )
 {
+OUString referer;
+if (auto const sh1 = rInf.GetVsh()) {
+if (auto const doc = sh1->GetDoc()) {
+auto const sh2 = doc->GetPersist();
+if (sh2 != nullptr && sh2->HasName()) {
+referer = sh2->GetMedium()->GetName();
+}
+}
+}
 pRet = new SwGrfNumPortion( 
const_cast(GetTextFrame()),
 pTextNd->GetLabelFollowedBy(),
-rNumFormat.GetBrush(),
+rNumFormat.GetBrush(), referer,
 rNumFormat.GetGraphicOrientation(),
 rNumFormat.GetGraphicSize(),
 bLeft, bCenter, nMinDist,
diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index 81fd65d30a05..afbee31d0340 100644
--- 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - chart2/qa sc/qa sw/qa test/source

[Mike Kaganski (via logerrit)]

 chart2/qa/extras/chart2export.cxx |7 +--
 sc/qa/unit/subsequent_export-test.cxx |8 +---
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx |   18 --
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx |   10 +++---
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |3 ++-
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx |3 ++-
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |2 +-
 test/source/xmltesttools.cxx  |3 +++
 8 files changed, 37 insertions(+), 17 deletions(-)

New commits:
commit a57691e297427f857ca8daecba26293c5203960d
Author: Mike Kaganski 
AuthorDate: Wed Apr 10 15:18:07 2019 +0300
Commit: Mike Kaganski 
CommitDate: Tue Jun 18 17:32:34 2019 +0200

XmlTestTools::getXPath now asserts that non-empty attribute exists

It turns out that this change revealed unit tests written incorrectly
(and untested), or maybe which became broken (not testing) because of
some previous assertXPath change? They incorrectly used 3-arg form of
it to check node content equality to passed string, while in fact, an
attribute was looked for with that name, and its empty return tested
to match default empty 4th argument.

Change-Id: If24e18518543102d115a22a6282e4cca9cf694e2
Reviewed-on: https://gerrit.libreoffice.org/70581
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/74296

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 839ef8c71752..3d502039d5b1 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -554,7 +554,10 @@ void Chart2ExportTest::testStockChart()
 
 assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:idx", "val", "1");
 assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:order", "val", "1");
-assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:tx/c:strRef/c:strCache/c:pt/c:v",
 "Open");
+assertXPathContent(
+pXmlDoc,
+
"/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:tx/c:strRef/c:strCache/c:pt/c:v",
+"Open");
 }
 
 void Chart2ExportTest::testBarChart()
@@ -710,7 +713,7 @@ void Chart2ExportTest::testDoughnutChart()
 xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML 
Text");
 CPPUNIT_ASSERT(pXmlDoc);
 
-assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:doughnutChart", 
"1");
+assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:doughnutChart");
 }
 
 void Chart2ExportTest::testDisplayUnits()
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 22851e9b5f5f..e7656233f979 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -716,10 +716,11 @@ void ScExportTest::testCommentExportXLSX()
 = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/comments1.xml");
 CPPUNIT_ASSERT(pComments);
 
-assertXPath(pComments, "/x:comments/x:authors/x:author[1]", "BAKO");
+assertXPathContent(pComments, "/x:comments/x:authors/x:author[1]", "BAKO");
 assertXPath(pComments, "/x:comments/x:authors/x:author", 1);
 
-assertXPath(pComments, 
"/x:comments/x:commentList/x:comment/x:text/x:r/x:t", "Komentarz");
+assertXPathContent(pComments, 
"/x:comments/x:commentList/x:comment/x:text/x:r/x:t",
+   "Komentarz");
 
 const xmlDocPtr pVmlDrawing
 = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/drawings/vmlDrawing1.vml");
@@ -757,7 +758,8 @@ void ScExportTest::testCommentExportXLSX_2_XLSX()
 = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/comments1.xml");
 CPPUNIT_ASSERT(pComments);
 
-assertXPath(pComments, 
"/x:comments/x:commentList/x:comment/x:text/x:r/x:t", "visible comment");
+assertXPathContent(pComments, 
"/x:comments/x:commentList/x:comment/x:text/x:r/x:t",
+   "visible comment");
 
 const xmlDocPtr pVmlDrawing
 = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/drawings/vmlDrawing1.vml");
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 494a6791e85e..91301b44858d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -714,8 +714,10 @@ DECLARE_OOXMLEXPORT_TEST(testParaAutoSpacing, 
"para-auto-spacing.docx")
 assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:spacing", 
"beforeAutospacing","1");
 assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:spacing", 
"afterAutospacing","1");
 
-assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:pPr/w:spacing", 
"beforeAutospacing","");
-assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:pPr/w:spacing", 
"afterAutospacing","");
+assertXPathNoAttribute(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:pPr/w:spacing",
+   

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

[Caolán McNamara (via logerrit)]

 editeng/source/editeng/impedit.cxx |   21 +++--
 editeng/source/editeng/impedit.hxx |2 ++
 2 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit ce9795954d3957e98d24bf711869efd846df6f15
Author: Caolán McNamara 
AuthorDate: Tue Jun 18 14:04:27 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 18 17:51:52 2019 +0200

fix crash in header/footer calc dialog

cut and paste can happen when the EditView isn't in a vcl::Window

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

diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 0fa84e2d90a2..9618c1fb604d 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -38,8 +39,9 @@
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
+#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -1268,6 +1270,13 @@ Pair ImpEditView::Scroll( long ndX, long ndY, 
ScrollRangeCheck nRangeCheck )
 return Pair( nRealDiffX, nRealDiffY );
 }
 
+Reference ImpEditView::GetClipboard()
+{
+if (vcl::Window* pWindow = GetWindow())
+return pWindow->GetClipboard();
+return 
css::datatransfer::clipboard::SystemClipboard::create(comphelper::getProcessComponentContext());
+}
+
 bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window const * 
pFrameWin )
 {
 bool bDone = false;
@@ -1281,7 +1290,7 @@ bool ImpEditView::PostKeyEvent( const KeyEvent& 
rKeyEvent, vcl::Window const * p
 {
 if ( !bReadOnly )
 {
-Reference 
aClipBoard(GetWindow()->GetClipboard());
+Reference 
aClipBoard(GetClipboard());
 CutCopy( aClipBoard, true );
 bDone = true;
 }
@@ -1289,7 +1298,7 @@ bool ImpEditView::PostKeyEvent( const KeyEvent& 
rKeyEvent, vcl::Window const * p
 break;
 case KeyFuncType::COPY:
 {
-Reference 
aClipBoard(GetWindow()->GetClipboard());
+Reference 
aClipBoard(GetClipboard());
 CutCopy( aClipBoard, false );
 bDone = true;
 }
@@ -1299,7 +1308,7 @@ bool ImpEditView::PostKeyEvent( const KeyEvent& 
rKeyEvent, vcl::Window const * p
 if ( !bReadOnly && IsPasteEnabled() )
 {
 pEditEngine->pImpEditEngine->UndoActionStart( 
EDITUNDO_PASTE );
-Reference 
aClipBoard(GetWindow()->GetClipboard());
+Reference 
aClipBoard(GetClipboard());
 Paste( aClipBoard, 
pEditEngine->pImpEditEngine->GetStatus().AllowPasteSpecial() );
 pEditEngine->pImpEditEngine->UndoActionEnd();
 bDone = true;
@@ -1329,12 +1338,12 @@ bool ImpEditView::MouseButtonUp( const MouseEvent& 
rMouseEvent )
 if ( rMouseEvent.IsMiddle() && !bReadOnly &&
  ( 
pWindow->GetSettings().GetMouseSettings().GetMiddleButtonAction() == 
MouseMiddleButtonAction::PasteSelection ) )
 {
-Reference 
aClipBoard(pWindow->GetPrimarySelection());
+Reference 
aClipBoard(GetClipboard());
 Paste( aClipBoard );
 }
 else if ( rMouseEvent.IsLeft() && GetEditSelection().HasRange() )
 {
-Reference 
aClipBoard(pWindow->GetPrimarySelection());
+Reference 
aClipBoard(GetClipboard());
 CutCopy( aClipBoard, false );
 }
 }
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index 8f09ca8f13d0..b7f7d5db0323 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -282,6 +282,8 @@ private:
 
 void InvalidateAtWindow(const tools::Rectangle& rRect);
 
+css::uno::Reference 
GetClipboard();
+
 protected:
 
 // DragAndDropClient
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: ciabot/bugzilla ciabot/libreoffice-bugzilla2.py

[Thorsten Behrens (via logerrit)]

 ciabot/bugzilla/base.py |8 ++--
 ciabot/libreoffice-bugzilla2.py |   25 -
 2 files changed, 14 insertions(+), 19 deletions(-)

New commits:
commit fb1f2fee35b1ed9dd24a6f3cefe431cdd8e14dea
Author: Thorsten Behrens 
AuthorDate: Tue Jun 18 18:12:52 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Jun 18 18:14:12 2019 +0200

Sync ciabot with in-production copy

diff --git a/ciabot/bugzilla/base.py b/ciabot/bugzilla/base.py
index d9b4e28..81dffb4 100644
--- a/ciabot/bugzilla/base.py
+++ b/ciabot/bugzilla/base.py
@@ -253,10 +253,6 @@ class RequestsTransport(Transport):
 # xmlrpclib fails to escape \r
 request_body = request_body.replace(b'\r', b'')
 
-# Needed for python-requests < 2.0 with python3, otherwise we get
-# Content-Type error later for the POST request
-request_body = request_body.decode('utf-8')
-
 return self._request_helper(url, request_body)
 
 
@@ -944,8 +940,8 @@ class BugzillaBase(object):
 if self._supports_getbug_extra_fields:
 getbugdata["extra_fields"] = extra_fields
 
-log.debug("Calling Bug.get_bugs with: %s", getbugdata)
-r = self._proxy.Bug.get_bugs(getbugdata)
+log.debug("Calling Bug.get with: %s", getbugdata)
+r = self._proxy.Bug.get(getbugdata)
 
 if self.bz_ver_major >= 4:
 bugdict = dict([(b['id'], b) for b in r['bugs']])
diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 626a7d6..17c88f0 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -37,8 +37,8 @@ import bugzilla
 from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
-master_target = "6.1.0"
-bug_regex = "(?:tdf|fdo)#(\d+)"
+master_target = "6.4.0"
+bug_regex = "\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)\\b"
 dry_run = False
 
 class FreedesktopBZ:
@@ -48,7 +48,7 @@ class FreedesktopBZ:
 
 def connect(self):
 config = ConfigParser.ConfigParser()
-config.read('/home/ciabot/prod/config.cfg')
+config.read('/srv/home/ciabot/prod/config.cfg')
 url = config.get('bugzilla', 'url')
 user = config.get('bugzilla', 'user')
 password = config.get('bugzilla', 'password')
@@ -75,10 +75,8 @@ class FreedesktopBZ:
 new_whiteboard = old_whiteboard + "target:" + new_version
 bug.setwhiteboard(new_whiteboard)
 
-cgiturl = "http://cgit.freedesktop.org/libreoffice/%s/commit/?id=%s; 
%(repo_name, commit.hexsha)
-if branch is not None and branch != "master":
-cgiturl = cgiturl + "=" + branch
-else:
+cgiturl = "https://git.libreoffice.org/%s/+/%s%%5E%%21; % (repo_name, 
commit.hexsha)
+if branch is None:
 branch = "master"
 
 comment_msg = """%s committed a patch related to this issue.
@@ -94,9 +92,9 @@ It has been pushed to "%s":
 It will be available in %s.
 
 The patch should be included in the daily builds available at
-http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
+https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
 information about daily builds can be found at:
-http://wiki.documentfoundation.org/Testing_Daily_Builds
+https://wiki.documentfoundation.org/Testing_Daily_Builds
 
 Affected users are encouraged to test the fix and report feedback.""" 
%(new_version)
 
@@ -167,7 +165,8 @@ def get_commit(repo, commit_id):
 commit = repo.commit(commit_id)
 return commit
 
-def find_bugid(commit):
+def find_bugid(repo, commit_id):
+commit = get_commit(repo, commit_id)
 summary_line = commit.summary
 regex = re.compile(bug_regex)
 m = regex.findall(summary_line)
@@ -179,7 +178,7 @@ def find_bugid(commit):
 
 def read_repo(repo_name):
 config = ConfigParser.ConfigParser()
-config.read('/home/ciabot/prod/config.cfg')
+config.read('/srv/home/ciabot/prod/config.cfg')
 path = config.get(repo_name, 'location')
 repo = git.repo.base.Repo(path)
 return repo
@@ -219,9 +218,9 @@ def main(argv):
 
 target_version = find_target_version(repo, branch)
 
-commit = get_commit(repo, commit_id)
+bug_ids = find_bugid(repo, commit_id)
 
-bug_ids = find_bugid(commit)
+commit = get_commit(repo, commit_id)
 
 if target_version is None:
 print("missing target version")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - 3 commits - librelogo/source sfx2/source sw/inc sw/source

[Stephan Bergmann (via logerrit)]

 librelogo/source/LibreLogo/LibreLogo.py|   51 -
 sfx2/source/doc/objmisc.cxx|   13 +
 sw/inc/unosett.hxx |2 
 sw/source/core/text/porfld.cxx |4 -
 sw/source/core/text/porfld.hxx |1 
 sw/source/core/text/txtfld.cxx |   12 
 sw/source/core/unocore/unosett.cxx |   15 --
 sw/source/uibase/config/StoredChapterNumbering.cxx |2 
 8 files changed, 91 insertions(+), 9 deletions(-)

New commits:
commit ab1a8b0861b469a1a7c1806b99edca58c7a8c785
Author: Stephan Bergmann 
AuthorDate: Fri Jun 7 09:28:12 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Jun 18 14:06:03 2019 +0200

More uses of referer URL with SvxBrushItem

Reviewed-on: https://gerrit.libreoffice.org/73643
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit b518882de8213ef71a8003f95fbdf7689069c06d)
Conflicts:
sw/source/core/text/porfld.cxx
sw/source/core/unocore/unosett.cxx

Reviewed-on: https://gerrit.libreoffice.org/73860
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 87c418a98650ab6e4a62a0b4b72e02fee358dced)

Change-Id: I04b524784df4ef453d8b1feec13b62f183a17e23

diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index dff4f1f8aee0..0aa6daefce36 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -208,7 +208,7 @@ public:
 
 static css::uno::Sequence 
GetPropertiesForNumFormat(
 const SwNumFormat& rFormat, OUString const& rCharFormatName,
-OUString const* pHeadingStyleName);
+OUString const* pHeadingStyleName, OUString const & referer);
 static void SetPropertiesToNumFormat(
 SwNumFormat & aFormat,
 OUString & rCharStyleName,
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 8c489de68590..c3de3a25128e 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -756,7 +756,7 @@ SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet,
 SwGrfNumPortion::SwGrfNumPortion(
 SwFrame*,
 const OUString& rGraphicFollowedBy,
-const SvxBrushItem* pGrfBrush,
+const SvxBrushItem* pGrfBrush, OUString const & referer,
 const SwFormatVertOrient* pGrfOrient, const Size& rGrfSize,
 const bool bLft, const bool bCntr, const sal_uInt16 nMinDst,
 const bool bLabelAlignmentPosAndSpaceModeActive ) :
@@ -770,7 +770,7 @@ SwGrfNumPortion::SwGrfNumPortion(
 if( pGrfBrush )
 {
 *pBrush = *pGrfBrush;
-const Graphic* pGraph = pGrfBrush->GetGraphic();
+const Graphic* pGraph = pGrfBrush->GetGraphic(referer);
 if( pGraph )
 SetAnimated( pGraph->IsAnimated() );
 else
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index cc5e350dbefa..a4f94d5147a1 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -172,6 +172,7 @@ public:
 SwGrfNumPortion( SwFrame *pFrame,
  const OUString& rGraphicFollowedBy,
  const SvxBrushItem* pGrfBrush,
+ OUString const & referer,
  const SwFormatVertOrient* pGrfOrient,
  const Size& rGrfSize,
  const bool bLeft,
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index d024e556ea43..26725e1cba3a 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -52,6 +52,7 @@
 #include "flddat.hxx"
 #include "fmtautofmt.hxx"
 #include 
+#include 
 #include 
 
 static bool lcl_IsInBody( SwFrame *pFrame )
@@ -478,9 +479,18 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( 
SwTextFormatInfo  ) con
 
 if( SVX_NUM_BITMAP == rNumFormat.GetNumberingType() )
 {
+OUString referer;
+if (auto const sh1 = rInf.GetVsh()) {
+if (auto const doc = sh1->GetDoc()) {
+auto const sh2 = doc->GetPersist();
+if (sh2 != nullptr && sh2->HasName()) {
+referer = sh2->GetMedium()->GetName();
+}
+}
+}
 pRet = new SwGrfNumPortion( 
const_cast(GetTextFrame()),
 pTextNd->GetLabelFollowedBy(),
-rNumFormat.GetBrush(),
+rNumFormat.GetBrush(), referer,
 rNumFormat.GetGraphicOrientation(),
 rNumFormat.GetGraphicSize(),
 bLeft, bCenter, nMinDist,
diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index 81fd65d30a05..afbee31d0340 100644
--- 

[Libreoffice-commits] core.git: include/svx officecfg/registry sd/sdi sd/source sd/uiconfig svx/sdi

[Samuel Mehrbrodt (via logerrit)]

 include/svx/svxids.hrc   |1 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |8 +++
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |8 ---
 sd/sdi/_drvwsh.sdi   |5 ++
 sd/source/ui/view/drviews2.cxx   |   15 
---
 sd/source/ui/view/drviewsf.cxx   |   21 
++
 sd/uiconfig/simpress/popupmenu/drawtext.xml  |1 
 svx/sdi/svx.sdi  |   17 

 8 files changed, 63 insertions(+), 13 deletions(-)

New commits:
commit 533dec5a3ddaff7ec176609edcff2cde4464747a
Author: Samuel Mehrbrodt 
AuthorDate: Tue Jun 18 13:43:27 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Jun 18 16:21:32 2019 +0200

tdf#111707 Add 'Remove Hyperlink' to context menu in Impress

"Clear formatting" no longer removes the hyperlink,
as now there is a dedicated context menu entry for this.

Change-Id: Ic47795b9ecb238470f853da527c648f6edb94c09
Reviewed-on: https://gerrit.libreoffice.org/74272
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index b5cbbab79d47..bec13fcf907a 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -497,6 +497,7 @@ class SvxSetItem;
 #define SID_GROUP   ( SID_SVX_START + 454 )
 #define SID_UNGROUP ( SID_SVX_START + 455 )
 #define SID_SET_DEFAULT ( SID_SVX_START + 456 )
+#define SID_REMOVE_HYPERLINK( SID_SVX_START + 457 )
 
 // CAUTION! Range <457 .. 457> used by EditEngine (!)
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 840c17d5404f..f8a45ed58929 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -7013,6 +7013,14 @@
   Regenerate Diagram
 
   
+  
+
+  ~Remove Hyperlink
+
+
+  1
+
+  
 
   
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 568a093e3ea4..df8fb4f821b2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -457,14 +457,6 @@
   1
 
   
-  
-
-  Remove Hyperlink
-
-
-  1
-
-  
   
 
   Copy Hyperlink Location
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 93a30e6757dc..8dfdf71023de 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -1522,6 +1522,11 @@ interface DrawView
 ExecMethod = FuTemporary ;
 StateMethod = GetAttrState ;
 ]
+SID_REMOVE_HYPERLINK // ole : no, status : ?
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetAttrState ;
+]
 SID_RULER_PAGE_POS // ole : no, status : ?
 [
 ExecMethod = ExecRuler ;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 007f3723b882..b6933d934182 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1145,18 +1145,24 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 rReq.Done ();
 break;
 
-case SID_SET_DEFAULT:
+case SID_REMOVE_HYPERLINK:
 {
-std::unique_ptr pSet;
-
 if (mpDrawView->IsTextEdit())
 {
-::Outliner* pOutl = mpDrawView->GetTextEditOutliner();
+Outliner* pOutl = mpDrawView->GetTextEditOutliner();
 if (pOutl)
 {
 pOutl->RemoveFields(checkSvxFieldData);
 }
+}
+}
+break;
+case SID_SET_DEFAULT:
+{
+std::unique_ptr pSet;
 
+if (mpDrawView->IsTextEdit())
+{
 pSet.reset(new SfxItemSet( GetPool(), 
svl::Items{} ));
 mpDrawView->SetAttributes( *pSet, true );
 }
@@ -1213,7 +1219,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 if( nLevel == 1 )
 // text frame listens on StyleSheet of 
level1
 pObj->NbcSetStyleSheet(pSheet, false);
-
 }
 }
 }
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/layout/data/tdf123651.docx   |binary
 sw/qa/extras/layout/layout.cxx|   11 ++
 sw/qa/extras/tiledrendering/data/semi-transparent.odt |binary
 sw/qa/extras/tiledrendering/tiledrendering.cxx|   33 ++
 sw/qa/extras/uiwriter/uiwriter2.cxx   |   23 
 sw/source/core/layout/paintfrm.cxx|7 +++
 sw/source/core/text/txtfrm.cxx|3 +
 7 files changed, 61 insertions(+), 16 deletions(-)

New commits:
commit 3d3564678bc11eefbc47547b665f1d11285aaa84
Author: Miklos Vajna 
AuthorDate: Tue May 14 12:02:55 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 18 18:12:12 2019 +0200

sw lok: assume no windows in SwLayoutFrame::PaintSwFrame()

The high-level problem was that a watermark shape in the background was
rendered with lighter and darker gray as the user typed. The reason for
this was that depending on what larger combined tile was rendered we did
or did not repaint the layout frame.

Handle the situation similar to when we have no vcl::Window at all,
which ensures that we always paint only once. The rgb value matches the
desktop rendering result this way.

(Just assert that we render the gray light enough, the actual color
channel value may be 190 or 191.)

Reviewed-on: https://gerrit.libreoffice.org/72276
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit 93abdf39b01bb7b404dc09ef37369a4350fb0d10)

Conflicts:
sw/qa/extras/tiledrendering/tiledrendering.cxx

Change-Id: Ie8746ab70f49f7f1080632c39e3a826c4ce509df

diff --git a/sw/qa/extras/tiledrendering/data/semi-transparent.odt 
b/sw/qa/extras/tiledrendering/data/semi-transparent.odt
new file mode 100644
index ..eb76980e7406
Binary files /dev/null and 
b/sw/qa/extras/tiledrendering/data/semi-transparent.odt differ
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 06cd6bfa48b2..4a33b92a372d 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 static char const DATA_DIRECTORY[] = "/sw/qa/extras/tiledrendering/data/";
@@ -108,6 +109,7 @@ public:
 void testSplitNodeRedlineCallback();
 void testDeleteNodeRedlineCallback();
 void testVisCursorInvalidation();
+void testSemiTransparent();
 
 CPPUNIT_TEST_SUITE(SwTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -163,6 +165,7 @@ public:
 CPPUNIT_TEST(testSplitNodeRedlineCallback);
 CPPUNIT_TEST(testDeleteNodeRedlineCallback);
 CPPUNIT_TEST(testVisCursorInvalidation);
+CPPUNIT_TEST(testSemiTransparent);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2374,6 +2377,36 @@ void SwTiledRenderingTest::testVisCursorInvalidation()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void SwTiledRenderingTest::testSemiTransparent()
+{
+// Load a document where the top left tile contains a semi-transparent 
rectangle shape.
+comphelper::LibreOfficeKit::setActive();
+SwXTextDocument* pXTextDocument = createDoc("semi-transparent.odt");
+
+// Render a larger area, and then get the color of the bottom right corner 
of our tile.
+size_t nCanvasWidth = 1024;
+size_t nCanvasHeight = 512;
+size_t nTileSize = 256;
+std::vector aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
+ScopedVclPtrInstance pDevice(nullptr, Size(1, 1), 
DeviceFormat::DEFAULT);
+pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
+pDevice->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth, 
nCanvasHeight),
+Fraction(1.0), Point(), 
aPixmap.data());
+pXTextDocument->paintTile(*pDevice, nCanvasWidth, nCanvasHeight, 
/*nTilePosX=*/0,
+  /*nTilePosY=*/0, /*nTileWidth=*/15360, 
/*nTileHeight=*/7680);
+pDevice->EnableMapMode(false);
+Bitmap aBitmap = pDevice->GetBitmap(Point(0, 0), Size(nTileSize, 
nTileSize));
+Bitmap::ScopedReadAccess pAccess(aBitmap);
+Color aColor(pAccess->GetPixel(255, 255).GetColor());
+
+// Without the accompanying fix in place, this test would have failed with 
'Expected greater or
+// equal than: 190; Actual: 159'. This means the semi-transparent gray 
rectangle was darker than
+// expected, as it was painted twice.
+CPPUNIT_ASSERT_GREATEREQUAL(190, static_cast(aColor.GetRed()));
+CPPUNIT_ASSERT_GREATEREQUAL(190, static_cast(aColor.GetGreen()));
+CPPUNIT_ASSERT_GREATEREQUAL(190, static_cast(aColor.GetBlue()));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwTiledRenderingTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index de8d04311d64..0a9338f462b6 100644
--- 

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - librelogo/source

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

 librelogo/source/LibreLogo/LibreLogo.py |   51 +++-
 1 file changed, 50 insertions(+), 1 deletion(-)

New commits:
commit 3b490c0f22f06911c17589ff0bf17b4dfbf41726
Author: László Németh 
AuthorDate: Thu Jun 6 14:25:32 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Jun 18 16:20:27 2019 +0200

sanitize LibreLogo calls

Change-Id: Ie4d9858e5b4b3e55ab08416fb9338d2df34ee5e1
Reviewed-on: https://gerrit.libreoffice.org/73627
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 1b63fa32bbd4a5b89d2ee3a53b28de4250c8dad3)
Reviewed-on: https://gerrit.libreoffice.org/74281
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/librelogo/source/LibreLogo/LibreLogo.py 
b/librelogo/source/LibreLogo/LibreLogo.py
index 7885ab9bb66d..2b9ef849ad13 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -76,6 +76,7 @@ __LineStyle_DOTTED__ = 2
 class __Doc__:
 def __init__(self, doc):
 self.doc = doc
+self.secure = False
 try:
 self.drawpage = doc.DrawPage # Writer
 except:
@@ -409,10 +410,58 @@ class LogoProgram(threading.Thread):
 self.code = code
 threading.Thread.__init__(self)
 
+def secure(self):
+# 0 = secure
+if _.secure:
+return 0
+
+# 1 = forms, fields or embedded objects are forbidden
+if _.doc.DrawPage.Forms.getCount() > 0 or 
_.doc.getTextFields().createEnumeration().hasMoreElements() or 
_.doc.getEmbeddedObjects().getCount() > 0:
+return 1
+
+# 2 = hyperlinks with script events
+nodes = _.doc.Text.createEnumeration()
+while nodes.hasMoreElements():
+node = nodes.nextElement()
+if node.supportsService("com.sun.star.text.Paragraph"):
+portions = node.createEnumeration()
+while portions.hasMoreElements():
+portion = portions.nextElement()
+if 
portion.PropertySetInfo.hasPropertyByName("HyperLinkEvents"):
+events = portion.getPropertyValue("HyperLinkEvents")
+for event in events.getElementNames():
+attributes = events.getByName(event)
+for attribute in attributes:
+if attribute.Name == "EventType" and 
attribute.Value == "Script":
+return 2
+
+# 2 = images with script events
+images = _.doc.DrawPage.createEnumeration()
+while images.hasMoreElements():
+image = images.nextElement()
+try:
+events = image.Events
+for event in events.getElementNames():
+attributes = events.getByName(event)
+for attribute in attributes:
+if attribute.Name == "EventType" and attribute.Value 
== "Script":
+return 2
+except:
+pass
+
+_.secure = True
+return 0
+
 def run(self):
 global __thread__
 try:
-exec(self.code)
+# check document security
+secid = self.secure()
+if secid > 0:
+parent = _.doc.CurrentController.Frame.ContainerWindow
+MessageBox(parent, "Document objects with%s script events" % 
[" possible", ""][secid-1], "LibreLogo program can't start", "errorbox")
+else:
+exec(self.code)
 if _.origcursor[0] and _.origcursor[1]:
 __dispatcher__(".uno:Escape")
 try:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

 sfx2/source/doc/autoredactdialog.cxx |   73 ---
 vcl/qt5/Qt5Instance.cxx  |6 +-
 2 files changed, 71 insertions(+), 8 deletions(-)

New commits:
commit 17c91a53d25c0b82524e04a0c108f8e0abc76685
Author: Jan-Marek Glogowski 
AuthorDate: Tue Jun 18 14:11:31 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Tue Jun 18 20:22:32 2019 +0200

tdf#125934 Qt5 set the desktop file name...

.. but only on wayland, as this also overrides the individual
window icons on X11.

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

diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 7961d5be0209..f83cf86b25ba 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -243,8 +243,10 @@ Qt5Instance::~Qt5Instance()
 
 void Qt5Instance::AfterAppInit()
 {
-// sets the default application icon on Wayland
-
QGuiApplication::setDesktopFileName(QStringLiteral("libreoffice-startcenter.desktop"));
+// set the default application icon via destop file just on Wayland,
+// as this otherwise overrides the individual desktop icons on X11.
+if (QGuiApplication::platformName() == "wayland")
+
QGuiApplication::setDesktopFileName(QStringLiteral("libreoffice-startcenter.desktop"));
 }
 
 void Qt5Instance::deleteObjectLater(QObject* pObject) { 
pObject->deleteLater(); }
commit 3cc152695af2117fecc0006ac2d34d43a9df0d86
Author: Muhammet Kara 
AuthorDate: Mon Jun 17 15:33:37 2019 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jun 18 20:20:08 2019 +0200

Let autoredact dialog remember last state

* By storing the JSON string as SvtViewOptions

Change-Id: I08e323005612cb0181d2176af659eb54267fbb3f
Reviewed-on: https://gerrit.libreoffice.org/74169
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/sfx2/source/doc/autoredactdialog.cxx 
b/sfx2/source/doc/autoredactdialog.cxx
index cc0aa1456db8..950684ac4d1c 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -557,6 +557,7 @@ SfxAutoRedactDialog::SfxAutoRedactDialog(weld::Window* 
pParent)
 OUString sExtraData;
 SvtViewOptions aDlgOpt(EViewType::Dialog,
OStringToOUString(m_xDialog->get_help_id(), 
RTL_TEXTENCODING_UTF8));
+
 if (aDlgOpt.Exists())
 {
 css::uno::Any aUserItem = aDlgOpt.GetUserItem("UserItem");
@@ -564,12 +565,34 @@ SfxAutoRedactDialog::SfxAutoRedactDialog(weld::Window* 
pParent)
 }
 
 // update the targets configuration if necessary
+if (!sExtraData.isEmpty())
 {
 weld::WaitObject aWaitCursor(m_xDialog.get());
-//m_aTargets.Update();
-}
 
-// TODO: fill the targets box
+try
+{
+// Create path string, and read JSON from file
+boost::property_tree::ptree aTargetsJSON;
+std::stringstream aStream(std::string(sExtraData.toUtf8()));
+
+boost::property_tree::read_json(aStream, aTargetsJSON);
+
+// Recreate & add the targets to the dialog
+for (const boost::property_tree::ptree::value_type& rValue :
+ aTargetsJSON.get_child("RedactionTargets"))
+{
+RedactionTarget* pTarget = JSONtoRedactionTarget(rValue);
+addTarget(pTarget);
+}
+}
+catch (css::uno::Exception& e)
+{
+SAL_WARN("sfx.doc",
+ "Exception caught while trying to load the last dialog 
state: " << e.Message);
+return;
+//TODO: Warn the user with a message box
+}
+}
 
 // Handler connections
 m_xLoadBtn->connect_clicked(LINK(this, SfxAutoRedactDialog, Load));
@@ -581,9 +604,47 @@ SfxAutoRedactDialog::SfxAutoRedactDialog(weld::Window* 
pParent)
 
 SfxAutoRedactDialog::~SfxAutoRedactDialog()
 {
-// Store the view options
-/*SvtViewOptions aDlgOpt(EViewType::Dialog, 
OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8));
-aDlgOpt.SetUserItem("UserItem", 
css::uno::makeAny(m_xMoreBt->get_expanded() ? OUString("Y") : OUString("N")));*/
+if (m_aTableTargets.empty())
+{
+// Clear the dialog data
+SvtViewOptions aDlgOpt(EViewType::Dialog,
+   OStringToOUString(m_xDialog->get_help_id(), 
RTL_TEXTENCODING_UTF8));
+aDlgOpt.Delete();
+return;
+}
+
+try
+{
+// Put the targets into a JSON array
+boost::property_tree::ptree aTargetsArray;
+for (const auto& targetPair : m_aTableTargets)
+{
+aTargetsArray.push_back(std::make_pair("", 
redactionTargetToJSON(targetPair.first)));
+}
+
+// Build the JSON tree
+boost::property_tree::ptree aTargetsTree;
+aTargetsTree.add_child("RedactionTargets", 

[Libreoffice-commits] core.git: 2 commits - writerfilter/source xmlhelp/Library_ucpchelp1.mk xmlhelp/source xmloff/source xmlsecurity/source xmlsecurity/workben

[Noel Grandin (via logerrit)]

 writerfilter/source/dmapper/DomainMapper.cxx |4 -
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   15 ++---
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|   27 --
 writerfilter/source/dmapper/GraphicImport.cxx|9 +--
 writerfilter/source/dmapper/NumberingManager.cxx |   13 ++--
 writerfilter/source/dmapper/OLEHandler.cxx   |9 +--
 writerfilter/source/dmapper/PropertyMap.cxx  |4 -
 writerfilter/source/dmapper/StyleSheetTable.cxx  |4 -
 writerfilter/source/dmapper/TableManager.cxx |5 +
 writerfilter/source/filter/RtfFilter.cxx |5 +
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx  |   36 ++---
 writerfilter/source/rtftok/rtfdocumentimpl.cxx   |6 +-
 xmlhelp/Library_ucpchelp1.mk |1 
 xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx|5 +
 xmloff/source/chart/SchXMLChartContext.cxx   |9 +--
 xmloff/source/chart/SchXMLExport.cxx |   40 +++
 xmloff/source/chart/SchXMLImport.cxx |4 -
 xmloff/source/chart/SchXMLPlotAreaContext.cxx|   18 +++---
 xmloff/source/chart/SchXMLSeries2Context.cxx |   16 +++---
 xmloff/source/chart/SchXMLSeriesHelper.cxx   |8 +--
 xmloff/source/core/DocumentSettingsContext.cxx   |7 +-
 xmloff/source/draw/animationexport.cxx   |5 +
 xmloff/source/draw/shapeexport.cxx   |4 -
 xmloff/source/style/XMLFontAutoStylePool.cxx |5 +
 xmloff/source/text/XMLTextFrameContext.cxx   |   11 ++--
 xmloff/source/text/txtparai.cxx  |5 +
 xmlsecurity/source/helper/documentsignaturehelper.cxx|5 +
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |5 +
 xmlsecurity/workben/pdfverify.cxx|   13 ++--
 29 files changed, 156 insertions(+), 142 deletions(-)

New commits:
commit 2836b78b54650d117282a9a345677d1b4d9fc043
Author: Noel Grandin 
AuthorDate: Tue Jun 18 15:38:17 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 18 20:03:42 2019 +0200

loplugin:logexceptionnicely in xmlhelp..xmlsecurity

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

diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index e12aabf96326..b76e0eb67c23 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,ucpchelp1,\
cppuhelper \
helplinker \
sal \
+   tl \
ucbhelper \
utl \
i18nlangtag \
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx 
b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index ac464c6d02c3..d599a217446d 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -26,6 +26,7 @@
 #include 
 
 #include 
+#include 
 
 #if defined(__GNUC__)
 #  pragma GCC visibility push (default)
@@ -234,9 +235,9 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< 
uno::XComponentConte
 
 aIndexFolderResultVectorVector.push_back( 
std::move(aIndexFolderResultVector) );
 }
-catch (const Exception )
+catch (const Exception &)
 {
-SAL_WARN("xmlhelp", e);
+TOOLS_WARN_EXCEPTION("xmlhelp", "");
 }
 
 if( bTemporary )
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx 
b/xmloff/source/chart/SchXMLChartContext.cxx
index 6cc3a29a7828..df143274ac32 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -27,6 +27,7 @@
 #include "SchXMLTools.hxx"
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -165,9 +166,9 @@ void lcl_removeEmptyChartTypeGroups( const uno::Reference< 
chart2::XChartDocumen
 }
 }
 }
-catch(const uno::Exception& ex)
+catch(const uno::Exception&)
 {
-SAL_INFO("xmloff.chart", "Exception caught while removing empty chart 
types: " << ex);
+TOOLS_INFO_EXCEPTION("xmloff.chart", "Exception caught while removing 
empty chart types");
 }
 }
 
@@ -301,9 +302,9 @@ static void 
lcl_setDataProvider(uno::Reference const & x
 xChartDoc->createInternalDataProvider(false);
 }
 }
-catch (const uno::Exception & rEx)
+catch (const uno::Exception &)
 {
-SAL_INFO("xmloff.chart", "SchXMLChartContext::StartElement(): 
Exception caught: " << rEx);
+TOOLS_INFO_EXCEPTION("xmloff.chart", 
"SchXMLChartContext::StartElement()");
 }
 }
 
diff --git a/xmloff/source/chart/SchXMLExport.cxx 
b/xmloff/source/chart/SchXMLExport.cxx

[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/Library_vcl.mk vcl/osx vcl/qt5 vcl/source vcl/unx vcl/win

[Jan-Marek Glogowski (via logerrit)]

 vcl/Library_vcl.mk|1 
 vcl/headless/svpframe.cxx |2 
 vcl/headless/svpgdi.cxx   |   63 -
 vcl/inc/WidgetDrawInterface.hxx   |   57 
 vcl/inc/headless/svpgdi.hxx   |   21 
 vcl/inc/qt5/Qt5Graphics.hxx   |   49 --
 vcl/inc/qt5/Qt5Graphics_Controls.hxx  |   27 ++---
 vcl/inc/qt5/Qt5SvpGraphics.hxx|   41 
 vcl/inc/quartz/salgdi.h   |   10 +-
 vcl/inc/salgdi.hxx|  139 +++---
 vcl/inc/unx/gtk/gtkgdi.hxx|   17 ++-
 vcl/inc/win/salgdi.h  |5 -
 vcl/osx/salnativewidgets.cxx  |2 
 vcl/qt5/Qt5Graphics.cxx   |   25 ++---
 vcl/qt5/Qt5Graphics_Controls.cxx  |4 
 vcl/qt5/Qt5SvpGraphics.cxx|   51 +--
 vcl/source/gdi/salgdilayout.cxx   |   56 +++-
 vcl/source/gdi/salnativewidgets-none.cxx  |   53 ---
 vcl/source/outdev/nativecontrols.cxx  |2 
 vcl/unx/gtk/gtksalframe.cxx   |2 
 vcl/unx/gtk/salnativewidgets-gtk.cxx  |8 +
 vcl/unx/gtk3/gtk3gtkframe.cxx |2 
 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |   49 +++---
 vcl/win/gdi/salnativewidgets-luna.cxx |2 
 24 files changed, 193 insertions(+), 495 deletions(-)

New commits:
commit 4a478227f5af8322164ecce66fd056e9bf2eac89
Author: Jan-Marek Glogowski 
AuthorDate: Sun Jun 16 14:19:09 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Tue Jun 18 20:27:49 2019 +0200

VCL cleanup WidgetDrawInterface

I don't understand why WidgetDrawInterface, which is basically a
copy of the SalGraphics native controls interface, duplicated it,
instead of cleaning things up.

The whole commit message of commit 8fcfa3853a81, which added this
code, is just: "custom widgets: Custom Widget Themes". That's it.

So this patch does, what the original one skipped: replacing the
SalGraphics interface with the WidgetDrawInterface. One result is
the addition of handleDamage to SalGraphics to correctly handle
the damage done by a custom widget theme to the underlying
SalGraphics implementation.

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

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index deb7cf049106..c8391717c492 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -300,7 +300,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/gdi/salgdiimpl \
 vcl/source/gdi/sallayout \
 vcl/source/gdi/salmisc \
-vcl/source/gdi/salnativewidgets-none \
 vcl/source/gdi/vectorgraphicdata \
 vcl/source/gdi/textlayout \
 vcl/source/gdi/virdev \
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index f54103ff1ecc..4259a84d5a0b 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -441,7 +441,7 @@ void SvpSalFrame::UpdateSettings( AllSettings& rSettings )
 }
 rSettings.SetStyleSettings(aStyleSettings);
 #ifndef IOS // For now...
-pGraphics->updateSettings(rSettings);
+pGraphics->UpdateSettings(rSettings);
 #endif
 if (bFreeGraphics)
 ReleaseGraphics(pGraphics);
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 0f6fda87fd5b..b335d2ed630b 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1866,69 +1866,6 @@ bool SvpSalGraphics::drawEPS( long, long, long, long, 
void*, sal_uInt32 )
 return false;
 }
 
-/* Widget drawing */
-
-bool SvpSalGraphics::IsNativeControlSupported(ControlType eType, ControlPart 
ePart)
-{
-if (hasWidgetDraw())
-return m_pWidgetDraw->isNativeControlSupported(eType, ePart);
-
-return false;
-}
-
-bool SvpSalGraphics::hitTestNativeControl(ControlType eType, ControlPart ePart,
-   const tools::Rectangle& 
rBoundingControlRegion,
-   const Point& rPosition, bool& rIsInside)
-{
-if (hasWidgetDraw())
-{
-return m_pWidgetDraw->hitTestNativeControl(eType, ePart, 
rBoundingControlRegion, rPosition, rIsInside);
-}
-
-return false;
-}
-
-bool SvpSalGraphics::drawNativeControl(ControlType eType, ControlPart ePart,
-   const tools::Rectangle& rControlRegion,
-   ControlState eState, const 
ImplControlValue& aValue,
-   const OUString& aCaptions)
-{
-if (hasWidgetDraw())
-{
-bool bReturn = m_pWidgetDraw->drawNativeControl(eType, ePart, 
rControlRegion,
-eState, aValue, 
aCaptions);
-return bReturn;
-}
-
-return false;
-}
-
-bool 

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/uiwriter/data2/image-comment.odt |binary
 sw/qa/extras/uiwriter/uiwriter2.cxx   |   32 ++
 sw/sdi/_frmsh.sdi |5 
 sw/source/uibase/inc/frmsh.hxx|1 
 sw/source/uibase/shells/frmsh.cxx |   14 +++
 sw/source/uibase/wrtsh/wrtsh1.cxx |   22 +
 6 files changed, 74 insertions(+)

New commits:
commit 351b9aefe3de7c68e907fdc7926d9b508560320e
Author: Miklos Vajna 
AuthorDate: Tue Jun 18 17:44:33 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 18 19:11:50 2019 +0200

sw: implement inserting comments when an as-char image is selected

Only the UI was missing in this case: creating a text selection around
the placeholder character does what the user expects.

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

diff --git a/sw/qa/extras/uiwriter/data2/image-comment.odt 
b/sw/qa/extras/uiwriter/data2/image-comment.odt
new file mode 100644
index ..4f0a520bcca3
Binary files /dev/null and b/sw/qa/extras/uiwriter/data2/image-comment.odt 
differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index b283af27b24c..4da4123e3322 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -27,8 +27,12 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 
 namespace
@@ -1357,4 +1361,32 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf125310b)
 CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testImageComment)
+{
+// Load a document with an as-char image in it.
+SwDoc* pDoc = createDoc("image-comment.odt");
+SwView* pView = pDoc->GetDocShell()->GetView();
+
+// Select the image.
+pView->GetViewFrame()->GetDispatcher()->Execute(FN_CNTNT_TO_NEXT_FRAME, 
SfxCallMode::SYNCHRON);
+
+// Insert a comment while the image is selected.
+pView->GetViewFrame()->GetDispatcher()->Execute(FN_POSTIT, 
SfxCallMode::SYNCHRON);
+
+// Verify that the comment is around the image.
+// Without the accompanying fix in place, this test would have failed, as 
FN_POSTIT was disabled
+// in the frame shell.
+uno::Reference xPara = getParagraph(1);
+CPPUNIT_ASSERT_EQUAL(OUString("Text"),
+ getProperty(getRun(xPara, 1), 
"TextPortionType"));
+CPPUNIT_ASSERT_EQUAL(OUString("Annotation"),
+ getProperty(getRun(xPara, 2), 
"TextPortionType"));
+CPPUNIT_ASSERT_EQUAL(OUString("Frame"),
+ getProperty(getRun(xPara, 3), 
"TextPortionType"));
+CPPUNIT_ASSERT_EQUAL(OUString("AnnotationEnd"),
+ getProperty(getRun(xPara, 4), 
"TextPortionType"));
+CPPUNIT_ASSERT_EQUAL(OUString("Text"),
+ getProperty(getRun(xPara, 5), 
"TextPortionType"));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index 398cd30a93ff..87df09bb3f5b 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -411,5 +411,10 @@ interface BaseTextFrame
 ExecMethod = ExecMove ;
 StateMethod = NoState ;
 ]
+FN_POSTIT
+[
+ExecMethod = ExecField ;
+StateMethod = NoState ;
+]
 }
 
diff --git a/sw/source/uibase/inc/frmsh.hxx b/sw/source/uibase/inc/frmsh.hxx
index 4b8a64c75823..e3e900acce56 100644
--- a/sw/source/uibase/inc/frmsh.hxx
+++ b/sw/source/uibase/inc/frmsh.hxx
@@ -36,6 +36,7 @@ public:
 
 voidExecute(SfxRequest &);
 voidExecMove(SfxRequest& rReq);
+voidExecField(SfxRequest& rReq);
 voidGetState(SfxItemSet &);
 voidExecFrameStyle(SfxRequest const & rReq);
 voidGetLineStyleState(SfxItemSet );
diff --git a/sw/source/uibase/shells/frmsh.cxx 
b/sw/source/uibase/shells/frmsh.cxx
index dfb403b9ffcf..41a6994204ed 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -87,6 +87,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star;
@@ -128,6 +129,19 @@ void SwFrameShell::ExecMove(SfxRequest& rReq)
 }
 }
 
+void SwFrameShell::ExecField(SfxRequest& rReq)
+{
+SwWrtShell& rSh = GetShell();
+sal_uInt16 nSlot = rReq.GetSlot();
+switch (nSlot)
+{
+case FN_POSTIT:
+SwFieldMgr aFieldMgr();
+rSh.InsertPostIt(aFieldMgr, rReq);
+break;
+}
+}
+
 void SwFrameShell::Execute(SfxRequest )
 {
 //First those who do not need FrameMgr.
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index f4bf6e00eae8..0b4ae14c8290 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -91,6 +91,7 @@
 #include 
 

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

[Jan-Marek Glogowski (via logerrit)]

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

New commits:
commit 288e729ecfdb7dbb9a4ca00cbc03bcdfe9442a0d
Author: Jan-Marek Glogowski 
AuthorDate: Tue Jun 18 16:26:28 2019 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Tue Jun 18 20:18:10 2019 +0200

Qt5 initialize bool before lcl_textMimeInfo call

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

diff --git a/vcl/qt5/Qt5Transferable.cxx b/vcl/qt5/Qt5Transferable.cxx
index 79e524d71eae..10a139093041 100644
--- a/vcl/qt5/Qt5Transferable.cxx
+++ b/vcl/qt5/Qt5Transferable.cxx
@@ -79,7 +79,7 @@ css::uno::Sequence SAL_CALL 
Qt5Transferable::getT
 continue;
 
 // LO doesn't like 'text/plain', so we have to provide UTF-16
-bool bIsNoCharset = false, bIsUTF8 = false, bIsUTF16 = false;
+bool bIsNoCharset = false, bIsUTF16 = false, bIsUTF8 = false;
 if (lcl_textMimeInfo(toOUString(rMimeType), bIsNoCharset, bIsUTF16, 
bIsUTF8))
 {
 bHaveNoCharset |= bIsNoCharset;
@@ -252,7 +252,7 @@ QStringList Qt5MimeData::formats() const
 css::uno::Sequence aFormats
 = m_aContents->getTransferDataFlavors();
 QStringList aList;
-bool bHaveUTF16;
+bool bHaveUTF16 = false;
 
 for (const auto& rFlavor : aFormats)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 vcl/source/filter/jpeg/Exif.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f25195a73b1574976c0446910e8da397089a
Author: Stephan Bergmann 
AuthorDate: Tue Jun 18 16:22:01 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jun 18 19:02:09 2019 +0200

Remove redundant write

...that had been there ever since the code's introduction with
b5a9cc71d246c26da8aca4203da84c10c104c222 "Exif reading/writing and Jpeg 
lossless
transformations support."

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

diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index 9088d9117494..45fd9ed23344 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -207,7 +207,6 @@ void Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 
aLength, sal_uInt16 aOffs
 {
 if(bSetValue)
 {
-write16(ORIENTATION, ifd->tag, littleEndian);
 write16(3, ifd->type, littleEndian);
 write32(1, ifd->count, littleEndian);
 write32(maOrientation, ifd->offset, littleEndian);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: comphelper/source compilerplugins/clang connectivity/source cppcanvas/source include/comphelper include/sfx2 include/svl include/svx include/vcl oox/source sc/source sd

[Noel Grandin (via logerrit)]

 comphelper/source/misc/logging.cxx |2 +-
 compilerplugins/clang/passstuffbyref.cxx   |   12 
 connectivity/source/drivers/firebird/ResultSet.cxx |2 +-
 connectivity/source/drivers/firebird/ResultSet.hxx |2 +-
 cppcanvas/source/mtfrenderer/textlineshelper.hxx   |2 +-
 include/comphelper/logging.hxx |2 +-
 include/sfx2/sidebar/SidebarController.hxx |2 +-
 include/svl/itempool.hxx   |4 ++--
 include/svx/charmap.hxx|2 +-
 include/svx/svdlayer.hxx   |6 +++---
 include/svx/unoshape.hxx   |2 +-
 include/vcl/menu.hxx   |2 +-
 include/vcl/menubtn.hxx|2 +-
 oox/source/drawingml/texteffectscontext.cxx|2 +-
 sc/source/filter/inc/stylesbuffer.hxx  |2 +-
 sc/source/ui/dataprovider/datatransformation.cxx   |   12 ++--
 sc/source/ui/inc/datatransformation.hxx|   12 ++--
 sdext/source/minimizer/unodialog.hxx   |2 +-
 sfx2/inc/SfxRedactionHelper.hxx|8 
 sfx2/inc/autoredactdialog.hxx  |4 ++--
 sfx2/source/doc/SfxRedactionHelper.cxx |   12 +---
 sfx2/source/doc/autoredactdialog.cxx   |6 +++---
 starmath/inc/ElementsDockingWindow.hxx |2 +-
 svtools/source/control/tabbar.cxx  |2 +-
 svx/source/dialog/charmap.cxx  |2 +-
 svx/source/stbctrls/zoomctrl.cxx   |2 +-
 svx/source/unodraw/unoshape.cxx|2 +-
 sw/inc/authfld.hxx |2 +-
 sw/inc/viewsh.hxx  |2 +-
 sw/source/core/fields/authfld.cxx  |2 +-
 sw/source/filter/ww8/docxtablestyleexport.cxx  |2 +-
 vcl/inc/image.h|4 ++--
 vcl/inc/qt5/Qt5FontFace.hxx|2 +-
 vcl/qt5/Qt5FontFace.cxx|2 +-
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx|2 +-
 vcl/source/gdi/svmconverter.cxx|2 +-
 vcl/source/image/ImplImage.cxx |4 ++--
 writerfilter/source/dmapper/SettingsTable.cxx  |2 +-
 writerfilter/source/dmapper/SettingsTable.hxx  |2 +-
 writerfilter/source/dmapper/StyleSheetTable.cxx|2 +-
 writerfilter/source/dmapper/StyleSheetTable.hxx|2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |4 ++--
 writerperfect/source/writer/exp/xmlfmt.cxx |2 +-
 xmlsecurity/inc/documentsignaturemanager.hxx   |2 +-
 44 files changed, 81 insertions(+), 71 deletions(-)

New commits:
commit 31f04378dbc07d4367dc3b66163aaed171cf0323
Author: Noel Grandin 
AuthorDate: Tue Jun 18 09:32:00 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 18 20:10:57 2019 +0200

loplugin:passstuffbyref

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

diff --git a/comphelper/source/misc/logging.cxx 
b/comphelper/source/misc/logging.cxx
index dfd52f8d5bcb..d9b7caf52634 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -86,7 +86,7 @@ namespace comphelper
 return false;
 }
 
-const css::uno::Reference EventLogger::getLogger()
+const css::uno::Reference & EventLogger::getLogger()
 {
 return m_pImpl->getLogger();
 }
diff --git a/compilerplugins/clang/passstuffbyref.cxx 
b/compilerplugins/clang/passstuffbyref.cxx
index 1fd14619b62f..cff1e781455c 100644
--- a/compilerplugins/clang/passstuffbyref.cxx
+++ b/compilerplugins/clang/passstuffbyref.cxx
@@ -271,6 +271,18 @@ void PassStuffByRef::checkReturnValue(const FunctionDecl * 
functionDecl, const C
 .GlobalNamespace()) {
 return;
 }
+// hides a constructor
+if 
(dc.Function("createNonOwningCopy").Class("SortedAutoCompleteStrings").Namespace("editeng")
+.GlobalNamespace()) {
+return;
+}
+// template function
+if 
(dc.Function("convertItems").Class("ValueParser").Namespace("configmgr").GlobalNamespace()
+|| 
dc.Function("parseListValue").AnonymousNamespace().Namespace("configmgr").GlobalNamespace()
+|| 
dc.Function("parseSingleValue").AnonymousNamespace().Namespace("configmgr").GlobalNamespace()
+|| 
dc.Function("Create").Class("HandlerComponentBase").Namespace("pcr").GlobalNamespace())
 {
+return;
+}
 if (startswith(type.getAsString(), "struct o3tl::strong_int")) {
 return;
 }
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx 
b/connectivity/source/drivers/firebird/ResultSet.cxx
index 38384282040b..d0c19c6dacf9 100644
--- 

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

[Muhammet Kara (via logerrit)]

 sfx2/inc/autoredactdialog.hxx|   12 
 sfx2/source/doc/autoredactdialog.cxx |   25 -
 sfx2/source/doc/objserv.cxx  |2 +-
 3 files changed, 13 insertions(+), 26 deletions(-)

New commits:
commit 881e6fdd47386e430ad4c5489e3a6bbf0b46c85f
Author: Muhammet Kara 
AuthorDate: Tue Jun 18 21:04:26 2019 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jun 18 21:59:35 2019 +0200

Copy targets instead of moving during redaction

To allow properly remembering the last state.

* And some clean-up.

Change-Id: Id0b0f4251e3578b8baced1e6e6b1161f46e324dc
Reviewed-on: https://gerrit.libreoffice.org/74302
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/sfx2/inc/autoredactdialog.hxx b/sfx2/inc/autoredactdialog.hxx
index 9734f236de10..f7cdecc15cce 100644
--- a/sfx2/inc/autoredactdialog.hxx
+++ b/sfx2/inc/autoredactdialog.hxx
@@ -106,6 +106,7 @@ class SFX2_DLLPUBLIC SfxAutoRedactDialog : public 
SfxDialogController
 std::vector> m_aTableTargets;
 std::unique_ptr m_pFileDlg;
 bool m_bIsValidState;
+bool m_bTargetsCopied;
 
 std::unique_ptr m_xRedactionTargetsLabel;
 std::unique_ptr m_xTargetsBox;
@@ -138,16 +139,11 @@ public:
 bool hasTargets() const;
 /// Check if the dialog is in a valid state.
 bool isValidState() const { return m_bIsValidState; }
-/** Literally moves targets into the given vector.
- *  At the end of the operation, m_aTableTargets vector becomes empty.
- *  The contents of the given vector will be erased before being filled in.
+/** Copies targets vector
+ *  Does a shallow copy.
  *  Returns true if successful.
  */
-bool moveTargets(std::vector>& 
r_aTargets);
-
-// TODO: Some method(s) to check emptiness/validity
-// TODO: Some method(s) to get the search params/objects
-// TODO: Some method(s) to load/save redaction target sets
+bool getTargets(std::vector>& 
r_aTargets);
 };
 
 class SfxAddTargetDialog : public weld::GenericDialogController
diff --git a/sfx2/source/doc/autoredactdialog.cxx 
b/sfx2/source/doc/autoredactdialog.cxx
index 950684ac4d1c..54f40fc35abd 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -545,6 +545,7 @@ void SfxAutoRedactDialog::clearTargets()
 SfxAutoRedactDialog::SfxAutoRedactDialog(weld::Window* pParent)
 : SfxDialogController(pParent, "sfx/ui/autoredactdialog.ui", 
"AutoRedactDialog")
 , m_bIsValidState(true)
+, m_bTargetsCopied(false)
 , m_xRedactionTargetsLabel(m_xBuilder->weld_label("labelRedactionTargets"))
 , m_xTargetsBox(new TargetsTable(m_xBuilder->weld_tree_view("targets")))
 , m_xLoadBtn(m_xBuilder->weld_button("btnLoadTargets"))
@@ -636,7 +637,8 @@ SfxAutoRedactDialog::~SfxAutoRedactDialog()
OStringToOUString(m_xDialog->get_help_id(), 
RTL_TEXTENCODING_UTF8));
 aDlgOpt.SetUserItem("UserItem", css::uno::makeAny(sUserDataStr));
 
-clearTargets();
+if (!m_bTargetsCopied)
+clearTargets();
 }
 catch (css::uno::Exception& e)
 {
@@ -656,24 +658,13 @@ bool SfxAutoRedactDialog::hasTargets() const
 return true;
 }
 
-bool SfxAutoRedactDialog::moveTargets(
-std::vector>& r_aTargets)
+bool SfxAutoRedactDialog::getTargets(std::vector>& r_aTargets)
 {
-try
-{
-r_aTargets.clear();
-r_aTargets.insert(r_aTargets.end(), 
std::make_move_iterator(m_aTableTargets.begin()),
-  std::make_move_iterator(m_aTableTargets.end()));
-m_aTableTargets.clear();
-m_bIsValidState = false;
-}
-catch (const css::uno::Exception& e)
-{
-SAL_WARN("sfx.doc", "Exception caught while moving redaction targets: 
" << e.Message);
-m_bIsValidState = false;
-return false;
-}
+if (m_aTableTargets.empty())
+return true;
 
+r_aTargets = m_aTableTargets;
+m_bTargetsCopied = true;
 return true;
 }
 
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 24eee80787f8..74edeb4d57da 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -561,7 +561,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
 
 // else continue with normal redaction
 bIsAutoRedact = true;
-aDlg.moveTargets(aRedactionTargets);
+aDlg.getTargets(aRedactionTargets);
 
 [[fallthrough]];
 }
___
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' - sfx2/source

[Muhammet Kara (via logerrit)]

 sfx2/source/doc/autoredactdialog.cxx |   73 ---
 1 file changed, 67 insertions(+), 6 deletions(-)

New commits:
commit 9c2043f649078c3b316415f174e6ec2840908d7e
Author: Muhammet Kara 
AuthorDate: Mon Jun 17 15:33:37 2019 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jun 18 22:19:56 2019 +0200

Let autoredact dialog remember last state

* By storing the JSON string as SvtViewOptions

Change-Id: I08e323005612cb0181d2176af659eb54267fbb3f
Reviewed-on: https://gerrit.libreoffice.org/74169
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 
Reviewed-on: https://gerrit.libreoffice.org/74305
Tested-by: Muhammet Kara 

diff --git a/sfx2/source/doc/autoredactdialog.cxx 
b/sfx2/source/doc/autoredactdialog.cxx
index 798ab965d831..c7248446f9f3 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -557,6 +557,7 @@ SfxAutoRedactDialog::SfxAutoRedactDialog(weld::Window* 
pParent)
 OUString sExtraData;
 SvtViewOptions aDlgOpt(EViewType::Dialog,
OStringToOUString(m_xDialog->get_help_id(), 
RTL_TEXTENCODING_UTF8));
+
 if (aDlgOpt.Exists())
 {
 css::uno::Any aUserItem = aDlgOpt.GetUserItem("UserItem");
@@ -564,12 +565,34 @@ SfxAutoRedactDialog::SfxAutoRedactDialog(weld::Window* 
pParent)
 }
 
 // update the targets configuration if necessary
+if (!sExtraData.isEmpty())
 {
 weld::WaitObject aWaitCursor(m_xDialog.get());
-//m_aTargets.Update();
-}
 
-// TODO: fill the targets box
+try
+{
+// Create path string, and read JSON from file
+boost::property_tree::ptree aTargetsJSON;
+std::stringstream 
aStream(std::string(sExtraData.toUtf8().getStr()));
+
+boost::property_tree::read_json(aStream, aTargetsJSON);
+
+// Recreate & add the targets to the dialog
+for (const boost::property_tree::ptree::value_type& rValue :
+ aTargetsJSON.get_child("RedactionTargets"))
+{
+RedactionTarget* pTarget = JSONtoRedactionTarget(rValue);
+addTarget(pTarget);
+}
+}
+catch (css::uno::Exception& e)
+{
+SAL_WARN("sfx.doc",
+ "Exception caught while trying to load the last dialog 
state: " << e.Message);
+return;
+//TODO: Warn the user with a message box
+}
+}
 
 // Handler connections
 m_xLoadBtn->connect_clicked(LINK(this, SfxAutoRedactDialog, Load));
@@ -581,9 +604,47 @@ SfxAutoRedactDialog::SfxAutoRedactDialog(weld::Window* 
pParent)
 
 SfxAutoRedactDialog::~SfxAutoRedactDialog()
 {
-// Store the view options
-/*SvtViewOptions aDlgOpt(EViewType::Dialog, 
OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8));
-aDlgOpt.SetUserItem("UserItem", 
css::uno::makeAny(m_xMoreBt->get_expanded() ? OUString("Y") : OUString("N")));*/
+if (m_aTableTargets.empty())
+{
+// Clear the dialog data
+SvtViewOptions aDlgOpt(EViewType::Dialog,
+   OStringToOUString(m_xDialog->get_help_id(), 
RTL_TEXTENCODING_UTF8));
+aDlgOpt.Delete();
+return;
+}
+
+try
+{
+// Put the targets into a JSON array
+boost::property_tree::ptree aTargetsArray;
+for (const auto& targetPair : m_aTableTargets)
+{
+aTargetsArray.push_back(std::make_pair("", 
redactionTargetToJSON(targetPair.first)));
+}
+
+// Build the JSON tree
+boost::property_tree::ptree aTargetsTree;
+aTargetsTree.add_child("RedactionTargets", aTargetsArray);
+std::stringstream aStream;
+
+boost::property_tree::write_json(aStream, aTargetsTree, false);
+
+OUString sUserDataStr(OUString::fromUtf8(aStream.str().c_str()));
+
+// Store the dialog data
+SvtViewOptions aDlgOpt(EViewType::Dialog,
+   OStringToOUString(m_xDialog->get_help_id(), 
RTL_TEXTENCODING_UTF8));
+aDlgOpt.SetUserItem("UserItem", css::uno::makeAny(sUserDataStr));
+
+clearTargets();
+}
+catch (css::uno::Exception& e)
+{
+SAL_WARN("sfx.doc",
+ "Exception caught while trying to store the dialog state: " 
<< e.Message);
+return;
+//TODO: Warn the user with a message box
+}
 }
 
 bool SfxAutoRedactDialog::hasTargets() const
___
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' - sfx2/inc sfx2/source

[Muhammet Kara (via logerrit)]

 sfx2/inc/autoredactdialog.hxx|   14 +-
 sfx2/source/doc/autoredactdialog.cxx |   25 -
 sfx2/source/doc/objserv.cxx  |2 +-
 3 files changed, 14 insertions(+), 27 deletions(-)

New commits:
commit 1200845272cb1a92507cfe01c125c5aca2d5452f
Author: Muhammet Kara 
AuthorDate: Tue Jun 18 21:04:26 2019 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jun 18 22:20:31 2019 +0200

Copy targets instead of moving during redaction

To allow properly remembering the last state.

* And some clean-up.

Change-Id: Id0b0f4251e3578b8baced1e6e6b1161f46e324dc
Reviewed-on: https://gerrit.libreoffice.org/74302
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 
Reviewed-on: https://gerrit.libreoffice.org/74308
Tested-by: Muhammet Kara 

diff --git a/sfx2/inc/autoredactdialog.hxx b/sfx2/inc/autoredactdialog.hxx
index 2cec20cc64c8..7082052d60a9 100644
--- a/sfx2/inc/autoredactdialog.hxx
+++ b/sfx2/inc/autoredactdialog.hxx
@@ -106,6 +106,7 @@ class SFX2_DLLPUBLIC SfxAutoRedactDialog : public 
SfxDialogController
 std::vector> m_aTableTargets;
 std::unique_ptr m_pFileDlg;
 bool m_bIsValidState;
+bool m_bTargetsCopied;
 
 std::unique_ptr m_xRedactionTargetsLabel;
 std::unique_ptr m_xTargetsBox;
@@ -138,16 +139,11 @@ public:
 bool hasTargets() const;
 /// Check if the dialog is in a valid state.
 bool isValidState() const { return m_bIsValidState; }
-/** Literally moves targets into the given vector.
- *  At the end of the operation, m_aTableTargets vector becomes empty.
- *  The contents of the given vector will be erased before being filled in.
- *  Returns true if successfull.
+/** Copies targets vector
+ *  Does a shallow copy.
+ *  Returns true if successful.
  */
-bool moveTargets(std::vector>& 
r_aTargets);
-
-// TODO: Some method(s) to check emptiness/validity
-// TODO: Some method(s) to get the search params/objects
-// TODO: Some method(s) to load/save redaction target sets
+bool getTargets(std::vector>& 
r_aTargets);
 };
 
 class SfxAddTargetDialog : public weld::GenericDialogController
diff --git a/sfx2/source/doc/autoredactdialog.cxx 
b/sfx2/source/doc/autoredactdialog.cxx
index c7248446f9f3..b1882f7b5717 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -545,6 +545,7 @@ void SfxAutoRedactDialog::clearTargets()
 SfxAutoRedactDialog::SfxAutoRedactDialog(weld::Window* pParent)
 : SfxDialogController(pParent, "sfx/ui/autoredactdialog.ui", 
"AutoRedactDialog")
 , m_bIsValidState(true)
+, m_bTargetsCopied(false)
 , m_xRedactionTargetsLabel(m_xBuilder->weld_label("labelRedactionTargets"))
 , m_xTargetsBox(new TargetsTable(m_xBuilder->weld_tree_view("targets")))
 , m_xLoadBtn(m_xBuilder->weld_button("btnLoadTargets"))
@@ -636,7 +637,8 @@ SfxAutoRedactDialog::~SfxAutoRedactDialog()
OStringToOUString(m_xDialog->get_help_id(), 
RTL_TEXTENCODING_UTF8));
 aDlgOpt.SetUserItem("UserItem", css::uno::makeAny(sUserDataStr));
 
-clearTargets();
+if (!m_bTargetsCopied)
+clearTargets();
 }
 catch (css::uno::Exception& e)
 {
@@ -656,24 +658,13 @@ bool SfxAutoRedactDialog::hasTargets() const
 return true;
 }
 
-bool SfxAutoRedactDialog::moveTargets(
-std::vector>& r_aTargets)
+bool SfxAutoRedactDialog::getTargets(std::vector>& r_aTargets)
 {
-try
-{
-r_aTargets.clear();
-r_aTargets.insert(r_aTargets.end(), 
std::make_move_iterator(m_aTableTargets.begin()),
-  std::make_move_iterator(m_aTableTargets.end()));
-m_aTableTargets.clear();
-m_bIsValidState = false;
-}
-catch (const css::uno::Exception& e)
-{
-SAL_WARN("sfx.doc", "Exception caught while moving redaction targets: 
" << e.Message);
-m_bIsValidState = false;
-return false;
-}
+if (m_aTableTargets.empty())
+return true;
 
+r_aTargets = m_aTableTargets;
+m_bTargetsCopied = true;
 return true;
 }
 
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 9b9b3fc0f9dc..73bc90490f22 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -560,7 +560,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
 
 // else continue with normal redaction
 bIsAutoRedact = true;
-aDlg.moveTargets(aRedactionTargets);
+aDlg.getTargets(aRedactionTargets);
 
 [[fallthrough]];
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

UNO connection problems (GSOC Report Week 3)

[Rasmus Jonsson]

So last week (until June 16th) I ran into issues with integrating my
program with LibreOffice using UNO. The goal is to start LibreOffice
Impress, connect to it (initially using the Impress Remote Protocol, but
it was decided that UNO would be more suitable), and open/ play/ control
slideshows this way.

Below is some information on what was done.

LibreOffice was started thus,

soffice --impress "--accept=socket,host=localhost,port=2002;urp;"

or thus,

soffice --impress "--accept=pipe,name=hello;urp;"

My mentor was able to run the following script and successfully connect
to LibreOffice,

http://paste.debian.net/1088385/

However, when I ran the same script `python3 myscript.py` I got this,

http://paste.debian.net/1088386/

My mentor advised to run `make UITest_demo_ui` which ran fine, but
`make UITest` failed with the same error as above,

http://paste.debian.net/hidden/ca319a53/

Would be great if anyone had any advice on how to solve this. 

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

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

[Jan-Marek Glogowski (via logerrit)]

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

New commits:
commit 60d83e5d5490bb488e26f52d5aeee667ffd206fd
Author: Jan-Marek Glogowski 
AuthorDate: Tue Jun 18 16:26:28 2019 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Tue Jun 18 23:29:13 2019 +0200

Qt5 initialize bool before lcl_textMimeInfo call

Change-Id: Ie1b2e77145c4f84dc7d2c1edd214363b7fa0625e
Reviewed-on: https://gerrit.libreoffice.org/74294
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 288e729ecfdb7dbb9a4ca00cbc03bcdfe9442a0d)
Reviewed-on: https://gerrit.libreoffice.org/74303

diff --git a/vcl/qt5/Qt5Transferable.cxx b/vcl/qt5/Qt5Transferable.cxx
index 79e524d71eae..10a139093041 100644
--- a/vcl/qt5/Qt5Transferable.cxx
+++ b/vcl/qt5/Qt5Transferable.cxx
@@ -79,7 +79,7 @@ css::uno::Sequence SAL_CALL 
Qt5Transferable::getT
 continue;
 
 // LO doesn't like 'text/plain', so we have to provide UTF-16
-bool bIsNoCharset = false, bIsUTF8 = false, bIsUTF16 = false;
+bool bIsNoCharset = false, bIsUTF16 = false, bIsUTF8 = false;
 if (lcl_textMimeInfo(toOUString(rMimeType), bIsNoCharset, bIsUTF16, 
bIsUTF8))
 {
 bHaveNoCharset |= bIsNoCharset;
@@ -252,7 +252,7 @@ QStringList Qt5MimeData::formats() const
 css::uno::Sequence aFormats
 = m_aContents->getTransferDataFlavors();
 QStringList aList;
-bool bHaveUTF16;
+bool bHaveUTF16 = false;
 
 for (const auto& rFlavor : aFormats)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

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

New commits:
commit f9cc6303d80ee70e44ce090c6ad2714f7430a7c9
Author: Jan-Marek Glogowski 
AuthorDate: Tue Jun 18 14:11:31 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Tue Jun 18 23:29:33 2019 +0200

tdf#125934 Qt5 set the desktop file name...

.. but only on wayland, as this also overrides the individual
window icons on X11.

Change-Id: I1b453b23f0dfd4ef2616d7b8054580a6018cdc53
Reviewed-on: https://gerrit.libreoffice.org/74293
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 17c91a53d25c0b82524e04a0c108f8e0abc76685)
Reviewed-on: https://gerrit.libreoffice.org/74304

diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 26e2e5782147..556e8a640148 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -242,8 +242,10 @@ Qt5Instance::~Qt5Instance()
 
 void Qt5Instance::AfterAppInit()
 {
-// sets the default application icon on Wayland
-
QGuiApplication::setDesktopFileName(QStringLiteral("libreoffice-startcenter.desktop"));
+// set the default application icon via destop file just on Wayland,
+// as this otherwise overrides the individual desktop icons on X11.
+if (QGuiApplication::platformName() == "wayland")
+
QGuiApplication::setDesktopFileName(QStringLiteral("libreoffice-startcenter.desktop"));
 }
 
 void Qt5Instance::deleteObjectLater(QObject* pObject) { 
pObject->deleteLater(); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - icon-themes/colibre icon-themes/colibre_svg icon-themes/elementary icon-themes/elementary_svg icon-themes/karasa_jaga icon-themes/karasa_jaga

[rizmut (via logerrit)]

 dev/null|binary
 icon-themes/colibre/cmd/32/hideallnotes.png |binary
 icon-themes/colibre/cmd/32/hidenote.png |binary
 icon-themes/colibre/cmd/32/showannotations.png  |binary
 icon-themes/colibre/cmd/32/shownote.png |binary
 icon-themes/colibre/cmd/lc_hidenote.png |binary
 icon-themes/colibre/cmd/lc_showannotations.png  |binary
 icon-themes/colibre/cmd/sc_showannotations.png  |binary
 icon-themes/colibre/links.txt   |   20 
 icon-themes/colibre_svg/cmd/32/hideallnotes.svg |1 
 icon-themes/colibre_svg/cmd/32/hidenote.svg |1 
 icon-themes/colibre_svg/cmd/32/showannotations.svg  |2 
 icon-themes/colibre_svg/cmd/32/shownote.svg |1 
 icon-themes/colibre_svg/cmd/lc_hidenote.svg |2 
 icon-themes/colibre_svg/cmd/lc_showallnotes.svg |1 
 icon-themes/colibre_svg/cmd/lc_showannotations.svg  |2 
 icon-themes/colibre_svg/cmd/sc_showallnotes.svg |1 
 icon-themes/colibre_svg/cmd/sc_showannotations.svg  |2 
 icon-themes/colibre_svg/cmd/sc_switchcontroldesignmode.svg  |3 -
 icon-themes/colibre_svg/svx/res/markers.svg |2 
 icon-themes/elementary/cmd/32/smallcaps.png |binary
 icon-themes/elementary/cmd/32/zoomnext.png  |binary
 icon-themes/elementary/cmd/32/zoompage.png  |binary
 icon-themes/elementary/cmd/32/zoompanning.png   |binary
 icon-themes/elementary/cmd/32/zoomprevious.png  |binary
 icon-themes/elementary/cmd/lc_insertpagenumberfield.png |binary
 icon-themes/elementary/cmd/lc_patternfield.png  |binary
 icon-themes/elementary/cmd/lc_smallcaps.png |binary
 icon-themes/elementary/cmd/lc_zoomnext.png  |binary
 icon-themes/elementary/cmd/lc_zoomobjects.png   |binary
 icon-themes/elementary/cmd/lc_zoompage.png  |binary
 icon-themes/elementary/cmd/lc_zoomprevious.png  |binary
 icon-themes/elementary/cmd/sc_smallcaps.png |binary
 icon-themes/elementary/cmd/sc_zoomobjects.png   |binary
 icon-themes/elementary/links.txt|   28 ++--
 icon-themes/elementary_svg/cmd/32/smallcaps.svg |2 
 icon-themes/elementary_svg/cmd/32/zoomnext.svg  |2 
 icon-themes/elementary_svg/cmd/32/zoompage.svg  |2 
 icon-themes/elementary_svg/cmd/32/zoompanning.svg   |2 
 icon-themes/elementary_svg/cmd/32/zoomprevious.svg  |2 
 icon-themes/elementary_svg/cmd/lc_insertpagenumberfield.svg |2 
 icon-themes/elementary_svg/cmd/lc_patternfield.svg  |2 
 icon-themes/elementary_svg/cmd/lc_smallcaps.svg |2 
 icon-themes/elementary_svg/cmd/lc_zoomnext.svg  |2 
 icon-themes/elementary_svg/cmd/lc_zoomobjects.svg   |2 
 icon-themes/elementary_svg/cmd/lc_zoompage.svg  |2 
 icon-themes/elementary_svg/cmd/lc_zoomprevious.svg  |2 
 icon-themes/elementary_svg/cmd/sc_smallcaps.svg |2 
 icon-themes/elementary_svg/cmd/sc_zoomobjects.svg   |2 
 icon-themes/elementary_svg/svx/res/markers.svg  |2 
 icon-themes/karasa_jaga/links.txt   |   22 -
 51 files changed, 60 insertions(+), 58 deletions(-)

New commits:
commit 38f79ddf341c35d654e6156a241ddacc5927b444
Author: rizmut 
AuthorDate: Wed Jun 19 00:38:26 2019 +0700
Commit: Rizal Muttaqin 
CommitDate: Tue Jun 18 23:52:29 2019 +0200

Colibre, elementary, KJ: Fix for tdf#107144

elementary:
- Fix blurred zoom icons
- Reverse top arrow on Small Capitals icons

Change-Id: I81883334e5cfaf3dab528ed61ea46894017a6c36
Reviewed-on: https://gerrit.libreoffice.org/74301
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 
(cherry picked from commit 11a1bdc5fa0312111ddf9c1b7779a114b97e361c)
Reviewed-on: https://gerrit.libreoffice.org/74317
Tested-by: Rizal Muttaqin 

diff --git a/icon-themes/colibre/cmd/32/hideallnotes.png 
b/icon-themes/colibre/cmd/32/hideallnotes.png
new file mode 100644
index ..077b168603e9
Binary files /dev/null and b/icon-themes/colibre/cmd/32/hideallnotes.png differ
diff --git a/icon-themes/colibre/cmd/32/hidenote.png 
b/icon-themes/colibre/cmd/32/hidenote.png
new file mode 100644
index ..330c1f48570e
Binary files /dev/null and b/icon-themes/colibre/cmd/32/hidenote.png differ
diff --git a/icon-themes/colibre/cmd/32/showannotations.png 
b/icon-themes/colibre/cmd/32/showannotations.png
index f8d663467326..0b2da685b910 100644
Binary files a/icon-themes/colibre/cmd/32/showannotations.png and 

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg icon-themes/elementary icon-themes/elementary_svg icon-themes/karasa_jaga icon-themes/karasa_jaga_svg

[rizmut (via logerrit)]

 dev/null|binary
 icon-themes/colibre/cmd/32/hideallnotes.png |binary
 icon-themes/colibre/cmd/32/hidenote.png |binary
 icon-themes/colibre/cmd/32/showannotations.png  |binary
 icon-themes/colibre/cmd/32/shownote.png |binary
 icon-themes/colibre/cmd/lc_hidenote.png |binary
 icon-themes/colibre/cmd/lc_showannotations.png  |binary
 icon-themes/colibre/cmd/sc_showannotations.png  |binary
 icon-themes/colibre/links.txt   |   20 
 icon-themes/colibre_svg/cmd/32/hideallnotes.svg |1 
 icon-themes/colibre_svg/cmd/32/hidenote.svg |1 
 icon-themes/colibre_svg/cmd/32/showannotations.svg  |2 
 icon-themes/colibre_svg/cmd/32/shownote.svg |1 
 icon-themes/colibre_svg/cmd/lc_hidenote.svg |2 
 icon-themes/colibre_svg/cmd/lc_showallnotes.svg |1 
 icon-themes/colibre_svg/cmd/lc_showannotations.svg  |2 
 icon-themes/colibre_svg/cmd/sc_showallnotes.svg |1 
 icon-themes/colibre_svg/cmd/sc_showannotations.svg  |2 
 icon-themes/colibre_svg/cmd/sc_switchcontroldesignmode.svg  |3 -
 icon-themes/colibre_svg/svx/res/markers.svg |2 
 icon-themes/elementary/cmd/32/smallcaps.png |binary
 icon-themes/elementary/cmd/32/zoomnext.png  |binary
 icon-themes/elementary/cmd/32/zoompage.png  |binary
 icon-themes/elementary/cmd/32/zoompanning.png   |binary
 icon-themes/elementary/cmd/32/zoomprevious.png  |binary
 icon-themes/elementary/cmd/lc_insertpagenumberfield.png |binary
 icon-themes/elementary/cmd/lc_patternfield.png  |binary
 icon-themes/elementary/cmd/lc_smallcaps.png |binary
 icon-themes/elementary/cmd/lc_zoomnext.png  |binary
 icon-themes/elementary/cmd/lc_zoomobjects.png   |binary
 icon-themes/elementary/cmd/lc_zoompage.png  |binary
 icon-themes/elementary/cmd/lc_zoomprevious.png  |binary
 icon-themes/elementary/cmd/sc_smallcaps.png |binary
 icon-themes/elementary/cmd/sc_zoomobjects.png   |binary
 icon-themes/elementary/links.txt|   28 ++--
 icon-themes/elementary_svg/cmd/32/smallcaps.svg |2 
 icon-themes/elementary_svg/cmd/32/zoomnext.svg  |2 
 icon-themes/elementary_svg/cmd/32/zoompage.svg  |2 
 icon-themes/elementary_svg/cmd/32/zoompanning.svg   |2 
 icon-themes/elementary_svg/cmd/32/zoomprevious.svg  |2 
 icon-themes/elementary_svg/cmd/lc_insertpagenumberfield.svg |2 
 icon-themes/elementary_svg/cmd/lc_patternfield.svg  |2 
 icon-themes/elementary_svg/cmd/lc_smallcaps.svg |2 
 icon-themes/elementary_svg/cmd/lc_zoomnext.svg  |2 
 icon-themes/elementary_svg/cmd/lc_zoomobjects.svg   |2 
 icon-themes/elementary_svg/cmd/lc_zoompage.svg  |2 
 icon-themes/elementary_svg/cmd/lc_zoomprevious.svg  |2 
 icon-themes/elementary_svg/cmd/sc_smallcaps.svg |2 
 icon-themes/elementary_svg/cmd/sc_zoomobjects.svg   |2 
 icon-themes/elementary_svg/svx/res/markers.svg  |2 
 icon-themes/karasa_jaga/links.txt   |   22 -
 51 files changed, 60 insertions(+), 58 deletions(-)

New commits:
commit 11a1bdc5fa0312111ddf9c1b7779a114b97e361c
Author: rizmut 
AuthorDate: Wed Jun 19 00:38:26 2019 +0700
Commit: Rizal Muttaqin 
CommitDate: Tue Jun 18 23:50:46 2019 +0200

Colibre, elementary, KJ: Fix for tdf#107144

elementary:
- Fix blurred zoom icons
- Reverse top arrow on Small Capitals icons

Change-Id: I81883334e5cfaf3dab528ed61ea46894017a6c36
Reviewed-on: https://gerrit.libreoffice.org/74301
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/colibre/cmd/32/hideallnotes.png 
b/icon-themes/colibre/cmd/32/hideallnotes.png
new file mode 100644
index ..077b168603e9
Binary files /dev/null and b/icon-themes/colibre/cmd/32/hideallnotes.png differ
diff --git a/icon-themes/colibre/cmd/32/hidenote.png 
b/icon-themes/colibre/cmd/32/hidenote.png
new file mode 100644
index ..330c1f48570e
Binary files /dev/null and b/icon-themes/colibre/cmd/32/hidenote.png differ
diff --git a/icon-themes/colibre/cmd/32/showannotations.png 
b/icon-themes/colibre/cmd/32/showannotations.png
index f8d663467326..0b2da685b910 100644
Binary files a/icon-themes/colibre/cmd/32/showannotations.png and 
b/icon-themes/colibre/cmd/32/showannotations.png differ
diff --git a/icon-themes/colibre/cmd/32/shownote.png 
b/icon-themes/colibre/cmd/32/shownote.png
new file mode 100644
index 

Gsoc

[srinivasan r]

Hi my name is srinivasan and i interested in gsoc so i like to contribute
to your organisation and i literally don't know any about the process to
join and i know c ,c++ learning python so if you people help to guide
through the process and how it works it would be great
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: svtools/langsupport svtools/source

[Noel Grandin (via logerrit)]

 svtools/langsupport/langsupport.cxx  |5 +++--
 svtools/source/config/itemholder2.cxx|5 +++--
 svtools/source/contnr/DocumentInfoPreview.cxx|5 +++--
 svtools/source/control/inettbc.cxx   |   17 +
 svtools/source/dialogs/ServerDetailsControls.cxx |5 +++--
 svtools/source/misc/embedhlp.cxx |   12 ++--
 svtools/source/misc/imagemgr.cxx |5 +++--
 svtools/source/misc/langhelp.cxx |5 +++--
 8 files changed, 33 insertions(+), 26 deletions(-)

New commits:
commit 129e799e1acf25d7dcd7ccf0438896cc125e7653
Author: Noel Grandin 
AuthorDate: Mon Jun 17 08:22:00 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 18 08:06:33 2019 +0200

loplugin:logexceptionnicely in svtools

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

diff --git a/svtools/langsupport/langsupport.cxx 
b/svtools/langsupport/langsupport.cxx
index 1aae3df70277..7c25d8382b1f 100644
--- a/svtools/langsupport/langsupport.cxx
+++ b/svtools/langsupport/langsupport.cxx
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -65,9 +66,9 @@ SAL_IMPLEMENT_MAIN()
 
 uno::Reference< lang::XComponent >(xContext, 
uno::UNO_QUERY_THROW)->dispose();
 }
-catch (const uno::Exception& e)
+catch (const uno::Exception&)
 {
-SAL_WARN("vcl.app", "Fatal: " << e);
+TOOLS_WARN_EXCEPTION("vcl.app", "Fatal");
 return 1;
 }
 catch (const std::exception )
diff --git a/svtools/source/config/itemholder2.cxx 
b/svtools/source/config/itemholder2.cxx
index cbd78826d7c0..2871aa3a512b 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace svtools {
 
@@ -54,13 +55,13 @@ ItemHolder2::ItemHolder2()
 throw;
 }
 #ifdef DBG_UTIL
-catch(const css::uno::Exception& rEx)
+catch(const css::uno::Exception&)
 {
 static bool bMessage = true;
 if(bMessage)
 {
 bMessage = false;
-SAL_WARN( "svtools", "CreateInstance with arguments: " << rEx );
+TOOLS_WARN_EXCEPTION( "svtools", "CreateInstance with arguments" );
 }
 }
 #else
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx 
b/svtools/source/contnr/DocumentInfoPreview.cxx
index a34030701f98..c853084e4e0e 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -113,8 +114,8 @@ void ODocumentInfoPreview::fill(
 try {
 value = conv->convertToSimpleType(aAny, 
css::uno::TypeClass_STRING).
 get< OUString >();
-} catch (css::script::CannotConvertException & e) {
-SAL_INFO("svtools.contnr", "ignored " << e);
+} catch (css::script::CannotConvertException &) {
+TOOLS_INFO_EXCEPTION("svtools.contnr", "ignored");
 }
 if (!value.isEmpty()) {
 insertEntry(name, value);
diff --git a/svtools/source/control/inettbc.cxx 
b/svtools/source/control/inettbc.cxx
index e740a79e6584..a2ef57c6116a 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -23,6 +23,7 @@
 #endif
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -967,8 +968,8 @@ void SvtMatchContext_Impl::doExecute()
 if (proc2.is()) {
 try {
 proc2->releaseCommandIdentifier(id);
-} catch (css::uno::RuntimeException & e) {
-SAL_WARN("svtools.control", "ignoring 
" << e);
+} catch (css::uno::RuntimeException &) {
+
TOOLS_WARN_EXCEPTION("svtools.control", "ignoring");
 }
 }
 throw;
@@ -991,8 +992,8 @@ void SvtMatchContext_Impl::doExecute()
 css::uno::Reference< css::sdbc::XRow > row(
 res, css::uno::UNO_QUERY_THROW);
 folder = row->getBoolean(1) && !row->wasNull();
-} catch (css::uno::Exception & e) {
-SAL_WARN("svtools.control", "ignoring " << e);
+} catch (css::uno::Exception &) {
+TOOLS_WARN_EXCEPTION("svtools.control", 
"ignoring");
 return;
 }
 }
@@ -1215,8 +1216,8 @@ void MatchContext_Impl::doExecute()
   

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

[Noel Grandin (via logerrit)]

 svx/source/core/extedit.cxx   |5 +++--
 svx/source/core/graphichelper.cxx |6 +++---
 svx/source/fmcomp/fmgridcl.cxx|4 ++--
 svx/source/fmcomp/gridcell.cxx|4 ++--
 svx/source/form/fmsrcimp.cxx  |9 ++---
 svx/source/gallery2/galtheme.cxx  |   13 +++--
 svx/source/gengal/gengal.cxx  |5 +++--
 svx/source/svdraw/svdoole2.cxx|4 ++--
 8 files changed, 24 insertions(+), 26 deletions(-)

New commits:
commit 4079282731cdf276715af6571786ab75845efc15
Author: Noel Grandin 
AuthorDate: Mon Jun 17 08:22:14 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 18 08:06:53 2019 +0200

loplugin:logexceptionnicely in svx

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

diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index 0c95811e744c..e1d31771c06d 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -95,9 +96,9 @@ void ExternalToolEditThread::execute()
 xSystemShellExecute->execute(m_aFileName, OUString(),
 SystemShellExecuteFlags::URIS_ONLY);
 }
-catch (Exception const& e)
+catch (Exception const&)
 {
-SAL_WARN("svx", "ExternalToolEditThread: " << e);
+TOOLS_WARN_EXCEPTION("svx", "ExternalToolEditThread");
 }
 }
 
diff --git a/svx/source/core/graphichelper.cxx 
b/svx/source/core/graphichelper.cxx
index a491e8210860..e3e2ed241e8a 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -26,7 +26,7 @@
 #include 
 #include 
 #include 
-
+#include 
 #include 
 #include 
 
@@ -173,9 +173,9 @@ bool lcl_ExecuteFilterDialog( const Sequence< PropertyValue 
>& rPropsForDialog,
 {
 throw;
 }
-catch( const Exception& e )
+catch( const Exception& )
 {
-SAL_WARN("sfx.doc", "ignoring " << e);
+TOOLS_WARN_EXCEPTION("sfx.doc", "ignoring");
 }
 
 return bStatus;
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index e4d4bf6e010b..757a9142ae57 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1887,8 +1887,8 @@ namespace
 {
 try {
 xProp->getPropertyValue( _sPropName ) >>= sRetText;
-} catch (UnknownPropertyException const& e) {
-SAL_WARN("svx.fmcomp", e);
+} catch (UnknownPropertyException const&) {
+TOOLS_WARN_EXCEPTION("svx.fmcomp", "");
 }
 }
 }
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 7cb4a87cd4d0..622a22c4682a 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3562,9 +3562,9 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev,
 else
 rDev.DrawText(rRect, aText, nStyle);
 }
-catch (const Exception& e)
+catch (const Exception&)
 {
-SAL_WARN("svx.fmcomp", "PaintFieldToCell: caught " << e);
+TOOLS_WARN_EXCEPTION("svx.fmcomp", "PaintFieldToCell");
 }
 }
 
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index f9eedbd65dbd..ae1803c9d85b 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -214,14 +214,9 @@ bool FmSearchEngine::MoveCursor()
 else
 m_xSearchCursor.previous();
 }
-catch(css::sdbc::SQLException const& e)
+catch(Exception const&)
 {
-SAL_WARN( "svx", "FmSearchEngine::MoveCursor: caught " << e << " 
sqlstate=" << e.SQLState );
-bSuccess = false;
-}
-catch(Exception const& e)
-{
-SAL_WARN( "svx", "FmSearchEngine::MoveCursor: caught " << e);
+TOOLS_WARN_EXCEPTION( "svx", "FmSearchEngine::MoveCursor");
 bSuccess = false;
 }
 catch(...)
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 227465c4da99..5875abd76bbd 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -98,11 +99,11 @@ void GalleryTheme::ImplCreateSvDrawStorage()
 if ( ( aSvDrawStorageRef->GetError() != ERRCODE_NONE ) && 
!pThm->IsReadOnly() )
 aSvDrawStorageRef = new SotStorage( false, GetSdvURL().GetMainURL( 
INetURLObject::DecodeMechanism::NONE ), StreamMode::READ );
 }
-catch (const css::ucb::ContentCreationException& e)
+catch (const css::ucb::ContentCreationException&)
 {
-SAL_WARN("svx", "failed to open: "
+TOOLS_WARN_EXCEPTION("svx", "failed to open: "
   << 
GetSdvURL().GetMainURL(INetURLObject::DecodeMechanism::NONE)
-   

[Libreoffice-commits] core.git: toolkit/source tools/source ucb/source unotools/source unoxml/Library_unoxml.mk unoxml/source

[Noel Grandin (via logerrit)]

 toolkit/source/controls/unocontrols.cxx |8 +-
 tools/source/debug/debug.cxx|9 ++
 ucb/source/core/provprox.cxx|5 -
 unotools/source/config/configitem.cxx   |   96 
 unotools/source/config/pathoptions.cxx  |5 -
 unotools/source/i18n/calendarwrapper.cxx|   87 +++--
 unotools/source/i18n/charclass.cxx  |9 +-
 unotools/source/i18n/localedatawrapper.cxx  |   41 +-
 unotools/source/i18n/transliterationwrapper.cxx |   17 ++--
 unotools/source/misc/mediadescriptor.cxx|   22 ++---
 unotools/source/ucbhelper/ucbhelper.cxx |   12 +--
 unoxml/Library_unoxml.mk|1 
 unoxml/source/dom/documentbuilder.cxx   |   17 ++--
 unoxml/source/dom/elementlist.cxx   |5 -
 14 files changed, 159 insertions(+), 175 deletions(-)

New commits:
commit 70accc2904edb5c4aa9b5acb7ff2889a77717b75
Author: Noel Grandin 
AuthorDate: Tue Jun 18 09:33:18 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 18 10:31:43 2019 +0200

loplugin:logexceptionnicely in toolkit..unoxml

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

diff --git a/toolkit/source/controls/unocontrols.cxx 
b/toolkit/source/controls/unocontrols.cxx
index 937b05745273..e6ec3492bb74 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -2884,9 +2884,9 @@ void UnoListBoxControl::itemStateChanged( const 
awt::ItemEvent& rEvent )
 {
 maItemListeners.itemStateChanged( rEvent );
 }
-catch( const Exception& e )
+catch( const Exception& )
 {
-SAL_WARN( "toolkit", "UnoListBoxControl::itemStateChanged: caught 
" << e);
+TOOLS_WARN_EXCEPTION( "toolkit", 
"UnoListBoxControl::itemStateChanged");
 }
 }
 }
@@ -3222,9 +3222,9 @@ void UnoComboBoxControl::itemStateChanged( const 
awt::ItemEvent& rEvent )
 {
 maItemListeners.itemStateChanged( rEvent );
 }
-catch( const Exception& e )
+catch( const Exception& )
 {
-SAL_WARN( "toolkit", "UnoComboBoxControl::itemStateChanged: caught 
" << e);
+TOOLS_WARN_EXCEPTION( "toolkit", 
"UnoComboBoxControl::itemStateChanged");
 }
 }
 }
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index fdfd7259d3cf..9b9419599b7d 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -384,6 +385,14 @@ OString exceptionToString(const css::uno::Any & caught)
 sMessage += OString::number( specialized.ColumnNumber );
 }
 }
+{
+css::ucb::InteractiveIOException specialized;
+if ( caught >>= specialized )
+{
+sMessage += " Code: ";
+sMessage += OString::number( 
static_cast(specialized.Code) );
+}
+}
 return sMessage;
 }
 
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index 25e1a1d1ff74..fbf44c7eb091 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "provprox.hxx"
 #include 
 #include 
@@ -311,9 +312,9 @@ UcbContentProviderProxy::getContentProvider()
 {
 throw;
 }
-catch ( Exception const & e)
+catch ( Exception const & )
 {
-SAL_INFO( "ucb.core", "Exception when getting content provider: " 
<< e );
+TOOLS_INFO_EXCEPTION( "ucb.core", "Exception getting content 
provider");
 }
 
 // registerInstance called at proxy, but not yet at original?
diff --git a/unotools/source/config/configitem.cxx 
b/unotools/source/config/configitem.cxx
index 803413259d11..6f5e99940703 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -412,13 +412,12 @@ Sequence< Any > ConfigItem::GetProperties(const Sequence< 
OUString >& rNames)
 {
 pRet[i] = xHierarchyAccess->getByHierarchicalName(pNames[i]);
 }
-catch (const Exception& rEx)
+catch (const Exception&)
 {
-SAL_WARN(
+TOOLS_WARN_EXCEPTION(
 "unotools.config",
 "ignoring XHierarchicalNameAccess to /org.openoffice."
-<< sSubTree << "/" << pNames[i] << " Exception: "
-<< rEx);
+<< sSubTree << "/" << pNames[i]);
 }
 }
 
@@ -494,11 +493,9 @@ bool ConfigItem::PutProperties( const Sequence< OUString 
>& rNames,
 

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

[Caolán McNamara (via logerrit)]

 vcl/source/filter/graphicfilter.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 857c72b6eaa7ecb96300a096280dae8e2895d05c
Author: Caolán McNamara 
AuthorDate: Tue Jun 18 09:00:17 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 18 11:12:00 2019 +0200

ofz#15335 avoid config during fuzzing

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

diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index c6b26c6ec2da..9742715aa4fd 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1770,7 +1771,7 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, 
const OUString& rPath,
 if( nFormat != GRFILTER_FORMAT_DONTKNOW )
 {
 aShortName = GetImportFormatShortName( nFormat 
).toAsciiUpperCase();
-if (aShortName == "PCD")
+if (aShortName == "PCD" && 
!utl::ConfigManager::IsFuzzing())
 {
 OUString aFilterConfigPath( 
"Office.Common/Filter/Graphic/Import/PCD" );
 pFilterConfigItem = 
std::make_unique( aFilterConfigPath );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Shubham Goyal (via logerrit)]

 cui/source/tabpages/tparea.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 1170001897078dd0bdafb2c00da8657e3660267c
Author: Shubham Goyal <22shub...@gmail.com>
AuthorDate: Sun Jun 16 19:32:31 2019 +0530
Commit: Xisco Faulí 
CommitDate: Tue Jun 18 11:14:33 2019 +0200

tdf#124549 Check Button toggle state before toggle.

Change-Id: I362cbc5613010e6586d63d6ebe45b40f05ffcbf1
Reviewed-on: https://gerrit.libreoffice.org/74117
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 770bf5a1f42be2d7397b30b91467a7dca4dc1785)
Reviewed-on: https://gerrit.libreoffice.org/74248
Reviewed-by: Xisco Faulí 

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 0ba9dcdeda72..1ec685daaafe 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -378,6 +378,10 @@ VclPtr lcl_CreateFillStyleTabPage(sal_uInt16 
nId, TabPageParent pPar
 
 IMPL_LINK(SvxAreaTabPage, SelectFillTypeHdl_Impl, weld::ToggleButton&, 
rButton, void)
 {
+//tdf#124549 - If the button is already active do not toggle it back.
+if(!rButton.get_active())
+rButton.set_active(true);
+
 SelectFillType(rButton);
 m_bBtnClicked = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: starmath/source stoc/Library_bootstrap.mk stoc/Library_javaloader.mk stoc/Library_javavm.mk stoc/source svgio/source

[Noel Grandin (via logerrit)]

 starmath/source/smdetect.cxx  |5 +++--
 stoc/Library_bootstrap.mk |1 +
 stoc/Library_javaloader.mk|1 +
 stoc/Library_javavm.mk|1 +
 stoc/source/javaloader/javaloader.cxx |7 +++
 stoc/source/javavm/javavm.cxx |   17 +
 stoc/source/servicemanager/servicemanager.cxx |   13 +++--
 svgio/source/svguno/xsvgparser.cxx|5 +++--
 8 files changed, 28 insertions(+), 22 deletions(-)

New commits:
commit e1eb7cb04a4c30cec238ab0f54d41a6cdc3299c1
Author: Noel Grandin 
AuthorDate: Mon Jun 17 08:21:42 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 18 09:27:59 2019 +0200

loplugin:logexceptionnicely in starmath..svgio

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

diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 90d601157a3e..24e6f2df7bf5 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "eqnolefilehdr.hxx"
 
@@ -83,9 +84,9 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence< 
PropertyValue >& lDescriptor
 }
 }
 }
-catch (const css::ucb::ContentCreationException )
+catch (const css::ucb::ContentCreationException &)
 {
-SAL_WARN("starmath", "SmFilterDetect::detect caught " << e);
+TOOLS_WARN_EXCEPTION("starmath", "SmFilterDetect::detect caught" );
 }
 
 if (!bStorageOk)
diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk
index bf5a75f55b6c..b31359663de6 100644
--- a/stoc/Library_bootstrap.mk
+++ b/stoc/Library_bootstrap.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,bootstrap,\
 reg \
 sal \
 salhelper \
+tl \
 ))
 
 $(eval $(call gb_Library_set_componentfile,bootstrap,stoc/util/bootstrap))
diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk
index f0b11fb4a9dc..caf4a1e27df6 100644
--- a/stoc/Library_javaloader.mk
+++ b/stoc/Library_javaloader.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_Library_use_libraries,javaloader,\
 jvmaccess \
 sal \
 salhelper \
+tl \
 ))
 
 $(eval $(call 
gb_Library_set_componentfile,javaloader,stoc/source/javaloader/javaloader))
diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk
index 84e29e8556e0..ce5f773ef394 100644
--- a/stoc/Library_javavm.mk
+++ b/stoc/Library_javavm.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_Library_use_libraries,javavm,\
 jvmfwk \
 sal \
 salhelper \
+tl \
 ))
 
 $(eval $(call gb_Library_set_componentfile,javavm,stoc/source/javavm/javavm))
diff --git a/stoc/source/javaloader/javaloader.cxx 
b/stoc/source/javaloader/javaloader.cxx
index 760f6d356a3c..e980d7dddebe 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #ifdef LINUX
 #undef minor
@@ -343,10 +344,8 @@ static css::uno::Reference 
JavaComponentLoader_CreateInstance(const
 static css::uno::Reference< XInterface > xStaticRef = *new 
JavaComponentLoader(xCtx);
 xRet = xStaticRef;
 }
-catch(const RuntimeException & runtimeException) {
-SAL_INFO(
-"stoc",
-"could not init javaloader due to " << runtimeException);
+catch(const RuntimeException &) {
+TOOLS_INFO_EXCEPTION("stoc", "could not init javaloader");
 throw;
 }
 
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 7f253f0ea7eb..eaecc2a91174 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -60,6 +60,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -527,23 +528,23 @@ void initVMConfiguration(
 try {
 getINetPropsFromConfig(, xSMgr, xCtx);
 }
-catch(const css::uno::Exception & exception) {
-SAL_INFO("stoc", "can not get INETProps because of " << exception);
+catch(const css::uno::Exception &) {
+TOOLS_INFO_EXCEPTION("stoc", "can not get INETProps");
 }
 
 try {
 getDefaultLocaleFromConfig(, xSMgr,xCtx);
 }
-catch(const css::uno::Exception & exception) {
-SAL_INFO("stoc", "can not get locale because of " << exception);
+catch(const css::uno::Exception &) {
+TOOLS_INFO_EXCEPTION("stoc", "can not get locale");
 }
 
 try
 {
 getJavaPropsFromSafetySettings(, xSMgr, xCtx);
 }
-catch(const css::uno::Exception & exception) {
-SAL_INFO("stoc", "couldn't get safety settings because of " << 
exception);
+catch(const css::uno::Exception &) {
+TOOLS_INFO_EXCEPTION("stoc", "couldn't get safety settings");
 }
 
 *pjvm= jvm;
@@ -1330,9 +1331,9 @@ void 

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

[Arkadiy Illarionov (via logerrit)]

 vcl/qa/cppunit/canvasbitmaptest.cxx |   46 -
 vcl/source/components/fontident.cxx |6 --
 vcl/source/control/edit.cxx |   18 ++--
 vcl/source/filter/FilterConfigCache.cxx |4 -
 vcl/source/filter/FilterConfigItem.cxx  |   39 ++
 vcl/source/filter/graphicfilter.cxx |   32 +++---
 vcl/source/filter/jpeg/JpegWriter.cxx   |9 +---
 vcl/source/filter/png/pngwrite.cxx  |   15 +++
 vcl/source/filter/wmf/wmfexternal.cxx   |   10 ++--
 vcl/source/font/fontmetric.cxx  |   10 +---
 vcl/source/gdi/configsettings.cxx   |   14 ++
 vcl/source/gdi/print3.cxx   |   49 --
 vcl/source/graphic/UnoGraphic.cxx   |3 -
 vcl/source/graphic/UnoGraphicProvider.cxx   |   60 +++-
 vcl/source/helper/canvasbitmap.cxx  |   56 +-
 vcl/source/helper/canvastools.cxx   |   34 ++-
 vcl/source/helper/commandinfoprovider.cxx   |   47 +
 vcl/source/uitest/logger.cxx|7 ---
 vcl/source/uitest/uitest.cxx|6 --
 vcl/source/uitest/uno/uiobject_uno.cxx  |6 +-
 vcl/source/window/printdlg.cxx  |   15 +++
 vcl/unx/generic/dtrans/X11_selection.cxx|   21 +++--
 vcl/unx/generic/dtrans/X11_transferable.cxx |   11 ++---
 vcl/unx/gtk/a11y/atkaction.cxx  |   18 
 vcl/unx/gtk/a11y/atktable.cxx   |4 -
 vcl/unx/gtk/a11y/atktextattributes.cxx  |   14 ++
 vcl/unx/gtk/a11y/atkwrapper.cxx |   11 ++---
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx|   40 ++
 vcl/unx/gtk/salprn-gtk.cxx  |   15 +++
 vcl/unx/gtk3/gtk3gtkinst.cxx|4 -
 vcl/workben/vcldemo.cxx |8 +--
 31 files changed, 270 insertions(+), 362 deletions(-)

New commits:
commit 452a8e4abe0c416d664078baddff67c1561025ec
Author: Arkadiy Illarionov 
AuthorDate: Sat Jun 15 17:13:48 2019 +0300
Commit: Noel Grandin 
CommitDate: Tue Jun 18 09:43:08 2019 +0200

Simplify Sequence iterations in vcl

Use range-based loops or replace with comphelper or STL functions

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

diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx 
b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 070b8b6217a4..cf7a82c653ad 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -482,15 +482,13 @@ private:
 virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( 
const uno::Sequence< ::sal_Int8 >& deviceColor ) override
 {
 const uno::Sequence< rendering::ARGBColor > aTemp( 
convertIntegerToARGB(deviceColor) );
-const std::size_t nLen(aTemp.getLength());
-uno::Sequence< rendering::RGBColor > aRes( nLen );
-rendering::RGBColor* pOut = aRes.getArray();
-for( std::size_t i=0; i aRes( aTemp.getLength() );
+std::transform(aTemp.begin(), aTemp.end(), aRes.begin(),
+[](const rendering::ARGBColor& rColor) {
+return rendering::RGBColor(rColor.Red,
+   rColor.Green,
+   rColor.Blue);
+});
 
 return aRes;
 }
@@ -503,21 +501,18 @@ private:
0, static_cast(nLen%nBytesPerPixel));
 
 uno::Sequence< rendering::ARGBColor > aRes( nLen / nBytesPerPixel );
-rendering::ARGBColor* pOut( aRes.getArray() );
 
 if( getPalette().is() )
 {
-for( std::size_t i=0; i(nLen%nBytesPerPixel));
 
 uno::Sequence< rendering::ARGBColor > aRes( nLen / nBytesPerPixel );
-rendering::ARGBColor* pOut( aRes.getArray() );
 
 if( getPalette().is() )
 {
-for( std::size_t i=0; i& i_rArgs )
 if( !ImplGetSVData() )
 return; // VCL not initialized
 
-sal_uInt32 nArgs = i_rArgs.getLength();
-const Any* pArgs = i_rArgs.getConstArray();
 Sequence< sal_Int8 > aFontBuf;
-for( sal_uInt32 i = 0; i < nArgs; i++ )
+for( const auto& rArg : i_rArgs )
 {
-if( pArgs[i] >>= aFontBuf )
+if( rArg >>= aFontBuf )
 {
 m_aFont = Font::identifyFont( aFontBuf.getConstArray(), 
aFontBuf.getLength() );
 break;
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index a1b1af252dc5..57d037546c5f 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2924,18 +2924,12 @@ void Edit::dragEnter( const 
css::datatransfer::dnd::DropTargetDragEnterEvent& rD
 }
 // search for string data type
 const Sequence< css::datatransfer::DataFlavor >& rFlavors( 
rDTDE.SupportedDataFlavors 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - android/CustomTarget_lo_android.mk

[Jan Holesovsky (via logerrit)]

 android/CustomTarget_lo_android.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 483e8d00dc0ad7753016a007e71a7412ac7fa952
Author: Jan Holesovsky 
AuthorDate: Mon Jun 17 10:04:44 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Jun 18 09:51:26 2019 +0200

android: Fix non-debug build.

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

diff --git a/android/CustomTarget_lo_android.mk 
b/android/CustomTarget_lo_android.mk
index 3f80fe86be3a..4badb659612e 100644
--- a/android/CustomTarget_lo_android.mk
+++ b/android/CustomTarget_lo_android.mk
@@ -20,7 +20,7 @@ $(loandroid3_DIR)/done : $(call 
gb_Postprocess_get_target,AllModulesButInstsetNa
 # still looks for the .apk, and we want fresh daily builds to be uploaded.
 # Us "foo" instead of the old INPATH
mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \
-   cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if 
$(ENABLE_ANDROID_EDITING),Editing)/debug/*-debug.apk 
$(BUILDDIR)/instsetoo_native/foo/bin
+   cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if 
$(ENABLE_ANDROID_EDITING),Editing)/$(if 
$(ENABLE_RELEASE_BUILD),release/*-release-unsigned.apk,debug/*-debug.apk) 
$(BUILDDIR)/instsetoo_native/foo/bin
 
 $(call gb_CustomTarget_get_clean_target,android/loandroid3) :
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - configure.ac distro-configs/LibreOfficeAndroidAarch64.conf distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX8

[Jan Holesovsky (via logerrit)]

 configure.ac  |1 -
 distro-configs/LibreOfficeAndroid.conf|1 +
 distro-configs/LibreOfficeAndroidAarch64.conf |1 +
 distro-configs/LibreOfficeAndroidX86.conf |1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit fe8e38a8dd07ae490064c7736e7ed904f59e1647
Author: Jan Holesovsky 
AuthorDate: Mon Jun 17 21:35:48 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Jun 18 09:52:22 2019 +0200

android: Define the icon theme in distro-configs and switch to colibre.

No need to reinvent the wheel and hardcode it in configure.ac.

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

diff --git a/configure.ac b/configure.ac
index eb510df19335..a58403b3b611 100644
--- a/configure.ac
+++ b/configure.ac
@@ -760,7 +760,6 @@ linux-android*)
 enable_odk=no
 enable_postgresql_sdbc=no
 enable_python=no
-with_theme="tango"
 test_cups=no
 test_dbus=no
 test_fontconfig=no
diff --git a/distro-configs/LibreOfficeAndroid.conf 
b/distro-configs/LibreOfficeAndroid.conf
index 9cc574909d66..2b4081b72c09 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -9,3 +9,4 @@
 --without-helppack-integration
 --without-junit
 --disable-largefile
+--with-theme=colibre
diff --git a/distro-configs/LibreOfficeAndroidAarch64.conf 
b/distro-configs/LibreOfficeAndroidAarch64.conf
index 4f3d2f44c5fc..4dbafba466d6 100644
--- a/distro-configs/LibreOfficeAndroidAarch64.conf
+++ b/distro-configs/LibreOfficeAndroidAarch64.conf
@@ -8,3 +8,4 @@
 --without-export-validation
 --without-helppack-integration
 --without-junit
+--with-theme=colibre
diff --git a/distro-configs/LibreOfficeAndroidX86.conf 
b/distro-configs/LibreOfficeAndroidX86.conf
index 7a2586989391..6b4aa2aff796 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -9,3 +9,4 @@
 --without-helppack-integration
 --without-junit
 --disable-largefile
+--with-theme=colibre
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Roman Kuznetsov (via logerrit)]

 sc/uiconfig/scalc/toolbar/formcontrols.xml|4 ++--
 sd/uiconfig/sdraw/toolbar/formcontrols.xml|4 ++--
 sd/uiconfig/simpress/toolbar/formcontrols.xml |4 ++--
 sw/uiconfig/sglobal/toolbar/formcontrols.xml  |4 ++--
 sw/uiconfig/sweb/toolbar/formcontrols.xml |4 ++--
 sw/uiconfig/swform/toolbar/formcontrols.xml   |4 ++--
 sw/uiconfig/swreport/toolbar/formcontrols.xml |4 ++--
 sw/uiconfig/swriter/toolbar/formcontrols.xml  |4 ++--
 sw/uiconfig/swxform/toolbar/formcontrols.xml  |4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 385128671716e70b9540a67e213d6495bf50662b
Author: Roman Kuznetsov 
AuthorDate: Mon Jun 17 19:51:30 2019 +0200
Commit: Roman Kuznetsov 
CommitDate: Tue Jun 18 09:54:55 2019 +0200

tdf#125947 Two tools are missing from default Form Controls toolbar

Change-Id: Ie54b2a3f5051b115f8f04467282090a93525dfc3
Reviewed-on: https://gerrit.libreoffice.org/74191
Tested-by: Jenkins
Reviewed-by: Roman Kuznetsov 

diff --git a/sc/uiconfig/scalc/toolbar/formcontrols.xml 
b/sc/uiconfig/scalc/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sc/uiconfig/scalc/toolbar/formcontrols.xml
+++ b/sc/uiconfig/scalc/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sd/uiconfig/sdraw/toolbar/formcontrols.xml 
b/sd/uiconfig/sdraw/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sd/uiconfig/sdraw/toolbar/formcontrols.xml
+++ b/sd/uiconfig/sdraw/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sd/uiconfig/simpress/toolbar/formcontrols.xml 
b/sd/uiconfig/simpress/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sd/uiconfig/simpress/toolbar/formcontrols.xml
+++ b/sd/uiconfig/simpress/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sw/uiconfig/sglobal/toolbar/formcontrols.xml 
b/sw/uiconfig/sglobal/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sw/uiconfig/sglobal/toolbar/formcontrols.xml
+++ b/sw/uiconfig/sglobal/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sw/uiconfig/sweb/toolbar/formcontrols.xml 
b/sw/uiconfig/sweb/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sw/uiconfig/sweb/toolbar/formcontrols.xml
+++ b/sw/uiconfig/sweb/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sw/uiconfig/swform/toolbar/formcontrols.xml 
b/sw/uiconfig/swform/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sw/uiconfig/swform/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swform/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sw/uiconfig/swreport/toolbar/formcontrols.xml 
b/sw/uiconfig/swreport/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sw/uiconfig/swreport/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swreport/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sw/uiconfig/swriter/toolbar/formcontrols.xml 
b/sw/uiconfig/swriter/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sw/uiconfig/swriter/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swriter/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sw/uiconfig/swxform/toolbar/formcontrols.xml 
b/sw/uiconfig/swxform/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sw/uiconfig/swxform/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swxform/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: schema/odf1.3

[Michael Stahl (via logerrit)]

 schema/odf1.3/OpenDocument-schema-v1.3.rng |  132 -
 1 file changed, 75 insertions(+), 57 deletions(-)

New commits:
commit b8775ff8961dbe589799ac7f59427a8e5d07ac72
Author: Michael Stahl 
AuthorDate: Mon Jun 17 18:31:50 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Jun 18 10:31:02 2019 +0200

schema: update ODF 1.3 main rng draft to wd12

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

diff --git a/schema/odf1.3/OpenDocument-schema-v1.3.rng 
b/schema/odf1.3/OpenDocument-schema-v1.3.rng
index 384b88162e1c..e8fac152483f 100644
--- a/schema/odf1.3/OpenDocument-schema-v1.3.rng
+++ b/schema/odf1.3/OpenDocument-schema-v1.3.rng
@@ -3,34 +3,16 @@
 Open Document Format for Office Applications (OpenDocument) Version 1.3
 OASIS Standard, In progress
Relax-NG Schema
-Source: https://tools.oasis-open.org/version-control/svn/office/
-Copyright (c) OASIS Open 2002-2015. All Rights Reserved.
 
-   All capitalized terms in the following text have the meanings assigned 
to them
-   in the OASIS Intellectual Property Rights Policy (the "OASIS IPR 
Policy"). The
-   full Policy may be found at the OASIS website.
+Copyright © OASIS Open [2002-2018]. All Rights Reserved.
+Distributed under the terms of the OASIS IPR Policy, 
[http://www.oasis-open.org/policies-guidelines/ipr],
+AS-IS, WITHOUT ANY IMPLIED OR EXPRESS WARRANTY; there is no warranty 
of MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE or NONINFRINGEMENT of the rights of 
others.
 
-   This document and translations of it may be copied and furnished to 
others, and
-   derivative works that comment on or otherwise explain it or assist in 
its
-   implementation may be prepared, copied, published, and distributed, in 
whole or
-   in part, without restriction of any kind, provided that the above 
copyright
-   notice and this section are included on all such copies and derivative 
works.
-   However, this document itself may not be modified in any way, including 
by
-   removing the copyright notice or references to OASIS, except as needed 
for the
-   purpose of developing any document or deliverable produced by an OASIS
-   Technical Committee (in which case the rules applicable to copyrights, 
as set
-   forth in the OASIS IPR Policy, must be followed) or as required to 
translate it
-   into languages other than English.
+-->
 
-   The limited permissions granted above are perpetual and will not be 
revoked by
-   OASIS or its successors or assigns.
+
 
-   This document and the information contained herein is provided on an 
"AS IS"
-   basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING 
BUT NOT
-   LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-   INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF 
MERCHANTABILITY OR
-   FITNESS FOR A PARTICULAR PURPOSE. 
--->
 http://purl.org/dc/elements/1.1/; 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:rng="http://relaxng.org/ns/structure/1.0; xmlns:script="urn:oa
 sis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes;>
   
 
@@ -1528,8 +1510,8 @@
   
 
   
-  
 
+
   
   
 
@@ -4986,6 +4968,7 @@
   
 
   
+  
   
 
   
@@ -7206,6 +7189,12 @@
   
 
   
+  
+
+  
+
+  
+  
 
   
   
@@ -7359,17 +7348,25 @@
 
   
   
-
-  
-
-  
-
-
-  
-
-  
-  
-
+
+  
+
+  
+
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+

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

[Stephan Bergmann (via logerrit)]

 vcl/source/filter/jpeg/Exif.cxx |   73 +---
 vcl/source/filter/jpeg/Exif.hxx |   10 ++---
 2 files changed, 59 insertions(+), 24 deletions(-)

New commits:
commit 42c0e433aca68c669bc0f55af404b6bae1655fba
Author: Stephan Bergmann 
AuthorDate: Tue Jun 18 00:00:54 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jun 18 10:59:59 2019 +0200

Avoid -fsanitize=misaligned-pointer-use

...like

> vcl/source/filter/jpeg/Exif.cxx:158:31: runtime error: member access 
within misaligned address 0x624000a5610a for type 'Exif::ExifIFD', which 
requires 4 byte alignment
> 0x624000a5610a: note: pointer points here
>  00 00  00 07 01 12 00 03 00 00  00 01 00 01 00 00 01 1a  00 05 00 00 00 
01 00 00  00 62 01 1b 00 05
>   ^
>  #0 in Exif::processIFD(unsigned char*, unsigned short, unsigned short, 
unsigned short, bool, bool) at vcl/source/filter/jpeg/Exif.cxx:158:31
>  #1 in Exif::processExif(SvStream&, unsigned short, bool) at 
vcl/source/filter/jpeg/Exif.cxx:255:5
>  #2 in Exif::processJpeg(SvStream&, bool) at 
vcl/source/filter/jpeg/Exif.cxx:132:20
[...]

when inserting some .jpg into Draw.

The swapping in Exif::processIFD had been introduced with
3ad12d1a540eeb54fbb34afc3b7a76bf9e3207c3 "fdo#57659: fix exif processing", 
and
it had probably been an oversight that it used OSL_SWAPWORD instead of
OSL_SWAPDWORD to swap sal_uInt32 ifd->offset (in two places), and that it 
failed
to swap ifd->type and ifd->count in the bSetValue branch (see the 
discussion at
 "fdo#57659: fix exif 
processing").

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

diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index 3b014f6deb1d..187d5ac6efc6 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -148,38 +148,73 @@ bool Exif::processJpeg(SvStream& rStream, bool bSetValue)
 return false;
 }
 
-void Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16 
aOffset, sal_uInt16 aNumberOfTags, bool bSetValue, bool bSwap)
+namespace {
+
+sal_uInt16 read16(sal_uInt8 const * data, bool littleEndian) {
+if (littleEndian) {
+return data[0] | (sal_uInt16(data[1]) << 8);
+} else {
+return data[1] | (sal_uInt16(data[0]) << 8);
+}
+}
+
+void write16(sal_uInt16 value, sal_uInt8 * data, bool littleEndian) {
+if (littleEndian) {
+data[0] = value & 0xFF;
+data[1] = value >> 8;
+} else {
+data[1] = value & 0xFF;
+data[0] = value >> 8;
+}
+}
+
+sal_uInt32 read32(sal_uInt8 const * data, bool littleEndian) {
+if (littleEndian) {
+return data[0] | (sal_uInt32(data[1]) << 8)
+| (sal_uInt32(data[2]) << 16) | (sal_uInt32(data[3]) << 24);
+} else {
+return data[3] | (sal_uInt32(data[2]) << 8)
+| (sal_uInt32(data[1]) << 16) | (sal_uInt32(data[0]) << 24);
+}
+}
+
+void write32(sal_uInt32 value, sal_uInt8 * data, bool littleEndian) {
+if (littleEndian) {
+data[0] = value & 0xFF;
+data[1] = (value >> 8) & 0xFF;
+data[2] = (value >> 16) & 0xFF;
+data[3] = value >> 24;
+} else {
+data[3] = value & 0xFF;
+data[2] = (value >> 8) & 0xFF;
+data[1] = (value >> 16) & 0xFF;
+data[0] = value >> 24;
+}
+}
+
+}
+
+void Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16 
aOffset, sal_uInt16 aNumberOfTags, bool bSetValue, bool littleEndian)
 {
 ExifIFD* ifd = nullptr;
 
 while (aOffset <= aLength - 12 && aNumberOfTags > 0)
 {
 ifd = reinterpret_cast([aOffset]);
-sal_uInt16 tag = ifd->tag;
-if (bSwap)
-{
-tag = OSL_SWAPWORD(ifd->tag);
-}
+sal_uInt16 tag = read16(ifd->tag, littleEndian);
 
 if (tag == ORIENTATION)
 {
 if(bSetValue)
 {
-ifd->tag = ORIENTATION;
-ifd->type = 3;
-ifd->count = 1;
-ifd->offset = maOrientation;
-if (bSwap)
-{
-ifd->tag = OSL_SWAPWORD(ifd->tag);
-ifd->offset = OSL_SWAPWORD(ifd->offset);
-}
+write16(ORIENTATION, ifd->tag, littleEndian);
+write16(3, ifd->type, littleEndian);
+write32(1, ifd->count, littleEndian);
+write32(maOrientation, ifd->offset, littleEndian);
 }
 else
 {
-sal_uInt32 nIfdOffset = ifd->offset;
-if (bSwap)
-nIfdOffset = OSL_SWAPWORD(ifd->offset);
+sal_uInt32 nIfdOffset = read32(ifd->offset, littleEndian);
 

[Libreoffice-commits] core.git: chart2/source cui/source filter/source include/IwyuFilter_include.yaml include/svx oox/source sc/source sd/source svx/inc svx/source sw/inc sw/source

[Gabor Kelemen (via logerrit)]

 chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |1 
 chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx |2 
 cui/source/inc/cuitabline.hxx  |1 
 cui/source/tabpages/tpline.cxx |3 
 cui/source/tabpages/tplnedef.cxx   |2 
 cui/source/tabpages/tplneend.cxx   |2 
 filter/source/msfilter/escherex.cxx|1 
 filter/source/svg/svgexport.cxx|1 
 include/IwyuFilter_include.yaml|   49 
++
 include/svx/TextCharacterSpacingPopup.hxx  |2 
 include/svx/TextUnderlinePopup.hxx |4 
 include/svx/svddef.hxx |3 
 include/svx/tabline.hxx|6 -
 include/svx/tbcontrl.hxx   |3 
 include/svx/ucsubset.hxx   |1 
 include/svx/unoapi.hxx |3 
 include/svx/unomaster.hxx  |4 
 include/svx/unopage.hxx|8 -
 include/svx/unoprov.hxx|1 
 include/svx/unoshape.hxx   |   10 --
 include/svx/unoshprp.hxx   |7 -
 include/svx/view3d.hxx |1 
 oox/source/drawingml/shape.cxx |1 
 oox/source/export/drawingml.cxx|1 
 sc/source/ui/unoobj/cellsuno.cxx   |1 
 sd/source/ui/func/fucon3d.cxx  |1 
 sd/source/ui/inc/unopage.hxx   |2 
 sd/source/ui/unoidl/unopage.cxx|1 
 svx/inc/dragmt3d.hxx   |1 
 svx/source/dialog/dlgctl3d.cxx |1 
 svx/source/tbxctrls/tbcontrl.cxx   |1 
 svx/source/unodraw/UnoGraphicExporter.cxx  |1 
 svx/source/unodraw/UnoNamespaceMap.cxx |1 
 svx/source/unodraw/shapeimpl.hxx   |2 
 svx/source/unodraw/unoprov.cxx |2 
 sw/inc/unodraw.hxx |2 
 sw/source/core/unocore/unoframe.cxx|1 
 37 files changed, 91 insertions(+), 43 deletions(-)

New commits:
commit e080acf2211af3f2b55cf59f04272a9a43188abe
Author: Gabor Kelemen 
AuthorDate: Thu Jun 13 18:43:27 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 18 09:08:59 2019 +0200

tdf#42949 Fix IWYU warnings in include/svx/[t-v]*

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

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

diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx 
b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index d5437f09165e..2856ff78b697 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -38,6 +38,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx 
b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
index f04d8717a1c0..ffbab285998e 100644
--- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
@@ -30,11 +30,13 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 8cfdcc84d571..e36febde5dd7 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_CUI_SOURCE_INC_CUITABLINE_HXX
 
 #include 
+#include 
 #include 
 #include 
 
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 8dd8dc36f527..a099256d8faa 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -26,6 +26,8 @@
 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -51,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 

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

[Noel Grandin (via logerrit)]

 vcl/qt5/Qt5Widget.cxx  |5 +++--
 vcl/source/app/session.cxx |5 +++--
 vcl/source/app/svdata.cxx  |5 +++--
 vcl/source/app/svmain.cxx  |5 +++--
 vcl/source/gdi/gdimtf.cxx  |5 +++--
 vcl/source/gdi/vectorgraphicdata.cxx   |5 +++--
 vcl/source/image/ImplImageTree.cxx |   17 +
 vcl/source/window/window.cxx   |9 +
 vcl/unx/generic/fontmanager/fontconfig.cxx |5 +++--
 vcl/unx/gtk/gtksalframe.cxx|5 +++--
 vcl/unx/gtk3/gtk3gtkframe.cxx  |3 ++-
 vcl/workben/mtfdemo.cxx|5 +++--
 vcl/workben/outdevgrind.cxx|5 +++--
 vcl/workben/svdem.cxx  |5 +++--
 vcl/workben/svpclient.cxx  |3 ++-
 vcl/workben/svptest.cxx|5 +++--
 vcl/workben/vcldemo.cxx|5 +++--
 17 files changed, 57 insertions(+), 40 deletions(-)

New commits:
commit a2e4b76e29e491bac4f9e6dfd9929dfd49a4b05e
Author: Noel Grandin 
AuthorDate: Tue Jun 18 09:33:28 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 18 10:46:40 2019 +0200

loplugin:logexceptionnicely in vcl

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

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index b46b48b35366..657c5e8e73f7 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -613,9 +614,9 @@ static bool lcl_retrieveSurrounding(sal_Int32& rPosition, 
sal_Int32& rAnchor, QS
 if (xAccessible.is())
 xText = 
FindFocusedEditableText(xAccessible->getAccessibleContext());
 }
-catch (const uno::Exception& e)
+catch (const uno::Exception&)
 {
-SAL_WARN("vcl.qt5", "Exception in getting input method surrounding 
text: " << e);
+TOOLS_WARN_EXCEPTION("vcl.qt5", "Exception in getting input method 
surrounding text");
 }
 
 bool result = false;
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 5679c7a9fb63..c96d179cf90e 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 
+#include 
 #include 
 
 #include 
@@ -376,8 +377,8 @@ void VCLSession::disposing() {
 try {
 listener.m_xListener->disposing(src);
 SAL_INFO("vcl.se.debug", "  call Listener disposing");
-} catch (css::uno::RuntimeException & e) {
-SAL_WARN("vcl.se", "ignoring " << e);
+} catch (css::uno::RuntimeException &) {
+TOOLS_WARN_EXCEPTION("vcl.se", "ignoring");
 }
 }
 }
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 93335d48624b..2a3fd1162528 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -244,9 +245,9 @@ vcl::Window *ImplGetDefaultContextWindow()
 pContext->acquire();
 #endif
 }
-catch (const css::uno::Exception& e)
+catch (const css::uno::Exception&)
 {
- SAL_WARN("vcl", "unable to create Default Window: " << e);
+TOOLS_WARN_EXCEPTION("vcl", "unable to create Default Window");
 }
 }
 }
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 51e47674b604..64395164e8ba 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -102,6 +102,7 @@
 #include 
 
 #include 
+#include 
 
 #if OSL_DEBUG_LEVEL > 0
 #include 
@@ -344,9 +345,9 @@ bool InitVCL()
 osl_setEnvironment(envVar.pData, aLocaleString.pData);
 }
 }
-catch (const uno::Exception )
+catch (const uno::Exception &)
 {
-SAL_INFO("vcl.app", "Unable to get ui language: '" << e);
+TOOLS_INFO_EXCEPTION("vcl.app", "Unable to get ui language:");
 }
 
 pSVData->mpDefInst->AfterAppInit();
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index eb730fe578a7..8c01f8302535 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -426,10 +427,10 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* 
pOut, const Point& rPos, S
 {
 throw; // runtime errors are fatal
 }
-catch (const uno::Exception& e)
+catch (const uno::Exception&)
 {
 // ignore errors, no way of reporting them here
-SAL_WARN("vcl.gdi", "GDIMetaFile::ImplPlayWithRenderer: " << e);
+TOOLS_WARN_EXCEPTION("vcl.gdi", "GDIMetaFile::ImplPlayWithRenderer");
 }
 
 return false;
diff --git 

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

[Mike Kaganski (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9bf161ea08e7432dcfb76feda4e57bebf91f8cf4
Author: Mike Kaganski 
AuthorDate: Thu Apr 11 23:35:13 2019 +0300
Commit: Mike Kaganski 
CommitDate: Wed Jun 19 04:16:11 2019 +0200

f315fee54eee57e6e55e5fcacf2522534682c2ce follow-up: fix tdf#109310 unit test

The test should guarantee presense of w:val attribute of w:rStyle element.
Turns out we must not use w: namespace before attribute name; likely it
is true when attribute namespace is the same as of its element.

Change-Id: I28e2936b51f039473326c6debf4b5559e2baf24c
Reviewed-on: https://gerrit.libreoffice.org/70612
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 735964c39097ff952fcaffee6b35c79e210c019c)
Reviewed-on: https://gerrit.libreoffice.org/74326
Tested-by: Mike Kaganski 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 4a3b1a0c412d..a44c8f78d9cf 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -488,7 +488,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf109310_endnoteStyleForMSO, 
"tdf109310_endnoteSty
 xmlDocPtr pXmlDoc = parseExport("word/endnotes.xml");
 if (!pXmlDoc)
 return;
-//assertXPath(pXmlDoc, 
"/w:endnotes/w:endnote[@w:id='2']/w:p/w:r[1]/w:rPr/w:rStyle", "w:val"); // what 
does it test?
+// Check w:rStyle element has w:val attribute - note that w: is not 
specified for attribute
+assertXPath(pXmlDoc, 
"/w:endnotes/w:endnote[@w:id='2']/w:p/w:r[1]/w:rPr/w:rStyle", "val",
+"EndnoteCharacters");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf103389, "tdf103389.docx")
___
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' - sc/inc sc/qa sc/source

[Mike Kaganski (via logerrit)]

 sc/inc/dputil.hxx  |2 
 sc/qa/unit/pivottable_filters_test.cxx |  167 +
 sc/source/core/data/dpobject.cxx   |5 
 sc/source/filter/excel/xepivotxml.cxx  |  120 ++-
 4 files changed, 208 insertions(+), 86 deletions(-)

New commits:
commit b4f61d5bb36130198a83a8cdcf060ebddea07b23
Author: Mike Kaganski 
AuthorDate: Fri Mar 22 14:06:19 2019 +0300
Commit: Mike Kaganski 
CommitDate: Wed Jun 19 07:09:02 2019 +0200

tdf#113908: Implement exporting pivot tables' groups fields to XSLX

Two tests in sc/qa/unit/pivottable_filters_test.cxx were extended
to also test round-trip of group fields in XLSX.

Change-Id: I70b7c15b09040c64fa1da2f88001af7ba16f2c6f
Reviewed-on: https://gerrit.libreoffice.org/69653
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/70687
Tested-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/74328

diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx
index b2539a159bce..735843b84578 100644
--- a/sc/inc/dputil.hxx
+++ b/sc/inc/dputil.hxx
@@ -33,7 +33,7 @@ public:
 
 SC_DLLPUBLIC static OUString createDuplicateDimensionName(const OUString& 
rOriginal, size_t nDupCount);
 
-static OUString getDateGroupName(
+SC_DLLPUBLIC static OUString getDateGroupName(
 sal_Int32 nDatePart, sal_Int32 nValue, SvNumberFormatter* pFormatter,
 double fStart, double fEnd);
 
diff --git a/sc/qa/unit/pivottable_filters_test.cxx 
b/sc/qa/unit/pivottable_filters_test.cxx
index 2c3448b78cfc..84ad5eade972 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -53,8 +53,8 @@ public:
 void testPivotTableSharedCacheGroupODS();
 void testGetPivotDataXLS();
 void testPivotTableSharedGroupXLSX();
-void testPivotTableSharedDateGroupXLSX();
-void testPivotTableSharedNestedDateGroupXLSX();
+void testPivotTableSharedDateGroupXLSX(); // + export
+void testPivotTableSharedNestedDateGroupXLSX(); // + export
 void testPivotTableSharedNumGroupXLSX();
 void testPivotTableNoColumnsLayout();
 void testTdf112501();
@@ -532,86 +532,99 @@ void 
ScPivotTableFiltersTest::testPivotTableSharedGroupXLSX()
 
 void ScPivotTableFiltersTest::testPivotTableSharedDateGroupXLSX()
 {
-ScDocShellRef xDocSh = loadDoc("pivot-table/shared-dategroup.", 
FORMAT_XLSX);
-CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
-ScDocument& rDoc = xDocSh->GetDocument();
-
-// Check whether right date labels are imported for both tables
-// First table
-CPPUNIT_ASSERT_EQUAL(OUString("a"), rDoc.GetString(ScAddress(0, 3, 1)));
-CPPUNIT_ASSERT_EQUAL(OUString("1965"), rDoc.GetString(ScAddress(0, 4, 1)));
-CPPUNIT_ASSERT_EQUAL(OUString("1989"), rDoc.GetString(ScAddress(0, 5, 1)));
-CPPUNIT_ASSERT_EQUAL(OUString("2000"), rDoc.GetString(ScAddress(0, 6, 1)));
-CPPUNIT_ASSERT_EQUAL(OUString("2004"), rDoc.GetString(ScAddress(0, 7, 1)));
-// TODO: check why this fails with 2005
-// CPPUNIT_ASSERT_EQUAL(OUString("2007"), 
rDoc.GetString(ScAddress(0,8,1)));
-
-// Second table
-CPPUNIT_ASSERT_EQUAL(OUString("a"), rDoc.GetString(ScAddress(5, 3, 1)));
-CPPUNIT_ASSERT_EQUAL(OUString("1965"), rDoc.GetString(ScAddress(5, 4, 1)));
-CPPUNIT_ASSERT_EQUAL(OUString("1989"), rDoc.GetString(ScAddress(5, 5, 1)));
-CPPUNIT_ASSERT_EQUAL(OUString("2000"), rDoc.GetString(ScAddress(5, 6, 1)));
-CPPUNIT_ASSERT_EQUAL(OUString("2004"), rDoc.GetString(ScAddress(5, 7, 1)));
-// TODO: check why this fails with 2005
-// CPPUNIT_ASSERT_EQUAL(OUString("2007"), 
rDoc.GetString(ScAddress(5,8,1)));
-
-// There should be exactly 2 pivot tables and 1 cache.
-ScDPCollection* pDPs = rDoc.GetDPCollection();
-CPPUNIT_ASSERT_EQUAL(static_cast(2), pDPs->GetCount());
-
-ScDPCollection::SheetCaches& rSheetCaches = pDPs->GetSheetCaches();
-CPPUNIT_ASSERT_EQUAL(static_cast(1), rSheetCaches.size());
-
-const ScDPCache* pCache = rSheetCaches.getExistingCache(ScRange(0, 0, 0, 
9, 24, 0));
-CPPUNIT_ASSERT_MESSAGE("Pivot cache is expected for A1:J25 on the first 
sheet.", pCache);
-CPPUNIT_ASSERT_EQUAL(static_cast(10), pCache->GetFieldCount());
-
-xDocSh->DoClose();
+auto testThis = [](ScDocShellRef& xDocSh) {
+CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is());
+ScDocument& rDoc = xDocSh->GetDocument();
+
+// Check whether right date labels are imported for both tables
+// First table
+CPPUNIT_ASSERT_EQUAL(OUString("a"), rDoc.GetString(ScAddress(0, 3, 
1)));
+CPPUNIT_ASSERT_EQUAL(OUString("1965"), rDoc.GetString(ScAddress(0, 4, 
1)));
+CPPUNIT_ASSERT_EQUAL(OUString("1989"), rDoc.GetString(ScAddress(0, 5, 
1)));
+CPPUNIT_ASSERT_EQUAL(OUString("2000"), rDoc.GetString(ScAddress(0, 6, 
1)));
+CPPUNIT_ASSERT_EQUAL(OUString("2004"), 

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

[Mike Kaganski (via logerrit)]

 sc/qa/unit/data/ods/tdf124651_simplePivotTable.ods |binary
 sc/qa/unit/pivottable_filters_test.cxx |   15 +++
 sc/source/filter/excel/xepivotxml.cxx  |7 +--
 3 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 8c800d3cc9541a28e665707bda0bf68d81a3269b
Author: Mike Kaganski 
AuthorDate: Wed Apr 10 15:18:07 2019 +0300
Commit: Mike Kaganski 
CommitDate: Wed Jun 19 07:08:45 2019 +0200

tdf#124651: always write "name" attribute to dataField element

Despite being optional as per ECMA-376-1:2016, Excel 2016 seems to
require the presence of "name" attribute in dataField element of
pivot table definition, so make sure to write at least empty string
there.

Change-Id: Iaab5674f86b7dd0b267776678e11af47086635d7
Reviewed-on: https://gerrit.libreoffice.org/70522
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/74327

diff --git a/sc/qa/unit/data/ods/tdf124651_simplePivotTable.ods 
b/sc/qa/unit/data/ods/tdf124651_simplePivotTable.ods
new file mode 100644
index ..05fd5fec838f
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf124651_simplePivotTable.ods 
differ
diff --git a/sc/qa/unit/pivottable_filters_test.cxx 
b/sc/qa/unit/pivottable_filters_test.cxx
index a476e0d7b450..2c3448b78cfc 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -89,6 +89,7 @@ public:
 void testTdf112106();
 void testTdf123923();
 void testTdf123939();
+void testTdf124651();
 
 CPPUNIT_TEST_SUITE(ScPivotTableFiltersTest);
 
@@ -132,6 +133,7 @@ public:
 CPPUNIT_TEST(testTdf112106);
 CPPUNIT_TEST(testTdf123923);
 CPPUNIT_TEST(testTdf123939);
+CPPUNIT_TEST(testTdf124651);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2443,6 +2445,19 @@ void ScPivotTableFiltersTest::testTdf123939()
 "containsMixedTypes", "1");
 }
 
+void ScPivotTableFiltersTest::testTdf124651()
+{
+ScDocShellRef xDocSh = loadDoc("tdf124651_simplePivotTable.", FORMAT_ODS);
+CPPUNIT_ASSERT(xDocSh.is());
+
+xmlDocPtr pDoc = XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory,
+"xl/pivotTables/pivotTable1.xml", FORMAT_XLSX);
+CPPUNIT_ASSERT(pDoc);
+// We have to export name attribute, even though it's optional according 
to ECMA-376 standard,
+// because Excel (at least 2016) seems to require it.
+assertXPath(pDoc, "/x:pivotTableDefinition/x:dataFields/x:dataField", 
"name", "");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScPivotTableFiltersTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xepivotxml.cxx 
b/sc/source/filter/excel/xepivotxml.cxx
index 41fa2161f9c2..5538bd8770b1 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -968,9 +968,12 @@ void XclExpXmlPivotTables::SavePivotTableXml( 
XclExpXmlStream& rStrm, const ScDP
 assert(aCachedDims[nDimIdx]); // the loop above should have 
screened for NULL's.
 const ScDPSaveDimension& rDim = *it->mpDim;
 const boost::optional & pName = rDim.GetLayoutName();
+// tdf#124651: despite being optional in CT_DataField according to 
ECMA-376 Part 1,
+// Excel (at least 2016) seems to insist on the presence of "name" 
attribute in
+// dataField element, even if empty
+const OString sName = pName ? pName->toUtf8() : "";
 pPivotStrm->write("<")->writeId(XML_dataField);
-if (pName)
-rStrm.WriteAttributes(XML_name, 
XclXmlUtils::ToOString(*pName), FSEND);
+rStrm.WriteAttributes(XML_name, sName, FSEND);
 
 rStrm.WriteAttributes(XML_fld, OString::number(nDimIdx).getStr(), 
FSEND);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Roman Kuznetsov (via logerrit)]

 sc/uiconfig/scalc/toolbar/formcontrols.xml|4 ++--
 sd/uiconfig/sdraw/toolbar/formcontrols.xml|4 ++--
 sd/uiconfig/simpress/toolbar/formcontrols.xml |4 ++--
 sw/uiconfig/sglobal/toolbar/formcontrols.xml  |4 ++--
 sw/uiconfig/sweb/toolbar/formcontrols.xml |4 ++--
 sw/uiconfig/swform/toolbar/formcontrols.xml   |4 ++--
 sw/uiconfig/swreport/toolbar/formcontrols.xml |4 ++--
 sw/uiconfig/swriter/toolbar/formcontrols.xml  |4 ++--
 sw/uiconfig/swxform/toolbar/formcontrols.xml  |4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 099d183410eb7b0dbede3db70966d54a41a971d7
Author: Roman Kuznetsov 
AuthorDate: Mon Jun 17 19:51:30 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jun 19 03:24:10 2019 +0200

tdf#125947 Two tools are missing from default Form Controls toolbar

Change-Id: Ie54b2a3f5051b115f8f04467282090a93525dfc3
Reviewed-on: https://gerrit.libreoffice.org/74191
Tested-by: Jenkins
Reviewed-by: Roman Kuznetsov 
(cherry picked from commit 385128671716e70b9540a67e213d6495bf50662b)
Reviewed-on: https://gerrit.libreoffice.org/74267
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sc/uiconfig/scalc/toolbar/formcontrols.xml 
b/sc/uiconfig/scalc/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sc/uiconfig/scalc/toolbar/formcontrols.xml
+++ b/sc/uiconfig/scalc/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sd/uiconfig/sdraw/toolbar/formcontrols.xml 
b/sd/uiconfig/sdraw/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sd/uiconfig/sdraw/toolbar/formcontrols.xml
+++ b/sd/uiconfig/sdraw/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sd/uiconfig/simpress/toolbar/formcontrols.xml 
b/sd/uiconfig/simpress/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sd/uiconfig/simpress/toolbar/formcontrols.xml
+++ b/sd/uiconfig/simpress/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sw/uiconfig/sglobal/toolbar/formcontrols.xml 
b/sw/uiconfig/sglobal/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sw/uiconfig/sglobal/toolbar/formcontrols.xml
+++ b/sw/uiconfig/sglobal/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sw/uiconfig/sweb/toolbar/formcontrols.xml 
b/sw/uiconfig/sweb/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sw/uiconfig/sweb/toolbar/formcontrols.xml
+++ b/sw/uiconfig/sweb/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sw/uiconfig/swform/toolbar/formcontrols.xml 
b/sw/uiconfig/swform/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sw/uiconfig/swform/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swform/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sw/uiconfig/swreport/toolbar/formcontrols.xml 
b/sw/uiconfig/swreport/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sw/uiconfig/swreport/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swreport/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sw/uiconfig/swriter/toolbar/formcontrols.xml 
b/sw/uiconfig/swriter/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sw/uiconfig/swriter/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swriter/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
diff --git a/sw/uiconfig/swxform/toolbar/formcontrols.xml 
b/sw/uiconfig/swxform/toolbar/formcontrols.xml
index f0b133503d4d..bd4c0d22ea36 100644
--- a/sw/uiconfig/swxform/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swxform/toolbar/formcontrols.xml
@@ -53,6 +53,6 @@
  
  
  
- 
- 
+ 
+ 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 librelogo/source/LibreLogo/LibreLogo.py |   51 +++-
 1 file changed, 50 insertions(+), 1 deletion(-)

New commits:
commit 6d0701eeb44e819113537e209c768dae55e910e2
Author: László Németh 
AuthorDate: Thu Jun 6 14:25:32 2019 +0200
Commit: Michael Weghorn 
CommitDate: Wed Jun 19 07:13:30 2019 +0200

sanitize LibreLogo calls

Change-Id: Ie4d9858e5b4b3e55ab08416fb9338d2df34ee5e1
Reviewed-on: https://gerrit.libreoffice.org/73627
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 1b63fa32bbd4a5b89d2ee3a53b28de4250c8dad3)
Reviewed-on: https://gerrit.libreoffice.org/74288
Reviewed-by: Michael Weghorn 
Tested-by: Michael Weghorn 

diff --git a/librelogo/source/LibreLogo/LibreLogo.py 
b/librelogo/source/LibreLogo/LibreLogo.py
index 57d385b41ca1..960d48a97e81 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -145,6 +145,7 @@ __LineStyle_DOTTED__ = 2
 class __Doc__:
 def __init__(self, doc):
 self.doc = doc
+self.secure = False
 try:
 self.drawpage = doc.DrawPage # Writer
 except:
@@ -463,10 +464,58 @@ class LogoProgram(threading.Thread):
 self.code = code
 threading.Thread.__init__(self)
 
+def secure(self):
+# 0 = secure
+if _.secure:
+return 0
+
+# 1 = forms, fields or embedded objects are forbidden
+if _.doc.DrawPage.Forms.getCount() > 0 or 
_.doc.getTextFields().createEnumeration().hasMoreElements() or 
_.doc.getEmbeddedObjects().getCount() > 0:
+return 1
+
+# 2 = hyperlinks with script events
+nodes = _.doc.Text.createEnumeration()
+while nodes.hasMoreElements():
+node = nodes.nextElement()
+if node.supportsService("com.sun.star.text.Paragraph"):
+portions = node.createEnumeration()
+while portions.hasMoreElements():
+portion = portions.nextElement()
+if 
portion.PropertySetInfo.hasPropertyByName("HyperLinkEvents"):
+events = portion.getPropertyValue("HyperLinkEvents")
+for event in events.getElementNames():
+attributes = events.getByName(event)
+for attribute in attributes:
+if attribute.Name == "EventType" and 
attribute.Value == "Script":
+return 2
+
+# 2 = images with script events
+images = _.doc.DrawPage.createEnumeration()
+while images.hasMoreElements():
+image = images.nextElement()
+try:
+events = image.Events
+for event in events.getElementNames():
+attributes = events.getByName(event)
+for attribute in attributes:
+if attribute.Name == "EventType" and attribute.Value 
== "Script":
+return 2
+except:
+pass
+
+_.secure = True
+return 0
+
 def run(self):
 global __thread__
 try:
-exec(self.code)
+# check document security
+secid = self.secure()
+if secid > 0:
+parent = _.doc.CurrentController.Frame.ContainerWindow
+MessageBox(parent, "Document objects with%s script events" % 
[" possible", ""][secid-1], "LibreLogo program can't start", "errorbox")
+else:
+exec(self.code)
 if _.origcursor[0] and _.origcursor[1]:
 __dispatcher__(".uno:Escape")
 try:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit aedf347ba9a494fa39a1f2fac96539585fc8bb44
Author: Caolán McNamara 
AuthorDate: Fri Jun 7 14:04:07 2019 +0100
Commit: Michael Weghorn 
CommitDate: Wed Jun 19 07:14:11 2019 +0200

explictly exclude LibreLogo from XScript usage

Change-Id: I567647f0e2f8b82e4ef2995c673abe82f4564228
Reviewed-on: https://gerrit.libreoffice.org/73659
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit cb0024e3668979dfdef44db5aa15ddfaf035e695)
Reviewed-on: https://gerrit.libreoffice.org/74289
Reviewed-by: Michael Weghorn 
Tested-by: Michael Weghorn 

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 8bee369851ec..8594e9522e48 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1346,6 +1346,16 @@ namespace
 }
 }
 
+namespace {
+
+// don't allow LibreLogo to be used with our mouseover/etc dom-alike events
+bool UnTrustedScript(const OUString& rScriptURL)
+{
+return 
rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo");
+}
+
+}
+
 ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& 
_rxScriptContext, const OUString& _rScriptURL,
 const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& 
aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const 
css::uno::Any* pCaller )
 {
@@ -1358,6 +1368,9 @@ ErrCode SfxObjectShell::CallXScript( const Reference< 
XInterface >& _rxScriptCon
 if ( bIsDocumentScript && !lcl_isScriptAccessAllowed_nothrow( 
_rxScriptContext ) )
 return ERRCODE_IO_ACCESSDENIED;
 
+if ( UnTrustedScript(_rScriptURL) )
+return ERRCODE_IO_ACCESSDENIED;
+
 bool bCaughtException = false;
 Any aException;
 try
___
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' - sc/qa sc/source

[Mike Kaganski (via logerrit)]

 sc/qa/unit/pivottable_filters_test.cxx |   56 ++
 sc/source/filter/excel/xepivotxml.cxx  |   99 +++--
 2 files changed, 115 insertions(+), 40 deletions(-)

New commits:
commit acdc657d0c1f9d03c8162104f2d5ead37343f07f
Author: Mike Kaganski 
AuthorDate: Mon Apr 15 23:33:38 2019 +0300
Commit: Mike Kaganski 
CommitDate: Wed Jun 19 07:27:15 2019 +0200

tdf#124736: Sort group field items

Excel expects the group field items to be in ascending order starting
from "<01/02/2010", then "Jan", "Feb", ..., then end with ">01/02/2020".

Change-Id: I29e9b55f43091ed007f59e10dec64f46a37c7d5f
Reviewed-on: https://gerrit.libreoffice.org/70800
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/70815
Tested-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/74329

diff --git a/sc/qa/unit/pivottable_filters_test.cxx 
b/sc/qa/unit/pivottable_filters_test.cxx
index 84ad5eade972..5f546875af94 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -90,6 +90,7 @@ public:
 void testTdf123923();
 void testTdf123939();
 void testTdf124651();
+void testTdf124736();
 
 CPPUNIT_TEST_SUITE(ScPivotTableFiltersTest);
 
@@ -134,6 +135,7 @@ public:
 CPPUNIT_TEST(testTdf123923);
 CPPUNIT_TEST(testTdf123939);
 CPPUNIT_TEST(testTdf124651);
+CPPUNIT_TEST(testTdf124736);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2471,6 +2473,60 @@ void ScPivotTableFiltersTest::testTdf124651()
 assertXPath(pDoc, "/x:pivotTableDefinition/x:dataFields/x:dataField", 
"name", "");
 }
 
+void ScPivotTableFiltersTest::testTdf124736()
+{
+ScDocShellRef xDocSh = loadDoc("pivot-table/shared-dategroup.", 
FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(xDocSh.get(), FORMAT_XLSX);
+xDocSh->DoClose();
+
+xmlDocPtr pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory,
+
"xl/pivotCache/pivotCacheDefinition1.xml");
+CPPUNIT_ASSERT(pTable);
+
+assertXPath(pTable,
+
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]/x:fieldGroup/x:groupItems",
+"count", "45");
+// Group items must start with "<05/16/1958", then years sorted ascending, 
then ">06/11/2009"
+// They used to have years in the beginning, then "<05/16/1958", then 
">06/11/2009".
+// The "<" and ">" date strings are locale-dependent, so test depends on 
en_US locale
+assertXPath(
+pTable,
+
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]/x:fieldGroup/x:groupItems/x:s[1]",
+"v", "<05/16/1958");
+for (int i = 2; i <= 44; ++i)
+assertXPath(
+pTable,
+
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]/x:fieldGroup/x:groupItems/x:s["
++ OString::number(i) + "]",
+"v", OUString::number(1963 + i));
+assertXPath(
+pTable,
+
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]/x:fieldGroup/x:groupItems/x:s[45]",
+"v", ">06/11/2009");
+
+// Now check that table references these in correct order 
(document-dependent, so this is how
+// it should be in this specific testdoc which shows "<" and ">" values in 
the end)
+pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/pivotTables/pivotTable1.xml");
+CPPUNIT_ASSERT(pTable);
+assertXPath(pTable, 
"/x:pivotTableDefinition/x:pivotFields/x:pivotField[1]/x:items", "count",
+"46");
+const int vals[] = { 1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 
14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 
29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 
0,  44 };
+for (size_t i = 0; i < SAL_N_ELEMENTS(vals); ++i)
+{
+assertXPath(pTable,
+
"/x:pivotTableDefinition/x:pivotFields/x:pivotField[1]/x:items/x:item["
++ OString::number(i + 1) + "]",
+"x", OUString::number(vals[i]));
+}
+assertXPath(pTable, 
"/x:pivotTableDefinition/x:pivotFields/x:pivotField[1]/x:items/x:item[46]",
+"t", "default");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScPivotTableFiltersTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xepivotxml.cxx 
b/sc/source/filter/excel/xepivotxml.cxx
index e6af90295288..c1e46ef1c5ee 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -200,7 +200,42 @@ OUString GetExcelFormattedDate( double fSerialDateTime, 
const SvNumberFormatter&
 ::sax::Converter::convertDateTime(sBuf, aUDateTime, nullptr, true);
 return sBuf.makeStringAndClear();
 }
+
+// Excel seems to expect different order of group item values; we need to 
rearrange elements

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

[Arkadiy Illarionov (via logerrit)]

 framework/inc/uielement/constitemcontainer.hxx|3 +--
 framework/inc/uielement/itemcontainer.hxx |3 +--
 framework/source/fwi/uielement/constitemcontainer.cxx |   13 +++--
 framework/source/fwi/uielement/itemcontainer.cxx  |   11 ++-
 framework/source/fwi/uielement/rootitemcontainer.cxx  |2 +-
 5 files changed, 8 insertions(+), 24 deletions(-)

New commits:
commit 60271c4433372097ef5ecc74e522532ebf5af8e0
Author: Arkadiy Illarionov 
AuthorDate: Wed Jun 19 00:10:12 2019 +0300
Commit: Stephan Bergmann 
CommitDate: Wed Jun 19 07:53:35 2019 +0200

tdf#39593 Remove GetImplementation from ConstItemContainer and ItemContainer

Replace with comphelper::getUnoTunnelImplementation.

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

diff --git a/framework/inc/uielement/constitemcontainer.hxx 
b/framework/inc/uielement/constitemcontainer.hxx
index 5efc22b30fdb..9ed27693829d 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -56,8 +56,7 @@ class FWI_DLLPUBLIC ConstItemContainer : public 
::cppu::WeakImplHelper<
 virtual ~ConstItemContainer() override;
 
 // XUnoTunnel
-static const css::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() 
throw();
-static ConstItemContainer*  
GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) 
throw();
+static const css::uno::Sequence< sal_Int8 >&   getUnoTunnelId() 
throw();
 sal_Int64   SAL_CALL 
getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
 
 // XIndexAccess
diff --git a/framework/inc/uielement/itemcontainer.hxx 
b/framework/inc/uielement/itemcontainer.hxx
index d3fb00b56952..156d7ffd4904 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -48,8 +48,7 @@ class FWI_DLLPUBLIC ItemContainer :   public 
::cppu::WeakImplHelper< css::contai
 //  XInterface, XTypeProvider
 
 // XUnoTunnel
-static const css::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() 
throw();
-static ItemContainer*   
GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) 
throw();
+static const css::uno::Sequence< sal_Int8 >&   getUnoTunnelId() 
throw();
 
 // XIndexContainer
 virtual void SAL_CALL insertByIndex( sal_Int32 Index, const 
css::uno::Any& Element ) override;
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx 
b/framework/source/fwi/uielement/constitemcontainer.cxx
index d1e45af96492..03d638f10ae6 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -151,7 +151,7 @@ Reference< XIndexAccess > 
ConstItemContainer::deepCopyContainer( const Reference
 Reference< XIndexAccess > xReturn;
 if ( rSubContainer.is() )
 {
-ItemContainer*  pSource = ItemContainer::GetImplementation( 
rSubContainer );
+ItemContainer*  pSource = 
comphelper::getUnoTunnelImplementation( rSubContainer );
 ConstItemContainer* pSubContainer( nullptr );
 if ( pSource )
 pSubContainer = new ConstItemContainer( *pSource );
@@ -166,7 +166,7 @@ Reference< XIndexAccess > 
ConstItemContainer::deepCopyContainer( const Reference
 // XUnoTunnel
 sal_Int64 ConstItemContainer::getSomething( const css::uno::Sequence< sal_Int8 
>& rIdentifier )
 {
-if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( 
ConstItemContainer::GetUnoTunnelId().getConstArray(), 
rIdentifier.getConstArray(), 16 ) ) )
+if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( 
ConstItemContainer::getUnoTunnelId().getConstArray(), 
rIdentifier.getConstArray(), 16 ) ) )
 {
 return reinterpret_cast< sal_Int64 >( this );
 }
@@ -178,18 +178,11 @@ namespace
 class theConstItemContainerUnoTunnelId : public rtl::Static< 
UnoTunnelIdInit, theConstItemContainerUnoTunnelId > {};
 }
 
-const Sequence< sal_Int8 >& ConstItemContainer::GetUnoTunnelId() throw()
+const Sequence< sal_Int8 >& ConstItemContainer::getUnoTunnelId() throw()
 {
 return theConstItemContainerUnoTunnelId::get().getSeq();
 }
 
-ConstItemContainer* ConstItemContainer::GetImplementation( const 
css::uno::Reference< css::uno::XInterface >& rxIFace ) throw()
-{
-css::uno::Reference< css::lang::XUnoTunnel > xUT( rxIFace, 
css::uno::UNO_QUERY );
-return xUT.is() ? reinterpret_cast< ConstItemContainer* 
>(sal::static_int_cast< sal_IntPtr >(
-  xUT->getSomething( 
ConstItemContainer::GetUnoTunnelId() ))) : nullptr;
-}
-
 // XElementAccess
 sal_Bool SAL_CALL ConstItemContainer::hasElements()
 {
diff --git 

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

[Andrea Gelmini (via logerrit)]

 include/comphelper/accessiblewrapper.hxx |2 +-
 sc/source/filter/inc/htmlpars.hxx|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ab5e1b485ca11941294d980ed3aa4272d693dbc5
Author: Andrea Gelmini 
AuthorDate: Tue Jun 18 08:54:09 2019 +
Commit: Julien Nabet 
CommitDate: Tue Jun 18 12:21:23 2019 +0200

Fix typos

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

diff --git a/include/comphelper/accessiblewrapper.hxx 
b/include/comphelper/accessiblewrapper.hxx
index 34b3cb8edad4..89e2c332917c 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -361,7 +361,7 @@ namespace comphelper
 /// invalidates (i.e. empties) the map
 voidinvalidateAll( );
 
-/** disposes (i.e. cleares) the manager
+/** disposes (i.e. clears) the manager
 
 Note that the XAccessibleContext's of the mapped XAccessible 
objects are disposed, too.
 */
diff --git a/sc/source/filter/inc/htmlpars.hxx 
b/sc/source/filter/inc/htmlpars.hxx
index d3523e9de602..1f5ef2a9a8ae 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -284,7 +284,7 @@ public:
 /** Returns true, if the entry represents a table. */
 ScHTMLTableId GetTableId() const { return nTab; }
 
-/** Sets or cleares the import always state. */
+/** Sets or clears the import always state. */
 void SetImportAlways() { mbImportAlways = true; }
 /** Sets start point of the entry selection to the start of the import 
info object. */
 voidAdjustStart( const HtmlImportInfo& rInfo );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Arkadiy Illarionov (via logerrit)]

 unoxml/inc/node.hxx  |3 +--
 unoxml/source/dom/element.cxx|5 +++--
 unoxml/source/dom/node.cxx   |   24 +---
 unoxml/source/xpath/xpathapi.cxx |7 ---
 4 files changed, 17 insertions(+), 22 deletions(-)

New commits:
commit cc0dc723c7d8354b5203310ef1381bbf54258eba
Author: Arkadiy Illarionov 
AuthorDate: Tue Jun 18 00:10:57 2019 +0300
Commit: Michael Stahl 
CommitDate: Tue Jun 18 12:50:43 2019 +0200

tdf#39593 Remove DOM::CNode::GetImplementation

Replace with comphelper::getUnoTunnelImplementation.

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

diff --git a/unoxml/inc/node.hxx b/unoxml/inc/node.hxx
index 216f80eda3d5..e35ab3aafda5 100644
--- a/unoxml/inc/node.hxx
+++ b/unoxml/inc/node.hxx
@@ -119,8 +119,7 @@ namespace DOM
 
 virtual ~CNode() override;
 
-static CNode * GetImplementation(css::uno::Reference<
-css::uno::XInterface> const& xNode);
+static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
 
 xmlNodePtr GetNodePtr() { return m_aNodePtr; }
 
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index f7cae19fdbdc..6ed9ba1ebd1e 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -29,6 +29,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include "attr.hxx"
@@ -472,7 +473,7 @@ namespace DOM
 }
 
 ::rtl::Reference const pCNode(
-CNode::GetImplementation(Reference(oldAttr.get(;
+
comphelper::getUnoTunnelImplementation(Reference(oldAttr.get(;
 if (!pCNode.is()) { throw RuntimeException(); }
 
 xmlNodePtr const pNode = pCNode->GetNodePtr();
@@ -532,7 +533,7 @@ namespace DOM
 
 // get the implementation
 CAttr *const pCAttr = dynamic_cast(
-CNode::GetImplementation(xNewAttr));
+comphelper::getUnoTunnelImplementation(xNewAttr));
 if (!pCAttr) { throw RuntimeException(); }
 xmlAttrPtr const pAttr =
 reinterpret_cast(pCAttr->GetNodePtr());
diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index f486182eca83..7171e6c2f791 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -168,15 +168,9 @@ namespace DOM
 }
 }
 
-CNode *
-CNode::GetImplementation(uno::Reference const& xNode)
+const css::uno::Sequence< sal_Int8 > & CNode::getUnoTunnelId() throw()
 {
-uno::Reference const xUnoTunnel(xNode, UNO_QUERY);
-if (!xUnoTunnel.is()) { return nullptr; }
-CNode *const pCNode( reinterpret_cast< CNode* >(
-::sal::static_int_cast< sal_IntPtr >(
-
xUnoTunnel->getSomething(theCNodeUnoTunnelId::get().getSeq();
-return pCNode;
+return theCNodeUnoTunnelId::get().getSeq();
 }
 
 CDocument & CNode::GetOwnerDocument()
@@ -290,7 +284,7 @@ namespace DOM
 
 if (nullptr == m_aNodePtr) { return nullptr; }
 
-CNode *const pNewChild(CNode::GetImplementation(xNewChild));
+CNode *const 
pNewChild(comphelper::getUnoTunnelImplementation(xNewChild));
 if (!pNewChild) { throw RuntimeException(); }
 xmlNodePtr const cur = pNewChild->GetNodePtr();
 if (!cur) { throw RuntimeException(); }
@@ -645,8 +639,8 @@ namespace DOM
 
 ::osl::ClearableMutexGuard guard(m_rMutex);
 
-CNode *const pNewNode(CNode::GetImplementation(newChild));
-CNode *const pRefNode(CNode::GetImplementation(refChild));
+CNode *const 
pNewNode(comphelper::getUnoTunnelImplementation(newChild));
+CNode *const 
pRefNode(comphelper::getUnoTunnelImplementation(refChild));
 if (!pNewNode || !pRefNode) { throw RuntimeException(); }
 xmlNodePtr const pNewChild(pNewNode->GetNodePtr());
 xmlNodePtr const pRefChild(pRefNode->GetNodePtr());
@@ -753,7 +747,7 @@ namespace DOM
 
 Reference xReturn( xOldChild );
 
-::rtl::Reference const 
pOld(CNode::GetImplementation(xOldChild));
+::rtl::Reference const 
pOld(comphelper::getUnoTunnelImplementation(xOldChild));
 if (!pOld.is()) { throw RuntimeException(); }
 xmlNodePtr const old = pOld->GetNodePtr();
 if (!old) { throw RuntimeException(); }
@@ -825,9 +819,9 @@ namespace DOM
 ::osl::ClearableMutexGuard guard(m_rMutex);
 
 ::rtl::Reference const pOldNode(
-CNode::GetImplementation(xOldChild));
+comphelper::getUnoTunnelImplementation(xOldChild));
 ::rtl::Reference const pNewNode(
-CNode::GetImplementation(xNewChild));
+comphelper::getUnoTunnelImplementation(xNewChild));
 if (!pOldNode.is() || !pNewNode.is()) { throw RuntimeException(); }
 xmlNodePtr const pOld = 

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

[Balazs Varga (via logerrit)]

 chart2/qa/extras/chart2export.cxx |   14 ++
 chart2/qa/extras/data/xlsx/tdf111824.xlsx |binary
 oox/source/export/chartexport.cxx |2 ++
 3 files changed, 16 insertions(+)

New commits:
commit 1b26a6e7a4e3865d1555fa0612845c765b114b49
Author: Balazs Varga 
AuthorDate: Mon Jun 17 14:58:54 2019 +0200
Commit: László Németh 
CommitDate: Tue Jun 18 12:55:54 2019 +0200

tdf#111824 Chart OOXML Export: fix Z axis labels

Export 3D barchart Z ("deep") axis properties into
 xml tag, as the OOXML Standard requires.

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

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index b238f35f715a..7a0abcf0bc02 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -128,6 +128,7 @@ public:
 void testChartTitlePropertiesBitmapFillPPTX();
 void testxAxisLabelsRotation();
 void testTdf116163();
+void testTdf111824();
 void testTdf119029();
 void testTdf108022();
 void testTdf121744();
@@ -224,6 +225,7 @@ public:
 CPPUNIT_TEST(testChartTitlePropertiesBitmapFillPPTX);
 CPPUNIT_TEST(testxAxisLabelsRotation);
 CPPUNIT_TEST(testTdf116163);
+CPPUNIT_TEST(testTdf111824);
 CPPUNIT_TEST(testTdf119029);
 CPPUNIT_TEST(testTdf108022);
 CPPUNIT_TEST(testTdf121744);
@@ -2081,6 +2083,18 @@ void Chart2ExportTest::testTdf116163()
 assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:bodyPr", "rot", "-540");
 }
 
+void Chart2ExportTest::testTdf111824()
+{
+load("/chart2/qa/extras/data/xlsx/", "tdf111824.xlsx");
+xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+CPPUNIT_ASSERT(pXmlDoc);
+
+// Collect 3D barchart Z axID
+OUString zAxisIdOf3DBarchart = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:bar3DChart/c:axId[3]", "val");
+// 3D barchart Z axis properties should be in a serAx OOXML tag instead of 
catAx
+assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:serAx/c:axId", 
"val", zAxisIdOf3DBarchart);
+}
+
 void Chart2ExportTest::testTdf119029()
 {
 load("/chart2/qa/extras/data/odp/", "tdf119029.odp");
diff --git a/chart2/qa/extras/data/xlsx/tdf111824.xlsx 
b/chart2/qa/extras/data/xlsx/tdf111824.xlsx
new file mode 100644
index ..ae86756c47ee
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/tdf111824.xlsx differ
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index ae16670ebe56..65b7bd3c3e23 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2423,6 +2423,8 @@ void ChartExport::exportAxis(const AxisIdPair& 
rAxisIdPair)
 nAxisType = XML_valAx;
 else if( eChartType == chart::TYPEID_STOCK )
 nAxisType = XML_dateAx;
+else if( eChartType == chart::TYPEID_BAR )
+nAxisType = XML_serAx;
 // FIXME: axPos, need to check axis direction
 sAxPos = "b";
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Arkadiy Illarionov (via logerrit)]

 sc/inc/docuno.hxx  |1 -
 sc/qa/unit/copy_paste_test.cxx |2 +-
 sc/source/core/data/documen8.cxx   |5 +++--
 sc/source/filter/excel/xlroot.cxx  |3 ++-
 sc/source/filter/xml/XMLConverter.cxx  |3 ++-
 sc/source/filter/xml/XMLTableShapeImportHelper.cxx |2 +-
 sc/source/filter/xml/xmlbodyi.cxx  |7 ---
 sc/source/filter/xml/xmlcelli.cxx  |8 +---
 sc/source/filter/xml/xmlcoli.cxx   |3 ++-
 sc/source/filter/xml/xmlexprt.cxx  |   12 ++--
 sc/source/filter/xml/xmlimprt.cxx  |   14 +++---
 sc/source/filter/xml/xmlrowi.cxx   |3 ++-
 sc/source/filter/xml/xmlstyli.cxx  |2 +-
 sc/source/filter/xml/xmlsubti.cxx  |3 ++-
 sc/source/filter/xml/xmltabi.cxx   |3 ++-
 sc/source/filter/xml/xmlwrap.cxx   |2 +-
 sc/source/ui/docshell/docsh.cxx|2 +-
 sc/source/ui/docshell/docsh4.cxx   |2 +-
 sc/source/ui/drawfunc/fusel.cxx|2 +-
 sc/source/ui/inc/docsh.hxx |3 ++-
 sc/source/ui/unoobj/docuno.cxx |   13 ++---
 sc/source/ui/view/tabview.cxx  |4 ++--
 sc/source/ui/view/tabview3.cxx |2 +-
 sc/source/ui/view/tabview5.cxx |2 +-
 sc/source/ui/view/viewfun3.cxx |2 +-
 sc/source/ui/view/viewfun7.cxx |4 ++--
 26 files changed, 55 insertions(+), 54 deletions(-)

New commits:
commit e062d42f587ad758ecfc42967bf257a9e2e37a3d
Author: Arkadiy Illarionov 
AuthorDate: Tue Jun 18 01:12:00 2019 +0300
Commit: Stephan Bergmann 
CommitDate: Tue Jun 18 13:21:01 2019 +0200

tdf#39593 Remove ScModelObj::getImplementation

Replace with comphelper::getUnoTunnelImplementation.

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

diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 501028b7340a..b5a5e71b1a60 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -260,7 +260,6 @@ public:
 virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< 
sal_Int8 >& aIdentifier ) override;
 
 static const css::uno::Sequence& getUnoTunnelId();
-static ScModelObj* getImplementation(const 
css::uno::Reference& rObj);
 
 /// XTypeProvider
 virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index 967faaadf13a..8a65609b51b1 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -205,7 +205,7 @@ void ScCopyPasteTest::testTdf84411()
 
 
 // 3. Disable OpenCL
-ScModelObj* pModel = 
ScModelObj::getImplementation(pFoundShell->GetModel());
+ScModelObj* pModel = 
comphelper::getUnoTunnelImplementation(pFoundShell->GetModel());
 CPPUNIT_ASSERT(pModel != nullptr);
 bool bOpenCLState = ScCalcConfig::isOpenCLEnabled();
 pModel->enableOpenCL(false);
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index aefbcb293d70..059293291eee 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -708,7 +709,7 @@ void ScDocument::RepaintRange( const ScRange& rRange )
 {
 if ( bIsVisible && mpShell )
 {
-ScModelObj* pModel = ScModelObj::getImplementation( 
mpShell->GetModel() );
+ScModelObj* pModel = 
comphelper::getUnoTunnelImplementation( mpShell->GetModel() );
 if ( pModel )
 pModel->RepaintRange( rRange ); // locked repaints are checked 
there
 }
@@ -718,7 +719,7 @@ void ScDocument::RepaintRange( const ScRangeList& rRange )
 {
 if ( bIsVisible && mpShell )
 {
-ScModelObj* pModel = ScModelObj::getImplementation( 
mpShell->GetModel() );
+ScModelObj* pModel = 
comphelper::getUnoTunnelImplementation( mpShell->GetModel() );
 if ( pModel )
 pModel->RepaintRange( rRange ); // locked repaints are checked 
there
 }
diff --git a/sc/source/filter/excel/xlroot.cxx 
b/sc/source/filter/excel/xlroot.cxx
index 7d054c52204c..3f559b285703 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -291,7 +292,7 @@ SfxObjectShell* XclRoot::GetDocShell() const
 ScModelObj* XclRoot::GetDocModelObj() const
 {
 SfxObjectShell* pDocShell = GetDocShell();
-return pDocShell ? ScModelObj::getImplementation( 

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

[Sumit Chauhan (via logerrit)]

 cui/source/customize/CustomNotebookbarGenerator.cxx |4 ++-
 cui/source/customize/SvxNotebookbarConfigPage.cxx   |   25 
 2 files changed, 13 insertions(+), 16 deletions(-)

New commits:
commit 7d9ff70206dbd75a7751515b642fbbbc8878c159
Author: Sumit Chauhan 
AuthorDate: Mon Jun 17 21:54:27 2019 +0530
Commit: Szymon Kłos 
CommitDate: Tue Jun 18 11:22:22 2019 +0200

User directory path changed

The old path was not rendering file from user directory in production
build

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

diff --git a/cui/source/customize/CustomNotebookbarGenerator.cxx 
b/cui/source/customize/CustomNotebookbarGenerator.cxx
index a1aa63bca568..1d5a2eb83ba7 100644
--- a/cui/source/customize/CustomNotebookbarGenerator.cxx
+++ b/cui/source/customize/CustomNotebookbarGenerator.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -96,7 +97,8 @@ static OUString getAppNameRegistryPath()
 
 static OUString customizedUIPathBuffer()
 {
-OUString sDirPath("$BRAND_BASE_DIR/user/config/soffice.cfg/");
+OUString sDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE(
+"bootstrap") ":UserInstallation}/user/config/soffice.cfg/");
 rtl::Bootstrap::expandMacros(sDirPath);
 return sDirPath;
 }
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx 
b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index f32ad2c472a0..181e1b3d0ee3 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -304,24 +304,19 @@ void 
SvxNotebookbarConfigPage::searchNodeandAttribute(std::vector& 
aEntries)
 {
+xmlDocPtr pDoc;
+xmlNodePtr pNodePtr;
 OUString sUIFilePath = CustomNotebookbarGenerator::getCustomizedUIPath();
-sal_uInt32 nflag = osl_File_OpenFlag_Read | osl_File_OpenFlag_Write;
-osl::File aFile(sUIFilePath);
-if (aFile.open(nflag) == osl::FileBase::E_None)
+char* cUIFileUIPath = 
CustomNotebookbarGenerator::convertToCharPointer(sUIFilePath);
+pDoc = xmlParseFile(cUIFileUIPath);
+pNodePtr = xmlDocGetRootElement(pDoc);
+int aRightPos = 0;
+searchNodeandAttribute(aEntries, pNodePtr, aRightPos);
+if (pDoc != nullptr)
 {
-xmlDocPtr pDoc;
-xmlNodePtr pNodePtr;
-char* cUIFileUIPath = 
CustomNotebookbarGenerator::convertToCharPointer(sUIFilePath);
-pDoc = xmlParseFile(cUIFileUIPath);
-pNodePtr = xmlDocGetRootElement(pDoc);
-int aRightPos = 0;
-searchNodeandAttribute(aEntries, pNodePtr, aRightPos);
-if (pDoc != nullptr)
-{
-xmlFreeDoc(pDoc);
-}
-delete[] cUIFileUIPath;
+xmlFreeDoc(pDoc);
 }
+delete[] cUIFileUIPath;
 }
 
 void SvxNotebookbarConfigPage::SelectElement()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 sw/source/core/layout/layact.cxx   |5 ++--
 sw/source/core/tox/toxhlp.cxx  |   25 ++---
 sw/source/core/view/viewimp.cxx|5 ++--
 sw/source/filter/docx/swdocxreader.cxx |6 +++--
 sw/source/filter/html/htmlplug.cxx |5 ++--
 sw/source/filter/rtf/swparrtf.cxx  |5 ++--
 sw/source/filter/writer/writer.cxx |5 ++--
 sw/source/filter/ww8/docxexport.cxx|4 +--
 sw/source/filter/ww8/ww8toolbar.cxx|5 ++--
 sw/source/ui/dbui/dbinsdlg.cxx |5 ++--
 sw/source/ui/dbui/mmaddressblockpage.cxx   |3 +-
 sw/source/uibase/app/apphdl.cxx|   14 +--
 sw/source/uibase/config/StoredChapterNumbering.cxx |9 ---
 sw/source/uibase/dbui/dbmgr.cxx|   20 
 14 files changed, 64 insertions(+), 52 deletions(-)

New commits:
commit 399edcb0bca8e1cfc55ca68237cdb470bcc54932
Author: Noel Grandin 
AuthorDate: Tue Jun 18 09:32:29 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 18 11:33:03 2019 +0200

loplugin:logexceptionnicely in sw

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

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 174e15699e46..83172f70e56f 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -63,6 +63,7 @@
 #include 
 #include 
 #include 
+#include 
 
 // Save some typing work to avoid accessing destroyed pages.
 #define XCHECKPAGE \
@@ -1968,9 +1969,9 @@ bool SwLayIdle::DoIdleJob_( const SwContentFrame *pCnt, 
IdleJobType eJob )
 bPageValid = bPageValid && !pTextNode->IsSmartTagDirty();
 if ( aRepaint.HasArea() )
 pImp->GetShell()->InvalidateWindows( aRepaint );
-} catch( const css::uno::RuntimeException& e) {
+} catch( const css::uno::RuntimeException&) {
 // handle smarttag problems gracefully and provide 
diagnostics
-SAL_WARN( "sw.core", "SMART_TAGS: " << e);
+TOOLS_WARN_EXCEPTION( "sw.core", "SMART_TAGS");
 }
 if (Application::AnyInput(VCL_INPUT_ANY & 
VclInputFlags(~VclInputFlags::TIMER)))
 return true;
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index 7bdd2d3d0130..1c383a757ae0 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -31,9 +32,9 @@ IndexEntrySupplierWrapper::IndexEntrySupplierWrapper()
 try {
 xIES = i18n::IndexEntrySupplier::create(xContext);
 }
-catch (const uno::Exception& e)
+catch (const uno::Exception&)
 {
-SAL_WARN( "sw.core", "IndexEntrySupplierWrapper: Caught " << e );
+TOOLS_WARN_EXCEPTION( "sw.core", "IndexEntrySupplierWrapper" );
 }
 }
 
@@ -49,9 +50,9 @@ OUString IndexEntrySupplierWrapper::GetIndexKey( const 
OUString& rText,
 try {
 sRet = xIES->getIndexKey( rText, rTextReading, rLocale );
 }
-catch (const uno::Exception& e)
+catch (const uno::Exception&)
 {
-SAL_WARN( "sw.core", "getIndexKey: Caught " << e );
+TOOLS_WARN_EXCEPTION( "sw.core", "getIndexKey" );
 }
 return sRet;
 }
@@ -62,9 +63,9 @@ OUString IndexEntrySupplierWrapper::GetFollowingText( bool 
bMorePages ) const
 try {
 sRet = xIES->getIndexFollowPageWord( bMorePages, aLcl );
 }
-catch (const uno::Exception& e)
+catch (const uno::Exception&)
 {
-SAL_WARN( "sw.core", "getIndexFollowPageWord: Caught " << e );
+TOOLS_WARN_EXCEPTION( "sw.core", "getIndexFollowPageWord" );
 }
 return sRet;
 }
@@ -76,9 +77,9 @@ css::uno::Sequence< OUString > 
IndexEntrySupplierWrapper::GetAlgorithmList( cons
 try {
 sRet = xIES->getAlgorithmList( rLcl );
 }
-catch (const uno::Exception& e)
+catch (const uno::Exception&)
 {
-SAL_WARN( "sw.core", "getAlgorithmList: Caught " << e );
+TOOLS_WARN_EXCEPTION( "sw.core", "getAlgorithmList" );
 }
 return sRet;
 }
@@ -91,9 +92,9 @@ bool IndexEntrySupplierWrapper::LoadAlgorithm(
 try {
 bRet = xIES->loadAlgorithm( rLcl, sSortAlgorithm, nOptions );
 }
-catch (const uno::Exception& e)
+catch (const uno::Exception&)
 {
-SAL_WARN( "sw.core", "loadAlgorithm: Caught " << e );
+TOOLS_WARN_EXCEPTION( "sw.core", "loadAlgorithm" );
 }
 return bRet;
 }
@@ -109,9 +110,9 @@ sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
 nRet = xIES->compareIndexEntry( rText1, rTextReading1, rLocale1,
   

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - include/oox oox/source sd/qa vcl/CppunitTest_vcl_outdev.mk vcl/qa vcl/source

[Miklos Vajna (via logerrit)]

 include/oox/drawingml/color.hxx |3 ++
 oox/source/drawingml/color.cxx  |8 +
 oox/source/drawingml/fillproperties.cxx |   48 
 sd/qa/unit/data/pptx/tdf94238.pptx  |binary
 sd/qa/unit/import-tests.cxx |   33 ++
 vcl/CppunitTest_vcl_outdev.mk   |1 
 vcl/qa/cppunit/outdev.cxx   |   18 
 vcl/source/outdev/map.cxx   |4 +-
 vcl/source/outdev/outdev.cxx|3 ++
 9 files changed, 110 insertions(+), 8 deletions(-)

New commits:
commit cc678cbe2e9f8d1bd9b571e0c3af0a38d0d2a4ad
Author: Miklos Vajna 
AuthorDate: Wed Jan 30 17:42:39 2019 +0100
Commit: Miklos Vajna 
CommitDate: Tue Jun 18 13:03:22 2019 +0200

Related: tdf#94238 PPTX import: handle subset of radial gradient fill

Handle the case when the horizontal center is at 50%. Other cases are
still unhandled, those are more complex.

After fixing the style, center and border, the gradient fill looks
similar to how PowerPoint renders it.

Reviewed-on: https://gerrit.libreoffice.org/67168
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit fa6d726a9369fd49ff2b6c00da682641a025ba50)

Conflicts:
sd/qa/unit/import-tests.cxx

Change-Id: I419da70482de37031aa2c7fc735692019d7665f5

diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx
index 94d9050c5b42..2d33eb6e3136 100644
--- a/include/oox/drawingml/color.hxx
+++ b/include/oox/drawingml/color.hxx
@@ -103,6 +103,9 @@ public:
 /** Translates between color transformation token names and the 
corresponding token */
 static sal_Int32getColorTransformationToken( const OUString& sName );
 
+/// Compares this color with rOther.
+bool equals(const Color& rOther, const GraphicHelper& rGraphicHelper, 
::Color nPhClr) const;
+
 private:
 /** Internal helper for getColor(). */
 voidsetResolvedRgb( ::Color nRgb ) const;
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index 7008328c47ca..a41c9398c268 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -431,6 +431,14 @@ sal_Int32 Color::getColorTransformationToken( const 
OUString& sName )
 return XML_TOKEN_INVALID;
 }
 
+bool Color::equals(const Color& rOther, const GraphicHelper& rGraphicHelper, 
::Color nPhClr) const
+{
+if (getColor(rGraphicHelper, nPhClr) != rOther.getColor(rGraphicHelper, 
nPhClr))
+return false;
+
+return getTransparency() == rOther.getTransparency();
+}
+
 void Color::clearTransparence()
 {
 mnAlpha = MAX_PERCENT;
diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index be91daa81b92..9c5338ce8975 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -154,6 +154,30 @@ const awt::Size lclGetOriginalSize( const GraphicHelper& 
rGraphicHelper, const R
 return aSizeHmm;
 }
 
+/**
+ * Looks for a last gradient transition and possibly sets a gradient border
+ * based on that.
+ */
+void extractGradientBorderFromStops(const GradientFillProperties& 
rGradientProps,
+const GraphicHelper& rGraphicHelper, 
::Color nPhClr,
+awt::Gradient& rGradient)
+{
+if (rGradientProps.maGradientStops.size() <= 1)
+return;
+
+auto it = rGradientProps.maGradientStops.rbegin();
+double fLastPos = it->first;
+Color aLastColor = it->second;
+++it;
+double fLastButOnePos = it->first;
+Color aLastButOneColor = it->second;
+if (!aLastColor.equals(aLastButOneColor, rGraphicHelper, nPhClr))
+return;
+
+// Last transition has the same color, we can map that to a border.
+rGradient.Border = rtl::math::round((fLastPos - fLastButOnePos) * 100);
+}
+
 } // namespace
 
 void GradientFillProperties::assignUsed( const GradientFillProperties& 
rSourceProps )
@@ -354,15 +378,28 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 
 if( maGradientProps.moGradientPath.has() )
 {
-aGradient.Style = 
(maGradientProps.moGradientPath.get() == XML_circle) ? 
awt::GradientStyle_ELLIPTICAL : awt::GradientStyle_RECT;
-// position of gradient center (limited to [30%;70%], 
otherwise gradient is too hidden)
+// position of gradient center (limited to [30%;100%], 
otherwise gradient is too hidden)
 IntegerRectangle2D aFillToRect = 
maGradientProps.moFillToRect.get( IntegerRectangle2D( 0, 0, MAX_PERCENT, 
MAX_PERCENT ) );
 sal_Int32 nCenterX = (MAX_PERCENT + aFillToRect.X1 - 
aFillToRect.X2) / 2;
-aGradient.XOffset = getLimitedValue< sal_Int16, 
sal_Int32 >( nCenterX / PER_PERCENT, 30, 70 );
+  

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

[Arkadiy Illarionov (via logerrit)]

 toolkit/source/controls/grid/defaultgridcolumnmodel.cxx |7 ---
 toolkit/source/controls/grid/gridcolumn.cxx |9 -
 toolkit/source/controls/grid/gridcolumn.hxx |1 -
 3 files changed, 4 insertions(+), 13 deletions(-)

New commits:
commit b0efb1be8ed02f34ab4a2bc0c933c4378b2715e3
Author: Arkadiy Illarionov 
AuthorDate: Tue Jun 18 00:22:09 2019 +0300
Commit: Stephan Bergmann 
CommitDate: Tue Jun 18 13:26:45 2019 +0200

tdf#39593 Remove toolkit::GridColumn::getImplementation

Replace with comphelper::getUnoTunnelImplementation.

Change-Id: I6b32cf388f32e7aa8f073daea0423fcbf169386d
Reviewed-on: https://gerrit.libreoffice.org/74235
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx 
b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 00a34fc696c2..3883f662a48b 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -28,6 +28,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -115,7 +116,7 @@ private:
 Reference< css::util::XCloneable > const xCloneable( *col, 
UNO_QUERY_THROW );
 Reference< XGridColumn > const xClone( 
xCloneable->createClone(), UNO_QUERY_THROW );
 
-GridColumn* const pGridColumn = GridColumn::getImplementation( 
xClone );
+GridColumn* const pGridColumn = 
comphelper::getUnoTunnelImplementation( xClone );
 if ( pGridColumn == nullptr )
 throw RuntimeException( "invalid clone source 
implementation", *this );
 // that's indeed a RuntimeException, not an 
IllegalArgumentException or some such:
@@ -151,7 +152,7 @@ private:
 {
 ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
-GridColumn* const pGridColumn = GridColumn::getImplementation( 
i_column );
+GridColumn* const pGridColumn = 
comphelper::getUnoTunnelImplementation( i_column );
 if ( pGridColumn == nullptr )
 throw css::lang::IllegalArgumentException( "invalid column 
implementation", *this, 1 );
 
@@ -190,7 +191,7 @@ private:
 ++updatePos, ++columnIndex
 )
 {
-GridColumn* pColumnImpl = GridColumn::getImplementation( 
*updatePos );
+GridColumn* pColumnImpl = 
comphelper::getUnoTunnelImplementation( *updatePos );
 if ( !pColumnImpl )
 {
 SAL_WARN( "toolkit.controls", 
"DefaultGridColumnModel::removeColumn: invalid column implementation!" );
diff --git a/toolkit/source/controls/grid/gridcolumn.cxx 
b/toolkit/source/controls/grid/gridcolumn.cxx
index 6cf9b0639fdf..acb64eccf76c 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.cxx
@@ -298,15 +298,6 @@ namespace toolkit
 static ::cppu::OImplementationId const aId;
 return aId.getImplementationId();
 }
-
-
-GridColumn* GridColumn::getImplementation( const Reference< XInterface >& 
i_component )
-{
-Reference< XUnoTunnel > const xTunnel( i_component, UNO_QUERY );
-if ( xTunnel.is() )
-return reinterpret_cast< GridColumn* >( ::sal::static_int_cast< 
sal_IntPtr >( xTunnel->getSomething( getUnoTunnelId() ) ) );
-return nullptr;
-}
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/toolkit/source/controls/grid/gridcolumn.hxx 
b/toolkit/source/controls/grid/gridcolumn.hxx
index 65a61363d7e6..4986fb164b8c 100644
--- a/toolkit/source/controls/grid/gridcolumn.hxx
+++ b/toolkit/source/controls/grid/gridcolumn.hxx
@@ -88,7 +88,6 @@ public:
 // XUnoTunnel and friends
 virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< 
sal_Int8 >& i_identifier ) override;
 static css::uno::Sequence< sal_Int8 > getUnoTunnelId() throw();
-static GridColumn* getImplementation( const css::uno::Reference< 
css::uno::XInterface >& i_component );
 
 // attribute access
 void setIndex( sal_Int32 const i_index );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 vcl/source/filter/jpeg/Exif.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 906eaf8a44f1ba8d08d5f8f74019c22fef4e5a05
Author: Stephan Bergmann 
AuthorDate: Tue Jun 18 12:13:57 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jun 18 13:28:13 2019 +0200

Better type safety

...following up on 42c0e433aca68c669bc0f55af404b6bae1655fba "Avoid
-fsanitize=misaligned-pointer-use"

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

diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index 187d5ac6efc6..9088d9117494 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -150,7 +150,7 @@ bool Exif::processJpeg(SvStream& rStream, bool bSetValue)
 
 namespace {
 
-sal_uInt16 read16(sal_uInt8 const * data, bool littleEndian) {
+sal_uInt16 read16(sal_uInt8 const (& data)[2], bool littleEndian) {
 if (littleEndian) {
 return data[0] | (sal_uInt16(data[1]) << 8);
 } else {
@@ -158,7 +158,7 @@ sal_uInt16 read16(sal_uInt8 const * data, bool 
littleEndian) {
 }
 }
 
-void write16(sal_uInt16 value, sal_uInt8 * data, bool littleEndian) {
+void write16(sal_uInt16 value, sal_uInt8 (& data)[2], bool littleEndian) {
 if (littleEndian) {
 data[0] = value & 0xFF;
 data[1] = value >> 8;
@@ -168,7 +168,7 @@ void write16(sal_uInt16 value, sal_uInt8 * data, bool 
littleEndian) {
 }
 }
 
-sal_uInt32 read32(sal_uInt8 const * data, bool littleEndian) {
+sal_uInt32 read32(sal_uInt8 const (& data)[4], bool littleEndian) {
 if (littleEndian) {
 return data[0] | (sal_uInt32(data[1]) << 8)
 | (sal_uInt32(data[2]) << 16) | (sal_uInt32(data[3]) << 24);
@@ -178,7 +178,7 @@ sal_uInt32 read32(sal_uInt8 const * data, bool 
littleEndian) {
 }
 }
 
-void write32(sal_uInt32 value, sal_uInt8 * data, bool littleEndian) {
+void write32(sal_uInt32 value, sal_uInt8 (& data)[4], bool littleEndian) {
 if (littleEndian) {
 data[0] = value & 0xFF;
 data[1] = (value >> 8) & 0xFF;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Serge Krot (via logerrit)]

 sw/qa/extras/rtfexport/data/tdf125719_case_1.rtf |  108 
 sw/qa/extras/rtfexport/data/tdf125719_case_2.rtf |  139 
 sw/qa/extras/rtfexport/rtfexport3.cxx|   19 ++
 sw/source/filter/ww8/rtfattributeoutput.cxx  |  194 +--
 sw/source/filter/ww8/rtfattributeoutput.hxx  |9 -
 sw/source/filter/ww8/rtfsdrexport.cxx|6 
 writerfilter/source/rtftok/rtfdispatchflag.cxx   |   17 +-
 writerfilter/source/rtftok/rtfdispatchvalue.cxx  |   77 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx   |   49 -
 writerfilter/source/rtftok/rtfdocumentimpl.hxx   |   11 -
 10 files changed, 495 insertions(+), 134 deletions(-)

New commits:
commit 3c1f6fc029ab8ff9129f2316a3d7c81bc7b69125
Author: Serge Krot 
AuthorDate: Thu May 30 15:33:29 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 18 11:38:53 2019 +0200

tdf#125719 sw: rtf: refactor associated character properties

1. \rtlch, \ltrch should be placed before their properties.
2. Do not mix associated and normal character properties in output.
3. Do not output empty "\rtlch \ltrch", "\ltrch \rtlch" pairs.
4. Handle associated character properties runs instead of
handling separately their parts without order of them.

Change-Id: Ibbf7365d04708682a5f1eb664a579c60a47465d2
Reviewed-on: https://gerrit.libreoffice.org/72578
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit fd95fb975b754d71d3750e85431a4e596a40e659)
Reviewed-on: https://gerrit.libreoffice.org/73868
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/rtfexport/data/tdf125719_case_1.rtf 
b/sw/qa/extras/rtfexport/data/tdf125719_case_1.rtf
new file mode 100644
index ..96b66450aa71
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf125719_case_1.rtf
@@ -0,0 +1,108 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch37\stshfhich37\stshfbi37\deflang1033\deflangfe1033\themelang1031\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi
 \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt 
Geneva};}
+{\f1\fbidi \fswiss\fcharset0\fprq2{\*\panose 
020b0604020202020204}Arial{\*\falt Arial};}{\f2\fbidi 
\fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}{\f3\fbidi 
\froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}
+{\f10\fbidi \fnil\fcharset2\fprq2{\*\panose 
0500}Wingdings{\*\falt Courier New};}{\f34\fbidi 
\froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}
+{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 
020f0502020204030204}Calibri{\*\falt Calibri};}{\f38\fbidi 
\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}
+{\f39\fbidi \fnil\fcharset0\fprq2{\*\panose }FONT_Type V2 
Bold{\*\falt Times New Roman};}{\f40\fbidi \fnil\fcharset0\fprq0{\*\panose 
}FONT_TypeGlobalPro-Bold{\*\falt Times New Roman};}
+{\f41\fbidi \fnil\fcharset0\fprq2{\*\panose }FONT_Type V2 
Light{\*\falt Times New Roman};}{\f42\fbidi \fnil\fcharset0\fprq0{\*\panose 
}FONT_TypeGlobalPro-Regular{\*\falt Times New Roman};}
+{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 
02020603050405020304}Times New Roman{\*\falt Geneva};}{\fdbmajor\f31501\fbidi 
\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt 
Geneva};}
+{\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 
02040503050406030204}Cambria;}{\fbimajor\f31503\fbidi 
\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt 
Geneva};}
+{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 
02020603050405020304}Times New Roman{\*\falt Geneva};}{\fdbminor\f31505\fbidi 
\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt 
Geneva};}
+{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 
020f0502020204030204}Calibri{\*\falt Calibri};}{\fbiminor\f31507\fbidi 
\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt 
Geneva};}
+{\f320\fbidi \froman\fcharset238\fprq2 Times New Roman CE{\*\falt 
Geneva};}{\f321\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt 
Geneva};}{\f323\fbidi \froman\fcharset161\fprq2 Times New Roman Greek{\*\falt 
Geneva};}
+{\f324\fbidi \froman\fcharset162\fprq2 Times New Roman Tur{\*\falt 
Geneva};}{\f325\fbidi \froman\fcharset177\fprq2 Times New Roman 
(Hebrew){\*\falt Geneva};}{\f326\fbidi \froman\fcharset178\fprq2 Times New 
Roman (Arabic){\*\falt Geneva};}
+{\f327\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt 
Geneva};}{\f328\fbidi \froman\fcharset163\fprq2 Times New Roman 
(Vietnamese){\*\falt Geneva};}{\f330\fbidi \fswiss\fcharset238\fprq2 Arial 
CE{\*\falt Arial};}
+{\f331\fbidi \fswiss\fcharset204\fprq2 Arial Cyr{\*\falt Arial};}{\f333\fbidi 
\fswiss\fcharset161\fprq2 Arial Greek{\*\falt Arial};}{\f334\fbidi 
\fswiss\fcharset162\fprq2 Arial 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/inc i18npool/source

[Matthias Seidel (via logerrit)]

 i18npool/inc/i18npool/lang.h|1 +
 i18npool/source/isolang/isolang.cxx |9 +
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 76c28ecc9c1faa4407dd02101aee57405b76d9d4
Author: Matthias Seidel 
AuthorDate: Tue Jun 18 09:09:30 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Jun 18 09:09:30 2019 +

Additions for new language Amharic (am)

diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index c06de7b9e030..074de5325bf1 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -110,6 +110,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_AFRIKAANS  0x0436
 #define LANGUAGE_ALBANIAN   0x041C
 #define LANGUAGE_ALSATIAN_FRANCE0x0484
+#define LANGUAGE_AMHARIC0x005E
 #define LANGUAGE_AMHARIC_ETHIOPIA   0x045E
 #define LANGUAGE_ARABIC_ALGERIA 0x1401
 #define LANGUAGE_ARABIC_BAHRAIN 0x3C01
diff --git a/i18npool/source/isolang/isolang.cxx 
b/i18npool/source/isolang/isolang.cxx
index 250935130ffd..2cef0e44e5e5 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -86,10 +86,10 @@ struct IsoLangOtherEntry
 // language, see code. A call with "en-ZZ" (not in table) would still result in
 // LANGUAGE_ENGLISH.
 
-/* erAck: 2007-07-05T20:01+0200  TODO: The entire suite's "primary language
+/* erAck: 2007-07-05T20:01+0200 TODO: The entire suite's "primary language
  * only" usage and locale fall back should be cleaned up and made consistent. I
  * strongly doubt that most callers exactly expect the behavior described.
- * Currently these primary LangIDs are used literally in OOo code:
+ * Currently these primary LangIDs are used literally in AOO code:
  * LANGUAGE_ENGLISH LANGUAGE_CHINESE LANGUAGE_MALAY
  * LANGUAGE_AZERI LANGUAGE_URDU LANGUAGE_KASHMIRI
  */
@@ -335,6 +335,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
 { LANGUAGE_UIGHUR_CHINA,"ug", "CN" },
 { LANGUAGE_TIGRIGNA_ETHIOPIA,   "ti", "ET" },
 { LANGUAGE_TIGRIGNA_ERITREA,"ti", "ER" },
+{ LANGUAGE_AMHARIC, "am", ""   },
 { LANGUAGE_AMHARIC_ETHIOPIA,"am", "ET" },
 { LANGUAGE_GUARANI_PARAGUAY,   "gug", "PY" },
 { LANGUAGE_HAWAIIAN_UNITED_STATES, "haw", "US" },
@@ -933,8 +934,8 @@ LanguageType MsLangId::convertIsoNamesToLanguage( const 
rtl::OUString& rLang,
 if ( pFirstLang )
 return pFirstLang->mnLang;
 
-//  if only the country is set, look for any entry matching the country
-//  (to allow reading country and language in separate steps, in any order)
+// if only the country is set, look for any entry matching the country
+// (to allow reading country and language in separate steps, in any order)
 if ( rCountry.getLength() && !rLang.getLength() )
 {
 const IsoLangEntry* pEntry2 = aImplIsoLangEntries;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/CustomTarget_lo_android.mk

[Jan Holesovsky (via logerrit)]

 android/CustomTarget_lo_android.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f362a3d8cc164bad7a61c9fd2191e3a80d5fd030
Author: Jan Holesovsky 
AuthorDate: Mon Jun 17 10:04:44 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Jun 18 12:31:10 2019 +0200

android: Fix non-debug build.

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

diff --git a/android/CustomTarget_lo_android.mk 
b/android/CustomTarget_lo_android.mk
index 3f80fe86be3a..4badb659612e 100644
--- a/android/CustomTarget_lo_android.mk
+++ b/android/CustomTarget_lo_android.mk
@@ -20,7 +20,7 @@ $(loandroid3_DIR)/done : $(call 
gb_Postprocess_get_target,AllModulesButInstsetNa
 # still looks for the .apk, and we want fresh daily builds to be uploaded.
 # Us "foo" instead of the old INPATH
mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \
-   cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if 
$(ENABLE_ANDROID_EDITING),Editing)/debug/*-debug.apk 
$(BUILDDIR)/instsetoo_native/foo/bin
+   cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if 
$(ENABLE_ANDROID_EDITING),Editing)/$(if 
$(ENABLE_RELEASE_BUILD),release/*-release-unsigned.apk,debug/*-debug.apk) 
$(BUILDDIR)/instsetoo_native/foo/bin
 
 $(call gb_CustomTarget_get_clean_target,android/loandroid3) :
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky (via logerrit)]

 vcl/source/image/ImplImageTree.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 7b9ec19bc2447389d7648401aa40ff8797e0c6af
Author: Jan Holesovsky 
AuthorDate: Tue Jun 18 10:43:16 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Jun 18 12:39:41 2019 +0200

[cp] android: Default to colibre.

Not ideal to use an ifdef, but I don't want to affect anything other
than Android; and there is no need to up-stream this either, colibre is
the default in master already.

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

diff --git a/vcl/source/image/ImplImageTree.cxx 
b/vcl/source/image/ImplImageTree.cxx
index 1a41d175a0b1..65a9b5562114 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -258,6 +258,12 @@ OUString ImplImageTree::fallbackStyle(const OUString& 
rsStyle)
 {
 OUString sResult;
 
+#ifdef ANDROID
+if (rsStyle == "colibre")
+return "";
+else
+return "colibre";
+#else
 if (rsStyle == "galaxy")
 sResult = "";
 else if (rsStyle == "industrial" || rsStyle == "tango" || rsStyle == 
"breeze")
@@ -272,6 +278,7 @@ OUString ImplImageTree::fallbackStyle(const OUString& 
rsStyle)
 sResult = "tango";
 
 return sResult;
+#endif
 }
 
 bool ImplImageTree::loadImage(OUString const & rName, OUString const & rStyle, 
BitmapEx & rBitmap, bool localized,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky (via logerrit)]

 solenv/bin/native-code.py |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 05eca1ba63a2eca5e6d6be0b7a05bb6f53354ec6
Author: Jan Holesovsky 
AuthorDate: Tue Jun 18 09:54:00 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Jun 18 12:39:03 2019 +0200

android: Add the sidebar-related constructors to liblo-native-code.so.

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

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index af43b0672e66..77e7bf85a009 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -227,11 +227,16 @@ core_constructor_list = [
 "com_sun_star_graphic_GraphicObject_get_implementation",
 "com_sun_star_comp_graphic_GraphicProvider_get_implementation",
 # svx/util/svx.component
+"com_sun_star_comp_svx_NumberingToolBoxControl_get_implementation",
 "com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation",
 "com_sun_star_drawing_SvxShapeCollection_get_implementation",
+"com_sun_star_svx_FontHeightToolBoxController_get_implementation",
+"org_apache_openoffice_comp_svx_sidebar_PanelFactory_get_implementation",
 # svx/util/svxcore.component
 "com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation",
 "com_sun_star_comp_Draw_GraphicExporter_get_implementation",
+"com_sun_star_comp_svx_ColorToolBoxControl_get_implementation",
+"com_sun_star_comp_svx_FontNameToolBoxControl_get_implementation",
 "com_sun_star_comp_Svx_GraphicExportHelper_get_implementation",
 "com_sun_star_comp_Svx_GraphicImportHelper_get_implementation",
 # toolkit/util/tk.component
@@ -277,6 +282,7 @@ edit_factory_list = [
 edit_constructor_list = [
 # framework/util/fwk.component
 
"com_sun_star_comp_framework_GlobalAcceleratorConfiguration_get_implementation",
+"com_sun_star_comp_framework_UICommandDescription_get_implementation",
 # i18npool/util/i18npool.component
 "com_sun_star_i18n_InputSequenceChecker_get_implementation",
 "com_sun_star_i18n_OrdinalSuffix_get_implementation",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/source/uibase/inc/wrtsh.hxx  |5 ++
 sw/source/uibase/shells/textfld.cxx |   65 ---
 sw/source/uibase/wrtsh/wrtsh1.cxx   |   74 
 3 files changed, 80 insertions(+), 64 deletions(-)

New commits:
commit 485e048c391da38f883adfbef920069bd7af2305
Author: Miklos Vajna 
AuthorDate: Tue Jun 18 12:17:22 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 18 13:05:22 2019 +0200

sw: extract postit insert code from SwTextShell::ExecField()

Into a new SwWrtShell::InsertPostIt(), so I can reuse it in
SwFrameShell.

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

diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index f474046de4be..8307327ce135 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -48,6 +48,8 @@ class NaviContentBookmark;
 struct SwCallMouseEvent;
 class SfxStringListItem;
 enum class SvMacroItemId : sal_uInt16;
+class SwFieldMgr;
+class SfxRequest;
 
 namespace i18nutil {
 struct SearchOptions2;
@@ -482,6 +484,9 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
 void ChangeHeaderOrFooter(const OUString& rStyleName, bool bHeader, bool 
bOn, bool bShowWarning);
 virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool 
bShow ) override;
 
+/// Inserts a new annotation/comment at the current cursor position / 
selection.
+void InsertPostIt(SwFieldMgr& rFieldMgr, SfxRequest& rReq);
+
 private:
 
 SAL_DLLPRIVATE void  OpenMark();
diff --git a/sw/source/uibase/shells/textfld.cxx 
b/sw/source/uibase/shells/textfld.cxx
index 376fdb2f269c..fa5afebd6c59 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -411,70 +411,7 @@ void SwTextShell::ExecField(SfxRequest )
 break;
 case FN_POSTIT:
 {
-SwPostItField* pPostIt = 
dynamic_cast(aFieldMgr.GetCurField());
-bool bNew = !(pPostIt && pPostIt->GetTyp()->Which() == 
SwFieldIds::Postit);
-if (bNew || GetView().GetPostItMgr()->IsAnswer())
-{
-const SvxPostItAuthorItem* pAuthorItem = 
rReq.GetArg(SID_ATTR_POSTIT_AUTHOR);
-OUString sAuthor;
-if ( pAuthorItem )
-sAuthor = pAuthorItem->GetValue();
-else
-{
-std::size_t nAuthor = SW_MOD()->GetRedlineAuthor();
-sAuthor = SW_MOD()->GetRedlineAuthor(nAuthor);
-}
-
-const SvxPostItTextItem* pTextItem = 
rReq.GetArg(SID_ATTR_POSTIT_TEXT);
-OUString sText;
-if ( pTextItem )
-sText = pTextItem->GetValue();
-
-// If we have a text already registered for answer, use 
that
-if (GetView().GetPostItMgr()->IsAnswer() && 
!GetView().GetPostItMgr()->GetAnswerText().isEmpty())
-{
-sText = GetView().GetPostItMgr()->GetAnswerText();
-
GetView().GetPostItMgr()->RegisterAnswerText(OUString());
-}
-
-if ( rSh.HasSelection() && !rSh.IsTableMode() )
-{
-rSh.KillPams();
-}
-
-// #i120513# Inserting a comment into an autocompletion 
crashes
-// --> suggestion has to be removed before
-GetView().GetEditWin().StopQuickHelp();
-
-SwInsertField_Data aData(TYP_POSTITFLD, 0, sAuthor, sText, 
0);
-aFieldMgr.InsertField( aData );
-
-rSh.Push();
-rSh.SwCursorShell::Left(1, CRSR_SKIP_CHARS);
-pPostIt = 
static_cast(aFieldMgr.GetCurField());
-rSh.Pop(SwCursorShell::PopMode::DeleteCurrent); // Restore 
cursor position
-}
-
-// Client has disabled annotations rendering, no need to
-// focus the postit field
-if (comphelper::LibreOfficeKit::isActive() && 
!comphelper::LibreOfficeKit::isTiledAnnotations())
-break;
-
-if (pPostIt)
-{
-SwFieldType* pType = 
rSh.GetDoc()->getIDocumentFieldsAccess().GetFieldType(SwFieldIds::Postit, 
OUString(), false);
-SwIterator aIter( *pType );
-SwFormatField* pSwFormatField = aIter.First();
-while( pSwFormatField )
-{
-if ( pSwFormatField->GetField() == pPostIt )
-{
-pSwFormatField->Broadcast( SwFormatFieldHint( 
nullptr, 

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

[Arkadiy Illarionov (via logerrit)]

 vcl/inc/graphic/UnoGraphic.hxx|2 --
 vcl/source/graphic/UnoGraphic.cxx |7 ---
 vcl/source/graphic/UnoGraphicProvider.cxx |3 ++-
 3 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 086c186209e33faa38403c1d9122fd2e90921b3a
Author: Arkadiy Illarionov 
AuthorDate: Mon Jun 17 22:37:08 2019 +0300
Commit: Stephan Bergmann 
CommitDate: Tue Jun 18 13:17:29 2019 +0200

tdf#39593 Remove Graphic::getImplementation

Replace with comphelper::getUnoTunnelImplementation.

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

diff --git a/vcl/inc/graphic/UnoGraphic.hxx b/vcl/inc/graphic/UnoGraphic.hxx
index 0bef26bcbd86..5728debf6a47 100644
--- a/vcl/inc/graphic/UnoGraphic.hxx
+++ b/vcl/inc/graphic/UnoGraphic.hxx
@@ -44,8 +44,6 @@ public:
 using ::unographic::GraphicDescriptor::init;
 void init( const ::Graphic& rGraphic ) throw();
 
-static const ::Graphic* getImplementation( const css::uno::Reference< 
css::uno::XInterface >& rxIFace ) throw();
-
 protected:
 
 // XInterface
diff --git a/vcl/source/graphic/UnoGraphic.cxx 
b/vcl/source/graphic/UnoGraphic.cxx
index 4fe9d88ada8e..b13860caa734 100644
--- a/vcl/source/graphic/UnoGraphic.cxx
+++ b/vcl/source/graphic/UnoGraphic.cxx
@@ -181,13 +181,6 @@ uno::Sequence SAL_CALL Graphic::getMaskDIB()
 }
 }
 
-const ::Graphic* Graphic::getImplementation( const uno::Reference< 
uno::XInterface >& rxIFace )
-throw()
-{
-uno::Reference< lang::XUnoTunnel > xTunnel( rxIFace, uno::UNO_QUERY );
-return( xTunnel.is() ? reinterpret_cast< ::Graphic* >( 
xTunnel->getSomething( ::Graphic::getUnoTunnelId() ) ) : nullptr );
-}
-
 sal_Int64 SAL_CALL Graphic::getSomething( const uno::Sequence< sal_Int8 >& rId 
)
 {
 return( ( rId.getLength() == 16 && 0 == memcmp( 
::Graphic::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ?
diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx 
b/vcl/source/graphic/UnoGraphicProvider.cxx
index d7dcee4b183c..eed36dbc0fe6 100644
--- a/vcl/source/graphic/UnoGraphicProvider.cxx
+++ b/vcl/source/graphic/UnoGraphicProvider.cxx
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -805,7 +806,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const 
uno::Reference< ::graphic::XG
 
 {
 const uno::Reference< XInterface >  xIFace( rxGraphic, uno::UNO_QUERY 
);
-const ::Graphic*pGraphic = 
::unographic::Graphic::getImplementation( xIFace );
+const ::Graphic*pGraphic = 
comphelper::getUnoTunnelImplementation<::Graphic>( xIFace );
 
 if( pGraphic && ( pGraphic->GetType() != GraphicType::NONE ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-4' - 4 commits - cppcanvas/source librelogo/source sfx2/source sw/inc sw/source

[Stephan Bergmann (via logerrit)]

 cppcanvas/source/mtfrenderer/emfplus.cxx   |3 +
 librelogo/source/LibreLogo/LibreLogo.py|   51 -
 sfx2/source/doc/objmisc.cxx|   13 +
 sw/inc/unosett.hxx |2 
 sw/source/core/text/porfld.cxx |4 -
 sw/source/core/text/porfld.hxx |1 
 sw/source/core/text/txtfld.cxx |   12 
 sw/source/core/unocore/unosett.cxx |   15 --
 sw/source/uibase/config/StoredChapterNumbering.cxx |2 
 9 files changed, 94 insertions(+), 9 deletions(-)

New commits:
commit 07ae8ec9a17c7c1dd7897c8d9494c7395e6d838b
Author: Stephan Bergmann 
AuthorDate: Fri Jun 7 09:28:12 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Jun 18 13:52:23 2019 +0200

More uses of referer URL with SvxBrushItem

Reviewed-on: https://gerrit.libreoffice.org/73643
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit b518882de8213ef71a8003f95fbdf7689069c06d)
Conflicts:
sw/source/core/text/porfld.cxx
sw/source/core/unocore/unosett.cxx

Reviewed-on: https://gerrit.libreoffice.org/73860
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 87c418a98650ab6e4a62a0b4b72e02fee358dced)

Change-Id: I04b524784df4ef453d8b1feec13b62f183a17e23

diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 96668f3680c0..d26a644d48d4 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -210,7 +210,7 @@ public:
 
 static css::uno::Sequence 
GetPropertiesForNumFormat(
 const SwNumFormat& rFormat, OUString const& rCharFormatName,
-OUString const* pHeadingStyleName);
+OUString const* pHeadingStyleName, OUString const & referer);
 static void SetPropertiesToNumFormat(
 SwNumFormat & aFormat,
 OUString & rCharStyleName,
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 0e7b5e97c1eb..f614be78559b 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -754,7 +754,7 @@ SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet,
 
 SwGrfNumPortion::SwGrfNumPortion(
 const OUString& rGraphicFollowedBy,
-const SvxBrushItem* pGrfBrush,
+const SvxBrushItem* pGrfBrush, OUString const & referer,
 const SwFormatVertOrient* pGrfOrient, const Size& rGrfSize,
 const bool bLft, const bool bCntr, const sal_uInt16 nMinDst,
 const bool bLabelAlignmentPosAndSpaceModeActive ) :
@@ -768,7 +768,7 @@ SwGrfNumPortion::SwGrfNumPortion(
 if( pGrfBrush )
 {
 *pBrush = *pGrfBrush;
-const Graphic* pGraph = pGrfBrush->GetGraphic();
+const Graphic* pGraph = pGrfBrush->GetGraphic(referer);
 if( pGraph )
 SetAnimated( pGraph->IsAnimated() );
 else
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 88146081d247..157ba19898a8 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -168,6 +168,7 @@ class SwGrfNumPortion : public SwNumberPortion
 public:
 SwGrfNumPortion( const OUString& rGraphicFollowedBy,
  const SvxBrushItem* pGrfBrush,
+ OUString const & referer,
  const SwFormatVertOrient* pGrfOrient,
  const Size& rGrfSize,
  const bool bLeft,
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index faa5fa153ae3..5fbbc2447983 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -52,6 +52,7 @@
 #include "flddat.hxx"
 #include "fmtautofmt.hxx"
 #include 
+#include 
 #include 
 
 static bool lcl_IsInBody( SwFrame *pFrame )
@@ -478,8 +479,17 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( 
SwTextFormatInfo  ) con
 
 if( SVX_NUM_BITMAP == rNumFormat.GetNumberingType() )
 {
+OUString referer;
+if (auto const sh1 = rInf.GetVsh()) {
+if (auto const doc = sh1->GetDoc()) {
+auto const sh2 = doc->GetPersist();
+if (sh2 != nullptr && sh2->HasName()) {
+referer = sh2->GetMedium()->GetName();
+}
+}
+}
 pRet = new SwGrfNumPortion( pTextNd->GetLabelFollowedBy(),
-rNumFormat.GetBrush(),
+rNumFormat.GetBrush(), referer,
 rNumFormat.GetGraphicOrientation(),
 rNumFormat.GetGraphicSize(),
 bLeft, bCenter, nMinDist,
diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index 80268724eb62..6ccff0bffc00 100644
--- 

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

[Miklos Vajna (via logerrit)]

 sd/qa/unit/export.map |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 27e3ed0d25735603d2c82744e3a8f5f3e0a8d043
Author: Miklos Vajna 
AuthorDate: Tue Jun 18 12:42:06 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 18 14:57:24 2019 +0200

sd: remove pre-gbuild map file

As far as I see this map file is not used to control linker-level
visibility in sd since the gbuild migration.

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

diff --git a/sd/qa/unit/export.map b/sd/qa/unit/export.map
deleted file mode 100644
index 4ca70fa85463..
--- a/sd/qa/unit/export.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3.0 {
-global:
-registerAllTestFunction;
-
-local:
-*;
-};
___
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' - sc/qa sc/source

[Mike Kaganski (via logerrit)]

 sc/qa/unit/data/ods/pivot-table-str-and-err-in-data.ods |binary
 sc/qa/unit/pivottable_filters_test.cxx  |   29 
 sc/source/filter/excel/xepivotxml.cxx   |7 ++-
 3 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit f1d3eb7573352d9da591ccadec21f49e1a5f8cb6
Author: Mike Kaganski 
AuthorDate: Fri Mar 8 14:01:03 2019 +0300
Commit: Mike Kaganski 
CommitDate: Tue Jun 18 15:00:12 2019 +0200

tdf#123939: string and error are same type for pivot cache in XLSX

Change-Id: Id39d322661f7537e8999acafee655c0cc16a78c1
Reviewed-on: https://gerrit.libreoffice.org/68911
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/74277
Tested-by: Mike Kaganski 

diff --git a/sc/qa/unit/data/ods/pivot-table-str-and-err-in-data.ods 
b/sc/qa/unit/data/ods/pivot-table-str-and-err-in-data.ods
new file mode 100644
index ..9c58dc8958ae
Binary files /dev/null and 
b/sc/qa/unit/data/ods/pivot-table-str-and-err-in-data.ods differ
diff --git a/sc/qa/unit/pivottable_filters_test.cxx 
b/sc/qa/unit/pivottable_filters_test.cxx
index c2546bc29cb7..a476e0d7b450 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -88,6 +88,7 @@ public:
 void testPivotTableDuplicateFields();
 void testTdf112106();
 void testTdf123923();
+void testTdf123939();
 
 CPPUNIT_TEST_SUITE(ScPivotTableFiltersTest);
 
@@ -130,6 +131,7 @@ public:
 CPPUNIT_TEST(testPivotTableDuplicateFields);
 CPPUNIT_TEST(testTdf112106);
 CPPUNIT_TEST(testTdf123923);
+CPPUNIT_TEST(testTdf123939);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2414,6 +2416,33 @@ void ScPivotTableFiltersTest::testTdf123923()
 "v", "#REF!");
 }
 
+void ScPivotTableFiltersTest::testTdf123939()
+{
+// tdf#123939: Excel warns on containsMixedTypes="1" if sharedItems has 
only strings and errors
+
+ScDocShellRef xShell = loadDoc("pivot-table-str-and-err-in-data.", 
FORMAT_ODS);
+CPPUNIT_ASSERT(xShell.is());
+
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+xmlDocPtr pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory,
+
"xl/pivotCache/pivotCacheDefinition1.xml");
+CPPUNIT_ASSERT(pTable);
+
+assertXPathNoAttribute(pTable,
+   
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]/x:sharedItems",
+   "containsMixedTypes");
+
+// But we must emit containsMixedTypes="1" for a mix of errors and 
non-string types!
+
+pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory,
+  
"xl/pivotCache/pivotCacheDefinition2.xml");
+CPPUNIT_ASSERT(pTable);
+
+assertXPath(pTable, 
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]/x:sharedItems",
+"containsMixedTypes", "1");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScPivotTableFiltersTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xepivotxml.cxx 
b/sc/source/filter/excel/xepivotxml.cxx
index 611078fa4ec1..41fa2161f9c2 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -266,6 +266,9 @@ void XclExpXmlPivotCaches::SavePivotCacheXml( 
XclExpXmlStream& rStrm, const Entr
 for (; it != itEnd; ++it)
 {
 ScDPItemData::Type eType = it->GetType();
+// tdf#123939 : error and string are same for cache; if both are 
present, keep only one
+if (eType == ScDPItemData::Error)
+eType = ScDPItemData::String;
 aDPTypes.insert(eType);
 if (eType == ScDPItemData::Value)
 {
@@ -291,8 +294,8 @@ void XclExpXmlPivotCaches::SavePivotCacheXml( 
XclExpXmlStream& rStrm, const Entr
 std::set aDPTypesWithoutBlank = aDPTypes;
 aDPTypesWithoutBlank.erase(ScDPItemData::Empty);
 
-bool isContainsString = 
aDPTypesWithoutBlank.find(ScDPItemData::String) != aDPTypesWithoutBlank.end() ||
-aDPTypesWithoutBlank.find(ScDPItemData::Error) 
!= aDPTypesWithoutBlank.end();
+const bool isContainsString
+= aDPTypesWithoutBlank.find(ScDPItemData::String) != 
aDPTypesWithoutBlank.end();
 bool isContainsBlank = aDPTypes.find(ScDPItemData::Empty) != 
aDPTypeEnd;
 bool isContainsNumber = !isContainsDate && 
aDPTypesWithoutBlank.find(ScDPItemData::Value) != aDPTypesWithoutBlank.end();
 bool isContainsNonDate = !(isContainsDate && 
aDPTypesWithoutBlank.size() <= 1);
___
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' - sfx2/source

[Mike Kaganski (via logerrit)]

 sfx2/source/doc/docfile.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit fda87834ae29dd0cba6cfc420c97ea79593c4738
Author: Mike Kaganski 
AuthorDate: Tue Dec 18 02:51:31 2018 +0100
Commit: Mike Kaganski 
CommitDate: Tue Jun 18 15:12:21 2019 +0200

tdf#116320: properly decode file name for File Locked dialog

Change-Id: I51bd7c6695ef52b08e0b6d809160d74daebb8505
Reviewed-on: https://gerrit.libreoffice.org/65298
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 8dc3fe631583228fe5bb49b44d2308470ec30df0)
Reviewed-on: https://gerrit.libreoffice.org/74278
Tested-by: Mike Kaganski 

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index dd1ff394894b..08848fd6808d 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -995,7 +995,8 @@ SfxMedium::ShowLockResult 
SfxMedium::ShowLockedDocumentDialog(const OUString& aD
 
 if ( ::svt::DocumentLockFile::IsInteractionAllowed() && xHandler.is() && ( 
bIsLoading || !bHandleSysLocked || bOwnLock ) )
 {
-OUString aDocumentURL = GetURLObject().GetLastName();
+OUString aDocumentURL
+= 
GetURLObject().GetLastName(INetURLObject::DecodeMechanism::WithCharset);
 OUString aInfo;
 ::rtl::Reference< ::ucbhelper::InteractionRequest > 
xInteractionRequestImpl;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 sc/uiconfig/scalc/ui/notebookbar.ui   |   77 
 sc/uiconfig/scalc/ui/notebookbar_compact.ui   | 8573 +-
 sd/uiconfig/sdraw/ui/notebookbar_compact.ui   | 1840 +++--
 sw/uiconfig/swriter/ui/notebookbar_compact.ui | 4529 +
 sw/uiconfig/swriter/ui/notebookbar_single.ui  |2 
 5 files changed, 10044 insertions(+), 4977 deletions(-)

New commits:
commit 1f2bc634cd48e6f093fa6821253bd18621eaa1e3
Author: andreas kainz 
AuthorDate: Tue Jun 18 05:12:43 2019 +0200
Commit: andreas_kainz 
CommitDate: Tue Jun 18 14:02:24 2019 +0200

NB tabbed compact big update and syncronisation between apps

Change-Id: Ie1178e1e36334b35c7a00b2ec918c79041150c80
Reviewed-on: https://gerrit.libreoffice.org/74268
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 5743fac0b855..4fe81d23d027 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1769,6 +1769,26 @@
   
 
 
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:GoalSeekDialog
+  
+
+
+  
+True
+False
+.uno:SolverDialog
+  
+
+
   
 True
 False
@@ -1789,6 +1809,12 @@
   
 
 
+  
+True
+False
+  
+
+
   
 True
 False
@@ -1796,23 +1822,37 @@
   
 
 
+  
+True
+False
+.uno:ClearArrowPrecedents
+  
+
+
+  
+True
+False
+.uno:ClearArrowDependents
+  
+
+
   
 True
 False
   
 
 
-  
+  
 True
 False
-.uno:GoalSeekDialog
+.uno:ShowErrors
   
 
 
-  
+  
 True
 False
-.uno:SolverDialog
+.uno:RefreshArrows
   
 
 
@@ -1822,6 +1862,33 @@
   
 
 
+  
+True
+False
+.uno:AuditingFillMode
+  
+
+
+  
+True
+False
+.uno:AutoRefreshArrows
+  
+
+
+  
+True
+False
+.uno:ShowInvalid
+  
+
+
+  
+True
+False
+  
+
+
   
 True
 False
@@ -1829,7 +1896,7 @@
   
 
 
-  
+  
 True
 False
   
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index 9c307b5df5eb..0e634a827f17 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -1837,126 +1837,185 @@
 True
 False
 
-  
+  
 True
 False
-.uno:MacroOrganizer?TabId:short=1
+.uno:MacroRecorder
   
 
 
-  
+  
 True
 False
-.uno:MacroSignature
+.uno:RunMacro
+  
+
+
+  
+True
+False
+.uno:BasicIDEAppear
+  
+
+
+  
+True
+False
+.uno:MacroOrganizer?TabId:short=1
   
 
 
-  
+  
 True
 False
 .uno:ScriptOrganizer
   
 
 
-  
+  
 True
 False
-.uno:ViewDataSourceBrowser
+.uno:MacroSignature
   
 
 
-  
+  
 True
 False
-.uno:BasicIDEAppear
   
 
 
-  
+  
 True
 False
-.uno:RunMacro
+.uno:GoalSeekDialog
   
 
 
-  
+  
 True
 False
-.uno:MacroRecorder
+.uno:SolverDialog
   
 
 
-  
+  
 True
 False
   
 
 
-  
+  
 True
 False
 .uno:ShowPrecedents
   
 
 
-  
+  
 True
 False
 .uno:ShowDependents
   
 
 
-  
+  
+True
+False
+  
+
+
+  
 True
 False
 .uno:ClearArrows
   
 
 
-  
+  
 True
 False
+.uno:ClearArrowPrecedents
   
 
 
-  
+  
 True
 False
-.uno:GoalSeekDialog
+.uno:ClearArrowDependents
   
 
 
-  
+  
 True
 False
-.uno:SolverDialog
   
 
 
-  
+  
 True
 False
+.uno:ShowErrors
   
 
 
-  
+  
+True
+False
+.uno:RefreshArrows
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:AuditingFillMode
+  
+
+
+  
+True
+False
+.uno:AutoRefreshArrows
+  
+
+
+  
+True
+False
+.uno:ShowInvalid
+  
+
+  

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

[Takeshi Abe (via logerrit)]

 extras/source/truetype/symbol/OpenSymbol.sfd|   25 
 starmath/inc/node.hxx   |2 -
 starmath/inc/strings.hrc|2 +
 starmath/inc/strings.hxx|2 +
 starmath/inc/token.hxx  |4 ++-
 starmath/inc/types.hxx  |1 
 starmath/qa/cppunit/test_nodetotextvisitors.cxx |2 +
 starmath/source/ElementsDockingWindow.cxx   |4 ++-
 starmath/source/mathmlexport.cxx|1 
 starmath/source/mathtype.cxx|2 +
 starmath/source/node.cxx|3 ++
 starmath/source/ooxmlexport.cxx |1 
 starmath/source/ooxmlimport.cxx |3 ++
 starmath/source/parse.cxx   |3 ++
 starmath/source/rtfexport.cxx   |1 
 starmath/uiconfig/smath/popupmenu/edit.xml  |2 +
 16 files changed, 51 insertions(+), 7 deletions(-)

New commits:
commit 528a1e8b1a2b26cf75e714145aea897079c02409
Author: Takeshi Abe 
AuthorDate: Mon May 27 00:12:28 2019 +0900
Commit: Xisco Faulí 
CommitDate: Tue Jun 18 14:07:13 2019 +0200

tdf#120047 Support attribute harpoon/wideharpoon in Math

... for an alternative style of vectors.

They are vec/widevec analogs but with COMBINING RIGHT HARPOON ABOVE
(U+20D1).  The new attribute names are deliberately long in order to
make fewer accidental collisions with variable names in formulae of
exising documents.

This also adds a glyph uni20D1 to OpenSymbol.

Change-Id: I31666e57808aa0e0327500916d3b862549891886
Reviewed-on: https://gerrit.libreoffice.org/72987
Tested-by: Jenkins
Reviewed-by: Takeshi Abe 
(cherry picked from commit 93eeaf0ad902214fb6b4205606b24046a458ee45)
Reviewed-on: https://gerrit.libreoffice.org/74251
Reviewed-by: Xisco Faulí 

diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd 
b/extras/source/truetype/symbol/OpenSymbol.sfd
index 35d4b01328b9..c9e9baad1707 100644
--- a/extras/source/truetype/symbol/OpenSymbol.sfd
+++ b/extras/source/truetype/symbol/OpenSymbol.sfd
@@ -3,8 +3,8 @@ FontName: OpenSymbol
 FullName: OpenSymbol
 FamilyName: OpenSymbol
 Weight: Book
-Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled 
Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, 
eight, nine, question, underscore, copyright, registered, uni2215, angle, 
therefore, lozenge (c) 2010 Google Corporation
-Version: 102.10
+Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled 
Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, 
eight, nine, question, underscore, copyright, registered, uni2215, angle, 
therefore, lozenge (c) 2010 Google Corporation\nuni20D1 (c) 2019 Takeshi Abe
+Version: 102.11
 ItalicAngle: 0
 UnderlinePosition: -143
 UnderlineWidth: 20
@@ -20,7 +20,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1144938807
-ModificationTime: 1479754802
+ModificationTime: 1558881510
 PfmFamily: 81
 TTFWeight: 400
 TTFWidth: 5
@@ -784,7 +784,7 @@ FitToEm: 1
 WinInfo: 0 34 12
 BeginPrivate: 0
 EndPrivate
-BeginChars: 1052 1052
+BeginChars: 1053 1053
 
 StartChar: Alpha
 Encoding: 0 913 0
@@ -108707,5 +108707,22 @@ SplineSet
  508 1286 l 1,6,-1
 EndSplineSet
 EndChar
+
+StartChar: uni20D1
+Encoding: 1052 8401 1052
+Width: 1056
+Flags: W
+HStem: 1313 112<98 686>
+LayerCount: 2
+Fore
+SplineSet
+98 1313 m 1,0,-1
+ 98 1425 l 1,1,-1
+ 686 1425 l 1,2,-1
+ 645 1575 l 1,3,-1
+ 1026 1313 l 1,4,-1
+ 98 1313 l 1,0,-1
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index da67e9bdece6..73bfb17132c9 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -1019,7 +1019,7 @@ public:
 /** Attribute node
  *
  * Used to give an attribute to another node. Used for commands such as:
- * UNDERLINE, OVERLINE, OVERSTRIKE, WIDEVEC, WIDEHAT and WIDETILDE.
+ * UNDERLINE, OVERLINE, OVERSTRIKE, WIDEVEC, WIDEHARPOON, WIDEHAT and 
WIDETILDE.
  *
  * Children:
  * 0: Attribute
diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index eec600990ba0..f12677d26eca 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -165,6 +165,7 @@
 #define RID_HATX_HELP   NC_("RID_HATX_HELP", "Circumflex" )
 #define RID_TILDEX_HELP NC_("RID_TILDEX_HELP", "Tilde" )
 #define RID_VECX_HELP   NC_("RID_VECX_HELP", "Vector 
Arrow" )
+#define RID_HARPOONX_HELP   NC_("RID_HARPOONX_HELP", "Harpoon" 

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

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

 sw/qa/extras/uiwriter/data2/tdf125916.docx|binary
 sw/qa/extras/uiwriter/uiwriter2.cxx   |   17 +
 sw/source/core/doc/DocumentRedlineManager.cxx |2 ++
 3 files changed, 19 insertions(+)

New commits:
commit 9eed8ef433ca13639a985434681e0439554702e5
Author: László Németh 
AuthorDate: Fri Jun 14 17:02:20 2019 +0200
Commit: Xisco Faulí 
CommitDate: Tue Jun 18 14:06:35 2019 +0200

tdf#125916 DOCX import: fix outline numbering at tracked deletion

Now there is no extra header after import (fixed regression from the
commit 8acc15b5113c798ecdbeed91456a92e7b0c1334e "tdf#118699 DOCX import:
don't add numbering") and the actual outline numbering is stable during
the next export/import cycles (losing correct numbering is the original
bug of DOCX import with change tracking).

Change-Id: I49a78549c10c4ce0b97bb2d593059bf25c4d7aab
Reviewed-on: https://gerrit.libreoffice.org/74054
Reviewed-by: László Németh 
Tested-by: László Németh 
(cherry picked from commit eeb9481304572cc404ea1da9f3dabff43d6d191c)
Reviewed-on: https://gerrit.libreoffice.org/74255
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sw/qa/extras/uiwriter/data2/tdf125916.docx 
b/sw/qa/extras/uiwriter/data2/tdf125916.docx
new file mode 100644
index ..6e1350da9c4a
Binary files /dev/null and b/sw/qa/extras/uiwriter/data2/tdf125916.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 1be95f8a0ea5..b283af27b24c 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -1268,6 +1268,23 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, 
testTdf125881_redline_list_level)
 CPPUNIT_ASSERT_EQUAL(sal_Int16(1), getProperty(getParagraph(8), 
"NumberingLevel"));
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf125916_redline_restart_numbering)
+{
+load(DATA_DIRECTORY, "tdf125916.docx");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+IDocumentRedlineAccess& rIDRA(pDoc->getIDocumentRedlineAccess());
+rIDRA.AcceptAllRedline(true);
+
+// check unnecessary numbering
+uno::Reference xProps(getParagraph(3), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_MESSAGE("first paragraph after the first deletion: 
erroneous numbering",
+   
!xProps->getPropertyValue("NumberingRules").hasValue());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf125310)
 {
 load(DATA_DIRECTORY, "tdf125310.fodt");
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 8548768793eb..5142be7c8d85 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -3046,6 +3046,8 @@ void DocumentRedlineManager::FinalizeImport()
 // tdf#118699 remove numbering of the first deleted list item
 const SwPaM aPam( *pStt, *pStt );
 m_rDoc.DelNumRules( aPam );
+// tdf#125916 copy style
+pDelNode->ChgFormatColl( pTextNode->GetTextColl() );
 }
 else if ( pDelNode->GetNumRule() != pTextNode->GetNumRule() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 sw/qa/extras/ooxmlexport/data/tdf89991.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |   10 ++
 sw/source/filter/ww8/docxexport.cxx   |   11 ++-
 sw/source/filter/ww8/docxexport.hxx   |1 +
 sw/source/filter/ww8/wrtww8.cxx   |5 +
 sw/source/filter/ww8/wrtww8.hxx   |1 +
 sw/source/uibase/uno/unotxdoc.cxx |8 
 writerfilter/source/dmapper/SettingsTable.cxx |   17 +
 8 files changed, 48 insertions(+), 5 deletions(-)

New commits:
commit 0620ccd4dc5422f8d3253c7b044a16043b00da35
Author: László Németh 
AuthorDate: Wed Jun 12 13:26:16 2019 +0200
Commit: Xisco Faulí 
CommitDate: Tue Jun 18 14:08:35 2019 +0200

tdf#89991 DOCX: import/export Show changes mode

handled by the optional w:revisionView OOXML setting.

Using disabled Show Changes mode, exported DOCX contains



as the documents exported from MSO with disabled Show Changes
and disabled Options -> Trust Center -> Trust Center Settings ->
Privacy Options -> Make hidden markup visible when opening or saving
(Note: this last setting needs also for opening the documents
really with disabled Show Changes in MSO).

Change-Id: I9f2c7df572f33838ae63185de21431102a7e139e
Reviewed-on: https://gerrit.libreoffice.org/73885
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: László Németh 
Tested-by: László Németh 
(cherry picked from commit 0e27158c4f6a6a7676a77afb6b37dd30b3f6d100)
Reviewed-on: https://gerrit.libreoffice.org/74254
Reviewed-by: Xisco Faulí 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf89991.docx 
b/sw/qa/extras/ooxmlexport/data/tdf89991.docx
new file mode 100644
index ..a074d9679a19
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf89991.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 8e96d05506cd..fde09e123f9f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -1012,6 +1012,16 @@ DECLARE_OOXMLEXPORT_TEST(tdf66398_permissions, 
"tdf66398_permissions.docx")
 
CPPUNIT_ASSERT(xBookmarksByName->hasByName("permission-for-group:267014232:everyone"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(tdf89991_revisionView, "tdf89991.docx")
+{
+// check revisionView (Show Changes) import and export
+if (xmlDocPtr pXmlSettings = parseExport("word/settings.xml"))
+{
+assertXPath(pXmlSettings, "/w:settings/w:revisionView", "insDel", 
"0");
+assertXPath(pXmlSettings, "/w:settings/w:revisionView", "formatting", 
"0");
+}
+}
+
 DECLARE_OOXMLEXPORT_TEST(tdf122201_editUnprotectedText, 
"tdf122201_editUnprotectedText.odt")
 {
 // get the document
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index f0db6407c55d..6d6dd78ad1c9 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -508,7 +508,8 @@ void DocxExport::OutputDML(uno::Reference 
const & xShape)
 
 ErrCode DocxExport::ExportDocument_Impl()
 {
-// Set the 'Track Revisions' flag in the settings structure
+// Set the 'Reviewing' flags in the settings structure
+m_aSettings.revisionView = m_bOrigShowChanges;
 m_aSettings.trackRevisions = bool( RedlineFlags::On & m_nOrigRedlineFlags 
);
 
 InitStyles();
@@ -955,6 +956,11 @@ void DocxExport::WriteSettings()
 }
 
 // Track Changes
+if ( !m_aSettings.revisionView )
+pFS->singleElementNS( XML_w, XML_revisionView,
+FSNS( XML_w, XML_insDel ), "0",
+FSNS( XML_w, XML_formatting ), "0" );
+
 if ( m_aSettings.trackRevisions )
 pFS->singleElementNS(XML_w, XML_trackRevisions);
 
@@ -1662,6 +1668,7 @@ DocxExport::~DocxExport()
 DocxSettingsData::DocxSettingsData()
 : evenAndOddHeaders( false )
 , defaultTabStop( 0 )
+, revisionView( true )
 , trackRevisions( false )
 {
 }
@@ -1672,6 +1679,8 @@ bool DocxSettingsData::hasData() const
 return true;
 if( defaultTabStop != 0 )
 return true;
+if ( !revisionView )
+return true;
 if ( trackRevisions )
 return true;
 
diff --git a/sw/source/filter/ww8/docxexport.hxx 
b/sw/source/filter/ww8/docxexport.hxx
index 5b906debb0e9..1de037fb7662 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -60,6 +60,7 @@ struct DocxSettingsData
 bool hasData() const; /// returns true if there are any non-default 
settings (i.e. something to write)
 bool evenAndOddHeaders;
 int defaultTabStop;
+bool revisionView;  // don't show tracked changes
 bool trackRevisions;// Should 'Track Revisions' be set
 };
 
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 09bf616a090b..bf8fb4665528 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dbaccess/AllLangResTarget_dbui.mk solenv/gbuild

[Matthias Seidel (via logerrit)]

 dbaccess/AllLangResTarget_dbui.mk |4 ++--
 solenv/gbuild/AllLangResTarget.mk |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0f8a7c476a085501364649b52ae8f1ebf757a5cf
Author: Matthias Seidel 
AuthorDate: Tue Jun 18 10:50:07 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Jun 18 10:50:07 2019 +

i128128 - Lost translations in database wizard

Fixing double slash and wrong paths

diff --git a/dbaccess/AllLangResTarget_dbui.mk 
b/dbaccess/AllLangResTarget_dbui.mk
index 829af504a246..6f6ef48e9055 100644
--- a/dbaccess/AllLangResTarget_dbui.mk
+++ b/dbaccess/AllLangResTarget_dbui.mk
@@ -126,7 +126,7 @@ $(WORKDIR)/inc/dbaccess/AutoControls.hrc : 
$(SRCDIR)/dbaccess/source/ui/dlg/Auto
$(call gb_Helper_abbreviate_dirs_native, \
$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-p svx \
--i $< -o $@ -m 
$(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all)
+-i $< -o $@ -m 
$(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/source/ui/dlg/localize.sdf -l all)
 
 $(WORKDIR)/inc/dbaccess/toolbox.hrc : 
$(SRCDIR)/dbaccess/source/ui/inc/toolbox_tmpl.hrc 
$(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf
echo merging $@
@@ -136,7 +136,7 @@ $(WORKDIR)/inc/dbaccess/toolbox.hrc : 
$(SRCDIR)/dbaccess/source/ui/inc/toolbox_t
$(call gb_Helper_abbreviate_dirs_native, \
$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-p svx \
--i $< -o $@ -m 
$(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all)
+-i $< -o $@ -m 
$(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/source/ui/inc/localize.sdf -l all)
 
 endif
 
diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index 073fc981be78..8aa245bf66c9 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -27,7 +27,7 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $(call 
gb_Executable_get_target,transex3)
 # gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
 
 gb_SrsPartMergeTarget_TRANSEXCOMMAND := 
$(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) 
$(gb_SrsPartMergeTarget_TRANSEXTARGET)
-gb_SrsPartMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf/
+gb_SrsPartMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf
 gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
 
 define gb_SrsPartMergeTarget__command
@@ -102,8 +102,8 @@ $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE :=
 else
 $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call 
gb_SrsPartMergeTarget_get_target,$(1))
 $(call gb_SrsPartTarget_get_target,$(1)) : $(call 
gb_SrsPartMergeTarget_get_target,$(1))
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath 
$(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(realpath 
$(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath 
$(gb_SrsPartMergeTarget_SDFLOCATION)/$(dir $(1))localize.sdf)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(realpath 
$(gb_SrsPartMergeTarget_SDFLOCATION)/$(dir $(1))localize.sdf)
 endif
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Balazs Varga (via logerrit)]

 chart2/source/tools/UncachedDataSequence.cxx |   13 +++--
 sw/qa/extras/layout/data/tdf75659.docx   |binary
 sw/qa/extras/layout/layout.cxx   |   25 +
 3 files changed, 36 insertions(+), 2 deletions(-)

New commits:
commit 0869c65a7e937d71bd623ed498a3a47cebe0a66d
Author: Balazs Varga 
AuthorDate: Tue Jun 11 13:26:50 2019 +0200
Commit: Xisco Faulí 
CommitDate: Tue Jun 18 14:07:55 2019 +0200

tdf#75659 Chart: fix empty legend at not available legend names

by using localized versions of "Unnamed Series 1" etc.

Note: OOXML files don't contain the default or fallback legend names
used by MSO in this case, so the original empty string replacement
of the missing names resulted bad chart import.

Change-Id: I2897c70d9003e1ab3241dd569de0d79821d896b1
Reviewed-on: https://gerrit.libreoffice.org/73817
Reviewed-by: László Németh 
Tested-by: László Németh 
(cherry picked from commit 007bf60611e2ba5a65ffabe80dbb0e279fcb9f26)
Reviewed-on: https://gerrit.libreoffice.org/74252
Tested-by: Jenkins
Reviewed-by: Balazs Varga 
Reviewed-by: Xisco Faulí 

diff --git a/chart2/source/tools/UncachedDataSequence.cxx 
b/chart2/source/tools/UncachedDataSequence.cxx
index b9721490b7e7..ca3a9280c452 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -23,6 +23,8 @@
 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -209,8 +211,15 @@ OUString SAL_CALL 
UncachedDataSequence::getSourceRangeRepresentation()
 
 Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( 
chart2::data::LabelOrigin )
 {
-// auto-generated label is an empty string
-return Sequence< OUString >(1);
+// auto-generated label
+sal_Int32 nSeries = m_aSourceRepresentation.toInt32() + 1;
+OUString aResString(::chart::SchResId(STR_DATA_UNNAMED_SERIES_WITH_INDEX));
+const OUString aReplacementStr("%NUMBER");
+sal_Int32 nIndex = aResString.indexOf(aReplacementStr);
+OUString aName;
+if( nIndex != -1 )
+aName = aResString.replaceAt(nIndex, aReplacementStr.getLength(), 
OUString::number(nSeries));
+return Sequence< OUString >( , 1 );
 }
 
 ::sal_Int32 SAL_CALL UncachedDataSequence::getNumberFormatKeyByIndex( 
::sal_Int32 )
diff --git a/sw/qa/extras/layout/data/tdf75659.docx 
b/sw/qa/extras/layout/data/tdf75659.docx
new file mode 100644
index ..a3cde330f8f5
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf75659.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 1175d25ef573..325c0ef49e64 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2327,6 +2327,31 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf125335)
 // This failed, if the legend first label is not "Data3". The legend 
position is bottom.
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf75659)
+{
+SwDoc* pDoc = createDoc("tdf75659.docx");
+SwDocShell* pShell = pDoc->GetDocShell();
+
+// Dump the rendering of the first page as an XML file.
+std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+xmlDocPtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPathContent(pXmlDoc,
+   
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[17]/text",
+   "Unnamed Series 1");
+
+assertXPathContent(pXmlDoc,
+   
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[18]/text",
+   "Unnamed Series 2");
+
+assertXPathContent(pXmlDoc,
+   
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[19]/text",
+   "Unnamed Series 3");
+// These failed, if the legend names are empty strings.
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf108021)
 {
 SwDoc* pDoc = createDoc("tdf108021.odt");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jim Raykowski (via logerrit)]

 svx/source/tbxctrls/tbcontrl.cxx|6 --
 svx/source/tbxctrls/tbunocontroller.cxx |5 -
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit d10b4015b07aa717b6377f46f58f29b9988ec84f
Author: Jim Raykowski 
AuthorDate: Sat May 25 16:08:40 2019 -0800
Commit: Xisco Faulí 
CommitDate: Tue Jun 18 14:10:02 2019 +0200

tdf#120170 Prevent escape key press focus to document

...from style, fontname, and fontsize comboboxes used in sidebar tool
boxes when sidebar is undocked

Windows build does not show this bug but Linux does for
SAL_USE_VCLPLUGIN's gen, gtk, and gtk3.

This patch checks the combobox parent object type for type sidebar tool
box and if so skips the release focus call that sets focus to the frames
container window which incorrectly sets focus to the document for Linux
build. Probably a lower level fix for this but I'm not at that level yet
:-)

Change-Id: Ie33ea4238f7e8715fbd0389efd9185598a528ced
Reviewed-on: https://gerrit.libreoffice.org/72970
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 
(cherry picked from commit c81055eb075efffa9cd123913a684ac3258903d5)
Reviewed-on: https://gerrit.libreoffice.org/74250
Reviewed-by: Xisco Faulí 

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 0b1c52b88acf..125d6d21432e 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -898,7 +898,8 @@ bool SvxStyleBox_Impl::EventNotify( NotifyEvent& rNEvt )
 
 case KEY_ESCAPE:
 SelectEntryPos( nCurSel );
-ReleaseFocus();
+if ( typeid( *GetParent() ) != typeid( 
sfx2::sidebar::SidebarToolBox ) )
+ReleaseFocus();
 bHandled = true;
 break;
 }
@@ -1416,7 +1417,8 @@ bool SvxFontNameBox_Impl::EventNotify( NotifyEvent& rNEvt 
)
 
 case KEY_ESCAPE:
 SetText( aCurText );
-ReleaseFocus_Impl();
+if ( typeid( *GetParent() ) != typeid( 
sfx2::sidebar::SidebarToolBox ) )
+ReleaseFocus_Impl();
 EndPreview();
 break;
 }
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx 
b/svx/source/tbxctrls/tbunocontroller.cxx
index 96ff89a22a3c..628a9585e922 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -39,6 +39,8 @@
 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 
 namespace {
@@ -230,7 +232,8 @@ bool SvxFontSizeBox_Impl::EventNotify( NotifyEvent& rNEvt )
 
 case KEY_ESCAPE:
 SetText( m_aCurText );
-ReleaseFocus_Impl();
+if ( typeid( *GetParent() ) != typeid( 
sfx2::sidebar::SidebarToolBox ) )
+ReleaseFocus_Impl();
 bHandled = true;
 break;
 }
___
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' - sw/CppunitTest_sw_ww8import.mk sw/qa sw/source

[Mike Kaganski (via logerrit)]

 sw/CppunitTest_sw_ww8import.mk|1 
 sw/qa/extras/ww8import/data/tdf121734.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx  |   43 ++
 sw/source/filter/ww8/ww8par.cxx   |4 --
 sw/source/filter/ww8/ww8par4.cxx  |3 --
 sw/source/filter/ww8/ww8par6.cxx  |6 +---
 6 files changed, 47 insertions(+), 10 deletions(-)

New commits:
commit d03a76d0fa4c2fa5f9ecdf3ea36e257587f2c333
Author: Mike Kaganski 
AuthorDate: Wed Dec 12 00:31:13 2018 +0300
Commit: Mike Kaganski 
CommitDate: Tue Jun 18 14:45:08 2019 +0200

tdf#121734: ww8 import: use direct formatting for floating object frames

... and don't modify standard frame styles to have no borders and padding.
This makes "Frame", "OLE", and "Graphics" frame styles of imported DOC
files to have usual settings (for "Frame", it's 1.5 mm padding and all
borders set to 0.05 pt black line).

All objects that need invisible frame will have them with all necessary
settings set explicitly, which allows to copy and paste such frames to
other documents without problems.

This makes DOC import aligned with DOCX import in this regard.

Change-Id: I6f05cf71e63ceccb8e0ddebe23ec41bf69af9b52
Reviewed-on: https://gerrit.libreoffice.org/64992
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/65012
Tested-by: Mike Kaganski 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/74242

diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk
index 932878b0e557..31a7dcbe80ba 100644
--- a/sw/CppunitTest_sw_ww8import.mk
+++ b/sw/CppunitTest_sw_ww8import.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8import, \
 comphelper \
 cppu \
 cppuhelper \
+editeng \
 sal \
 test \
 unotest \
diff --git a/sw/qa/extras/ww8import/data/tdf121734.doc 
b/sw/qa/extras/ww8import/data/tdf121734.doc
new file mode 100644
index ..11a9bf503ca5
Binary files /dev/null and b/sw/qa/extras/ww8import/data/tdf121734.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 5068f7bbf38c..e3763e60ba17 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -17,6 +17,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 class Test : public SwModelTestBase
 {
@@ -264,6 +267,46 @@ DECLARE_WW8IMPORT_TEST(testTdf122425_2, "tdf122425_2.doc")
 }
 }
 
+DECLARE_WW8IMPORT_TEST(testTdf121734, "tdf121734.doc")
+{
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+SwPosFlyFrames aPosFlyFrames = pDoc->GetAllFlyFormats(nullptr, false);
+// There is only one fly frame in the document: the one with the imported 
floating table
+CPPUNIT_ASSERT_EQUAL(size_t(1), aPosFlyFrames.size());
+for (const auto& rPosFlyFrame : aPosFlyFrames)
+{
+const SwFrameFormat& rFormat = rPosFlyFrame->GetFormat();
+const SfxPoolItem* pItem = nullptr;
+
+// The LR and UL spacings and borders must all be set explicitly;
+// spacings and border distances must be 0; borders must be absent.
+
+CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, 
rFormat.GetItemState(RES_LR_SPACE, false, ));
+auto pLR = static_cast(pItem);
+CPPUNIT_ASSERT(pLR);
+CPPUNIT_ASSERT_EQUAL(long(0), pLR->GetLeft());
+CPPUNIT_ASSERT_EQUAL(long(0), pLR->GetRight());
+
+CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, 
rFormat.GetItemState(RES_UL_SPACE, false, ));
+auto pUL = static_cast(pItem);
+CPPUNIT_ASSERT(pUL);
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(0), pUL->GetUpper());
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(0), pUL->GetLower());
+
+CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, rFormat.GetItemState(RES_BOX, 
false, ));
+auto pBox = static_cast(pItem);
+CPPUNIT_ASSERT(pBox);
+for (auto eLine : { SvxBoxItemLine::TOP, SvxBoxItemLine::BOTTOM,
+SvxBoxItemLine::LEFT, SvxBoxItemLine::RIGHT })
+{
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(0), pBox->GetDistance(eLine));
+CPPUNIT_ASSERT(!pBox->GetLine(eLine));
+}
+}
+}
+
 // tests should only be added to ww8IMPORT *if* they fail round-tripping in 
ww8EXPORT
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index bc5b7a864c98..612d0c200958 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6333,12 +6333,8 @@ ErrCode WW8Reader::Read(SwDoc , const OUString& 
rBaseURL, SwPaM , cons
 rBaseURL, bNew, m_bSkipImages, *rPaM.GetPoint()));
 if (bNew)
 {
-// Remove Frame and offsets from Frame Template
-

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 3 commits - librelogo/source sfx2/source sw/inc sw/source

[Stephan Bergmann (via logerrit)]

 librelogo/source/LibreLogo/LibreLogo.py|   51 -
 sfx2/source/doc/objmisc.cxx|   13 +
 sw/inc/unosett.hxx |2 
 sw/source/core/text/porfld.cxx |4 -
 sw/source/core/text/porfld.hxx |1 
 sw/source/core/text/txtfld.cxx |   12 
 sw/source/core/unocore/unosett.cxx |   15 --
 sw/source/uibase/config/StoredChapterNumbering.cxx |2 
 8 files changed, 91 insertions(+), 9 deletions(-)

New commits:
commit ee5cb12f07b7932883d5a77fdebae4e830932824
Author: Stephan Bergmann 
AuthorDate: Fri Jun 7 09:28:12 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon Jun 17 16:27:50 2019 +0200

More uses of referer URL with SvxBrushItem

Reviewed-on: https://gerrit.libreoffice.org/73643
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit b518882de8213ef71a8003f95fbdf7689069c06d)
Conflicts:
sw/source/core/text/porfld.cxx
sw/source/core/unocore/unosett.cxx

Change-Id: I04b524784df4ef453d8b1feec13b62f183a17e23
Reviewed-on: https://gerrit.libreoffice.org/73860
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 87c418a98650ab6e4a62a0b4b72e02fee358dced)

diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 1372c30126d0..fe4a514c9a4e 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -209,7 +209,7 @@ public:
 
 static css::uno::Sequence 
GetPropertiesForNumFormat(
 const SwNumFormat& rFormat, OUString const& rCharFormatName,
-OUString const* pHeadingStyleName);
+OUString const* pHeadingStyleName, OUString const & referer);
 static void SetPropertiesToNumFormat(
 SwNumFormat & aFormat,
 OUString & rCharStyleName,
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index ac3596f78262..14e5320f234d 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -757,7 +757,7 @@ SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet,
 
 SwGrfNumPortion::SwGrfNumPortion(
 const OUString& rGraphicFollowedBy,
-const SvxBrushItem* pGrfBrush,
+const SvxBrushItem* pGrfBrush, OUString const & referer,
 const SwFormatVertOrient* pGrfOrient, const Size& rGrfSize,
 const bool bLft, const bool bCntr, const sal_uInt16 nMinDst,
 const bool bLabelAlignmentPosAndSpaceModeActive ) :
@@ -771,7 +771,7 @@ SwGrfNumPortion::SwGrfNumPortion(
 if( pGrfBrush )
 {
 *pBrush = *pGrfBrush;
-const Graphic* pGraph = pGrfBrush->GetGraphic();
+const Graphic* pGraph = pGrfBrush->GetGraphic(referer);
 if( pGraph )
 SetAnimated( pGraph->IsAnimated() );
 else
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index d7c06e2ae4b2..ecdfeec6cff2 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -162,6 +162,7 @@ class SwGrfNumPortion : public SwNumberPortion
 public:
 SwGrfNumPortion( const OUString& rGraphicFollowedBy,
  const SvxBrushItem* pGrfBrush,
+ OUString const & referer,
  const SwFormatVertOrient* pGrfOrient,
  const Size& rGrfSize,
  const bool bLeft,
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 9ba37a923740..06cfa0cd4a35 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -52,6 +52,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 static bool lcl_IsInBody( SwFrame const *pFrame )
@@ -500,8 +501,17 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( 
SwTextFormatInfo  ) con
 
 if( SVX_NUM_BITMAP == rNumFormat.GetNumberingType() )
 {
+OUString referer;
+if (auto const sh1 = rInf.GetVsh()) {
+if (auto const doc = sh1->GetDoc()) {
+auto const sh2 = doc->GetPersist();
+if (sh2 != nullptr && sh2->HasName()) {
+referer = sh2->GetMedium()->GetName();
+}
+}
+}
 pRet = new SwGrfNumPortion( pTextNd->GetLabelFollowedBy(),
-rNumFormat.GetBrush(),
+rNumFormat.GetBrush(), referer,
 rNumFormat.GetGraphicOrientation(),
 rNumFormat.GetGraphicSize(),
 bLeft, bCenter, nMinDist,
diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index e27cc31c0780..7ca0075c29e3 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -60,6 +60,7 @@
 #include 
 #include 
 

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-0' - 3 commits - librelogo/source sfx2/source sw/inc sw/source

[Stephan Bergmann (via logerrit)]

 librelogo/source/LibreLogo/LibreLogo.py|   51 -
 sfx2/source/doc/objmisc.cxx|   13 +
 sw/inc/unosett.hxx |2 
 sw/source/core/text/porfld.cxx |4 -
 sw/source/core/text/porfld.hxx |1 
 sw/source/core/text/txtfld.cxx |   12 
 sw/source/core/unocore/unosett.cxx |   15 --
 sw/source/uibase/config/StoredChapterNumbering.cxx |2 
 8 files changed, 91 insertions(+), 9 deletions(-)

New commits:
commit 9e4c66748c8e8bde1dd71fb661c3c3aa16ec87e8
Author: Stephan Bergmann 
AuthorDate: Fri Jun 7 09:28:12 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Jun 18 13:23:28 2019 +0200

More uses of referer URL with SvxBrushItem

Reviewed-on: https://gerrit.libreoffice.org/73643
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit b518882de8213ef71a8003f95fbdf7689069c06d)
Conflicts:
sw/source/core/text/porfld.cxx
sw/source/core/unocore/unosett.cxx

Reviewed-on: https://gerrit.libreoffice.org/73860
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 87c418a98650ab6e4a62a0b4b72e02fee358dced)

Change-Id: I04b524784df4ef453d8b1feec13b62f183a17e23

diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 295eb06fe671..185b5bcb40fe 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -210,7 +210,7 @@ public:
 
 static css::uno::Sequence 
GetPropertiesForNumFormat(
 const SwNumFormat& rFormat, OUString const& rCharFormatName,
-OUString const* pHeadingStyleName);
+OUString const* pHeadingStyleName, OUString const & referer);
 static void SetPropertiesToNumFormat(
 SwNumFormat & aFormat,
 OUString & rCharStyleName,
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 777165819b55..b29cee3b5a41 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -755,7 +755,7 @@ SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet,
 
 SwGrfNumPortion::SwGrfNumPortion(
 const OUString& rGraphicFollowedBy,
-const SvxBrushItem* pGrfBrush,
+const SvxBrushItem* pGrfBrush, OUString const & referer,
 const SwFormatVertOrient* pGrfOrient, const Size& rGrfSize,
 const bool bLft, const bool bCntr, const sal_uInt16 nMinDst,
 const bool bLabelAlignmentPosAndSpaceModeActive ) :
@@ -769,7 +769,7 @@ SwGrfNumPortion::SwGrfNumPortion(
 if( pGrfBrush )
 {
 *pBrush = *pGrfBrush;
-const Graphic* pGraph = pGrfBrush->GetGraphic();
+const Graphic* pGraph = pGrfBrush->GetGraphic(referer);
 if( pGraph )
 SetAnimated( pGraph->IsAnimated() );
 else
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 38fc08993c0d..4ecf25e7d2ac 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -168,6 +168,7 @@ class SwGrfNumPortion : public SwNumberPortion
 public:
 SwGrfNumPortion( const OUString& rGraphicFollowedBy,
  const SvxBrushItem* pGrfBrush,
+ OUString const & referer,
  const SwFormatVertOrient* pGrfOrient,
  const Size& rGrfSize,
  const bool bLeft,
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 6b2b9388644d..14e396869ca8 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -52,6 +52,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 static bool lcl_IsInBody( SwFrame const *pFrame )
@@ -478,8 +479,17 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( 
SwTextFormatInfo  ) con
 
 if( SVX_NUM_BITMAP == rNumFormat.GetNumberingType() )
 {
+OUString referer;
+if (auto const sh1 = rInf.GetVsh()) {
+if (auto const doc = sh1->GetDoc()) {
+auto const sh2 = doc->GetPersist();
+if (sh2 != nullptr && sh2->HasName()) {
+referer = sh2->GetMedium()->GetName();
+}
+}
+}
 pRet = new SwGrfNumPortion( pTextNd->GetLabelFollowedBy(),
-rNumFormat.GetBrush(),
+rNumFormat.GetBrush(), referer,
 rNumFormat.GetGraphicOrientation(),
 rNumFormat.GetGraphicSize(),
 bLeft, bCenter, nMinDist,
diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index f7376b93693f..da076ebf39e2 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -57,6 +57,7 @@
 #include 
 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - sw/qa sw/source ucb/source

[Mike Kaganski (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf116371.odt  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx   |   10 +++
 sw/source/filter/ww8/docxattributeoutput.cxx |   37 ---
 ucb/source/ucp/webdav-neon/NeonSession.cxx   |   14 --
 ucb/source/ucp/webdav-neon/NeonSession.hxx   |1 
 ucb/source/ucp/webdav-neon/webdavcontent.cxx |   10 ++-
 6 files changed, 50 insertions(+), 22 deletions(-)

New commits:
commit 0ba1cb36688baff5814ae61163d401f2ecb39e31
Author: Mike Kaganski 
AuthorDate: Tue Jan 8 05:47:04 2019 +0300
Commit: Mike Kaganski 
CommitDate: Tue Jun 18 13:57:52 2019 +0200

Don't crash when accessing WebDAV resource after auth failed

In my testing on Windows, the crashing scenario was this:
1. FileDialogHelper_Impl::updateVersions() creates storage calling
   comphelper::OStorageHelper::GetStorageFromURL;
2. Content::openStream() calls isDocument first;
3. Content::isDocument() indirectly initiates WebDAV session,
   creating a NeonSession;
4. All operations of NeonSession call Init() first; its first call
   initializes m_pHttpSession using ne_session_create, and then
   adds auth callbacks using ne_add_server_auth/ne_add_proxy_auth
5. Then NeonSession performs the rest of PROPFIND task, calling
   ah_post_send and auth_challenge; the latter fails, then
   ah_post_send calls clean_session, which cleans m_pHttpSession's
   auth_session's sspi_host;
6. NeonSession::HandleError throws DAVException for NE_AUTH error;
7. Content::isDocument() returns true to Content::openStream(),
   which proceeds to execute the command, which in turn re-uses
   the NeonSession and its m_pHttpSession;
8. NeonSession::OPTIONS then indirectly calls continue_sspi, which
   tries to dereference the m_pHttpSession's auth_session's
   sspi_host which is nullptr at this point.

So in case NeonSession detects the NE_AUTH error condition, let's
set a flag indicating that the next Init() should reinitialize its
m_pHttpSession.

Also fixed a case when xProps was used before initialization in
Content::getPropertyValues.

Change-Id: Ifc9eec4fe0333ff6be17c5089068441b4a6eb78c
Reviewed-on: https://gerrit.libreoffice.org/65950
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 162a472d55cf9fb9aaa6d5eae625b3da2273a516)
Reviewed-on: https://gerrit.libreoffice.org/74261
Tested-by: Mike Kaganski 

diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx 
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index c10796a48e79..164d30e56ae3 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -671,7 +671,8 @@ void NeonSession::Init()
 {
 osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
-bool bCreateNewSession = false;
+bool bCreateNewSession = m_bNeedNewSession;
+m_bNeedNewSession = false;
 
 if ( m_pHttpSession == nullptr )
 {
@@ -725,13 +726,17 @@ void NeonSession::Init()
 m_aProxyName = rProxyCfg.aName;
 m_nProxyPort = rProxyCfg.nPort;
 
+bCreateNewSession = true;
+}
+
+if (bCreateNewSession)
+{
 // new session needed, destroy old first
 {
 osl::Guard< osl::Mutex > theGlobalGuard(getGlobalNeonMutex());
 ne_session_destroy( m_pHttpSession );
 }
 m_pHttpSession = nullptr;
-bCreateNewSession = true;
 }
 }
 
@@ -1966,6 +1971,11 @@ void NeonSession::HandleError( int nError,
 m_aHostName, m_nPort ) );
 
 case NE_AUTH: // User authentication failed on server
+// m_pHttpSession could get invalidated, e.g., as result of 
clean_session called in
+// ah_post_send in case when auth_challenge failed, which 
invalidates the auth_session
+// which we established in Init(): the auth_session's sspi_host 
gets disposed, and
+// next attempt to authenticate would crash in continue_sspi 
trying to dereference it
+m_bNeedNewSession = true;
 throw DAVException( DAVException::DAV_HTTP_AUTH,
 NeonUri::makeConnectionEndPointString(
 m_aHostName, m_nPort ) );
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx 
b/ucb/source/ucp/webdav-neon/NeonSession.hxx
index 2adebaacd3fd..df4522da6e18 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx
@@ -54,6 +54,7 @@ private:
 sal_Int32 m_nProxyPort;
 css::uno::Sequence< css::beans::NamedValue > const m_aFlags;
 HttpSession * m_pHttpSession;
+bool m_bNeedNewSession = false; // Something happened that could 
invalidate m_pHttpSession
 void * const  m_pRequestData;
 const ucbhelper::InternetProxyDecider 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 3 commits - cui/uiconfig editeng/source include/editeng include/sfx2 officecfg/registry sal/osl sfx2/source sw/qa sw/source

[Mike Kaganski (via logerrit)]

 cui/uiconfig/ui/acorexceptpage.ui  |6 
 editeng/source/misc/svxacorr.cxx   |8 
 include/editeng/svxacorr.hxx   |8 
 include/sfx2/docfile.hxx   |3 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 -
 sal/osl/w32/file.cxx   |2 
 sfx2/source/doc/docfile.cxx|  108 -
 sw/qa/extras/ww8import/data/tdf122425_1.doc|binary
 sw/qa/extras/ww8import/data/tdf122425_2.doc|binary
 sw/qa/extras/ww8import/ww8import.cxx   |   66 +++
 sw/source/filter/ww8/ww8graf.cxx   |1 
 sw/source/filter/ww8/ww8par.cxx|7 
 12 files changed, 200 insertions(+), 18 deletions(-)

New commits:
commit b833372df8d06c69809b656137826c3ca8dd53f8
Author: Mike Kaganski 
AuthorDate: Fri Dec 7 13:10:57 2018 +0300
Commit: Mike Kaganski 
CommitDate: Tue Jun 18 13:58:30 2019 +0200

tdf#121779: extend TWo CApitals list to also ignore sMALL iNITIALS

Now this list is used also in rules for capitalizing first letter of
every sentence, and for correcting accidental use of Caps Lock key.

Change-Id: I4fbdbccbae32743d5e9a6757344361eefd88e167
Reviewed-on: https://gerrit.libreoffice.org/64759
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Sophie Gautier 
Reviewed-by: Mike Kaganski 
(cherry picked from commit 7bf6d0d9d8e3e2e07726ca6df246619ee1ead3a3)
Reviewed-on: https://gerrit.libreoffice.org/74258
Tested-by: Mike Kaganski 

diff --git a/cui/uiconfig/ui/acorexceptpage.ui 
b/cui/uiconfig/ui/acorexceptpage.ui
index b1568fbd3bed..505457430969 100644
--- a/cui/uiconfig/ui/acorexceptpage.ui
+++ b/cui/uiconfig/ui/acorexceptpage.ui
@@ -289,7 +289,7 @@
 True
 
   
-New words with 
two initial capitals
+New words with 
two initial capitals or small initial
   
 
   
@@ -325,7 +325,7 @@
 True
 
   
-Delete words 
with two initial capitals
+Delete words 
with two initial capitals or small initial
   
 
   
@@ -394,7 +394,7 @@
   
 True
 False
-Words With TWo INitial CApitals
+Words With TWo INitial CApitals or sMALL 
iNITIAL
 
   
 
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index e1a32bb154b5..0f06586be272 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -900,6 +900,10 @@ void SvxAutoCorrect::FnCapitalStartSentence( 
SvxAutoCorrDoc& rDoc,
 return; // no valid separator -> no replacement
 }
 
+// No replacement for words in TWo INitial CApitals or sMALL iNITIAL list
+if (FindInWrdSttExceptList(eLang, OUString(pWordStt, pDelim - pWordStt)))
+return;
+
 if( bAtStart )  // at the beginning of a paragraph?
 {
 // Check out the previous paragraph, if it exists.
@@ -1114,6 +1118,10 @@ bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& 
rDoc, const OUString& rT
 aConverted.append( rCC.uppercase(OUString(rTxt[nSttPos])) );
 aConverted.append( rCC.lowercase(OUString(rTxt[nSttPos+1])) );
 
+// No replacement for words in TWo INitial CApitals or sMALL iNITIAL list
+if (FindInWrdSttExceptList(eLang, rTxt.copy(nSttPos, nEndPos - nSttPos)))
+return false;
+
 for( sal_Int32 i = nSttPos+2; i < nEndPos; ++i )
 {
 if ( IsLowerLetter(rCC.getCharacterType(rTxt, i)) )
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 988680984e12..311ed4cfadf7 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -67,7 +67,7 @@ enum class ACFlags : sal_uInt32 {
 Autocorrect  = 0x0080,   // Call AutoCorrect
 ChgQuotes= 0x0100,   // replace double quotes
 SaveWordCplSttLst= 0x0200,   // Save Auto correction of Capital 
letter at beginning of sentence.
-SaveWordWrdSttLst= 0x0400,   // Save Auto correction of 2 Capital 
letter at beginning of word.
+SaveWordWrdSttLst= 0x0400,   // Save Auto correction of TWo 
INitial CApitals or sMALL iNITIAL.
 IgnoreDoubleSpace= 0x0800,   // Ignore 2 Spaces
 ChgSglQuotes = 0x1000,   // Replace simple quotes
 CorrectCapsLock  = 0x2000,   // Correct accidental use of cAPS 
LOCK key
@@ -209,8 +209,7 @@ public:
 SvStringsISortDtor* GetCplSttExceptList();
 bool 

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

[Mike Kaganski (via logerrit)]

 sal/osl/w32/file_url.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 98cc9b6ae02dc6c10e1f24c478dfca4e128504a8
Author: Mike Kaganski 
AuthorDate: Fri Dec 14 12:44:57 2018 +0100
Commit: Mike Kaganski 
CommitDate: Tue Jun 18 13:58:36 2019 +0200

tdf#98343: ensure PathRemoveFileSpec does not remove UNC's "\\"

PathRemoveFileSpec is used exclusively in GetCaseCorrectPathName(Ex).
The GetCaseCorrectPathName function is only called for absolute or
relative paths, not some arbitrary that chunks. So initial double
backslashes are only possible for UNC paths.

This change fixes handling of UNC paths by the functions. Previously,
the UNC path was recursively shortened until it only consisted of a
single "\"; then, if bCheckExistence was requested, testing this path
failed, which resulted in the whole recursion to return empty result;
else when returning from the recursion, original path components were
appended, but initial double backslashes were never restored. This led
to transformation "\\SERVER\Path\file.ext" to "\SERVER\Path\file.ext".

The GetCaseCorrectPathName itself is only used in two places:
osl_getSystemPathFromFileURL_() and osl_getFileStatus().

osl_getSystemPathFromFileURL_ only calls GetCaseCorrectPathName for
paths longer than 248 characters; bCheckExistence is false. In that
case, the resulting wrong path (missing one initial backslash) was then
processed in /* it should be an UNC path, use the according prefix */
branch, where two initial characters of it were stripped, one of which
being the first character of SERVER name. So, all the following
manipulations with resulting path were incorrect. This code path was
the reason for the bug.

osl_getFileStatus calls GetCaseCorrectPathName always; it requires
to check existence. This led to 0 returned from GetCaseCorrectPathName,
then osl_getFileStatus continued with copying the original string, thus
ignoring the error.

Change-Id: If7409afa2c0dd6dd001c79e719acbfd271a6ab72
Reviewed-on: https://gerrit.libreoffice.org/65158
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/74257
Tested-by: Mike Kaganski 

diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index 28955cce4f3a..f2bfd8da7e0a 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -307,11 +307,12 @@ DWORD IsValidFilePath(rtl_uString *path, DWORD dwFlags, 
rtl_uString **corrected)
 return bValid ? dwPathType : PATHTYPE_ERROR;
 }
 
+// Expects a proper absolute or relative path
 static sal_Int32 PathRemoveFileSpec(LPWSTR lpPath, LPWSTR lpFileName, 
sal_Int32 nFileBufLen )
 {
 sal_Int32 nRemoved = 0;
 
-if ( nFileBufLen )
+if (nFileBufLen && wcscmp(lpPath, L"") != 0) // tdf#98343 do not 
remove leading UNC backslashes!
 {
 lpFileName[0] = 0;
 LPWSTR  lpLastBkSlash = wcsrchr( lpPath, '\\' );
@@ -361,7 +362,7 @@ static LPWSTR PathAddBackslash(LPWSTR lpPath, sal_uInt32 
nBufLen)
 return lpEndPath;
 }
 
-// Same as GetLongPathName but also 95/NT4
+// Expects a proper absolute or relative path. NB: It is different from 
GetLongPathName WinAPI!
 static DWORD GetCaseCorrectPathNameEx(
 LPWSTR  lpszPath,   // path buffer to convert
 sal_uInt32 cchBuffer,  // size of path buffer
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57b' - 3 commits - librelogo/source sfx2/source sw/inc sw/source

[Stephan Bergmann (via logerrit)]

 librelogo/source/LibreLogo/LibreLogo.py|   51 -
 sfx2/source/doc/objmisc.cxx|   13 +
 sw/inc/unosett.hxx |2 
 sw/source/core/text/porfld.cxx |4 -
 sw/source/core/text/porfld.hxx |1 
 sw/source/core/text/txtfld.cxx |   12 
 sw/source/core/unocore/unosett.cxx |   15 --
 sw/source/uibase/config/StoredChapterNumbering.cxx |2 
 8 files changed, 91 insertions(+), 9 deletions(-)

New commits:
commit 4139d4ead2a02f008b86f52b8e97d423cd1fa910
Author: Stephan Bergmann 
AuthorDate: Fri Jun 7 09:28:12 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Jun 18 14:42:26 2019 +0200

More uses of referer URL with SvxBrushItem

Reviewed-on: https://gerrit.libreoffice.org/73643
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit b518882de8213ef71a8003f95fbdf7689069c06d)
Conflicts:
sw/source/core/text/porfld.cxx
sw/source/core/unocore/unosett.cxx

Reviewed-on: https://gerrit.libreoffice.org/73860
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 87c418a98650ab6e4a62a0b4b72e02fee358dced)

Change-Id: I04b524784df4ef453d8b1feec13b62f183a17e23

diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index dff4f1f8aee0..0aa6daefce36 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -208,7 +208,7 @@ public:
 
 static css::uno::Sequence 
GetPropertiesForNumFormat(
 const SwNumFormat& rFormat, OUString const& rCharFormatName,
-OUString const* pHeadingStyleName);
+OUString const* pHeadingStyleName, OUString const & referer);
 static void SetPropertiesToNumFormat(
 SwNumFormat & aFormat,
 OUString & rCharStyleName,
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 8c489de68590..c3de3a25128e 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -756,7 +756,7 @@ SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet,
 SwGrfNumPortion::SwGrfNumPortion(
 SwFrame*,
 const OUString& rGraphicFollowedBy,
-const SvxBrushItem* pGrfBrush,
+const SvxBrushItem* pGrfBrush, OUString const & referer,
 const SwFormatVertOrient* pGrfOrient, const Size& rGrfSize,
 const bool bLft, const bool bCntr, const sal_uInt16 nMinDst,
 const bool bLabelAlignmentPosAndSpaceModeActive ) :
@@ -770,7 +770,7 @@ SwGrfNumPortion::SwGrfNumPortion(
 if( pGrfBrush )
 {
 *pBrush = *pGrfBrush;
-const Graphic* pGraph = pGrfBrush->GetGraphic();
+const Graphic* pGraph = pGrfBrush->GetGraphic(referer);
 if( pGraph )
 SetAnimated( pGraph->IsAnimated() );
 else
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index cc5e350dbefa..a4f94d5147a1 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -172,6 +172,7 @@ public:
 SwGrfNumPortion( SwFrame *pFrame,
  const OUString& rGraphicFollowedBy,
  const SvxBrushItem* pGrfBrush,
+ OUString const & referer,
  const SwFormatVertOrient* pGrfOrient,
  const Size& rGrfSize,
  const bool bLeft,
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index d024e556ea43..26725e1cba3a 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -52,6 +52,7 @@
 #include "flddat.hxx"
 #include "fmtautofmt.hxx"
 #include 
+#include 
 #include 
 
 static bool lcl_IsInBody( SwFrame *pFrame )
@@ -478,9 +479,18 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( 
SwTextFormatInfo  ) con
 
 if( SVX_NUM_BITMAP == rNumFormat.GetNumberingType() )
 {
+OUString referer;
+if (auto const sh1 = rInf.GetVsh()) {
+if (auto const doc = sh1->GetDoc()) {
+auto const sh2 = doc->GetPersist();
+if (sh2 != nullptr && sh2->HasName()) {
+referer = sh2->GetMedium()->GetName();
+}
+}
+}
 pRet = new SwGrfNumPortion( 
const_cast(GetTextFrame()),
 pTextNd->GetLabelFollowedBy(),
-rNumFormat.GetBrush(),
+rNumFormat.GetBrush(), referer,
 rNumFormat.GetGraphicOrientation(),
 rNumFormat.GetGraphicSize(),
 bLeft, bCenter, nMinDist,
diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index 81fd65d30a05..afbee31d0340 100644
--- 

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

[andreas kainz (via logerrit)]

 sc/uiconfig/scalc/ui/notebookbar.ui   |   77 
 sc/uiconfig/scalc/ui/notebookbar_compact.ui   | 8573 +-
 sd/uiconfig/sdraw/ui/notebookbar_compact.ui   | 1840 +++--
 sw/uiconfig/swriter/ui/notebookbar_compact.ui | 4529 +
 sw/uiconfig/swriter/ui/notebookbar_single.ui  |2 
 5 files changed, 10044 insertions(+), 4977 deletions(-)

New commits:
commit c928f35216be0f9bdfc5874b4e5a05fd42acb4d2
Author: andreas kainz 
AuthorDate: Tue Jun 18 05:12:43 2019 +0200
Commit: andreas_kainz 
CommitDate: Tue Jun 18 15:19:11 2019 +0200

NB tabbed compact big update and syncronisation between apps

Change-Id: Ie1178e1e36334b35c7a00b2ec918c79041150c80
Reviewed-on: https://gerrit.libreoffice.org/74268
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 1f2bc634cd48e6f093fa6821253bd18621eaa1e3)
Reviewed-on: https://gerrit.libreoffice.org/74273

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 42032e62c55d..a760853e0898 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1769,6 +1769,26 @@
   
 
 
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:GoalSeekDialog
+  
+
+
+  
+True
+False
+.uno:SolverDialog
+  
+
+
   
 True
 False
@@ -1789,6 +1809,12 @@
   
 
 
+  
+True
+False
+  
+
+
   
 True
 False
@@ -1796,23 +1822,37 @@
   
 
 
+  
+True
+False
+.uno:ClearArrowPrecedents
+  
+
+
+  
+True
+False
+.uno:ClearArrowDependents
+  
+
+
   
 True
 False
   
 
 
-  
+  
 True
 False
-.uno:GoalSeekDialog
+.uno:ShowErrors
   
 
 
-  
+  
 True
 False
-.uno:SolverDialog
+.uno:RefreshArrows
   
 
 
@@ -1822,6 +1862,33 @@
   
 
 
+  
+True
+False
+.uno:AuditingFillMode
+  
+
+
+  
+True
+False
+.uno:AutoRefreshArrows
+  
+
+
+  
+True
+False
+.uno:ShowInvalid
+  
+
+
+  
+True
+False
+  
+
+
   
 True
 False
@@ -1829,7 +1896,7 @@
   
 
 
-  
+  
 True
 False
   
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index 9c307b5df5eb..0e634a827f17 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -1837,126 +1837,185 @@
 True
 False
 
-  
+  
 True
 False
-.uno:MacroOrganizer?TabId:short=1
+.uno:MacroRecorder
   
 
 
-  
+  
 True
 False
-.uno:MacroSignature
+.uno:RunMacro
+  
+
+
+  
+True
+False
+.uno:BasicIDEAppear
+  
+
+
+  
+True
+False
+.uno:MacroOrganizer?TabId:short=1
   
 
 
-  
+  
 True
 False
 .uno:ScriptOrganizer
   
 
 
-  
+  
 True
 False
-.uno:ViewDataSourceBrowser
+.uno:MacroSignature
   
 
 
-  
+  
 True
 False
-.uno:BasicIDEAppear
   
 
 
-  
+  
 True
 False
-.uno:RunMacro
+.uno:GoalSeekDialog
   
 
 
-  
+  
 True
 False
-.uno:MacroRecorder
+.uno:SolverDialog
   
 
 
-  
+  
 True
 False
   
 
 
-  
+  
 True
 False
 .uno:ShowPrecedents
   
 
 
-  
+  
 True
 False
 .uno:ShowDependents
   
 
 
-  
+  
+True
+False
+  
+
+
+  
 True
 False
 .uno:ClearArrows
   
 
 
-  
+  
 True
 False
+.uno:ClearArrowPrecedents
   
 
 
-  
+  
 True
 False
-.uno:GoalSeekDialog
+.uno:ClearArrowDependents
   
 
 
-  
+  
 True
 False
-.uno:SolverDialog
   
 
 
-  
+  
 True
 False
+.uno:ShowErrors
   
 
 
-  
+  
+True
+False
+.uno:RefreshArrows
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:AuditingFillMode
+  
+
+
+  
+True
+False
+

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-4-1-6+backports' - 2 commits - python3/ExternalPackage_python3.mk scripting/source

[Xisco Fauli (via logerrit)]

 python3/ExternalPackage_python3.mk   |1 +
 scripting/source/pyprov/mailmerge.py |5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d2ce23fcb27bcdbf4883950b1cd8dcf830d4b3fd
Author: Xisco Fauli 
AuthorDate: Mon Oct 30 11:13:06 2017 +0100
Commit: Michael Weghorn 
CommitDate: Tue Jun 18 13:25:26 2019 +

mailmerge.py: Use strip in server name

Using spaces in the dialog might lead to  incorrect server name
Reviewed-on: https://gerrit.libreoffice.org/44052
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

(cherry picked from commit 55ad93f29b1be106a7b475f92202ece3589584d8)

Change-Id: If057d0bf8dea55ccddfab8e0f21c8ef16d87dc92
Reviewed-on: https://gerrit.libreoffice.org/74187
Reviewed-by: Michael Weghorn 
Tested-by: Michael Weghorn 
(cherry picked from commit 6a3c5250066188f127c5445ae1224e19e20ce33a)

diff --git a/scripting/source/pyprov/mailmerge.py 
b/scripting/source/pyprov/mailmerge.py
index e0dd1b5154f6..ed20e625aaeb 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -84,7 +84,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
self.connectioncontext = xConnectionContext
if dbg:
print("PyMailSMTPService connect", file=dbgout)
-   server = xConnectionContext.getValueByName("ServerName")
+   server = xConnectionContext.getValueByName("ServerName").strip()
if dbg:
print("ServerName: " + server, file=dbgout)
port = int(xConnectionContext.getValueByName("Port"))
@@ -398,7 +398,7 @@ class PyMailPOP3Service(unohelper.Base, XMailService):
print("Timeout: " + str(tout), file=dbgout)
self.server = poplib.POP3(server, port, timeout=tout)
print("AFTER", file=dbgout)
-   
+
user = xAuthenticator.getUserName()
password = xAuthenticator.getPassword()
if sys.version < '3': # fdo#59249 i#105669 Python 2 needs 
"ascii"
commit a3d465a40c3eb1cb8c4ce9efbf7c8394fb19991b
Author: Julien Nabet 
AuthorDate: Sun Dec 18 19:17:53 2016 +0100
Commit: Michael Weghorn 
CommitDate: Tue Jun 18 13:25:25 2019 +

tdf#103363: add unicodedata and import idna encoding for mailmerge

Thank you Moggi for your help on how to add unicodedata module to Python!

Reviewed-on: https://gerrit.libreoffice.org/32140
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 
(cherry picked from commit 486efbfc74890582b16f858b8e937d4ae9b66f64)

Reviewed-on: https://gerrit.libreoffice.org/74186
Reviewed-by: Michael Weghorn 
Tested-by: Michael Weghorn 
(cherry picked from commit 6459ec8046231e258d380efcdaac0a5def23276f)

 Conflicts:
external/python3/ExternalPackage_python3.mk

Change-Id: I1b5b0cb622eb9663d836b773d44a05efc9a59535

diff --git a/python3/ExternalPackage_python3.mk 
b/python3/ExternalPackage_python3.mk
index 3a36d4e33fde..ed758725e7d3 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -109,6 +109,7 @@ $(eval $(call 
gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/

LO_lib/_testbuffer.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \

LO_lib/_testcapi.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
LO_lib/time.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+   
LO_lib/unicodedata.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
LO_lib/zlib.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
 ))
 endif
diff --git a/scripting/source/pyprov/mailmerge.py 
b/scripting/source/pyprov/mailmerge.py
index 3cfb6d3175eb..e0dd1b5154f6 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -17,6 +17,7 @@ import unohelper
 import uno
 import re
 import os
+import encodings.idna
 
 #to implement com::sun::star::mail::XMailServiceProvider
 #and
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 writerfilter/source/dmapper/SettingsTable.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit d56be0923966deab3f49bc460a5d233d1301430f
Author: László Németh 
AuthorDate: Thu Jun 13 08:44:04 2019 +0200
Commit: Xisco Faulí 
CommitDate: Tue Jun 18 15:34:29 2019 +0200

tdf#89991 DOCX: import Show changes from older formats

w:formatting is optional, w:markup can be instead of w:insDel, too.

Change-Id: Ic689499a880dcc7c97497e4381dff31610f745bf
Reviewed-on: https://gerrit.libreoffice.org/73943
Reviewed-by: Justin Luth 
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 8b3c861c46ae12d21b7b3a550e2daa21d2006b77)
Reviewed-on: https://gerrit.libreoffice.org/74274
Reviewed-by: Xisco Faulí 

diff --git a/writerfilter/source/dmapper/SettingsTable.cxx 
b/writerfilter/source/dmapper/SettingsTable.cxx
index 609173eefd0b..8be0c6c0f114 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -236,6 +236,7 @@ struct SettingsTable_Impl
 boolm_bRecordChanges;
 boolm_bShowInsDelChanges;
 boolm_bShowFormattingChanges;
+boolm_bShowMarkupChanges;
 boolm_bLinkStyles;
 sal_Int16   m_nZoomFactor;
 sal_Int16 m_nZoomType = 0;
@@ -266,7 +267,8 @@ struct SettingsTable_Impl
   m_nDefaultTabStop( 720 ) //default is 1/2 in
 , m_bRecordChanges(false)
 , m_bShowInsDelChanges(true)
-, m_bShowFormattingChanges(true)
+, m_bShowFormattingChanges(false)
+, m_bShowMarkupChanges(true)
 , m_bLinkStyles(false)
 , m_nZoomFactor(0)
 , m_nView(0)
@@ -383,6 +385,9 @@ void SettingsTable::lcl_attribute(Id nName, Value & val)
 case NS_ooxml::LN_CT_TrackChangesView_formatting:
 m_pImpl->m_bShowFormattingChanges = (nIntValue != 0);
 break;
+case NS_ooxml::LN_CT_TrackChangesView_markup:
+m_pImpl->m_bShowMarkupChanges = (nIntValue != 0);
+break;
 default:
 {
 #ifdef DBG_UTIL
@@ -648,7 +653,10 @@ void 
SettingsTable::ApplyProperties(uno::Reference const& x
 
 // Show changes value
 if (xDocProps.is())
-xDocProps->setPropertyValue("ShowChanges", uno::makeAny( 
m_pImpl->m_bShowInsDelChanges || m_pImpl->m_bShowFormattingChanges ) );
+{
+bool bHideChanges = !m_pImpl->m_bShowInsDelChanges || 
!m_pImpl->m_bShowMarkupChanges;
+xDocProps->setPropertyValue("ShowChanges", uno::makeAny( !bHideChanges 
|| m_pImpl->m_bShowFormattingChanges ) );
+}
 
 // Record changes value
 if (xDocProps.is())
___
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' - 2 commits - oox/source sd/qa sw/qa writerfilter/source

[Miklos Vajna (via logerrit)]

 oox/source/export/drawingml.cxx   |   59 --
 sd/qa/unit/export-tests-ooxml1.cxx|   34 
 sd/qa/unit/import-tests.cxx   |   33 
 sw/qa/extras/uiwriter/uiwriter.cxx|   10 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |1 
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |4 +
 writerfilter/source/dmapper/PropertyMap.cxx   |   11 ++--
 7 files changed, 110 insertions(+), 42 deletions(-)

New commits:
commit 15395a58feec2e2b00dc3186cbc5713376c796bd
Author: Miklos Vajna 
AuthorDate: Wed Mar 13 17:51:07 2019 +0100
Commit: Miklos Vajna 
CommitDate: Tue Jun 18 15:43:11 2019 +0200

DOCX import: fix unexpected page break on autotext insert at end of doc

The problem was that the page style was set on the first paragraph,
which means a page break on the UI. So if you used a multi-paragraph
autotext twice (insert autotext, press enter, insert autotext again)
then you ended up with 2 pages instead of just 1.

Fix the problem by tracking when we are in autotext import mode, and
similar to pasting, don't set the page style in autotext import mode.

Change-Id: I4fc551b3c1b999687eb80242e261f186fd1b6f13
Reviewed-on: https://gerrit.libreoffice.org/69214
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit adcf656bb56e09fbb638a44b096f8cfced7f)

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index e16e78beba22..c734ba823f6e 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1021,7 +1021,15 @@ void SwUiWriterTest::testDOCXAutoTextMultiple()
 
 // first line
 SwNode& rNode = aStart.GetNode();
-CPPUNIT_ASSERT_EQUAL(OUString("Another "), rNode.GetTextNode()->GetText());
+CPPUNIT_ASSERT(rNode.IsTextNode());
+SwTextNode& rTextNode = *rNode.GetTextNode();
+CPPUNIT_ASSERT_EQUAL(OUString("Another "), rTextNode.GetText());
+
+// Make sure that autotext does not set a custom page style, leading to an 
unexpected page break
+// on insertion.
+// Without the accompanying fix in place, this test would have failed: the 
text node had an
+// attribute set containing a page style item.
+CPPUNIT_ASSERT(!rTextNode.HasSwAttrSet() || 
!rTextNode.GetSwAttrSet().HasItem(RES_PAGEDESC));
 
 // last line
 SwNodeIndex aLast(*aDocEnd.GetNode().EndOfSectionNode(), -1);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 4a700758a574..5d2272cdc5bc 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -239,6 +239,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_aSmartTagHandler(m_xComponentContext, m_xTextDocument),
 
m_xInsertTextRange(rMediaDesc.getUnpackedValueOrDefault("TextInsertModeRange", 
uno::Reference())),
 m_bIsNewDoc(!rMediaDesc.getUnpackedValueOrDefault("InsertMode", 
false)),
+
m_bIsReadGlossaries(rMediaDesc.getUnpackedValueOrDefault("ReadGlossaries", 
false)),
 m_bInTableStyleRunProps(false),
 m_nTableDepth(0),
 m_nTableCellDepth(0),
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 5d6f634bad10..52aeb82ab378 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -550,6 +550,7 @@ public:
 css::uno::Reference m_xInsertTextRange;
 private:
 bool const m_bIsNewDoc;
+bool const m_bIsReadGlossaries;
 public:
 DomainMapper_Impl(
 DomainMapper& rDMapper,
@@ -918,6 +919,9 @@ public:
 /// If we're importing into a new document, or just pasting to an existing 
one.
 bool IsNewDoc() { return m_bIsNewDoc;}
 
+/// If we're importing autotext.
+bool IsReadGlossaries() { return m_bIsReadGlossaries;}
+
 /// If we're inside , inside 
 bool m_bInTableStyleRunProps;
 
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index e965db4f919b..9bc6e3a8780c 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1585,10 +1585,13 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl& rDM_Impl )
 
 if ( xRangeProperties.is() && rDM_Impl.IsNewDoc() )
 {
-xRangeProperties->setPropertyValue(
-getPropertyName( PROP_PAGE_DESC_NAME ),
-uno::makeAny( m_bTitlePage ? m_sFirstPageStyleName
-: m_sFollowPageStyleName ) );
+// Avoid setting page style in case of autotext: so inserting 
the autotext at the
+// end of the document does not introduce an unwanted page 
break.
+if 

[Libreoffice-bugs] [Bug 101107] Editing Connectors seems to mess with LightDM - Affects all other apps on the PC

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=101107

Heiko Tietze  changed:

   What|Removed |Added

URL|http://abtrainings.com/cour |
   |ses/power-bi-online-trainin |
   |g   |

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 125988] Menubar is broken after open a DOC file

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=125988

--- Comment #1 from Volga  ---
Created attachment 152273
  --> https://bugs.documentfoundation.org/attachment.cgi?id=152273=edit
Snapshot

Let’s see what happened to me.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 107733] [META] Hyperlink bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=107733
Bug 107733 depends on bug 111707, which changed state.

Bug 111707 Summary: EDITING: No Remove Hyperlink option (in context menu) in 
Impress
https://bugs.documentfoundation.org/show_bug.cgi?id=111707

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 125647] Bad error message with disabled Java

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=125647

--- Comment #1 from Kenneth  ---
I notice that the Whiteboard was changed to "QA:needsComment".  Is this a
comment you need from me?

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 125167] Chart Position and Size dialog—Adapt options grayed out--delete?

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=125167

--- Comment #9 from Jacques Guilleron  ---
Created attachment 152274
  --> https://bugs.documentfoundation.org/attachment.cgi?id=152274=edit
Modified attachment

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 118856] Text flickering when highlighting text in about us windows

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=118856

V Stuart Foote  changed:

   What|Removed |Added

 Blocks||91488


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=91488
[Bug 91488] [META] RenderContext related issues
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 125989] With default rendering, palette swatches of the Color picker flicker on mouse over

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=125989

--- Comment #2 from V Stuart Foote  ---
regards the Draw 'Color bar'

/me embarrassed, if using the scroll bar or actually clicking to change a color
swatch the 'Color bar' flickers. Weird because mouse over does have an action
(i.e. popping out tooltip with color) but it does not seem to refresh elements
on the toolbar. A pick or using the scrollbar to reposition does, and flickers.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 125994] New: Setting Impress Animation effects causes incorrect functionality

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=125994

Bug ID: 125994
   Summary: Setting Impress Animation effects causes incorrect
functionality
   Product: LibreOffice
   Version: 6.1.6.3 release
  Hardware: Other
OS: Mac OS X (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Impress
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: m...@ianmacg.plus.com

Description:
Unable to set Animation effect options to get the presentation to behave as I
want.  Change one attribute and others seem to reset.  Most bizarre example is
setting appear effect option to "as one object" and clicking OK causes the
entire effect to be removed.

Steps to Reproduce:
1.See description.  Objects for which animation settings attempted are main two
content text blocks.

Actual Results:
See description

Expected Results:
What the effect setting indicates.


Reproducible: Always


User Profile Reset: No



Additional Info:
[Information automatically included from LibreOffice]
Locale: en-US
Module: PresentationDocument
[Information guessed from browser]
OS: Mac OS X (All)
OS is 64bit: no

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 125990] FILEOPEN DOCX Deleted non-numbered paragraph gets numbering from subsequent numbered paragraph

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=125990

--- Comment #1 from NISZ LibreOffice Team  ---
Created attachment 152276
  --> https://bugs.documentfoundation.org/attachment.cgi?id=152276=edit
Screenshot of the original document side by side in Word and Writer

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 125990] New: FILEOPEN DOCX Deleted non-numbered paragraph gets numbering from subsequent numbered paragraph

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=125990

Bug ID: 125990
   Summary: FILEOPEN DOCX Deleted non-numbered paragraph gets
numbering from subsequent numbered paragraph
   Product: LibreOffice
   Version: 6.3.0.0.alpha1+
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: libreoff...@nisz.hu

Created attachment 152275
  --> https://bugs.documentfoundation.org/attachment.cgi?id=152275=edit
Example file from Word

In the attached file there are some deleted change tracked, numbered
paragraphs. If the numbered paragraph is deleted with the preceding one in one
step in Word, the preceding paragraph gets the numbering setting too.


Steps to reproduce:
1. Create some numbered paragraphs in Word
2. Enable change tracking and delete them along the previous paragraph
3. Save the file and open it in Writer

Actual results:
The preceding paragraph gets numbered formatting.

Expected results:
The preceding paragraph stays unnumbered.

LibreOffice details:
Version: 6.4.0.0.alpha0+ (x86)
Build ID: 99971d009e9c96d1d47aec14ecfbfeaa06dc140d
CPU threads: 4; OS: Windows 6.3; UI render: default; VCL: win; 
TinderBox: Win-x86@42, Branch:master, Time: 2019-06-18_03:59:27
Locale: hu-HU (hu_HU); UI-Language: en-US
Calc: CL

Bibisected to: 
URL:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=cbd894925e6b9869baedcd6476484c14d3a3df87
 

author
László Németh 
2019-05-22 16:30:02 +0200
committer
László Németh 
2019-05-24 15:09:00 +0200

tdf#125319 DOCX track changes: don't change numbering

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 125989] With default rendering, palette swatches of the Color picker flicker on mouse over

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=125989

V Stuart Foote  changed:

   What|Removed |Added

 Blocks||91488


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=91488
[Bug 91488] [META] RenderContext related issues
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 125991] New: Cant open a new ods file if one is already opened

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=125991

Bug ID: 125991
   Summary: Cant open a new ods file if one is already opened
   Product: LibreOffice
   Version: 6.2.4.2 release
  Hardware: x86-64 (AMD64)
OS: Linux (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Calc
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: reso...@numericable.fr

When calc has already an ods file opened, and you try to open an other ods
file, it fails to load it:

scenario:
- open an ods file with calc; do some job and save it
- try to open an other ods file

What happen:
- get a flashing 'libreoffice' logo 
- cpu is fully using frequency, but not full cores power
- log is flooded with:

AVC apparmor="ALLOWED" operation="open" profile="libreoffice-soffice"
name="/home/oem/.cache/mesa_shader_cache/index" pid=28606 comm="soffice.bin"
requested_mask="wrc" denied_mask="wrc" fsuid=1000 ouid=1000

 audit: type=1400 audit(1560867555.448:41): apparmor="ALLOWED" operation="open"
profile="libreoffice-soffice" name="/home/oem/.cache/mesa_shader_cache/index"
pid=28619 comm="soffice.bin" requested_mask="wrc" denied_mask="wrc" fsuid=1000
ouid=1000

Need to kill the soffice.bin processes

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs