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

[Libreoffice Gerrit user]

 sw/source/ui/chrdlg/pardlg.cxx |4 
 sw/source/ui/config/optcomp.cxx|   24 +---
 sw/source/ui/config/optpage.cxx|   13 +-
 sw/source/ui/dbui/createaddresslistdialog.cxx  |   60 +--
 sw/source/ui/dbui/customizeaddresslistdialog.cxx   |   37 ++-
 sw/source/ui/dbui/mmaddressblockpage.cxx   |   74 ++
 sw/source/ui/dialog/ascfldlg.cxx   |5 
 sw/source/ui/envelp/label1.cxx |6 -
 sw/source/ui/fmtui/tmpdlg.cxx  |4 
 sw/source/ui/frmdlg/frmpage.cxx|   39 +++
 sw/source/ui/index/cntex.cxx   |6 -
 sw/source/ui/index/cnttab.cxx  |   83 ++--
 sw/source/ui/vba/vbadocumentproperties.cxx |8 -
 sw/source/ui/vba/vbarevisions.cxx  |6 -
 sw/source/ui/vba/vbatables.cxx |7 -
 sw/source/uibase/config/StoredChapterNumbering.cxx |   10 -
 sw/source/uibase/dbui/mmconfigitem.cxx |   50 +++--
 sw/source/uibase/dochdl/swdtflvr.cxx   |   11 --
 sw/source/uibase/docvw/FrameControlsManager.cxx|   30 +
 sw/source/uibase/docvw/PostItMgr.cxx   |   74 ++
 sw/source/uibase/docvw/frmsidebarwincontainer.cxx  |   38 ++-
 sw/source/uibase/envelp/labelcfg.cxx   |5 
 sw/source/uibase/lingu/olmenu.cxx  |4 
 sw/source/uibase/misc/glosdoc.cxx  |  107 -
 sw/source/uibase/misc/redlndlg.cxx |   44 +++-
 sw/source/uibase/shells/basesh.cxx |6 -
 sw/source/uibase/uiview/formatclipboard.cxx|   11 --
 sw/source/uibase/uiview/uivwimp.cxx|   13 --
 sw/source/uibase/uno/unotxdoc.cxx  |8 -
 sw/source/uibase/utlui/content.cxx |4 
 sw/source/uibase/utlui/gloslst.cxx |9 -
 sw/source/uibase/wrtsh/navmgr.cxx  |   12 --
 32 files changed, 329 insertions(+), 483 deletions(-)

New commits:
commit 16b2b4f27acb83fc651b8484dead53ebd0e269e1
Author: Arkadiy Illarionov 
AuthorDate: Sat Oct 27 19:50:00 2018 +0300
Commit: Noel Grandin 
CommitDate: Tue Oct 30 07:52:11 2018 +0100

Simplify containers iterations in sw/source/ui*

Use range-based loop or replace with STL functions.

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

diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index f3df6a32e9f2..7d74c451942e 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -222,8 +222,8 @@ void SwParaDlg::PageCreated(const OString& rId, SfxTabPage& 
rPage)
 aNames.insert(pBase->GetName());
 pBase = pPool->Next();
 }
-for(std::set::const_iterator it = aNames.begin(); it != 
aNames.end(); ++it)
-rBox.append_text(*it);
+for(const auto& rName : aNames)
+rBox.append_text(rName);
 }
 // inits for Area and Transparency TabPages
 // The selection attribute lists (XPropertyList derivates, e.g. XColorList 
for
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 5ea1304c1d66..8752338a7ede 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -269,20 +269,17 @@ IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl, 
Button*, void)
 std::unique_ptr 
xQueryBox(xBuilder->weld_message_dialog("QueryDefaultCompatDialog"));
 if (xQueryBox->run() == RET_YES)
 {
-for ( vector< SvtCompatibilityEntry >::iterator pItem = 
m_pImpl->m_aList.begin();
-  pItem != m_pImpl->m_aList.end(); ++pItem )
+auto pItem = std::find_if(m_pImpl->m_aList.begin(), 
m_pImpl->m_aList.end(),
+[](const SvtCompatibilityEntry& rItem) { return 
rItem.isDefaultEntry(); });
+if (pItem != m_pImpl->m_aList.end())
 {
-if ( pItem->isDefaultEntry() )
+const sal_Int32 nCount = m_pOptionsLB->GetEntryCount();
+for ( sal_Int32 i = 0; i < nCount; ++i )
 {
-const sal_Int32 nCount = m_pOptionsLB->GetEntryCount();
-for ( sal_Int32 i = 0; i < nCount; ++i )
-{
-bool bChecked = m_pOptionsLB->IsChecked(static_cast< 
sal_uLong >( i ));
+bool bChecked = m_pOptionsLB->IsChecked(static_cast< sal_uLong 
>( i ));
 
-int nCoptIdx = i + 2; /* Consider "Name" & "Module" 
indexes */
-pItem->setValue( 
SvtCompatibilityEntry::Index(nCoptIdx), bChecked );
-}
-break;
+int nCoptIdx = i + 2; /* Consider "Name" & "Module" indexes */
+pItem->setValue( SvtCompatibility

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

[Libreoffice Gerrit user]

 include/svx/svdlayer.hxx   |1 -
 svx/source/svdraw/svdlayer.cxx |4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 922c4a61ca2184803a28abfd442dd0b4a858
Author: Regina Henschel 
AuthorDate: Mon Oct 29 13:28:22 2018 +0100
Commit: Mike Kaganski 
CommitDate: Tue Oct 30 07:39:42 2018 +0100

Remove now unused mbUserDefinedLayer from SdrLayer

Commit 'Special methods NewStandardLayer and SetStandardLayer
not needed' has removed the last user of mbUserDefinedLayer.

Change-Id: Id4d4fbbfa9b1425225181ea6b0750a4205683902
Reviewed-on: https://gerrit.libreoffice.org/62506
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx
index 9c7d9ae53432..dca763194356 100644
--- a/include/svx/svdlayer.hxx
+++ b/include/svx/svdlayer.hxx
@@ -67,7 +67,6 @@ class SVX_DLLPUBLIC SdrLayer
 bool mbPrintableODF; // corresponds to ODF draw:display
 bool mbLockedODF; // corresponds to ODF draw:protected
 SdrModel*  pModel; // For broadcasting
-bool mbUserDefinedLayer;
 SdrLayerID const nID;
 
 SdrLayer(SdrLayerID nNewID, const OUString& rNewName);
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index ab149bfcfa4b..a5b78f987ece 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -68,7 +68,7 @@ void SdrLayerIDSet::PutValue( const css::uno::Any & rAny )
 }
 
 SdrLayer::SdrLayer(SdrLayerID nNewID, const OUString& rNewName) :
-maName(rNewName), pModel(nullptr), mbUserDefinedLayer(true), nID(nNewID)
+maName(rNewName), pModel(nullptr), nID(nNewID)
 {
 // ODF default values
 mbVisibleODF = true;
@@ -82,7 +82,6 @@ void SdrLayer::SetName(const OUString& rNewName)
 return;
 
 maName = rNewName;
-mbUserDefinedLayer = true;
 
 if (pModel)
 {
@@ -95,7 +94,6 @@ void SdrLayer::SetName(const OUString& rNewName)
 bool SdrLayer::operator==(const SdrLayer& rCmpLayer) const
 {
 return (nID == rCmpLayer.nID
-&& mbUserDefinedLayer == rCmpLayer.mbUserDefinedLayer
 && maName == rCmpLayer.maName);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/uiconfig/sdraw/ui/notebookbar.ui|   12 
 sd/uiconfig/simpress/ui/notebookbar.ui |   12 
 2 files changed, 24 deletions(-)

New commits:
commit 5242ad5f2b4ad44fee8a6b2524e55907d3329ad1
Author: andreas kainz 
AuthorDate: Tue Oct 30 00:32:12 2018 +0100
Commit: andreas_kainz 
CommitDate: Tue Oct 30 07:28:51 2018 +0100

Tabbed Notebookbar: Show Draw toolbar didn't work so was removed

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

diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui 
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 23f5f5fc5a7b..f2f9811e837d 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -4864,18 +4864,6 @@
 both-horiz
 False
 1
-
-  
-True
-False
-center
-.uno:InsertDraw
-  
-  
-True
-True
-  
-
   
   
 False
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui 
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 0b6f89c072d6..3aeed04add40 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -5392,18 +5392,6 @@
 both-horiz
 False
 1
-
-  
-True
-False
-center
-.uno:InsertDraw
-  
-  
-True
-True
-  
-
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/source/dialog/docrecovery.cxx |   14 +++---
 svx/source/inc/docrecovery.hxx|2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 7598df03159c45eab011b15a47dc824676008f3d
Author: Noel Grandin 
AuthorDate: Mon Oct 29 19:16:29 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 30 07:22:56 2018 +0100

tdf#120097 Revert "clang-tidy bugprone-virtual-near-miss in RecoveryDialog"

This reverts commit eb34a6a93fcdebe545ab267d7cc7c5c72bab22c8.

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

diff --git a/svx/source/dialog/docrecovery.cxx 
b/svx/source/dialog/docrecovery.cxx
index 899c7a9e9e59..68e2d115dbfd 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -913,7 +913,7 @@ void RecoveryDialog::dispose()
 Dialog::dispose();
 }
 
-short RecoveryDialog::Execute()
+short RecoveryDialog::execute()
 {
 ::SolarMutexGuard aSolarLock;
 
@@ -938,7 +938,7 @@ short RecoveryDialog::Execute()
 
 m_pCore->setUpdateListener(nullptr);
 m_eRecoveryState = RecoveryDialog::E_RECOVERY_CORE_DONE;
-return Execute();
+return execute();
  }
 
 case RecoveryDialog::E_RECOVERY_CORE_DONE :
@@ -1017,7 +1017,7 @@ short RecoveryDialog::Execute()
  m_eRecoveryState = 
RecoveryDialog::E_RECOVERY_CANCELED_AFTERWARDS;
  else
  m_eRecoveryState = 
RecoveryDialog::E_RECOVERY_CANCELED_BEFORE;
- return Execute();
+ return execute();
  }
 
 case RecoveryDialog::E_RECOVERY_CANCELED_BEFORE :
@@ -1141,11 +1141,11 @@ IMPL_LINK_NOARG(RecoveryDialog, NextButtonHdl, Button*, 
void)
 {
 case RecoveryDialog::E_RECOVERY_PREPARED:
 m_eRecoveryState = RecoveryDialog::E_RECOVERY_IN_PROGRESS;
-Execute();
+execute();
 break;
 case RecoveryDialog::E_RECOVERY_CORE_DONE:
 m_eRecoveryState = RecoveryDialog::E_RECOVERY_DONE;
-Execute();
+execute();
 break;
 }
 
@@ -1163,12 +1163,12 @@ IMPL_LINK_NOARG(RecoveryDialog, CancelButtonHdl, 
Button*, void)
 if (impl_askUserForWizardCancel(GetFrameWeld(), 
RID_SVXSTR_QUERY_EXIT_RECOVERY) != DLG_RET_CANCEL)
 {
 m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED;
-Execute();
+execute();
 }
 break;
 case RecoveryDialog::E_RECOVERY_CORE_DONE:
 m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED;
-Execute();
+execute();
 break;
 }
 
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index d87afdb6ee27..f0caa6fcb448 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -522,7 +522,7 @@ class RecoveryDialog : public Dialog
 virtual void start() override;
 virtual void end() override;
 
-virtual short Execute() override;
+short execute();
 
 // helper
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |3 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|   17 +++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx|   10 +++-
 3 files changed, 19 insertions(+), 11 deletions(-)

New commits:
commit d3db6ff43a531ecf1afc858a0a8832353d091644
Author: Mike Kaganski 
AuthorDate: Mon Oct 29 23:00:37 2018 +0300
Commit: Mike Kaganski 
CommitDate: Tue Oct 30 06:19:17 2018 +0100

tdf#116989: disable conversion of tables in footers to floating for now

As the floating objects anchored to footers aren't wrapped around properly
(they behave as if they are wrapped through unconditionally), which makes
imported tables to overlap the page body text making the document unusable,
let's just disable the conversion for the time being (until the actual bug
fixed properly).

Change-Id: I06c984ff7157b71fff2aa8122cc475a114c6
Reviewed-on: https://gerrit.libreoffice.org/62523
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 01c7f59fc314..04fd361b7e36 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -1176,7 +1176,8 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel, bool bTab
 m_aTableProperties->getValue(TablePropertyMap::TABLE_WIDTH_TYPE, 
nTableWidthType);
 if (m_rDMapper_Impl.GetSectionContext() && nestedTableLevel <= 1 
&& !m_rDMapper_Impl.IsInHeaderFooter())
 m_rDMapper_Impl.m_aPendingFloatingTables.emplace_back(xStart, 
xEnd, comphelper::containerToSequence(aFrameProperties), nTableWidth, 
nTableWidthType);
-else
+else if (!m_rDMapper_Impl.IsInFooter()) // FIXME: tdf#116989 
floating objects anchored
+//to footer cannot have 
proper wrapping
 {
 // m_xText points to the body text, get the current xText from 
m_rDMapper_Impl, in case e.g. we would be in a header.
 uno::Reference 
xTextAppendAndConvert(m_rDMapper_Impl.GetTopTextAppend(), uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 835e6ff53920..d9edde3eaf22 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -212,7 +212,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_sDefaultParaStyleName(),
 m_bInStyleSheetImport( false ),
 m_bInAnyTableImport( false ),
-m_bInHeaderFooterImport( false ),
+m_eInHeaderFooterImport( HeaderFooterImportState::none ),
 m_bDiscardHeaderFooter( false ),
 m_bInFootOrEndnote(false),
 m_bSeenFootOrEndnoteSeparator(false),
@@ -424,7 +424,7 @@ void DomainMapper_Impl::RemoveLastParagraph( )
 // (but only for paste/insert, not load; otherwise it can happen that
 // flys anchored at the disposed paragraph are deleted (fdo47036.rtf))
 bool const bEndOfDocument(m_aTextAppendStack.size() == 1);
-if ((m_bInHeaderFooterImport || (bEndOfDocument && !m_bIsNewDoc))
+if ((IsInHeaderFooter() || (bEndOfDocument && !m_bIsNewDoc))
 && xEnumerationAccess.is())
 {
 uno::Reference xEnumeration = 
xEnumerationAccess->createEnumeration();
@@ -1635,7 +1635,7 @@ void DomainMapper_Impl::appendTextPortion( const 
OUString& rString, const Proper
 {
 if (m_bStartTOC || m_bStartIndex || m_bStartBibliography || 
m_bStartGenericField)
 {
-if(m_bInHeaderFooterImport && !m_bStartTOCHeaderFooter)
+if (IsInHeaderFooter() && !m_bStartTOCHeaderFooter)
 {
 xTextRange = xTextAppend->appendTextPortion(rString, 
aValues);
 }
@@ -1899,7 +1899,8 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool 
bHeader, SectionPropertyMap::P
 const PropertyIds ePropTextLeft = bHeader? PROP_HEADER_TEXT_LEFT: 
PROP_FOOTER_TEXT_LEFT;
 const PropertyIds ePropText = bHeader? PROP_HEADER_TEXT: PROP_FOOTER_TEXT;
 
-m_bInHeaderFooterImport = true;
+m_eInHeaderFooterImport
+= bHeader ? HeaderFooterImportState::header : 
HeaderFooterImportState::footer;
 
 //get the section context
 PropertyMapPtr pContext = 
DomainMapper_Impl::GetTopContextOfType(CONTEXT_SECTION);
@@ -1976,7 +1977,7 @@ void DomainMapper_Impl::PopPageHeaderFooter()
 }
 m_bDiscardHeaderFooter = false;
 }
-m_bInHeaderFooterImport = false;
+m_eInHeaderFooterImport = HeaderFooterImportState::none;
 
 if (!m_aHeaderFooterStack.empty())
 {
@@ -2384,7 +2385,7 @@ void DomainMapper_Impl::PushShapeContext( 

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

[Libreoffice Gerrit user]

 sc/source/ui/app/transobj.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 968fac07d5e70c198459581f51e88179d3940d8a
Author: Vasily Melenchuk 
AuthorDate: Wed Oct 24 13:13:41 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Oct 30 04:56:50 2018 +0100

tdf#118747 sc: use manual height for previous rows in TransferObj

This can ensure, that visible area will not shift if autoheight
will change height of previous rows.

Change-Id: I66e013e9f3f27396f13b26fde37353cb63e47258
Reviewed-on: https://gerrit.libreoffice.org/62279
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 1b9574ed8269f4ed9dde33856c1d74702a7fa4bb)
Reviewed-on: https://gerrit.libreoffice.org/62518
Tested-by: Xisco Faulí 

diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index c3725e7202a0..fa76c05d133b 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -693,6 +693,12 @@ void ScTransferObj::InitDocShell(bool bLimitToPageSize)
 else
 rDestDoc.SetColWidth( nCol, 0, m_pDoc->GetColWidth( nCol, 
nSrcTab ) );
 
+if (nStartY > 0)
+{
+// Set manual height for all previous rows so we can ensure
+// that visible area will not change due to autoheight
+rDestDoc.SetManualHeight(0, nStartY - 1, 0, true);
+}
 for (SCROW nRow = nStartY; nRow <= nEndY; ++nRow)
 {
 if ( m_pDoc->RowHidden(nRow, nSrcTab) )
___
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/unit/data/functions/statistical/fods/small.fods |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2e184378da6058af14acf208d6469fadf44d04ed
Author: Takeshi Abe 
AuthorDate: Fri Oct 26 12:15:15 2018 +0900
Commit: Takeshi Abe 
CommitDate: Tue Oct 30 02:43:56 2018 +0100

sc: Fix a wrong reference in a SMALL()'s test case

Change-Id: I6eb5491cb437745a787304bde9f5673e63892773
Reviewed-on: https://gerrit.libreoffice.org/62380
Tested-by: Jenkins
Reviewed-by: Takeshi Abe 

diff --git a/sc/qa/unit/data/functions/statistical/fods/small.fods 
b/sc/qa/unit/data/functions/statistical/fods/small.fods
index ba203bf5ef7a..5f191b43edb4 100644
--- a/sc/qa/unit/data/functions/statistical/fods/small.fods
+++ b/sc/qa/unit/data/functions/statistical/fods/small.fods
@@ -3940,7 +3940,7 @@
  
   4
  
- 
+ 
   TRUE
  
  
___
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/core/tool/interpr1.cxx |   67 +++
 1 file changed, 47 insertions(+), 20 deletions(-)

New commits:
commit 9574076674acfed2e7f24a86929c10b7a539a35c
Author: Eike Rathke 
AuthorDate: Mon Oct 29 23:49:22 2018 +0100
Commit: Eike Rathke 
CommitDate: Tue Oct 30 02:35:28 2018 +0100

Rewrite REGEX() to directly use icu::RegexMatcher, tdf#113977

This not only avoids all the overhead of i18npool's TextSearch and
Transliteration efforts (which are useful in the Find&Replace
dialog bu we don't use here) that could possibly even get in the
way how they are implemented, but also gives us direct control
over all possible flags; plus ICU's replace features are more
convenient to use and have better error checking to report back
and there is the advantage that ICU's regex description can be
taken verbatim.

Change-Id: Iaa06c26a3ff6882a0057d1ca92b1605073429bca
Reviewed-on: https://gerrit.libreoffice.org/62531
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 6c3012ad2ad9..3123335ea3b9 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -9242,30 +9243,56 @@ void ScInterpreter::ScRegex()
 return;
 }
 
-sal_Int32 nPos = 0;
-sal_Int32 nEndPos = aText.getLength();
-utl::SearchParam aParam( aExpression, 
utl::SearchParam::SearchType::Regexp);
-css::util::SearchResult aResult;
-utl::TextSearch aSearch( aParam, *ScGlobal::pCharClass);
-const bool bMatch = aSearch.SearchForward( aText, &nPos, &nEndPos, 
&aResult);
-if (!bMatch)
-PushError( FormulaError::NotAvailable);
-else
+const icu::UnicodeString aIcuExpression(
+reinterpret_cast(aExpression.getStr()), 
aExpression.getLength());
+UErrorCode status = U_ZERO_ERROR;
+icu::RegexMatcher aRegexMatcher( aIcuExpression, 0, status);
+if (U_FAILURE(status))
 {
-assert(aResult.subRegExpressions >= 1);
-if (!bReplacement)
-PushString( aText.copy( aResult.startOffset[0], 
aResult.endOffset[0] - aResult.startOffset[0]));
-else
+// Invalid regex.
+PushIllegalArgument();
+return;
+}
+// Guard against pathological patterns, limit steps of engine, see
+// 
https://ssl.icu-project.org/apiref/icu4c/classicu_1_1RegexMatcher.html#a6ebcfcab4fe6a38678c0291643a03a00
+aRegexMatcher.setTimeLimit ( 23*1000, status);
+
+const icu::UnicodeString aIcuText( reinterpret_cast(aText.getStr()), aText.getLength());
+aRegexMatcher.reset( aIcuText);
+
+if (!bReplacement)
+{
+// Find first occurrence.
+if (!aRegexMatcher.find())
+{
+PushError( FormulaError::NotAvailable);
+return;
+}
+// Extract matched text.
+icu::UnicodeString aMatch( aRegexMatcher.group( status));
+if (U_FAILURE(status))
 {
-/* TODO: global replacement of multiple occurrences, introduce
- * extra parameter with flag 'g'? Loop over positions after
- * nEndPos until none left? How to keep the offsets in sync
- * after replacement? That should be done by
- * ReplaceBackReferences(). */
-aSearch.ReplaceBackReferences( aReplacement, aText, aResult);
-PushString( aReplacement);
+// Some error.
+PushIllegalArgument();
+return;
 }
+OUString aResult( reinterpret_cast(aMatch.getBuffer()), aMatch.length());
+PushString( aResult);
+return;
+}
+
+// Replace first occurrence of match with replacement.
+const icu::UnicodeString aIcuReplacement(
+reinterpret_cast(aReplacement.getStr()), 
aReplacement.getLength());
+icu::UnicodeString aReplaced( aRegexMatcher.replaceFirst( 
aIcuReplacement, status));
+if (U_FAILURE(status))
+{
+// Some error, e.g. extraneous $1 without group.
+PushIllegalArgument();
+return;
 }
+OUString aResult( reinterpret_cast(aReplaced.getBuffer()), aReplaced.length());
+PushString( aResult);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[mdds] R-tree documentation is now available

[Kohei Yoshida]

Hi there,

Just a short-n-quick announcement that I've finished authoring
documentation for R-tree - the newest addition in mdds.

http://kohei.us/files/mdds/doc/rtree.html

I've also updated the doc for flat_segment_tree and multi_type_vector,
to add a bit more code examples.

Best,

Kohei

-- 
Kohei Yoshida, LibreOffice Calc volunteer hacker

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

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/popupmenu/form.xml   |2 -
 sc/uiconfig/scalc/popupmenu/oleobject.xml  |2 -
 sd/uiconfig/sdraw/popupmenu/3dobject.xml   |6 ++--
 sd/uiconfig/sdraw/popupmenu/3dscene.xml|3 --
 sd/uiconfig/sdraw/popupmenu/connector.xml  |   28 ++---
 sd/uiconfig/sdraw/popupmenu/curve.xml  |   29 ++
 sd/uiconfig/sdraw/popupmenu/group.xml  |3 --
 sd/uiconfig/sdraw/popupmenu/line.xml   |4 +--
 sd/uiconfig/sdraw/popupmenu/measure.xml|   27 ++---
 sd/uiconfig/sdraw/popupmenu/multiselect.xml|   31 +++-
 sd/uiconfig/sdraw/popupmenu/page.xml   |2 -
 sd/uiconfig/sdraw/popupmenu/textbox.xml|6 +---
 sd/uiconfig/simpress/popupmenu/3dobject.xml|7 ++---
 sd/uiconfig/simpress/popupmenu/3dscene.xml |3 --
 sd/uiconfig/simpress/popupmenu/connector.xml   |   29 ++
 sd/uiconfig/simpress/popupmenu/curve.xml   |   32 +++--
 sd/uiconfig/simpress/popupmenu/draw.xml|9 ---
 sd/uiconfig/simpress/popupmenu/form.xml|   24 +-
 sd/uiconfig/simpress/popupmenu/group.xml   |3 --
 sd/uiconfig/simpress/popupmenu/line.xml|6 +---
 sd/uiconfig/simpress/popupmenu/measure.xml |   30 ++-
 sd/uiconfig/simpress/popupmenu/media.xml   |1 
 sd/uiconfig/simpress/popupmenu/multiselect.xml |   31 +++-
 sd/uiconfig/simpress/popupmenu/oleobject.xml   |2 -
 sd/uiconfig/simpress/popupmenu/page.xml|2 -
 sd/uiconfig/simpress/popupmenu/textbox.xml |7 +
 26 files changed, 151 insertions(+), 178 deletions(-)

New commits:
commit bd96f02f51ccaa6ad02f459b07f810d23c868f98
Author: andreas kainz 
AuthorDate: Mon Oct 29 22:16:55 2018 +0100
Commit: andreas_kainz 
CommitDate: Tue Oct 30 00:54:55 2018 +0100

context menu: finish draw and calc context menues

and update NameGroup arrangement

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

diff --git a/sc/uiconfig/scalc/popupmenu/form.xml 
b/sc/uiconfig/scalc/popupmenu/form.xml
index 7c0dc23842c2..a1e28386f0e5 100644
--- a/sc/uiconfig/scalc/popupmenu/form.xml
+++ b/sc/uiconfig/scalc/popupmenu/form.xml
@@ -47,6 +47,6 @@
   
   
   
-  
   
+  
 
diff --git a/sc/uiconfig/scalc/popupmenu/oleobject.xml 
b/sc/uiconfig/scalc/popupmenu/oleobject.xml
index 39779cd19733..4d0e5fc4bbd3 100644
--- a/sc/uiconfig/scalc/popupmenu/oleobject.xml
+++ b/sc/uiconfig/scalc/popupmenu/oleobject.xml
@@ -39,8 +39,8 @@
 
   
   
-  
   
+  
   
   
   
diff --git a/sd/uiconfig/sdraw/popupmenu/3dobject.xml 
b/sd/uiconfig/sdraw/popupmenu/3dobject.xml
index f8d64c1c03be..af54cdbf743d 100644
--- a/sd/uiconfig/sdraw/popupmenu/3dobject.xml
+++ b/sd/uiconfig/sdraw/popupmenu/3dobject.xml
@@ -12,10 +12,13 @@
   
   
   
+  
+  
   
   
   
   
+  
   
 
   
@@ -40,7 +43,6 @@
   
 
   
-  
   
 
   
@@ -58,9 +60,7 @@
   
 
   
-  
   
-  
   
   
 
diff --git a/sd/uiconfig/sdraw/popupmenu/3dscene.xml 
b/sd/uiconfig/sdraw/popupmenu/3dscene.xml
index 34b8dc5560e0..bc55ca2aa3da 100644
--- a/sd/uiconfig/sdraw/popupmenu/3dscene.xml
+++ b/sd/uiconfig/sdraw/popupmenu/3dscene.xml
@@ -18,6 +18,7 @@
   
   
   
+  
   
 
   
@@ -42,7 +43,6 @@
   
 
   
-  
   
 
   
@@ -54,6 +54,5 @@
   
 
   
-  
   
 
diff --git a/sd/uiconfig/sdraw/popupmenu/connector.xml 
b/sd/uiconfig/sdraw/popupmenu/connector.xml
index 80f62bcfd90c..20569f57af33 100644
--- a/sd/uiconfig/sdraw/popupmenu/connector.xml
+++ b/sd/uiconfig/sdraw/popupmenu/connector.xml
@@ -13,13 +13,24 @@
   
   
   
+  
   
   
   
   
   
-  
-  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+
+  
   
 
   
@@ -33,18 +44,6 @@
   
 
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-
-  
-  
   
 
   
@@ -56,7 +55,6 @@
   
 
   
-  
   
   
   
diff --git a/sd/uiconfig/sdraw/popupmenu/curve.xml 
b/sd/uiconfig/sdraw/popupmenu/curve.xml
index 46f01a2b76dd..a994db1737be 100644
--- a/sd/uiconfig/sdraw/popupmenu/curve.xml
+++ b/sd/uiconfig/sdraw/popupmenu/curve.xml
@@ -12,14 +12,26 @@
   
   
   
-  
-  
   
   
+  
+  
   
   
   
   
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+
+  
   
 
   
@@ -33,18 +45,6 @@
   
 
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-
-  
-  
   
 
   
@@ -62,7 +62,6 @@
   
 
   
-  
   
   
   
diff --git a/sd/uiconfig/sdraw/popupmenu/group.xml 
b/sd/uiconfig/sdraw/popupmenu/group.xml
index d534990a7fed..bc360939009c 100644
--- a/sd/uiconfig/sdraw/popupmenu/group.xml
+++ b/sd/uiconfig/sdraw/popupmenu/group.xml
@@ -16,6 +16,7 @@
   
   
  

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

[Libreoffice Gerrit user]

 vcl/source/window/builder.cxx |   18 +++---
 1 file changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 7a6e6d027ad41350ae1334d3e60dc1a6ce96c508
Author: Caolán McNamara 
AuthorDate: Sun Oct 28 20:52:37 2018 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Oct 30 00:28:35 2018 +0100

Resolves: tdf#120988 mismatch of in/out locale formatting

Change-Id: I9def43c111adc877aeec9f1990f5dd76fabdbf8f
Reviewed-on: https://gerrit.libreoffice.org/62486
Tested-by: Jenkins
Tested-by: Xisco Faulí 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 63e459a0becb..efa62401f876 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -216,18 +216,18 @@ namespace weld
 {
 OUString aStr;
 
+const LocaleDataWrapper& rLocaleData = 
Application::GetSettings().GetUILocaleDataWrapper();
+
 unsigned int nDecimalDigits = m_xSpinButton->get_digits();
 //pawn percent off to icu to decide whether percent is separated from 
its number for this locale
 if (m_eSrcUnit == FUNIT_PERCENT)
 {
 double fValue = nValue;
 fValue /= SpinButton::Power10(nDecimalDigits);
-aStr = unicode::formatPercent(fValue, 
Application::GetSettings().GetUILanguageTag());
+aStr = unicode::formatPercent(fValue, 
rLocaleData.getLanguageTag());
 }
 else
 {
-const SvtSysLocale aSysLocale;
-const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData();
 aStr = rLocaleData.getNum(nValue, nDecimalDigits, true, true);
 if (m_eSrcUnit != FUNIT_NONE && m_eSrcUnit != FUNIT_DEGREE)
 aStr += " ";
@@ -245,8 +245,7 @@ namespace weld
 
 IMPL_LINK(MetricSpinButton, spin_button_input, int*, result, bool)
 {
-const SvtSysLocale aSysLocale;
-const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData();
+const LocaleDataWrapper& rLocaleData = 
Application::GetSettings().GetUILocaleDataWrapper();
 double fResult(0.0);
 bool bRet = MetricFormatter::TextToValue(get_text(), fResult, 0, 
m_xSpinButton->get_digits(), rLocaleData, m_eSrcUnit);
 if (bRet)
@@ -259,8 +258,7 @@ namespace weld
 int nStartPos, nEndPos;
 m_xSpinButton->get_selection_bounds(nStartPos, nEndPos);
 
-const SvtSysLocale aSysLocale;
-const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData();
+const LocaleDataWrapper& rLocaleData = 
Application::GetSettings().GetUILocaleDataWrapper();
 const int nTimeArea = TimeFormatter::GetTimeArea(m_eFormat, 
m_xSpinButton->get_text(), nEndPos,
  rLocaleData);
 
@@ -294,8 +292,7 @@ namespace weld
 int nStartPos, nEndPos;
 m_xSpinButton->get_selection_bounds(nStartPos, nEndPos);
 
-const SvtSysLocale aSysLocale;
-const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData();
+const LocaleDataWrapper& rLocaleData = 
Application::GetSettings().GetUILocaleDataWrapper();
 tools::Time aResult(0);
 bool bRet = TimeFormatter::TextToTime(m_xSpinButton->get_text(), 
aResult, m_eFormat, true, rLocaleData);
 if (bRet)
@@ -327,8 +324,7 @@ namespace weld
 
 OUString TimeSpinButton::format_number(int nValue) const
 {
-const SvtSysLocale aSysLocale;
-const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData();
+const LocaleDataWrapper& rLocaleData = 
Application::GetSettings().GetUILocaleDataWrapper();
 return TimeFormatter::FormatTime(ConvertValue(nValue), m_eFormat, 
TimeFormat::Hour24, true, rLocaleData);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - net/FakeSocket.cpp net/Socket.hpp

[Libreoffice Gerrit user]

 net/FakeSocket.cpp |   24 ++--
 net/Socket.hpp |2 ++
 2 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit 4ce96fb8fff164555b165f9b3692b453b8ff3660
Author: Tor Lillqvist 
AuthorDate: Tue Oct 30 00:46:52 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Oct 30 00:47:26 2018 +0200

Don't access nonexistent vector element in the EOF case

diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp
index ecbcdc33e..0a4419110 100644
--- a/net/FakeSocket.cpp
+++ b/net/FakeSocket.cpp
@@ -510,18 +510,22 @@ ssize_t fakeSocketRead(int fd, void *buf, size_t nbytes)
 return -1;
 }
 
-// These sockets are record-oriented. It won't work to read less than the 
whole record in turn
-// to be read.
-ssize_t result = pair.buffer[K][0].size();
-if (nbytes < result)
+ssize_t result = 0;
+if (pair.buffer[K].size() > 0)
 {
-loggingBuffer << "FakeSocket EAGAIN: Read from #" << fd << ", " << 
nbytes << (nbytes == 1 ? " byte" : " bytes") << flush();
-errno = EAGAIN; // Not the right errno, but what would be?q
-return -1;
-}
+// These sockets are record-oriented. It won't work to read less than 
the whole record in
+// turn to be read.
+result = pair.buffer[K][0].size();
+if (nbytes < result)
+{
+loggingBuffer << "FakeSocket EAGAIN: Read from #" << fd << ", " << 
nbytes << (nbytes == 1 ? " byte" : " bytes") << flush();
+errno = EAGAIN; // Not the right errno, but what would be?
+return -1;
+}
 
-memmove(buf, pair.buffer[K][0].data(), result);
-pair.buffer[K].erase(pair.buffer[K].begin());
+memmove(buf, pair.buffer[K][0].data(), result);
+pair.buffer[K].erase(pair.buffer[K].begin());
+}
 
 // If peer is closed or shut down, we continue to be readable
 if (pair.fd[N] == -1 || pair.shutdown[N])
commit 9fec3b0e277c6dc9a979bd2afeb07aee4a0a54c5
Author: Tor Lillqvist 
AuthorDate: Tue Oct 30 00:45:55 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Oct 30 00:47:21 2018 +0200

Handle EOF case (when fakeSocketAvailableDataLength() returns 0)

diff --git a/net/Socket.hpp b/net/Socket.hpp
index 3a28bffdd..e62b01039 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -893,6 +893,8 @@ public:
 ssize_t len;
 if (available == -1)
 len = -1;
+else if (available == 0)
+len = 0;
 else
 {
 std::vectorbuf(available);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 4 commits - Mobile/Mobile Mobile/Mobile.xcodeproj

[Libreoffice Gerrit user]

 Mobile/Mobile.xcodeproj/project.pbxproj |   51 
 Mobile/Mobile/Info.plist|   14 +---
 Mobile/Mobile/Mobile.entitlements   |   20 
 3 files changed, 74 insertions(+), 11 deletions(-)

New commits:
commit 15bd148f26b1597bf158f1dd61407c42091abea7
Author: Tor Lillqvist 
AuthorDate: Mon Oct 29 21:17:36 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Oct 30 00:22:45 2018 +0200

Add source files from vcl/headless for easier breakpointing

Change-Id: Iae08ef264ba8e03f478c16ea60a5dd46d06e4930

diff --git a/Mobile/Mobile.xcodeproj/project.pbxproj 
b/Mobile/Mobile.xcodeproj/project.pbxproj
index adaba7441..22dcfd753 100644
--- a/Mobile/Mobile.xcodeproj/project.pbxproj
+++ b/Mobile/Mobile.xcodeproj/project.pbxproj
@@ -80,6 +80,18 @@
BE58E12E217F295B00249358 /* Protocol.hpp */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path 
= Protocol.hpp; sourceTree = ""; };
BE58E12F217F295B00249358 /* Session.hpp */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path 
= Session.hpp; sourceTree = ""; };
BE58E13021874A2E00249358 /* Mobile.entitlements */ = {isa = 
PBXFileReference; lastKnownFileType = text.plist.entitlements; path = 
Mobile.entitlements; sourceTree = ""; };
+   BE58E132218793B500249358 /* svpbmp.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpbmp.cxx; 
path = "../../ios-device/vcl/headless/svpbmp.cxx"; sourceTree = ""; };
+   BE58E133218793B500249358 /* svpglyphcache.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
svpglyphcache.cxx; path = "../../ios-device/vcl/headless/svpglyphcache.cxx"; 
sourceTree = ""; };
+   BE58E134218793B600249358 /* svpgdi.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpgdi.cxx; 
path = "../../ios-device/vcl/headless/svpgdi.cxx"; sourceTree = ""; };
+   BE58E135218793B600249358 /* headlessinst.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
headlessinst.cxx; path = "../../ios-device/vcl/headless/headlessinst.cxx"; 
sourceTree = ""; };
+   BE58E136218793B600249358 /* svpcairotextrender.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
svpcairotextrender.cxx; path = 
"../../ios-device/vcl/headless/svpcairotextrender.cxx"; sourceTree = ""; 
};
+   BE58E137218793B600249358 /* svpprn.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpprn.cxx; 
path = "../../ios-device/vcl/headless/svpprn.cxx"; sourceTree = ""; };
+   BE58E138218793B600249358 /* svpdummies.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
svpdummies.cxx; path = "../../ios-device/vcl/headless/svpdummies.cxx"; 
sourceTree = ""; };
+   BE58E139218793B600249358 /* svpinst.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpinst.cxx; 
path = "../../ios-device/vcl/headless/svpinst.cxx"; sourceTree = ""; };
+   BE58E13A218793B600249358 /* svpdata.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpdata.cxx; 
path = "../../ios-device/vcl/headless/svpdata.cxx"; sourceTree = ""; };
+   BE58E13B218793B600249358 /* svptext.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svptext.cxx; 
path = "../../ios-device/vcl/headless/svptext.cxx"; sourceTree = ""; };
+   BE58E13C218793B600249358 /* svpvd.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpvd.cxx; 
path = "../../ios-device/vcl/headless/svpvd.cxx"; sourceTree = ""; };
+   BE58E13D218793B600249358 /* svpframe.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpframe.cxx; 
path = "../../ios-device/vcl/headless/svpframe.cxx"; sourceTree = ""; };
BE5EB5B9213FE29900E0826C /* Log.cpp */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
path = Log.cpp; sourceTree = ""; };
BE5EB5BA213FE29900E0826C /* SpookyV2.cpp */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
path = SpookyV2.cpp; sourceTree = ""; };
BE5EB5BB213FE29900E0826C /* Session.cpp */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
path = Session.cpp; sourceTree = ""; };
@@ -314,6 +326,25 @@
name = Frameworks;
sourceTree = "";
};
+   BE58E1312187938700249358 /* headless */ = {
+   isa = PBXGroup;
+   children = (
+   BE58E135218793B600249358 /* headlessinst.cxx */,
+   

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

[Libreoffice Gerrit user]

 vcl/headless/svpinst.cxx |2 ++
 vcl/inc/headless/svpinst.hxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 629f9ff63bf3a1e16ed38a737a7fdd074b9c0ca7
Author: Tor Lillqvist 
AuthorDate: Mon Oct 29 22:04:19 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Oct 30 00:20:59 2018 +0200

m_FeedbackFDs is unused on iOS

I wonder why we have that iOS ifdef in SvpSalInstance::Wakeup()?
Elsewhere in this file we do compile code that uses those same fields
for iOS, too.

Change-Id: Ib801ea81fafcf2296181874018c1df2ceef144a1

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index a711d693f00e..25e15ca9961a 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -298,7 +298,9 @@ void SvpSalInstance::ProcessEvent( SalUserEvent aEvent )
 
 SvpSalYieldMutex::SvpSalYieldMutex()
 {
+#ifndef IOS
 m_FeedbackFDs[0] = m_FeedbackFDs[1] = -1;
+#endif
 }
 
 SvpSalYieldMutex::~SvpSalYieldMutex()
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 7c2b5efce593..4793d8e463d5 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -73,7 +73,9 @@ private:
 // at least one subclass of SvpSalInstance (GTK3) that doesn't use them.
 friend class SvpSalInstance;
 // members for communication from main thread to non-main thread
+#ifndef IOS
 int m_FeedbackFDs[2];
+#endif
 osl::Condition  m_NonMainWaitingYieldCond;
 // members for communication from non-main thread to main thread
 boolm_bNoYieldLock = false; // accessed only on main 
thread
___
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/inputLine/tdf67346.py |   45 +
 1 file changed, 45 insertions(+)

New commits:
commit 87f57f3aaf90706f1b3e0a9bc22de17378f319f2
Author: Zdeněk Crhonek 
AuthorDate: Mon Oct 29 22:01:32 2018 +0100
Commit: Zdenek Crhonek 
CommitDate: Mon Oct 29 23:19:09 2018 +0100

uitest for bug tdf#67346

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

diff --git a/sc/qa/uitest/inputLine/tdf67346.py 
b/sc/qa/uitest/inputLine/tdf67346.py
new file mode 100644
index ..324d8ca6384c
--- /dev/null
+++ b/sc/qa/uitest/inputLine/tdf67346.py
@@ -0,0 +1,45 @@
+# -*- 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_sheet_from_doc
+from libreoffice.calc.conditional_format import 
get_conditional_format_from_sheet
+from uitest.debug import sleep
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+#Bug 67346 - EDITING: Undo broken when pasting text that has been copied from 
the input line
+
+class tdf67346(UITestCase):
+
+def test_tdf67346_undo_paste_text_input_line(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()
+# type 'Apple' in A1
+enter_text_to_cell(gridwin, "A1", "Apple")
+# input line: copy the text from there
+xInputWin = xCalcDoc.getChild("sc_input_window")
+xInputWin.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
+self.xUITest.executeCommand(".uno:Copy")
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A2"}))
+# Ctrl-V
+self.xUITest.executeCommand(".uno:Paste")
+self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), 
"Apple")
+self.assertEqual(get_cell_by_position(document, 0, 0, 1).getString(), 
"Apple")
+self.assertEqual(get_state_as_dict(xInputWin)["Text"], "Apple")
+#Ctrl-Z
+self.xUITest.executeCommand(".uno:Undo")
+self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), 
"Apple")
+self.assertEqual(get_cell_by_position(document, 0, 0, 1).getString(), 
"")
+self.assertEqual(get_state_as_dict(xInputWin)["Text"], "")
+
+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

Re: Build fails in UnitTest

[Regis Perdreau]

Forget the noise, Lo accept to launch itself at the second try :)

Régis Perdreau


Le lun. 29 oct. 2018 à 21:18, Regis Perdreau
 a écrit :
>
> Hi,
>
> I have this error when i try to launch debug version of libreoffice in GDB.
>
>
> Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
> warning: Corrupted shared library list: 0x55850240 != 0x77f97cc0
>
> Some clues to solve this problem ?
>
> Régis Perdreau
> 07 68 88 26 07
>
> Le mar. 16 oct. 2018 à 19:36, kalriel  a écrit :
> >
> > Hello.
> > I get the following error when building the master
> >
> > Error: a unit test failed, please do one of:
> > make CppunitTest_sc_subsequent_filters_test CPPUNITTRACE="lldb --"   #
> > for interactive debugging on OS X
> > make CppunitTest_sc_subsequent_filters_test VALGRIND=memcheck#
> > for memory checking
> >
> > You can limit the execution to just one particular test by:
> >
> > make CppunitTest_sc_subsequent_filters_test CPPUNIT_TEST_NAME="testXYZ"
> > ...above mentioned params...
> >
> > /[...]/LibreOffice_Source/lode/dev/core/solenv/gbuild/CppunitTest.mk:120:
> > recipe for target
> > '/[...]/LibreOffice_Source/lode/dev/core/workdir/CppunitTest/sc_subsequent_filters_test.test'
> > failed
> > make[1]: ***
> > [/[...]/LibreOffice_Source/lode/dev/core/workdir/CppunitTest/sc_subsequent_filters_test.test]
> > Error 1
> > Makefile:167: recipe for target 'CppunitTest_sc_subsequent_filters_test'
> > failed
> > make: *** [CppunitTest_sc_subsequent_filters_test] Error 2
> >
> > Best regards.
> > Kalriel
> >
> >
> >
> > --
> > Sent from: 
> > http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
> > ___
> > LibreOffice mailing list
> > LibreOffice@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sd/uiconfig/sdraw/popupmenu/tabletext.xml|   75 +++
 sd/uiconfig/simpress/popupmenu/tabletext.xml |   75 +++
 2 files changed, 62 insertions(+), 88 deletions(-)

New commits:
commit e9b5b4b5c65cd86b1c7aee98a9837464bc126ef1
Author: andreas kainz 
AuthorDate: Mon Oct 29 17:46:49 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Oct 29 22:17:57 2018 +0100

update tabletext context toolbar for draw and impress

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

diff --git a/sd/uiconfig/sdraw/popupmenu/tabletext.xml 
b/sd/uiconfig/sdraw/popupmenu/tabletext.xml
index 482ad92396a0..ed1625065383 100644
--- a/sd/uiconfig/sdraw/popupmenu/tabletext.xml
+++ b/sd/uiconfig/sdraw/popupmenu/tabletext.xml
@@ -11,67 +11,54 @@
   
   
   
-  
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
 
-  
-  
+  
+  
+  
   
-  
-  
-  
+  
+  
+  
 
   
-  
+  
 
-  
-  
-  
-  
-  
-  
   
+  
+  
 
   
-  
+  
 
+  
+  
+  
+  
+  
+  
   
   
   
-  
-  
-  
-  
 
   
   
-  
-  
-  
+  
+  
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
   
-  
+  
+  
+  
+  
+  
   
+  
+  
+  
+  
+  
 
diff --git a/sd/uiconfig/simpress/popupmenu/tabletext.xml 
b/sd/uiconfig/simpress/popupmenu/tabletext.xml
index 482ad92396a0..ed1625065383 100644
--- a/sd/uiconfig/simpress/popupmenu/tabletext.xml
+++ b/sd/uiconfig/simpress/popupmenu/tabletext.xml
@@ -11,67 +11,54 @@
   
   
   
-  
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
 
-  
-  
+  
+  
+  
   
-  
-  
-  
+  
+  
+  
 
   
-  
+  
 
-  
-  
-  
-  
-  
-  
   
+  
+  
 
   
-  
+  
 
+  
+  
+  
+  
+  
+  
   
   
   
-  
-  
-  
-  
 
   
   
-  
-  
-  
+  
+  
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
   
-  
+  
+  
+  
+  
+  
   
+  
+  
+  
+  
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |   83 ++
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx |8 
 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx |   26 +++
 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx |6 
 4 files changed, 92 insertions(+), 31 deletions(-)

New commits:
commit 2286137c40a2abb26d36beb906962baffd779312
Author: Tomaž Vajngerl 
AuthorDate: Wed Oct 24 10:27:26 2018 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon Oct 29 22:15:56 2018 +0100

fix importing the certificate and private key

If importing the certificate and private key is done separately,
they don't associate with each other, so with this you can add
the private key to the certificate that it belongs to. If the
private key is set in this way, then getPrivateKey() call doesn't
look into the database but just returns the private key stored
in the member variable.

Additionally use CERT_DecodeCertFromPackage to import the DER
certificate from the imput as CERT_DecodeDERCertificate doesn't
import a complete certificate and doesn't add it into the
certificate database.

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

diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx 
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 4e31c40bf733..bdf8000d886b 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -432,6 +432,30 @@ Sequence< Reference < XCertificate > > 
SecurityEnvironment_NssImpl::buildCertifi
 return Sequence< Reference < XCertificate > >();
 }
 
+X509Certificate_NssImpl* 
SecurityEnvironment_NssImpl::createAndAddCertificateFromPackage(
+const 
css::uno::Sequence& raDERCertificate,
+OUString const & 
raString)
+{
+auto pCertificateBytes = reinterpret_cast(const_cast(raDERCertificate.getConstArray()));
+CERTCertificate* pCERTCertificate = 
CERT_DecodeCertFromPackage(pCertificateBytes, raDERCertificate.getLength());
+
+if (!pCERTCertificate)
+return nullptr;
+
+OString aTrustString = OUStringToOString(raString, 
RTL_TEXTENCODING_ASCII_US);
+
+CERTCertTrust aTrust;
+if (CERT_DecodeTrustString(&aTrust, aTrustString.getStr()) != SECSuccess)
+return nullptr;
+
+if (CERT_ChangeCertTrust(CERT_GetDefaultCertDB(), pCERTCertificate, 
&aTrust) != SECSuccess)
+return nullptr;
+
+X509Certificate_NssImpl* pX509Certificate = new X509Certificate_NssImpl();
+pX509Certificate->setCert(pCERTCertificate);
+return pX509Certificate;
+}
+
 X509Certificate_NssImpl* 
SecurityEnvironment_NssImpl::createX509CertificateFromDER(const 
css::uno::Sequence& aDerCertificate)
 {
 X509Certificate_NssImpl* pX509Certificate = nullptr;
@@ -816,68 +840,71 @@ xmlSecKeysMngrPtr 
SecurityEnvironment_NssImpl::createKeysManager() {
 // Adopt the private key of the signing certificate, if it has any.
 if (auto pCertificate = 
dynamic_cast(m_xSigningCertificate.get()))
 {
-if (auto pCERTCertificate = 
const_cast(pCertificate->getNssCert()))
+SECKEYPrivateKey* pPrivateKey = pCertificate->getPrivateKey();
+if (pPrivateKey)
 {
-if (pCERTCertificate && pCERTCertificate->slot)
-{
-SECKEYPrivateKey* pPrivateKey = 
PK11_FindPrivateKeyFromCert(pCERTCertificate->slot, pCERTCertificate, nullptr);
-xmlSecKeyDataPtr pKeyData = xmlSecNssPKIAdoptKey(pPrivateKey, 
nullptr);
-xmlSecKeyPtr pKey = xmlSecKeyCreate();
-xmlSecKeySetValue(pKey, pKeyData);
-xmlSecNssAppDefaultKeysMngrAdoptKey(pKeysMngr, pKey);
-}
-else
-{
-SAL_WARN("xmlsecurity.xmlsec", "Can't get the private key from 
the certificate.");
-}
+xmlSecKeyDataPtr pKeyData = xmlSecNssPKIAdoptKey(pPrivateKey, 
nullptr);
+xmlSecKeyPtr pKey = xmlSecKeyCreate();
+xmlSecKeySetValue(pKey, pKeyData);
+xmlSecNssAppDefaultKeysMngrAdoptKey(pKeysMngr, pKey);
+}
+else
+{
+SAL_WARN("xmlsecurity.xmlsec", "Can't get the private key from the 
certificate.");
 }
 }
 
-return pKeysMngr ;
+return pKeysMngr;
 }
+
 void SecurityEnvironment_NssImpl::destroyKeysManager(xmlSecKeysMngrPtr 
pKeysMngr) {
 if( pKeysMngr != nullptr ) {
 xmlSecKeysMngrDestroy( pKeysMngr ) ;
 }
 }
 
-uno::Reference 
SecurityEnvironment_NssImpl::createDERCertificateWithPrivateKey(
-Sequence const & raDERCertificate, Sequence const 
& raPrivateKey)
+SECKEYPrivateKey* 
Security

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

[Libreoffice Gerrit user]

 svx/inc/bitmaps.hlst |   89 +++
 1 file changed, 89 insertions(+)

New commits:
commit f713caa6f116ee9d6f99e03a688216984cedce44
Author: Regina Henschel 
AuthorDate: Sun Oct 28 23:08:48 2018 +0100
Commit: Tomaž Vajngerl 
CommitDate: Mon Oct 29 22:07:39 2018 +0100

tdf#114700 Single marker files are needed for HiDPI display

The method ImpGetBitmapEx in svdhdl.cxx needs special single
marker files to generate display dependent markers on the fly.
List them in bitmaps.hlst so that they are packed and delivered.

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

diff --git a/svx/inc/bitmaps.hlst b/svx/inc/bitmaps.hlst
index 5ae8d9e3ea60..158b66175691 100644
--- a/svx/inc/bitmaps.hlst
+++ b/svx/inc/bitmaps.hlst
@@ -186,6 +186,95 @@
 #define SIP_SA_MARKERS  "svx/res/markers.png"
 #define BMP_SVXOLEOBJ   "res/oleobj.png"
 #define SIP_SA_CROP_MARKERS "svx/res/cropmarkers.png"
+#define BMP_MARKER_ANCHOR   "svx/res/marker-anchor.png"
+#define BMP_MARKER_ANCHOR_PRESSED   
"svx/res/marker-anchor-pressed.png"
+#define BMP_MARKER_CIRC7_1  
"svx/res/marker-circ7-1.png"
+#define BMP_MARKER_CIRC7_2  
"svx/res/marker-circ7-2.png"
+#define BMP_MARKER_CIRC7_3  
"svx/res/marker-circ7-3.png"
+#define BMP_MARKER_CIRC7_4  
"svx/res/marker-circ7-4.png"
+#define BMP_MARKER_CIRC7_5  
"svx/res/marker-circ7-5.png"
+#define BMP_MARKER_CIRC7_6  
"svx/res/marker-circ7-6.png"
+#define BMP_MARKER_CIRC9_1  
"svx/res/marker-circ9-1.png"
+#define BMP_MARKER_CIRC9_2  
"svx/res/marker-circ9-2.png"
+#define BMP_MARKER_CIRC9_3  
"svx/res/marker-circ9-3.png"
+#define BMP_MARKER_CIRC9_4  
"svx/res/marker-circ9-4.png"
+#define BMP_MARKER_CIRC9_5  
"svx/res/marker-circ9-5.png"
+#define BMP_MARKER_CIRC9_6  
"svx/res/marker-circ9-6.png"
+#define BMP_MARKER_CIRC11_1 
"svx/res/marker-circ11-1.png"
+#define BMP_MARKER_CIRC11_2 
"svx/res/marker-circ11-2.png"
+#define BMP_MARKER_CIRC11_3 
"svx/res/marker-circ11-3.png"
+#define BMP_MARKER_CIRC11_4 
"svx/res/marker-circ11-4.png"
+#define BMP_MARKER_CIRC11_5 
"svx/res/marker-circ11-5.png"
+#define BMP_MARKER_CIRC11_6 
"svx/res/marker-circ11-6.png"
+#define BMP_MARKER_CROSS"svx/res/marker-cross.png"
+#define BMP_MARKER_ELLI7x9_1
"svx/res/marker-elli7x9-1.png"
+#define BMP_MARKER_ELLI7x9_2
"svx/res/marker-elli7x9-2.png"
+#define BMP_MARKER_ELLI7x9_3
"svx/res/marker-elli7x9-3.png"
+#define BMP_MARKER_ELLI7x9_4
"svx/res/marker-elli7x9-4.png"
+#define BMP_MARKER_ELLI7x9_5
"svx/res/marker-elli7x9-5.png"
+#define BMP_MARKER_ELLI7x9_6
"svx/res/marker-elli7x9-6.png"
+#define BMP_MARKER_ELLI9x7_1
"svx/res/marker-elli9x7-1.png"
+#define BMP_MARKER_ELLI9x7_2
"svx/res/marker-elli9x7-2.png"
+#define BMP_MARKER_ELLI9x7_3
"svx/res/marker-elli9x7-3.png"
+#define BMP_MARKER_ELLI9x7_4
"svx/res/marker-elli9x7-4.png"
+#define BMP_MARKER_ELLI9x7_5
"svx/res/marker-elli9x7-5.png"
+#define BMP_MARKER_ELLI9x7_6
"svx/res/marker-elli9x7-6.png"
+#define BMP_MARKER_ELLI9x11_1   
"svx/res/marker-elli9x11-1.png"
+#define BMP_MARKER_ELLI9x11_2   
"svx/res/marker-elli9x11-2.png"
+#define BMP_MARKER_ELLI9x11_3   
"svx/res/marker-elli9x11-3.png"
+#define BMP_MARKER_ELLI9x11_4   
"svx/res/marker-elli9x11-4.png"
+#define BMP_MARKER_ELLI9x11_5   
"svx/res/marker-elli9x11-5.png"
+#define BMP_MARKER_ELLI9x11_6   
"svx/res/marker-elli9x11-6.png"
+#define BMP_MARKER_ELLI11x9_1   
"svx/res/marker-elli11x9-1.png"
+#define BMP_MARKER_ELLI11x9_2   
"svx/res/marker-elli11x9-2.png"
+#define BMP_MARKER_ELLI11x9_3   
"svx/res/marker-elli11x9-3.png"
+#define BMP_MARKER_ELLI11x9_4   
"svx/res/marker-elli11x9-4.png"
+#define BMP_MARKER_ELLI11x9_5   
"svx/res/marker-elli11x9-5.png"
+#define BMP_MARKER_ELLI11x9_6   
"svx/res/marker-elli11x9-6.png"
+#define BMP_MARKER_GLUE_SELECTED   

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

[Libreoffice Gerrit user]

 sc/Module_sc.mk|1 
 sc/UITest_inputLine.mk |   20 +++
 sc/qa/uitest/inputLine/tdf54197.py |   38 +
 3 files changed, 59 insertions(+)

New commits:
commit 993948678e7a78c7c91e2c2728a9b7182cb2bc79
Author: Zdeněk Crhonek 
AuthorDate: Mon Oct 29 19:57:43 2018 +0100
Commit: Zdenek Crhonek 
CommitDate: Mon Oct 29 21:20:37 2018 +0100

uitest for bug tdf#54197

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

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index da8cfd59a6ca..6373fad86cb7 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -198,6 +198,7 @@ $(eval $(call gb_Module_add_uicheck_targets,sc,\
UITest_key_f4 \
UITest_textCase \
UITest_signatureLine \
+   UITest_inputLine \
 ))
 endif
 
diff --git a/sc/UITest_inputLine.mk b/sc/UITest_inputLine.mk
new file mode 100644
index ..df6dfc627095
--- /dev/null
+++ b/sc/UITest_inputLine.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UITest_UITest,inputLine))
+
+$(eval $(call gb_UITest_add_modules,inputLine,$(SRCDIR)/sc/qa/uitest,\
+   inputLine/ \
+))
+
+$(eval $(call gb_UITest_set_defs,inputLine, \
+TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/uitest/inputLine/tdf54197.py 
b/sc/qa/uitest/inputLine/tdf54197.py
new file mode 100644
index ..54f2c5f56861
--- /dev/null
+++ b/sc/qa/uitest/inputLine/tdf54197.py
@@ -0,0 +1,38 @@
+# -*- 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_sheet_from_doc
+from libreoffice.calc.conditional_format import 
get_conditional_format_from_sheet
+from uitest.debug import sleep
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+#Bug 54197 - Calc single cell filling (Ctrl+D) does not change data at input 
line
+
+class tdf54197(UITestCase):
+
+def test_tdf54197_CTRL_D_input_line_change(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()
+# 1. go to cell A1 enter any text
+enter_text_to_cell(gridwin, "A1", "t")
+# 2. go to cell A2 press Ctrl+D
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A2"}))
+self.xUITest.executeCommand(".uno:FillDown")
+# The same text as above is displayed at cell A2, BUT input line is 
still blank
+self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(), 
"t")
+self.assertEqual(get_cell_by_position(document, 0, 0, 1).getString(), 
"t")
+xInputWin = xCalcDoc.getChild("sc_input_window")
+self.assertEqual(get_state_as_dict(xInputWin)["Text"], "t")
+
+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

Re: Build fails in UnitTest

[Regis Perdreau]

Hi,

I have this error when i try to launch debug version of libreoffice in GDB.


Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
warning: Corrupted shared library list: 0x55850240 != 0x77f97cc0

Some clues to solve this problem ?

Régis Perdreau
07 68 88 26 07

Le mar. 16 oct. 2018 à 19:36, kalriel  a écrit :
>
> Hello.
> I get the following error when building the master
>
> Error: a unit test failed, please do one of:
> make CppunitTest_sc_subsequent_filters_test CPPUNITTRACE="lldb --"   #
> for interactive debugging on OS X
> make CppunitTest_sc_subsequent_filters_test VALGRIND=memcheck#
> for memory checking
>
> You can limit the execution to just one particular test by:
>
> make CppunitTest_sc_subsequent_filters_test CPPUNIT_TEST_NAME="testXYZ"
> ...above mentioned params...
>
> /[...]/LibreOffice_Source/lode/dev/core/solenv/gbuild/CppunitTest.mk:120:
> recipe for target
> '/[...]/LibreOffice_Source/lode/dev/core/workdir/CppunitTest/sc_subsequent_filters_test.test'
> failed
> make[1]: ***
> [/[...]/LibreOffice_Source/lode/dev/core/workdir/CppunitTest/sc_subsequent_filters_test.test]
> Error 1
> Makefile:167: recipe for target 'CppunitTest_sc_subsequent_filters_test'
> failed
> make: *** [CppunitTest_sc_subsequent_filters_test] Error 2
>
> Best regards.
> Kalriel
>
>
>
> --
> Sent from: 
> http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-6.1.3.2'

[Libreoffice Gerrit user]

Tag 'libreoffice-6.1.3.2' created by Christian Lohmaier 
 at 2018-10-29 19:55 +

Tag libreoffice-6.1.3.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJb12XAAAoJEPQ0oe+v7q6jC+gP/1NI25futaRkX2Bdoeuejbnl
e7AV18kOp0K1bu6jOlwcJ6nu2mqZdM6jVjp1nix3zK3rqDfx2+6rENol3hs+JAUk
oagqmMdRDFBuM5JHWAin2/xCrxWlXxXp5PXcjdY7wUoSpxD6R7POfN5lpZGQ78+1
ILpkSTmuDdyM4bs2qhORjS9K2ks4qEv7JOltV3X1CigLcINYBEaFJeYZEbFPpWR7
qI1xEXv/q3+76OdLTdcphj2JR3US4H/NCqOcks3kK5hCYX9LQKJCmksrwWSubu3f
NQnpU+T2Qa1q/M8wOw/7NgTHCCJLBgKOI1vapR6xCl8BaJX08SBZyfmMLh+UP7/d
aUZQQ+/DmFFVqpw3bv9bQXrw1VkxNiQYJH0QOW/EURG62rZpOjWaAF4jIlAi/1rw
5MaN649B88v6V8xGqprWytSlwr/ctR6fJ3IUQpwGzpT6hQBwRbMhO1jnvsUU0B1X
uQ/VzPEt9cY6br9UpMBgMqT8qdQMfM4W8cSmUjmzTGRebFi7ZodnkVq0q5wOCL5z
aWmTB0wedkQKm0Nn2VnEYrbRurVh6x8h2n7QIV2z+IBHsX52HqdVUivVi+m1bkJG
GRPZQ6apiGBshJxPBz559TXSbsQZVXpFdpftodqkv2k6opmG1U1MwZ7DFUIlYpX8
4Gsl+WQfE5EMsEiKQxhf
=+j7F
-END PGP SIGNATURE-

Changes since libreoffice-6-1-branch-point-24:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-3' - configure.ac

[Libreoffice Gerrit user]

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

New commits:
commit 1602b56fb1741598f6aefaaeda292594144552bd
Author: Christian Lohmaier 
AuthorDate: Mon Oct 29 20:56:17 2018 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Oct 29 20:56:17 2018 +0100

bump product version to 6.1.3.2.0+

Change-Id: I1dea874f7ac5edacfaa54541ca59f26f68b5364c

diff --git a/configure.ac b/configure.ac
index 67ebe0c96e62..d2542ab31d13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.1.3.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.1.3.2.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-6.1.3.2'

[Libreoffice Gerrit user]

Tag 'libreoffice-6.1.3.2' created by Christian Lohmaier 
 at 2018-10-29 19:55 +

Tag libreoffice-6.1.3.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJb12W9AAoJEPQ0oe+v7q6jnYoP/1qi03RMVelFvBJixsVe0leE
8juat+aD2cZot//FtjuS5tcmTZOa6xGTReMEvvF39uMo7Pm6FnvI9eeawCoirAUg
NAFeMwxqqWg81+iZFdf2f0VVcLrYgzOr4I/JwwoLd//glWzB+S5FBYLBVVitKjVZ
JfW0KB6jxwKOiGp8rZNXnHR6ljWWJRDnifPRANYPLelCkSwymHKL1o2dSKml690C
Of8wbj4OVY4KwNRnNmkoicd+mzOitRwBZAIDetqeKNYeJW6Nb1og2bPQxNpbRmdy
GTMV0CsJVbGQliwAac7Kx638jGamagWkK63nUPpRbEJqOCOkj52v5xFVqkQo5IwX
XSgZVFPIM6KStqdGRFPFPFgC3j/ePWiKXLT+9HlDr5wuFUGeJ7TZ97dtR2ULdf3A
rTpK2ghNkoOvaFSEXwv3Kz3+B4gAxbqjIEgiNXKr5aUH3/fW69RfzZi7+y/3dtxg
uXiJtP8MpB1L0ZoX3hVGHJFCsK6Q8B5iYwbzDAXfZThxyvO2knCJ8r08afb5mIO/
nvRn7k6dak0LKzyVHn7kykuRvrv90t8aPIIBay2vtmyefViwrflvpUOSXVVfml21
2iydCdMzp6kxdl55K2uWypBQLThbEZiuhFPSR7B9ANzf0FWogQGfsE2P9zWR2734
0HDGm6V0FBOZwaMpz/sO
=8Kms
-END PGP SIGNATURE-

Changes since libreoffice-6-1-branch-point-68:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-6.1.3.2'

[Libreoffice Gerrit user]

Tag 'libreoffice-6.1.3.2' created by Christian Lohmaier 
 at 2018-10-29 19:55 +

Tag libreoffice-6.1.3.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJb12XDAAoJEPQ0oe+v7q6jptUP/0xqLvNwBr/02CoE1bOLxWDv
nEa/+6ILN2hLeR+60otrtk3S1/Esa9wZl35c90eMeRBpON88CidmUMytrkKd0eWY
6kxDse6RClDjfkok+45V2CbnfeyzZORZITQ2tC4gk6hQuM1o2r0PjT3qyAZtsBOK
tnB4tAG/cIcx8L1iKJElot75/IZlvwAz2YtbkttXXbWr/EDJREH54NBzO0qtL8tp
5vVAIaw1CTDTIXYTFXIq+lpS3goJNxTMUjMZ32IyeN6z76m7NUWk5CieVLRMNgZk
U3hp0yWr+JRZ54/qzKtfOzBi3bGPyg3WoV5aJCaYdp0sHGM9+wEJ1YGufUuwO6XB
VBfqnzGns4N9the1EQARl5Xh4kVwVzXoQsce2bh7cG/2KAlyPza8nHUlwm+xp/Ez
3v8qrT6aKJHRIV7d9H+emMGEQy+Jgr2tHpmiBFabvoCxwkhUnt5O9QHaOidZptO9
KK99meRceft7aiW68MJje9Tv60EPr13SB3iUYesDFNAPGNxba+rWl3cnMZvqOPaP
12Z5tvtL3gy29fTDwg5av/WSC2X5JmpGhcwgi9rJgMNwHuAiRugZjzUbqD9X7GmJ
z6Di5eF3C2QTK9pL7YjJEAqz6Fhu1ZGvu093QV7kA/2ZBN8Or1Vij/Xov5jqkvct
aHbxofZAFGFNqXPxhzDa
=xE0w
-END PGP SIGNATURE-

Changes since libreoffice-6-1-branch-point-1163:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-6.1.3.2'

[Libreoffice Gerrit user]

Tag 'libreoffice-6.1.3.2' created by Christian Lohmaier 
 at 2018-10-29 19:55 +

Tag libreoffice-6.1.3.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJb12W5AAoJEPQ0oe+v7q6jHcYQAJqUOd+e+u8JeiZTVeiS+A0n
NaUCpvaCl7658U80REfTewM+60W7FK/4WG7L60HppopAQoe4L9o6H6t1V7RoPly+
TxOwlzOZ1saj+7U1JLU4G5KPwtww818bRH4iujh43WlqKzt/4HPd5XTFFR5zoxg3
ooScKRicjVYw+v921vRn2gDso0mNWYJv0XA+sbH9JtHavB8t8hD9AUtCV3fLrpFj
L0kYM8RvU52wZ/yWB4Q95RHis1ifhBQT9jvml57oXJyDudMXitNAWTEFwFIl1jBT
EA9O/9sH3brYuk3buhYL4vt8hkT9fZSSAGPUMWwXXSbC2//PAA03uidSvXbt1pxI
F1MSU4xPNWwmcZJe/Fkq8hAHQnwMh/HZFMJl6PjgzboxHLyWfQDmuczLnRfDSyan
gO4f6bSVCZl1k623BNTf5REuNg+1jdGcbyRfTUZznAKnsysKEMEufYab1Sa9XYjN
Lo4TJikXHiD5xbX+wiIwL/KPaiQwVYujx6a0ys0GTU0ECtCcc38Yehk14j6NrEnO
PUhr+Rg0za14YN/Q4JJx9chmEIWMYoiz8ruyooNx2ZX+SL6Q6QgFXCcmhfnInP8t
tkh016T/6nR+DRs4kGcuULdYalLO32I9RMWRBHWmKiGbeBq2mkXu3auxu/B9XcHw
T+XfCOtr4UdcLIOsxcSM
=6DiB
-END PGP SIGNATURE-

Changes since libreoffice-6-1-branch-point-10:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-3' - readlicense_oo/license

[Libreoffice Gerrit user]

 readlicense_oo/license/CREDITS.fodt | 2905 ++--
 1 file changed, 1458 insertions(+), 1447 deletions(-)

New commits:
commit 9e5b99a776073aceb9dac7d428c1624bf8429601
Author: Christian Lohmaier 
AuthorDate: Mon Oct 29 20:40:24 2018 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Oct 29 20:48:37 2018 +0100

update credits

Change-Id: I8a383888ae8e2da96c7eef94c40cf3ddb7815d98
(cherry picked from commit 360b557c28c7f19731d566c01627cc104d06638a)
(cherry picked from commit cb5584c8a715df8aa68cecefd0bad8d1839124e8)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index af19c057ea7e..f88e2f1b7a3b 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.1.2.1$Linux_X86_64
 
LibreOffice_project/65905a128db06ba48db947242809d14d3f9a93fe2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.1.2.1$Linux_X86_64
 
LibreOffice_project/65905a128db06ba48db947242809d14d3f9a93fe2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   649
+   533
501
-   50872
-   26846
+   37917
+   18960
true
true

 
  view2
- 3577
- 3434
+ 3531
+ 3313
  501
- 649
- 51372
- 27494
+ 533
+ 38416
+ 19491
  0
  0
  false
@@ -69,7 +69,7 @@
false
false
true
-   8065751
+   8189906
false
false
false
@@ -320,58 +320,58 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -380,19 +380,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -401,26 +401,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -1054,7 +1051,7 @@

   
  Credits
-1364 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-10-18 11:20:47.
+1367 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-10-29 07:13:20.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1081,13 +1078,13 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 25074Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 25215Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 16463Joined: 
2000-10-04
+   Stephan 
Bergma

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - readlicense_oo/license

[Libreoffice Gerrit user]

 readlicense_oo/license/CREDITS.fodt | 2905 ++--
 1 file changed, 1458 insertions(+), 1447 deletions(-)

New commits:
commit cb5584c8a715df8aa68cecefd0bad8d1839124e8
Author: Christian Lohmaier 
AuthorDate: Mon Oct 29 20:40:24 2018 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Oct 29 20:45:28 2018 +0100

update credits

Change-Id: I8a383888ae8e2da96c7eef94c40cf3ddb7815d98
(cherry picked from commit 360b557c28c7f19731d566c01627cc104d06638a)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index af19c057ea7e..f88e2f1b7a3b 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.1.2.1$Linux_X86_64
 
LibreOffice_project/65905a128db06ba48db947242809d14d3f9a93fe2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.1.2.1$Linux_X86_64
 
LibreOffice_project/65905a128db06ba48db947242809d14d3f9a93fe2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   649
+   533
501
-   50872
-   26846
+   37917
+   18960
true
true

 
  view2
- 3577
- 3434
+ 3531
+ 3313
  501
- 649
- 51372
- 27494
+ 533
+ 38416
+ 19491
  0
  0
  false
@@ -69,7 +69,7 @@
false
false
true
-   8065751
+   8189906
false
false
false
@@ -320,58 +320,58 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -380,19 +380,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -401,26 +401,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -1054,7 +1051,7 @@

   
  Credits
-1364 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-10-18 11:20:47.
+1367 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-10-29 07:13:20.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1081,13 +1078,13 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 25074Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 25215Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 16463Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16483Joined: 
2000-10-04
   
   
-   *Noel Grandin

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-7' - readlicense_oo/license

[Libreoffice Gerrit user]

 readlicense_oo/license/CREDITS.fodt | 2905 ++--
 1 file changed, 1458 insertions(+), 1447 deletions(-)

New commits:
commit ee1ddb52aedcf2a01dcebc4817e4687729ede596
Author: Christian Lohmaier 
AuthorDate: Mon Oct 29 20:40:24 2018 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Oct 29 20:42:57 2018 +0100

update credits

Change-Id: I8a383888ae8e2da96c7eef94c40cf3ddb7815d98
(cherry picked from commit 360b557c28c7f19731d566c01627cc104d06638a)
(cherry picked from commit a836d673119f1187e6b8bf70968429b58b105097)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index af19c057ea7e..f88e2f1b7a3b 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.1.2.1$Linux_X86_64
 
LibreOffice_project/65905a128db06ba48db947242809d14d3f9a93fe2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.1.2.1$Linux_X86_64
 
LibreOffice_project/65905a128db06ba48db947242809d14d3f9a93fe2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   649
+   533
501
-   50872
-   26846
+   37917
+   18960
true
true

 
  view2
- 3577
- 3434
+ 3531
+ 3313
  501
- 649
- 51372
- 27494
+ 533
+ 38416
+ 19491
  0
  0
  false
@@ -69,7 +69,7 @@
false
false
true
-   8065751
+   8189906
false
false
false
@@ -320,58 +320,58 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -380,19 +380,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -401,26 +401,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -1054,7 +1051,7 @@

   
  Credits
-1364 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-10-18 11:20:47.
+1367 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-10-29 07:13:20.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1081,13 +1078,13 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 25074Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 25215Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 16463Joined: 
2000-10-04
+   Stephan 
Bergma

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - readlicense_oo/license

[Libreoffice Gerrit user]

 readlicense_oo/license/CREDITS.fodt | 2905 ++--
 1 file changed, 1458 insertions(+), 1447 deletions(-)

New commits:
commit a836d673119f1187e6b8bf70968429b58b105097
Author: Christian Lohmaier 
AuthorDate: Mon Oct 29 20:40:24 2018 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Oct 29 20:42:03 2018 +0100

update credits

Change-Id: I8a383888ae8e2da96c7eef94c40cf3ddb7815d98
(cherry picked from commit 360b557c28c7f19731d566c01627cc104d06638a)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index af19c057ea7e..f88e2f1b7a3b 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.1.2.1$Linux_X86_64
 
LibreOffice_project/65905a128db06ba48db947242809d14d3f9a93fe2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.1.2.1$Linux_X86_64
 
LibreOffice_project/65905a128db06ba48db947242809d14d3f9a93fe2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   649
+   533
501
-   50872
-   26846
+   37917
+   18960
true
true

 
  view2
- 3577
- 3434
+ 3531
+ 3313
  501
- 649
- 51372
- 27494
+ 533
+ 38416
+ 19491
  0
  0
  false
@@ -69,7 +69,7 @@
false
false
true
-   8065751
+   8189906
false
false
false
@@ -320,58 +320,58 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -380,19 +380,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -401,26 +401,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -1054,7 +1051,7 @@

   
  Credits
-1364 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-10-18 11:20:47.
+1367 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-10-29 07:13:20.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1081,13 +1078,13 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 25074Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 25215Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 16463Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16483Joined: 
2000-10-04
   
   
-   *Noel Grandin

[Libreoffice-commits] core.git: readlicense_oo/license

[Libreoffice Gerrit user]

 readlicense_oo/license/CREDITS.fodt | 2905 ++--
 1 file changed, 1458 insertions(+), 1447 deletions(-)

New commits:
commit 360b557c28c7f19731d566c01627cc104d06638a
Author: Christian Lohmaier 
AuthorDate: Mon Oct 29 20:40:24 2018 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Oct 29 20:40:24 2018 +0100

update credits

Change-Id: I8a383888ae8e2da96c7eef94c40cf3ddb7815d98

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index af19c057ea7e..f88e2f1b7a3b 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.1.2.1$Linux_X86_64
 
LibreOffice_project/65905a128db06ba48db947242809d14d3f9a93fe2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.1.2.1$Linux_X86_64
 
LibreOffice_project/65905a128db06ba48db947242809d14d3f9a93fe2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   649
+   533
501
-   50872
-   26846
+   37917
+   18960
true
true

 
  view2
- 3577
- 3434
+ 3531
+ 3313
  501
- 649
- 51372
- 27494
+ 533
+ 38416
+ 19491
  0
  0
  false
@@ -69,7 +69,7 @@
false
false
true
-   8065751
+   8189906
false
false
false
@@ -320,58 +320,58 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -380,19 +380,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -401,26 +401,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -1054,7 +1051,7 @@

   
  Credits
-1364 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-10-18 11:20:47.
+1367 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-10-29 07:13:20.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1081,13 +1078,13 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 25074Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 25215Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 16463Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16483Joined: 
2000-10-04
   
   
-   *Noel GrandinCommits: 
10457Joined: 2011-12-12
+   *Noel GrandinCommits: 
10506Joi

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-3' - translations

[Libreoffice Gerrit user]

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

New commits:
commit 74cff518b6685b61db80b8b95d92c51229b2aef0
Author: Christian Lohmaier 
AuthorDate: Mon Oct 29 19:55:26 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Oct 29 20:05:10 2018 +0100

Update git submodules

* Update translations from branch 'libreoffice-6-1-3'
  - update translations for 6.1.3 rc2

and force-fix errors using pocheck

Change-Id: I8707b11ce2d130f136617e928e7b705c47721fef
(cherry picked from commit 617684686d72dd389f37b16128deba8c5282ecc4)

diff --git a/translations b/translations
index 5c49d3a613d6..db097ffe16ad 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 5c49d3a613d6337b437ccf38ebc43f6fb0563c01
+Subproject commit db097ffe16ad20e7731049404c4e92a0fe8bba1a
___
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' - translations

[Libreoffice Gerrit user]

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

New commits:
commit 22b29808d3f6a8a9232b04ec966d8348cdbd58b2
Author: Christian Lohmaier 
AuthorDate: Mon Oct 29 19:55:26 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Oct 29 20:04:20 2018 +0100

Update git submodules

* Update translations from branch 'libreoffice-6-1'
  - update translations for 6.1.3 rc2

and force-fix errors using pocheck

Change-Id: I8707b11ce2d130f136617e928e7b705c47721fef

diff --git a/translations b/translations
index a6589dcbdb30..617684686d72 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit a6589dcbdb300793dc2808ef831098c52c546062
+Subproject commit 617684686d72dd389f37b16128deba8c5282ecc4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/uiconfig/sdraw/popupmenu/page.xml|   27 +
 sd/uiconfig/simpress/popupmenu/page.xml |   49 
 2 files changed, 40 insertions(+), 36 deletions(-)

New commits:
commit 742206383ef2d570178acc5e931fdafb62f6cca9
Author: andreas kainz 
AuthorDate: Mon Oct 29 07:13:20 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Oct 29 19:43:17 2018 +0100

context menu: sync page context menu between draw and impress

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

diff --git a/sd/uiconfig/sdraw/popupmenu/page.xml 
b/sd/uiconfig/sdraw/popupmenu/page.xml
index 105c6e86b873..d27823600be5 100644
--- a/sd/uiconfig/sdraw/popupmenu/page.xml
+++ b/sd/uiconfig/sdraw/popupmenu/page.xml
@@ -12,19 +12,6 @@
   
   
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
-  
   
   
 
@@ -49,4 +36,18 @@
   
   
   
+  
+  
+
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
 
diff --git a/sd/uiconfig/simpress/popupmenu/page.xml 
b/sd/uiconfig/simpress/popupmenu/page.xml
index e50f1090104a..176e7f1d0516 100644
--- a/sd/uiconfig/simpress/popupmenu/page.xml
+++ b/sd/uiconfig/simpress/popupmenu/page.xml
@@ -12,6 +12,31 @@
   
   
   
+  
+  
+
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
   
 
   
@@ -35,28 +60,6 @@
 
   
   
-  
   
-  
-  
-  
-
-  
-  
-  
-  
-  
-
-  
-  
-
-  
-  
-  
-  
-  
-
-  
-  
-  
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/popupmenu/audit.xml  |1 
 sc/uiconfig/scalc/popupmenu/draw.xml   |8 +++-
 sc/uiconfig/scalc/popupmenu/form.xml   |2 -
 sc/uiconfig/scalc/popupmenu/graphic.xml|1 
 sc/uiconfig/scalc/popupmenu/media.xml  |7 +++-
 sc/uiconfig/scalc/popupmenu/oleobject.xml  |   10 --
 sc/uiconfig/scalc/toolbar/drawobjectbar.xml|2 -
 sc/uiconfig/scalc/toolbar/formdesign.xml   |   41 +
 sc/uiconfig/scalc/toolbar/formsfilterbar.xml   |5 +--
 sc/uiconfig/scalc/toolbar/graphicobjectbar.xml |6 +--
 sw/uiconfig/swriter/toolbar/fullscreenbar.xml  |   19 ++-
 11 files changed, 66 insertions(+), 36 deletions(-)

New commits:
commit cc94ca3dd1350c5cd23dcf2ebe69ef0838439d1f
Author: andreas kainz 
AuthorDate: Sun Oct 28 23:03:10 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Oct 29 19:43:01 2018 +0100

calc: sync calc popupmenu and toolbare files with writer

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

diff --git a/sc/uiconfig/scalc/popupmenu/audit.xml 
b/sc/uiconfig/scalc/popupmenu/audit.xml
index 216d626c8795..5748bdb748a5 100644
--- a/sc/uiconfig/scalc/popupmenu/audit.xml
+++ b/sc/uiconfig/scalc/popupmenu/audit.xml
@@ -16,6 +16,7 @@
   
   
   
+  
   
   
 
diff --git a/sc/uiconfig/scalc/popupmenu/draw.xml 
b/sc/uiconfig/scalc/popupmenu/draw.xml
index 690dfbffc02e..0df2b8ed8a60 100644
--- a/sc/uiconfig/scalc/popupmenu/draw.xml
+++ b/sc/uiconfig/scalc/popupmenu/draw.xml
@@ -14,8 +14,6 @@
   
   
   
-  
-  
   
   
   
@@ -45,6 +43,12 @@
   
 
   
+  
+
+  
+  
+
+  
   
   
   
diff --git a/sc/uiconfig/scalc/popupmenu/form.xml 
b/sc/uiconfig/scalc/popupmenu/form.xml
index d1875118b331..7c0dc23842c2 100644
--- a/sc/uiconfig/scalc/popupmenu/form.xml
+++ b/sc/uiconfig/scalc/popupmenu/form.xml
@@ -12,8 +12,8 @@
   
   
   
-  
   
+  
   
   
   
diff --git a/sc/uiconfig/scalc/popupmenu/graphic.xml 
b/sc/uiconfig/scalc/popupmenu/graphic.xml
index b769a614848a..0efe30f531fc 100644
--- a/sc/uiconfig/scalc/popupmenu/graphic.xml
+++ b/sc/uiconfig/scalc/popupmenu/graphic.xml
@@ -21,7 +21,6 @@
   
   
   
-  
   
   
   
diff --git a/sc/uiconfig/scalc/popupmenu/media.xml 
b/sc/uiconfig/scalc/popupmenu/media.xml
index a919bb3ab6bd..a05d6942b27d 100644
--- a/sc/uiconfig/scalc/popupmenu/media.xml
+++ b/sc/uiconfig/scalc/popupmenu/media.xml
@@ -12,8 +12,8 @@
   
   
   
-  
   
+  
   
   
   
@@ -42,6 +42,9 @@
   
   
   
-  
+  
+  
+  
+  
 
 
diff --git a/sc/uiconfig/scalc/popupmenu/oleobject.xml 
b/sc/uiconfig/scalc/popupmenu/oleobject.xml
index 143320b4f3f9..39779cd19733 100644
--- a/sc/uiconfig/scalc/popupmenu/oleobject.xml
+++ b/sc/uiconfig/scalc/popupmenu/oleobject.xml
@@ -14,8 +14,6 @@
   
   
   
-  
-  
   
   
   
@@ -40,14 +38,6 @@
   
 
   
-  
-
-  
-  
-  
-  
-
-  
   
   
   
diff --git a/sc/uiconfig/scalc/toolbar/drawobjectbar.xml 
b/sc/uiconfig/scalc/toolbar/drawobjectbar.xml
index 976ca019a23c..b9f07a437f0c 100644
--- a/sc/uiconfig/scalc/toolbar/drawobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/drawobjectbar.xml
@@ -38,13 +38,13 @@
  
  
  
- 
  
  
  
  
  
  
+ 
  
  
  
diff --git a/sc/uiconfig/scalc/toolbar/formdesign.xml 
b/sc/uiconfig/scalc/toolbar/formdesign.xml
index 551153b6a353..1d4a5c96c6d9 100644
--- a/sc/uiconfig/scalc/toolbar/formdesign.xml
+++ b/sc/uiconfig/scalc/toolbar/formdesign.xml
@@ -18,31 +18,46 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
- 
- 
+ 
  
- 
- 
- 
+ 
  
- 
- 
- 
- 
+ 
+ 
+ 
  
- 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  
- 
- 
+ 
+ 
  
  
  
  
  
  
- 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  
  
+ 
+ 
+ 
+ 
  
  
  
diff --git a/sc/uiconfig/scalc/toolbar/formsfilterbar.xml 
b/sc/uiconfig/scalc/toolbar/formsfilterbar.xml
index c5e89318ff82..096d7e73d821 100644
--- a/sc/uiconfig/scalc/toolbar/formsfilterbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formsfilterbar.xml
@@ -18,7 +18,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
- 
  
+ 
+ 
  
-
\ No newline at end of file
+
diff --git a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml 
b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml
index 47f9a46c0bc5..f9f5e97a6e71 100644
--- a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml
@@ -35,15 +35,15 @@
  
  
  
- 
- 
+ 
+ 
  
  
  
  
  
- 
  
+ 
  
  
  
diff --git a/sw/uiconfig/swriter/toolbar/fullscreenbar.xml 
b/sw/uiconfig/swriter/toolbar/fullscreenbar.xml
index 4162e396e5f2..9b007728dcdc 100644
--- a/sw/uiconfig/swriter/toolbar/fullscreenbar.xml
+++ b/sw/uiconfig/swriter/toolbar/fullscreenbar.xml
@@ -1,5 +1,22 @@
 
 
+
 http://

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

[Libreoffice Gerrit user]

 sw/uiconfig/sglobal/popupmenu/draw.xml |8 ++-
 sw/uiconfig/sglobal/popupmenu/table.xml|1 
 sw/uiconfig/sglobal/popupmenu/text.xml |4 -
 sw/uiconfig/sglobal/toolbar/arrowshapes.xml|   32 +++---
 sw/uiconfig/sglobal/toolbar/basicshapes.xml|   20 
 sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml|   11 ++--
 sw/uiconfig/sglobal/toolbar/calloutshapes.xml  |3 -
 sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml   |   35 +--
 sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml  |   32 ++
 sw/uiconfig/sglobal/toolbar/findbar.xml|4 +
 sw/uiconfig/sglobal/toolbar/formsnavigationbar.xml |3 -
 sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml   |3 -
 sw/uiconfig/sglobal/toolbar/previewobjectbar.xml   |   17 ---
 sw/uiconfig/sglobal/toolbar/standardbar.xml|2 
 sw/uiconfig/sglobal/toolbar/starshapes.xml |8 +--
 sw/uiconfig/sglobal/toolbar/symbolshapes.xml   |   16 +++
 sw/uiconfig/sglobal/toolbar/tableobjectbar.xml |   47 ++---
 sw/uiconfig/sglobal/toolbar/textstylebar.xml   |9 ++--
 sw/uiconfig/sglobal/toolbar/viewerbar.xml  |1 
 sw/uiconfig/sweb/popupmenu/table.xml   |1 
 sw/uiconfig/sweb/popupmenu/text.xml|4 -
 sw/uiconfig/swform/popupmenu/draw.xml  |8 ++-
 sw/uiconfig/swform/popupmenu/table.xml |   18 +---
 sw/uiconfig/swform/popupmenu/text.xml  |3 -
 sw/uiconfig/swreport/popupmenu/draw.xml|8 ++-
 sw/uiconfig/swreport/popupmenu/table.xml   |   18 +---
 sw/uiconfig/swreport/popupmenu/text.xml|3 -
 sw/uiconfig/swxform/popupmenu/draw.xml |8 ++-
 sw/uiconfig/swxform/popupmenu/table.xml|1 
 sw/uiconfig/swxform/popupmenu/text.xml |4 -
 30 files changed, 212 insertions(+), 120 deletions(-)

New commits:
commit 9964299e7396dd7c7f5a9e1870eaa7901d930868
Author: andreas kainz 
AuthorDate: Sun Oct 28 21:45:15 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Oct 29 19:42:45 2018 +0100

Toolbar: sync sglobal with swriter

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

diff --git a/sw/uiconfig/sglobal/toolbar/arrowshapes.xml 
b/sw/uiconfig/sglobal/toolbar/arrowshapes.xml
index e2171beab7c8..3f74148c7da9 100644
--- a/sw/uiconfig/sglobal/toolbar/arrowshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/arrowshapes.xml
@@ -18,34 +18,34 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
- 
  
- 
+ 
  
+ 
  
  
  
- 
- 
+ 
+ 
+ 
+ 
  
  
- 
- 
  
- 
- 
  
+ 
+ 
+ 
+ 
+ 
+ 
  
  
- 
- 
  
+ 
  
  
- 
- 
- 
  
- 
- 
-
\ No newline at end of file
+ 
+ 
+
diff --git a/sw/uiconfig/sglobal/toolbar/basicshapes.xml 
b/sw/uiconfig/sglobal/toolbar/basicshapes.xml
index 5b7194408b0b..148245f66672 100644
--- a/sw/uiconfig/sglobal/toolbar/basicshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/basicshapes.xml
@@ -22,25 +22,27 @@
  
  
  
- 
- 
+ 
+ 
  
+ 
+ 
  
+ 
+ 
+ 
+ 
  
  
- 
  
- 
- 
  
  
  
- 
- 
- 
  
  
  
  
+ 
  
-
\ No newline at end of file
+ 
+
diff --git a/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml 
b/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml
index b20e6e3643b8..c42f57ec6e93 100644
--- a/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml
@@ -18,20 +18,21 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
- 
+ 
  
  
  
- 
  
- 
+ 
  
  
+ 
+ 
+ 
  
  
  
  
- 
  
  
-
\ No newline at end of file
+
diff --git a/sw/uiconfig/sglobal/toolbar/calloutshapes.xml 
b/sw/uiconfig/sglobal/toolbar/calloutshapes.xml
index 43872e2e3bd5..04176302ccd1 100644
--- a/sw/uiconfig/sglobal/toolbar/calloutshapes.xml
+++ b/sw/uiconfig/sglobal/toolbar/calloutshapes.xml
@@ -22,7 +22,8 @@
  
  
  
+ 
  
  
  
-
\ No newline at end of file
+
diff --git a/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml 
b/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml
index f39fb0164480..3662242f552f 100644
--- a/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml
@@ -18,30 +18,26 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  
  
  
  
  
- 
- 
+ 
+ 
  
  
  
- 
  
  
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  
  
  
@@ -50,6 +46,17 @@
  
  
  
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml 
b/sw/uiconfig/sglobal/toolbar/drawtextobjectbar.xml
index 835c6b9364a3..018

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

[Libreoffice Gerrit user]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |   35 +++-
 desktop/source/lib/init.cxx |   19 ---
 include/LibreOfficeKit/LibreOfficeKit.h |4 ++-
 include/LibreOfficeKit/LibreOfficeKit.hxx   |8 --
 4 files changed, 49 insertions(+), 17 deletions(-)

New commits:
commit c2ceb1f54e85ebc8b38df3f2e4d1113a2fe1cc64
Author: Tomaž Vajngerl 
AuthorDate: Thu Oct 18 10:35:25 2018 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon Oct 29 19:35:04 2018 +0100

lok: create certificate and private key with insertCertificate

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

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index bd8b08f9fac8..aeb4f0692c42 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2261,24 +2261,37 @@ void DesktopLOKTest::testInsertCertificate()
 {
 comphelper::LibreOfficeKit::setActive();
 
+// Load the document, save it into a temp file and load that file again
 LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+CPPUNIT_ASSERT(pDocument->pClass->saveAs(pDocument, 
aTempFile.GetURL().toUtf8().getStr(), "odt", nullptr));
+closeDoc();
+
+mxComponent = loadFromDesktop(aTempFile.GetURL(), 
"com.sun.star.text.TextDocument");
+pDocument = new LibLODocument_Impl(mxComponent);
 
 Scheduler::ProcessEventsToIdle();
 CPPUNIT_ASSERT(mxComponent.is());
 pDocument->m_pDocumentClass->initializeForRendering(pDocument, "{}");
 
-OUString aFileURL;
-createFileURL("certificate.der", aFileURL);
-
-SvFileStream aStream(aFileURL, StreamMode::READ);
-sal_uInt64 nSize = aStream.remainingSize();
-
+OUString aCertificateURL;
+createFileURL("certificate.der", aCertificateURL);
+SvFileStream aCertificateStream(aCertificateURL, StreamMode::READ);
 std::vector aCertificate;
-aCertificate.resize(nSize);
-aStream.ReadBytes(aCertificate.data(), nSize);
-
-bool bResult = pDocument->m_pDocumentClass->insertCertificate(pDocument, 
aCertificate.data(), int(aCertificate.size()));
-CPPUNIT_ASSERT(bResult);
+aCertificate.resize(aCertificateStream.remainingSize());
+aCertificateStream.ReadBytes(aCertificate.data(), 
aCertificateStream.remainingSize());
+
+OUString aPrivateKeyURL;
+createFileURL("pkey.der", aPrivateKeyURL);
+SvFileStream aPrivateKeyStream(aPrivateKeyURL, StreamMode::READ);
+std::vector aPrivateKey;
+aPrivateKey.resize(aPrivateKeyStream.remainingSize());
+aPrivateKeyStream.ReadBytes(aPrivateKey.data(), 
aPrivateKeyStream.remainingSize());
+
+pDocument->m_pDocumentClass->insertCertificate(pDocument,
+aCertificate.data(), int(aCertificate.size()),
+aPrivateKey.data(), int(aPrivateKey.size()));
 
 comphelper::LibreOfficeKit::setActive(false);
 }
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2a13775dcc64..b08c6d694f4a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -76,6 +76,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -691,7 +692,9 @@ static char* doc_getPartInfo(LibreOfficeKitDocument* pThis, 
int nPart);
 
 static bool doc_insertCertificate(LibreOfficeKitDocument* pThis,
   const unsigned char* pCertificateBinary,
-  const int pCertificateBinarySize);
+  const int nCertificateBinarySize,
+  const unsigned char* pPrivateKeyBinary,
+  const int nPrivateKeyBinarySize);
 
 static int doc_getSignatureState(LibreOfficeKitDocument* pThis);
 
@@ -3601,7 +3604,9 @@ static void doc_postWindow(LibreOfficeKitDocument* 
/*pThis*/, unsigned nLOKWindo
 }
 
 // CERTIFICATE AND DOCUMENT SIGNING
-static bool doc_insertCertificate(LibreOfficeKitDocument* /*pThis*/, const 
unsigned char* pCertificateBinary, const int nCertificateBinarySize)
+static bool doc_insertCertificate(LibreOfficeKitDocument* /*pThis*/,
+  const unsigned char* pCertificateBinary, 
const int nCertificateBinarySize,
+  const unsigned char* pPrivateKeyBinary, 
const int nPrivateKeySize)
 {
 if (!xContext.is())
 return false;
@@ -3614,11 +3619,19 @@ static bool 
doc_insertCertificate(LibreOfficeKitDocument* /*pThis*/, const unsig
 
 uno::Reference xSecurityEnvironment;
 xSecurityEnvironment = xSecurityContext->getSecurityEnvironment();
+uno::Reference 
xCertificateCreator(xSecurityEnvironment, uno::UNO_QUERY);
+
+if (!xCertificateCreator.is())
+return false;
 
 uno::

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_3' - 5 commits - sw/source

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit e4ea2f3aee390fc739526c869dc3ddcd832d60cf
Author: Michael Stahl 
AuthorDate: Mon Oct 29 19:23:42 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Oct 29 19:23:42 2018 +0100

sw_redlinehide_3: adapt SwWrtShell::NumOrBulletOn/Off

Change-Id: I5cd89bc0595f96125d58a05e01d9e33b965621fe

diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 9ddfd9fe39e8..c0181c34402d 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -56,6 +56,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1026,8 +1027,8 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
 // check, if text node at current cursor positioned is counted.
 // If not, let it been counted. Then it has to be checked,
 // of the outline numbering has to be activated or continued.
-SwTextNode* pTextNode =
-
GetCursor()->GetPoint()->nNode.GetNode().GetTextNode();
+SwTextNode const*const pTextNode = sw::GetParaPropsNode(
+*GetLayout(), GetCursor()->GetPoint()->nNode);
 if ( pTextNode && !pTextNode->IsCountedInList() )
 {
 // check, if numbering of the outline level of the 
paragraph
@@ -1133,7 +1134,8 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
 // do not change found numbering/bullet rule, if it should only be 
continued.
 if ( !bContinueFoundNumRule )
 {
-SwTextNode * pTextNode = 
GetCursor()->GetPoint()->nNode.GetNode().GetTextNode();
+SwTextNode const*const pTextNode = sw::GetParaPropsNode(
+*GetLayout(), GetCursor()->GetPoint()->nNode);
 
 if (pTextNode)
 {
@@ -1197,7 +1199,8 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
 pChrFormat = GetCharFormatFromPool( RES_POOLCHR_BUL_LEVEL );
 }
 
-const SwTextNode* pTextNode = 
GetCursor()->GetPoint()->nNode.GetNode().GetTextNode();
+const SwTextNode *const pTextNode = sw::GetParaPropsNode(*GetLayout(),
+GetCursor()->GetPoint()->nNode);
 const SwTwips nWidthOfTabs = pTextNode
  ? pTextNode->GetWidthOfLeadingTabs()
  : 0;
@@ -1306,7 +1309,7 @@ void SwWrtShell::NumOrBulletOff()
 SwNumRule aNumRule(*pCurNumRule);
 
 SwTextNode * pTextNode =
-GetCursor()->GetPoint()->nNode.GetNode().GetTextNode();
+sw::GetParaPropsNode(*GetLayout(), 
GetCursor()->GetPoint()->nNode);
 
 if (pTextNode)
 {
@@ -1413,7 +1416,7 @@ SelectionType SwWrtShell::GetSelectionType() const
 if ( pNumRule )
 {
 const SwTextNode* pTextNd =
-GetCursor()->GetPoint()->nNode.GetNode().GetTextNode();
+sw::GetParaPropsNode(*GetLayout(), GetCursor()->GetPoint()->nNode);
 
 if ( pTextNd && pTextNd->IsInList() )
 {
commit c9bc8a8916e8c16d29564a5cd80b9a8edabca1d6
Author: Michael Stahl 
AuthorDate: Mon Oct 29 18:54:56 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Oct 29 18:54:56 2018 +0100

sw_redlinehide_3: adapt SwFEShell::GetNumRuleNodeAtPos()/IsNumLabel()

Change-Id: Ifd65b7b294cd7bc2a93c9e574712dce200bdfcf3

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 05890b2e1803..a00a35ec6f77 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1304,7 +1304,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
  && IsAttrAtPos::NumLabel & rContentAtPos.eContentAtPos)
 {
 bRet = aTmpState.m_bInNumPortion;
-rContentAtPos.aFnd.pNode = pTextNd;
+rContentAtPos.aFnd.pNode = sw::GetParaPropsNode(*GetLayout(), 
aPos.nNode);
 
 Size aSizeLogic(aTmpState.m_nInNumPortionOffset, 0);
 Size aSizePixel = GetWin()->LogicToPixel(aSizeLogic);
commit 6e1f648e2ae00fc80b41c7d5eaf168ac06eeaf26
Author: Michael Stahl 
AuthorDate: Mon Oct 29 15:58:25 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Oct 29 15:58:25 2018 +0100

remove this nonsense, see SwPam::Delete

Change-Id: Ic8425801e51219627fd37e0b63161590a61b2857

diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index de507fa6aea3..6597f7109ec6 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -398,12 +398,6 @@ bool SwEditShell::MoveParagraph( long nOffset )
 StartAllAction();
 
 SwPaM *pCursor = GetCursor();
-if( !pCursor->HasMark() )
-{
-// Ensures that Bound1 and Bound2 are in the same Node
-pCursor->SetMark();
-pCursor->DeleteMark();
-}
 
 bool bRet = GetDoc()->MoveParagraph( *pCursor, nOffset );
 
commit 511f786e0f5581d0

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

[Libreoffice Gerrit user]

 sw/source/uibase/app/apphdl.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b8e260a9372de9ee1186e1f78ade29717e9b8026
Author: Ilhan Yesil 
AuthorDate: Mon Oct 29 12:33:25 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Oct 29 17:54:54 2018 +0100

tdf#121013 External tool opens it's own dialog to update input fields

Instead calling function SwWrtShell::UpdateInputFields directly, use
an UNO command, so an external tool can catch the UNO call.

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

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index dda0b9143141..04255a9721c1 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -66,6 +66,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -814,7 +815,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint )
 bUpdateFields = false;
 if(bUpdateFields)
 {
-pWrtSh->UpdateInputFields();
+comphelper::dispatchCommand(".uno:UpdateInputFields", 
{});
 
 // Are database fields contained?
 // Get all used databases for the first time
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/inc/column.hxx   |3 +
 sc/inc/table.hxx|1 
 sc/source/core/data/column2.cxx |   61 ++--
 sc/source/core/data/dociter.cxx |   14 +
 sc/source/core/data/table1.cxx  |   21 -
 sc/source/core/data/table3.cxx  |   13 +++-
 6 files changed, 88 insertions(+), 25 deletions(-)

New commits:
commit 9c5f3baa657290cca801767f9e5886f6287e2f08
Author: Serge Krot 
AuthorDate: Wed Oct 24 15:38:17 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Oct 29 17:53:31 2018 +0100

sc: fix: range/step calculation for progress bar

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

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 915b1aa22644..ffa43e12ea94 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -369,7 +369,8 @@ public:
 ScFormulaCell * const * GetFormulaCellBlockAddress( SCROW nRow, size_t& 
rBlockSize ) const;
 CellTypeGetCellType( SCROW nRow ) const;
 SCSIZE  GetCellCount() const;
-sal_uInt32 GetWeightedCount() const;
+sal_uLong GetWeightedCount() const;
+sal_uLong GetWeightedCount(SCROW nStartRow, SCROW nEndRow) const;
 sal_uInt32 GetCodeCount() const;   // RPN-Code in formulas
 FormulaError  GetErrCode( SCROW nRow ) const;
 
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 50dd96be4a3b..0e5b62837b92 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -290,6 +290,7 @@ public:
 }
 sal_uLong   GetCellCount() const;
 sal_uLong   GetWeightedCount() const;
+sal_uLong   GetWeightedCount(SCROW nStartRow, SCROW nEndRow) const;
 sal_uLong   GetCodeCount() const;   // RPN code in formula
 
 sal_uInt16 GetTextWidth(SCCOL nCol, SCROW nRow) const;
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 07653661e13a..e6cbf36a2ce5 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -3471,48 +3471,91 @@ namespace {
 
 class WeightedCounter
 {
-size_t mnCount;
+sal_uLong mnCount;
 public:
 WeightedCounter() : mnCount(0) {}
 
 void operator() (const sc::CellStoreType::value_type& node)
 {
+mnCount += getWeight(node);
+}
+
+static sal_uLong getWeight(const sc::CellStoreType::value_type& node)
+{
 switch (node.type)
 {
 case sc::element_type_numeric:
 case sc::element_type_string:
-mnCount += node.size;
+return node.size;
 break;
 case sc::element_type_formula:
 {
+size_t nCount = 0;
 // Each formula cell is worth its code length plus 5.
 sc::formula_block::const_iterator it = 
sc::formula_block::begin(*node.data);
 sc::formula_block::const_iterator itEnd = 
sc::formula_block::end(*node.data);
 for (; it != itEnd; ++it)
 {
 const ScFormulaCell* p = *it;
-mnCount += 5 + p->GetCode()->GetCodeLen();
+nCount += 5 + p->GetCode()->GetCodeLen();
 }
+
+return nCount;
 }
 break;
 case sc::element_type_edittext:
 // each edit-text cell is worth 50.
-mnCount += node.size * 50;
+return node.size * 50;
 break;
 default:
-;
+return 0;
 }
 }
 
-size_t getCount() const { return mnCount; }
+sal_uLong getCount() const { return mnCount; }
 };
 
+class WeightedCounterWithRows
+{
+const SCROW mnStartRow;
+const SCROW mnEndRow;
+sal_uLong mnCount;
+
+public:
+WeightedCounterWithRows(SCROW nStartRow, SCROW nEndRow)
+: mnStartRow(nStartRow)
+, mnEndRow(nEndRow)
+, mnCount(0)
+{
+}
+
+void operator() (const sc::CellStoreType::value_type& node)
+{
+const SCROW nRow1 = node.position;
+const SCROW nRow2 = nRow1 + 1;
+
+if (! ((nRow2 < mnStartRow) || (nRow1 > mnEndRow)))
+{
+mnCount += WeightedCounter::getWeight(node);
+}
+}
+
+sal_uLong getCount() const { return mnCount; }
+};
+
+}
+
+sal_uLong ScColumn::GetWeightedCount() const
+{
+const WeightedCounter aFunc = std::for_each(maCells.begin(), maCells.end(),
+WeightedCounter());
+return aFunc.getCount();
 }
 
-sal_uInt32 ScColumn::GetWeightedCount() const
+sal_uLong ScColumn::GetWeightedCount(SCROW nStartRow, SCROW nEndRow) const
 {
-WeightedCounter aFunc;
-std::for_each(maCells.begin(), maCells.end(), aFunc);
+const WeightedCounterWithRows aFunc = std::for_each(maCells.begin(), 
maCells.end(),
+WeightedCounterWithRows(nStartRow, nEndRow));
 return aFunc.getCount();
 }
 

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

[Libreoffice Gerrit user]

 sw/source/filter/xml/xmlbrsh.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 65d727548740afae7175fb04a12f50e119514497
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 12:50:33 2018 +0100
Commit: Xisco Faulí 
CommitDate: Mon Oct 29 17:08:00 2018 +0100

tdf#118820 untested speculative fix

Change-Id: I50a65d56251f978785fa446515cb374167c604e8
Reviewed-on: https://gerrit.libreoffice.org/60682
Tested-by: Jenkins
Tested-by: Xisco Faulí 
Reviewed-by: Xisco Faulí 

diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index c9ed33c53dc7..aebefd159b8f 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -135,10 +135,14 @@ void SwXMLBrushItemImportContext::EndElement()
 m_xGraphic = GetImport().loadGraphicFromBase64(m_xBase64Stream);
 m_xBase64Stream = nullptr;
 }
+
 if (m_xGraphic.is())
 {
 Graphic aGraphic(m_xGraphic);
+SvxGraphicPosition eOldGraphicPos = pItem->GetGraphicPos();
 pItem->SetGraphic(aGraphic);
+if (GPOS_NONE == eOldGraphicPos && GPOS_NONE != pItem->GetGraphicPos())
+pItem->SetGraphicPos(GPOS_TILED);
 }
 
 if (!(pItem->GetGraphic()))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 configure.ac |8 
 1 file changed, 8 insertions(+)

New commits:
commit 6b56ca7a9bf67bcada666f4cb1c2e20e7c0d512e
Author: Mike Kaganski 
AuthorDate: Mon Oct 29 14:36:24 2018 +0100
Commit: Mike Kaganski 
CommitDate: Mon Oct 29 15:56:33 2018 +0100

Add check for en_US.utf8 locale

Change-Id: I62ce7680c65ec49dd81085d4087c578f3b6c7907
Reviewed-on: https://gerrit.libreoffice.org/62508
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/configure.ac b/configure.ac
index 66ef56202d1a..0312d7f07841 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2411,6 +2411,14 @@ if test -z "$BASH"; then
 fi
 AC_SUBST(BASH)
 
+AC_MSG_CHECKING([for en_US.utf8 locale])
+if locale -a | egrep -q 'en_US\.(UTF-8|utf8)'; then
+AC_MSG_RESULT(present)
+else
+AC_MSG_RESULT(absent)
+AC_MSG_ERROR([you need en_US.utf8 locale to build])
+fi
+
 AC_MSG_CHECKING([for GNU or BSD tar])
 for a in $GNUTAR gtar gnutar bsdtar tar /usr/sfw/bin/gtar; do
 $a --version 2> /dev/null | egrep "GNU|bsdtar"  2>&1 > /dev/null
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |   67 --
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx |   12 +
 2 files changed, 66 insertions(+), 13 deletions(-)

New commits:
commit ef2623b712d7417d8135279d654a16de2caf56fc
Author: Tomaž Vajngerl 
AuthorDate: Thu Oct 18 10:34:14 2018 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon Oct 29 15:27:10 2018 +0100

xmlsecurity: implement XCertificateCreator for NSS backend

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

diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx 
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index cae2675db64a..4e31c40bf733 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -26,7 +26,6 @@
 #include 
 #include 
 #include "securityenvironment_nssimpl.hxx"
-#include "x509certificate_nssimpl.hxx"
 #include 
 
 #include 
@@ -433,20 +432,23 @@ Sequence< Reference < XCertificate > > 
SecurityEnvironment_NssImpl::buildCertifi
 return Sequence< Reference < XCertificate > >();
 }
 
-Reference< XCertificate > 
SecurityEnvironment_NssImpl::createCertificateFromRaw( const Sequence< sal_Int8 
>& rawCertificate ) {
-X509Certificate_NssImpl* xcert ;
-
-if( rawCertificate.getLength() > 0 ) {
-xcert = new X509Certificate_NssImpl() ;
-if( xcert == nullptr )
-throw RuntimeException() ;
+X509Certificate_NssImpl* 
SecurityEnvironment_NssImpl::createX509CertificateFromDER(const 
css::uno::Sequence& aDerCertificate)
+{
+X509Certificate_NssImpl* pX509Certificate = nullptr;
 
-xcert->setRawCert( rawCertificate ) ;
-} else {
-xcert = nullptr ;
+if (aDerCertificate.getLength() > 0)
+{
+pX509Certificate = new X509Certificate_NssImpl();
+if (pX509Certificate == nullptr)
+throw RuntimeException();
+pX509Certificate->setRawCert(aDerCertificate);
 }
+return pX509Certificate;
+}
 
-return xcert ;
+Reference 
SecurityEnvironment_NssImpl::createCertificateFromRaw(const Sequence< sal_Int8 
>& rawCertificate)
+{
+return createX509CertificateFromDER(rawCertificate);
 }
 
 Reference< XCertificate > 
SecurityEnvironment_NssImpl::createCertificateFromAscii( const OUString& 
asciiCertificate )
@@ -839,6 +841,47 @@ void 
SecurityEnvironment_NssImpl::destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr
 }
 }
 
+uno::Reference 
SecurityEnvironment_NssImpl::createDERCertificateWithPrivateKey(
+Sequence const & raDERCertificate, Sequence const 
& raPrivateKey)
+{
+SECStatus nStatus = SECSuccess;
+
+PK11SlotInfo* pSlot = PK11_GetInternalKeySlot();
+if (!pSlot)
+return uno::Reference();
+
+SECItem pDerPrivateKeyInfo;
+pDerPrivateKeyInfo.data = reinterpret_cast(const_cast(raPrivateKey.getConstArray()));
+pDerPrivateKeyInfo.len = raPrivateKey.getLength();
+
+const unsigned int keyUsage = KU_KEY_ENCIPHERMENT | KU_DATA_ENCIPHERMENT | 
KU_DIGITAL_SIGNATURE;
+SECKEYPrivateKey* pPrivateKey = nullptr;
+
+bool bPermanent = false;
+bool bSensitive = false;
+
+nStatus = PK11_ImportDERPrivateKeyInfoAndReturnKey(
+  pSlot, &pDerPrivateKeyInfo, nullptr, nullptr, bPermanent, bSensitive,
+  keyUsage, &pPrivateKey, nullptr);
+
+if (nStatus != SECSuccess)
+return uno::Reference();
+
+if (!pPrivateKey)
+return uno::Reference();
+
+X509Certificate_NssImpl* pX509Certificate = 
createX509CertificateFromDER(raDERCertificate);
+if (!pX509Certificate)
+return uno::Reference();
+
+addCryptoSlot(pSlot);
+
+CERTCertificate* pCERTCertificate = 
const_cast(pX509Certificate->getNssCert());
+pCERTCertificate->slot = pSlot;
+
+return pX509Certificate;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
 com_sun_star_xml_crypto_SecurityEnvironment_get_implementation(
 uno::XComponentContext* /*pCtx*/, uno::Sequence const& /*rSeq*/)
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx 
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index aec7f5bbcead..6c6160fc2009 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -31,11 +31,14 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 
+#include "x509certificate_nssimpl.hxx"
+
 #include 
 
 #include 
@@ -46,7 +49,8 @@
 #include 
 
 class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper<
-css::xml::crypto::XSecurityEnvironment ,
+css::xml::crypto::XSecurityEnvironment,
+css::xml::crypto::XCertificateCreator,
 css::lang::XServiceInfo,
 css::lang::XUnoTunnel >
 {
@@ -111,6 +115,10 @@ private:
 virtual css::uno::Refe

[Libreoffice-commits] core.git: connectivity/source dbaccess/qa editeng/qa sax/source sccomp/qa sc/source sd/qa sw/qa tools/qa vcl/qa vcl/source

[Libreoffice Gerrit user]

 connectivity/source/drivers/mysqlc/mysqlc_connection.cxx |6 -
 dbaccess/qa/extras/hsql_schema_import.cxx|   44 +++-
 dbaccess/qa/unit/tdf119625.cxx   |6 -
 editeng/qa/unit/core-test.cxx|3 
 sax/source/tools/fastserializer.cxx  |2 
 sc/source/ui/Accessibility/AccessibleDocument.cxx|9 --
 sc/source/ui/dataprovider/datatransformation.cxx |   27 ++-
 sccomp/qa/unit/SwarmSolverTest.cxx   |   10 +-
 sd/qa/unit/import-tests.cxx  |4 -
 sw/qa/extras/layout/layout.cxx   |7 +
 sw/qa/extras/odfexport/odfexport.cxx |4 -
 sw/qa/extras/uiwriter/uiwriter.cxx   |3 
 tools/qa/cppunit/test_color.cxx  |3 
 tools/qa/cppunit/test_config.cxx |9 --
 tools/qa/cppunit/test_date.cxx   |   54 +--
 vcl/qa/cppunit/FontFeatureTest.cxx   |2 
 vcl/qa/cppunit/bitmapcolor.cxx   |   12 +--
 vcl/source/gdi/pdfwriter_impl.cxx|3 
 18 files changed, 88 insertions(+), 120 deletions(-)

New commits:
commit 41eeaace84b45c803fff3ebd5ab981f0ad09393b
Author: Noel Grandin 
AuthorDate: Mon Oct 29 08:58:11 2018 +0200
Commit: Noel Grandin 
CommitDate: Mon Oct 29 15:12:26 2018 +0100

loplugin:oncevar

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

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
index cb1b06261042..981fe7392aa5 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
@@ -268,9 +268,8 @@ OUString SAL_CALL OConnection::nativeSQL(const OUString& 
/*_sSql*/)
 MutexGuard aGuard(m_aMutex);
 
 // const OUString sSqlStatement = transFormPreparedStatement( _sSql );
-OUString sNativeSQL;
 // TODO
-return sNativeSQL;
+return OUString();
 }
 
 void SAL_CALL OConnection::setAutoCommit(sal_Bool autoCommit)
@@ -291,8 +290,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit()
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
-bool autoCommit = false;
-return autoCommit;
+return false;
 }
 
 void SAL_CALL OConnection::commit()
diff --git a/dbaccess/qa/extras/hsql_schema_import.cxx 
b/dbaccess/qa/extras/hsql_schema_import.cxx
index dd75eb2dc38c..89ee74ce03aa 100644
--- a/dbaccess/qa/extras/hsql_schema_import.cxx
+++ b/dbaccess/qa/extras/hsql_schema_import.cxx
@@ -61,7 +61,7 @@ public:
 
 void HsqlSchemaImportTest::testIntegerPrimaryKeyNotNull()
 {
-OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL 
PRIMARY KEY)" };
+const OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT 
NULL PRIMARY KEY)" };
 
 FbCreateStmtParser aCreateParser;
 aCreateParser.parse(sql);
@@ -79,8 +79,10 @@ void HsqlSchemaImportTest::testIntegerPrimaryKeyNotNull()
 
 void HsqlSchemaImportTest::testVarcharWithParam()
 {
-OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL 
PRIMARY KEY, \"myText\" "
-  "VARCHAR(50))" };
+const OUString sql{
+"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myText\" "
+"VARCHAR(50))"
+};
 
 FbCreateStmtParser aCreateParser;
 aCreateParser.parse(sql);
@@ -102,8 +104,10 @@ void HsqlSchemaImportTest::testVarcharWithParam()
  **/
 void HsqlSchemaImportTest::testVarcharWithoutParam()
 {
-OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL 
PRIMARY KEY, \"myText\" "
-  "VARCHAR)" };
+const OUString sql{
+"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myText\" "
+"VARCHAR)"
+};
 
 FbCreateStmtParser aCreateParser;
 aCreateParser.parse(sql);
@@ -118,8 +122,10 @@ void HsqlSchemaImportTest::testVarcharWithoutParam()
 
 void HsqlSchemaImportTest::testNumericWithTwoParam()
 {
-OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL 
PRIMARY KEY, \"Betrag\" "
-  "NUMERIC(8,2))" };
+const OUString sql{
+"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"Betrag\" "
+"NUMERIC(8,2))"
+};
 
 FbCreateStmtParser aCreateParser;
 aCreateParser.parse(sql);
@@ -140,8 +146,10 @@ void HsqlSchemaImportTest::testNumericWithTwoParam()
 
 void HsqlSchemaImportTest::testIntegerAutoincremental()
 {
-OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL 
PRIMARY KEY GENERATED "
-  "BY DEFAULT AS IDENTITY(START WITH 0), \"myText\" 
VARCHAR(5

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

[Libreoffice Gerrit user]

 sd/IwyuFilter_sd.yaml|   10 --
 sd/inc/Annotation.hxx|4 
 sd/inc/Outliner.hxx  |5 -
 sd/inc/helper/simplereferencecomponent.hxx   |3 ---
 sd/inc/sdpdffilter.hxx   |8 ++--
 sd/source/ui/dlg/sdpreslt.cxx|1 +
 sd/source/ui/inc/ClientView.hxx  |2 --
 sd/source/ui/inc/FormShellManager.hxx|1 +
 sd/source/ui/inc/GraphicDocShell.hxx |1 -
 sd/source/ui/inc/OutlineView.hxx |1 -
 sd/source/ui/inc/Ruler.hxx   |1 -
 sd/source/ui/inc/ShellFactory.hxx|4 
 sd/source/ui/inc/copydlg.hxx |2 --
 sd/source/ui/inc/createtableobjectbar.hxx|2 ++
 sd/source/ui/inc/facreg.hxx  |1 -
 sd/source/ui/inc/fuconcs.hxx |1 -
 sd/source/ui/inc/fuconrec.hxx|1 -
 sd/source/ui/inc/fuoltext.hxx|2 --
 sd/source/ui/inc/fupoor.hxx  |1 -
 sd/source/ui/inc/sdpreslt.hxx|4 ++--
 sd/source/ui/presenter/PresenterPreviewCache.cxx |2 ++
 21 files changed, 18 insertions(+), 39 deletions(-)

New commits:
commit a2f7678171618d958e3c387718cd389bea63eaeb
Author: Gabor Kelemen 
AuthorDate: Tue Oct 23 10:37:52 2018 +0200
Commit: Miklos Vajna 
CommitDate: Mon Oct 29 14:24:23 2018 +0100

tdf#42949 Fix IWYU warnings in sd/inc ; sd/source/ui/inc/

Found with bin/find-unneeded-includes after recent improvements
- remove UNO headers from blacklist
- remove newly found unneeded fw declarations
- fix up some not self contained headers

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

diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index d0561dc6eb15..dbae85a63152 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -1,15 +1,6 @@
 ---
 assumeFilename: sd/source/core/drawdoc.cxx
 blacklist:
-sd/inc/createpresentation.hxx:
-# base class has to be a complete type
-- com/sun/star/uno/Reference.hxx
-sd/inc/createunopageimpl.hxx:
-# base class has to be a complete type
-- com/sun/star/uno/Reference.hxx
-sd/inc/createunocustomshow.hxx:
-# base class has to be a complete type
-- com/sun/star/uno/Reference.hxx
 sd/inc/CustomAnimationCloner.hxx:
 # base class has to be a complete type
 - com/sun/star/animations/XAnimationNode.hpp
@@ -50,7 +41,6 @@ blacklist:
 - com/sun/star/container/XNamed.hpp
 - com/sun/star/lang/XServiceInfo.hpp
 - com/sun/star/lang/XSingleServiceFactory.hpp
-- com/sun/star/uno/Any.hxx
 sd/inc/stlpool.hxx:
 # base class has to be a complete type
 - com/sun/star/lang/XServiceInfo.hpp
diff --git a/sd/inc/Annotation.hxx b/sd/inc/Annotation.hxx
index 2c83e8cb9135..74f945c6216e 100644
--- a/sd/inc/Annotation.hxx
+++ b/sd/inc/Annotation.hxx
@@ -21,6 +21,8 @@
 #define INCLUDED_SD_INC_ANNOTATION_HXX
 
 #include 
+#include 
+#include 
 
 class SdPage;
 class SdrUndoAction;
@@ -29,6 +31,8 @@ namespace com { namespace sun { namespace star { namespace 
office {
 class XAnnotation;
 } } } }
 
+namespace com { namespace sun { namespace star { namespace uno { template 
 class Reference; } } } }
+
 class SfxViewShell;
 
 namespace sd {
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 32e2b21cfa88..7f25e9a0fcf4 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -30,11 +30,6 @@ class SdrObject;
 class SdrTextObj;
 class SdDrawDocument;
 
-namespace weld
-{
-class MessageDialog;
-}
-
 namespace sd {
 
 class View;
diff --git a/sd/inc/helper/simplereferencecomponent.hxx 
b/sd/inc/helper/simplereferencecomponent.hxx
index bfe1c391535a..64ab641fc6bc 100644
--- a/sd/inc/helper/simplereferencecomponent.hxx
+++ b/sd/inc/helper/simplereferencecomponent.hxx
@@ -22,9 +22,6 @@
 
 #include 
 
-#include 
-#include 
-
 #include 
 
 namespace sd {
diff --git a/sd/inc/sdpdffilter.hxx b/sd/inc/sdpdffilter.hxx
index 8971eb745179..ce085a7036b3 100644
--- a/sd/inc/sdpdffilter.hxx
+++ b/sd/inc/sdpdffilter.hxx
@@ -20,10 +20,14 @@
 #ifndef INCLUDED_SD_INC_SDPDFIUMFILTER_HXX
 #define INCLUDED_SD_INC_SDPDFIUMFILTER_HXX
 
-#include 
-
 #include "sdfilter.hxx"
 
+class SfxMedium;
+namespace sd
+{
+class DrawDocShell;
+}
+
 class SdPdfFilter : public SdFilter
 {
 public:
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 9e1c983c6070..5929e734a0fc 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 
diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx
index 1f6a720907a9..a7bb20b51bf2 100644
--- a/sd/source/ui/inc/Clie

[Libreoffice-commits] core.git: Branch 'feature/cib_contract138b' - 12 commits - comphelper/source configure.ac desktop/source dtrans/source extensions/Library_log.mk extensions/source .gitreview incl

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit cd137052b02d552d43bc44c9794557f05a77e3df
Author: Samuel Mehrbrodt 
AuthorDate: Mon Oct 29 14:03:22 2018 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Oct 29 14:09:41 2018 +0100

Bump version to 6.0.8.1

Change-Id: I5b6949214031817471900b929e1281eba11c47c6

diff --git a/configure.ac b/configure.ac
index 8d4c7b3d36a2..795cde16d38f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.0.8.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.0.8.1],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
commit 44d74f144f4d476b96191f568d7077a066a4bc41
Author: Samuel Mehrbrodt 
AuthorDate: Fri Oct 26 14:46:47 2018 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Oct 29 14:01:08 2018 +0100

unopkg: Log deployment output with the same logger as unopkg

This prevents overwriting the existing logfile by
using the same logger as unopkg does.

Reviewed-on: https://gerrit.libreoffice.org/62393
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 5bd0212b54ea8c98fe401e8b1ad6d0b626a4b7e1)

Change-Id: Iaad4c5b99a4f428d3a4ad8a046c88404aecb5652
(cherry picked from commit ad9d295c13d4c176643a26898f1b697b2a406ee7)

diff --git a/desktop/source/deployment/dp_log.cxx 
b/desktop/source/deployment/dp_log.cxx
index 4f9453ff3a3b..c40cd16780ec 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -27,7 +27,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -37,6 +39,7 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::logging;
 
 namespace dp_log {
 
@@ -46,8 +49,7 @@ typedef 
::cppu::WeakComponentImplHelper t_log_helper;
 class ProgressLogImpl : public ::dp_misc::MutexHolder, public t_log_helper
 {
 Reference m_xLogFile;
-sal_Int32 m_log_level;
-void log_write( OString const & text );
+std::unique_ptr m_logger;
 
 protected:
 virtual void SAL_CALL disposing() override;
@@ -71,73 +73,16 @@ ProgressLogImpl::~ProgressLogImpl()
 
 void ProgressLogImpl::disposing()
 {
-try {
-if (m_xLogFile.is()) {
-m_xLogFile->closeOutput();
-m_xLogFile.clear();
-}
-}
-catch (const Exception & exc) {
-SAL_WARN( "desktop", exc );
-}
 }
 
 
 ProgressLogImpl::ProgressLogImpl(
-Sequence const & args,
+Sequence const & /* args */,
 Reference const & xContext )
-: t_log_helper( getMutex() ),
-  m_log_level( 0 )
-{
-OUString log_file;
-boost::optional< Reference > interactionHandler;
-comphelper::unwrapArgs( args, log_file, interactionHandler );
-
-Reference xSimpleFileAccess( 
ucb::SimpleFileAccess::create(xContext) );
-// optional ia handler:
-if (interactionHandler)
-xSimpleFileAccess->setInteractionHandler( *interactionHandler );
-
-m_xLogFile.set(
-xSimpleFileAccess->openFileWrite( log_file ), UNO_QUERY_THROW );
-Reference xSeekable( m_xLogFile, UNO_QUERY_THROW );
-xSeekable->seek( xSeekable->getLength() );
-
-// write log stamp
-OStringBuffer buf;
-buf.append( "## Progress log entry " );
-TimeValue aStartTime, tLocal;
-oslDateTime date_time;
-if (osl_getSystemTime( &aStartTime ) &&
-osl_getLocalTimeFromSystemTime( &aStartTime, &tLocal ) &&
-osl_getDateTimeFromTimeValue( &tLocal, &date_time ))
-{
-char ar[ 128 ];
-snprintf(
-ar, sizeof (ar),
-"%04d-%02d-%02d %02d:%02d:%02d ",
-date_time.Year, date_time.Month, date_time.Day,
-date_time.Hours, date_time.Minutes, date_time.Seconds );
-buf.append( ar );
-}
-buf.append( "##\n" );
-log_write( buf.makeStringAndClear() );
-}
-
-
-void ProgressLogImpl::log_write( OString const & text )
+: t_log_helper( getMutex() )
 {
-try {
-if (m_xLogFile.is()) {
-m_xLogFile->writeBytes(
-Sequence< sal_Int8 >(
-reinterpret_cast< sal_Int8 const * >(text.getStr()),
-text.getLength() ) );
-}
-}
-catch (const io::IOException & exc) {
-SAL_WARN( "desktop", exc );
-}
+// Use the logger created by unopkg app
+m_logger.reset(new comphelper::EventLogger(xContext, "unopkg"));
 }
 
 // XProgressHandler
@@ -145,39 +90,30 @@ void ProgressLogImpl::log_write( OString const & text )
 void ProgressLogImpl::push( Any const & Status )
 {
 update( Status );
-OSL_ASSERT( m_log_level >= 0 );
-++m_log_level;
 }
 
-
 void ProgressLogImpl::update( Any const & Statu

[Libreoffice-commits] online.git: 6 commits - bundled/include

[Libreoffice Gerrit user]

 bundled/include/LibreOfficeKit/LibreOfficeKit.h  |   10 
 bundled/include/LibreOfficeKit/LibreOfficeKit.hxx|   19 +++
 bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |3 -
 bundled/include/LibreOfficeKit/LibreOfficeKitInit.h  |   46 ---
 4 files changed, 70 insertions(+), 8 deletions(-)

New commits:
commit c6d2c9c26a0cb28e68ec53a2807ba27acf73be95
Author: Tor Lillqvist 
AuthorDate: Mon Oct 29 14:23:03 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Oct 29 14:23:16 2018 +0200

Add a newline to make the file match the one in core.git

Change-Id: Icb4b285a1d1510af550f1a3d98276546a4dc6aad

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 1a9889ba9..c3ccc6aa0 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -574,6 +574,7 @@ typedef enum
  * - "close" - window is closed
  */
 LOK_CALLBACK_WINDOW = 36,
+
 /**
  * When for the current cell is defined a validity list we need to show
  * a drop down button in the form of a marker.
commit c730ce1d2c13a859847124b3f4165c53a7c6f459
Author: Tomaž Vajngerl 
AuthorDate: Mon Oct 15 10:09:15 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Oct 29 14:23:16 2018 +0200

lokit: add funct. to insert, sign and verify signature

A lot of signing code paths trigger a GUI dialog (to select the
certificate for example) which aren't acceptable when triggering
through the LOKit. This code paths needed to be duplicated and
reworked to not trigger any GUI action.

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

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 0ae5c6ff1..24aa49621 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -321,6 +321,16 @@ struct _LibreOfficeKitDocumentClass
   const int nTileHeight);
 #endif // IOS
 
+// CERTIFICATE AND SIGNING
+
+/// @see lok::Document::insertCertificate().
+bool (*insertCertificate) (LibreOfficeKitDocument* pThis,
+const unsigned char* pCertificateBinary,
+const int pCertificateBinarySize);
+
+/// @see lok::Document::getSignatureState().
+int (*getSignatureState) (LibreOfficeKitDocument* pThis);
+
 #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 };
 
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
index 3568c861f..d6e4bee6f 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -578,6 +578,25 @@ public:
 }
 #endif // IOS
 
+/**
+ *  Insert certificate (in binary form) to the certificate store.
+ */
+bool insertCertificate(const unsigned char* pCertificateBinary,
+   const int pCertificateBinarySize)
+{
+return mpDoc->pClass->insertCertificate(mpDoc, pCertificateBinary, 
pCertificateBinarySize);
+}
+
+/**
+ *  Verify signature of the document.
+ *
+ *  Check possible values in include/sfx2/signaturestate.hxx
+ */
+int getSignatureState()
+{
+return mpDoc->pClass->getSignatureState(mpDoc);
+}
+
 #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 };
 
commit 4ea29914eb7d3f6f284b76c053e3aad4c3d8be3e
Author: Tor Lillqvist 
AuthorDate: Thu Jul 19 11:51:14 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Oct 29 14:23:16 2018 +0200

Avoid gcc: "specified bound depends on the length of the source argument"

Just use memcpy().

Change-Id: Icb705acb6c12baf28684c763a77da7abc514ea6d
Reviewed-on: https://gerrit.libreoffice.org/57714
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
index 187b224d6..ae779f468 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -200,7 +200,7 @@ static void *lok_dlopen( const char *install_path, char ** 
_imp_lib )
 return NULL;
 }
 
-strncpy(imp_lib, install_path, imp_lib_size);
+memcpy(imp_lib, install_path, partial_length);
 
 extendUnoPath(install_path);
 
commit 3b2bc20502de30995873e5fe86839e0395499b7e
Author: Caolán McNamara 
AuthorDate: Thu Jul 26 12:22:16 2018 +0100
Commit: Tor Lillqvist 
CommitDate: Mon Oct 29 14:23:16 2018 +0200

Related: rhbz#1602589 add comments to coverity annotations

Change-Id: I88c941832a0d682ea4b6028c28edd48cf5df3

[Libreoffice-commits] online.git: loleaflet/Makefile.am

[Libreoffice Gerrit user]

 loleaflet/Makefile.am |5 -
 1 file changed, 5 deletions(-)

New commits:
commit fb1b7d6b448cabf6d13fb1a7eb48a6106d9b5bb9
Author: Andras Timar 
AuthorDate: Mon Oct 29 13:10:29 2018 +0100
Commit: Andras Timar 
CommitDate: Mon Oct 29 13:10:29 2018 +0100

remove obsolete comment

Change-Id: I69168335c479b94ad4352a64631c1605e4314abe

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 5ae2ed51c..e23798264 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -1,8 +1,3 @@
-# Version number of loleaflet, no need to be in sync with the loolwsd
-# one, but do please follow the same even/odd convention for the third
-# ("micro") part: Between releases odd, even for releases (no other
-# changes inbetween).
-
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
 
___
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 5e432284a8a350ea82b6773f565b8b8098eab4f0
Author: Olivier Hallot 
AuthorDate: Sat Oct 27 20:42:18 2018 -0300
Commit: Gerrit Code Review 
CommitDate: Mon Oct 29 12:45:05 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - tdf#118586 Base report 'Add field' Help page

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

diff --git a/helpcontent2 b/helpcontent2
index 1eff40c0dc0e..64f6b8c5bc8d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1eff40c0dc0efa883414d2a48bfa7c57a46f25d2
+Subproject commit 64f6b8c5bc8d517cea4a36b088c6b35e22bd8a69
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 AllLangHelp_shared.mk|1 
 source/text/shared/explorer/database/rep_insertfield.xhp |   93 +++
 source/text/shared/explorer/database/rep_main.xhp|   17 --
 source/text/shared/explorer/database/rep_prop.xhp|5 
 4 files changed, 99 insertions(+), 17 deletions(-)

New commits:
commit 64f6b8c5bc8d517cea4a36b088c6b35e22bd8a69
Author: Olivier Hallot 
AuthorDate: Sat Oct 27 20:42:18 2018 -0300
Commit: Olivier Hallot 
CommitDate: Mon Oct 29 12:45:05 2018 +0100

tdf#118586 Base report 'Add field' Help page

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

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 97f266bfd..01811caae 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -660,6 +660,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/explorer/database/querywizard07 \
 helpcontent2/source/text/shared/explorer/database/querywizard08 \
 helpcontent2/source/text/shared/explorer/database/rep_datetime \
+helpcontent2/source/text/shared/explorer/database/rep_insertfield \
 helpcontent2/source/text/shared/explorer/database/rep_main \
 helpcontent2/source/text/shared/explorer/database/rep_navigator \
 helpcontent2/source/text/shared/explorer/database/rep_pagenumbers \
diff --git a/source/text/shared/explorer/database/rep_insertfield.xhp 
b/source/text/shared/explorer/database/rep_insertfield.xhp
new file mode 100644
index 0..602e70382
--- /dev/null
+++ b/source/text/shared/explorer/database/rep_insertfield.xhp
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+Insert Fields
+
/text/shared/explorer/database/rep_insertfield.xhp
+
+
+
+
+
+
+insert fields;in report design
+add fields;in report design
+report design;add fields to report
+
+Add 
fields to report
+The Add Field window helps you to insert the table entries in the 
report.
+
+
+The 
Add Field window is shown automatically when you have selected a table in the 
Contents box and leave that box.
+Choose View - Add 
Field.
+
+
+
+
+Add field icon
+
+
+
+Click the Add Field icon on the toolbar.
+
+
+
+
+
+
+Select the field in the Add Field dialog and click 
Insert. You can select multiples fields pressing the 
+CommandCtrl
+ key while clicking on the fields name or 
using the Shift key while pressing the mouse button. Click Insert 
in the toolbar to add the fields to the report.
+
+
+Drag and drop the field names one by one from the Add Field 
window into the Detail area of the report. Position the fields as you like. Use 
the icons in the toolbars to align the fields.
+It 
is not possible to overlap the fields. If you drop a table field on the Detail 
area, then a label and a text box are inserted.
+
+
+You can also insert text that should be the same on every page 
of the report. Click the Label Field icon Icon, 
then drag a rectangle in the Page Header or Page Footer area. Edit the Label 
property to show the text you want.
+
+
+Sorting fields names
+
+
+
+
+Sort Ascending icon
+
+
+
+Sort names ascending.
+
+
+
+
+
+Sort descending icon
+
+
+
+Sort names descending,
+
+
+
+
+
+Undo sorting icon
+
+
+
+Restore original sorting
+
+
+
+
+
diff --git a/source/text/shared/explorer/database/rep_main.xhp 
b/source/text/shared/explorer/database/rep_main.xhp
index 449311889..e2741d95e 100644
--- a/source/text/shared/explorer/database/rep_main.xhp
+++ b/source/text/shared/explorer/database/rep_main.xhp
@@ -98,20 +98,9 @@
 After selecting the table, press the Tab key to leave the 
Content box.
  
   
-  The Add 
Field window opens automatically and shows all fields of the selected 
table.
-  To insert fields into the report
-  The Add 
Field window helps you to insert the table entries in the report. Click the Add 
Field icon in the toolbar to open the Add Field window.
-  
- 
-Drag and drop the field names one by one from the Add Field 
wind

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

[Libreoffice Gerrit user]

 desktop/source/deployment/dp_log.cxx |1 -
 desktop/source/deployment/manager/dp_manager.cxx |3 +--
 desktop/source/pkgchk/unopkg/unopkg_app.cxx  |5 ++---
 desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx   |   20 +++-
 desktop/source/pkgchk/unopkg/unopkg_shared.h |1 -
 5 files changed, 10 insertions(+), 20 deletions(-)

New commits:
commit c2a19eb8b94dd01d306fcae6a2fd974ef3298c3d
Author: Samuel Mehrbrodt 
AuthorDate: Mon Oct 29 09:42:36 2018 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Oct 29 12:26:32 2018 +0100

Remove unused parameter

Change-Id: I5b53e8d270f5b87cb3068943d35c17e1f041d1a5
Reviewed-on: https://gerrit.libreoffice.org/62497
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/desktop/source/deployment/dp_log.cxx 
b/desktop/source/deployment/dp_log.cxx
index dd93e3bc1bdd..3cfdb338d9b7 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -49,7 +49,6 @@ typedef 
::cppu::WeakComponentImplHelper t_log_helper;
 
 class ProgressLogImpl : public ::dp_misc::MutexHolder, public t_log_helper
 {
-Reference m_xLogFile;
 std::unique_ptr m_logger;
 
 protected:
diff --git a/desktop/source/deployment/manager/dp_manager.cxx 
b/desktop/source/deployment/manager/dp_manager.cxx
index d2c33e298199..25ca6cdcc2d1 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -430,12 +430,11 @@ Reference 
PackageManagerImpl::create(
 xFileHandler->setLevel(LogLevel::WARNING);
 xLogger->addLogHandler(xFileHandler);
 
-const Any any_logFile(logFile);
 that->m_xLogFile.set(
 that->m_xComponentContext->getServiceManager()
 ->createInstanceWithArgumentsAndContext(
 dp_log::serviceDecl.getSupportedServiceNames()[0],
-Sequence( &any_logFile, 1 ),
+Sequence(),
 that->m_xComponentContext ),
 UNO_QUERY_THROW );
 xCmdEnv.set( new CmdEnvWrapperImpl( xCmdEnv, that->m_xLogFile ) );
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx 
b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index edbc84eff605..725067c20925 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -386,9 +386,8 @@ extern "C" int unopkg_main()
 Reference xExtensionManager(
 deployment::ExtensionManager::get( xComponentContext ) );
 
-Reference< css::ucb::XCommandEnvironment > xCmdEnv(
-createCmdEnv( xComponentContext, logFile,
-  option_force, option_verbose, 
option_suppressLicense) );
+Reference xCmdEnv(
+createCmdEnv(xComponentContext, option_force, option_verbose, 
option_suppressLicense));
 
 //synchronize bundled/shared extensions
 //Do not synchronize when command is "reinstall". This could add types 
and services to UNO and
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx 
b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 2ef5295ec68a..2cb0ebf0dec3 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -73,7 +73,6 @@ public:
 virtual ~CommandEnvironmentImpl() override;
 CommandEnvironmentImpl(
 Reference const & xComponentContext,
-OUString const & log_file,
 bool option_force_overwrite,
 bool option_verbose,
 bool option_suppress_license);
@@ -96,7 +95,6 @@ public:
 
 CommandEnvironmentImpl::CommandEnvironmentImpl(
 Reference const & xComponentContext,
-OUString const & log_file,
 bool option_force_overwrite,
 bool option_verbose,
 bool option_suppressLicense)
@@ -106,15 +104,12 @@ CommandEnvironmentImpl::CommandEnvironmentImpl(
   m_option_suppress_license( option_suppressLicense ),
   m_xComponentContext(xComponentContext)
 {
-if (!log_file.isEmpty()) {
-const Any logfile(log_file);
-m_xLogFile.set(
-xComponentContext->getServiceManager()
-->createInstanceWithArgumentsAndContext(
-"com.sun.star.comp.deployment.ProgressLog",
-Sequence( &logfile, 1 ), xComponentContext ),
-UNO_QUERY_THROW );
-}
+m_xLogFile.set(
+xComponentContext->getServiceManager()
+->createInstanceWithArgumentsAndContext(
+"com.sun.star.comp.deployment.ProgressLog",
+Sequence(), xComponentContext ),
+UNO_QUERY_THROW );
 }
 
 
@@ -381,13 +376,12 @@ namespace unopkg {
 
 Reference< XCommandEnvironment > createCmdEnv(
 Reference< XComponentContext > const & xContext,
-OUString const & logFile,
 bool option_force_overwrite,
 bool option_verbose,
 bool option_suppress_license)
 {
 return new CommandEnvironmentImpl(
-xContex

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

[Libreoffice Gerrit user]

 sw/source/core/text/txtfly.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 53c907aa2411f92059d15a961874b22a543745ed
Author: Mike Kaganski 
AuthorDate: Mon Oct 29 10:53:11 2018 +0100
Commit: Mike Kaganski 
CommitDate: Mon Oct 29 12:07:52 2018 +0100

Simplify conditions a bit

bOn is implied when nCount is > 0

Change-Id: I77939668445603a22ae9ea56a7d272ca650c5c1c
Reviewed-on: https://gerrit.libreoffice.org/62499
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 535c570e0e90..31f04c376233 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -490,8 +490,8 @@ void SwTextFly::DrawTextOpaque( SwDrawTextInfo &rInf )
 OSL_ENSURE( !bTopRule, "DrawTextOpaque: Wrong TopRule" );
 
 // #i68520#
-SwAnchoredObjList::size_type nCount( bOn ? GetAnchoredObjList()->size() : 
0 );
-if ( bOn && nCount > 0 )
+const SwAnchoredObjList::size_type nCount( bOn ? 
GetAnchoredObjList()->size() : 0 );
+if (nCount > 0)
 {
 const SdrLayerID nHellId = 
pPage->getRootFrame()->GetCurrShell()->getIDocumentDrawModelAccess().GetHellId();
 for( SwAnchoredObjList::size_type i = 0; i < nCount; ++i )
@@ -576,8 +576,8 @@ void SwTextFly::DrawFlyRect( OutputDevice* pOut, const 
SwRect &rRect )
 SwRegionRects aRegion( rRect );
 OSL_ENSURE( !bTopRule, "DrawFlyRect: Wrong TopRule" );
 // #i68520#
-SwAnchoredObjList::size_type nCount( bOn ? GetAnchoredObjList()->size() : 
0 );
-if ( bOn && nCount > 0 )
+const SwAnchoredObjList::size_type nCount( bOn ? 
GetAnchoredObjList()->size() : 0 );
+if (nCount > 0)
 {
 const SdrLayerID nHellId = 
pPage->getRootFrame()->GetCurrShell()->getIDocumentDrawModelAccess().GetHellId();
 for( SwAnchoredObjList::size_type i = 0; i < nCount; ++i )
@@ -1001,8 +1001,8 @@ bool SwTextFly::ForEach( const SwRect &rRect, SwRect* 
pRect, bool bAvoid ) const
 
 bool bRet = false;
 // #i68520#
-SwAnchoredObjList::size_type nCount( bOn ? GetAnchoredObjList()->size() : 
0 );
-if ( bOn && nCount > 0 )
+const SwAnchoredObjList::size_type nCount( bOn ? 
GetAnchoredObjList()->size() : 0 );
+if (nCount > 0)
 {
 for( SwAnchoredObjList::size_type i = 0; i < nCount; ++i )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - dtrans/source sd/source sot/source svx/source

[Libreoffice Gerrit user]

 dtrans/source/win32/ftransl/ftransl.cxx |2 -
 sd/source/ui/view/sdview2.cxx   |   20 +++---
 sd/source/ui/view/sdview3.cxx   |   35 
 sot/source/base/exchange.cxx|2 -
 svx/source/tbxctrls/colrctrl.cxx|   32 +
 5 files changed, 52 insertions(+), 39 deletions(-)

New commits:
commit 24ccbc35e8857cc8de784154d0648800d39ab20b
Author: Michael Stahl 
AuthorDate: Sat Oct 27 23:39:27 2018 +0200
Commit: Michael Stahl 
CommitDate: Mon Oct 29 11:31:02 2018 +0100

tdf#119235 svx,sd: fix drag&drop from ColorBar

This was using the SfxPoolItem serialisation of XATTR_FILL* items,
where only XFillColorItem and XFillStyleItem were actually used;
the binary serialisation was removed without being aware of this
feature.

Fix this by using uno::Any instead, rather than reviving the binary
serialisation.

Also change the clipboard format strings, just to be safe.

(regression from 97b889b8b2b2554ce33fd6b3f0359fc18f39832d)

Change-Id: I1828621a9aae606a1ca47835eef608062efe64a0
Reviewed-on: https://gerrit.libreoffice.org/62455
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 0a6813ad5d57d0df72562c797a8b0581bfd65a11)
Reviewed-on: https://gerrit.libreoffice.org/62472
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 

diff --git a/dtrans/source/win32/ftransl/ftransl.cxx 
b/dtrans/source/win32/ftransl/ftransl.cxx
index 64962aecf05a..8f079c646e22 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -144,7 +144,7 @@ static const std::vector< FormatEntry > g_TranslTable {
 // SotClipboardFormatId::SVIM
 FormatEntry("application/x-openoffice-svim;windows_formatname=\"SVIM 
(StarView ImageMap)\"", "SVIM (StarView ImageMap)", nullptr, CF_INVALID, 
CPPUTYPE_DEFAULT),
 // SotClipboardFormatId::XFA
-FormatEntry("application/x-openoffice-xfa;windows_formatname=\"XFA 
(XOutDev FillAttr)\"", "XFA (XOutDev FillAttr)", nullptr, CF_INVALID, 
CPPUTYPE_DEFAULT),
+FormatEntry("application/x-libreoffice-xfa;windows_formatname=\"XFA 
(XOutDev FillAttr Any)\"", "XFA (XOutDev FillAttr Any)", nullptr, CF_INVALID, 
CPPUTYPE_DEFAULT),
 // SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT
 FormatEntry("application/vnd.oasis.opendocument.text-flat-xml", 
"EditEngine ODF", nullptr, CF_INVALID, CPPUTYPE_DEFAULT),
 // SotClipboardFormatId::INTERNALLINK_STATE
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 4df02ee52385..62fa687f1de1 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -673,14 +674,19 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt,
 {
 
if(pIAOHandle->getOverlayObjectList().isHitPixel(rEvt.maPosPixel))
 {
-::tools::SvRef xStm;
-
-if( aDataHelper.GetSotStorageStream( 
SotClipboardFormatId::XFA, xStm ) && xStm.is() )
+uno::Any const 
data(aDataHelper.GetAny(SotClipboardFormatId::XFA, ""));
+uno::Sequence props;
+if (data >>= props)
 {
-XFillExchangeData aFillData( XFillAttrSetItem( 
&mrDoc.GetPool() ) );
-
-ReadXFillExchangeData( *xStm, aFillData );
-const Color aColor( 
aFillData.GetXFillAttrSetItem()->GetItemSet().Get( XATTR_FILLCOLOR 
).GetColorValue() );
+::comphelper::SequenceAsHashMap const 
map(props);
+Color aColor(COL_BLACK);
+auto const it = map.find("FillColor");
+if (it != map.end())
+{
+XFillColorItem color;
+color.PutValue(it->second, 0);
+aColor = color.GetColorValue();
+}
 static_cast< SdrHdlColor* >( pIAOHandle 
)->SetColor( aColor, true );
 nRet = nDropAction;
 }
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 24e22a0f0dc5..01c415bff69f 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -71,6 +71,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1317,14 +1318,10 @@ bool View::InsertData( const TransferableDataHelper& 
rDataHelper,
 
 if(!bReturn && pPickObj && CHECK_FORMAT_TRANS( SotClipboardFormatId::XFA ) 
)
 {
-::tools

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

[Libreoffice Gerrit user]

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

New commits:
commit 19a0698079fbba36646a2d06eaec3a7fde60b2f5
Author: Miklos Vajna 
AuthorDate: Mon Oct 29 09:05:26 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Oct 29 11:11:21 2018 +0100

tdf#120735 sw: clear the font cache text glyphs when layout finished

The motivation for remembering the text glyphs was to avoid repeated layout
calls during one sw layout run, this still preserves that optimization.

Approximate numbers for memory usage after importing the bugdoc finished:

- old: 401MB

- new 366MB (91% of baseline)

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

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 3923725ee9a2..d4cd2b349b87 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -58,6 +58,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 // Save some typing work to avoid accessing destroyed pages.
@@ -2271,6 +2272,9 @@ SwLayIdle::SwLayIdle( SwRootFrame *pRt, SwViewShellImp 
*pI ) :
 pRoot->ResetIdleFormat();
 SfxObjectShell* pDocShell = 
pImp->GetShell()->GetDoc()->GetDocShell();
 pDocShell->Broadcast( SfxEventHint( 
SfxEventHintId::SwEventLayoutFinished, 
SwDocShell::GetEventName(STR_SW_EVENT_LAYOUT_FINISHED), pDocShell ) );
+// Limit lifetime of the text glyphs cache to a single run of the
+// layout.
+SwClearFntCacheTextGlyphs();
 }
 }
 
___
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/layout/paintfrm.cxx |   20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

New commits:
commit ea7d9105456537d2e0a6b7dcf051fee1fa259954
Author: Armin Le Grand 
AuthorDate: Sat Oct 27 23:20:06 2018 +0200
Commit: Armin Le Grand 
CommitDate: Mon Oct 29 11:02:28 2018 +0100

tdf#115296 extend vertical FrameBorders for joined Frames

This feature was lost on my changes for FrameBorder primitive
creation. It was calculated/applied formally in
lcl_PaintLeftRightLine

Change-Id: Ie44619a4c4e44ff4584533685cb21882c323742e
Reviewed-on: https://gerrit.libreoffice.org/62451
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
(cherry picked from commit e89e8941e114d4d1adf76df995a3f1a8d1bff4b1)
Reviewed-on: https://gerrit.libreoffice.org/62475

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index b684c5ac1b2c..b684232ba78d 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5103,14 +5103,30 @@ void SwFrame::PaintSwFrameShadowAndBorder(
 // if ContentFrame and joined Prev/Next, reset top/bottom as needed
 if(IsContentFrame())
 {
+const SwFrame* pDirRefFrame(IsCellFrame() ? FindTabFrame() : this);
+const SwRectFnSet aRectFnSet(pDirRefFrame);
+const SwRectFn& _rRectFn(aRectFnSet.FnRect());
+
 if(rAttrs.JoinedWithPrev(*this))
 {
-pTopBorder = nullptr;
+// tdf#115296 re-add adaption of vert distance to clos ethe 
evtl.
+// existing gap to previous frame
+const SwFrame* pPrevFrame(GetPrev());
+(aRect.*_rRectFn->fnSetTop)( 
(pPrevFrame->*_rRectFn->fnGetPrtBottom)() );
+
+// ...and disable top border paint/creation
+pTopBorder = nullptr;
 }
 
 if(rAttrs.JoinedWithNext(*this))
 {
-pBottomBorder = nullptr;
+// tdf#115296 re-add adaption of vert distance to clos ethe 
evtl.
+// existing gap to next frame
+const SwFrame* pNextFrame(GetNext());
+(aRect.*_rRectFn->fnSetBottom)( 
(pNextFrame->*_rRectFn->fnGetPrtTop)() );
+
+// ...and disable bottom border paint/creation
+pBottomBorder = nullptr;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: bundled/include

[Libreoffice Gerrit user]

 bundled/include/LibreOfficeKit/LibreOfficeKitInit.h |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 790f3aa5c5a4ca1cfdda41c255a18401c5ded40d
Author: Tor Lillqvist 
AuthorDate: Thu Oct 25 15:39:50 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Oct 29 11:49:11 2018 +0200

Verify that we are actually passed a URL, not a pathname

Sure, the test could be even more strict and actually do a
case-insensitive check for an initial "file:" or
"vnd.sun.star.pathname:".

Change-Id: Ic252aeccdec708138530075d1f38fa348d1e469e

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
index ce5054ac9..3251ade7d 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -285,6 +285,15 @@ static LibreOfficeKit *lok_init_2( const char 
*install_path,  const char *user_p
 return pSym( install_path );
 }
 
+if (user_profile_url != NULL && user_profile_url[0] == '/')
+{
+// It should be either a file: URL or a vnd.sun.star.pathname: URL.
+fprintf( stderr, "second parameter to lok_init_2 '%s' should be a URL, 
not a pathname\n", user_profile_url );
+lok_dlclose( dlhandle );
+free( imp_lib );
+return NULL;
+}
+
 free( imp_lib );
 // dlhandle is "leaked"
 // coverity[leaked_storage]
___
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/core/text/frmpaint.cxx |  142 +++
 1 file changed, 71 insertions(+), 71 deletions(-)

New commits:
commit e503ed2c530a3e91ad6a8b93efac727ea0207019
Author: Miklos Vajna 
AuthorDate: Mon Oct 29 09:04:18 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Oct 29 10:30:10 2018 +0100

sw: prefix members of SwExtraPainter

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

diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index c279dd70def2..d459595c8a06 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -60,18 +60,18 @@ static bool bInitFont = true;
 
 class SwExtraPainter
 {
-SwSaveClip aClip;
-SwRect aRect;
-const SwTextFrame* pTextFrame;
-SwViewShell *pSh;
-std::unique_ptr pFnt;
-const SwLineNumberInfo &rLineInf;
-SwTwips nX;
-SwTwips nRedX;
-sal_uLong nLineNr;
-sal_uInt16 nDivider;
-bool bGoLeft;
-bool IsClipChg() { return aClip.IsChg(); }
+SwSaveClip m_aClip;
+SwRect m_aRect;
+const SwTextFrame* m_pTextFrame;
+SwViewShell *m_pSh;
+std::unique_ptr m_pFnt;
+const SwLineNumberInfo &m_rLineInf;
+SwTwips m_nX;
+SwTwips m_nRedX;
+sal_uLong m_nLineNr;
+sal_uInt16 m_nDivider;
+bool m_bGoLeft;
+bool IsClipChg() { return m_aClip.IsChg(); }
 
 SwExtraPainter(const SwExtraPainter&) = delete;
 SwExtraPainter& operator=(const SwExtraPainter&) = delete;
@@ -80,11 +80,11 @@ public:
 SwExtraPainter( const SwTextFrame *pFrame, SwViewShell *pVwSh,
 const SwLineNumberInfo &rLnInf, const SwRect &rRct,
 sal_Int16 eHor, bool bLnNm );
-SwFont* GetFont() const { return pFnt.get(); }
-void IncLineNr() { ++nLineNr; }
-bool HasNumber() { return !( nLineNr % rLineInf.GetCountBy() ); }
-bool HasDivider() { if( !nDivider ) return false;
-return !(nLineNr % rLineInf.GetDividerCountBy()); }
+SwFont* GetFont() const { return m_pFnt.get(); }
+void IncLineNr() { ++m_nLineNr; }
+bool HasNumber() { return !( m_nLineNr % m_rLineInf.GetCountBy() ); }
+bool HasDivider() { if( !m_nDivider ) return false;
+return !(m_nLineNr % m_rLineInf.GetDividerCountBy()); }
 
 void PaintExtra( SwTwips nY, long nAsc, long nMax, bool bRed );
 void PaintRedline( SwTwips nY, long nMax );
@@ -93,22 +93,22 @@ public:
 SwExtraPainter::SwExtraPainter( const SwTextFrame *pFrame, SwViewShell *pVwSh,
 const SwLineNumberInfo &rLnInf, const SwRect 
&rRct,
 sal_Int16 eHor, bool bLineNum )
-: aClip( pVwSh->GetWin() || pFrame->IsUndersized() ? pVwSh->GetOut() : 
nullptr )
-, aRect( rRct )
-, pTextFrame( pFrame )
-, pSh( pVwSh )
-, rLineInf( rLnInf )
-, nX(0)
-, nRedX(0)
-, nLineNr( 1 )
-, nDivider(0)
-, bGoLeft(false)
+: m_aClip( pVwSh->GetWin() || pFrame->IsUndersized() ? pVwSh->GetOut() : 
nullptr )
+, m_aRect( rRct )
+, m_pTextFrame( pFrame )
+, m_pSh( pVwSh )
+, m_rLineInf( rLnInf )
+, m_nX(0)
+, m_nRedX(0)
+, m_nLineNr( 1 )
+, m_nDivider(0)
+, m_bGoLeft(false)
 {
 if( pFrame->IsUndersized() )
 {
 SwTwips nBottom = pFrame->getFrameArea().Bottom();
-if( aRect.Bottom() > nBottom )
-aRect.Bottom( nBottom );
+if( m_aRect.Bottom() > nBottom )
+m_aRect.Bottom( nBottom );
 }
 int nVirtPageNum = 0;
 if( bLineNum )
@@ -122,16 +122,16 @@ SwExtraPainter::SwExtraPainter( const SwTextFrame 
*pFrame, SwViewShell *pVwSh,
 bLineNum is set back to false if the numbering is completely
 outside of the paint rect
 */
-nDivider = !rLineInf.GetDivider().isEmpty() ? 
rLineInf.GetDividerCountBy() : 0;
-nX = pFrame->getFrameArea().Left();
-SwCharFormat* pFormat = rLineInf.GetCharFormat( 
const_cast(pFrame->GetDoc().getIDocumentStylePoolAccess())
 );
+m_nDivider = !m_rLineInf.GetDivider().isEmpty() ? 
m_rLineInf.GetDividerCountBy() : 0;
+m_nX = pFrame->getFrameArea().Left();
+SwCharFormat* pFormat = m_rLineInf.GetCharFormat( 
const_cast(pFrame->GetDoc().getIDocumentStylePoolAccess())
 );
 OSL_ENSURE( pFormat, "PaintExtraData without CharFormat" );
-pFnt.reset( new SwFont(&pFormat->GetAttrSet(), 
&pFrame->GetDoc().getIDocumentSettingAccess()) );
-pFnt->Invalidate();
-pFnt->ChgPhysFnt( pSh, *pSh->GetOut() );
-pFnt->SetVertical( 0, pFrame->IsVertical() );
-nLineNr += pFrame->GetAllLines() - pFrame->GetThisLines();
-LineNumberPosition ePos = rLineInf.GetPos();
+m_pFnt.reset( new SwFont(&pFormat->GetAttrSet(), 
&pFrame->GetDoc().getIDocumentSettingAccess()) );
+m_pFnt->Invalidate();
+m_pFnt->ChgPhysFnt( m_pSh, *m_pSh->GetOu

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

[Libreoffice Gerrit user]

 dbaccess/source/filter/hsqldb/utils.cxx |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit 76279399f747548494a259173ef5669553c3f06f
Author: Tamas Bunth 
AuthorDate: Fri Oct 26 21:04:09 2018 +0200
Commit: Tamás Bunth 
CommitDate: Mon Oct 29 10:02:56 2018 +0100

tdf#120691 Migrate tables which contain spaces

Change-Id: I115d765bc781a926189605990e91c8e47f24d474
Reviewed-on: https://gerrit.libreoffice.org/62403
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 

diff --git a/dbaccess/source/filter/hsqldb/utils.cxx 
b/dbaccess/source/filter/hsqldb/utils.cxx
index dfdbee40c37b..8d6c49e348dc 100644
--- a/dbaccess/source/filter/hsqldb/utils.cxx
+++ b/dbaccess/source/filter/hsqldb/utils.cxx
@@ -22,6 +22,8 @@
 #include 
 #include 
 
+#include 
+
 #include "utils.hxx"
 
 using namespace dbahsql;
@@ -39,6 +41,22 @@ OUString utils::getTableNameFromStmt(const OUString& sSql)
 if (*wordIter == "TABLE")
 ++wordIter;
 
+// it may contain spaces if it's put into apostrophes.
+if (wordIter->indexOf("\"") >= 0)
+{
+sal_Int32 nAposBegin = sSql.indexOf("\"");
+sal_Int32 nAposEnd = nAposBegin;
+bool bProperEndAposFound = false;
+while (!bProperEndAposFound)
+{
+nAposEnd = sSql.indexOf("\"", nAposEnd + 1);
+if (sSql[nAposEnd - 1] != u'\\')
+bProperEndAposFound = true;
+}
+OUString result = sSql.copy(nAposBegin, nAposEnd - nAposBegin + 1);
+return result;
+}
+
 // next word is the table's name
 // it might stuck together with the column definitions.
 sal_Int32 nParenPos = wordIter->indexOf("(");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-projects] minutes of ESC call ...

[Stephan Bergmann]

On 26/10/2018 10:46, Michael Meeks wrote:

+ UITest_findReplace seems particularly flaky.
+ AI: poke Raal (Xisco)


I hope 
 
"Avoid SvxSearchController::StateChanged during SvxSearchDialog 
sub-dialog" fixes that

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

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

[Libreoffice Gerrit user]

 sw/inc/fesh.hxx|2 +-
 sw/source/core/frmedt/feshview.cxx |4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit a1dd2f55f24da4fa875a92eebf05c154528e1d74
Author: Noel Grandin 
AuthorDate: Mon Oct 29 09:39:37 2018 +0200
Commit: Noel Grandin 
CommitDate: Mon Oct 29 09:53:52 2018 +0100

loplugin:shouldreturnbool

return value is ignored by call site, so just drop it

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

diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index b9e40d22d7c7..6bf34ba62f2c 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -337,7 +337,7 @@ public:
 /// Set size of draw objects.
 void SetObjRect( const SwRect& rRect );
 
-long BeginDrag( const Point *pPt, bool bProp );
+void BeginDrag( const Point *pPt, bool bProp );
 void Drag ( const Point *pPt, bool bProp );
 void EndDrag  ();
 void BreakDrag();
diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 1a85c3aec296..cc88b7e5bb2f 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -695,7 +695,7 @@ void SwFEShell::StartCropImage()
 SetDragMode( SdrDragMode::Crop );
 }
 
-long SwFEShell::BeginDrag( const Point* pPt, bool bIsShift)
+void SwFEShell::BeginDrag( const Point* pPt, bool bIsShift)
 {
 SdrView *pView = Imp()->GetDrawView();
 if ( pView && pView->AreObjectsMarked() )
@@ -706,9 +706,7 @@ long SwFEShell::BeginDrag( const Point* pPt, bool bIsShift)
 if (pView->BegDragObj( *pPt, nullptr, pHdl ))
 pView->GetDragMethod()->SetShiftPressed( bIsShift );
 ::FrameNotify( this );
-return 1;
 }
-return 0;
 }
 
 void SwFEShell::Drag( const Point *pPt, bool )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/IwyuFilter_sc.yaml   |4 
 sc/source/ui/dbgui/imoptdlg.cxx |1 +
 sc/source/ui/inc/cellsh.hxx |2 ++
 sc/source/ui/inc/filldlg.hxx|2 --
 sc/source/ui/inc/filtdlg.hxx|1 -
 sc/source/ui/inc/foptmgr.hxx|1 -
 sc/source/ui/inc/formatsh.hxx   |3 +--
 sc/source/ui/inc/formula.hxx|7 ---
 sc/source/ui/inc/fupoor.hxx |9 -
 sc/source/ui/inc/futext.hxx |2 --
 sc/source/ui/inc/graphsh.hxx|4 ++--
 sc/source/ui/inc/gridwin.hxx|6 +++---
 sc/source/ui/inc/hdrcont.hxx|5 +++--
 sc/source/ui/inc/hfedtdlg.hxx   |4 +---
 sc/source/ui/inc/highred.hxx|9 -
 sc/source/ui/inc/hiranges.hxx   |1 -
 sc/source/ui/inc/imoptdlg.hxx   |9 ++---
 sc/source/ui/inc/impex.hxx  |4 +---
 sc/source/ui/inc/inputhdl.hxx   |5 ++---
 sc/source/ui/inc/inputwin.hxx   |3 ---
 sc/source/ui/inc/instbdlg.hxx   |2 +-
 sc/source/ui/inc/linkarea.hxx   |2 +-
 sc/source/ui/inc/mediash.hxx|3 +--
 sc/source/ui/inc/msgpool.hxx|2 --
 sc/source/ui/inc/mvtabdlg.hxx   |4 +++-
 sc/source/ui/inc/namedefdlg.hxx |1 -
 sc/source/ui/inc/namedlg.hxx|3 ---
 sc/source/ui/inc/namemgrtable.hxx   |1 -
 sc/source/ui/inc/namepast.hxx   |3 ---
 sc/source/ui/inc/navipi.hxx |4 +---
 sc/source/ui/inc/navsett.hxx|1 -
 sc/source/ui/inc/notemark.hxx   |7 +--
 sc/source/ui/inc/oleobjsh.hxx   |3 +--
 sc/source/ui/inc/olinefun.hxx   |2 +-
 sc/source/ui/inc/opredlin.hxx   |9 ++---
 sc/source/ui/inc/optsolver.hxx  |1 -
 sc/source/ui/inc/output.hxx |   11 ---
 sc/source/ui/inc/pagedata.hxx   |1 -
 sc/source/ui/inc/pfiltdlg.hxx   |3 +--
 sc/source/ui/inc/pgbrksh.hxx|2 +-
 sc/source/ui/inc/pivotsh.hxx|2 +-
 sc/source/ui/inc/prevloc.hxx|3 ---
 sc/source/ui/inc/prevwsh.hxx|6 +++---
 sc/source/ui/inc/printfun.hxx   |3 ---
 sc/source/ui/inc/protectiondlg.hxx  |2 --
 sc/source/ui/inc/pvfundlg.hxx   |1 -
 sc/source/ui/inc/scuiimoptdlg.hxx   |1 +
 sc/source/ui/miscdlgs/datatableview.cxx |1 +
 sc/source/ui/miscdlgs/filldlg.cxx   |1 +
 sc/source/ui/miscdlgs/highred.cxx   |1 +
 sc/source/ui/miscdlgs/linkarea.cxx  |1 +
 sc/source/ui/namedlg/namepast.cxx   |1 +
 sc/source/ui/pagedlg/hfedtdlg.cxx   |1 +
 sc/source/ui/pagedlg/tphf.cxx   |1 +
 54 files changed, 60 insertions(+), 112 deletions(-)

New commits:
commit 8ee49e6e8f5c37682d776fac4bc01479733b9d76
Author: Gabor Kelemen 
AuthorDate: Tue Oct 23 01:54:39 2018 +0200
Commit: Miklos Vajna 
CommitDate: Mon Oct 29 09:30:49 2018 +0100

tdf#42949 Fix IWYU warnings in sc/source/ui/inc/[f-p]*

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

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

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 3f63ccb0cea8..0b8fff456db7 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -462,6 +462,9 @@ blacklist:
 sc/source/ui/inc/ExponentialSmoothingDialog.hxx:
 # base class has to be a complete type
 - viewdata.hxx
+sc/source/ui/inc/impex.hxx:
+# Needed for template
+- o3tl/deleter.hxx
 sc/source/ui/inc/MatrixComparisonGenerator.hxx:
 # base class has to be a complete type
 - viewdata.hxx
@@ -483,3 +486,4 @@ blacklist:
 sc/source/ui/inc/StatisticsTwoVariableDialog.hxx:
 # base class has to be a complete type
 - viewdata.hxx
+
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index 0407642692de..a71eaee2feb3 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 static const sal_Char pStrFix[] = "FIX";
 
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index a4a8eee681d3..6c963e2dc3a1 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -28,11 +28,13 @@
 #include "formatsh.hxx"
 #include 
 #include 
+#include 
 
 class SvxClipboardFormatItem;
 class TransferableDataHelper;
 class TransferableClipboardListener;
 class AbstractScLinkedAreaDlg;
+class Dialog;
 
 struct CellShell_Impl
 {
diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx
index de6ec72dcb54..afa1527b84d9 100644
--- a/sc/source/ui/inc/filldlg.hxx
+++ b/sc/source/ui/inc/filldlg.hxx
@@ -25,8 +25,6 @@
 
 cl

[Libreoffice-commits] online.git: net/ServerSocket.hpp net/Socket.hpp wsd/Admin.cpp

[Libreoffice Gerrit user]

 net/ServerSocket.hpp |6 +++---
 net/Socket.hpp   |   25 +
 wsd/Admin.cpp|2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)

New commits:
commit d1e183f20d836fce8ebac3d50a79900d8d11746a
Author: Miklos Vajna 
AuthorDate: Mon Oct 29 09:06:08 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Oct 29 09:06:33 2018 +0100

SocketPoll: make members private

All these protected members are unused by child classes, except read
access to a single member.

diff --git a/net/ServerSocket.hpp b/net/ServerSocket.hpp
index 314b56f2d..7799d8c73 100644
--- a/net/ServerSocket.hpp
+++ b/net/ServerSocket.hpp
@@ -94,12 +94,12 @@ public:
 
 inet_ntop(clientInfo.sin6_family, inAddr, addrstr, 
sizeof(addrstr));
 std::shared_ptr _socket = _sockFactory->create(rc);
-_socket->_clientAddress = addrstr;
+_socket->setClientAddress(addrstr);
 LOG_DBG("Accepted socket has family " << 
clientInfo.sin6_family <<
-" address " << _socket->_clientAddress);
+" address " << _socket->clientAddress());
 #else
 std::shared_ptr _socket = _sockFactory->create(rc);
-_socket->_clientAddress = "dummy";
+_socket->setClientAddress("dummy");
 #endif
 return _socket;
 }
diff --git a/net/Socket.hpp b/net/Socket.hpp
index 0c58d20aa..3a28bffdd 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -100,7 +100,6 @@ public:
 static const int DefaultSendBufferSize = 16 * 1024;
 static const int MaximumSendBufferSize = 128 * 1024;
 static std::atomic InhibitThreadChecks;
-std::string _clientAddress;
 
 enum Type { IPv4, IPv6, All };
 
@@ -127,6 +126,16 @@ public:
 /// Create socket of the given type.
 static int createSocket(Type type);
 
+void setClientAddress(const std::string& clientAddress)
+{
+_clientAddress = clientAddress;
+}
+
+const std::string& clientAddress() const
+{
+return _clientAddress;
+}
+
 /// Returns the OS native socket fd.
 int getFD() const { return _fd; }
 
@@ -323,6 +332,7 @@ protected:
 }
 
 private:
+std::string _clientAddress;
 const int _fd;
 int _sendBufferSize;
 
@@ -701,6 +711,12 @@ public:
 return false;
 }
 
+protected:
+bool isStop() const
+{
+return _stop;
+}
+
 private:
 /// Initialize the poll fds array with the right events
 void setupPollFds(std::chrono::steady_clock::time_point now,
@@ -729,7 +745,6 @@ private:
 /// Used to set the thread name and mark the thread as stopped when done.
 void pollingThreadEntry();
 
-private:
 /// Debug name used for logging.
 const std::string _name;
 
@@ -744,7 +759,6 @@ private:
 /// The fds to poll.
 std::vector _pollFds;
 
-protected:
 /// Flag the thread to stop.
 std::atomic _stop;
 /// The polling thread.
@@ -933,11 +947,6 @@ public:
 recv = _bytesRecvd;
 }
 
-const std::string clientAddress()
-{
-return _clientAddress;
-}
-
 std::vector& getInBuffer()
 {
 return _inBuffer;
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 6025c59a5..c5f303ad0 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -390,7 +390,7 @@ void Admin::pollingThread()
 lastMem = lastCPU;
 lastNet = lastCPU;
 
-while (!_stop && !TerminationFlag && !ShutdownRequestFlag)
+while (!isStop() && !TerminationFlag && !ShutdownRequestFlag)
 {
 const std::chrono::steady_clock::time_point now = 
std::chrono::steady_clock::now();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/uitest/findReplace/findReplace.py |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 982663f2137195cffabbcb623e3199cbba658ab7
Author: Stephan Bergmann 
AuthorDate: Mon Oct 29 08:01:13 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Oct 29 09:05:13 2018 +0100

Use copied test docs in sw/qa/uitest/findReplace/findReplace.py, too

No idea why this was initially commented out in
80d1ac7d55c22de20edeec30f8f56e09f8455f8d "uitest findReplace; tdf#116242;
tdf#98417; tdf#39022".

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

diff --git a/sw/qa/uitest/findReplace/findReplace.py 
b/sw/qa/uitest/findReplace/findReplace.py
index 213e47d6c372..a20950ad51c6 100644
--- a/sw/qa/uitest/findReplace/findReplace.py
+++ b/sw/qa/uitest/findReplace/findReplace.py
@@ -12,12 +12,11 @@ from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.uihelper.common import get_state_as_dict, type_text
 from uitest.debug import sleep
-#import org.libreoffice.unotest
-#import pathlib
+import org.libreoffice.unotest
+import pathlib
 from uitest.path import get_srcdir_url
 def get_url_for_data_file(file_name):
-#return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
-return get_srcdir_url() + "/sw/qa/uitest/writer_tests/data/" + file_name
+return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 #tdf116242  ţ ț - DONE
 #Bug 98417 - FIND & REPLACE: Add 'Find Previous' button - DONE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 xmlsecurity/source/helper/xmlsignaturehelper.cxx |   26 ++-
 1 file changed, 7 insertions(+), 19 deletions(-)

New commits:
commit a113aff7add62da5f2f8ffe0be453af4b1b79866
Author: Tomaž Vajngerl 
AuthorDate: Thu Oct 18 10:29:45 2018 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon Oct 29 08:58:54 2018 +0100

xmlsignaturehelper: fix comments, no change

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

diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx 
b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 0e7a77640a68..db80016f84e0 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -257,32 +257,22 @@ bool XMLSignatureHelper::ReadAndVerifySignature( const 
css::uno::Reference< css:
 
 SAL_WARN_IF(!xInputStream.is(), "xmlsecurity.helper", "input stream 
missing");
 
-/*
- * prepare ParserInputSrouce
- */
+// prepare ParserInputSrouce
 xml::sax::InputSource aParserInput;
 aParserInput.aInputStream = xInputStream;
 
-/*
- * get SAX parser component
- */
+// get SAX parser component
 uno::Reference< xml::sax::XParser > xParser = 
xml::sax::Parser::create(mxCtx);
 
-/*
- * create a signature reader
- */
+// create a signature reader
 uno::Reference< xml::sax::XDocumentHandler > xHandler
 = mpXSecController->createSignatureReader(*this);
 
-/*
- * setup the connection:
- * Parser -> SignatureReader
- */
+// setup the connection:
+// Parser -> SignatureReader
 xParser->setDocumentHandler( xHandler );
 
-/*
- * parser the stream
- */
+// parser the stream
 try
 {
 xParser->parseStream( aParserInput );
@@ -292,9 +282,7 @@ bool XMLSignatureHelper::ReadAndVerifySignature( const 
css::uno::Reference< css:
 mbError = true;
 }
 
-/*
- * release the signature reader
- */
+// release the signature reader
 mpXSecController->releaseSignatureReader( );
 
 return !mbError;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com offapi/UnoApi_offapi.mk

[Libreoffice Gerrit user]

 offapi/UnoApi_offapi.mk|1 
 offapi/com/sun/star/xml/crypto/XCertificateCreator.idl |   48 +
 2 files changed, 49 insertions(+)

New commits:
commit bdde44d5525caf2240a6ea900336ac973121f145
Author: Tomaž Vajngerl 
AuthorDate: Thu Oct 18 10:27:16 2018 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon Oct 29 08:58:24 2018 +0100

xmlsecurity: UNO interface to create cert. and private key

new XCertificateCreator interface which can be used to create a
certificate and a associated private key, both in DER format

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

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 4b47111da786..9934fff83b8c 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -4232,6 +4232,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/xml/crypto,\
CipherID \
DigestID \
SecurityOperationStatus \
+   XCertificateCreator \
XCipherContext \
XCipherContextSupplier \
XDigestContext \
diff --git a/offapi/com/sun/star/xml/crypto/XCertificateCreator.idl 
b/offapi/com/sun/star/xml/crypto/XCertificateCreator.idl
new file mode 100644
index ..6d920b37715c
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/XCertificateCreator.idl
@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef __com_sun_star_xml_crypto_xsecurityenvironment_idl_
+#define __com_sun_star_xml_crypto_xsecurityenvironment_idl_
+
+#include 
+#include 
+#include 
+
+module com { module sun { module star { module xml { module crypto {
+
+/**
+ * Interface for creating certificates
+ *
+ * @since LibreOffice 6.2
+ */
+interface XCertificateCreator : com::sun::star::uno::XInterface
+{
+/**
+ * Create certificate from raw DER encoded certificate and associate the 
private key with the certificate
+ */
+com::sun::star::security::XCertificate createDERCertificateWithPrivateKey(
+[in] sequence aDerCertificate,
+[in] sequence aPrivateKey) raises 
(com::sun::star::uno::SecurityException);
+};
+
+} ; } ; } ; } ; } ;
+
+#endif
+
+/* 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: bin/check-elf-dynamic-objects

[Libreoffice Gerrit user]

 bin/check-elf-dynamic-objects |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f7e87507640eef524edaae23495220bd96fdb435
Author: Stephan Bergmann 
AuthorDate: Mon Oct 29 08:44:11 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Oct 29 08:44:11 2018 +0100

Compensate for `set -u` when LO_ELFCHECK_WHITELIST is unset

...as happens e.g. in
.  (Regression
introduced with d157e510252636d3519c71415c20dfd113d40960
"check-elf-dynamic-objects: allow extending the whitelist via env-var".)

Change-Id: I93097d0bb7781b1bfac818872f40bbe38c5f5fea

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 68a2acf4beec..c1b69e6ec61d 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -88,7 +88,7 @@ programfiles=$(echo ${files} | grep -o '/program/[^/]* ' | 
xargs -n 1 basename)
 # of maintaining ABI stability
 # allow extending the whitelist using the environment variable to be able to 
work
 # on the installer stuff without the need for a baseline setup
-globalwhitelist="ld-linux-x86-64.so.2 ld-linux.so.2 libc.so.6 libm.so.6 
libdl.so.2 libpthread.so.0 librt.so.1 libutil.so.1 libnsl.so.1 libcrypt.so.1 
libgcc_s.so.1 libstdc++.so.6 libz.so.1 libfontconfig.so.1 libfreetype.so.6 
libxml2.so.2 libxslt.so.1 libexslt.so.0 ${LO_ELFCHECK_WHITELIST}"
+globalwhitelist="ld-linux-x86-64.so.2 ld-linux.so.2 libc.so.6 libm.so.6 
libdl.so.2 libpthread.so.0 librt.so.1 libutil.so.1 libnsl.so.1 libcrypt.so.1 
libgcc_s.so.1 libstdc++.so.6 libz.so.1 libfontconfig.so.1 libfreetype.so.6 
libxml2.so.2 libxslt.so.1 libexslt.so.0 ${LO_ELFCHECK_WHITELIST-}"
 x11whitelist="libX11.so.6 libXext.so.6 libSM.so.6 libICE.so.6 libXinerama.so.1 
libXrender.so.1 libXrandr.so.2 libcairo.so.2"
 openglwhitelist="libGL.so.1"
 giowhitelist="libgio-2.0.so.0 libgobject-2.0.so.0 libgmodule-2.0.so.0 
libgthread-2.0.so.0 libglib-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/sfx2/notebookbar/SfxNotebookBar.hxx |4 +++
 sc/source/ui/view/prevwsh.cxx   |   15 
 sc/uiconfig/scalc/ui/notebookbar.ui |3 ++
 sfx2/source/notebookbar/SfxNotebookBar.cxx  |   35 +++-
 4 files changed, 56 insertions(+), 1 deletion(-)

New commits:
commit 81695542af1dc2cc74f16a1ce4b4dd540a64817b
Author: Samuel Mehrbrodt 
AuthorDate: Sat Oct 27 17:47:01 2018 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Oct 29 08:23:34 2018 +0100

tdf#120874 Don't show menubar in other windows when one is closed

Change-Id: Id0b1af277bd7ec367525663ec6d478d67cde0a40
Reviewed-on: https://gerrit.libreoffice.org/62431
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx 
b/include/sfx2/notebookbar/SfxNotebookBar.hxx
index e3c397a5bd62..08633bf27352 100644
--- a/include/sfx2/notebookbar/SfxNotebookBar.hxx
+++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx
@@ -11,6 +11,7 @@
 #define INCLUDED_SFX2_NOTEBOOKBAR_SFXNOTEBOOKBAR_HXX
 
 #include 
+#include 
 #include 
 
 class SfxBindings;
@@ -43,7 +44,10 @@ public:
 
 static void RemoveListeners(SystemWindow const * pSysWindow);
 
+/** Show menu bar in all frames of current application */
 static void ShowMenubar(bool bShow);
+/** Show menu bar only in current frame */
+static void ShowMenubar(SfxViewFrame* pViewFrame, bool bShow);
 static void ToggleMenubar();
 
 private:
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx 
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index ee19f6f2bcc4..953bacf4bfe8 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -179,7 +179,8 @@ void SfxNotebookBar::CloseMethod(SystemWindow* pSysWindow)
 RemoveListeners(pSysWindow);
 if(pSysWindow->GetNotebookBar())
 pSysWindow->CloseNotebookBar();
-SfxNotebookBar::ShowMenubar(true);
+if (SfxViewFrame::Current())
+SfxNotebookBar::ShowMenubar(SfxViewFrame::Current(), true);
 }
 }
 
@@ -423,6 +424,38 @@ void SfxNotebookBar::ShowMenubar(bool bShow)
 }
 }
 
+void SfxNotebookBar::ShowMenubar(SfxViewFrame* pViewFrame, bool bShow)
+{
+if (m_bLock)
+return;
+
+m_bLock = true;
+
+uno::Reference xContext = 
comphelper::getProcessComponentContext();
+const Reference xModuleManager = 
frame::ModuleManager::create(xContext);
+
+Reference xFrame = 
pViewFrame->GetFrame().GetFrameInterface();
+if (xFrame.is())
+{
+const Reference& xLayoutManager = 
lcl_getLayoutManager(xFrame);
+if (xLayoutManager.is())
+{
+xLayoutManager->lock();
+
+if (xLayoutManager->getElement(MENUBAR_STR).is())
+{
+if (xLayoutManager->isElementVisible(MENUBAR_STR) && !bShow)
+xLayoutManager->hideElement(MENUBAR_STR);
+else if (!xLayoutManager->isElementVisible(MENUBAR_STR) && 
bShow)
+xLayoutManager->showElement(MENUBAR_STR);
+}
+
+xLayoutManager->unlock();
+}
+}
+m_bLock = false;
+}
+
 void SfxNotebookBar::ToggleMenubar()
 {
 if (SfxViewFrame::Current())
commit 128ecffe53394c1f045521c2efb42ea03a319f4b
Author: andreas kainz 
AuthorDate: Wed Oct 17 21:41:25 2018 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Oct 29 08:23:23 2018 +0100

Notebookbar: add context-Printpreview to calc tabbed NB

Change-Id: I9b63a515c407692f5632cb5e1f391593cfd68736
Reviewed-on: https://gerrit.libreoffice.org/62433
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 01ca947a8251..15074ddf2a04 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -69,6 +69,9 @@
 #include 
 
 #include 
+#include 
+#include 
+
 //  for mouse wheel
 #define MINZOOM_SLIDER 10
 #define MAXZOOM_SLIDER 400
@@ -155,6 +158,15 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
 {
 Construct( &pViewFrame->GetWindow() );
 
+SfxShell::SetContextBroadcasterEnabled(true);
+
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Printpreview));
+SfxShell::BroadcastContextForActivation(true);
+
+
+auto& pNotebookBar = 
pViewFrame->GetWindow().GetSystemWindow()->GetNotebookBar();
+if (pNotebookBar)
+pNotebookBar->ControlListener(true);
+
 if ( auto pTabViewShell = dynamic_cast( pOldSh) )
 {
 //  store view settings, show table from TabView
@@ -181,6 +193,9 @@ ScPreviewShell::~ScPreviewShell()
 if (mpFrameWindow)
 mpFrameWindow->SetCloseHdl(Link()); // Remove 
close handler.
 
+if (auto& pBar = 
GetViewFrame()->GetWindow().GetSystemWindow()->GetNotebookBar())
+pBar->ControlListener(false);
+
 // #108333#; notify Accessibility that Shell is dying and bef