Re: Unit Test Failure: CppunitTest_cppcanvas_emfplus

[Luke Benes]

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


Thanks Noel!




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

Re: Unit Test Failure: CppunitTest_cppcanvas_emfplus

[Noel Grandin]

should be fixed now with

https://cgit.freedesktop.org/libreoffice/core/commit/?id=4beed2ba7335fdb211aca7f70a144ffecf90a781
​
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: UITest_writerperfect_epubexport hang (only sometimes)

[Noel Grandin]

at the very least we should make that wait command use a timeout, and fail
the test, rather than hanging indefinitely​
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tamás Zolnai]

 editeng/qa/unit/core-test.cxx|  111 +++
 editeng/source/editeng/editeng.cxx   |   14 +++-
 editeng/source/editeng/impedit.hxx   |9 ++
 editeng/source/editeng/impedit2.cxx  |   14 ++--
 editeng/source/editeng/impedit3.cxx  |   12 +++
 editeng/source/outliner/outliner.cxx |   10 +++
 include/editeng/editeng.hxx  |6 +
 include/editeng/outliner.hxx |4 +
 include/svx/svdmodel.hxx |4 +
 sd/qa/unit/data/odp/tdf115639.odp|binary
 sd/qa/unit/data/ppt/tdf115639.ppt|binary
 sd/qa/unit/data/pptx/tdf115639.pptx  |binary
 sd/qa/unit/import-tests.cxx  |   33 ++
 sd/source/ui/docshell/docshel4.cxx   |   16 +
 sd/source/ui/view/Outliner.cxx   |1 
 svx/source/svdraw/svdetc.cxx |1 
 svx/source/svdraw/svdmodel.cxx   |   22 ++
 17 files changed, 245 insertions(+), 12 deletions(-)

New commits:
commit 1da3a3cb74a415a76fa547ef0c8f61780e260e7f
Author: Tamás Zolnai 
Date:   Sat Feb 17 06:35:29 2018 +0100

tdf#115639: Align right/center with trailing spaces the same as MS 
PowerPoint

* Add HoriAlignIgnoreTrailingWhitespace compatibility option.
** For MSO file formats it is set to true
** For ODP format it's set to false by default
** The flag is saved to ODP format as user data if the document
comes from an MSO format.

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

diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 2e122cc59c1d..195fae1bcb4a 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -97,6 +98,9 @@ public:
 
 void testTransliterate();
 
+/// Test HoriAlignIgnoreTrailingWhitespace compatibility flag
+void testHoriAlignIgnoreTrailingWhitespace();
+
 DECL_STATIC_LINK( Test, CalcFieldValueHdl, EditFieldInfo*, void );
 
 CPPUNIT_TEST_SUITE(Test);
@@ -117,6 +121,7 @@ public:
 CPPUNIT_TEST(testSectionAttributes);
 CPPUNIT_TEST(testLargeParaCopyPaste);
 CPPUNIT_TEST(testTransliterate);
+CPPUNIT_TEST(testHoriAlignIgnoreTrailingWhitespace);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1848,6 +1853,112 @@ void Test::testTransliterate()
 CPPUNIT_ASSERT_EQUAL(aExpected, aEditEngine.GetText());
 }
 
+void Test::testHoriAlignIgnoreTrailingWhitespace()
+{
+// Create EditEngine's instance
+EditEngine aEditEngine(mpItemPool);
+
+// Get EditDoc for current EditEngine's instance
+EditDoc &rDoc = aEditEngine.GetEditDoc();
+
+// Initially no text should be there
+CPPUNIT_ASSERT_EQUAL(sal_uLong(0), rDoc.GetTextLen());
+CPPUNIT_ASSERT_EQUAL(OUString(), rDoc.GetParaAsString(sal_Int32(0)));
+
+// Set initial text
+OUString aText = "Some text";
+sal_Int32 aTextLen = aText.getLength();
+aEditEngine.SetText(aText);
+
+// Assert changes - text insertion
+CPPUNIT_ASSERT_EQUAL(static_cast(aTextLen), rDoc.GetTextLen());
+CPPUNIT_ASSERT_EQUAL(aText, 
rDoc.GetParaAsString(static_cast(0)));
+
+// First test case: center alignment with compatibility option enabled
+{
+aEditEngine.SetHoriAlignIgnoreTrailingWhitespace(true);
+std::unique_ptr pSet(new 
SfxItemSet(aEditEngine.GetEmptyItemSet()));
+pSet->Put(SvxAdjustItem( SvxAdjust::Center, EE_PARA_JUST ));
+CPPUNIT_ASSERT_EQUAL(static_cast(1), pSet->Count());
+
+// Select all paragraphs and apply changes
+ESelection aSelection(0, 0, 0, aTextLen);
+aEditEngine.QuickSetAttribs(*pSet, aSelection);
+
+// Use a one line paragraph
+aEditEngine.SetPaperSize(Size(1, 6000));
+CPPUNIT_ASSERT_EQUAL(static_cast(1), 
aEditEngine.GetLineCount(0));
+
+// Check horizontal position
+ParaPortion* pParaPortion = aEditEngine.GetParaPortions()[0];
+EditLine* pLine = &pParaPortion->GetLines()[0];
+CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast(4527), 
pLine->GetStartPosX(), 10);
+}
+
+// Second test case: center alignment with compatibility option disabled
+{
+aEditEngine.SetHoriAlignIgnoreTrailingWhitespace(false);
+std::unique_ptr pSet(new 
SfxItemSet(aEditEngine.GetEmptyItemSet()));
+pSet->Put(SvxAdjustItem( SvxAdjust::Center, EE_PARA_JUST ));
+CPPUNIT_ASSERT_EQUAL(static_cast(1), pSet->Count());
+
+// Select all paragraphs and apply changes
+ESelection aSelection(0, 0, 0, aTextLen);
+aEditEngine.QuickSetAttribs(*pSet, aSelection);
+
+// Use a one line paragraph
+aEditEngine.SetPaperSize(Size(1, 6000));
+CPPUNIT_ASSERT_EQUAL(static_cast(1), 
aEditEngine.GetLineCount(0));
+
+// Check horizontal position
+ParaPortion* pParaPortion = aEditEngine.GetParaPortions()[0];
+EditLin

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

[Noel Grandin]

 include/svx/svdundo.hxx   |   12 +++-
 svx/source/svdraw/svdundo.cxx |   36 ++--
 2 files changed, 21 insertions(+), 27 deletions(-)

New commits:
commit 71545d500e4b88e960a73d499328504ce99397a8
Author: Noel Grandin 
Date:   Mon Feb 5 13:51:25 2018 +0200

loplugin:useuniqueptr in SdrUndoAttrObj

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

diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 9cb4271d0a86..642b67954073 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -144,8 +144,8 @@ protected:
 class SVX_DLLPUBLIC SdrUndoAttrObj : public SdrUndoObj
 {
 protected:
-SfxItemSet* pUndoSet;
-SfxItemSet* pRedoSet;
+std::unique_ptr pUndoSet;
+std::unique_ptr pRedoSet;
 
 // FIXME: Or should we better remember the StyleSheetNames?
 rtl::Reference< SfxStyleSheetBase > mxUndoStyleSheet;
@@ -154,13 +154,15 @@ protected:
 boolbHaveToTakeRedoSet;
 
 // When assigning TextItems to a drawing object with text:
-OutlinerParaObject* pTextUndo;
+std::unique_ptr
+pTextUndo;
 // #i8508#
 // The text rescue mechanism needs also to be implemented for redo actions.
-OutlinerParaObject* pTextRedo;
+std::unique_ptr
+pTextRedo;
 
 // If we have a group object:
-SdrUndoGroup*   pUndoGroup;
+std::unique_ptr pUndoGroup;
 
 // Helper to ensure StyleSheet is in pool (provided by SdrModel from 
SdrObject)
 static void ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool& 
rStyleSheetPool, SfxStyleSheet& rSheet);
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 3f607186f87f..1c6ec236f34b 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -262,14 +262,9 @@ void 
SdrUndoAttrObj::ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool& rSt
 
 SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool 
bSaveText)
 : SdrUndoObj(rNewObj)
-, pUndoSet(nullptr)
-, pRedoSet(nullptr)
 , mxUndoStyleSheet()
 , mxRedoStyleSheet()
 , bHaveToTakeRedoSet(true)
-, pTextUndo(nullptr)
-, pTextRedo(nullptr)
-, pUndoGroup(nullptr)
 {
 bStyleSheet = bStyleSheet1;
 
@@ -280,7 +275,7 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool 
bStyleSheet1, bool bSave
 if(bIsGroup)
 {
 // it's a group object!
-pUndoGroup = new SdrUndoGroup(*pObj->GetModel());
+pUndoGroup.reset( new SdrUndoGroup(*pObj->GetModel()) );
 const size_t nObjCount(pOL->GetObjCount());
 
 for(size_t nObjNum = 0; nObjNum < nObjCount; ++nObjNum)
@@ -292,27 +287,27 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool 
bStyleSheet1, bool bSave
 
 if(!bIsGroup || bIs3DScene)
 {
-pUndoSet = new SfxItemSet(pObj->GetMergedItemSet());
+pUndoSet.reset( new SfxItemSet(pObj->GetMergedItemSet()) );
 
 if(bStyleSheet)
 mxUndoStyleSheet = pObj->GetStyleSheet();
 
 if(bSaveText)
 {
-pTextUndo = pObj->GetOutlinerParaObject();
-if(pTextUndo)
-pTextUndo = new OutlinerParaObject(*pTextUndo);
+auto p = pObj->GetOutlinerParaObject();
+if(p)
+pTextUndo.reset( new OutlinerParaObject(*p) );
 }
 }
 }
 
 SdrUndoAttrObj::~SdrUndoAttrObj()
 {
-delete pUndoSet;
-delete pRedoSet;
-delete pUndoGroup;
-delete pTextUndo;
-delete pTextRedo;
+pUndoSet.reset();
+pRedoSet.reset();
+pUndoGroup.reset();
+pTextUndo.reset();
+pTextRedo.reset();
 }
 
 void SdrUndoAttrObj::Undo()
@@ -329,9 +324,7 @@ void SdrUndoAttrObj::Undo()
 {
 bHaveToTakeRedoSet = false;
 
-delete pRedoSet;
-
-pRedoSet = new SfxItemSet(pObj->GetMergedItemSet());
+pRedoSet.reset( new SfxItemSet(pObj->GetMergedItemSet()) );
 
 if(bStyleSheet)
 mxRedoStyleSheet = pObj->GetStyleSheet();
@@ -339,10 +332,9 @@ void SdrUndoAttrObj::Undo()
 if(pTextUndo)
 {
 // #i8508#
-pTextRedo = pObj->GetOutlinerParaObject();
-
-if(pTextRedo)
-pTextRedo = new OutlinerParaObject(*pTextRedo);
+auto p = pObj->GetOutlinerParaObject();
+if(p)
+pTextRedo.reset( new OutlinerParaObject(*p) );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 svx/source/form/fmexpl.cxx |7 +++
 svx/source/inc/fmexpl.hxx  |5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d4be0bfedf8497ad3b4244aeeb0b761b5c6b128b
Author: Noel Grandin 
Date:   Tue Feb 6 11:40:14 2018 +0200

loplugin:useuniqueptr in FmEntryData

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

diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 96166a275440..9e96bd6db2d5 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -176,7 +176,7 @@ void FmEntryDataList::clear()
 FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< 
XInterface >& _rxIFace )
 :pParent( pParentData )
 {
-pChildList = new FmEntryDataList();
+pChildList.reset( new FmEntryDataList() );
 
 newObject( _rxIFace );
 }
@@ -184,8 +184,7 @@ FmEntryData::FmEntryData( FmEntryData* pParentData, const 
Reference< XInterface
 
 FmEntryData::~FmEntryData()
 {
-GetChildList()->clear();
-delete pChildList;
+pChildList->clear();
 }
 
 
@@ -200,7 +199,7 @@ void FmEntryData::newObject( const css::uno::Reference< 
css::uno::XInterface >&
 
 FmEntryData::FmEntryData( const FmEntryData& rEntryData )
 {
-pChildList = new FmEntryDataList();
+pChildList.reset( new FmEntryDataList() );
 aText = rEntryData.GetText();
 m_aNormalImage = rEntryData.GetNormalImage();
 pParent = rEntryData.GetParent();
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index a089f10f015d..76142653fe7a 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -144,7 +144,8 @@ protected:
 Image   m_aNormalImage;
 OUStringaText;
 
-FmEntryDataList*pChildList;
+std::unique_ptr
+pChildList;
 FmEntryData*pParent;
 
 protected:
@@ -163,7 +164,7 @@ public:
 
 const OUString& GetText() const { return aText; }
 FmEntryData*GetParent() const { return pParent; }
-FmEntryDataList* GetChildList() const { return pChildList; }
+FmEntryDataList* GetChildList() const { return pChildList.get(); }
 
 virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData );
 virtual FmEntryData* Clone() = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sc/source/core/data/documen3.cxx   |   16 +--
 sc/source/core/data/dpoutput.cxx   |   24 ++---
 sc/source/core/data/drwlayer.cxx   |   50 +-
 sc/source/core/data/postit.cxx |4 
 sc/source/core/tool/detfunc.cxx|   22 ++--
 sc/source/core/tool/editutil.cxx   |6 -
 sc/source/filter/excel/xiescher.cxx|   16 +--
 sc/source/filter/html/htmlexp2.cxx |4 
 sc/source/filter/html/htmlimp.cxx  |4 
 sc/source/filter/rtf/eeimpars.cxx  |   12 +-
 sc/source/ui/app/client.cxx|   16 +--
 sc/source/ui/app/inputhdl.cxx  |2 
 sc/source/ui/app/inputwin.cxx  |8 -
 sc/source/ui/cctrl/cbuttonw.cxx|   14 +-
 sc/source/ui/cctrl/checklistmenu.cxx   |   36 +++
 sc/source/ui/cctrl/dpcontrol.cxx   |2 
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx|   22 ++--
 sc/source/ui/condformat/condformatdlg.cxx  |4 
 sc/source/ui/drawfunc/fuins1.cxx   |4 
 sc/source/ui/drawfunc/fuins2.cxx   |2 
 sc/source/ui/miscdlgs/anyrefdg.cxx |6 -
 sc/source/ui/miscdlgs/autofmt.cxx  |   16 +--
 sc/source/ui/miscdlgs/solveroptions.cxx|2 
 sc/source/ui/namedlg/namemgrtable.cxx  |2 
 sc/source/ui/navipi/scenwnd.cxx|2 
 sc/source/ui/sidebar/CellLineStyleValueSet.cxx |4 
 sc/source/ui/unoobj/viewuno.cxx|2 
 sc/source/ui/view/gridwin.cxx  |   76 
 sc/source/ui/view/gridwin4.cxx |   40 
 sc/source/ui/view/gridwin5.cxx |4 
 sc/source/ui/view/hdrcont.cxx  |   22 ++--
 sc/source/ui/view/hintwin.cxx  |2 
 sc/source/ui/view/notemark.cxx |8 -
 sc/source/ui/view/output.cxx   |   22 ++--
 sc/source/ui/view/output2.cxx  |  118 -
 sc/source/ui/view/output3.cxx  |   16 +--
 sc/source/ui/view/preview.cxx  |   20 ++--
 sc/source/ui/view/prevwsh.cxx  |   24 ++---
 sc/source/ui/view/printfun.cxx |   58 ++--
 sc/source/ui/view/tabview.cxx  |   18 +--
 sc/source/ui/view/tabview2.cxx |   12 +-
 sc/source/ui/view/tabview3.cxx |   28 ++---
 sc/source/ui/view/tabview4.cxx |6 -
 sc/source/ui/view/tabview5.cxx |   10 +-
 sc/source/ui/view/tabvwsh2.cxx |4 
 sc/source/ui/view/tabvwsh4.cxx |   12 +-
 sc/source/ui/view/tabvwshb.cxx |4 
 sc/source/ui/view/tabvwshg.cxx |2 
 sc/source/ui/view/viewdata.cxx |   18 +--
 sc/source/ui/view/viewfun5.cxx |8 -
 sc/source/ui/view/viewfun7.cxx |   12 +-
 51 files changed, 421 insertions(+), 425 deletions(-)

New commits:
commit e2e4798b35ecd33a09dda85c575d7a7709ab9414
Author: Noel Grandin 
Date:   Fri Feb 16 10:23:51 2018 +0200

Revert "loplugin:changetoolsgen in sc" and reapply plugin

because I
(a) forgot to insert parentheses which changes the meaning of some 
expressions and
(b) I now use the AdjustFoo calls when changing unary operations, which 
reads much better
This reverts commit 95fab7cbf2f0576d0f728bed8898b7ff769d90e6.

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

diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 12a8a525e785..8f37ada3dcbb 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1698,13 +1698,13 @@ tools::Rectangle ScDocument::GetEmbeddedRect() const // 
1/100 mm
 SCCOL i;
 
 for (i=0; iGetColWidth(i) );
-aRect.SetTop( aRect.Top() + pTable->GetRowHeight( 0, 
aEmbedRange.aStart.Row() - 1) );
+aRect.AdjustLeft(pTable->GetColWidth(i) );
+aRect.AdjustTop(pTable->GetRowHeight( 0, aEmbedRange.aStart.Row() - 1) 
);
 aRect.SetRight( aRect.Left() );
 for (i=aEmbedRange.aStart.Col(); i<=aEmbedRange.aEnd.Col(); i++)
-aRect.SetRight( aRect.Right() + pTable->GetColWidth(i) );
+aRect.AdjustRight(pTable->GetColWidth(i) );
 aRect.SetBottom( aRect.Top() );
-aRect.SetBottom( aRect.Bottom() + pTable->GetRowHeight( 
aEmbedRange.aStart.Row(), aEmbedRange.aEnd.Row()) );
+aRect.AdjustBottom(pTable->GetRowHeight( aEmbedRange.aStart.Row(), 
aEmbedRange.aEnd.Row()) );
 
 aRect.SetLeft( static_cast( aRect.Left()   * HMM_PER_TWIPS ) );
 aRect.SetRight( static_cast( aRect.Right()  * HMM_PER_TWIPS ) );
@@ -1970,15 +1970,15 @@ tools::Rectangle ScDocument::GetMMRect( SCCOL 

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

[Noel Grandin]

 include/svx/fmgridif.hxx  |3 
 lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx |   68 ++
 lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx |7 -
 lingucomponent/source/thesaurus/libnth/nthesimp.cxx   |   83 --
 lingucomponent/source/thesaurus/libnth/nthesimp.hxx   |   17 ++-
 svx/source/fmcomp/fmgridif.cxx|7 -
 6 files changed, 66 insertions(+), 119 deletions(-)

New commits:
commit 794066fa1ac67b6e352c17e78245a2698b0c470b
Author: Noel Grandin 
Date:   Tue Feb 6 11:38:34 2018 +0200

loplugin:useuniqueptr in FmXGridPeer

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

diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index 5aa857005c69..fbec6ea6435f 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class DbGridColumn;
 enum class DbGridControlNavigationBarState;
@@ -359,7 +360,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FmXGridPeer:
 
 class GridListenerDelegator;
 friend class GridListenerDelegator;
-GridListenerDelegator*  m_pGridListener;
+std::unique_ptr  m_pGridListener;
 
 protected:
 css::uno::Reference< css::uno::XComponentContext >m_xContext;
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 31280a401825..262d4d47f5bc 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1041,11 +1041,10 @@ FmXGridPeer::FmXGridPeer(const Reference< 
XComponentContext >& _rxContext)
 ,m_bInterceptingDispatch(false)
 ,m_pStateCache(nullptr)
 ,m_pDispatchers(nullptr)
-,m_pGridListener(nullptr)
 ,m_xContext(_rxContext)
 {
 // Create must be called after this constructor
-m_pGridListener = new GridListenerDelegator( this );
+m_pGridListener.reset( new GridListenerDelegator( this ) );
 }
 
 
@@ -1064,7 +1063,7 @@ void FmXGridPeer::Create(vcl::Window* pParent, WinBits 
nStyle)
 pWin->SetSlotExecutor(LINK(this, FmXGridPeer, OnExecuteGridSlot));
 
 // want to hear about row selections
-pWin->setGridListener( m_pGridListener );
+pWin->setGridListener( m_pGridListener.get() );
 
 // Init must always be called
 pWin->Init();
@@ -1078,8 +1077,6 @@ FmXGridPeer::~FmXGridPeer()
 {
 setRowSet(Reference< XRowSet > ());
 setColumns(Reference< XIndexContainer > ());
-
-delete m_pGridListener;
 }
 
 namespace
commit c503df794f942488840ac2d69e61895e42a35b2a
Author: Noel Grandin 
Date:   Tue Feb 6 11:35:31 2018 +0200

loplugin:useuniqueptr in Hyphenator

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

diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx 
b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index 4da78de3995b..8f9480e3ff0f 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -64,28 +64,19 @@ Hyphenator::Hyphenator() :
 aEvtListeners   ( GetLinguMutex() )
 {
 bDisposing = false;
-pPropHelper = nullptr;
-aDicts = nullptr;
-numdict = 0;
 }
 
 Hyphenator::~Hyphenator()
 {
-if (numdict && aDicts)
+for (auto & rInfo : mvDicts)
 {
-for (int i=0; i < numdict; ++i)
-{
-delete aDicts[i].apCC;
-if (aDicts[i].aPtr)
-hnj_hyphen_free(aDicts[i].aPtr);
-}
+if (rInfo.aPtr)
+hnj_hyphen_free(rInfo.aPtr);
 }
-delete[] aDicts;
 
 if (pPropHelper)
 {
 pPropHelper->RemoveAsPropListener();
-delete pPropHelper;
 }
 }
 
@@ -95,7 +86,7 @@ PropertyHelper_Hyphenation& Hyphenator::GetPropHelper_Impl()
 {
 Reference< XLinguProperties >   xPropSet( GetLinguProperties(), 
UNO_QUERY );
 
-pPropHelper = new PropertyHelper_Hyphenation (static_cast(this), xPropSet );
+pPropHelper.reset( new PropertyHelper_Hyphenation 
(static_cast(this), xPropSet ) );
 pPropHelper->AddAsPropListener();   //! after a reference is 
established
 }
 return *pPropHelper;
@@ -107,7 +98,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
 
 // this routine should return the locales supported by the installed
 // dictionaries.
-if (!numdict)
+if (!mvDicts.size())
 {
 SvtLinguConfig aLinguCfg;
 
@@ -137,7 +128,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
 // is not yet supported by the list od new style dictionaries
 MergeNewStyleDicsAndOldStyleDics( aDics, aOldStyleDics );
 
-numdict = aDics.size();
+sal_Int32 numdict = aDics.size();
 if (numdict)
 {
 // ge

[Libreoffice-commits] core.git: 3 commits - hwpfilter/source lingucomponent/source scaddins/source

[Noel Grandin]

 hwpfilter/source/hfont.cxx   |   13 -
 hwpfilter/source/hfont.h |3 ++-
 lingucomponent/source/spellcheck/spell/sspellimp.cxx |9 +++--
 lingucomponent/source/spellcheck/spell/sspellimp.hxx |2 +-
 scaddins/source/analysis/analysis.cxx|   13 -
 scaddins/source/analysis/analysis.hxx|6 +++---
 scaddins/source/pricing/pricing.cxx  |   15 +++
 scaddins/source/pricing/pricing.hxx  |5 +++--
 8 files changed, 23 insertions(+), 43 deletions(-)

New commits:
commit 35ba29e093d41ce88a827ab145ba8df09ff0ee2f
Author: Noel Grandin 
Date:   Tue Feb 6 10:49:49 2018 +0200

loplugin:useuniqueptr in SpellChecker

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

diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 12b9e240fa24..db6c183a8cef 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -72,7 +72,6 @@ using namespace linguistic;
 
 SpellChecker::SpellChecker() :
 m_aEvtListeners(GetLinguMutex()),
-m_pPropHelper(nullptr),
 m_bDisposing(false)
 {
 }
@@ -87,7 +86,6 @@ SpellChecker::~SpellChecker()
 if (m_pPropHelper)
 {
 m_pPropHelper->RemoveAsPropListener();
-delete m_pPropHelper;
 }
 }
 
@@ -97,7 +95,7 @@ PropertyHelper_Spelling & SpellChecker::GetPropHelper_Impl()
 {
 Reference< XLinguProperties >   xPropSet( GetLinguProperties(), 
UNO_QUERY );
 
-m_pPropHelper = new PropertyHelper_Spelling( static_cast(this), xPropSet );
+m_pPropHelper.reset( new PropertyHelper_Spelling( 
static_cast(this), xPropSet ) );
 m_pPropHelper->AddAsPropListener();   //! after a reference is 
established
 }
 return *m_pPropHelper;
@@ -577,7 +575,7 @@ void SAL_CALL SpellChecker::initialize( const Sequence< Any 
>& rArguments )
 //! And the reference to the UNO-functions while increasing
 //! the ref-count and will implicitly free the memory
 //! when the object is no longer used.
-m_pPropHelper = new PropertyHelper_Spelling( 
static_cast(this), xPropSet );
+m_pPropHelper.reset( new PropertyHelper_Spelling( 
static_cast(this), xPropSet ) );
 m_pPropHelper->AddAsPropListener();   //! after a reference is 
established
 }
 else {
@@ -598,8 +596,7 @@ void SAL_CALL SpellChecker::dispose()
 if (m_pPropHelper)
 {
 m_pPropHelper->RemoveAsPropListener();
-delete m_pPropHelper;
-m_pPropHelper = nullptr;
+m_pPropHelper.reset();
 }
 }
 }
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index d8e5581463da..82ddbedf0af3 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -69,7 +69,7 @@ class SpellChecker :
 Sequence< Locale > m_aSuppLocales;
 
 ::comphelper::OInterfaceContainerHelper2   m_aEvtListeners;
-linguistic::PropertyHelper_Spelling*m_pPropHelper;
+std::unique_ptr m_pPropHelper;
 boolm_bDisposing;
 
 SpellChecker(const SpellChecker &) = delete;
commit cc85db4c4e2ca9ef8e1c9fc0af6d314767678faa
Author: Noel Grandin 
Date:   Tue Feb 6 10:42:23 2018 +0200

loplugin:useuniqueptr in scaddins

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

diff --git a/scaddins/source/analysis/analysis.cxx 
b/scaddins/source/analysis/analysis.cxx
index 6c6a94afdb42..34414abd0f50 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -73,12 +73,10 @@ void AnalysisAddIn::InitData()
 {
 aResLocale = Translate::Create("sca", LanguageTag(aFuncLoc));
 
-delete pFD;
-pFD = new FuncDataList;
+pFD.reset(new FuncDataList);
 InitFuncDataList(*pFD);
 
-delete pDefLocales;
-pDefLocales = nullptr;
+pDefLocales.reset();
 }
 
 AnalysisAddIn::AnalysisAddIn( const uno::Reference< uno::XComponentContext >& 
xContext ) :
@@ -92,9 +90,6 @@ AnalysisAddIn::AnalysisAddIn( const uno::Reference< 
uno::XComponentContext >& xC
 
 AnalysisAddIn::~AnalysisAddIn()
 {
-delete pCDL;
-delete pFD;
-delete[] pDefLocales;
 }
 
 sal_Int32 AnalysisAddIn::getDateMode(
@@ -337,7 +332,7 @@ static const sal_uInt32 nNumOfLoc = 
SAL_N_ELEMENTS(pLang);
 
 void AnalysisAddIn::InitDefLocales()
 {
-pDefLocales = new lang::Locale[ nNumOfLoc ];
+pDefLocales.reset( new lang::Locale[ nNumOfLoc

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

[Szymon Kłos]

 sd/qa/unit/export-tests-ooxml2.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 7a510effa4566d405d2033b6635b42c08d34dec8
Author: Szymon Kłos 
Date:   Fri Feb 16 22:13:49 2018 +0100

Fix fontScale test

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

diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index 51e13eb80a5e..9fc5302f0325 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -1415,7 +1415,10 @@ void SdOOXMLExportTest2::testFontScale()
 xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
 xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
 
-assertXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:bodyPr/a:normAutofit", "fontScale", 
"73000");
+// Rounding errors possible, approximate value
+OUString sScale = getXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:bodyPr/a:normAutofit", "fontScale");
+if (sScale != "73000" && sScale != "72000" && sScale != "74000")
+CPPUNIT_ASSERT_EQUAL(OUString("73000"), sScale);
 
 xDocShRef->DoClose();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Unit Test Failure: CppunitTest_cppcanvas_emfplus

[Luke Benes]

After 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=0d9f3f7628f88fa66aaeea1f7148db620e17e728

I'm seeing the following Unit Test Failure under Arch with both gcc and clang:

[CUT] cppcanvas_emfplus
[DEP] LNK:CppunitTest/libtest_sd_import_tests.so
[LNK] CppunitTest/libtest_sd_import_tests.so
/core/cppcanvas/qa/extras/emfplus/emfplus.cxx:84:Test::testFdo77229
equality assertion failed
- Expected: 
- Actual  : �

Test::testFdo77229 finished in: 1885ms
emfplus.cxx:84:Assertion
Test name: Test::testFdo77229
equality assertion failed
- Expected: 
- Actual  : �

Failures !!!
Run: 1   Failure total: 1   Failures: 1   Errors: 0

Error: a unit test failed, please do one of:

make CppunitTest_cppcanvas_emfplus CPPUNITTRACE="gdb --args"
# for interactive debugging on Linux
make CppunitTest_cppcanvas_emfplus VALGRIND=memcheck
# for memory checking
make CppunitTest_cppcanvas_emfplus DEBUGCPPUNIT=TRUE
# for exception catching

You can limit the execution to just one particular test by:

make CPPUNIT_TEST_NAME="testXYZ" ...above mentioned params...

make[1]: *** [/core/solenv/gbuild/CppunitTest.mk:115: 
/core/workdir/CppunitTest/cppcanvas_emfplus.test] Error 1
make[1]: *** Waiting for unfinished jobs
make: *** [Makefile:280: build] Error 2

Noel,
Any idea why that change may have caused this regression? 



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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - helpcontent2

[Olivier Hallot]

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

New commits:
commit 82bbb94dea3291d740ee4b0bb4b3c331f3e2a45b
Author: Olivier Hallot 
Date:   Thu Jan 4 07:08:56 2018 -0200

Updated core
Project: help  c084a6cc7a44ecd652b78351a35dd5c3ae9624f1

Fix some help page contents

Change-Id: Ida1bfdaf86690a95df3949b5287dc0b10223e907
Reviewed-on: https://gerrit.libreoffice.org/47371
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
(cherry picked from commit 9219a96f5e75fc59492259f354051ce980697c95)
Reviewed-on: https://gerrit.libreoffice.org/47384

diff --git a/helpcontent2 b/helpcontent2
index 6d883096dc27..c084a6cc7a44 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6d883096dc275e1b384ed9ad08fd9ab4ad26bb3f
+Subproject commit c084a6cc7a44ecd652b78351a35dd5c3ae9624f1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-0' - source/text

[Olivier Hallot]

 source/text/shared/01/01060001.xhp |2 +-
 source/text/shared/01/01060002.xhp |2 +-
 source/text/shared/02/2005.xhp |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c084a6cc7a44ecd652b78351a35dd5c3ae9624f1
Author: Olivier Hallot 
Date:   Thu Jan 4 07:08:56 2018 -0200

Fix some help page contents

Change-Id: Ida1bfdaf86690a95df3949b5287dc0b10223e907
Reviewed-on: https://gerrit.libreoffice.org/47371
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
(cherry picked from commit 9219a96f5e75fc59492259f354051ce980697c95)
Reviewed-on: https://gerrit.libreoffice.org/47384

diff --git a/source/text/shared/01/01060001.xhp 
b/source/text/shared/01/01060001.xhp
index c3fe8e397..40d9f2b03 100644
--- a/source/text/shared/01/01060001.xhp
+++ b/source/text/shared/01/01060001.xhp
@@ -30,7 +30,7 @@
 Long click on the Save icon and select Save 
Remote Files...
 
 
-A 
remote file server is web service that stores documents with or without 
check-in, check-out, version controls and backups.
+A 
remote file server is a web service that stores documents with or without 
check-in, check-out, version controls and backups.
 
 Opening and saving files in remote servers
 
diff --git a/source/text/shared/01/01060002.xhp 
b/source/text/shared/01/01060002.xhp
index 1d2ed50cc..1d6c032c7 100644
--- a/source/text/shared/01/01060002.xhp
+++ b/source/text/shared/01/01060002.xhp
@@ -28,7 +28,7 @@
 
 Choose File - Save a 
Copy
 
-Creates another file with same contents of the current file. 
The current file is kept opened for edition.
+Creates another file with same contents of the current file. 
The current file is kept open for editing.
 
 Save
 Save 
as
diff --git a/source/text/shared/02/2005.xhp 
b/source/text/shared/02/2005.xhp
index b79d80a58..4d76be719 100644
--- a/source/text/shared/02/2005.xhp
+++ b/source/text/shared/02/2005.xhp
@@ -67,7 +67,7 @@
 Extending selection (F8)
 
 
-By using the arrow keys or the Home and End keys you can 
extend or crop the current selection. Clicking into the text selects the text 
between the current cursor position and the click position. You also can use 
(with or without Shift key) the arrow keys and the 
keys Home and End to 
increase or decrease the current selection.
+By using the arrow keys or the Home and End keys you can 
extend or crop the current selection. Clicking into the text selects the text 
between the current cursor position and the click position.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/qa/unit/data/xml/named-exp-global.xml |   92 +
 sc/qa/unit/data/xml/named-exp-local.xml  |  131 +++
 sc/qa/unit/subsequent_filters-test.cxx   |   45 ++
 3 files changed, 268 insertions(+)

New commits:
commit 05986e7f98ea1c0bd8092500968774ef3f6bcef4
Author: Kohei Yoshida 
Date:   Fri Feb 16 16:37:31 2018 -0500

Add a test case for global and sheet-local named expressions.

Change-Id: I44247b55f3541214b515378744ee2c1982051e27
Reviewed-on: https://gerrit.libreoffice.org/49882
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/sc/qa/unit/data/xml/named-exp-global.xml 
b/sc/qa/unit/data/xml/named-exp-global.xml
new file mode 100644
index ..151ed7037e02
--- /dev/null
+++ b/sc/qa/unit/data/xml/named-exp-global.xml
@@ -0,0 +1,92 @@
+
+
+http://www.w3.org/TR/REC-html40";>
+ 
+  Kohei Yoshida
+  Kohei Yoshida
+  2016-12-17T20:46:03Z
+  2016-12-17T20:49:13Z
+  15.00
+ 
+ 
+  
+ 
+ 
+  14385
+  24000
+  0
+  0
+  
+  False
+  False
+ 
+ 
+  
+   
+   
+   
+   
+   
+   
+  
+ 
+ 
+  
+  
+ 
+ 
+  
+   
+1
+6
+   
+   
+2
+7
+   
+   
+3
+8
+   
+   
+4
+9
+   
+   
+5
+10
+   
+   
+15
+55
+   
+  
+  
+   
+
+
+
+   
+   
+   
+
+ 3
+ 6
+ 1
+
+   
+   False
+   False
+  
+ 
+
diff --git a/sc/qa/unit/data/xml/named-exp-local.xml 
b/sc/qa/unit/data/xml/named-exp-local.xml
new file mode 100644
index ..46f110bf3da7
--- /dev/null
+++ b/sc/qa/unit/data/xml/named-exp-local.xml
@@ -0,0 +1,131 @@
+
+
+http://www.w3.org/TR/REC-html40";>
+ 
+  Kohei Yoshida
+  Kohei Yoshida
+  2017-02-08T02:38:34Z
+  2017-02-08T02:41:56Z
+  15.00
+ 
+ 
+  
+ 
+ 
+  14385
+  24000
+  0
+  0
+  False
+  False
+ 
+ 
+  
+   
+   
+   
+   
+   
+   
+  
+ 
+ 
+  
+   
+  
+  
+   
+1
+6
+   
+   
+2
+7
+   
+   
+3
+8
+   
+   
+4
+9
+   
+   
+5
+10
+   
+   
+27
+   
+  
+  
+   
+
+
+
+   
+   
+   
+   
+
+ 3
+ 6
+
+   
+   False
+   False
+  
+ 
+ 
+  
+   
+  
+  
+   
+10
+20
+   
+   
+11
+21
+   
+   
+12
+22
+   
+   
+13
+23
+   
+   
+14
+24
+   
+   
+74
+   
+  
+  
+   
+
+
+
+   
+   
+   
+
+ 3
+ 6
+
+   
+   False
+   False
+  
+ 
+
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 5eb5303b397f..f93af35a0aab 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -237,6 +237,7 @@ public:
 
 void testMergedCellsXLSXML();
 void testBackgroundColorStandardXLSXML();
+void testNamedExpressionsXLSXML();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testBooleanFormatXLSX);
@@ -361,6 +362,7 @@ public:
 #endif
 CPPUNIT_TEST(testMergedCellsXLSXML);
 CPPUNIT_TEST(testBackgroundColorStandardXLSXML);
+CPPUNIT_TEST(testNamedExpressionsXLSXML);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -3584,6 +3586,49 @@ void ScFiltersTest::testBackgroundColorStandardXLSXML()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testNamedExpressionsXLSXML()
+{
+{
+// global named expressions
+
+ScDocShellRef xDocSh = loadDoc("named-exp-global.", FORMAT_XLS_XML);
+CPPUNIT_ASSERT_MESSAGE("Failed to load named-exp-global.xml", 
xDocSh.is());
+ScDocument& rDoc = xDocSh->GetDocument();
+
+// A7
+ScAddress aPos(0,6,0);
+CPPUNIT_ASSERT_EQUAL(15.0, rDoc.GetValue(aPos));
+ASSERT_FORMULA_EQUAL(rDoc, aPos, "SUM(MyRange)", nullptr);
+
+// B7
+aPos.IncCol();
+CPPUNIT_ASSERT_EQUAL(55.0, rDoc.GetValue(aPos));
+ASSERT_FORMULA_EQUAL(rDoc, aPos, "SUM(MyRange2)", nullptr);
+
+xDocSh->DoClose();
+}
+
+{
+// sheet-local named expressions
+
+ScDocShellRef xDocSh = loadDoc("named-exp-local.", FORMAT_XLS_XML);
+CPPUNIT_ASSERT_MESSAGE("Failed to load named-exp-local.xml", 
xDocSh.is());
+ScDocument& rDoc = xDocSh->GetDocument();
+
+// A7 on Sheet1
+ScAddress aPos(0,6,0);
+CPPUNIT_ASSERT_EQUAL(27.0, rDoc.GetValue(aPos));
+ASSERT_FORMULA_EQUAL(rDoc, aPos, "SUM(MyRange)", nullptr);
+
+// A7 on Sheet2
+aPos.IncTab();
+CPPUNIT_ASSERT_EQUAL(74.0, rDoc.GetValue(aPos));
+ASSERT_FORMULA_EQUAL(rDoc, aPos, "SUM(MyRange)", nullptr);
+
+xDocSh->DoClose();
+}
+}
+
 void ScFiltersTest::testCondFormatXLSB()
 {
 ScDocShellRef xDocSh = loadDoc("cond_format.", FORMAT_XLSB);
__