[Libreoffice-commits] core.git: bin/find-unneeded-includes

2022-02-13 Thread Gabor Kelemen (via logerrit)
 bin/find-unneeded-includes |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5382df1422832fb7a18a2a39ac52fb75ababff17
Author: Gabor Kelemen 
AuthorDate: Sun Feb 13 14:36:52 2022 +0100
Commit: Miklos Vajna 
CommitDate: Mon Feb 14 08:31:00 2022 +0100

find-unneeded-includes: rename argument to --continue

sounds more natural than --dontstop

Change-Id: I4650f8bf97a426782828f0e088805551c5830acc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129880
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes
index 93257451cce9..bdff09bf23eb 100755
--- a/bin/find-unneeded-includes
+++ b/bin/find-unneeded-includes
@@ -306,7 +306,7 @@ def tidy(compileCommands, paths, dontstop):
 
 def main(argv):
 parser = argparse.ArgumentParser(description='Check source files for 
unneeded includes.')
-parser.add_argument('--dontstop', action='store_true',
+parser.add_argument('--continue', action='store_true',
 help='Don\'t stop on errors. Useful for periodic re-check 
of large amount of files')
 parser.add_argument('Files' , nargs='*',
 help='The files to be checked')
@@ -341,7 +341,7 @@ def main(argv):
 print ("File 'compile_commands.json' does not exist, please run:\nmake 
vim-ide-integration")
 sys.exit(-1)
 
-tidy(compileCommands, paths=list_of_files, dontstop=args.dontstop)
+tidy(compileCommands, paths=list_of_files, dontstop=vars(args)["continue"])
 
 if __name__ == '__main__':
 main(sys.argv[1:])


Re: New Defects reported by Coverity Scan for LibreOffice

2022-02-13 Thread Luboš Luňák
On Saturday 12 of February 2022, scan-ad...@coverity.com wrote:
> /sc/source/core/data/fillinfo.cxx: 253 in ::initCellInfo(RowInfo
> *, unsigned long, short, const SvxShadowItem *)() 247 {
> 248 RowInfo& rThisRowInfo = pRowInfo[nArrRow];
> 249 rThisRowInfo.allocCellInfo( nRotMax + 1 );
> 250
> 251 for (SCCOL nCol = -1; nCol <= nRotMax+1; ++nCol) //
> Preassign cell info 252 {
>
> >>> CID 1498148:  Integer handling issues  (NEGATIVE_RETURNS)
> >>> "nCol" is passed to a parameter that cannot be negative.
>
> 253 CellInfo& rInfo = rThisRowInfo.cellInfo(nCol);

 Any idea what this is about? It's RowInfo::cellInfo(SCCOL), and SCCOL is 
sal_Int16, so the parameter can be negative. Does Coverity somehow know that 
SCCOL under normal circumstances should not be negative?

-- 
 Luboš Luňák
 l.lu...@collabora.com


[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - download.lst

2022-02-13 Thread Eike Rathke (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cbaf6eda9237986e64d062784cc8c97842cd2c76
Author: Eike Rathke 
AuthorDate: Sat Feb 12 15:54:31 2022 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Feb 14 07:06:34 2022 +0100

Update language-subtag-registry to 2021-12-29

Change-Id: Ia9e1c68bd13974ec7403016197cc2d91c193f7bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129860
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 7cd3013a3704b8365e295f4260e242273d45d27e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129841
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/download.lst b/download.lst
index bb6328ee0a2e..c0ac5c940bce 100644
--- a/download.lst
+++ b/download.lst
@@ -140,8 +140,8 @@ export JFREEREPORT_SAC_SHA256SUM := 
085f2112c51fa8c1783fac12fbd45265059641512134
 export JFREEREPORT_SAC_TARBALL := 
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 export LIBJPEG_TURBO_SHA256SUM := 
b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523
 export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-1.5.3.tar.gz
-export LANGTAGREG_SHA256SUM := 
08452d3997c78e21f2d81e31409dc46557707be6dc1df3129674019659e5ff9b
-export LANGTAGREG_TARBALL := language-subtag-registry-2021-08-06.tar.bz2
+export LANGTAGREG_SHA256SUM := 
d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837
+export LANGTAGREG_TARBALL := language-subtag-registry-2021-12-29.tar.bz2
 export LANGUAGETOOL_SHA256SUM := 
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
 export LANGUAGETOOL_TARBALL := 
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 export LCMS2_SHA256SUM := 
dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e


[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - i18npool/source

2022-02-13 Thread Julien Nabet (via logerrit)
 i18npool/source/localedata/data/an_ES.xml |4 ++--
 i18npool/source/localedata/data/es_AR.xml |4 ++--
 i18npool/source/localedata/data/es_BO.xml |4 ++--
 i18npool/source/localedata/data/es_CL.xml |4 ++--
 i18npool/source/localedata/data/es_CO.xml |4 ++--
 i18npool/source/localedata/data/es_CR.xml |4 ++--
 i18npool/source/localedata/data/es_DO.xml |4 ++--
 i18npool/source/localedata/data/es_EC.xml |4 ++--
 i18npool/source/localedata/data/es_ES.xml |4 ++--
 i18npool/source/localedata/data/es_GT.xml |4 ++--
 i18npool/source/localedata/data/es_PE.xml |4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit b651275e76ec41e2802cb1a558d9fd90b73ef6c7
Author: Julien Nabet 
AuthorDate: Thu Feb 10 17:46:37 2022 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Feb 14 07:05:54 2022 +0100

tdf#147343: Wrong typo for AM/PM indicator in Spanish locales

Change-Id: I0cc077a94b6f11f67436981033e024e3097c635a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129793
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit d582bc9735022996a317ed661388621edabf78cc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129843
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/i18npool/source/localedata/data/an_ES.xml 
b/i18npool/source/localedata/data/an_ES.xml
index f6063c06e206..217acd57ddc4 100644
--- a/i18npool/source/localedata/data/an_ES.xml
+++ b/i18npool/source/localedata/data/an_ES.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-a. m.
-p. m.
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_AR.xml 
b/i18npool/source/localedata/data/es_AR.xml
index 84cc34e3bb70..60473d5cd289 100644
--- a/i18npool/source/localedata/data/es_AR.xml
+++ b/i18npool/source/localedata/data/es_AR.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_BO.xml 
b/i18npool/source/localedata/data/es_BO.xml
index 317ab9406abc..9d9a13047f11 100644
--- a/i18npool/source/localedata/data/es_BO.xml
+++ b/i18npool/source/localedata/data/es_BO.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_CL.xml 
b/i18npool/source/localedata/data/es_CL.xml
index 3b1605b98ed3..95a865b0589c 100644
--- a/i18npool/source/localedata/data/es_CL.xml
+++ b/i18npool/source/localedata/data/es_CL.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_CO.xml 
b/i18npool/source/localedata/data/es_CO.xml
index f7962ec6f169..cca72c41d169 100644
--- a/i18npool/source/localedata/data/es_CO.xml
+++ b/i18npool/source/localedata/data/es_CO.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_CR.xml 
b/i18npool/source/localedata/data/es_CR.xml
index 23c204fac6c8..d0e33e911d26 100644
--- a/i18npool/source/localedata/data/es_CR.xml
+++ b/i18npool/source/localedata/data/es_CR.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_DO.xml 
b/i18npool/source/localedata/data/es_DO.xml
index 446219719b8a..5c80546c89b9 100644
--- a/i18npool/source/localedata/data/es_DO.xml
+++ b/i18npool/source/localedata/data/es_DO.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-a.m.
-p.m.
+a. m.
+p. m.
 Metric
   
   
diff --git a/i18npool/source/localedata/data/es_EC.xml 
b/i18npool/source/localedata/data/es_EC.xml
index eea5b1b73173..df07087a1740 100644
--- a/i18npool/source/localedata/data/es_EC.xml
+++ b/i18npool/source/localedata/data/es_EC.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_ES.xml 
b/i18npool/source/localedata/data/es_ES.xml
index 15b25d937aab..c9c99979f748 100644
--- a/i18npool/source/localedata/data/es_ES.xml
+++ b/i18npool/source/localedata/data/es_ES.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_GT.xml 
b/i18npool/source/localedata/data/es_GT.xml
index 5ef3985d0d30..9332399a75b8 100644
--- a/i18npool/source/localedata/data/es_GT.xml
+++ b/i18npool/source/localedata/data/es_GT.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-a.m.
-p.m.
+a. m.
+p. m.
 Metric
   
   
diff --git a/i18npool/source/localedata/data/es_PE.xml 
b/i18npool/source/localedata/data/es_PE.xml
index cf50595b913f..f1bfd15f1bef 100644
--- a/i18npool/source/localedata/data/es_PE.xml
+++ b/i18npool/source/localedata/data/es_PE.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-a.m.
-p.m.
+a. m.
+p. m.
 Metr

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

2022-02-13 Thread Tomaž Vajngerl (via logerrit)
 cui/source/inc/grfpage.hxx  |   14 ++--
 cui/source/tabpages/grfpage.cxx |  129 
 2 files changed, 72 insertions(+), 71 deletions(-)

New commits:
commit 58ac3288b5a4a1f1f9b21fed4f4c1ab06dd43db9
Author: Tomaž Vajngerl 
AuthorDate: Mon Feb 14 09:11:05 2022 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Feb 14 03:25:19 2022 +0100

cui: show image pixel size below logic size

Change-Id: If919d1fade2ed85aec7437b429a648ca658e2c92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129885
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 33bc69b81f49..158e6b2b1e79 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -665,6 +665,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
  }
  sTemp += " " + CuiResId(RID_CUISTR_PPI).replaceAll("%1", sPPI);
 }
+sTemp += "\n" + OUString::number(m_aOrigPixelSize.Width()) + u"\u00D7" 
+ OUString::number(m_aOrigPixelSize.Height()) + " px";
 m_xOrigSizeFT->set_label(sTemp);
 }
 
commit ace0adfd2312211854a61fdc0aa60c1ba9c4d446
Author: Tomaž Vajngerl 
AuthorDate: Sat Feb 12 14:57:37 2022 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Feb 14 03:25:08 2022 +0100

cui: prefix member variables of SvxGrfCropPage class

Change-Id: If6f4a32df97c352d30958fb27dc90ffec5bbf44d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129884
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 

diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 2c7017a57189..adfaebc33595 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -49,13 +49,13 @@ class SvxGrfCropPage : public SfxTabPage
 {
 friend class VclPtr;
 
-OUStringaGraphicName;
-SizeaOrigSize;
-SizeaOrigPixelSize;
-SizeaPageSize;
-tools::LongnOldWidth;
-tools::LongnOldHeight;
-boolbSetOrigSize;
+OUString m_aGraphicName;
+Size m_aOrigSize;
+Size m_aOrigPixelSize;
+Size m_aPageSize;
+tools::Long m_nOldWidth;
+tools::Long m_nOldHeight;
+bool m_bSetOrigSize;
 sal_Int32 m_aPreferredDPI;
 
 SvxCropExample m_aExampleWN;
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 8eb5608c966f..33bc69b81f49 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -55,9 +55,9 @@ static int lcl_GetValue(const weld::MetricSpinButton& 
rMetric, FieldUnit eUnit)
 
 SvxGrfCropPage::SvxGrfCropPage(weld::Container* pPage, weld::DialogController* 
pController, const SfxItemSet &rSet)
 : SfxTabPage(pPage, pController, "cui/ui/croppage.ui", "CropPage", &rSet)
-, nOldWidth(0)
-, nOldHeight(0)
-, bSetOrigSize(false)
+, m_nOldWidth(0)
+, m_nOldHeight(0)
+, m_bSetOrigSize(false)
 , m_aPreferredDPI(0)
 , m_xCropFrame(m_xBuilder->weld_widget("cropframe"))
 , m_xZoomConstRB(m_xBuilder->weld_radio_button("keepscale"))
@@ -167,17 +167,17 @@ void SvxGrfCropPage::Reset( const SfxItemSet *rSet )
 // orientation and size from the PageItem
 FieldUnit eUnit = MapToFieldUnit( rSet->GetPool()->GetMetric( nW ));
 
-aPageSize = static_cast(pItem)->GetSize();
+m_aPageSize = static_cast(pItem)->GetSize();
 
 auto nMin = m_xWidthMF->normalize( 23 );
-auto nMax = m_xHeightMF->normalize(aPageSize.Height());
+auto nMax = m_xHeightMF->normalize(m_aPageSize.Height());
 m_xHeightMF->set_range(nMin, nMax, eUnit);
-nMax = m_xWidthMF->normalize(aPageSize.Width());
+nMax = m_xWidthMF->normalize(m_aPageSize.Width());
 m_xWidthMF->set_range(nMin, nMax, eUnit);
 }
 else
 {
-aPageSize = OutputDevice::LogicToLogic(
+m_aPageSize = OutputDevice::LogicToLogic(
 Size( CM_1_TO_TWIP,  CM_1_TO_TWIP ),
 MapMode( MapUnit::MapTwip ),
 MapMode( rSet->GetPool()->GetMetric( nW ) ) );
@@ -195,21 +195,21 @@ void SvxGrfCropPage::Reset( const SfxItemSet *rSet )
 const Graphic* pGrf = static_cast(pItem)->GetGraphic(referer);
 if( pGrf )
 {
-aOrigSize = GetGrfOrigSize( *pGrf );
-if (pGrf->GetType() == GraphicType::Bitmap && aOrigSize.Width() && 
aOrigSize.Height())
+m_aOrigSize = GetGrfOrigSize( *pGrf );
+if (pGrf->GetType() == GraphicType::Bitmap && m_aOrigSize.Width() 
&& m_aOrigSize.Height())
 {
-aOrigPixelSize = pGrf->GetSizePixel();
+m_aOrigPixelSize = pGrf->GetSizePixel();
 }
 
-if( aOrigSize.Width() && aOrigSize.Height() )
+if( m_aOrigSize.Width() && m_aOrigSize.Height() )
 {
 CalcMinMa

Jwtiyar Nariman license statement

2022-02-13 Thread Jwtiyar ali
All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.


[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - translations

2022-02-13 Thread Christian Lohmaier (via logerrit)
 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c106400259d8e2250d91d358cccacebb1c694a5b
Author: Christian Lohmaier 
AuthorDate: Sun Feb 13 23:55:05 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Feb 13 23:55:05 2022 +0100

Update git submodules

* Update translations from branch 'distro/collabora/co-22.05'
  to a0221609670607e8d203b4c129292b5697a66566
  - update translations for 7.3.1 rc1

and force-fix errors using pocheck

Change-Id: I908b3cd7aa687fee135329d0c6728ebf0cf21553

  - update translations for 7.3.1 rc1

and force-fix errors using pocheck

Change-Id: I4aaa09256fc6fc2a2b70fb47f013613770e009e3

diff --git a/translations b/translations
index 22e60373393e..a02216096706 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 22e60373393e60eacb736936c265807ca7e0f946
+Subproject commit a0221609670607e8d203b4c129292b5697a66566


[Libreoffice-commits] translations.git: Branch 'distro/collabora/co-22.05' - 2 commits - source/af source/an source/ar source/ast source/bg source/ca source/cs source/cy source/da source/de source/el

2022-02-13 Thread Christian Lohmaier (via logerrit)
 source/af/cui/messages.po  
 |8 
 source/af/sc/messages.po   
 |8 
 source/af/svx/messages.po  
 |8 
 source/an/sc/messages.po   
 |9 
 source/an/sd/messages.po   
 |6 
 source/an/sw/messages.po   
 |6 
 source/ar/avmedia/messages.po  
 |8 
 source/ar/basctl/messages.po   
 |   14 
 source/ar/chart2/messages.po   
 |   46 
 source/ar/connectivity/messages.po 
 |8 
 source/ar/connectivity/registry/flat/org/openoffice/Office/DataAccess.po   
 |   10 
 source/ar/cui/messages.po  
 |  502 +-
 source/ar/dbaccess/messages.po 
 |   10 
 source/ar/desktop/messages.po  
 |   10 
 source/ar/editeng/messages.po  
 |   30 
 source/ar/extensions/messages.po   
 |   34 
 source/ar/extras/source/autocorr/emoji.po  
 |   68 
 source/ar/filter/messages.po   
 |   27 
 source/ar/filter/source/config/fragments/filters.po
 |6 
 source/ar/forms/messages.po
 |8 
 source/ar/fpicker/messages.po  
 |   14 
 source/ar/framework/messages.po
 |   12 
 source/ar/instsetoo_native/inc_openoffice/windows/msi_languages.po 
 |8 
 source/ar/librelogo/source/pythonpath.po   
 |   22 
 source/ar/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver.po
 |   12 
 source/ar/nlpsolver/src/locale.po  
 |6 
 source/ar/officecfg/registry/data/org/openoffice/Office.po 
 |   42 
 source/ar/officecfg/registry/data/org/openoffice/Office/UI.po  
 |  545 +-
 source/ar/reportdesign/messages.po 
 |   20 
 source/ar/sc/messages.po   
 |  420 +-
 source/ar/scp2/source/draw.po  
 |   14 
 source/ar/scp2/source/extensions.po
 |   20 
 source/ar/sd/messages.po   
 |  359 -
 source/ar/setup_native/source/mac.po   
 |   11 
 source/ar/sfx2/messages.po 
 |  138 
 source/ar/shell/messages.po
 |6 
 source/ar/starmath/messages.po 
 |   18 
 source/ar/svtools/messages.po  
 |   24 
 source/ar/svx/messages.po  
 |  322 -
 source/ar/sw/messages.po   
 |  728 +--
 source/ar/swext/mediawiki/help.po  
 |   19 
 source/ar/uui/messages.po  
 |   18 
 source/ar/vcl/messages.po  
 |   36 
 source/ar/wizards/messages.po  
 |   14 
 source/ar/wizards/source/resources.po  
 |   33 
 source/ar/xmlsecurity/messages.po  
 |8 
 source/ast/basctl/messages.po  
 |6 
 source/ast/chart2/messages.po  
 |6 
 source/ast/cui/messages.po 
 |   18 
 source/ast/dbaccess/messages.po
 |   17 
 source/ast/extensions/messages.po  
 |   16 
 source/ast/filter/messages.po  
 |6 
 source/ast/filter/source/config/fragments/filters.po   
 |   13 
 source/ast/fpicker/messages.po 
 |8 
 source/ast/helpcontent2/source/text/sbasic/python.po   
 |6 
 source/ast/helpcontent2/source/text/s

Infra call on Tue, Feb 15 at 17:30 UTC

2022-02-13 Thread Guilhem Moulin
Hi there,

The next infra call will take place at `date -d "Tue, 15 Feb 2022 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature


[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - svx/source

2022-02-13 Thread Henry Castro (via logerrit)
 svx/source/svdraw/svdpntv.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 7e8929f90506891ce559c7e328417d16d79c35fc
Author: Henry Castro 
AuthorDate: Thu Feb 10 10:25:52 2022 -0400
Commit: Andras Timar 
CommitDate: Sun Feb 13 23:46:34 2022 +0100

svx: fix dynamic cast SdrView

Jan 19 13:48:41 ip-172-31-35-149 coolwsd[23647]: SUMMARY: 
UndefinedBehaviorSanitizer: undefined-behavior 
/home/collabora/online-buildscripts/staging/builddir/libreoffice/svx/source/sdr/contact/objectcontactofpageview.cxx:353:57
 in
Jan 19 13:48:41 ip-172-31-35-149 coolwsd[23647]: 
/home/collabora/online-buildscripts/staging/builddir/libreoffice/include/svx/svdview.hxx:235:65:
 runtime error: member access within address 0x61c000489880 which does not 
point to an object of type 'SdrView'
Jan 19 13:48:41 ip-172-31-35-149 coolwsd[23647]: 0x61c000489880: note: 
object is of type 'SdrPaintView'
Jan 19 13:48:41 ip-172-31-35-149 coolwsd[23647]:  7c 04 80 3b  90 58 b9 3d 
60 7f 00 00  30 51 96 0a 20 60 00 00  38 51 96 0a 20 60 00 00  38 51 96 0a
Jan 19 13:48:41 ip-172-31-35-149 coolwsd[23647]:   
^~~
Jan 19 13:48:41 ip-172-31-35-149 coolwsd[23647]:   vptr for 
'SdrPaintView'

Change-Id: Ifc9177902ac834d400d6bf9f72b94e82f544b348
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129791
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
Reviewed-by: Henry Castro 

diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index addf221c9bb1..a069edfe3362 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -363,8 +363,11 @@ SdrPageView* SdrPaintView::ShowSdrPage(SdrPage* pPage)
 mpPageView.reset();
 }
 
-mpPageView.reset(new SdrPageView(pPage, *static_cast(this)));
-mpPageView->Show();
+if (SdrView *pView = dynamic_cast(this))
+{
+mpPageView.reset(new SdrPageView(pPage, *pView));
+mpPageView->Show();
+}
 }
 
 return mpPageView.get();


[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac

2022-02-13 Thread Tor Lillqvist (via logerrit)
 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a4ddc0ae5bd6b5a70a5441969a9c4c196b044cd6
Author: Tor Lillqvist 
AuthorDate: Thu Dec 16 19:29:07 2021 +0200
Commit: Andras Timar 
CommitDate: Sun Feb 13 23:45:27 2022 +0100

Accept iOS SDK 15.2

Change-Id: I42182f86673586ce48905bdda3281ef4499263a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126958
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index eaab62102bdc..633311f0b9f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3567,8 +3567,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=15.0
-older_sdk_vers="14.5"
+current_sdk_ver=15.2
+older_sdk_vers="15.0 14.5"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=13.6


[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - download.lst

2022-02-13 Thread Eike Rathke (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3bf7bb60dcf0a05d11b4462662900fc9c058c12d
Author: Eike Rathke 
AuthorDate: Sat Feb 12 15:54:31 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sun Feb 13 20:45:22 2022 +0100

Update language-subtag-registry to 2021-12-29

Change-Id: Ia9e1c68bd13974ec7403016197cc2d91c193f7bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129860
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 7cd3013a3704b8365e295f4260e242273d45d27e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129840
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 383b4e61d14d..162a39c7f797 100644
--- a/download.lst
+++ b/download.lst
@@ -140,8 +140,8 @@ export JFREEREPORT_SAC_SHA256SUM := 
085f2112c51fa8c1783fac12fbd45265059641512134
 export JFREEREPORT_SAC_TARBALL := 
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 export LIBJPEG_TURBO_SHA256SUM := 
20e9cd3e5f517950dfb7a300ad344543d88719c254407ffb5ad88d891bf701c4
 export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.1.tar.gz
-export LANGTAGREG_SHA256SUM := 
08452d3997c78e21f2d81e31409dc46557707be6dc1df3129674019659e5ff9b
-export LANGTAGREG_TARBALL := language-subtag-registry-2021-08-06.tar.bz2
+export LANGTAGREG_SHA256SUM := 
d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837
+export LANGTAGREG_TARBALL := language-subtag-registry-2021-12-29.tar.bz2
 export LANGUAGETOOL_SHA256SUM := 
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
 export LANGUAGETOOL_TARBALL := 
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 export LCMS2_SHA256SUM := 
18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5


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

2022-02-13 Thread Noel Grandin (via logerrit)
 chart2/source/controller/main/ChartController_Tools.cxx |   18 +---
 1 file changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 11a3e5707d6b524728b24e170eb542bba273d811
Author: Noel Grandin 
AuthorDate: Sun Feb 13 16:57:47 2022 +0200
Commit: Noel Grandin 
CommitDate: Sun Feb 13 19:48:14 2022 +0100

tdf#147394 delete crash legend

regression from
commit 63e8c2ccd39263b24f644c3d0394044a2613eb88
Author: Noel Grandin 
Date:   Sat Jan 29 21:21:27 2022 +0200
use more concrete types in chart2, Diagram

Change-Id: I6598bb7c116bd94272a805e77751aa8cf5dc174a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129882
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/chart2/source/controller/main/ChartController_Tools.cxx 
b/chart2/source/controller/main/ChartController_Tools.cxx
index ccf18ae37d15..92035d9d1bbd 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -616,13 +616,17 @@ bool ChartController::executeDispatch_Delete()
 rtl::Reference< Diagram > xDiagram( 
xChartDoc->getFirstChartDiagram());
 if( xDiagram.is())
 {
-UndoGuard aUndoGuard(
-ActionDescriptionProvider::createDescription(
-ActionDescriptionProvider::ActionType::Delete, 
SchResId( STR_OBJECT_LEGEND )),
-m_xUndoManager );
-xDiagram->setPropertyValue( "Show", uno::Any( false ));
-bReturn = true;
-aUndoGuard.commit();
+uno::Reference< beans::XPropertySet > xLegendProp( 
xDiagram->getLegend(), uno::UNO_QUERY );
+if( xLegendProp.is())
+{
+UndoGuard aUndoGuard(
+ActionDescriptionProvider::createDescription(
+ActionDescriptionProvider::ActionType::Delete, 
SchResId( STR_OBJECT_LEGEND )),
+m_xUndoManager );
+xLegendProp->setPropertyValue( "Show", uno::Any( false 
));
+bReturn = true;
+aUndoGuard.commit();
+}
 }
 break;
 }


[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 47 commits - basic/qa basic/source canvas/source configure.ac dbaccess/source distro-configs/Jenkins emfio/qa include/svl include/t

2022-02-13 Thread Armin Le Grand (Allotropia) (via logerrit)
 basic/qa/basic_coverage/test_cdbl_method.bas   |   42 +-
 basic/qa/vba_tests/cdbl.vb |5 
 basic/source/runtime/methods1.cxx  |2 
 basic/source/runtime/stdobj.cxx|2 
 basic/source/sbx/sbxscan.cxx   |3 
 basic/source/sbx/sbxvar.cxx|5 
 canvas/source/vcl/canvashelper_texturefill.cxx |   12 
 configure.ac   |   31 +
 dbaccess/source/ui/querydesign/QueryTextView.cxx   |1 
 distro-configs/Jenkins/linux_clang_dbgutil_64  |1 
 emfio/qa/cppunit/emf/EmfImportTest.cxx |   11 
 include/svl/srchitem.hxx   |3 
 include/tools/cpuid.hxx|2 
 include/tools/simdsupport.hxx  |   41 +-
 include/vcl/gdimtf.hxx |2 
 sc/Library_sc.mk   |   13 
 sc/inc/arraysumfunctor.hxx |   30 +
 sc/inc/arraysumfunctorinternal.hxx |   36 --
 sc/inc/clipcontext.hxx |   11 
 sc/inc/column.hxx  |2 
 sc/inc/document.hxx|   28 +
 sc/inc/kahan.hxx   |8 
 sc/qa/uitest/calc_tests/autofill.py|   30 +
 sc/qa/uitest/data/autofill.ods |binary
 sc/qa/unit/functions_statistical.cxx   |   22 -
 sc/qa/unit/ucalc_copypaste.cxx |2 
 sc/source/core/data/clipcontext.cxx|8 
 sc/source/core/data/column2.cxx|7 
 sc/source/core/data/column3.cxx|   25 +
 sc/source/core/data/column4.cxx|   56 ++-
 sc/source/core/data/document.cxx   |   22 -
 sc/source/core/data/table2.cxx |7 
 sc/source/core/data/table4.cxx |   20 -
 sc/source/core/tool/arraysum.hxx   |   18 -
 sc/source/core/tool/arraysumAVX.cxx|  121 ---
 sc/source/core/tool/arraysumAVX512.cxx |  120 ---
 sc/source/core/tool/arraysumSSE2.cxx   |   20 -
 sc/source/core/tool/interpr1.cxx   |   39 +-
 sc/source/ui/inc/undoblk.hxx   |4 
 sc/source/ui/inc/viewfunc.hxx  |   30 +
 sc/source/ui/undo/undoblk.cxx  |2 
 sc/source/ui/view/viewfun3.cxx |   38 +-
 sd/inc/Outliner.hxx|2 
 sd/qa/uitest/findReplace/findReplace.py|7 
 sd/source/core/CustomAnimationEffect.cxx   |1 
 sd/source/ui/animations/CustomAnimationList.cxx|   13 
 sd/source/ui/animations/CustomAnimationPane.cxx|   36 ++
 sd/source/ui/view/Outliner.cxx |   21 -
 sdext/source/pdfimport/inc/wrapper.hxx |   12 
 sdext/source/pdfimport/wrapper/wrapper.cxx |   26 +
 shell/source/unix/exec/shellexec.cxx   |1 
 solenv/flatpak-manifest.in |1 
 solenv/gdb/libreoffice/sw.py   |   15 
 svl/source/items/srchitem.cxx  |   21 -
 svtools/source/control/ctrltool.cxx|2 
 svx/source/unodraw/UnoGraphicExporter.cxx  |   92 ++---
 svx/source/unodraw/unoshtxt.cxx|5 
 sw/qa/core/layout/data/double-border-horizontal.docx   |binary
 sw/qa/core/layout/data/double-border-vertical.docx |binary
 sw/qa/core/layout/data/double-page-border.docx |binary
 sw/qa/core/layout/data/inner-border.docx   |binary
 sw/qa/core/layout/data/para-border-in-cell-clip.docx   |binary
 sw/qa/core/layout/layout.cxx   |  217 +
 sw/qa/extras/ooxmlexport/data/tdf126287.docx   |binary
 sw/qa/extras/ooxmlexport/data/tdf132752.docx   |binary
 sw/qa/extras/ooxmlexport/data/testParaListRightIndent.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport16.cxx |   32 +
 sw/qa/extras/ooxmlexport/ooxmlexport17.cxx |   13 
 sw/qa/extras/uiwriter/uiwriter3.cxx|   65 +++
 sw/qa/extras/uiwriter/uiwriter4.cxx|  197 +++
 sw/source/core/doc/DocumentRedlineManager.cxx  |3 
 sw/source/core/edit/edredln.cxx|   46 ++
 sw/source/core/layout/pa

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 2 commits - configure.ac connectivity/source external/iODBC external/unixODBC readlicense_oo/license RepositoryExternal.mk solenv/c

2022-02-13 Thread Andras Timar (via logerrit)
 RepositoryExternal.mk   |2 
 configure.ac|1 
 connectivity/source/drivers/odbc/OPreparedStatement.cxx |2 
 connectivity/source/drivers/odbc/OTools.cxx |4 
 external/iODBC/README   |1 
 external/iODBC/inc/odbc/iodbcunix.h |  160 
 external/iODBC/inc/odbc/sql.h   | 1187 +++
 external/iODBC/inc/odbc/sqlext.h| 2573 
 external/iODBC/inc/odbc/sqltypes.h  |  429 ++
 external/iODBC/inc/odbc/sqlucode.h  |  818 +
 external/unixODBC/README|1 
 external/unixODBC/inc/odbc/sql.h|  824 -
 external/unixODBC/inc/odbc/sqlext.h | 2122 -
 external/unixODBC/inc/odbc/sqltypes.h   |  470 --
 external/unixODBC/inc/odbc/sqlucode.h   |  789 
 readlicense_oo/license/license.xml  |   59 
 solenv/clang-format/excludelist |8 
 17 files changed, 5221 insertions(+), 4229 deletions(-)

New commits:
commit 18daf23a556ab7f7c034a26b0e46e9f1463f28ec
Author: Andras Timar 
AuthorDate: Tue Nov 30 12:45:40 2021 +0100
Commit: Andras Timar 
CommitDate: Sun Feb 13 19:24:36 2022 +0100

Replace unixODBC to iODBC that is BSD licensed

Change-Id: Ia794fd97bb70b1e33385517971a174430d11cab7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126117
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4854a20aa050..c374a72847a7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -50,7 +50,7 @@ else # !SYSTEM_ODBC_HEADERS
 
 define gb_LinkTarget__use_odbc_headers
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(SRCDIR)/external/unixODBC/inc \
+   -I$(SRCDIR)/external/iODBC/inc \
$$(INCLUDE) \
 )
 
diff --git a/configure.ac b/configure.ac
index af5badf8c0df..e9cac7e398e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10465,6 +10465,7 @@ elif test "$enable_database_connectivity" = no; then
 else
 AC_MSG_RESULT([internal])
 SYSTEM_ODBC_HEADERS=
+BUILD_TYPE="$BUILD_TYPE IODBC"
 fi
 AC_SUBST(SYSTEM_ODBC_HEADERS)
 
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx 
b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 507a52d872a2..82323c40401c 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -306,7 +306,7 @@ void OPreparedStatement::setParameter(const sal_Int32 
parameterIndex, const sal_
  * ODBC Programmer's reference > Developing Applications > Programming 
Considerations > Unicode >  Unicode Function Arguments
  *http://support.microsoft.com/kb/294169
  *
- * UnixODBC can be configured at compile-time so that the "W" variants 
expect
+ * iODBC can be configured at compile-time so that the "W" variants 
expect
  * UTF-16 or UTF-32 encoded strings, and character lengths are number 
of codepoints.
  * However, UTF-16 is the default, what all/most distributions do
  * and the established API that most drivers implement.
diff --git a/connectivity/source/drivers/odbc/OTools.cxx 
b/connectivity/source/drivers/odbc/OTools.cxx
index 4781415de474..e65da53c20cf 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -65,7 +65,7 @@ size_t sqlTypeLen ( SQLSMALLINT _nType )
 return sizeof(SQLBIGINT);
 case SQL_C_UBIGINT:
 return sizeof(SQLUBIGINT);
-/* UnixODBC gives this the same value as SQL_C_UBIGINT
+/* iODBC gives this the same value as SQL_C_UBIGINT
 case SQL_C_BOOKMARK:
 return sizeof(BOOKMARK); */
 case SQL_C_TYPE_DATE:
@@ -99,7 +99,7 @@ size_t sqlTypeLen ( SQLSMALLINT _nType )
 case SQL_C_CHAR:
 case SQL_C_WCHAR:
 case SQL_C_BINARY:
-// UnixODBC gives this the same value as SQL_C_BINARY
+// iODBC gives this the same value as SQL_C_BINARY
 //case SQL_C_VARBOOKMARK:
 // Unknown datatype -> cannot predict length
 default:
diff --git a/external/iODBC/README b/external/iODBC/README
new file mode 100644
index ..df189dcd88e7
--- /dev/null
+++ b/external/iODBC/README
@@ -0,0 +1 @@
+iODBC is an open-source ODBC driver manager and SDK that facilitates the 
development of database-independent applications on Linux, FreeBSD, Unix and 
macOS platforms.  [http://www.iodbc.org/]
diff --git a/external/iODBC/inc/odbc/iodbcunix.h 
b/external/iODBC/inc/odbc/iodbcunix.h
new file mode 100644
index ..22e1518ba44a
--- /dev/null
+++ b/external/iODBC/inc/odbc/iodbcunix.h
@@ -0,0 +1,160 @@
+/*
+ *  iodbcunix.h
+ *
+ *  $Id$
+ *
+ *  ODBC defines for Unix
+ 

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - cui/source

2022-02-13 Thread Pedro Pinto Silva (via logerrit)
 cui/source/dialogs/about.cxx |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 1d3e9fc71f8a1d048f1035b13c30cdbbcc27a970
Author: Pedro Pinto Silva 
AuthorDate: Tue Jun 22 15:36:15 2021 +0200
Commit: Andras Timar 
CommitDate: Sun Feb 13 19:14:14 2022 +0100

About: Darkmode: Use different about image

Fixes the use of the same about.svg even on darkmode

The way we are loading the svgs makes, when in presence of dark mode,
the rendering of svgs very very poor on those dialogs. It adds artifacts
, doesn't render gradients properly (at least when compared to
light mode) and adds white outlines everywhere.

Fix this by providing a simpler and more legible svgs to be use in
dark mode and load them only in that mode.

Signed-off-by: Pedro Pinto Silva 
Change-Id: Ib1a95f7d7a2be62b9b001b4c811c22104cc01b2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117663
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 9bb4042a2955..29a5310168c0 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -93,13 +93,9 @@ AboutDialog::AboutDialog(weld::Window *pParent)
   const tools::Long nWidth(m_pCopyrightLabel->get_preferred_size().getWidth());
   BitmapEx aBackgroundBitmap;
 
-  if (SfxApplication::loadBrandSvg(Application::GetSettings()
-   .GetStyleSettings()
-   .GetDialogColor()
-   .IsDark()
-   ? "shell/logo_inverted"
-   : "shell/logo",
-   aBackgroundBitmap, nWidth * 0.8)) {
+  bool bIsDark = 
Application::GetSettings().GetStyleSettings().GetDialogColor().IsDark();
+
+  if (SfxApplication::loadBrandSvg(bIsDark ? "shell/logo_inverted" : 
"shell/logo", aBackgroundBitmap, nWidth * 0.8)) {
 ScopedVclPtr m_pVirDev =
 m_pBrandImage->create_virtual_device();
 m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel());
@@ -107,7 +103,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
 m_pBrandImage->set_image(m_pVirDev.get());
 m_pVirDev.disposeAndClear();
   }
-  if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 
0.9)) {
+  if (SfxApplication::loadBrandSvg(bIsDark ? "shell/about_inverted" : 
"shell/about", aBackgroundBitmap, nWidth * 0.9)) {
 ScopedVclPtr m_pVirDev =
 m_pAboutImage->create_virtual_device();
 m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel());


[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 5 commits - configure.ac external/lcms2 external/openssl external/pdfium external/python3

2022-02-13 Thread Andras Timar (via logerrit)
 configure.ac|2 +-
 external/lcms2/ExternalPackage_lcms2.mk |4 +++-
 external/openssl/ExternalProject_openssl.mk |4 +++-
 external/pdfium/UnpackedTarball_pdfium.mk   |1 +
 external/pdfium/bsd-time.patch.1|   12 
 external/python3/ExternalPackage_python3.mk |8 +++-
 6 files changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 3615d2f0e1531dbb1f89e00672c52faa5316f23c
Author: Andras Timar 
AuthorDate: Tue May 25 14:12:12 2021 +0200
Commit: Andras Timar 
CommitDate: Sun Feb 13 19:09:04 2022 +0100

FreeBSD: fix python3 packaging

Change-Id: Ia5a32c8c33f74cb00c3c270774e5982443298243

diff --git a/external/python3/ExternalPackage_python3.mk 
b/external/python3/ExternalPackage_python3.mk
index faddf06fc36a..dd470ef37f4e 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -106,7 +106,7 @@ $(eval $(call 
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor
LO_lib/_sha3.$(python3_EXTENSION_MODULE_SUFFIX).so \
LO_lib/_sha512.$(python3_EXTENSION_MODULE_SUFFIX).so \
LO_lib/_socket.$(python3_EXTENSION_MODULE_SUFFIX).so \
-   LO_lib/spwd.$(python3_EXTENSION_MODULE_SUFFIX).so \
+   $(if $(filter FREEBSD,$(OS)),,  
LO_lib/spwd.$(python3_EXTENSION_MODULE_SUFFIX).so) \
$(if $(ENABLE_OPENSSL), \
LO_lib/_ssl.$(python3_EXTENSION_MODULE_SUFFIX).so \
) \
@@ -137,6 +137,11 @@ endif
 endif
 
 # that one is generated...
+ifeq ($(HOST_PLATFORM),x86_64-unknown-freebsd12.2)
+$(eval $(call 
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
+   LO_lib/_sysconfigdata__freebsd12_.py \
+))
+else
 # note: python configure overrides config.guess with something that doesn't
 # put -pc in its linux platform triplets, so filter that...
 ifneq ($(OS),WNT)
@@ -150,6 +155,7 @@ $(eval $(call 
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor
 ))
 endif
 endif
+endif
 
 
 # packages not shipped:
commit c4ab0cd8ca50eeb0f2c329b085b993a6d9b948ac
Author: Andras Timar 
AuthorDate: Mon May 24 20:16:45 2021 +0200
Commit: Andras Timar 
CommitDate: Sun Feb 13 19:06:36 2022 +0100

Fix pdfium build on BSD

Change-Id: I30b10e71c120e59d1da7b69728c742afcb4bbe83

diff --git a/external/pdfium/UnpackedTarball_pdfium.mk 
b/external/pdfium/UnpackedTarball_pdfium.mk
index 3a19feed8ea2..ac19d21c770b 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -18,6 +18,7 @@ pdfium_patches += c++20-comparison.patch
 pdfium_patches += cg-instead-of-carbon.patch.1
 # Android NDK 19 - that is known to work well - does not have 2 defines
 pdfium_patches += AndroidNDK19.patch.1
+pdfium_patches += bsd-time.patch.1
 
 # Work around  "c++20 
rewritten operator==
 # recursive call mixing friend and external operators for template class" in 
GCC with
diff --git a/external/pdfium/bsd-time.patch.1 b/external/pdfium/bsd-time.patch.1
new file mode 100644
index ..7c08071d8d20
--- /dev/null
+++ b/external/pdfium/bsd-time.patch.1
@@ -0,0 +1,12 @@
+diff -ur pdfium.org/core/fxcrt/cfx_datetime.cpp 
pdfium/core/fxcrt/cfx_datetime.cpp
+--- pdfium.org/core/fxcrt/cfx_datetime.cpp 2021-05-24 18:49:42.50075 
+0200
 pdfium/core/fxcrt/cfx_datetime.cpp 2021-05-24 18:50:28.360272000 +0200
+@@ -10,7 +10,7 @@
+ #include "core/fxcrt/fx_system.h"
+ 
+ #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
+-defined(OS_APPLE) || defined(OS_ASMJS)
++defined(OS_APPLE) || defined(OS_ASMJS) || defined(OS_BSD)
+ #include 
+ #include 
+ #endif
commit da027986398213c1c5b54661fc6f024827eb46a6
Author: Andras Timar 
AuthorDate: Mon May 24 20:15:14 2021 +0200
Commit: Andras Timar 
CommitDate: Sun Feb 13 19:05:37 2022 +0100

FreeBSD: fix OPENSSL_PLATFORM

Change-Id: I0f48d572edaed7e996be7a75d524c7d540a76ecd

diff --git a/external/openssl/ExternalProject_openssl.mk 
b/external/openssl/ExternalProject_openssl.mk
index e44ccf5f3436..81a7c5ff6c67 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -26,7 +26,9 @@ OPENSSL_PLATFORM := \
 $(if $(filter GNU/kFreeBSD,$(shell uname)),\
   debian-kfreebsd-amd64\
 ,\
-  $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64, 
linux-generic64) no-asm\
+  $(if $(filter FreeBSD,$(shell uname)), BSD-x86_64,\
+$(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64, 
linux-generic64) no-asm\
+  )\
 )\
   ,\
 $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic32, 
linux-generic32)\
commit 5eb1c2d4c82c0d276b721f76841109b1315f9d16
Author: Andras Timar 
AuthorDate: Mon May 24 20:14:37 2021 +0200
Commit: Andras Timar 
CommitDate: Sun Fe

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - scp2/source setup_native/source solenv/bin

2022-02-13 Thread Andras Timar (via logerrit)
 scp2/source/ooo/scpaction_ooo.scp |7 
 setup_native/source/packinfo/DS_Store |binary
 setup_native/source/packinfo/VolumeIcon.icns  |binary
 setup_native/source/packinfo/sla.r| 2728 ++
 solenv/bin/macosx-codesign-app-bundle |4 
 solenv/bin/modules/installer/simplepackage.pm |   12 
 6 files changed, 2745 insertions(+), 6 deletions(-)

New commits:
commit bed90e0b52647e0c61702d680495c8acec044b73
Author: Andras Timar 
AuthorDate: Thu Mar 15 23:01:27 2018 +0100
Commit: Andras Timar 
CommitDate: Sun Feb 13 18:50:55 2022 +0100

[cp] Collabora Office macOS packaging

- added EULA (sla.r) in special OS X resource fork format
- added volume icon which does not work ATM, TODO later
- new dmg background image and adjusted .DS_Store
- fixes to tolerate space in app bundle name

Change-Id: Ia855d7d677136de951c2b9b31ee8d5583475dd41

diff --git a/scp2/source/ooo/scpaction_ooo.scp 
b/scp2/source/ooo/scpaction_ooo.scp
index e09d72848dad..a6546b2400e0 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -45,6 +45,13 @@ ScpAction scp_Copy_Dmg_Background_Image
 Subdir = ".background";
 End
 
+ScpAction scp_Copy_Dmg_Volume_Icon
+Copy = "VolumeIcon.icns";
+Name = ".VolumeIcon.icns";
+UnixRights = 444;
+Styles = ();
+End
+
 ScpAction scp_Copy_Ds_Store
 Copy = "DS_Store";
 DevVersionCopy = "DS_Store_Dev";
diff --git a/setup_native/source/packinfo/DS_Store 
b/setup_native/source/packinfo/DS_Store
index 755f7f6a845f..260cdc3c2a6e 100644
Binary files a/setup_native/source/packinfo/DS_Store and 
b/setup_native/source/packinfo/DS_Store differ
diff --git a/setup_native/source/packinfo/VolumeIcon.icns 
b/setup_native/source/packinfo/VolumeIcon.icns
new file mode 100644
index ..1c7cef6b6f44
Binary files /dev/null and b/setup_native/source/packinfo/VolumeIcon.icns differ
diff --git a/setup_native/source/packinfo/sla.r 
b/setup_native/source/packinfo/sla.r
new file mode 100644
index ..e66aae700ee8
--- /dev/null
+++ b/setup_native/source/packinfo/sla.r
@@ -0,0 +1,2728 @@
+data 'TMPL' (128, "LPic") {
+   $"1344 6566 6175 6C74 204C 616E 6775 6167"/* .Default 
Languag */
+   $"6520 4944 4457 5244 0543 6F75 6E74 4F43"/* e 
IDDWRD.CountOC */
+   $"4E54 042A 2A2A 2A4C 5354 430B 7379 7320"/* 
NT.LSTC.sys  */
+   $"6C61 6E67 2049  5752 441E 6C6F 6361"/* lang 
IDDWRD.loca */
+   $"6C20 7265 7320 4944 2028 6F66 6673 6574"/* l res ID 
(offset */
+   $"2066 726F 6D20 3530 3030 4457 5244 1032"/*  from 
5000DWRD.2 */
+   $"2D62 7974 6520 6C61 6E67 7561 6765 3F44"/* -byte 
language?D */
+   $"5752 4404 2A2A 2A2A 4C53 5445"  /* WRD.LSTE */
+};
+
+data 'STR#' (5000, "English buttons") {
+   $"0006 0D45 6E67 6C69 7368 2074 6573 7431"/* ...English 
test1 */
+   $"0541 6772 6565 0844 6973 6167 7265 6505"/* 
.Agree.Disagree. */
+   $"5072 696E 7407 5361 7665 2E2E 2E7A 4966"/* 
Print.Save...zIf */
+   $"2079 6F75 2061 6772 6565 2077 6974 6820"/*  you agree 
with  */
+   $"7468 6520 7465 726D 7320 6F66 2074 6869"/* the terms of 
thi */
+   $"7320 6C69 6365 6E73 652C 2063 6C69 636B"/* s license, 
click */
+   $"2022 4167 7265 6522 2074 6F20 6163 6365"/*  "Agree" to 
acce */
+   $"7373 2074 6865 2073 6F66 7477 6172 652E"/* ss the 
software. */
+   $"2020 4966 2079 6F75 2064 6F20 6E6F 7420"/*   If you do 
not  */
+   $"6167 7265 652C 2070 7265 7373 2022 4469"/* agree, press 
"Di */
+   $"7361 6772 6565 2E22"/* sagree." */
+};
+
+data 'STR#' (5001, "German") {
+   $"0006 0744 6575 7473 6368 0B41 6B7A 6570"/* 
...Deutsch.Akzep */
+   $"7469 6572 656E 0841 626C 6568 6E65 6E07"/* 
tieren.Ablehnen. */
+   $"4472 7563 6B65 6E0A 5369 6368 6572 6E2E"/* 
Drucken�Sichern. */
+   $"2E2E E74B 6C69 636B 656E 2053 6965 2069"/* ..�Klicken Sie 
i */
+   $"6E20 D241 6B7A 6570 7469 6572 656E D32C"/* n 
�Akzeptieren�, */
+   $"2077 656E 6E20 5369 6520 6D69 7420 6465"/*  wenn Sie mit 
de */
+   $"6E20 4265 7374 696D 6D75 6E67 656E 2064"/* n Bestimmungen 
d */
+   $"6573 2053 6F66 7477 6172 652D 4C69 7A65"/* es 
Software-Lize */
+   $"6E7A 7665 7274 7261 6773 2065 696E 7665"/* nzvertrags 
einve */
+   $"7273 7461 6E64 656E 2073 696E 642E 2046"/* rstanden sind. 
F */
+   $"616C 6C73 206E 6963 6874 2C20 6269 7474"/* alls nicht, 
bitt */
+   $"6520 D241 626C 6568 6E65 6ED3 2061 6E6B"/* e �Ablehnen� 
ank */
+   $"6C69 636B 656E 2E20 5369 6520 6B9

[Libreoffice-commits] core.git: helpcontent2

2022-02-13 Thread Johnny_M (via logerrit)
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5854e65351a7ff430b01ec9eb7db75fa659c3ee1
Author: Johnny_M 
AuthorDate: Sun Feb 13 18:45:35 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Feb 13 18:45:35 2022 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1c448c51a9ba356c62e1fe100186e076228b081e
  - tdf#132643 Translate German section IDs

Change-Id: I70ffee911ca9cfcc1ade46198223b0e9dbe9ed84
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129874
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 0a82cbf071c1..1c448c51a9ba 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0a82cbf071c1c6540bbcd3dace8f29d3e13625ad
+Subproject commit 1c448c51a9ba356c62e1fe100186e076228b081e


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

2022-02-13 Thread Johnny_M (via logerrit)
 source/text/swriter/01/0499.xhp |2 +-
 source/text/swriter/02/1803.xhp |2 +-
 source/text/swriter/02/18030300.xhp |3 ---
 source/text/swriter/02/1904.xhp |2 +-
 source/text/swriter/main0104.xhp|2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 1c448c51a9ba356c62e1fe100186e076228b081e
Author: Johnny_M 
AuthorDate: Sat Feb 12 20:33:54 2022 +0100
Commit: Olivier Hallot 
CommitDate: Sun Feb 13 18:45:33 2022 +0100

tdf#132643 Translate German section IDs

Change-Id: I70ffee911ca9cfcc1ade46198223b0e9dbe9ed84
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129874
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/swriter/01/0499.xhp 
b/source/text/swriter/01/0499.xhp
index dda065eaa..f4a6581ad 100644
--- a/source/text/swriter/01/0499.xhp
+++ b/source/text/swriter/01/0499.xhp
@@ -38,7 +38,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/02/1803.xhp 
b/source/text/swriter/02/1803.xhp
index ad55df723..9a6b53759 100644
--- a/source/text/swriter/02/1803.xhp
+++ b/source/text/swriter/02/1803.xhp
@@ -37,7 +37,7 @@
 You can choose 
from the following functions:
 
 
-
+
 
 
 
diff --git a/source/text/swriter/02/18030300.xhp 
b/source/text/swriter/02/18030300.xhp
index 1e42a57f0..a5523ec75 100644
--- a/source/text/swriter/02/18030300.xhp
+++ b/source/text/swriter/02/18030300.xhp
@@ -29,14 +29,11 @@
 
 
 
-
-
 
 
 Page 
Number
 Inserts the current page number as a field at the cursor 
position. The default setting is for it to use the Page 
Number character style.
 
-
 
 
 
diff --git a/source/text/swriter/02/1904.xhp 
b/source/text/swriter/02/1904.xhp
index e2baee3f6..2affc7865 100644
--- a/source/text/swriter/02/1904.xhp
+++ b/source/text/swriter/02/1904.xhp
@@ -35,7 +35,7 @@
 You can select 
the following functions:
 
 
-
+
 UFI added two 
lines, see #i60664
 
 
diff --git a/source/text/swriter/main0104.xhp b/source/text/swriter/main0104.xhp
index 688166be7..5fee8f302 100644
--- a/source/text/swriter/main0104.xhp
+++ b/source/text/swriter/main0104.xhp
@@ -60,7 +60,7 @@
 Inserts a horizontal line at the current cursor 
position.
 
 
-
+
 
 
 Envelope


[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 19 commits - basctl/uiconfig bin/upload_symbols.py chart2/uiconfig configure.ac dbaccess/uiconfig desktop/source extensions/source

2022-02-13 Thread Miklos Vajna (via logerrit)
 basctl/uiconfig/basicide/menubar/menubar.xml   |3 
 bin/upload_symbols.py  |2 
 chart2/uiconfig/menubar/menubar.xml|3 
 configure.ac   |2 
 dbaccess/uiconfig/dbapp/menubar/menubar.xml|3 
 dbaccess/uiconfig/dbquery/menubar/menubar.xml  |3 
 dbaccess/uiconfig/dbrelation/menubar/menubar.xml   |3 
 dbaccess/uiconfig/dbtable/menubar/menubar.xml  |3 
 dbaccess/uiconfig/dbtdata/menubar/menubar.xml  |3 
 desktop/source/app/crashreport.cxx |4 
 extensions/source/macosx/spotlight/mdimporter/Info.plist   |4 
 extensions/uiconfig/sbibliography/menubar/menubar.xml  |3 
 framework/uiconfig/startmodule/menubar/menubar.xml |3 
 instsetoo_native/CustomTarget_install.mk   |6 -
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 
 postprocess/CustomTarget_signing.mk|2 
 postprocess/signing/signing.pl |2 
 reportdesign/uiconfig/dbreport/menubar/menubar.xml |3 
 sc/uiconfig/scalc/menubar/menubar.xml  |3 
 scp2/source/ooo/scpaction_ooo.scp  |   18 
 scp2/source/python/module_python_librelogo.scp |2 
 sd/uiconfig/sdraw/menubar/menubar.xml  |3 
 sd/uiconfig/simpress/menubar/menubar.xml   |3 
 sfx2/source/appl/appserv.cxx   |6 -
 sfx2/source/view/viewfrm.cxx   |   58 -
 solenv/bin/modules/installer/epmfile.pm|2 
 solenv/bin/modules/installer/windows/admin.pm  |3 
 solenv/bin/modules/installer/windows/msp.pm|4 
 starmath/uiconfig/smath/menubar/menubar.xml|3 
 svx/source/dialog/crashreportdlg.cxx   |   14 +--
 svx/source/dialog/crashreportdlg.hxx   |4 
 svx/uiconfig/ui/crashreportdlg.ui  |   33 ++-
 sw/uiconfig/sglobal/menubar/menubar.xml|3 
 sw/uiconfig/sweb/menubar/menubar.xml   |3 
 sw/uiconfig/swform/menubar/menubar.xml |3 
 sw/uiconfig/swreport/menubar/menubar.xml   |3 
 sw/uiconfig/swriter/menubar/menubar.xml|3 
 sw/uiconfig/swxform/menubar/menubar.xml|3 
 writerperfect/qa/unit/EPUBExportTest.cxx   |3 
 39 files changed, 48 insertions(+), 183 deletions(-)

New commits:
commit 14bbc66cbb5ac0165a6300d7ac01179a9fad
Author: Miklos Vajna 
AuthorDate: Thu May 14 10:19:21 2020 +0200
Commit: Andras Timar 
CommitDate: Sun Feb 13 18:25:53 2022 +0100

CppunitTest_writerperfect_epubexport: don't try to load flagged abw format

master opens this as-is, this branch would first show you a dialog, we
cancel that in headless mode, and then loading fails, but that's not an
interesting failure.

Change-Id: I6ff83e320738fb33ee88d10f9b2cfabff91de8ed

diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx 
b/writerperfect/qa/unit/EPUBExportTest.cxx
index c1769607605a..b8827b47c2c5 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -874,9 +874,12 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testSimpleRuby)
 
 CPPUNIT_TEST_FIXTURE(EPUBExportTest, testAbi11105)
 {
+// Disable the test on this branch, .abw is flagged as EXOTIC, so loading 
would fail.
+#if 0
 // This crashed because the paragraph style "P5" which had a 
master-page-name
 // appeared in a table cell messed up page spans.
 createDoc(u"abi11105.abw", {});
+#endif
 }
 }
 
commit c0e537948c240d697c7dc0836a02c98f79e8240d
Author: Andras Timar 
AuthorDate: Sun Sep 22 18:35:02 2019 +0200
Commit: Andras Timar 
CommitDate: Sun Feb 13 18:24:09 2022 +0100

[cp] switch to Collabora's help instance

Change-Id: I70df6d7b7601f47b923c922c97436b0a826fc32e

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index a556d6af7f4d..a753798b3369 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3752,7 +3752,7 @@
   Specifies the root URL to the Office help pages. Blank disables
   Help buttons on dialogs in LibreOffice Online.
 
-https://help.libreoffice.org/help.html?
+https://help.collaboraoffice.com/help.html?
   
   
 
commit 27ecb78c8d30b7281b069578f4d6ce53e6702ed8
Author: Andras Timar 
AuthorDate: Thu Feb 11 08:27:23 2021 +0100
Commit: Andras Timar 
CommitDate: Sun Feb 13 18:23:49 2022 +0100

[cp] tr

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

2022-02-13 Thread Noel Grandin (via logerrit)
 chart2/source/model/template/ColumnLineChartTypeTemplate.cxx |   91 ++-
 chart2/source/model/template/LineChartType.cxx   |  115 +++--
 chart2/source/model/template/LineChartTypeTemplate.cxx   |  115 +++--
 chart2/source/model/template/NetChartType.cxx|   36 ---
 chart2/source/model/template/PieChartType.cxx|  105 +++--
 chart2/source/model/template/PieChartTypeTemplate.cxx|  113 +++--
 chart2/source/model/template/ScatterChartType.cxx|  115 +++--
 chart2/source/model/template/ScatterChartTypeTemplate.cxx|  127 ---
 8 files changed, 296 insertions(+), 521 deletions(-)

New commits:
commit 9985cc1088218c616f9cb8854cd58eb1f4fa895c
Author: Noel Grandin 
AuthorDate: Sat Feb 12 11:50:49 2022 +0200
Commit: Noel Grandin 
CommitDate: Sun Feb 13 17:21:40 2022 +0100

rtl::Static -> local static

Change-Id: I43059938f1fc814b2b8306258210a67d7a1fac84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129858
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx 
b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 1f3bd9c9a538..90646552e50e 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -56,69 +56,44 @@ enum
 PROP_COL_LINE_NUMBER_OF_LINES
 };
 
-void lcl_AddPropertiesToVector(
-std::vector< Property > & rOutProperties )
+::chart::tPropertyValueMap& StaticColumnLineChartTypeTemplateDefaults()
 {
-rOutProperties.emplace_back( "NumberOfLines",
-  PROP_COL_LINE_NUMBER_OF_LINES,
-  cppu::UnoType::get(),
-  beans::PropertyAttribute::BOUND
-  | beans::PropertyAttribute::MAYBEDEFAULT );
+static ::chart::tPropertyValueMap aStaticDefaults =
+[]()
+{
+::chart::tPropertyValueMap aOutMap;
+::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( 
aOutMap, PROP_COL_LINE_NUMBER_OF_LINES, 1 );
+return aOutMap;
+}();
+return aStaticDefaults;
 }
 
-struct StaticColumnLineChartTypeTemplateDefaults_Initializer
-{
-::chart::tPropertyValueMap* operator()()
-{
-static ::chart::tPropertyValueMap aStaticDefaults;
-::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( 
aStaticDefaults, PROP_COL_LINE_NUMBER_OF_LINES, 1 );
-return &aStaticDefaults;
-}
-};
-
-struct StaticColumnLineChartTypeTemplateDefaults : public 
rtl::StaticAggregate< ::chart::tPropertyValueMap, 
StaticColumnLineChartTypeTemplateDefaults_Initializer >
+::cppu::OPropertyArrayHelper& StaticColumnLineChartTypeTemplateInfoHelper()
 {
-};
-
-struct StaticColumnLineChartTypeTemplateInfoHelper_Initializer
-{
-::cppu::OPropertyArrayHelper* operator()()
-{
-static ::cppu::OPropertyArrayHelper aPropHelper( 
lcl_GetPropertySequence() );
-return &aPropHelper;
-}
-
-private:
-static uno::Sequence< Property > lcl_GetPropertySequence()
-{
-std::vector< css::beans::Property > aProperties;
-lcl_AddPropertiesToVector( aProperties );
-
-std::sort( aProperties.begin(), aProperties.end(),
- ::chart::PropertyNameLess() );
-
-return comphelper::containerToSequence( aProperties );
-}
+static ::cppu::OPropertyArrayHelper aPropHelper(
+[]()
+{
+std::vector< css::beans::Property > aProperties {
+{ "NumberOfLines",
+  PROP_COL_LINE_NUMBER_OF_LINES,
+  cppu::UnoType::get(),
+  beans::PropertyAttribute::BOUND
+  | beans::PropertyAttribute::MAYBEDEFAULT } };
 
-};
+std::sort( aProperties.begin(), aProperties.end(),
+ ::chart::PropertyNameLess() );
 
-struct StaticColumnLineChartTypeTemplateInfoHelper : public 
rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, 
StaticColumnLineChartTypeTemplateInfoHelper_Initializer >
-{
-};
-
-struct StaticColumnLineChartTypeTemplateInfo_Initializer
-{
-uno::Reference< beans::XPropertySetInfo >* operator()()
-{
-static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
-
::cppu::OPropertySetHelper::createPropertySetInfo(*StaticColumnLineChartTypeTemplateInfoHelper::get()
 ) );
-return &xPropertySetInfo;
-}
-};
+return comphelper::containerToSequence( aProperties );
+}());
+return aPropHelper;
+}
 
-struct StaticColumnLineChartTypeTemplateInfo : public rtl::StaticAggregate< 
uno::Reference< beans::XPropertySetInfo >, 
StaticColumnLineChartTypeTemplateInfo_Initializer >
+uno::Reference< beans::XPropertySetInfo >& 
StaticColumnLineChartTypeTemplateInfo()
 {
-};
+static uno::Reference< beans::XPropertySetInfo > xPropertySetInfo(
+
::cppu::OPropertySetHel

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 4 commits - bin/pack-debug config_host.mk.in configure.ac filter/source instsetoo_native/CustomTarget_install.mk officecfg/registry

2022-02-13 Thread Andras Timar (via logerrit)
 bin/pack-debug   |  195 
++
 config_host.mk.in|2 
 configure.ac |8 
 filter/source/config/fragments/filters/BroadBand_eBook.xcu   |2 
 filter/source/config/fragments/filters/ClarisWorks.xcu   |2 
 filter/source/config/fragments/filters/ClarisWorks_Calc.xcu  |2 
 filter/source/config/fragments/filters/ClarisWorks_Draw.xcu  |2 
 filter/source/config/fragments/filters/ClarisWorks_Impress.xcu   |2 
 filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu   |2 
 filter/source/config/fragments/filters/CorelDrawDocument.xcu |2 
 filter/source/config/fragments/filters/CorelPresentationExchange.xcu |2 
 filter/source/config/fragments/filters/DIF.xcu   |2 
 filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu |2 
 filter/source/config/fragments/filters/DocBook_File.xcu  |2 
 filter/source/config/fragments/filters/DosWord.xcu   |2 
 filter/source/config/fragments/filters/FictionBook_2.xcu |2 
 filter/source/config/fragments/filters/FreehandDocument.xcu  |2 
 filter/source/config/fragments/filters/Lotus.xcu |2 
 filter/source/config/fragments/filters/LotusWordPro.xcu  |2 
 filter/source/config/fragments/filters/MacWrite.xcu  |2 
 filter/source/config/fragments/filters/Mac_Word.xcu  |2 
 filter/source/config/fragments/filters/Mac_Works.xcu |2 
 filter/source/config/fragments/filters/Mac_Works_Calc.xcu|2 
 filter/source/config/fragments/filters/Mariner_Write.xcu |2 
 filter/source/config/fragments/filters/PageMakerDocument.xcu |2 
 filter/source/config/fragments/filters/PalmDoc.xcu   |2 
 filter/source/config/fragments/filters/Palm_Text_Document.xcu|2 
 filter/source/config/fragments/filters/Plucker_eBook.xcu |2 
 filter/source/config/fragments/filters/QPro.xcu  |2 
 filter/source/config/fragments/filters/QXPDocument.xcu   |2 
 filter/source/config/fragments/filters/StarOffice_Drawing.xcu|2 
 filter/source/config/fragments/filters/StarOffice_Presentation.xcu   |2 
 filter/source/config/fragments/filters/StarOffice_Spreadsheet.xcu|2 
 filter/source/config/fragments/filters/StarOffice_Writer.xcu |2 
 filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu |2 
 filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu   |2 
 filter/source/config/fragments/filters/UOF_presentation.xcu  |2 
 filter/source/config/fragments/filters/UOF_spreadsheet.xcu   |2 
 filter/source/config/fragments/filters/UOF_text.xcu  |2 
 filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu|2 
 filter/source/config/fragments/filters/WPS_QPro_Calc.xcu |2 
 filter/source/config/fragments/filters/WordPerfect.xcu   |2 
 filter/source/config/fragments/filters/WordPerfectGraphics.xcu   |2 
 filter/source/config/fragments/filters/WriteNow.xcu  |2 
 filter/source/config/fragments/filters/ZMFDocument.xcu   |2 
 instsetoo_native/CustomTarget_install.mk |2 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs   |2 
 solenv/bin/modules/installer.pm  |   53 ++
 solenv/bin/modules/installer/epmfile.pm  |   20 +
 solenv/bin/modules/installer/splitdbg.pm |  121 
++
 50 files changed, 440 insertions(+), 47 deletions(-)

New commits:
commit 32c0ff9a0cf82566f5db464bdf5df4cc2c02a8a7
Author: Andras Timar 
AuthorDate: Wed Apr 25 15:30:38 2018 +0200
Commit: Andras Timar 
CommitDate: Sun Feb 13 12:50:33 2022 +0100

[cp] StarOffice XML is not exotic, old binary format is exotic

Change-Id: Ie435dda390e434e34ef753b5cb2715ac2252e82e
Reviewed-on: https://gerrit.libreoffice.org/53450
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/filter/source/config/fragments/filters/StarOffice_Drawing.xcu 
b/filter/source/config/fragments/filters/StarOffice_Drawing.xcu
index f820fe0965a3..a367a5bd909a 100644
--- a/filter/source/config/fragments/filters/StarOffice_Drawing.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_Drawing.xcu
@@ -9,7 +9,7 @@
 
 
 
-IMPORT ALIEN 3RDPARTYFILTER PREFERRED
+IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC
 
 
 org.libreoffice.comp.Draw.StarOfficeDrawImportFilter
diff --git a/filter/source/config/fragments/filters/StarOffice_Pre

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

2022-02-13 Thread Luboš Luňák (via logerrit)
 solenv/gbuild/ExternalProject.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0e3092fd6c8dc8908bd7820a4eb858771ca7eb00
Author: Luboš Luňák 
AuthorDate: Sun Feb 13 01:18:10 2022 +0100
Commit: Luboš Luňák 
CommitDate: Sun Feb 13 13:17:51 2022 +0100

set up gb_COMPILER_SETUP properly for gb_ExternalProject_run

If the command to run would be "cmd1 && cmd2", the old way would
set up the variables only for the first command.

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

diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 94f8daee37fc..ef10c1d2884f 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -222,7 +222,8 @@ $(call gb_Helper_print_on_error,cd $(EXTERNAL_WORKDIR)/$(3) 
&& \
unset Platform && \
$(if $(WRAPPERS),export $(WRAPPERS) &&) \
$(if $(NMAKE),export $(NMAKE) &&) \
-   $(gb_COMPILER_SETUP) $(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if 
$(3),$(3)/,)$(if $(4),$(4),$(1).log))
+   $(if $(gb_COMPILER_SETUP),export $(gb_COMPILER_SETUP) &&) \
+   $(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if $(3),$(3)/,)$(if 
$(4),$(4),$(1).log))
 )
 endef
 


[Libreoffice-commits] core.git: solenv/gcc-wrappers

2022-02-13 Thread Luboš Luňák (via logerrit)
 solenv/gcc-wrappers/wrapper.cxx |   16 
 1 file changed, 4 insertions(+), 12 deletions(-)

New commits:
commit c5e29ad23da99913a73e28e7d5d1c096c7b9e312
Author: Luboš Luňák 
AuthorDate: Sat Feb 12 23:40:20 2022 +0100
Commit: Luboš Luňák 
CommitDate: Sun Feb 13 13:17:34 2022 +0100

may just as well use -Z7 if trying to avoid shared .pdb access

-Z7 writes all debug info into the .obj file, so it avoids the .pdb
altogether.

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

diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index c97b57808be9..c84fd4990b75 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -107,11 +107,12 @@ std::string processccargs(const std::vector& 
rawargs, std::string &
 std::string linkargs;
 bool block_linkargs = false;
 
-// instead of using synced PDB access (-FS), use individual PDB files 
based on output
+// Instead of using synced PDB access (-FS), use individual PDB files 
based on output.
+// In fact, simply use -Z7, which doesn't use PDB files at all and writes 
all debug into the .obj file.
 const char *const pEnvIndividualPDBs(getenv("MSVC_USE_INDIVIDUAL_PDBS"));
 const bool bIndividualPDBs = (pEnvIndividualPDBs && 
!strcmp(pEnvIndividualPDBs, "TRUE"));
 const char *const pEnvEnableZ7Debug(getenv("ENABLE_Z7_DEBUG"));
-const bool bEnableZ7Debug = (pEnvEnableZ7Debug && 
!strcmp(pEnvEnableZ7Debug, "TRUE"));
+const bool bEnableZ7Debug = (pEnvEnableZ7Debug && 
!strcmp(pEnvEnableZ7Debug, "TRUE")) || bIndividualPDBs;
 
 for(std::vector::const_iterator i = rawargs.begin(); i != 
rawargs.end(); ++i) {
 if (env_prefix_next_arg)
@@ -152,21 +153,12 @@ std::string processccargs(const std::vector& 
rawargs, std::string &
  << (*i) << "\"" << std::endl;
 exit(1);
 }
-
-if (bIndividualPDBs && !bEnableZ7Debug)
-{
-if (dot == std::string::npos)
-args.append(" -Fd" + *i + ".pdb");
-else
-args.append(" -Fd" + (*i).substr(0, dot) + ".pdb");
-}
 }
 else if(*i == "-g" || !(*i).compare(0,5,"-ggdb")) {
 if(!bEnableZ7Debug)
 {
 args.append("-Zi");
-if (!bIndividualPDBs)
-args.append(" -FS");
+args.append(" -FS");
 }
 else
 {


Re: Wants to contribute!!

2022-02-13 Thread Ilmari Lauhakangas

On 13.2.2022 5.30, Aman Jha wrote:

Dear sir/mam,

I want to contribute in libreoffice. I am an open source enthusiast. I 
also participated in hactoberfest and contributed in some projects. I 
have very good intereste in c++ programming i know all the basics and 
learning more about it by solving problems. I love problem solving.


Skills: C++, html, css,python(basic)
GitHub: https://github.com/amanj752 

Experience : 6 month web development internship (worked on css did 
responsiveness).


Kindly, give me an opportunity to work with your organization i hope I 
will make some good contribution.


I have invited you to an interview.

Ilmari


[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sc/source

2022-02-13 Thread Aron Budea (via logerrit)
 sc/source/filter/oox/workbookhelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 003c8b9f89be4f99c2f23cb1d49c08f8d9562221
Author: Aron Budea 
AuthorDate: Fri Oct 19 20:56:35 2018 +0200
Commit: Andras Timar 
CommitDate: Sun Feb 13 12:25:10 2022 +0100

[cp] Add another known good generator.

Change-Id: I05a9aff0d1bddf0efd2491f09fe0fbf7144e8b4d

diff --git a/sc/source/filter/oox/workbookhelper.cxx 
b/sc/source/filter/oox/workbookhelper.cxx
index 322986e9ba25..15d019dc8c05 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -554,7 +554,7 @@ void WorkbookGlobals::initialize()
 aCalcConfig.SetStringRefSyntax( formula::FormulaGrammar::CONV_XL_A1 ) ;
 mpDoc->SetCalcConfig(aCalcConfig);
 }
-else if (aGenerator.startsWithIgnoreAsciiCase("LibreOffice"))
+else if (aGenerator.startsWithIgnoreAsciiCase("LibreOffice") || 
aGenerator.startsWithIgnoreAsciiCase("Collabora"))
 {
 mbGeneratorKnownGood = true;
 }


[Libreoffice-commits] core.git: helpcontent2

2022-02-13 Thread Johnny_M (via logerrit)
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bff93ba74ec9fdb21ab5aba9df33c181d5a7408f
Author: Johnny_M 
AuthorDate: Sun Feb 13 12:21:39 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Feb 13 12:21:39 2022 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 0a82cbf071c1c6540bbcd3dace8f29d3e13625ad
  - tdf#132643 Translate German section IDs

Change-Id: Ifc3ae651992037a4ebd9f067abed75e83ddca76f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129873
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index dfaa80e9ae8c..0a82cbf071c1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dfaa80e9ae8c0948a6d1691b5e0406c6fe205f25
+Subproject commit 0a82cbf071c1c6540bbcd3dace8f29d3e13625ad


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

2022-02-13 Thread Johnny_M (via logerrit)
 source/text/swriter/02/1402.xhp |4 ++--
 source/text/swriter/main0214.xhp|4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0a82cbf071c1c6540bbcd3dace8f29d3e13625ad
Author: Johnny_M 
AuthorDate: Sat Feb 12 20:28:18 2022 +0100
Commit: Olivier Hallot 
CommitDate: Sun Feb 13 12:21:37 2022 +0100

tdf#132643 Translate German section IDs

Change-Id: Ifc3ae651992037a4ebd9f067abed75e83ddca76f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129873
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/swriter/02/1402.xhp 
b/source/text/swriter/02/1402.xhp
index f537b8d25..b72bb1d76 100644
--- a/source/text/swriter/02/1402.xhp
+++ b/source/text/swriter/02/1402.xhp
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 formulas; in text documents
 operators; in table formulas
@@ -45,7 +45,7 @@
 
 With the cursor in 
a table, press F2
 In the Table toolbar, 
press the Formula icon.
-
+
 
 
 
diff --git a/source/text/swriter/main0214.xhp b/source/text/swriter/main0214.xhp
index f32b79590..db39f58ee 100644
--- a/source/text/swriter/main0214.xhp
+++ b/source/text/swriter/main0214.xhp
@@ -37,8 +37,8 @@
 The Formula Bar allows you to create and insert 
calculations into a text document. To activate the Formula 
Bar, press F2.
 
 
-
-
+
+
 
 
 


[Libreoffice-commits] core.git: helpcontent2

2022-02-13 Thread Johnny_M (via logerrit)
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4c8d0abf65b127e38d8d0a113f208ec52ffd9a36
Author: Johnny_M 
AuthorDate: Sun Feb 13 12:20:59 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Feb 13 12:20:59 2022 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to dfaa80e9ae8c0948a6d1691b5e0406c6fe205f25
  - tdf#132643 Translate German section IDs

Change-Id: I8b146a974b3220561ce6f2d1181851663f0b409d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129872
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 6eb4e6b6a68f..dfaa80e9ae8c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6eb4e6b6a68f36db612040f391a8683780eee460
+Subproject commit dfaa80e9ae8c0948a6d1691b5e0406c6fe205f25


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

2022-02-13 Thread Johnny_M (via logerrit)
 source/text/swriter/02/1007.xhp |4 ++--
 source/text/swriter/main0210.xhp|4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit dfaa80e9ae8c0948a6d1691b5e0406c6fe205f25
Author: Johnny_M 
AuthorDate: Sat Feb 12 20:18:19 2022 +0100
Commit: Olivier Hallot 
CommitDate: Sun Feb 13 12:20:57 2022 +0100

tdf#132643 Translate German section IDs

Change-Id: I8b146a974b3220561ce6f2d1181851663f0b409d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129872
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/swriter/02/1007.xhp 
b/source/text/swriter/02/1007.xhp
index c11eecc8b..f35dfbab5 100644
--- a/source/text/swriter/02/1007.xhp
+++ b/source/text/swriter/02/1007.xhp
@@ -29,14 +29,14 @@
 
 
 
-
+
 
 
 
 
 Defines the number of pages displayed on screen. Click 
the arrow next to the icon to open a grid to select the number of pages to be 
displayed as rows and columns in the preview.
 
-
+
 
 
 
diff --git a/source/text/swriter/main0210.xhp b/source/text/swriter/main0210.xhp
index 4dc96daea..64a7a0aaf 100644
--- a/source/text/swriter/main0210.xhp
+++ b/source/text/swriter/main0210.xhp
@@ -43,8 +43,8 @@
 
 
 
-
-
+
+
 
 
 


[Libreoffice-commits] core.git: helpcontent2

2022-02-13 Thread Johnny_M (via logerrit)
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5e52cad9d5a0432f707328ff8ddbc0e935bb1487
Author: Johnny_M 
AuthorDate: Sun Feb 13 12:20:26 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Feb 13 12:20:26 2022 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 6eb4e6b6a68f36db612040f391a8683780eee460
  - tdf#132643 Translate German section IDs

Change-Id: I33c485aee4f6e16bb35ceda14541091b09cf1088
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129871
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 9e0a8c989991..6eb4e6b6a68f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9e0a8c989991406a0644272544763cc46dca13b2
+Subproject commit 6eb4e6b6a68f36db612040f391a8683780eee460


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

2022-02-13 Thread Johnny_M (via logerrit)
 source/text/swriter/02/0608.xhp |4 ++--
 source/text/swriter/02/0612.xhp |4 ++--
 source/text/swriter/main0206.xhp|8 
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 6eb4e6b6a68f36db612040f391a8683780eee460
Author: Johnny_M 
AuthorDate: Sat Feb 12 20:13:03 2022 +0100
Commit: Olivier Hallot 
CommitDate: Sun Feb 13 12:20:24 2022 +0100

tdf#132643 Translate German section IDs

Change-Id: I33c485aee4f6e16bb35ceda14541091b09cf1088
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129871
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/swriter/02/0608.xhp 
b/source/text/swriter/02/0608.xhp
index d4907b0bb..ecff762f1 100644
--- a/source/text/swriter/02/0608.xhp
+++ b/source/text/swriter/02/0608.xhp
@@ -30,13 +30,13 @@
 
 
 
-
+
 
 i66535, was Shift up with Subpoints
 Promote One Level With Subpoints
 Shifts paragraphs with subpoints up one numbering 
level. This is only visible when the cursor is positioned within 
numbered or bulleted text.
 
-
+
 
 
 
diff --git a/source/text/swriter/02/0612.xhp 
b/source/text/swriter/02/0612.xhp
index 22676ce41..ee7b0ae10 100644
--- a/source/text/swriter/02/0612.xhp
+++ b/source/text/swriter/02/0612.xhp
@@ -29,12 +29,12 @@
 
 
 
-  
+  
 
 Move Up with Subpoints
   Moves a paragraph with subpoints 
to above the previous paragraph. This is only visible when the cursor 
is positioned within numbered or bulleted text.
   
-  
+  
   
 
 
diff --git a/source/text/swriter/main0206.xhp b/source/text/swriter/main0206.xhp
index 27a67aef9..6e8b0fb34 100644
--- a/source/text/swriter/main0206.xhp
+++ b/source/text/swriter/main0206.xhp
@@ -34,8 +34,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -44,8 +44,8 @@
 
 
 
-
-
+
+
 
 
 


[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 6 commits - officecfg/registry readlicense_oo/docs readlicense_oo/license readlicense_oo/Package_files.mk sfx2/source sfx2/uiconfig

2022-02-13 Thread Gülşah Köse (via logerrit)
 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu   |
6 
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
2 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs   |
2 
 readlicense_oo/Package_files.mk  |
4 
 readlicense_oo/docs/readme.xrm   |  
196 --
 readlicense_oo/license/EULA.odt  
|binary
 readlicense_oo/license/EULA_en-US.rtf|  
105 +
 sfx2/source/appl/appserv.cxx |   
26 +
 sfx2/uiconfig/ui/licensedialog.ui|   
49 ++
 solenv/bin/modules/installer/environment.pm  |
2 
 solenv/bin/modules/installer/windows/idtglobal.pm|
2 
 11 files changed, 186 insertions(+), 208 deletions(-)

New commits:
commit d064ea3659198fcd914b6939ec1f31880ebe9809
Author: Gülşah Köse 
AuthorDate: Wed Sep 18 23:07:09 2019 +0300
Commit: Andras Timar 
CommitDate: Sun Feb 13 11:50:27 2022 +0100

[cp] add EULA button to Help - License Information... dialog

Forward port of acd8acfa89d9 from distro/collabora/cp-6.0
Rewritten for weld API

Change-Id: I62b9293c68059389a63e523ea5747fdb267b1a99
28a21f5831e0b2e99eb11f1c1ac2b8845c462669
Reviewed-on: https://gerrit.libreoffice.org/79110
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 107b8c1f749a..ccb93bfc4c6b 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -254,21 +254,43 @@ namespace
 
 class LicenseDialog : public weld::GenericDialogController
 {
+private:
+std::unique_ptr m_xBtnLicense;
+std::unique_ptr m_xBtnEula;
+
+DECL_LINK(EulaHdl, weld::Button&, void);
+DECL_LINK(LicenseHdl, weld::Button&, void);
+
 public:
 LicenseDialog(weld::Window* pParent)
 : GenericDialogController(pParent, "sfx/ui/licensedialog.ui",  
"LicenseDialog")
+, m_xBtnLicense(m_xBuilder->weld_button("license"))
+, m_xBtnEula(m_xBuilder->weld_button("eula"))
 {
+m_xBtnLicense->connect_clicked( LINK(this, LicenseDialog, 
LicenseHdl) );
+m_xBtnEula->connect_clicked( LINK(this, LicenseDialog, EulaHdl) );
 }
 
 virtual short run() override
 {
 short nRet = GenericDialogController::run();
-if (nRet == RET_OK)
-showDocument("LICENSE");
 return nRet;
 }
 };
 
+IMPL_LINK_NOARG(LicenseDialog, EulaHdl, weld::Button&, void)
+{
+response(RET_OK);
+showDocument("EULA.odt");
+}
+
+IMPL_LINK_NOARG(LicenseDialog, LicenseHdl, weld::Button&, void)
+{
+response(RET_OK);
+showDocument("LICENSE");
+}
+
+
 class SafeModeQueryDialog : public weld::MessageDialogController
 {
 public:
diff --git a/sfx2/uiconfig/ui/licensedialog.ui 
b/sfx2/uiconfig/ui/licensedialog.ui
index 71d504f9300d..a1d42e05dc7a 100644
--- a/sfx2/uiconfig/ui/licensedialog.ui
+++ b/sfx2/uiconfig/ui/licensedialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -11,6 +11,9 @@
 0
 0
 dialog
+
+  
+
 
   
 False
@@ -21,7 +24,7 @@
 False
 end
 
-  
+  
 _Show License
 True
 True
@@ -36,6 +39,23 @@
 True
   
 
+
+  
+_EULA
+True
+True
+True
+True
+True
+True
+  
+  
+False
+True
+1
+True
+  
+
 
   
 _Close
@@ -50,7 +70,7 @@
   
 False
 True
-1
+2
   
 
   
@@ -61,6 +81,24 @@
 0
   
 
+
+  
+True
+False
+%PRODUCTNAME binary package is made available 
subject to the terms of the End User License and Subscription Agreement; choose 
EULA to see exact details in English.
+True
+True
+eula
+80
+0
+0
+  
+  
+False
+True
+0
+  
+
 
   
 True
@@ -88,11 +126,8 @@ This product was created by %OOOVENDOR, based on 
OpenOffice.org, which is Copyri
   
 
 
-  ok
+  license
   close
 
-
-  
-
   
 
commit 4157921a0741b29

[Libreoffice-commits] core.git: helpcontent2

2022-02-13 Thread Johnny_M (via logerrit)
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a3270efa82ef35907f87e9c26b80b417e633f0ce
Author: Johnny_M 
AuthorDate: Sun Feb 13 12:19:23 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Feb 13 12:19:23 2022 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 9e0a8c989991406a0644272544763cc46dca13b2
  - tdf#132643 Translate German section IDs

Change-Id: I2c3da3855c159524fa0e20fc3b817857b96cd9d8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129870
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index a7e0e8446ea9..9e0a8c989991 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a7e0e8446ea94f6ca0737750a88ba7f8229bfd20
+Subproject commit 9e0a8c989991406a0644272544763cc46dca13b2


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

2022-02-13 Thread Johnny_M (via logerrit)
 source/text/shared/main0204.xhp |4 ++--
 source/text/swriter/02/0410.xhp |4 ++--
 source/text/swriter/main0204.xhp|4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 9e0a8c989991406a0644272544763cc46dca13b2
Author: Johnny_M 
AuthorDate: Sat Feb 12 20:06:51 2022 +0100
Commit: Olivier Hallot 
CommitDate: Sun Feb 13 12:19:21 2022 +0100

tdf#132643 Translate German section IDs

Change-Id: I2c3da3855c159524fa0e20fc3b817857b96cd9d8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129870
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/main0204.xhp b/source/text/shared/main0204.xhp
index 9bc345f92..602bf6ce6 100644
--- a/source/text/shared/main0204.xhp
+++ b/source/text/shared/main0204.xhp
@@ -53,8 +53,8 @@
 
 
 
-
-
+
+
 Delete 
Row
 
 
diff --git a/source/text/swriter/02/0410.xhp 
b/source/text/swriter/02/0410.xhp
index 73e3102c5..775ddfa06 100644
--- a/source/text/swriter/02/0410.xhp
+++ b/source/text/swriter/02/0410.xhp
@@ -32,7 +32,7 @@
 
 
 
-
+
 tables; inserting columns in
 columns; inserting in tables
 
@@ -40,7 +40,7 @@
 Insert 
Column
 Inserts one or more columns into the table, after the 
selection. You can insert several columns at the same time by opening the 
dialog (choose Table - Insert - Columns), or by selecting several 
columns before clicking the icon. If the latter method is used, the 
columns inserted will have the same relative width as the selected 
columns.
 
-
+
 
 
 
diff --git a/source/text/swriter/main0204.xhp b/source/text/swriter/main0204.xhp
index 24be74bc6..2c87bf1e6 100644
--- a/source/text/swriter/main0204.xhp
+++ b/source/text/swriter/main0204.xhp
@@ -53,8 +53,8 @@
 
 
 
-
-
+
+
 Delete 
Row
 
 


[Libreoffice-commits] core.git: helpcontent2

2022-02-13 Thread Johnny_M (via logerrit)
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7c6e8c7e34c91016ae62c4d47f6d44468bf6b470
Author: Johnny_M 
AuthorDate: Sun Feb 13 12:18:32 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Feb 13 12:18:32 2022 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to a7e0e8446ea94f6ca0737750a88ba7f8229bfd20
  - tdf#132643 Translate German section IDs

Change-Id: I8f9898aae8da81c5a04fddf4fa824143051ffeac
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129869
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index c60e4d69ec32..a7e0e8446ea9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c60e4d69ec32eb450e5075c03af329ae141eb33d
+Subproject commit a7e0e8446ea94f6ca0737750a88ba7f8229bfd20


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

2022-02-13 Thread Johnny_M (via logerrit)
 source/text/swriter/01/0499.xhp |2 +-
 source/text/swriter/02/1803.xhp |2 +-
 source/text/swriter/02/18030200.xhp |2 +-
 source/text/swriter/02/1904.xhp |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a7e0e8446ea94f6ca0737750a88ba7f8229bfd20
Author: Johnny_M 
AuthorDate: Sat Feb 12 20:03:31 2022 +0100
Commit: Olivier Hallot 
CommitDate: Sun Feb 13 12:18:31 2022 +0100

tdf#132643 Translate German section IDs

Change-Id: I8f9898aae8da81c5a04fddf4fa824143051ffeac
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129869
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/swriter/01/0499.xhp 
b/source/text/swriter/01/0499.xhp
index 375b6904e..dda065eaa 100644
--- a/source/text/swriter/01/0499.xhp
+++ b/source/text/swriter/01/0499.xhp
@@ -41,7 +41,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/02/1803.xhp 
b/source/text/swriter/02/1803.xhp
index 692c7d404..ad55df723 100644
--- a/source/text/swriter/02/1803.xhp
+++ b/source/text/swriter/02/1803.xhp
@@ -36,7 +36,7 @@
 
 You can choose 
from the following functions:
 
-
+
 
 
 
diff --git a/source/text/swriter/02/18030200.xhp 
b/source/text/swriter/02/18030200.xhp
index 5629629f9..6d83c0635 100644
--- a/source/text/swriter/02/18030200.xhp
+++ b/source/text/swriter/02/18030200.xhp
@@ -32,7 +32,7 @@
 
   
   
-  
+  
   time 
fields;insertingfields;inserting 
time
 
 Time
diff --git a/source/text/swriter/02/1904.xhp 
b/source/text/swriter/02/1904.xhp
index e03d1ddc6..e2baee3f6 100644
--- a/source/text/swriter/02/1904.xhp
+++ b/source/text/swriter/02/1904.xhp
@@ -34,7 +34,7 @@
 Click to open 
the Fields 
dialog. Click the arrow next to the icon and select the required field from the 
submenu. 
 You can select 
the following functions:
 
-
+
 
 UFI added two 
lines, see #i60664
 


[Libreoffice-commits] core.git: helpcontent2

2022-02-13 Thread Johnny_M (via logerrit)
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d092fd5d773bae722e2af5f21b106a3475d0aa27
Author: Johnny_M 
AuthorDate: Sun Feb 13 12:17:39 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Feb 13 12:17:39 2022 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to c60e4d69ec32eb450e5075c03af329ae141eb33d
  - tdf#132643 Translate German section IDs

Remove unused.

Change-Id: Ie363a0cacea00c34f1b16f2b767e198d45ac3a92
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129868
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 348add24c9ee..c60e4d69ec32 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 348add24c9ee527eb35d52ef1a4204ea2980077c
+Subproject commit c60e4d69ec32eb450e5075c03af329ae141eb33d


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

2022-02-13 Thread Johnny_M (via logerrit)
 source/text/swriter/02/0422.xhp |4 
 source/text/swriter/02/0423.xhp |4 
 source/text/swriter/02/0424.xhp |4 
 source/text/swriter/02/1001.xhp |2 --
 source/text/swriter/02/1002.xhp |2 --
 source/text/swriter/02/1813.xhp |4 
 6 files changed, 20 deletions(-)

New commits:
commit c60e4d69ec32eb450e5075c03af329ae141eb33d
Author: Johnny_M 
AuthorDate: Sat Feb 12 20:01:08 2022 +0100
Commit: Olivier Hallot 
CommitDate: Sun Feb 13 12:17:36 2022 +0100

tdf#132643 Translate German section IDs

Remove unused.

Change-Id: Ie363a0cacea00c34f1b16f2b767e198d45ac3a92
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129868
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/swriter/02/0422.xhp 
b/source/text/swriter/02/0422.xhp
index ea18a7943..016d55239 100644
--- a/source/text/swriter/02/0422.xhp
+++ b/source/text/swriter/02/0422.xhp
@@ -29,12 +29,9 @@
 
 
 
-  
 
 Table: Fixed
   If this mode is active, changes to 
a line and/or column affect only the neighboring lines or columns in 
question.
-  
-  
   
 
 
@@ -49,7 +46,6 @@
 
 
   
-  
 
  
 
diff --git a/source/text/swriter/02/0423.xhp 
b/source/text/swriter/02/0423.xhp
index 3442c8574..9feda413c 100644
--- a/source/text/swriter/02/0423.xhp
+++ b/source/text/swriter/02/0423.xhp
@@ -29,12 +29,9 @@
 
 
 
-  
 
 Table: Fixed, Proportional
   If this mode is active, 
changes to the line and/or column affect the entire table.
-  
-  
   
 
 
@@ -49,7 +46,6 @@
 
 
   
-  
 
  
 
diff --git a/source/text/swriter/02/0424.xhp 
b/source/text/swriter/02/0424.xhp
index ac76f85b3..d5165bbd9 100644
--- a/source/text/swriter/02/0424.xhp
+++ b/source/text/swriter/02/0424.xhp
@@ -29,12 +29,9 @@
 
 
 
-  
 
 Table: Variable
   If this mode is active, 
changes to a line and/or column affect the size of the 
table.
-  
-  
   
 
 
@@ -49,7 +46,6 @@
 
 
   
-  
 
  
 
diff --git a/source/text/swriter/02/1001.xhp 
b/source/text/swriter/02/1001.xhp
index 8cd701f9a..776689006 100644
--- a/source/text/swriter/02/1001.xhp
+++ b/source/text/swriter/02/1001.xhp
@@ -34,7 +34,6 @@
 Zoom In
   Zooms in to get a close-up view of the 
document.
   
-  
   
 
 
@@ -49,7 +48,6 @@
 
 
   
-  
 
  
 
diff --git a/source/text/swriter/02/1002.xhp 
b/source/text/swriter/02/1002.xhp
index ec7550915..f6e1e25de 100644
--- a/source/text/swriter/02/1002.xhp
+++ b/source/text/swriter/02/1002.xhp
@@ -36,7 +36,6 @@
 Zoom Out
 Zooms out to see more of the document at a reduced 
size.
 
-
 
 
 
@@ -49,6 +48,5 @@
 
 
 
-
 
 
diff --git a/source/text/swriter/02/1813.xhp 
b/source/text/swriter/02/1813.xhp
index c4eaa590c..46ef9a6fd 100644
--- a/source/text/swriter/02/1813.xhp
+++ b/source/text/swriter/02/1813.xhp
@@ -24,17 +24,14 @@
 
 
 
-
 direct cursor; restriction
 
 
 Direct Cursor Mode
 Activates or deactivates the direct cursor. You 
can specify the behavior of the direct cursor by choosing %PRODUCTNAME - 
PreferencesTools - 
Options - %PRODUCTNAME Writer - Formatting Aids.
-
 
   
 On Tools bar, 
click
-
 
 
 
@@ -48,7 +45,6 @@
 
 
 
-
 
 The direct 
cursor allows you to click in any blank area of a page to place text, images, 
tables, frames, and other objects.
 If you place 
the direct cursor approximately in the middle between the left and the right 
margin of a page or a table cell, the text you insert will be centered. 
Similarly, text is right-aligned when the direct cursor is placed on the right 
margin.


[Libreoffice-commits] core.git: helpcontent2

2022-02-13 Thread Johnny_M (via logerrit)
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c1ec5b45d745ad5af7aa6abdf30b56a0f59372ec
Author: Johnny_M 
AuthorDate: Sun Feb 13 12:16:04 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Feb 13 12:16:04 2022 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 348add24c9ee527eb35d52ef1a4204ea2980077c
  - tdf#132643 Translate German section IDs

Change-Id: I892e5e64d6d430dd3d12ad5329b48ba4e2e1d5c7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129867
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index bd2715dfc0b7..348add24c9ee 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit bd2715dfc0b767f9478566d5d0ae58b722c685cb
+Subproject commit 348add24c9ee527eb35d52ef1a4204ea2980077c


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

2022-02-13 Thread Johnny_M (via logerrit)
 source/text/swriter/02/0808.xhp |2 +-
 source/text/swriter/main0208.xhp|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 348add24c9ee527eb35d52ef1a4204ea2980077c
Author: Johnny_M 
AuthorDate: Sat Feb 12 19:59:01 2022 +0100
Commit: Olivier Hallot 
CommitDate: Sun Feb 13 12:16:02 2022 +0100

tdf#132643 Translate German section IDs

Change-Id: I892e5e64d6d430dd3d12ad5329b48ba4e2e1d5c7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129867
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/swriter/02/0808.xhp 
b/source/text/swriter/02/0808.xhp
index 94f716f1c..ca88ca4c8 100644
--- a/source/text/swriter/02/0808.xhp
+++ b/source/text/swriter/02/0808.xhp
@@ -32,7 +32,7 @@
 
   
   
-  
+  
 
 Combined 
Display
   Displays current information 
about the active document.
diff --git a/source/text/swriter/main0208.xhp b/source/text/swriter/main0208.xhp
index 18e5222f4..018d4d4d1 100644
--- a/source/text/swriter/main0208.xhp
+++ b/source/text/swriter/main0208.xhp
@@ -56,7 +56,7 @@
 
 Digital Signature
 Click 
to start digital signature process.  You must have a digital certificate to 
complete the process. See also Digital 
Signatures.
-
+
 
 Zoom & View Layout
 Three controls 
on the Writer Status Bar allow you to change the zoom and view layout of your 
text documents.


[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 12 commits - config_host.mk.in configure.ac cui/source distro-configs/CPAndroidBranding.conf distro-configs/CPLinux.conf distro-con

2022-02-13 Thread Andras Timar (via logerrit)
 Makefile.fetch  |   15 
 Repository.mk   |   13 
 config_host.mk.in   |1 
 configure.ac|   42 
 cui/source/dialogs/about.cxx|2 
 distro-configs/CPAndroidBranding.conf   |3 
 distro-configs/CPLinux-LOKit.conf   |   65 
 distro-configs/CPLinux.conf |   48 
 distro-configs/CPOSX.conf   |   20 
 distro-configs/CPWin32-MPL.conf |   28 
 distro-configs/CPWin32.conf |   26 
 distro-configs/CPWin64.conf |   26 
 download.lst|   22 
 external/Module_external.mk |1 
 external/more_fonts/ExternalPackage_karla.mk|   19 
 external/more_fonts/ExternalPackage_opendyslexic.mk |   19 
 external/more_fonts/Module_more_fonts.mk|4 
 external/more_fonts/UnpackedTarball_karla.mk|   14 
 external/more_fonts/UnpackedTarball_opendyslexic.mk |   14 
 external/noto_font/ExternalPackage_noto.mk  |  134 
 external/noto_font/ExternalPackage_notosansjp.mk|   17 
 external/noto_font/ExternalPackage_notosanskr.mk|   17 
 external/noto_font/ExternalPackage_notosanssc.mk|   17 
 external/noto_font/ExternalPackage_notosanstc.mk|   17 
 external/noto_font/ExternalPackage_notoserifjp.mk   |   17 
 external/noto_font/ExternalPackage_notoserifkr.mk   |   17 
 external/noto_font/ExternalPackage_notoserifsc.mk   |   17 
 external/noto_font/ExternalPackage_notoseriftc.mk   |   17 
 external/noto_font/Makefile |7 
 external/noto_font/Module_noto_font.mk  |   33 
 external/noto_font/README   |1 
 external/noto_font/UnpackedTarball_noto.mk  |   46 
 external/noto_font/UnpackedTarball_notosansjp.mk|   14 
 external/noto_font/UnpackedTarball_notosanskr.mk|   14 
 external/noto_font/UnpackedTarball_notosanssc.mk|   14 
 external/noto_font/UnpackedTarball_notosanstc.mk|   14 
 external/noto_font/UnpackedTarball_notoserifjp.mk   |   14 
 external/noto_font/UnpackedTarball_notoserifkr.mk   |   14 
 external/noto_font/UnpackedTarball_notoserifsc.mk   |   14 
 external/noto_font/UnpackedTarball_notoseriftc.mk   |   14 
 framework/source/helper/titlebarupdate.cxx  |2 
 icon-themes/colibre/sfx2/res/logo.png   |binary
 icon-themes/galaxy/brand_cp/about.svg   | 1463 
+
 icon-themes/galaxy/brand_cp/about_inverted.svg  | 1452 
+
 icon-themes/galaxy/brand_cp/flat_logo.svg   |  717 
 icon-themes/galaxy/brand_cp/intro-highres.png   |binary
 icon-themes/galaxy/brand_cp/intro.png   |binary
 icon-themes/galaxy/brand_cp/logo-sc.svg |   98 
 icon-themes/galaxy/brand_cp/logo-sc_inverted.svg|   59 
 icon-themes/galaxy/brand_cp/logo.svg|   98 
 icon-themes/galaxy/brand_cp/logo_inverted.svg   |   59 
 icon-themes/galaxy/brand_cp_snapshot/about.svg  | 1511 
+
 icon-themes/galaxy/brand_cp_snapshot/about_inverted.svg | 1535 
++
 icon-themes/galaxy/brand_cp_snapshot/flat_logo.svg  |  736 
 icon-themes/galaxy/brand_cp_snapshot/intro-highres.png  |binary
 icon-themes/galaxy/brand_cp_snapshot/intro.png  |binary
 icon-themes/galaxy/brand_cp_snapshot/logo-sc.svg|   98 
 icon-themes/galaxy/brand_cp_snapshot/logo-sc_inverted.svg   |   59 
 icon-themes/galaxy/brand_cp_snapshot/logo.svg   |   98 
 icon-themes/galaxy/brand_cp_snapshot/logo_inverted.svg  |   59 
 icon-themes/karasa_jaga/sfx2/res/logo.png   |binary
 include/default.rc  |2 
 instsetoo_native/CustomTarget_install.mk|1 
 instsetoo_native/CustomTarget_setup.mk  |   18 
 instsetoo_native/inc_

Wants to contribute!!

2022-02-13 Thread Aman Jha
Dear sir/mam,

I want to contribute in libreoffice. I am an open source enthusiast. I also
participated in hactoberfest and contributed in some projects. I have very
good intereste in c++ programming i know all the basics and learning more
about it by solving problems. I love problem solving.

Skills: C++, html, css,python(basic)
GitHub: https://github.com/amanj752

Experience : 6 month web development internship (worked on css did
responsiveness).

Kindly, give me an opportunity to work with your organization i hope I will
make some good contribution.

Thanks and regards
Aman Jha


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

2022-02-13 Thread Julien Nabet (via logerrit)
 i18npool/source/localedata/data/an_ES.xml |4 ++--
 i18npool/source/localedata/data/es_AR.xml |4 ++--
 i18npool/source/localedata/data/es_BO.xml |4 ++--
 i18npool/source/localedata/data/es_CL.xml |4 ++--
 i18npool/source/localedata/data/es_CO.xml |4 ++--
 i18npool/source/localedata/data/es_CR.xml |4 ++--
 i18npool/source/localedata/data/es_DO.xml |4 ++--
 i18npool/source/localedata/data/es_EC.xml |4 ++--
 i18npool/source/localedata/data/es_ES.xml |4 ++--
 i18npool/source/localedata/data/es_GT.xml |4 ++--
 i18npool/source/localedata/data/es_PE.xml |4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit d582bc9735022996a317ed661388621edabf78cc
Author: Julien Nabet 
AuthorDate: Thu Feb 10 17:46:37 2022 +0100
Commit: Julien Nabet 
CommitDate: Sun Feb 13 09:49:30 2022 +0100

tdf#147343: Wrong typo for AM/PM indicator in Spanish locales

Change-Id: I0cc077a94b6f11f67436981033e024e3097c635a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129793
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/i18npool/source/localedata/data/an_ES.xml 
b/i18npool/source/localedata/data/an_ES.xml
index f6063c06e206..217acd57ddc4 100644
--- a/i18npool/source/localedata/data/an_ES.xml
+++ b/i18npool/source/localedata/data/an_ES.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-a. m.
-p. m.
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_AR.xml 
b/i18npool/source/localedata/data/es_AR.xml
index 84cc34e3bb70..60473d5cd289 100644
--- a/i18npool/source/localedata/data/es_AR.xml
+++ b/i18npool/source/localedata/data/es_AR.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_BO.xml 
b/i18npool/source/localedata/data/es_BO.xml
index 317ab9406abc..9d9a13047f11 100644
--- a/i18npool/source/localedata/data/es_BO.xml
+++ b/i18npool/source/localedata/data/es_BO.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_CL.xml 
b/i18npool/source/localedata/data/es_CL.xml
index 3b1605b98ed3..95a865b0589c 100644
--- a/i18npool/source/localedata/data/es_CL.xml
+++ b/i18npool/source/localedata/data/es_CL.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_CO.xml 
b/i18npool/source/localedata/data/es_CO.xml
index f7962ec6f169..cca72c41d169 100644
--- a/i18npool/source/localedata/data/es_CO.xml
+++ b/i18npool/source/localedata/data/es_CO.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_CR.xml 
b/i18npool/source/localedata/data/es_CR.xml
index 23c204fac6c8..d0e33e911d26 100644
--- a/i18npool/source/localedata/data/es_CR.xml
+++ b/i18npool/source/localedata/data/es_CR.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_DO.xml 
b/i18npool/source/localedata/data/es_DO.xml
index 446219719b8a..5c80546c89b9 100644
--- a/i18npool/source/localedata/data/es_DO.xml
+++ b/i18npool/source/localedata/data/es_DO.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-a.m.
-p.m.
+a. m.
+p. m.
 Metric
   
   
diff --git a/i18npool/source/localedata/data/es_EC.xml 
b/i18npool/source/localedata/data/es_EC.xml
index eea5b1b73173..df07087a1740 100644
--- a/i18npool/source/localedata/data/es_EC.xml
+++ b/i18npool/source/localedata/data/es_EC.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_ES.xml 
b/i18npool/source/localedata/data/es_ES.xml
index 15b25d937aab..c9c99979f748 100644
--- a/i18npool/source/localedata/data/es_ES.xml
+++ b/i18npool/source/localedata/data/es_ES.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_GT.xml 
b/i18npool/source/localedata/data/es_GT.xml
index 5ef3985d0d30..9332399a75b8 100644
--- a/i18npool/source/localedata/data/es_GT.xml
+++ b/i18npool/source/localedata/data/es_GT.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-a.m.
-p.m.
+a. m.
+p. m.
 Metric
   
   
diff --git a/i18npool/source/localedata/data/es_PE.xml 
b/i18npool/source/localedata/data/es_PE.xml
index cf50595b913f..f1bfd15f1bef 100644
--- a/i18npool/source/localedata/data/es_PE.xml
+++ b/i18npool/source/localedata/data/es_PE.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-a.m.
-p.m.
+a. m.
+p. m.
 Metric