Re: make fails on MacOS 10.13.4 with c++11 related issues

[Noel Grandin]

have a look at the config.log to get a more detailed look at the error,
sometimes it's some kind of config issue​
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: compilerplugins/clang include/tools solenv/CompilerTest_compilerplugins_clang.mk tools/source xmloff/source

[Noel Grandin]

 compilerplugins/clang/sallogareas.cxx|  107 +++
 compilerplugins/clang/test/sallogareas.cxx   |   58 ++
 include/tools/diagnose_ex.h  |   24 --
 solenv/CompilerTest_compilerplugins_clang.mk |1 
 tools/source/debug/debug.cxx |7 +
 xmloff/source/draw/shapeexport.cxx   |6 -
 xmloff/source/draw/ximpshap.cxx  |   30 +++
 7 files changed, 161 insertions(+), 72 deletions(-)

New commits:
commit e075ee967d0c030a22b7699ee54b5cbd49c07c17
Author: Noel Grandin 
Date:   Thu Mar 29 13:49:19 2018 +0200

give DBG_UNHANDLED_EXCEPTION_WHEN an area parameter

and rename it to DBG_UNHANDLED_EXCEPTION, to make it more like
the SAL_WARN-type macros.

Use some macro magic to deal with different numbers of arguments.

Update the sallogareas plugin to check the area parameter of
DBG_UNHANDLED_EXCEPTION.

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

diff --git a/compilerplugins/clang/sallogareas.cxx 
b/compilerplugins/clang/sallogareas.cxx
index 98cafb596fd5..1095302d9ada 100644
--- a/compilerplugins/clang/sallogareas.cxx
+++ b/compilerplugins/clang/sallogareas.cxx
@@ -49,54 +49,73 @@ bool SalLogAreas::VisitCallExpr( const CallExpr* call )
 {
 if( ignoreLocation( call ))
 return true;
-if( const FunctionDecl* func = call->getDirectCallee())
+const FunctionDecl* func = call->getDirectCallee();
+if( !func )
+return true;
+
+if( !( func->getNumParams() == 5 && func->getIdentifier() != NULL
+  && ( func->getName() == "sal_detail_log" || func->getName() == "log" 
|| func->getName() == "DbgUnhandledException")) )
+return true;
+
+auto tc = loplugin::DeclCheck(func);
+enum class LogCallKind { Sal, DbgUnhandledException};
+LogCallKind kind;
+int areaArgIndex;
+if( tc.Function("sal_detail_log") || 
tc.Function("log").Namespace("detail").Namespace("sal").GlobalNamespace() )
+{
+kind = LogCallKind::Sal; // fine
+areaArgIndex = 1;
+}
+else if( tc.Function("DbgUnhandledException").GlobalNamespace() )
+{
+kind = LogCallKind::DbgUnhandledException; // ok
+areaArgIndex = 3;
+}
+else
+return true;
+
+// The SAL_DETAIL_LOG_STREAM macro expands to two calls to 
sal::detail::log(),
+// so do not warn repeatedly about the same macro (the area->getLocStart() 
of all the calls
+// from the same macro should be the same).
+if( kind == LogCallKind::Sal )
+{
+SourceLocation expansionLocation = 
compiler.getSourceManager().getExpansionLoc( call->getLocStart());
+if( expansionLocation == lastSalDetailLogStreamMacro )
+return true;
+lastSalDetailLogStreamMacro = expansionLocation;
+};
+if( const clang::StringLiteral* area = dyn_cast< clang::StringLiteral >( 
call->getArg( areaArgIndex )->IgnoreParenImpCasts()))
 {
-if( func->getNumParams() == 5 && func->getIdentifier() != NULL
-&& ( func->getName() == "sal_detail_log" || func->getName() == 
"log" ))
+if( area->getKind() == clang::StringLiteral::Ascii )
+checkArea( area->getBytes(), area->getExprLoc());
+else
+report( DiagnosticsEngine::Warning, "unsupported string literal 
kind (plugin needs fixing?)",
+area->getLocStart());
+return true;
+}
+if( kind == LogCallKind::DbgUnhandledException ) // below checks don't 
apply
+return true;
+if( 
loplugin::DeclCheck(inFunction).Function("log").Namespace("detail").Namespace("sal").GlobalNamespace()
+|| 
loplugin::DeclCheck(inFunction).Function("sal_detail_logFormat").GlobalNamespace()
 )
+return true; // These functions only forward to sal_detail_log, so ok.
+if( call->getArg( areaArgIndex )->isNullPointerConstant( 
compiler.getASTContext(),
+Expr::NPC_ValueDependentIsNotNull ) != Expr::NPCK_NotNull )
+{ // If the area argument is a null pointer, that is allowed only for 
SAL_DEBUG.
+const SourceManager& source = compiler.getSourceManager();
+for( SourceLocation loc = call->getLocStart();
+ loc.isMacroID();
+ loc = source.getImmediateExpansionRange( loc ).first )
 {
-auto tc = loplugin::DeclCheck(func);
-if( tc.Function("sal_detail_log") || 
tc.Function("log").Namespace("detail").Namespace("sal").GlobalNamespace() )
-{
-// The SAL_DETAIL_LOG_STREAM macro expands to two calls to 
sal::detail::log(),
-// so do not warn repeatedly about the same macro (the 
area->getLocStart() of all the calls
-// from the same macro should be the same).
-SourceLocation expansionLocation =

Re: Build aborting

[Noel Grandin]

Since Cloph says the build is being killed by the jenkins timeout, I'm
guessing that somehow the change has introduced an infinite loop somewhere?​
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Aron Budea]

 cui/source/options/optinet2.cxx |   54 
 cui/source/options/optinet2.hxx |2 -
 2 files changed, 34 insertions(+), 22 deletions(-)

New commits:
commit 5092305fa80f1900d7229df75a30204ecb53daf0
Author: Aron Budea 
Date:   Sun Apr 1 00:28:57 2018 +0200

Respect read-only config items in Internet/Proxy dialog

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

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 1a03dba47d9c..16d62d4acaa5 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -20,6 +20,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -417,7 +418,7 @@ void SvxProxyTabPage::Reset(const SfxItemSet*)
 m_pFtpPortED->SaveValue();
 m_pNoProxyForED->SaveValue();
 
-EnableControls_Impl( m_pProxyModeLB->GetSelectedEntryPos() == 2 );
+EnableControls_Impl();
 }
 
 bool SvxProxyTabPage::FillItemSet(SfxItemSet* )
@@ -504,26 +505,37 @@ bool SvxProxyTabPage::FillItemSet(SfxItemSet* )
 return bModified;
 }
 
-void SvxProxyTabPage::EnableControls_Impl(bool bEnable)
+void SvxProxyTabPage::EnableControls_Impl()
 {
-m_pHttpProxyFT->Enable(bEnable);
-m_pHttpProxyED->Enable(bEnable);
-m_pHttpPortFT->Enable(bEnable);
-m_pHttpPortED->Enable(bEnable);
-
-m_pHttpsProxyFT->Enable(bEnable);
-m_pHttpsProxyED->Enable(bEnable);
-m_pHttpsPortFT->Enable(bEnable);
-m_pHttpsPortED->Enable(bEnable);
-
-m_pFtpProxyFT->Enable(bEnable);
-m_pFtpProxyED->Enable(bEnable);
-m_pFtpPortFT->Enable(bEnable);
-m_pFtpPortED->Enable(bEnable);
-
-m_pNoProxyForFT->Enable(bEnable);
-m_pNoProxyForED->Enable(bEnable);
-m_pNoProxyDescFT->Enable(bEnable);
+
m_pProxyModeLB->Enable(!officecfg::Inet::Settings::ooInetNoProxy::isReadOnly());
+
+const bool bManualConfig = m_pProxyModeLB->GetSelectedEntryPos() == 2;
+
+const bool bHTTPProxyNameEnabled = bManualConfig && 
!officecfg::Inet::Settings::ooInetHTTPProxyName::isReadOnly();
+const bool bHTTPProxyPortEnabled = bManualConfig && 
!officecfg::Inet::Settings::ooInetHTTPProxyPort::isReadOnly();
+m_pHttpProxyFT->Enable(bHTTPProxyNameEnabled);
+m_pHttpProxyED->Enable(bHTTPProxyNameEnabled);
+m_pHttpPortFT->Enable(bHTTPProxyPortEnabled);
+m_pHttpPortED->Enable(bHTTPProxyPortEnabled);
+
+const bool bHTTPSProxyNameEnabled = bManualConfig && 
!officecfg::Inet::Settings::ooInetHTTPSProxyName::isReadOnly();
+const bool bHTTPSProxyPortEnabled = bManualConfig && 
!officecfg::Inet::Settings::ooInetHTTPSProxyPort::isReadOnly();
+m_pHttpsProxyFT->Enable(bHTTPSProxyNameEnabled);
+m_pHttpsProxyED->Enable(bHTTPSProxyNameEnabled);
+m_pHttpsPortFT->Enable(bHTTPSProxyPortEnabled);
+m_pHttpsPortED->Enable(bHTTPSProxyPortEnabled);
+
+const bool bFTPProxyNameEnabled = bManualConfig && 
!officecfg::Inet::Settings::ooInetFTPProxyName::isReadOnly();
+const bool bFTPProxyPortEnabled = bManualConfig && 
!officecfg::Inet::Settings::ooInetFTPProxyPort::isReadOnly();
+m_pFtpProxyFT->Enable(bFTPProxyNameEnabled);
+m_pFtpProxyED->Enable(bFTPProxyNameEnabled);
+m_pFtpPortFT->Enable(bFTPProxyPortEnabled);
+m_pFtpPortED->Enable(bFTPProxyPortEnabled);
+
+const bool bInetNoProxyEnabled = bManualConfig && 
!officecfg::Inet::Settings::ooInetNoProxy::isReadOnly();
+m_pNoProxyForFT->Enable(bInetNoProxyEnabled);
+m_pNoProxyForED->Enable(bInetNoProxyEnabled);
+m_pNoProxyDescFT->Enable(bInetNoProxyEnabled);
 }
 
 
@@ -537,7 +549,7 @@ IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox&, rBox, 
void )
 ReadConfigDefaults_Impl();
 }
 
-EnableControls_Impl(nPos == 2);
+EnableControls_Impl();
 }
 
 
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index cd402a4513bd..b0d8f7884dc8 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -81,7 +81,7 @@ private:
 
 css::uno::Reference< css::uno::XInterface > m_xConfigurationUpdateAccess;
 
-void EnableControls_Impl(bool bEnable);
+void EnableControls_Impl();
 void ReadConfigData_Impl();
 void ReadConfigDefaults_Impl();
 void RestoreConfigDefaults_Impl();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 source/text/scalc/guide/formulas.xhp   |2 +-
 source/text/shared/guide/redlining.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 03f934e2c836af98bb8d7722b4a4ecec9c741910
Author: Andrea Gelmini 
Date:   Sun Apr 1 17:54:36 2018 +0200

Removed comments

Change-Id: I5917f9c4b49a06937f5d7ab5ecf1551953dc7875
Reviewed-on: https://gerrit.libreoffice.org/52229
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/source/text/scalc/guide/formulas.xhp 
b/source/text/scalc/guide/formulas.xhp
index ee71644ac..acc8ae6b0 100644
--- a/source/text/scalc/guide/formulas.xhp
+++ b/source/text/scalc/guide/formulas.xhp
@@ -32,7 +32,7 @@
 formulas;calculating with
 calculating; with formulas
 examples;formula calculation
-mw changed "formulas;..." entry and addes "examples;..." 
entryCalculating With Formulas
+Calculating With Formulas
 
 All formulas 
begin with an equals sign. The formulas can contain numbers, text, arithmetic 
operators, logic operators, or functions.
 Remember that the 
basic arithmetic operators (+, -, *, /) can be used in formulas using the 
"Multiplication and Division before Addition and Subtraction" rule. Instead of 
writing =SUM(A1:B1) you can write =A1+B1.
diff --git a/source/text/shared/guide/redlining.xhp 
b/source/text/shared/guide/redlining.xhp
index 5427a0f2f..1878c3454 100644
--- a/source/text/shared/guide/redlining.xhp
+++ b/source/text/shared/guide/redlining.xhp
@@ -32,7 +32,7 @@
   changes; review function
   review function; recording changes 
example
   Track Changes, see review function
-MW addes a cross-referenceMW added 
"highlighting changes"
+
 Recording and Displaying Changes
 
   The review 
function is available in %PRODUCTNAME for text documents and spreadsheet 
documents.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Andrea Gelmini]

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

New commits:
commit 3939e10c515364cb9ef0a089d3db667aed0aa5ea
Author: Andrea Gelmini 
Date:   Sun Apr 1 17:54:36 2018 +0200

Updated core
Project: help  03f934e2c836af98bb8d7722b4a4ecec9c741910

Removed comments

Change-Id: I5917f9c4b49a06937f5d7ab5ecf1551953dc7875
Reviewed-on: https://gerrit.libreoffice.org/52229
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 29f6ad0004e6..03f934e2c836 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 29f6ad0004e6f49481ae32c577b394ec709b43f0
+Subproject commit 03f934e2c836af98bb8d7722b4a4ecec9c741910
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz]

 icon-themes/colibre/links.txt |   69 --
 1 file changed, 67 insertions(+), 2 deletions(-)

New commits:
commit b8dbb7332c617731bcab8e67ca9f2a16cf39ff5b
Author: andreas kainz 
Date:   Sun Apr 1 22:41:20 2018 +0200

Colibre icons: update links.txt file

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

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 77acaac4de9e..b259a5d5757e 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -999,6 +999,72 @@ res/lc10715.png cmd/lc_datafilterstandardfilter.png
 res/lc10716.png cmd/lc_datafilterautofilter.png
 res/lc10853.png cmd/lc_recsearch.png
 
+res/lx03127.png res/lx03126.png
+res/lx03130.png res/lx03123.png
+res/lx03137.png res/lx03125.png
+res/lx03140.png res/lx03125.png
+res/lx03145.png res/lx03144.png
+res/lx03152.png res/lx03125.png
+res/lx03153.png res/lx03125.png
+res/lx03154.png res/lx03125.png
+res/lx03155.png res/lx03125.png
+res/lx03158.png res/lx03125.png
+res/lx03160.png res/lx03125.png
+res/lx03219.png res/lx03125.png
+res/lx03162.png res/lx03156.png
+res/lx03163.png res/lx03156.png
+res/lx03188.png res/lx03126.png
+res/lx03218.png res/lx03217.png
+res/lx03220.png res/lx03217.png
+res/lx03221.png res/lx03217.png
+res/lx03222.png res/lx03217.png
+res/lx03227.png res/lx03217.png
+res/lx03228.png res/lx03217.png
+
+res/sx03127.png res/sx03126.png
+res/sx03130.png res/sx03123.png
+res/sx03137.png res/sx03125.png
+res/sx03140.png res/sx03125.png
+res/sx03145.png res/sx03144.png
+res/sx03152.png res/sx03125.png
+res/sx03153.png res/sx03125.png
+res/sx03154.png res/sx03125.png
+res/sx03155.png res/sx03125.png
+res/sx03158.png res/sx03125.png
+res/sx03160.png res/sx03125.png
+res/sx03219.png res/sx03125.png
+res/sx03162.png res/sx03156.png
+res/sx03163.png res/sx03156.png
+res/sx03188.png res/sx03126.png
+res/sx03218.png res/sx03217.png
+res/sx03220.png res/sx03217.png
+res/sx03221.png res/sx03217.png
+res/sx03222.png res/sx03217.png
+res/sx03227.png res/sx03217.png
+res/sx03228.png res/sx03217.png
+
+res/harddisk_16.png cmd/sc_open.png
+res/lx03164.png cmd/lc_open.png
+res/lx03167.png cmd/lc_openremote.png
+res/newdoc.png cmd/lc_open.png
+res/oleobj.png cmd/lc_insertobject.png
+res/lx03256.png cmd/lc_insertplugin.png
+res/plugin.png cmd/lc_insertplugin.png
+res/sx10144.png cmd/sc_checkbox.png
+res/sx10593.png cmd/sc_switchxformsdesignmode.png
+res/sx10597.png cmd/sc_color.png
+res/sx10598.png cmd/sc_group.png
+
+res/sc05500.png cmd/sc_adddirect.png
+res/sc05678.png cmd/sc_inserthyperlink.png
+res/sc10851.png cmd/sc_inserthyperlink.png
+res/sx03164.png cmd/sc_open.png
+res/sx03187.png cmd/sc_inserttable.png
+res/sx03201.png cmd/sc_copy.png
+res/sx03202.png cmd/sc_copy.png
+res/sx03256.png cmd/sc_insertplugin.png
+
+
 res/lx03165.png cmd/lc_save.png
 res/lx03189.png cmd/lc_open.png
 res/sc05501.png cmd/sc_open.png
@@ -1009,8 +1075,7 @@ res/mainapp_16.png cmd/sc_showsinglepage.png
 res/mainapp_16.png cmd/sc_showsinglepage.png
 res/mainapp_16_8.png cmd/sc_showsinglepage.png
 
-res/mainapp.png res/newdoc.png
-res/mainapp_32.png res/newdoc.png
+res/mainapp_32.png res/mainapp_32_8.png
 res/printeradmin_16_8.png res/printeradmin_16.png
 res/printeradmin_32_8.png res/printeradmin_32.png
 res/reload.png cmd/sc_reload.png
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz]

 icon-themes/colibre/cmd/32/save.png  |binary
 icon-themes/colibre/res/grafikde.png |binary
 icon-themes/colibre/res/grafikei.png |binary
 icon-themes/colibre/res/lx03123.png  |binary
 icon-themes/colibre/res/lx03125.png  |binary
 icon-themes/colibre/res/lx03126.png  |binary
 icon-themes/colibre/res/lx03129.png  |binary
 icon-themes/colibre/res/lx03144.png  |binary
 icon-themes/colibre/res/lx03150.png  |binary
 icon-themes/colibre/res/lx03156.png  |binary
 icon-themes/colibre/res/lx03217.png  |binary
 icon-themes/colibre/res/lx03226.png  |binary
 icon-themes/colibre/res/savemodified_extralarge.png  |binary
 icon-themes/colibre/res/sx03123.png  |binary
 icon-themes/colibre/res/sx03125.png  |binary
 icon-themes/colibre/res/sx03126.png  |binary
 icon-themes/colibre/res/sx03129.png  |binary
 icon-themes/colibre/res/sx03144.png  |binary
 icon-themes/colibre/res/sx03150.png  |binary
 icon-themes/colibre/res/sx03156.png  |binary
 icon-themes/colibre/res/sx03217.png  |binary
 icon-themes/colibre/res/sx03226.png  |binary
 icon-themes/colibre/res/tb01.png |binary
 icon-themes/colibre/res/tb02.png |binary
 icon-themes/colibre/res/tb03.png |binary
 icon-themes/colibre/res/tb04.png |binary
 icon-themes/colibre/res/tb05.png |binary
 icon-themes/colibre_svg/cmd/32/save.svg  |1 +
 icon-themes/colibre_svg/res/grafikde.svg |1 +
 icon-themes/colibre_svg/res/grafikei.svg |1 +
 icon-themes/colibre_svg/res/lx03123.svg  |1 +
 icon-themes/colibre_svg/res/lx03125.svg  |1 +
 icon-themes/colibre_svg/res/lx03126.svg  |1 +
 icon-themes/colibre_svg/res/lx03129.svg  |1 +
 icon-themes/colibre_svg/res/lx03144.svg  |1 +
 icon-themes/colibre_svg/res/lx03150.svg  |1 +
 icon-themes/colibre_svg/res/lx03156.svg  |1 +
 icon-themes/colibre_svg/res/lx03217.svg  |1 +
 icon-themes/colibre_svg/res/lx03226.svg  |1 +
 icon-themes/colibre_svg/res/savemodified_extralarge.svg  |1 +
 icon-themes/colibre_svg/res/sx03123.svg  |1 +
 icon-themes/colibre_svg/res/sx03125.svg  |1 +
 icon-themes/colibre_svg/res/sx03126.svg  |1 +
 icon-themes/colibre_svg/res/sx03129.svg  |1 +
 icon-themes/colibre_svg/res/sx03144.svg  |1 +
 icon-themes/colibre_svg/res/sx03150.svg  |1 +
 icon-themes/colibre_svg/res/sx03156.svg  |1 +
 icon-themes/colibre_svg/res/sx03217.svg  |1 +
 icon-themes/colibre_svg/res/sx03226.svg  |1 +
 icon-themes/colibre_svg/res/tb01.svg |5 
+
 icon-themes/colibre_svg/res/tb02.svg |5 
+
 icon-themes/colibre_svg/res/tb03.svg |5 
+
 icon-themes/colibre_svg/res/tb04.svg |6 
++
 icon-themes/colibre_svg/res/tb05.svg |6 
++
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 +++
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |3 +++
 56 files changed, 55 insertions(+)

New commits:
commit b543039da340d92d8f762119d378fa1fa97a54e3
Author: andreas kainz 
Date:   Sun Apr 1 22:36:39 2018 +0200

Colibre icons: update res folder

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

diff --git a/icon-themes/colibre/cmd/32/save.png 
b/icon-themes/colibre/cmd/32/save.png
new file mode 100644
index ..3b53a06d8253
Binary files /dev/null and b/icon-themes/colibre/cmd/32/sav

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

[Adolfo Jayme Barrientos]

 cui/uiconfig/ui/optappearancepage.ui |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit cb5a55adbb67d9515f0048d1b2b595c04f2e2736
Author: Adolfo Jayme Barrientos 
Date:   Sun Apr 1 22:06:58 2018 -0500

Make color scheme dropdown in Options span the window’s width

It was minuscule before.
Props to Andreas for reporting the issue.

Change-Id: If8ecbe39321c56018e2366147481dcefab4326dc

diff --git a/cui/uiconfig/ui/optappearancepage.ui 
b/cui/uiconfig/ui/optappearancepage.ui
index bc44f72eea60..60f3b90344de 100644
--- a/cui/uiconfig/ui/optappearancepage.ui
+++ b/cui/uiconfig/ui/optappearancepage.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -71,6 +71,7 @@
   
 True
 False
+True
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

make fails on MacOS 10.13.4 with c++11 related issues

[Ch g]

Hello Tietze,

I update Macbook to latest 10.13.4 and also xcode tools.

I unset CCACHE_CPP2, removed gcc installed from brew.

still get make error saying:

...
checking whether C++11 use of const_iterator in standard containers is 
broken... yes
checking whether /Users/almas/lode/opt/bin/ccache 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
 -m64  -stdlib=libc++ -mmacosx-version-min=10.9 -isysroot 
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk
 has broken static initializer_list support... yes
configure: error: working support for static initializer_list needed
Error running configure at /Users/almas/lode/dev/core/autogen.sh line 289.
Makefile:55: recipe for target '/Users/almas/lode/dev/core/config_host.mk' 
failed
make: *** [/Users/almas/lode/dev/core/config_host.mk] Error 2
#EOF


Regarding your reply:To purge all modifications do "git fetch --all && git 
reset --hard origin/master".


will "git reset --hard origin/master" undo changes already made in custom 
branches?

I was cherry-picking from branch A to branch B, 3 week ago.

After the first cherry-pick, I "make && make install" successfully in branch B.

But make failed with errors on locally unmodified files, I thought updating the 
local master branch will help resolve those issues.

So I did "./g pull -r" mistakenly on then-current branch B, which got error 
because of unstaged modification that are cherry-picks.

Then, I switched to branch master, and did "./g pull -r", after update, I still 
get  "C++11 use of const_iterator in standard containers is broken" and similar 
errors.


gcc -v:
Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr 
--with-gxx-include-dir=/usr/include/c++/4.2.1
Apple LLVM version 9.1.0 (clang-902.0.39.1)
Target: x86_64-apple-darwin17.5.0
Thread model: posix
InstalledDir: 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin

make -v
GNU Make 4.1
Built for x86_64-apple-darwin17.3.0
Copyright (C) 1988-2014 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later 
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.

Will I better off "reset hard", then "make && make install", and only after 
make succeeded, start over(do from the beginning?) cherry-pick?


From: Heiko Tietze 
Sent: Thursday, March 29, 2018 10:33 PM
To: Ch g; libreoffice@lists.freedesktop.org
Subject: Re: autogen.sh fails on MacOS 10.13.3

To purge all modifications do "git fetch --all && git reset --hard 
origin/master". There are no reasons AFAIK to rerun autogen.sh.

On 29.03.2018 12:12, Ch g wrote:
> Hello all, I first built LO official source successfully with "build-nocheck" 
> option in this January, and could start that built
>
> app. But last week, I cherry-picked 3 commits from a forked repo which 
> enabled vertical Mongolian editing, then make failed with errors occurred in 
> unedited files. So, I thought maybe "./g pull r" could resolve those issues, 
> but not.
>
>
> My settings are following:
>
>
>
> autogen.input:
>
> --enable-dbgutil
> --enable-symbols
> --disable-cve-tests
> #EOF
>
>
> last few lines of
>
> ./autogen.sh:
>
> checking for Google Drive client id and secret... set
> checking for Alfresco Cloud client id and secret... set
> checking for OneDrive client id and secret... set
> checking whether to enable dependency tracking... yes
> checking for number of processors to use... 4
> checking whether C++11 use of const_iterator in standard containers is 
> broken... yes
> checking whether /Users/almas/lode/opt/bin/ccache 
> /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
>  -m64  -stdlib=libc++ -mmacosx-version-min=10.9 -isysroot 
> /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk
>  has broken static initializer_list support... yes
> configure: error: working support for static initializer_list needed
> Error running configure at ./autogen.sh line 293.
> #EOF
>
>
> CFLAGS, CXXFLAGS and CPPFLAGS are unset.
>
>
> which g++: /usr/local/opt/ccache/libexec/g++
>
>
> gcc 7.3 was installed via homebrew and
>
> cd /usr/local/Cellar/gcc/7.3.0_1/bin && ln -s gcc-7 gcc && ln -s g++-7 g++
>
> g++ --version
> g++ (Homebrew GCC 7.3.0_1) 7.3.0
>
> gcc --version
> gcc (Homebrew GCC 7.3.0_1) 7.3.0
>
> I'm stuck now, I have many more commits for vertical Mongolian editing to 
> cherry-pick to continue my work.
>
> I hope anyone could give solutions to me.
>
> Thank you.
>
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>

--
Dr. Heiko Tietze
UX designer
Tel. +49 (0)179/1268509

_

Re: Build aborting

[Chris Sherlock]

Sure, but I’m build this on a Linux system here and mine completes successfully.

Not sure why this is occurring!

Sent from my iPhone

> On 2 Apr 2018, at 7:52 am, Markus Mohrhard  
> wrote:
> 
> Hey,
> 
>> On Sun, Apr 1, 2018 at 11:44 PM, Chris Sherlock  
>> wrote:
>> Hi all, 
>> 
>> Does anyone know why the following patch’s build is aborting?
>> 
>> https://gerrit.libreoffice.org/#/c/51808/9
>> 
>> 
> 
> 
> "Build timed out (after 45 minutes). Marking the build as aborted." (see 
> https://ci.libreoffice.org/job/gerrit_linux_clang_dbgutil/2493/console and 
> https://ci.libreoffice.org/job/gerrit_linux_gcc_release/2443/console)
> 
> Regards,
> Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source

[Jens Carl]

 include/test/sheet/xactivationbroadcaster.hxx|   36 
 qadevOOo/Jar_OOoRunner.mk|1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv |2 
 qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java   |   97 ---
 sc/qa/extras/sctabviewobj.cxx|   34 +++
 test/Library_subsequenttest.mk   |1 
 test/source/sheet/xactivationbroadcaster.cxx |   69 +++
 7 files changed, 134 insertions(+), 106 deletions(-)

New commits:
commit 34568738bbaf1e82dbb53fdf516f4d57416bb5b0
Author: Jens Carl 
Date:   Sun Apr 1 07:20:34 2018 +

tdf#45904 Move _XActivationBroadcaster Java tests to C++

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

diff --git a/include/test/sheet/xactivationbroadcaster.hxx 
b/include/test/sheet/xactivationbroadcaster.hxx
new file mode 100644
index ..5dc21edc0195
--- /dev/null
+++ b/include/test/sheet/xactivationbroadcaster.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XACTIVATIONBROADCASTER_HXX
+#define INCLUDED_TEST_SHEET_XACTIVATIONBROADCASTER_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XActivationBroadcaster
+{
+public:
+virtual css::uno::Reference init() = 0;
+virtual css::uno::Reference getXSpreadsheet(const 
sal_Int16 nNumber = 0)
+= 0;
+
+void testAddRemoveActivationEventListener();
+
+protected:
+~XActivationBroadcaster() {}
+};
+} // namespace apitest
+
+#endif // INCLUDED_TEST_SHEET_XACTIVATIONBROADCASTER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index bf742f150711..ca3665894180 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -566,7 +566,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor \
 qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocument \
 qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \
-qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster \
 qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange \
 qadevOOo/tests/java/ifc/sheet/_XCellRangeData \
 qadevOOo/tests/java/ifc/sheet/_XCellRangeFormula \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
index e13c05bfda4e..35e1186c0e10 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
@@ -15,8 +15,6 @@
 "ScTabViewObj";"com::sun::star::sheet::XCellRangeReferrer";"getReferredCells()"
 "ScTabViewObj";"com::sun::star::container::XElementAccess";"getElementType()"
 "ScTabViewObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScTabViewObj";"com::sun::star::sheet::XActivationBroadcaster#optional";"addActivationEventListener()"
-"ScTabViewObj";"com::sun::star::sheet::XActivationBroadcaster#optional";"removeActivationEventListener()"
 "ScTabViewObj";"com::sun::star::sheet::XRangeSelection";"startRangeSelection()"
 "ScTabViewObj";"com::sun::star::sheet::XRangeSelection";"abortRangeSelection()"
 
"ScTabViewObj";"com::sun::star::sheet::XRangeSelection";"addRangeSelectionListener()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java 
b/qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java
deleted file mode 100644
index 5d2d15dc6628..
--- a/qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package ifc.sheet;

Re: Build aborting

[Markus Mohrhard]

Hey,

On Sun, Apr 1, 2018 at 11:44 PM, Chris Sherlock 
wrote:

> Hi all,
>
> Does anyone know why the following patch’s build is aborting?
>
> https://gerrit.libreoffice.org/#/c/51808/9
>
>
>
"Build timed out (after 45 minutes). Marking the build as aborted." (see
https://ci.libreoffice.org/job/gerrit_linux_clang_dbgutil/2493/console and
https://ci.libreoffice.org/job/gerrit_linux_gcc_release/2443/console)

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

Build aborting

[Chris Sherlock]

Hi all, 

Does anyone know why the following patch’s build is aborting?

https://gerrit.libreoffice.org/#/c/51808/9 


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

[Libreoffice-commits] core.git: chart2/source connectivity/source dbaccess/source forms/qa fpicker/source i18npool/source scaddins/source sfx2/qa svx/source sw/source

[dennisroczek]

 chart2/source/tools/ThreeDHelper.cxx |8 ++---
 connectivity/source/parse/sqlnode.cxx|2 -
 dbaccess/source/core/dataaccess/documentevents.cxx   |4 +-
 dbaccess/source/ui/app/AppController.cxx |2 -
 dbaccess/source/ui/querydesign/QueryDesignView.cxx   |2 -
 forms/qa/integration/forms/MasterDetailForms.java|2 -
 fpicker/source/aqua/SalAquaFilePicker.mm |2 -
 i18npool/source/inputchecker/inputsequencechecker_th.cxx |2 -
 scaddins/source/analysis/bessel.cxx  |4 +-
 sfx2/qa/complex/sfx2/UndoManager.java|2 -
 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx |   18 ++--
 svx/source/unodraw/unoshape.cxx  |2 -
 sw/source/filter/inc/msfilter.hxx|2 -
 sw/source/filter/ww8/README-rtf.txt  |   22 +++
 sw/source/filter/ww8/fields.hxx  |2 -
 15 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 783bc62734534b3f01339c9922ff354adec05165
Author: dennisroczek 
Date:   Sun Apr 1 14:32:19 2018 +0100

fix some openoffice bugzilla links

* remove redirects
* use https links
* replace old attchment links with working ones

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

diff --git a/chart2/source/tools/ThreeDHelper.cxx 
b/chart2/source/tools/ThreeDHelper.cxx
index facec9710c8e..764598c66de3 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -408,8 +408,8 @@ void ThreeDHelper::convertElevationRotationDegToXYZAngleRad(
 double& rfXAngleRad, double& rfYAngleRad, double& rfZAngleRad)
 {
 // for a description of the algorithm see issue 72994
-//http://www.openoffice.org/issues/show_bug.cgi?id=72994
-
//http://www.openoffice.org/nonav/issues/showattachment.cgi/50608/DescriptionCorrected.odt
+//https://bz.apache.org/ooo/show_bug.cgi?id=72994
+//https://bz.apache.org/ooo/attachment.cgi?id=50608
 
 lcl_shiftAngleToIntervalZeroTo360( nElevationDeg );
 lcl_shiftAngleToIntervalZeroTo360( nRotationDeg );
@@ -590,8 +590,8 @@ void ThreeDHelper::convertXYZAngleRadToElevationRotationDeg(
 double fXRad, double fYRad, double fZRad)
 {
 // for a description of the algorithm see issue 72994
-//http://www.openoffice.org/issues/show_bug.cgi?id=72994
-
//http://www.openoffice.org/nonav/issues/showattachment.cgi/50608/DescriptionCorrected.odt
+//https://bz.apache.org/ooo/show_bug.cgi?id=72994
+//https://bz.apache.org/ooo/attachment.cgi?id=50608
 
 double R = 0.0; //Rotation in Rad
 double E = 0.0; //Elevation in Rad
diff --git a/connectivity/source/parse/sqlnode.cxx 
b/connectivity/source/parse/sqlnode.cxx
index cdd78496ad6c..e5349c7feded 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -725,7 +725,7 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( 
OUStringBuffer& rString, c
 const OSQLParseNode* pParaNode = nullptr;
 
 SQLParseNodeParameter aNewParam(rParam);
-//aNewParam.bQuote = sal_True; // why setting this to true? @see 
http://www.openoffice.org/issues/show_bug.cgi?id=75557
+//aNewParam.bQuote = sal_True; // why setting this to true? @see 
https://bz.apache.org/ooo/show_bug.cgi?id=75557
 
 if ( !(bSimple && rParam.bPredicate && rParam.xField.is() && 
SQL_ISRULE(m_aChildren[0],column_ref) && columnMatchP(m_aChildren[0].get(), 
rParam)) )
 m_aChildren[0]->impl_parseNodeToString_throw( rString, aNewParam, 
bSimple );
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx 
b/dbaccess/source/core/dataaccess/documentevents.cxx
index 2c1a161a5f4c..95c6c42634bd 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -72,8 +72,8 @@ namespace dbaccess
 static const DocumentEventData s_aData[] = {
 { "OnCreate",   true  },
 { "OnLoadFinished", true  },
-{ "OnNew",  false },// compatibility, see 
http://www.openoffice.org/issues/show_bug.cgi?id=46484
-{ "OnLoad", false },// compatibility, see 
http://www.openoffice.org/issues/show_bug.cgi?id=46484
+{ "OnNew",  false },// compatibility, see 
https://bz.apache.org/ooo/show_bug.cgi?id=46484
+{ "OnLoad", false },// compatibility, see 
https://bz.apache.org/ooo/show_bug.cgi?id=46484
 { "OnSaveAs",   true  },
 { "OnSaveAsDone",   false },
 { "OnSaveAsFailed", false },
diff --git a/dbaccess/source/ui/app/AppController.

Re: "Microsoft Excel Is Going Beyond Text and Numbers"

[toki]

On 04/01/2018 01:57 PM, the User BL wrote:

> To be compatibe to actual and future version of Excel this news could be 
> interesting for you:

More formulas for those who think such things are indicators of how
good/bad a spreadsheet program is.

> USDinYEN(), EURinUSD(), CADtoUSD() or GBPtoEUR()

There was an extension for OOo that pulled exchange rates, and stock
prices from Yahoo. It worked until Yahoo decided to upgrade it, by
reducing functionality, capability, and overall usability of their
financial portal.

A recently released extension appears to offer the same functionality
--- I haven't played with it yet.

In terms of matching the exact functions, it would, in theory, be
possible to modify this recently released extension for each specific
conversion.

Anybody up for USDinXBT, XAUtoUSD extensions?

I can't tell from the article description whether or not LibO currently
has an extension that offers similar functionality. There are a couple
of extension that might do so, but are currently limited to Europe. If
they are similar, then WorldWide coverage is mere grunt work in
transcribing _The CIA Fact Book_ to a database recognizable by the
extension. On the flipside, adding this data to a single extension, will
result in an extension that is a couple of hundred MB in size.

> So the new Excel will be the old Excel plus a big database in background, 
> which will be permanent updated.

And as some of the comments over there pointed out, still not as useful
as Javelin was, back in the day.  Perhaps LibO should incorporate more
functionality that Javelin had, that current spreadsheets lack.

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

"Microsoft Excel Is Going Beyond Text and Numbers"

[theUser BL]

To be compatibe to actual and future version of Excel this news could be 
interesting for you:
https://www.thurrott.com/office/155211/microsoft-excel-going-beyond-text-numbers

Possible comming Excel functions like USDinYEN(), EURinUSD(), CADtoUSD() or 
GBPtoEUR(). 
Where everytime the current  exchange rate is taken from the internet and used.

So the new Excel will be the old Excel plus a big database in background, which 
will be permanent updated.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - configure.ac README.md vcl/source

[jan Iversen]

 README.md  |4 ++--
 configure.ac   |2 +-
 vcl/source/filter/ipdf/pdfread.cxx |4 
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 6e7f6dd20aa58cb4c9ab66260a62d71a53002b9b
Author: jan Iversen 
Date:   Sun Apr 1 18:21:38 2018 +0200

iOS, void unused paramters.

Change-Id: I60b7d1a49d9e9073470ee8d0d6e68b34cdd0bdad

diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
index 572a4c2f6831..7f31e0ac15de 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -195,6 +195,10 @@ bool getCompatibleStream(SvStream& rInStream, SvStream& 
rOutStream, sal_uInt64 n
 size_t generatePreview(SvStream&, std::vector&, sal_uInt64 nPos, 
sal_uInt64 nSize,
size_t nFirstPage = 0, int nLastPage = 0)
 {
+(void)nPos;
+(void)nSize;
+(void)nFirstPage;
+(void)nLastPage;
 return false;
 }
 
commit e63a65174800968cfe5adb38e8f9ca28f22984d0
Author: jan Iversen 
Date:   Sun Apr 1 18:15:58 2018 +0200

iOS, bump versions

SDK needed is 11.3
Xcode needed is 9.3

Change-Id: If26eda81f969f63500d94e3274dda8efb59dec12

diff --git a/README.md b/README.md
index 1bbf9b58a481..c59f68122473 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,8 @@ run and compile LibreOffice, also used by the TDF builds:
 * Runtime: RHEL 6 or CentOS 6
 * Build: GCC 4.8.1 or Clang
 * iOS (only for LibreOfficeKit):
-* Runtime: 11.2 (only support for newer i devices == 64 bit)
-* Build: Xcode 9.0 and iPhone SDK 11.2
+* Runtime: 11.3 (only support for newer i devices == 64 bit)
+* Build: Xcode 9.3 and iPhone SDK 11.3
 
 At least Clang 3.4.2 is known to be too old to pass the configure.ac check 
"whether $CXX supports
 C++17, C++14, or C++11" in its current form (due to the #pragma GCC diagnostic 
ignored "-Wpragmas"
diff --git a/configure.ac b/configure.ac
index 73bc7b16a14d..e2d5c8c5e320 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2925,7 +2925,7 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=11.2
+current_sdk_ver=11.3
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=$current_sdk_ver
___
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/wizards/res/formarrangefree_42.png |binary
 icon-themes/colibre/wizards/res/formarrangelistside_42.png |binary
 icon-themes/colibre/wizards/res/formarrangelisttop_42.png  |binary
 icon-themes/colibre/wizards/res/formarrangetable_42.png|binary
 icon-themes/colibre_svg/wizards/res/formarrangefree_42.svg |1 +
 icon-themes/colibre_svg/wizards/res/formarrangelistside_42.svg |1 +
 icon-themes/colibre_svg/wizards/res/formarrangelisttop_42.svg  |1 +
 icon-themes/colibre_svg/wizards/res/formarrangetable_42.svg|1 +
 8 files changed, 4 insertions(+)

New commits:
commit b6a5302eca54fc498628c452ab268a2364582a19
Author: andreas kainz 
Date:   Sun Apr 1 01:01:24 2018 +0200

Colibre icons: finish wizards galaxy folder

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

diff --git a/icon-themes/colibre/wizards/res/formarrangefree_42.png 
b/icon-themes/colibre/wizards/res/formarrangefree_42.png
new file mode 100644
index ..46e67fdd2508
Binary files /dev/null and 
b/icon-themes/colibre/wizards/res/formarrangefree_42.png differ
diff --git a/icon-themes/colibre/wizards/res/formarrangelistside_42.png 
b/icon-themes/colibre/wizards/res/formarrangelistside_42.png
new file mode 100644
index ..46e67fdd2508
Binary files /dev/null and 
b/icon-themes/colibre/wizards/res/formarrangelistside_42.png differ
diff --git a/icon-themes/colibre/wizards/res/formarrangelisttop_42.png 
b/icon-themes/colibre/wizards/res/formarrangelisttop_42.png
new file mode 100644
index ..16d799351a5a
Binary files /dev/null and 
b/icon-themes/colibre/wizards/res/formarrangelisttop_42.png differ
diff --git a/icon-themes/colibre/wizards/res/formarrangetable_42.png 
b/icon-themes/colibre/wizards/res/formarrangetable_42.png
new file mode 100644
index ..176b4255ef4f
Binary files /dev/null and 
b/icon-themes/colibre/wizards/res/formarrangetable_42.png differ
diff --git a/icon-themes/colibre_svg/wizards/res/formarrangefree_42.svg 
b/icon-themes/colibre_svg/wizards/res/formarrangefree_42.svg
new file mode 100644
index ..d4a46dd7f054
--- /dev/null
+++ b/icon-themes/colibre_svg/wizards/res/formarrangefree_42.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/wizards/res/formarrangelistside_42.svg 
b/icon-themes/colibre_svg/wizards/res/formarrangelistside_42.svg
new file mode 100644
index ..d4a46dd7f054
--- /dev/null
+++ b/icon-themes/colibre_svg/wizards/res/formarrangelistside_42.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/wizards/res/formarrangelisttop_42.svg 
b/icon-themes/colibre_svg/wizards/res/formarrangelisttop_42.svg
new file mode 100644
index ..d6833c430b8e
--- /dev/null
+++ b/icon-themes/colibre_svg/wizards/res/formarrangelisttop_42.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/wizards/res/formarrangetable_42.svg 
b/icon-themes/colibre_svg/wizards/res/formarrangetable_42.svg
new file mode 100644
index ..4dbd5bed3890
--- /dev/null
+++ b/icon-themes/colibre_svg/wizards/res/formarrangetable_42.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac cui/uiconfig icon-themes/crystal

[Adolfo Jayme Barrientos]

 configure.ac   |6 +++---
 cui/uiconfig/ui/optviewpage.ui |1 -
 dev/null   |binary
 icon-themes/crystal/links.txt  |   31 ---
 4 files changed, 3 insertions(+), 35 deletions(-)

New commits:
commit 7762ebf1134475f39e9ef14837561cc761ee1d83
Author: Adolfo Jayme Barrientos 
Date:   Sat Mar 31 17:11:38 2018 -0600

Finish off Crystal

This is like a decade old and has never seen a single substantial update 
since
the LibreOffice project inherited it.

Change-Id: I72359b2bd4f312b027ceca6399ccbafbb01be88a
Reviewed-on: https://gerrit.libreoffice.org/52223
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/configure.ac b/configure.ac
index 3eed457588b3..73bc7b16a14d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1542,7 +1542,7 @@ AC_ARG_WITH(galleries,
 AC_ARG_WITH(theme,
 AS_HELP_STRING([--with-theme="theme1 theme2..."],
 [Choose which themes to include. By default those themes with an '*' 
are included.
- Possible choices: *breeze, *breeze_dark, crystal, *colibre, 
*elementary, *galaxy, *hicontrast, oxygen, *sifr, *sifr_dark, *tango, 
tango_testing.]),
+ Possible choices: *breeze, *breeze_dark, *colibre, *elementary, 
*galaxy, *hicontrast, oxygen, *sifr, *sifr_dark, *tango, tango_testing.]),
 ,)
 
 libo_FUZZ_ARG_WITH(helppack-integration,
@@ -11186,7 +11186,7 @@ WITH_THEMES=""
 if test "x$with_theme" != "xno"; then
 for theme in $with_theme; do
 case $theme in
-
breeze|breeze_dark|crystal|colibre|elementary|galaxy|hicontrast|oxygen|sifr|sifr_dark|tango|tango_testing)
 real_theme="$theme" ;;
+
breeze|breeze_dark|colibre|elementary|galaxy|hicontrast|oxygen|sifr|sifr_dark|tango|tango_testing)
 real_theme="$theme" ;;
 default) real_theme=galaxy ;;
 *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
 esac
@@ -12483,7 +12483,7 @@ if test "$enable_mpl_subset" = "yes"; then
 fi
 for theme in $WITH_THEMES; do
 case $theme in
-breeze|crystal|default|hicontrast|oxygen|sifr)
+breeze|default|hicontrast|oxygen|sifr)
 AC_MSG_ERROR([need to disable icon themes from '$WITH_THEMES': 
$theme present, use --with-theme=tango]) ;;
 *) : ;;
 esac
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index fdc3b6084cb0..d082efacad5b 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -358,7 +358,6 @@
   Automatic
   Galaxy
   High Contrast
-  Crystal
   Tango
   Oxygen
   Classic
diff --git a/icon-themes/crystal/cmd/ar/lc_redo.png 
b/icon-themes/crystal/cmd/ar/lc_redo.png
deleted file mode 100644
index 73a73c07e637..
Binary files a/icon-themes/crystal/cmd/ar/lc_redo.png and /dev/null differ
diff --git a/icon-themes/crystal/cmd/ar/lc_undo.png 
b/icon-themes/crystal/cmd/ar/lc_undo.png
deleted file mode 100644
index 9e945c060078..
Binary files a/icon-themes/crystal/cmd/ar/lc_undo.png and /dev/null differ
diff --git a/icon-themes/crystal/cmd/ar/sc_redo.png 
b/icon-themes/crystal/cmd/ar/sc_redo.png
deleted file mode 100644
index 802b0f9eeef7..
Binary files a/icon-themes/crystal/cmd/ar/sc_redo.png and /dev/null differ
diff --git a/icon-themes/crystal/cmd/ar/sc_undo.png 
b/icon-themes/crystal/cmd/ar/sc_undo.png
deleted file mode 100644
index 6531d9bd2c91..
Binary files a/icon-themes/crystal/cmd/ar/sc_undo.png and /dev/null differ
diff --git a/icon-themes/crystal/cmd/bg/lc_bold.png 
b/icon-themes/crystal/cmd/bg/lc_bold.png
deleted file mode 100644
index dbfa91bfdc3f..
Binary files a/icon-themes/crystal/cmd/bg/lc_bold.png and /dev/null differ
diff --git a/icon-themes/crystal/cmd/bg/lc_italic.png 
b/icon-themes/crystal/cmd/bg/lc_italic.png
deleted file mode 100644
index c283d35b5070..
Binary files a/icon-themes/crystal/cmd/bg/lc_italic.png and /dev/null differ
diff --git a/icon-themes/crystal/cmd/bg/lc_underline.png 
b/icon-themes/crystal/cmd/bg/lc_underline.png
deleted file mode 100644
index 7624ec47255d..
Binary files a/icon-themes/crystal/cmd/bg/lc_underline.png and /dev/null differ
diff --git a/icon-themes/crystal/cmd/bg/sc_bold.png 
b/icon-themes/crystal/cmd/bg/sc_bold.png
deleted file mode 100644
index 653e0d8b0b83..
Binary files a/icon-themes/crystal/cmd/bg/sc_bold.png and /dev/null differ
diff --git a/icon-themes/crystal/cmd/bg/sc_italic.png 
b/icon-themes/crystal/cmd/bg/sc_italic.png
deleted file mode 100644
index ff09c125f7b0..
Binary files a/icon-themes/crystal/cmd/bg/sc_italic.png and /dev/null differ
diff --git a/icon-themes/crystal/cmd/bg/sc_underline.png 
b/icon-themes/crystal/cmd/bg/sc_underline.png
del

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

[Andrea Gelmini]

 sw/source/filter/ww8/ww8par2.cxx |2 +-
 vcl/source/window/paint.cxx  |2 +-
 vcl/source/window/window.cxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 13fcf6c083de3b4e48d4e4f08ad7f81a9db0a997
Author: Andrea Gelmini 
Date:   Sat Mar 31 19:26:38 2018 +0200

Fix typo

Change-Id: I8983e1ef73051febd796d737cba1a58558b80bbf
Reviewed-on: https://gerrit.libreoffice.org/52209
Reviewed-by: Julien Nabet 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 1ab7029bca8e..0395b9902528 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2168,7 +2168,7 @@ void WW8TabDesc::CalcDefaults()
 }
 
 // 2. pass: Detect number of writer columns. This can exceed the count
-// of columns in WW by 2, because SW in constrast to WW does not provide
+// of columns in WW by 2, because SW in contrast to WW does not provide
 // fringed left and right borders and has to fill with empty boxes.
 // Non existent cells can reduce the number of columns.
 
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index aaebe10c871d..0bd9caf964a3 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -333,7 +333,7 @@ void 
RenderTools::DrawSelectionBackground(vcl::RenderContext& rRenderContext, vc
 
 if (!bDark && !bBright && std::abs(c2 - c1) < (pPaintColor ? 40 : 75))
 {
-// constrast too low
+// contrast too low
 sal_uInt16 h, s, b;
 aSelectionFillColor.RGBtoHSB( h, s, b );
 if( b > 50 )b -= 40;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 2c2ba81da62a..f5548205b846 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3404,7 +3404,7 @@ void Window::DrawSelectionBackground( const 
tools::Rectangle& rRect,
 
 if( !bDark && !bBright && abs( c2-c1 ) < 75 )
 {
-// constrast too low
+// contrast too low
 sal_uInt16 h,s,b;
 aSelectionFillCol.RGBtoHSB( h, s, b );
 if( b > 50 )b -= 40;
___
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/links.txt  |4 
 icon-themes/colibre/res/ballgreen_7.png|binary
 icon-themes/colibre/res/ballred_7.png  |binary
 icon-themes/colibre/res/basobj2.png|binary
 icon-themes/colibre/res/colorsliderleft.png|binary
 icon-themes/colibre/res/colorsliderright.png   |binary
 icon-themes/colibre/res/component_16.png   |binary
 icon-themes/colibre/res/da01.png   |binary
 icon-themes/colibre/res/da02.png   |binary
 icon-themes/colibre/res/da03.png   |binary
 icon-themes/colibre/res/da04.png   |binary
 icon-themes/colibre/res/da05.png   |binary
 icon-themes/colibre/res/da06.png   |binary
 icon-themes/colibre/res/dialogfolder_16.png|binary
 icon-themes/colibre/res/dialogfoldernot_16.png |binary
 icon-themes/colibre/res/fwthcirc.png   |binary
 icon-themes/colibre/res/hldoctp.png|binary
 icon-themes/colibre/res/hlinettp.png   |binary
 icon-themes/colibre/res/hlmailtp.png   |binary
 icon-themes/colibre/res/im30820.png|binary
 icon-themes/colibre/res/im30821.png|binary
 icon-themes/colibre/res/im30827.png|binary
 icon-themes/colibre/res/lc05678.png|binary
 icon-themes/colibre/res/lock.png   |binary
 icon-themes/colibre/res/script.png |binary
 icon-themes/colibre/res/soliline.png   |binary
 icon-themes/colibre/res/sx03165.png|binary
 icon-themes/colibre/res/sx03166.png|binary
 icon-themes/colibre/res/sx03167.png|binary
 icon-themes/colibre/res/target.png |binary
 icon-themes/colibre/res/xml_16.png |binary
 icon-themes/colibre_svg/res/ballgreen_7.svg|1 +
 icon-themes/colibre_svg/res/ballred_7.svg  |1 +
 icon-themes/colibre_svg/res/basobj2.svg|1 +
 icon-themes/colibre_svg/res/colorsliderleft.svg|1 +
 icon-themes/colibre_svg/res/colorsliderright.svg   |1 +
 icon-themes/colibre_svg/res/component_16.svg   |1 +
 icon-themes/colibre_svg/res/da01.svg   |5 +
 icon-themes/colibre_svg/res/da02.svg   |5 +
 icon-themes/colibre_svg/res/da03.svg   |5 +
 icon-themes/colibre_svg/res/da04.svg   |5 +
 icon-themes/colibre_svg/res/da05.svg   |5 +
 icon-themes/colibre_svg/res/da06.svg   |5 +
 icon-themes/colibre_svg/res/dialogfolder_16.svg|1 +
 icon-themes/colibre_svg/res/dialogfoldernot_16.svg |1 +
 icon-themes/colibre_svg/res/fwthcirc.svg   |1 +
 icon-themes/colibre_svg/res/hldoctp.svg|1 +
 icon-themes/colibre_svg/res/hlinettp.svg   |5 +
 icon-themes/colibre_svg/res/hlmailtp.svg   |1 +
 icon-themes/colibre_svg/res/im30820.svg|3 +++
 icon-themes/colibre_svg/res/im30821.svg|2 ++
 icon-themes/colibre_svg/res/im30827.svg|4 
 icon-themes/colibre_svg/res/lc05678.svg|1 +
 icon-themes/colibre_svg/res/lock.svg   |1 +
 icon-themes/colibre_svg/res/script.svg |1 +
 icon-themes/colibre_svg/res/soliline.svg   |1 +
 icon-themes/colibre_svg/res/sx03165.svg|1 +
 icon-themes/colibre_svg/res/sx03166.svg|6 ++
 icon-themes/colibre_svg/res/sx03167.svg|1 +
 icon-themes/colibre_svg/res/target.svg |1 +
 icon-themes/colibre_svg/res/xml_16.svg |1 +
 61 files changed, 73 insertions(+)

New commits:
commit c42db71056c381e84622d7a5347b437d8dab22f1
Author: andreas kainz 
Date:   Sun Apr 1 10:26:28 2018 +0200

Colibre icons: update res folder

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

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index e2456c54b310..77acaac4de9e 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1074,6 +1074,9 @@ res/sx10769.png cmd/sc_scrollbar.png
 res/sx18002.png res/plus.png
 res/sx18003.png res/minus.png
 
+res/basbrk.png cmd/sc_addwatch.png
+res/fp015.png cmd/sc_starshapes.png
+
 # sc
 # ==
 sc/res/lc26047.png cmd/lc_dbviewfunctions.png
@@ -1395,6 +1398,7 @@ sw/res/sr20018.png cmd/sc_inserttable.png
 sw/res/sr20019.png cmd/sc_remove.png
 
 sw/res/sx03.png cmd/sc_dbqueryedit.png
+svx/res/reload.png cmd/sc_reload.png
 
 # res
 sw/res/all_left.png cmd/sc_firstrecord.png
diff --git a/icon-themes/colibre/res/ballgreen_7.png 
b/icon-themes/colibre/res/ballgreen_7.png
new file mode 100644
index ..cb42e3a9bab8
Binary files /dev/null a

Re: master build fails, related to firebird

[Áron Budea]

Hi JBF and all,
 
On Saturday, March 31, 2018 13:46 CEST, Jean-Baptiste Faure 
 wrote: 
> It works again if I remove --disable-firebird-sdbc from my autogen.input
> I do not know what changed in the last 3 days that make firebird-sdbc 
> mandatory and if that is expected.

Should be fixed with 1859b45a08ccc2fa6da72cf6ee8196185df6ef37 from yesterday, 
please pull and try again.

Cheers,
Aron

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

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

[Bjoern Michaelsen]

 sw/source/core/unocore/unoobj2.cxx |   60 -
 1 file changed, 27 insertions(+), 33 deletions(-)

New commits:
commit 882909af782044d9d7bc8cae86833c1b7801
Author: Bjoern Michaelsen 
Date:   Sun Apr 1 02:19:38 2018 +0200

SwXTextRange::Impl: use WriterMultiListener

Change-Id: Ib850916bfed8a5eb6ca97419db9d7be0bdef1257
Reviewed-on: https://gerrit.libreoffice.org/52217
Tested-by: Jenkins 
Reviewed-by: Björn Michaelsen 

diff --git a/sw/source/core/unocore/unoobj2.cxx 
b/sw/source/core/unocore/unoobj2.cxx
index 02a921443eea..6778329393be 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -683,24 +683,27 @@ class SwXTextRange::Impl
 : public SwClient
 {
 public:
-const SfxItemPropertySet &  m_rPropSet;
-const enum RangePositionm_eRangePosition;
-SwDoc & m_rDoc;
+const SfxItemPropertySet& m_rPropSet;
+const enum RangePosition m_eRangePosition;
+SwDoc& m_rDoc;
 uno::Reference m_xParentText;
-SwDependm_ObjectDepend; // register at format of table or frame
-::sw::mark::IMark * m_pMark;
+sw::WriterMultiListener m_aMultiListener;
+const ::sw::mark::IMark* m_pMark;
+const SwFrameFormat* m_pTableFormat;
 
-Impl(   SwDoc & rDoc, const enum RangePosition eRange,
-SwFrameFormat *const pTableFormat,
-const uno::Reference< text::XText > & xParent = nullptr)
+Impl(SwDoc & rDoc, const enum RangePosition eRange,
+SwFrameFormat* const pTableFormat,
+const uno::Reference& xParent = nullptr)
 : SwClient()
 , m_rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_CURSOR))
 , m_eRangePosition(eRange)
 , m_rDoc(rDoc)
 , m_xParentText(xParent)
-, m_ObjectDepend(this, pTableFormat)
+, m_aMultiListener(*this)
 , m_pMark(nullptr)
+, m_pTableFormat(pTableFormat)
 {
+m_aMultiListener.StartListening(pTableFormat);
 }
 
 virtual ~Impl() override
@@ -722,31 +725,24 @@ public:
 
 protected:
 // SwClient
-virtual voidModify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) 
override;
+virtual void SwClientNotify(const SwModify&, const SfxHint&) override;
 };
 
-void SwXTextRange::Impl::Modify(const SfxPoolItem *pOld, const SfxPoolItem 
*pNew)
+void SwXTextRange::Impl::SwClientNotify(const SwModify& rModify, const 
SfxHint& rHint)
 {
-const bool bAlreadyRegistered = nullptr != GetRegisteredIn();
-ClientModify(this, pOld, pNew);
-if (m_ObjectDepend.GetRegisteredIn())
+assert(!GetRegisteredIn()); // we should only listen with the 
WriterMultiListener from now on
+if(auto pModifyChangedHint = dynamic_cast(&rHint))
 {
-ClientModify(&m_ObjectDepend, pOld, pNew);
-// if the depend was removed then the range must be removed too
-if (!m_ObjectDepend.GetRegisteredIn())
+if(pModifyChangedHint->m_pNew == nullptr)
 {
-EndListeningAll();
-}
-// or if the range has been removed but the depend is still
-// connected then the depend must be removed
-else if (bAlreadyRegistered && !GetRegisteredIn())
-{
-m_ObjectDepend.EndListeningAll();
+m_aMultiListener.EndListeningAll();
+m_pMark = nullptr;
+m_pTableFormat = nullptr;
 }
-}
-if (!GetRegisteredIn())
-{
-m_pMark = nullptr;
+else if(&rModify == m_pMark)
+m_pMark = dynamic_cast(pModifyChangedHint->m_pNew);
+else if(&rModify == m_pTableFormat)
+m_pTableFormat = dynamic_cast(pModifyChangedHint->m_pNew);
 }
 }
 
@@ -795,7 +791,7 @@ void SwXTextRange::SetPositions(const SwPaM& rPam)
 IDocumentMarkAccess* const pMA = m_pImpl->m_rDoc.getIDocumentMarkAccess();
 m_pImpl->m_pMark = pMA->makeMark(rPam, OUString(),
 IDocumentMarkAccess::MarkType::UNO_BOOKMARK, 
sw::mark::InsertMode::New);
-m_pImpl->m_pMark->Add(m_pImpl.get());
+
m_pImpl->m_aMultiListener.StartListening(const_cast<::sw::mark::IMark*>(m_pImpl->m_pMark));
 }
 
 void SwXTextRange::DeleteAndInsert(
@@ -887,11 +883,9 @@ SwXTextRange::getText()
 if (!m_pImpl->m_xParentText.is())
 {
 if (m_pImpl->m_eRangePosition == RANGE_IS_TABLE &&
-m_pImpl->m_ObjectDepend.GetRegisteredIn())
+m_pImpl->m_pTableFormat)
 {
-SwFrameFormat const*const pTableFormat = static_cast(
-m_pImpl->m_ObjectDepend.GetRegisteredIn());
-SwTable const*const pTable = SwTable::FindTable( pTableFormat );
+SwTable const*const pTable = SwTable::FindTable( 
m_pImpl->m_pTableFormat );
 SwTableNode const*const pTableNode = pTable->GetTableNode();
 const SwPosition aPosition( *pTableNode );
 m_pImpl->m_xParentText =
_

Re: master build fails, related to firebird

[Jean-Baptiste Faure]

Le 01/04/2018 à 07:35, Áron Budea a écrit :

Hi JBF and all,
  
On Saturday, March 31, 2018 13:46 CEST, Jean-Baptiste Faure  wrote:

It works again if I remove --disable-firebird-sdbc from my autogen.input
I do not know what changed in the last 3 days that make firebird-sdbc
mandatory and if that is expected.


Should be fixed with 1859b45a08ccc2fa6da72cf6ee8196185df6ef37 from yesterday, 
please pull and try again.


Indeed it works again since this commit. Thank you to Tamas Bunth for 
the fix.


Best regards.
JBF

--
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
Disclaimer: my Internet Provider being located in France, each of our
exchanges over Internet will be scanned by French spying services.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Bjoern Michaelsen]

 sw/source/core/unocore/unoidx.cxx |   91 +++---
 1 file changed, 47 insertions(+), 44 deletions(-)

New commits:
commit 6f92c49f3801589202c58739e89b08b525a4d279
Author: Bjoern Michaelsen 
Date:   Sun Apr 1 02:19:38 2018 +0200

SwXDocumentIndexMark::Impl: use WriterMultiListener

Change-Id: Ia4e09e1e3b95553fbedba515d70875c1d8aa14f0
Reviewed-on: https://gerrit.libreoffice.org/52215
Tested-by: Jenkins 
Reviewed-by: Björn Michaelsen 

diff --git a/sw/source/core/unocore/unoidx.cxx 
b/sw/source/core/unocore/unoidx.cxx
index 4d26cd73953b..216bbab09ecc 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -1512,32 +1512,33 @@ private:
 public:
 
 uno::WeakReference m_wThis;
-SfxItemPropertySet const&   m_rPropSet;
-const TOXTypes  m_eTOXType;
+SfxItemPropertySet const& m_rPropSet;
+const TOXTypes m_eTOXType;
 ::comphelper::OInterfaceContainerHelper2 m_EventListeners;
-boolm_bIsDescriptor;
-SwDependm_TypeDepend;
-const SwTOXMark *   m_pTOXMark;
-SwDoc * m_pDoc;
-
-boolm_bMainEntry;
-sal_uInt16  m_nLevel;
-OUStringm_aBookmarkName;
-OUStringm_aEntryTypeName;
-OUStringm_sAltText;
-OUStringm_sPrimaryKey;
-OUStringm_sSecondaryKey;
-OUStringm_sTextReading;
-OUStringm_sPrimaryKeyReading;
-OUStringm_sSecondaryKeyReading;
-OUStringm_sUserIndexName;
-OUStringm_sCitaitonText;
-
-Impl(   SwXDocumentIndexMark & rThis,
-SwDoc *const pDoc,
+bool m_bIsDescriptor;
+sw::WriterMultiListener m_aListener;
+const SwTOXType* m_pTOXType;
+const SwTOXMark* m_pTOXMark;
+SwDoc* m_pDoc;
+
+bool m_bMainEntry;
+sal_uInt16 m_nLevel;
+OUString m_aBookmarkName;
+OUString m_aEntryTypeName;
+OUString m_sAltText;
+OUString m_sPrimaryKey;
+OUString m_sSecondaryKey;
+OUString m_sTextReading;
+OUString m_sPrimaryKeyReading;
+OUString m_sSecondaryKeyReading;
+OUString m_sUserIndexName;
+OUString m_sCitaitonText;
+
+Impl(SwXDocumentIndexMark& rThis,
+SwDoc* const pDoc,
 const enum TOXTypes eType,
-SwTOXType *const pType, SwTOXMark const*const pMark)
-: SwClient(const_cast(pMark))
+SwTOXType* const pType, SwTOXMark const*const pMark)
+: SwClient()
 , m_rThis(rThis)
 , m_bInReplaceMark(false)
 , m_rPropSet(
@@ -1545,23 +1546,24 @@ public:
 , m_eTOXType(eType)
 , m_EventListeners(m_Mutex)
 , m_bIsDescriptor(nullptr == pMark)
-, m_TypeDepend(this, pType)
+, m_aListener(*this)
+, m_pTOXType(pType)
 , m_pTOXMark(pMark)
 , m_pDoc(pDoc)
 , m_bMainEntry(false)
 , m_nLevel(0)
 {
+m_aListener.StartListening(const_cast(pMark));
+m_aListener.StartListening(pType);
 }
 
-SwTOXType * GetTOXType() const {
-return static_cast(
-const_cast(m_TypeDepend.GetRegisteredIn()));
+SwTOXType* GetTOXType() const {
+return const_cast(m_pTOXType);
 }
 
 void DeleteTOXMark()
 {
-m_pDoc->DeleteTOXMark(m_pTOXMark); // calls Invalidate() via Modify!
-m_pTOXMark = nullptr;
+m_pDoc->DeleteTOXMark(m_pTOXMark); // calls Invalidate() via Notify
 }
 
 void InsertTOXMark(SwTOXType & rTOXType, SwTOXMark & rMark, SwPaM & rPam,
@@ -1586,16 +1588,11 @@ public:
 voidInvalidate();
 protected:
 // SwClient
-virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) 
override;
+virtual void SwClientNotify(const SwModify&, const SfxHint& ) override;
 };
 
 void SwXDocumentIndexMark::Impl::Invalidate()
 {
-if (GetRegisteredIn())
-{
-EndListeningAll();
-m_TypeDepend.EndListeningAll();
-}
 if (!m_bInReplaceMark) // #i109983# only dispose on delete, not on replace!
 {
 uno::Reference const xThis(m_wThis);
@@ -1606,17 +1603,21 @@ void SwXDocumentIndexMark::Impl::Invalidate()
 m_EventListeners.disposeAndClear(ev);
 }
 }
+m_aListener.EndListeningAll();
 m_pDoc = nullptr;
 m_pTOXMark = nullptr;
+m_pTOXType = nullptr;
 }
 
-void SwXDocumentIndexMark::Impl::Modify(const SfxPoolItem *pOld, const 
SfxPoolItem *pNew)
+void SwXDocumentIndexMark::Impl::SwClientNotify(const SwModify& rModify, const 
SfxHint& rHint)
 {
-ClientModify(this, pOld, pNew);
-
-if (!GetRegisteredIn()) // removed => dispose
+assert(!GetRegisteredIn()); // we should only listen with the 
WriterMultiListener from now on
+if(auto pModifyChangedHint = dynamic_cast(&rHint

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - distro-configs/CPWin32.conf distro-configs/CPWin32-MPL.conf sc/source

[Andras Timar]

 distro-configs/CPWin32-MPL.conf  |1 -
 distro-configs/CPWin32.conf  |1 -
 sc/source/core/data/dpobject.cxx |4 +---
 3 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 1581e3e6a04fb8c1f367eaac802f1a2eb0dcad47
Author: Andras Timar 
Date:   Sat Mar 31 23:58:58 2018 -0700

remove obsoleted --enable-activex from configs

Change-Id: Ifae3732df56e63c577cdcf19073c8cc3b9d2d1c5

diff --git a/distro-configs/CPWin32-MPL.conf b/distro-configs/CPWin32-MPL.conf
index 60cd5d9acd58..ae1a17aab9f6 100644
--- a/distro-configs/CPWin32-MPL.conf
+++ b/distro-configs/CPWin32-MPL.conf
@@ -8,7 +8,6 @@
 --without-junit
 --without-helppack-integration
 --enable-extension-integration
---enable-activex
 --disable-online-update
 --disable-odk
 --disable-gtk
diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf
index d99422d9f511..834a3555917e 100644
--- a/distro-configs/CPWin32.conf
+++ b/distro-configs/CPWin32.conf
@@ -4,7 +4,6 @@
 --without-junit
 --without-helppack-integration
 --enable-extension-integration
---enable-activex
 --disable-online-update
 --disable-odk
 --disable-gtk
commit 9d581c9fa85a018f755b3711f4be6558e51f9032
Author: Stephan Bergmann 
Date:   Wed Nov 29 13:47:44 2017 +0100

Avoid ambiguities

...when sc/source/ui/inc/tabvwsh.hxx happens to be also (indirectly) 
included
(as happens with Windows --enable-pch?)

Change-Id: I252af03524c0d8f354a2f64a2073c2b085b3cedc
(cherry picked from commit e1131556a8485c10af8224e29dbecbfb5c608353)

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index f86a608b156e..8486df51d431 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1308,8 +1308,6 @@ long ScDPObject::GetDimCount()
 
 void ScDPObject::GetHeaderPositionData(const ScAddress& rPos, 
DataPilotTableHeaderData& rData)
 {
-using namespace ::com::sun::star::sheet::DataPilotTablePositionType;
-
 CreateOutput(); // create xSource and pOutput if not already 
done
 
 // Reset member values to invalid state.
@@ -1319,7 +1317,7 @@ void ScDPObject::GetHeaderPositionData(const ScAddress& 
rPos, DataPilotTableHead
 DataPilotTablePositionData aPosData;
 pOutput->GetPositionData(rPos, aPosData);
 const sal_Int32 nPosType = aPosData.PositionType;
-if (nPosType == COLUMN_HEADER || nPosType == ROW_HEADER)
+if (nPosType == css::sheet::DataPilotTablePositionType::COLUMN_HEADER || 
nPosType == css::sheet::DataPilotTablePositionType::ROW_HEADER)
 aPosData.PositionData >>= rData;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits