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

[Noel Grandin]

 include/sfx2/tabdlg.hxx|2 --
 sfx2/source/dialog/dinfdlg.cxx |6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 213f12be2cab2106dde4a0e859faaa8259627c1a
Author: Noel Grandin 
Date:   Thu May 3 15:10:50 2018 +0200

no need to expose m_pExampleSet as non-const

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

diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 9317380174a3..c3d6d6ec2cf6 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -210,7 +210,6 @@ public:
 voidStart();
 
 const SfxItemSet*   GetExampleSet() const { return m_pExampleSet; }
-SfxItemSet* GetExampleSet() { return m_pExampleSet; }
 
 voidSetApplyHandler(const Link& _rHdl);
 
@@ -296,7 +295,6 @@ public:
 short   execute();
 
 const SfxItemSet*   GetExampleSet() const { return m_pExampleSet; }
-SfxItemSet* GetExampleSet() { return m_pExampleSet; }
 
 SAL_DLLPRIVATE void Start_Impl();
 };
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 017ca402dd89..f5d2ce07a86e 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -950,7 +950,7 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet* rSet )
  m_pUseUserDataCB->IsValueChangedFromSaved() &&
  GetTabDialog() && GetTabDialog()->GetExampleSet() )
 {
-SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
+const SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
 const SfxPoolItem* pItem;
 
 if ( pExpSet && SfxItemState::SET == pExpSet->GetItemState( 
SID_DOCINFO, true, &pItem ) )
@@ -965,7 +965,7 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet* rSet )
 
 if ( bHandleDelete )
 {
-SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
+const SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
 const SfxPoolItem* pItem;
 if ( pExpSet && SfxItemState::SET == pExpSet->GetItemState( 
SID_DOCINFO, true, &pItem ) )
 {
@@ -987,7 +987,7 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet* rSet )
 if ( m_pUseThumbnailSaveCB->IsValueChangedFromSaved() &&
GetTabDialog() && GetTabDialog()->GetExampleSet() )
 {
-SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
+const SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
 const SfxPoolItem* pItem;
 
 if ( pExpSet && SfxItemState::SET == pExpSet->GetItemState( 
SID_DOCINFO, true, &pItem ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 connectivity/source/commontools/TSortIndex.cxx|   14 ++
 connectivity/source/drivers/file/FNoException.cxx |4 ++--
 connectivity/source/drivers/file/FResultSet.cxx   |4 ++--
 connectivity/source/drivers/mork/MResultSet.cxx   |4 ++--
 connectivity/source/inc/TKeyValue.hxx |3 +--
 connectivity/source/inc/TSortIndex.hxx|8 +---
 connectivity/source/inc/file/FResultSet.hxx   |2 +-
 7 files changed, 19 insertions(+), 20 deletions(-)

New commits:
commit 869683945a801e86590c165bc6f08832adb7ebb1
Author: Noel Grandin 
Date:   Wed May 2 15:17:21 2018 +0200

loplugin:useuniqueptr in connectivity::OSortIndex

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

diff --git a/connectivity/source/commontools/TSortIndex.cxx 
b/connectivity/source/commontools/TSortIndex.cxx
index 63e5037a7279..0f06aa11e625 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -103,16 +103,15 @@ OSortIndex::~OSortIndex()
 {
 }
 
-void OSortIndex::AddKeyValue(OKeyValue * pKeyValue)
+void OSortIndex::AddKeyValue(std::unique_ptr pKeyValue)
 {
 assert(pKeyValue && "Can not be null here!");
 if(m_bFrozen)
 {
-
m_aKeyValues.push_back(TIntValuePairVector::value_type(pKeyValue->getValue(),nullptr));
-delete pKeyValue;
+m_aKeyValues.push_back({pKeyValue->getValue(),nullptr});
 }
 else
-
m_aKeyValues.push_back(TIntValuePairVector::value_type(pKeyValue->getValue(),pKeyValue));
+m_aKeyValues.push_back({pKeyValue->getValue(),std::move(pKeyValue)});
 }
 
 void OSortIndex::Freeze()
@@ -125,8 +124,7 @@ void OSortIndex::Freeze()
 
 for (auto & keyValue : m_aKeyValues)
 {
-delete keyValue.second;
-keyValue.second = nullptr;
+keyValue.second.reset();
 }
 
 m_bFrozen = true;
@@ -142,9 +140,9 @@ OKeyValue::~OKeyValue()
 {
 }
 
-OKeyValue* OKeyValue::createKeyValue(sal_Int32 _nVal)
+std::unique_ptr OKeyValue::createKeyValue(sal_Int32 _nVal)
 {
-return new OKeyValue(_nVal);
+return std::unique_ptr(new OKeyValue(_nVal));
 }
 
 
diff --git a/connectivity/source/drivers/file/FNoException.cxx 
b/connectivity/source/drivers/file/FNoException.cxx
index bc87c7d0535f..dfb080dc4ee3 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -87,11 +87,11 @@ void OPreparedStatement::scanParameter(OSQLParseNode* 
pParseNode,std::vector< OS
 scanParameter(pParseNode->getChild(i),_rParaNodes);
 }
 
-OKeyValue* OResultSet::GetOrderbyKeyValue(OValueRefRow const & _rRow)
+std::unique_ptr OResultSet::GetOrderbyKeyValue(OValueRefRow const & 
_rRow)
 {
 sal_uInt32 nBookmarkValue = 
std::abs(static_cast((_rRow->get())[0]->getValue()));
 
-OKeyValue* pKeyValue = OKeyValue::createKeyValue(nBookmarkValue);
+std::unique_ptr pKeyValue = 
OKeyValue::createKeyValue(nBookmarkValue);
 
 for (auto const& elem : m_aOrderbyColumnNumber)
 {
diff --git a/connectivity/source/drivers/file/FResultSet.cxx 
b/connectivity/source/drivers/file/FResultSet.cxx
index a078e095a3fa..f2610657bf07 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -843,8 +843,8 @@ again:
 {
 if (m_pSortIndex)
 {
-OKeyValue* pKeyValue = GetOrderbyKeyValue( m_aSelectRow );
-m_pSortIndex->AddKeyValue(pKeyValue);
+std::unique_ptr pKeyValue = GetOrderbyKeyValue( 
m_aSelectRow );
+m_pSortIndex->AddKeyValue(std::move(pKeyValue));
 }
 else if (m_pFileSet.is())
 {
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx 
b/connectivity/source/drivers/mork/MResultSet.cxx
index 912341732d4f..72e8c3aa3d06 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -1136,7 +1136,7 @@ void OResultSet::executeQuery()
 #endif
 for ( sal_Int32 nRow = 1; nRow <= 
m_aQueryHelper.getResultCount(); nRow++ ) {
 
-OKeyValue* pKeyValue = OKeyValue::createKeyValue(nRow);
+std::unique_ptr pKeyValue = 
OKeyValue::createKeyValue(nRow);
 
 std::vector::const_iterator aIter = 
m_aOrderbyColumnNumber.begin();
 for (;aIter != m_aOrderbyColumnNumber.end(); ++aIter)
@@ -1151,7 +1151,7 @@ void OResultSet::executeQuery()
 pKeyValue->pushKey(new 
ORowSetValueDecorator(value));
 }
 
-aSortIndex.AddKeyValue( pKeyValue );
+aSortIndex.AddKeyValue( std::move(pKeyValue) );
 }
 
 m_pKeySet = aSortIndex.CreateKeySet();
diff --git a/connectivity/source/inc/T

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

[Noel Grandin]

 include/sfx2/mgetempl.hxx   |3 ++-
 sfx2/source/appl/appdata.cxx|1 +
 sfx2/source/appl/appdde.cxx |   32 ++--
 sfx2/source/dialog/mgetempl.cxx |4 ++--
 sfx2/source/inc/appdata.hxx |   21 +
 5 files changed, 32 insertions(+), 29 deletions(-)

New commits:
commit de0a2f6ae7fdfccc17e2b93006a3d308ac15868b
Author: Noel Grandin 
Date:   Wed May 2 13:58:34 2018 +0200

loplugin:useuniqueptr in SfxManageStyleSheetPage

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

diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index 2a86859b17cd..ded0aab6b0ec 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 /* expected:
 SID_TEMPLATE_NAME   :   In: StringItem, Name of Template
@@ -55,7 +56,7 @@ class SfxManageStyleSheetPage final : public SfxTabPage
 VclPtrm_pDescFt;
 
 SfxStyleSheetBase *pStyle;
-SfxStyleFamilies *pFamilies;
+std::unique_ptr pFamilies;
 const SfxStyleFamilyItem *pItem;
 OUString aBuf;
 bool bModified;
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 611a7359b9f9..2b29c7e335d1 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -92,7 +92,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* 
pParent, const Sfx
 else
 m_pEditLinkStyleBtn->Enable();
 
-pFamilies = SfxApplication::GetModule_Impl()->CreateStyleFamilies();
+pFamilies.reset(SfxApplication::GetModule_Impl()->CreateStyleFamilies());
 
 SfxStyleSheetBasePool* pPool = nullptr;
 SfxObjectShell* pDocShell = SfxObjectShell::Current();
@@ -252,7 +252,7 @@ void SfxManageStyleSheetPage::dispose()
 {
 m_pNameRw->SetGetFocusHdl( Link() );
 m_pNameRw->SetLoseFocusHdl( Link() );
-delete pFamilies;
+pFamilies.reset();
 pItem = nullptr;
 pStyle = nullptr;
 m_pNameRo.clear();
commit 49380068794fa6776cfeedf3ffeaa3677bc63f21
Author: Noel Grandin 
Date:   Wed May 2 13:11:14 2018 +0200

loplugin:useuniqueptr in SfxAppData_Impl

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

diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index fff9997452e1..cf12b4cc1e20 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -42,6 +42,7 @@
 #include "imestatuswindow.hxx"
 #include 
 #include 
+#include 
 
 #include 
 #include 
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 8f1ce9d8f25d..31adc8acfc2d 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -194,18 +194,6 @@ bool ImplDdeService::SysTopicExecute( const OUString* pStr 
)
 }
 #endif
 
-class SfxDdeTriggerTopic_Impl : public DdeTopic
-{
-#if defined(_WIN32)
-public:
-SfxDdeTriggerTopic_Impl()
-: DdeTopic( "TRIGGER" )
-{}
-
-virtual bool Execute( const OUString* ) override { return true; }
-#endif
-};
-
 class SfxDdeDocTopic_Impl : public DdeTopic
 {
 #if defined(_WIN32)
@@ -426,11 +414,11 @@ bool SfxApplication::InitializeDde()
 DBG_ASSERT( !pImpl->pDdeService,
 "Dde can not be initialized multiple times" );
 
-pImpl->pDdeService = new ImplDdeService( Application::GetAppName() );
+pImpl->pDdeService.reset(new ImplDdeService( Application::GetAppName() ));
 nError = pImpl->pDdeService->GetError();
 if( !nError )
 {
-pImpl->pDocTopics = new SfxDdeDocTopics_Impl;
+pImpl->pDocTopics.reset(new SfxDdeDocTopics_Impl);
 
 // we certainly want to support RTF!
 pImpl->pDdeService->AddFormat( SotClipboardFormatId::RTF );
@@ -442,8 +430,8 @@ bool SfxApplication::InitializeDde()
 OUString aService( SfxDdeServiceName_Impl(
 
aOfficeLockFile.GetMainURL(INetURLObject::DecodeMechanism::ToIUri) ) );
 aService = aService.toAsciiUpperCase();
-pImpl->pDdeService2 = new ImplDdeService( aService );
-pImpl->pTriggerTopic = new SfxDdeTriggerTopic_Impl;
+pImpl->pDdeService2.reset( new ImplDdeService( aService ));
+pImpl->pTriggerTopic.reset(new SfxDdeTriggerTopic_Impl);
 pImpl->pDdeService2->AddTopic( *pImpl->pTriggerTopic );
 }
 #endif
@@ -452,10 +440,10 @@ bool SfxApplication::InitializeDde()
 
 void SfxAppData_Impl::DeInitDDE()
 {
-DELETEZ( pTriggerTopic );
-DELETEZ( pDdeService2 );
-DELETEZ( pDocTopics );
-DELETEZ( pDdeService );
+pTriggerTopic.reset();
+pDdeService2.reset();
+pDocTopics.reset();
+pDdeService.reset();
 }
 
 #if defined(_WIN32)
@@ -514,12 +502,12 @@ void SfxApplication::RemoveDdeTopic( SfxObjectShell const 
* pSh )
 
 const Dde

Re: autoconf and libnumbertext dependency

[Tor Lillqvist]

>
>
> configure.ac:6: error: Autoconf version 2.68 or higher is required
>
> I’m running on MacOS High Sierra.
>

macOS does not come with any version of autoconf (or automake), so you have
always needed to build it yourself anyway in order to build LibreOffice,
no? (Installing some pre-built one from some 3rd-party packaging thing,
homebrew etc, has not been recommended). So just make sure that you build
and install a new enough version? I seem to have 2.69, and it is from 2015,
so version 2.68 isn't exactly brand new.

(How LODE handles it I have no idea. Does it include autoconf, and is that
what is too old?)

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

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

[Regina Henschel]

 filter/source/config/fragments/types/calc_MS_Multiplan.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 36ca18f70ee0bf9541bc0105c85f0a68f088c92b
Author: Regina Henschel 
Date:   Thu May 3 16:05:47 2018 +0200

tdf#117323 Add file name extension mp for Multiplan

The missing file name extensions makes the assertion fail in
core/include/rtl/ustring.hxx#669

Change-Id: I1a3c95867f850d64b69dc851737b902c4aef228b
Reviewed-on: https://gerrit.libreoffice.org/53797
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/filter/source/config/fragments/types/calc_MS_Multiplan.xcu 
b/filter/source/config/fragments/types/calc_MS_Multiplan.xcu
index 8f2bba34f0a2..7f9b3c3c528d 100644
--- a/filter/source/config/fragments/types/calc_MS_Multiplan.xcu
+++ b/filter/source/config/fragments/types/calc_MS_Multiplan.xcu
@@ -11,7 +11,7 @@
 
 com.sun.star.comp.Calc.MSWorksCalcImportFilter
 
-
+mp
 
 
 true
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basegfx/source chart2/qa external/boost icon-themes/galaxy icon-themes/tango include/basegfx sc/qa sd/qa sfx2/source sw/qa

[Andrea Gelmini]

 0 files changed

New commits:
commit 268c7a7841bf860c8882d281ddbf669cebc3768e
Author: Andrea Gelmini 
Date:   Sat Apr 7 22:58:22 2018 +0200

Removed executable permission on data files

chmod -x for doc, xlsx, png, hxx, cxx, xls, ppt, hpp

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

diff --git a/basegfx/source/matrix/b3dhommatrixtools.cxx 
b/basegfx/source/matrix/b3dhommatrixtools.cxx
old mode 100755
new mode 100644
diff --git a/chart2/qa/extras/data/xlsx/tdf73.xlsx 
b/chart2/qa/extras/data/xlsx/tdf73.xlsx
old mode 100755
new mode 100644
diff --git a/external/boost/include/boost/bimap/bimap.hpp 
b/external/boost/include/boost/bimap/bimap.hpp
old mode 100755
new mode 100644
diff --git a/external/boost/include/boost/bimap/unordered_set_of.hpp 
b/external/boost/include/boost/bimap/unordered_set_of.hpp
old mode 100755
new mode 100644
diff --git a/icon-themes/galaxy/res/mainapp_16.png 
b/icon-themes/galaxy/res/mainapp_16.png
old mode 100755
new mode 100644
diff --git a/icon-themes/galaxy/res/mainapp_32.png 
b/icon-themes/galaxy/res/mainapp_32.png
old mode 100755
new mode 100644
diff --git a/icon-themes/tango/res/lx03252.png 
b/icon-themes/tango/res/lx03252.png
old mode 100755
new mode 100644
diff --git a/icon-themes/tango/res/sx03252.png 
b/icon-themes/tango/res/sx03252.png
old mode 100755
new mode 100644
diff --git a/include/basegfx/matrix/b3dhommatrixtools.hxx 
b/include/basegfx/matrix/b3dhommatrixtools.hxx
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xls/fail/forcepoint-group-range-1.xls 
b/sc/qa/unit/data/xls/fail/forcepoint-group-range-1.xls
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xls/pass/forcepoint-selfseriesadd.xls 
b/sc/qa/unit/data/xls/pass/forcepoint-selfseriesadd.xls
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xls/pivot_row_header.xls 
b/sc/qa/unit/data/xls/pivot_row_header.xls
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xls/pivottable_bool_field_filter.xls 
b/sc/qa/unit/data/xls/pivottable_bool_field_filter.xls
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xls/pivottable_date_field_filter.xls 
b/sc/qa/unit/data/xls/pivottable_date_field_filter.xls
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xls/pivottable_double_field_filter.xls 
b/sc/qa/unit/data/xls/pivottable_double_field_filter.xls
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xls/pivottable_empty_item.xls 
b/sc/qa/unit/data/xls/pivottable_empty_item.xls
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xls/pivottable_page_field_filter.xls 
b/sc/qa/unit/data/xls/pivottable_page_field_filter.xls
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xls/pivottable_rowcolpage_field_filter.xls 
b/sc/qa/unit/data/xls/pivottable_rowcolpage_field_filter.xls
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xls/pivottable_string_field_filter.xls 
b/sc/qa/unit/data/xls/pivottable_string_field_filter.xls
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xls/tdf112501.xls 
b/sc/qa/unit/data/xls/tdf112501.xls
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xlsx/activex_checkbox.xlsx 
b/sc/qa/unit/data/xlsx/activex_checkbox.xlsx
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xlsx/cell-anchored-hidden-shapes.xlsx 
b/sc/qa/unit/data/xlsx/cell-anchored-hidden-shapes.xlsx
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xlsx/column-style-autofilter.xlsx 
b/sc/qa/unit/data/xlsx/column-style-autofilter.xlsx
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xlsx/pivot_table_first_header_row.xlsx 
b/sc/qa/unit/data/xlsx/pivot_table_first_header_row.xlsx
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xlsx/pivottable_bool_field_filter.xlsx 
b/sc/qa/unit/data/xlsx/pivottable_bool_field_filter.xlsx
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xlsx/pivottable_date_field_filter.xlsx 
b/sc/qa/unit/data/xlsx/pivottable_date_field_filter.xlsx
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xlsx/pivottable_double_field_filter.xlsx 
b/sc/qa/unit/data/xlsx/pivottable_double_field_filter.xlsx
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xlsx/pivottable_duplicated_member_filter.xlsx 
b/sc/qa/unit/data/xlsx/pivottable_duplicated_member_filter.xlsx
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xlsx/pivottable_error_item_filter.xlsx 
b/sc/qa/unit/data/xlsx/pivottable_error_item_filter.xlsx
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xlsx/pivottable_outline_mode.xlsx 
b/sc/qa/unit/data/xlsx/pivottable_outline_mode.xlsx
old mode 100755
new mode 100644
diff --git a/sc/qa/unit/data/xlsx/pivottable_rowcolpage_field_filter.xlsx 
b/sc/qa/unit/data/xlsx/pivottable_rowcolpage_field_filter.xlsx
old mode 100755
new mode 100644
diff --git a/sc/qa/unit

[Libreoffice-commits] core.git: basic/qa external/curl external/epoxy external/libassuan external/libcmis external/libgpg-error external/libtommath external/mdds scripting/astyle.options sd/qa

[Andrea Gelmini]

 0 files changed

New commits:
commit 09425ab9f199a90abfb45f62d94e68163e31c8af
Author: Andrea Gelmini 
Date:   Sat Apr 7 23:03:31 2018 +0200

Removed executable permission on data files

chmod -x for .patch, .pptm, and .vb

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

diff --git a/basic/qa/basic_coverage/test_date_literal.vb 
b/basic/qa/basic_coverage/test_date_literal.vb
old mode 100755
new mode 100644
diff --git a/external/curl/clang-cl.patch.0 b/external/curl/clang-cl.patch.0
old mode 100755
new mode 100644
diff --git a/external/epoxy/clang-cl.patch b/external/epoxy/clang-cl.patch
old mode 100755
new mode 100644
diff --git a/external/libassuan/w32-build-fixes.patch.1 
b/external/libassuan/w32-build-fixes.patch.1
old mode 100755
new mode 100644
diff --git a/external/libcmis/libcmis-fix-google-drive-2.patch 
b/external/libcmis/libcmis-fix-google-drive-2.patch
old mode 100755
new mode 100644
diff --git a/external/libgpg-error/clang-cl.patch 
b/external/libgpg-error/clang-cl.patch
old mode 100755
new mode 100644
diff --git a/external/libgpg-error/w32-build-fixes-2.patch.1 
b/external/libgpg-error/w32-build-fixes-2.patch.1
old mode 100755
new mode 100644
diff --git a/external/libgpg-error/w32-build-fixes-3.patch.1 
b/external/libgpg-error/w32-build-fixes-3.patch.1
old mode 100755
new mode 100644
diff --git a/external/libtommath/clang-cl.patch 
b/external/libtommath/clang-cl.patch
old mode 100755
new mode 100644
diff --git a/external/mdds/c++17.patch b/external/mdds/c++17.patch
old mode 100755
new mode 100644
diff --git a/scripting/astyle.options b/scripting/astyle.options
old mode 100755
new mode 100644
diff --git a/sd/qa/unit/data/pptm/macro.pptm b/sd/qa/unit/data/pptm/macro.pptm
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jim Raykowski]

 sw/source/uibase/utlui/content.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 38407bec341f2018fe460a76440dc0641dd07cef
Author: Jim Raykowski 
Date:   Fri Apr 27 16:17:35 2018 -0800

tdf#117283 Select all drawing objects with the same name

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

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 06bb5ad1c701..601c017d7f41 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3482,7 +3482,6 @@ void SwContentTree::GotoContent(SwContent* pCnt)
 pDrawView->MarkObj( pTemp, pPV );
 m_pActiveShell->EnterStdMode();
 bSel = true;
-break;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Thibault]

 solenv/gbuild/UIConfig.mk  |2 +-
 solenv/sanitizers/ui/cui.suppr |   13 +
 solenv/sanitizers/ui/modules/scalc.suppr   |5 +
 solenv/sanitizers/ui/modules/schart.suppr  |3 ++-
 solenv/sanitizers/ui/modules/swriter.suppr |   14 ++
 solenv/sanitizers/ui/svx.suppr |7 +++
 6 files changed, 38 insertions(+), 6 deletions(-)

New commits:
commit 936eaedddbc6d21737745be3c3131607440e366c
Author: Samuel Thibault 
Date:   Mon Apr 23 10:54:20 2018 +0200

gla11y: Enable duplicate labelling warnings

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

diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 1d9ede0986d1..e208d99a7309 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -167,7 +167,7 @@ gb_UIConfig_gla11y_PARAMETERS += --enable-type 
missing-labelled-by
 # These are often buttons with only an image
 gb_UIConfig_gla11y_PARAMETERS += --enable-type button-no-label
 # These are often doubtful
-#gb_UIConfig_gla11y_PARAMETERS += --enable-type duplicate-mnemonic 
--enable-type labelled-by-and-mnemonic
+gb_UIConfig_gla11y_PARAMETERS += --enable-type duplicate-mnemonic 
--enable-type labelled-by-and-mnemonic
 
 # For now, disable warning about widgets without a label by default, to enable 
warnings for classes progressively
 # To be uncommented progressively
diff --git a/solenv/sanitizers/ui/cui.suppr b/solenv/sanitizers/ui/cui.suppr
index 3cf4f506104c..faf5d9357fdd 100644
--- a/solenv/sanitizers/ui/cui.suppr
+++ b/solenv/sanitizers/ui/cui.suppr
@@ -1,3 +1,5 @@
+cui/uiconfig/ui/colorpage.ui://GtkSpinButton[@id='C_custom:0%'] 
duplicate-mnemonic
+cui/uiconfig/ui/colorpage.ui://GtkSpinButton[@id='K_custom:0%'] 
duplicate-mnemonic
 cui/uiconfig/ui/comment.ui://GtkButton[@id='previous'] button-no-label
 cui/uiconfig/ui/comment.ui://GtkButton[@id='next'] button-no-label
 cui/uiconfig/ui/gradientpage.ui://GtkScale[@id='incrementslider'] 
no-labelled-by
@@ -11,6 +13,8 @@ cui/uiconfig/ui/hatchpage.ui://GtkLabel[@id='linecolorft'] 
orphan-label
 cui/uiconfig/ui/hyphenate.ui://GtkLabel[@id='label1'] orphan-label
 cui/uiconfig/ui/hyphenate.ui://GtkButton[@id='left'] button-no-label
 cui/uiconfig/ui/hyphenate.ui://GtkButton[@id='right'] button-no-label
+cui/uiconfig/ui/menuassignpage.ui://GtkTextView[@id='desc:border'] 
labelled-by-and-mnemonic
+cui/uiconfig/ui/newlibdialog.ui://GtkEntry[@id='entry'] duplicate-mnemonic
 cui/uiconfig/ui/optemailpage.ui://GtkLabel[@id='browsetitle'] orphan-label
 cui/uiconfig/ui/optemailpage.ui://GtkLabel[@id='suppress'] orphan-label
 cui/uiconfig/ui/optemailpage.ui://GtkCheckButton[@id='suppressHidden'] 
button-no-label
@@ -20,6 +24,9 @@ cui/uiconfig/ui/optfontspage.ui://GtkLabel[@id='font'] 
orphan-label
 cui/uiconfig/ui/optfontspage.ui://GtkLabel[@id='replacewith'] orphan-label
 cui/uiconfig/ui/optfontspage.ui://GtkButton[@id='apply'] button-no-label
 cui/uiconfig/ui/optfontspage.ui://GtkButton[@id='delete'] button-no-label
+cui/uiconfig/ui/optviewpage.ui://GtkComboBoxText[@id='iconsize'] 
duplicate-mnemonic
+cui/uiconfig/ui/pageformatpage.ui://GtkSpinButton[@id='spinMargLeft:0.00cm'] 
duplicate-mnemonic
+cui/uiconfig/ui/pageformatpage.ui://GtkSpinButton[@id='spinMargRight:0.00cm'] 
duplicate-mnemonic
 cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default1'] 
button-no-label
 cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default2'] 
button-no-label
 cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default3'] 
button-no-label
@@ -42,8 +49,6 @@ 
cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='result7'] button-no-la
 cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='result8'] 
button-no-label
 cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='result9'] 
button-no-label
 cui/uiconfig/ui/select_persona_dialog.ui://GtkLabel[@id='progress_label'] 
orphan-label
-cui/uiconfig/ui/textflowpage.ui://GtkSpinButton[@id='spinPageNumber'] 
missing-label-for
-cui/uiconfig/ui/textflowpage.ui://GtkComboBox[@id='comboPageStyle'] 
missing-label-for
-cui/uiconfig/ui/textflowpage.ui://GtkSpinButton[@id='spinOrphan'] 
missing-label-for
-cui/uiconfig/ui/textflowpage.ui://GtkSpinButton[@id='spinWidow'] 
missing-label-for
+cui/uiconfig/ui/signsignatureline.ui://GtkTextView[@id='edit_comment'] 
duplicate-mnemonic
 cui/uiconfig/ui/thesaurus.ui://GtkButton[@id='left'] button-no-label
+cui/uiconfig/ui/wordcompletionpage.ui://GtkSpinButton[@id='maxentries'] 
duplicate-mnemonic
diff --git a/solenv/sanitizers/ui/modules/scalc.suppr 
b/solenv/sanitizers/ui/modules/scalc.suppr
index 28d6cc96060e..6e20952ada84 100644
--- a/solenv/sanitizers/ui/modules/scalc.suppr
+++ b/solenv/sanitizers/ui/modules/scalc.suppr
@@ -1,3 +1,4 @@
+sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui://GtkComboBoxText[@id='layout'] 
duplicate-mnemonic
 sc/u

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

[Andrea Gelmini]

 0 files changed

New commits:
commit 4ed3137022efa6128ad146e4b4dfae13548431dc
Author: Andrea Gelmini 
Date:   Tue May 1 13:25:38 2018 +0200

Removed executable permission on data file

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

diff --git a/sysui/desktop/macosx/Info.plist.in 
b/sysui/desktop/macosx/Info.plist.in
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 0 files changed

New commits:
commit 91424c5ce672d4b81c0325d53cc377f31a3fc417
Author: Andrea Gelmini 
Date:   Tue May 1 16:16:27 2018 +0200

Removed executable permission on data file

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

diff --git a/sw/qa/core/data/ww8/pass/forcepoint-layout-1.doc 
b/sw/qa/core/data/ww8/pass/forcepoint-layout-1.doc
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sal toolkit/source vcl/win

[Thorsten Behrens]

 include/sal/log-areas.dox |1 +
 toolkit/source/awt/vclxwindow.cxx |3 +++
 vcl/win/app/salinst.cxx   |2 ++
 vcl/win/window/salframe.cxx   |2 ++
 4 files changed, 8 insertions(+)

New commits:
commit bb2443cc18d43860faafc852a5bfc5d446a7b6b3
Author: Thorsten Behrens 
Date:   Wed Feb 1 03:29:18 2017 +0100

logging: add some strategic places around vcl messages

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

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 0f8927cc89ff..488f4d6c0232 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -462,6 +462,7 @@ certain functionality.
 @li @c vcl.filter
 @li @c vcl.fonts - font-specific code
 @li @c vcl.gdi - the GDI part of VCL, devices, bitmaps, etc.
+@li @c vcl.gdi.wndproc - Windows Procedure part of VCL
 @li @c vcl.gdi.fontmetric
 @li @c vcl.gtk - Gtk+ 2/3 plugin
 @li @c vcl.gtk3
diff --git a/toolkit/source/awt/vclxwindow.cxx 
b/toolkit/source/awt/vclxwindow.cxx
index d85def1007e7..45c7d1dcdc62 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -269,6 +269,8 @@ IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks, void*, 
void)
 {
 const Reference< uno::XInterface > xKeepAlive( mrAntiImpl );
 
+SAL_INFO("toolkit.controls", "OnProcessCallbacks grabbing solarmutex");
+
 // work on a copy of the callback array
 CallbackArray aCallbacksCopy;
 {
@@ -287,6 +289,7 @@ IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks, void*, 
void)
 }
 
 {
+SAL_INFO("toolkit.controls", "OnProcessCallbacks relinquished 
solarmutex");
 SolarMutexReleaser aReleaseSolar;
 for (   CallbackArray::const_iterator loop = aCallbacksCopy.begin();
 loop != aCallbacksCopy.end();
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index a33b7e1bd683..c0bd18f85627 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -582,6 +582,8 @@ LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM 
wParam, LPARAM lParam, b
 WinSalInstance *pInst = GetSalData()->mpInstance;
 WinSalTimer *const pTimer = static_cast( 
ImplGetSVData()->maSchedCtx.mpSalTimer );
 
+SAL_INFO("vcl.gdi.wndproc", "SalComWndProc(nMsg=" << nMsg << ", wParam=" << 
wParam << ", lParam=" << lParam << ")");
+
 switch ( nMsg )
 {
 case SAL_MSG_THREADYIELD:
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 7dfe3c0a573d..864c0dd45f03 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -5437,6 +5437,8 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, 
WPARAM wParam, LPARAM lP
 static bool  bInWheelMsg = false;
 static bool  bInQueryEnd = false;
 
+SAL_INFO("vcl.gdi.wndproc", "SalFrameWndProc(nMsg=" << nMsg << ", wParam=" 
<< wParam << ", lParam=" << lParam << ")");
+
 // By WM_CREATE we connect the frame with the window handle
 if ( nMsg == WM_CREATE )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in

[Rene Engelhard]

 config_host.mk.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 409b7636f0e519f9ab14bac7884789b2323557c7
Author: Rene Engelhard 
Date:   Fri May 4 00:34:59 2018 +0200

actually export SYSTEM_LIBNUMBERTEXT_DATA in config_host.mk

Change-Id: I5cd6d0b3fe610d0152a3d5345d8412161a1d0544

diff --git a/config_host.mk.in b/config_host.mk.in
index b5e2dc00f8f5..70f0ecb02893 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -550,6 +550,7 @@ export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
 export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
 export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@
 export SYSTEM_LIBNUMBERTEXT=@SYSTEM_LIBNUMBERTEXT@
+export SYSTEM_LIBNUMBERTEXT_DATA=@SYSTEM_LIBNUMBERTEXT_DATA@
 export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
 export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
 export SYSTEM_LIBXML=@SYSTEM_LIBXML@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 svl/source/numbers/zforlist.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 16a8d9f45449d0ef7efbdbff8ae29d97441eb044
Author: Eike Rathke 
Date:   Thu May 3 14:31:08 2018 +0200

Avoid number scanner overhead for all General formats

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

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 178c3e853d71..de7a808324e0 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1095,6 +1095,13 @@ bool SvNumberFormatter::IsNumberFormat(const OUString& 
sString,
 FType = SvNumFormatType::DEFINED;
 }
 ChangeIntl(pFormat->GetLanguage());
+// Avoid scanner overhead with the General format of any locale.
+// These are never substituded above so safe to ignore.
+if ((F_Index % SV_COUNTRY_LANGUAGE_OFFSET) == 0)
+{
+assert(FType == SvNumFormatType::NUMBER);
+pFormat = nullptr;
+}
 }
 
 bool res;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 svl/source/numbers/zforlist.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 3f8fa788a28abdbf58b0e7577e6a5632001f6181
Author: Eike Rathke 
Date:   Thu May 3 14:18:44 2018 +0200

Avoid number scanner overhead for the 0 General format

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

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index c22807fc9cd4..178c3e853d71 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1079,7 +1079,9 @@ bool SvNumberFormatter::IsNumberFormat(const OUString& 
sString,
 ::osl::MutexGuard aGuard( GetInstanceMutex() );
 
 SvNumFormatType FType;
-const SvNumberformat* pFormat = ImpSubstituteEntry( 
GetFormatEntry(F_Index));
+// For the 0 General format directly use the init/system locale and avoid
+// all overhead that is associated with a format passed to the scanner.
+const SvNumberformat* pFormat = (F_Index == 0 ? nullptr : 
ImpSubstituteEntry( GetFormatEntry(F_Index)));
 if (!pFormat)
 {
 ChangeIntl(IniLnge);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 include/svl/zforlist.hxx|4 
 svl/source/numbers/zforfind.cxx |  164 
 svl/source/numbers/zforfind.hxx |   19 +---
 3 files changed, 111 insertions(+), 76 deletions(-)

New commits:
commit a5e0fda3c1375f312ba8d3f0f5ce80d16649c4f5
Author: Eike Rathke 
Date:   Thu May 3 13:59:31 2018 +0200

Revert "Revert "Resolves: tdf#116579 consider both work locale and 
format...""

This reverts commit f5a56c367fba1c42b4f9719b10ff3e86ad5e2ab1.

Now that Basic is fixed to set the proper NfEvalDateFormat ...

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

diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 536d6bdf1645..14aaf6a40940 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -882,6 +882,10 @@ public:
 /** Access for unit tests. */
 size_t GetMaxDefaultColors() const;
 
+struct InputScannerPrivateAccess { friend class ImpSvNumberInputScan; 
private: InputScannerPrivateAccess() {} };
+/** Access for input scanner to temporarily (!) switch locales. */
+OnDemandLocaleDataWrapper& GetOnDemandLocaleDataWrapper( const 
InputScannerPrivateAccess& ) { return xLocaleData; }
+
 private:
 mutable ::osl::Mutex m_aMutex;
 css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 85b27797d204..e55786ea9d17 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include "zforscan.hxx"
@@ -98,6 +99,7 @@ ImpSvNumberInputScan::~ImpSvNumberInputScan()
 
 void ImpSvNumberInputScan::Reset()
 {
+mpFormat = nullptr;
 nMonth   = 0;
 nMonthPos= 0;
 nDayOfWeek   = 0;
@@ -702,14 +704,13 @@ int ImpSvNumberInputScan::GetDayOfWeek( const OUString& 
rString, sal_Int32& nPos
  * '$'   => true
  * else => false
  */
-bool ImpSvNumberInputScan::GetCurrency( const OUString& rString, sal_Int32& 
nPos,
-const SvNumberformat* pFormat )
+bool ImpSvNumberInputScan::GetCurrency( const OUString& rString, sal_Int32& 
nPos )
 {
 if ( rString.getLength() > nPos )
 {
 if ( !aUpperCurrSymbol.getLength() )
 {   // if no format specified the currency of the initialized formatter
-LanguageType eLang = (pFormat ? pFormat->GetLanguage() : 
pFormatter->GetLanguage());
+LanguageType eLang = (mpFormat ? mpFormat->GetLanguage() : 
pFormatter->GetLanguage());
 aUpperCurrSymbol = pFormatter->GetCharClass()->uppercase(
 SvNumberFormatter::GetCurrencyEntry( eLang ).GetSymbol() );
 }
@@ -718,10 +719,10 @@ bool ImpSvNumberInputScan::GetCurrency( const OUString& 
rString, sal_Int32& nPos
 nPos = nPos + aUpperCurrSymbol.getLength();
 return true;
 }
-if ( pFormat )
+if ( mpFormat )
 {
 OUString aSymbol, aExtension;
-if ( pFormat->GetNewCurrencySymbol( aSymbol, aExtension ) )
+if ( mpFormat->GetNewCurrencySymbol( aSymbol, aExtension ) )
 {
 if ( aSymbol.getLength() <= rString.getLength() - nPos )
 {
@@ -1100,18 +1101,18 @@ bool ImpSvNumberInputScan::CanForceToIso8601( DateOrder 
eDateOrder )
 }
 
 
-bool ImpSvNumberInputScan::IsAcceptableIso8601( const SvNumberformat* pFormat )
+bool ImpSvNumberInputScan::IsAcceptableIso8601()
 {
-if (pFormat && (pFormat->GetType() & SvNumFormatType::DATE))
+if (mpFormat && (mpFormat->GetType() & SvNumFormatType::DATE))
 {
 switch (pFormatter->GetEvalDateFormat())
 {
 case NF_EVALDATEFORMAT_INTL:
 return CanForceToIso8601( GetDateOrder());
 case NF_EVALDATEFORMAT_FORMAT:
-return CanForceToIso8601( pFormat->GetDateOrder());
+return CanForceToIso8601( mpFormat->GetDateOrder());
 default:
-return CanForceToIso8601( GetDateOrder()) || 
CanForceToIso8601( pFormat->GetDateOrder());
+return CanForceToIso8601( GetDateOrder()) || 
CanForceToIso8601( mpFormat->GetDateOrder());
 }
 }
 return CanForceToIso8601( GetDateOrder());
@@ -1191,7 +1192,46 @@ bool ImpSvNumberInputScan::IsAcceptedDatePattern( 
sal_uInt16 nStartPatternAt )
 }
 else if (!sDateAcceptancePatterns.getLength())
 {
-sDateAcceptancePatterns = 
pFormatter->GetLocaleData()->getDateAcceptancePatterns();
+// The current locale is the format's locale, if a format is present.
+const NfEvalDateFormat eEDF = pFormatter->GetEvalDateFormat();
+if (!mpFormat || eEDF == NF_EVALDATEFORMAT_FORMAT || 
mpFormat->GetLanguage() == pFormatter->GetLanguage())
+{
+  

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

[Eike Rathke]

 basic/source/runtime/runtime.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 657668c378a9405c9978c553be52346b250e8d99
Author: Eike Rathke 
Date:   Thu May 3 13:34:54 2018 +0200

Related: tdf#116579 tell SvNumberFormatter the proper NfEvalDateFormat

So far Basic relied on the side effect of date acceptance patterns
selected according to the passed format's locale, which changed
with the (temporarily reverted) commit
dfb9138b8b5a239b46f189a717999bcaff19aa79. Explicitly tell the
formatter the behavior to use.

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

diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 23573424b09d..9f242dab4ba8 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -407,6 +407,15 @@ std::shared_ptr 
SbiInstance::PrepareNumberFormatter( sal_uInt
 std::shared_ptr pNumberFormatter(
 new SvNumberFormatter( comphelper::getProcessComponentContext(), 
eLangType ));
 
+// Several parser methods pass SvNumberFormatter::IsNumberFormat() a number
+// format index to parse against. Tell the formatter the proper date
+// evaluation order, which also determines the date acceptance patterns to
+// use if a format was passed. NF_EVALDATEFORMAT_FORMAT restricts to the
+// format's locale's date patterns/order (no init/system locale match
+// tried) and falls back to NF_EVALDATEFORMAT_INTL if no specific (i.e. 0)
+// (or an unknown) format index was passed.
+pNumberFormatter->SetEvalDateFormat( NF_EVALDATEFORMAT_FORMAT);
+
 sal_Int32 nCheckPos = 0;
 SvNumFormatType nType;
 rnStdTimeIdx = pNumberFormatter->GetStandardFormat( SvNumFormatType::TIME, 
eLangType );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sfx2/source/dialog/filtergrouping.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ccbc955ed0d2efec2de5250a8b838804fafa93ce
Author: Eike Rathke 
Date:   Fri May 4 00:13:41 2018 +0200

Reverse debug logic

Two warning messages are too much..

Change-Id: Ifaa40e1c7a32b488d1a40374507efea5e893280f

diff --git a/sfx2/source/dialog/filtergrouping.cxx 
b/sfx2/source/dialog/filtergrouping.cxx
index fc8104801207..b00da7900b62 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -464,7 +464,7 @@ namespace sfx2
 {
 DBG_ASSERT( !_rWildCard.isEmpty(),
 "AppendWildcardToDescriptor::AppendWildcardToDescriptor: invalid 
wildcard!" );
-DBG_ASSERT( !_rWildCard.isEmpty() && _rWildCard[0] != 
s_cWildcardSeparator,
+DBG_ASSERT( _rWildCard.isEmpty() || _rWildCard[0] != 
s_cWildcardSeparator,
 "AppendWildcardToDescriptor::AppendWildcardToDescriptor: wildcard 
already separated!" );
 
 aWildCards.reserve( comphelper::string::getTokenCount(_rWildCard, 
s_cWildcardSeparator) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sfx2/source/dialog/filtergrouping.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8c65f839633f57e57e9f748af87983377b705d24
Author: Eike Rathke 
Date:   Fri May 4 00:08:08 2018 +0200

Debug string access out-of-bounds

Change-Id: Ie5afbcdc9818e09261c2458f03ce26da1fefcf49

diff --git a/sfx2/source/dialog/filtergrouping.cxx 
b/sfx2/source/dialog/filtergrouping.cxx
index 1666e81b258f..fc8104801207 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -464,7 +464,7 @@ namespace sfx2
 {
 DBG_ASSERT( !_rWildCard.isEmpty(),
 "AppendWildcardToDescriptor::AppendWildcardToDescriptor: invalid 
wildcard!" );
-DBG_ASSERT( _rWildCard[0] != s_cWildcardSeparator,
+DBG_ASSERT( !_rWildCard.isEmpty() && _rWildCard[0] != 
s_cWildcardSeparator,
 "AppendWildcardToDescriptor::AppendWildcardToDescriptor: wildcard 
already separated!" );
 
 aWildCards.reserve( comphelper::string::getTokenCount(_rWildCard, 
s_cWildcardSeparator) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac

[Rene Engelhard]

 config_host.mk.in |3 ++-
 configure.ac  |2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 887481755949e6313e12d6e9ab04c95f84884830
Author: Rene Engelhard 
Date:   Thu May 3 23:55:25 2018 +0200

fix system-libnumbertext build

actually export SYSTEM_LIBNUMBERTEXT

Change-Id: I758ef7ee868c5b06fc4e8ae43e6f2091925232aa

diff --git a/config_host.mk.in b/config_host.mk.in
index 3085de0c4767..b5e2dc00f8f5 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -332,7 +332,7 @@ export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@
 export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
 export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
 export LIBLOADER_JAR=@LIBLOADER_JAR@
-export LIBNUMBERTEXT_CXXFLAGS=$(gb_SPACE)@LIBNUMBERTEXT_CXXFLAGS@
+export LIBNUMBERTEXT_CFLAGS=$(gb_SPACE)@LIBNUMBERTEXT_CFLAGS@
 export LIBNUMBERTEXT_LIBS=$(gb_SPACE)@LIBNUMBERTEXT_LIBS@
 export ENABLE_LIBNUMBERTEXT=@ENABLE_LIBNUMBERTEXT@
 export LIBO_BIN_FOLDER=@LIBO_BIN_FOLDER@
@@ -549,6 +549,7 @@ export SYSTEM_LIBEOT=@SYSTEM_LIBEOT@
 export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
 export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
 export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@
+export SYSTEM_LIBNUMBERTEXT=@SYSTEM_LIBNUMBERTEXT@
 export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
 export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
 export SYSTEM_LIBXML=@SYSTEM_LIBXML@
diff --git a/configure.ac b/configure.ac
index eda8f07c0df3..a840bed74350 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9657,6 +9657,7 @@ LIBNUMBERTEXT_CFLAGS="-DENABLE_LIBNUMBERTEXT"
 libo_CHECK_SYSTEM_MODULE([libnumbertext],[LIBNUMBERTEXT],[libnumbertext >= 
1.0.0])
 if test "$with_system_libnumbertext" = "yes"; then
 SYSTEM_LIBNUMBERTEXT_DATA=file://`$PKG_CONFIG --variable=pkgdatadir 
libnumbertext`
+SYSTEM_LIBNUMBERTEXT=YES
 else
 AC_LANG_PUSH([C++])
 save_CXXFLAGS=$CXXFLAGS
@@ -9671,6 +9672,7 @@ else
 CXXFLAGS=$save_CXXFLAGS
 AC_LANG_POP([C++])
 fi
+AC_SUBST(SYSTEM_LIBNUMBERTEXT)
 AC_SUBST(SYSTEM_LIBNUMBERTEXT_DATA)
 AC_SUBST(ENABLE_LIBNUMBERTEXT)
 AC_SUBST(LIBNUMBERTEXT_CFLAGS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

autoconf and libnumbertext dependency

[Chris Sherlock]

Hi all, 

I think f1579d3d6c5f5f3a6 has a problem the new library needs Autoconf 
version 2.68, but this is not what we bundle in LibreOffice. 

I get the following error:

main::scan_file() called too early to check prototype at /opt/lo/bin/aclocal 
line 617.
configure.ac:6: error: Autoconf version 2.68 or higher is required
configure.ac:6: the top level
autom4te: /usr/bin/m4 failed with exit status: 63
aclocal: /opt/lo/bin/autom4te failed with exit status: 63
autoreconf: aclocal failed with exit status: 63
make[1]: *** 
[/Users/5K/lo/core/external/libnumbertext/ExternalProject_libnumbertext.mk:30: 
/Users/5K/lo/core/workdir/ExternalProject/libnumbertext/build] Error 1
make[1]: *** Waiting for unfinished jobs….

I’m running on MacOS High Sierra. 

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/opengl

[Miklos Vajna]

 vcl/opengl/salbmp.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 443b2e6359955b107ba951636b2491b9444d0fee
Author: Miklos Vajna 
Date:   Fri Apr 27 15:39:32 2018 +0200

tdf#116365 vcl opengl: respect max texture size when creating textures

I can't reproduce the crash, but the image in the bugdoc is a large one
(23100 x 1364 pixels) and it was black for me. It's rendered correctly
now.

(cherry picked from commit a3cbd06872b2f9ee9253e5879f590ff1b9eaf365)

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

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 6a032200670e..1ae3e2ae4a01 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -171,6 +171,15 @@ bool OpenGLSalBitmap::Create( const Size& rSize, 
sal_uInt16 nBits, const BitmapP
 mnBits = nBits;
 mnWidth = rSize.Width();
 mnHeight = rSize.Height();
+
+// Limit size to what GL allows, so later glTexImage2D() won't fail.
+GLint nMaxTextureSize;
+glGetIntegerv(GL_MAX_TEXTURE_SIZE, &nMaxTextureSize);
+if (mnWidth > nMaxTextureSize)
+mnWidth = nMaxTextureSize;
+if (mnHeight > nMaxTextureSize)
+mnHeight = nMaxTextureSize;
+
 return false;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sc/source/ui/view/tabview5.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f8f65d88ede1db197c35be7b0db117c321b0d180
Author: Caolán McNamara 
Date:   Thu May 3 15:08:17 2018 +0100

Resolves: tdf#117005 undo/redo skips comment when switching sheets

while insert comment is active

regression from

commit 80509950d35cebaede89fcb52c446a1fd3e45ba3
Author: Caolán McNamara 
Date:   Mon Jul 4 15:31:29 2016 +0100

Resolves: tdf#100761 after insert note, focus cannot return to inputbar

which is a suspected regression from.

commit 11d605cc5a0c221d2423b6e63f502db660d085d2
Date:   Mon Feb 1 18:39:51 2016 +0200

tdf#84843 Stop using PseudoSlots for drawing slots

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

diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index f263f3daaff3..e78b45ced30a 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -372,7 +372,8 @@ void ScTabView::DrawDeselectAll()
 if (pDrawView)
 {
 ScTabViewShell* pViewSh = aViewData.GetViewShell();
-if (pDrawActual && pViewSh->IsDrawTextShell())
+if ( pDrawActual &&
+( pViewSh->IsDrawTextShell() || pDrawActual->GetSlotID() == 
SID_DRAW_NOTEEDIT ) )
 {
 // end text edit (as if escape pressed, in FuDraw)
 aViewData.GetDispatcher().Execute( pDrawActual->GetSlotID(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/bitmap/BitmapMosaicFilter.cxx |   21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit a0b549c0081f37aada8e53addf5e0b5929fb4636
Author: Caolán McNamara 
Date:   Thu May 3 16:11:37 2018 +0100

fix 4 separate new bugs in BitmapMosaicFilter

coverity#1435274 Dereference after null check
coverity#1435276 Resource leak
coverity#1435278 Resource leak
and on success it returned its input, throwing
away the result of its calculation

commit 63a716783a555e91ad3a32f25f20cffc88ca15e4
Author: Chris Sherlock 
Date:   Fri Apr 20 20:39:48 2018 +1000

vcl: ImplMosaic() -> BitmapMosaicFilter

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

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

diff --git a/vcl/source/bitmap/BitmapMosaicFilter.cxx 
b/vcl/source/bitmap/BitmapMosaicFilter.cxx
index f17a25ff2283..496d687ef4e3 100644
--- a/vcl/source/bitmap/BitmapMosaicFilter.cxx
+++ b/vcl/source/bitmap/BitmapMosaicFilter.cxx
@@ -166,20 +166,27 @@ BitmapEx BitmapMosaicFilter::execute(BitmapEx const& 
rBitmapEx)
 
 Bitmap::ReleaseAccess(pReadAcc);
 
-if (bRet)
+if (pNewBmp)
 {
-const MapMode aMap(aBitmap.GetPrefMapMode());
-const Size aPrefSize(aBitmap.GetPrefSize());
+Bitmap::ReleaseAccess(pWriteAcc);
 
-aBitmap = *pNewBmp;
+if (bRet)
+{
+const MapMode aMap(aBitmap.GetPrefMapMode());
+const Size aPrefSize(aBitmap.GetPrefSize());
+
+aBitmap = *pNewBmp;
+
+aBitmap.SetPrefMapMode(aMap);
+aBitmap.SetPrefSize(aPrefSize);
+}
 
-aBitmap.SetPrefMapMode(aMap);
-aBitmap.SetPrefSize(aPrefSize);
+delete pNewBmp;
 }
 }
 
 if (bRet)
-return rBitmapEx;
+return BitmapEx(aBitmap);
 
 return BitmapEx();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/ui/envelp/envfmt.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit aaeb63a9e2dcde768d6fd8d4cc8a9ad13185851b
Author: Caolán McNamara 
Date:   Thu May 3 15:21:02 2018 +0100

coverity#1435272 Uninitialized pointer field

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

diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 4d264417f664..2862d520c57e 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -116,6 +116,7 @@ static long lUserH = 5669; // 10 cm
 
 SwEnvFormatPage::SwEnvFormatPage(TabPageParent pParent, const SfxItemSet& rSet)
 : SfxTabPage(pParent, "modules/swriter/ui/envformatpage.ui", 
"EnvFormatPage", &rSet)
+, m_pDialog(nullptr)
 , m_xAddrLeftField(m_xBuilder->weld_metric_spin_button("leftaddr", 
FUNIT_CM))
 , m_xAddrTopField(m_xBuilder->weld_metric_spin_button("topaddr", FUNIT_CM))
 , m_xAddrEditButton(m_xBuilder->weld_menu_button("addredit"))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit fb85d38546f18a2f6addbe9c8acbafdb3cca989e
Author: Caolán McNamara 
Date:   Thu May 3 15:25:07 2018 +0100

coverity#1435275 Uninitialized scalar field

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

diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx 
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index e241ab6cbb8e..b962d86f9e10 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -34,6 +34,7 @@ SidebarDockingWindow::SidebarDockingWindow(SfxBindings* 
pSfxBindings, SidebarChi
vcl::Window* pParentWindow, WinBits 
nBits)
 : SfxDockingWindow(pSfxBindings, &rChildWindow, pParentWindow, nBits)
 , mpSidebarController()
+, mbIsReadyToDrag(false)
 {
 // Get the XFrame from the bindings.
 if (pSfxBindings==nullptr || pSfxBindings->GetDispatcher()==nullptr)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/gdi/pdfwriter_impl.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a11a21570e357fddef10f436d8b1e9e27e0bc7ce
Author: Caolán McNamara 
Date:   Thu May 3 15:22:09 2018 +0100

coverity#1435279 unused field

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

diff --git a/vcl/source/gdi/pdfwriter_impl.hxx 
b/vcl/source/gdi/pdfwriter_impl.hxx
index cedc12c71805..23da7f6052cc 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -592,7 +592,6 @@ public:
 sal_Int32   m_nMappedFontId;
 sal_uInt8   m_nMappedGlyphId;
 int m_nCharPos;
-int m_nCharCount;
 
 PDFGlyph( const Point& rPos,
   const GlyphItem* pGlyph,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 chart2/source/controller/main/ShapeController.cxx |2 
 cui/source/factory/dlgfact.cxx|   39 +-
 cui/source/factory/dlgfact.hxx|   20 +
 cui/source/inc/textanim.hxx   |   10 --
 cui/source/tabpages/textanim.cxx  |   19 +
 cui/uiconfig/ui/textanimtabpage.ui|   16 ++--
 cui/uiconfig/ui/textattrtabpage.ui|   14 +--
 cui/uiconfig/ui/textdialog.ui |   82 ++
 include/svx/svxdlg.hxx|2 
 sc/source/ui/drawfunc/drawsh.cxx  |3 
 sc/source/ui/drawfunc/drtxtob.cxx |3 
 sd/source/ui/func/futxtatt.cxx|2 
 sw/source/uibase/shells/drawdlg.cxx   |2 
 sw/source/uibase/shells/drwtxtsh.cxx  |2 
 14 files changed, 155 insertions(+), 61 deletions(-)

New commits:
commit 098ba55907b0fec87fe8f62b52a087a4f2f9239e
Author: Caolán McNamara 
Date:   Thu May 3 10:24:52 2018 +0100

weld SvxTextTabDialog

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

diff --git a/chart2/source/controller/main/ShapeController.cxx 
b/chart2/source/controller/main/ShapeController.cxx
index 1ffe80d2786b..1b6a89b94985 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -336,7 +336,7 @@ void ShapeController::executeDispatch_TextAttributes()
 if ( pFact )
 {
 ScopedVclPtr< SfxAbstractTabDialog > pDlg(
-pFact->CreateTextTabDialog( pChartWindow, &aAttr, 
pDrawViewWrapper ) );
+pFact->CreateTextTabDialog( pChartWindow ? 
pChartWindow->GetFrameWeld() : nullptr, &aAttr, pDrawViewWrapper ) );
 if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) )
 {
 const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 85b2d1504c37..a22a64c1f933 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -275,6 +275,38 @@ void CuiAbstractTabDialog_Impl::SetText( const OUString& 
rStr )
 pDlg->SetText( rStr );
 }
 
+short CuiAbstractTabController_Impl::Execute()
+{
+return m_xDlg->execute();
+}
+
+void CuiAbstractTabController_Impl::SetCurPageId( const OString &rName )
+{
+m_xDlg->SetCurPageId( rName );
+}
+
+const SfxItemSet* CuiAbstractTabController_Impl::GetOutputItemSet() const
+{
+return m_xDlg->GetOutputItemSet();
+}
+
+const sal_uInt16* CuiAbstractTabController_Impl::GetInputRanges(const 
SfxItemPool& pItem )
+{
+return m_xDlg->GetInputRanges( pItem );
+}
+
+void CuiAbstractTabController_Impl::SetInputSet( const SfxItemSet* pInSet )
+{
+ m_xDlg->SetInputSet( pInSet );
+}
+
+//From class Window.
+void CuiAbstractTabController_Impl::SetText( const OUString& rStr )
+{
+m_xDlg->set_title(rStr);
+}
+
+
 
 const SfxItemSet* CuiAbstractSfxDialog_Impl::GetOutputItemSet() const
 {
@@ -934,12 +966,11 @@ VclPtr 
AbstractDialogFactory_Impl::CreateCustomizeTabDialo
 }
 
 // TabDialog that use functionality of the drawing layer
-VclPtr AbstractDialogFactory_Impl::CreateTextTabDialog( 
vcl::Window* pParent,
+VclPtr 
AbstractDialogFactory_Impl::CreateTextTabDialog(weld::Window* pParent,
 const SfxItemSet* pAttrSet,
-SdrView* pView )
+SdrView* pView)
 {
-VclPtrInstance pDlg( pParent, pAttrSet, pView );
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new 
SvxTextTabDialog(pParent, pAttrSet, pView));
 }
 
 // TabDialog that use functionality of the drawing layer and add AnchorTypes 
-- for SvxCaptionTabDialog
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 9de13861ee17..b1239c049e00 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -124,6 +124,24 @@ class CuiAbstractTabDialog_Impl : public 
SfxAbstractTabDialog
 virtual voidSetText( const OUString& rStr ) override;
 };
 
+class CuiAbstractTabController_Impl : public SfxAbstractTabDialog
+{
+protected:
+std::unique_ptr m_xDlg;
+public:
+explicit CuiAbstractTabController_Impl(SfxTabDialogController* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
+virtual voidSetCurPageId( const OString &rName ) override;
+virtual const SfxItemSet*   GetOutputItemSet() const override;
+virtual const sal_uInt16*   GetInputRanges( const SfxItemPool& pItem ) 
override;
+virtual voidSetInputSet( const SfxItemSet* pInSet ) 
override;
+//From class Window.
+virtual voi

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

[Caolán McNamara]

 include/svx/dlgctrl.hxx   |1 +
 include/vcl/weld.hxx  |5 +
 svx/source/dialog/dlgctrl.cxx |   13 -
 vcl/source/app/salvtables.cxx |3 +++
 vcl/unx/gtk3/gtk3gtkinst.cxx  |7 +++
 5 files changed, 24 insertions(+), 5 deletions(-)

New commits:
commit 2d45f87330ef7011711767cc736829e4082b236b
Author: Caolán McNamara 
Date:   Wed May 2 21:21:36 2018 +0100

support native focus for drawing sub region

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

diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 075a008fe0c0..1f2a17f9feb7 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -194,6 +194,7 @@ public:
 DECL_LINK(DoGetFocus, weld::Widget&, void);
 DECL_LINK(DoLoseFocus, weld::Widget&, void);
 DECL_LINK(MarkToResetSettings, weld::Widget&, void);
+DECL_LINK(DoFocusRect, weld::Widget&, tools::Rectangle);
 
 voidReset();
 RectPoint   GetActualRP() const { return eRP;}
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 309c1447a80d..9e58e585a533 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -701,6 +701,7 @@ protected:
 Link m_aKeyPressHdl;
 Link m_aKeyReleaseHdl;
 Link m_aStyleUpdatedHdl;
+Link m_aGetFocusRectHdl;
 
 public:
 void connect_draw(const Link& rLink) { m_aDrawHdl = 
rLink; }
@@ -720,6 +721,10 @@ public:
 void connect_key_press(const Link& rLink) { 
m_aKeyPressHdl = rLink; }
 void connect_key_release(const Link& rLink) { 
m_aKeyReleaseHdl = rLink; }
 void connect_style_updated(const Link& rLink) { 
m_aStyleUpdatedHdl = rLink; }
+void connect_focus_rect(const Link& rLink)
+{
+m_aGetFocusRectHdl = rLink;
+}
 virtual void queue_draw() = 0;
 virtual void queue_draw_area(int x, int y, int width, int height) = 0;
 virtual a11yref get_accessible_parent() = 0;
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index a4d31925d242..d091a121023d 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -684,6 +684,7 @@ RectCtl::RectCtl(weld::Builder& rBuilder, const OString& 
rDrawingId, SvxTabPage*
 m_xControl->connect_key_press(LINK(this, RectCtl, DoKeyDown));
 m_xControl->connect_focus_in(LINK(this, RectCtl, DoGetFocus));
 m_xControl->connect_focus_out(LINK(this, RectCtl, DoLoseFocus));
+m_xControl->connect_focus_rect(LINK(this, RectCtl, DoFocusRect));
 
 m_xControl->set_size_request(m_xControl->get_approximate_digit_width() * 
25, m_xControl->get_text_height() * 5);
 Resize_Impl();
@@ -976,12 +977,14 @@ IMPL_LINK(RectCtl, DoPaint, weld::DrawingArea::draw_args, 
aPayload, void)
 rRenderContext.DrawBitmap(aCenterPt, aDstBtnSize, aBtnPnt2, 
aBtnSize, rBitmap.GetBitmap());
 }
 }
+}
 
-if (m_xControl->has_focus())
-{
-tools::Rectangle aFocusRect(CalculateFocusRectangle());
-rRenderContext.Invert(aFocusRect, InvertFlags(0x));
-}
+IMPL_LINK(RectCtl, DoFocusRect, weld::Widget&, rControl, tools::Rectangle)
+{
+tools::Rectangle aRet;
+if (rControl.has_focus())
+aRet = CalculateFocusRectangle();
+return aRet;
 }
 
 // Convert RectPoint Point
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 8af07394c310..818ef8b778b4 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1683,6 +1683,9 @@ public:
 IMPL_LINK(SalInstanceDrawingArea, PaintHdl, target_and_area, aPayload, void)
 {
 m_aDrawHdl.Call(aPayload);
+tools::Rectangle aFocusRect(m_aGetFocusRectHdl.Call(*this));
+if (!aFocusRect.IsEmpty())
+aPayload.first.Invert(aFocusRect, InvertFlags(0x));
 }
 
 IMPL_LINK(SalInstanceDrawingArea, ResizeHdl, const Size&, rSize, void)
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index b33013916a85..ed78e141b124 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3506,6 +3506,13 @@ private:
 
 cairo_set_source_surface(cr, m_pSurface, 0, 0);
 cairo_paint(cr);
+
+tools::Rectangle aFocusRect(m_aGetFocusRectHdl.Call(*this));
+if (!aFocusRect.IsEmpty())
+{
+
gtk_render_focus(gtk_widget_get_style_context(GTK_WIDGET(m_pDrawingArea)), cr,
+ aFocusRect.Left(), aFocusRect.Top(), 
aFocusRect.GetWidth(), aFocusRect.GetHeight());
+}
 }
 static void signalSizeAllocate(GtkWidget*, GdkRectangle* allocation, 
gpointer widget)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source cui/uiconfig include/svx include/vcl svx/source vcl/source vcl/unx

[Caolán McNamara]

 cui/source/inc/backgrnd.hxx |1 
 cui/source/inc/cuitabarea.hxx   |6 
 cui/source/inc/cuitabline.hxx   |1 
 cui/source/inc/dstribut.hxx |1 
 cui/source/inc/measure.hxx  |1 
 cui/source/inc/textattr.hxx |   45 -
 cui/source/inc/transfrm.hxx |3 
 cui/source/tabpages/backgrnd.cxx|7 
 cui/source/tabpages/dstribut.cxx|4 
 cui/source/tabpages/measure.cxx |5 
 cui/source/tabpages/textattr.cxx|  363 +-
 cui/source/tabpages/tparea.cxx  |4 
 cui/source/tabpages/tpbitmap.cxx|4 
 cui/source/tabpages/tphatch.cxx |4 
 cui/source/tabpages/tpline.cxx  |4 
 cui/source/tabpages/tppattern.cxx   |   13 
 cui/source/tabpages/tpshadow.cxx|6 
 cui/source/tabpages/tptrans.cxx |3 
 cui/source/tabpages/transfrm.cxx|   17 
 cui/uiconfig/ui/textattrtabpage.ui  |   77 +-
 include/svx/dlgctrl.hxx |   82 ++
 include/vcl/layout.hxx  |   14 
 include/vcl/weld.hxx|6 
 svx/source/accessibility/charmapacc.cxx |   26 
 svx/source/accessibility/svxrectctaccessiblecontext.cxx |  544 +++-
 svx/source/dialog/dlgctrl.cxx   |  521 +++
 svx/source/inc/charmapacc.hxx   |1 
 svx/source/inc/svxrectctaccessiblecontext.hxx   |  203 +
 vcl/source/app/salvtables.cxx   |   33 
 vcl/unx/gtk/a11y/atkwrapper.cxx |   13 
 vcl/unx/gtk/a11y/atkwrapper.hxx |3 
 vcl/unx/gtk3/gtk3gtkinst.cxx|   30 
 32 files changed, 1778 insertions(+), 267 deletions(-)

New commits:
commit 7e64aaebce8667f7ab173ea3807c62f81138b4af
Author: Caolán McNamara 
Date:   Wed May 2 12:39:43 2018 +0100

weld SvxTextAttrPage

with a a11y rework to be more like the insert special char a11y

also, route a11y questions about a custom widgets parent to the gtk toolkits
underlying default implementation, keeping only questions about ourself to
be handled by the XAccessible

focus rectangles in RectCtl work again, seems that got lost somewhere
along the way

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

diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 8f5a9c96ff2a..a67caba32a2a 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -57,6 +57,7 @@ public:
 virtual voidReset( const SfxItemSet* rSet ) override;
 virtual voidFillUserData() override;
 virtual voidPointChanged( vcl::Window* pWindow, RectPoint eRP ) 
override;
+virtual voidPointChanged( weld::DrawingArea* pWindow, RectPoint 
eRP ) override;
 
 /// Shift-ListBox activation
 voidShowSelector();
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index ce7fea8d96e8..2790b5323888 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -204,6 +204,7 @@ public:
 virtual void ActivatePage(const SfxItemSet& rSet) override;
 virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
 virtual void PointChanged(vcl::Window* pWindow, RectPoint eRP) override;
+virtual void PointChanged(weld::DrawingArea* pWindow, RectPoint eRP) 
override;
 
 void SetPageType(PageType nInType) { nPageType = nInType; }
 void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; }
@@ -271,6 +272,7 @@ public:
 virtual void ActivatePage( const SfxItemSet& rSet ) override;
 virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
+virtual void PointChanged( weld::DrawingArea* pWindow, RectPoint eRP ) 
override;
 
 voidSetColorList( XColorListRef const & pColorList ) { m_pColorList = 
pColorList; }
 voidSetGradientList( XGradientListRef const & pGrdLst)
@@ -332,6 +334,7 @@ public:
 virtual void ActivatePage( const SfxItemSet& rSet ) override;
 virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
+virtual void PointChanged( weld::DrawingArea* pWindow, RectPoint eRP ) 
override;
 
 voidSetColorList( XColo

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

[Stephan Bergmann]

 external/libnumbertext/ExternalProject_libnumbertext.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 55fcb23ea5caa509d8254910c581d234f7ec9199
Author: Stephan Bergmann 
Date:   Thu May 3 15:48:07 2018 +0200

Tunnel verbose=t into external/libnumbertext

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

diff --git a/external/libnumbertext/ExternalProject_libnumbertext.mk 
b/external/libnumbertext/ExternalProject_libnumbertext.mk
index 04b957667ae6..8d473632bee4 100644
--- a/external/libnumbertext/ExternalProject_libnumbertext.mk
+++ b/external/libnumbertext/ExternalProject_libnumbertext.mk
@@ -33,6 +33,7 @@ $(call 
gb_ExternalProject_get_state_target,libnumbertext,build):
LIBS="$(gb_STDLIBS) $(LIBS)" \
autoreconf && \
$(SHELL) ./configure --disable-shared --with-pic \
+   $(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM))\
$(if $(filter 
AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \
$(if 
$(libnumbertext_CPPFLAGS),CPPFLAGS='$(libnumbertext_CPPFLAGS)') \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 configure.ac |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 0d7baf34ea56d27775f417e07dd854ad3d2fc3b1
Author: Stephan Bergmann 
Date:   Thu May 3 14:49:01 2018 +0200

Remove unused --with-help=common

...see mail thread starting at

"Anybody using --with-help=common?".  Instead, make configure fail for 
unknown
--with-help=... arguments.

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

diff --git a/configure.ac b/configure.ac
index 15cd5bb408c7..eda8f07c0df3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1939,8 +1939,6 @@ AC_ARG_WITH(help,
  --without-help no local help (default)
  --with-help=html   build the new HTML local 
help
  --with-help=online build the new HTML online 
help
- --with-help=common bundle common files for 
the local
-help but do not build the 
whole help
 ],
 ,)
 
@@ -4710,9 +4708,6 @@ if test -n "$with_help" -a "$with_help" != "no" -a $_os 
!= iOS -a $_os != Androi
 BUILD_TYPE="$BUILD_TYPE HELP"
 GIT_NEEDED_SUBMODULES="helpcontent2 $GIT_NEEDED_SUBMODULES"
 case "$with_help" in
-"common")
-AC_MSG_RESULT([common only])
-;;
 "html")
 ENABLE_HTMLHELP=TRUE
 SCPDEFS="$SCPDEFS -DWITH_HELP"
@@ -4723,10 +4718,13 @@ if test -n "$with_help" -a "$with_help" != "no" -a $_os 
!= iOS -a $_os != Androi
 HELP_ONLINE=TRUE
 AC_MSG_RESULT([HTML])
 ;;
-*)
+yes)
 SCPDEFS="$SCPDEFS -DWITH_HELP"
 AC_MSG_RESULT([yes])
 ;;
+*)
+AC_MSG_ERROR([Unknown --with-help=$with_help])
+;;
 esac
 else
 AC_MSG_RESULT([no])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sw/qa/extras/rtfexport/data/tdf117268.rtf   |   35 +++
 sw/qa/extras/rtfexport/rtfexport3.cxx   |   36 
 writerfilter/source/rtftok/rtfdispatchvalue.cxx |7 
 3 files changed, 78 insertions(+)

New commits:
commit 247dabcb0b92a62b233ec0237deac84e6675325c
Author: Mike Kaganski 
Date:   Thu May 3 15:09:40 2018 +0300

tdf#117268: treat erroneous \itap0 the same way as Word does

... so that if we are inside a table, it would not convert table
paragraphs into top-level paragraphs. (The in-the-wild documents
with this invalid input are, e.g., generated by Consultant+ legal
reference database).

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

diff --git a/sw/qa/extras/rtfexport/data/tdf117268.rtf 
b/sw/qa/extras/rtfexport/data/tdf117268.rtf
new file mode 100644
index ..608ea65637cc
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf117268.rtf
@@ -0,0 +1,35 @@
+{\rtf1
+{\trowd
+\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clbrdrt\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\cellx2000
+\pard
+Text 1
+\itap0
+\cell
+\row}
+\pard
+\par
+\itap0
+{\trowd
+\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clbrdrt\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\cellx2000
+\pard
+Text 2
+\itap0
+\cell
+\row}
+\itap0
+{\trowd
+\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clbrdrt\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\cellx2000
+\pard
+\itap2
+Text 3
+\nestcell
+\itap2
+{\nesttableprops\trowd
+\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clbrdrt\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\cellx1000
+\nestrow}
+\itap0
+\cell
+\row}
+\itap0
+\par
+}
\ No newline at end of file
diff --git a/sw/qa/extras/rtfexport/rtfexport3.cxx 
b/sw/qa/extras/rtfexport/rtfexport3.cxx
index d07740cc2879..142c7f6c8381 100644
--- a/sw/qa/extras/rtfexport/rtfexport3.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport3.cxx
@@ -109,6 +109,42 @@ DECLARE_RTFEXPORT_TEST(testTdf116841, "tdf116841.rtf")
  getProperty(getParagraph(1), 
"ParaLeftMargin"));
 }
 
+DECLARE_RTFEXPORT_TEST(testTdf117268, "tdf117268.rtf")
+{
+// Here we check that we correctly mimic Word's treatment of erroneous 
\itap0 inside tables.
+// Previously, the first table was import as text, and second top-level 
one only imported
+// last row with nested table (first row was also imported as text).
+uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY_THROW);
+uno::Reference 
xTables(xTablesSupplier->getTextTables(),
+uno::UNO_QUERY_THROW);
+
+// First (simple) table
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getColumns()->getCount());
+uno::Reference xCell(xTable->getCellByName("A1"), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("Text 1"), xCell->getString());
+
+// Nested table
+xTable.set(xTables->getByIndex(1), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getColumns()->getCount());
+xCell.set(xTable->getCellByName("A1"), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("Text 3"), xCell->getString());
+uno::Reference xNestedAnchor(xTable->getAnchor(), 
uno::UNO_QUERY_THROW);
+uno::Reference 
xAnchorCell(xNestedAnchor->getPropertyValue("Cell"),
+ uno::UNO_QUERY_THROW);
+
+// Outer table
+xTable.set(xTables->getByIndex(2), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTable->getRows()->getCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getColumns()->getCount());
+xCell.set(xTable->getCellByName("A1"), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("Text 2"), xCell->getString());
+xCell.set(xTable->getCellByName("A2"), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(xCell, xAnchorCell);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx 
b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index 27f3d9ae9de9..11fe8e6237bd 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -227,6 +227,13 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword 
nKeyword, int nParam)
 {
 case RTF_ITAP:
 nSprm = NS_ooxml::LN_tblDepth;
+// tdf#117268: If \itap0 is encountered inside tables (between 
\cellxN and \cell), then
+// use the default value (1), as Word apparently does
+if (nParam == 0 && (m_nTopLevelCells != 0 || m_nNestedCells != 0))
+{
+nParam = 1;
+pIntValue

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide' - 21 commits - include/o3tl sw/source

[Michael Stahl]

Rebased ref, commits from common ancestor:
commit 4775674ae24ca588d3b2791fbc685157d83e08ae
Author: Michael Stahl 
Date:   Thu May 3 19:01:57 2018 +0200

EnhancedPDFExportHelper.cxx

Change-Id: Id41c8cdd567f3fdf688338a17bc513553a8b2b71

diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx 
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 7d18ac32c423..85b5e787e0b5 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -760,7 +760,7 @@ void SwTaggedPDFHelper::SetAttributes( 
vcl::PDFWriter::StructElement eType )
 if (pPor->GetWhichPor() == POR_SOFTHYPH || pPor->GetWhichPor() == 
POR_HYPH)
 aActualText = OUString(u'\x00ad'); // soft hyphen
 else
-aActualText = rInf.GetText().copy(rInf.GetIdx(), 
pPor->GetLen());
+aActualText = rInf.GetText().copy(rInf.GetIdx(), 
sal_Int32(pPor->GetLen()));
 mpPDFExtOutDevData->SetActualText( aActualText );
 }
 
commit 82eeaf6619067519114b37deef93095100b8f3a4
Author: Michael Stahl 
Date:   Thu May 3 19:01:46 2018 +0200

accpara.cxx

Change-Id: I76a39b81c6770dea1905a0fb20691cd33e8be130

diff --git a/sw/source/core/access/accpara.cxx 
b/sw/source/core/access/accpara.cxx
index 238fcfa62f83..d144127be4f7 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -961,12 +961,10 @@ void SAL_CALL SwAccessibleParagraph::grabFocus()
 if( pCursorSh != nullptr && pTextNd != nullptr &&
 ( pCursor == nullptr ||
pCursor->GetPoint()->nNode.GetIndex() != pTextNd->GetIndex() ||
-  !pTextFrame->IsInside( pCursor->GetPoint()->nContent.GetIndex()) ) )
+  
!pTextFrame->IsInside(pTextFrame->MapModelToViewPos(*pCursor->GetPoint()
 {
 // create pam for selection
-SwIndex aIndex( const_cast< SwTextNode * >( pTextNd ),
-pTextFrame->GetOfst() );
-SwPosition aStartPos( *pTextNd, aIndex );
+SwPosition const 
aStartPos(pTextFrame->MapViewToModelPos(pTextFrame->GetOfst()));
 SwPaM aPaM( aStartPos );
 
 // set PaM at cursor shell
@@ -2966,7 +2964,7 @@ SwHyperlinkIter_Impl::SwHyperlinkIter_Impl( const 
SwTextFrame *pTextFrame ) :
 nPos( 0 )
 {
 const SwTextFrame *pFollFrame = pTextFrame->GetFollow();
-nEnd = pFollFrame ? pFollFrame->GetOfst() : 
pTextFrame->GetTextNode()->Len();
+nEnd = pFollFrame ? pFollFrame->GetOfst() : 
TextFrameIndex(pTextFrame->GetText().getLength());
 }
 
 const SwTextAttr *SwHyperlinkIter_Impl::next()
commit 0261ad58392a23f22c2ac2fb2be6ae7a370041d3
Author: Michael Stahl 
Date:   Thu May 3 19:01:19 2018 +0200

acccontext.cxx

Change-Id: I537d218afbd7d2832461e24fd98cc1d63304e17a

diff --git a/sw/source/core/access/acccontext.cxx 
b/sw/source/core/access/acccontext.cxx
index 628ad727dc47..ba217a027a79 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -956,9 +956,7 @@ void SAL_CALL SwAccessibleContext::grabFocus()
 if( pTextNd )
 {
 // create pam for selection
-SwIndex aIndex( const_cast< SwTextNode * >( pTextNd ),
-pTextFrame->GetOfst() );
-SwPosition aStartPos( *pTextNd, aIndex );
+SwPosition const 
aStartPos(pTextFrame->MapViewToModelPos(pTextFrame->GetOfst()));
 SwPaM aPaM( aStartPos );
 
 // set PaM at cursor shell
commit 83aac19830f309b24afa75457aa0bd735a9e316c
Author: Michael Stahl 
Date:   Thu May 3 18:46:10 2018 +0200

sw: do all trivial conversions in txtftn.cxx

Change-Id: I80a7303d73ff1e5f2d6496add4a31121f3fbfd8e

diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index e5815623dab0..655e10346123 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -97,10 +97,13 @@ void SwTextFrame::CalcFootnoteFlag()
 const size_t nSize = pHints->Count();
 
 #ifdef DBG_UTIL
-const sal_Int32 nEnd = nStop != COMPLETE_STRING ? nStop
-: GetFollow() ? GetFollow()->GetOfst() : 
COMPLETE_STRING;
+const TextFrameIndex nEnd = nStop != TextFrameIndex(COMPLETE_STRING)
+? nStop
+: GetFollow() ? GetFollow()->GetOfst() : 
TextFrameIndex(COMPLETE_STRING);
 #else
-const sal_Int32 nEnd = GetFollow() ? GetFollow()->GetOfst() : 
COMPLETE_STRING;
+const TextFrameIndex nEnd = GetFollow()
+? GetFollow()->GetOfst()
+: TextFrameIndex(COMPLETE_STRING);
 #endif
 
 for ( size_t i = 0; i < nSize; ++i )
@@ -396,9 +399,9 @@ void SwTextFrame::RemoveFootnote(TextFrameIndex const 
nStart, TextFrameIndex con
 if( !pHints )
 return;
 
-bool bRollBack = nLen != COMPLETE_STRING;
+bool bRollBack = nLen != TextFrameIndex(COMPLETE_STRING);
 const size_t nSize = pHints->Count();
-sal_Int32 nEnd;
+ 

[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - vcl/unx

[Katarina Behrens]

 vcl/unx/kde5/KDE5SalData.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 897176bc99730f3389ce44b13c868dab1bcddb33
Author: Katarina Behrens 
Date:   Thu May 3 17:22:08 2018 +0200

Get rid of annoying focus rectangles in start centre

Change-Id: I7ef38b226cd2bab7641638c500341cf7c198026d

diff --git a/vcl/unx/kde5/KDE5SalData.cxx b/vcl/unx/kde5/KDE5SalData.cxx
index f995fa549768..1b0e2071770b 100644
--- a/vcl/unx/kde5/KDE5SalData.cxx
+++ b/vcl/unx/kde5/KDE5SalData.cxx
@@ -45,6 +45,7 @@ void KDE5SalData::initNWF()
 pSVData->maNWFData.mbRolloverMenubar = true;
 
 pSVData->maNWFData.mbNoFocusRects = true;
+pSVData->maNWFData.mbNoFocusRectsForFlatButtons = true;
 
 // Styled menus need additional space
 QStyle *style = QApplication::style();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - vcl/unx

[Katarina Behrens]

 vcl/unx/kde5/KDE5SalGraphics.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 826f2e7d7de87d03dcdb1f0433730bff8ce4f7a8
Author: Katarina Behrens 
Date:   Thu May 3 16:45:57 2018 +0200

Render list headers natively

they have somehow odd colour though

Change-Id: I645581cc594ba3e06c4475957565aadc633b9d20

diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
index 92275052013a..070a18c0f57c 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
@@ -90,6 +90,9 @@ bool KDE5SalGraphics::IsNativeControlSupported( ControlType 
type, ControlPart pa
 case ControlType::Pushbutton:
 return (part == ControlPart::Entire) || (part == 
ControlPart::Focus);
 
+case ControlType::ListHeader:
+return (part == ControlPart::Button);
+
 case ControlType::Menubar:
 case ControlType::MenuPopup:
 case ControlType::Editbox:
@@ -422,6 +425,12 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type, 
ControlPart part,
 draw( QStyle::PE_IndicatorBranch, &option, m_image.get(),
   vclStateValue2StateFlag(nControlState, value) );
 }
+else if (type == ControlType::ListHeader)
+{
+QStyleOptionHeader option;
+draw(QStyle::CE_HeaderSection, &option, m_image.get(),
+  vclStateValue2StateFlag(nControlState, value) );
+}
 else if (type == ControlType::Checkbox)
 {
 if (part == ControlPart::Entire)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

[Michael Meeks]

* Present:
+ Stephan, Michael W, Olivier, Sophie, Michael M, Caolan, Heiko,
  Thorsten, Cloph, Xisco, Miklos, Christian, Lionel, Michael S, Kendy,
  Eike (>16:20)

* Completed Action Items:
+ create & circulate new ESC time poll & CC dev list (Heiko)
  => https://doodle.com/poll/567nszb5tfzfxue4
  [ what is the answer ? - hard to know, Thorsten didn’t fill it out.
Rene has time in the morning / lunchtime (Heiko)
+ no Monday / Friday ? (Michael)
   + typically used by other meetings,travel (Heiko)
  + can run another poll of course.
   + would like to include people who can’t make it (Thorsten)
  + 18:00 Berlin time might be good.
+ just saw the ‘want it later than 4pm’ option (Thorsten)
+ lets re-run – what periods ? (Michael)
   + evening not ideal for East Asia / India (Thorsten)
   + concern with early morning (Olivier, Lionel)
   + 6am or 6pm to avoid work (Michael)
   => propose do a separate evening poll: 
AI:   6pm – 10pm Berlin time Mon→Fri (Thorsten) ]
+ come up with a plan for help / video l10n, translation (Olivier)
+ in discussion with l10n team
[ listening to the l10n discussion – will now interact with them]

* Pending Action Items:
+ Fill out new doodle poll (everyone)
+ run dev-certification script again (Kendy)
+ turn budget ideas into a spreadsheet for ranking (Thorsten)

* Release Engineering update (Christian)
+ 5.4.7 – RC2 status
   + delayed, not tagged yet.
   + patches submitted to -5-4 but not -5-4-7
+ important to get a chance to review those.   
+ 6.0.4 – RC2 status
   + planned for this week
   + all patches are now in.
   + can tag after the ESC call.
+ 6.1.0 alpha1 – Feature Freeze May 24th
+ Remotes
   + iOS built with xcode8 – but wrong ver for iOS 11
   + downloaded xcode9  
+ Online

* Documentation (Olivier)
+ Help contents:
+ help pages for PIVOT CHARTS (ohallot)
+ Improvements on EPUB help (ohallot)
+ fixes, fixes, fixes… (fitoshido, ohallot, Sophia_s, A. 
Gelmini)
+ New Help
+ New help is packageable (sberg)
+ CSS enhancements to prettify (fitoshido)
  + investigating on-line editors
+ no conclusion yet.

+ Proposal for handling multimedia.

Objective of Multimedia:
• Will NOT replace textual description of LO resource or feature.
• Be a rich support for textual contents
• Introduce examples, use cases or tutorials on feature / resource.
• Indirectly: motivate communities to produce contents and contribute.

Issue: 
• Multimedia contents is asked to be localized on release,
  for some languages.

   Concerns:
   • Not every community has resource for localization or
 local contents production to match release deadlines.
   • Localized captions not even accepted in some languages.

   Further information on New Help
   • New help is now build-able and package-able
 (thanks to Stephan Bergman and David Tardon)
   • New Help build distinct when ONLINE or OFFLINE
  ◦ Offline is package-able.
   • OFFLINE help already has no multimedia ( tag is not rendered)
   • ONLINE help has multimedia (master).
 ◦ https://help.libreoffice.org/6.1/en-US/text/scalc/main.html

   Options:
   1. Remove all multimedia from Help either online and offline: 
  1. Problem vanish.
   2. Remove all multimedia from offline Help.
  => Done already
   3. Implement language based multimedia enabler in XSLT / makefile
  1. --without-help-multimedia=fr
  2. if $lang = “fr” then multimedia > /dev/null
   4. Have multimedia enabled and localize 
  1. Change href= to localized contents
  2. set width=”0” and height=”0” if no localized contents.

 + was this built in discussion with l10n team ? (Michael)
 + not presented the options to them (Olivier)
+ would like to have ESC input

 + l10n team are waiting for his proposals (Sophie)
 + can we add – when video scripts are made available.
 + where are these published before embedding ?
 + expect each community to decide if they want it ? (Olivier)

 + a 5th option ? Different flavours of help  with & without ? (Heiko)
 + off-line help has no MM enabled already (Olivier)
+ the on-line site can have this. 

 => discuss this with the l10n teams for a decision.

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
247(247) (topicUI) bugs open, 319(319) (needsUXEval)
+ Updates:
BZ changes   1 week   1 month   3 months   12 months  
 added  4(-3)17(0) 36(-2) 113(1)  
 co

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

[Samuel Mehrbrodt]

 offapi/com/sun/star/document/MacroExecMode.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6441eaaa5fa72946f52579426cc8847a42d94e10
Author: Samuel Mehrbrodt 
Date:   Thu May 3 11:28:19 2018 +0100

Fix typo

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

diff --git a/offapi/com/sun/star/document/MacroExecMode.idl 
b/offapi/com/sun/star/document/MacroExecMode.idl
index 130c921e78af..14bc0b7a7d80 100644
--- a/offapi/com/sun/star/document/MacroExecMode.idl
+++ b/offapi/com/sun/star/document/MacroExecMode.idl
@@ -37,7 +37,7 @@ published constants MacroExecMode
 /** Execute macros from secure list quietly.
 
 
-If a macro is not in the list a conformation for it executing will
+If a macro is not in the list a confirmation for it executing will
 appear.
 
 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: testTdf108947 failure on master

[Stephan van den Akker]

Hi David, Arnaud,

I too get this test failure on openSUSE Leap 42.2 (=old static release),
even after following Arnaud's suggestion of removing and blacklisting
google-roboto-fonts.

BTW: On my openSUSE Tumbleweed systems (=rolling release, so newest stable
versions of everything) blacklisting roboto _did_ work. LO builds there.


2018-05-02 8:15 GMT+02:00 Arnaud Versini :

> Hello,
>
> Did you try to remove google-roboto-fonts package ? I opened a bug about
> this issue on tdf bugzilla
>
> Le mer. 2 mai 2018 à 06:41, David Ostrovsky  a écrit :
>
>>
>> It seems that I need this patch: [1] on most recent master
>> to pass the rtfimport test. All other tests pass. My autogen
>> input file is here: [2]. Build tool chain used:
>>
>> $ gcc --version
>> gcc (SUSE Linux) 7.3.1 20180323 [gcc-7-branch revision 258812]
>>
>> When I open this test document testTdf108947, I'm seeing in
>> fact one single page: [3]. Any clue, what is going on here?
>>
>> [1] http://paste.openstack.org/show/720207
>> [2] http://paste.openstack.org/show/720208
>> [3] https://imgur.com/a/3eQdQDA
>> ___
>> 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 mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Noel Grandin]

 framework/source/services/pathsettings.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 30bb90fc2a9726068db49ddb8c1e818777d5c5b1
Author: Noel Grandin 
Date:   Wed May 2 14:23:11 2018 +0200

loplugin:useuniqueptr in PathSettings

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

diff --git a/framework/source/services/pathsettings.cxx 
b/framework/source/services/pathsettings.cxx
index 82feb855a636..f24d4976c604 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -170,7 +170,7 @@ private:
 /** helper to listen for configuration changes without ownership cycle 
problems */
 css::uno::Reference< css::util::XChangesListener > m_xCfgNewListener;
 
-::cppu::OPropertyArrayHelper* m_pPropHelp;
+std::unique_ptr<::cppu::OPropertyArrayHelper> m_pPropHelp;
 
 public:
 
@@ -468,8 +468,7 @@ void SAL_CALL PathSettings::disposing()
 m_xCfgNew.clear();
 m_xCfgNewListener.clear();
 
-delete m_pPropHelp;
-m_pPropHelp = nullptr;
+m_pPropHelp.reset();
 }
 
 css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& 
_rType )
@@ -1099,8 +1098,7 @@ void PathSettings::impl_rebuildPropertyDescriptor()
 ++i;
 }
 
-delete m_pPropHelp;
-m_pPropHelp = new ::cppu::OPropertyArrayHelper(m_lPropDesc, false); // 
false => not sorted ... must be done inside helper
+m_pPropHelp.reset(new ::cppu::OPropertyArrayHelper(m_lPropDesc, false)); 
// false => not sorted ... must be done inside helper
 
 // <- SAFE
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

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

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

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


** CID 1435279:  Uninitialized members  (UNINIT_CTOR)
/vcl/source/gdi/pdfwriter_impl.hxx: 606 in 
vcl::PDFWriterImpl::PDFGlyph::PDFGlyph(const Point &, const GlyphItem *, int, 
int, unsigned char, int)()



*** CID 1435279:  Uninitialized members  (UNINIT_CTOR)
/vcl/source/gdi/pdfwriter_impl.hxx: 606 in 
vcl::PDFWriterImpl::PDFGlyph::PDFGlyph(const Point &, const GlyphItem *, int, 
int, unsigned char, int)()
600   sal_Int32 nFontId,
601   sal_uInt8 nMappedGlyphId,
602   int nCharPos )
603 : m_aPos( rPos ), m_pGlyph(pGlyph), m_nNativeWidth( 
nNativeWidth ),
604   m_nMappedFontId( nFontId ), m_nMappedGlyphId( nMappedGlyphId 
),
605   m_nCharPos(nCharPos)
>>> CID 1435279:  Uninitialized members  (UNINIT_CTOR)
>>> Non-static class member "m_nCharCount" is not initialized in this 
>>> constructor nor in any functions that it calls.
606 {}
607 };
608 
609 static const sal_Char* getStructureTag( PDFWriter::StructElement );
610 static const sal_Char* getAttributeTag( PDFWriter::StructAttribute 
eAtr );
611 static const sal_Char* getAttributeValueTag( 
PDFWriter::StructAttributeValue eVal );

** CID 1435278:  Resource leaks  (RESOURCE_LEAK)
/vcl/source/bitmap/BitmapMosaicFilter.cxx: 179 in 
BitmapMosaicFilter::execute(const BitmapEx &)()



*** CID 1435278:  Resource leaks  (RESOURCE_LEAK)
/vcl/source/bitmap/BitmapMosaicFilter.cxx: 179 in 
BitmapMosaicFilter::execute(const BitmapEx &)()
173 
174 aBitmap = *pNewBmp;
175 
176 aBitmap.SetPrefMapMode(aMap);
177 aBitmap.SetPrefSize(aPrefSize);
178 }
>>> CID 1435278:  Resource leaks  (RESOURCE_LEAK)
>>> Variable "pWriteAcc" going out of scope leaks the storage it points to.
179 }
180 
181 if (bRet)
182 return rBitmapEx;
183 
184 return BitmapEx();
185 }
186 

** CID 1435277:  Control flow issues  (DEADCODE)
/svl/source/numbers/zforfind.cxx: 1217 in 
ImpSvNumberInputScan::IsAcceptedDatePattern(unsigned short)()



*** CID 1435277:  Control flow issues  (DEADCODE)
/svl/source/numbers/zforfind.cxx: 1217 in 
ImpSvNumberInputScan::IsAcceptedDatePattern(unsigned short)()
1211 xLocaleData.changeLocale( aSaveLocale);
1212 // When concatenating don't care about duplicates, 
combining
1213 // weeding those out reallocs yet another time and 
probably doesn't
1214 // take less time than looping over two additional 
patterns below..
1215 switch (eEDF)
1216 {
>>> CID 1435277:  Control flow issues  (DEADCODE)
>>> Execution cannot reach this statement: "case NF_EVALDATEFORMAT_FORMAT:".
1217 case NF_EVALDATEFORMAT_FORMAT:
1218 assert(!"shouldn't reach here");
1219 break;
1220 case NF_EVALDATEFORMAT_INTL:
1221 sDateAcceptancePatterns = aLocalePatterns;
1222 break;

** CID 1435276:  Resource leaks  (RESOURCE_LEAK)
/vcl/source/bitmap/BitmapMosaicFilter.cxx: 179 in 
BitmapMosaicFilter::execute(const BitmapEx &)()



*** CID 1435276:  Resource leaks  (RESOURCE_LEAK)
/vcl/source/bitmap/BitmapMosaicFilter.cxx: 179 in 
BitmapMosaicFilter::execute(const BitmapEx &)()
173 
174 aBitmap = *pNewBmp;
175 
176 aBitmap.SetPrefMapMode(aMap);
177 aBitmap.SetPrefSize(aPrefSize);
178 }
>>> CID 1435276:  Resource leaks  (RESOURCE_LEAK)
>>> Variable "pNewBmp" going out of scope leaks the storage it points to.
179 }
180 
181 if (bRet)
182 return rBitmapEx;
183 
184 return BitmapEx();
185 }
186 

** CID 1435275:  Uninitialized members  (UNINIT_CTOR)
/sfx2/source/sidebar/SidebarDockingWindow.cxx: 50 in 
sfx2::sidebar::SidebarDockingWindow::SidebarDockingWindow(SfxBindings *, 
sfx2::sidebar::SidebarChildWindow &, vcl::Window *, long)()


___

[Libreoffice-commits] help.git: Module_helpcontent2.mk

[Stephan Bergmann]

 Module_helpcontent2.mk |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 819ea03090a68b250f09df30731f9ad0c0f9e625
Author: Stephan Bergmann 
Date:   Thu May 3 15:22:24 2018 +0200

An AllLangPackage should be an l10n_target

...to avoid "target ... should be a l10n target" warnings from
solenv/gbuild/Module.mk (but apart from that, doesn't seem to make much of a
difference)

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

diff --git a/Module_helpcontent2.mk b/Module_helpcontent2.mk
index 2f199d91d..41311cac9 100644
--- a/Module_helpcontent2.mk
+++ b/Module_helpcontent2.mk
@@ -15,14 +15,19 @@ $(eval $(call gb_Module_add_targets,helpcontent2,\
 ))
 
 ifeq ($(ENABLE_HTMLHELP),TRUE)
+
 $(eval $(call gb_Module_add_targets,helpcontent2,\
-   AllLangPackage_html_lang \
CustomTarget_html \
GeneratedPackage_html_lang_generated \
GeneratedPackage_html_media \
Package_html_dynamic \
Package_html_static \
 ))
+
+$(eval $(call gb_Module_add_l10n_targets,helpcontent2,\
+   AllLangPackage_html_lang \
+))
+
 endif
 
 $(eval $(call gb_Module_add_l10n_targets,helpcontent2,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Stephan Bergmann]

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

New commits:
commit ea33ae5ef0a9d6b03fdef6503066100d0ae12729
Author: Stephan Bergmann 
Date:   Thu May 3 15:22:24 2018 +0200

Updated core
Project: help  819ea03090a68b250f09df30731f9ad0c0f9e625

An AllLangPackage should be an l10n_target

...to avoid "target ... should be a l10n target" warnings from
solenv/gbuild/Module.mk (but apart from that, doesn't seem to make much of a
difference)

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

diff --git a/helpcontent2 b/helpcontent2
index e1bc9445a23c..819ea03090a6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e1bc9445a23c41a19ff529f3ed014eaace091d5e
+Subproject commit 819ea03090a68b250f09df30731f9ad0c0f9e625
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg

[andreas kainz]

 icon-themes/colibre/cmd/32/connector.png   
 |binary
 icon-themes/colibre/cmd/32/connectorline.png   
 |binary
 icon-themes/colibre/cmd/32/connectorlinearrowend.png   
 |binary
 icon-themes/colibre/cmd/32/connectorlinearrows.png 
 |binary
 icon-themes/colibre/cmd/32/connectorlinearrowstart.png 
 |binary
 icon-themes/colibre/cmd/32/connectorlinecircleend.png  
 |binary
 icon-themes/colibre/cmd/32/connectorlinecirclestart.png
 |binary
 icon-themes/colibre/cmd/32/connectorlines.png  
 |binary
 icon-themes/colibre/cmd/32/window3d.png
 |binary
 icon-themes/colibre/cmd/32/wrapcontour.png 
 |binary
 icon-themes/colibre/cmd/32/wrapideal.png   
 |binary
 icon-themes/colibre/cmd/32/wrapleft.png
 |binary
 icon-themes/colibre/cmd/32/wrapoff.png 
 |binary
 icon-themes/colibre/cmd/32/wrapon.png  
 |binary
 icon-themes/colibre/cmd/32/wrapright.png   
 |binary
 icon-themes/colibre/cmd/32/wraptext.png
 |binary
 icon-themes/colibre/cmd/32/wrapthrough.png 
 |binary
 icon-themes/colibre/cmd/32/zoom.png
 |binary
 icon-themes/colibre/cmd/32/zoomin.png  
 |binary
 icon-themes/colibre/cmd/32/zoomnext.png
 |binary
 icon-themes/colibre/cmd/32/zoomoptimal.png 
 |binary
 icon-themes/colibre/cmd/32/zoomout.png 
 |binary
 icon-themes/colibre/cmd/32/zoomprevious.png
 |binary
 icon-themes/colibre_svg/cmd/32/addfield.svg
 |1 +
 icon-themes/colibre_svg/cmd/32/connector.svg   
 |1 +
 icon-themes/colibre_svg/cmd/32/connectorline.svg   
 |1 +
 icon-themes/colibre_svg/cmd/32/connectorlinearrowend.svg   
 |1 +
 icon-themes/colibre_svg/cmd/32/connectorlinearrows.svg 
 |1 +
 icon-themes/colibre_svg/cmd/32/connectorlinearrowstart.svg 
 |1 +
 icon-themes/colibre_svg/cmd/32/connectorlinecircleend.svg  
 |1 +
 icon-themes/colibre_svg/cmd/32/connectorlinecirclestart.svg
 |1 +
 icon-themes/colibre_svg/cmd/32/connectorlines.svg  
 |1 +
 
icon-themes/colibre_svg/cmd/32/fontworkshapetype.fontwork-fade-up-and-right.svg 
|4 +---
 icon-themes/colibre_svg/cmd/32/window3d.svg
 |1 +
 icon-themes/colibre_svg/cmd/32/wrapcontour.svg 
 |1 +
 icon-themes/colibre_svg/cmd/32/wrapideal.svg   
 |1 +
 icon-themes/colibre_svg/cmd/32/wrapleft.svg
 |1 +
 icon-themes/colibre_svg/cmd/32/wrapoff.svg 
 |1 +
 icon-themes/colibre_svg/cmd/32/wrapon.svg  
 |1 +
 icon-themes/colibre_svg/cmd/32/wrapright.svg   
 |1 +
 icon-themes/colibre_svg/cmd/32/wraptext.svg
 |1 +
 icon-themes/colibre_svg/cmd/32/wrapthrough.svg 
 |1 +
 icon-themes/colibre_svg/cmd/32/zoom.svg
 |1 +
 icon-themes/colibre_svg/cmd/32/zoomin.svg  
 |1 +
 icon-themes/colibre_svg/cmd/32/zoomnext.svg
 |1 +
 icon-themes/colibre_svg/cmd/32/zoomoptimal.svg 
 |1 +
 icon-themes/colibre_svg/cmd/32/zoomout.svg 
 |1 +
 icon-themes/colibre_svg/cmd/32/zoomprevious.svg
 |1 +
 48 files changed, 25 insertions(+), 3 deletions(-)

New commits:
commit 8d5796615d1332fe507a7fa16940c4969c2b5762
Author: andreas kainz 
Date:   Thu May 3 09:48:14 2018 +0200

Colibre icons: add 32px icon size support

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

diff --git a/icon-themes/colibre/cmd/32/connector.png 
b/icon-themes/colibre/cmd/32/connector.png
new file mode 100644
index ..0a62d027434c
Binary files /dev/null and b/icon-themes/colibre/cmd/32/connector.png differ
diff --git a/icon-themes/c

Re: Anybody using --with-help=common?

[Stephan Bergmann]

On 20/04/18 10:48, Tomáš Chvátal wrote:
2018-04-20 10:26 GMT+02:00 Stephan Bergmann >:


...as was introduced with

>:

commit b70d4ad13b909265c54a9ff55f07224a14e9feb2
Author: Petr Mladek mailto:pmla...@suse.cz>>
Date:   Wed Aug 28 16:09:39 2013 +0200

     add --with-help=common parameter to the configure option
         It allows to build only the common parts of the help, e.g.
     bundle the helpcontent-related icons.
         It is useful when the build content is built
separately. For example,
     it is used to speed up the build of the main package in
openSUSE
     Build Service.


openSUSE is no longer using it, so from our PoV it can be killed :)


 "Remove unused 
--with-help=common"

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

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

[Noel Grandin]

 include/sfx2/tabdlg.hxx   |1 
 include/svx/svdmark.hxx   |3 +-
 sfx2/source/dialog/tabdlg.cxx |3 --
 svx/source/svdraw/svdmark.cxx |   45 ++
 4 files changed, 17 insertions(+), 35 deletions(-)

New commits:
commit ab17afd9beeb2a2cef3e7b67a6acd2581d78b823
Author: Noel Grandin 
Date:   Wed May 2 10:16:19 2018 +0200

loplugin:useuniqueptr in SdrMarkList

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

diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx
index 071f1ce568cb..4b901f6ab2ad 100644
--- a/include/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -134,7 +135,7 @@ public:
 
 class SVX_DLLPUBLIC SdrMarkList final
 {
-std::vector   maList;
+std::vector>   maList;
 
 OUStringmaMarkName;
 OUStringmaPointName;
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index da4f03051999..00901afc309e 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -119,7 +119,7 @@ SdrMark& SdrMark::operator=(const SdrMark& rMark)
 return *this;
 }
 
-static bool ImpSdrMarkListSorter(SdrMark* const& lhs, SdrMark* const& rhs)
+static bool ImpSdrMarkListSorter(std::unique_ptr const& lhs, 
std::unique_ptr const& rhs)
 {
 SdrObject* pObj1 = lhs->GetMarkedSdrObj();
 SdrObject* pObj2 = rhs->GetMarkedSdrObj();
@@ -161,13 +161,11 @@ void SdrMarkList::ImpForceSort()
 // remove invalid
 if(nCount > 0 )
 {
-for(std::vector::iterator it = maList.begin(); it != 
maList.end(); )
+for(auto it = maList.begin(); it != maList.end(); )
 {
-SdrMark* pCurrent = *it;
-if(pCurrent->GetMarkedSdrObj() == nullptr)
+if(it->get()->GetMarkedSdrObj() == nullptr)
 {
 it = maList.erase( it );
-delete pCurrent;
 }
 else
 ++it;
@@ -182,11 +180,11 @@ void SdrMarkList::ImpForceSort()
 // remove duplicates
 if(maList.size() > 1)
 {
-SdrMark* pCurrent = maList.back();
+SdrMark* pCurrent = maList.back().get();
 for (size_t count = maList.size() - 1; count; --count)
 {
 size_t i = count - 1;
-SdrMark* pCmp = maList[i];
+SdrMark* pCmp = maList[i].get();
 assert(pCurrent->GetMarkedSdrObj());
 if(pCurrent->GetMarkedSdrObj() == pCmp->GetMarkedSdrObj())
 {
@@ -199,8 +197,6 @@ void SdrMarkList::ImpForceSort()
 
 // delete pCmp
 maList.erase(maList.begin() + i);
-
-delete pCmp;
 }
 else
 {
@@ -214,10 +210,6 @@ void SdrMarkList::ImpForceSort()
 
 void SdrMarkList::Clear()
 {
-for (auto const& elem : maList)
-{
-delete elem;
-}
 maList.clear();
 mbSorted = true; //we're empty, so can be considered sorted
 SetNameDirty();
@@ -230,8 +222,7 @@ SdrMarkList& SdrMarkList::operator=(const SdrMarkList& rLst)
 for(size_t i = 0; i < rLst.GetMarkCount(); ++i)
 {
 SdrMark* pMark = rLst.GetMark(i);
-SdrMark* pNewMark = new SdrMark(*pMark);
-maList.push_back(pNewMark);
+maList.emplace_back(new SdrMark(*pMark));
 }
 
 maMarkName = rLst.maMarkName;
@@ -245,7 +236,7 @@ SdrMarkList& SdrMarkList::operator=(const SdrMarkList& rLst)
 
 SdrMark* SdrMarkList::GetMark(size_t nNum) const
 {
-return (nNum < maList.size()) ? maList[nNum] : nullptr;
+return (nNum < maList.size()) ? maList[nNum].get() : nullptr;
 }
 
 size_t SdrMarkList::FindObject(const SdrObject* pObj) const
@@ -283,7 +274,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, bool 
bChkSort)
 if(!bChkSort)
 mbSorted = false;
 
-maList.push_back(new SdrMark(rMark));
+maList.emplace_back(new SdrMark(rMark));
 }
 else
 {
@@ -303,8 +294,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, bool 
bChkSort)
 }
 else
 {
-SdrMark* pCopy = new SdrMark(rMark);
-maList.push_back(pCopy);
+maList.emplace_back(new SdrMark(rMark));
 
 // now check if the sort is ok
 const SdrObjList* pLastOL = pLastObj!=nullptr ? 
pLastObj->getParentOfSdrObject() : nullptr;
@@ -338,7 +328,6 @@ void SdrMarkList::DeleteMark(size_t nNum)
 if(pMark)
 {
 maList.erase(maList.begin() + nNum);
-del

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

[Winfried Donkers]

 sc/qa/unit/data/functions/statistical/fods/hypgeomdist.fods |  145 
 sc/source/core/tool/interpr3.cxx|2 
 2 files changed, 146 insertions(+), 1 deletion(-)

New commits:
commit 5cee94308b8dbceb11de4ac02e1d7c9808ccdb02
Author: Winfried Donkers 
Date:   Wed May 2 15:51:48 2018 +0200

tdf#117041 use correct expression in if statement.

Follow up of commit e58b3f987681d0034f692db82345af06de217836.

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

diff --git a/sc/qa/unit/data/functions/statistical/fods/hypgeomdist.fods 
b/sc/qa/unit/data/functions/statistical/fods/hypgeomdist.fods
index 86e67be89a36..4b57e0150907 100644
--- a/sc/qa/unit/data/functions/statistical/fods/hypgeomdist.fods
+++ b/sc/qa/unit/data/functions/statistical/fods/hypgeomdist.fods
@@ -4469,6 +4469,151 @@
  
 
 
+
+  1
+ 
+ 
+  1
+ 
+ 
+  TRUE
+ 
+ 
+  =HYPGEOMDIST(2,4,1,10,1)
+ 
+ 
+  tdf117041
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+
+
+  0
+ 
+ 
+  0
+ 
+ 
+  TRUE
+ 
+ 
+  =HYPGEOMDIST(2,4,1,10,1)
+ 
+ 
+  tdf117041
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+
+
+  0.4
+ 
+ 
+  0.4
+ 
+ 
+  TRUE
+ 
+ 
+  =HYPGEOMDIST(1,4,1,10,0)
+ 
+ 
+  tdf117041
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+
+
+  0
+ 
+ 
+  0
+ 
+ 
+  TRUE
+ 
+ 
+  =HYPGEOMDIST(1,4,4,6,0)
+ 
+ 
+  tdf117041
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+
+
+  0.4
+ 
+ 
+  0.4
+ 
+ 
+  TRUE
+ 
+ 
+  =HYPGEOMDIST(2,4,4,6,0)
+ 
+ 
+  tdf117041
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+
  
  
  
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 2a9535e31c8d..b52a62fd3d20 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -1868,7 +1868,7 @@ void ScInterpreter::ScHypGeomDist( int nMinParamCount )
 
 for ( int i = ( bCumulative ? 0 : x ); i <= x && nGlobalError == 
FormulaError::NONE; i++ )
 {
-if ( (i >= n - N + M)  || (i >= M) )
+if ( (n - i <= N - M) && (i <= M) )
 fVal +=  GetHypGeomDist( i, n, M, N );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 lingucomponent/source/numbertext/numbertext.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e56702c41bc84a4ddeaad23a59b66aee6bd35a6c
Author: Stephan Bergmann 
Date:   Thu May 3 13:27:21 2018 +0200

loplugin:staticaccess

Change-Id: Ic62cdd1fd2ba2fe0ecda49505cf7047457d33b87

diff --git a/lingucomponent/source/numbertext/numbertext.cxx 
b/lingucomponent/source/numbertext/numbertext.cxx
index e86278d851f4..237aaa46ba01 100644
--- a/lingucomponent/source/numbertext/numbertext.cxx
+++ b/lingucomponent/source/numbertext/numbertext.cxx
@@ -143,10 +143,10 @@ OUString SAL_CALL NumberText_Impl::getNumberText(const 
OUString& rText, const Lo
 aCode += "-" + aCountry;
 OString aLangCode(OUStringToOString(aCode, RTL_TEXTENCODING_ASCII_US));
 OString aInput(OUStringToOString(rText, RTL_TEXTENCODING_UTF8));
-std::wstring aResult = m_aNumberText.string2wstring(aInput.getStr());
+std::wstring aResult = Numbertext::string2wstring(aInput.getStr());
 bool result = m_aNumberText.numbertext(aResult, aLangCode.getStr());
 DBG_ASSERT(result, "numbertext: false");
-OString aResult2(m_aNumberText.wstring2string(aResult).c_str());
+OString aResult2(Numbertext::wstring2string(aResult).c_str());
 return OUString::fromUtf8(aResult2);
 #else
 return rText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng include/svx offapi/com offapi/type_reference svx/source sw/inc sw/source

[Tomaž Vajngerl]

 include/editeng/unoprnms.hxx   |1 
 include/svx/unoshprp.hxx   |3 +
 offapi/com/sun/star/drawing/GraphicObjectShape.idl |   21 ---
 offapi/com/sun/star/style/NumberingLevel.idl   |   17 +++--
 offapi/com/sun/star/text/TextGraphicObject.idl |   15 ++--
 offapi/type_reference/offapi.idl   |5 +-
 svx/source/unodraw/unoshap2.cxx|   22 
 sw/inc/cmdid.h |2 -
 sw/source/core/unocore/unoframe.cxx|   37 -
 sw/source/core/unocore/unomap1.cxx |1 
 10 files changed, 99 insertions(+), 25 deletions(-)

New commits:
commit 2bf4d69e0bfa98d641939e62945a7f8915441297
Author: Tomaž Vajngerl 
Date:   Thu Apr 26 19:28:35 2018 +0900

[API CHANGE] revert and deprecate GraphicURL, modify Graphic prop.

Revert the state of GraphicURL property so it supports setting a
external URL, but getting throws and exception.

Modify the Graphic property, so it reflects what was used with
GraphicURL before.

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

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index d90be0f6b45d..8ac52ede237f 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -165,6 +165,7 @@
 #define UNO_NAME_GRAPHOBJ_GRAFSTREAMURL "GraphicStreamURL"
 #define UNO_NAME_GRAPHOBJ_URLPKGPREFIX  "vnd.sun.star.Package:"
 #define UNO_NAME_GRAPHOBJ_GRAPHIC   "Graphic"
+#define UNO_NAME_GRAPHOBJ_GRAPHIC_URL   "GraphicURL"
 #define UNO_NAME_GRAPHOBJ_IS_SIGNATURELINE  "IsSignatureLine"
 #define UNO_NAME_GRAPHOBJ_SIGNATURELINE_ID  "SignatureLineId"
 #define UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_NAME 
"SignatureLineSuggestedSignerName"
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 1794f1d9d96d..6341c37f3dc6 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -98,7 +98,7 @@
 #define OWN_ATTR_LDNAME (OWN_ATTR_VALUE_START+30)
 #define OWN_ATTR_LDBITMAP   (OWN_ATTR_VALUE_START+31)
 #define OWN_ATTR_OLESIZE(OWN_ATTR_VALUE_START+32)
-//#define free  (OWN_ATTR_VALUE_START+33)
+#define OWN_ATTR_GRAPHIC_URL(OWN_ATTR_VALUE_START+33)
 #define OWN_ATTR_OLEMODEL   (OWN_ATTR_VALUE_START+34)
 #define OWN_ATTR_MIRRORED   (OWN_ATTR_VALUE_START+35)
 #define OWN_ATTR_CLSID  (OWN_ATTR_VALUE_START+36)
@@ -431,6 +431,7 @@
 { OUString(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL),OWN_ATTR_GRAFSTREAMURL 
 , ::cppu::UnoType::get(), 
css::beans::PropertyAttribute::MAYBEVOID, 0 }, \
 { OUString(UNO_NAME_GRAPHOBJ_FILLBITMAP),   
OWN_ATTR_VALUE_FILLBITMAP   , cppu::UnoType::get()  ,0,  
   0},\
 { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC),  OWN_ATTR_VALUE_GRAPHIC 
 , cppu::UnoType::get()  ,   0, 0}, \
+{ OUString(UNO_NAME_GRAPHOBJ_GRAPHIC_URL),  OWN_ATTR_GRAPHIC_URL   
 , cppu::UnoType::get(), 0, 0 }, \
 { OUString(UNO_NAME_GRAPHOBJ_IS_SIGNATURELINE), 
OWN_ATTR_IS_SIGNATURELINE   , cppu::UnoType::get(), 0, 0}, \
 { OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_ID), 
OWN_ATTR_SIGNATURELINE_ID   , cppu::UnoType::get(), 0, 0}, \
 { OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_NAME), 
OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_NAME, cppu::UnoType::get(), 
0, 0}, \
diff --git a/offapi/com/sun/star/drawing/GraphicObjectShape.idl 
b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
index 522d0019bd48..7ca7706b3f2c 100644
--- a/offapi/com/sun/star/drawing/GraphicObjectShape.idl
+++ b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
@@ -50,15 +50,28 @@ published service GraphicObjectShape
 service com::sun::star::drawing::RotationDescriptor;
 
 /** This is an url to the source bitmap for this graphic shape.
+
+@deprecated as of LibreOffice 6.1 - use Graphic instead
+
+Note the new behaviour since it was deprecated:
+This property can only be set and only external URLs are
+supported (no more vnd.sun.star.GraphicObject scheme). When a
+URL is set, then it will load the image and set the Graphic
+property.
 */
 [property] string GraphicURL;
 
+/** This is the graphic that represents this graphic shape
+*/
+[property] com::sun::star::graphic::XGraphic Graphic;
+
 /** This is an url to the stream ("in document" or linked graphic) for 
this graphic shape.
 */
 [property] string GraphicStreamURL;
 
-/** Deprecated. Use graphic property instead!
-This is the bitmap that represents this graphic shape.
+/**

[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - vcl/inc vcl/unx

[Katarina Behrens]

 vcl/inc/qt5/Qt5Tools.hxx |1 +
 vcl/unx/kde5/KDE5SalGraphics.cxx |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit dbcd55464c80237431a255c95f85f576bd419ad0
Author: Katarina Behrens 
Date:   Thu May 3 12:03:12 2018 +0200

Use QImage format with premultiplied alpha

as that's what cairo (almost) silently expects

Change-Id: If1ad6f28fcc6fb7ddc2ac4fcec0a31bad512cb2a

diff --git a/vcl/inc/qt5/Qt5Tools.hxx b/vcl/inc/qt5/Qt5Tools.hxx
index c7b47014beb0..d632a5ed8ce5 100644
--- a/vcl/inc/qt5/Qt5Tools.hxx
+++ b/vcl/inc/qt5/Qt5Tools.hxx
@@ -91,6 +91,7 @@ inline sal_uInt16 getFormatBits(QImage::Format eFormat)
 case QImage::Format_RGB888:
 return 24;
 case Qt5_DefaultFormat32:
+case QImage::Format_ARGB32_Premultiplied:
 return 32;
 default:
 std::abort();
diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
index 13b791943199..92275052013a 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
@@ -180,7 +180,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type, 
ControlPart part,
 //if no image, or resized, make a new image
 if (!m_image || m_image->size() != widgetRect.size())
 {
-m_image.reset(new QImage( widgetRect.width(), widgetRect.height(), 
QImage::Format_ARGB32 ) );
+m_image.reset(new QImage( widgetRect.width(), widgetRect.height(), 
QImage::Format_ARGB32_Premultiplied ) );
 }
 
 // Default image color - just once
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac download.lst external/libnumbertext external/Module_external.mk i18npool/inc i18npool/source include/editeng include/unotools lingucompon

[László Németh]

 Makefile.fetch|1 
 Repository.mk |1 
 RepositoryExternal.mk |   53 ++
 config_host.mk.in |3 
 configure.ac  |   26 +
 download.lst  |2 
 external/Module_external.mk   |1 
 external/libnumbertext/ExternalPackage_numbertext.mk  |   54 ++
 external/libnumbertext/ExternalProject_libnumbertext.mk   |   43 ++
 external/libnumbertext/Makefile   |7 
 external/libnumbertext/Module_libnumbertext.mk|   32 +
 external/libnumbertext/README |3 
 external/libnumbertext/StaticLibrary_libnumbertext.mk |   22 +
 external/libnumbertext/UnpackedTarball_libnumbertext.mk   |   16 
 i18npool/inc/defaultnumberingprovider.hxx |2 
 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |   47 ++
 include/editeng/svxenum.hxx   |5 
 include/unotools/pathoptions.hxx  |2 
 lingucomponent/Library_numbertext.mk  |   34 +
 lingucomponent/Module_lingucomponent.mk   |1 
 lingucomponent/source/numbertext/numbertext.component |   25 +
 lingucomponent/source/numbertext/numbertext.cxx   |  207 
++
 offapi/UnoApi_offapi.mk   |2 
 offapi/com/sun/star/linguistic2/NumberText.idl|   46 ++
 offapi/com/sun/star/linguistic2/XNumberText.idl   |  123 
+
 offapi/com/sun/star/style/NumberingType.idl   |   23 +
 officecfg/Configuration_officecfg.mk  |2 
 officecfg/registry/data/org/openoffice/Office/Paths.xcu   |6 
 postprocess/CustomTarget_registry.mk  |6 
 postprocess/Rdb_services.mk   |1 
 scp2/source/ooo/directory_ooo.scp |5 
 svx/inc/numberingtype.hrc |3 
 sw/inc/numrule.hxx|4 
 sw/qa/extras/odfexport/data/spellout-numberingtypes.odt   |binary
 sw/qa/extras/odfexport/odfexport.cxx  |   26 +
 sw/source/core/doc/number.cxx |7 
 sw/source/core/txtnode/ndtxt.cxx  |4 
 unotools/source/config/pathoptions.cxx|8 
 38 files changed, 848 insertions(+), 5 deletions(-)

New commits:
commit f1579d3d6c5f5f3a651825e035b93bee7a4f43c6
Author: László Németh 
Date:   Tue Feb 20 11:38:24 2018 +0100

tdf#117171 support localized number name numbering styles

in page number, chapter and outline numbering
in ~30 languages by integrating libnumbertext library.

- offapi: add linguistic2::NumberText

New NumberingType constants:

- ordinal indicators (1st, 2nd, 3rd...)

- cardinal number names (One, Two, Three...)

- ordinal number names  (First, Second, Third...)

Note: these numberings are parts of OOXML, too.

Plain text files of Libnumbertext's language data
are installed in share/numbertext (similar to
share/fingerprint), allowing further customization.

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

diff --git a/Makefile.fetch b/Makefile.fetch
index 94f697ea9270..fce291d2c3ac 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -157,6 +157,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,LIBGPGERROR,LIBGPGERROR_TARBALL) \
$(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \
$(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \
+   $(call fetch_Optional,LIBNUMBERTEXT,LIBNUMBERTEXT_TARBALL) \
$(call fetch_Optional,LIBPNG,LIBPNG_TARBALL) \
$(call fetch_Optional,LIBTOMMATH,LIBTOMMATH_TARBALL) \
$(call fetch_Optional,LIBXML2,LIBXML_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index e4a11d3d160f..fa62def2fc91 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -404,6 +404,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(call gb_Helper_optional,

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

[Stephan Bergmann]

 include/svl/zforlist.hxx|4 
 svl/source/numbers/zforfind.cxx |  164 +++-
 svl/source/numbers/zforfind.hxx |   19 ++--
 3 files changed, 76 insertions(+), 111 deletions(-)

New commits:
commit f5a56c367fba1c42b4f9719b10ff3e86ad5e2ab1
Author: Stephan Bergmann 
Date:   Thu May 3 09:07:15 2018 +0200

Revert "Resolves: tdf#116579 consider both work locale and format locale 
date patterns"

This reverts commit dfb9138b8b5a239b46f189a717999bcaff19aa79, which caused
CppunitTest_basic_macros to fail with

> macro result for weekday.vb
> macro returned:
> Test Results
> 
>
>  Failed:  : the return WeekDay is: 1
>  Failed:  : the return WeekDay is: 3
>  Failed:  : the return WeekDay is: 7
>  Failed:  : the return WeekDay is: 2
>  Failed:  : the return WeekDay is: 6
> Tests passed: 1
> Tests failed: 5

etc.

diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 14aaf6a40940..536d6bdf1645 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -882,10 +882,6 @@ public:
 /** Access for unit tests. */
 size_t GetMaxDefaultColors() const;
 
-struct InputScannerPrivateAccess { friend class ImpSvNumberInputScan; 
private: InputScannerPrivateAccess() {} };
-/** Access for input scanner to temporarily (!) switch locales. */
-OnDemandLocaleDataWrapper& GetOnDemandLocaleDataWrapper( const 
InputScannerPrivateAccess& ) { return xLocaleData; }
-
 private:
 mutable ::osl::Mutex m_aMutex;
 css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index e55786ea9d17..85b27797d204 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -30,7 +30,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include "zforscan.hxx"
@@ -99,7 +98,6 @@ ImpSvNumberInputScan::~ImpSvNumberInputScan()
 
 void ImpSvNumberInputScan::Reset()
 {
-mpFormat = nullptr;
 nMonth   = 0;
 nMonthPos= 0;
 nDayOfWeek   = 0;
@@ -704,13 +702,14 @@ int ImpSvNumberInputScan::GetDayOfWeek( const OUString& 
rString, sal_Int32& nPos
  * '$'   => true
  * else => false
  */
-bool ImpSvNumberInputScan::GetCurrency( const OUString& rString, sal_Int32& 
nPos )
+bool ImpSvNumberInputScan::GetCurrency( const OUString& rString, sal_Int32& 
nPos,
+const SvNumberformat* pFormat )
 {
 if ( rString.getLength() > nPos )
 {
 if ( !aUpperCurrSymbol.getLength() )
 {   // if no format specified the currency of the initialized formatter
-LanguageType eLang = (mpFormat ? mpFormat->GetLanguage() : 
pFormatter->GetLanguage());
+LanguageType eLang = (pFormat ? pFormat->GetLanguage() : 
pFormatter->GetLanguage());
 aUpperCurrSymbol = pFormatter->GetCharClass()->uppercase(
 SvNumberFormatter::GetCurrencyEntry( eLang ).GetSymbol() );
 }
@@ -719,10 +718,10 @@ bool ImpSvNumberInputScan::GetCurrency( const OUString& 
rString, sal_Int32& nPos
 nPos = nPos + aUpperCurrSymbol.getLength();
 return true;
 }
-if ( mpFormat )
+if ( pFormat )
 {
 OUString aSymbol, aExtension;
-if ( mpFormat->GetNewCurrencySymbol( aSymbol, aExtension ) )
+if ( pFormat->GetNewCurrencySymbol( aSymbol, aExtension ) )
 {
 if ( aSymbol.getLength() <= rString.getLength() - nPos )
 {
@@ -1101,18 +1100,18 @@ bool ImpSvNumberInputScan::CanForceToIso8601( DateOrder 
eDateOrder )
 }
 
 
-bool ImpSvNumberInputScan::IsAcceptableIso8601()
+bool ImpSvNumberInputScan::IsAcceptableIso8601( const SvNumberformat* pFormat )
 {
-if (mpFormat && (mpFormat->GetType() & SvNumFormatType::DATE))
+if (pFormat && (pFormat->GetType() & SvNumFormatType::DATE))
 {
 switch (pFormatter->GetEvalDateFormat())
 {
 case NF_EVALDATEFORMAT_INTL:
 return CanForceToIso8601( GetDateOrder());
 case NF_EVALDATEFORMAT_FORMAT:
-return CanForceToIso8601( mpFormat->GetDateOrder());
+return CanForceToIso8601( pFormat->GetDateOrder());
 default:
-return CanForceToIso8601( GetDateOrder()) || 
CanForceToIso8601( mpFormat->GetDateOrder());
+return CanForceToIso8601( GetDateOrder()) || 
CanForceToIso8601( pFormat->GetDateOrder());
 }
 }
 return CanForceToIso8601( GetDateOrder());
@@ -1192,46 +1191,7 @@ bool ImpSvNumberInputScan::IsAcceptedDatePattern( 
sal_uInt16 nStartPatternAt )
 }
 else if (!sDateAcceptancePatterns.getLength())
 {
-// The current locale is the format's locale, if a format is present.
-const NfEvalDateFormat eEDF = pFormatter->GetEvalDateFormat();
-if (!mpFormat || eE