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

[Libreoffice Gerrit user]

 0 files changed

New commits:
commit ba259064a0301a1b2fc17064be2724f61bd12f9b
Author: Andrea Gelmini 
AuthorDate: Thu Aug 30 17:26:04 2018 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 31 08:54:33 2018 +0200

Removed execution flag on xlsx file

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

diff --git a/sc/qa/unit/data/xlsx/testShapeAutofit.xlsx 
b/sc/qa/unit/data/xlsx/testShapeAutofit.xlsx
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[no subject]

[Nidhin Mahesh]

Hey all, I  am Nidhin Mahesh, B.Tech pre-final year student in Computer Science 
and Engineering, Amrita Vishwa Vidyapeetham. I am interested in working for 
open source projects. I am a beginner in open source contribution.

 I am a writer for Towards Data Science publications and worked on technologies 
like Android, Flutter, Tensorflow, Vue.js, Postgres, and familiar with Java, C 
and Python.

 Contributors here please help me to start with this Org.

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

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

[Libreoffice Gerrit user]

 editeng/source/items/frmitems.cxx   |2 +-
 svx/source/unodraw/unoshap2.cxx |2 +-
 sw/source/core/unocore/unoframe.cxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 49d1a2f70bb8c099f1a950e5ad9f805d252ea342
Author: Julien Nabet 
AuthorDate: Fri Aug 31 07:32:43 2018 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 31 08:41:07 2018 +0200

Fix syntax

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

diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index f66dfff63a63..e690d36ffb85 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3316,7 +3316,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 
nMemberId ) const
 
 case MID_GRAPHIC_URL:
 {
-throw uno::RuntimeException("Getting from this property is not 
unsupported");
+throw uno::RuntimeException("Getting from this property is not 
supported");
 }
 break;
 case MID_GRAPHIC:
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 459353b72a73..c13b75661df2 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1450,7 +1450,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const 
OUString& rName, const SfxIte
 
 case OWN_ATTR_GRAPHIC_URL:
 {
-throw uno::RuntimeException("Getting from this property is not 
unsupported");
+throw uno::RuntimeException("Getting from this property is not 
supported");
 break;
 }
 
diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index 15f4b88b01f8..d8f7f1ac7053 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2056,7 +2056,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& 
rPropertyName)
 }
 else if( FN_UNO_GRAPHIC_URL == pEntry->nWID )
 {
-throw uno::RuntimeException("Getting from this property is not 
unsupported");
+throw uno::RuntimeException("Getting from this property is not 
supported");
 }
 else if( FN_UNO_GRAPHIC == pEntry->nWID )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/ui/docshell/dbdocfun.cxx |   26 +-
 sc/source/ui/docshell/dbdocimp.cxx |9 +
 sc/source/ui/docshell/docsh5.cxx   |8 
 sc/source/ui/inc/undodat.hxx   |   12 ++--
 sc/source/ui/undo/undodat.cxx  |   30 +++---
 sc/source/ui/view/dbfunc3.cxx  |   20 ++--
 6 files changed, 53 insertions(+), 52 deletions(-)

New commits:
commit df26410a52419707590fdf62dc043d13b79ada81
Author: Noel Grandin 
AuthorDate: Thu Aug 30 11:26:21 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 31 08:23:20 2018 +0200

pass ScDBData by std::unique_ptr

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

diff --git a/sc/source/ui/docshell/dbdocfun.cxx 
b/sc/source/ui/docshell/dbdocfun.cxx
index 5c324bab714a..f6c3a95b4c2e 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -343,8 +343,8 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool 
bApi, bool bIsUnnamed,
 
 ScDocumentUniquePtr pUndoDoc;
 ScOutlineTable* pUndoTab = nullptr;
-ScRangeName* pUndoRange = nullptr;
-ScDBCollection* pUndoDB = nullptr;
+std::unique_ptr pUndoRange;
+std::unique_ptr pUndoDB;
 
 if (bRecord)
 {
@@ -381,10 +381,10 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool 
bApi, bool bIsUnnamed,
 //  ranges of DB and other
 ScRangeName* pDocRange = rDoc.GetRangeName();
 if (!pDocRange->empty())
-pUndoRange = new ScRangeName( *pDocRange );
+pUndoRange.reset(new ScRangeName( *pDocRange ));
 ScDBCollection* pDocDB = rDoc.GetDBCollection();
 if (!pDocDB->empty())
-pUndoDB = new ScDBCollection( *pDocDB );
+pUndoDB.reset(new ScDBCollection( *pDocDB ));
 }
 
 if (bSort && bSubTotal)
@@ -449,7 +449,7 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool 
bApi, bool bIsUnnamed,
 //nCurX, nCurY,
 nStartCol, nStartRow,
 std::move(pUndoDoc), pUndoTab,
-pUndoRange, pUndoDB,
+std::move(pUndoRange), 
std::move(pUndoDB),
 pOld, pNew ) );
 }
 
@@ -737,7 +737,7 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& 
rQueryParam,
 }
 
 ScDocumentUniquePtr pUndoDoc;
-ScDBCollection* pUndoDB = nullptr;
+std::unique_ptr pUndoDB;
 const ScRange* pOld = nullptr;
 
 if ( bRecord )
@@ -766,7 +766,7 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& 
rQueryParam,
 
 ScDBCollection* pDocDB = rDoc.GetDBCollection();
 if (!pDocDB->empty())
-pUndoDB = new ScDBCollection( *pDocDB );
+pUndoDB.reset(new ScDBCollection( *pDocDB ));
 
 rDoc.BeginDrawUndo();
 }
@@ -930,7 +930,7 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& 
rQueryParam,
 {
 // create undo action after executing, because of drawing layer undo
 rDocShell.GetUndoManager()->AddUndoAction(
-new ScUndoQuery( &rDocShell, nTab, rQueryParam, 
std::move(pUndoDoc), pUndoDB,
+new ScUndoQuery( &rDocShell, nTab, rQueryParam, 
std::move(pUndoDoc), std::move(pUndoDB),
 pOld, bDoSize, pAdvSource ) );
 }
 
@@ -1029,8 +1029,8 @@ void ScDBDocFunc::DoSubTotals( SCTAB nTab, const 
ScSubTotalParam& rParam,
 ScSubTotalParam aNewParam( rParam );// end of range is being 
changed
 ScDocumentUniquePtr pUndoDoc;
 std::unique_ptr pUndoTab;
-ScRangeName*pUndoRange = nullptr;
-ScDBCollection* pUndoDB = nullptr;
+std::unique_ptr pUndoRange;
+std::unique_ptr pUndoDB;
 
 if (bRecord)// secure old data
 {
@@ -1067,10 +1067,10 @@ void ScDBDocFunc::DoSubTotals( SCTAB nTab, const 
ScSubTotalParam& rParam,
 //  ranges of DB and other
 ScRangeName* pDocRange = rDoc.GetRangeName();
 if (!pDocRange->empty())
-pUndoRange = new ScRangeName( *pDocRange );
+pUndoRange.reset(new ScRangeName( *pDocRange ));
 ScDBCollection* pDocDB = rDoc.GetDBCollection();
 if (!pDocDB->empty())
-pUndoDB = new ScDBCollection( *pDocDB );
+pUndoDB.reset(new ScDBCollection( *pDocDB ));
 }
 
 //  rDoc.SetOutlineTable( nTab, NULL );
@@ -,7 +,7 @@ void ScDBDocFunc::DoSubTotals( SCTAB nTa

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

[Libreoffice Gerrit user]

 sc/source/ui/docshell/docsh5.cxx |8 
 sc/source/ui/inc/undodat.hxx |4 ++--
 sc/source/ui/undo/undodat.cxx|   10 +-
 sc/source/ui/view/viewfun3.cxx   |8 
 4 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 418e6419219a7ffa61b7400abbbcec6a6a93b91f
Author: Noel Grandin 
AuthorDate: Thu Aug 30 10:49:19 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Aug 31 08:22:18 2018 +0200

pass ScDocument by ScDocumentUniquePtr

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

diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index 32f842080a0a..95106e21676f 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -577,7 +577,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& 
rParam, bool bRecord )
 ScOutlineTable* pTable = m_aDocument.GetOutlineTable( nDestTab );
 ScOutlineTable* pUndoTab = pTable ? new ScOutlineTable( *pTable ) 
: nullptr;
 
-ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
+ScDocumentUniquePtr pUndoDoc(new ScDocument( SCDOCMODE_UNDO ));
 pUndoDoc->InitUndo( &m_aDocument, 0, nTabCount-1, false, true );
 
 // row state
@@ -598,12 +598,12 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& 
rParam, bool bRecord )
 m_aDocument.CopyToDocument(aOldDest, InsertDeleteFlags::ALL, 
false, *pUndoDoc);
 
 GetUndoManager()->AddUndoAction(
-new ScUndoConsolidate( this, aDestArea, rParam, pUndoDoc,
+new ScUndoConsolidate( this, aDestArea, rParam, 
std::move(pUndoDoc),
 true, nInsertCount, pUndoTab, 
pUndoData ) );
 }
 else
 {
-ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
+ScDocumentUniquePtr pUndoDoc(new ScDocument( SCDOCMODE_UNDO ));
 pUndoDoc->InitUndo( &m_aDocument, aDestArea.nTab, aDestArea.nTab );
 
 m_aDocument.CopyToDocument(aDestArea.nColStart, 
aDestArea.nRowStart, aDestArea.nTab,
@@ -615,7 +615,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& 
rParam, bool bRecord )
 m_aDocument.CopyToDocument(aOldDest, InsertDeleteFlags::ALL, 
false, *pUndoDoc);
 
 GetUndoManager()->AddUndoAction(
-new ScUndoConsolidate( this, aDestArea, rParam, pUndoDoc,
+new ScUndoConsolidate( this, aDestArea, rParam, 
std::move(pUndoDoc),
 false, 0, nullptr, pUndoData ) );
 }
 }
diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index edb6599f6319..2464f098b8e3 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -370,7 +370,7 @@ class ScUndoConsolidate: public ScSimpleUndo
 public:
 ScUndoConsolidate(ScDocShell* pNewDocShell,
   const ScArea& rArea, const ScConsolidateParam& rPar,
-  ScDocument* pNewUndoDoc, bool bReference,
+  ScDocumentUniquePtr pNewUndoDoc, bool bReference,
   SCROW nInsCount, ScOutlineTable* pTab,
   ScDBData* pData);
 
@@ -430,7 +430,7 @@ public:
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
const ScMarkData& rMark,
-   ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
+   ScDocumentUniquePtr pNewUndoDoc, ScDocumentUniquePtr 
pNewRedoDoc,
std::unique_ptr pRefData);
 virtual voidUndo() override;
 virtual voidRedo() override;
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 9f2a204e6b5b..f258c8ecfdf1 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -1523,12 +1523,12 @@ bool ScUndoDataPilot::CanRepeat(SfxRepeatTarget& /* 
rTarget */) const
 }
 
 ScUndoConsolidate::ScUndoConsolidate( ScDocShell* pNewDocShell, const ScArea& 
rArea,
-const ScConsolidateParam& rPar, ScDocument* pNewUndoDoc,
+const ScConsolidateParam& rPar, ScDocumentUniquePtr 
pNewUndoDoc,
 bool bReference, SCROW nInsCount, ScOutlineTable* pTab,
 ScDBData* pData )
 : ScSimpleUndo(pNewDocShell)
 , aDestArea(rArea)
-, xUndoDoc(pNewUndoDoc)
+, xUndoDoc(std::move(pNewUndoDoc))
 , aParam(rPar)
 , bInsRef(bReference)
 , nInsertCount(nInsCount)
@@ -1732,12 +1732,12 @@ ScUndoDataForm::ScUndoDataForm( ScDocShell* 
pNewDocShell,
 SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
 SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
  

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

[Libreoffice Gerrit user]

 external/boost/msvc2017.patch.0 |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0cf0847b81ed48de01e66565d794ebbd9c663e79
Author: Stephan Bergmann 
AuthorDate: Thu Aug 30 18:21:01 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 31 08:19:14 2018 +0200

cl version 19.15.26726 (VS 2017 15.8.1) still produces those warnings

...see d84bf553afa510e5c674817fa480ac0af62e4945 "Silence external/boost
deprecated std::iterator warnings with MSVC 2017"

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

diff --git a/external/boost/msvc2017.patch.0 b/external/boost/msvc2017.patch.0
index a032557542c9..525f3c95cbab 100644
--- a/external/boost/msvc2017.patch.0
+++ b/external/boost/msvc2017.patch.0
@@ -4,7 +4,7 @@
  // Helper types
  
  //! Base iterator.
-+#if defined _MSC_VER && !defined __clang__ && _MSC_VER == 1914
++#if defined _MSC_VER && !defined __clang__ && _MSC_VER >= 1914
 +#pragma warning(push)
 +#pragma warning(disable: 4996)
 +#endif
@@ -14,7 +14,7 @@
  typename Traits::difference_type,
  typename Traits::pointer,
  typename Traits::reference> base_iterator;
-+#if defined _MSC_VER && !defined __clang__ && _MSC_VER == 1914
++#if defined _MSC_VER && !defined __clang__ && _MSC_VER >= 1914
 +#pragma warning(pop)
 +#endif
  
@@ -26,12 +26,12 @@
  namespace boost
  {
  
-+#if defined _MSC_VER && !defined __clang__ && _MSC_VER == 1914
++#if defined _MSC_VER && !defined __clang__ && _MSC_VER >= 1914
 +#pragma warning(push)
 +#pragma warning(disable: 4996)
 +#endif
  using std::iterator;
-+#if defined _MSC_VER && !defined __clang__ && _MSC_VER == 1914
++#if defined _MSC_VER && !defined __clang__ && _MSC_VER >= 1914
 +#pragma warning(pop)
 +#endif
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 chart2/source/inc/ExplicitCategoriesProvider.hxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 63aa373631a192f261b0e5cb603357f5e9822efa
Author: Stephan Bergmann 
AuthorDate: Thu Aug 30 18:16:50 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 31 08:18:54 2018 +0200

XLabeledDataSequence would need to be a complete type

...when MSVC creates ExplicitCategoriesProvider's implicit copy functions 
(and
--disable-pch doesn't happen to include the definition of 
XLabeledDataSequence
anyway).  Easiest fix is to explicitly delete those (apparently unused) copy
functions.

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

diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx 
b/chart2/source/inc/ExplicitCategoriesProvider.hxx
index 154a85b78fb4..fef7c873737c 100644
--- a/chart2/source/inc/ExplicitCategoriesProvider.hxx
+++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx
@@ -89,7 +89,10 @@ public:
 bool isDateAxis();
 const std::vector< double >&  getDateCategories();
 
-private: //member
+private:
+ExplicitCategoriesProvider(ExplicitCategoriesProvider &) = delete;
+void operator =(ExplicitCategoriesProvider) = delete;
+
 bool volatile m_bDirty;
 css::uno::WeakReference< css::chart2::XCoordinateSystem >   m_xCooSysModel;
 ChartModel& mrModel;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/source/filter/eppt/pptx-animations.cxx |   15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 7321d7e34f8e2e886f11764cc432755040ea24cc
Author: Mark Hung 
AuthorDate: Thu Aug 30 18:13:15 2018 +0800
Commit: Mark Hung 
CommitDate: Fri Aug 31 07:44:39 2018 +0200

sd/pptx export: remove parameter that is always true.

Caller of WriteAnimationNodeCommonPropsStart always
pass true for parameter bSingle.

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

diff --git a/sd/source/filter/eppt/pptx-animations.cxx 
b/sd/source/filter/eppt/pptx-animations.cxx
index bce9b1079732..3f7600fc74ce 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -461,7 +461,7 @@ class PPTXAnimationExport
 void WriteAnimationNodeSeq(const Reference& rXNode, bool 
bMainSeqChild);
 void WriteAnimationNodeEffect(const Reference& rXNode, 
bool bMainSeqChild);
 void WriteAnimationNodeCommand(const Reference& rXNode, 
bool bMainSeqChild);
-void WriteAnimationNodeCommonPropsStart(const Reference& 
rXNode, bool bSingle,
+void WriteAnimationNodeCommonPropsStart(const Reference& 
rXNode,
 bool bMainSeqChild);
 void WriteAnimationTarget(const Any& rTarget);
 
@@ -694,7 +694,7 @@ void 
PPTXAnimationExport::WriteAnimationNodeAnimateInside(const ReferencestartElementNS(XML_p, XML_cBhvr, XML_additive, pAdditive, FSEND);
-WriteAnimationNodeCommonPropsStart(rXNode, true, bMainSeqChild);
+WriteAnimationNodeCommonPropsStart(rXNode, bMainSeqChild);
 
 Reference xIterate(rXNode->getParent(), UNO_QUERY);
 WriteAnimationTarget(xIterate.is() ? xIterate->getTarget() : 
rXAnimate->getTarget());
@@ -730,7 +730,7 @@ void 
PPTXAnimationExport::WriteAnimationNodeAnimateInside(const Reference& rXNode, bool bSingle, bool bMainSeqChild)
+const Reference& rXNode, bool bMainSeqChild)
 {
 const char* pDuration = nullptr;
 const char* pRestart = nullptr;
@@ -962,8 +962,7 @@ void 
PPTXAnimationExport::WriteAnimationNodeCommonPropsStart(
 }
 }
 
-if (bSingle)
-mpFS->endElementNS(XML_p, XML_cTn);
+mpFS->endElementNS(XML_p, XML_cTn);
 }
 
 void PPTXAnimationExport::WriteAnimationNodeSeq(const 
Reference& rXNode,
@@ -973,7 +972,7 @@ void PPTXAnimationExport::WriteAnimationNodeSeq(const 
Reference&
 
 mpFS->startElementNS(XML_p, XML_seq, FSEND);
 
-WriteAnimationNodeCommonPropsStart(rXNode, true, bMainSeqChild);
+WriteAnimationNodeCommonPropsStart(rXNode, bMainSeqChild);
 
 WriteAnimationCondition(mpFS, nullptr, "onPrev", 0, true, XML_prevCondLst);
 WriteAnimationCondition(mpFS, nullptr, "onNext", 0, true, XML_nextCondLst);
@@ -1033,7 +1032,7 @@ void PPTXAnimationExport::WriteAnimationNodeCommand(const 
ReferencestartElementNS(XML_p, XML_cBhvr, FSEND);
-WriteAnimationNodeCommonPropsStart(rXNode, true, bMainSeqChild);
+WriteAnimationNodeCommonPropsStart(rXNode, bMainSeqChild);
 WriteAnimationTarget(xCommand->getTarget());
 mpFS->endElementNS(XML_p, XML_cBhvr);
 
@@ -1052,7 +1051,7 @@ void PPTXAnimationExport::WriteAnimationNode(const 
Reference& rX
 case AnimationNodeType::ITERATE:
 case AnimationNodeType::PAR:
 mpFS->startElementNS(XML_p, xmlNodeType, FSEND);
-WriteAnimationNodeCommonPropsStart(rXNode, true, bMainSeqChild);
+WriteAnimationNodeCommonPropsStart(rXNode, bMainSeqChild);
 mpFS->endElementNS(XML_p, xmlNodeType);
 break;
 case AnimationNodeType::SEQ:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/source/filter/eppt/pptx-animations.cxx |   21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

New commits:
commit 8d9707e5f685c7f8824c752c086dd4727e989898
Author: Mark Hung 
AuthorDate: Wed Aug 29 22:43:34 2018 +0800
Commit: Mark Hung 
CommitDate: Fri Aug 31 07:27:45 2018 +0200

sd/pptx export: remove unused parameter.

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

diff --git a/sd/source/filter/eppt/pptx-animations.cxx 
b/sd/source/filter/eppt/pptx-animations.cxx
index e0c217a635b3..bce9b1079732 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -458,12 +458,9 @@ class PPTXAnimationExport
bool bMainSeqChild);
 void WriteAnimationNodeAnimateInside(const Reference& 
rXNode,
  bool bMainSeqChild, bool bSimple, 
bool bWriteTo = true);
-void WriteAnimationNodeSeq(const Reference& rXNode, 
sal_Int32 nXmlNodeType,
-   bool bMainSeqChild);
-void WriteAnimationNodeEffect(const Reference& rXNode, 
sal_Int32 nXmlNodeType,
-  bool bMainSeqChild);
-void WriteAnimationNodeCommand(const Reference& rXNode, 
sal_Int32 nXmlNodeType,
-   bool bMainSeqChild);
+void WriteAnimationNodeSeq(const Reference& rXNode, bool 
bMainSeqChild);
+void WriteAnimationNodeEffect(const Reference& rXNode, 
bool bMainSeqChild);
+void WriteAnimationNodeCommand(const Reference& rXNode, 
bool bMainSeqChild);
 void WriteAnimationNodeCommonPropsStart(const Reference& 
rXNode, bool bSingle,
 bool bMainSeqChild);
 void WriteAnimationTarget(const Any& rTarget);
@@ -969,7 +966,7 @@ void 
PPTXAnimationExport::WriteAnimationNodeCommonPropsStart(
 mpFS->endElementNS(XML_p, XML_cTn);
 }
 
-void PPTXAnimationExport::WriteAnimationNodeSeq(const 
Reference& rXNode, sal_Int32,
+void PPTXAnimationExport::WriteAnimationNodeSeq(const 
Reference& rXNode,
 bool bMainSeqChild)
 {
 SAL_INFO("sd.eppt", "write animation node SEQ");
@@ -985,7 +982,7 @@ void PPTXAnimationExport::WriteAnimationNodeSeq(const 
Reference&
 }
 
 void PPTXAnimationExport::WriteAnimationNodeEffect(const 
Reference& rXNode,
-   sal_Int32, bool 
bMainSeqChild)
+   bool bMainSeqChild)
 {
 SAL_INFO("sd.eppt", "write animation node FILTER");
 Reference xFilter(rXNode, UNO_QUERY);
@@ -1004,7 +1001,7 @@ void PPTXAnimationExport::WriteAnimationNodeEffect(const 
Reference& rXNode,
-sal_Int32, bool 
bMainSeqChild)
+bool bMainSeqChild)
 {
 SAL_INFO("sd.eppt", "write animation node COMMAND");
 Reference xCommand(rXNode, UNO_QUERY);
@@ -1059,7 +1056,7 @@ void PPTXAnimationExport::WriteAnimationNode(const 
Reference& rX
 mpFS->endElementNS(XML_p, xmlNodeType);
 break;
 case AnimationNodeType::SEQ:
-WriteAnimationNodeSeq(rXNode, xmlNodeType, bMainSeqChild);
+WriteAnimationNodeSeq(rXNode, bMainSeqChild);
 break;
 case AnimationNodeType::ANIMATETRANSFORM:
 {
@@ -1085,10 +1082,10 @@ void PPTXAnimationExport::WriteAnimationNode(const 
Reference& rX
 WriteAnimationNodeAnimate(rXNode, xmlNodeType, bMainSeqChild);
 break;
 case AnimationNodeType::TRANSITIONFILTER:
-WriteAnimationNodeEffect(rXNode, xmlNodeType, bMainSeqChild);
+WriteAnimationNodeEffect(rXNode, bMainSeqChild);
 break;
 case AnimationNodeType::COMMAND:
-WriteAnimationNodeCommand(rXNode, xmlNodeType, bMainSeqChild);
+WriteAnimationNodeCommand(rXNode, bMainSeqChild);
 break;
 default:
 SAL_WARN("sd.eppt", "unhandled animation node: " << 
rXNode->getType());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/tests

[Libreoffice Gerrit user]

 qadevOOo/tests/java/mod/_sw/CharacterStyle.java|4 ++--
 qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java |6 +++---
 qadevOOo/tests/java/mod/_sw/PageStyle.java |6 +++---
 qadevOOo/tests/java/mod/_sw/ParagraphStyle.java|4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 94acf17472c9a1560b5a745fcbed3a9e9506ac53
Author: Julien Nabet 
AuthorDate: Thu Aug 30 19:35:14 2018 +0200
Commit: Julien Nabet 
CommitDate: Fri Aug 31 07:17:17 2018 +0200

Typo: skipPropetiesNamed->skipPropertiesNamed

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

diff --git a/qadevOOo/tests/java/mod/_sw/CharacterStyle.java 
b/qadevOOo/tests/java/mod/_sw/CharacterStyle.java
index 1671a39b99ed..8f7c3b18169b 100644
--- a/qadevOOo/tests/java/mod/_sw/CharacterStyle.java
+++ b/qadevOOo/tests/java/mod/_sw/CharacterStyle.java
@@ -137,10 +137,10 @@ public class CharacterStyle extends TestCase {
 
 XPropertySet xStyleProp = 
UnoRuntime.queryInterface(XPropertySet.class, oMyStyle);
 
-String[] skipPropetiesNamed = {};
+String[] skipPropertiesNamed = {};
 
 short exclude = PropertyAttribute.READONLY;
-
tEnv.addObjRelation("PropertyNames",utils.getFilteredPropertyNames(xStyleProp, 
(short)0, exclude, skipPropetiesNamed));
+
tEnv.addObjRelation("PropertyNames",utils.getFilteredPropertyNames(xStyleProp, 
(short)0, exclude, skipPropertiesNamed));
 
 return tEnv;
 }
diff --git a/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java 
b/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java
index 0ccff31ed554..fbcc9e2b0f64 100644
--- a/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java
+++ b/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java
@@ -129,12 +129,12 @@ public class ConditionalParagraphStyle extends TestCase {
 
 XPropertySet xStyleProp = 
UnoRuntime.queryInterface(XPropertySet.class, oMyStyle);
 short exclude = PropertyAttribute.READONLY;
-String[] skipPropetiesNamed = { "ParaBackGraphicURL" };
+String[] skipPropertiesNamed = { "ParaBackGraphicURL" };
 
-String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, 
exclude, skipPropetiesNamed);
+String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, 
exclude, skipPropertiesNamed);
 
 tEnv.addObjRelation("PropertyNames", names);
-tEnv.addObjRelation("SkipProperties", skipPropetiesNamed);
+tEnv.addObjRelation("SkipProperties", skipPropertiesNamed);
 
 return tEnv;
 }
diff --git a/qadevOOo/tests/java/mod/_sw/PageStyle.java 
b/qadevOOo/tests/java/mod/_sw/PageStyle.java
index fdfac78b1dee..7de28b2019a7 100644
--- a/qadevOOo/tests/java/mod/_sw/PageStyle.java
+++ b/qadevOOo/tests/java/mod/_sw/PageStyle.java
@@ -127,13 +127,13 @@ public class PageStyle extends TestCase {
 
 short exclude = PropertyAttribute.READONLY;
 
-String[] skipPropetiesNamed = {
+String[] skipPropertiesNamed = {
 "BackGraphicURL", "HeaderBackGraphicURL", "FooterBackGraphicURL"
 };
 
-String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, 
exclude, skipPropetiesNamed);
+String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, 
exclude, skipPropertiesNamed);
 tEnv.addObjRelation("PropertyNames", names);
-tEnv.addObjRelation("SkipProperties", skipPropetiesNamed);
+tEnv.addObjRelation("SkipProperties", skipPropertiesNamed);
 
 return tEnv;
 }
diff --git a/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java 
b/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java
index e52daed43c02..b85a83ab32a2 100644
--- a/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java
+++ b/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java
@@ -120,9 +120,9 @@ public class ParagraphStyle extends TestCase  {
 XPropertySet xStyleProp = 
UnoRuntime.queryInterface(XPropertySet.class, oMyStyle);
 short exclude = PropertyAttribute.READONLY;
 
-String[] skipPropetiesNamed = { "ParaBackGraphicURL" };
+String[] skipPropertiesNamed = { "ParaBackGraphicURL" };
 
-String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, 
exclude, skipPropetiesNamed);
+String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, 
exclude, skipPropertiesNamed);
 tEnv.addObjRelation("PropertyNames", names);
 
 return tEnv;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in

[Libreoffice Gerrit user]

 set_soenv.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 545e976cb77e5519621819cb48efb93d89b14c07
Author: Pedro Giffuni 
AuthorDate: Fri Aug 31 03:53:49 2018 +
Commit: Pedro Giffuni 
CommitDate: Fri Aug 31 03:53:49 2018 +

Typo: no functional change intended.

diff --git a/set_soenv.in b/set_soenv.in
index af8a7d8f1632..70098462629c 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -909,7 +909,7 @@ if ($platform =~ m/cygwin/)
 }
 
 #
-# E. Determining the envionment values based on the information
+# E. Determining the environment values based on the information
 #that was gathered earlier on.
 #
 print "Setting the environment variables... ";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/source/filter/eppt/pptx-animations.cxx |  213 ++
 1 file changed, 102 insertions(+), 111 deletions(-)

New commits:
commit 26d237aaec02b6ffa90037feff9ce106cc39335b
Author: Mark Hung 
AuthorDate: Wed Aug 29 19:30:17 2018 +0800
Commit: Mark Hung 
CommitDate: Fri Aug 31 05:46:09 2018 +0200

sd/pptx export: make FSHelperPtr pFS a class member.

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

diff --git a/sd/source/filter/eppt/pptx-animations.cxx 
b/sd/source/filter/eppt/pptx-animations.cxx
index 17d16dedc591..e0c217a635b3 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -453,29 +453,27 @@ sal_Int32 convertNodeType(sal_Int16 nType)
 
 class PPTXAnimationExport
 {
-void WriteAnimationNode(const FSHelperPtr& pFS, const 
Reference& rXNode,
-bool bMainSeqChild);
-void WriteAnimationNodeAnimate(const FSHelperPtr& pFS, const 
Reference& rXNode,
-   sal_Int32 nXmlNodeType, bool bMainSeqChild);
-void WriteAnimationNodeAnimateInside(const FSHelperPtr& pFS,
- const Reference& 
rXNode,
+void WriteAnimationNode(const Reference& rXNode, bool 
bMainSeqChild);
+void WriteAnimationNodeAnimate(const Reference& rXNode, 
sal_Int32 nXmlNodeType,
+   bool bMainSeqChild);
+void WriteAnimationNodeAnimateInside(const Reference& 
rXNode,
  bool bMainSeqChild, bool bSimple, 
bool bWriteTo = true);
-void WriteAnimationNodeSeq(const FSHelperPtr& pFS, const 
Reference& rXNode,
-   sal_Int32 nXmlNodeType, bool bMainSeqChild);
-void WriteAnimationNodeEffect(const FSHelperPtr& pFS, const 
Reference& rXNode,
-  sal_Int32 nXmlNodeType, bool bMainSeqChild);
-void WriteAnimationNodeCommand(const FSHelperPtr& pFS, const 
Reference& rXNode,
-   sal_Int32 nXmlNodeType, bool bMainSeqChild);
-void WriteAnimationNodeCommonPropsStart(const FSHelperPtr& pFS,
-const Reference& 
rXNode, bool bSingle,
+void WriteAnimationNodeSeq(const Reference& rXNode, 
sal_Int32 nXmlNodeType,
+   bool bMainSeqChild);
+void WriteAnimationNodeEffect(const Reference& rXNode, 
sal_Int32 nXmlNodeType,
+  bool bMainSeqChild);
+void WriteAnimationNodeCommand(const Reference& rXNode, 
sal_Int32 nXmlNodeType,
+   bool bMainSeqChild);
+void WriteAnimationNodeCommonPropsStart(const Reference& 
rXNode, bool bSingle,
 bool bMainSeqChild);
-void WriteAnimationTarget(const FSHelperPtr& pFS, const Any& rTarget);
+void WriteAnimationTarget(const Any& rTarget);
 
 PowerPointExport& mrPowerPointExport;
+const FSHelperPtr& mpFS;
 
 public:
-PPTXAnimationExport(PowerPointExport& rExport);
-void WriteAnimations(const FSHelperPtr& pFS, const Reference& 
rXDrawPage);
+PPTXAnimationExport(PowerPointExport& rExport, const FSHelperPtr& pFS);
+void WriteAnimations(const Reference& rXDrawPage);
 };
 }
 
@@ -486,18 +484,19 @@ namespace core
 void WriteAnimations(const FSHelperPtr& pFS, const Reference& 
rXDrawPage,
  PowerPointExport& rExport)
 {
-PPTXAnimationExport aAnimationExport(rExport);
-aAnimationExport.WriteAnimations(pFS, rXDrawPage);
+PPTXAnimationExport aAnimationExport(rExport, pFS);
+aAnimationExport.WriteAnimations(rXDrawPage);
 }
 }
 }
 
-PPTXAnimationExport::PPTXAnimationExport(PowerPointExport& rExport)
+PPTXAnimationExport::PPTXAnimationExport(PowerPointExport& rExport, const 
FSHelperPtr& pFS)
 : mrPowerPointExport(rExport)
+, mpFS(pFS)
 {
 }
 
-void PPTXAnimationExport::WriteAnimationTarget(const FSHelperPtr& pFS, const 
Any& rTarget)
+void PPTXAnimationExport::WriteAnimationTarget(const Any& rTarget)
 {
 sal_Int32 nParagraph = -1;
 bool bParagraphTarget = false;
@@ -525,22 +524,21 @@ void PPTXAnimationExport::WriteAnimationTarget(const 
FSHelperPtr& pFS, const Any
 {
 sal_Int32 nShapeID = mrPowerPointExport.GetShapeID(rXShape);
 
-pFS->startElementNS(XML_p, XML_tgtEl, FSEND);
-pFS->startElementNS(XML_p, XML_spTgt, XML_spid, I32S(nShapeID), FSEND);
+mpFS->startElementNS(XML_p, XML_tgtEl, FSEND);
+mpFS->startElementNS(XML_p, XML_spTgt, XML_spid, I32S(nShapeID), 
FSEND);
 if (bParagraphTarget)
 {
-pFS->startElementNS(XML_p, XML_txEl, FSEND);
-pFS->singleElementNS(XML_p, XML_pRg, XML_st, I32S(nParagraph), 
XML_end,
- I32S(nParagraph), FSEND);
-pFS->endElementNS(XML_p, X

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

[Libreoffice Gerrit user]

 sd/source/filter/eppt/epptooxml.hxx   |   12 ---
 sd/source/filter/eppt/pptx-animations.cxx |  106 ++
 sd/source/filter/eppt/pptx-animations.hxx |   23 ++
 sd/source/filter/eppt/pptx-epptooxml.cxx  |   13 +++
 4 files changed, 115 insertions(+), 39 deletions(-)

New commits:
commit 76be5c31b97a37d15a3009995f4e60e4cee011ee
Author: Mark Hung 
AuthorDate: Wed Aug 29 01:21:28 2018 +0800
Commit: Mark Hung 
CommitDate: Fri Aug 31 03:56:04 2018 +0200

sd/pptx export: new PPTXAnimationExport class.

Create a new PPTXAnimationExport and move animation
related member functions from PowerPointExport.

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

diff --git a/sd/source/filter/eppt/epptooxml.hxx 
b/sd/source/filter/eppt/epptooxml.hxx
index 97f7cf903d3f..4f1a1540da20 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -83,6 +83,8 @@ public:
 static const char* Get8Direction( sal_uInt8 nDirection );
 static   int   GetPPTXLayoutId( int nOffset );
 
+sal_Int32 GetShapeID(const css::uno::Reference& 
rXShape);
+sal_Int32 GetNextAnimationNodeID();
 private:
 
 virtual void ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, 
sal_uInt16 nMode,
@@ -99,16 +101,6 @@ private:
 virtual ::oox::ole::VbaProject* implCreateVbaProject() const override;
 void WriteNotesMaster();
 
-void WriteAnimations( const ::sax_fastparser::FSHelperPtr& pFS );
-void WriteAnimationNode( const ::sax_fastparser::FSHelperPtr& pFS, const 
css::uno::Reference< css::animations::XAnimationNode >& rXNode, bool 
bMainSeqChild );
-void WriteAnimationNodeAnimate( const ::sax_fastparser::FSHelperPtr& pFS, 
const css::uno::Reference< css::animations::XAnimationNode >& rXNode, sal_Int32 
nXmlNodeType, bool bMainSeqChild );
-void WriteAnimationNodeAnimateInside( const ::sax_fastparser::FSHelperPtr& 
pFS, const css::uno::Reference< css::animations::XAnimationNode >& rXNode, bool 
bMainSeqChild, bool bSimple, bool bWriteTo = true );
-void WriteAnimationNodeSeq( const ::sax_fastparser::FSHelperPtr& pFS, 
const css::uno::Reference< css::animations::XAnimationNode >& rXNode, sal_Int32 
nXmlNodeType, bool bMainSeqChild );
-void WriteAnimationNodeEffect( const ::sax_fastparser::FSHelperPtr& pFS, 
const css::uno::Reference< css::animations::XAnimationNode >& rXNode, sal_Int32 
nXmlNodeType, bool bMainSeqChild );
-void WriteAnimationNodeCommand(const ::sax_fastparser::FSHelperPtr& pFS, 
const css::uno::Reference< css::animations::XAnimationNode >& rXNode, sal_Int32 
nXmlNodeType, bool bMainSeqChild );
-void WriteAnimationNodeCommonPropsStart( const 
::sax_fastparser::FSHelperPtr& pFS, const css::uno::Reference< 
css::animations::XAnimationNode >& rXNode, bool bSingle, bool bMainSeqChild );
-
-void WriteAnimationTarget( const ::sax_fastparser::FSHelperPtr& pFS, const 
css::uno::Any& rTarget );
 bool WriteComments( sal_uInt32 nPageNum );
 void ImplWriteBackground( const ::sax_fastparser::FSHelperPtr& pFS, const 
css::uno::Reference< css::beans::XPropertySet >& aXBackgroundPropSet );
 void WriteTransition( const ::sax_fastparser::FSHelperPtr& pFS );
diff --git a/sd/source/filter/eppt/pptx-animations.cxx 
b/sd/source/filter/eppt/pptx-animations.cxx
index d9c98db90415..17d16dedc591 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -54,11 +54,13 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 
 #include "pptexanimations.hxx"
+#include "pptx-animations.hxx"
 #include "../ppt/pptanimations.hxx"
 
 using namespace ::com::sun::star::animations;
@@ -71,6 +73,7 @@ using namespace oox::core;
 using namespace oox;
 
 using ::com::sun::star::beans::NamedValue;
+using ::com::sun::star::drawing::XDrawPage;
 using ::com::sun::star::drawing::XShape;
 using ::com::sun::star::text::XSimpleText;
 using ::sax_fastparser::FSHelperPtr;
@@ -447,9 +450,54 @@ sal_Int32 convertNodeType(sal_Int16 nType)
 }
 return xmlNodeType;
 }
+
+class PPTXAnimationExport
+{
+void WriteAnimationNode(const FSHelperPtr& pFS, const 
Reference& rXNode,
+bool bMainSeqChild);
+void WriteAnimationNodeAnimate(const FSHelperPtr& pFS, const 
Reference& rXNode,
+   sal_Int32 nXmlNodeType, bool bMainSeqChild);
+void WriteAnimationNodeAnimateInside(const FSHelperPtr& pFS,
+ const Reference& 
rXNode,
+ bool bMainSeqChild, bool bSimple, 
bool bWriteTo = true);
+void WriteAnimationNodeSeq(const FSHelperPtr& pFS, const 
Reference& rXNode,
+   sal_Int32 nXmlNodeType, bool bMainSeqChild);
+void WriteAnimationNodeEffect(const FSHelperPtr& pFS, const 

[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - config_host.mk.in configure.ac solenv/gbuild

[Libreoffice Gerrit user]

 config_host.mk.in   |1 +
 configure.ac|9 +
 solenv/gbuild/gbuild.mk |6 ++
 3 files changed, 16 insertions(+)

New commits:
commit 061ced74ec8b71504464b1c74e0cf043ad158f2a
Author: Tor Lillqvist 
AuthorDate: Thu Oct 23 12:58:56 2014 +0300
Commit: Thorsten Behrens 
CommitDate: Fri Aug 31 03:37:20 2018 +0200

Add --enable-sal-log

This is:
- Add --enable-sal-info
- Rename --enable-sal-info to --enable-sal-log

Change-Id: I896c9ac1c941b85d052fbefb902c4341664881d4

diff --git a/config_host.mk.in b/config_host.mk.in
index 5bc7b1455721..f1df8e336af4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -157,6 +157,7 @@ export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
 export ENABLE_RANDR=@ENABLE_RANDR@
 export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
 export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@
+export ENABLE_SAL_LOG=@ENABLE_SAL_LOG@
 export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
 export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
 export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
diff --git a/configure.ac b/configure.ac
index 4fe00e79aef1..895e50151f35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -902,6 +902,10 @@ AC_ARG_ENABLE(debug,
 [Include debugging information, disable compiler optimization and 
inlining plus
  extra debugging code like assertions. Extra large build! (enables -g 
compiler flag).]))
 
+AC_ARG_ENABLE(sal-log,
+AS_HELP_STRING([--enable-sal-log],
+[Make SAL_INFO and SAL_WARN calls do something even in a non-debug 
build.]))
+
 AC_ARG_ENABLE(selective-debuginfo,
 AS_HELP_STRING([--enable-selective-debuginfo],
 [If --enable-debug or --enable-dbgutil is used, build debugging 
information
@@ -3792,6 +3796,11 @@ else
 fi
 AC_SUBST(ENABLE_DEBUG)
 
+if test "$enable_sal_log" = yes; then
+ENABLE_SAL_LOG=TRUE
+fi
+AC_SUBST(ENABLE_SAL_LOG)
+
 dnl Selective debuginfo
 ENABLE_DEBUGINFO_FOR=
 if test -n "$ENABLE_DEBUG"; then
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 0796f8ba2541..93eda58ea3ac 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -232,6 +232,12 @@ gb_GLOBALDEFS += -DNDEBUG \
 
 endif
 
+ifeq ($(ENABLE_SAL_LOG),TRUE)
+gb_GLOBALDEFS += -DSAL_LOG_INFO \
+-DSAL_LOG_WARN \
+
+endif
+
 else
 gb_GLOBALDEFS += -DSAL_LOG_INFO \
 -DSAL_LOG_WARN \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/sanitizers vcl/uiconfig

[Libreoffice Gerrit user]

 solenv/sanitizers/ui/vcl.suppr |7 ---
 vcl/uiconfig/ui/printdialog.ui |   18 ++
 2 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit 135fca2f14ee4231886bf9f9efe79bf9c34e8121
Author: Samuel Thibault 
AuthorDate: Thu Aug 30 16:29:45 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Aug 31 03:02:04 2018 +0200

printdialog: set a11y role of printer information to static

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

diff --git a/solenv/sanitizers/ui/vcl.suppr b/solenv/sanitizers/ui/vcl.suppr
index c29a96e4a53e..ba71a66caff1 100644
--- a/solenv/sanitizers/ui/vcl.suppr
+++ b/solenv/sanitizers/ui/vcl.suppr
@@ -3,13 +3,6 @@ 
vcl/uiconfig/ui/printdialog.ui://GtkSpinButton[@id='pageedit-nospin'] no-labelle
 vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='totalnumpages'] orphan-label
 vcl/uiconfig/ui/printdialog.ui://GtkButton[@id='forward'] button-no-label
 vcl/uiconfig/ui/printdialog.ui://GtkButton[@id='backward'] button-no-label
-vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='label7'] orphan-label
-vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='label8'] orphan-label
-vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='label9'] orphan-label
-vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='status'] orphan-label
-vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='location'] orphan-label
-vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='comment'] orphan-label
-vcl/uiconfig/ui/printdialog.ui://GtkTreeView[@id='printers:border'] 
no-labelled-by
 vcl/uiconfig/ui/printdialog.ui://GtkImage[@id='collateimage'] no-labelled-by
 vcl/uiconfig/ui/printdialog.ui://GtkLabel[@id='fromwhich'] orphan-label
 vcl/uiconfig/ui/printdialog.ui://GtkEntry[@id='pagerange'] no-labelled-by
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 2a6641250130..7f5763a3c8f8 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -330,6 +330,9 @@
 False
 Status:
 0
+
+  
+
   
   
 0
@@ -342,6 +345,9 @@
 False
 Location:
 0
+
+  
+
   
   
 0
@@ -354,6 +360,9 @@
 False
 Comment:
 0
+
+  
+
   
   
 0
@@ -366,6 +375,9 @@
 False
 Default printer
 0
+
+  
+
   
   
 1
@@ -378,6 +390,9 @@
 False
 Place
 0
+
+  
+
   
   
 1
@@ -390,6 +405,9 @@
 False
 Long printer name
 0
+
+  
+
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/uiconfig solenv/sanitizers

[Libreoffice Gerrit user]

 extensions/uiconfig/sabpilot/ui/contentfieldpage.ui  |3 +
 extensions/uiconfig/sabpilot/ui/datasourcepage.ui|8 +++
 extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui |3 +
 extensions/uiconfig/sabpilot/ui/fieldassignpage.ui   |6 ++
 extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui |3 +
 extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui   |1 
 extensions/uiconfig/sabpilot/ui/invokeadminpage.ui   |6 ++
 extensions/uiconfig/sabpilot/ui/optiondbfieldpage.ui |6 ++
 extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui  |3 +
 extensions/uiconfig/sabpilot/ui/optionvaluespage.ui  |4 +
 extensions/uiconfig/sabpilot/ui/selecttablepage.ui   |3 +
 extensions/uiconfig/sabpilot/ui/selecttypepage.ui|6 ++
 extensions/uiconfig/sabpilot/ui/tableselectionpage.ui|3 +
 solenv/sanitizers/ui/modules/sabpilot.suppr  |   25 ---
 14 files changed, 54 insertions(+), 26 deletions(-)

New commits:
commit 5e1ab7e36bb38b217260bf1cc9aec2be7defe25e
Author: Samuel Thibault 
AuthorDate: Thu Aug 30 16:50:15 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Aug 31 03:01:24 2018 +0200

Address data source wizard: fix most a11y warnings

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

diff --git a/extensions/uiconfig/sabpilot/ui/contentfieldpage.ui 
b/extensions/uiconfig/sabpilot/ui/contentfieldpage.ui
index 12aab1d37e87..49d70a0b7c93 100644
--- a/extensions/uiconfig/sabpilot/ui/contentfieldpage.ui
+++ b/extensions/uiconfig/sabpilot/ui/contentfieldpage.ui
@@ -111,6 +111,9 @@
 0
 0
 True
+
+  
+
   
   
 False
diff --git a/extensions/uiconfig/sabpilot/ui/datasourcepage.ui 
b/extensions/uiconfig/sabpilot/ui/datasourcepage.ui
index 2fa96e874ff3..95bb17387650 100644
--- a/extensions/uiconfig/sabpilot/ui/datasourcepage.ui
+++ b/extensions/uiconfig/sabpilot/ui/datasourcepage.ui
@@ -19,6 +19,9 @@
 Now, just enter the name under which you want to register the data source in 
%PRODUCTNAME.
 True
 90
+
+  
+
   
   
 0
@@ -154,7 +157,7 @@ Now, just enter the name under which you want to register 
the data source in %PR
 0
 Address book name
 True
-location
+name
   
   
 0
@@ -193,6 +196,9 @@ Now, just enter the name under which you want to register 
the data source in %PR
 Another data source already has this name. As 
data sources have to have globally unique names, you need to choose another 
one.
 True
 90
+
+  
+
   
   
 0
diff --git a/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui 
b/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui
index 57ff124e3575..05717b884d13 100644
--- a/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui
+++ b/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui
@@ -17,6 +17,9 @@
 start
 Should one option field be selected 
as a default?
 True
+
+  
+
   
   
 False
diff --git a/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui 
b/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui
index dbd94f11c0d4..d86802f8f4a4 100644
--- a/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui
+++ b/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui
@@ -20,6 +20,9 @@ For instance, you could have stored the e-mail addresses in a 
field named "email
 Click the button below to open another dialog where you can enter the settings 
for your data source.
 True
 90
+
+  
+
   
   
 0
@@ -53,6 +56,9 @@ Click the button below to open another dialog where you can 
enter the settings f
 0
 True
 90
+
+  
+
   
   
 0
diff --git a/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui 
b/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui
index b95c8ebcb295..060893dacf12 100644
--- a/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui
+++ b/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui
@@ -19,6 +19,9 @@
 This is where you select fields with matching 
contents so that the value from the display field will be shown.
 True
 90
+
+  
+
   
   
 False
diff --git a/extensions/uiconfig/sabpilot/ui/groupradioselection

[Libreoffice-commits] dev-tools.git: 4 commits - qa/createWeeklyReport.py

[Libreoffice Gerrit user]

 qa/createWeeklyReport.py |  160 ++-
 1 file changed, 104 insertions(+), 56 deletions(-)

New commits:
commit ab8875998497909f4e52e8404a380671eac527cf
Author: Xisco Fauli 
AuthorDate: Fri Aug 31 02:47:44 2018 +0200
Commit: Xisco Fauli 
CommitDate: Fri Aug 31 02:47:44 2018 +0200

QA: Also show which was the previous status

diff --git a/qa/createWeeklyReport.py b/qa/createWeeklyReport.py
index 9738ca4..f09dc19 100755
--- a/qa/createWeeklyReport.py
+++ b/qa/createWeeklyReport.py
@@ -19,8 +19,8 @@ def util_create_statList_weeklyReport():
 'unconfirmed': [],
 'newUsers': {},
 'comments_count': {},
-'status_changed': {s: {'id':[], 'author': [] } for s in 
common.statutes_list},
-'keyword_added': {k: {'id':[], 'author': [], 'status': {s:0 for s in 
common.statutes_list}} for k in common.keywords_list},
+'status_changed': {},
+'keyword_added': {k: {'id':[], 'author': []} for k in 
common.keywords_list},
 'keyword_removed': {k: {'id':[], 'author': []} for k in 
common.keywords_list},
 'whiteboard_added': {},
 'whiteboard_removed': {},
@@ -53,10 +53,6 @@ def analyze_bugzilla_weeklyReport(statList, bugzillaData, 
cfg):
 statNewDate = creationDate
 
 rowStatus = row['status']
-rowResolution = row['resolution']
-
-if rowStatus == 'VERIFIED' or rowStatus == 'RESOLVED':
-rowStatus += "_" + rowResolution
 
 if rowStatus == 'UNCONFIRMED':
 statList['unconfirmed'].append(rowId)
@@ -80,8 +76,11 @@ def analyze_bugzilla_weeklyReport(statList, bugzillaData, 
cfg):
 actionDate = datetime.datetime.strptime(action['when'], 
"%Y-%m-%dT%H:%M:%SZ")
 common.util_check_bugzilla_mail(statList, actionMail, '', 
actionDate, rowId)
 
-# Use this variable in case the status is set before the 
resolution
+# Use these variables in case the status is set before the 
resolution or viceversa
 newStatus = None
+newResolution = None
+oldStatus = None
+oldResolution = None
 for change in action['changes']:
 if change['field_name'] == 'blocks':
 if change['added']:
@@ -108,28 +107,57 @@ def analyze_bugzilla_weeklyReport(statList, bugzillaData, 
cfg):
 addedStatus = change['added']
 removedStatus = change['removed']
 
+if removedStatus == 'RESOLVED' or removedStatus == 
'VERIFIED':
+if oldResolution:
+removedStatus = removedStatus + "_" + 
removedResolution
+oldResolution = None
+else:
+oldStatus = removedStatus
+
 if  addedStatus == 'RESOLVED' or addedStatus == 
'VERIFIED':
-if rowResolution:
-addedStatus = addedStatus + "_" + rowResolution
+if newResolution:
+addedStatus = addedStatus + "_" + newResolution
 if actionDate >= cfg['reportPeriod']:
-
statList['status_changed'][addedStatus]['id'].append(rowId)
-
statList['status_changed'][addedStatus]['author'].append(actionMail)
+keyValue = removedStatus + '-' + 
addedStatus
+if keyValue not in 
statList['status_changed']:
+statList['status_changed'][keyValue] = 
{'id':[], 'author':[]}
+
statList['status_changed'][keyValue]['id'].append(rowId)
+
statList['status_changed'][keyValue]['author'].append(actionMail)
+
+newResolution = None
 else:
 newStatus = addedStatus
 else:
 if actionDate >= cfg['reportPeriod']:
-
statList['status_changed'][addedStatus]['id'].append(rowId)
-
statList['status_changed'][addedStatus]['author'].append(actionMail)
+keyValue = removedStatus + '-' + addedStatus
+if keyValue not in statList['status_changed']:
+statList['status_changed'][keyValue] = 
{'id':[], 'author':[]}
+
statList['status_changed'][keyValue]['id'].append(rowId)
+
statList['status_changed'][keyValue]['author'].append(actionMail)
 
 elif change['field_name'] == 'resolutio

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

[Libreoffice Gerrit user]

 sw/qa/extras/uiwriter/data/testInconsistentBookmark.ott |binary
 sw/qa/extras/uiwriter/uiwriter.cxx  |   62 
 2 files changed, 62 insertions(+)

New commits:
commit 6126de0363b070a914f06a1b853979317aa0a183
Author: Serge Krot 
AuthorDate: Thu Aug 30 18:01:42 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Aug 31 03:00:12 2018 +0200

sw: fix inconsistent bookmark behavior around at-char/as-char anchored 
frames

Added unit test for Added fix for
   Change-Id: Ic1f173c85d3824afabb5b7ebf3a8594311eb9007

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

diff --git a/sw/qa/extras/uiwriter/data/testInconsistentBookmark.ott 
b/sw/qa/extras/uiwriter/data/testInconsistentBookmark.ott
new file mode 100644
index ..ff3970a27b27
Binary files /dev/null and 
b/sw/qa/extras/uiwriter/data/testInconsistentBookmark.ott differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 6513d71bf006..8a2537a2292a 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -347,6 +347,7 @@ public:
 void testTdf117225();
 void testTdf91801();
 void testTdf51223();
+void testInconsistentBookmark();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -545,6 +546,7 @@ public:
 CPPUNIT_TEST(testTdf117225);
 CPPUNIT_TEST(testTdf91801);
 CPPUNIT_TEST(testTdf51223);
+CPPUNIT_TEST(testInconsistentBookmark);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -6472,6 +6474,66 @@ void SwUiWriterTest::testFontEmbedding()
 #endif
 }
 
+// Unit test for fix inconsistent bookmark behavior around at-char/as-char 
anchored frames
+//
+// We have a placeholder character in the sw doc model for as-char anchored 
frames,
+// so it's possible to have a bookmark before/after the frame or a 
non-collapsed bookmark
+// which covers the frame. The same is not true for at-char anchored frames,
+// where the anchor points to a doc model position, but there is no 
placeholder character.
+// If a bookmark is created covering the start and end of the anchor of the 
frame,
+// internally we create a collapsed bookmark which has the same position as 
the anchor of the frame.
+// When this doc model is handled by SwXParagraph::createEnumeration(),
+// first the frame and then the bookmark is appended to the text portion 
enumeration,
+// so your bookmark around the frame is turned into a collapsed bookmark after 
the frame.
+// (The same happens when we roundtrip an ODT document representing this doc 
model.)
+//
+// Fix the problem by inserting collapsed bookmarks with affected anchor 
positions
+// (same position is the anchor for an at-char frame) into the enumeration in 
two stages:
+// first the start of them before frames and then the end of them + other 
bookmarks.
+// This way UNO API users get their non-collapsed bookmarks around at-char 
anchored frames,
+// similar to as-char ones.
+void SwUiWriterTest::testInconsistentBookmark()
+{
+// create test document with text and bookmark
+{
+SwDoc* pDoc(createDoc("testInconsistentBookmark.ott"));
+IDocumentMarkAccess& rIDMA(*pDoc->getIDocumentMarkAccess());
+SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
+SwCursor aPaM(SwPosition(aIdx), nullptr);
+aPaM.SetMark();
+aPaM.MovePara(GoCurrPara, fnParaStart);
+aPaM.MovePara(GoCurrPara, fnParaEnd);
+rIDMA.makeMark(aPaM, "Mark", IDocumentMarkAccess::MarkType::BOOKMARK,
+   ::sw::mark::InsertMode::New);
+aPaM.Exchange();
+aPaM.DeleteMark();
+}
+
+// save document and verify the bookmark scoup
+{
+// save document
+utl::TempFile aTempFile;
+save("writer8", aTempFile);
+
+// load only content.xml
+if (xmlDocPtr pXmlDoc = parseExportInternal(aTempFile.GetURL(), 
"content.xml"))
+{
+const OString 
aPath("/office:document-content/office:body/office:text/text:p");
+
+const OUString aTagBookmarkStart("bookmark-start");
+const OUString aTagControl("control");
+const OUString aTagBookmarkEnd("bookmark-end");
+
+const int pos1 = getXPathPosition(pXmlDoc, aPath, 
aTagBookmarkStart);
+const int pos2 = getXPathPosition(pXmlDoc, aPath, aTagControl);
+const int pos3 = getXPathPosition(pXmlDoc, aPath, aTagBookmarkEnd);
+
+CPPUNIT_ASSERT_GREATER(pos1, pos2);
+CPPUNIT_ASSERT_GREATER(pos2, pos3);
+}
+}
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/CppunitTest_sw_xhtmlexport.mk|   59 
 sw/Module_sw.mk |1 
 sw/qa/extras/htmlexport/xhtmlexport.cxx |   59 
 3 files changed, 119 insertions(+)

New commits:
commit 22d2b332dfd38da82902ace5d6d3763cb3f56f17
Author: Thorsten Behrens 
AuthorDate: Thu Aug 30 06:03:12 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Aug 31 02:58:49 2018 +0200

sw: add unit test for the XHTML part of tdf#109202

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

diff --git a/sw/CppunitTest_sw_xhtmlexport.mk b/sw/CppunitTest_sw_xhtmlexport.mk
new file mode 100644
index ..ce454f367b99
--- /dev/null
+++ b/sw/CppunitTest_sw_xhtmlexport.mk
@@ -0,0 +1,59 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_xhtmlexport))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_xhtmlexport, \
+sw/qa/extras/htmlexport/xhtmlexport \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_xhtmlexport, \
+comphelper \
+cppu \
+   cppuhelper \
+   i18nlangtag \
+sal \
+sfx \
+sw \
+test \
+   tl \
+unotest \
+utl \
+vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_xhtmlexport,\
+   boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_xhtmlexport,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+   -I$(SRCDIR)/sw/qa/extras/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_xhtmlexport,\
+   udkapi \
+   offapi \
+   oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_xhtmlexport))
+$(eval $(call gb_CppunitTest_use_vcl,sw_xhtmlexport))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_xhtmlexport,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_xhtmlexport))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index b9127c379424..c3feaa8feb5b 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_docbookexport \
 CppunitTest_sw_fodfexport \
 CppunitTest_sw_htmlexport \
+CppunitTest_sw_xhtmlexport \
 CppunitTest_sw_htmlimport \
 CppunitTest_sw_macros_test \
 CppunitTest_sw_ooxmlexport \
diff --git a/sw/qa/extras/htmlexport/xhtmlexport.cxx 
b/sw/qa/extras/htmlexport/xhtmlexport.cxx
new file mode 100644
index ..af97e6a821fc
--- /dev/null
+++ b/sw/qa/extras/htmlexport/xhtmlexport.cxx
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+
+class XHtmlExportTest : public SwModelTestBase, public HtmlTestTools
+{
+public:
+XHtmlExportTest()
+: SwModelTestBase("/sw/qa/extras/odfexport/data/", "XHTML Writer File")
+{
+}
+
+private:
+virtual std::unique_ptr preTest(const char*) override
+{
+setFilterOptions("UTF8");
+return nullptr;
+}
+};
+
+#define DECLARE_HTMLEXPORT_TEST(TestName, filename)
\
+DECLARE_SW_EXPORT_TEST(TestName, filename, nullptr, XHtmlExportTest)
+
+DECLARE_HTMLEXPORT_TEST(testImageEmbedding, "image-mimetype.odt")
+{
+htmlDocPtr pDoc = parseHtml(maTempFile);
+CPPUNIT_ASSERT(pDoc);
+
+assertXPath(pDoc, "/html/body", 1);
+assertXPath(pDoc, "/html/body/div[1]/div[1]/img", 1);
+OUString aValue = getXPath(pDoc, "/html/body/div[1]/div[1]/img", "src");
+CPPUNIT_ASSERT(aValue.startsWith("data:image/svg+xml;base64"));
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/source/filter/eppt/pptx-animations.cxx |  101 --
 1 file changed, 57 insertions(+), 44 deletions(-)

New commits:
commit 8fbf75895e92f179ecc8a90b90d076552a279285
Author: Mark Hung 
AuthorDate: Wed Aug 29 00:18:23 2018 +0800
Commit: Mark Hung 
CommitDate: Fri Aug 31 02:38:20 2018 +0200

sd/pptx export: refactor WriteAnimationNode.

to get rid of function pointers.

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

diff --git a/sd/source/filter/eppt/pptx-animations.cxx 
b/sd/source/filter/eppt/pptx-animations.cxx
index 5e2854fadfb7..d9c98db90415 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -405,6 +405,48 @@ void WriteAnimationAttributeName(const FSHelperPtr& pFS, 
const OUString& rAttrib
 
 pFS->endElementNS(XML_p, XML_attrNameLst);
 }
+
+/// convert animation node type to corresponding ooxml element.
+sal_Int32 convertNodeType(sal_Int16 nType)
+{
+sal_Int32 xmlNodeType = -1;
+switch (nType)
+{
+case AnimationNodeType::ITERATE:
+case AnimationNodeType::PAR:
+xmlNodeType = XML_par;
+break;
+case AnimationNodeType::SEQ:
+xmlNodeType = XML_seq;
+break;
+case AnimationNodeType::ANIMATE:
+xmlNodeType = XML_anim;
+break;
+case AnimationNodeType::ANIMATEMOTION:
+xmlNodeType = XML_animMotion;
+break;
+case AnimationNodeType::ANIMATETRANSFORM:
+// could be XML_animScale or XML_animRot based on 
xTransform->getTransformType()
+xmlNodeType = -1;
+break;
+case AnimationNodeType::ANIMATECOLOR:
+xmlNodeType = XML_animClr;
+break;
+case AnimationNodeType::SET:
+xmlNodeType = XML_set;
+break;
+case AnimationNodeType::TRANSITIONFILTER:
+xmlNodeType = XML_animEffect;
+break;
+case AnimationNodeType::COMMAND:
+xmlNodeType = XML_cmd;
+break;
+default:
+SAL_WARN("sd.eppt", "unhandled animation node: " << nType);
+break;
+}
+return xmlNodeType;
+}
 }
 
 void PowerPointExport::WriteAnimationTarget(const FSHelperPtr& pFS, const Any& 
rTarget)
@@ -965,27 +1007,18 @@ void PowerPointExport::WriteAnimationNode(const 
FSHelperPtr& pFS,
   bool bMainSeqChild)
 {
 SAL_INFO("sd.eppt", "export node type: " << rXNode->getType());
-sal_Int32 xmlNodeType = -1;
-typedef void (PowerPointExport::*AnimationNodeWriteMethod)(
-const FSHelperPtr&, const Reference&, sal_Int32, bool);
-AnimationNodeWriteMethod pMethod = nullptr;
+sal_Int32 xmlNodeType = convertNodeType(rXNode->getType());
 
 switch (rXNode->getType())
 {
 case AnimationNodeType::ITERATE:
 case AnimationNodeType::PAR:
-xmlNodeType = XML_par;
+pFS->startElementNS(XML_p, xmlNodeType, FSEND);
+WriteAnimationNodeCommonPropsStart(pFS, rXNode, true, 
bMainSeqChild);
+pFS->endElementNS(XML_p, xmlNodeType);
 break;
 case AnimationNodeType::SEQ:
-pMethod = &PowerPointExport::WriteAnimationNodeSeq;
-break;
-case AnimationNodeType::ANIMATE:
-xmlNodeType = XML_anim;
-pMethod = &PowerPointExport::WriteAnimationNodeAnimate;
-break;
-case AnimationNodeType::ANIMATEMOTION:
-xmlNodeType = XML_animMotion;
-pMethod = &PowerPointExport::WriteAnimationNodeAnimate;
+WriteAnimationNodeSeq(pFS, rXNode, xmlNodeType, bMainSeqChild);
 break;
 case AnimationNodeType::ANIMATETRANSFORM:
 {
@@ -993,53 +1026,33 @@ void PowerPointExport::WriteAnimationNode(const 
FSHelperPtr& pFS,
 if (xTransform.is())
 {
 if (xTransform->getTransformType() == 
AnimationTransformType::SCALE)
-{
 xmlNodeType = XML_animScale;
-pMethod = &PowerPointExport::WriteAnimationNodeAnimate;
-}
 else if (xTransform->getTransformType() == 
AnimationTransformType::ROTATE)
-{
 xmlNodeType = XML_animRot;
-pMethod = &PowerPointExport::WriteAnimationNodeAnimate;
-}
+
+WriteAnimationNodeAnimate(pFS, rXNode, xmlNodeType, 
bMainSeqChild);
 }
+else
+SAL_WARN("sd.eppt",
+ "XAnimateTransform not handled: " << 
xTransform->getTransformType());
 }
 break;
+case AnimationNodeType::ANIMATE:
+case AnimationNodeType::ANIMATEMOTION:
 case AnimationNodeType::ANIMATECOLOR:
-   

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

[Libreoffice Gerrit user]

 sd/source/filter/eppt/pptx-animations.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 9216d1d7a699618e91c739b7c0b66395539681d8
Author: Mark Hung 
AuthorDate: Tue Aug 28 23:33:19 2018 +0800
Commit: Mark Hung 
CommitDate: Fri Aug 31 02:36:47 2018 +0200

sd/pptx export: remove unnecessary using caluses.

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

diff --git a/sd/source/filter/eppt/pptx-animations.cxx 
b/sd/source/filter/eppt/pptx-animations.cxx
index c2fa67f36673..5e2854fadfb7 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -53,7 +53,7 @@
 #include 
 #include 
 #include 
-
+#include 
 #include 
 #include 
 #include 
@@ -61,20 +61,20 @@
 #include "pptexanimations.hxx"
 #include "../ppt/pptanimations.hxx"
 
-using namespace ::com::sun::star;
 using namespace ::com::sun::star::animations;
-using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::presentation;
-using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::uno;
 using namespace ::ppt;
-using ::sax_fastparser::FSHelperPtr;
 using namespace oox::drawingml;
 using namespace oox::core;
 using namespace oox;
 
+using ::com::sun::star::beans::NamedValue;
+using ::com::sun::star::drawing::XShape;
+using ::com::sun::star::text::XSimpleText;
+using ::sax_fastparser::FSHelperPtr;
+
 namespace
 {
 void WriteAnimationProperty(const FSHelperPtr& pFS, const Any& rAny, sal_Int32 
nToken = 0)
@@ -104,7 +104,7 @@ void WriteAnimationProperty(const FSHelperPtr& pFS, const 
Any& rAny, sal_Int32 n
 sal_uInt32 nRgb;
 double fDouble;
 
-uno::TypeClass aClass = rAny.getValueType().getTypeClass();
+TypeClass aClass = rAny.getValueType().getTypeClass();
 bool bWriteToken
 = nToken
   && (aClass == TypeClass_LONG || aClass == TypeClass_DOUBLE || aClass 
== TypeClass_STRING);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst openssl/makefile.mk openssl/openssllnx.patch openssl/openssl.patch

[Libreoffice Gerrit user]

 external_deps.lst|6 +-
 openssl/makefile.mk  |4 -
 openssl/openssl.patch|  112 ++-
 openssl/openssllnx.patch |   18 +++
 4 files changed, 76 insertions(+), 64 deletions(-)

New commits:
commit f1293fc1719a7dca21c17ac4ffc9a00ab135a3ab
Author: Don Lewis 
AuthorDate: Thu Aug 30 23:08:51 2018 +
Commit: Don Lewis 
CommitDate: Thu Aug 30 23:08:51 2018 +

Upgrade bundled openssl to version 1.0.2p.

diff --git a/external_deps.lst b/external_deps.lst
index d88a0f37b128..441cc11209de 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -152,9 +152,9 @@ if (SOLAR_JAVA==TRUE)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
-MD5 = 9392e65072ce4b614c1392eefc1f23d0
-name = openssl-1.0.2h.tar.gz
-URL1 = http://www.openssl.org/source/openssl-1.0.2h.tar.gz
+MD5 = ac5eb30bf5798aa14b1ae6d0e7da58df
+name = openssl-1.0.2p.tar.gz
+URL1 = http://www.openssl.org/source/openssl-1.0.2p.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index dc97bb1c7459..64249e01487f 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -42,10 +42,10 @@ TARGET=openssl
 @echo "openssl disabled"
 .ENDIF
 
-OPENSSL_NAME=openssl-1.0.2h
+OPENSSL_NAME=openssl-1.0.2p
 
 TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=9392e65072ce4b614c1392eefc1f23d0
+TARFILE_MD5=ac5eb30bf5798aa14b1ae6d0e7da58df
 
 CONFIGURE_DIR=.
 CONFIGURE_ACTION=config
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index 27a01adffaa2..1a6da3720b13 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -1,7 +1,7 @@
-diff -ur misc/openssl-1.0.2h/Configure misc/build/openssl-1.0.2h/Configure
 misc/openssl-1.0.2h/Configure  2016-05-03 06:44:42.0 -0700
-+++ misc/build/openssl-1.0.2h/Configure2016-08-14 23:51:42.672229000 
-0700
-@@ -475,19 +475,20 @@
+diff -ur misc/openssl-1.0.2p/Configure misc/build/openssl-1.0.2p/Configure
+--- misc/openssl-1.0.2p/Configure  2018-08-14 05:49:04.0 -0700
 misc/build/openssl-1.0.2p/Configure2018-08-26 14:51:25.39791 
-0700
+@@ -477,19 +477,20 @@
  "android-mips","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib 
-O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL 
BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
   *BSD [do see comment about ${BSDthreads} above!]
@@ -31,7 +31,19 @@ diff -ur misc/openssl-1.0.2h/Configure 
misc/build/openssl-1.0.2h/Configure
  
  "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 
-march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} 
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
-@@ -2031,10 +2032,12 @@
+@@ -592,9 +593,9 @@
+ "debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE 
-D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT 
EXPORT_VAR_AS_FN:".eval{my 
$asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32",
+ # x86 Win32 target defaults to ANSI API, if you want UNICODE, complement
+ # 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'
+-"VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE 
-D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN 
${x86_gcc_opts}:${x86_asm}:win32n:win32",
++"VC-WIN32","cl:-W3 -w44129 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE 
-D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN 
${x86_gcc_opts}:${x86_asm}:win32n:win32",
+ # Unified CE target
+-"debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE 
-D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN 
${x86_gcc_opts}:${x86_asm}:win32n:win32",
++"debug-VC-WIN32","cl:-W3 -W44129 -WX -Gs0 -GF -Gy -Zi -nologo 
-DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN 
-D_CRT_SECURE_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG 
RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
+ "VC-CE","clWINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN 
${x86_gcc_opts}:${no_asm}:win32",
+ 
+ # Borland C++ 4.5
+@@ -2065,10 +2066,12 @@
if ( $perl =~ m@^/@) {
&dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my 
$dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . 
'";');
&dofile("apps/CA.pl",$perl,'^#!/', '#!%s');
@@ -43,11 +55,11 @@ diff -ur misc/openssl-1.0.2h/Configure 
misc/build/openssl-1.0.2h/Configure
 +  &dofile("apps/tsget",'/usr/local/bin/perl',,'^#!/', '#!%s');

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

[Libreoffice Gerrit user]

 sd/source/filter/eppt/epptooxml.hxx   |7 
 sd/source/filter/eppt/pptx-animations.cxx |  367 ++
 2 files changed, 182 insertions(+), 192 deletions(-)

New commits:
commit 7496a0c8141c05c5f2b7e39ea9d4582f261b9e13
Author: Mark Hung 
AuthorDate: Tue Aug 28 23:24:11 2018 +0800
Commit: Mark Hung 
CommitDate: Fri Aug 31 01:25:34 2018 +0200

sd/pptx export: move animation related static member functions

of PowerPointExport to anonymous namespace. This allows cleaning
up PowerPointExport and later moving other non-static member
functions caller outside PowerPointExport to become a new class.

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

diff --git a/sd/source/filter/eppt/epptooxml.hxx 
b/sd/source/filter/eppt/epptooxml.hxx
index 29ffca5604d9..97f7cf903d3f 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -99,12 +99,7 @@ private:
 virtual ::oox::ole::VbaProject* implCreateVbaProject() const override;
 void WriteNotesMaster();
 
-static void WriteAnimateTo( const ::sax_fastparser::FSHelperPtr& pFS, 
const css::uno::Any& rValue, const OUString& rAttributeName );
-static void WriteAnimateValues( const ::sax_fastparser::FSHelperPtr& pFS, 
const css::uno::Reference< css::animations::XAnimate >& rXAnimate );
-static void WriteAnimationCondition( const ::sax_fastparser::FSHelperPtr& 
pFS, css::uno::Any const & rAny, bool bWriteEvent, bool bMainSeqChild, 
sal_Int32 nToken );
-static void WriteAnimationCondition( const ::sax_fastparser::FSHelperPtr& 
pFS, const char* pDelay, const char* pEvent, double fDelay, bool bHasFDelay, 
sal_Int32 nToken );
 void WriteAnimations( const ::sax_fastparser::FSHelperPtr& pFS );
-static void WriteAnimationAttributeName( const 
::sax_fastparser::FSHelperPtr& pFS, const OUString& rAttributeName );
 void WriteAnimationNode( const ::sax_fastparser::FSHelperPtr& pFS, const 
css::uno::Reference< css::animations::XAnimationNode >& rXNode, bool 
bMainSeqChild );
 void WriteAnimationNodeAnimate( const ::sax_fastparser::FSHelperPtr& pFS, 
const css::uno::Reference< css::animations::XAnimationNode >& rXNode, sal_Int32 
nXmlNodeType, bool bMainSeqChild );
 void WriteAnimationNodeAnimateInside( const ::sax_fastparser::FSHelperPtr& 
pFS, const css::uno::Reference< css::animations::XAnimationNode >& rXNode, bool 
bMainSeqChild, bool bSimple, bool bWriteTo = true );
@@ -113,8 +108,6 @@ private:
 void WriteAnimationNodeCommand(const ::sax_fastparser::FSHelperPtr& pFS, 
const css::uno::Reference< css::animations::XAnimationNode >& rXNode, sal_Int32 
nXmlNodeType, bool bMainSeqChild );
 void WriteAnimationNodeCommonPropsStart( const 
::sax_fastparser::FSHelperPtr& pFS, const css::uno::Reference< 
css::animations::XAnimationNode >& rXNode, bool bSingle, bool bMainSeqChild );
 
-static void WriteAnimateColorColor(const ::sax_fastparser::FSHelperPtr& 
pFS, const css::uno::Any& rAny, sal_Int32 nToken);
-static void WriteAnimationProperty( const ::sax_fastparser::FSHelperPtr& 
pFS, const css::uno::Any& rAny, sal_Int32 nToken = 0 );
 void WriteAnimationTarget( const ::sax_fastparser::FSHelperPtr& pFS, const 
css::uno::Any& rTarget );
 bool WriteComments( sal_uInt32 nPageNum );
 void ImplWriteBackground( const ::sax_fastparser::FSHelperPtr& pFS, const 
css::uno::Reference< css::beans::XPropertySet >& aXBackgroundPropSet );
diff --git a/sd/source/filter/eppt/pptx-animations.cxx 
b/sd/source/filter/eppt/pptx-animations.cxx
index 82dbb8eb59ab..c2fa67f36673 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -73,9 +73,11 @@ using namespace ::ppt;
 using ::sax_fastparser::FSHelperPtr;
 using namespace oox::drawingml;
 using namespace oox::core;
+using namespace oox;
 
-void PowerPointExport::WriteAnimationProperty(const FSHelperPtr& pFS, const 
Any& rAny,
-  sal_Int32 nToken)
+namespace
+{
+void WriteAnimationProperty(const FSHelperPtr& pFS, const Any& rAny, sal_Int32 
nToken = 0)
 {
 if (!rAny.hasValue())
 return;
@@ -132,8 +134,64 @@ void PowerPointExport::WriteAnimationProperty(const 
FSHelperPtr& pFS, const Any&
 pFS->endElementNS(XML_p, nToken);
 }
 
-void PowerPointExport::WriteAnimateValues(const FSHelperPtr& pFS,
-  const Reference& rXAnimate)
+void WriteAnimateColorColor(const FSHelperPtr& pFS, const Any& rAny, sal_Int32 
nToken)
+{
+if (!rAny.hasValue())
+return;
+
+sal_Int32 nColor = 0;
+if (rAny >>= nColor)
+{
+pFS->startElementNS(XML_p, nToken, FSEND);
+
+if (nToken == XML_by)
+{
+// CT_TLByRgbColorTransform
+SAL_WARN("sd.eppt", "Export p:rgb in p:by of animClr isn't 
implemented yet."

Re: New Defects reported by Coverity Scan for LibreOffice

[Kohei Yoshida]

Hi there,

> On August 30, 2018 at 11:25 AM scan-ad...@coverity.com wrote:

> ** CID 1438872:(UNUSED_VALUE)

I did look into this and I confirm coverity's assessment.  It should be 
resolved with the following commit:

https://gitlab.com/mdds/mdds/commit/61900151e63d232d6c49891bccb7f5d1c1976991

> ** CID 1438870:  Performance inefficiencies  (PASS_BY_VALUE)
> /usr/include/mdds-1.4/mdds/multi_type_matrix_def.inl: 697 in 
> mdds::multi_type_matrix::walk<::WalkElementBlockOperation>(T1,
>  const mdds::multi_type_matrix::size_pair_type &, const 
> mdds::multi_type_matrix::size_pair_type &) const()

This one, however, is related to the function object being passed by value, and 
it's intentional.  It's modeled after how std::for_each implementation takes 
its function object by value and returns either a copied or a moved instance of 
it.

As far as I know it cannot support inline lambdas unless the method takes the 
function object by value.

--
Kohei Yoshida, LibreOffice Calc volunteer hacker
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sw/uiconfig/sweb/toolbar/standardbar.xml |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7fc4aa739c6913c14bea7485919818f6da5f8c38
Author: Rizal Muttaqin 
AuthorDate: Thu Aug 30 23:35:38 2018 +0700
Commit: Maxim Monastirsky 
CommitDate: Fri Aug 31 00:35:49 2018 +0200

tdf#118993 - Missing new Insert Special Character in Web

Change-Id: Icbe68ac5f1ddb5ad59e0615ad1d558b829c6977f
Reviewed-on: https://gerrit.libreoffice.org/59832
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git a/sw/uiconfig/sweb/toolbar/standardbar.xml 
b/sw/uiconfig/sweb/toolbar/standardbar.xml
index e96c9debec67..921dfa7948df 100644
--- a/sw/uiconfig/sweb/toolbar/standardbar.xml
+++ b/sw/uiconfig/sweb/toolbar/standardbar.xml
@@ -53,7 +53,8 @@
  
  
  
- 
+ 
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 framework/source/uielement/toolbarmanager.cxx |5 ++--
 svtools/source/uno/popupwindowcontroller.cxx  |4 ++-
 vcl/source/window/floatwin.cxx|   28 ++
 3 files changed, 17 insertions(+), 20 deletions(-)

New commits:
commit 4b8ef8bd6acfa9c062146bff2168fb0450e9542e
Author: Maxim Monastirsky 
AuthorDate: Sun Aug 26 23:54:13 2018 +0300
Commit: Maxim Monastirsky 
CommitDate: Fri Aug 31 00:09:20 2018 +0200

tdf#119390 Don't focus the toolbar when closing a floating window

Toolbar popup windows have the toolbar as their direct
parent. This causes problems when such window is teared-off
and later closed, as Window::dispose will attempt to move the
focus to its parent which is the toolbar, instead of what
users expect to have the focus back in the document area, or
in whatever was the last focused control. As a solution
reparent the window before dispose, similar to what happens
with floating toolbars.

Also return the focus to the main window when popup mode ends,
so we can keep track of the last focused control. This is also
a good thing by itself, as WB_OWNERDRAWDECORATION windows don't
get the focus by default, which results in neither the floating
window nor the document have focus after tear-off.

Change-Id: I060b8c45a64db9c612da58b7c35478bab41a4558
Reviewed-on: https://gerrit.libreoffice.org/59811
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index b6fe68308b9b..5ca1bb8daa69 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -234,8 +234,9 @@ void ToolBarManager::Destroy()
 
 // Hide toolbar as lazy delete can destroy the toolbar much later.
 m_pToolBar->Hide();
-/* #i99167# removed change for i93173 since there is some weird crash */
-// #i93173# delete toolbar lazily as we can still be in one of its 
handlers
+// #i93173# delete toolbar lazily as we can still be in one of its handlers
+// tdf#119390 this will reparent the toolbar, so focus is restored from a
+// floating toolbar to the last focused control of the application window.
 m_pToolBar->doLazyDelete();
 
 m_pToolBar->SetSelectHdl( Link() );
diff --git a/svtools/source/uno/popupwindowcontroller.cxx 
b/svtools/source/uno/popupwindowcontroller.cxx
index 51f2b6e10f42..264afc41ce75 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -79,7 +79,9 @@ void PopupWindowControllerImpl::SetFloatingWindow()
 if( mpFloatingWindow )
 {
 mpFloatingWindow->RemoveEventListener( LINK( this, 
PopupWindowControllerImpl, WindowEventListener ) );
-mpFloatingWindow.disposeAndClear();
+// tdf#119390 reparent the window, so focus is restored
+// to the last focused control of the application window.
+mpFloatingWindow->doLazyDelete();
 }
 mpFloatingWindow = mpPopupWindow;
 mpPopupWindow.clear();
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 5acbf1cc8bc2..86a7140cce43 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -829,29 +829,23 @@ void FloatingWindow::ImplEndPopupMode( 
FloatWinPopupEndFlags nFlags, const VclPt
 mpNextFloat = nullptr;
 
 FloatWinPopupFlags nPopupModeFlags = mnPopupModeFlags;
+mbPopupModeTearOff = nFlags & FloatWinPopupEndFlags::TearOff &&
+ nPopupModeFlags & FloatWinPopupFlags::AllowTearOff;
 
 // hide window again if it was not deleted
-if ( !(nFlags & FloatWinPopupEndFlags::TearOff) ||
- !(nPopupModeFlags & FloatWinPopupFlags::AllowTearOff) )
-{
+if (!mbPopupModeTearOff)
 Show( false, ShowFlags::NoFocusChange );
 
-if (HasChildPathFocus() && xFocusId != nullptr)
-{
-// restore focus to previous focus window if we still have the 
focus
-Window::EndSaveFocus(xFocusId);
-}
-else if ( pSVData->maWinData.mpFocusWin && 
pSVData->maWinData.mpFirstFloat &&
-  ImplIsWindowOrChild( pSVData->maWinData.mpFocusWin ) )
-{
-// maybe pass focus on to a suitable FloatingWindow
-pSVData->maWinData.mpFirstFloat->GrabFocus();
-}
-mbPopupModeTearOff = false;
+if (HasChildPathFocus() && xFocusId != nullptr)
+{
+// restore focus to previous focus window if we still have the focus
+Window::EndSaveFocus(xFocusId);
 }
-else
+else if ( pSVData->maWinData.mpFocusWin && pSVData->maWinData.mpFirstFloat 
&&
+  ImplIsWindowOrChild( pSVData->maWinData.mpFocusWin ) )
 {
-mbPopupModeTearOff = true;
+// maybe pass focus on to a suitable FloatingWindow
+pSVData->maWinData.mpFirstFloat->GrabFo

Re: make check fails in [build JCS]

[Regina Henschel]

Hi Stephan,

Stephan Bergmann schrieb am 29-Aug-18 um 11:06:

On 29/08/18 10:04, Regina Henschel wrote:



I run into such errors on Windows with recent JDK (9/10; I /think/ it
started with 9) for quite a while now, wondered why apparently nobody
else did, locally applied below hack for now, and moved on for the time
being without investigating deeper into the issue.  (Apparently, Java no
longer accepts file:... URLs there, at least on Windows, and won't
accept full pathnames starting with a drive letter like C:/..., but does
accept ("drive-absolute") pathnames like /...; so my hack should work as
long as your files are on drive C.)


It is D: for me.

Your changes work here too. At least checking goes further. It fails in 
chart2 now. I'll update and look, whether that solves the problem.




Apparently, needs more investigation and a proper fix, eventually.


A fix would be nice.

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

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

[Libreoffice Gerrit user]

 connectivity/source/drivers/mysqlc/mysqlc_general.cxx   |2 +-
 connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx |2 +-
 include/sal/log-areas.dox   |1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e2ecce7e01038baac502f4b69c7ad47e82cd1ab4
Author: Stephan Bergmann 
AuthorDate: Thu Aug 30 14:33:28 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Aug 30 22:33:23 2018 +0200

Combine mysqlc and connectivity.mysqlc log areas

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

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
index 126c9940a895..c1caf782016d 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
@@ -83,7 +83,7 @@ void allocateSqlVar(void** mem, enum_field_types eType, 
unsigned nSize)
 *mem = nullptr;
 break;
 default:
-SAL_WARN("mysqlc", "unknown enum_field_type");
+SAL_WARN("connectivity.mysqlc", "unknown enum_field_type");
 }
 }
 
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
index e188793d7e50..97c1da289d02 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
@@ -125,7 +125,7 @@ void SAL_CALL OPreparedStatement::close()
 
 if (mysql_stmt_close(m_pStmt))
 {
-SAL_WARN("mysqlc", "failed to close mysql prepared statement");
+SAL_WARN("connectivity.mysqlc", "failed to close mysql prepared 
statement");
 }
 m_pStmt = nullptr; // it's deallocated already
 clearWarnings();
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index d92db0ae571e..d718f649be70 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -606,7 +606,6 @@ certain functionality.
 @li @c lingucomponent
 @li @c linguistic
 @li @c lwp - lotuswordpro
-@li @c mysqlc
 @li @c opencl
 @li @c opencl.device
 @li @c opencl.file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svl/source/numbers/zformat.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 73c200d7e5779b18ee1406b7fbd2000a8c901589
Author: Eike Rathke 
AuthorDate: Thu Aug 30 16:46:49 2018 +0200
Commit: Eike Rathke 
CommitDate: Thu Aug 30 20:37:41 2018 +0200

Use INPUTSTRING_PRECISION to enable input of fraction of second

This got lost when SvNumberFormatter::INPUTSTRING_PRECISION was
introduced but not all places changed using the previous hard
coded number 300, so input of fraction of second in time clock and
duration was either truncated or not available at all, already
since

commit 0ce0dd5863208500d8d4658f1f68f34e254ab015
CommitDate: Tue Dec 1 16:58:07 2009 -0500

#i46511# Fixed one bug where the standard percent format
incorrectly got unlimited precision.

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

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 3d7e1c42bd8e..cffa86176781 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2972,7 +2972,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
 }
 bool bInputLine;
 sal_Int32 nCntPost;
-if ( rScan.GetStandardPrec() == 300 &&
+if ( rScan.GetStandardPrec() == SvNumberFormatter::INPUTSTRING_PRECISION &&
  0 < rInfo.nCntPost && rInfo.nCntPost < 7 )
 {   // round at 7 decimals (+5 of 86400 == 12 significant digits)
 bInputLine = true;
@@ -3837,7 +3837,7 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
 const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
 bool bInputLine;
 sal_Int32 nCntPost;
-if ( rScan.GetStandardPrec() == 300 &&
+if ( rScan.GetStandardPrec() == SvNumberFormatter::INPUTSTRING_PRECISION &&
  0 < rInfo.nCntPost && rInfo.nCntPost < 7 )
 {
 // round at 7 decimals (+5 of 86400 == 12 significant digits)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: License information for extensions on LO's extension site

[Andreas Mantke]

Am 30.08.2018 um 19:02 schrieb Stephan Bergmann:
> On 30/08/18 18:43, Andreas Mantke wrote:
>> In my view it is necessary, that a LibreOffice extension that is
>> published on a TDF resource, has a clear license statement and presents
>> this license statement to the user during the installation process.
>
> Why should presenting the license during installation be necessary?
> Installing LO itself, for example, doesn't do that, either.

if you want to make an agreement with the user about the license, you
have to present the license during the installing process and ask for
accepting it.

Otherwise there is no agreement on the license.

Kind regards,
Andreas

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

Re: Tinderbox 71 Failing on CppunitTest_sd_export_ooxml2

[Luke Benes]

This was fixed by:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=6563b399

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

[Libreoffice-commits] core.git: basegfx/Library_basegfx.mk basegfx/source cui/source drawinglayer/source include/basegfx include/vcl solenv/clang-format vcl/headless vcl/inc vcl/opengl vcl/qt5 vcl/qua

[Libreoffice Gerrit user]

 basegfx/Library_basegfx.mk  |1 
 basegfx/source/polygon/b2dpolygon.cxx   |   47 ++
 basegfx/source/tools/systemdependentdata.cxx|  141 +++
 cui/source/dialogs/screenshotannotationdlg.cxx  |2 
 drawinglayer/source/primitive2d/polygonprimitive2d.cxx  |6 
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |   42 +-
 include/basegfx/polygon/b2dpolygon.hxx  |   24 +
 include/basegfx/utils/systemdependentdata.hxx   |  139 +++
 include/vcl/outdev.hxx  |1 
 solenv/clang-format/blacklist   |2 
 vcl/headless/svpgdi.cxx |  289 +---
 vcl/inc/headless/svpgdi.hxx |   26 -
 vcl/inc/openglgdiimpl.hxx   |4 
 vcl/inc/qt5/Qt5Graphics.hxx |6 
 vcl/inc/quartz/salgdi.h |4 
 vcl/inc/salgdi.hxx  |   11 
 vcl/inc/salgdiimpl.hxx  |4 
 vcl/inc/unx/genpspgraphics.h|   15 
 vcl/inc/unx/salgdi.h|4 
 vcl/inc/win/salbmp.h|   32 -
 vcl/inc/win/salgdi.h|4 
 vcl/opengl/gdiimpl.cxx  |   45 +-
 vcl/qt5/Qt5Graphics_GDI.cxx |   23 -
 vcl/quartz/salgdicommon.cxx |   39 +-
 vcl/source/app/svmain.cxx   |5 
 vcl/source/gdi/salgdilayout.cxx |  183 +-
 vcl/source/outdev/line.cxx  |   19 -
 vcl/source/outdev/polygon.cxx   |   82 ++--
 vcl/source/outdev/polyline.cxx  |  152 +---
 vcl/source/outdev/transparent.cxx   |   20 -
 vcl/unx/generic/gdi/gdiimpl.cxx |   41 +-
 vcl/unx/generic/gdi/gdiimpl.hxx |4 
 vcl/unx/generic/gdi/salgdi.cxx  |   44 +-
 vcl/unx/generic/print/genpspgraphics.cxx|4 
 vcl/win/gdi/gdiimpl.cxx |  280 +++
 vcl/win/gdi/gdiimpl.hxx |4 
 vcl/win/gdi/salbmp.cxx  |  219 +++-
 vcl/win/gdi/salgdi_gdiplus.cxx  |   15 
 38 files changed, 1479 insertions(+), 504 deletions(-)

New commits:
commit b9fa01a8d1137a95af9865a3e47995734c40da6e
Author: Armin Le Grand 
AuthorDate: Fri Aug 24 13:01:08 2018 +0200
Commit: Armin Le Grand 
CommitDate: Thu Aug 30 19:48:46 2018 +0200

Support buffering SystemDependent GraphicData

This is a first step to allow buffering of system
dependent data, especially (but not only) for the
system-dependent implementations of graphic output.
For example, for B2DPolygon and Win output, it allows
buffering the Gdiplus::GraphicsPath instead of re-
creating it all the time.
To support that, the change includes forwarding the
current transformation to the renderers in SalGraphics.
The current state in VCL is to transform all and
everything to device coordinates at every single
paint.
I have currently started to do this for ::drawPolyLine
implementations. The fallbacks for all systems will
at the start of that method just transform the data
to device coordinates, so all works as before.
This may also be done for FilledPolygon paint in a later
step, but most urgent is FatLine painting.
An arrangement of shared_ptr/weak_ptr is used so that
either the instance buffering (in the example B2DPolygon)
or the instance managing it can delete it. The instance
managing it currently uses a 1s Timer and a cycle-lifetime
management, but that can be extended in the future
to e.g. include size hints, too.
The mechanism it designed to support multiple Data per
buffering element, e.g. for B2DPolygon at the same time
system-dependent instances of Gdiplus and Cairo can be
buffered, but also PDF-data.
This is achieved semi-automatic by using
typeid(class).hash_code() as key for organization.
The mechanism will be used for now at B2DPolygon, but
is not limited to. There is already a similar but less
general buffer (see GdiPlusBuffer) that can and will
be converted to use this new mechanism.

Added vcl/headless Cairo renderer to support given
ObjectToDevice transformation (not to transform given
B2DPolygon)
Added support for CairoPath buffered at B2DPolygon,
seems to work well. Need to do more tests

Moved usage to templates suggested by Noel Grandin
(Noel Grandin ), thanks for
these suggestions. Adapted Win usage to that, too.

problems exporing spreadsheet to JPEG

[Oliver Kowalke]

Hi,
I'd like to export an spreadsheet to JPEG.
Unfortunately only 7 of 17 columns are contained int the jpeg file.
Is it possible to remove the padding? The jpeg should only contain the
table without space at it s borders?
The function for exporting the spreadsheet looks like this:

void
export2jpeg( Reference< XMultiServiceFactory > const& xMainComponent,
 std::string const& documentFile) {
Reference< XStorable > xStore{ xMainComponent, UNO_QUERY };
Sequence< PropertyValue > storeProps{ 1 };
storeProps[0].Name = OUString::createFromAscii("FilterName");
storeProps[0].Name = "FilterName";
storeProps[0].Value <<= OUString::createFromAscii("JPEG - Joint
Photographic Experts Group");
xStore->storeToURL( OUString::createFromAscii( documentFile.c_str() ),
storeProps);
}

Thank you in advance.
Oliver
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sd/Library_sdfilt.mk  |1 
 sd/source/filter/eppt/pptx-animations.cxx | 1076 ++
 sd/source/filter/eppt/pptx-epptooxml.cxx  | 1025 
 3 files changed, 1077 insertions(+), 1025 deletions(-)

New commits:
commit f4a9ce33415a85d0b86ced3a0bf780f4ec61e25f
Author: Mark Hung 
AuthorDate: Mon Aug 27 22:38:30 2018 +0800
Commit: Mark Hung 
CommitDate: Thu Aug 30 19:19:03 2018 +0200

sd/pptx export: move animation export code to a single file.

Move animation export functions in PowerPointExport to
a single file for further refactor work.

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

diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index f371c274edda..8428a4a82df5 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -63,6 +63,7 @@ $(eval $(call gb_Library_add_exception_objects,sdfilt,\
 sd/source/filter/eppt/pptexsoundcollection \
 sd/source/filter/eppt/pptx-epptbase \
 sd/source/filter/eppt/pptx-epptooxml \
+sd/source/filter/eppt/pptx-animations \
 sd/source/filter/eppt/pptx-grouptable \
 sd/source/filter/eppt/pptx-stylesheet \
 sd/source/filter/eppt/pptx-text \
diff --git a/sd/source/filter/eppt/pptx-animations.cxx 
b/sd/source/filter/eppt/pptx-animations.cxx
new file mode 100644
index ..82dbb8eb59ab
--- /dev/null
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -0,0 +1,1076 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include 
+#include 
+#include 
+#include "epptooxml.hxx"
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#include "pptexanimations.hxx"
+#include "../ppt/pptanimations.hxx"
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::animations;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::drawing;
+using namespace ::com::sun::star::presentation;
+using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::uno;
+using namespace ::ppt;
+using ::sax_fastparser::FSHelperPtr;
+using namespace oox::drawingml;
+using namespace oox::core;
+
+void PowerPointExport::WriteAnimationProperty(const FSHelperPtr& pFS, const 
Any& rAny,
+  sal_Int32 nToken)
+{
+if (!rAny.hasValue())
+return;
+
+ValuePair aPair;
+
+if (rAny >>= aPair)
+{
+double x, y;
+if ((aPair.First >>= x) && (aPair.Second >>= y))
+{
+if (nToken == XML_by)
+{
+// MS needs ending values but we have offset values.
+x += 1.0;
+y += 1.0;
+}
+pFS->singleElementNS(XML_p, nToken, XML_x, OString::number(x * 
10).getStr(), XML_y,
+ OString::number(y * 10).getStr(), FSEND);
+}
+return;
+}
+
+sal_uInt32 nRgb;
+double fDouble;
+
+uno::TypeClass aClass = rAny.getValueType().getTypeClass();
+bool bWriteToken
+= nToken
+  && (aClass == TypeClass_LONG || aClass == TypeClass_DOUBLE || aClass 
== TypeClass_STRING);
+
+if (bWriteToken)
+pFS->startElementNS(XML_p, nToken, FSEND);
+
+switch (rAny.getValueType().getTypeClass())
+{
+case TypeClass_LONG:
+rAny >>= nRgb;
+pFS->singleElementNS(XML_a, XML_srgbClr, XML_val, I32SHEX(nRgb), 
FSEND);
+break;
+case TypeClass_DOUBLE:
+rAny >>= fDouble;
+pFS->singleElementNS(XML_p, XML_fltVal, XML_val, DS(fDouble), 
FSEND);
+break;
+case TypeClass_STRING:
+pFS->s

Re: License information for extensions on LO's extension site

[Kaganski Mike]

On 8/30/2018 8:02 PM, Stephan Bergmann wrote:
> On 30/08/18 18:43, Andreas Mantke wrote:
>> In my view it is necessary, that a LibreOffice extension that is
>> published on a TDF resource, has a clear license statement and presents
>> this license statement to the user during the installation process.
> 
> Why should presenting the license during installation be necessary? 
> Installing LO itself, for example, doesn't do that, either.

By the way, GPLv3 (for example) explicitly says what is required to do 
with license when redistributing (4. "... give all recipients a copy of 
this License along with the Program"; 9. "Acceptance Not Required for 
Having Copies - You are not required to accept this License in order to 
receive or run a copy of the Program").

-- 
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: License information for extensions on LO's extension site

[Stephan Bergmann]

On 30/08/18 18:43, Andreas Mantke wrote:

In my view it is necessary, that a LibreOffice extension that is
published on a TDF resource, has a clear license statement and presents
this license statement to the user during the installation process.


Why should presenting the license during installation be necessary? 
Installing LO itself, for example, doesn't do that, either.

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

[Libreoffice-commits] online.git: 2 commits - test/TileCacheTests.cpp wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/DocumentBroker.cpp

[Libreoffice Gerrit user]

 test/TileCacheTests.cpp |  220 
 wsd/ClientSession.cpp   |   18 ++-
 wsd/ClientSession.hpp   |3 
 wsd/DocumentBroker.cpp  |   14 +--
 4 files changed, 243 insertions(+), 12 deletions(-)

New commits:
commit 8085b112dc13a676a54e0aeca47e9b792d68fcf1
Author: Tamás Zolnai 
AuthorDate: Thu Aug 30 18:43:43 2018 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Aug 30 18:43:43 2018 +0200

Add some test for the new tile rendering code

Change-Id: I92e925740e67a62cd69e8c8135484c10d74dabc8

diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index afff54f55..10a1900f4 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace helpers;
 
@@ -78,6 +79,12 @@ class TileCacheTests : public CPPUNIT_NS::TestFixture
 // temporarily disable
 //CPPUNIT_TEST(testTileInvalidatePartCalc);
 //CPPUNIT_TEST(testTileInvalidatePartImpress);
+CPPUNIT_TEST(testTileRequestByInvalidation);
+CPPUNIT_TEST(testTileRequestByZoom);
+CPPUNIT_TEST(testTileWireIDHandling);
+CPPUNIT_TEST(testTileProcessed);
+CPPUNIT_TEST(testTileInvalidatedOutside);
+
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -100,6 +107,11 @@ class TileCacheTests : public CPPUNIT_NS::TestFixture
 void testTileInvalidateCalc();
 void testTileInvalidatePartCalc();
 void testTileInvalidatePartImpress();
+void testTileRequestByInvalidation();
+void testTileRequestByZoom();
+void testTileWireIDHandling();
+void testTileProcessed();
+void testTileInvalidatedOutside();
 
 void checkTiles(std::shared_ptr& socket,
 const std::string& type,
@@ -1123,6 +1135,214 @@ void 
TileCacheTests::requestTiles(std::shared_ptr& socket, const
 }
 }
 
+void TileCacheTests::testTileRequestByInvalidation()
+{
+const char* testname = "tileRequestByInvalidation ";
+
+std::string documentPath, documentURL;
+getDocumentPathAndURL("empty.odt", documentPath, documentURL, testname);
+std::shared_ptr socket = loadDocAndGetSocket(_uri, 
documentURL, testname);
+
+// 1. use case: invalidation without having a valid visible area in wsd
+// Type one character to trigger invalidation
+sendChar(socket, 'x', skNone, testname);
+
+// First wsd forwards the invalidation
+assertResponseString(socket, "invalidatetiles:", testname);
+
+// Since we did not set client visible area wsd won't send tile
+std::vector tile = getResponseMessage(socket, "tile:", testname);
+CPPUNIT_ASSERT_MESSAGE("Not expected tile message arrived!", tile.empty());
+
+// 2. use case: invalidation of one tile inside the client visible area
+// Now set the client visible area
+sendTextFrame(socket, "clientvisiblearea x=-4005 y=0 width=50490 
height=72300");
+sendTextFrame(socket, "clientzoom tilepixelwidth=256 tilepixelheight=256 
tiletwipwidth=3840 tiletwipheight=3840");
+
+// Type one character to trigger invalidation
+sendChar(socket, 'x', skNone, testname);
+
+// First wsd forwards the invalidation
+assertResponseString(socket, "invalidatetiles:", testname);
+
+// Then sends the new tile which was invalidated inside the visible area
+assertResponseString(socket, "tile:", testname);
+}
+
+void TileCacheTests::testTileRequestByZoom()
+{
+// By zoom the client requests all the tile of the visible area
+// Server should push all these tiles to the network, so tiles-on-fly 
should be bigger than this count
+
+const char* testname = "testTileRequestByZoom ";
+
+std::string documentPath, documentURL;
+getDocumentPathAndURL("empty.odt", documentPath, documentURL, testname);
+std::shared_ptr socket = loadDocAndGetSocket(_uri, 
documentURL, testname);
+
+// Set the client visible area
+sendTextFrame(socket, "clientvisiblearea x=-2662 y=0 width=16000 
height=9875");
+sendTextFrame(socket, "clientzoom tilepixelwidth=256 tilepixelheight=256 
tiletwipwidth=3200 tiletwipheight=3200");
+
+// Request all tile of the visible area (it happens by zoom)
+sendTextFrame(socket, "tilecombine part=0 width=256 height=256 
tileposx=0,3200,6400,9600,12800,0,3200,6400,9600,12800,0,3200,6400,9600,12800,0,3200,6400,9600,12800,0,3200,6400,9600,12800
 
tileposy=0,0,0,0,0,3200,3200,3200,3200,3200,6400,6400,6400,6400,6400,9600,9600,9600,9600,9600,12800,12800,12800,12800,12800
 tilewidth=3200 tileheight=3200");
+
+// Check that we get all the tiles without we send back the tileprocessed 
message
+for (int i = 0; i < 25; ++i)
+{
+std::vector tile = getResponseMessage(socket, "tile:", testname);
+CPPUNIT_ASSERT_MESSAGE("Did not get tile as expected!", !tile.empty());
+std::cout << i << std::endl;
+}
+}
+
+void TileCacheTests::testTileWireIDHandling()
+{
+const char* testname = "testTileWireIDHandling ";
+
+std::string documentPath, documentURL;
+getDocume

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

[Libreoffice Gerrit user]

 sal/qa/osl/security/osl_Security.cxx   |6 +-
 salhelper/qa/test_api.cxx  |5 ++---
 sd/source/ui/inc/SlideSorter.hxx   |6 --
 sd/source/ui/slidesorter/shell/SlideSorter.cxx |   14 +-
 4 files changed, 4 insertions(+), 27 deletions(-)

New commits:
commit 416a543824caa01a07ab96f1764769d4f234f213
Author: Mike Kaganski 
AuthorDate: Thu Aug 30 15:06:34 2018 +0300
Commit: Mike Kaganski 
CommitDate: Thu Aug 30 18:49:45 2018 +0200

Remove redundant asserts after new

Also remove SlideSorter::CreateController which only calls new;
fix a memory leak in osl_Security's MyTestPlugInImpl::initialize

Change-Id: I70b6e888984f8543adbf879162e752556d2b3f0e
Reviewed-on: https://gerrit.libreoffice.org/59805
Reviewed-by: Noel Grandin 
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/sal/qa/osl/security/osl_Security.cxx 
b/sal/qa/osl/security/osl_Security.cxx
index a1dff025ce70..94a0dcf6a1d1 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -418,11 +418,9 @@ void MyTestPlugInImpl::initialize( 
CPPUNIT_NS::TestFactoryRegistry *,
 
 // Create buffers for the SID and the domain name.
 PSID pSid = static_cast(new BYTE[dwSidBufferSize]);
-CPPUNIT_ASSERT_MESSAGE("# creating SID buffer failed.\n", pSid!= nullptr );
 memset( pSid, 0, dwSidBufferSize);
 
 wszDomainName = new WCHAR[dwDomainBufferSize];
-CPPUNIT_ASSERT_MESSAGE("# creating Domain name buffer failed.\n", 
wszDomainName != nullptr );
 memset(wszDomainName, 0, dwDomainBufferSize*sizeof(WCHAR));
 
 // Obtain the SID for the account name passed.
@@ -454,9 +452,8 @@ void MyTestPlugInImpl::initialize( 
CPPUNIT_NS::TestFactoryRegistry *,
 {
 // Reallocate memory for the SID buffer.
 wprintf(L"# The SID buffer was too small. It will be 
reallocated.\n");
-FreeSid( pSid);
+delete[] static_cast(pSid);
 pSid = static_cast(new BYTE[cbSid]);
-CPPUNIT_ASSERT_MESSAGE("# re-creating SID buffer failed.\n",  
pSid!= nullptr );
 memset( pSid, 0, cbSid);
 dwSidBufferSize = cbSid;
 }
@@ -466,7 +463,6 @@ void MyTestPlugInImpl::initialize( 
CPPUNIT_NS::TestFactoryRegistry *,
 wprintf(L"# The domain name buffer was too small. It will be 
reallocated.\n");
 delete [] wszDomainName;
 wszDomainName = new WCHAR[cchDomainName];
-CPPUNIT_ASSERT_MESSAGE("# re-creating domain name buffer 
failed.\n", wszDomainName!= nullptr );
 memset(wszDomainName, 0, cchDomainName*sizeof(WCHAR));
 dwDomainBufferSize = cchDomainName;
 }
diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx
index badde099e117..56cc571dd6b4 100644
--- a/salhelper/qa/test_api.cxx
+++ b/salhelper/qa/test_api.cxx
@@ -220,15 +220,14 @@ void Test::testSimpleReferenceObject() {
 
 void Test::testDerivedCondition() {
 osl::Mutex mutex;
+// Next line tests that new doesn't throw
 std::unique_ptr< salhelper::Condition > p(new DerivedCondition(mutex));
-CPPUNIT_ASSERT(dynamic_cast< DerivedCondition * >(p.get()) != nullptr);
 }
 
 void Test::testDerivedConditionWaiterTimedout() {
+// Next line tests that new doesn't throw
 std::unique_ptr< salhelper::ConditionWaiter::timedout > p(
 new DerivedConditionWaiterTimedout);
-CPPUNIT_ASSERT(
-dynamic_cast< DerivedConditionWaiterTimedout * >(p.get()) != nullptr);
 try {
 throw DerivedConditionWaiterTimedout();
 } catch (salhelper::ConditionWaiter::timedout &) {
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 9ae38c845a14..8b83e8cf9f3c 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -198,12 +198,6 @@ private:
 */
 model::SlideSorterModel* CreateModel();
 
-/** Create the controller for the view shell.  When called from the default
-implementation of CreateModelViewController() then both the view and
-the controller do exist.  Test their pointers when in doubt.
-*/
-controller::SlideSorterController* CreateController();
-
 bool mbIsValid;
 
 std::unique_ptr mpSlideSorterController;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx 
b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index bcc71fbb3667..56daffae9add 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -302,12 +302,7 @@ void SlideSorter::CreateModelViewController()
 "Can not create model for slide browser");
 
 mpSlideSorterView.reset(new view::SlideSorterView (*this));
-DBG_ASSERT (mpSlideSorterView.get()!=nullptr,
-"Can not create view for slide browser");
-
-mpSlideSorterController.res

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

[Libreoffice Gerrit user]

 sw/qa/extras/htmlexport/data/reqif-no-lang.odt |binary
 sw/qa/extras/htmlexport/htmlexport.cxx |   11 +++
 sw/source/filter/html/wrthtml.cxx  |3 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 81fac013cb365d711ad78a566ee1b5b13480b013
Author: Miklos Vajna 
AuthorDate: Thu Aug 30 15:08:36 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Aug 30 18:45:42 2018 +0200

sw XHTML export: xml:lang is not relevant for ReqIF

I suppose if language is set, that happens in the wrapping ReqIF
document, not in the XHTML fragments.

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

diff --git a/sw/qa/extras/htmlexport/data/reqif-no-lang.odt 
b/sw/qa/extras/htmlexport/data/reqif-no-lang.odt
new file mode 100644
index ..c831921a42a4
Binary files /dev/null and b/sw/qa/extras/htmlexport/data/reqif-no-lang.odt 
differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index c83170752496..861054868ec1 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -646,6 +646,17 @@ DECLARE_HTMLEXPORT_TEST(testOleNodataReqIf, 
"reqif-ole-nodata.odt")
 CPPUNIT_ASSERT(!aSource.isEmpty());
 }
 
+DECLARE_HTMLEXPORT_TEST(testNoLangReqIf, "reqif-no-lang.odt")
+{
+SvMemoryStream aStream;
+wrapFragment(aStream);
+xmlDocPtr pDoc = parseXmlStream(&aStream);
+CPPUNIT_ASSERT(pDoc);
+
+// Make sure that xml:lang is not written in ReqIF mode.
+assertXPathNoAttribute(pDoc, 
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:h1", "lang");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/wrthtml.cxx 
b/sw/source/filter/html/wrthtml.cxx
index 2f8dde26a3bd..53b57fc4ce33 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1339,7 +1339,8 @@ sal_uInt16 SwHTMLWriter::GetLangWhichIdFromScript( 
sal_uInt16 nScript )
 
 void SwHTMLWriter::OutLanguage( LanguageType nLang )
 {
-if( LANGUAGE_DONTKNOW != nLang )
+// ReqIF mode: consumers would ignore language anyway.
+if (LANGUAGE_DONTKNOW != nLang && !mbReqIF)
 {
 OStringBuffer sOut;
 sOut.append(' ');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/htmlexport/data/reqif-ole-nodata.odt |binary
 sw/qa/extras/htmlexport/htmlexport.cxx|   36 +--
 sw/source/filter/html/htmlplug.cxx|   72 --
 3 files changed, 86 insertions(+), 22 deletions(-)

New commits:
commit 5d997c029e53c31a3651a08f5012645097cec48f
Author: Miklos Vajna 
AuthorDate: Thu Aug 30 14:14:11 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Aug 30 18:43:08 2018 +0200

sw XHTML export: improve dummy OLE object handling

It is possible that we not only have a dummy OLE object, but both the
replacement image and the native data is missing. Handle these enough so
that we don't give up exporting the document and also produce valid
output.

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

diff --git a/sw/qa/extras/htmlexport/data/reqif-ole-nodata.odt 
b/sw/qa/extras/htmlexport/data/reqif-ole-nodata.odt
new file mode 100644
index ..a4d3243a8bf3
Binary files /dev/null and b/sw/qa/extras/htmlexport/data/reqif-ole-nodata.odt 
differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 696ca6041dad..c83170752496 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -35,6 +35,20 @@ public:
 m_eUnit(FUNIT_NONE)
 {}
 
+/**
+ * Wraps a reqif-xhtml fragment into an XHTML file, so an XML parser can
+ * parse it.
+ */
+void wrapFragment(SvMemoryStream& rStream)
+{
+rStream.WriteCharPtr(
+"http://www.w3.org/1999/xhtml\";>\n");
+SvFileStream aFileStream(maTempFile.GetURL(), StreamMode::READ);
+rStream.WriteStream(aFileStream);
+rStream.WriteCharPtr("\n");
+rStream.Seek(0);
+}
+
 private:
 bool mustCalcLayoutOf(const char* filename) override
 {
@@ -603,11 +617,7 @@ DECLARE_HTMLEXPORT_TEST(testTransparentImage, 
"transparent-image.odt")
 DECLARE_HTMLEXPORT_TEST(testTransparentImageReqIf, "transparent-image.odt")
 {
 SvMemoryStream aStream;
-aStream.WriteCharPtr("http://www.w3.org/1999/xhtml\";>\n");
-SvFileStream aFileStream(maTempFile.GetURL(), StreamMode::READ);
-aStream.WriteStream(aFileStream);
-aStream.WriteCharPtr("\n");
-aStream.Seek(0);
+wrapFragment(aStream);
 xmlDocPtr pDoc = parseXmlStream(&aStream);
 CPPUNIT_ASSERT(pDoc);
 
@@ -620,6 +630,22 @@ DECLARE_HTMLEXPORT_TEST(testTransparentImageReqIf, 
"transparent-image.odt")
 CPPUNIT_ASSERT_MESSAGE(aMessage.toUtf8().getStr(), 
aSource.endsWith(".png"));
 }
 
+DECLARE_HTMLEXPORT_TEST(testOleNodataReqIf, "reqif-ole-nodata.odt")
+{
+// This failed, io::IOException was thrown during the filter() call.
+SvMemoryStream aStream;
+wrapFragment(aStream);
+xmlDocPtr pDoc = parseXmlStream(&aStream);
+CPPUNIT_ASSERT(pDoc);
+
+// Make sure the native  element has the required data attribute.
+OUString aSource = getXPath(
+pDoc,
+
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p/reqif-xhtml:object/reqif-xhtml:object",
+"data");
+CPPUNIT_ASSERT(!aSource.isEmpty());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlplug.cxx 
b/sw/source/filter/html/htmlplug.cxx
index d054fd393f65..cea1a75cacd0 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -63,6 +63,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -74,6 +75,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 
@@ -130,6 +132,33 @@ const HtmlFrmOpts HTML_FRMOPTS_OLE_CSS1   =
 HtmlFrmOpts::SAlign |
 HtmlFrmOpts::SSpace;
 
+namespace
+{
+/**
+ * Calculates a filename for an image, provided the HTML file name, the image
+ * itself and a wanted extension.
+ */
+OUString lcl_CalculateFileName(const OUString* pOrigFileName, const Graphic& 
rGraphic,
+   const OUString& rExtension)
+{
+OUString aFileName;
+
+if (pOrigFileName)
+aFileName = *pOrigFileName;
+INetURLObject aURL(aFileName);
+OUString aName(aURL.getBase());
+aName += "_";
+aName += aURL.getExtension();
+aName += "_";
+aName += OUString::number(rGraphic.GetChecksum(), 16);
+aURL.setBase(aName);
+aURL.setExtension(rExtension);
+aFileName = aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE);
+
+return aFileName;
+}
+}
+
 void SwHTMLParser::SetFixSize( const Size& rPixSize,
const Size& rTwipDfltSize,
bool bPrcWidth, bool bPrcHeight,
@@ -1465,18 +1494,7 @@ Writer& OutHTML_FrameFormatOLENodeGrf( Writer& rWrt, 
const SwFrameFormat& rFrame
 
 // Calculate the file name, which is meant to be the same as the
 /

Re: License information for extensions on LO's extension site

[Andreas Mantke]

Hello Stephan,

there is no way to comment directly on my blog.

Am 30.08.2018 um 12:19 schrieb Stephan Bergmann:
> I don't find a way to comment directly at
> ,
> so moving that here.  Quoting that blog post:
>
> [...]
>> But without a proper license the Extension it is not appropriate to
>> publish the Extension on the LibreOffice Extensions website.
>>
>> But it is not a very difficult task to add such a license information
>> to the Extension. Just add a text file with the license to the
>> Extension (zipped) container (preferably in a subfolder) and update
>> the description.xml with the following xml-tag:
>>
>> 
>> 
>> ”
>> lang=”en” />
>> 
>> 
>
> The description.xml simple-license element is about asking the user to
> actively accept a license before installing/using the extension.  This
> is awkward UX and I guess that many extensions do not want to bother
> users with click-through license bla bla.
>
It's not the question if they (the extension developer) want it. They
have to ask for an agreement on the license during the install process.
If they don't do that there will be no license agreement.
My take is,  that in this case there is no clear rule, if and for what
purpose the user is allowed to use the extension software. But it's
clear that there is no agreement to use the extension software on the
ground of a free software license. And thus it could not published on
the LibreOffice extensions website.

> I don't think that it is a good idea to tie the question of whether an
> extension is suitably licensed for publishing on LO's extension site
> to the presence of such a simple-license element.

In my view it is necessary, that a LibreOffice extension that is
published on a TDF resource, has a clear license statement and presents
this license statement to the user during the installation process.
Because the installation routine gives only the way with the xml-tag
above, this is the way to do it. If the implementation is ugly from your
point of view, you could improve it. But at least there has to be a
workflow to accept the license during the installation process.

That's my view and I'm following it as long as I'm responsible for the
website and the review of the extensions on it.

Cheers,
Andreas

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

Re: API-CHANGE - dropping string properties which use vnd.sun.star.GraphicObject URL

[Pusteblumi]

Hi Tomaž, 

sorry if that is a stupid question, but...

as Thorsten wrote, many macros make use of GraphicURL for inserting
graphics. 
Is there any documentation what we need to change to make those macros work
again? 
I'm no developer but just an ordinary user who has no clue what do do now... 
;-)

To be more precise, I have the following code to insert a SVG file into a
Writer document:

' 
Function ImportBitmapIntoWriter(sFile As String) As Object

Dim oBitmaps As Object
Dim sNewUrl As String
Dim oDoc As Object
   
oDoc = ThisComponent
   
oBitmaps = oDoc.createInstance("com.sun.star.drawing.BitmapTable")
' If there is an older entry with that name, remove it:
If oBitmaps.hasByName( "OOoLilyPond" ) Then
oBitmaps.removeByName( "OOoLilyPond" )
End If
   
' Load the image into the internal bitmap table:

oBitmaps.insertByName( "OOoLilyPond", ConvertToURL(sFile) )  
' Up to here, everything works fine.

sNewURL = oBitmaps.getByName( "OOoLilyPond" )   
' This line causes the error "Incorrect property value". 
' Thus the following lines are not executed.

oTextGraphic = oDoc.createInstance("com.sun.star.text.GraphicObject")
oTextGraphic.GraphicURL = sNewURL 

' do some more stuff...
End Function
'  

The whole function can be found here (starting with line 235):
https://github.com/openlilylib/LO-ly/blob/master/extension/OOoLilyPond/Tools.xba
It's about the "OOoLilyPond" extension:
https://extensions.libreoffice.org/extensions/ooolilypond
https://github.com/openlilylib/LO-ly

(The thing is, I don't understand every step myself. The original developer
of the project has retired and I'm continuing his work...) 

Best wishes and thanks for any help, 
Klaus




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

[Libreoffice-commits] core.git: compilerplugins/clang include/comphelper

[Libreoffice Gerrit user]

 compilerplugins/clang/useuniqueptr.cxx |2 +-
 include/comphelper/sequence.hxx|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 59a4804ce4ec15bad1c8ec2a1a850d0740ba3e7a
Author: Andrea Gelmini 
AuthorDate: Wed Aug 29 21:50:24 2018 +0200
Commit: Jens Carl 
CommitDate: Thu Aug 30 18:36:37 2018 +0200

Fix typos

Change-Id: Ia658776bce8744e7b771559ca12b94a20923fc52
Reviewed-on: https://gerrit.libreoffice.org/59782
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/compilerplugins/clang/useuniqueptr.cxx 
b/compilerplugins/clang/useuniqueptr.cxx
index 3038447964bb..cbcde8c2fce1 100644
--- a/compilerplugins/clang/useuniqueptr.cxx
+++ b/compilerplugins/clang/useuniqueptr.cxx
@@ -690,7 +690,7 @@ bool UseUniquePtr::VisitCXXDeleteExpr(const CXXDeleteExpr* 
deleteExpr)
 // NodeArrayDeleter
 if (fn == SRCDIR "/unoxml/source/rdf/librdf_repository.cxx")
 return true;
-// SmCursor::LineToList ran out of enthusiam to rework the node handling
+// SmCursor::LineToList ran out of enthusiasm to rework the node handling
 if (fn == SRCDIR "/starmath/source/cursor.cxx")
 return true;
 // XMLEventOASISTransformerContext::FlushEventMap
diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx
index ee1cdf6edf4f..903b0b5ae25b 100644
--- a/include/comphelper/sequence.hxx
+++ b/include/comphelper/sequence.hxx
@@ -29,7 +29,7 @@
 
 namespace comphelper
 {
-/** Search the given string within the given sequence, return the position 
of the first occurence.
+/** Search the given string within the given sequence, return the position 
of the first occurrence.
 Returns -1 if nothing found.
 */
 COMPHELPER_DLLPUBLIC sal_Int32 findValue(const css::uno::Sequence< 
OUString >& _rList, const OUString& _rValue);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 test/source/table/xcellcursor.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 99c95cc9fbff0e2cc60152f97d4826a07a8a6ba7
Author: Andrea Gelmini 
AuthorDate: Thu Aug 30 11:28:57 2018 +0200
Commit: Jens Carl 
CommitDate: Thu Aug 30 18:35:48 2018 +0200

Fix typo

Change-Id: Ib7d79f9ea2192e798891ea1c2a9d547c8ddf3574
Reviewed-on: https://gerrit.libreoffice.org/59790
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/test/source/table/xcellcursor.cxx 
b/test/source/table/xcellcursor.cxx
index 40e70b6ec352..a5c9ac446207 100644
--- a/test/source/table/xcellcursor.cxx
+++ b/test/source/table/xcellcursor.cxx
@@ -42,7 +42,7 @@ void XCellCursor::testGoToNext()
 aCellRangeAddr = xCellRangeAddressable->getRangeAddress();
 const sal_Int32 startCol2 = aCellRangeAddr.StartColumn;
 
-CPPUNIT_ASSERT_MESSAGE("Sucessfully able to go to Next", startCol != 
startCol2);
+CPPUNIT_ASSERT_MESSAGE("Successfully able to go to Next", startCol != 
startCol2);
 }
 
 void XCellCursor::testGoToOffset()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/source/appl/sfxhelp.cxx |   17 +
 1 file changed, 17 insertions(+)

New commits:
commit eac4bd8e3c84ba4afe153e42cc82b263f62b5e11
Author: Caolán McNamara 
AuthorDate: Thu Aug 30 13:45:12 2018 +0100
Commit: Caolán McNamara 
CommitDate: Thu Aug 30 17:35:47 2018 +0200

tdf#119579 skip floating windows as potential parent for missing help dialog

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

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 14d9fb4e10d3..8092367eafce 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -726,6 +726,21 @@ static bool impl_showOfflineHelp( const OUString& rURL )
 return false;
 }
 
+namespace
+{
+// tdf#119579 skip floating windows as potential parent for missing help 
dialog
+const vcl::Window* GetBestParent(const vcl::Window* pWindow)
+{
+while (pWindow)
+{
+if (pWindow->IsSystemWindow() && pWindow->GetType() != 
WindowType::FLOATINGWINDOW)
+break;
+pWindow = pWindow->GetParent();
+}
+return pWindow;
+}
+}
+
 bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, 
const OUString& rKeyword)
 {
 OUStringBuffer aHelpRootURL("vnd.sun.star.help://");
@@ -831,6 +846,8 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const 
vcl::Window* pWindow, const
 SvtHelpOptions aHelpOptions;
 bool bShowOfflineHelpPopUp = aHelpOptions.IsOfflineHelpPopUp();
 
+pWindow = GetBestParent(pWindow);
+
 if(bShowOfflineHelpPopUp)
 {
 std::unique_ptr 
xBuilder(Application::CreateBuilder(pWindow ? pWindow->GetFrameWeld() : 
nullptr, "sfx/ui/helpmanual.ui"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/uibase/app/apphdl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 55498d196c31c098b02da5f4638fc0ca155b60b4
Author: Ilhan Yesil 
AuthorDate: Tue Aug 28 18:39:57 2018 +0200
Commit: Michael Stahl 
CommitDate: Thu Aug 30 17:26:30 2018 +0200

tdf#117823 Save mail merge config item in new view

The config object is now saved in a newly created document.

Regression from commit id 00fa85e701d4a8984cfa3a24c9b7a3963b031fa0.

Change-Id: I2265de1dd69038d447e28dfda2e85c7cf89903c6
Reviewed-on: https://gerrit.libreoffice.org/59728
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 9d847ff825c1c94286e8ab864a88fc5375d9341c)
Reviewed-on: https://gerrit.libreoffice.org/59803

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 467112e58956..2752aace725d 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -518,6 +518,7 @@ IMPL_LINK_NOARG( SwMailMergeWizardExecutor, EndDialogHdl, 
Dialog&, void )
 std::shared_ptr xMMConfig = 
m_pView->GetMailMergeConfigItem();
 if (pNewView)
 {
+pNewView->SetMailMergeConfigItem(xMMConfig);
 m_pView = pNewView;
 xMMConfig->DocumentReloaded();
 //new source view!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/uibase/app/apphdl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cb954f0486b78131876b92190d840ba1b1636eb4
Author: Ilhan Yesil 
AuthorDate: Tue Aug 28 18:39:57 2018 +0200
Commit: Michael Stahl 
CommitDate: Thu Aug 30 17:26:26 2018 +0200

tdf#117823 Save mail merge config item in new view

The config object is now saved in a newly created document.

Regression from commit id 00fa85e701d4a8984cfa3a24c9b7a3963b031fa0.

Change-Id: I2265de1dd69038d447e28dfda2e85c7cf89903c6
Reviewed-on: https://gerrit.libreoffice.org/59728
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 9d847ff825c1c94286e8ab864a88fc5375d9341c)
Reviewed-on: https://gerrit.libreoffice.org/59802

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 90688e0648b9..804e358418ef 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -516,6 +516,7 @@ IMPL_LINK_NOARG( SwMailMergeWizardExecutor, EndDialogHdl, 
Dialog&, void )
 std::shared_ptr xMMConfig = 
m_pView->GetMailMergeConfigItem();
 if (pNewView)
 {
+pNewView->SetMailMergeConfigItem(xMMConfig);
 m_pView = pNewView;
 xMMConfig->DocumentReloaded();
 //new source view!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

2 new defect(s) introduced to LibreOffice found with Coverity Scan.
7 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 2 of 2 defect(s)


** CID 1438872:(UNUSED_VALUE)
/usr/include/mdds-1.4/mdds/multi_type_vector_def.inl: 1881 in 
mdds::multi_type_vector>, 
mdds::detail::mtv::event_func>::transfer_multi_blocks(unsigned long, unsigned 
long, unsigned long, unsigned long, unsigned long, unsigned long, 
mdds::multi_type_vector>, mdds::detail::mtv::event_func>&, unsigned long)()
/usr/include/mdds-1.4/mdds/multi_type_vector_def.inl: 1891 in 
mdds::multi_type_vector>, 
mdds::detail::mtv::event_func>::transfer_multi_blocks(unsigned long, unsigned 
long, unsigned long, unsigned long, unsigned long, unsigned long, 
mdds::multi_type_vector>, mdds::detail::mtv::event_func>&, unsigned long)()
/usr/include/mdds-1.4/mdds/multi_type_vector_def.inl: 1881 in 
mdds::multi_type_vector>, mdds::detail::mtv::event_func>::transfer_multi_blocks(unsigned 
long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned 
long, 
mdds::multi_type_vector>, mdds::detail::mtv::event_func>&, unsigned long)()
/usr/include/mdds-1.4/mdds/multi_type_vector_def.inl: 1891 in 
mdds::multi_type_vector>, mdds::detail::mtv::event_func>::transfer_multi_blocks(unsigned 
long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned 
long, 
mdds::multi_type_vector>, mdds::detail::mtv::event_func>&, unsigned long)()
/usr/include/mdds-1.4/mdds/multi_type_vector_def.inl: 1881 in 
mdds::multi_type_vector, mdds::mtv::noncopyable_managed_element_block<(int)53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<(int)54, 
ScFormulaCell>>, sc::CellStoreEvent>::transfer_multi_blocks(unsigned long, 
unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, 
mdds::multi_type_vector, mdds::mtv::noncopyable_managed_element_block<(int)53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<(int)54, 
ScFormulaCell>>, sc::CellStoreEvent>&, unsigned long)()
/usr/include/mdds-1.4/mdds/multi_type_vector_def.inl: 1891 in 
mdds::multi_type_vector, mdds::mtv::noncopyable_managed_element_block<(int)53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<(int)54, 
ScFormulaCell>>, sc::CellStoreEvent>::transfer_multi_blocks(unsigned long, 
unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, 
mdds::multi_type_vector, mdds::mtv::noncopyable_managed_element_block<(int)53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<(int)54, 
ScFormulaCell>>, sc::CellStoreEvent>&, unsigned long)()
/usr/include/mdds-1.4/mdds/multi_type_vector_def.inl: 1881 in 
mdds::multi_type_vector>, 
mdds::detail::mtv::event_func>::transfer_multi_blocks(unsigned long, unsigned 
long, unsigned long, unsigned long, unsigned long, unsigned long, 
mdds::multi_type_vector>, mdds::detail::mtv::event_func>&, unsigned long)()
/usr/include/mdds-1.4/mdds/multi_type_vector_def.inl: 1891 in 
mdds::multi_type_vector>, 
mdds::detail::mtv::event_func>::transfer_multi_blocks(unsigned long, unsigned 
long, unsigned long, unsigned long, unsigned long, unsigned long, 
mdds::multi_type_vector>, mdds::detail::mtv::event_func>&, unsigned long)()



*** CID 1438872:(UNUSED_VALUE)
/usr/include/mdds-1.4/mdds/multi_type_vector_def.inl: 1881 in 
mdds::multi_type_vector>, 
mdds::detail::mtv::event_func>::transfer_multi_blocks(unsigned long, unsigned 
long, unsigned long, unsigned long, unsigned long, unsigned long, 
mdds::multi_type_vector>, mdds::detail::mtv::event_func>&, unsigned long)()
1875 // Copy to the top part of destination block.
1876 if (len < blk_dest->m_size)
1877 {
1878 // Shrink the existing block and insert slots for new 
blocks before it.
1879 blk_dest->m_size -= len;
1880 
dest.m_blocks.insert(dest.m_blocks.begin()+dest_block_index, block_len, 
block());
>>> CID 1438872:(UNUSED_VALUE)
>>> Assigning value from "dest.m_blocks[dest_block_index + block_len]" to 
>>> "blk_dest" here, but that stored value is overwritten before it can be used.
1881 blk_dest = &dest.m_blocks[dest_block_index+block_len];
1882 }
1883 else
1884 {
1885 // Destination block is exactly of the length of the 
elements being transferred.
1886 dest.delete_element_block(*blk_dest);
/usr/include/mdds-1.4/mdds/multi_type_vector_def.inl: 1891 in 
mdds::multi_type_vector>, 
mdds::detail::mtv::event_func>::transfer_multi_blocks(unsigned long, unsigned 
long, unsigned long, unsigned long, unsigned long, unsigned long, 
mdds::multi_type_vector>, m

[Libreoffice-commits] core.git: bin/gbuild-to-ide Makefile.in

[Libreoffice Gerrit user]

 Makefile.in   |2 +-
 bin/gbuild-to-ide |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 80d071f834b13c73b14335ed6298daf895aecdb3
Author: Mike Kaganski 
AuthorDate: Thu Aug 30 12:47:46 2018 +0300
Commit: Mike Kaganski 
CommitDate: Thu Aug 30 17:16:05 2018 +0200

Upgrade to vs2017-ide-integration, since we don't support VS2015 in master

This allows to avoid the "(Visual Studio 2015)" labels next to project
names in Solution Explorer; and also avoid multiple warnilgs like

project-name.vcxproj : warning  : The build tools for Visual Studio
2015 (v140) cannot be found. Install Visual Studio 2015 (v140) to
build using the Visual Studio 2015 (v140) build tools.

in IDE's Output pane in case VS2015 is absent locally.

Change-Id: I53b68ac810cbf2a31667c35dd549310e7209e010
Reviewed-on: https://gerrit.libreoffice.org/59797
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/Makefile.in b/Makefile.in
index 8cc9357666b9..324e0af03026 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -478,7 +478,7 @@ endef
 
 $(foreach ide,\
codelite \
-   vs2015 \
+   vs2017 \
kdevelop \
vim \
qtcreator \
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 9ac6949ffec8..14409b5490b9 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -744,7 +744,7 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 }
 
 def retrieve_toolset(self, ide):
-ide_toolset_map = {'vs2015': 'v140'}
+ide_toolset_map = {'vs2017': 'v141'}
 return ide_toolset_map[ide]
 
 def module_make_command(self, targets):
@@ -879,7 +879,7 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 # Type of project used by the MSBuild to determine build process, 
see Microsoft.Makefile.targets
 conf_type_node = ET.SubElement(conf_node, '{%s}ConfigurationType' 
% ns)
 conf_type_node.text = 'Makefile'
-# VS2012: I need to have this otherwise the names of projects will 
contain text Visual Studio 2010 in the Solution Explorer
+# This defines the version of Visual Studio which can show next to 
project names in the Solution Explorer
 platform_toolset_node = ET.SubElement(conf_node, 
'{%s}PlatformToolset' % ns)
 platform_toolset_node.text = self.toolset
 
@@ -1651,7 +1651,7 @@ if __name__ == '__main__':
 'eclipsecdt': EclipseCDTIntegrationGenerator,
 'kdevelop': KdevelopIntegrationGenerator,
 'xcode': XcodeIntegrationGenerator,
-'vs2015': VisualStudioIntegrationGenerator,
+'vs2017': VisualStudioIntegrationGenerator,
 'vim': VimIntegrationGenerator,
 'debug': DebugIntegrationGenerator,
 'qtcreator': QtCreatorIntegrationGenerator,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host/config_global.h.in configure.ac editeng/source

[Libreoffice Gerrit user]

 config_host/config_global.h.in |4 
 configure.ac   |   15 +++
 editeng/source/editeng/editeng.cxx |5 +
 3 files changed, 24 insertions(+)

New commits:
commit c00948d9bd35dfb15a331c2163f32e9ee24644fd
Author: Stephan Bergmann 
AuthorDate: Tue Aug 28 17:07:16 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Aug 30 17:14:54 2018 +0200

Silence bogus -Werror=redundant-move (GCC 9)

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

diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
index 375e610a1180..2a681264992b 100644
--- a/config_host/config_global.h.in
+++ b/config_host/config_global.h.in
@@ -30,4 +30,8 @@ Any change in this header will cause a rebuild of almost 
everything.
move constructor": */
 #define HAVE_CXX_CWG1579_FIX 0
 
+/* GCC bug  "move ctor 
wrongly chosen in return
+   stmt (derived vs. base)": */
+#define HAVE_GCC_BUG_87150 0
+
 #endif
diff --git a/configure.ac b/configure.ac
index 8a0de7e22435..f4f7303c0146 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6445,6 +6445,21 @@ CXXFLAGS=$save_CXXFLAGS
 AC_LANG_POP([C++])
 AC_SUBST([HAVE_CXX_CWG1579_FIX])
 
+AC_MSG_CHECKING([whether $CXX has GCC bug 87150])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+struct S1 { S1(S1 &&); };
+struct S2: S1 {};
+S1 f(S2 s) { return s; }
+])], [
+AC_DEFINE([HAVE_GCC_BUG_87150],[1])
+AC_MSG_RESULT([yes])
+], [AC_MSG_RESULT([no])])
+CXXFLAGS=$save_CXXFLAGS
+AC_LANG_POP([C++])
+
 dnl ===
 dnl system stl sanity tests
 dnl ===
diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index e2c4a63f3efd..e601fa4172e7 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -21,6 +21,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2650,7 +2651,11 @@ vcl::Font EditEngine::CreateFontFromItemSet( const 
SfxItemSet& rItemSet, SvtScri
 {
 SvxFont aFont;
 CreateFont( aFont, rItemSet, true, nScriptType );
+#if HAVE_GCC_BUG_87150
+return aFont;
+#else
 return std::move(aFont);
+#endif
 }
 
 SvxFont EditEngine::CreateSvxFontFromItemSet( const SfxItemSet& rItemSet )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/svx/hdft.hxx   |4 ++--
 svx/source/dialog/hdft.cxx |   16 ++--
 2 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 412c1a3089904a95e18b3ac34eb432e4b87c8fbb
Author: Caolán McNamara 
AuthorDate: Thu Aug 30 09:57:11 2018 +0100
Commit: Caolán McNamara 
CommitDate: Thu Aug 30 17:13:57 2018 +0200

weld SvxHeaderPage/SvxHeaderPage

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

diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index d7d910c772ba..6a0eeb7980a3 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -104,7 +104,7 @@ public:
 static VclPtr Create( TabPageParent pParent, const SfxItemSet* 
rSet );
 // returns the Which values to the range
 static const sal_uInt16*  GetRanges() { return pRanges; }
-SVX_DLLPRIVATE SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet 
);
+SVX_DLLPRIVATE SvxHeaderPage(TabPageParent pParent, const SfxItemSet& 
rSet);
 };
 
 class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage
@@ -112,7 +112,7 @@ class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage
 public:
 static VclPtr Create( TabPageParent pParent, const SfxItemSet* 
rSet );
 static const sal_uInt16*  GetRanges() { return pRanges; }
-SVX_DLLPRIVATE SvxFooterPage(   vcl::Window* pParent, const SfxItemSet& 
rSet );
+SVX_DLLPRIVATE SvxFooterPage(TabPageParent pParent, const SfxItemSet& 
rSet);
 };
 
 class SVX_DLLPUBLIC DeleteHeaderDialog : public weld::MessageDialogController
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 7ca86e2e132c..b0e8661f1c03 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -108,25 +108,21 @@ namespace svx {
 
 VclPtr SvxHeaderPage::Create( TabPageParent pParent, const 
SfxItemSet* rSet )
 {
-return VclPtr::Create( pParent.pParent, *rSet );
+return VclPtr::Create( pParent, *rSet );
 }
 
 VclPtr SvxFooterPage::Create( TabPageParent pParent, const 
SfxItemSet* rSet )
 {
-return VclPtr::Create( pParent.pParent, *rSet );
+return VclPtr::Create( pParent, *rSet );
 }
 
-SvxHeaderPage::SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rAttr ) :
-
-SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_HEADERSET )
-
+SvxHeaderPage::SvxHeaderPage(TabPageParent pParent, const SfxItemSet& rAttr)
+: SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_HEADERSET )
 {
 }
 
-SvxFooterPage::SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rAttr ) :
-
-SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_FOOTERSET )
-
+SvxFooterPage::SvxFooterPage(TabPageParent pParent, const SfxItemSet& rAttr)
+: SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_FOOTERSET )
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/Library_mysqlc.mk

[Libreoffice Gerrit user]

 connectivity/Library_mysqlc.mk |4 
 1 file changed, 4 deletions(-)

New commits:
commit 340bde53376dfa844270bcdf991b5f4183981bb9
Author: Michael Stahl 
AuthorDate: Thu Aug 30 17:10:29 2018 +0200
Commit: Michael Stahl 
CommitDate: Thu Aug 30 17:12:17 2018 +0200

Revert "On macOS Library_mysqlc needs _iconv{,_close,_open}"

This reverts commit a191075ee1bd103a57c935e47026337a5e2340e9.

This fix was superceded by commit 13a05eec7377c013d9c13d6473a9e863c897
which is better abstracted.

Change-Id: I3b8ba735d279a50f5548a26fcc8fa6f790b2ea42

diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index e57f84aaf57f..3d9d9150b9ea 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -14,10 +14,6 @@ $(eval $(call gb_Library_use_externals,mysqlc,\
mariadb-connector-c \
 ))
 
-ifeq ($(OS)-$(SYSTEM_MARIADB_CONNECTOR_C),MACOSX-)
-$(eval $(call gb_Library_use_external,mysqlc,iconv))
-endif
-
 $(eval $(call gb_Library_set_include,mysqlc,\
-I$(SRCDIR)/connectivity/inc \
-I$(SRCDIR)/connectivity/source/inc \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 writerfilter/source/ooxml/OOXMLStreamImpl.cxx |   20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)

New commits:
commit 48c677d55330ac6caf0065fa1776c985b876eead
Author: Caolán McNamara 
AuthorDate: Sat Aug 25 19:08:35 2018 +0100
Commit: Michael Stahl 
CommitDate: Thu Aug 30 16:58:54 2018 +0200

ofz#10056 Null deref

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

diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx 
b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 2d96312be119..7e742690d32b 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -315,12 +315,20 @@ bool OOXMLStreamImpl::lcl_getTarget(const 
uno::Reference xPart = 
xFac->parse(sMyTarget);
 uno::Reference xAbs = 
xFac->makeAbsolute(xBase, xPart, true, 
uri::RelativeUriExcessParentSegments_RETAIN);
-rDocumentTarget = xAbs->getPath();
-// path will start with the fragment separator. need to
-// remove that
-rDocumentTarget = rDocumentTarget.copy( 1 );
-if(sStreamType == sEmbeddingsType)
-embeddingsTarget = rDocumentTarget;
+if (!xAbs)
+{
+//it was invalid gibberish
+bFound = false;
+}
+else
+{
+rDocumentTarget = xAbs->getPath();
+// path will start with the fragment separator. need to
+// remove that
+rDocumentTarget = rDocumentTarget.copy( 1 );
+if(sStreamType == sEmbeddingsType)
+embeddingsTarget = rDocumentTarget;
+}
 }
 
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit fabac301a2c431a51bcae435e7ad87c843331877
Author: Caolán McNamara 
AuthorDate: Fri Aug 24 15:01:23 2018 +0100
Commit: Michael Stahl 
CommitDate: Thu Aug 30 16:56:10 2018 +0200

ofz#10045 Null deref

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

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 287028cff621..40a9e9bbdb62 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -1016,8 +1016,11 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel, bool bTab
 {
 xStart = m_aTableRanges[0][0][0];
 uno::Sequence< uno::Sequence< uno::Reference > 
>& rLastRow = m_aTableRanges[m_aTableRanges.size() - 1];
-uno::Sequence< uno::Reference >& rLastCell = 
rLastRow[rLastRow.getLength() - 1];
-xEnd = rLastCell[1];
+if (rLastRow.getLength())
+{
+uno::Sequence< uno::Reference >& rLastCell = 
rLastRow[rLastRow.getLength() - 1];
+xEnd = rLastCell[1];
+}
 }
 uno::Reference xTable;
 try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call 2018-08-30

[Miklos Vajna]

* Present:
+ Thorsten, Eike, Xisco, Michael S, Miklos, Caolan, Olivier,
  Christian, Sophie, Heiko, Jan-Marek, Stephan

* Completed Action Items:
+ check out the CentOS builds tools for 32bit & update baseline (Christian)
  [ devtools-7 for centos6 and centos7 is an option → trying this first
32bit centos7 is not officual, though.
Centos7 comes with gcc-4.8 by default ]
+ add 6.2 release plan to the overview in the wiki (Christian)
[ done ]

* Pending Action Items:
+ default bitergia filter for master + libreoffice-* (Christian)
[ should be possible to add raw data to filter command (Christian) ]

* Release Engineering update (Christian)
+ 6.0.7 – due in October
+ 6.1.1 RC1 / RC2 status
  + RC1 tagged, uploaded
  + RC2 next week
+ 6.1.2 shortened cycle to just one RC, since otherwise 6.1.1 would overlap
+ Remotes
+ Android viewer
  + new builds done, plan to do some testing
+ Online

* Documentation (Olivier)
+ New Help
+ bug fix in XSLT + tweaks in CSS (ohallot, fitoshido)
+ Housekeeping dead code (A. Timar)
+ Online Help Editor
+ Word completion for CodeMission (M. Saunders)
+ Help content
+ refactor/rewriting on string parsing in Calc (ohallot)
+ refactor page on empty cells (ohallot)
+ New page on Impress remote dialog (ohallot)
+ New pages for New Help
+ Collateral file for Dutch (L. Moons)
+ Several fixes, typos (A. Gelmini, S. Horacek, M. Kaganski)
+ Wiki pages
+ Compile pages on New Help development/contents addition (ohallot)
+ Guides
+ Stalled


* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
246(246) (topicUI) bugs open, 294(294) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
 added 11(5) 20(3) 34(4)   97(3)
 commented 66(35)   151(-2)   357(47)1683(17)
   removed  0(0)  0(0)  1(0)9(0)
  resolved  3(2) 13(-2)30(3)  145(-2)
+ top 10 contributors:
  Kainz, Andreas made 100 changes in 1 month, and 135 changes in 1 year
  Tietze, Heiko made 44 changes in 1 month, and 608 changes in 1 year
  Foote, V Stuart made 30 changes in 1 month, and 260 changes in 1 year
  Xisco Faulí made 30 changes in 1 month, and 324 changes in 1 year
  Telesto made 19 changes in 1 month, and 84 changes in 1 year
  Thomas Lendo made 16 changes in 1 month, and 225 changes in 1 year
  Monastirsky, Maxim made 12 changes in 1 month, and 50 changes in 1 
year
  Kaganski, Mike made 12 changes in 1 month, and 73 changes in 1 year
  Cor Nouws made 12 changes in 1 month, and 102 changes in 1 year
  Dieter Praas made 11 changes in 1 month, and 140 changes in 1 year
 * Context menus harmonization
   * tdf#119432, tdf#119436, tdf#119506, tdf#119521, tdf#119526, tdf#119532, 
 tdf#119547, tdf#119580, tdf#119581
   + https://colibreoffice.wordpress.com/2018/08/29/context-menubar/ (Andreas 
Kainz)
   + in discussion, comments welcome

  + Calc menu reorganization: some menu items are gone
+ Eike commented on 


* Crash Testing
+ 1(+1) import failure, 2(+2) export failures
  + not reproducible, though
+ 5 coverity issues
  + next round will be lower
+ Google / ossfuzz: down for a while, build fixed again
  - 5 issues, 1 serious
  - build fixed now again
+ ForcePoint, round 9
  - 38 issues, 5 unfixed, all writer layout
  - complicated, no progress this week
- perhaps will just throw an exception for the corner-case...

* Crash Reporting (Xisco)
+ http://crashreport.libreoffice.org/stats/version/5.4.7.2
 + 459 (last 7 days) (+25)
+ http://crashreport.libreoffice.org/stats/version/6.0.4.2
 + 776 731 (last 7 days) (+45)
+ http://crashreport.libreoffice.org/stats/version/6.0.5.2
 + 1018 (last 7 days) (-24)
+ http://crashreport.libreoffice.org/stats/version/6.0.6.2
 + 540 (last 7 days) (+106)

+ http://crashreport.libreoffice.org/stats/version/6.1.0.3
 + 2177 1626 (last 7 days) (+551)
 + top 1 - new crash in 6.1.0.3 in GL – looks like locking
   + epoxy upgrade on master didn’t fix tdf#119028
   + probably not worth backporting to 6.1
   + aware of no reproducer steps at the moment
 + top 3 – regression since 6.1.

* Hackfests & Events
   + nextCloud conference
   + FrOScon in Bonn: Aug 25
  + Bubli, Thorsten, Cloph, Rene
  + was pretty nice, 2 talks, 7-8 contributors there
   + Munich (Thorsten)
  + Oct 26-28th, CIB main office
  + an Open Gov’t meeting from the City of Munich
  + good to have a hack-fest back-to-back there.
   + Conference – September 26 - 28
   + DINA

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

[Libreoffice Gerrit user]

 include/sfx2/sidebar/SidebarToolBox.hxx |1 +
 sfx2/source/sidebar/SidebarToolBox.cxx  |6 ++
 2 files changed, 7 insertions(+)

New commits:
commit b9c38b78025c1abd5bf155c66f878d42c0eccb16
Author: Jim Raykowski 
AuthorDate: Tue Aug 28 14:18:44 2018 -0800
Commit: Maxim Monastirsky 
CommitDate: Thu Aug 30 15:43:35 2018 +0200

tdf#119577 Ignore escape key press on sidebar toolboxes not handled by

...focus manager.

This prevents escape key press on More Options tool box in some panel
title bars from sending focus to doc view.

Change-Id: Iaac9bf31494e4e35f30350580acaa9f42ead49a0
Reviewed-on: https://gerrit.libreoffice.org/59783
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx 
b/include/sfx2/sidebar/SidebarToolBox.hxx
index 32f5106b5eaf..a19c7af4b3b1 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -50,6 +50,7 @@ public:
 ImplToolItems::size_type nPos = APPEND) override;
 
 virtual bool EventNotify(NotifyEvent& rEvent) override;
+virtual void KeyInput( const KeyEvent& rKEvt ) override;
 
 void SetController(const sal_uInt16 nItemId,
const 
css::uno::Reference& rxController);
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx 
b/sfx2/source/sidebar/SidebarToolBox.cxx
index ba44d821371e..7182b479e282 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -137,6 +137,12 @@ bool SidebarToolBox::EventNotify (NotifyEvent& rEvent)
 return ToolBox::EventNotify(rEvent);
 }
 
+void SidebarToolBox::KeyInput(const KeyEvent& rKEvt)
+{
+if (KEY_ESCAPE != rKEvt.GetKeyCode().GetCode())
+ToolBox::KeyInput(rKEvt);
+}
+
 void SidebarToolBox::CreateController (
 const sal_uInt16 nItemId,
 const css::uno::Reference& rxFrame,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 oox/source/vml/vmlshapecontext.cxx|2 +-
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |4 
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit b914c4c98bfca32168ff05fec7cc687c95754d36
Author: Justin Luth 
AuthorDate: Wed Aug 22 20:57:19 2018 +0300
Commit: Miklos Vajna 
CommitDate: Thu Aug 30 15:39:25 2018 +0200

tdf#115670 vml shadow: shadow is off unless explicitly set on

The absence of "on=" is treated in Word (tested 2003) as off.

Change-Id: Ibc6b0e5ca0f25a9c3ca1b9505fa24c4d821bfd0
Reviewed-on: https://gerrit.libreoffice.org/59457
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/oox/source/vml/vmlshapecontext.cxx 
b/oox/source/vml/vmlshapecontext.cxx
index d1237eb8615d..efeb188a42b5 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -389,7 +389,7 @@ ContextHandlerRef ShapeTypeContext::onCreateContext( 
sal_Int32 nElement, const A
 case VML_TOKEN( shadow ):
 {
 mrTypeModel.maShadowModel.mbHasShadow = true;
-
mrTypeModel.maShadowModel.moShadowOn.assignIfUsed(lclDecodeBool(rAttribs, 
XML_on));
+mrTypeModel.maShadowModel.moShadowOn = lclDecodeBool(rAttribs, 
XML_on).get(false);
 
mrTypeModel.maShadowModel.moColor.assignIfUsed(rAttribs.getString(XML_color));
 
mrTypeModel.maShadowModel.moOffset.assignIfUsed(rAttribs.getString(XML_offset));
 mrTypeModel.maShadowModel.moOpacity = lclDecodePercent(rAttribs, 
XML_opacity, 1.0);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 51287c7035cd..ed841f245459 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -580,6 +580,10 @@ DECLARE_OOXMLEXPORT_TEST(testTdf103982, "tdf103982.docx")
 sal_Int32 nDistB = getXPath(pXmlDoc, "//wp:anchor", "distB").toInt32();
 // This was -260350, which is not a valid value for an unsigned type.
 CPPUNIT_ASSERT(nDistB >= 0);
+
+// tdf#115670 the shadow should not be enabled (no on="t")
+uno::Reference xPropertySet(getShape(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(!getProperty(xPropertySet, "Shadow"));
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf104115, "tdf104115.docx")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - RepositoryExternal.mk solenv/bin

[Libreoffice Gerrit user]

 RepositoryExternal.mk |5 +
 solenv/bin/mkdocs.sh  |6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 2ed18399f034982a5d7f2ed46144a4b66987baef
Author: Michael Stahl 
AuthorDate: Thu Aug 30 15:27:55 2018 +0200
Commit: Michael Stahl 
CommitDate: Thu Aug 30 15:32:12 2018 +0200

solenv: fix markdown issues in mkdocs.sh

- Fedora 28 has python3-markdown2 package containing /usr/bin/markdown2-3
- the "alias" doesn't work at all because it's not exported to the
  sub-shell in $(markdown) so use variable instead

Change-Id: Icf2af1e66750269e0660f3897a91734cadf5d978

diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
index 99579f71340a..e83e749bde27 100755
--- a/solenv/bin/mkdocs.sh
+++ b/solenv/bin/mkdocs.sh
@@ -101,7 +101,7 @@ function check_cmd {
   echo "$error_msg" >&2
   exit 1
   fi
-  alias "${cmds_needed%% *}"=$cmd
+  export "${cmds_needed%% *}"=$cmd
 }
 
 function setup {
@@ -120,7 +120,7 @@ function setup {
 # binaries that we need
 check_cmd doxygen "You need doxygen for doc generation"
 check_cmd dot "You need the graphviz tools to create the nice inheritance 
graphs"
-check_cmd "markdown markdown2" "You need either markdown or markdown2 in order 
to convert README.md into html"
+check_cmd "markdown markdown2 markdown2-3" "You need either markdown or 
markdown2 in order to convert README.md into html"
 
 # suck setup
 setup "SOLARINC"
@@ -253,7 +253,7 @@ for module_name in *; do
 
   if [ ${cur_file: -3} == ".md" ]; then
 # This is a markdown file.
-text="$(markdown $cur_file | proc_text_markdown)"
+text="$(${markdown} $cur_file | proc_text_markdown)"
 echo $text >> "$BASE_OUTPUT/${module_name}.html"
   else
 proc_text < $cur_file >> "$BASE_OUTPUT/${module_name}.html"
commit 13a05eec7377c013d9c13d6473a9e863c897
Author: Michael Stahl 
AuthorDate: Mon Aug 20 19:07:40 2018 +0200
Commit: Michael Stahl 
CommitDate: Thu Aug 30 15:32:12 2018 +0200

RepositoryExternal: mariadb needs iconv on MacOS

Change-Id: I78928baab2ea3accfdd7db62240e39e486c2f52c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6852ff356a9e..cec79cc105e8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -257,6 +257,11 @@ $(call gb_LinkTarget_set_include,$(1),\
 $(call gb_LinkTarget_use_static_libraries,$(1),\
mariadb-connector-c \
 )
+ifeq ($(OS),MACOSX)
+$(call gb_LinkTarget_add_libs,$(1),\
+   -liconv \
+)
+endif
 
 endef
 define gb_ExternalProject__use_mariadb-connector-c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/ui/envelp/envfmt.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 893f26ce157e47a1f4b3499c5f0d3db9e923e1be
Author: Caolán McNamara 
AuthorDate: Thu Aug 30 11:09:55 2018 +0100
Commit: Caolán McNamara 
CommitDate: Thu Aug 30 15:16:17 2018 +0200

Resolves: tdf#119572 addressee/sender formatting swapped

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

diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index f44b0c00f108..40e8cfaf4967 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -225,12 +225,12 @@ IMPL_LINK( SwEnvFormatPage, ModifyHdl, 
weld::MetricSpinButton&, rEdit, void )
 
 IMPL_LINK(SwEnvFormatPage, AddrEditHdl, const OString&, rIdent, void)
 {
-Edit(rIdent, true);
+Edit(rIdent, false);
 }
 
 IMPL_LINK(SwEnvFormatPage, SendEditHdl, const OString&, rIdent, void)
 {
-Edit(rIdent, false);
+Edit(rIdent, true);
 }
 
 void SwEnvFormatPage::Edit(const OString& rIdent, bool bSender)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSoC weekly update : Add Support for Python in LOEclipse Plugin - Shobhan Mandal

[Christian Lohmaier]

Hi *,
On Mon, Aug 6, 2018 at 7:06 PM Shobhan Mandal
 wrote:
>
> The following git commit is one of the last commits made during the GSOC'18 
> period. It includes some of the changes mainly removing some of the redundant 
> code. Also it includes changes in the help section, where new content 
> regarding creating, running and debugging of Extension Project using Python 
> has been added.
> https://github.com/LibreOffice/loeclipse/pull/68/commits/bc8132de53efa6c23dc7248dc4d774a444d08af2
>
> In addition I made a YouTube video on how to create, run and debug a 
> Extension Project made using Python:
> https://youtu.be/64XCukPZsxA

Some remarks on the video/for future ones:

Silent videos are awkward to watch, especially when they're long.
Consider adding narration and/or background music.. Also don't be
afraid to use editing to accelerate the waiting time..
Also for such a long video, please also add timestamps to the
description/comment to jump to relevant chapters... Or even split the
video up in a small series and add them to a playlist.
Also if you still have the "written narration", consider uploading it
as a transcript of the video...

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

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

[Libreoffice Gerrit user]

 sw/source/ui/envelp/envfmt.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1fd55c3a58ff171a39586fb0e5dd140e82718aed
Author: Caolán McNamara 
AuthorDate: Thu Aug 30 11:09:55 2018 +0100
Commit: Caolán McNamara 
CommitDate: Thu Aug 30 14:37:59 2018 +0200

Resolves: tdf#119572 addressee/sender formatting swapped

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

diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index b46b795fdaac..ac02d23dc88a 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -225,12 +225,12 @@ IMPL_LINK( SwEnvFormatPage, ModifyHdl, 
weld::MetricSpinButton&, rEdit, void )
 
 IMPL_LINK(SwEnvFormatPage, AddrEditHdl, const OString&, rIdent, void)
 {
-Edit(rIdent, true);
+Edit(rIdent, false);
 }
 
 IMPL_LINK(SwEnvFormatPage, SendEditHdl, const OString&, rIdent, void)
 {
-Edit(rIdent, false);
+Edit(rIdent, true);
 }
 
 void SwEnvFormatPage::Edit(const OString& rIdent, bool bSender)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Regarding libreoffice android error

[Christian Lohmaier]

Hi *,

On Wed, Aug 8, 2018 at 9:05 PM Tushar Koshti  wrote:
>
> I am facing one problem while building and running Android version of 
> LibreOffice. Here is the stack trace.
>
> - beginning of the crash
> 08-07 07:53:49.913 25702-25702/? E/AndroidRuntime: FATAL EXCEPTION: main
> Process: org.documentfoundation.libreoffice, PID: 25702
> java.lang.UnsatisfiedLinkError: 
> dalvik.system.PathClassLoader[DexPathList[[zip file 
> "/data/app/org.documentfoundation.libreoffice-1/base.apk"],nativeLibraryDirectories=[/data/app/org.documentfoundation.libreoffice-1/lib/arm64,
>  /system/lib64, /vendor/lib64]]] couldn't find "libnspr4.so"

all that 64 in there make it sound like you're trying to do a 64bit
build for android - that's not really supported/tested...

> It would be great if you can help me out with this.

First step is to check whether there actually is a nspr4 lib in
android/source/jniLibs/... and if not, see whether libnspr did build
at all..

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

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

[Libreoffice Gerrit user]

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

New commits:
commit 339795d6bd064f57ef33c7cbd5e90433c179e72e
Author: Kacper Kasper 
AuthorDate: Wed Aug 29 21:54:32 2018 +0200
Commit: Rene Engelhard 
CommitDate: Thu Aug 30 14:08:06 2018 +0200

Drop --with-system-mysql-cppconn

Not needed since 5061663ce052087c6d5d0910d6f99358e26dbbd1 "drop
unnecessary SYSTEM_MYSQL_CONNECTOR_CPP"

Change-Id: I6ca1869edcfb42a1ffa77b791527e53d774117f5
Reviewed-on: https://gerrit.libreoffice.org/59781
Tested-by: Jenkins
Reviewed-by: Rene Engelhard 
Tested-by: Rene Engelhard 

diff --git a/configure.ac b/configure.ac
index 3be9d4efcc43..8a0de7e22435 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1742,11 +1742,6 @@ AC_ARG_ENABLE(bundle-mariadb,
 [When using MariaDB/MySQL libraries already on system, bundle them 
with the MariaDB Connector/LibreOffice.])
 )
 
-AC_ARG_WITH(system-mysql-cppconn,
-AS_HELP_STRING([--with-system-mysql-cppconn],
-[Use MySQL C++ Connector libraries already on system.]),,
-[with_system_mysql_cppconn="$with_system_libs"])
-
 AC_ARG_WITH(system-postgresql,
 AS_HELP_STRING([--with-system-postgresql],
 [Use PostgreSQL libraries already on system, for building the 
PostgreSQL-SDBC
@@ -3815,11 +3810,6 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" != 
"no"; then
 else
 with_system_graphite=no
 fi
-if test "$with_system_mysql_cppconn" = "yes"; then
-AC_MSG_ERROR([--with-system-mysql-cppconn conflicts with 
--enable-dbgutil])
-else
-with_system_mysql_cppconn=no
-fi
 if test "$with_system_orcus" = "yes"; then
 AC_MSG_ERROR([--with-system-orcus conflicts with --enable-dbgutil])
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source editeng/source filter/source sc/source sw/inc sw/source

[Libreoffice Gerrit user]

 connectivity/source/drivers/dbase/DTable.cxx|2 +-
 editeng/source/editeng/editview.cxx |2 +-
 filter/source/graphicfilter/ios2met/ios2met.cxx |4 ++--
 sc/source/ui/pagedlg/tphfedit.cxx   |2 +-
 sw/inc/cellfml.hxx  |2 +-
 sw/source/core/attr/cellatr.cxx |4 ++--
 sw/source/core/text/itrcrsr.cxx |2 +-
 sw/source/filter/ww8/ww8par5.cxx|4 ++--
 sw/source/uibase/dochdl/swdtflvr.cxx|2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 0b06762ff19a804d3b86167ae3012811662412f1
Author: Johnny_M 
AuthorDate: Sat Aug 25 11:05:45 2018 +0200
Commit: Michael Stahl 
CommitDate: Thu Aug 30 13:55:41 2018 +0200

Translate German comments

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

diff --git a/connectivity/source/drivers/dbase/DTable.cxx 
b/connectivity/source/drivers/dbase/DTable.cxx
index a1c116fe316c..469a773378f2 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2049,7 +2049,7 @@ void ODbaseTable::WriteMemo(const ORowSetValue& 
aVariable, std::size_t& rBlockNr
 m_pMemoStream->WriteChar( cEOF ).WriteChar( cEOF );
 } break;
 case MemoFoxPro:
-case MemodBaseIV: // dBase IV-Memofeld with length
+case MemodBaseIV: // dBase IV-Memofield with length
 {
 if ( MemodBaseIV == m_aMemoHeader.db_typ )
 (*m_pMemoStream).WriteUChar( 0xFF )
diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 5343877fc203..212bb3fc2392 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1217,7 +1217,7 @@ const SvxFieldItem* EditView::GetFieldAtSelection() const
 if (rAttr.GetStart() == nXPos)
 if (rAttr.Which() == EE_FEATURE_FIELD)
 {
-DBG_ASSERT(dynamic_cast(rAttr.GetItem() ) != nullptr, "No FeldItem...");
+DBG_ASSERT(dynamic_cast(rAttr.GetItem() ) != nullptr, "No FieldItem...");
 return static_cast(rAttr.GetItem());
 }
 }
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx 
b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 2c9202243893..eb1faefe4ac2 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -36,7 +36,7 @@ class FilterConfigItem;
 enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
 
 
-// -Feld-Typen---
+// -Field Types---
 
 #define BegDocumnMagic 0xA8A8 /* Begin Document */
 #define EndDocumnMagic 0xA8A9 /* End Document   */
@@ -65,7 +65,7 @@ enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, 
PEN_DASHDOT };
 #define MapCodFntMagic 0x8AAB /* Map Coded Font*/
 #define MapDatResMagic 0xC3AB /* Map Data Resource */
 
-// -Order-Typen---
+// -Order Types---
 
 #define GOrdGivArc 0xC6   /* 1 Arc at given position   */
 #define GOrdCurArc 0x86   /* 1 Arc at current position */
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx 
b/sc/source/ui/pagedlg/tphfedit.cxx
index 54c72df18fb8..617b26446b9a 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -88,7 +88,7 @@ ScEditWindow::ScEditWindow( vcl::Window* pParent, WinBits 
nBits, ScEditWindowLoc
 ScHeaderFieldData aData;
 lcl_GetFieldData( aData );
 
-//  Feldbefehle:
+// fields
 pEdEngine->SetData( aData );
 pEdEngine->SetControlWord( pEdEngine->GetControlWord() | 
EEControlBits::MARKFIELDS );
 mbRTL = ScGlobal::IsSystemRTL();
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 3aa83b22d8ef..96b52b576743 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -91,7 +91,7 @@ protected:
 boolm_bValidValue;  ///< true: recalculate formula
 
 // find the node in which the formula is located
-//  TextFeld-> TextNode,
+//  TextField   -> TextNode,
 //  BoxAttribut -> BoxStartNode
 // !!! every derived class must override this !!!
 virtual const SwNode* GetNodeOfFormula() const = 0;
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index abc80746442d..26958ececdde 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -81,8 +81,8 @@ SfxPoolItem* SwTableBoxFormula::Clone( SfxItemPool* ) const
 
 /** Get node type of the node containing this formula
 
-E.g. TextFeld -> TextNode, or
- BoxAttribute -> BoxStartNode
+E.g. TextField -> 

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

[Libreoffice Gerrit user]

 sw/source/uibase/app/apphdl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9d847ff825c1c94286e8ab864a88fc5375d9341c
Author: Ilhan Yesil 
AuthorDate: Tue Aug 28 18:39:57 2018 +0200
Commit: Michael Stahl 
CommitDate: Thu Aug 30 13:52:25 2018 +0200

tdf#117823 Save mail merge config item in new view

The config object is now saved in a newly created document.

Regression from commit id 00fa85e701d4a8984cfa3a24c9b7a3963b031fa0.

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

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index c16f93e1d574..cd8b77dd87ae 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -479,6 +479,7 @@ IMPL_LINK_NOARG( SwMailMergeWizardExecutor, EndDialogHdl, 
Dialog&, void )
 std::shared_ptr xMMConfig = 
m_pView->GetMailMergeConfigItem();
 if (pNewView)
 {
+pNewView->SetMailMergeConfigItem(xMMConfig);
 m_pView = pNewView;
 xMMConfig->DocumentReloaded();
 //new source view!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 oox/source/export/drawingml.cxx|2 +-
 sc/qa/unit/data/xlsx/testShapeAutofit.xlsx |binary
 sc/qa/unit/subsequent_export-test.cxx  |   16 
 3 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 7626dc2d81dc5eb647d6f8937cc1d220a8b8ef4b
Author: Balazs Varga 
AuthorDate: Wed Aug 29 19:14:56 2018 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Aug 30 13:03:03 2018 +0200

tdf#119562 Fix export of AutoFit property of shapes to XLSX

With this patch the "Resize shape to fit text" property
(TextAutoGrowHeight) will be exported correctly to XLSX format.

Change-Id: I488ceead452aef9096e7766f957de425c8486f85
Reviewed-on: https://gerrit.libreoffice.org/59778
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 2b74cb83ce85..c42a74a95267 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2423,7 +2423,7 @@ void DrawingML::WriteText( const Reference< XInterface >& 
rXIface, const OUStrin
 mpFS->singleElementNS(XML_a, XML_prstTxWarp, XML_prst, 
presetWarp.toUtf8().getStr(),
 FSEND );
 }
-if (GetDocumentType() == DOCUMENT_DOCX)
+if (GetDocumentType() == DOCUMENT_DOCX || GetDocumentType() == 
DOCUMENT_XLSX)
 {
 bool bTextAutoGrowHeight = false;
 GET(bTextAutoGrowHeight, TextAutoGrowHeight);
diff --git a/sc/qa/unit/data/xlsx/testShapeAutofit.xlsx 
b/sc/qa/unit/data/xlsx/testShapeAutofit.xlsx
new file mode 100755
index ..d5742cd1c854
Binary files /dev/null and b/sc/qa/unit/data/xlsx/testShapeAutofit.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 56546a588789..596cfe751e20 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -188,6 +188,7 @@ public:
 void testTextUnderlineColorXLSX();
 void testSheetRunParagraphPropertyXLSX();
 void testHiddenShapeXLSX();
+void testShapeAutofitXLSX();
 void testHyperlinkXLSX();
 void testMoveCellAnchoredShapesODS();
 void testMatrixMultiplicationXLSX();
@@ -301,6 +302,7 @@ public:
 CPPUNIT_TEST(testTextUnderlineColorXLSX);
 CPPUNIT_TEST(testSheetRunParagraphPropertyXLSX);
 CPPUNIT_TEST(testHiddenShapeXLSX);
+CPPUNIT_TEST(testShapeAutofitXLSX);
 CPPUNIT_TEST(testHyperlinkXLSX);
 CPPUNIT_TEST(testMoveCellAnchoredShapesODS);
 CPPUNIT_TEST(testMatrixMultiplicationXLSX);
@@ -3549,6 +3551,20 @@ void ScExportTest::testHiddenShapeXLSX()
 assertXPath(pDoc, 
"/xdr:wsDr/xdr:twoCellAnchor/xdr:sp[1]/xdr:nvSpPr/xdr:cNvPr", "hidden", "1");
 }
 
+void ScExportTest::testShapeAutofitXLSX()
+{
+ScDocShellRef xDocSh = loadDoc("testShapeAutofit.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+
+xmlDocPtr pDoc = XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory, 
"xl/drawings/drawing1.xml", FORMAT_XLSX);
+CPPUNIT_ASSERT(pDoc);
+
+// TextAutoGrowHeight --> "Fit height to text" / "Resize shape to fit 
text" --> true
+assertXPath(pDoc, 
"/xdr:wsDr/xdr:twoCellAnchor[1]/xdr:sp/xdr:txBody/a:bodyPr/a:spAutoFit", 1);
+// TextAutoGrowHeight --> "Fit height to text" / "Resize shape to fit 
text" --> false
+assertXPath(pDoc, 
"/xdr:wsDr/xdr:twoCellAnchor[2]/xdr:sp/xdr:txBody/a:bodyPr/a:noAutofit", 1);
+}
+
 void ScExportTest::testHyperlinkXLSX()
 {
 ScDocShellRef xDocSh = loadDoc("hyperlink.", FORMAT_XLSX);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: License information for extensions on LO's extension site

[Stephan Bergmann]

On 30/08/18 12:41, Heiko Tietze wrote:

But doesn't it depend on whether you let the admin or the user agree?


"admin" means that only the one installing the extension has to accept 
the license, while "user" means that every user has to (in case the 
extension is installed shared), see 
.


And I don't see how "admin" vs. "user" would make much of a difference 
wrt. my "guess that many extensions do not want to bother users [any 
kind of user, incl. those installing extensions and falling under the 
"admin" label for the accept-by attribute] with click-through license 
bla bla."

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

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

[Libreoffice Gerrit user]

 sc/qa/unit/ucalc.cxx  |8 
 sc/source/ui/docshell/docfunc.cxx |   25 +
 sc/source/ui/docshell/impex.cxx   |1 +
 sc/source/ui/inc/undobase.hxx |2 +-
 sc/source/ui/inc/undoblk.hxx  |8 
 sc/source/ui/inc/undodat.hxx  |2 +-
 sc/source/ui/inc/undotab.hxx  |2 +-
 sc/source/ui/undo/undobase.cxx|4 ++--
 sc/source/ui/undo/undoblk.cxx |   16 
 sc/source/ui/undo/undodat.cxx |4 ++--
 sc/source/ui/undo/undotab.cxx |5 +++--
 sc/source/ui/unoobj/cellsuno.cxx  |1 +
 sc/source/ui/view/viewfun2.cxx|   10 +++---
 sc/source/ui/view/viewfun3.cxx|   10 +-
 sc/source/ui/view/viewfun4.cxx|1 +
 sc/source/ui/view/viewfunc.cxx|6 +++---
 16 files changed, 49 insertions(+), 56 deletions(-)

New commits:
commit 1f9f35177aca7000edd0ec5e68e4045e04cce535
Author: Noel Grandin 
AuthorDate: Thu Aug 30 09:47:24 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 30 12:53:56 2018 +0200

pass ScRefUndoData around by std::unique_ptr

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

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 791b25ab85b2..193522887b8b 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -3748,8 +3748,8 @@ void Test::testCopyPasteSkipEmpty()
 m_pDoc->CopyToDocument(aDestRange, InsertDeleteFlags::ALL, false, 
*pRedoDoc, &aMark);
 
 // Create an undo object for this.
-ScRefUndoData* pRefUndoData = new ScRefUndoData(m_pDoc);
-ScUndoPaste aUndo(&getDocShell(), aDestRange, aMark, std::move(pUndoDoc), 
std::move(pRedoDoc), InsertDeleteFlags::ALL, pRefUndoData);
+std::unique_ptr pRefUndoData(new ScRefUndoData(m_pDoc));
+ScUndoPaste aUndo(&getDocShell(), aDestRange, aMark, std::move(pUndoDoc), 
std::move(pRedoDoc), InsertDeleteFlags::ALL, std::move(pRefUndoData));
 
 // Check the content after the paste.
 {
@@ -6741,10 +6741,10 @@ ScUndoPaste* Test::createUndoPaste(ScDocShell& rDocSh, 
const ScRange& rRange, Sc
 ScDocument& rDoc = rDocSh.GetDocument();
 ScMarkData aMarkData;
 aMarkData.SetMarkArea(rRange);
-ScRefUndoData* pRefUndoData = new ScRefUndoData(&rDoc);
+std::unique_ptr pRefUndoData(new ScRefUndoData(&rDoc));
 
 return new ScUndoPaste(
-&rDocSh, rRange, aMarkData, std::move(pUndoDoc), nullptr, 
InsertDeleteFlags::ALL, pRefUndoData, false);
+&rDocSh, rRange, aMarkData, std::move(pUndoDoc), nullptr, 
InsertDeleteFlags::ALL, std::move(pRefUndoData), false);
 }
 
 void Test::setExpandRefs(bool bExpand)
diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index f995de081037..a49e78d89f65 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1799,7 +1799,7 @@ bool ScDocFunc::InsertCells( const ScRange& rRange, const 
ScMarkData* pTabMark,
 WaitObject aWait( ScDocShell::GetActiveDialogParent() );  // important 
due to TrackFormulas at UpdateReference
 
 ScDocumentUniquePtr pRefUndoDoc;
-ScRefUndoData* pUndoData = nullptr;
+std::unique_ptr pUndoData;
 if ( bRecord )
 {
 pRefUndoDoc.reset(new ScDocument( SCDOCMODE_UNDO ));
@@ -1807,7 +1807,7 @@ bool ScDocFunc::InsertCells( const ScRange& rRange, const 
ScMarkData* pTabMark,
 
 // pRefUndoDoc is filled in InsertCol / InsertRow
 
-pUndoData = new ScRefUndoData( &rDoc );
+pUndoData.reset(new ScRefUndoData( &rDoc ));
 
 rDoc.BeginDrawUndo();
 }
@@ -1849,7 +1849,6 @@ bool ScDocFunc::InsertCells( const ScRange& rRange, const 
ScMarkData* pTabMark,
 if (!bApi)
 rDocShell.ErrorMessage(STR_MSSG_INSERTCELLS_0);
 rDocShell.GetUndoManager()->LeaveListAction();
-delete pUndoData;
 return false;
 }
 
@@ -1954,7 +1953,6 @@ bool ScDocFunc::InsertCells( const ScRange& rRange, const 
ScMarkData* pTabMark,
 if (!bApi)
 rDocShell.ErrorMessage(STR_MSSG_INSERTCELLS_0);
 rDocShell.GetUndoManager()->LeaveListAction();
-delete pUndoData;
 return false;
 }
 }
@@ -2025,7 +2023,7 @@ bool ScDocFunc::InsertCells( const ScRange& rRange, const 
ScMarkData* pTabMark,
 
 rDocShell.GetUndoManager()->AddUndoAction( new ScUndoInsertCells(
 &rDocShell, ScRange( nStartCol, nStartRow, nStartTab, nEndCol, 
nEndRow, nEndTab ),
-nUndoPos, pTabs, pScenarios, eCmd, std::move(pRefUndoDoc), 
pUndoData, bPartOfPaste ) );
+nUndoPos, pTabs, pScenarios, eCmd, std::move(pRefUndoDoc), 
std::move(pUndoData), bPartOfPaste ) );
 }
 
 // #i8302 : we remerge growing ranges, with the new part inserted
@@ -2122,7 +2120,6 @@ bool ScDoc

Re: License information for extensions on LO's extension site

[Heiko Tietze]

But doesn't it depend on whether you let the admin or the user agree? Anyway, 
the platform itself has a license selection and there confusion started for me 
(forgot the license file in one of my extensions). So we definitely have room 
for improvements nevertheless Andreas awesome work around the platform.

On 30 August 2018 12:19:13 CEST, Stephan Bergmann  wrote:
>I don't find a way to comment directly at 
>,
>so 
>moving that here.  Quoting that blog post:
>
>[...]
>> But without a proper license the Extension it is not appropriate to
>publish the Extension on the LibreOffice Extensions website.
>> 
>> But it is not a very difficult task to add such a license information
>to the Extension. Just add a text file with the license to the
>Extension (zipped) container (preferably in a subfolder) and update the
>description.xml with the following xml-tag:
>> 
>> 
>> 
>> ”
>> lang=”en” />
>> 
>> 
>
>The description.xml simple-license element is about asking the user to 
>actively accept a license before installing/using the extension.  This 
>is awkward UX and I guess that many extensions do not want to bother 
>users with click-through license bla bla.
>
>I don't think that it is a good idea to tie the question of whether an 
>extension is suitably licensed for publishing on LO's extension site to
>
>the presence of such a simple-license element.
>___
>LibreOffice mailing list
>LibreOffice@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/libreoffice

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/cib_contract935' - framework/source

[Libreoffice Gerrit user]

 framework/source/dispatch/interceptionhelper.cxx |   17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 3b6fdf5eb0f6571383880e8c6af450a0e0069fca
Author: Vasily Melenchuk 
AuthorDate: Thu Aug 30 11:23:05 2018 +0300
Commit: Vasily Melenchuk 
CommitDate: Thu Aug 30 13:20:10 2018 +0300

debug: let's disable dispatch interceptors for a while

Also make a debug run of interceptor code during registration

Change-Id: Ie7c59eda4ca4e7b12ecd5a0a296de0e87d3d005b

diff --git a/framework/source/dispatch/interceptionhelper.cxx 
b/framework/source/dispatch/interceptionhelper.cxx
old mode 100644
new mode 100755
index c7ef6cf62448..afc74ab8b03c
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -20,7 +20,7 @@
 #include 
 
 #include 
-
+#include 
 #include 
 
 namespace framework{
@@ -74,7 +74,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL 
InterceptionHelper::queryD
 // c) No registered interceptor => use our direct slave.
 //This helper exist by design and must be valid everytimes ...
 //But to be more feature proof - we should check that .-)
-if (!xInterceptor.is() && m_xSlave.is())
+//if (!xInterceptor.is() && m_xSlave.is())
 xInterceptor = m_xSlave;
 
 aReadLock.clear();
@@ -103,6 +103,19 @@ css::uno::Sequence< css::uno::Reference< 
css::frame::XDispatch > > SAL_CALL Inte
 void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const 
css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
 throw(css::uno::RuntimeException, std::exception)
 {
+// testrun
+{
+css::uno::Reference xOwner(m_xOwnerWeak.get(), 
css::uno::UNO_QUERY);
+css::util::URL aTargetURL(".uno:Save", ".uno:Save", ".uno:", "", "", 
"", 0, "Save", "", "",
+  "");
+/*aTargetURL.Complete = ".uno:Save";
+css::uno::Reference m_xUrlTransformer
+= css::util::URLTransformer::create(xOwner);
+if (m_xUrlTransformer.is())
+m_xUrlTransformer->parseStrict(aTargetURL);*/
+xInterceptor->queryDispatch(aTargetURL, OUString(), 0);
+}
+
 // reject incorrect calls of this interface method
 css::uno::Reference< css::frame::XDispatchProvider > xThis(static_cast< 
::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
 if (!xInterceptor.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/uibase/sidebar/PageFormatPanel.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 32bf352c61754fe5ef39e0794b5d6dc71be99194
Author: Ilhan Yesil 
AuthorDate: Thu Aug 30 09:21:36 2018 +0200
Commit: Katarina Behrens 
CommitDate: Thu Aug 30 12:38:33 2018 +0200

tdf#113848 Sidebar: Get user-defined sizes while changing orientation

If the orientation of the page is changed, the user
defined page sizes are now accessed directly to swap the sizes
correctly.

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

diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx 
b/sw/source/uibase/sidebar/PageFormatPanel.cxx
index e0d6b385acd7..bda95ea0dd34 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx
@@ -216,9 +216,14 @@ void PageFormatPanel::NotifyItemUpdate(
 IMPL_LINK_NOARG(PageFormatPanel, PaperFormatModifyHdl, ListBox&, void)
 {
 Paper ePaper = mpPaperSizeBox->GetSelection();
-Size  aSize(SvxPaperInfo::GetPaperSize(ePaper, meUnit));
+Size  aSize;
 
-if(mpPaperOrientation->GetSelectedEntryPos() == 1)
+if(ePaper!=PAPER_USER)
+   aSize = SvxPaperInfo::GetPaperSize(ePaper, meUnit);
+else
+   aSize = Size(GetCoreValue( *mpPaperWidth, meUnit ), GetCoreValue( 
*mpPaperHeight, meUnit));
+
+if(mpPaperOrientation->GetSelectedEntryPos() == 1 || ePaper==PAPER_USER)
 Swap(aSize);
 
 mpPageItem->SetLandscape(mpPaperOrientation->GetSelectedEntryPos() == 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

License information for extensions on LO's extension site

[Stephan Bergmann]

I don't find a way to comment directly at 
, so 
moving that here.  Quoting that blog post:


[...]

But without a proper license the Extension it is not appropriate to publish the 
Extension on the LibreOffice Extensions website.

But it is not a very difficult task to add such a license information to the 
Extension. Just add a text file with the license to the Extension (zipped) 
container (preferably in a subfolder) and update the description.xml with the 
following xml-tag:



”
lang=”en” />




The description.xml simple-license element is about asking the user to 
actively accept a license before installing/using the extension.  This 
is awkward UX and I guess that many extensions do not want to bother 
users with click-through license bla bla.


I don't think that it is a good idea to tie the question of whether an 
extension is suitably licensed for publishing on LO's extension site to 
the presence of such a simple-license element.

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

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

[Libreoffice Gerrit user]

 solenv/bin/modules/installer/windows/admin.pm |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 088e8bb9b7f2e60061bf1da56d83fb4537f40d67
Author: Andras Timar 
AuthorDate: Thu Aug 30 12:21:38 2018 +0200
Commit: Andras Timar 
CommitDate: Thu Aug 30 12:21:38 2018 +0200

x86 Win MSP build fix

Change-Id: I2580fe0eacd5834047b50f36384ad9ea6c9d0354

diff --git a/solenv/bin/modules/installer/windows/admin.pm 
b/solenv/bin/modules/installer/windows/admin.pm
index f822afe7eaec..3dfba9e7a8de 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -287,8 +287,9 @@ sub create_directory_structure
 {
 if ( ! exists($fullpathhash{$dir}) ) { $fullpathhash{$dir} = 
$targetdir; }
 }
-# FIXME why is this hack needed? ERROR: Did not find full directory path 
for dir: "ystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"
+# FIXME why is this hack needed? ERROR: Did not find full directory path 
for dir: "SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"
 $fullpathhash{"SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"} 
= $targetdir . $installer::globals::separator . "System";
+$fullpathhash{"SystemFolder_x86_VC.E281B893_10D7_34CE_BB0E_B69D88E154A5"} 
= $targetdir . $installer::globals::separator . "System";
 
$fullpathhash{"System64Folder_amd64_VC.AF4EABEE_4589_3789_BA0A_C83A71662E1D"} = 
$targetdir . $installer::globals::separator . "System64";
 
 return \%fullpathhash;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/source/sidebar/FocusManager.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 897d64a5370770f526d7709f8b27096407f06e1c
Author: Jim Raykowski 
AuthorDate: Mon Aug 27 18:12:54 2018 -0800
Commit: Caolán McNamara 
CommitDate: Thu Aug 30 12:01:26 2018 +0200

Update sidebar panel title decoration expand/collapse bitmap

...when panel title has focus and space key is pressed

Fixes sidebar panel title decoration expand/collapse bitmap not updating
when keyboard space key is pressed. This has been present since at least
ver 5.1.6.2. Seems trival enough to not have go through the report
process. May be why I could find no bug report for it :-)

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

diff --git a/sfx2/source/sidebar/FocusManager.cxx 
b/sfx2/source/sidebar/FocusManager.cxx
index 6218efd88679..84c6b60f1ebf 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -390,6 +390,7 @@ void FocusManager::HandleKeyEvent (
 case PC_PanelTitle:
 // Toggle panel between expanded and collapsed.
 maPanels[aLocation.mnIndex]->SetExpanded( ! 
maPanels[aLocation.mnIndex]->IsExpanded());
+
maPanels[aLocation.mnIndex]->GetTitleBar().get()->Invalidate();
 break;
 
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/3.4-rc3'

[Libreoffice Gerrit user]

Tag '3.4-rc3' created by Andras Timar  at 
2018-08-30 09:10 +

3.4-rc3

Changes since 3.4-rc2-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 registry/source/keyimpl.cxx |  217 +---
 1 file changed, 84 insertions(+), 133 deletions(-)

New commits:
commit fbb2d771681709e8d40f844d16e9a487a813
Author: Noel Grandin 
AuthorDate: Wed Aug 29 13:02:22 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 30 11:10:06 2018 +0200

loplugin:useuniqueptr in registry

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

diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 7dcd088ceaa5..a717c5df6764 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace store;
 
@@ -218,7 +219,7 @@ RegError ORegKey::deleteKey(const OUString& keyName)
 RegError ORegKey::getValueInfo(const OUString& valueName, RegValueType* 
pValueType, sal_uInt32* pValueSize) const
 {
 OStoreStreamrValue;
-sal_uInt8*  pBuffer;
+std::unique_ptr pBuffer;
 storeAccessMode accessMode = storeAccessMode::ReadWrite;
 
 if (m_pRegistry->isReadOnly())
@@ -238,23 +239,21 @@ RegError ORegKey::getValueInfo(const OUString& valueName, 
RegValueType* pValueTy
 return RegError::VALUE_NOT_EXISTS;
 }
 
-pBuffer = static_cast(std::malloc(VALUE_HEADERSIZE));
+pBuffer.reset(new sal_uInt8[VALUE_HEADERSIZE]);
 
 sal_uInt32  readBytes;
-if ( rValue.readAt(0, pBuffer, VALUE_HEADERSIZE, readBytes) )
+if ( rValue.readAt(0, pBuffer.get(), VALUE_HEADERSIZE, readBytes) )
 {
-std::free(pBuffer);
 return RegError::INVALID_VALUE;
 }
 if (readBytes != VALUE_HEADERSIZE)
 {
-std::free(pBuffer);
 return RegError::INVALID_VALUE;
 }
 
 sal_uInt32  size;
-sal_uInt8   type = *pBuffer;
-readUINT32(pBuffer+VALUE_TYPEOFFSET, size);
+sal_uInt8   type = pBuffer[0];
+readUINT32(pBuffer.get()+VALUE_TYPEOFFSET, size);
 
 *pValueType = static_cast(type);
 //if (*pValueType == RegValueType::UNICODE)
@@ -264,17 +263,15 @@ RegError ORegKey::getValueInfo(const OUString& valueName, 
RegValueType* pValueTy
 //{
 if (*pValueType > RegValueType::BINARY)
 {
-std::free(pBuffer);
-pBuffer = static_cast(std::malloc(4));
-rValue.readAt(VALUE_HEADEROFFSET, pBuffer, 4, readBytes);
+pBuffer.reset(new sal_uInt8[4]);
+rValue.readAt(VALUE_HEADEROFFSET, pBuffer.get(), 4, readBytes);
 
-readUINT32(pBuffer, size);
+readUINT32(pBuffer.get(), size);
 }
 
 *pValueSize = size;
 //}
 
-std::free(pBuffer);
 return RegError::NO_ERROR;
 }
 
@@ -284,7 +281,7 @@ RegError ORegKey::getValueInfo(const OUString& valueName, 
RegValueType* pValueTy
 RegError ORegKey::setValue(const OUString& valueName, RegValueType vType, 
RegValue value, sal_uInt32 vSize)
 {
 OStoreStreamrValue;
-sal_uInt8*  pBuffer;
+std::unique_ptr pBuffer;
 
 if (m_pRegistry->isReadOnly())
 {
@@ -309,27 +306,27 @@ RegError ORegKey::setValue(const OUString& valueName, 
RegValueType vType, RegVal
 sal_uInt32 size = vSize;
 
 sal_uInt8 type = static_cast(vType);
-pBuffer = static_cast(std::malloc(VALUE_HEADERSIZE + size));
-memcpy(pBuffer, &type, 1);
+pBuffer.reset(new sal_uInt8[VALUE_HEADERSIZE + size]);
+memcpy(pBuffer.get(), &type, 1);
 
-writeUINT32(pBuffer+VALUE_TYPEOFFSET, size);
+writeUINT32(pBuffer.get()+VALUE_TYPEOFFSET, size);
 
 switch (vType)
 {
 case RegValueType::NOT_DEFINED:
-memcpy(pBuffer+VALUE_HEADEROFFSET, value, size);
+memcpy(pBuffer.get()+VALUE_HEADEROFFSET, value, size);
 break;
 case RegValueType::LONG:
-writeINT32(pBuffer+VALUE_HEADEROFFSET, 
*static_cast(value));
+writeINT32(pBuffer.get()+VALUE_HEADEROFFSET, 
*static_cast(value));
 break;
 case RegValueType::STRING:
-writeUtf8(pBuffer+VALUE_HEADEROFFSET, static_cast(value));
+writeUtf8(pBuffer.get()+VALUE_HEADEROFFSET, static_cast(value));
 break;
 case RegValueType::UNICODE:
-writeString(pBuffer+VALUE_HEADEROFFSET, static_cast(value));
+writeString(pBuffer.get()+VALUE_HEADEROFFSET, static_cast(value));
 break;
 case RegValueType::BINARY:
-memcpy(pBuffer+VALUE_HEADEROFFSET, value, size);
+memcpy(pBuffer.get()+VALUE_HEADEROFFSET, value, size);
 break;
 default:
 OSL_ASSERT(false);
@@ -337,19 +334,16 @@ RegError ORegKey::setValue(const OUString& valueName, 
RegValueType vType, RegVal
 }
 
 sal_uInt32  writenBytes;
-if ( rValue.writeAt(0, pBuffer, VALUE_HEADERSIZE+size, writenBytes) )
+if ( rValue.writeAt(0, pBuffer.get(), VALUE_HEADERSIZE+size, writenBytes) )
   

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - debian/changelog loolwsd.spec.in

[Libreoffice Gerrit user]

 debian/changelog |6 ++
 loolwsd.spec.in  |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 63051b77ad967925bdade22dad063f8337dcff93
Author: Andras Timar 
AuthorDate: Thu Aug 30 08:40:34 2018 +0200
Commit: Andras Timar 
CommitDate: Thu Aug 30 11:09:52 2018 +0200

Bump package version to 3.4.0-3

Change-Id: Ia73a770b5c442db232da0286fe173550649c4333
(cherry picked from commit ef9835593d4334a58755849cf6e16af4f256d949)

diff --git a/debian/changelog b/debian/changelog
index 2953d0976..e2b92dfaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.4.0-3) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool3
+
+ -- Andras Timar   Fri, 30 Aug 2018 08:30:00 +0200
+
 loolwsd (3.4.0-2) unstable; urgency=medium
 
   * see the git log: http://col.la/cool3
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 0ab7cf170..59191c142 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:2%{?dist}
+Release:3%{?dist}
 %if 0%{?suse_version} == 1110
 Group:  Productivity/Office/Suite
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/ui/app/inputhdl.cxx |   10 +-
 sc/source/ui/app/inputwin.cxx |4 ++--
 sc/source/ui/app/scmod.cxx|6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 5857555e129a5913352cd7e8c7e825dd6892d808
Author: Bijan Tabatabai 
AuthorDate: Sat Aug 25 23:38:46 2018 -0500
Commit: Eike Rathke 
CommitDate: Thu Aug 30 10:28:00 2018 +0200

tdf#114441 Convert  sal_uLong to other types in ./sc/source/ui/app

Change-Id: I9648d54f75d7ed5cb68ec7d678bc61c46df18acf
Signed-off-by: Bijan Tabatabai 
Reviewed-on: https://gerrit.libreoffice.org/59602
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index cc02c55468db..9351055540bb 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -813,8 +813,8 @@ void ScInputHandler::GetFormulaData()
 
 const OUString aParenthesesReplacement( cParenthesesReplacement);
 const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
-sal_uLong nListCount = pFuncList->GetCount();
-for(sal_uLong i=0;iGetCount();
+for(sal_uInt32 i=0;iGetFunction( i );
 if ( pDesc->mxFuncName )
@@ -1428,7 +1428,7 @@ static OUString lcl_Calculate( const OUString& rFormula, 
ScDocument* pDoc, const
 if ( pCalc->IsValue() )
 {
 double n = pCalc->GetValue();
-sal_uLong nFormat = aFormatter.GetStandardFormat( n, 0,
+sal_uInt32 nFormat = aFormatter.GetStandardFormat( n, 0,
 pCalc->GetFormatType(), ScGlobal::eLnge );
 aFormatter.GetInputLineString( n, nFormat, aValue );
 //! display OutputString but insert InputLineString
@@ -1436,7 +1436,7 @@ static OUString lcl_Calculate( const OUString& rFormula, 
ScDocument* pDoc, const
 else
 {
 OUString aStr = pCalc->GetString().getString();
-sal_uLong nFormat = aFormatter.GetStandardFormat(
+sal_uInt32 nFormat = aFormatter.GetStandardFormat(
 pCalc->GetFormatType(), ScGlobal::eLnge);
 {
 Color* pColor;
@@ -2072,7 +2072,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool 
bFromCommand, bool bIn
 
 if ( SfxItemState::SET == rAttrSet.GetItemState( 
ATTR_VALUE_FORMAT, true, &pItem ) )
 {
-sal_uLong nFormat = static_cast(pItem)->GetValue();
+sal_uInt32 nFormat = static_cast(pItem)->GetValue();
 bCellHasPercentFormat = ( SvNumFormatType::PERCENT ==
   rDoc.GetFormatTable()->GetType( 
nFormat ) );
 }
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index edab7e0023db..a1fb0b3a6625 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1931,11 +1931,11 @@ void ScPosWnd::FillFunctions()
 if (pMRUList)
 {
 const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
-sal_uLong nListCount = pFuncList->GetCount();
+sal_uInt32 nListCount = pFuncList->GetCount();
 for (sal_uInt16 i=0; iGetFunction( j );
 if ( pDesc->nFIndex == nId && pDesc->mxFuncName )
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 707ebb1e8f82..46789edb9567 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1784,7 +1784,7 @@ void ScModule::EndReference()
  */
 void ScModule::AnythingChanged()
 {
-sal_uLong nOldTime = m_aIdleTimer.GetTimeout();
+sal_uInt64 nOldTime = m_aIdleTimer.GetTimeout();
 if ( nOldTime != SC_IDLE_MIN )
 m_aIdleTimer.SetTimeout( SC_IDLE_MIN );
 
@@ -1849,8 +1849,8 @@ IMPL_LINK_NOARG(ScModule, IdleHandler, Timer *, void)
 }
 }
 
-sal_uLong nOldTime = m_aIdleTimer.GetTimeout();
-sal_uLong nNewTime = nOldTime;
+sal_uInt64 nOldTime = m_aIdleTimer.GetTimeout();
+sal_uInt64 nNewTime = nOldTime;
 if ( bMore )
 {
 nNewTime = SC_IDLE_MIN;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 chart2/source/controller/main/ChartTransferable.cxx |2 +-
 include/svx/svdxcgv.hxx |2 +-
 include/svx/view3d.hxx  |2 +-
 sc/source/ui/app/seltrans.cxx   |2 +-
 sc/source/ui/navipi/content.cxx |2 +-
 sc/source/ui/view/drawvie4.cxx  |8 
 sd/source/core/drawdoc3.cxx |2 +-
 sd/source/ui/app/sdxfer.cxx |4 ++--
 sd/source/ui/view/sdview2.cxx   |2 +-
 sd/source/ui/view/sdview3.cxx   |2 +-
 svx/source/engine3d/view3d.cxx  |   16 
 svx/source/svdraw/svdpage.cxx   |2 +-
 svx/source/svdraw/svdxcgv.cxx   |4 ++--
 13 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit b99c69784e8bb7b477759f14058a707e9000e56d
Author: Noel Grandin 
AuthorDate: Wed Aug 29 16:27:18 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 30 09:46:37 2018 +0200

rename GetMarkedObjModel to CreateMarkedObjModel

and return std::unique_ptr

Not that it helps much, the ownership quickly becomes complex once it
hits the TransferableHelper.

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

diff --git a/chart2/source/controller/main/ChartTransferable.cxx 
b/chart2/source/controller/main/ChartTransferable.cxx
index 90660c07e1cb..9ace159756e1 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -63,7 +63,7 @@ ChartTransferable::ChartTransferable(
 m_xMetaFileGraphic.set( aGraphic.GetXGraphic());
 if ( m_bDrawing )
 {
-m_pMarkedObjModel = pExchgView->GetMarkedObjModel();
+m_pMarkedObjModel = pExchgView->CreateMarkedObjModel().release();
 }
 }
 
diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx
index 52dc63b1a282..731c9a392f53 100644
--- a/include/svx/svdxcgv.hxx
+++ b/include/svx/svdxcgv.hxx
@@ -70,7 +70,7 @@ public:
 // the page-local layer is merged. If there's no more room left for
 // additional page-local layers, the corresponding objects are assigned
 // the default layer (layer 0, document-global standard layer).
-virtual SdrModel*   GetMarkedObjModel() const;
+virtual std::unique_ptr CreateMarkedObjModel() const;
 
 Graphic GetAllMarkedGraphic() const;
 
diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx
index 33a19fa79061..9b92023e5596 100644
--- a/include/svx/view3d.hxx
+++ b/include/svx/view3d.hxx
@@ -83,7 +83,7 @@ public:
 const MouseEvent& GetMouseEvent() { return aMouseEvent; }
 
 // Override getting the model, as we need to supply a Scene together with 
individual 3D Objects.
-virtual SdrModel* GetMarkedObjModel() const override;
+virtual std::unique_ptr CreateMarkedObjModel() const override;
 
 // On Paste: We need to insert the objects of the Scene, but not the Scene 
itself
 using SdrView::Paste;
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index c42134bb28cd..5b5aca2a4a7b 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -327,7 +327,7 @@ void ScSelectionTransferObj::CreateDrawData()
 }
 
 ScDrawLayer::SetGlobalDrawPersist( aDragShellRef.get() );
-std::unique_ptr pModel(pDrawView->GetMarkedObjModel());
+std::unique_ptr 
pModel(pDrawView->CreateMarkedObjModel());
 ScDrawLayer::SetGlobalDrawPersist(nullptr);
 
 ScViewData& rViewData = pView->GetViewData();
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index ecaecee72982..ad7ea280d8c7 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -1253,7 +1253,7 @@ static void lcl_DoDragObject( ScDocShell* pSrcShell, 
const OUString& rName, ScCo
 SdrPageView* pPV = aEditView.GetSdrPageView();
 aEditView.MarkObj(pObject, pPV);
 
-std::unique_ptr 
pDragModel(aEditView.GetMarkedObjModel());
+std::unique_ptr 
pDragModel(aEditView.CreateMarkedObjModel());
 
 TransferableObjectDescriptor aObjDesc;
 pSrcShell->FillTransferableObjectDescriptor( aObjDesc );
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 4bd6b11719cf..ae640d7f1708 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -80,7 +80,7 @@ void ScDrawView::BeginDrag( vcl::Window* pWindow, const 
Point& rStartPos )
 aDragShellRef->DoInitNew();
 }
 ScDrawLayer::SetGlobalDrawPersist( aDragShellRef.get() );
-std::unique_ptr pModel(GetMarkedObjModel());
+std::unique_ptr pModel(CreateMarkedObjModel());

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

[Libreoffice Gerrit user]

 forms/source/xforms/xpathlib/xpathlib.cxx |   29 ++---
 1 file changed, 10 insertions(+), 19 deletions(-)

New commits:
commit 5ff20b1c726509ad88058c953406a2bd0c8e194b
Author: Noel Grandin 
AuthorDate: Wed Aug 29 12:15:54 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 30 09:40:36 2018 +0200

no need to allocate a new string in parseDuration

just parse the incoming string in-place with boost::lexical_cast

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

diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx 
b/forms/source/xforms/xpathlib/xpathlib.cxx
index 177251bb1709..9ff6426ec456 100644
--- a/forms/source/xforms/xpathlib/xpathlib.cxx
+++ b/forms/source/xforms/xpathlib/xpathlib.cxx
@@ -36,8 +36,9 @@
 #include 
 #include 
 
-#include "xpathlib.hxx"
+#include 
 
+#include "xpathlib.hxx"
 #include "extension.hxx"
 
 // C interface
@@ -373,10 +374,7 @@ static bool parseDuration(const xmlChar* aString, bool& 
bNegative, sal_Int32& nY
   sal_Int32& nHours, sal_Int32& nMinutes, 
sal_Int32& nSeconds)
 {
 bool bTime = false; // in part after T
-sal_Int32 nLength = strlen(reinterpret_cast(aString))+1;
-char *pString = static_cast(std::malloc(nLength));
-char *pString0 = pString;
-strncpy(pString, reinterpret_cast(aString), nLength);
+const xmlChar *pString = aString;
 
 if (pString[0] == '-') {
 bNegative = true;
@@ -385,41 +383,35 @@ static bool parseDuration(const xmlChar* aString, bool& 
bNegative, sal_Int32& nY
 
 if (pString[0] != 'P')
 {
-std::free(pString0);
 return false;
 }
 
 pString++;
-char* pToken = pString;
+const xmlChar* pToken = pString;
 while(pToken[0] != 0)
 {
 switch(pToken[0]) {
 case 'Y':
-pToken[0] = 0;
-nYears = atoi(pString);
+nYears = boost::lexical_cast(pString, pString-pToken);
 pString = ++pToken;
 break;
 case 'M':
-pToken[0] = 0;
 if (!bTime)
-nMonth = atoi(pString);
+nMonth = boost::lexical_cast(pString, 
pString-pToken);
 else
-nMinutes = atoi(pString);
+nMinutes = boost::lexical_cast(pString, 
pString-pToken);
 pString = ++pToken;
 break;
 case 'D':
-pToken[0] = 0;
-nDays = atoi(pString);
+nDays = boost::lexical_cast(pString, pString-pToken);
 pString = ++pToken;
 break;
 case 'H':
-pToken[0] = 0;
-nHours = atoi(pString);
+nHours = boost::lexical_cast(pString, pString-pToken);
 pString = ++pToken;
 break;
 case 'S':
-pToken[0] = 0;
-nSeconds = atoi(pString);
+nSeconds = boost::lexical_cast(pString, pString-pToken);
 pString = ++pToken;
 break;
 case 'T':
@@ -430,7 +422,6 @@ static bool parseDuration(const xmlChar* aString, bool& 
bNegative, sal_Int32& nY
 pToken++;
 }
 }
-std::free(pString0);
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |   16 +++---
 1 file changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 59bcc90cad1bf07e6841dbd01ef503c10032ff0b
Author: Miklos Vajna 
AuthorDate: Wed Aug 29 21:34:23 2018 +0200
Commit: Miklos Vajna 
CommitDate: Thu Aug 30 09:12:56 2018 +0200

xmlsecurity: use comphelper::containerToSequence()

Allows not iterating the certificate chain twice.

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

diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx 
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 3f928b05bcc8..7e19c995ae88 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "secerror.hxx"
 
@@ -438,15 +439,10 @@ Sequence< Reference < XCertificate > > 
SecurityEnvironment_NssImpl::buildCertifi
 }
 
 if( certChain != nullptr ) {
-X509Certificate_NssImpl* pCert ;
-CERTCertListNode* node ;
-int len ;
+std::vector> aCertChain;
 
-for( len = 0, node = CERT_LIST_HEAD( certChain ); !CERT_LIST_END( 
node, certChain ); node = CERT_LIST_NEXT( node ), len ++ ) ;
-Sequence< Reference< XCertificate > > xCertChain( len ) ;
-
-for( len = 0, node = CERT_LIST_HEAD( certChain ); !CERT_LIST_END( 
node, certChain ); node = CERT_LIST_NEXT( node ), len ++ ) {
-pCert = new X509Certificate_NssImpl() ;
+for (CERTCertListNode* node = CERT_LIST_HEAD(certChain); 
!CERT_LIST_END(node, certChain); node = CERT_LIST_NEXT(node)) {
+X509Certificate_NssImpl* pCert = new X509Certificate_NssImpl();
 if( pCert == nullptr ) {
 CERT_DestroyCertList( certChain ) ;
 throw RuntimeException() ;
@@ -454,12 +450,12 @@ Sequence< Reference < XCertificate > > 
SecurityEnvironment_NssImpl::buildCertifi
 
 pCert->setCert( node->cert ) ;
 
-xCertChain[len] = pCert ;
+aCertChain.push_back(pCert);
 }
 
 CERT_DestroyCertList( certChain ) ;
 
-return xCertChain ;
+return comphelper::containerToSequence(aCertChain);
 }
 
 return Sequence< Reference < XCertificate > >();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/sfx2/mgetempl.hxx   |1 
 include/sfx2/styledlg.hxx   |   19 
 include/sfx2/tabdlg.hxx |6 ++
 sfx2/source/dialog/mgetempl.cxx |2 
 sfx2/source/dialog/styledlg.cxx |   84 +-
 sfx2/source/dialog/tabdlg.cxx   |   88 +---
 sw/source/uibase/app/docst.cxx  |2 
 7 files changed, 191 insertions(+), 11 deletions(-)

New commits:
commit 923c14135c21ffde2a19ca7875be6ebb79197740
Author: Caolán McNamara 
AuthorDate: Wed Aug 29 17:05:28 2018 +0100
Commit: Caolán McNamara 
CommitDate: Thu Aug 30 09:06:34 2018 +0200

add SfxStyleDialogController

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

diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index 4a2c906ca9c2..238d662c33f5 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -64,6 +64,7 @@ class SfxManageStyleSheetPage final : public SfxTabPage
 std::unique_ptr m_xNameFt;
 
 friend class SfxStyleDialog;
+friend class SfxStyleDialogController;
 
 DECL_LINK(GetFocusHdl, weld::Widget&, void);
 DECL_LINK(LoseFocusHdl, weld::Widget&, void);
diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx
index 5abf6c653d22..e86c6450e355 100644
--- a/include/sfx2/styledlg.hxx
+++ b/include/sfx2/styledlg.hxx
@@ -21,7 +21,6 @@
 
 #include 
 #include 
-
 #include 
 
 class SfxStyleSheetBase;
@@ -45,6 +44,24 @@ public:
 const SfxStyleSheetBase&GetStyleSheet() const { return *pStyle; }
 
 virtual short   Ok() override;
+};
+
+class SFX2_DLLPUBLIC SfxStyleDialogController : public SfxTabDialogController
+{
+private:
+SfxStyleSheetBase& m_rStyle;
+DECL_DLLPRIVATE_LINK(CancelHdl, weld::Button&, void);
+
+public:
+SfxStyleDialogController(weld::Window* pParent,
+const OUString& rUIXMLDescription, const OString& rID, 
SfxStyleSheetBase&);
+
+virtual ~SfxStyleDialogController() override;
+
+SfxStyleSheetBase&  GetStyleSheet() { return m_rStyle; }
+const SfxStyleSheetBase&GetStyleSheet() const { return m_rStyle; }
+
+virtual short   Ok() override;
 
 static OUString GenerateUnusedName(SfxStyleSheetBasePool &rPool);
 };
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 64a8ebc5d6ae..ebcaf8c17268 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -230,6 +230,7 @@ protected:
 
 DECL_LINK(OkHdl, weld::Button&, void);
 DECL_LINK(ResetHdl, weld::Button&, void);
+DECL_LINK(BaseFmtHdl, weld::Button&, void);
 DECL_LINK(UserHdl, weld::Button&, void);
 DECL_LINK(CancelHdl, weld::Button&, void);
 private:
@@ -238,6 +239,7 @@ private:
 std::unique_ptr m_xUserBtn;
 std::unique_ptr m_xCancelBtn;
 std::unique_ptr m_xResetBtn;
+std::unique_ptr m_xBaseFmtBtn;
 std::unique_ptr m_xSizeGroup;
 
 std::unique_ptr   m_pSet;
@@ -245,6 +247,7 @@ private:
 std::unique_ptr  m_pImpl;
 std::unique_ptr m_pRanges;
 OString m_sAppPageId;
+boolm_bStandardPushed;
 
 DECL_DLLPRIVATE_LINK(ActivatePageHdl, const OString&, void);
 DECL_DLLPRIVATE_LINK(DeactivatePageHdl, const OString&, bool);
@@ -273,7 +276,7 @@ protected:
 void Start_Impl();
 public:
 SfxTabDialogController(weld::Window* pParent, const OUString& 
rUIXMLDescription, const OString& rID,
-   const SfxItemSet * = nullptr);
+   const SfxItemSet * = nullptr, bool bEditFmt = 
false);
 virtual ~SfxTabDialogController() override;
 
 voidAddTabPage( const OString& rName,   // Name of 
the label for the page in the notebook .ui
@@ -298,6 +301,7 @@ public:
 const weld::Button* GetUserButton() const { return m_xUserBtn.get(); }
 weld::Button*   GetUserButton() { return m_xUserBtn.get(); }
 voidRemoveResetButton();
+voidRemoveStandardButton();
 
 short   execute();
 static bool runAsync(const std::shared_ptr& 
rController,
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index b5d9634588ef..663a26295453 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -111,7 +111,7 @@ 
SfxManageStyleSheetPage::SfxManageStyleSheetPage(TabPageParent pParent, const Sf
 if ( pStyle->GetName().isEmpty() && pPool )
 {
 // NullString as Name -> generate Name
-OUString aNoName(SfxStyleDialog::GenerateUnusedName(*pPool));
+OUString aNoName(SfxStyleDialogController::GenerateUnusedName(*pPool));
 pStyle->SetName( aNoName );
 aName = aNoName;
 aFollow = pStyle->GetFollow();
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg

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

[Libreoffice Gerrit user]

 include/vcl/dialog.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 07b71a93278f39c3cdac12e18643c70dc5042cdc
Author: Caolán McNamara 
AuthorDate: Wed Aug 29 16:58:07 2018 +0100
Commit: Caolán McNamara 
CommitDate: Thu Aug 30 09:06:49 2018 +0200

the 0 default for EndDialog means RET_CANCEL

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

diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 440aacf479af..984330476a1a 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -164,7 +164,7 @@ public:
 // Dialog::Execute replacement API
 
 
-voidEndDialog( long nResult = 0 );
+voidEndDialog( long nResult = RET_CANCEL );
 static void EndAllDialogs( vcl::Window const * pParent );
 
 // returns the most recent of the currently executing modal dialogs
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits