date:20200118

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

2020-01-18 Thread andreas kainz (via logerrit)

 sc/uiconfig/scalc/ui/sidebarnumberformat.ui |  244 +++-
 1 file changed, 134 insertions(+), 110 deletions(-)

New commits:
commit 56c6a53ffcba1b8eac8b953b8724557df856954d
Author: andreas kainz 
AuthorDate: Fri Jan 17 13:38:42 2020 +0100
Commit: andreas_kainz 
CommitDate: Sat Jan 18 09:04:45 2020 +0100

calc sidebar numberformat alignment and arrangement

Change-Id: Id283e72ea0f54124df5daa5f74baef62b544e0f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86974
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui 
b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
index 3f1d139a11ee..09704d6ef5d0 100644
--- a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
+++ b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
@@ -2,21 +2,6 @@
 
 
   
-  
-20
-1
-10
-  
-  
-8
-1
-1
-  
-  
-20
-1
-10
-  
   
 True
 False
@@ -30,49 +15,19 @@
 vertical
 6
 
-  
+  
 True
 False
-6
-
-  
-True
-True
-Select a category of 
contents.
-center
-True
-
-  General
-  Number
-  Percent
-  Currency
-  Date 
-  Time
-  Scientific
-  Fraction
-  Boolean Value
-  Text
-
-
-  
-Category
-  
-
-  
-  
-0
-0
-  
-
+6
 
   
 True
-True
+False
 icons
 False
 2
 
-  
+  
 True
 False
 True
@@ -94,7 +49,7 @@
   
 
 
-  
+  
 True
 False
 True
@@ -106,8 +61,40 @@
 
   
   
-1
-0
+False
+True
+0
+  
+
+
+  
+True
+False
+Select a category of 
contents.
+center
+True
+
+  General
+  Number
+  Percent
+  Currency
+  Date 
+  Time
+  Scientific
+  Fraction
+  Boolean Value
+  Text
+
+
+  
+Category
+  
+
+  
+  
+False
+True
+1
   
 
   
@@ -118,22 +105,24 @@
   
 
 
-  
+  
 True
 False
-12
+6
 
   
 True
 False
+center
 vertical
-6
 
-  
+  
+True
 False
-Den_ominator 
places:
+_Decimal places:
 True
-denominatorplaces
+decimalplaces
+0
   
   
 False
@@ -142,12 +131,12 @@
   
 
 
-  
-True
+  
 False
-_Decimal places:
+Den_ominator 
places:
 True
-decimalplaces
+denominatorplaces
+0
   
   
 False
@@ -155,15 +144,28 @@
 0
   
 
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+center
+True
+vertical
 
-  
-True
+  
 True
-Enter the number of 
decimal places that you want to display.
-adjustment3
+Enter the number 
of places for the denominator that you want to display.

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

2020-01-18 Thread Stephan Bergmann (via logerrit)

 external/pdfium/UnpackedTarball_pdfium.mk |1 +
 external/pdfium/c++20-comparison.patch|   13 +
 2 files changed, 14 insertions(+)

New commits:
commit 6e0461d576d9f386e458f98f3c57f0ba385aacb4
Author: Stephan Bergmann 
AuthorDate: Fri Jan 17 18:27:14 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Sat Jan 18 10:06:16 2020 +0100

external/pdfium: C++20 comparison operator fix

Missing const leads to overload resolution ambiguity when a synthesized
candidate of operator == for a reversed-argument rewrite conflicts with the
actual operator ==, due to the asymmetric const-ness of the implicit object
parameter and the RHS parameter:

> In file included from 
workdir/UnpackedTarball/pdfium/core/fxge/cfx_font.cpp:7:
> In file included from 
workdir/UnpackedTarball/pdfium/core/fxge/cfx_font.h:11:
> llvm/inst/include/c++/v1/vector:1369:27: error: use of overloaded 
operator '!=' is ambiguous (with operand types 
'std::__1::__vector_base 
>::allocator_type' (aka 'FxAllocAllocator') and 
'std::__1::__vector_base 
>::allocator_type')
> if (__base::__alloc() != __c.__alloc())
> ~ ^  ~
> llvm/inst/include/c++/v1/vector:1359:5: note: in instantiation of member 
function 'std::__1::vector 
>::__move_assign' requested here
> __move_assign(__x, integral_constant ^
> workdir/UnpackedTarball/pdfium/core/fxge/cfx_font.cpp:384:24: note: in 
instantiation of member function 'std::__1::vector >::operator=' requested here
>   m_FontDataAllocation = std::vector>(
>^
> workdir/UnpackedTarball/pdfium/core/fxcrt/fx_memory_wrappers.h:74:8: 
note: candidate function
>   bool operator!=(const FxAllocAllocator& that) { return false; }
>^
> workdir/UnpackedTarball/pdfium/core/fxcrt/fx_memory_wrappers.h:73:8: 
note: candidate function
>   bool operator==(const FxAllocAllocator& that) { return true; }
>^
> workdir/UnpackedTarball/pdfium/core/fxcrt/fx_memory_wrappers.h:73:8: 
note: candidate function (with reversed parameter order)

Change-Id: I48cfc8ce37287d9d3c0dec8c4d8b14b53de895d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86993
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/pdfium/UnpackedTarball_pdfium.mk 
b/external/pdfium/UnpackedTarball_pdfium.mk
index 2874bd72719f..ba1a7e994dbf 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -14,6 +14,7 @@ pdfium_patches += ubsan.patch
 pdfium_patches += build.patch.1
 # Avoids Windows 8 build dependency.
 pdfium_patches += windows7.patch.1
+pdfium_patches += c++20-comparison.patch
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium))
 
diff --git a/external/pdfium/c++20-comparison.patch 
b/external/pdfium/c++20-comparison.patch
new file mode 100644
index ..025f9ba010db
--- /dev/null
+++ b/external/pdfium/c++20-comparison.patch
@@ -0,0 +1,13 @@
+--- core/fxcrt/fx_memory_wrappers.h
 core/fxcrt/fx_memory_wrappers.h
+@@ -70,8 +70,8 @@
+   }
+ 
+   // There's no state, so they are all the same,
+-  bool operator==(const FxAllocAllocator& that) { return true; }
+-  bool operator!=(const FxAllocAllocator& that) { return false; }
++  bool operator==(const FxAllocAllocator& that) const { return true; }
++  bool operator!=(const FxAllocAllocator& that) const { return false; }
+ };
+ 
+ #endif  // CORE_FXCRT_FX_MEMORY_WRAPPERS_H_
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-18 Thread Mike Kaganski (via logerrit)

 sc/source/ui/view/tabview.cxx |   21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

New commits:
commit bda31b1a95b284749cd5e4d9596aab8e1aa93714
Author: Mike Kaganski 
AuthorDate: Sat Jan 18 12:01:24 2020 +0300
Commit: Mike Kaganski 
CommitDate: Sat Jan 18 11:44:10 2020 +0100

tdf#130054: consider all row/col bars in ScTabView::EnableRefInput

Left col bar and bottom row bar were ignored - apparently overlooked
at least since commit 9ae5a91f7955e44d3b24a3f7741f9bca02ac7f24.

Change-Id: I5c2386b0aa1fdbb42f352c0b654e268dc62c7e66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87007
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index ec52581dad23..53e03e61de07 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2245,18 +2245,15 @@ void ScTabView::EnableRefInput(bool bFlag)
 
 if(pTabControl!=nullptr) pTabControl->EnableInput(bFlag);
 
-if(pGridWin[SC_SPLIT_BOTTOMLEFT]!=nullptr)
-pGridWin[SC_SPLIT_BOTTOMLEFT]->EnableInput(bFlag,false);
-if(pGridWin[SC_SPLIT_BOTTOMRIGHT]!=nullptr)
-pGridWin[SC_SPLIT_BOTTOMRIGHT]->EnableInput(bFlag,false);
-if(pGridWin[SC_SPLIT_TOPLEFT]!=nullptr)
-pGridWin[SC_SPLIT_TOPLEFT]->EnableInput(bFlag,false);
-if(pGridWin[SC_SPLIT_TOPRIGHT]!=nullptr)
-pGridWin[SC_SPLIT_TOPRIGHT]->EnableInput(bFlag,false);
-if(pColBar[SC_SPLIT_RIGHT]!=nullptr)
-pColBar[SC_SPLIT_RIGHT]->EnableInput(bFlag,false);
-if(pRowBar[SC_SPLIT_TOP]!=nullptr)
-pRowBar[SC_SPLIT_TOP]->EnableInput(bFlag,false);
+for (auto& p : pGridWin)
+if (p)
+p->EnableInput(bFlag, false);
+for (auto& p : pColBar)
+if (p)
+p->EnableInput(bFlag, false);
+for (auto& p : pRowBar)
+if (p)
+p->EnableInput(bFlag, false);
 }
 
 bool ScTabView::ContinueOnlineSpelling()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-18 Thread Stephan Bergmann (via logerrit)

 ucb/source/sorter/sortresult.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a1f5ea6c033fb11a4650401bd0e6b38c11088bda
Author: Stephan Bergmann 
AuthorDate: Sat Jan 18 10:09:48 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Sat Jan 18 12:29:11 2020 +0100

Fix typo in comment

(cf. SortedResultSet::maS2O in ucb/source/sorter/sortresult.hxx)

Change-Id: I4dd9118335d51a98e6f1ed6af39c62558b295933
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87006
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index dd72d5a33a42..8d8334cff393 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -1360,7 +1360,7 @@ void SortedResultSet::InsertNew( sal_IntPtr nPos, 
sal_IntPtr nCount )
 }
 }
 
-// and append the new entries at the end of the maS20-list or insert at the
+// and append the new entries at the end of the maS2O-list or insert at the
 // position nPos in the maS2O-list
 for ( i=0; ihttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-18 Thread Andrea Gelmini (via logerrit)

 sal/qa/osl/file/osl_File.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7404db932232c6baa7909052f92cd8135f371361
Author: Andrea Gelmini 
AuthorDate: Fri Jan 10 22:24:03 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Sat Jan 18 12:29:47 2020 +0100

Removed redundant semicolon

Change-Id: Ice0c5f413f176ce6eb832dc8b06010595f214857
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86582
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 2f099586ee73..dabe4e09e15f 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -4530,7 +4530,7 @@ namespace osl_Directory
 }
 else
 break;
-};
+}
 fd = std::remove(strLinkFileName.getStr());
 CPPUNIT_ASSERT_EQUAL_MESSAGE("remove link file failed", 
static_cast(0), fd);
 CPPUNIT_ASSERT_MESSAGE("test for getNextItem function: check if 
can retrieve the link file name",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-18 Thread Andrea Gelmini (via logerrit)

 sw/source/filter/ww8/ww8graf.cxx  |   12 ++--
 sw/source/filter/ww8/ww8par.hxx   |2 +-
 sw/source/filter/ww8/ww8struc.hxx |4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit f150876698b5cea4857abcc5bd2e37fd4b038a17
Author: Andrea Gelmini 
AuthorDate: Fri Jan 10 23:15:01 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Sat Jan 18 12:32:57 2020 +0100

Fix typo in code

Change-Id: Ic464f818204af4d5e0d6d1a0b1c29cac620f6250
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86588
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index df78fd4f6a76..e4c84d297b8b 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -363,11 +363,11 @@ SdrObject* SwWW8ImplReader::ReadRect(WW8_DPHEAD const * 
pHd, SfxAllItemSet &rSet
 return pObj;
 }
 
-SdrObject* SwWW8ImplReader::ReadElipse(WW8_DPHEAD const * pHd, SfxAllItemSet 
&rSet)
+SdrObject* SwWW8ImplReader::ReadEllipse(WW8_DPHEAD const * pHd, SfxAllItemSet 
&rSet)
 {
-WW8_DP_ELIPSE aElipse;
+WW8_DP_ELLIPSE aEllipse;
 
-if( !ReadGrafStart( static_cast(&aElipse), sizeof( aElipse ), pHd, 
rSet ) )
+if( !ReadGrafStart( static_cast(&aEllipse), sizeof( aEllipse ), 
pHd, rSet ) )
 return nullptr;
 
 Point aP0( static_cast(SVBT16ToUInt16( pHd->xa )) + 
m_nDrawXOfs2,
@@ -381,8 +381,8 @@ SdrObject* SwWW8ImplReader::ReadElipse(WW8_DPHEAD const * 
pHd, SfxAllItemSet &rS
 SdrCircKind::Full,
 tools::Rectangle(aP0, aP1));
 
-SetStdAttr( rSet, aElipse.aLnt, aElipse.aShd );
-SetFill( rSet, aElipse.aFill );
+SetStdAttr( rSet, aEllipse.aLnt, aEllipse.aShd );
+SetFill( rSet, aEllipse.aFill );
 
 return pObj;
 }
@@ -1397,7 +1397,7 @@ SdrObject* SwWW8ImplReader::ReadGrafPrimitive(short& 
rLeft, SfxAllItemSet &rSet)
 pRet = ReadRect(&aHd, rSet);
 break;
 case 4:
-pRet = ReadElipse(&aHd, rSet);
+pRet = ReadEllipse(&aHd, rSet);
 break;
 case 5:
 pRet = ReadArc(&aHd, rSet);
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 61e30e6618ed..4a0b06c553a6 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1581,7 +1581,7 @@ private:
 SfxAllItemSet &rSet);
 SdrObject *ReadLine(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
 SdrObject *ReadRect(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
-SdrObject *ReadElipse(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
+SdrObject *ReadEllipse(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
 SdrObject *ReadArc(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
 SdrObject *ReadPolyLine(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
 void InsertTxbxStyAttrs( SfxItemSet& rS, sal_uInt16 nColl );
diff --git a/sw/source/filter/ww8/ww8struc.hxx 
b/sw/source/filter/ww8/ww8struc.hxx
index 70b683ce3352..7e448e1c30d6 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -698,7 +698,7 @@ struct WW8_DPHEAD
 {
 SVBT16 dpk; //  0   Drawn Primitive Kind  REVIEW davebu
   //0=start of grouping, 1=line, 2=textbox, 3=rectangle,
-  //4=arc, 5=elipse, 6=polyline, 7=callout textbox,
+  //4=arc, 5=ellipse, 6=polyline, 7=callout textbox,
   //8=end of grouping, 9=sample primitive holding default values
 SVBT16 cb;  // 2size (count of bytes) of this DP
 SVBT16 xa;  // 4These 2 points describe the rectangle
@@ -788,7 +788,7 @@ struct WW8_DP_ARC
 //  sal_uInt16 fUp : 8; // 0x24 ff00REVIEW davebu
 };
 
-struct WW8_DP_ELIPSE
+struct WW8_DP_ELLIPSE
 {
 WW8_DP_LINETYPE aLnt;
 WW8_DP_FILL aFill;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-18 Thread Stephan Bergmann (via logerrit)

 vcl/source/window/syswin.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7dc50ca94ad6cc47561662424e163250a8e5957e
Author: Stephan Bergmann 
AuthorDate: Sat Jan 18 12:34:18 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Sat Jan 18 14:06:21 2020 +0100

Remove redundant casts

They had been added with d2986be1a8d896782b8cb846b0028eaa752e0384 
"INTEGRATION:
CWS vcl83: #i82823# remove warnings (thanks pjanik)" before
dbbf365921b50009db8ea86b90c99f3a26c467bc "INTEGRATION: CWS vcl87: #i86882# 
use
long for gemoetry like the rest of the Sal interface does" changed the
SalFrameGeometry::n*Decoration members from 'unsinged int' to 'unsigned 
long'.
So back then the sums were of type

  'long' + 'long' + 'long' + 'unsigned int' => 'long' or 'unsigned long'

(depending on whether 'long' is larger than 'int'), while now it is

  'long' + 'long' + 'long' + 'unsigned long' => 'unsigned long'

Change-Id: Ia8c7a8ccd858675c909e39497256be7783a8fd2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87012
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 9d2a0b671c66..5dbcd6852859 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -705,15 +705,15 @@ void SystemWindow::SetWindowStateData( const 
WindowStateData& rData )
 if( std::abs(g.nX-aState.mnX) < 2 && 
std::abs(g.nY-aState.mnY) < 5 )
 {
 long displacement = g.nTopDecoration ? 
g.nTopDecoration : 20;
-if( static_cast(aState.mnX + 
displacement + aState.mnWidth + g.nRightDecoration) > static_cast(aDesktop.Right()) ||
-static_cast(aState.mnY + 
displacement + aState.mnHeight + g.nBottomDecoration) > static_cast(aDesktop.Bottom()) )
+if( aState.mnX + displacement + aState.mnWidth + 
g.nRightDecoration > static_cast(aDesktop.Right()) ||
+aState.mnY + displacement + aState.mnHeight + 
g.nBottomDecoration > static_cast(aDesktop.Bottom()) )
 {
 // displacing would leave screen
 aState.mnX = g.nLeftDecoration ? 
g.nLeftDecoration : 10; // should result in (0,0)
 aState.mnY = displacement;
 if( bWrapped ||
-static_cast(aState.mnX + 
displacement + aState.mnWidth + g.nRightDecoration) > static_cast(aDesktop.Right()) ||
-static_cast(aState.mnY + 
displacement + aState.mnHeight + g.nBottomDecoration) > static_cast(aDesktop.Bottom()) )
+aState.mnX + displacement + aState.mnWidth 
+ g.nRightDecoration > static_cast(aDesktop.Right()) ||
+aState.mnY + displacement + 
aState.mnHeight + g.nBottomDecoration > static_cast(aDesktop.Bottom()) )
 break;  // further displacement not 
possible -> break
 // avoid endless testing
 bWrapped = true;
___
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 solenv/gbuild

2020-01-18 Thread Luboš Luňák (via logerrit)

 config_host.mk.in   |2 ++
 configure.ac|   31 +++
 solenv/gbuild/platform/com_GCC_class.mk |   16 +++-
 3 files changed, 48 insertions(+), 1 deletion(-)

New commits:
commit a0323937ff4b36594e26b5c1a143af188c75abfc
Author: Luboš Luňák 
AuthorDate: Sat Jun 22 21:17:56 2019 +0200
Commit: Luboš Luňák 
CommitDate: Sat Jan 18 14:56:37 2020 +0100

support Clang's -fmodules-codegen/debuginfo options for PCH building

These (starting with my patches for Clang-to-be-10) allowing emitting
debuginfo and functions into a dedicated object file, so that all
the normal compilations using the PCH can skip those, thus saving
the time. The debuginfo option seems to always be worth it. The codegen
option is more tricky, it doesn't seem to be worth it for optimized
builds (optimizing all the functions in that one object file costs
too much).

This requires also using --Wl,--gc-sections . The reason is that
the object file contains all template instances instantiated from the PCH,
so that they can be shared, but the template instance may come
from another library or use a private symbol from that library.
For example the std::unique_ptr
in ScInterpreterContextPool in the header refers to ScInterpreterContext
dtor. But even though both these classes are private, the header
gets used also by scfilt, because there it is included by document.hxx
because of a private ScDocument data member. So even though nothing
in scfilt uses ScInterpreterContext, the PCH object file will refer to it.
Fortunately that template instance itself is not used by scfilt,
so --gc-sections will remove it.

Change-Id: I2a06ebcc4dd4175424b3a72ab3ebcaf2ac3ee295
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87011
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/config_host.mk.in b/config_host.mk.in
index e1cddb295964..2c5eec97a156 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -448,6 +448,8 @@ export PATH=@LO_PATH@
 export LIBO_PATH_SEPARATOR=@P_SEP@
 export PAGEMAKER_CFLAGS=$(gb_SPACE)@PAGEMAKER_CFLAGS@
 export PAGEMAKER_LIBS=$(gb_SPACE)@PAGEMAKER_LIBS@
+export PCH_MODULES_CODEGEN=@PCH_MODULES_CODEGEN@
+export PCH_MODULES_DEBUGINFO=@PCH_MODULES_DEBUGINFO@
 export PERL=@PERL@
 export PKGFORMAT=@PKGFORMAT@
 export PKGMK=@PKGMK@
diff --git a/configure.ac b/configure.ac
index 1f7eb690b6cc..5b9fd601ef9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5202,6 +5202,37 @@ if test -n "$ENABLE_PCH"; then
 fi
 AC_SUBST(BUILDING_PCH_WITH_OBJ)
 
+PCH_MODULES_CODEGEN=
+if test -n "$BUILDING_PCH_WITH_OBJ"; then
+AC_MSG_CHECKING([whether $CC supports -Xclang -fmodules-codegen])
+save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Werror -Xclang -fmodules-codegen"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
PCH_MODULES_CODEGEN="-Xclang -fmodules-codegen" ],[])
+CFLAGS=$save_CFLAGS
+if test -n "$PCH_MODULES_CODEGEN"; then
+AC_MSG_RESULT(yes)
+else
+AC_MSG_RESULT(no)
+fi
+CFLAGS=$save_CFLAGS
+fi
+AC_SUBST(PCH_MODULES_CODEGEN)
+PCH_MODULES_DEBUGINFO=
+if test -n "$BUILDING_PCH_WITH_OBJ"; then
+AC_MSG_CHECKING([whether $CC supports -Xclang -fmodules-debuginfo])
+save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Werror -Xclang -fmodules-debuginfo"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
PCH_MODULES_DEBUGINFO="-Xclang -fmodules-debuginfo" ],[])
+CFLAGS=$save_CFLAGS
+if test -n "$PCH_MODULES_DEBUGINFO"; then
+AC_MSG_RESULT(yes)
+else
+AC_MSG_RESULT(no)
+fi
+CFLAGS=$save_CFLAGS
+fi
+AC_SUBST(PCH_MODULES_DEBUGINFO)
+
 TAB=`printf '\t'`
 
 AC_MSG_CHECKING([the GNU Make version])
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 2ec7a66f3e25..f40d315b1c3b 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -89,8 +89,22 @@ gb_PrecompiledHeader_EXT := .gch
 endif
 
 # Clang supports building extra object file where it puts code that would be 
shared by all users of the PCH.
-# Unlike with MSVC it is built as a separate step.
+# Unlike with MSVC it is built as a separate step. The relevant options are 
used only when generating the PCH
+# and when creating the PCH's object file, normal compilations using the PCH 
do not need extra options.
 gb_PrecompiledHeader_pch_with_obj = $(BUILDING_PCH_WITH_OBJ)
+ifneq ($(BUILDING_PCH_WITH_OBJ),)
+# If using Clang's PCH extra object, we may need to strip unused sections, 
otherwise inline and template functions
+# emitted in that object may in some cases cause unresolved references to 
private symbols in other libraries.
+gb_LinkTarget_LDFLAGS += -Wl,--gc-sections
+gb_PrecompiledHeader_pch_with_obj += -ffunction-sections -fdata-sections
+# Enable generating more shared code and debuginfo in the PCH

[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac Repository.mk slideshow/CppunitTest_slideshow.mk slideshow/Library_slideshow.mk solenv/gbuild solenv/qa

2020-01-18 Thread Luboš Luňák (via logerrit)

 Repository.mk   |1 +
 config_host.mk.in   |1 +
 configure.ac|   15 +++
 slideshow/CppunitTest_slideshow.mk  |1 +
 slideshow/Library_slideshow.mk  |1 +
 solenv/gbuild/LinkTarget.mk |   22 +++---
 solenv/gbuild/PrecompiledHeaders.mk |2 +-
 solenv/gbuild/platform/com_GCC_class.mk |7 ++-
 solenv/qa/python/gbuildtojson.py|1 +
 9 files changed, 46 insertions(+), 5 deletions(-)

New commits:
commit 68c934c08401d1edbd89746dd0d554d7fc80665b
Author: Luboš Luňák 
AuthorDate: Fri Nov 8 21:00:48 2019 +0100
Commit: Luboš Luňák 
CommitDate: Sat Jan 18 14:56:25 2020 +0100

make Library_slideshow explicitly link svl

It already links svxcore, which pulls in svl, so make it explicit.
This fixes a tricky linking problem when using -fmodules-codegen.

Change-Id: I2422519cd87e0aeff2de2bdbb4fe33e6fd55f311
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87010
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/slideshow/CppunitTest_slideshow.mk 
b/slideshow/CppunitTest_slideshow.mk
index 030a4baa1fa5..ae17f66d8452 100644
--- a/slideshow/CppunitTest_slideshow.mk
+++ b/slideshow/CppunitTest_slideshow.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_CppunitTest_use_libraries,slideshow,\
 cppuhelper \
 sal \
 salhelper \
+svl \
 svt \
 svx \
 svxcore \
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 23b8b86ac311..58e169a05cbb 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,slideshow,\
 cppuhelper \
 sal \
 salhelper \
+svl \
 svt \
 svxcore \
 tl \
commit 7162d047941c721577b8719323fce7f3be5212fc
Author: Luboš Luňák 
AuthorDate: Sat Jun 22 15:09:39 2019 +0200
Commit: Luboš Luňák 
CommitDate: Sat Jan 18 14:56:12 2020 +0100

add support for Clang's -building-pch-with-obj

This marks the PCH as having an accompanying object file, and
this object file needs to be also built, but this allows the compiler
to skip generating stuff that'd be shared by all the objects using
the PCH. Currently it doesn't make much of a difference, few symbols
if any, but template instantiations could be shared this way, as
soon as Clang gets the necessary support (my WIP patch).

Change-Id: Ib1b86338d85a47b48979558435253dc2672a0da8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87009
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/Repository.mk b/Repository.mk
index 88941099db72..7372a01319eb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -542,6 +542,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
scqahelper \
unowinreg \
wpftqahelper \
+   precompiled_system \
$(if $(filter MSC,$(COM)),cli_cppuhelper) \
$(if $(filter $(OS),ANDROID),lo-bootstrap) \
$(if $(filter $(OS),MACOSX),OOoSpotlightImporter) \
diff --git a/config_host.mk.in b/config_host.mk.in
index 1cf941b4a5da..e1cddb295964 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -55,6 +55,7 @@ export BUILD_UNOWINREG=@BUILD_UNOWINREG@
 export BUILD_VER_STRING=@BUILD_VER_STRING@
 export BUILD_X64=@BUILD_X64@
 export BUILD_X86=@BUILD_X86@
+export BUILDING_PCH_WITH_OBJ=@BUILDING_PCH_WITH_OBJ@
 export BZIP2_CFLAGS=$(gb_SPACE)@BZIP2_CFLAGS@
 export BZIP2_LIBS=$(gb_SPACE)@BZIP2_LIBS@
 export CAIRO_CFLAGS=$(gb_SPACE)@CAIRO_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 04e110bc6133..1f7eb690b6cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5187,6 +5187,21 @@ if test -n "$ENABLE_PCH" -a -n "$CCACHE_DEPEND_MODE" -a 
"$GCC" = "yes" -a "$COM_
 fi
 fi
 
+BUILDING_PCH_WITH_OBJ=
+if test -n "$ENABLE_PCH"; then
+AC_MSG_CHECKING([whether $CC supports -Xclang -building-pch-with-obj])
+save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Werror -Xclang -building-pch-with-obj"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
BUILDING_PCH_WITH_OBJ="-Xclang -building-pch-with-obj" ],[])
+CFLAGS=$save_CFLAGS
+if test -n "$BUILDING_PCH_WITH_OBJ"; then
+AC_MSG_RESULT(yes)
+else
+AC_MSG_RESULT(no)
+fi
+fi
+AC_SUBST(BUILDING_PCH_WITH_OBJ)
+
 TAB=`printf '\t'`
 
 AC_MSG_CHECKING([the GNU Make version])
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 0cfa5a25c145..f3fa447a57bf 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -268,12 +268,14 @@ gb_CxxObject_get_source = $(1)/$(2).cxx
 # compiled with different flags and link that in rather than mixing different
 # flags in one linktarget. If OBJECT_HAS_EXTRA_CXXFLAGS is set, the object
 # has explicitly set additional CXXFLAGS, so in that case avoid using the PCH.
+# T_PCH_EXTRA_CXXFLAGS is used when some object requires extra

[Libreoffice-commits] core.git: sw/CppunitTest_sw_ooxmlexport8.mk sw/CppunitTest_sw_ooxmlimport2.mk sw/CppunitTest_sw_ooxmlimport.mk

2020-01-18 Thread Luboš Luňák (via logerrit)

 sw/CppunitTest_sw_ooxmlexport8.mk |2 ++
 sw/CppunitTest_sw_ooxmlimport.mk  |2 ++
 sw/CppunitTest_sw_ooxmlimport2.mk |2 ++
 3 files changed, 6 insertions(+)

New commits:
commit e1e9796f521e6fb7a043af410db754891559b24a
Author: Luboš Luňák 
AuthorDate: Sat Jan 18 14:05:24 2020 +0100
Commit: Luboš Luňák 
CommitDate: Sat Jan 18 14:57:05 2020 +0100

do not reuse common PCH if switching to Objective C++

In those cases gbuild detects flags mismatch between the PCH
and the source files (-x objective-c++ -fobjc-exceptions).

Change-Id: I88d456f59f95afaf60e252e07151ece6667ed51b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87016
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sw/CppunitTest_sw_ooxmlexport8.mk 
b/sw/CppunitTest_sw_ooxmlexport8.mk
index f873d05f8330..d5344cb1b78e 100644
--- a/sw/CppunitTest_sw_ooxmlexport8.mk
+++ b/sw/CppunitTest_sw_ooxmlexport8.mk
@@ -11,7 +11,9 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,sw_ooxmlexport8))
 
+ifneq ($(OS),MACOSX)
 $(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_ooxmlexport8))
+endif
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_ooxmlexport8, \
 sw/qa/extras/ooxmlexport/ooxmlexport8 \
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index 44d03956d688..c6d111e5acc9 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -11,7 +11,9 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,sw_ooxmlimport))
 
+ifneq ($(OS),MACOSX)
 $(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_ooxmlimport))
+endif
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_ooxmlimport, \
 sw/qa/extras/ooxmlimport/ooxmlimport \
diff --git a/sw/CppunitTest_sw_ooxmlimport2.mk 
b/sw/CppunitTest_sw_ooxmlimport2.mk
index dd0267663455..f47d7e35830b 100644
--- a/sw/CppunitTest_sw_ooxmlimport2.mk
+++ b/sw/CppunitTest_sw_ooxmlimport2.mk
@@ -11,7 +11,9 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,sw_ooxmlimport2))
 
+ifneq ($(OS),MACOSX)
 $(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_ooxmlimport2))
+endif
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_ooxmlimport2, \
 sw/qa/extras/ooxmlimport/ooxmlimport2 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-18 Thread Mike Kaganski (via logerrit)

 sw/source/uibase/docvw/edtwin.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0d2084e198717301da0678eae311f10e6a9c5d78
Author: Mike Kaganski 
AuthorDate: Sat Jan 18 12:27:37 2020 +0300
Commit: Mike Kaganski 
CommitDate: Sat Jan 18 15:52:33 2020 +0100

tdf#130066: reset calendar to today for word completion

Change-Id: I8a9c34fb0ae9174cace0df25b6b233ae3e0a3af6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87008
Reviewed-by: László Németh 
Tested-by: Jenkins

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index 4e51062da05a..c802664c8aeb 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5988,6 +5988,7 @@ void QuickHelpData::FillStrArr( SwWrtShell const & rSh, 
const OUString& rWord )
 
 if (rWord[0] == '2')
 {
+(*pCalendar)->setGregorianDateTime(Date(Date::SYSTEM)); // tdf#130066: 
reset today
 OUStringBuffer rStr("");
 rStr.append(sal::static_int_cast< sal_Int32 
>((*pCalendar)->getValue(i18n::CalendarFieldIndex::YEAR))).append("-");
 sal_Int32 nMonth = sal::static_int_cast< sal_Int32 
>((*pCalendar)->getValue(i18n::CalendarFieldIndex::MONTH)+1);
___
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 solenv/gbuild

2020-01-18 Thread Luboš Luňák (via logerrit)

 config_host.mk.in   |1 +
 configure.ac|   23 +++
 solenv/gbuild/platform/com_GCC_class.mk |2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 4a93a7954e49b42b0e23a9ca8d962b6d4614b005
Author: Luboš Luňák 
AuthorDate: Sat Jan 18 15:44:45 2020 +0100
Commit: Luboš Luňák 
CommitDate: Sat Jan 18 16:55:55 2020 +0100

use -Wl,-dead_strip on Mac, its linker doesn't know -Wl,--gc-sections

Change-Id: Ic69d0030a46fe4753cc75da58bb2c15cf009b135
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87023
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/config_host.mk.in b/config_host.mk.in
index 2c5eec97a156..88a529da664a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -318,6 +318,7 @@ export KF5_LIBS=$(gb_SPACE)@KF5_LIBS@
 export KRB5_LIBS=@KRB5_LIBS@
 export LCMS2_CFLAGS=$(gb_SPACE)@LCMS2_CFLAGS@
 export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@
+export LD_GC_SECTIONS=@LD_GC_SECTIONS@
 export LD_PLUGIN=@LD_PLUGIN@
 @x_LDFLAGS@ export LDFLAGS=@LDFLAGS@
 export LFS_CFLAGS=@LFS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 5b9fd601ef9e..5c1dc1e5f919 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4062,6 +4062,29 @@ printf ("hello world\n");
 fi
 AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
 
+LD_GC_SECTIONS=
+if test "$GCC" = "yes"; then
+for flag in "--gc-sections" "-dead_strip"; do
+AC_MSG_CHECKING([for $flag linker support])
+ldflags_save=$LDFLAGS
+LDFLAGS="$LDFLAGS -Wl,$flag"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([
+#include 
+],[
+printf ("hello world\n");
+])],[
+LD_GC_SECTIONS="-Wl,$flag"
+AC_MSG_RESULT( found )
+], [
+AC_MSG_RESULT( not found )
+])
+LDFLAGS=$ldflags_save
+if test -n "$LD_GC_SECTIONS"; then
+break
+fi
+done
+fi
+AC_SUBST(LD_GC_SECTIONS)
 
 HAVE_GSPLIT_DWARF=
 if test "$enable_split_debug" != no; then
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index f40d315b1c3b..12ae0a21537e 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -95,7 +95,7 @@ gb_PrecompiledHeader_pch_with_obj = $(BUILDING_PCH_WITH_OBJ)
 ifneq ($(BUILDING_PCH_WITH_OBJ),)
 # If using Clang's PCH extra object, we may need to strip unused sections, 
otherwise inline and template functions
 # emitted in that object may in some cases cause unresolved references to 
private symbols in other libraries.
-gb_LinkTarget_LDFLAGS += -Wl,--gc-sections
+gb_LinkTarget_LDFLAGS += $(LD_GC_SECTIONS)
 gb_PrecompiledHeader_pch_with_obj += -ffunction-sections -fdata-sections
 # Enable generating more shared code and debuginfo in the PCH object file.
 gb_PrecompiledHeader_pch_with_obj += $(PCH_MODULES_DEBUGINFO)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: unotools/Library_utl.mk

2020-01-18 Thread Luboš Luňák (via logerrit)

 unotools/Library_utl.mk |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 52a26b146542526dc4f6bb193ffb4fd95e4f79fd
Author: Luboš Luňák 
AuthorDate: Sat Jan 18 14:38:59 2020 +0100
Commit: Luboš Luňák 
CommitDate: Sat Jan 18 16:56:25 2020 +0100

fix unotools/source/i18n/resmgr.cxx build with PCH on Mac

When a PCH is used, those #defines come too late if they are
in the source file, set them using the command line.

Change-Id: I361503db7c9e51c2cf5fdcdda2861d1377b81fa5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87020
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index cdc4b38f96ae..e36d291db0f0 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -96,7 +96,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
 unotools/source/i18n/localedatawrapper \
 unotools/source/i18n/nativenumberwrapper \
 unotools/source/i18n/readwritemutexguard \
-unotools/source/i18n/resmgr \
 unotools/source/i18n/textsearch \
 unotools/source/i18n/transliterationwrapper \
 unotools/source/misc/closeveto \
@@ -123,4 +122,10 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
 unotools/source/ucbhelper/xtempfile \
 ))
 
+# see the source file
+$(eval $(call gb_Library_add_exception_objects,utl,\
+unotools/source/i18n/resmgr, \
+-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR= -D_HAS_AUTO_PTR_ETC=1 \
+))
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-18 Thread Kemal Ayhan (via logerrit)

 sd/source/core/drawdoc4.cxx|3 +
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |   13 +-
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx |   14 ++
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx |   62 -
 4 files changed, 31 insertions(+), 61 deletions(-)

New commits:
commit c59c1a9170e9510a18a084cd90289b6a7d8b87e4
Author: Kemal Ayhan 
AuthorDate: Fri Jan 10 21:56:17 2020 +0300
Commit: Mike Kaganski 
CommitDate: Sat Jan 18 17:21:04 2020 +0100

tdf#129423: Make export tests export-only where applicable

Change-Id: I90e9c8e199ae0e7d6e8f63b3f425847b3f5779d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86574
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index a7803e1aad75..52484bffa02f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -215,11 +215,9 @@ 
DECLARE_OOXMLEXPORT_TEST(testTdf120412_400PercentSubscript, "tdf120412_400Percen
 CPPUNIT_ASSERT_DOUBLES_EQUAL( -400.f, getProperty(getRun(xPara, 2, 
"Subscript"), "CharEscapement"), 0);
 }
 
-DECLARE_OOXMLEXPORT_TEST(testFontEsc, "test_tdf120412.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFontEsc, "test_tdf120412.docx")
 {
 xmlDocPtr pXmlDoc =parseExport("word/document.xml");
-if (!pXmlDoc)
-return;
 // don't lose the run with superscript formatting
 assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r", 2);
 // Superscript should be raised by 100% (11pt). Was 110% (12pt)
@@ -372,13 +370,12 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69649, "fdo69649.docx")
 CPPUNIT_ASSERT(aTocString.startsWithIgnoreAsciiCase( "15" ) );
 }
 
-DECLARE_OOXMLEXPORT_TEST(testFdo73389,"fdo73389.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFdo73389,"fdo73389.docx")
 {
 // The width of the inner table was too large. The first fix still 
converted
 // the "auto" table width to a fixed one. The recent fix uses variable 
width.
 xmlDocPtr pXmlDoc = parseExport();
-if (!pXmlDoc)
-return;
+
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tblPr/w:tblW","type","pct");
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tblPr/w:tblW","w","5000");
 }
@@ -595,12 +592,10 @@ DECLARE_OOXMLEXPORT_TEST(testGridBefore, 
"gridbefore.docx")
 CPPUNIT_ASSERT( leftA3.toInt32() > leftB2.toInt32());
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTdf116194, "tdf116194.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf116194, "tdf116194.docx")
 {
 // The problem was that the importer lost consecutive tables with 
w:gridBefore
 xmlDocPtr pXmlDoc = parseExport();
-if (!pXmlDoc)
-return;
 assertXPath(pXmlDoc, "/w:document/w:body/w:tbl", 2);
 }
 
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index 908faf14e22a..a317e9e977c5 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -855,11 +855,9 @@ DECLARE_OOXMLEXPORT_TEST(testWatermarkTrim, 
"tdf114308.docx")
 CPPUNIT_ASSERT_MESSAGE(ss.str(), nDifference >= -4);
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTdf73547, "tdf73547-dash.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf73547, "tdf73547-dash.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
-return;
 double nD = getXPath(pXmlDoc, "//a:custDash/a:ds[1]", "d").toDouble();
 CPPUNIT_ASSERT_DOUBLES_EQUAL(105000.0, nD, 5000.0); // was 10
 double nSp = getXPath(pXmlDoc, "//a:custDash/a:ds[1]", "sp").toDouble();
@@ -911,11 +909,10 @@ DECLARE_OOXMLEXPORT_TEST(testTdf117137, "tdf117137.docx")
 CPPUNIT_ASSERT(xPara3->getPropertyValue("NumberingRules").hasValue());
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTdf99631, "tdf99631.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf99631, "tdf99631.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
-return;
+
 assertXPath(pXmlDoc, "//w:object", 2);
 assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r/w:object", 2);
 // first XSLX OLE object (1:1 scale)
@@ -926,11 +923,10 @@ DECLARE_OOXMLEXPORT_TEST(testTdf99631, "tdf99631.docx")
 assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:object[1]", 
"dyaOrig", "768");
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTdf122563, "tdf122563.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf122563, "tdf122563.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
-return;
+
 assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r/w:object", 1);
 // Size of the embedded OLE spreadsheet was the bad 
"width:28.35pt;height:28.35pt"
 assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[1]/w:object/v:shape", 
"style",
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index

[Libreoffice-commits] online.git: common/SigUtil.cpp

2020-01-18 Thread Michael Meeks (via logerrit)

 common/SigUtil.cpp |   20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

New commits:
commit b72f37826edf742eb7d9cf4fd0ac73b2a2e2096b
Author: Michael Meeks 
AuthorDate: Fri Jan 17 19:03:23 2020 +
Commit: Michael Meeks 
CommitDate: Sat Jan 18 17:23:02 2020 +0100

sighandler: break infinite loop with corrupted heap

ignoring the segv can lead to not making progress, while churning debug.

Change-Id: I97af266cec3feefe2dcbd9adb8dbf4b13a4d69bd
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87002
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/common/SigUtil.cpp b/common/SigUtil.cpp
index 8fe38b721..881326df5 100644
--- a/common/SigUtil.cpp
+++ b/common/SigUtil.cpp
@@ -237,19 +237,16 @@ namespace SigUtil
 void handleFatalSignal(const int signal)
 {
 SigHandlerTrap guard;
-if (!guard.isExclusive())
-{
-Log::signalLogPrefix();
-Log::signalLog(" Fatal double signal received: ");
-Log::signalLog(signalName(signal));
-Log::signalLog("\n Already handling a signal; will ignore this.");
-return;
-}
+bool bReEntered = !guard.isExclusive();
 
 Log::signalLogPrefix();
-Log::signalLog(" Fatal signal received: ");
+
+// Heap corruption can re-enter through backtrace.
+if (bReEntered)
+Log::signalLog(" Fatal double signal received: ");
+else
+Log::signalLog(" Fatal signal received: ");
 Log::signalLog(signalName(signal));
-Log::signalLog("\n");
 
 struct sigaction action;
 
@@ -259,7 +256,8 @@ namespace SigUtil
 
 sigaction(signal, &action, nullptr);
 
-dumpBacktrace();
+if (!bReEntered)
+dumpBacktrace();
 
 // let default handler process the signal
 kill(getpid(), signal);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'feature/paralleltest' - 6 commits - common/FileUtil.cpp common/FileUtil.hpp common/SigUtil.cpp common/Unit.cpp common/Unit.hpp kit/ForKit.cpp test/helpers.hpp

2020-01-18 Thread Michael Meeks (via logerrit)

Rebased ref, commits from common ancestor:
commit e9c3e0752b8c00cab931dcf109ed81418f801242
Author: Michael Meeks 
AuthorDate: Fri Jan 17 21:18:42 2020 +
Commit: Michael Meeks 
CommitDate: Sat Jan 18 16:40:05 2020 +

test: dung out redundant LOOL_TEST_CLIENT_PORT.

And cleanup other related oddities.

Change-Id: I2d179a2ece6a8553e10e406ad4e5da08a2ff58e5

diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp
index 164489589..ac0191e33 100644
--- a/kit/ForKit.cpp
+++ b/kit/ForKit.cpp
@@ -396,15 +396,6 @@ int main(int argc, char** argv)
 std::string sysTemplate;
 std::string loTemplate;
 
-#if ENABLE_DEBUG
-static const char* clientPort = std::getenv("LOOL_TEST_CLIENT_PORT");
-if (clientPort)
-ClientPortNumber = std::stoi(clientPort);
-static const char* masterPort = std::getenv("LOOL_TEST_MASTER_PORT");
-if (masterPort)
-MasterLocation = masterPort;
-#endif
-
 for (int i = 0; i < argc; ++i)
 {
 char *cmd = argv[i];
diff --git a/test/Makefile.am b/test/Makefile.am
index 2b369465a..e10cb7d8c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,12 +2,10 @@
 export MAX_CONCURRENCY=4
 AUTOMAKE_OPTION = serial-tests
 
-# unittest: tests that do not need loolwsd running, and that are run during a
-# normal build
-# test: tests that need loolwsd running, and that are run via 'make check'
-check_PROGRAMS = test fakesockettest
+# unittest: tests that run a captive loolwsd as part of themselves.
+check_PROGRAMS = fakesockettest
 
-noinst_PROGRAMS = test fakesockettest unittest
+noinst_PROGRAMS = fakesockettest unittest
 
 AM_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTDOC=\"$(abs_top_srcdir)/test/data\" \
-I${top_srcdir}/common -I${top_srcdir}/net -I${top_srcdir}/wsd 
-I${top_srcdir}/kit
@@ -87,10 +85,6 @@ unittest_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS
 unittest_SOURCES = $(test_base_source) test.cpp
 unittest_LDADD = $(CPPUNIT_LIBS)
 
-test_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS
-test_SOURCES = $(test_all_source) test.cpp
-test_LDADD = $(CPPUNIT_LIBS)
-
 fakesockettest_SOURCES = fakesockettest.cpp ../net/FakeSocket.cpp
 fakesockettest_LDADD = $(CPPUNIT_LIBS)
 
diff --git a/test/helpers.hpp b/test/helpers.hpp
index dd638d191..19bd8804d 100644
--- a/test/helpers.hpp
+++ b/test/helpers.hpp
@@ -187,12 +187,15 @@ Poco::Net::HTTPClientSession* createSession(const 
Poco::URI& uri)
 return new Poco::Net::HTTPClientSession(uri.getHost(), uri.getPort());
 }
 
+#ifndef UNIT_CLIENT_TESTS
+
 inline int getClientPort()
 {
-static const char* clientPort = std::getenv("LOOL_TEST_CLIENT_PORT");
-return clientPort? atoi(clientPort) : DEFAULT_CLIENT_PORT_NUMBER;
+return DEFAULT_CLIENT_PORT_NUMBER;
 }
 
+#endif
+
 inline std::shared_ptr createRawSocket()
 {
 return
diff --git a/test/integration-http-server.cpp b/test/integration-http-server.cpp
index 4db04737a..5d9342b76 100644
--- a/test/integration-http-server.cpp
+++ b/test/integration-http-server.cpp
@@ -92,15 +92,13 @@ public:
 // A server URI which was not added to loolwsd.xml as post_allow IP or a 
wopi storage host
 Poco::URI getNotAllowedTestServerURI()
 {
-static const char* clientPort = std::getenv("LOOL_TEST_CLIENT_PORT");
-
 static std::string serverURI(
 #if ENABLE_SSL
-"https://165.227.162.232:";
+"https://165.227.162.232:9980";
 #else
-"http://165.227.162.232:";
+"http://165.227.162.232:9980";
 #endif
-+ (clientPort? std::string(clientPort) : 
std::to_string(DEFAULT_CLIENT_PORT_NUMBER)));
+);
 
 return Poco::URI(serverURI);
 }
diff --git a/test/run_unit.sh.in b/test/run_unit.sh.in
index 5fb8a6936..4b893f23c 100755
--- a/test/run_unit.sh.in
+++ b/test/run_unit.sh.in
@@ -70,55 +70,10 @@ fi
 echo "Test output is '$test_output'"
 echo > $test_output
 
-if test "z$tst" == "z"; then
- # run the test on a dedicated port
- export LOOL_TEST_CLIENT_PORT=9984
- export LOOL_TEST_MASTER_PORT=9985
-
- echo "Executing external tests"
- ${trace} \
- ${abs_top_builddir}/loolwsd --o:sys_template_path="$systemplate_path" \
- --o:child_root_path="$jails_path" \
- --o:storage.filesystem[@allow]=true \
- --o:logging.level=trace \
- --o:logging.file[@enable]=false \
- 
--o:ssl.key_file_path="${abs_top_builddir}/etc/key.pem" \
- 
--o:ssl.cert_file_path="${abs_top_builddir}/etc/cert.pem" \
- 
--o:ssl.ca_file_path="${abs_top_builddir}/etc/ca-chain.cert.pem" \
- --o:admin_console.username=admin 
--o:admin_console.password=admin \
- --o:storage.ssl.enable=false \
- > "$tst_log" 2>&1 &
- if test "z${SLEEPFORDEBUGGER}${SLEEPKITFORDEBUGGER}" != "

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

2020-01-18 Thread Dennis Francis (via logerrit)

 loleaflet/src/layer/tile/CalcTileLayer.js |1 +
 loleaflet/src/layer/tile/GridLayer.js |3 +++
 2 files changed, 4 insertions(+)

New commits:
commit 3af2346bbb97f9b8588099b2ab6d0eb9117c84b3
Author: Dennis Francis 
AuthorDate: Fri Jan 17 16:59:02 2020 +0530
Commit: Dennis Francis 
CommitDate: Sat Jan 18 17:42:24 2020 +0100

Request comment positions when zooming/view reset

The twips coordinates sent by core in CommentsPos message are already
correct w.r.t zoom level (See ScModelObj::getPostItsPos() in core.git).
In addition these values are view specific (each client user).

Change-Id: I18c2971f34362de0eba5181f9dbe3e662c223575
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86986
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index a1847dd8e..697622b35 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -577,6 +577,7 @@ L.CalcTileLayer = L.TileLayer.extend({
this._sendClientZoom();
// TODO: test it!
this._map.fire('updaterowcolumnheaders');
+   this._map._socket.sendMessage('commandvalues 
command=.uno:ViewAnnotationsPosition');
},
 
_onUpdateCurrentHeader: function() {
diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index 4db50a473..ee8b4c9de 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -322,6 +322,9 @@ L.GridLayer = L.Layer.extend({
 
_viewReset: function (e) {
this._reset(this._map.getCenter(), this._map.getZoom(), e && 
e.hard);
+   if (this._docType === 'spreadsheet' && this._annotations !== 
'undefined') {
+   this._map._socket.sendMessage('commandvalues 
command=.uno:ViewAnnotationsPosition');
+   }
},
 
_animateZoom: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/Auth.cpp wsd/Auth.hpp wsd/LOOLWSD.cpp

2020-01-18 Thread Michael Meeks (via logerrit)

 wsd/Auth.cpp|9 -
 wsd/Auth.hpp|7 +--
 wsd/LOOLWSD.cpp |1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 8cca6dcac8753865f5cea693141a20fec1ea3600
Author: Michael Meeks 
AuthorDate: Sat Jan 18 16:36:50 2020 +
Commit: Michael Meeks 
CommitDate: Sat Jan 18 19:26:10 2020 +0100

Cleanup JWTAuth token before shutdown.

valgrind had some exciting double-free action on unclean shutdown.

Change-Id: Id7dd3d8ff60387ae51521bd2c74e4d6bcc30ff2e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87025
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/wsd/Auth.cpp b/wsd/Auth.cpp
index 01f9e4f43..2ffa17b39 100644
--- a/wsd/Auth.cpp
+++ b/wsd/Auth.cpp
@@ -37,7 +37,14 @@ using Poco::Base64Decoder;
 using Poco::Base64Encoder;
 using Poco::OutputLineEndingConverter;
 
-const Poco::Crypto::RSAKey 
JWTAuth::_key(Poco::Crypto::RSAKey(Poco::Crypto::RSAKey::KL_2048, 
Poco::Crypto::RSAKey::EXP_LARGE));
+std::unique_ptr JWTAuth::_key(
+new 
Poco::Crypto::RSAKey(Poco::Crypto::RSAKey(Poco::Crypto::RSAKey::KL_2048, 
Poco::Crypto::RSAKey::EXP_LARGE)));
+
+// avoid obscure doublef rees on exit.
+void JWTAuth::cleanup()
+{
+_key.reset();
+}
 
 const std::string JWTAuth::getAccessToken()
 {
diff --git a/wsd/Auth.hpp b/wsd/Auth.hpp
index 1220aee21..00256fb1f 100644
--- a/wsd/Auth.hpp
+++ b/wsd/Auth.hpp
@@ -13,6 +13,7 @@
 
 #include 
 #include 
+#include 
 
 #if !MOBILEAPP
 #include 
@@ -43,7 +44,7 @@ public:
 : _name(name),
   _sub(sub),
   _aud(aud),
-  _digestEngine(_key, "SHA256")
+  _digestEngine(*_key, "SHA256")
 {
 }
 
@@ -51,6 +52,8 @@ public:
 
 bool verify(const std::string& accessToken) override;
 
+static void cleanup();
+
 private:
 const std::string createHeader();
 
@@ -65,7 +68,7 @@ private:
 const std::string _sub;
 const std::string _aud;
 
-static const Poco::Crypto::RSAKey _key;
+static std::unique_ptr _key;
 Poco::Crypto::RSADigestEngine _digestEngine;
 };
 
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 0538759ba..3b45fd3de 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3592,6 +3592,7 @@ void LOOLWSD::cleanup()
 {
 #if !MOBILEAPP
 FileServerRequestHandler::uninitialize();
+JWTAuth::cleanup();
 
 #if ENABLE_SSL
 // Finally, we no longer need SSL.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/FileUtil.cpp common/FileUtil.hpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp

2020-01-18 Thread Michael Meeks (via logerrit)

 common/FileUtil.cpp |   24 
 common/FileUtil.hpp |   10 ++
 wsd/LOOLWSD.cpp |9 +
 wsd/LOOLWSD.hpp |6 +++---
 4 files changed, 42 insertions(+), 7 deletions(-)

New commits:
commit e6a3364e9367bbf833ab4bf2265a04ee8c010324
Author: Michael Meeks 
AuthorDate: Fri Jan 17 22:31:41 2020 +
Commit: Michael Meeks 
CommitDate: Sat Jan 18 20:05:35 2020 +0100

Move file url anonymization down from LOOLWSD into FileUtil.

Change-Id: I415c73b10621d5c7c942367bbf38a3bbd9bf8f27
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87024
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/common/FileUtil.cpp b/common/FileUtil.cpp
index f94911606..5066d2938 100644
--- a/common/FileUtil.cpp
+++ b/common/FileUtil.cpp
@@ -343,6 +343,30 @@ namespace FileUtil
 return true;
 }
 
+namespace {
+bool AnonymizeUserData = false;
+std::uint64_t AnonymizationSalt = 82589933;
+}
+
+void setUrlAnonymization(bool anonymize, const std::uint64_t salt)
+{
+AnonymizeUserData = anonymize;
+AnonymizationSalt = salt;
+}
+
+/// Anonymize the basename of filenames, preserving the path and extension.
+std::string anonymizeUrl(const std::string& url)
+{
+return AnonymizeUserData ? Util::anonymizeUrl(url, AnonymizationSalt) 
: url;
+}
+
+/// Anonymize user names and IDs.
+/// Will use the Obfuscated User ID if one is provied via WOPI.
+std::string anonymizeUsername(const std::string& username)
+{
+return AnonymizeUserData ? Util::anonymize(username, 
AnonymizationSalt) : username;
+}
+
 } // namespace FileUtil
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/FileUtil.hpp b/common/FileUtil.hpp
index 84b42f65c..a57aa5414 100644
--- a/common/FileUtil.hpp
+++ b/common/FileUtil.hpp
@@ -17,6 +17,16 @@
 
 namespace FileUtil
 {
+/// Used for anonymizing URLs
+void setUrlAnonymization(bool anonymize, const std::uint64_t salt);
+
+/// Anonymize the basename of filenames, preserving the path and extension.
+std::string anonymizeUrl(const std::string& url);
+
+/// Anonymize user names and IDs.
+/// Will use the Obfuscated User ID if one is provied via WOPI.
+std::string anonymizeUsername(const std::string& username);
+
 /// Create a secure, random directory path.
 std::string createRandomDir(const std::string& path);
 
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 3b45fd3de..e39bfa9d0 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -716,7 +716,6 @@ std::string LOOLWSD::ConfigFile = LOOLWSD_CONFIGDIR 
"/loolwsd.xml";
 std::string LOOLWSD::ConfigDir = LOOLWSD_CONFIGDIR "/conf.d";
 std::string LOOLWSD::LogLevel = "trace";
 bool LOOLWSD::AnonymizeUserData = false;
-std::uint64_t LOOLWSD::AnonymizationSalt = 82589933;
 #if ENABLE_SSL
 Util::RuntimeConstant LOOLWSD::SSLEnabled;
 Util::RuntimeConstant LOOLWSD::SSLTermination;
@@ -1003,14 +1002,16 @@ void LOOLWSD::initialize(Application& self)
 }
 }
 
+std::uint64_t anonymizationSalt = 82589933;
 LOG_INF("Anonymization of user-data is " << (AnonymizeUserData ? 
"enabled." : "disabled."));
 if (AnonymizeUserData)
 {
 // Get the salt, if set, otherwise default, and set as envar, so the 
kits inherit it.
-AnonymizationSalt = getConfigValue(conf, 
"logging.anonymize.anonymization_salt", 82589933);
-const std::string sAnonymizationSalt = 
std::to_string(AnonymizationSalt);
-setenv("LOOL_ANONYMIZATION_SALT", sAnonymizationSalt.c_str(), true);
+anonymizationSalt = getConfigValue(conf, 
"logging.anonymize.anonymization_salt", 82589933);
+const std::string anonymizationSaltStr = 
std::to_string(anonymizationSalt);
+setenv("LOOL_ANONYMIZATION_SALT", anonymizationSaltStr.c_str(), true);
 }
+FileUtil::setUrlAnonymization(AnonymizeUserData, anonymizationSalt);
 
 {
 std::string proto = getConfigValue(conf, "net.proto", "");
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 6e35bd796..71ddb2155 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -24,6 +24,7 @@
 #include 
 
 #include "Util.hpp"
+#include "FileUtil.hpp"
 
 class ChildProcess;
 class TraceFileWriter;
@@ -67,7 +68,6 @@ public:
 static std::string HostIdentifier; ///< A unique random hash that 
identifies this server
 static std::string LogLevel;
 static bool AnonymizeUserData;
-static std::uint64_t AnonymizationSalt;
 static std::atomic NumConnections;
 static std::unique_ptr TraceDumper;
 #if !MOBILEAPP
@@ -184,14 +184,14 @@ public:
 /// Anonymize the basename of filenames, preserving the path and extension.
 static std::string anonymizeUrl(const std::string& url)
 {
-return AnonymizeUserData ? Util::anonymizeUrl(url, AnonymizationSalt) 
: url;
+return FileUtil::anonymizeUrl(url);
 }
 
 /// Anonymize u

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

2020-01-18 Thread Caolán McNamara (via logerrit)

 vcl/unx/gtk3/gtk3gtkinst.cxx |   41 +++--
 1 file changed, 35 insertions(+), 6 deletions(-)

New commits:
commit 0b240f9e1487ea13677e93ecaa7099f68ff63a3e
Author: Caolán McNamara 
AuthorDate: Sat Jan 18 17:21:43 2020 +
Commit: Caolán McNamara 
CommitDate: Sat Jan 18 20:21:42 2020 +0100

Resolves: tdf#130070 keep dropdown menu fully on screen

if possible

Change-Id: I2ec3b54516ec713421288a4a30a9a7296c8d3e75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87026
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index f4424ac18e5c..fdc09fa45581 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3536,6 +3536,16 @@ namespace
 gtk_container_forall(GTK_CONTAINER(pItem), 
do_collect_screenshot_data, data);
 }
 
+tools::Rectangle get_monitor_workarea(GtkWidget* pWindow)
+{
+GdkScreen* pScreen = gtk_widget_get_screen(pWindow);
+gint nMonitor = gdk_screen_get_monitor_at_window(pScreen, 
gtk_widget_get_window(pWindow));
+GdkRectangle aRect;
+gdk_screen_get_monitor_workarea(pScreen, nMonitor, &aRect);
+return tools::Rectangle(aRect.x, aRect.y, aRect.x + aRect.width, 
aRect.y + aRect.height);
+}
+
+
 class GtkInstanceWindow : public GtkInstanceContainer, public virtual 
weld::Window
 {
 private:
@@ -3634,11 +3644,7 @@ public:
 
 virtual tools::Rectangle get_monitor_workarea() const override
 {
-GdkScreen* pScreen = gtk_widget_get_screen(GTK_WIDGET(m_pWindow));
-gint nMonitor = gdk_screen_get_monitor_at_window(pScreen, 
gtk_widget_get_window(GTK_WIDGET(m_pWindow)));
-GdkRectangle aRect;
-gdk_screen_get_monitor_workarea(pScreen, nMonitor, &aRect);
-return tools::Rectangle(aRect.x, aRect.y, aRect.x + aRect.width, 
aRect.y + aRect.height);
+return ::get_monitor_workarea(GTK_WIDGET(m_pWindow));
 }
 
 virtual void set_centered_on_parent(bool bTrackGeometryRequests) override
@@ -6521,12 +6527,35 @@ private:
 gtk_widget_translate_coordinates(GTK_WIDGET(m_pMenuButton), 
pToplevel, 0, 0, &x, &y);
 GdkWindow *pWindow = gtk_widget_get_window(pToplevel);
 gdk_window_get_position(pWindow, &absx, &absy);
+x += absx;
+y += absy;
+
+gint nButtonHeight = 
gtk_widget_get_allocated_height(GTK_WIDGET(m_pMenuButton));
+y += nButtonHeight;
 
 
gtk_window_group_add_window(gtk_window_get_group(GTK_WINDOW(pToplevel)), 
m_pMenuHack);
 gtk_window_set_transient_for(m_pMenuHack, GTK_WINDOW(pToplevel));
 
 gtk_widget_show_all(GTK_WIDGET(m_pMenuHack));
-gtk_window_move(m_pMenuHack, x + absx, y + absy + 
gtk_widget_get_allocated_height(GTK_WIDGET(m_pMenuButton)));
+
+tools::Rectangle 
aWorkArea(::get_monitor_workarea(GTK_WIDGET(m_pMenuHack)));
+gint endx = x + 
gtk_widget_get_allocated_width(GTK_WIDGET(m_pMenuHack));
+if (endx > aWorkArea.Right())
+{
+x -= endx - aWorkArea.Right();
+if (x < 0)
+x = 0;
+}
+gint nMenuHeight = 
gtk_widget_get_allocated_height(GTK_WIDGET(m_pMenuHack));
+gint endy = y + nMenuHeight;
+if (endy > aWorkArea.Bottom())
+{
+y -= nButtonHeight + nMenuHeight;
+if (y < 0)
+y = 0;
+}
+
+gtk_window_move(m_pMenuHack, x, y);
 
 gtk_widget_grab_focus(GTK_WIDGET(m_pMenuHack));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-18 Thread Caolán McNamara (via logerrit)

 cui/uiconfig/ui/gallerythemedialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c5196ec5d163ecb6086bc6f1a3f6d7bd5fb7915a
Author: Caolán McNamara 
AuthorDate: Sat Jan 18 17:32:11 2020 +
Commit: Caolán McNamara 
CommitDate: Sat Jan 18 20:21:30 2020 +0100

gallery theme dialog should be modal

Change-Id: I3c32851cda40254c73b0040f92466eedb7427d6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87027
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/cui/uiconfig/ui/gallerythemedialog.ui 
b/cui/uiconfig/ui/gallerythemedialog.ui
index 993300859180..00c472d92d3f 100644
--- a/cui/uiconfig/ui/gallerythemedialog.ui
+++ b/cui/uiconfig/ui/gallerythemedialog.ui
@@ -7,6 +7,7 @@
 6
 Properties of %1
 False
+True
 dialog
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - external/nss

2020-01-18 Thread Stephan Bergmann (via logerrit)

 external/nss/UnpackedTarball_nss.mk |1 +
 external/nss/macos-dlopen.patch.0   |   25 +
 2 files changed, 26 insertions(+)

New commits:
commit 5fd80277366bf3c41767981722e6cc316f858ead
Author: Stephan Bergmann 
AuthorDate: Fri Jan 17 11:13:43 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jan 18 20:23:11 2020 +0100

tdf#127619: external/nss: Load smime3 lib with a path on macOS

A plain dlopen("libsmime3.dylib",...) would search (among other places)
DYLD_FALLBACK_LIBRARY_PATH, which when unset defaults to a set of paths
including /usr/local/lib (so would erroneously find Homebrew's
/usr/local/lib/libsmime3.dylib instead of LO's
LibreOffice.app/Contents/Frameworks/libsmime3.dylib next to the calling
LibreOffice.app/Contents/Frameworks/libnspr4.dylib).

At least macOS 10.15.2 supports a "@loader_path/" prefix in dlopen, to find 
the
requested library next to the calling code, so use that as a quick fix.  
(Should
that turn out to be problematic, there is PORT_LoadLibraryFromOrigin in
workdir/UnpackedTarball/nss/nss/lib/util/secload.c that might be useful in a
more elaborate fix.)

Change-Id: I8688606017a4b32a2dd55740f67b8fdb36fc5435
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86966
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit a3ca9b88b4b38c008efa868844ba7a3105b4bcca)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86971
Reviewed-by: Caolán McNamara 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 3079216b674e..0e174879a702 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
$(if $(filter ANDROID,$(OS)), \
external/nss/nss-android.patch.1) \
external/nss/nss.bzmozilla1238154.patch \
+external/nss/macos-dlopen.patch.0 \
 ))
 
 ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/external/nss/macos-dlopen.patch.0 
b/external/nss/macos-dlopen.patch.0
new file mode 100644
index ..8c484e4c6841
--- /dev/null
+++ b/external/nss/macos-dlopen.patch.0
@@ -0,0 +1,25 @@
+--- nspr/pr/src/linking/prlink.c
 nspr/pr/src/linking/prlink.c
+@@ -793,7 +793,7 @@
+ /* ensure the file exists if it contains a slash character i.e. path 
*/
+ /* DARWIN's dlopen ignores the provided path and checks for the */
+ /* plain filename in DYLD_LIBRARY_PATH */
+-if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL ||
++if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL || strncmp(name, 
"@loader_path/", 13) == 0 ||
+ PR_Access(name, PR_ACCESS_EXISTS) == PR_SUCCESS) {
+ h = dlopen(name, dl_flags);
+ }
+--- nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
 nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
+@@ -224,7 +224,11 @@
+ static PRStatus PR_CALLBACK pkix_getDecodeFunction(void)
+ {
+ pkix_decodeFunc.smimeLib = 
++#if defined DARWIN
++  PR_LoadLibrary("@loader_path/" 
SHLIB_PREFIX"smime3."SHLIB_SUFFIX);
++#else
+   PR_LoadLibrary(SHLIB_PREFIX"smime3."SHLIB_SUFFIX);
++#endif
+ if (pkix_decodeFunc.smimeLib == NULL) {
+   return PR_FAILURE;
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - cui/uiconfig

2020-01-18 Thread Caolán McNamara (via logerrit)

 cui/uiconfig/ui/gallerythemedialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6d1cc107dd729e667d866e17d977cc94ce76d887
Author: Caolán McNamara 
AuthorDate: Sat Jan 18 17:32:11 2020 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Jan 18 20:25:40 2020 +0100

gallery theme dialog should be modal

Change-Id: I3c32851cda40254c73b0040f92466eedb7427d6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87028
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/uiconfig/ui/gallerythemedialog.ui 
b/cui/uiconfig/ui/gallerythemedialog.ui
index 993300859180..00c472d92d3f 100644
--- a/cui/uiconfig/ui/gallerythemedialog.ui
+++ b/cui/uiconfig/ui/gallerythemedialog.ui
@@ -7,6 +7,7 @@
 6
 Properties of %1
 False
+True
 dialog
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-18 Thread Mike Kaganski (via logerrit)

 sw/qa/extras/unowriter/unowriter.cxx |   23 +++
 sw/source/core/unocore/unotbl.cxx|3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit a031dc687bb35aa42835e0b4aa046250795d8fc0
Author: Mike Kaganski 
AuthorDate: Mon Jan 6 21:29:54 2020 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Jan 18 20:29:56 2020 +0100

tdf#129839: pass initialized shared_ptr to SwDoc::GetBoxAttr

Regression after commit 1e2682235cded9a7cd90e55f0bfc60a1285e9a46

Change-Id: I40acc9e0ffdd292283381366a31eb6647b80324f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86291
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 4056b70e6339102374898fff26f099da455475b1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86329
Reviewed-by: Michael Stahl 
(cherry picked from commit ed7dc32834e11c93eaf21de8424d9d46c7fa0d53)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86965
Reviewed-by: Thorsten Behrens 
Reviewed-by: Miklos Vajna 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sw/qa/extras/unowriter/unowriter.cxx 
b/sw/qa/extras/unowriter/unowriter.cxx
index faaac078bff6..788acffbef7e 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -12,6 +12,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -821,6 +822,28 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter, 
testTextConvertToTableLineSpacing)
 CPPUNIT_ASSERT_EQUAL(static_cast(convertTwipToMm100(220)), 
aLineSpacing.Height);
 }
 
+CPPUNIT_TEST_FIXTURE(SwUnoWriter, testTdf129839)
+{
+// Create a new document and add a table
+loadURL("private:factory/swriter", nullptr);
+css::uno::Reference xTextDocument(mxComponent,
+
css::uno::UNO_QUERY_THROW);
+css::uno::Reference xFac(xTextDocument,
+  
css::uno::UNO_QUERY_THROW);
+css::uno::Reference xTable(
+xFac->createInstance("com.sun.star.text.TextTable"), 
css::uno::UNO_QUERY_THROW);
+xTable->initialize(4, 4);
+auto xSimpleText = xTextDocument->getText();
+xSimpleText->insertTextContent(xSimpleText->createTextCursor(), xTable, 
true);
+css::uno::Reference xTableCellRange(xTable, 
css::uno::UNO_QUERY_THROW);
+// Get instance of SwXCellRange
+css::uno::Reference xCellRange(
+xTableCellRange->getCellRangeByPosition(0, 0, 1, 1), 
css::uno::UNO_QUERY_THROW);
+// Test retrieval of VertOrient property - this crashed
+css::uno::Any aOrient = xCellRange->getPropertyValue("VertOrient");
+CPPUNIT_ASSERT_EQUAL(css::uno::Any(css::text::VertOrientation::NONE), 
aOrient);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index 1ad6dc454657..fa378c7e8ae1 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3572,7 +3572,8 @@ uno::Any SAL_CALL SwXCellRange::getPropertyValue(const 
OUString& rPropertyName)
 break;
 case RES_VERT_ORIENT:
 {
-std::shared_ptr aVertOrient;
+std::shared_ptr aVertOrient(
+std::make_shared(RES_VERT_ORIENT));
 if (SwDoc::GetBoxAttr(*m_pImpl->m_pTableCursor, aVertOrient))
 {
 aVertOrient->QueryValue( aRet, pEntry->nMemberId );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-18 Thread andreas kainz (via logerrit)

 svx/uiconfig/ui/sidebarlists.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0ae7e8ed251a4106c7065514f3f12a8ad83f2211
Author: andreas kainz 
AuthorDate: Sat Jan 18 14:40:56 2020 +0100
Commit: andreas_kainz 
CommitDate: Sat Jan 18 21:04:43 2020 +0100

Sidebar list small update

Change-Id: Ie8e4508f6fd0f3f54f4f01456eff6d980235338f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87021
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/svx/uiconfig/ui/sidebarlists.ui b/svx/uiconfig/ui/sidebarlists.ui
index 103120c9d20e..2f2806459acd 100644
--- a/svx/uiconfig/ui/sidebarlists.ui
+++ b/svx/uiconfig/ui/sidebarlists.ui
@@ -9,6 +9,7 @@
   
 True
 False
+True
 6
 vertical
 6
@@ -55,6 +56,7 @@
   
 True
 False
+True
 
   
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-18 Thread andreas kainz (via logerrit)

 svx/uiconfig/ui/sidebartextpanel.ui |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fc3c3aa4a12ed9bc7af416a94219139e2db482c1
Author: andreas kainz 
AuthorDate: Sat Jan 18 14:30:17 2020 +0100
Commit: andreas_kainz 
CommitDate: Sat Jan 18 21:05:02 2020 +0100

Sidebar text panel spacing update

Change-Id: I7d4a26a9cb165ca862cbea14668bc4dc9c7e8d19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87019
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/svx/uiconfig/ui/sidebartextpanel.ui 
b/svx/uiconfig/ui/sidebartextpanel.ui
index c2c995490525..65443d789f31 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -14,7 +14,7 @@
 False
 6
 vertical
-12
+3
 
   
 True
@@ -78,7 +78,7 @@
   
 True
 False
-12
+6
 
   
 True
@@ -206,7 +206,7 @@
   
 True
 False
-12
+6
 
   
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-18 Thread andreas kainz (via logerrit)

 sc/uiconfig/scalc/ui/sidebarcellappearance.ui |  232 ++
 1 file changed, 92 insertions(+), 140 deletions(-)

New commits:
commit 20949cc3489fc834a5b3f85a87af97f17c3febdc
Author: andreas kainz 
AuthorDate: Sat Jan 18 14:12:22 2020 +0100
Commit: andreas_kainz 
CommitDate: Sat Jan 18 21:06:50 2020 +0100

calc sidebar cellappearance simplyfication

Change-Id: I22a69805816d0ca6a00443075ea4d5cc15c1b544
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87017
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui 
b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
index ddf3c1bca80c..0631a1d62585 100644
--- a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
+++ b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
@@ -5,191 +5,143 @@
   
 True
 False
-True
-True
 
-  
+  
 True
 False
+True
 6
-vertical
-6
+3
+6
+True
 
-  
+  
 True
 False
+_Background:
+True
+cellbackgroundcolor
+0
+  
+  
+0
+0
+  
+
+
+  
+True
+True
+Select the 
background color of the selected cells.
+icons
+False
+2
 
-  
+  
 True
 False
-_Background:
+Select the 
background color of the selected cells.
 True
-cellbackgroundcolor
-0
   
   
 False
-True
-0
+False
   
 
+  
+  
+1
+0
+  
+
+
+  
+True
+True
+start
+icons
+False
+2
 
-  
+  
 True
-True
-Select the 
background color of the selected cells.
-icons
-False
-2
-
-  
-105
-True
-False
-Select the 
background color of the selected cells.
-start
-True
-  
-  
-True
-True
-  
-
+False
+Specify the borders of 
the selected cells.
+start
+start
+True
   
   
-False
-True
-end
-1
+True
+True
   
 
   
   
-False
-True
-0
+0
+1
+2
   
 
 
-  
+  
 True
-False
-6
+True
+Select the line 
color of the borders.
+icons
+False
+2
 
-  
+  
 True
-True
-center
-icons
-False
-2
-
-  
-True
-False
-Specify the borders of 
the selected cells.
-start
-True
-  
-  
-True
-True
-  
-
+False
+Select the line color of 
the borders.
+True
   
   
 False
-True
-0
+False
   
 
+
+  
+Border Line 
Color
+  
+
+  
+  
+1
+2
+  
+
+
+  
+True
+True
+icons
+False
+2
 
-  
+  
 True
 False
-vertical
-6
-
-  
-True
-True
-icons
-False
-2
-
-  
-105
-True
-False
-Select the line style of 
the borders.
-end
-True
-  
-

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/uiconfig

2020-01-18 Thread Caolán McNamara (via logerrit)

 cui/uiconfig/ui/gallerythemedialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ee5265b20ec017c25bc1c98902f776f46ce66a44
Author: Caolán McNamara 
AuthorDate: Sat Jan 18 17:32:11 2020 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Jan 18 21:13:02 2020 +0100

gallery theme dialog should be modal

Change-Id: I3c32851cda40254c73b0040f92466eedb7427d6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87029
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Jenkins

diff --git a/cui/uiconfig/ui/gallerythemedialog.ui 
b/cui/uiconfig/ui/gallerythemedialog.ui
index 993300859180..00c472d92d3f 100644
--- a/cui/uiconfig/ui/gallerythemedialog.ui
+++ b/cui/uiconfig/ui/gallerythemedialog.ui
@@ -7,6 +7,7 @@
 6
 Properties of %1
 False
+True
 dialog
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/unx

2020-01-18 Thread Caolán McNamara (via logerrit)

 vcl/unx/gtk3/gtk3gtkinst.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 06f761fe43b184fb0b8306967e55da61d2b1ca1b
Author: Caolán McNamara 
AuthorDate: Fri Jan 10 17:32:51 2020 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Jan 18 22:03:45 2020 +0100

Related: tdf#127782 call signal_expanded after expansion in gtk case

which is the same as the gen one

Change-Id: Ia93598bb88d5a3f93c62e7096f8bc4ca69698a19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86564
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 766c13fb440c..0b7e019b4de7 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -12213,7 +12213,6 @@ private:
 {
 GtkInstanceExpander* pThis = static_cast(widget);
 SolarMutexGuard aGuard;
-pThis->signal_expanded();
 
 GtkWidget *pToplevel = gtk_widget_get_toplevel(GTK_WIDGET(pExpander));
 
@@ -12236,6 +12235,8 @@ private:
 
 gtk_window_resize(GTK_WINDOW(pToplevel), nToplevelWidth, 
nToplevelHeight);
 }
+
+pThis->signal_expanded();
 }
 
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'feature/paralleltest' - 6 commits - common/FileUtil.cpp common/FileUtil.hpp common/Unit.cpp common/Unit.hpp kit/ForKit.cpp loleaflet/src test/helpers.hpp test

2020-01-18 Thread Michael Meeks (via logerrit)

Rebased ref, commits from common ancestor:
commit a397fc2faf5ea607b46604f2c3fd8520807d2fd2
Author: Michael Meeks 
AuthorDate: Fri Jan 17 21:18:42 2020 +
Commit: Michael Meeks 
CommitDate: Sat Jan 18 21:30:40 2020 +

test: dung out redundant LOOL_TEST_CLIENT_PORT.

And cleanup other related oddities.

Change-Id: I2d179a2ece6a8553e10e406ad4e5da08a2ff58e5

diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp
index 164489589..ac0191e33 100644
--- a/kit/ForKit.cpp
+++ b/kit/ForKit.cpp
@@ -396,15 +396,6 @@ int main(int argc, char** argv)
 std::string sysTemplate;
 std::string loTemplate;
 
-#if ENABLE_DEBUG
-static const char* clientPort = std::getenv("LOOL_TEST_CLIENT_PORT");
-if (clientPort)
-ClientPortNumber = std::stoi(clientPort);
-static const char* masterPort = std::getenv("LOOL_TEST_MASTER_PORT");
-if (masterPort)
-MasterLocation = masterPort;
-#endif
-
 for (int i = 0; i < argc; ++i)
 {
 char *cmd = argv[i];
diff --git a/test/Makefile.am b/test/Makefile.am
index 2b369465a..e10cb7d8c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,12 +2,10 @@
 export MAX_CONCURRENCY=4
 AUTOMAKE_OPTION = serial-tests
 
-# unittest: tests that do not need loolwsd running, and that are run during a
-# normal build
-# test: tests that need loolwsd running, and that are run via 'make check'
-check_PROGRAMS = test fakesockettest
+# unittest: tests that run a captive loolwsd as part of themselves.
+check_PROGRAMS = fakesockettest
 
-noinst_PROGRAMS = test fakesockettest unittest
+noinst_PROGRAMS = fakesockettest unittest
 
 AM_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTDOC=\"$(abs_top_srcdir)/test/data\" \
-I${top_srcdir}/common -I${top_srcdir}/net -I${top_srcdir}/wsd 
-I${top_srcdir}/kit
@@ -87,10 +85,6 @@ unittest_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS
 unittest_SOURCES = $(test_base_source) test.cpp
 unittest_LDADD = $(CPPUNIT_LIBS)
 
-test_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS
-test_SOURCES = $(test_all_source) test.cpp
-test_LDADD = $(CPPUNIT_LIBS)
-
 fakesockettest_SOURCES = fakesockettest.cpp ../net/FakeSocket.cpp
 fakesockettest_LDADD = $(CPPUNIT_LIBS)
 
diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index 7dc7d1500..a69099bd5 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -432,6 +432,8 @@ void TileCacheTests::testUnresponsiveClient()
 {
 const std::string testname = "unresponsiveClient-";
 
+TST_LOG("testUnresponsiveClient.");
+
 std::string documentPath, documentURL;
 getDocumentPathAndURL("hello.odt", documentPath, documentURL, testname);
 
diff --git a/test/helpers.hpp b/test/helpers.hpp
index dd638d191..19bd8804d 100644
--- a/test/helpers.hpp
+++ b/test/helpers.hpp
@@ -187,12 +187,15 @@ Poco::Net::HTTPClientSession* createSession(const 
Poco::URI& uri)
 return new Poco::Net::HTTPClientSession(uri.getHost(), uri.getPort());
 }
 
+#ifndef UNIT_CLIENT_TESTS
+
 inline int getClientPort()
 {
-static const char* clientPort = std::getenv("LOOL_TEST_CLIENT_PORT");
-return clientPort? atoi(clientPort) : DEFAULT_CLIENT_PORT_NUMBER;
+return DEFAULT_CLIENT_PORT_NUMBER;
 }
 
+#endif
+
 inline std::shared_ptr createRawSocket()
 {
 return
diff --git a/test/integration-http-server.cpp b/test/integration-http-server.cpp
index 4db04737a..8c0c87ac2 100644
--- a/test/integration-http-server.cpp
+++ b/test/integration-http-server.cpp
@@ -92,15 +92,13 @@ public:
 // A server URI which was not added to loolwsd.xml as post_allow IP or a 
wopi storage host
 Poco::URI getNotAllowedTestServerURI()
 {
-static const char* clientPort = std::getenv("LOOL_TEST_CLIENT_PORT");
-
 static std::string serverURI(
 #if ENABLE_SSL
-"https://165.227.162.232:";
+"https://165.227.162.232:9980";
 #else
-"http://165.227.162.232:";
+"http://165.227.162.232:9980";
 #endif
-+ (clientPort? std::string(clientPort) : 
std::to_string(DEFAULT_CLIENT_PORT_NUMBER)));
+);
 
 return Poco::URI(serverURI);
 }
@@ -236,9 +234,12 @@ void HTTPServerTest::testScriptsAndLinksPost()
 
 void HTTPServerTest::testConvertTo()
 {
+const char *testname = "testConvertTo";
 const std::string srcPath = FileUtil::getTempFilePath(TDOC, "hello.odt", 
"convertTo_");
 std::unique_ptr 
session(helpers::createSession(_uri));
-session->setTimeout(Poco::Timespan(2, 0)); // 2 seconds.
+session->setTimeout(Poco::Timespan(5, 0)); // 5 seconds.
+
+TST_LOG("Convert-to odt -> txt");
 
 Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, 
"/lool/convert-to");
 Poco::Net::HTMLForm form;
@@ -253,7 +254,7 @@ void HTTPServerTest::testConvertTo()
 catch (const std::exception& ex)
 {
 // In case the server is still starting up.
-sleep(2);
+sleep(5);
 form.write(session->sendRequest(request));
 }
 
@@ -279,9 +280,12 @@ void HTTPServerTest::testCo

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - external/nss

2020-01-18 Thread Stephan Bergmann (via logerrit)

 external/nss/UnpackedTarball_nss.mk |1 +
 external/nss/macos-dlopen.patch.0   |   25 +
 2 files changed, 26 insertions(+)

New commits:
commit ee779da3acc32371d45b91f92ad9da0c46594e47
Author: Stephan Bergmann 
AuthorDate: Fri Jan 17 11:13:43 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 19 00:59:29 2020 +0100

tdf#127619: external/nss: Load smime3 lib with a path on macOS

A plain dlopen("libsmime3.dylib",...) would search (among other places)
DYLD_FALLBACK_LIBRARY_PATH, which when unset defaults to a set of paths
including /usr/local/lib (so would erroneously find Homebrew's
/usr/local/lib/libsmime3.dylib instead of LO's
LibreOffice.app/Contents/Frameworks/libsmime3.dylib next to the calling
LibreOffice.app/Contents/Frameworks/libnspr4.dylib).

At least macOS 10.15.2 supports a "@loader_path/" prefix in dlopen, to find 
the
requested library next to the calling code, so use that as a quick fix.  
(Should
that turn out to be problematic, there is PORT_LoadLibraryFromOrigin in
workdir/UnpackedTarball/nss/nss/lib/util/secload.c that might be useful in a
more elaborate fix.)

Change-Id: I8688606017a4b32a2dd55740f67b8fdb36fc5435
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86966
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit a3ca9b88b4b38c008efa868844ba7a3105b4bcca)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86969
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 3079216b674e..0e174879a702 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
$(if $(filter ANDROID,$(OS)), \
external/nss/nss-android.patch.1) \
external/nss/nss.bzmozilla1238154.patch \
+external/nss/macos-dlopen.patch.0 \
 ))
 
 ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/external/nss/macos-dlopen.patch.0 
b/external/nss/macos-dlopen.patch.0
new file mode 100644
index ..8c484e4c6841
--- /dev/null
+++ b/external/nss/macos-dlopen.patch.0
@@ -0,0 +1,25 @@
+--- nspr/pr/src/linking/prlink.c
 nspr/pr/src/linking/prlink.c
+@@ -793,7 +793,7 @@
+ /* ensure the file exists if it contains a slash character i.e. path 
*/
+ /* DARWIN's dlopen ignores the provided path and checks for the */
+ /* plain filename in DYLD_LIBRARY_PATH */
+-if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL ||
++if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL || strncmp(name, 
"@loader_path/", 13) == 0 ||
+ PR_Access(name, PR_ACCESS_EXISTS) == PR_SUCCESS) {
+ h = dlopen(name, dl_flags);
+ }
+--- nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
 nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
+@@ -224,7 +224,11 @@
+ static PRStatus PR_CALLBACK pkix_getDecodeFunction(void)
+ {
+ pkix_decodeFunc.smimeLib = 
++#if defined DARWIN
++  PR_LoadLibrary("@loader_path/" 
SHLIB_PREFIX"smime3."SHLIB_SUFFIX);
++#else
+   PR_LoadLibrary(SHLIB_PREFIX"smime3."SHLIB_SUFFIX);
++#endif
+ if (pkix_decodeFunc.smimeLib == NULL) {
+   return PR_FAILURE;
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - instsetoo_native/inc_openoffice officecfg/registry

2020-01-18 Thread Adolfo Jayme Barrientos (via logerrit)

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf|2 +-
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |4 
++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1ff79cfaf746aa65d9fa19e82f14da8d8a2d9209
Author: Adolfo Jayme Barrientos 
AuthorDate: Sat Jan 18 15:17:20 2020 -0600
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 19 01:02:23 2020 +0100

Remove misused hyphens

Change-Id: I17553952476ec46861df5ac353187c2a4b5f57fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87035
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index c09dda21d69a..87bd85857eaf 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5028,10 +5028,10 @@
   ~Tip of the day
 
 
-  Show Tip-of-the-Day
+  Show Tip of the Day
 
 
-  Show the Tip-of-the-Day dialog
+  Show the Tip of the Day dialog
 
 
   1
commit 6c1669a1e08f8467757e0fc75917c4f96fdabb68
Author: Adolfo Jayme Barrientos 
AuthorDate: Sat Jan 18 14:51:50 2020 -0600
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 19 01:02:00 2020 +0100

Remove a hardcoded product name from a translatable string

Fix the string’s grammar while at it.
Follow-up for commit 128dabf58a535d422eb27f8dc760c81e54c6b354.
Mentioned on review but never addressed.

Change-Id: Id05d8686aca6d719eab4ad47fa0502353d3d074b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87034
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 6c12870e861d..fe6cb7d5fac4 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -704,4 +704,4 @@ en-US = "OK"
 en-US = "{&DialogDefaultBold}Attention!"
 
 [OOO_CONTROL_328]
-en-US = "LibreOffice help must be installed into the installation directory of 
LibreOffice program."
+en-US = "The [ProductName] Help must be installed in the same directory as the 
program."
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-18 Thread Balazs Varga (via logerrit)

 chart2/source/view/axes/Tickmarks.cxx  |5 +
 chart2/source/view/axes/Tickmarks.hxx  |1 +
 chart2/source/view/axes/VCartesianAxis.cxx |   15 ---
 sw/qa/extras/layout/data/tdf128996.docx|binary
 sw/qa/extras/layout/layout.cxx |   16 
 5 files changed, 26 insertions(+), 11 deletions(-)

New commits:
commit 2530ef4a8c381f38decc605bc9f0fbe3766826ee
Author: Balazs Varga 
AuthorDate: Mon Dec 30 15:53:08 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 19 01:09:39 2020 +0100

tdf#128996 Chart: Fix disappeared vertical X axis labels

Regression from commit: 75ef0e41ea8a9096ac619356d2b837c5333b47e6
(tdf#125334 Chart: allow text break in bar chart axis labels)

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86010
Tested-by: Jenkins
Reviewed-by: László Németh 
Tested-by: László Németh 
(cherry picked from commit d53de6b0bfff08dfbde4fe305e2a9b7a60255458)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86259
Reviewed-by: Balazs Varga 
Reviewed-by: Xisco Faulí 
Signed-off-by: Xisco Fauli 

Change-Id: Ib935de74314b7dec489d94a4aa3c65072e18d9e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86355
Tested-by: Jenkins
Reviewed-by: Balazs Varga 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/chart2/source/view/axes/Tickmarks.cxx 
b/chart2/source/view/axes/Tickmarks.cxx
index 45e311ce3cfa..e1dc3953bd11 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -204,6 +204,11 @@ sal_Int32 TickFactory2D::getTickScreenDistance( TickIter& 
rIter )
 return pFirstTickInfo->getScreenDistanceBetweenTicks( *pSecondTickInfo );
 }
 
+B2DVector TickFactory2D::getXaxisStartPos() const
+{
+return m_aAxisStartScreenPosition2D;
+}
+
 B2DVector TickFactory2D::getTickScreenPosition2D( double fScaledLogicTickValue 
) const
 {
 B2DVector aRet(m_aAxisStartScreenPosition2D);
diff --git a/chart2/source/view/axes/Tickmarks.hxx 
b/chart2/source/view/axes/Tickmarks.hxx
index b0cb774dbf5d..34addbeb45db 100644
--- a/chart2/source/view/axes/Tickmarks.hxx
+++ b/chart2/source/view/axes/Tickmarks.hxx
@@ -135,6 +135,7 @@ public:
 
 bool  isHorizontalAxis() const;
 bool  isVerticalAxis() const;
+::basegfx::B2DVector getXaxisStartPos() const;
 
 private:
 ::basegfx::B2DVector getTickScreenPosition2D( double 
fScaledLogicTickValue ) const;
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index 4b7f4df2f8ac..dce4de52783b 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -733,22 +733,15 @@ bool VCartesianAxis::createTextShapes(
 // recalculate the nLimitedSpaceForText in case of 90 and 270 degree 
if the text break is true
 if ( rAxisLabelProperties.fRotationAngleDegree == 90.0 || 
rAxisLabelProperties.fRotationAngleDegree == 270.0 )
 {
-if ( rAxisLabelProperties.m_aFontReferenceSize.Height - 
rAxisLabelProperties.m_aMaximumSpaceForLabels.Height > 2 * 
rAxisLabelProperties.m_aMaximumSpaceForLabels.Y )
-{
-const sal_Int32 nFullHeight = 
rAxisLabelProperties.m_aFontReferenceSize.Height;
-sal_Int32 nMaxLabelsHeight = nFullHeight - ( 
rAxisLabelProperties.m_aMaximumSpaceForLabels.Height + 
rAxisLabelProperties.m_aMaximumSpaceForLabels.Y );
-nLimitedSpaceForText = nMaxLabelsHeight;
-}
-else
-{
-nLimitedSpaceForText = -1;
-}
+nLimitedSpaceForText = 
rAxisLabelProperties.m_aFontReferenceSize.Height - 
pTickFactory->getXaxisStartPos().getY();
+m_aAxisProperties.m_bLimitSpaceForLabels = false;
 }
 
 // recalculate the nLimitedSpaceForText in case of vertical category 
axis if the text break is true
 if ( m_aAxisProperties.m_bSwapXAndY && bIsVerticalAxis && 
rAxisLabelProperties.fRotationAngleDegree == 0.0 )
 {
-nLimitedSpaceForText = 
rAxisLabelProperties.m_aMaximumSpaceForLabels.X;
+nLimitedSpaceForText = pTickFactory->getXaxisStartPos().getX();
+m_aAxisProperties.m_bLimitSpaceForLabels = false;
 }
 }
 
diff --git a/sw/qa/extras/layout/data/tdf128996.docx 
b/sw/qa/extras/layout/data/tdf128996.docx
new file mode 100644
index ..8b6e77214b0c
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf128996.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index fdd1d2ae125c..80b0ecdac7f9 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2437,6 +2437,22 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf122800)
 // This failed, if the textarray length of the first axis label not 22.
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf128996)
+{
+SwDoc* pDoc = createDoc(

help in writing tests

2020-01-18 Thread Shivam Kumar Singh

Hi all,
My patch for tdf#123847 has been pushed to master and now I need to write
unit test for the bug . I went through the wiki but am still having trouble
writing one.Could anyone guide me through which kind of test I need to do
and how to do that ?

Thanks.

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

building 6.3.4.2 from source

2020-01-18 Thread Yury

When building the 6.3.4.2 from the released source archive on 64-bit linux,
there were two difficulties:

1) if configured with the '--with-export-validation' the build process
fails, as it seems like some rng schemas are expected to be in
subdirectories of the 'schema' subdirectory -- but those were empty in the
source archive and were not populated by the build (so I had to switch that
validation off);

2) binaries validation fails for the ELFs linking the 'suspicious
libpython3.7m.so.1.0'; like, why?? I had to add this SO to the
$globalwhitelist in the 'bin/check-elf-dynamic-objects'.

Thought I'd let you guys know.



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

CppCheck Report Update

2020-01-18 Thread cppcheck.libreoff...@gmail.com



A new cppcheck report is available at : 
http://dev-builds.libreoffice.org/cppcheck_reports/master/


Note:
The script generating this report was run at :
2020-19-01 03:16:45 with user buildslave at host vm140 as 
/home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s 
/home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w 
/home/buildslave/tmp/www

It can be found and improved here:

https://gerrit.libreoffice.org/plugins/gitiles/dev-tools/+/master/cppcheck/cppcheck-report.sh


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

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

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

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

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

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

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

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

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

[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac Repository.mk slideshow/CppunitTest_slideshow.mk slideshow/Library_slideshow.mk solenv/gbuild solenv/qa

[Libreoffice-commits] core.git: sw/CppunitTest_sw_ooxmlexport8.mk sw/CppunitTest_sw_ooxmlimport2.mk sw/CppunitTest_sw_ooxmlimport.mk

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

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

[Libreoffice-commits] core.git: unotools/Library_utl.mk

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

[Libreoffice-commits] online.git: common/SigUtil.cpp

[Libreoffice-commits] online.git: Branch 'feature/paralleltest' - 6 commits - common/FileUtil.cpp common/FileUtil.hpp common/SigUtil.cpp common/Unit.cpp common/Unit.hpp kit/ForKit.cpp test/helpers.hpp

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

[Libreoffice-commits] online.git: wsd/Auth.cpp wsd/Auth.hpp wsd/LOOLWSD.cpp

[Libreoffice-commits] online.git: common/FileUtil.cpp common/FileUtil.hpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp

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

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - external/nss

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - cui/uiconfig

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

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

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

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/uiconfig

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/unx

[Libreoffice-commits] online.git: Branch 'feature/paralleltest' - 6 commits - common/FileUtil.cpp common/FileUtil.hpp common/Unit.cpp common/Unit.hpp kit/ForKit.cpp loleaflet/src test/helpers.hpp test

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - external/nss

[Libreoffice-commits] core.git: 2 commits - instsetoo_native/inc_openoffice officecfg/registry

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

help in writing tests

building 6.3.4.2 from source

CppCheck Report Update

36 matches

Site Navigation

Mail list logo

Footer information