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

[Libreoffice Gerrit user]

 sw/source/uibase/inc/unomod.hxx |2 +-
 sw/source/uibase/uno/unomod.cxx |5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 187f29dfc8f03565b277ee163186a46a0b8ef0c5
Author: Noel Grandin 
AuthorDate: Tue Jul 24 12:45:00 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 25 08:47:51 2018 +0200

loplugin:useuniqueptr in SwXViewSettings

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

diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index 3bdba7867954..5f385aaffbf1 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.hxx
@@ -102,7 +102,7 @@ class SwXViewSettings final : public 
comphelper::ChainablePropertySet
 friend class SwXDocumentSettings;
 
 SwView* pView;
-SwViewOption*   mpViewOption;
+std::unique_ptr mpViewOption;
 const SwViewOption* mpConstViewOption;
 boolbObjectValid:1, mbApplyZoom;
 
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index f2a5456a4aa4..ff5ff9a0fd5c 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -552,7 +552,7 @@ void SwXViewSettings::_preSetValues ()
 else
 pVOpt = SW_MOD()->GetViewOption(false);
 
-mpViewOption = new SwViewOption (*pVOpt);
+mpViewOption.reset( new SwViewOption (*pVOpt) );
 mbApplyZoom = false;
 if(pView)
 mpViewOption->SetStarOneSetting(true);
@@ -782,8 +782,7 @@ void SwXViewSettings::_postSetValues()
 SW_MOD()->ApplyUsrPref( *mpViewOption, pView, pView ? 
SvViewOpt::DestViewOnly
   : SvViewOpt::DestText );
 
-delete mpViewOption;
-mpViewOption = nullptr;
+mpViewOption.reset();
 }
 
 void SwXViewSettings::_preGetValues ()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/uibase/inc/srcview.hxx|2 +-
 sw/source/uibase/inc/uivwimp.hxx|6 +++---
 sw/source/uibase/uiview/srcview.cxx |9 -
 sw/source/uibase/uiview/uivwimp.cxx |   10 --
 4 files changed, 12 insertions(+), 15 deletions(-)

New commits:
commit 36f8b5ec35440fa0b1dadadf28ce9d1a83f8dc50
Author: Noel Grandin 
AuthorDate: Tue Jul 24 11:31:56 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 25 08:47:37 2018 +0200

loplugin:useuniqueptr in SwSrcView

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

diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx
index 298983510f4d..60b866371352 100644
--- a/sw/source/uibase/inc/srcview.hxx
+++ b/sw/source/uibase/inc/srcview.hxx
@@ -34,7 +34,7 @@ class SwSrcView: public SfxViewShell
 {
 VclPtr aEditWin;
 
-SvxSearchItem*  pSearchItem;
+std::unique_ptr pSearchItem;
 
 boolbSourceSaved:1;
 rtl_TextEncodingeLoadEncoding;
diff --git a/sw/source/uibase/uiview/srcview.cxx 
b/sw/source/uibase/uiview/srcview.cxx
index 5aefb75da632..7160f1ec66cb 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -234,7 +234,7 @@ SwSrcView::~SwSrcView()
 pDocShell->SetAutoLoad(INetURLObject(url), delay,
 (delay != 0) || !url.isEmpty());
 EndListening(*pDocShell);
-delete pSearchItem;
+pSearchItem.reset();
 
 aEditWin.disposeAndClear();
 }
@@ -548,15 +548,14 @@ SvxSearchItem* SwSrcView::GetSearchItem()
 {
 if(!pSearchItem)
 {
-pSearchItem = new SvxSearchItem(SID_SEARCH_ITEM);
+pSearchItem.reset(new SvxSearchItem(SID_SEARCH_ITEM));
 }
-return pSearchItem;
+return pSearchItem.get();
 }
 
 void SwSrcView::SetSearchItem( const SvxSearchItem& rItem )
 {
-delete pSearchItem;
-pSearchItem = static_cast(rItem.Clone());
+pSearchItem.reset(static_cast(rItem.Clone()));
 }
 
 void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
commit 97c993b681bb059d1974b29ade5b433f93a85e46
Author: Noel Grandin 
AuthorDate: Tue Jul 24 11:30:09 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 25 08:47:22 2018 +0200

loplugin:useuniqueptr in SwView_Impl

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

diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index 46b627c518b7..67c90d732ea9 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -104,8 +104,8 @@ class SwView_Impl
 std::shared_ptr
 xConfigItem;
 
-sfx2::DocumentInserter* m_pDocInserter;
-SfxRequest* m_pRequest;
+std::unique_ptr m_pDocInserter;
+std::unique_ptr m_pRequest;
 sal_Int16   m_nParam;
 
 Point   m_aEditingPosition;
@@ -162,7 +162,7 @@ public:
 SfxMedium*  CreateMedium();
 voidInitRequest( const SfxRequest& rRequest );
 
-SfxRequest*  GetRequest() const { return m_pRequest; }
+SfxRequest*  GetRequest() const { return m_pRequest.get(); }
 sal_Int16GetParam() const { return m_nParam; }
 void SetParam( sal_Int16 nParam ) { m_nParam = nParam; }
 };
diff --git a/sw/source/uibase/uiview/uivwimp.cxx 
b/sw/source/uibase/uiview/uivwimp.cxx
index 70d688111a4b..f626480715e1 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -87,8 +87,8 @@ SwView_Impl::~SwView_Impl()
 #if HAVE_FEATURE_DBCONNECTIVITY
 xConfigItem.reset();
 #endif
-delete m_pDocInserter;
-delete m_pRequest;
+m_pDocInserter.reset();
+m_pRequest.reset();
 }
 
 void SwView_Impl::SetShellMode(ShellMode eSet)
@@ -261,8 +261,7 @@ void SwView_Impl::StartDocumentInserter(
 break;
 }
 
-delete m_pDocInserter;
-m_pDocInserter = new ::sfx2::DocumentInserter(pView->GetFrameWeld(), 
rFactory, mode);
+m_pDocInserter.reset(new ::sfx2::DocumentInserter(pView->GetFrameWeld(), 
rFactory, mode));
 m_pDocInserter->StartExecuteModal( rEndDialogHdl );
 }
 
@@ -273,8 +272,7 @@ SfxMedium* SwView_Impl::CreateMedium()
 
 void SwView_Impl::InitRequest( const SfxRequest& rRequest )
 {
-delete m_pRequest;
-m_pRequest = new SfxRequest( rRequest );
+m_pRequest.reset(new SfxRequest( rRequest ));
 }
 
 SwScannerEventListener::~SwScannerEventListener()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/uibase/inc/inputwin.hxx|2 +-
 sw/source/uibase/inc/redlndlg.hxx|4 ++--
 sw/source/uibase/misc/redlndlg.cxx   |9 -
 sw/source/uibase/ribbar/inputwin.cxx |4 ++--
 sw/source/uibase/shells/textsh.cxx   |2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit cc60fd2285515b17b893ab4c106f5b060cf31a38
Author: Noel Grandin 
AuthorDate: Tue Jul 24 11:27:58 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 25 08:47:06 2018 +0200

loplugin:useuniqueptr in SwModelessRedlineAcceptDlg

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

diff --git a/sw/source/uibase/inc/redlndlg.hxx 
b/sw/source/uibase/inc/redlndlg.hxx
index a0ddb69ba3a3..2e3e34aa87fa 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -136,7 +136,7 @@ public:
 
 class SwModelessRedlineAcceptDlg : public SfxModelessDialog
 {
-SwRedlineAcceptDlg* pImplDlg;
+std::unique_ptr pImplDlg;
 SwChildWinWrapper*  pChildWin;
 
 public:
@@ -165,7 +165,7 @@ public:
 /// Redline (Manage Changes) panel for the sidebar.
 class SwRedlineAcceptPanel : public PanelLayout, public SfxListener
 {
-SwRedlineAcceptDlg* mpImplDlg;
+std::unique_ptr mpImplDlg;
 public:
 SwRedlineAcceptPanel(vcl::Window* pParent, const 
css::uno::Reference& rFrame);
 virtual ~SwRedlineAcceptPanel() override;
diff --git a/sw/source/uibase/misc/redlndlg.cxx 
b/sw/source/uibase/misc/redlndlg.cxx
index b8590f525b7d..90a96f5ed56d 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -86,7 +86,7 @@ SwModelessRedlineAcceptDlg::SwModelessRedlineAcceptDlg(
 "AcceptRejectChangesDialog", "svx/ui/acceptrejectchangesdialog.ui")
 , pChildWin   (pChild)
 {
-pImplDlg = new SwRedlineAcceptDlg(this, this, get_content_area());
+pImplDlg.reset(new SwRedlineAcceptDlg(this, this, get_content_area()));
 }
 
 void SwModelessRedlineAcceptDlg::Activate()
@@ -142,7 +142,7 @@ SwModelessRedlineAcceptDlg::~SwModelessRedlineAcceptDlg()
 
 void SwModelessRedlineAcceptDlg::dispose()
 {
-delete pImplDlg;
+pImplDlg.reset();
 SfxModelessDialog::dispose();
 }
 
@@ -1205,7 +1205,7 @@ void SwRedlineAcceptDlg::FillInfo(OUString &rExtraData) 
const
 SwRedlineAcceptPanel::SwRedlineAcceptPanel(vcl::Window* pParent, const 
css::uno::Reference& rFrame)
 : PanelLayout(pParent, "ManageChangesPanel", 
"modules/swriter/ui/managechangessidebar.ui", rFrame)
 {
-mpImplDlg = new SwRedlineAcceptDlg(this, this, 
get("content_area"));
+mpImplDlg.reset(new SwRedlineAcceptDlg(this, this, 
get("content_area")));
 
 mpImplDlg->Init();
 
@@ -1220,8 +1220,7 @@ SwRedlineAcceptPanel::~SwRedlineAcceptPanel()
 
 void SwRedlineAcceptPanel::dispose()
 {
-delete mpImplDlg;
-mpImplDlg = nullptr;
+mpImplDlg.reset();
 PanelLayout::dispose();
 }
 
diff --git a/sw/source/uibase/shells/textsh.cxx 
b/sw/source/uibase/shells/textsh.cxx
index 3d9592f2ff3e..b34a65a6d97b 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -89,7 +89,7 @@
 #include 
 #include 
 #include 
-
+#include 
 #include 
 
 #define ShellClass_SwTextShell
commit e2d96eaa1d6b75347c3de272547fe5d78e9d8623
Author: Noel Grandin 
AuthorDate: Tue Jul 24 11:21:29 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 25 08:46:51 2018 +0200

loplugin:useuniqueptr in SwInputWindow

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

diff --git a/sw/source/uibase/inc/inputwin.hxx 
b/sw/source/uibase/inc/inputwin.hxx
index c23d2c51a361..2fcac269e132 100644
--- a/sw/source/uibase/inc/inputwin.hxx
+++ b/sw/source/uibase/inc/inputwin.hxx
@@ -49,7 +49,7 @@ friend class InputEdit;
 
 VclPtraPos;
 VclPtr   aEdit;
-SwFieldMgr* pMgr;
+std::unique_ptr pMgr;
 SwWrtShell* pWrtShell;
 SwView* pView;
 OUStringaCurrentTableName, sOldFormula;
diff --git a/sw/source/uibase/ribbar/inputwin.cxx 
b/sw/source/uibase/ribbar/inputwin.cxx
index 07e71a29b90a..d5bc628b8bfd 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -143,7 +143,7 @@ void SwInputWindow::dispose()
 pView->GetHRuler().SetActive();
 pView->GetVRuler().SetActive();
 }
-delete pMgr;
+pMgr.reset();
 if(pWrtShell)
 pWrtShell->EndSelTableCells();
 
@@ -215,7 +215,7 @@ void SwInputWindow::ShowWin()
 
 // Edit current field
 OSL_ENSURE(pMgr == nullptr, "FieldManager not deleted");
-pMgr = new SwFieldMgr;
+pMgr.reset(new SwFieldMgr);
 
 // Form should always begin with "=" , so set here
 OUString sEdit('=');

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

[Libreoffice Gerrit user]

 sw/inc/hhcwrp.hxx |4 ++--
 sw/source/uibase/lingu/hhcwrp.cxx |   26 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit be1cc9d0d2e7cdbf449521a9e602ac5a288255ab
Author: Noel Grandin 
AuthorDate: Tue Jul 24 11:17:43 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 25 08:46:36 2018 +0200

loplugin:useuniqueptr in SwHHCWrapper

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

diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index f595cf045d10..6cfdec0f2347 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -34,8 +34,8 @@ class SW_DLLPUBLIC SwHHCWrapper : public 
editeng::HangulHanjaConversion
 VclPtr m_pWin;
 SwWrtShell &m_rWrtShell;
 
-SwConversionArgs *m_pConvArgs;/**< object for arguments (and results) 
needed
-   to find of next convertible text 
portion */
+std::unique_ptr m_pConvArgs;/**< object for 
arguments (and results) needed
+   to find of next 
convertible text portion */
 
 sal_Int32   m_nLastPos;   /**< starting position of the last found 
text part
(needs to be sth that gets not moved 
like
diff --git a/sw/source/uibase/lingu/hhcwrp.cxx 
b/sw/source/uibase/lingu/hhcwrp.cxx
index 7192e4b72265..5765a20bee11 100644
--- a/sw/source/uibase/lingu/hhcwrp.cxx
+++ b/sw/source/uibase/lingu/hhcwrp.cxx
@@ -113,7 +113,7 @@ SwHHCWrapper::SwHHCWrapper(
 
 SwHHCWrapper::~SwHHCWrapper()
 {
-delete m_pConvArgs;
+m_pConvArgs.reset();
 
 SwViewShell::SetCareWin( nullptr );
 
@@ -522,9 +522,9 @@ void SwHHCWrapper::Convert()
 if (pSttPos->nNode.GetNode().IsTextNode() &&
 pEndPos->nNode.GetNode().IsTextNode())
 {
-m_pConvArgs = new SwConversionArgs( GetSourceLanguage(),
+m_pConvArgs.reset( new SwConversionArgs( GetSourceLanguage(),
 pSttPos->nNode.GetNode().GetTextNode(), 
pSttPos->nContent,
-pEndPos->nNode.GetNode().GetTextNode(), 
pEndPos->nContent );
+pEndPos->nNode.GetNode().GetTextNode(), 
pEndPos->nContent ) );
 }
 else// we are not in the text (maybe a graphic or OLE object is 
selected) let's start from the top
 {
@@ -538,9 +538,9 @@ void SwHHCWrapper::Convert()
 // just in case we check anyway...
 if (!pTextNode || !pTextNode->IsTextNode())
 return;
-m_pConvArgs = new SwConversionArgs( GetSourceLanguage(),
+m_pConvArgs.reset( new SwConversionArgs( GetSourceLanguage(),
 pTextNode, pSttPos->nContent,
-pTextNode, pSttPos->nContent );
+pTextNode, pSttPos->nContent ) );
 }
 OSL_ENSURE( m_pConvArgs->pStartNode && 
m_pConvArgs->pStartNode->IsTextNode(),
 "failed to get proper start text node" );
@@ -596,16 +596,16 @@ void SwHHCWrapper::Convert()
 }
 
 if ( m_bIsOtherContent )
-ConvStart_impl( m_pConvArgs, SvxSpellArea::Other );
+ConvStart_impl( m_pConvArgs.get(), SvxSpellArea::Other );
 else
 {
 m_bStartChk = false;
-ConvStart_impl( m_pConvArgs, SvxSpellArea::BodyEnd );
+ConvStart_impl( m_pConvArgs.get(), SvxSpellArea::BodyEnd );
 }
 
 ConvertDocument();
 
-ConvEnd_impl( m_pConvArgs );
+ConvEnd_impl( m_pConvArgs.get() );
 }
 
 bool SwHHCWrapper::ConvNext_impl( )
@@ -628,7 +628,7 @@ bool SwHHCWrapper::ConvNext_impl( )
 if ( m_bIsOtherContent )
 {
 m_bStartChk = false;
-ConvStart_impl( m_pConvArgs, SvxSpellArea::Body );
+ConvStart_impl( m_pConvArgs.get(), SvxSpellArea::Body );
 bGoOn = true;
 }
 else if ( m_bStartDone && m_bEndDone )
@@ -636,14 +636,14 @@ bool SwHHCWrapper::ConvNext_impl( )
 // body region done, ask about special region
 if( !m_bIsSelection && m_rWrtShell.HasOtherCnt() )
 {
-ConvStart_impl( m_pConvArgs, SvxSpellArea::Other );
+ConvStart_impl( m_pConvArgs.get(), SvxSpellArea::Other );
 m_bIsOtherContent = bGoOn = true;
 }
 }
 else
 {
 m_bStartChk = !m_bStartDone;
-ConvStart_impl( m_pConvArgs, m_bStartChk ? SvxSpellArea::BodyStart 
: SvxSpellArea::BodyEnd );
+ConvStart_impl( m_pConvArgs.get(), m_bStartChk ? 
SvxSpellArea::BodyStart : SvxSpellArea::BodyEnd );
 bGoOn = true;
 }
 return bGoOn;
@@ -660,14 +660,14 @@ void SwHHCWrapper::FindConvText_impl()
 
 while ( bConv )
 {
-bFound = ConvContinue_impl( m_pConvArgs );
+bFound = ConvContinue_impl( m_pConvArgs.get() );
 if (bFound)
 {
  

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

[Libreoffice Gerrit user]

 sw/source/uibase/docvw/srcedtw.cxx|   16 +++-
 sw/source/uibase/inc/srcedtw.hxx  |8 
 sw/source/uibase/lingu/sdrhhcwrap.cxx |   10 +-
 sw/source/uibase/lingu/sdrhhcwrap.hxx |2 +-
 4 files changed, 17 insertions(+), 19 deletions(-)

New commits:
commit df0175c71ee836ed6e832e8849d9004cef530c65
Author: Noel Grandin 
AuthorDate: Tue Jul 24 11:14:11 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 25 08:46:22 2018 +0200

loplugin:useuniqueptr in SdrHHCWrapper

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

diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx 
b/sw/source/uibase/lingu/sdrhhcwrap.cxx
index 6ae103bcb830..9eb0a9d3f9ac 100644
--- a/sw/source/uibase/lingu/sdrhhcwrap.cxx
+++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx
@@ -72,13 +72,13 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw,
  Size aSize( 1, 1 );
 SetPaperSize( aSize );
 
-pOutlView = new OutlinerView( this, &(pView->GetEditWin()) );
+pOutlView.reset( new OutlinerView( this, &(pView->GetEditWin()) ) );
 
pOutlView->GetOutliner()->SetRefDevice(pView->GetWrtShell().getIDocumentDeviceAccess().getPrinter(
 false ));
 
 // Hack: all SdrTextObj attributes should be transferred to EditEngine
 pOutlView->SetBackgroundColor( COL_WHITE );
 
-InsertView( pOutlView );
+InsertView( pOutlView.get() );
 Point aPoint( 0, 0 );
  tools::Rectangle aRect( aPoint, aSize );
 pOutlView->SetOutputArea( aRect );
@@ -96,8 +96,8 @@ SdrHHCWrapper::~SdrHHCWrapper()
 SetUpdateMode(false);
 pOutlView->SetOutputArea( tools::Rectangle( Point(), Size(1, 1) ) );
 }
-RemoveView( pOutlView );
-delete pOutlView;
+RemoveView( pOutlView.get() );
+pOutlView.reset();
 }
 
 void SdrHHCWrapper::StartTextConversion()
@@ -156,7 +156,7 @@ bool SdrHHCWrapper::ConvertNextDocument()
 SetUpdateMode(true);
 pView->GetWrtShell().MakeVisible(pTextObj->GetLogicRect());
 
-pSdrView->SdrBeginTextEdit(pTextObj, pPV, 
&pView->GetEditWin(), false, this, pOutlView, true, true);
+pSdrView->SdrBeginTextEdit(pTextObj, pPV, 
&pView->GetEditWin(), false, this, pOutlView.get(), true, true);
 }
 else
 SetUpdateMode(false);
diff --git a/sw/source/uibase/lingu/sdrhhcwrap.hxx 
b/sw/source/uibase/lingu/sdrhhcwrap.hxx
index fd6ac484979b..133e47cc9200 100644
--- a/sw/source/uibase/lingu/sdrhhcwrap.hxx
+++ b/sw/source/uibase/lingu/sdrhhcwrap.hxx
@@ -31,7 +31,7 @@ class SdrHHCWrapper : public SdrOutliner
 
 SwView* pView;
 SdrTextObj* pTextObj;
-OutlinerView*   pOutlView;
+std::unique_ptr pOutlView;
 sal_Int32   nOptions;
 sal_uInt16  nDocIndex;
 LanguageTypenSourceLang;
commit f154ed6d9c5ba1895ec07f0d93337f6941803e59
Author: Noel Grandin 
AuthorDate: Tue Jul 24 11:06:31 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 25 08:46:07 2018 +0200

loplugin:useuniqueptr in SwSrcEditWindow

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

diff --git a/sw/source/uibase/docvw/srcedtw.cxx 
b/sw/source/uibase/docvw/srcedtw.cxx
index a625f02bd999..f38d0b287546 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -292,12 +292,10 @@ void SwSrcEditWindow::dispose()
 if ( m_pTextEngine )
 {
 EndListening( *m_pTextEngine );
-m_pTextEngine->RemoveView( m_pTextView );
+m_pTextEngine->RemoveView( m_pTextView.get() );
 
-delete m_pTextView;
-m_pTextView = nullptr;
-delete m_pTextEngine;
-m_pTextEngine = nullptr;
+m_pTextView.reset();
+m_pTextEngine.reset();
 }
 m_pHScrollbar.disposeAndClear();
 m_pVScrollbar.disposeAndClear();
@@ -518,13 +516,13 @@ void SwSrcEditWindow::CreateTextEngine()
 m_pHScrollbar->EnableDrag();
 m_pVScrollbar->Show();
 
-m_pTextEngine = new ExtTextEngine;
-m_pTextView = new TextView( m_pTextEngine, m_pOutWin );
+m_pTextEngine.reset(new ExtTextEngine);
+m_pTextView.reset(new TextView( m_pTextEngine.get(), m_pOutWin ));
 m_pTextView->SetAutoIndentMode(true);
-m_pOutWin->SetTextView(m_pTextView);
+m_pOutWin->SetTextView(m_pTextView.get());
 
 m_pTextEngine->SetUpdateMode( false );
-m_pTextEngine->InsertView( m_pTextView );
+m_pTextEngine->InsertView( m_pTextView.get() );
 
 vcl::Font aFont;
 aFont.SetTransparent( false );
diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index ef9f90a096f8..beb43502c158 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.hxx
@@ -64,8 +64,8 @@ class S

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

[Libreoffice Gerrit user]

 sw/source/uibase/docvw/edtdd.cxx   |5 -
 sw/source/uibase/docvw/edtwin.cxx  |   99 +
 sw/source/uibase/docvw/edtwin2.cxx |3 -
 sw/source/uibase/inc/edtwin.hxx|   14 ++---
 4 files changed, 45 insertions(+), 76 deletions(-)

New commits:
commit 3426b8ea0ded6423e465bf1770433b39cc345ffd
Author: Noel Grandin 
AuthorDate: Tue Jul 24 10:41:27 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 25 08:45:51 2018 +0200

loplugin:useuniqueptr in SwEditWin

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

diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx
index ed773db4b658..9c5413a85aad 100644
--- a/sw/source/uibase/docvw/edtdd.cxx
+++ b/sw/source/uibase/docvw/edtdd.cxx
@@ -174,8 +174,7 @@ void SwEditWin::CleanupDropUserMarker()
 {
 if ( m_pUserMarker )
 {
-delete m_pUserMarker;
-m_pUserMarker = nullptr;
+m_pUserMarker.reset();
 m_pUserMarkerObj = nullptr;
 }
 }
@@ -464,7 +463,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt 
)
 
 if(m_pUserMarkerObj)
 {
-m_pUserMarker = new SdrDropMarkerOverlay( 
*rSh.GetDrawView(), *m_pUserMarkerObj );
+m_pUserMarker.reset(new SdrDropMarkerOverlay( 
*rSh.GetDrawView(), *m_pUserMarkerObj ));
 }
 }
 }
diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index bbf7c8400dd6..bd468aa41d5c 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -352,8 +352,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 
nModifier )
 PointerStyle eStyle = PointerStyle::Fill;
 if ( rSh.IsOverReadOnlyPos( rLPt ) )
 {
-delete m_pUserMarker;
-m_pUserMarker = nullptr;
+m_pUserMarker.reset();
 
 eStyle = PointerStyle::NotAllowed;
 }
@@ -378,13 +377,12 @@ void SwEditWin::UpdatePointer(const Point &rLPt, 
sal_uInt16 nModifier )
 
 if ( !m_pUserMarker )
 {
-m_pUserMarker = new SdrDropMarkerOverlay( 
*rSh.GetDrawView(), aTmp );
+m_pUserMarker.reset(new SdrDropMarkerOverlay( 
*rSh.GetDrawView(), aTmp ));
 }
 }
 else
 {
-delete m_pUserMarker;
-m_pUserMarker = nullptr;
+m_pUserMarker.reset();
 }
 
 rSh.SwCursorShell::SetVisibleCursor( rLPt );
@@ -410,13 +408,12 @@ void SwEditWin::UpdatePointer(const Point &rLPt, 
sal_uInt16 nModifier )
 
 if ( !m_pUserMarker )
 {
-m_pUserMarker = new SdrDropMarkerOverlay( *rSh.GetDrawView(), 
aTmp );
+m_pUserMarker.reset(new SdrDropMarkerOverlay( 
*rSh.GetDrawView(), aTmp ));
 }
 }
 else
 {
-delete m_pUserMarker;
-m_pUserMarker = nullptr;
+m_pUserMarker.reset();
 }
 
 SetPointer( eStyle );
@@ -644,10 +641,10 @@ IMPL_LINK_NOARG(SwEditWin, TimerHandler, Timer *, void)
 }
 if ( !bDone && !(g_bFrameDrag || m_bInsDraw) )
 {
-if ( m_pRowColumnSelectionStart )
+if ( m_xRowColumnSelectionStart )
 {
 Point aPos( aModPt );
-rSh.SelectTableRowCol( *m_pRowColumnSelectionStart, &aPos, 
m_bIsRowDrag );
+rSh.SelectTableRowCol( *m_xRowColumnSelectionStart, &aPos, 
m_bIsRowDrag );
 }
 else
 rSh.CallSetCursor( &aModPt, false );
@@ -691,8 +688,7 @@ void SwEditWin::LeaveArea(const Point &rPos)
 JustifyAreaTimer();
 if( !m_aTimer.IsActive() )
 m_aTimer.Start();
-delete m_pShadCursor;
-m_pShadCursor = nullptr;
+m_pShadCursor.reset();
 }
 
 inline void SwEditWin::EnterArea()
@@ -1379,8 +1375,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
 // running on a document, no order is being taken
 return;
 
-delete m_pShadCursor;
-m_pShadCursor = nullptr;
+m_pShadCursor.reset();
 m_aKeyInputFlushTimer.Stop();
 
 bool bIsDocReadOnly = m_rView.GetDocShell()->IsReadOnly() &&
@@ -2741,8 +2736,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
 }
 
 m_bWasShdwCursor = nullptr != m_pShadCursor;
-delete m_pShadCursor;
-m_pShadCursor = nullptr;
+m_pShadCursor.reset();
 
 const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
 
@@ -2904,7 +2898,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
 rSh.SelectTableRowCol( aDocPos );
 if( SwTab::SEL_HORI  != nMouseTabCol && SwTab::SEL_HORI_RTL  != 
nMouseTabCol)
 {
-m_pRowColumnSelectionStart = new Point( aDocPos );
+m_xRowCol

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

[Libreoffice Gerrit user]

 sw/inc/PostItMgr.hxx |2 +-
 sw/source/uibase/docvw/PostItMgr.cxx |   13 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 574a6265fb6adb401efefcc1312a4e1d7e6b4ddc
Author: Noel Grandin 
AuthorDate: Tue Jul 24 10:20:35 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 25 08:45:34 2018 +0200

loplugin:useuniqueptr in SwPostItMgr

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

diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 32f77b8488f6..e3f881e59d39 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -132,7 +132,7 @@ class SwPostItMgr: public SfxListener
 SwWrtShell* mpWrtShell;
 VclPtr   mpEditWin;
 std::vector mvPostItFields;
-std::vector  mPages;
+std::vector>  mPages;
 ImplSVEvent *   mnEventId;
 boolmbWaitingForCalcRects;
 VclPtr mpActivePostIt;
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx 
b/sw/source/uibase/docvw/PostItMgr.cxx
index 2cd8d420db70..2365d8b026ea 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -236,8 +236,6 @@ SwPostItMgr::~SwPostItMgr()
 RemoveSidebarWin();
 EndListening( *mpView->GetDocShell() );
 
-for (auto const& page : mPages)
-delete page;
 mPages.clear();
 }
 
@@ -601,8 +599,9 @@ bool SwPostItMgr::CalcRects()
 if (aPageNum > mPages.size())
 {
 const unsigned long nNumberOfPages = mPages.size();
+mPages.reserve(aPageNum);
 for (unsigned int j=0; jmvSidebarItems.push_back(pItem);
 mPages[aPageNum-1]->mPageRect = pItem->maLayoutInfo.mPageFrame;
@@ -651,14 +650,14 @@ void SwPostItMgr::PreparePageContainer()
 
 if (lContainerSize < lPageSize)
 {
+mPages.reserve(lPageSize);
 for (int i=0; i lPageSize)
 {
 for (int i=mPages.size()-1; i >= lPageSize;--i)
 {
-delete mPages[i];
 mPages.pop_back();
 }
 }
@@ -686,7 +685,7 @@ void SwPostItMgr::LayoutPostIts()
 // - place SwPostIts on their initial position
 // - calculate necessary height for all PostIts together
 bool bUpdate = false;
-for (SwPostItPageItem* pPage : mPages)
+for (std::unique_ptr& pPage : mPages)
 {
 // only layout if there are notes on this page
 if (pPage->mvSidebarItems.size()>0)
@@ -1972,7 +1971,7 @@ void SwPostItMgr::CorrectPositions()
 {
 long aAnchorPosX = 0;
 long aAnchorPosY = 0;
-for (SwPostItPageItem* pPage : mPages)
+for (std::unique_ptr& pPage : mPages)
 {
 for (auto const& item : pPage->mvSidebarItems)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/uibase/dochdl/swdtflvr.cxx|   14 +++---
 sw/source/uibase/docvw/PageBreakWin.cxx |   22 --
 sw/source/uibase/inc/PageBreakWin.hxx   |5 +++--
 sw/source/uibase/inc/swdtflvr.hxx   |2 +-
 4 files changed, 19 insertions(+), 24 deletions(-)

New commits:
commit b05b2eafa2a15f861de065bc6c3a4a31d6f126d7
Author: Noel Grandin 
AuthorDate: Tue Jul 24 10:12:48 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 25 08:45:13 2018 +0200

loplugin:useuniqueptr in SwPageBreakWin

and fix check in UpdatePosition, which would previously never have
returned early

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

diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx 
b/sw/source/uibase/docvw/PageBreakWin.cxx
index 366c204f9dc8..7d68143d0acb 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -86,8 +86,7 @@ namespace
 
 if ( !rMEvt.IsSynthetic() && !m_pWin->IsVisible() )
 {
-Point* pPtr = new Point( rMEvt.GetPosPixel() );
-m_pWin->UpdatePosition( pPtr );
+m_pWin->UpdatePosition( rMEvt.GetPosPixel() );
 }
 }
 }
@@ -100,8 +99,7 @@ SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const 
SwFrame *pFrame ) :
 m_bIsAppearing( false ),
 m_nFadeRate( 100 ),
 m_nDelayAppearing( 0 ),
-m_bDestroyed( false ),
-m_pMousePt( nullptr )
+m_bDestroyed( false )
 {
 // Use pixels for the rest of the drawing
 SetMapMode( MapMode ( MapUnit::MapPixel ) );
@@ -131,9 +129,6 @@ void SwPageBreakWin::dispose()
 m_pPopupMenu.clear();
 m_aBuilder.disposeBuilder();
 
-delete m_pMousePt;
-m_pMousePt = nullptr;
-
 SwFrameMenuButtonBase::dispose();
 }
 
@@ -328,14 +323,13 @@ void SwPageBreakWin::Activate( )
 MenuButton::Activate();
 }
 
-void SwPageBreakWin::UpdatePosition( const Point* pEvtPt )
+void SwPageBreakWin::UpdatePosition( boost::optional xEvtPt )
 {
-if ( pEvtPt != nullptr )
+if ( xEvtPt )
 {
-if ( pEvtPt == m_pMousePt )
+if ( xEvtPt == m_xMousePt )
 return;
-delete m_pMousePt;
-m_pMousePt = pEvtPt;
+m_xMousePt = xEvtPt;
 }
 
 const SwPageFrame* pPageFrame = GetPageFrame();
@@ -380,9 +374,9 @@ void SwPageBreakWin::UpdatePosition( const Point* pEvtPt )
 long nLineRight = std::min( nPgRight, aVisArea.Right() );
 long nBtnLeft = nLineLeft;
 
-if ( m_pMousePt )
+if ( m_xMousePt )
 {
-nBtnLeft = nLineLeft + m_pMousePt->X() - aBtnSize.getWidth() / 2;
+nBtnLeft = nLineLeft + m_xMousePt->X() - aBtnSize.getWidth() / 2;
 
 if ( nBtnLeft < nLineLeft )
 nBtnLeft = nLineLeft;
diff --git a/sw/source/uibase/inc/PageBreakWin.hxx 
b/sw/source/uibase/inc/PageBreakWin.hxx
index c659be062f0d..5b84ee1d8a6a 100644
--- a/sw/source/uibase/inc/PageBreakWin.hxx
+++ b/sw/source/uibase/inc/PageBreakWin.hxx
@@ -12,6 +12,7 @@
 #include "FrameControl.hxx"
 #include 
 #include 
+#include 
 
 class SwPageFrame;
 
@@ -31,7 +32,7 @@ class SwPageBreakWin : public SwFrameMenuButtonBase
 Timer m_aFadeTimer;
 bool  m_bDestroyed;
 
-const Point*  m_pMousePt;
+boost::optional m_xMousePt;
 
 public:
 SwPageBreakWin( SwEditWin* pEditWin, const SwFrame *pFrame );
@@ -43,7 +44,7 @@ public:
 virtual void MouseMove( const MouseEvent& rMEvt ) override;
 virtual void Activate( ) override;
 
-void UpdatePosition( const Point* pEvtPt = nullptr );
+void UpdatePosition( boost::optional xEvtPt = 
boost::optional() );
 
 virtual void ShowAll( bool bShow ) override;
 virtual bool Contains( const Point &rDocPt ) const override;
commit 7789628e9aebc68fb194d42252dcb5e29f183f96
Author: Noel Grandin 
AuthorDate: Tue Jul 24 10:12:00 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 25 08:45:03 2018 +0200

loplugin:useuniqueptr in SwTransferable

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

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx 
b/sw/source/uibase/dochdl/swdtflvr.cxx
index f2b8aa3d0fbc..d69c680a0424 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -245,7 +245,7 @@ SwTransferable::~SwTransferable()
 // release reference to the document so that aDocShellRef will delete
 // it (if aDocShellRef is set). Otherwise, the OLE nodes keep references
 // to their sub-storage when the storage is already dead.
-delete m_pClpDocFac;
+m_pClpDocFac.reset();
 
 // first close, then the Ref. can be cleared as well, so that
 // the DocShell really gets deleted!
@@ -429,7 +429,7 @@ bool SwTransferable::GetData( const DataFlavor& rFla

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

[Libreoffice Gerrit user]

 sw/source/uibase/docvw/SidebarTxtControlAcc.cxx |   14 +++---
 1 file changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 003b2956d872ac19a1c84fefcc773ecefa008220
Author: Noel Grandin 
AuthorDate: Tue Jul 24 10:20:22 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 25 08:45:18 2018 +0200

loplugin:useuniqueptr in SidebarTextControlAccessibleContext

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

diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx 
b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
index 7529bdbfe027..f6fc2e693271 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -128,7 +128,6 @@ class SidebarTextControlAccessibleContext : public 
VCLXAccessibleComponent
 {
 public:
 explicit SidebarTextControlAccessibleContext( SidebarTextControl& 
rSidebarTextControl );
-virtual ~SidebarTextControlAccessibleContext() override;
 
 virtual sal_Int32 SAL_CALL
 getAccessibleChildCount() override;
@@ -146,7 +145,7 @@ class SidebarTextControlAccessibleContext : public 
VCLXAccessibleComponent
 virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent 
) override;
 
 private:
-::accessibility::AccessibleTextHelper* mpAccessibleTextHelper;
+std::unique_ptr<::accessibility::AccessibleTextHelper> 
mpAccessibleTextHelper;
 
 ::osl::Mutex maMutex;
 
@@ -155,22 +154,15 @@ class SidebarTextControlAccessibleContext : public 
VCLXAccessibleComponent
 
 SidebarTextControlAccessibleContext::SidebarTextControlAccessibleContext( 
SidebarTextControl& rSidebarTextControl )
 : VCLXAccessibleComponent( rSidebarTextControl.GetWindowPeer() )
-, mpAccessibleTextHelper( nullptr )
 , maMutex()
 {
-mpAccessibleTextHelper = new ::accessibility::AccessibleTextHelper( 
o3tl::make_unique(rSidebarTextControl) );
+mpAccessibleTextHelper.reset(new ::accessibility::AccessibleTextHelper( 
o3tl::make_unique(rSidebarTextControl) ));
 mpAccessibleTextHelper->SetEventSource( 
rSidebarTextControl.GetWindowPeer() );
 }
 
-SidebarTextControlAccessibleContext::~SidebarTextControlAccessibleContext()
-{
-defunc();
-}
-
 void SidebarTextControlAccessibleContext::defunc()
 {
-delete mpAccessibleTextHelper;
-mpAccessibleTextHelper = nullptr;
+mpAccessibleTextHelper.reset();
 }
 
 sal_Int32 SAL_CALL 
SidebarTextControlAccessibleContext::getAccessibleChildCount()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/qa/uitest/validity/tdf96698.py |  137 ++
 1 file changed, 137 insertions(+)

New commits:
commit 1394bad8ce5c5e341f824fd6cd14769ada32eeb3
Author: Zdeněk Crhonek 
AuthorDate: Mon Jul 23 23:50:26 2018 +0200
Commit: Zdenek Crhonek 
CommitDate: Wed Jul 25 07:54:20 2018 +0200

uitest for bug tdf#96698 , Validity-> Custom

Change-Id: Ia35d95c4ac6cddfb7db7a6e770b6c193baeab9fa
Reviewed-on: https://gerrit.libreoffice.org/57896
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek 

diff --git a/sc/qa/uitest/validity/tdf96698.py 
b/sc/qa/uitest/validity/tdf96698.py
new file mode 100644
index ..376f957183eb
--- /dev/null
+++ b/sc/qa/uitest/validity/tdf96698.py
@@ -0,0 +1,137 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+#Bug 96698 - Data => Validity => Custom (like Excel) is missing
+class tdf96698(UITestCase):
+def test_tdf96698_validity_custom_formula(self):
+calc_doc = self.ui_test.create_doc_in_start_center("calc")
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+#A general valitdity check for the entered new content of the active 
cell - especially for text
+#with a custom formula like in Excel is not possible.
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A2"}))
+self.ui_test.execute_dialog_through_command(".uno:Validation")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "0")
+xallow = xDialog.getChild("allow")
+xallowempty = xDialog.getChild("allowempty")
+xmin = xDialog.getChild("min")
+
+props = {"TEXT": "Custom"}
+actionProps = mkPropertyValues(props)
+xallow.executeAction("SELECT", actionProps)
+xmin.executeAction("TYPE", 
mkPropertyValues({"TEXT":"ISERROR(FIND(\",\",B2))"}))
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+#verify
+self.ui_test.execute_dialog_through_command(".uno:Validation")
+xDialog = self.xUITest.getTopFocusWindow()
+xallow = xDialog.getChild("allow")
+xallowempty = xDialog.getChild("allowempty")
+xmin = xDialog.getChild("min")
+
+self.assertEqual(get_state_as_dict(xallow)["SelectEntryText"], 
"Custom")
+self.assertEqual(get_state_as_dict(xmin)["Text"], 
"ISERROR(FIND(\",\",B2))")
+
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"}))
+self.ui_test.execute_dialog_through_command(".uno:Validation")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "0")
+xallow = xDialog.getChild("allow")
+xallowempty = xDialog.getChild("allowempty")
+xmin = xDialog.getChild("min")
+
+props = {"TEXT": "Custom"}
+actionProps = mkPropertyValues(props)
+xallow.executeAction("SELECT", actionProps)
+xmin.executeAction("TYPE", 
mkPropertyValues({"TEXT":"NOT(ISERROR(B3))"}))
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+#verify
+self.ui_test.execute_dialog_through_command(".uno:Validation")
+xDialog = self.xUITest.getTopFocusWindow()
+xallow = xDialog.getChild("allow")
+xallowempty = xDialog.getChild("allowempty")
+xmin = xDialog.getChild("min")
+
+self.assertEqual(get_state_as_dict(xallow)["SelectEntryText"], 
"Custom")
+self.assertEqual(get_state_as_dict(xmin)["Text"], "NOT(ISERROR(B3))")
+
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A7"}))
+self.ui_test.execute_dialog_through_command(".uno:Validation")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "0")
+xallow = xDialog.getChild("allow")
+xallowempty = xDialog.getChild("allowempty")
+xmin = xDialog.getChild("min")
+
+props = {"TEXT": "Custom"}
+actionProps = mkPropertyValues(props)
+xallow.executeAction

RE: Calc cell type

[Kaganski Mike]

Hi Vikas,

Dates and times are internally just numbers ("serial date/time"), which are 
formatted for display as dates or times. For pivot tables, there's 
IsDateDimension methods (in ScDPCache and others), which help in the pivot 
table specific case.

Possibly it's better to refer to specific issue # or gerrit patch related to 
those transformations to allow some better suggestions?

--
Best regards,
Mike Kaganski

От: LibreOffice  от имени Vikas 
Mahato 
Отправлено: 25 июля 2018 г. 14:45
Кому: libreoffice@lists.freedesktop.org
Тема: Calc cell type

Hello all,

I am trying to write some datatransformations related to date-time for calc.

Is there any way to determine whether a column stores date or time value? I was 
only able to find CELLTYPE_STRING, CELLTYPE_NONE, CELLTYPE_VALUE etc in 
global.hxx but none related to date or time.

Regards,
Vikas Mahato
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Calc cell type

[Vikas Mahato]

Hello all,

I am trying to write some datatransformations related to date-time for calc.

Is there any way to determine whether a column stores date or time value? I
was only able to find CELLTYPE_STRING, CELLTYPE_NONE, CELLTYPE_VALUE etc in
global.hxx but none related to date or time.

Regards,
Vikas Mahato
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Compiler baselines (was: [Libreoffice-qa] minutes of ESC call ...)

[Thorsten Behrens]

Stephan Bergmann wrote:
> According to the feature matrix at
> , bumping to GCC 7 and
> MSVC 2017 15.7 would give us almost complete C++17 support, which would of
> course be a great step forward.
>
oh nice!

> For the TDF Linux builds on CentOS 6 with Developer Toolset (where we
> currently use Deverloper Toolset 2 with GCC 4.8.2, IIUC), my understanding
> would be that Developer Toolset 7 with GCC 7 should be available to use
> instead (searching the web I found
> )?
>
Two remarks - devtoolset-7 only seems to be available for x86_64, so
unless we invest some effort to get cross builds to work on linux (I
expect externals to be the real pain point here), this means
abandoning 32bit linux.

One of the upsides to not only update toolchain, but the entire
baseline builders (e.g. to CentOS 7) would be KF5 ('KDE5') support.

Cheers,

-- Thorsten


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

LibreOffice ESC call, Wed - 18:00 central European (local) time

[Michael Meeks]

Hi guys,

Prototype agenda below, bug metrics also at the link below;
extra items appreciated as last-week:

https://demo.collaboracloudsuite.com/tdf/

Lets use the new TDF jitsi goodness this week at:

http://jitsi.documentfoundation.org/esc

ATB,

Michael.

* Completed Action Items:
+ mail budget spreadsheet to the board (Thorsten)

* Pending Action Items:

* Release Engineering update (Christian) 
+ 6.0.6 – rc2 this next week ?
+ 6.1.0 RC2 update
+ Remotes
+ Android viewer
+ Online
+ need an rc2 – Timar on vacation.

* Documentation (Olivier)
 
* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
250(250) (topicUI) bugs open, 288(288) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month   3 months   12 months  
 added  5(-10)16(-8)24(-6)  92(-5) 
 commented 60(12)160(20)   311(25)1695(-7) 
   removed  0(-1)  1(0)  1(0)   10(-1) 
  resolved  2(-2)  9(0) 19(-1) 155(-15)
+ top 10 contributors:
  Tietze, Heiko made 60 changes in 1 month, and 673 changes in 1 year
  Buovjaga made 41 changes in 1 month, and 206 changes in 1 year
  Foote, V Stuart made 33 changes in 1 month, and 257 changes in 1 year
  Xisco Faulí made 25 changes in 1 month, and 318 changes in 1 year
  Timur made 19 changes in 1 month, and 62 changes in 1 year
  kompilainenn made 16 changes in 1 month, and 42 changes in 1 year
  muso made 15 changes in 1 month, and 15 changes in 1 year
  Nabet, Julien made 13 changes in 1 month, and 29 changes in 1 year
  Henschel, Regina made 12 changes in 1 month, and 93 changes in 1 year
  Faure, Jean-Baptiste made 11 changes in 1 month, and 47 changes in 1 
year
* Fuzz / Crash Testing (Caolan)
+ 17(-3) import failures, 114(+110) export failures 
+ coverity
+ ??? 17(+12, -6)
+ forcepoint round #8
+ smaller set of issues here – only 7
+ ?? only 3 / 4 outstanding. 
+ oss-fuzz (?? 13 outstanding, 13 minor)
  
* Crash Reporting (Xisco)
+ http://crashreport.libreoffice.org/stats/version/5.4.7.2
 + 534 (last 7 days) (45)
+ http://crashreport.libreoffice.org/stats/version/6.0.4.2
 + 967 (last 7 days) (-160)
+ http://crashreport.libreoffice.org/stats/version/6.0.5.2
 + 1232 (last 7 days) (+137)


* GSoC schedule (Thorsten/Heiko)
   + Coding: May 14 - August 6
   + Evaluation 2: July 9 – 13 - next week!
   + all students passed – 10 still going.
   + 1 feedback on somewhat inaccessible mentors
   + should have 2x assigned – if not available; please tell students
   + let Moggi/Heiko/Thorsten know if both are away
   + bad to let students stew for two weeks un-attended.
   + Students Submit Code and Final Evaluations: August 6 - 14
   + Mentors Submit Final Evaluations: August 14 - 21
   + Results Announced: August 22
   + https://wiki.documentfoundation.org/Development/GSoC/2018

* Hackfests & Events
   + Akademy in Vienna Aug 11-17th
  + Thorsten?
   + FrOScon in Bonn: Aug 25
  + Bubli, Thorsten, perhaps Cloph.
   + Conference – September
   + potentially one in Bern / Switzerland - October 19th.
   + working on a Munich event October 26-28th (Thorsten)
  + an Open Gov’t meeting from the City of Munich
  + good to have a hack-fest back-to-back there.
  + moving slowly here …

* mentoring/easyhack update
  committer...   1 week  1 month  3 months12 months   
  open   98(-12)157(19)  159(19)  169(18) 
   reviews 1370(-40)   5627(58) 9569(708)   23039(596)
merged  248(-37)   1286(-100)   3606(30)13998(-6) 
 abandoned9(-3)  54(-2)  266(-1)  981(-13)
   own commits  204(-49)   1029(-24)3497(-52)   14949(192)
review commits   85(30) 320(14)  939(-16)3591(83) 
contributor...   1 week1 month   3 months 12 months
  open 17(-8) 68(-1) 70(-2)73(-2)  
   reviews 46(-68)   307(-4)   4172(-541)   28566(-594)
merged 56(32)178(34)379(6)   1720(9)   
 abandoned  4(-6) 38(1)  94(-9)   345(-5)  
   own commits 60(38)177(34)407(17)  1406(61)  
review commits  0(0)   0(0)   0(0)  0(0)   
+ easyHack statistics:
   needsDevEval 53(53)   needsUXEval 2(2)   cleanup_comments 218(218)   
   total 268(268)   assigned 27(27)   open 185(185)   
+ top 5 contributors:
  Gelmini, Andrea made 59 patches in 1 month, and 449 patches in 1 year
  Sophia Schröder made 28 patches in 1 month, and 87 patches in 1 year
  Rizal Mut

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

[Libreoffice Gerrit user]

 svtools/source/svhtml/parhtml.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit f33ca5e3ba342e8251ab8177105a9b4b231b73e0
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 17:36:13 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 21:09:44 2018 +0100

ofz#7621 tight OUString concat loop causes libfuzzer oom

it doesn't get a chance to release memory and falls over with
an oom

Change-Id: I20eb91223de3aa00f3e2f4131ad212f1cfde6ff3

diff --git a/svtools/source/svhtml/parhtml.cxx 
b/svtools/source/svhtml/parhtml.cxx
index be3167d30053..d887f4084ab8 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1218,12 +1218,15 @@ HtmlTokenId HTMLParser::GetNextToken_()
 
 bool bDone = false;
 // Read until closing %>. If not found restart at 
first >.
+sal_Unicode nLastTokenChar = !aToken.isEmpty() ? 
aToken[aToken.getLength() - 1] : 0;
+OUStringBuffer aTmpBuffer(aToken);
 while( !bDone && !rInput.eof() && IsParserWorking() )
 {
-bDone = '>'==nNextCh && aToken.endsWith("%");
+bDone = '>'==nNextCh && nLastTokenChar == '%';
 if( !bDone )
 {
-aToken += OUString(&nNextCh,1);
+aTmpBuffer.appendUtf32(nNextCh);
+nLastTokenChar = 
aTmpBuffer[aTmpBuffer.getLength() - 1];
 nNextCh = GetNextChar();
 }
 }
@@ -1237,6 +1240,7 @@ HtmlTokenId HTMLParser::GetNextToken_()
 nRet = HtmlTokenId::TEXTTOKEN;
 break;
 }
+aToken = aTmpBuffer.makeStringAndClear();
 if( IsParserWorking() )
 {
 sSaveToken = aToken;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/inc/sallayout.hxx  |2 +-
 vcl/source/gdi/CommonSalLayout.cxx |4 +---
 vcl/source/gdi/sallayout.cxx   |8 +++-
 3 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 2882c0fd4740e35f03e0a800b8f6b33fb06cf8f2
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 15:01:01 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 22:08:41 2018 +0200

GetCharWidths always returns true

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

diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 8daed9a01d09..b6fc7ed75a5c 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -344,7 +344,7 @@ private:
 voidJustify(DeviceCoordinate nNewWidth);
 voidApplyAsianKerning(const OUString& rStr);
 
-boolGetCharWidths(DeviceCoordinate* pCharWidths) const;
+voidGetCharWidths(DeviceCoordinate* pCharWidths) const;
 
 voidSetNeedFallback(ImplLayoutArgs&, sal_Int32, bool);
 
diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 647788129d32..3d5d235fb601 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -572,7 +572,7 @@ bool GenericSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 return true;
 }
 
-bool GenericSalLayout::GetCharWidths(DeviceCoordinate* pCharWidths) const
+void GenericSalLayout::GetCharWidths(DeviceCoordinate* pCharWidths) const
 {
 const int nCharCount = mnEndCharPos - mnMinCharPos;
 
@@ -586,8 +586,6 @@ bool GenericSalLayout::GetCharWidths(DeviceCoordinate* 
pCharWidths) const
 continue;
 pCharWidths[nIndex] += aGlyphItem.mnNewWidth;
 }
-
-return true;
 }
 
 // A note on how Kashida justification is implemented (because it took me 5
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index a738a1d5168b..d921354879fc 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -693,9 +693,8 @@ bool SalLayout::GetBoundRect( SalGraphics& rSalGraphics, 
tools::Rectangle& rRect
 
 DeviceCoordinate GenericSalLayout::FillDXArray( DeviceCoordinate* pCharWidths 
) const
 {
-if( pCharWidths )
-if( !GetCharWidths( pCharWidths ) )
-return 0;
+if (pCharWidths)
+GetCharWidths(pCharWidths);
 
 return GetTextWidth();
 }
@@ -877,8 +876,7 @@ sal_Int32 GenericSalLayout::GetTextBreak( DeviceCoordinate 
nMaxWidth, DeviceCoor
 {
 int nCharCapacity = mnEndCharPos - mnMinCharPos;
 std::unique_ptr const pCharWidths(new 
DeviceCoordinate[nCharCapacity]);
-if (!GetCharWidths(pCharWidths.get()))
-return -1;
+GetCharWidths(pCharWidths.get());
 
 DeviceCoordinate nWidth = 0;
 for( int i = mnMinCharPos; i < mnEndCharPos; ++i )
___
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/app/swmodule.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1fbbc34a4d25c479ebec1f1419b50bbd3c312127
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 16:56:59 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 22:08:23 2018 +0200

drop some more stuff for fuzzing

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

diff --git a/sw/source/uibase/app/swmodule.cxx 
b/sw/source/uibase/app/swmodule.cxx
index 14b800abfbe5..c186f1999fca 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -192,9 +192,8 @@ SwModule::SwModule( SfxObjectFactory* pWebFact,
 // member  is created and the color configuration is 
applied
 // at the view options.
 GetColorConfig();
+m_xLinguServiceEventListener = new SwLinguServiceEventListener;
 }
-
-m_xLinguServiceEventListener = new SwLinguServiceEventListener;
 }
 
 OUString SwResId(const char* pId)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - kit/Kit.cpp wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/DocumentBroker.cpp wsd/TileCache.cpp wsd/TileCache.hpp

[Libreoffice Gerrit user]

 kit/Kit.cpp|4 +++-
 wsd/ClientSession.cpp  |6 +-
 wsd/ClientSession.hpp  |   23 ++-
 wsd/DocumentBroker.cpp |   39 ---
 wsd/TileCache.cpp  |   35 ---
 wsd/TileCache.hpp  |2 +-
 6 files changed, 71 insertions(+), 38 deletions(-)

New commits:
commit c2a5f6acb0f1e93f19104b761661c852d930fb9e
Author: Tamás Zolnai 
AuthorDate: Mon Jul 23 16:09:55 2018 +0200
Commit: Tamás Zolnai 
CommitDate: Tue Jul 24 20:52:53 2018 +0200

Store number of tiles sent to kit for rendering

and use that info also to avoid sending to much tiles on the network.

Change-Id: Iab2d7af64693047a3c1cfe9f73de80a7100bbc13

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 47cedaa8d..a6e386243 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1079,7 +1079,9 @@ public:
 // The tile content is identical to what the client already 
has, so skip it
 LOG_TRC("Match for tile #" << tileIndex << " at (" << 
positionX << "," <<
 positionY << ") oldhash==hash (" << hash << "), 
wireId: " << wireId << " skipping");
-tiles.erase(tiles.begin() + tileIndex);
+tiles[tileIndex].setWireId(wireId);
+tiles[tileIndex].setImgSize(0);
+tileIndex++;
 continue;
 }
 
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 41fa32193..b421d3304 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -56,7 +56,9 @@ ClientSession::ClientSession(const std::string& id,
 _tileHeightPixel(0),
 _tileWidthTwips(0),
 _tileHeightTwips(0),
-_isTextDocument(false)
+_isTextDocument(false),
+_tilesOnFly(0),
+_tilesBeingRendered(0)
 {
 assert(!creatingPngThumbnail || thumbnailFile != "");
 const size_t curConnections = ++LOOLWSD::NumConnections;
@@ -350,6 +352,8 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 auto iter = std::find(_tilesOnFly.begin(), _tilesOnFly.end(), tileID);
 if(iter != _tilesOnFly.end())
 _tilesOnFly.erase(iter);
+else
+LOG_WRN("Tileprocessed message with an unknown tile ID");
 
 docBroker->sendRequestedTiles(shared_from_this());
 return true;
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index ca38257c6..fe565a672 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -137,6 +137,12 @@ public:
 /// This method updates internal data related to sent tiles (wireID and 
tiles-on-fly)
 /// Call this method anytime when a new tile is sent to the client
 void traceTileBySend(const TileDesc& tile);
+
+void traceSubscribe() { ++_tilesBeingRendered; }
+void traceUnSubscribe() { --_tilesBeingRendered; }
+void clearSubscription() { _tilesBeingRendered = 0; }
+
+int getTilesBeingRendered() const {return _tilesBeingRendered;}
 private:
 
 /// SocketHandler: disconnection event.
@@ -236,6 +242,10 @@ private:
 /// TileID's of the sent tiles. Push by sending and pop by tileprocessed 
message from the client.
 std::list _tilesOnFly;
 
+/// Number of tiles requested from kit, which this session is subsrcibed to
+/// Track only non-thumbnail tiles (getId() == -1)
+int _tilesBeingRendered;
+
 /// Requested tiles are stored in this list, before we can send them to 
the client
 boost::optional> _requestedTiles;
 
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 7c1e30e2b..84ad69a15 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1382,7 +1382,8 @@ void DocumentBroker::sendRequestedTiles(const 
std::shared_ptr& se
 if(requestedTiles != boost::none && !requestedTiles.get().empty())
 {
 std::vector tilesNeedsRendering;
-while(session->getTilesOnFlyCount() < tilesOnFlyUpperLimit && 
!requestedTiles.get().empty())
+while(session->getTilesOnFlyCount() + session->getTilesBeingRendered() 
< tilesOnFlyUpperLimit
+  && !requestedTiles.get().empty())
 {
 TileDesc& tile = *(requestedTiles.get().begin());
 
@@ -1416,15 +1417,9 @@ void DocumentBroker::sendRequestedTiles(const 
std::shared_ptr& se
 else
 {
 // Not cached, needs rendering.
-if(tile.getVersion() == -1) // Rendering of this tile was not 
requested yet
-{
-tile.setVersion(++_tileVersion);
-}
-if(!tileCache().hasTileBeingRendered(tile))
-{
-tilesNeedsRendering.push_back(tile);
-_debugRenderedTileCount++;
-}
+tile.setVersion(++_tileVersion);
+tilesNeedsRendering.push_back(tile);
+_debugRenderedTileCount++;
 tileCache().subscribeToTileRendering(tile, session);
 }

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - postprocess/CustomTarget_signing.mk

[Libreoffice Gerrit user]

 postprocess/CustomTarget_signing.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1e906500e36d9bd54ca3cc8ddb9a28b37c3737c3
Author: Christian Lohmaier 
AuthorDate: Tue May 9 13:23:59 2017 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Jul 24 20:38:15 2018 +0200

cannot sign read-only files, so u+w the redistributables

Change-Id: I5290d2093555d00e7b7cd4e21098d54af58ee6b8
(cherry picked from commit 5e062501eb6c3abe5219777fd9267702689785c7)

diff --git a/postprocess/CustomTarget_signing.mk 
b/postprocess/CustomTarget_signing.mk
index 1d7193cc517c..61336f40ac00 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -32,6 +32,7 @@ ifneq ($(ENABLE_DBGUTIL),TRUE)
EXCLUDELIST=$(shell $(gb_MKTEMP)) && \
cat $(SRCDIR)/postprocess/signing/no_signing.txt > $$EXCLUDELIST && \
echo "$(foreach lib,$(gb_MERGEDLIBS),$(call 
gb_Library_get_filename,$(lib)))" | tr ' ' '\n' >> $$EXCLUDELIST && \
+   chmod u+w $(foreach 
lib,$(MSVC_DLLS),$(INSTDIR)/program/shlxthdl/$(lib)) && \
$(PERL) $(SRCDIR)/postprocess/signing/signing.pl \
-e $$EXCLUDELIST \
-l $(subst .done,_log.txt,$@) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - postprocess/CustomTarget_signing.mk

[Libreoffice Gerrit user]

 postprocess/CustomTarget_signing.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 82f09101c86b2a6f09ccf770becf66556150ecda
Author: Christian Lohmaier 
AuthorDate: Tue May 9 13:23:59 2017 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Jul 24 18:56:46 2018 +0200

cannot sign read-only files, so u+w the redistributables

Change-Id: I5290d2093555d00e7b7cd4e21098d54af58ee6b8
(cherry picked from commit 5e062501eb6c3abe5219777fd9267702689785c7)

diff --git a/postprocess/CustomTarget_signing.mk 
b/postprocess/CustomTarget_signing.mk
index 1d7193cc517c..61336f40ac00 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -32,6 +32,7 @@ ifneq ($(ENABLE_DBGUTIL),TRUE)
EXCLUDELIST=$(shell $(gb_MKTEMP)) && \
cat $(SRCDIR)/postprocess/signing/no_signing.txt > $$EXCLUDELIST && \
echo "$(foreach lib,$(gb_MERGEDLIBS),$(call 
gb_Library_get_filename,$(lib)))" | tr ' ' '\n' >> $$EXCLUDELIST && \
+   chmod u+w $(foreach 
lib,$(MSVC_DLLS),$(INSTDIR)/program/shlxthdl/$(lib)) && \
$(PERL) $(SRCDIR)/postprocess/signing/signing.pl \
-e $$EXCLUDELIST \
-l $(subst .done,_log.txt,$@) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/src/map/handler/Map.Tap.js |   65 ++-
 1 file changed, 26 insertions(+), 39 deletions(-)

New commits:
commit 03a29a169968a48064a190f40b68e68d03f5
Author: Henry Castro 
AuthorDate: Tue Jul 24 13:57:44 2018 -0400
Commit: Henry Castro 
CommitDate: Tue Jul 24 14:03:10 2018 -0400

loleaflet: mobile: handle long click

Change-Id: I3c3ecce737e5c2457e922e2e612f0312dfab72dd

diff --git a/loleaflet/src/map/handler/Map.Tap.js 
b/loleaflet/src/map/handler/Map.Tap.js
index d5d25d570..b8a4e96a5 100644
--- a/loleaflet/src/map/handler/Map.Tap.js
+++ b/loleaflet/src/map/handler/Map.Tap.js
@@ -22,31 +22,21 @@ L.Map.Tap = L.Handler.extend({
 
L.DomEvent.preventDefault(e);
 
-   this._fireClick = true;
-
// don't simulate click or track longpress if more than 1 touch
if (e.touches.length > 1) {
-   this._fireClick = false;
clearTimeout(this._holdTimeout);
return;
}
 
-   var first = e.touches[0],
-   el = first.target;
+   var first = e.touches[0];
 
this._startPos = this._newPos = new L.Point(first.clientX, 
first.clientY);
 
-   // if touching a link, highlight it
-   if (el.tagName && el.tagName.toLowerCase() === 'a') {
-   L.DomUtil.addClass(el, 'leaflet-active');
-   }
-
// simulate long hold but setting a timeout
this._holdTimeout = setTimeout(L.bind(function () {
if (this._isTapValid()) {
-   this._fireClick = false;
-   this._onUp();
-   this._simulateEvent('contextmenu', first);
+   this._fireDblClick = true;
+   this._onUp(e);
}
}, this), 1000);
 
@@ -66,21 +56,12 @@ L.Map.Tap = L.Handler.extend({
touchend: this._onUp
}, this);
 
-   if (this._fireClick && e && e.changedTouches) {
-
-   var first = e.changedTouches[0],
-   el = first.target;
-
-   if (el && el.tagName && el.tagName.toLowerCase() === 
'a') {
-   L.DomUtil.removeClass(el, 'leaflet-active');
-   }
+   var first = e.changedTouches[0];
+   this._simulateEvent('mouseup', first);
 
-   this._simulateEvent('mouseup', first);
-
-   // simulate click if the touch didn't move too much
-   if (this._isTapValid()) {
-   this._simulateEvent('click', first);
-   }
+   if (this._fireDblClick) {
+   this._simulateEvent('dblclick', first);
+   this._fireDblClick = false;
}
},
 
@@ -91,21 +72,27 @@ L.Map.Tap = L.Handler.extend({
_onMove: function (e) {
var first = e.touches[0];
this._newPos = new L.Point(first.clientX, first.clientY);
+   this._simulateEvent('mousemove', first);
},
 
_simulateEvent: function (type, e) {
-   var simulatedEvent = document.createEvent('MouseEvents');
-
-   simulatedEvent._simulated = true;
-   e.target._simulatedClick = true;
-
-   simulatedEvent.initMouseEvent(
-   type, true, true, window, 1,
-   e.screenX, e.screenY,
-   e.clientX, e.clientY,
-   false, false, false, false, 0, null);
-
-   e.target.dispatchEvent(simulatedEvent);
+   var simulatedEvent = {
+   type: type,
+   canBubble: false,
+   cancelable: true,
+   screenX: e.screenX,
+   screenY: e.screenY,
+   clientX: e.clientX,
+   clientY: e.clientY,
+   ctrlKey: false,
+   altKey: false,
+   shiftKey: false,
+   metaKey: false,
+   button: 0,
+   target: e.target,
+   preventDefault: function () {}
+   };
+   this._map._handleDOMEvent(simulatedEvent);
}
 });
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/source/gdi/CommonSalLayout.cxx |9 +++--
 vcl/source/gdi/sallayout.cxx   |7 ---
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit d43c1b718f9a290307510b7d526a981b15264622
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 15:24:35 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 17:59:03 2018 +0200

split buffers to clarify what it does

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

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 9cf26a6971cd..a738a1d5168b 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1400,20 +1400,21 @@ sal_Int32 MultiSalLayout::GetTextBreak( 
DeviceCoordinate nMaxWidth, DeviceCoordi
 return mpLayouts[0]->GetTextBreak( nMaxWidth, nCharExtra, nFactor );
 
 int nCharCount = mnEndCharPos - mnMinCharPos;
-std::unique_ptr const pCharWidths(new 
DeviceCoordinate[2 * nCharCount]);
+std::unique_ptr const pCharWidths(new 
DeviceCoordinate[nCharCount]);
+std::unique_ptr const pFallbackCharWidths(new 
DeviceCoordinate[nCharCount]);
 mpLayouts[0]->FillDXArray( pCharWidths.get() );
 
 for( int n = 1; n < mnLevel; ++n )
 {
 SalLayout& rLayout = *mpLayouts[ n ];
-rLayout.FillDXArray( &pCharWidths[nCharCount] );
+rLayout.FillDXArray( pFallbackCharWidths.get() );
 double fUnitMul = mnUnitsPerPixel;
 fUnitMul /= rLayout.GetUnitsPerPixel();
 for( int i = 0; i < nCharCount; ++i )
 {
 if( pCharWidths[ i ] == 0 )
 {
-DeviceCoordinate w = pCharWidths[ i + nCharCount ];
+DeviceCoordinate w = pFallbackCharWidths[i];
 w = static_cast(w * fUnitMul + 0.5);
 pCharWidths[ i ] = w;
 }
commit ad3595cac951d069a2b0883a18711edab138c1ab
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 14:47:14 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 17:58:53 2018 +0200

forcepoint#53 restrict to expected index range

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

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index eb3260bdbdc9..647788129d32 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -574,13 +574,18 @@ bool GenericSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 
 bool GenericSalLayout::GetCharWidths(DeviceCoordinate* pCharWidths) const
 {
-int nCharCount = mnEndCharPos - mnMinCharPos;
+const int nCharCount = mnEndCharPos - mnMinCharPos;
 
 for (int i = 0; i < nCharCount; ++i)
 pCharWidths[i] = 0;
 
 for (auto const& aGlyphItem : m_GlyphItems)
-pCharWidths[aGlyphItem.mnCharPos - mnMinCharPos] += 
aGlyphItem.mnNewWidth;
+{
+const int nIndex = aGlyphItem.mnCharPos - mnMinCharPos;
+if (nIndex >= nCharCount)
+continue;
+pCharWidths[nIndex] += aGlyphItem.mnNewWidth;
+}
 
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 external/icu/UnpackedTarball_icu.mk |1 -
 external/icu/icu4c-icu11100.patch.1 |   27 ---
 2 files changed, 28 deletions(-)

New commits:
commit d0f44c46c678837f0b30928595d82443f3d53abe
Author: Michael Stahl 
AuthorDate: Fri Jul 13 14:41:39 2018 +0200
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 17:33:12 2018 +0200

icu: icu4c-icu11100.patch.1 presumed obsolete

According to http://bugs.icu-project.org/trac/ticket/11100
the bug was fixed upstream in a different way so hopefully
this patch can be removed (but i don't know how to verify this).

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

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 6800c1fb5ea8..0abba05b5bbe 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-mkdir.patch.1 \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
external/icu/icu4c-ubsan.patch.1 \
-   external/icu/icu4c-icu11100.patch.1 \
external/icu/icu4c-scriptrun.patch.1 \
external/icu/icu4c-rtti.patch.1 \
external/icu/icu4c-clang-cl.patch.1 \
diff --git a/external/icu/icu4c-icu11100.patch.1 
b/external/icu/icu4c-icu11100.patch.1
deleted file mode 100644
index 2f0e390961c1..
--- a/external/icu/icu4c-icu11100.patch.1
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur icu.org/source/common/ubidi.cpp icu/source/common/ubidi.cpp
 icu.org/source/common/ubidi.cpp2017-03-07 23:57:46.0 +0100
-+++ icu/source/common/ubidi.cpp2017-04-21 22:55:11.352659142 +0200
-@@ -2125,6 +2125,14 @@
- return DirProp_ON;
- }
- 
-+static int
-+isolatesavailable(UBiDi *pBiDi) {
-+if (pBiDi->isolates == pBiDi->simpleIsolates) {
-+return pBiDi->isolateCount < SIMPLE_ISOLATES_COUNT-1;
-+}
-+return pBiDi->isolateCount < pBiDi->isolatesSize/sizeof(Isolate)-1;
-+}
-+
- static void
- resolveImplicitLevels(UBiDi *pBiDi,
-   int32_t start, int32_t limit,
-@@ -2271,7 +2279,7 @@
- /* look for the last char not a BN or LRE/RLE/LRO/RLO/PDF */
- for(i=limit-1; i>start&&(DIRPROP_FLAG(dirProps[i])&MASK_BN_EXPLICIT); 
i--);
- dirProp=dirProps[i];
--if((dirProp==LRI || dirProp==RLI) && limitlength) {
-+if((dirProp==LRI || dirProp==RLI) && limitlength && 
isolatesavailable(pBiDi)) {
- pBiDi->isolateCount++;
- pBiDi->isolates[pBiDi->isolateCount].stateImp=stateImp;
- pBiDi->isolates[pBiDi->isolateCount].state=levState.state;
___
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/uiview/viewdlg2.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 84a0cdf166ea9ab5073b085193d0f10958897437
Author: Michael Stahl 
AuthorDate: Tue Jul 24 13:05:26 2018 +0200
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 17:31:38 2018 +0200

sw,sc: Signature Line: fix VclPtr assertion

Insert a Signature Line, right click, Sign..., Cancel

include/vcl/vclptr.hxx:116: VclPtr::~VclPtr() [with reference_type = 
AbstractSignSignatureLineDialog]: Assertion `(!m_rInnerRef.get() || 
m_rInnerRef->isDisposed() || m_rInnerRef->getRefCount() > 1) && "someone forgot 
to call dispose()"' failed.

Reviewed-on: https://gerrit.libreoffice.org/57913
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 6de194cb685dbe105a73812afa73070d04341bfb)
(The sc part is missing in libreoffice-6-1 so only fix sw)

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

diff --git a/sw/source/uibase/uiview/viewdlg2.cxx 
b/sw/source/uibase/uiview/viewdlg2.cxx
index 41bec30c8023..3e5174475249 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -84,8 +84,8 @@ void SwView::ExecDlgExt(SfxRequest const &rReq)
 assert(pFact && "VclAbstractDialogFactory fail!");
 
 const uno::Reference xModel(GetCurrentDocument());
-VclPtr pDialog
-= pFact->CreateSignSignatureLineDialog(GetFrameWeld(), xModel);
+ScopedVclPtr pDialog(
+pFact->CreateSignSignatureLineDialog(GetFrameWeld(), xModel));
 assert(pDialog && "Dialog creation failed!");
 
 if (pDialog)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 4602d890bf2f25b66b74bbd440397f5bbf7b3a43
Author: Olivier Hallot 
AuthorDate: Tue Jul 24 12:28:08 2018 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Jul 24 17:31:10 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Fix  case for icon replacement

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

diff --git a/helpcontent2 b/helpcontent2
index c8d840200ba0..1f5dbe3cfae7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c8d840200ba0175a09e5f6c68385f56e09c235ec
+Subproject commit 1f5dbe3cfae77c879d2b7c95131cc87393dccb00
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/link.txt.xsl

[Libreoffice Gerrit user]

 help3xsl/link.txt.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1f5dbe3cfae77c879d2b7c95131cc87393dccb00
Author: Olivier Hallot 
AuthorDate: Tue Jul 24 12:28:08 2018 -0300
Commit: Olivier Hallot 
CommitDate: Tue Jul 24 17:31:10 2018 +0200

Fix  case for icon replacement

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

diff --git a/help3xsl/link.txt.xsl b/help3xsl/link.txt.xsl
index 0d3c219f5..041e7d7d4 100644
--- a/help3xsl/link.txt.xsl
+++ b/help3xsl/link.txt.xsl
@@ -1717,7 +1717,7 @@ Stylesheet map Colibre icon images from link.txt
 cmd/sc_protect.png
 cmd/lc_protect.png
 
-
+
 
 
 
___
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/qa writerfilter/source

[Libreoffice Gerrit user]

 sw/qa/extras/rtfimport/data/tdf81943.rtf   |   48 +
 sw/qa/extras/rtfimport/rtfimport.cxx   |6 +++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   24 
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 +
 4 files changed, 80 insertions(+)

New commits:
commit 7e863504854ae8ab286b32510aba8b363a8e314b
Author: Miklos Vajna 
AuthorDate: Mon Jul 16 22:04:02 2018 +0200
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 17:25:25 2018 +0200

tdf#81943 sw RTF import: fix missing wrap in background for in-table shape

Regression from commit 015fd55c94b7b650ed8e572cafaf3b0f903b01b9
(tdf#96275 RTF import: fix anchor of shapes inside tables, 2016-05-10),
remember more context when delaying the import of a shape.

(cherry picked from commit 0c91f8f839d36c8b5af272b1d3c835d2f4af6b65)

Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx

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

diff --git a/sw/qa/extras/rtfimport/data/tdf81943.rtf 
b/sw/qa/extras/rtfimport/data/tdf81943.rtf
new file mode 100644
index ..28b3f430abce
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf81943.rtf
@@ -0,0 +1,48 @@
+{\rtf1
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;
+\red255\green255\blue255;\red0\green0\blue128;}
+\trowd \irow0\cellx6300\cellx10800\pard\plain 
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \lang1024\langfe1024\noproof 
+{\shp
+{\*\shpinst\shpleft-199\shptop-18\shpright11028\shpbottom2236\shpfhdr0\shpbxpage\shpbxignore\shpbypage\shpbyignore\shpwr3\shpwrk0\shpfblwtxt1\shpz0\shplockanchor\shplid1026
+{\sp
+{\sn shapeType}
+{\sv 75}
+}
+{\sp
+{\sn pib}
+{\sv 
+{\pict\picscalex99\picscaley99\piccropl0\piccropr0\piccropt0\piccropb0\picw19905\pich3997\picwgoal11285\pichgoal2266\pngblip
+89504e470d0a1a0a000d4948445200040004080200269309290009704859732e232e230178a53f76000774494d4507e2
+07090f031bf2645ea100144944415408d763cc63f8cf00034c0c480037070047bd01759ad735e249454e44ae426082}
+}
+}
+{\sp
+{\sn posrelh}
+{\sv 1}
+}
+{\sp
+{\sn posrelv}
+{\sv 1}
+}
+{\sp
+{\sn fBehindDocument}
+{\sv 1}
+}
+}
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0  \cell }
+\pard \ltrpar \intbl\cell
+\pard\plain \ltrpar\ql \li0\ri0\intbl\aspnum \rtlch\fcs1 \af1\afs22 
\ltrch\fcs0 \f39\fs18\lang1033\langfe1033\cgrid 
+{\rtlch\fcs1 \af1 \ltrch\fcs0  \trowd \irow0\cellx6300\cellx10800\row }
+\trowd \irow1\lastrow 
+\cellx6300\cellx10800\pard\plain
+\f42\fs40\cf8\lang1033\langfe1033\cgrid 
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \f31506 hello\cell}
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1049\langfe1033 \cell }
+\pard\plain
+{\rtlch\fcs1 \af1 \ltrch\fcs0  \trowd \irow1\lastrow 
+\cellx6300\cellx10800\row }
+\pard\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 10c32eb50c50..659b422f5f1a 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -173,6 +173,12 @@ DECLARE_RTFIMPORT_TEST(testTdf115715, "tdf115715.rtf")
  getProperty(getParagraph(2), 
"ParaFirstLineIndent"));
 }
 
+DECLARE_RTFIMPORT_TEST(testTdf81943, "tdf81943.rtf")
+{
+// The shape wasn't in background.
+CPPUNIT_ASSERT_EQUAL(false, getProperty(getShape(1), "Opaque"));
+}
+
 DECLARE_RTFIMPORT_TEST(testTdf115155, "tdf115155.rtf")
 {
 auto xLevels
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 14eba29aa4a5..d48df600c34f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1065,6 +1065,13 @@ void RTFDocumentImpl::resolvePict(bool const bInline, 
uno::Reference(aAnchorWrapAttributes);
+
+if (m_aStates.top().aShape.aWrapSprm.first != 0)
+// Replay of a buffered shape, wrap sprm there has priority over
+// character sprms of the current state.
+aAnchorSprms.set(m_aStates.top().aShape.aWrapSprm.first,
+ m_aStates.top().aShape.aWrapSprm.second);
+
 aAnchorSprms.set(NS_ooxml::LN_CT_Anchor_extent, pExtentValue);
 if (!aAnchorWrapAttributes.empty() && nWrap == -1)
 aAnchorSprms.set(NS_ooxml::LN_EG_WrapType_wrapSquare, 
pAnchorWrapValue);
@@ -1633,6 +1640,11 @@ void RTFDocumentImpl::replayBuffer(RTFBuffer_t& rBuffer, 
RTFSprms* const pSprms,
 // otherwise it gets re-buffered.
 RTFBuffer_t* pCurrentBuffer = m_aStates.top().pCurrentBuffer;
 m_aStates.top().pCurrentBuffer = nullptr;
+
+// Set current shape during replay, needed by e.g. wrap in
+// background.
+m_aStates.top().aSha

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

[Libreoffice Gerrit user]

 sc/source/filter/rtf/eeimpars.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8c29928de76ff24f9b6dc4dba08940e63e54413d
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 14:20:20 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 16:25:20 2018 +0200

ofz#9431 don't check attribs of Invalid column

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

diff --git a/sc/source/filter/rtf/eeimpars.cxx 
b/sc/source/filter/rtf/eeimpars.cxx
index 890c536f80fd..da23becae30c 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -157,7 +157,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, 
double nOutputFactor, SvNu
 SCCOL nCol = nStartCol + pE->nCol + nMergeColAdd;
 // Determine RowMerge
 // Pure ColMerge and ColMerge of the first MergeRow already done 
during parsing
-if ( nRow <= nOverlapRowMax )
+if (nRow <= nOverlapRowMax && ValidCol(nCol))
 {
 while ( nCol <= MAXCOL && mpDoc->HasAttrib( nCol, nRow, nTab,
 nCol, nRow, nTab, HasAttrFlags::Overlapped ) )
___
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/controller/chartapiwrapper/AreaWrapper.cxx   
|6 
 chart2/source/controller/chartapiwrapper/AreaWrapper.hxx   
|2 
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx   
|   38 ++---
 chart2/source/controller/chartapiwrapper/AxisWrapper.hxx   
|2 
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx  
|   30 ++--
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
|   72 +-
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
|2 
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
|   28 +--
 chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
|2 
 chart2/source/controller/chartapiwrapper/GridWrapper.cxx   
|6 
 chart2/source/controller/chartapiwrapper/GridWrapper.hxx   
|2 
 chart2/source/controller/chartapiwrapper/LegendWrapper.cxx 
|   12 -
 chart2/source/controller/chartapiwrapper/LegendWrapper.hxx 
|2 
 chart2/source/controller/chartapiwrapper/TitleWrapper.cxx  
|   10 -
 chart2/source/controller/chartapiwrapper/TitleWrapper.hxx  
|2 
 chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx  
|8 -
 chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx  
|2 
 
chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx 
   |9 -
 
chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx 
   |2 
 
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
 |   52 +++
 
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx
 |6 
 chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
|8 -
 chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
|2 
 chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx  
|8 -
 chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx  
|4 
 chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx  
|   34 ++--
 chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx  
|2 
 chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
|4 
 chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
|2 
 chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx  
|4 
 chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx  
|2 
 chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx   
|8 -
 chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx   
|2 
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
|   34 ++--
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx
|4 
 chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
|6 
 chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx
|2 
 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx   
|   16 +-
 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx   
|4 
 chart2/source/controller/inc/ChartDocumentWrapper.hxx  
|2 
 chart2/source/inc/WrappedIgnoreProperty.hxx
|8 -
 chart2/source/inc/WrappedProperty.hxx  
|3 
 chart2/source/inc/WrappedPropertySet.hxx   
|2 
 chart2/source/tools/WrappedIgnoreProperty.cxx  
|   52 +++
 chart2/source/tools/WrappedPropertySet.cxx 
|   43 +
 45 files changed, 266 insertions(+), 285 deletions(-)

New commits:
commit ac8a1a146fa362ebe6849ae1a592a0629801971d
Author: Noel Grandin 
AuthorDate: Mon Jul 23 14:45:22 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 24 15:37:37 2018 +0200

pass WrappedProperty around by std::unique_ptr

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

diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx 
b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 069c26e6197a..66fed1b1b8be 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiw

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

[Libreoffice Gerrit user]

 sw/uiconfig/sglobal/popupmenu/table.xml  |1 +
 sw/uiconfig/sweb/popupmenu/table.xml |1 +
 sw/uiconfig/swform/popupmenu/table.xml   |1 +
 sw/uiconfig/swreport/popupmenu/table.xml |1 +
 sw/uiconfig/swriter/popupmenu/table.xml  |1 +
 sw/uiconfig/swxform/popupmenu/table.xml  |1 +
 6 files changed, 6 insertions(+)

New commits:
commit 90430ac55ca4ac2ccd54d19bdcb5dc488d42e0ef
Author: Xisco Fauli 
AuthorDate: Mon Jul 23 19:06:08 2018 +0200
Commit: Xisco Faulí 
CommitDate: Tue Jul 24 15:30:06 2018 +0200

tdf#86619 Reintroduce Insert Caption to the table context menu

This was removed in 4d0b11411d11050b13b821e847bab86f1247bcea
however, the Insert Caption entry is available for images, charts and 
frames,
thus, reintroducing in to keep it consistent across context menus

Change-Id: I7dbe15ba82b8997a53eb32f8207c7ea35246b6df
Reviewed-on: https://gerrit.libreoffice.org/57861
Reviewed-by: Heiko Tietze 
Tested-by: Xisco Faulí 

diff --git a/sw/uiconfig/sglobal/popupmenu/table.xml 
b/sw/uiconfig/sglobal/popupmenu/table.xml
index 624905ff401c..627b4aa562b4 100644
--- a/sw/uiconfig/sglobal/popupmenu/table.xml
+++ b/sw/uiconfig/sglobal/popupmenu/table.xml
@@ -55,6 +55,7 @@
 
   
   
+  
   
   
   
diff --git a/sw/uiconfig/sweb/popupmenu/table.xml 
b/sw/uiconfig/sweb/popupmenu/table.xml
index 624905ff401c..627b4aa562b4 100644
--- a/sw/uiconfig/sweb/popupmenu/table.xml
+++ b/sw/uiconfig/sweb/popupmenu/table.xml
@@ -55,6 +55,7 @@
 
   
   
+  
   
   
   
diff --git a/sw/uiconfig/swform/popupmenu/table.xml 
b/sw/uiconfig/swform/popupmenu/table.xml
index 624905ff401c..627b4aa562b4 100644
--- a/sw/uiconfig/swform/popupmenu/table.xml
+++ b/sw/uiconfig/swform/popupmenu/table.xml
@@ -55,6 +55,7 @@
 
   
   
+  
   
   
   
diff --git a/sw/uiconfig/swreport/popupmenu/table.xml 
b/sw/uiconfig/swreport/popupmenu/table.xml
index 624905ff401c..627b4aa562b4 100644
--- a/sw/uiconfig/swreport/popupmenu/table.xml
+++ b/sw/uiconfig/swreport/popupmenu/table.xml
@@ -55,6 +55,7 @@
 
   
   
+  
   
   
   
diff --git a/sw/uiconfig/swriter/popupmenu/table.xml 
b/sw/uiconfig/swriter/popupmenu/table.xml
index 4bedc921c551..bdd835d4960c 100644
--- a/sw/uiconfig/swriter/popupmenu/table.xml
+++ b/sw/uiconfig/swriter/popupmenu/table.xml
@@ -55,6 +55,7 @@
 
   
   
+  
   
   
   
diff --git a/sw/uiconfig/swxform/popupmenu/table.xml 
b/sw/uiconfig/swxform/popupmenu/table.xml
index 624905ff401c..627b4aa562b4 100644
--- a/sw/uiconfig/swxform/popupmenu/table.xml
+++ b/sw/uiconfig/swxform/popupmenu/table.xml
@@ -55,6 +55,7 @@
 
   
   
+  
   
   
   
___
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' - editeng/source

[Libreoffice Gerrit user]

 editeng/source/misc/svxacorr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1706ed7334461420274584b875ae6ab209f4dad9
Author: Xisco Fauli 
AuthorDate: Mon Jul 23 22:00:25 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 24 15:16:53 2018 +0200

tdf#118517: Use xStg before resetting it

Regression from 0f166ef5240ee155bf2544e6bc3c985b1e3bf646
Change-Id: I083951700895a00be8d4407871c27804ca3e5f30
Reviewed-on: https://gerrit.libreoffice.org/57881
Reviewed-by: Julien Nabet 
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 
(cherry picked from commit a61d61f66f80c91c14825f8fe8fb9bd3f295591b)
Reviewed-on: https://gerrit.libreoffice.org/57906
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 556f60b9c426..b890b5cd0984 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2568,9 +2568,9 @@ void SvxAutoCorrectLanguageLists::PutText( const 
OUString& rShort,
 try
 {
 uno::Reference < embed::XStorage > xStg = 
comphelper::OStorageHelper::GetStorageFromURL( sUserAutoCorrFile, 
embed::ElementModes::READWRITE );
+bool bRet = rAutoCorrect.PutText( xStg, sUserAutoCorrFile, rShort, 
rShell, sLong );
 xStg = nullptr;
 
-bool bRet = rAutoCorrect.PutText( xStg, sUserAutoCorrFile, rShort, 
rShell, sLong );
 // Update the word list
 if( bRet )
 {
___
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/core/text/porfld.cxx  |2 +-
 sw/source/uibase/uiview/viewtab.cxx |   12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit af7b9609fee603756f8cb0668ae45af37c5fb4fb
Author: Noel Grandin 
AuthorDate: Mon Jul 23 15:08:41 2018 +0200
Commit: Xisco Faulí 
CommitDate: Tue Jul 24 15:13:52 2018 +0200

tdf#118716 Inner border of an embedded table can't be dragged around

regression from
commit f14b9d30293f180500fc56d81e5390021758e7c1
convert (a>b?a:b) to std::max(a,b)

In this code
   int a;
   std::max(a,0)
std::max will first convert a and b to sal_uInt16, therefore potentially
converting a negative number to a positive number due to the conversion
rules. Then it will take the larger number.

While this code
int a;
static_cast(a > 0 ? a : 0)
will compare first, and then convert the larger number to sal_uInt16,
which might result in making a "a" that is larger than 2^16 into a
smaller value, but which will never convert a negative "a" value into a
positive value.

Change-Id: Id4f6df0089b1a74ea4ac1c5d05655e7c1d8f0c7f
Reviewed-on: https://gerrit.libreoffice.org/57846
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit c13865a4caf7898c4e59a5b22bbd493d6dad9661)
Reviewed-on: https://gerrit.libreoffice.org/57908
Tested-by: Xisco Faulí 
Reviewed-by: Xisco Faulí 

diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index d40ff3ed3dc0..ac3596f78262 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -830,7 +830,7 @@ bool SwGrfNumPortion::Format( SwTextFormatInfo &rInf )
 const bool bFull = rInf.Width() < rInf.X() + Width();
 const bool bFly = rInf.GetFly() ||
 ( rInf.GetLast() && rInf.GetLast()->IsFlyPortion() );
-SetAscent( std::max(GetRelPos(), 0) );
+SetAscent( GetRelPos() > 0 ? GetRelPos() : 0 );
 if( GetAscent() > Height() )
 Height( GetAscent() );
 
diff --git a/sw/source/uibase/uiview/viewtab.cxx 
b/sw/source/uibase/uiview/viewtab.cxx
index 4dab2bb0a4bf..545b3f2e48ab 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -1700,8 +1700,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 const int nRgt = (bTableVertical ? nPageHeight : nPageWidth) -
  (aTabCols.GetLeftMin() + aTabCols.GetRight());
 
-const sal_uInt16 nL = std::max< sal_uInt16 >(nLft, 0);
-const sal_uInt16 nR = std::max< sal_uInt16 >(nRgt, 0);
+const sal_uInt16 nL = static_cast< sal_uInt16 >(std::max(nLft, 
0));
+const sal_uInt16 nR = static_cast< sal_uInt16 >(std::max(nRgt, 
0));
 
 SvxColumnItem aColItem(nNum, nL, nR);
 
@@ -1937,8 +1937,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 const int nRgt = (bVerticalWriting ? nPageWidth : nPageHeight) 
-
  (aTabCols.GetLeftMin() + aTabCols.GetRight());
 
-const sal_uInt16 nL = std::max< sal_uInt16 >(nLft, 0);
-const sal_uInt16 nR = std::max< sal_uInt16 >(nRgt, 0);
+const sal_uInt16 nL = static_cast< sal_uInt16 >(std::max(nLft, 
0));
+const sal_uInt16 nR = static_cast< sal_uInt16 >(std::max(nRgt, 
0));
 
 SvxColumnItem aColItem(0, nL, nR);
 
@@ -2011,8 +2011,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 const int nLft = aTabCols.GetLeftMin() + 
aTabCols.GetLeft();
 const int nRgt = nPageWidth -(aTabCols.GetLeftMin() + 
aTabCols.GetRight());
 
-const sal_uInt16 nL = std::max< sal_uInt16 >(nLft, 0);
-const sal_uInt16 nR = std::max< sal_uInt16 >(nRgt, 0);
+const sal_uInt16 nL = static_cast< sal_uInt16 
>(std::max(nLft, 0));
+const sal_uInt16 nR = static_cast< sal_uInt16 
>(std::max(nRgt, 0));
 
 aRectangle.SetLeft( nL );
 if(nNum > 1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/ui/view/tabvwshb.cxx   |4 ++--
 sw/source/uibase/uiview/viewdlg2.cxx |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6de194cb685dbe105a73812afa73070d04341bfb
Author: Michael Stahl 
AuthorDate: Tue Jul 24 13:05:26 2018 +0200
Commit: Michael Stahl 
CommitDate: Tue Jul 24 15:06:07 2018 +0200

sw,sc: Signature Line: fix VclPtr assertion

Insert a Signature Line, right click, Sign..., Cancel

include/vcl/vclptr.hxx:116: VclPtr::~VclPtr() [with reference_type = 
AbstractSignSignatureLineDialog]: Assertion `(!m_rInnerRef.get() || 
m_rInnerRef->isDisposed() || m_rInnerRef->getRefCount() > 1) && "someone forgot 
to call dispose()"' failed.

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

diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 4e5fb7b98869..5fc41502f1ea 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -362,8 +362,8 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
 GetViewData().GetDocShell()->GetBaseModel());
 
 VclAbstractDialogFactory* pFact = 
VclAbstractDialogFactory::Create();
-VclPtr pDialog
-= pFact->CreateSignSignatureLineDialog(GetFrameWeld(), 
xModel);
+ScopedVclPtr pDialog(
+pFact->CreateSignSignatureLineDialog(GetFrameWeld(), 
xModel));
 pDialog->Execute();
 break;
 }
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx 
b/sw/source/uibase/uiview/viewdlg2.cxx
index e88a14128519..6308b552a1ae 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -71,8 +71,8 @@ void SwView::ExecDlgExt(SfxRequest const &rReq)
 {
 VclAbstractDialogFactory* pFact = 
VclAbstractDialogFactory::Create();
 const uno::Reference xModel(GetCurrentDocument());
-VclPtr pDialog
-= pFact->CreateSignSignatureLineDialog(GetFrameWeld(), xModel);
+ScopedVclPtr pDialog(
+pFact->CreateSignSignatureLineDialog(GetFrameWeld(), xModel));
 pDialog->Execute();
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Compiler baselines (was: [Libreoffice-qa] minutes of ESC call ...)

[Tor Lillqvist]

I would assume that Visual Studio gently but firmly tries to insist you
keep updated to the latest release of it anyway, so I don't see any reason
to not require a relatively recent release. So feel free to explicitly do
that, if you can figure our how to do it cleanly in configure.ac.

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

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

[Libreoffice Gerrit user]

 sw/source/core/text/porlay.cxx |   25 -
 sw/source/core/text/porlay.hxx |1 +
 2 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 8347f43707ca1dc4f79dbaf3d5136f35067a6e6d
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 11:40:33 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 14:42:50 2018 +0200

forcepoint#52 flatten deep recursive delete of SwLineLayout

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

diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index e6b2ea0ee5a1..843d09c231b8 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -171,6 +171,29 @@ static  bool lcl_HasStrongLTR ( const OUString& rText, 
sal_Int32 nStart, sal_Int
  return false;
  }
 
+// This is (meant to be) functionally equivalent to 'delete m_pNext' where
+// deleting a SwLineLayout recursively deletes the owned m_pNext SwLineLayout.
+//
+// Here, instead of using a potentially deep stack, iterate over all the
+// SwLineLayouts that would be deleted recursively and delete them linearly
+void SwLineLayout::DeleteNext()
+{
+if (!m_pNext)
+return;
+std::vector aNexts;
+SwLineLayout* pNext = m_pNext;
+do
+{
+aNexts.push_back(pNext);
+SwLineLayout* pLastNext = pNext;
+pNext = pNext->GetNext();
+pLastNext->SetNext(nullptr);
+}
+while (pNext);
+for (auto a : aNexts)
+delete a;
+}
+
 // class SwLineLayout: This is the layout of a single line, which is made
 // up of its dimension, the character count and the word spacing in the line.
 // Line objects are managed in an own pool, in order to store them continuously
@@ -178,7 +201,7 @@ static  bool lcl_HasStrongLTR ( const OUString& rText, 
sal_Int32 nStart, sal_Int
 SwLineLayout::~SwLineLayout()
 {
 Truncate();
-delete m_pNext;
+DeleteNext();
 if( pBlink )
 pBlink->Delete( this );
 m_pLLSpaceAdd.reset();
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 1ebf00cc0c0d..bffa35c692e8 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -102,6 +102,7 @@ private:
 
 SwTwips GetHangingMargin_() const;
 
+void DeleteNext();
 public:
 // From SwLinePortion
 virtual SwLinePortion *Insert( SwLinePortion *pPortion ) override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Compiler baselines (was: [Libreoffice-qa] minutes of ESC call ...)

[Stephan Bergmann]

[fuck gmail; this was meant to go to libreoffice@lists.freedesktop.org 
not libreoffice...@lists.freedesktop.org]



 Forwarded Message 
Subject: Compiler baselines (was: [Libreoffice-qa] minutes of ESC call ...)
Date: Tue, 24 Jul 2018 12:28:21 +0200
From: Stephan Bergmann 
To: libreoffice...@lists.freedesktop.org

On 19/07/18 16:50, Michael Meeks wrote:

* GCC 4.8 support no longer needed for master by City of Munich (Michael W)
 + prolly the only ones still using this vs. master.
 + 6.1 is the last one built for Ubuntu 14.04
 + new base-line is Ubuntu 18.04
 + gcc 7
 + would also require bumping base-line on TDF linux builds (Christian)
 + ideally wait for Stephan (Michael)
 + this may help wrt. C++ features, the VS 2017 upgrade didn’t much (Miklos)
 + due to older gcc baseline.
 + CentOS6 – continues until 2020, CentOS 7 til 2024 (Christian)
 + would like to build more KDE on a newer baseline (Thorsten)
 => when Stephan is back.


So what would we gain re C++11/14/17 support if we bump the current 
master (towards LO 6.2) Linux GCC baseline from 4.8.1 to, say, 7?


One limiting factor is MSVC, where---IIUC---our current baseline is VS 
2017 15.0 (aka 19.10), but many features are only available in later 
15.x (aka 19.y), see 
.  Is there any good 
reason to stick with an older version of VS 2017, or could we require 
the latest version (which appears to be 15.7 aka 19.14) or at least the 
second-latest one (15.6 aka 19.13)?


According to the feature matrix at 
, bumping to GCC 7 
and MSVC 2017 15.7 would give us almost complete C++17 support, which 
would of course be a great step forward.  Staying at MSVC 2017 15.0 
would limit that substantially.  (Clang has never been a limiting factor 
in recent years.  I didn't check now, but would assume that our 
macOS/Xcode baseline is recent enough to provide all the features.)


As an example, the relevant feature-test macros we currently have in 
config_host/config_global.h.in would be satisfied as follows:


* HAVE_CXX14_CONSTEXPR: yes (GCC 5, Clang 3.4, MSVC 19.10, "Extended 
constexpr" at ).


* HAVE_GCC_PRAGMA_OPERATOR: yes (GCC 4.3, Clang, MSVC 19.0, "C99 
preprocessor" at 
; so this 
should already be satisfied today).


* HAVE_GCC_DEPRECATED_MESSAGE: yes (GCC 4.9, Clang 3.4, MSVC 19.0, 
"[[deprecated]] attribute" at 
).


* HAVE_BROKEN_CONST_ITERATORS: yes (see "We should be able to drop the 
below check when bumping the GCC baseline to 4.9 [...]" in configure.ac).


* HAVE_GCC_ATTRIBUTE_WARN_UNUSED: yes, if we don't stick to MSVC 15.0 
(GCC 7, Clang 3.9, MSVC 19.11, "[[nodiscard]] attribute" at 
).


* HAVE_CPP_GUARANTEED_COPY_ELISION: yes, if we don't stick to MSVC 15.0 
(GCC 7, Clang 4, MSVC 19.13, "Guaranteed copy elision" at 
).


(And we would get rid of the nuisance that GCC 4.8 still required an 
explicit


  return OUString("foo")

instead of just

  return "foo";

.)

For the TDF Linux builds on CentOS 6 with Developer Toolset (where we 
currently use Deverloper Toolset 2 with GCC 4.8.2, IIUC), my 
understanding would be that Developer Toolset 7 with GCC 7 should be 
available to use instead (searching the web I found 
)?

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

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

[Libreoffice Gerrit user]

 sw/qa/core/data/ww8/pass/forcepoint50-grfanchor-1.doc |binary
 sw/source/filter/ww8/ww8par6.cxx  |6 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 2fd44e945d3d0bb6318ba704c7ca2ac06c7db263
Author: Caolán McNamara 
AuthorDate: Fri Jul 20 12:28:54 2018 +0100
Commit: Michael Stahl 
CommitDate: Tue Jul 24 13:43:09 2018 +0200

forcepoint#51 anchor location deleted before graphic anchor processed

try deferring to after anchor stack is cleared

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

diff --git a/sw/qa/core/data/ww8/pass/forcepoint50-grfanchor-1.doc 
b/sw/qa/core/data/ww8/pass/forcepoint50-grfanchor-1.doc
new file mode 100644
index ..91ee6b58f210
Binary files /dev/null and 
b/sw/qa/core/data/ww8/pass/forcepoint50-grfanchor-1.doc differ
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 3d543b74bc97..9b9998081fca 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2526,6 +2526,7 @@ void SwWW8ImplReader::StopApo()
 Color aBg(0xFE, 0xFF, 0xFF, 0xFF);  //Transparent by default
 
 SwTextNode* pNd = aPref.GetNode().GetTextNode();
+SwTextNode* pJoinNext = nullptr;
 if (pNd && m_xSFlyPara->pFlyFormat)
 {
 /*
@@ -2555,13 +2556,16 @@ void SwWW8ImplReader::StopApo()
 }
 
 //Get rid of extra empty paragraph
-pNd->JoinNext();
+pJoinNext = pNd;
 }
 
 if (m_xSFlyPara->pFlyFormat)
 m_xSFlyPara->pFlyFormat->SetFormatAttr(SvxBrushItem(aBg, 
RES_BACKGROUND));
 
 DeleteAnchorStack();
+if (pJoinNext)
+pJoinNext->JoinNext();
+
 m_xAnchorStck = std::move(m_xSFlyPara->xOldAnchorStck);
 
 // When inserting a graphic into the fly frame using the auto
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO build: CppunitTest error in Ubuntu 16.04/18.04

[Michael Stahl]

On 24.07.2018 12:12, Ch g wrote:
I tried to build a local branch created by merging latest gerrit master 
with another branch, on both Ubuntu 16.04.4 and Ubuntu 18.04.1, and got 
the same following error.





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

make CppunitTest_sd_import_tests CPPUNITTRACE="gdb --args"

 # for interactive debugging on Linux

make CppunitTest_sd_import_tests VALGRIND=memcheck

 # for memory checking

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

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



this tells you that a test failed - but not why - perhaps you will find 
messages about assertion failures further up in the output?  those would 
be interesting...


That branch was built(make) successfully only *with* 
option "--build-nocheck" on MacOS 10.13.3, and that built LO app was 
usable despite having some bugs which I caused when merging the 
original old branch.



How should I get a full normal build done?


perhaps it's a good idea to first do a build of the upstream master, 
without your changes?  then you'll know if your changes introduced the 
test failures or not.


to find out why the tests fail, use e.g. the gdb command that is 
printed, together with CPPUNIT_TEST_NAME to limit it to the failing test(s).

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

[Libreoffice-commits] online.git: 3 commits - loleaflet/src wsd/FileServer.cpp wsd/FileServer.hpp

[Libreoffice Gerrit user]

 loleaflet/src/control/Toolbar.js |   13 -
 wsd/FileServer.cpp   |   54 +++
 wsd/FileServer.hpp   |5 ++-
 3 files changed, 43 insertions(+), 29 deletions(-)

New commits:
commit 594348b6fee74fdcb95f15247562ce485a66350f
Author: George Wood 
AuthorDate: Tue Jul 24 12:19:52 2018 +0100
Commit: Michael Meeks 
CommitDate: Tue Jul 24 12:27:35 2018 +0100

enables debug mode to be turned on from the about screen by pressing d.

Also fixes focus issue with map after closing dialog.

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 8d1cebcf5..6c7360df9 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -1,3 +1,4 @@
+/* -*- js-indent-level: 8 -*- */
 /*
  * Toolbar handler
  */
@@ -186,6 +187,7 @@ L.Map.include({
contentCSS: {width: w + 'px'},
buttons: {},
afterOpen: function($vexContent) {
+   map.enable(false);
// Display help according to document 
opened
if (map.getDocType() === 'text') {

document.getElementById('text-shortcuts').style.display='block';
@@ -197,7 +199,7 @@ L.Map.include({

document.getElementById('presentation-shortcuts').style.display='block';
}
 
-   // Lets transalte
+   // Lets translate
var i, max;
var translatableContent = 
$vexContent.find('h1');
for (i = 0, max = 
translatableContent.length; i < max; i++) {
@@ -225,6 +227,7 @@ L.Map.include({
},
beforeClose: function () {
map.focus();
+   map.enable(true);
}
});
});
@@ -240,6 +243,11 @@ L.Map.include({

content.find('#product-string').text(productString.replace('%productName', 
productName));
var w = window.innerWidth / 2;
var map = this;
+   var handler = function(event) {
+   if (event.keyCode === 68) {
+   map._docLayer.toggleTileDebugMode();
+   }
+   };
vex.open({
content: content,
showCloseButton: true,
@@ -249,6 +257,7 @@ L.Map.include({
buttons: {},
afterOpen: function($vexContent) {
map.enable(false);
+   $(window).bind('keyup.vex', handler);
// workaround for 
https://github.com/HubSpot/vex/issues/43
$('.vex-overlay').css({ 'pointer-events': 
'none'});
$('.vex').click(function() {
@@ -259,7 +268,9 @@ L.Map.include({
});
},
beforeClose: function () {
+   $(window).unbind('keyup.vex', handler)
map.enable(true);
+   map.focus();
}
});
}
commit 73b8da4ab009248badbf041fb2d63a40c3ebad9d
Author: George Wood 
AuthorDate: Mon Jul 23 13:37:34 2018 +0100
Commit: Michael Meeks 
CommitDate: Tue Jul 24 12:27:35 2018 +0100

Cleanup error reporting.

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 6af1be5d7..6b7ba63bd 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -413,48 +413,43 @@ void FileServerRequestHandler::handleRequest(const 
HTTPRequest& request, Poco::M
 catch (const Poco::Net::NotAuthenticatedException& exc)
 {
 LOG_ERR("FileServerRequestHandler::NotAuthenticated: " << 
exc.displayText());
-
-// Unauthorized.
-std::ostringstream oss;
-oss << "HTTP/1.1 401\r\n"
-<< "Date: " << Poco::DateTimeFormatter::format(Poco::Timestamp(), 
Poco::DateTimeFormat::HTTP_FORMAT) << "\r\n"
-<< "User-Agent: " << WOPI_AGENT_STRING << "\r\n"
-<< "Content-Length: 0\r\n"
-<< "WWW-Authenticate: Basic realm=\"online\"\r\n"
-<< "\r\n";
-socket->send(oss.str());
+sendError(401, request, socket, "", "", "WWW-authenticate: Basic 
realm=\"online\"\r\n");
 }
 catch (const Poco::FileAccessDeniedException& exc)
 {
 LOG_ERR("FileServerRequestHandler: " << exc.displayText());
-
-/

Re: Question, please

[Michael Stahl]

On 23.07.2018 22:03, Susan Jean wrote:

Hi Folks,

I'm fairly new to LibreOffice and have attempted to make a build following the wiki page, 
"LibreOffice Development Environment". I got pretty far but am having a few issues in the step, 
"../../opt/bin/make 2>&1 | tee build.log".

Could someone kindly point me to a developer who might be able to help me? I'd 
be quite grateful.


hi Susan,

this list is the right place, another is the IRC channel 
#libreoffice-dev, but please include some details on what is going 
wrong, such as error messages (especially compiler error messages), 
otherwise nobody will be able to help.

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

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - package/source

[Libreoffice Gerrit user]

 package/source/zipapi/ZipFile.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e06a33ee928240259649438951b81c118a2db925
Author: David Ostrovsky 
AuthorDate: Sun Jan 15 11:05:03 2017 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Jul 24 13:17:31 2018 +0200

ZipFile: make it work on MSVC 14.0

Change-Id: I99a00c61634375a75e15a8c1530213f5aad25b51
(cherry picked from commit 32c9876d51fe0357ba66eb6292f772728080510b)

diff --git a/package/source/zipapi/ZipFile.cxx 
b/package/source/zipapi/ZipFile.cxx
index fb8fc3db3c66..35dfb5083023 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -34,6 +34,7 @@
 #include 
 
 #include 
+#include 
 #include 
 
 #include "blowfishcontext.hxx"
___
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/filter/excel/xlstyle.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c8d7715e9fcf69ad4130a2bc7e393f42bfcacd0a
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 10:21:43 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 13:17:19 2018 +0200

valgrind: use of unit value exporting tdf107162-1.ots to xls

Conditional jump or move depends on uninitialised value(s)
   at 0x4554B657: SetApiUnderline (xlstyle.cxx:487)
   by 0x4554B657: (anonymous 
namespace)::lclSetApiFontSettings(XclFontData&, rtl::OUString const&, float, 
float, com::sun::star::awt::FontSlant, short, short) (xlstyle.cxx:583)
   by 0x4554C096: XclFontPropSetHelper::ReadFontProperties(XclFontData&, 
ScfPropertySet const&, XclFontPropSetType, short) (xlstyle.cxx:679)
   by 0x4546D8BE: 
XclExpTbxControlObj::XclExpTbxControlObj(XclExpObjectManager&, 
com::sun::star::uno::Reference const&, 
tools::Rectangle const*) (xeescher.cxx:753)
   by 0x45593D99: 
XclEscherEx::CreateTBXCtrlObj(com::sun::star::uno::Reference
 const&, tools::Rectangle const*) (xcl97esc.cxx:441)
   by 0x45594E85: 
XclEscherEx::StartShape(com::sun::star::uno::Reference
 const&, tools::Rectangle const*) (xcl97esc.cxx:254)
   by 0x44E4FFBC: ImplEESdrWriter::ImplWriteShape(ImplEESdrObject&, 
EscherSolverContainer&, bool) (eschesdo.cxx:164)
   by 0x44E510C3: ImplEESdrWriter::ImplWriteShape(ImplEESdrObject&, 
EscherSolverContainer&, bool) (eschesdo.cxx:215)
   by 0x44E5452B: ImplEESdrWriter::ImplWritePage(EscherSolverContainer&) 
(eschesdo.cxx:848)
   by 0x44E54D27: ImplWriteCurrentPage (eschesdo.cxx:932)
   by 0x44E54D27: EscherEx::AddSdrPage(SdrPage const&) (eschesdo.cxx:945)
   by 0x454696BC: XclExpObjectManager::ProcessDrawing(SdrPage const*) 
(xeescher.cxx:1523)
   by 0x45407A35: ExcTable::FillAsTableBinary(short) (excdoc.cxx:518)
   by 0x454088B8: ExcDocument::ReadDoc() (excdoc.cxx:767)

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

diff --git a/sc/source/filter/excel/xlstyle.cxx 
b/sc/source/filter/excel/xlstyle.cxx
index 673b2a5bf62c..e9095b580cad 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -659,8 +659,8 @@ void XclFontPropSetHelper::ReadFontProperties( XclFontData& 
rFontData,
 case EXC_FONTPROPSET_CONTROL:
 {
 OUString aApiFontName;
-float fApiHeight, fApiWeight;
-sal_Int16 nApiFamily, nApiCharSet, nApiPosture, nApiUnderl, 
nApiStrikeout;
+float fApiHeight(0.0), fApiWeight(0.0);
+sal_Int16 nApiFamily(0), nApiCharSet(0), nApiPosture(0), 
nApiUnderl(0), nApiStrikeout(0);
 
 // read font properties
 maHlpControl.ReadFromPropertySet( rPropSet );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/filter/xcl97/xcl97esc.cxx |1 +
 sw/source/filter/xml/xmltbli.cxx|   10 +-
 sw/source/filter/xml/xmltbli.hxx|6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 03477108118028c8dfc1e161502177fabd037a6d
Author: Noel Grandin 
AuthorDate: Tue Jul 24 11:04:59 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 24 13:15:34 2018 +0200

crashtesting: tdf107162-1.xls

regression from
commit 8a304fe8b1282efa2d40bdf337728e64b7532a35
loplugin:useuniqueptr in XclEscherEx

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

diff --git a/sc/source/filter/xcl97/xcl97esc.cxx 
b/sc/source/filter/xcl97/xcl97esc.cxx
index 329ad5170150..ccbc75ae3dd3 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -383,6 +383,7 @@ void XclEscherEx::EndShape( sal_uInt16 nShapeType, 
sal_uInt32 nShapeID )
 {
 pCurrXclObj = aStack.top().first;
 pCurrAppData = std::move(aStack.top().second);
+aStack.pop();
 }
 if( nAdditionalText == 3 )
 nAdditionalText = 0;
commit 125a139e3dcfcf2bec4c61c30fb5dbf63f454cba
Author: Noel Grandin 
AuthorDate: Mon Jul 23 11:05:23 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 24 13:15:24 2018 +0200

loplugin:useuniqueptr in SwXMLTableContext

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

diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index beff1d977a38..f5357e284625 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1412,9 +1412,9 @@ SwXMLTableContext::~SwXMLTableContext()
 {
 if (m_bOwnsBox1)
 delete m_pBox1;
-delete m_pColumnDefaultCellStyleNames;
-delete m_pSharedBoxFormats;
-delete m_pRows;
+m_pColumnDefaultCellStyleNames.reset();
+m_pSharedBoxFormats.reset();
+m_pRows.reset();
 
 // close redlines on table end nodes
 GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(false);
@@ -1492,7 +1492,7 @@ void SwXMLTableContext::InsertColumn( sal_Int32 nWidth2, 
bool bRelWidth2,
 {
 if( !m_pColumnDefaultCellStyleNames )
 {
-m_pColumnDefaultCellStyleNames = new std::vector;
+m_pColumnDefaultCellStyleNames.reset(new std::vector);
 sal_uLong nCount = m_aColumnWidths.size() - 1;
 while( nCount-- )
 m_pColumnDefaultCellStyleNames->push_back(OUString());
@@ -1830,7 +1830,7 @@ SwTableBoxFormat* SwXMLTableContext::GetSharedBoxFormat(
 bool* pModifyLocked )
 {
 if ( m_pSharedBoxFormats == nullptr )
-m_pSharedBoxFormats = new map_BoxFormat;
+m_pSharedBoxFormats.reset(new map_BoxFormat);
 
 SwTableBoxFormat* pBoxFormat2;
 
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index 0fac390c2794..157be580f67f 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -58,12 +58,12 @@ class SwXMLTableContext : public XMLTextTableContext
 ColumnWidthInfo(sal_uInt16 wdth, bool isRel) : width(wdth), 
isRelative(isRel) {};
 };
 std::vector m_aColumnWidths;
-std::vector *m_pColumnDefaultCellStyleNames;
+std::unique_ptr> m_pColumnDefaultCellStyleNames;
 
 css::uno::Reference< css::text::XTextCursor > m_xOldCursor;
 css::uno::Reference< css::text::XTextContent > m_xTextContent;
 
-SwXMLTableRows_Impl * m_pRows;
+std::unique_ptr m_pRows;
 
 SwTableNode *m_pTableNode;
 SwTableBox  *m_pBox1;
@@ -77,7 +77,7 @@ class SwXMLTableContext : public XMLTextTableContext
 // the column width, and protection flag
 typedef std::unordered_map map_BoxFormat;
-map_BoxFormat* m_pSharedBoxFormats;
+std::unique_ptr m_pSharedBoxFormats;
 
 SvXMLImportContextRef   m_xParentTable;   // if table is a sub table
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Generate encryption key

[Vikas Mahato]

Thanks,
I'll have a look at css::task::XPasswordContainer2 interface and get back
to you.

On Tue, 24 Jul 2018, 16:22 Eike Rathke,  wrote:

> Hi Vikas,
>
> On Tuesday, 2018-07-24 11:44:27 +0200, Tomaž Vajngerl wrote:
>
> > On Tue, Jul 24, 2018 at 10:11 AM, Vikas Mahato 
> wrote:
> > >
> > > I am trying to implement credentials for external data source as part
> of my
> > > GSoC project. I want to encrypt the credentials and store them to a
> file.
> > > moggi ( my mentor) asked me to implement it using CryptTools but I am
> not
> > > sure how to proceed.
>
> So that suggests it is not OOXML related, but the credentials are to be
> stored (in the configuration) somehow. We already have the "Passwords
> for Web Connections" under Tools -> Options -> LibreOffice -> Security,
> which sounds like it should do what is requested.
>
> Look for use of the css::task::XPasswordContainer2 interface, or the
> css::task::PaswordContainer service, specifically
> PasswordContainer::create(...) calls where dialogs use it.
>
>   Eike
>
> --
> LibreOffice Calc developer. Number formatter stricken i18n
> transpositionizer.
> GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563
> 2D3A
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Generate encryption key

[Eike Rathke]

Hi Vikas,

On Tuesday, 2018-07-24 11:44:27 +0200, Tomaž Vajngerl wrote:

> On Tue, Jul 24, 2018 at 10:11 AM, Vikas Mahato  wrote:
> >
> > I am trying to implement credentials for external data source as part of my
> > GSoC project. I want to encrypt the credentials and store them to a file.
> > moggi ( my mentor) asked me to implement it using CryptTools but I am not
> > sure how to proceed.

So that suggests it is not OOXML related, but the credentials are to be
stored (in the configuration) somehow. We already have the "Passwords
for Web Connections" under Tools -> Options -> LibreOffice -> Security,
which sounds like it should do what is requested.

Look for use of the css::task::XPasswordContainer2 interface, or the
css::task::PaswordContainer service, specifically
PasswordContainer::create(...) calls where dialogs use it.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sd/source/filter/xml/sdxmlwrp.cxx |   11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit c33613a07df9ea92201ad741032cb9201aebf21d
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:55:15 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 12:42:20 2018 +0200

ofz#9261 catch all exceptions

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

diff --git a/sd/source/filter/xml/sdxmlwrp.cxx 
b/sd/source/filter/xml/sdxmlwrp.cxx
index cd7d5e86abd7..7eda98d88a6d 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -1103,16 +1103,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool 
TestImportPPTX(SvStream &rStream)
 {
 ret = xFilter->filter(aArgs);
 }
-catch (const css::io::IOException&)
-{
-}
-catch (const css::xml::sax::SAXException&)
-{
-}
-catch (const css::lang::IllegalArgumentException&)
-{
-}
-catch (const css::lang::WrappedTargetRuntimeException&)
+catch (...)
 {
 }
 xDocSh->SetLoading(SfxLoadedFlags::ALL);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Generate encryption key

[Eike Rathke]

Hi Vikas,

On Tuesday, 2018-07-24 09:05:09 +0530, Vikas Mahato wrote:

> I wanted to know how can we generate the encryption key for using wit
> include/oox/crypto/CryptTools.hxx classes?

As Tomaž said, it may depend on what you're actually up to..
Likely you do not want to use the CryptTool Encrypt/Decrypt wrappers
directly.

If it is for OOXML encryption there are two engines derived from
CryptoEngine of include/oox/crypto/CryptoEngine.hxx, AgileEngine of
include/oox/crypto/AgileEngine.hxx and the older Standard2007Engine of
include/oox/crypto/Standard2007Engine.hxx

The engines provide a generateEncryptionKey() function, which is called
by an engine's setupEncryption(const OUString& rPassword) after presets
have been initialized, for usage see for example
oox/qa/unit/CryptoTest.cxx

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

LO build: CppunitTest error in Ubuntu 16.04/18.04

[Ch g]

I tried to build a local branch created by merging latest gerrit master with 
another branch, on both Ubuntu 16.04.4 and Ubuntu 18.04.1, and got the same 
following error.

No core file identified in directory 
/home/dev/libreoffice/workdir/CppunitTest/sd_import_tests.test.core

To show backtraces for crashes during test execution,

enable core files with:

   ulimit -c unlimited

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

make CppunitTest_sd_import_tests CPPUNITTRACE="gdb --args"

# for interactive debugging on Linux

make CppunitTest_sd_import_tests VALGRIND=memcheck

# for memory checking

make CppunitTest_sd_import_tests DEBUGCPPUNIT=TRUE

# for exception catching

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

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

/home/dev/libreoffice/solenv/gbuild/CppunitTest.mk:114: recipe for target 
'/home/dev/libreoffice/workdir/CppunitTest/sd_import_tests.test' failed

make[1]: *** [/home/dev/libreoffice/workdir/CppunitTest/sd_import_tests.test] 
Error 1


autogen.input:

--enable-dbgutil
--disable-cve-tests
--without-java
--without-help
--without-myspell-dicts
--with-build-version=$(date +"LinuxDbg%Y-%m-%d")



That branch was built(make) successfully only with option "--build-nocheck" on 
MacOS 10.13.3, and that built LO app was usable despite having some bugs which 
I caused when merging the original old branch.


I want to build without option "--build-nocheck" to debug (the same source 
code) on Ubuntu, in order to fix my bugs which haven't been resolved in MacOS.


How should I get a full normal build done?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sd/qa/unit/data/odp/tdf118835.odp|binary
 sd/qa/unit/export-tests-ooxml2.cxx   |   30 
 sd/source/filter/eppt/epptooxml.hxx  |2 
 sd/source/filter/eppt/pptx-epptooxml.cxx |   73 ++-
 4 files changed, 103 insertions(+), 2 deletions(-)

New commits:
commit 6a79db85be2520de3ca5d2c52eacdb58bc17fec8
Author: Mark Hung 
AuthorDate: Sat Jul 21 10:20:51 2018 +0800
Commit: Mark Hung 
CommitDate: Tue Jul 24 12:12:01 2018 +0200

tdf#118835 export animClr element. ( handle AnimateColor ).

Implement PowerPointExport::WriteAnimateColorColor to export
to, from, by elements of the animClr element.

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

diff --git a/sd/qa/unit/data/odp/tdf118835.odp 
b/sd/qa/unit/data/odp/tdf118835.odp
new file mode 100644
index ..c3e15a6dcac9
Binary files /dev/null and b/sd/qa/unit/data/odp/tdf118835.odp differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index 6756f86e9ab7..e33f02f82103 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -148,6 +148,7 @@ public:
 void testTdf118783();
 void testTdf104789();
 void testOpenDocumentAsReadOnly();
+void testTdf118835();
 void testTdf118768();
 
 CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
@@ -218,6 +219,7 @@ public:
 CPPUNIT_TEST(testTdf118783);
 CPPUNIT_TEST(testTdf104789);
 CPPUNIT_TEST(testOpenDocumentAsReadOnly);
+CPPUNIT_TEST(testTdf118835);
 CPPUNIT_TEST(testTdf118768);
 
 CPPUNIT_TEST_SUITE_END();
@@ -1726,6 +1728,34 @@ void SdOOXMLExportTest2::testOpenDocumentAsReadOnly()
 xDocShRef->DoClose();
 }
 
+void SdOOXMLExportTest2::testTdf118835()
+{
+sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf118835.odp"), ODP);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+
+xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
+assertXPath(pXmlDocContent, "(//p:animClr)[1]", "clrSpc", "rgb");
+assertXPathContent(pXmlDocContent, "(//p:animClr)[1]//p:attrName", 
"style.color");
+assertXPath(pXmlDocContent, "(//p:animClr)[1]//p:to/a:srgbClr", "val", 
"ed1c24");
+
+assertXPath(pXmlDocContent, "(//p:animClr)[2]", "clrSpc", "rgb");
+assertXPathContent(pXmlDocContent, "(//p:animClr)[2]//p:attrName", 
"stroke.color");
+assertXPath(pXmlDocContent, "(//p:animClr)[2]//p:to/a:srgbClr", "val", 
"99");
+
+assertXPath(pXmlDocContent, "(//p:animClr)[3]", "clrSpc", "rgb");
+assertXPathContent(pXmlDocContent, "(//p:animClr)[3]//p:attrName", 
"fillcolor");
+assertXPath(pXmlDocContent, "(//p:animClr)[3]//p:to/a:srgbClr", "val", 
"fcd3c1");
+
+assertXPath(pXmlDocContent, "(//p:animClr)[5]", "clrSpc", "hsl");
+assertXPathContent(pXmlDocContent, "(//p:animClr)[5]//p:attrName", 
"fillcolor");
+assertXPath(pXmlDocContent, "(//p:animClr)[5]//p:by/p:hsl", "h", 
"1080");
+assertXPath(pXmlDocContent, "(//p:animClr)[5]//p:by/p:hsl", "s", "0");
+assertXPath(pXmlDocContent, "(//p:animClr)[5]//p:by/p:hsl", "l", "0");
+
+xDocShRef->DoClose();
+}
+
 void SdOOXMLExportTest2::testTdf118768()
 {
 sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf118768-brake.odp"), 
ODP);
diff --git a/sd/source/filter/eppt/epptooxml.hxx 
b/sd/source/filter/eppt/epptooxml.hxx
index ee5520f590b5..8784ae49c18a 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -112,6 +112,8 @@ private:
 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 );
+
+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 );
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 5811334ddff7..80e87fa1db0c 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.

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

[Libreoffice Gerrit user]

 oox/source/ppt/timenodelistcontext.cxx |   16 
 sd/qa/unit/data/pptx/tdf113818-swivel.pptx |binary
 sd/qa/unit/export-tests.cxx|   15 +++
 3 files changed, 23 insertions(+), 8 deletions(-)

New commits:
commit 0bc245ede6ec5831561e950299071f57b0329da8
Author: Mark Hung 
AuthorDate: Sat Jul 14 14:02:14 2018 +0800
Commit: Mark Hung 
CommitDate: Tue Jul 24 12:11:24 2018 +0200

tdf#113818 convert formula of AnimContext.

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

diff --git a/oox/source/ppt/timenodelistcontext.cxx 
b/oox/source/ppt/timenodelistcontext.cxx
index 2bd2e2a78f72..b286acdd6d94 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -578,17 +578,17 @@ namespace oox { namespace ppt {
 Any aTime = GetTimeAnimateValueTime( tav.msTime );
 aTime >>= aKeyTimes[i];
 aValues[i] = tav.maValue;
+convertAnimationValueWithTimeNode(mpNode, aValues[i]);
 
-OUString aTest;
-tav.maValue >>= aTest;
-if( !aTest.isEmpty() )
+// Examine pptx documents and find that only the first 
tav
+// has the formula set. The formula can be used for 
the whole.
+if (!tav.msFormula.isEmpty())
 {
-aValues[i] = tav.maValue;
-}
-else
-{
-aProps[ NP_FORMULA ] <<= tav.msFormula;
+OUString sFormula = tav.msFormula;
+convertMeasure(sFormula);
+aProps[NP_FORMULA] <<= sFormula;
 }
+
 ++i;
 }
 aProps[ NP_VALUES ] <<= aValues;
diff --git a/sd/qa/unit/data/pptx/tdf113818-swivel.pptx 
b/sd/qa/unit/data/pptx/tdf113818-swivel.pptx
new file mode 100755
index ..f39225223acd
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf113818-swivel.pptx differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 1c494ae33188..71509ca61eea 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -100,6 +100,7 @@ public:
 void testTextRotation();
 void testTdf115394PPT();
 void testBulletsAsImage();
+void testTdf113818();
 void testTdf113822();
 
 CPPUNIT_TEST_SUITE(SdExportTest);
@@ -126,6 +127,7 @@ public:
 CPPUNIT_TEST(testTextRotation);
 CPPUNIT_TEST(testTdf115394PPT);
 CPPUNIT_TEST(testBulletsAsImage);
+CPPUNIT_TEST(testTdf113818);
 CPPUNIT_TEST(testTdf113822);
 
 CPPUNIT_TEST_SUITE_END();
@@ -1094,6 +1096,19 @@ void SdExportTest::testTdf113822()
 xDocShRef->DoClose();
 }
 
+void SdExportTest::testTdf113818()
+{
+utl::TempFile tempFile;
+sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf113818-swivel.pptx"),
 PPTX);
+
+xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
+
+xmlDocPtr pXmlDoc = parseExport(tempFile, "content.xml");
+assertXPath(pXmlDoc, "//anim:animate[1]", "formula", 
"width*sin(2.5*pi*$)");
+assertXPath(pXmlDoc, "//anim:animate[1]", "values", "0;1");
+xDocShRef->DoClose();
+}
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 oox/source/ppt/pptfilterhelpers.cxx  |2 
 sd/source/filter/eppt/pptx-epptooxml.cxx |   82 +--
 2 files changed, 25 insertions(+), 59 deletions(-)

New commits:
commit e65da112029bf7b6a3b5d94b72bcd5d6ca225195
Author: Mark Hung 
AuthorDate: Sat Jul 21 09:22:45 2018 +0800
Commit: Mark Hung 
CommitDate: Tue Jul 24 12:10:29 2018 +0200

tdf#118835 fix missing attribute name conversion.

LineColor and LineStyle are missing from the switch-case.
Just reuse the conversion list from
oox::ppt::getAttributeConversionList(), also reoder the
list so that fillcolor is prior than fillColor.

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

diff --git a/oox/source/ppt/pptfilterhelpers.cxx 
b/oox/source/ppt/pptfilterhelpers.cxx
index 3c1ab92fc06d..cc4ebfba1e4c 100644
--- a/oox/source/ppt/pptfilterhelpers.cxx
+++ b/oox/source/ppt/pptfilterhelpers.cxx
@@ -57,8 +57,8 @@ namespace oox { namespace ppt {
 { AnimationAttributeEnum::PPT_C, "ppt_c",  
  "DimColor" },
 { AnimationAttributeEnum::R, "r",  
  "Rotate" },
 { AnimationAttributeEnum::XSHEAR,"xshear", 
  "SkewX" },
-{ AnimationAttributeEnum::FILLCOLOR, "fillColor",  
  "FillColor" },
 { AnimationAttributeEnum::FILLCOLOR, "fillcolor",  
  "FillColor" },
+{ AnimationAttributeEnum::FILLCOLOR, "fillColor",  
  "FillColor" },
 { AnimationAttributeEnum::FILLTYPE,  "fill.type",  
  "FillStyle" },
 { AnimationAttributeEnum::FILLON,"fill.on",
  "FillOn" },
 { AnimationAttributeEnum::STROKECOLOR,   "stroke.color",   
  "LineColor" },
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 17d7c4f6835d..5811334ddff7 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -78,6 +78,7 @@
 #include 
 
 #include 
+#include 
 
 #include "pptexanimations.hxx"
 #include "../ppt/pptanimations.hxx"
@@ -1020,21 +1021,7 @@ void PowerPointExport::WriteAnimationAttributeName(const 
FSHelperPtr& pFS, const
 
 SAL_INFO("sd.eppt", "write attribute name: " << USS(rAttributeName));
 
-const char* pAttribute = nullptr;
-
-if (rAttributeName == "Visibility")
-{
-pAttribute = "style.visibility";
-}
-else if (rAttributeName == "X")
-{
-pAttribute = "ppt_x";
-}
-else if (rAttributeName == "Y")
-{
-pAttribute = "ppt_y";
-}
-else if (rAttributeName == "X;Y")
+if (rAttributeName == "X;Y")
 {
 pFS->startElementNS(XML_p, XML_attrName, FSEND);
 pFS->writeEscaped("ppt_x");
@@ -1044,52 +1031,31 @@ void 
PowerPointExport::WriteAnimationAttributeName(const FSHelperPtr& pFS, const
 pFS->writeEscaped("ppt_y");
 pFS->endElementNS(XML_p, XML_attrName);
 }
-else if (rAttributeName == "Width")
-{
-pAttribute = "ppt_w";
-}
-else if (rAttributeName == "Height")
-{
-pAttribute = "ppt_h";
-}
-else if (rAttributeName == "Rotate")
-{
-pAttribute = "r";
-}
-else if (rAttributeName == "FillStyle")
-{
-pAttribute = "fill.type";
-}
-else if (rAttributeName == "FillOn")
-{
-pAttribute = "fill.on";
-}
-else if (rAttributeName == "FillColor")
-{
-pAttribute = "fillcolor";
-}
-else if (rAttributeName == "CharColor")
-{
-pAttribute = "style.color";
-}
-else if (rAttributeName == "Opacity")
-{
-pAttribute = "style.opacity";
-}
-else if (rAttributeName == "SkewX")
-{
-pAttribute = "xshear";
-}
 else
 {
-SAL_WARN("sd.eppt", "unhandled animation attribute name: " << 
rAttributeName);
-}
+const oox::ppt::ImplAttributeNameConversion *attrConv = 
oox::ppt::getAttributeConversionList();
+const char* pAttribute = nullptr;
 
-if (pAttribute)
-{
-pFS->startElementNS(XML_p, XML_attrName, FSEND);
-pFS->writeEscaped(pAttribute);
-pFS->endElementNS(XML_p, XML_attrName);
+while(attrConv->mpAPIName != nullptr)
+{
+if(rAttributeName.equalsAscii(attrConv->mpAPIName))
+{
+pAttribute = attrConv->mpMSName;
+break;
+}
+attrConv++;
+}
+
+if (pAttribute)
+{
+pFS->startElementNS(XML_p, XML_attrName, FSEND);
+pFS->writeEscaped(pAttribute);
+pFS->endElementNS(XML_p, XML_attrName);
+}
+else
+{
+   

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

[Libreoffice Gerrit user]

 oox/source/ppt/timenodelistcontext.cxx |6 +-
 sd/qa/unit/export-tests.cxx|2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 629aeda73b2db4246b837b63fb7bcf267111783c
Author: Mark Hung 
AuthorDate: Tue Jul 24 00:54:41 2018 +0800
Commit: Mark Hung 
CommitDate: Tue Jul 24 12:10:06 2018 +0200

tdf#118890 subtract 100% from by values of animScale.

Despite that by values should be offset values instead of
ending values, what we got from pptx seems to be the later,
that we have to subtract 100% from the by values to get
offset values for slideshow.

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

diff --git a/oox/source/ppt/timenodelistcontext.cxx 
b/oox/source/ppt/timenodelistcontext.cxx
index ec720520e54c..2bd2e2a78f72 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -673,7 +673,11 @@ namespace oox { namespace ppt {
 case PPT_TOKEN( by ):
 {
 // CT_TLPoint
-maBy = 
convertPointPercent(GetPointPercent(rAttribs.getFastAttributeList()));
+css::awt::Point aPoint = 
GetPointPercent(rAttribs.getFastAttributeList());
+// We got ending values instead of offset values, so 
substract 100% from them.
+aPoint.X -= 10;
+aPoint.Y -= 10;
+maBy = convertPointPercent(aPoint);
 return this;
 }
 default:
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 1eb9be7404c3..1c494ae33188 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -857,7 +857,7 @@ void SdExportTest::testTdf98477()
 xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
 
 xmlDocPtr pXmlDoc = parseExport(tempFile, "content.xml");
-assertXPath(pXmlDoc, "//anim:animateTransform", "by", "1.5,1.5");
+assertXPath(pXmlDoc, "//anim:animateTransform", "by", "0.5,0.5");
 xDocShRef->DoClose();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Using native SVG as image in flat ODF

[Regina Henschel]

Hi all,

currently an SVG image needs to be BASE64 encoded, if you save to flat 
ODF. I have started https://issues.oasis-open.org/browse/OFFICE-3995 to 
allow native SVG. My proposal is a first draft and it is time enough 
till ODF 1.4 to consider your ideas and concerns. So please have a look. 
Especially, should it be allowed in the normal, packed file format too?


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

Re: Generate encryption key

[Tomaž Vajngerl]

Hi,

Please do a "Reply All" when replying so that the mail also is sent to
the libreoffice-dev mailing list.

On Tue, Jul 24, 2018 at 10:11 AM, Vikas Mahato  wrote:
> Hi,
>
> I am trying to implement credentials for external data source as part of my
> GSoC project. I want to encrypt the credentials and store them to a file.
> moggi ( my mentor) asked me to implement it using CryptTools but I am not
> sure how to proceed.
>

Well in that case ask your mentor what you should use to create the
key. As I said key creation is key (no pun intended) and we already
have ways to securely create keys so it is a matter to decide which
one to use.

It is possible to use the same algorithm that is used in OOXML
document encryption, however you'd need to store additional encryption
info inside the file (by using oox::core::AgileEngine, look at
oox/qa/unit/CryptoTest.cxx for some examples), or maybe it would be
simpler to just use the OleStorage like the OOXML documents do to
store the encryption info and the file content or a ZipStorage. Or use
the same encryption as ODF files. Anyway ask your mentor what he has
in mind for this as this is not at all a trivial decision.

Regards, Tomaž
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sfx2/source/notebookbar/SfxNotebookBar.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dcbb65f2a4a3ee70ccd4896d7a5e975dbd9e6509
Author: Julien Nabet 
AuthorDate: Tue Jul 24 09:48:28 2018 +0200
Commit: Julien Nabet 
CommitDate: Tue Jul 24 11:11:23 2018 +0200

Avoid com.sun.star.container.NoSuchElementException "Active" (2)

Launch Base, use by default settings then create a form with the wizard
and look at this kind of logs:
warn:unotools:4125:4125:unotools/source/config/confignode.cxx:444: 
DBG_UNHANDLED_EXCEPTION
in com::sun::star::uno::Any utl::OConfigurationNode::getNodeValue(const 
rtl::OUString&) const
type: com.sun.star.container.NoSuchElementException
message: Active
context: configmgr::RootAccess

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

diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx 
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 77ed3f8c495c..23c2280add7d 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -60,6 +60,7 @@ static OUString lcl_getAppName( vcl::EnumContext::Application 
eApp )
 switch ( eApp )
 {
 case vcl::EnumContext::Application::Writer:
+case vcl::EnumContext::Application::WriterForm:
 return OUString( "Writer" );
 break;
 case vcl::EnumContext::Application::Calc:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

George Wood license statement

[George Wood]

All my past and future contributions to LibreOffice may be licensed under
the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 compilerplugins/clang/useuniqueptr.cxx   |3 +++
 reportdesign/source/ui/dlg/Condition.cxx |   20 ++--
 reportdesign/source/ui/dlg/Condition.hxx |8 
 3 files changed, 17 insertions(+), 14 deletions(-)

New commits:
commit 8a592a5c6a0fbfb831569a7c03ac75b91ce013c4
Author: Noel Grandin 
AuthorDate: Mon Jul 23 15:35:42 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 24 10:48:08 2018 +0200

loplugin:useuniqueptr in rptui::Condition

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

diff --git a/compilerplugins/clang/useuniqueptr.cxx 
b/compilerplugins/clang/useuniqueptr.cxx
index f41b55a5eb0f..ab254920b6c9 100644
--- a/compilerplugins/clang/useuniqueptr.cxx
+++ b/compilerplugins/clang/useuniqueptr.cxx
@@ -107,6 +107,9 @@ public:
 // RedlineInfo::pNextRedline
 if (fn == SRCDIR "/sw/source/filter/xml/XMLRedlineImportHelper.cxx")
 return;
+// SfxObjectShell::pMedium
+if (fn == SRCDIR "/sfx2/source/doc/objxtor.cxx")
+return;
 
 TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 }
diff --git a/reportdesign/source/ui/dlg/Condition.cxx 
b/reportdesign/source/ui/dlg/Condition.cxx
index 8d4e76ba23b2..5aa87cd98d03 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -118,9 +118,9 @@ Condition::Condition( vcl::Window* _pParent, 
IConditionalFormatAction& _rAction,
 get(m_pHeader, "headerLabel");
 get(m_pConditionType, "typeCombobox");
 get(m_pOperationList, "opCombobox");
-m_pCondLHS = new ConditionField(this, get("lhsEntry"), 
get("lhsButton"));
+m_pCondLHS.reset( new ConditionField(this, get("lhsEntry"), 
get("lhsButton")) );
 get(m_pOperandGlue, "andLabel");
-m_pCondRHS = new ConditionField(this, get("rhsEntry"), 
get("rhsButton"));
+m_pCondRHS.reset( new ConditionField(this, get("rhsEntry"), 
get("rhsButton")) );
 get(m_pActions, "formatToolbox");
 get(m_pPreview, "previewDrawingarea");
 get(m_pMoveUp, "upButton");
@@ -162,10 +162,10 @@ Condition::Condition( vcl::Window* _pParent, 
IConditionalFormatAction& _rAction,
 m_nFontColorId = m_pActions->GetItemId(".uno:FontColor");
 m_nFontDialogId = m_pActions->GetItemId(".uno:FontDialog");
 
-m_pBtnUpdaterBackgroundColor = new svx::ToolboxButtonColorUpdater(
-SID_BACKGROUND_COLOR, 
m_nBackgroundColorId, m_pActions );
-m_pBtnUpdaterFontColor = new svx::ToolboxButtonColorUpdater(
-SID_ATTR_CHAR_COLOR2, 
m_nFontColorId, m_pActions );
+m_pBtnUpdaterBackgroundColor.reset( new svx::ToolboxButtonColorUpdater(
+SID_BACKGROUND_COLOR, 
m_nBackgroundColorId, m_pActions ) );
+m_pBtnUpdaterFontColor.reset( new svx::ToolboxButtonColorUpdater(
+SID_ATTR_CHAR_COLOR2, 
m_nFontColorId, m_pActions ) );
 
 Show();
 
@@ -198,10 +198,10 @@ void Condition::dispose()
 {
 m_bInDestruction = true;
 
-delete m_pBtnUpdaterFontColor;
-delete m_pCondLHS;
-delete m_pCondRHS;
-delete m_pBtnUpdaterBackgroundColor;
+m_pBtnUpdaterFontColor.reset();
+m_pCondLHS.reset();
+m_pCondRHS.reset();
+m_pBtnUpdaterBackgroundColor.reset();
 m_pHeader.clear();
 m_pConditionType.clear();
 m_pOperationList.clear();
diff --git a/reportdesign/source/ui/dlg/Condition.hxx 
b/reportdesign/source/ui/dlg/Condition.hxx
index f770928ee7e5..04e228707b22 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -96,9 +96,9 @@ namespace rptui
 VclPtr  m_pHeader;
 VclPtrm_pConditionType;
 VclPtrm_pOperationList;
-ConditionField*m_pCondLHS;
+std::unique_ptrm_pCondLHS;
 VclPtr  m_pOperandGlue;
-ConditionField*m_pCondRHS;
+std::unique_ptrm_pCondRHS;
 VclPtrm_pActions;
 VclPtr  m_pPreview;
 VclPtr m_pMoveUp;
@@ -107,8 +107,8 @@ namespace rptui
 VclPtr m_pRemoveCondition;
 VclPtr m_pColorFloat;
 
-svx::ToolboxButtonColorUpdater*   m_pBtnUpdaterFontColor; // updates 
the color below the toolbar icon
-svx::ToolboxButtonColorUpdater*   m_pBtnUpdaterBackgroundColor;
+std::unique_ptr 
m_pBtnUpdaterFontColor; // updates the color below the toolbar icon
+std::unique_ptr 
m_pBtnUpdaterBackgroundColor;
 
 
 size_t  m_nCondIndex;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 40/df862cfadebb91b73b5e187edd9730b0c368fc 45/6d2ec3c1c2ff4f64d1201437fb9eeb2da87972

[Libreoffice Gerrit user]

 40/df862cfadebb91b73b5e187edd9730b0c368fc |1 +
 45/6d2ec3c1c2ff4f64d1201437fb9eeb2da87972 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 09b71aa372cf4f73af95a27ca1c70c64923ad1bd
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:15:11 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:15:11 2018 +0100

Notes added by 'git notes add'

diff --git a/45/6d2ec3c1c2ff4f64d1201437fb9eeb2da87972 
b/45/6d2ec3c1c2ff4f64d1201437fb9eeb2da87972
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/45/6d2ec3c1c2ff4f64d1201437fb9eeb2da87972
@@ -0,0 +1 @@
+ignore: aoo
commit b2e6adf0ecbb315b12843199f8cf99f2f314e384
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:15:00 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:15:00 2018 +0100

Notes added by 'git notes add'

diff --git a/40/df862cfadebb91b73b5e187edd9730b0c368fc 
b/40/df862cfadebb91b73b5e187edd9730b0c368fc
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/40/df862cfadebb91b73b5e187edd9730b0c368fc
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 85/7630b4b28cf61484a03461a6203869b89200ef

[Libreoffice Gerrit user]

 85/7630b4b28cf61484a03461a6203869b89200ef |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8baf6815881ae599d49f65382c0f77476f14a158
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:12:31 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:12:31 2018 +0100

Notes added by 'git notes add'

diff --git a/85/7630b4b28cf61484a03461a6203869b89200ef 
b/85/7630b4b28cf61484a03461a6203869b89200ef
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/85/7630b4b28cf61484a03461a6203869b89200ef
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 20/de55238c3c82c3e68570b046fa8472dc0896dc

[Libreoffice Gerrit user]

 20/de55238c3c82c3e68570b046fa8472dc0896dc |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d2e86be8f3c7f9ed4694f5ff0816a2b288539f63
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:09:48 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:09:48 2018 +0100

Notes added by 'git notes add'

diff --git a/20/de55238c3c82c3e68570b046fa8472dc0896dc 
b/20/de55238c3c82c3e68570b046fa8472dc0896dc
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/20/de55238c3c82c3e68570b046fa8472dc0896dc
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c0/880c2e0b46e8524b0fd3200beb7bbb7e32d8d5

[Libreoffice Gerrit user]

 c0/880c2e0b46e8524b0fd3200beb7bbb7e32d8d5 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c278171ddb2051bb755925401e76a494dc99ef13
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:10:16 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:10:16 2018 +0100

Notes added by 'git notes add'

diff --git a/c0/880c2e0b46e8524b0fd3200beb7bbb7e32d8d5 
b/c0/880c2e0b46e8524b0fd3200beb7bbb7e32d8d5
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/c0/880c2e0b46e8524b0fd3200beb7bbb7e32d8d5
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d7/de7c96a56a98c10e73322f1812d4a5c9d95523

[Libreoffice Gerrit user]

 d7/de7c96a56a98c10e73322f1812d4a5c9d95523 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1d1b3a10fc2569fca36331e1ec6fbb8b99d1ecab
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:08:55 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:08:55 2018 +0100

Notes added by 'git notes add'

diff --git a/d7/de7c96a56a98c10e73322f1812d4a5c9d95523 
b/d7/de7c96a56a98c10e73322f1812d4a5c9d95523
new file mode 100644
index ..81b64235c04a
--- /dev/null
+++ b/d7/de7c96a56a98c10e73322f1812d4a5c9d95523
@@ -0,0 +1 @@
+prefer: df903c3e2084d8cc33e3935a1668b8b46e25201f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a1/dd1b5da2200e7f3e65eaa40978b61cd88f60c0

[Libreoffice Gerrit user]

 a1/dd1b5da2200e7f3e65eaa40978b61cd88f60c0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 10bee4454c61d5239d55580d4d27cf6cf7573590
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:09:22 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:09:22 2018 +0100

Notes added by 'git notes add'

diff --git a/a1/dd1b5da2200e7f3e65eaa40978b61cd88f60c0 
b/a1/dd1b5da2200e7f3e65eaa40978b61cd88f60c0
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/a1/dd1b5da2200e7f3e65eaa40978b61cd88f60c0
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 74/392bd6a04052c13f0f799f04d4892af716096f

[Libreoffice Gerrit user]

 74/392bd6a04052c13f0f799f04d4892af716096f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9995f3a01c8886db622e8669c8182376e9d3e64b
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:07:58 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:07:58 2018 +0100

Notes added by 'git notes add'

diff --git a/74/392bd6a04052c13f0f799f04d4892af716096f 
b/74/392bd6a04052c13f0f799f04d4892af716096f
new file mode 100644
index ..6338a2df713a
--- /dev/null
+++ b/74/392bd6a04052c13f0f799f04d4892af716096f
@@ -0,0 +1 @@
+prefer: 0b7ab07611ddaafe25e9e1914a49be2afe68ada9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 67/9347ebaea109b8c11392a962f4e05f2bf09919

[Libreoffice Gerrit user]

 67/9347ebaea109b8c11392a962f4e05f2bf09919 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8616b24400050e0513fd635ec54962e6742141ae
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:07:15 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:07:15 2018 +0100

Notes added by 'git notes add'

diff --git a/67/9347ebaea109b8c11392a962f4e05f2bf09919 
b/67/9347ebaea109b8c11392a962f4e05f2bf09919
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/67/9347ebaea109b8c11392a962f4e05f2bf09919
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 17/2f0f8f239be0a1d5432aa02a684a014c88420a

[Libreoffice Gerrit user]

 17/2f0f8f239be0a1d5432aa02a684a014c88420a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f026c2b20df68c50b011eac0107b96e76880ade0
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:05:25 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:05:25 2018 +0100

Notes added by 'git notes add'

diff --git a/17/2f0f8f239be0a1d5432aa02a684a014c88420a 
b/17/2f0f8f239be0a1d5432aa02a684a014c88420a
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/17/2f0f8f239be0a1d5432aa02a684a014c88420a
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7d/05182426f3e819aa306f6006e0004e3774817a

[Libreoffice Gerrit user]

 7d/05182426f3e819aa306f6006e0004e3774817a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit acaf16bddb8b801c11ccf584b477e8b19d43cb8d
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:04:22 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:04:22 2018 +0100

Notes added by 'git notes add'

diff --git a/7d/05182426f3e819aa306f6006e0004e3774817a 
b/7d/05182426f3e819aa306f6006e0004e3774817a
new file mode 100644
index ..c704f942203c
--- /dev/null
+++ b/7d/05182426f3e819aa306f6006e0004e3774817a
@@ -0,0 +1 @@
+prefer: c38a1de224b911387fba74ae3039d634509085fb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - c1/4f452d2e051697df554a913bb11afc76030092 d2/dc6b897c2c406ed7e326c5146da41323b864bc

[Libreoffice Gerrit user]

 c1/4f452d2e051697df554a913bb11afc76030092 |1 +
 d2/dc6b897c2c406ed7e326c5146da41323b864bc |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 5fb71e071be765aaeb92892ea5b1fc4a947a42ec
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:03:46 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:03:46 2018 +0100

Notes added by 'git notes add'

diff --git a/d2/dc6b897c2c406ed7e326c5146da41323b864bc 
b/d2/dc6b897c2c406ed7e326c5146da41323b864bc
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/d2/dc6b897c2c406ed7e326c5146da41323b864bc
@@ -0,0 +1 @@
+ignore: aoo
commit 2c25cf4a20bba35e2c15e11275a8627bed2fde86
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:03:33 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:03:33 2018 +0100

Notes added by 'git notes add'

diff --git a/c1/4f452d2e051697df554a913bb11afc76030092 
b/c1/4f452d2e051697df554a913bb11afc76030092
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/c1/4f452d2e051697df554a913bb11afc76030092
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 38/1a4025df64d804270419b9f2eaaf81d65b1327

[Libreoffice Gerrit user]

 38/1a4025df64d804270419b9f2eaaf81d65b1327 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2a8ba04c1375ced77cd823386c5ff03003ee3ef2
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:03:09 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:03:09 2018 +0100

Notes added by 'git notes add'

diff --git a/38/1a4025df64d804270419b9f2eaaf81d65b1327 
b/38/1a4025df64d804270419b9f2eaaf81d65b1327
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/38/1a4025df64d804270419b9f2eaaf81d65b1327
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6b/760c766bca7865cc116dce6016a6dd6df63534

[Libreoffice Gerrit user]

 6b/760c766bca7865cc116dce6016a6dd6df63534 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 70db0ca8c1ebb01296eb0374c04140369bb6e363
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:01:36 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:01:36 2018 +0100

Notes added by 'git notes add'

diff --git a/6b/760c766bca7865cc116dce6016a6dd6df63534 
b/6b/760c766bca7865cc116dce6016a6dd6df63534
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/6b/760c766bca7865cc116dce6016a6dd6df63534
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 07/ffdb086a0b6f4d96a5a4ae5c948e0babec8954

[Libreoffice Gerrit user]

 07/ffdb086a0b6f4d96a5a4ae5c948e0babec8954 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c60d1ee785b8d40709f9c8b30e0db40cdcf779ea
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:01:21 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:01:21 2018 +0100

Notes added by 'git notes add'

diff --git a/07/ffdb086a0b6f4d96a5a4ae5c948e0babec8954 
b/07/ffdb086a0b6f4d96a5a4ae5c948e0babec8954
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/07/ffdb086a0b6f4d96a5a4ae5c948e0babec8954
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2d/b33b2791a2189d9e6a8e2a4c7f0da7822eb4c2

[Libreoffice Gerrit user]

 2d/b33b2791a2189d9e6a8e2a4c7f0da7822eb4c2 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 049159ff68d79edbcabc5b7bc08915ff0cd5efb0
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 09:00:59 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:00:59 2018 +0100

Notes added by 'git notes add'

diff --git a/2d/b33b2791a2189d9e6a8e2a4c7f0da7822eb4c2 
b/2d/b33b2791a2189d9e6a8e2a4c7f0da7822eb4c2
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/2d/b33b2791a2189d9e6a8e2a4c7f0da7822eb4c2
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f6/ed06e8bd5c5263d0c8e190b9a096e77deab72f

[Libreoffice Gerrit user]

 f6/ed06e8bd5c5263d0c8e190b9a096e77deab72f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ef7997d77d549e31724486d1e8dceb7cae2e15d3
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:58:55 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:58:55 2018 +0100

Notes added by 'git notes add'

diff --git a/f6/ed06e8bd5c5263d0c8e190b9a096e77deab72f 
b/f6/ed06e8bd5c5263d0c8e190b9a096e77deab72f
new file mode 100644
index ..de6c5fe0075b
--- /dev/null
+++ b/f6/ed06e8bd5c5263d0c8e190b9a096e77deab72f
@@ -0,0 +1 @@
+prefer: 00657aef09d854c74fb426a935a3e8b1fc390bb0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 42/5b62ddc26adb5e9a2e21ebfe1d46b9005caba5

[Libreoffice Gerrit user]

 42/5b62ddc26adb5e9a2e21ebfe1d46b9005caba5 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit eda084af509a737eeb83ffeb8d3b8f57401e0c07
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:56:16 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:56:16 2018 +0100

Notes added by 'git notes add'

diff --git a/42/5b62ddc26adb5e9a2e21ebfe1d46b9005caba5 
b/42/5b62ddc26adb5e9a2e21ebfe1d46b9005caba5
new file mode 100644
index ..82bf4b48f38a
--- /dev/null
+++ b/42/5b62ddc26adb5e9a2e21ebfe1d46b9005caba5
@@ -0,0 +1 @@
+prefer: 9196de99ed4dff2c1f8708bfd68da9b6424ae53b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 44/83e2c33766ce720577033324b51a333de0d5b6

[Libreoffice Gerrit user]

 44/83e2c33766ce720577033324b51a333de0d5b6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d582bf11e728b8cafcf4968f1a9254d14057d61c
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:55:27 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:55:27 2018 +0100

Notes added by 'git notes add'

diff --git a/44/83e2c33766ce720577033324b51a333de0d5b6 
b/44/83e2c33766ce720577033324b51a333de0d5b6
new file mode 100644
index ..4dcccba40f38
--- /dev/null
+++ b/44/83e2c33766ce720577033324b51a333de0d5b6
@@ -0,0 +1 @@
+prefer: 747a4f30d2e6b44e31854849be30295cca25af5b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/qa/uitest/validity/tdf53920.py |   78 ++
 1 file changed, 78 insertions(+)

New commits:
commit 65379d43e1f590274775449c8fb381ceb3bc0537
Author: Zdeněk Crhonek 
AuthorDate: Mon Jul 23 23:17:18 2018 +0200
Commit: Zdenek Crhonek 
CommitDate: Tue Jul 24 09:47:08 2018 +0200

uitest for bug tdf#53920

Change-Id: I4e4cd572c2f2354da4f024d4bc80f56b589faab9
Reviewed-on: https://gerrit.libreoffice.org/57895
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek 

diff --git a/sc/qa/uitest/validity/tdf53920.py 
b/sc/qa/uitest/validity/tdf53920.py
new file mode 100644
index ..221922d4b2d7
--- /dev/null
+++ b/sc/qa/uitest/validity/tdf53920.py
@@ -0,0 +1,78 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.debug import sleep
+#Bug 53920 - EDITING: Data Validity Cell Range not being applied to multiple 
selected cells
+class tdf53920(UITestCase):
+def test_tdf53920_validity_multiple_cells(self):
+calc_doc = self.ui_test.create_doc_in_start_center("calc")
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
+#. Provide the desired values in a range of cells
+enter_text_to_cell(gridwin, "C1", "A")
+enter_text_to_cell(gridwin, "C2", "B")
+enter_text_to_cell(gridwin, "C3", "C")
+#Select the cells to be validated
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3", 
"EXTEND":"1"}))
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A5", 
"EXTEND":"1"}))
+#Apply Data > Validity ... > Cell Range
+self.ui_test.execute_dialog_through_command(".uno:Validation")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "0")
+xallow = xDialog.getChild("allow")
+xmin = xDialog.getChild("min")
+
+props = {"TEXT": "Cell range"}
+actionProps = mkPropertyValues(props)
+xallow.executeAction("SELECT", actionProps)
+xmin.executeAction("TYPE", 
mkPropertyValues({"TEXT":"$Sheet1.$C$1:$C$3"}))
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+#Expected behavior: All selected cells validate data.
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
+self.ui_test.execute_dialog_through_command(".uno:Validation")
+xDialog = self.xUITest.getTopFocusWindow()
+xallow = xDialog.getChild("allow")
+xmin = xDialog.getChild("min")
+self.assertEqual(get_state_as_dict(xallow)["SelectEntryText"], "Cell 
range")
+self.assertEqual(get_state_as_dict(xmin)["Text"], "$Sheet1.$C$1:$C$3")
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"}))
+self.ui_test.execute_dialog_through_command(".uno:Validation")
+xDialog = self.xUITest.getTopFocusWindow()
+xallow = xDialog.getChild("allow")
+xmin = xDialog.getChild("min")
+self.assertEqual(get_state_as_dict(xallow)["SelectEntryText"], "Cell 
range")
+self.assertEqual(get_state_as_dict(xmin)["Text"], "$Sheet1.$C$1:$C$3")
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A5"}))
+self.ui_test.execute_dialog_through_command(".uno:Validation")
+xDialog = self.xUITest.getTopFocusWindow()
+xallow = xDialog.getChild("allow")
+xmin = xDialog.getChild("min")
+self.assertEqual(get_state_as_dict(xallow)["SelectEntryText"], "Cell 
range")
+self.assertEqual(get_state_as_dict(xmin)["Text"], "$Sheet1.$C$1:$C$3")
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 76/dda4ea7957b8cd40a04471f5601dc977dc2450

[Libreoffice Gerrit user]

 76/dda4ea7957b8cd40a04471f5601dc977dc2450 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e2dde0d88d94077a88f4d1260e2cd31b5ab50fb2
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:45:12 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:45:12 2018 +0100

Notes added by 'git notes add'

diff --git a/76/dda4ea7957b8cd40a04471f5601dc977dc2450 
b/76/dda4ea7957b8cd40a04471f5601dc977dc2450
new file mode 100644
index ..cedfef7297c0
--- /dev/null
+++ b/76/dda4ea7957b8cd40a04471f5601dc977dc2450
@@ -0,0 +1 @@
+prefer: c6cf2320d2a464594e759289c34796538d31f02b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 96/b76d955e8a0603ac2e83d606c0cd9137585797 fe/cd7bd58075f721303296334b70e48a88f6118e

[Libreoffice Gerrit user]

 96/b76d955e8a0603ac2e83d606c0cd9137585797 |1 +
 fe/cd7bd58075f721303296334b70e48a88f6118e |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 68dfcbec9e9252f865fa040d4606cec9fdad9fd3
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:44:06 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:44:06 2018 +0100

Notes added by 'git notes add'

diff --git a/96/b76d955e8a0603ac2e83d606c0cd9137585797 
b/96/b76d955e8a0603ac2e83d606c0cd9137585797
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/96/b76d955e8a0603ac2e83d606c0cd9137585797
@@ -0,0 +1 @@
+ignore: aoo
commit 695fff5b1341fa1a7552795dc5287d507e58f4a9
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:43:56 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:43:56 2018 +0100

Notes added by 'git notes add'

diff --git a/fe/cd7bd58075f721303296334b70e48a88f6118e 
b/fe/cd7bd58075f721303296334b70e48a88f6118e
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/fe/cd7bd58075f721303296334b70e48a88f6118e
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - de/c05d8733540e1c7886b6ec803006494d56f43f

[Libreoffice Gerrit user]

 de/c05d8733540e1c7886b6ec803006494d56f43f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 298370d8bd52f60e3be6ce7b7b0d910a080af453
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:44:15 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:44:15 2018 +0100

Notes added by 'git notes add'

diff --git a/de/c05d8733540e1c7886b6ec803006494d56f43f 
b/de/c05d8733540e1c7886b6ec803006494d56f43f
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/de/c05d8733540e1c7886b6ec803006494d56f43f
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 2d/aa2d8a77c802cfad84ef952a99606e3bcc467f 4c/184a25474995d41296f1c59eef364b3c710842

[Libreoffice Gerrit user]

 2d/aa2d8a77c802cfad84ef952a99606e3bcc467f |1 +
 4c/184a25474995d41296f1c59eef364b3c710842 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit f7ae8e8c7380ed3dc99155601bca029dcb97a838
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:43:33 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:43:33 2018 +0100

Notes added by 'git notes add'

diff --git a/2d/aa2d8a77c802cfad84ef952a99606e3bcc467f 
b/2d/aa2d8a77c802cfad84ef952a99606e3bcc467f
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/2d/aa2d8a77c802cfad84ef952a99606e3bcc467f
@@ -0,0 +1 @@
+ignore: aoo
commit 0228f23b42a15960afe2d4be42b33d2515b67cd3
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:43:21 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:43:21 2018 +0100

Notes added by 'git notes add'

diff --git a/4c/184a25474995d41296f1c59eef364b3c710842 
b/4c/184a25474995d41296f1c59eef364b3c710842
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/4c/184a25474995d41296f1c59eef364b3c710842
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 78/494928a920020127c09e94a95fef1b1843e773 91/741688da3380b3396e2bbfb4e11d78a7fcac5c

[Libreoffice Gerrit user]

 78/494928a920020127c09e94a95fef1b1843e773 |1 +
 91/741688da3380b3396e2bbfb4e11d78a7fcac5c |1 +
 2 files changed, 2 insertions(+)

New commits:
commit bc34d97b33d5c025d38de9b45ab25a0c6a2ec261
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:42:52 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:42:52 2018 +0100

Notes added by 'git notes add'

diff --git a/78/494928a920020127c09e94a95fef1b1843e773 
b/78/494928a920020127c09e94a95fef1b1843e773
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/78/494928a920020127c09e94a95fef1b1843e773
@@ -0,0 +1 @@
+ignore: aoo
commit 8097127e979875e7d9c3b84b57e5eba45b80f246
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:42:43 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:42:43 2018 +0100

Notes added by 'git notes add'

diff --git a/91/741688da3380b3396e2bbfb4e11d78a7fcac5c 
b/91/741688da3380b3396e2bbfb4e11d78a7fcac5c
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/91/741688da3380b3396e2bbfb4e11d78a7fcac5c
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 89/1d5f8f1b7dea5436fde2c22d24aa20997f6f56 bb/86fdd2cef9abc011e398dd4a4be17f3d332641

[Libreoffice Gerrit user]

 89/1d5f8f1b7dea5436fde2c22d24aa20997f6f56 |1 +
 bb/86fdd2cef9abc011e398dd4a4be17f3d332641 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit ced32a01306abefc420ab0f7a72d7b2b441dc0e0
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:43:12 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:43:12 2018 +0100

Notes added by 'git notes add'

diff --git a/bb/86fdd2cef9abc011e398dd4a4be17f3d332641 
b/bb/86fdd2cef9abc011e398dd4a4be17f3d332641
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/bb/86fdd2cef9abc011e398dd4a4be17f3d332641
@@ -0,0 +1 @@
+ignore: aoo
commit f0079939292b5b0438cf71840c8ca012f68c064f
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:43:02 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:43:02 2018 +0100

Notes added by 'git notes add'

diff --git a/89/1d5f8f1b7dea5436fde2c22d24aa20997f6f56 
b/89/1d5f8f1b7dea5436fde2c22d24aa20997f6f56
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/89/1d5f8f1b7dea5436fde2c22d24aa20997f6f56
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 6d/1023002af66a4f7453ffdf50ff50f79d443b24 b5/beba607e1ae77088bf212517d2c5e942a4f071

[Libreoffice Gerrit user]

 6d/1023002af66a4f7453ffdf50ff50f79d443b24 |1 +
 b5/beba607e1ae77088bf212517d2c5e942a4f071 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit f09fac688bf4b155cf5e92460a1391bacf734072
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:42:31 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:42:31 2018 +0100

Notes added by 'git notes add'

diff --git a/6d/1023002af66a4f7453ffdf50ff50f79d443b24 
b/6d/1023002af66a4f7453ffdf50ff50f79d443b24
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/6d/1023002af66a4f7453ffdf50ff50f79d443b24
@@ -0,0 +1 @@
+ignore: aoo
commit 687423f96d2c1201fb1095bdc4b0dd3023376453
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:42:17 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:42:17 2018 +0100

Notes added by 'git notes add'

diff --git a/b5/beba607e1ae77088bf212517d2c5e942a4f071 
b/b5/beba607e1ae77088bf212517d2c5e942a4f071
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/b5/beba607e1ae77088bf212517d2c5e942a4f071
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bc/f12622492d148e11369921c5faf258681f5c6e

[Libreoffice Gerrit user]

 bc/f12622492d148e11369921c5faf258681f5c6e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 88273f2d40da18752c97b07ee6bcc86f94085a7b
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:41:40 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:41:40 2018 +0100

Notes added by 'git notes add'

diff --git a/bc/f12622492d148e11369921c5faf258681f5c6e 
b/bc/f12622492d148e11369921c5faf258681f5c6e
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/bc/f12622492d148e11369921c5faf258681f5c6e
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - a3/8be85fd66236e041a2a0d24b2ed11b2cbc68ee b5/6b55bb53f1f9dfcc073e2707db748881eb38da

[Libreoffice Gerrit user]

 a3/8be85fd66236e041a2a0d24b2ed11b2cbc68ee |1 +
 b5/6b55bb53f1f9dfcc073e2707db748881eb38da |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 6fca7256102175c460cd1012d8ee3a9ada49a5bd
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:42:05 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:42:05 2018 +0100

Notes added by 'git notes add'

diff --git a/a3/8be85fd66236e041a2a0d24b2ed11b2cbc68ee 
b/a3/8be85fd66236e041a2a0d24b2ed11b2cbc68ee
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/a3/8be85fd66236e041a2a0d24b2ed11b2cbc68ee
@@ -0,0 +1 @@
+ignore: aoo
commit 3ed9271ec4668d14f6dd555da59d8263738fb31c
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:41:55 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:41:55 2018 +0100

Notes added by 'git notes add'

diff --git a/b5/6b55bb53f1f9dfcc073e2707db748881eb38da 
b/b5/6b55bb53f1f9dfcc073e2707db748881eb38da
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/b5/6b55bb53f1f9dfcc073e2707db748881eb38da
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6f/5a494d3c43f976ba2f00da44a35e762881b1a1

[Libreoffice Gerrit user]

 6f/5a494d3c43f976ba2f00da44a35e762881b1a1 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 345ca4e5df89071fbb7be35c9a4f3c3ee8214d8d
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:40:59 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:40:59 2018 +0100

Notes added by 'git notes add'

diff --git a/6f/5a494d3c43f976ba2f00da44a35e762881b1a1 
b/6f/5a494d3c43f976ba2f00da44a35e762881b1a1
new file mode 100644
index ..81b64235c04a
--- /dev/null
+++ b/6f/5a494d3c43f976ba2f00da44a35e762881b1a1
@@ -0,0 +1 @@
+prefer: df903c3e2084d8cc33e3935a1668b8b46e25201f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6e/3f2607a58910c060588193c46e0f27905838ee

[Libreoffice Gerrit user]

 6e/3f2607a58910c060588193c46e0f27905838ee |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a907de566dcac1cac3ccbaec251a2e5d2b1d6da2
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:39:02 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:39:02 2018 +0100

Notes added by 'git notes add'

diff --git a/6e/3f2607a58910c060588193c46e0f27905838ee 
b/6e/3f2607a58910c060588193c46e0f27905838ee
new file mode 100644
index ..18dcab68b600
--- /dev/null
+++ b/6e/3f2607a58910c060588193c46e0f27905838ee
@@ -0,0 +1 @@
+prefer: 982babed5c791fd84e8ede37b421bceb5b2a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1c/241d624bfe75379548d3e9780318a038f1018a

[Libreoffice Gerrit user]

 1c/241d624bfe75379548d3e9780318a038f1018a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 55ee3099cef64a0b858652cdbf2e440e58023e7c
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:38:25 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:38:25 2018 +0100

Notes added by 'git notes add'

diff --git a/1c/241d624bfe75379548d3e9780318a038f1018a 
b/1c/241d624bfe75379548d3e9780318a038f1018a
new file mode 100644
index ..c590b15e2e95
--- /dev/null
+++ b/1c/241d624bfe75379548d3e9780318a038f1018a
@@ -0,0 +1 @@
+prefer: 6df9c479f58ea94141a3a43eb7fd6fb4d1fd5c8b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 88/4e2d4c70d458f137dbb3f005077fcb4959ff37

[Libreoffice Gerrit user]

 88/4e2d4c70d458f137dbb3f005077fcb4959ff37 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 603f53315d88d9bec51fae7f73f11f921a35024b
Author: Caolán McNamara 
AuthorDate: Tue Jul 24 08:37:03 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 08:37:03 2018 +0100

Notes added by 'git notes add'

diff --git a/88/4e2d4c70d458f137dbb3f005077fcb4959ff37 
b/88/4e2d4c70d458f137dbb3f005077fcb4959ff37
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/88/4e2d4c70d458f137dbb3f005077fcb4959ff37
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 xmloff/source/transform/ControlOASISTContext.hxx  |4 +-
 xmloff/source/transform/CreateElemTContext.hxx|2 -
 xmloff/source/transform/EventMap.hxx  |2 -
 xmloff/source/transform/EventOOoTContext.hxx  |2 -
 xmloff/source/transform/FormPropOASISTContext.hxx |4 +-
 xmloff/source/transform/FrameOOoTContext.hxx  |2 -
 xmloff/source/transform/IgnoreTContext.hxx|8 ++---
 xmloff/source/transform/MergeElemTContext.hxx |2 -
 xmloff/source/transform/NotesTContext.hxx |2 -
 xmloff/source/transform/OOo2Oasis.cxx |   25 ++---
 xmloff/source/transform/OOo2Oasis.hxx |8 ++---
 xmloff/source/transform/Oasis2OOo.cxx |2 -
 xmloff/source/transform/PersAttrListTContext.hxx  |2 -
 xmloff/source/transform/ProcAddAttrTContext.hxx   |4 +-
 xmloff/source/transform/ProcAttrTContext.hxx  |4 +-
 xmloff/source/transform/RenameElemTContext.hxx|6 ++--
 xmloff/source/transform/StyleOASISTContext.cxx|2 -
 xmloff/source/transform/StyleOASISTContext.hxx|2 -
 xmloff/source/transform/StyleOOoTContext.cxx  |   32 ++
 xmloff/source/transform/StyleOOoTContext.hxx  |2 -
 xmloff/source/transform/TransformerActionInit.hxx |   12 
 xmloff/source/transform/TransformerBase.hxx   |2 -
 xmloff/source/transform/XMLFilterRegistration.cxx |6 ++--
 xmloff/source/xforms/SchemaRestrictionContext.hxx |2 -
 xmloff/source/xforms/xformsexport.cxx |4 +-
 25 files changed, 68 insertions(+), 75 deletions(-)

New commits:
commit 29a8e51aea4e6956a388deaa1104fb1d81476ad3
Author: Noel Grandin 
AuthorDate: Mon Jul 23 17:06:00 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 24 09:34:17 2018 +0200

loplugin:unusedfields,can-be-const in xmloff(1)

(*) When passing a part of a global static data to 
XMLPropertiesOOoTContext_Impl,
just store a reference to it instead of copying

(*) Simplify the OOo2OasisTransformer constructor and call sites to make 
the const-ness work

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

diff --git a/xmloff/source/transform/ControlOASISTContext.hxx 
b/xmloff/source/transform/ControlOASISTContext.hxx
index 9b223bc64ae0..0a0a167af80c 100644
--- a/xmloff/source/transform/ControlOASISTContext.hxx
+++ b/xmloff/source/transform/ControlOASISTContext.hxx
@@ -24,8 +24,8 @@
 
 class XMLControlOASISTransformerContext : public XMLTransformerContext
 {
-OUString m_aElemQName;
-bool m_bCreateControl;
+OUString const m_aElemQName;
+bool const m_bCreateControl;
 
 public:
 XMLControlOASISTransformerContext( XMLTransformerBase& rTransformer,
diff --git a/xmloff/source/transform/CreateElemTContext.hxx 
b/xmloff/source/transform/CreateElemTContext.hxx
index 2d34e562e6c5..13ad49b6ee8d 100644
--- a/xmloff/source/transform/CreateElemTContext.hxx
+++ b/xmloff/source/transform/CreateElemTContext.hxx
@@ -25,7 +25,7 @@
 
 class XMLCreateElemTransformerContext : public XMLTransformerContext
 {
-sal_uInt16 m_nActionMap;
+sal_uInt16 const m_nActionMap;
 
 public:
 XMLCreateElemTransformerContext( XMLTransformerBase& rTransformer,
diff --git a/xmloff/source/transform/EventMap.hxx 
b/xmloff/source/transform/EventMap.hxx
index 410c012d98b8..ec8d1a92f406 100644
--- a/xmloff/source/transform/EventMap.hxx
+++ b/xmloff/source/transform/EventMap.hxx
@@ -24,7 +24,7 @@
 
 struct XMLTransformerEventMapEntry
 {
-sal_uInt16 m_nOASISPrefix;
+sal_uInt16 const m_nOASISPrefix;
 const sal_Char *m_pOASISName;
 const sal_Char *m_pOOoName;
 };
diff --git a/xmloff/source/transform/EventOOoTContext.hxx 
b/xmloff/source/transform/EventOOoTContext.hxx
index 23297127dff9..5254b9902f43 100644
--- a/xmloff/source/transform/EventOOoTContext.hxx
+++ b/xmloff/source/transform/EventOOoTContext.hxx
@@ -26,7 +26,7 @@ class XMLTransformerOOoEventMap_Impl;
 
 class XMLEventOOoTransformerContext : public XMLPersElemContentTContext
 {
-bool m_bPersistent;
+bool const m_bPersistent;
 
 public:
 XMLEventOOoTransformerContext( XMLTransformerBase& rTransformer,
diff --git a/xmloff/source/transform/FormPropOASISTContext.hxx 
b/xmloff/source/transform/FormPropOASISTContext.hxx
index a2b50270e312..139584c7c77d 100644
--- a/xmloff/source/transform/FormPropOASISTContext.hxx
+++ b/xmloff/source/transform/FormPropOASISTContext.hxx
@@ -25,8 +25,8 @@
 class XMLFormPropOASISTransformerContext :
 public XMLRenameElemTransformerContext
 {
-bool m_bIsList;
-bool m_bIsListValue;
+bool const m_bIsList;
+bool const m_bIsListValue;
 
 static ::xmloff::token::XMLTokenEnum GetValueType( const OUString& rValue 
);
 
diff --git a/xmloff/source/transform/FrameOOoTContext.hxx 
b/xmloff/source/transform/FrameOOoTContext.hxx
index eb31e9305916..27f8b5

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

[Libreoffice Gerrit user]

 svgio/inc/svgstyleattributes.hxx  |1 
 svgio/source/svgreader/svgstyleattributes.cxx |  199 ++
 2 files changed, 144 insertions(+), 56 deletions(-)

New commits:
commit 37ce56416d67ecd6a8d1bfa762c45ec04a00e51b
Author: Caolán McNamara 
AuthorDate: Mon Jul 23 17:37:04 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:32:30 2018 +0200

crashtesting: infinite recurse with moz609361-1.svg

Change-Id: I18c2dd159dd7a64c3627abdb472d65013453b1b9
Reviewed-on: https://gerrit.libreoffice.org/57891
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index c642f169f9c6..44f4d35ab9b4 100644
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -231,6 +231,7 @@ namespace svgio
 BaselineShift   maBaselineShift;
 SvgNumber   maBaselineShiftNumber;
 
+mutable boolmbResolvingParent;
 
 // defines if this attributes are part of a ClipPath. If yes,
 // rough geometry will be created on decomposition by patching
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index 7cc0a05b..17efe6793b3e 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1289,6 +1289,7 @@ namespace svgio
 maClipRule(FillRule_nonzero),
 maBaselineShift(BaselineShift_Baseline),
 maBaselineShiftNumber(0),
+mbResolvingParent(false),
 mbIsClipPathContent(SVGTokenClipPathNode == mrOwner.getType()),
 mbStrokeDasharraySet(false)
 {
@@ -2028,9 +2029,11 @@ namespace svgio
 {
 const SvgStyleAttributes* pSvgStyleAttributes = 
getParentStyle();
 
-if(pSvgStyleAttributes)
+if (pSvgStyleAttributes && !mbResolvingParent)
 {
+mbResolvingParent = true;
 const basegfx::BColor* pFill = 
pSvgStyleAttributes->getFill();
+mbResolvingParent = false;
 
 if(mbIsClipPathContent)
 {
@@ -2071,9 +2074,12 @@ namespace svgio
 {
 const SvgStyleAttributes* pSvgStyleAttributes = 
getParentStyle();
 
-if(pSvgStyleAttributes)
+if (pSvgStyleAttributes && !mbResolvingParent)
 {
-return pSvgStyleAttributes->getStroke();
+mbResolvingParent = true;
+auto ret = pSvgStyleAttributes->getStroke();
+mbResolvingParent = false;
+return ret;
 }
 }
 
@@ -2102,9 +2108,12 @@ namespace svgio
 {
 const SvgStyleAttributes* pSvgStyleAttributes = 
getParentStyle();
 
-if(pSvgStyleAttributes)
+if (pSvgStyleAttributes && !mbResolvingParent)
 {
-return pSvgStyleAttributes->getSvgGradientNodeFill();
+mbResolvingParent = true;
+auto ret = pSvgStyleAttributes->getSvgGradientNodeFill();
+mbResolvingParent = false;
+return ret;
 }
 }
 
@@ -2121,9 +2130,12 @@ namespace svgio
 {
 const SvgStyleAttributes* pSvgStyleAttributes = 
getParentStyle();
 
-if(pSvgStyleAttributes)
+if (pSvgStyleAttributes && !mbResolvingParent)
 {
-return pSvgStyleAttributes->getSvgGradientNodeStroke();
+mbResolvingParent = true;
+auto ret = pSvgStyleAttributes->getSvgGradientNodeStroke();
+mbResolvingParent = false;
+return ret;
 }
 }
 
@@ -2140,9 +2152,12 @@ namespace svgio
 {
 const SvgStyleAttributes* pSvgStyleAttributes = 
getParentStyle();
 
-if(pSvgStyleAttributes)
+if (pSvgStyleAttributes && !mbResolvingParent)
 {
-return pSvgStyleAttributes->getSvgPatternNodeFill();
+mbResolvingParent = true;
+auto ret = pSvgStyleAttributes->getSvgPatternNodeFill();
+mbResolvingParent = false;
+return ret;
 }
 }
 
@@ -2159,9 +2174,12 @@ namespace svgio
 {
 const SvgStyleAttributes* pSvgStyleAttributes = 
getParentStyle();
 
-if(pSvgStyleAttributes)
+if (pSvgStyleAttributes && !mbResolvingParent)
 {
-return pSvgStyleAttributes->getSvgPatternNodeStroke();
+mbResolvingParent =

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

[Libreoffice Gerrit user]

 svgio/inc/svgnode.hxx  |2 ++
 svgio/source/svgreader/svgnode.cxx |7 +++
 2 files changed, 9 insertions(+)

New commits:
commit 20bb79886de5b7e24b6796aaa9811153abda86c9
Author: Caolán McNamara 
AuthorDate: Mon Jul 23 21:30:05 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jul 24 09:32:08 2018 +0200

crashtesting: infinite recurse with moz384637-1.svg

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

diff --git a/svgio/inc/svgnode.hxx b/svgio/inc/svgnode.hxx
index 45d9730be909..2db5d490fa14 100644
--- a/svgio/inc/svgnode.hxx
+++ b/svgio/inc/svgnode.hxx
@@ -114,6 +114,8 @@ namespace svgio
 /// possible local CssStyle, e.g. style="fill:red; stroke:red;"
 std::unique_ptrmpLocalCssStyle;
 
+mutable boolmbDecomposing;
+
 // flag if maCssStyleVector is already computed (done only once)
 boolmbCssStyleVectorBuilt : 1;
 
diff --git a/svgio/source/svgreader/svgnode.cxx 
b/svgio/source/svgreader/svgnode.cxx
index f6395a24527d..56389ef14124 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -267,6 +267,7 @@ namespace svgio
 maDisplay(Display_inline),
 maCssStyleVector(),
 mpLocalCssStyle(nullptr),
+mbDecomposing(false),
 mbCssStyleVectorBuilt(false)
 {
 OSL_ENSURE(SVGTokenUnknown != maType, "SvgNode with unknown type 
created (!)");
@@ -464,6 +465,9 @@ namespace svgio
 
 void 
SvgNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DContainer& 
rTarget, bool bReferenced) const
 {
+if (mbDecomposing) //guard against infinite recurse
+return;
+
 if(Display_none == getDisplay())
 {
 return;
@@ -499,6 +503,8 @@ namespace svgio
 
 if(!rChildren.empty())
 {
+mbDecomposing = true;
+
 const sal_uInt32 nCount(rChildren.size());
 
 for(sal_uInt32 a(0); a < nCount; a++)
@@ -571,6 +577,7 @@ namespace svgio
 }
 }
 }
+mbDecomposing = false;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits