date:20220311

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

2022-03-11 Thread Noel Grandin (via logerrit)

 sc/source/filter/html/htmlpars.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 15c097010f1567d933abf046bc43447bd7415e4c
Author: Noel Grandin 
AuthorDate: Fri Mar 11 18:58:58 2022 +0200
Commit: Noel Grandin 
CommitDate: Sat Mar 12 08:41:55 2022 +0100

tdf#147767 html pasted to calc has very small font

regression from
commit da9bba7cc3c243e936daea689fea64ecaf110f35
Author: Noel Grandin 
Date:   Mon Jul 26 10:10:17 2021 +0200
use officecfg for SvxHtmlOptions

Change-Id: Ia84d713a18b4c694af98478681996b6156cbb928
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131393
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/sc/source/filter/html/htmlpars.cxx 
b/sc/source/filter/html/htmlpars.cxx
index af48b0b3e7e5..9c4c01913e93 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -188,13 +188,13 @@ ScHTMLParser::ScHTMLParser( EditEngine* pEditEngine, 
ScDocument* pDoc ) :
 ScEEParser( pEditEngine ),
 mpDoc( pDoc )
 {
-maFontHeights[0] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_1::get();
-maFontHeights[1] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_2::get();
-maFontHeights[2] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_3::get();
-maFontHeights[3] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_4::get();
-maFontHeights[4] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_5::get();
-maFontHeights[5] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_6::get();
-maFontHeights[6] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_7::get();
+maFontHeights[0] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_1::get() * 20;
+maFontHeights[1] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_2::get() * 20;
+maFontHeights[2] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_3::get() * 20;
+maFontHeights[3] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_4::get() * 20;
+maFontHeights[4] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_5::get() * 20;
+maFontHeights[5] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_6::get() * 20;
+maFontHeights[6] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_7::get() * 20;
 }
 
 ScHTMLParser::~ScHTMLParser()

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

2022-03-11 Thread Noel Grandin (via logerrit)

 include/tools/wldcrd.hxx |2 +-
 tools/source/fsys/wldcrd.cxx |   38 +-
 2 files changed, 22 insertions(+), 18 deletions(-)

New commits:
commit a378ac93e1b4e3c0dacdd3f0a3500813714537c7
Author: Noel Grandin 
AuthorDate: Fri Mar 11 19:18:25 2022 +0200
Commit: Noel Grandin 
CommitDate: Sat Mar 12 08:41:25 2022 +0100

tdf#147921 Filesave DOC: wrong layout and then all missing from 7.3

regression from
commit 990b2cb056788f7f412656a303456d90c003cf83
Author: Noel Grandin 
Date:   Mon Jun 21 13:00:07 2021 +0200
simplify and improve Wildcard

Cannot pass a string_view into something expecting a char* because
then it gets the length wrong.

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

diff --git a/include/tools/wldcrd.hxx b/include/tools/wldcrd.hxx
index fdbefcc4d2ea..5c18ad20fc68 100644
--- a/include/tools/wldcrd.hxx
+++ b/include/tools/wldcrd.hxx
@@ -32,7 +32,7 @@ private:
 OUString aWildString;
 char cSepSymbol;
 
-static bool ImpMatch( const sal_Unicode *pWild, const sal_Unicode *pStr );
+static bool ImpMatch( std::u16string_view aWild, std::u16string_view aStr 
);
 
 public:
 WildCard()
diff --git a/tools/source/fsys/wldcrd.cxx b/tools/source/fsys/wldcrd.cxx
index 6e0259696aca..a9867c00ba51 100644
--- a/tools/source/fsys/wldcrd.cxx
+++ b/tools/source/fsys/wldcrd.cxx
@@ -25,22 +25,26 @@
  * '?' in pWild mean match exactly one character.
  *
  */
-bool WildCard::ImpMatch( const sal_Unicode *pWild, const sal_Unicode *pStr )
+bool WildCard::ImpMatch( std::u16string_view aWild, std::u16string_view aStr )
 {
 intpos=0;
 intflag=0;
+const sal_Unicode* pWild = aWild.data();
+const sal_Unicode* pWildEnd = aWild.data() + aWild.size();
+const sal_Unicode* pStr = aStr.data();
+const sal_Unicode* pStrEnd = aStr.data() + aStr.size();
 
-while ( *pWild || flag )
+while ( pWild != pWildEnd || flag )
 {
 switch (*pWild)
 {
 case '?':
-if ( *pStr == '\0' )
+if ( pStr == pStrEnd )
 return false;
 break;
 
 default:
-if ( (*pWild == '\\') && ((*(pWild+1)=='?') || (*(pWild+1) == 
'*')) )
+if ( (*pWild == '\\') && (pWild + 1 != pWildEnd) && 
((*(pWild+1)=='?') || (*(pWild+1) == '*')) )
 pWild++;
 if ( *pWild != *pStr )
 if ( !pos )
@@ -53,37 +57,37 @@ bool WildCard::ImpMatch( const sal_Unicode *pWild, const 
sal_Unicode *pStr )
 // circumstances!
 [[fallthrough]];
 case '*':
-while ( *pWild == '*' )
+while ( pWild != pWildEnd && *pWild == '*' )
 pWild++;
-if ( *pWild == '\0' )
+if ( pWild == pWildEnd )
 return true;
 flag = 1;
 pos  = 0;
-if ( *pStr == '\0' )
-return ( *pWild == '\0' );
-while ( *pStr && *pStr != *pWild )
+if ( pStr == pStrEnd )
+return false;
+while ( pStr != pStrEnd && *pStr != *pWild )
 {
 if ( *pWild == '?' ) {
 pWild++;
-while ( *pWild == '*' )
+while ( pWild != pWildEnd && *pWild == '*' )
 pWild++;
 }
 pStr++;
-if ( *pStr == '\0' )
-return ( *pWild == '\0' );
+if ( pStr == pStrEnd )
+return pWild == pWildEnd;
 }
 break;
 }
-if ( *pWild != '\0' )
+if ( pWild != pWildEnd )
 pWild++;
-if ( *pStr != '\0' )
+if ( pStr != pStrEnd )
 pStr++;
 else
 flag = 0;
 if ( flag )
 pos--;
 }
-return ( *pStr == '\0' ) && ( *pWild == '\0' );
+return ( pStr == pStrEnd ) && ( pWild == pWildEnd );
 }
 
 bool WildCard::Matches( std::u16string_view rString ) const
@@ -97,13 +101,13 @@ bool WildCard::Matches( std::u16string_view rString ) const
 while ( (nSepPos = aTmpWild.indexOf(cSepSymbol)) != -1 )
 {
 // Check all split wildcards
-if ( ImpMatch( aTmpWild.subView( 0, nSepPos ).data(), 
rString.data() ) )
+if ( ImpMatch( aTmpWild.subView( 0, nSepPos ), rString ) )
 return true;
 aTmpWild = aTmpWild.copy(nSepPos + 1); // remove separator
 }
 }
 
-return ImpMatch( aTmpWild.getStr(), rString.data() );
+return ImpMatch( aTmpWild, rString );
 }
 
 /* vim:set shi

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

2022-03-11 Thread Noel Grandin (via logerrit)

 sd/source/core/drawdoc.cxx |   21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

New commits:
commit 6fb716d58c1285a1abbfa6683c2f4bfaeb89e2c6
Author: Noel Grandin 
AuthorDate: Fri Mar 11 19:01:06 2022 +0200
Commit: Noel Grandin 
CommitDate: Sat Mar 12 08:40:33 2022 +0100

simplify some service factory code

no need to get the factory from the component context and then
get the context from the service factory

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

diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index f1a9a55cedcd..796bbe1a477b 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -1113,16 +1113,15 @@ void SdDrawDocument::InitLayoutVector()
 const Sequence< OUString > aFiles(
 officecfg::Office::Impress::Misc::LayoutListFiles::get() );
 
-OUString sFilename;
+if (aFiles.getLength() == 0)
+return;
+const Reference xDocBuilder = DocumentBuilder::create( 
xContext );
+
 for( const auto& rFile : aFiles )
 {
-sFilename = comphelper::getExpandedUri(xContext, rFile);
+OUString sFilename = comphelper::getExpandedUri(xContext, rFile);
 
 // load layout file into DOM
-Reference< XMultiServiceFactory > xServiceFactory(
-xContext->getServiceManager() , UNO_QUERY_THROW );
-const Reference xDocBuilder(
-DocumentBuilder::create( comphelper::getComponentContext 
(xServiceFactory) ));
 
 try
 {
@@ -1152,16 +1151,14 @@ void SdDrawDocument::InitObjectVector()
 const Sequence< OUString > aFiles(
officecfg::Office::Impress::Misc::PresObjListFiles::get() );
 
-OUString sFilename;
+if (aFiles.getLength() == 0)
+return;
+const Reference xDocBuilder = DocumentBuilder::create( 
xContext );
 for( const auto& rFile : aFiles )
 {
-sFilename = comphelper::getExpandedUri(xContext, rFile);
+OUString sFilename = comphelper::getExpandedUri(xContext, rFile);
 
 // load presentation object file into DOM
-Reference< XMultiServiceFactory > xServiceFactory(
-xContext->getServiceManager() , UNO_QUERY_THROW );
-const Reference xDocBuilder(
-DocumentBuilder::create( comphelper::getComponentContext 
(xServiceFactory) ));
 
 try
 {

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

2022-03-11 Thread Mike Kaganski (via logerrit)

 starmath/source/view.cxx |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit 344353495c60dcdc69f7975ec4e51a753ebfb81f
Author: Mike Kaganski 
AuthorDate: Fri Mar 11 17:48:53 2022 +0300
Commit: Mike Kaganski 
CommitDate: Sat Mar 12 07:04:38 2022 +0100

Related: tdf#128610 drop obsolete encoding attribute replacement

It was needed once, when we used expat; now libxml2 does its own
detection (in its xmlDetectCharEncoding) after the strange dance
in our XMLFile2UTFConverter::readAndConvert (which does nothing
useful for UTF-16 case).

The original problem in tdf#128610 was addressed in commit
c964700d16d99d1569373a1eb9a1352fb3512915. This one just drops
the obsolete replacement.

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

diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 77886a5795dc..4ab60033951e 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1832,16 +1832,6 @@ void SmViewShell::Execute(SfxRequest& rReq)
 SfxFilter::GetFilterByName(MATHML_XML);
 aClipboardMedium.SetFilter(pMathFilter);
 
-// The text to be imported might asserts encoding 
like 'encoding="utf-8"' but FORMAT_STRING is UTF-16.
-// Force encoding to UTF-16, if encoding exists.
-sal_Int32 nPosL = aString.indexOf("encoding=\"");
-if ( nPosL >= 0 && nPosL +10 < aString.getLength() 
)
-{
-nPosL += 10;
-sal_Int32 nPosU = aString.indexOf( '"',nPosL);
-if (nPosU > nPosL)
-aString = aString.replaceAt(nPosL, nPosU - 
nPosL, u"UTF-16");
-}
 SvMemoryStream aStrm( const_cast(aString.getStr()), aString.getLength() * sizeof(sal_Unicode), 
StreamMode::READ);
 uno::Reference xStrm2( new 
::utl::OInputStreamWrapper(aStrm) );
 aClipboardMedium.setStreamToLoadFrom(xStrm2, true 
/*bIsReadOnly*/);

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - icon-themes/colibre icon-themes/colibre_svg

2022-03-11 Thread Rizal Muttaqin (via logerrit)

 icon-themes/colibre/cmd/32/basicshapes.frame.png   |binary
 icon-themes/colibre/cmd/32/changepicture.png   |binary
 icon-themes/colibre/cmd/32/dbchangedesignmode.png  |binary
 icon-themes/colibre/cmd/32/dbclearquery.png|binary
 icon-themes/colibre/cmd/32/dbnewquery.png  |binary
 icon-themes/colibre/cmd/32/dbnewqueryautopilot.png |binary
 icon-themes/colibre/cmd/32/dbquerydelete.png   |binary
 icon-themes/colibre/cmd/32/dbqueryedit.png |binary
 icon-themes/colibre/cmd/32/dbquerypropertiesdialog.png |binary
 icon-themes/colibre/cmd/32/dbqueryrename.png   |binary
 icon-themes/colibre/cmd/32/dbviewqueries.png   |binary
 icon-themes/colibre/cmd/32/hideslide.png   |binary
 icon-themes/colibre/cmd/32/moduledialog.png|binary
 icon-themes/colibre/cmd/32/sbaexecutesql.png   |binary
 icon-themes/colibre/cmd/32/showinvalid.png |binary
 icon-themes/colibre/cmd/32/tablenumberformatdialog.png |binary
 icon-themes/colibre/cmd/lc_basicideappear.png  |binary
 icon-themes/colibre/cmd/lc_controlproperties.png   |binary
 icon-themes/colibre/cmd/lc_dataincolumns.png   |binary
 icon-themes/colibre/cmd/lc_dbchangedesignmode.png  |binary
 icon-themes/colibre/cmd/lc_dbclearquery.png|binary
 icon-themes/colibre/cmd/lc_dbqueryrename.png   |binary
 icon-themes/colibre/cmd/lc_diagramdata.png |binary
 icon-themes/colibre/cmd/lc_filldown.png|binary
 icon-themes/colibre/cmd/lc_hideslide.png   |binary
 icon-themes/colibre/cmd/lc_insertslidetitlefield.png   |binary
 icon-themes/colibre/cmd/lc_moduledialog.png|binary
 icon-themes/colibre/cmd/lc_morecontrols.png|binary
 icon-themes/colibre/cmd/lc_refreshformcontrol.png  |binary
 icon-themes/colibre/cmd/lc_renamemasterpage.png|binary
 icon-themes/colibre/cmd/lc_sbaexecutesql.png   |binary
 icon-themes/colibre/cmd/lc_showslide.png   |binary
 icon-themes/colibre/cmd/lc_tablenumberformatdialog.png |binary
 icon-themes/colibre/cmd/lc_togglemergecells.png|binary
 icon-themes/colibre/cmd/sc_basicshapes.frame.png   |binary
 icon-themes/colibre/cmd/sc_dbnewquery.png  |binary
 icon-themes/colibre/cmd/sc_dbquerydelete.png   |binary
 icon-themes/colibre/cmd/sc_displaymode.png |binary
 icon-themes/colibre/cmd/sc_flowchartshapes.png |binary
 icon-themes/colibre/cmd/sc_moduledialog.png|binary
 icon-themes/colibre/cmd/sc_sbaexecutesql.png   |binary
 icon-themes/colibre/cmd/sc_splitcell.png   |binary
 icon-themes/colibre/cmd/sc_splittable.png  |binary
 icon-themes/colibre/res/base_thumbnail_256.png |binary
 icon-themes/colibre/res/lx03249.png|binary
 icon-themes/colibre/res/lx03250.png|binary
 icon-themes/colibre/res/lx03255.png|binary
 icon-themes/colibre/res/sx16670.png|binary
 icon-themes/colibre_svg/cmd/32/basicshapes.frame.svg   |2 
 icon-themes/colibre_svg/cmd/32/changepicture.svg   |6 +-
 icon-themes/colibre_svg/cmd/32/dbchangedesignmode.svg  |2 
 icon-themes/colibre_svg/cmd/32/dbclearquery.svg|2 
 icon-themes/colibre_svg/cmd/32/dbnewquery.svg  |2 
 icon-themes/colibre_svg/cmd/32/dbnewqueryautopilot.svg |2 
 icon-themes/colibre_svg/cmd/32/dbquerydelete.svg   |2 
 icon-themes/colibre_svg/cmd/32/dbqueryedit.svg |2 
 icon-themes/colibre_svg/cmd/32/dbqueryopen.svg |4 +
 icon-themes/colibre_svg/cmd/32/dbquerypropertiesdialog.svg |2 
 icon-themes/colibre_svg/cmd/32/dbqueryrename.svg   |2 
 icon-themes/colibre_svg/cmd/32/dbviewqueries.svg   |2 
 icon-themes/colibre_svg/cmd/32/hideslide.svg   |2 
 icon-themes/colibre_svg/cmd/32/moduledialog.svg|2 
 icon-themes/colibre_svg/cmd/32/sbaexecutesql.svg   |2 
 icon-themes/colibre_svg/cmd/32/showinvalid.svg |2 
 icon-themes/colibre_svg/cmd/32/tablenumberformatdialog.svg |2 
 icon-themes/colibre_svg/cmd/lc_basicideappear.svg  |2 
 icon-themes/colibre_svg/cmd/lc_controlproperties.svg   |5 -
 icon-themes/colibre_svg/cmd/lc_dataincolumns.svg   |2 
 icon-themes/colibre_svg/cmd/lc_dbchangedesignmode.svg  |2 
 icon-themes/colibre_svg/cmd/lc_dbclearquery.svg|2 
 icon-themes/colibre_svg/cmd/lc_dbqueryrename.svg   |2 
 icon-themes/colibre_svg/cmd/lc_diagramdata.svg |2 
 icon-themes/colibre_svg/cmd/lc_filldown.svg|2 
 icon-themes/colibre_svg/cmd/lc

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

2022-03-11 Thread Julien Nabet (via logerrit)

 icon-themes/sifr/links.txt  |2 +-
 icon-themes/sifr_dark/links.txt |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aef15ba6b5223804c9c795ed51f95af7c11f23fa
Author: Julien Nabet 
AuthorDate: Fri Mar 11 21:30:18 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Sat Mar 12 02:00:50 2022 +0100

Fix Breeze & Sifr: Add missing icons

Local build error:
Link cmd/sc_about.png -> res/mainapp_16_8.png -> cmd/sc_adddirect.png
Some icons in links.txt were found to link to other linked icons
Link cmd/sc_about.png -> res/mainapp_16_8.png -> cmd/sc_adddirect.png
Some icons in links.txt were found to link to other linked icons
make[1]: *** 
[/home/julien/lo/libreoffice/postprocess/CustomTarget_images.mk:53 : 
/home/julien/lo/libreoffice/workdir/CustomTarget/postprocess/images/images_sifr.zip]
 Erreur 1
make[1]: *** Attente des tâches non terminées
make[1]: *** 
[/home/julien/lo/libreoffice/postprocess/CustomTarget_images.mk:53 : 
/home/julien/lo/libreoffice/workdir/CustomTarget/postprocess/images/images_sifr_dark.zip]
 Erreur 1

Change-Id: If7cc708f5201d21fb2134785cdb3f12a4974826a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131403
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 097c1bb5738b..8ccc0e851cd4 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -1853,7 +1853,7 @@ cmd/lc_donation.png cmd/lc_currencyfield.png
 cmd/lc_helperdialog.png cmd/lc_helpindex.png
 cmd/lc_questionanswers.png cmd/lc_browseview.png
 
-cmd/sc_about.png res/mainapp_16_8.png
+cmd/sc_about.png cmd/sc_adddirect.png
 cmd/sc_donation.png cmd/sc_currencyfield.png
 cmd/sc_helperdialog.png cmd/sc_helpindex.png
 cmd/sc_questionanswers.png cmd/sc_browseview.png
diff --git a/icon-themes/sifr_dark/links.txt b/icon-themes/sifr_dark/links.txt
index 097c1bb5738b..8ccc0e851cd4 100644
--- a/icon-themes/sifr_dark/links.txt
+++ b/icon-themes/sifr_dark/links.txt
@@ -1853,7 +1853,7 @@ cmd/lc_donation.png cmd/lc_currencyfield.png
 cmd/lc_helperdialog.png cmd/lc_helpindex.png
 cmd/lc_questionanswers.png cmd/lc_browseview.png
 
-cmd/sc_about.png res/mainapp_16_8.png
+cmd/sc_about.png cmd/sc_adddirect.png
 cmd/sc_donation.png cmd/sc_currencyfield.png
 cmd/sc_helperdialog.png cmd/sc_helpindex.png
 cmd/sc_questionanswers.png cmd/sc_browseview.png

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

2022-03-11 Thread Luboš Luňák (via logerrit)

 sc/source/core/data/table2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e98325d8996c436394d3e1db357683aa25fc4ca7
Author: Luboš Luňák 
AuthorDate: Fri Mar 11 17:43:41 2022 +0100
Commit: Luboš Luňák 
CommitDate: Fri Mar 11 23:10:34 2022 +0100

allocate column in ScTable::SetPatternAreaCondFormat() (tdf#147894)

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

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 59444b7bb61e..8fdee0a9f414 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2894,7 +2894,7 @@ void ScTable::RemoveCondFormatData( const ScRangeList& 
rRangeList, sal_uInt32 nI
 void  ScTable::SetPatternAreaCondFormat( SCCOL nCol, SCROW nStartRow, SCROW 
nEndRow,
 const ScPatternAttr& rAttr, const ScCondFormatIndexes& 
rCondFormatIndexes )
 {
-aCol[nCol].SetPatternArea( nStartRow, nEndRow, rAttr);
+CreateColumnIfNotExists(nCol).SetPatternArea( nStartRow, nEndRow, rAttr);
 
 for (const auto& rIndex : rCondFormatIndexes)
 {

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

2022-03-11 Thread Luboš Luňák (via logerrit)

 sc/source/filter/inc/sheetdatabuffer.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 83d599fd7c530d14f70ac60bd673b66640191bf7
Author: Luboš Luňák 
AuthorDate: Fri Mar 11 09:56:20 2022 +0100
Commit: Luboš Luňák 
CommitDate: Fri Mar 11 23:09:57 2022 +0100

fix comparison operators

It seems the ranges are always distinct, so the < comparison always
worked in practice, but the == comparison added by my 6810aa937caca1
is obviously incorrect.

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

diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx 
b/sc/source/filter/inc/sheetdatabuffer.hxx
index 7f4930bff450..0cca3f0c7c84 100644
--- a/sc/source/filter/inc/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -198,14 +198,14 @@ private:
 {
 bool operator() (const RowRangeStyle& lhs, const RowRangeStyle& rhs) 
const
 {
-return lhs.mnEndRow 
RowStyles;

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

2022-03-11 Thread Kohei Yoshida (via logerrit)

 sc/inc/column.hxx   |5 +
 sc/source/core/data/column4.cxx |   22 +++---
 2 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit 7049b1da30f715c502f38ed982eec037e096be08
Author: Kohei Yoshida 
AuthorDate: Thu Mar 10 22:50:17 2022 -0500
Commit: Kohei Yoshida 
CommitDate: Fri Mar 11 22:41:13 2022 +0100

tdf#147744: Make sure to pass valid position hints.

When pasting a single cell to a range with filtered rows, the existing
code wasn't updating the position hint iterator after inserting cloned
formula cells via ScColumn::CloneFormulaCell().  This caused the next
call into the cell store to receive an invalid position hint.

This problem has been there all along, but apparently it did not cause
a process termination with the previous storage layout of
multi_type_vector for a reason unknown to me.

Change-Id: Ie1a4b99c7077536499c6373ccb7022961e9d93e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131331
Tested-by: Jenkins
Tested-by: Xisco Fauli 
Reviewed-by: Kohei Yoshida 
(cherry picked from commit f19ae9b5e629d163314ee18d56973d0561d5fb3b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131378

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 35c4b3eb0d3b..01e58fb9d055 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -348,6 +348,11 @@ public:
 bool HasFormulaCell() const;
 bool HasFormulaCell( SCROW nRow1, SCROW nRow2 ) const;
 
+void CloneFormulaCell(
+sc::ColumnBlockPosition& rBlockPos,
+const ScFormulaCell& rSrc, const sc::CellTextAttr& rAttr,
+const std::vector& rRanges );
+
 void CloneFormulaCell(
 const ScFormulaCell& rSrc, const sc::CellTextAttr& rAttr,
 const std::vector& rRanges );
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 22bd15cb271c..bbae4747a13e 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -317,7 +317,7 @@ void ScColumn::CopyOneCellFromClip( 
sc::CopyFromClipContext& rCxt, SCROW nRow1,
 std::vector aRanges;
 aRanges.reserve(1);
 aRanges.emplace_back(nRow1, nRow2);
-CloneFormulaCell(*rSrcCell.mpFormula, rSrcAttr, aRanges);
+CloneFormulaCell(*pBlockPos, *rSrcCell.mpFormula, rSrcAttr, 
aRanges);
 }
 break;
 default:
@@ -576,12 +576,10 @@ void ScColumn::DeleteRanges( const 
std::vector& rRanges, InsertDele
 }
 
 void ScColumn::CloneFormulaCell(
+sc::ColumnBlockPosition& rBlockPos,
 const ScFormulaCell& rSrc, const sc::CellTextAttr& rAttr,
 const std::vector& rRanges )
 {
-sc::CellStoreType::iterator itPos = maCells.begin();
-sc::CellTextAttrStoreType::iterator itAttrPos = maCellTextAttrs.begin();
-
 SCCOL nMatrixCols = 0;
 SCROW nMatrixRows = 0;
 ScMatrixMode nMatrixFlag = rSrc.GetMatrixFlag();
@@ -634,10 +632,10 @@ void ScColumn::CloneFormulaCell(
 }
 }
 
-itPos = maCells.set(itPos, nRow1, aFormulas.begin(), aFormulas.end());
+rBlockPos.miCellPos = maCells.set(rBlockPos.miCellPos, nRow1, 
aFormulas.begin(), aFormulas.end());
 
 // Join the top and bottom of the pasted formula cells as needed.
-sc::CellStoreType::position_type aPosObj = maCells.position(itPos, 
nRow1);
+sc::CellStoreType::position_type aPosObj = 
maCells.position(rBlockPos.miCellPos, nRow1);
 
 assert(aPosObj.first->type == sc::element_type_formula);
 ScFormulaCell* pCell = sc::formula_block::at(*aPosObj.first->data, 
aPosObj.second);
@@ -649,12 +647,22 @@ void ScColumn::CloneFormulaCell(
 JoinNewFormulaCell(aPosObj, *pCell);
 
 std::vector aTextAttrs(nLen, rAttr);
-itAttrPos = maCellTextAttrs.set(itAttrPos, nRow1, aTextAttrs.begin(), 
aTextAttrs.end());
+rBlockPos.miCellTextAttrPos = maCellTextAttrs.set(
+rBlockPos.miCellTextAttrPos, nRow1, aTextAttrs.begin(), 
aTextAttrs.end());
 }
 
 CellStorageModified();
 }
 
+void ScColumn::CloneFormulaCell(
+const ScFormulaCell& rSrc, const sc::CellTextAttr& rAttr,
+const std::vector& rRanges )
+{
+sc::ColumnBlockPosition aBlockPos;
+InitBlockPosition(aBlockPos);
+CloneFormulaCell(aBlockPos, rSrc, rAttr, rRanges);
+}
+
 std::unique_ptr ScColumn::ReleaseNote( SCROW nRow )
 {
 if (!GetDoc().ValidRow(nRow))

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

2022-03-11 Thread Xisco Fauli (via logerrit)

 sc/qa/unit/uicalc/uicalc.cxx |   51 ---
 1 file changed, 39 insertions(+), 12 deletions(-)

New commits:
commit eea8182795324d5f0df9c12f4debda6d532502bb
Author: Xisco Fauli 
AuthorDate: Fri Mar 11 15:25:27 2022 +0100
Commit: Xisco Fauli 
CommitDate: Fri Mar 11 22:31:58 2022 +0100

tdf#56036: sc_uicalc: Add unittest

Change-Id: I48f5e0550e4ff7a57bd8a8eae057429b620c7508
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131379
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index 56f70c19bc48..3248dc1ac732 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -50,6 +50,7 @@ public:
 ScModelObj* saveAndReload(css::uno::Reference& 
xComponent,
   const OUString& rFilter);
 void goToCell(const OUString& rCell);
+void insertString(ScModelObj& rModelObj, const std::string& rStr);
 void insertStringToCell(ScModelObj& rModelObj, const OUString& rCell, 
const std::string& rStr,
 bool bUseReturn = true);
 void insertArrayToCell(ScModelObj& rModelObj, const OUString& rCell, const 
std::string& rStr);
@@ -106,17 +107,22 @@ void ScUiCalcTest::goToCell(const OUString& rCell)
 dispatchCommand(mxComponent, ".uno:GoToCell", aArgs);
 }
 
-void ScUiCalcTest::insertStringToCell(ScModelObj& rModelObj, const OUString& 
rCell,
-  const std::string& rStr, bool bUseReturn)
+void ScUiCalcTest::insertString(ScModelObj& rModelObj, const std::string& rStr)
 {
-goToCell(rCell);
-
 for (const char c : rStr)
 {
 rModelObj.postKeyEvent(LOK_KEYEVENT_KEYINPUT, c, 0);
 rModelObj.postKeyEvent(LOK_KEYEVENT_KEYUP, c, 0);
 Scheduler::ProcessEventsToIdle();
 }
+}
+
+void ScUiCalcTest::insertStringToCell(ScModelObj& rModelObj, const OUString& 
rCell,
+  const std::string& rStr, bool bUseReturn)
+{
+goToCell(rCell);
+
+insertString(rModelObj, rStr);
 
 if (bUseReturn)
 {
@@ -458,6 +464,33 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf144308)
 xGlobalSheetSettings->setDoAutoComplete(bOldValue);
 }
 
+CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf56036)
+{
+mxComponent = loadFromDesktop("private:factory/scalc");
+ScModelObj* pModelObj = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pModelObj);
+ScDocument* pDoc = pModelObj->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+insertStringToCell(*pModelObj, "A1", "=SUM( 1 + 2 ", /*bUseReturn*/ false);
+
+// Insert Newline
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_MOD1 | 
awt::Key::RETURN);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_MOD1 | 
awt::Key::RETURN);
+Scheduler::ProcessEventsToIdle();
+
+insertString(*pModelObj, "+ 3)");
+
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::RETURN);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::RETURN);
+Scheduler::ProcessEventsToIdle();
+
+// Without the fix in place, this test would have failed with
+// - Expected: 6
+// - Actual  : Err:501
+CPPUNIT_ASSERT_EQUAL(OUString("6"), pDoc->GetString(ScAddress(0, 0, 0)));
+}
+
 CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf119162)
 {
 mxComponent = loadFromDesktop("private:factory/scalc");
@@ -584,11 +617,7 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf138432)
 dispatchCommand(mxComponent, ".uno:Copy", {});
 Scheduler::ProcessEventsToIdle();
 
-goToCell("A2");
-
-pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, '=', 0);
-pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, '=', 0);
-Scheduler::ProcessEventsToIdle();
+insertStringToCell(*pModelObj, "A2", "=", /*bUseReturn*/ false);
 
 dispatchCommand(mxComponent, ".uno:Paste", {});
 Scheduler::ProcessEventsToIdle();
@@ -1489,9 +1518,7 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf119793)
 CPPUNIT_ASSERT_EQUAL(static_cast(1381), 
xShape->getPosition().Y);
 
 // Type into the shape
-pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'x', 0);
-pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 'x', 0);
-Scheduler::ProcessEventsToIdle();
+insertString(*pModelObj, "x");
 pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_ESCAPE);
 pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_ESCAPE);
 Scheduler::ProcessEventsToIdle();

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - icon-themes/colibre icon-themes/colibre_svg

2022-03-11 Thread Rizal Muttaqin (via logerrit)

 icon-themes/colibre/cmd/32/autocorrectdlg.png  |binary
 icon-themes/colibre/cmd/32/basicideappear.png  |binary
 icon-themes/colibre/cmd/32/choosemacro.png |binary
 icon-themes/colibre/cmd/32/deletemasterpage.png|binary
 icon-themes/colibre/cmd/32/ko/text.png |binary
 icon-themes/colibre/cmd/32/pagebreakmode.png   |binary
 icon-themes/colibre/cmd/32/pickthrough.png |binary
 icon-themes/colibre/cmd/32/presentationminimizer.png   |binary
 icon-themes/colibre/cmd/32/quit.png|binary
 icon-themes/colibre/cmd/32/scriptorganizer.png |binary
 icon-themes/colibre/cmd/32/viewrowcolumnheaders.png|binary
 icon-themes/colibre/cmd/lc_autocorrectdlg.png  |binary
 icon-themes/colibre/cmd/lc_choosemacro.png |binary
 icon-themes/colibre/cmd/lc_cleararrowprecedents.png|binary
 icon-themes/colibre/cmd/lc_conditionalformatdialog.png |binary
 icon-themes/colibre/cmd/lc_datefield.png   |binary
 icon-themes/colibre/cmd/lc_dbnewquery.png  |binary
 icon-themes/colibre/cmd/lc_dbquerydelete.png   |binary
 icon-themes/colibre/cmd/lc_dbquerypropertiesdialog.png |binary
 icon-themes/colibre/cmd/lc_dbviewqueries.png   |binary
 icon-themes/colibre/cmd/lc_formatobjectmenu.png|binary
 icon-themes/colibre/cmd/lc_mergecells.png  |binary
 icon-themes/colibre/cmd/lc_scriptorganizer.png |binary
 icon-themes/colibre/cmd/lc_sidebar.png |binary
 icon-themes/colibre/cmd/lc_splitcell.png   |binary
 icon-themes/colibre/cmd/lc_viewrowcolumnheaders.png|binary
 icon-themes/colibre/cmd/lc_zoommode.png|binary
 icon-themes/colibre/cmd/sc_basicideappear.png  |binary
 icon-themes/colibre/cmd/sc_choosemacro.png |binary
 icon-themes/colibre/cmd/sc_datefield.png   |binary
 icon-themes/colibre/cmd/sc_dbquerypropertiesdialog.png |binary
 icon-themes/colibre/cmd/sc_dbviewqueries.png   |binary
 icon-themes/colibre/cmd/sc_dbviewtablenames.png|binary
 icon-themes/colibre/cmd/sc_distributecolumns.png   |binary
 icon-themes/colibre/cmd/sc_insertcolumnbreak.png   |binary
 icon-themes/colibre/cmd/sc_mergecells.png  |binary
 icon-themes/colibre/cmd/sc_normalmultipanegui.png  |binary
 icon-themes/colibre/cmd/sc_pickthrough.png |binary
 icon-themes/colibre/cmd/sc_queryrename.png |binary
 icon-themes/colibre/cmd/sc_signaturelinedialog.png |binary
 icon-themes/colibre/cmd/sc_togglemergecells.png|binary
 icon-themes/colibre/reportdesign/res/sx10454.png   |binary
 icon-themes/colibre/reportdesign/res/sx10928.png   |binary
 icon-themes/colibre/reportdesign/res/sx10929.png   |binary
 icon-themes/colibre/reportdesign/res/sx12452.png   |binary
 icon-themes/colibre/reportdesign/res/sx12453.png   |binary
 icon-themes/colibre/reportdesign/res/sx12466.png   |binary
 icon-themes/colibre/reportdesign/res/sx12468.png   |binary
 icon-themes/colibre/reportdesign/res/sx12603.png   |binary
 icon-themes/colibre/res/base_thumbnail_256.png |binary
 icon-themes/colibre/res/lx03251.png|binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_005.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_110.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_250.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_260.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_400.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_450.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_500.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_505.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_750.png |binary
 icon-themes/colibre/sd/res/pageobjs.png|binary
 icon-themes/colibre/sd/res/pagobjex.png|binary
 icon-themes/colibre_svg/cmd/32/autocorrectdlg.svg  |2 +-
 icon-themes/colibre_svg/cmd/32/basicideappear.svg  |2 +-
 icon-themes/colibre_svg/cmd/32/choosemacro.svg |2 +-
 icon-themes/colibre_svg/cmd/32/deletemasterpage.svg

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

2022-03-11 Thread Rizal Muttaqin (via logerrit)

 icon-themes/colibre/cmd/32/basicshapes.frame.png   |binary
 icon-themes/colibre/cmd/32/changepicture.png   |binary
 icon-themes/colibre/cmd/32/dbchangedesignmode.png  |binary
 icon-themes/colibre/cmd/32/dbclearquery.png|binary
 icon-themes/colibre/cmd/32/dbnewquery.png  |binary
 icon-themes/colibre/cmd/32/dbnewqueryautopilot.png |binary
 icon-themes/colibre/cmd/32/dbquerydelete.png   |binary
 icon-themes/colibre/cmd/32/dbqueryedit.png |binary
 icon-themes/colibre/cmd/32/dbqueryopen.png |binary
 icon-themes/colibre/cmd/32/dbquerypropertiesdialog.png |binary
 icon-themes/colibre/cmd/32/dbqueryrename.png   |binary
 icon-themes/colibre/cmd/32/dbviewqueries.png   |binary
 icon-themes/colibre/cmd/32/hideslide.png   |binary
 icon-themes/colibre/cmd/32/moduledialog.png|binary
 icon-themes/colibre/cmd/32/sbaexecutesql.png   |binary
 icon-themes/colibre/cmd/32/showinvalid.png |binary
 icon-themes/colibre/cmd/32/tablenumberformatdialog.png |binary
 icon-themes/colibre/cmd/lc_basicideappear.png  |binary
 icon-themes/colibre/cmd/lc_controlproperties.png   |binary
 icon-themes/colibre/cmd/lc_dataincolumns.png   |binary
 icon-themes/colibre/cmd/lc_dbchangedesignmode.png  |binary
 icon-themes/colibre/cmd/lc_dbclearquery.png|binary
 icon-themes/colibre/cmd/lc_dbqueryrename.png   |binary
 icon-themes/colibre/cmd/lc_diagramdata.png |binary
 icon-themes/colibre/cmd/lc_filldown.png|binary
 icon-themes/colibre/cmd/lc_hideslide.png   |binary
 icon-themes/colibre/cmd/lc_insertslidetitlefield.png   |binary
 icon-themes/colibre/cmd/lc_moduledialog.png|binary
 icon-themes/colibre/cmd/lc_morecontrols.png|binary
 icon-themes/colibre/cmd/lc_refreshformcontrol.png  |binary
 icon-themes/colibre/cmd/lc_renamemasterpage.png|binary
 icon-themes/colibre/cmd/lc_sbaexecutesql.png   |binary
 icon-themes/colibre/cmd/lc_showslide.png   |binary
 icon-themes/colibre/cmd/lc_tablenumberformatdialog.png |binary
 icon-themes/colibre/cmd/lc_togglemergecells.png|binary
 icon-themes/colibre/cmd/sc_basicshapes.frame.png   |binary
 icon-themes/colibre/cmd/sc_dbnewquery.png  |binary
 icon-themes/colibre/cmd/sc_dbquerydelete.png   |binary
 icon-themes/colibre/cmd/sc_displaymode.png |binary
 icon-themes/colibre/cmd/sc_flowchartshapes.png |binary
 icon-themes/colibre/cmd/sc_moduledialog.png|binary
 icon-themes/colibre/cmd/sc_sbaexecutesql.png   |binary
 icon-themes/colibre/cmd/sc_splitcell.png   |binary
 icon-themes/colibre/cmd/sc_splittable.png  |binary
 icon-themes/colibre/res/base_thumbnail_256.png |binary
 icon-themes/colibre/res/lx03249.png|binary
 icon-themes/colibre/res/lx03250.png|binary
 icon-themes/colibre/res/lx03255.png|binary
 icon-themes/colibre/res/sx16670.png|binary
 icon-themes/colibre_svg/cmd/32/basicshapes.frame.svg   |2 
 icon-themes/colibre_svg/cmd/32/changepicture.svg   |2 
 icon-themes/colibre_svg/cmd/32/dbchangedesignmode.svg  |2 
 icon-themes/colibre_svg/cmd/32/dbclearquery.svg|2 
 icon-themes/colibre_svg/cmd/32/dbnewquery.svg  |2 
 icon-themes/colibre_svg/cmd/32/dbnewqueryautopilot.svg |2 
 icon-themes/colibre_svg/cmd/32/dbquerydelete.svg   |2 
 icon-themes/colibre_svg/cmd/32/dbqueryedit.svg |2 
 icon-themes/colibre_svg/cmd/32/dbqueryopen.svg |2 
 icon-themes/colibre_svg/cmd/32/dbquerypropertiesdialog.svg |2 
 icon-themes/colibre_svg/cmd/32/dbqueryrename.svg   |2 
 icon-themes/colibre_svg/cmd/32/dbviewqueries.svg   |2 
 icon-themes/colibre_svg/cmd/32/hideslide.svg   |2 
 icon-themes/colibre_svg/cmd/32/moduledialog.svg|2 
 icon-themes/colibre_svg/cmd/32/sbaexecutesql.svg   |2 
 icon-themes/colibre_svg/cmd/32/showinvalid.svg |2 
 icon-themes/colibre_svg/cmd/32/tablenumberformatdialog.svg |2 
 icon-themes/colibre_svg/cmd/lc_basicideappear.svg  |2 
 icon-themes/colibre_svg/cmd/lc_controlproperties.svg   |5 -
 icon-themes/colibre_svg/cmd/lc_dataincolumns.svg   |2 
 icon-themes/colibre_svg/cmd/lc_dbchangedesignmode.svg  |2 
 icon-themes/colibre_svg/cmd/lc_dbclearquery.svg|2 
 icon-themes/colibre_svg/cmd/lc_dbqueryrename.svg   |2 
 icon-themes/colibre_svg/cmd/lc_diagramdata.svg |2 
 icon-themes/colibre_svg/cmd/lc_fi

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - icon-themes/colibre icon-themes/colibre_svg

2022-03-11 Thread Rizal Muttaqin (via logerrit)

 icon-themes/colibre/cmd/32/autocorrectdlg.png  |binary
 icon-themes/colibre/cmd/32/basicideappear.png  |binary
 icon-themes/colibre/cmd/32/choosemacro.png |binary
 icon-themes/colibre/cmd/32/deletemasterpage.png|binary
 icon-themes/colibre/cmd/32/ko/text.png |binary
 icon-themes/colibre/cmd/32/pagebreakmode.png   |binary
 icon-themes/colibre/cmd/32/pickthrough.png |binary
 icon-themes/colibre/cmd/32/presentationminimizer.png   |binary
 icon-themes/colibre/cmd/32/quit.png|binary
 icon-themes/colibre/cmd/32/scriptorganizer.png |binary
 icon-themes/colibre/cmd/32/viewrowcolumnheaders.png|binary
 icon-themes/colibre/cmd/lc_autocorrectdlg.png  |binary
 icon-themes/colibre/cmd/lc_choosemacro.png |binary
 icon-themes/colibre/cmd/lc_cleararrowprecedents.png|binary
 icon-themes/colibre/cmd/lc_conditionalformatdialog.png |binary
 icon-themes/colibre/cmd/lc_datefield.png   |binary
 icon-themes/colibre/cmd/lc_dbnewquery.png  |binary
 icon-themes/colibre/cmd/lc_dbquerydelete.png   |binary
 icon-themes/colibre/cmd/lc_dbqueryopen.png |binary
 icon-themes/colibre/cmd/lc_dbquerypropertiesdialog.png |binary
 icon-themes/colibre/cmd/lc_dbviewqueries.png   |binary
 icon-themes/colibre/cmd/lc_formatobjectmenu.png|binary
 icon-themes/colibre/cmd/lc_mergecells.png  |binary
 icon-themes/colibre/cmd/lc_scriptorganizer.png |binary
 icon-themes/colibre/cmd/lc_sidebar.png |binary
 icon-themes/colibre/cmd/lc_splitcell.png   |binary
 icon-themes/colibre/cmd/lc_viewrowcolumnheaders.png|binary
 icon-themes/colibre/cmd/lc_zoommode.png|binary
 icon-themes/colibre/cmd/sc_basicideappear.png  |binary
 icon-themes/colibre/cmd/sc_choosemacro.png |binary
 icon-themes/colibre/cmd/sc_datefield.png   |binary
 icon-themes/colibre/cmd/sc_dbquerypropertiesdialog.png |binary
 icon-themes/colibre/cmd/sc_dbviewqueries.png   |binary
 icon-themes/colibre/cmd/sc_dbviewtablenames.png|binary
 icon-themes/colibre/cmd/sc_distributecolumns.png   |binary
 icon-themes/colibre/cmd/sc_insertcolumnbreak.png   |binary
 icon-themes/colibre/cmd/sc_mergecells.png  |binary
 icon-themes/colibre/cmd/sc_normalmultipanegui.png  |binary
 icon-themes/colibre/cmd/sc_pickthrough.png |binary
 icon-themes/colibre/cmd/sc_queryrename.png |binary
 icon-themes/colibre/cmd/sc_signaturelinedialog.png |binary
 icon-themes/colibre/cmd/sc_togglemergecells.png|binary
 icon-themes/colibre/reportdesign/res/sx10454.png   |binary
 icon-themes/colibre/reportdesign/res/sx10928.png   |binary
 icon-themes/colibre/reportdesign/res/sx10929.png   |binary
 icon-themes/colibre/reportdesign/res/sx12452.png   |binary
 icon-themes/colibre/reportdesign/res/sx12453.png   |binary
 icon-themes/colibre/reportdesign/res/sx12466.png   |binary
 icon-themes/colibre/reportdesign/res/sx12468.png   |binary
 icon-themes/colibre/reportdesign/res/sx12603.png   |binary
 icon-themes/colibre/res/base_thumbnail_256.png |binary
 icon-themes/colibre/res/lx03251.png|binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_005.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_110.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_250.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_260.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_400.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_450.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_500.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_505.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_750.png |binary
 icon-themes/colibre/sd/res/pageobjs.png|binary
 icon-themes/colibre/sd/res/pagobjex.png|binary
 icon-themes/colibre_svg/cmd/32/autocorrectdlg.svg  |2 +-
 icon-themes/colibre_svg/cmd/32/basicideappear.svg  |2 +-
 icon-themes/colibre_svg/cmd/32/choosemacro.svg

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

2022-03-11 Thread Rizal Muttaqin (via logerrit)

 icon-themes/colibre/cmd/32/autocorrectdlg.png  |binary
 icon-themes/colibre/cmd/32/basicideappear.png  |binary
 icon-themes/colibre/cmd/32/choosemacro.png |binary
 icon-themes/colibre/cmd/32/deletemasterpage.png|binary
 icon-themes/colibre/cmd/32/ko/text.png |binary
 icon-themes/colibre/cmd/32/pagebreakmode.png   |binary
 icon-themes/colibre/cmd/32/pickthrough.png |binary
 icon-themes/colibre/cmd/32/presentationminimizer.png   |binary
 icon-themes/colibre/cmd/32/quit.png|binary
 icon-themes/colibre/cmd/32/scriptorganizer.png |binary
 icon-themes/colibre/cmd/32/viewrowcolumnheaders.png|binary
 icon-themes/colibre/cmd/lc_autocorrectdlg.png  |binary
 icon-themes/colibre/cmd/lc_choosemacro.png |binary
 icon-themes/colibre/cmd/lc_cleararrowprecedents.png|binary
 icon-themes/colibre/cmd/lc_conditionalformatdialog.png |binary
 icon-themes/colibre/cmd/lc_datefield.png   |binary
 icon-themes/colibre/cmd/lc_dbnewquery.png  |binary
 icon-themes/colibre/cmd/lc_dbquerydelete.png   |binary
 icon-themes/colibre/cmd/lc_dbqueryopen.png |binary
 icon-themes/colibre/cmd/lc_dbquerypropertiesdialog.png |binary
 icon-themes/colibre/cmd/lc_dbviewqueries.png   |binary
 icon-themes/colibre/cmd/lc_formatobjectmenu.png|binary
 icon-themes/colibre/cmd/lc_mergecells.png  |binary
 icon-themes/colibre/cmd/lc_scriptorganizer.png |binary
 icon-themes/colibre/cmd/lc_sidebar.png |binary
 icon-themes/colibre/cmd/lc_splitcell.png   |binary
 icon-themes/colibre/cmd/lc_viewrowcolumnheaders.png|binary
 icon-themes/colibre/cmd/lc_zoommode.png|binary
 icon-themes/colibre/cmd/sc_basicideappear.png  |binary
 icon-themes/colibre/cmd/sc_choosemacro.png |binary
 icon-themes/colibre/cmd/sc_datefield.png   |binary
 icon-themes/colibre/cmd/sc_dbquerypropertiesdialog.png |binary
 icon-themes/colibre/cmd/sc_dbviewqueries.png   |binary
 icon-themes/colibre/cmd/sc_dbviewtablenames.png|binary
 icon-themes/colibre/cmd/sc_distributecolumns.png   |binary
 icon-themes/colibre/cmd/sc_insertcolumnbreak.png   |binary
 icon-themes/colibre/cmd/sc_mergecells.png  |binary
 icon-themes/colibre/cmd/sc_normalmultipanegui.png  |binary
 icon-themes/colibre/cmd/sc_pickthrough.png |binary
 icon-themes/colibre/cmd/sc_queryrename.png |binary
 icon-themes/colibre/cmd/sc_signaturelinedialog.png |binary
 icon-themes/colibre/cmd/sc_togglemergecells.png|binary
 icon-themes/colibre/reportdesign/res/sx10454.png   |binary
 icon-themes/colibre/reportdesign/res/sx10928.png   |binary
 icon-themes/colibre/reportdesign/res/sx10929.png   |binary
 icon-themes/colibre/reportdesign/res/sx12452.png   |binary
 icon-themes/colibre/reportdesign/res/sx12453.png   |binary
 icon-themes/colibre/reportdesign/res/sx12466.png   |binary
 icon-themes/colibre/reportdesign/res/sx12468.png   |binary
 icon-themes/colibre/reportdesign/res/sx12603.png   |binary
 icon-themes/colibre/res/base_thumbnail_256.png |binary
 icon-themes/colibre/res/lx03251.png|binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_005.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_110.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_250.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_260.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_400.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_450.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_500.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_505.png |binary
 icon-themes/colibre/sc/res/sidebar/CellBorderLineStyle_750.png |binary
 icon-themes/colibre/sd/res/pageobjs.png|binary
 icon-themes/colibre/sd/res/pagobjex.png|binary
 icon-themes/colibre_svg/cmd/32/autocorrectdlg.svg  |2 +-
 icon-themes/colibre_svg/cmd/32/basicideappear.svg  |2 +-
 icon-themes/colibre_svg/cmd/32/choosemacro.svg

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg

2022-03-11 Thread Rizal Muttaqin (via logerrit)

 icon-themes/breeze/cmd/32/autocorrectdlg.png|binary
 icon-themes/breeze/cmd/32/insertfooter.png  |binary
 icon-themes/breeze/cmd/32/insertheader.png  |binary
 icon-themes/breeze/cmd/32/pasteonlyformula.png  |binary
 icon-themes/breeze/cmd/32/pasteonlytext.png |binary
 icon-themes/breeze/cmd/32/pasteonlyvalue.png|binary
 icon-themes/breeze/cmd/32/pastespecial.png  |binary
 icon-themes/breeze/cmd/32/pasteunformatted.png  |binary
 icon-themes/breeze/cmd/32/scriptorganizer.png   |binary
 icon-themes/breeze/cmd/32/textattributes.png|binary
 icon-themes/breeze/cmd/lc_autocorrectdlg.png|binary
 icon-themes/breeze/cmd/lc_insertfooter.png  |binary
 icon-themes/breeze/cmd/lc_insertheader.png  |binary
 icon-themes/breeze/cmd/lc_pasteonlyformula.png  |binary
 icon-themes/breeze/cmd/lc_pasteonlytext.png |binary
 icon-themes/breeze/cmd/lc_pasteonlyvalue.png|binary
 icon-themes/breeze/cmd/lc_pastespecial.png  |binary
 icon-themes/breeze/cmd/lc_scriptorganizer.png   |binary
 icon-themes/breeze/cmd/sc_autocorrectdlg.png|binary
 icon-themes/breeze/cmd/sc_insertfooter.png  |binary
 icon-themes/breeze/cmd/sc_insertheader.png  |binary
 icon-themes/breeze/cmd/sc_pastespecial.png  |binary
 icon-themes/breeze/cmd/sc_scriptorganizer.png   |binary
 icon-themes/breeze/links.txt|   12 
 icon-themes/breeze_dark/cmd/32/autocorrectdlg.png   |binary
 icon-themes/breeze_dark/cmd/32/insertfooter.png |binary
 icon-themes/breeze_dark/cmd/32/insertheader.png |binary
 icon-themes/breeze_dark/cmd/32/pasteonlyformula.png |binary
 icon-themes/breeze_dark/cmd/32/pasteonlytext.png|binary
 icon-themes/breeze_dark/cmd/32/pasteonlyvalue.png   |binary
 icon-themes/breeze_dark/cmd/32/pastespecial.png |binary
 icon-themes/breeze_dark/cmd/32/pasteunformatted.png |binary
 icon-themes/breeze_dark/cmd/32/scriptorganizer.png  |binary
 icon-themes/breeze_dark/cmd/32/textattributes.png   |binary
 icon-themes/breeze_dark/cmd/lc_autocorrectdlg.png   |binary
 icon-themes/breeze_dark/cmd/lc_insertfooter.png |binary
 icon-themes/breeze_dark/cmd/lc_insertheader.png |binary
 icon-themes/breeze_dark/cmd/lc_pasteonlyformula.png |binary
 icon-themes/breeze_dark/cmd/lc_pasteonlytext.png|binary
 icon-themes/breeze_dark/cmd/lc_pasteonlyvalue.png   |binary
 icon-themes/breeze_dark/cmd/lc_pastespecial.png |binary
 icon-themes/breeze_dark/cmd/lc_scriptorganizer.png  |binary
 icon-themes/breeze_dark/cmd/sc_autocorrectdlg.png   |binary
 icon-themes/breeze_dark/cmd/sc_insertfooter.png |binary
 icon-themes/breeze_dark/cmd/sc_insertheader.png |binary
 icon-themes/breeze_dark/cmd/sc_pastespecial.png |binary
 icon-themes/breeze_dark/cmd/sc_scriptorganizer.png  |binary
 icon-themes/breeze_dark/links.txt   |   12 
 icon-themes/breeze_dark_svg/cmd/32/autocorrectdlg.svg   |1 +
 icon-themes/breeze_dark_svg/cmd/32/insertfooter.svg |1 +
 icon-themes/breeze_dark_svg/cmd/32/insertheader.svg |1 +
 icon-themes/breeze_dark_svg/cmd/32/pasteonlyformula.svg |1 +
 icon-themes/breeze_dark_svg/cmd/32/pasteonlytext.svg|1 +
 icon-themes/breeze_dark_svg/cmd/32/pasteonlyvalue.svg   |1 +
 icon-themes/breeze_dark_svg/cmd/32/pastespecial.svg |1 +
 icon-themes/breeze_dark_svg/cmd/32/pasteunformatted.svg |1 +
 icon-themes/breeze_dark_svg/cmd/32/scriptorganizer.svg  |1 +
 icon-themes/breeze_dark_svg/cmd/32/textattributes.svg   |1 +
 icon-themes/breeze_dark_svg/cmd/lc_autocorrectdlg.svg   |1 +
 icon-themes/breeze_dark_svg/cmd/lc_insertfooter.svg |1 +
 icon-themes/breeze_dark_svg/cmd/lc_insertheader.svg |1 +
 icon-themes/breeze_dark_svg/cmd/lc_pasteonlyformula.svg |1 +
 icon-themes/breeze_dark_svg/cmd/lc_pasteonlytext.svg|1 +
 icon-themes/breeze_dark_svg/cmd/lc_pasteonlyvalue.svg   |1 +
 icon-themes/breeze_dark_svg/cmd/lc_pastespecial.svg |1 +
 icon-themes/breeze_dark_svg/cmd/lc_scriptorganizer.svg  |2 +-
 icon-themes/breeze_dark_svg/cmd/sc_autocorrectdlg.svg   |2 +-
 icon-themes/breeze_dark_svg/cmd/sc_insertfooter.svg |1 +
 icon-themes/breeze_dark_svg/cmd/sc_insertheader.svg |1 +
 icon-themes/breeze_dark_svg/cmd/sc_pastespecial.svg |2 +-
 icon-themes/breeze_dark_svg/cmd/sc_scriptorganizer.svg  |2 +-
 icon-themes/breeze_svg/cmd/32/autocorrectdlg.svg|1 +
 icon-themes/breeze_svg/cmd/32/insertfooter.svg  |1 +
 icon-themes/breeze_svg/cmd/32/insertheader.svg  |1 +
 icon-themes/breeze_svg/cmd/32/pasteonlyformula.svg  |1 +
 icon-themes/breeze_svg/cmd/32/pasteonlytext.svg |1 +
 ic

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/sifr icon-themes/sifr_dark icon-the

2022-03-11 Thread Rizal Muttaqin (via logerrit)

 dev/null  |binary
 icon-themes/breeze/cmd/32/editframeset.png|binary
 icon-themes/breeze/cmd/32/sendfeedback.png|binary
 icon-themes/breeze/cmd/lc_editframeset.png|binary
 icon-themes/breeze/cmd/lc_sendfeedback.png|binary
 icon-themes/breeze/cmd/sc_editframeset.png|binary
 icon-themes/breeze_dark/cmd/32/editframeset.png   |binary
 icon-themes/breeze_dark/cmd/32/sendfeedback.png   |binary
 icon-themes/breeze_dark/cmd/lc_editframeset.png   |binary
 icon-themes/breeze_dark/cmd/lc_sendfeedback.png   |binary
 icon-themes/breeze_dark/cmd/sc_editframeset.png   |binary
 icon-themes/breeze_dark_svg/cmd/32/editframeset.svg   |1 
 icon-themes/breeze_dark_svg/cmd/32/sendfeedback.svg   |1 
 icon-themes/breeze_dark_svg/cmd/lc_editframeset.svg   |1 
 icon-themes/breeze_dark_svg/cmd/lc_sendfeedback.svg   |1 
 icon-themes/breeze_dark_svg/cmd/sc_editframeset.svg   |1 
 icon-themes/breeze_svg/cmd/32/editframeset.svg|1 
 icon-themes/breeze_svg/cmd/32/sendfeedback.svg|1 
 icon-themes/breeze_svg/cmd/lc_editframeset.svg|1 
 icon-themes/breeze_svg/cmd/lc_sendfeedback.svg|1 
 icon-themes/breeze_svg/cmd/sc_editframeset.svg|1 
 icon-themes/sifr/cmd/32/autocorrectdlg.png|binary
 icon-themes/sifr/cmd/32/cleararrows.png   |binary
 icon-themes/sifr/cmd/32/donation.png  |binary
 icon-themes/sifr/cmd/32/editframeset.png  |binary
 icon-themes/sifr/cmd/32/editqrcode.png|binary
 icon-themes/sifr/cmd/32/insertqrcode.png  |binary
 icon-themes/sifr/cmd/32/normalviewmode.png|binary
 icon-themes/sifr/cmd/32/pagebreakmode.png |binary
 icon-themes/sifr/cmd/32/pasteonlyformula.png  |binary
 icon-themes/sifr/cmd/32/pasteonlytext.png |binary
 icon-themes/sifr/cmd/32/pasteonlyvalue.png|binary
 icon-themes/sifr/cmd/32/pastespecial.png  |binary
 icon-themes/sifr/cmd/32/pasteunformatted.png  |binary
 icon-themes/sifr/cmd/32/remove.png|binary
 icon-themes/sifr/cmd/32/saveacopy.png |binary
 icon-themes/sifr/cmd/32/saveall.png   |binary
 icon-themes/sifr/cmd/32/scan.png  |binary
 icon-themes/sifr/cmd/32/scriptorganizer.png   |binary
 icon-themes/sifr/cmd/32/selecttables.png  |binary
 icon-themes/sifr/cmd/32/sendfeedback.png  |binary
 icon-themes/sifr/cmd/lc_autocorrectdlg.png|binary
 icon-themes/sifr/cmd/lc_editframeset.png  |binary
 icon-themes/sifr/cmd/lc_editqrcode.png|binary
 icon-themes/sifr/cmd/lc_insertqrcode.png  |binary
 icon-themes/sifr/cmd/lc_name.png  |binary
 icon-themes/sifr/cmd/lc_normalviewmode.png|binary
 icon-themes/sifr/cmd/lc_pagebreakmode.png |binary
 icon-themes/sifr/cmd/lc_pasteonlyformula.png  |binary
 icon-themes/sifr/cmd/lc_pasteonlytext.png |binary
 icon-themes/sifr/cmd/lc_pasteonlyvalue.png|binary
 icon-themes/sifr/cmd/lc_pastespecial.png  |binary
 icon-themes/sifr/cmd/lc_pasteunformatted.png  |binary
 icon-themes/sifr/cmd/lc_saveall.png   |binary
 icon-themes/sifr/cmd/lc_scan.png  |binary
 icon-themes/sifr/cmd/lc_scriptorganizer.png   |binary
 icon-themes/sifr/cmd/lc_selecttables.png  |binary
 icon-themes/sifr/cmd/sc_autocorrectdlg.png|binary
 icon-themes/sifr/cmd/sc_editframeset.png  |binary
 icon-themes/sifr/cmd/sc_editqrcode.png|binary
 icon-themes/sifr/cmd/sc_insertqrcode.png  |binary
 icon-themes/sifr/cmd/sc_name.png  |binary
 icon-themes/sifr/cmd/sc_scan.png  |binary
 icon-themes/sifr/cmd/sc_scriptorganizer.png   |binary
 icon-themes/sifr/cmd/sc_selecttables.png  |binary
 icon-themes/sifr/links.txt|   46 +-
 icon-themes/sifr_dark/cmd/32/autocorrectdlg.png   |binary
 icon-themes/sifr_dark/cmd/32/cleararrows.png  |binary
 icon-themes/sifr_dark/cmd/32/donation.png |binary
 icon-themes/sifr_dark/cmd/32/editframeset.png |binary
 icon-themes/sifr_d

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/sifr icon-themes/sifr_dark icon-the

2022-03-11 Thread Rizal Muttaqin (via logerrit)

 dev/null  |binary
 icon-themes/breeze/cmd/32/editframeset.png|binary
 icon-themes/breeze/cmd/32/sendfeedback.png|binary
 icon-themes/breeze/cmd/lc_editframeset.png|binary
 icon-themes/breeze/cmd/lc_sendfeedback.png|binary
 icon-themes/breeze/cmd/sc_editframeset.png|binary
 icon-themes/breeze_dark/cmd/32/editframeset.png   |binary
 icon-themes/breeze_dark/cmd/32/sendfeedback.png   |binary
 icon-themes/breeze_dark/cmd/lc_editframeset.png   |binary
 icon-themes/breeze_dark/cmd/lc_sendfeedback.png   |binary
 icon-themes/breeze_dark/cmd/sc_editframeset.png   |binary
 icon-themes/breeze_dark_svg/cmd/32/editframeset.svg   |1 
 icon-themes/breeze_dark_svg/cmd/32/sendfeedback.svg   |1 
 icon-themes/breeze_dark_svg/cmd/lc_editframeset.svg   |1 
 icon-themes/breeze_dark_svg/cmd/lc_sendfeedback.svg   |1 
 icon-themes/breeze_dark_svg/cmd/sc_editframeset.svg   |1 
 icon-themes/breeze_svg/cmd/32/editframeset.svg|1 
 icon-themes/breeze_svg/cmd/32/sendfeedback.svg|1 
 icon-themes/breeze_svg/cmd/lc_editframeset.svg|1 
 icon-themes/breeze_svg/cmd/lc_sendfeedback.svg|1 
 icon-themes/breeze_svg/cmd/sc_editframeset.svg|1 
 icon-themes/sifr/cmd/32/autocorrectdlg.png|binary
 icon-themes/sifr/cmd/32/cleararrows.png   |binary
 icon-themes/sifr/cmd/32/donation.png  |binary
 icon-themes/sifr/cmd/32/editframeset.png  |binary
 icon-themes/sifr/cmd/32/editqrcode.png|binary
 icon-themes/sifr/cmd/32/insertqrcode.png  |binary
 icon-themes/sifr/cmd/32/normalviewmode.png|binary
 icon-themes/sifr/cmd/32/pagebreakmode.png |binary
 icon-themes/sifr/cmd/32/pasteonlyformula.png  |binary
 icon-themes/sifr/cmd/32/pasteonlytext.png |binary
 icon-themes/sifr/cmd/32/pasteonlyvalue.png|binary
 icon-themes/sifr/cmd/32/pastespecial.png  |binary
 icon-themes/sifr/cmd/32/pasteunformatted.png  |binary
 icon-themes/sifr/cmd/32/remove.png|binary
 icon-themes/sifr/cmd/32/saveacopy.png |binary
 icon-themes/sifr/cmd/32/saveall.png   |binary
 icon-themes/sifr/cmd/32/scan.png  |binary
 icon-themes/sifr/cmd/32/scriptorganizer.png   |binary
 icon-themes/sifr/cmd/32/selecttables.png  |binary
 icon-themes/sifr/cmd/32/sendfeedback.png  |binary
 icon-themes/sifr/cmd/lc_autocorrectdlg.png|binary
 icon-themes/sifr/cmd/lc_editframeset.png  |binary
 icon-themes/sifr/cmd/lc_editqrcode.png|binary
 icon-themes/sifr/cmd/lc_insertqrcode.png  |binary
 icon-themes/sifr/cmd/lc_name.png  |binary
 icon-themes/sifr/cmd/lc_normalviewmode.png|binary
 icon-themes/sifr/cmd/lc_pagebreakmode.png |binary
 icon-themes/sifr/cmd/lc_pasteonlyformula.png  |binary
 icon-themes/sifr/cmd/lc_pasteonlytext.png |binary
 icon-themes/sifr/cmd/lc_pasteonlyvalue.png|binary
 icon-themes/sifr/cmd/lc_pastespecial.png  |binary
 icon-themes/sifr/cmd/lc_pasteunformatted.png  |binary
 icon-themes/sifr/cmd/lc_saveall.png   |binary
 icon-themes/sifr/cmd/lc_scan.png  |binary
 icon-themes/sifr/cmd/lc_scriptorganizer.png   |binary
 icon-themes/sifr/cmd/lc_selecttables.png  |binary
 icon-themes/sifr/cmd/sc_autocorrectdlg.png|binary
 icon-themes/sifr/cmd/sc_editframeset.png  |binary
 icon-themes/sifr/cmd/sc_editqrcode.png|binary
 icon-themes/sifr/cmd/sc_insertqrcode.png  |binary
 icon-themes/sifr/cmd/sc_name.png  |binary
 icon-themes/sifr/cmd/sc_scan.png  |binary
 icon-themes/sifr/cmd/sc_scriptorganizer.png   |binary
 icon-themes/sifr/cmd/sc_selecttables.png  |binary
 icon-themes/sifr/links.txt|   46 +-
 icon-themes/sifr_dark/cmd/32/autocorrectdlg.png   |binary
 icon-themes/sifr_dark/cmd/32/cleararrows.png  |binary
 icon-themes/sifr_dark/cmd/32/donation.png |binary
 icon-themes/sifr_dark/cmd/32/editframeset.png |binary
 icon-themes/sifr_d

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-them

2022-03-11 Thread Rizal Muttaqin (via logerrit)

 dev/null  |binary
 icon-themes/breeze/cmd/32/editframeset.png|binary
 icon-themes/breeze/cmd/32/sendfeedback.png|binary
 icon-themes/breeze/cmd/lc_editframeset.png|binary
 icon-themes/breeze/cmd/lc_sendfeedback.png|binary
 icon-themes/breeze/cmd/sc_editframeset.png|binary
 icon-themes/breeze_dark/cmd/32/editframeset.png   |binary
 icon-themes/breeze_dark/cmd/32/sendfeedback.png   |binary
 icon-themes/breeze_dark/cmd/lc_editframeset.png   |binary
 icon-themes/breeze_dark/cmd/lc_sendfeedback.png   |binary
 icon-themes/breeze_dark/cmd/sc_editframeset.png   |binary
 icon-themes/breeze_dark_svg/cmd/32/editframeset.svg   |1 
 icon-themes/breeze_dark_svg/cmd/32/sendfeedback.svg   |1 
 icon-themes/breeze_dark_svg/cmd/lc_editframeset.svg   |1 
 icon-themes/breeze_dark_svg/cmd/lc_sendfeedback.svg   |1 
 icon-themes/breeze_dark_svg/cmd/sc_editframeset.svg   |1 
 icon-themes/breeze_svg/cmd/32/editframeset.svg|1 
 icon-themes/breeze_svg/cmd/32/sendfeedback.svg|1 
 icon-themes/breeze_svg/cmd/lc_editframeset.svg|1 
 icon-themes/breeze_svg/cmd/lc_sendfeedback.svg|1 
 icon-themes/breeze_svg/cmd/sc_editframeset.svg|1 
 icon-themes/sifr/cmd/32/autocorrectdlg.png|binary
 icon-themes/sifr/cmd/32/cleararrows.png   |binary
 icon-themes/sifr/cmd/32/donation.png  |binary
 icon-themes/sifr/cmd/32/editframeset.png  |binary
 icon-themes/sifr/cmd/32/editqrcode.png|binary
 icon-themes/sifr/cmd/32/insertqrcode.png  |binary
 icon-themes/sifr/cmd/32/normalviewmode.png|binary
 icon-themes/sifr/cmd/32/pagebreakmode.png |binary
 icon-themes/sifr/cmd/32/pasteonlyformula.png  |binary
 icon-themes/sifr/cmd/32/pasteonlytext.png |binary
 icon-themes/sifr/cmd/32/pasteonlyvalue.png|binary
 icon-themes/sifr/cmd/32/pastespecial.png  |binary
 icon-themes/sifr/cmd/32/pasteunformatted.png  |binary
 icon-themes/sifr/cmd/32/remove.png|binary
 icon-themes/sifr/cmd/32/saveacopy.png |binary
 icon-themes/sifr/cmd/32/saveall.png   |binary
 icon-themes/sifr/cmd/32/scan.png  |binary
 icon-themes/sifr/cmd/32/scriptorganizer.png   |binary
 icon-themes/sifr/cmd/32/selecttables.png  |binary
 icon-themes/sifr/cmd/32/sendfeedback.png  |binary
 icon-themes/sifr/cmd/lc_autocorrectdlg.png|binary
 icon-themes/sifr/cmd/lc_editframeset.png  |binary
 icon-themes/sifr/cmd/lc_editqrcode.png|binary
 icon-themes/sifr/cmd/lc_insertqrcode.png  |binary
 icon-themes/sifr/cmd/lc_name.png  |binary
 icon-themes/sifr/cmd/lc_normalviewmode.png|binary
 icon-themes/sifr/cmd/lc_pagebreakmode.png |binary
 icon-themes/sifr/cmd/lc_pasteonlyformula.png  |binary
 icon-themes/sifr/cmd/lc_pasteonlytext.png |binary
 icon-themes/sifr/cmd/lc_pasteonlyvalue.png|binary
 icon-themes/sifr/cmd/lc_pastespecial.png  |binary
 icon-themes/sifr/cmd/lc_pasteunformatted.png  |binary
 icon-themes/sifr/cmd/lc_saveall.png   |binary
 icon-themes/sifr/cmd/lc_scan.png  |binary
 icon-themes/sifr/cmd/lc_scriptorganizer.png   |binary
 icon-themes/sifr/cmd/lc_selecttables.png  |binary
 icon-themes/sifr/cmd/sc_autocorrectdlg.png|binary
 icon-themes/sifr/cmd/sc_editframeset.png  |binary
 icon-themes/sifr/cmd/sc_editqrcode.png|binary
 icon-themes/sifr/cmd/sc_insertqrcode.png  |binary
 icon-themes/sifr/cmd/sc_name.png  |binary
 icon-themes/sifr/cmd/sc_scan.png  |binary
 icon-themes/sifr/cmd/sc_scriptorganizer.png   |binary
 icon-themes/sifr/cmd/sc_selecttables.png  |binary
 icon-themes/sifr/links.txt|   46 +-
 icon-themes/sifr_dark/cmd/32/autocorrectdlg.png   |binary
 icon-themes/sifr_dark/cmd/32/cleararrows.png  |binary
 icon-themes/sifr_dark/cmd/32/donation.png |binary
 icon-themes/sifr_dark/cmd/32/editframeset.png |binary
 icon-themes/sifr_d

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

2022-03-11 Thread Noel Grandin (via logerrit)

 extensions/source/propctrlr/formcomponenthandler.cxx |9 --
 sw/source/ui/envelp/envfmt.cxx   |7 --
 sw/source/ui/frmdlg/column.cxx   |5 -
 sw/source/ui/frmdlg/frmpage.cxx  |   46 +
 sw/source/ui/table/tabledlg.cxx  |   65 ---
 5 files changed, 57 insertions(+), 75 deletions(-)

New commits:
commit 7b634028cec2df4136017be483ebc3c32bc8d9ec
Author: Noel Grandin 
AuthorDate: Tue Jan 25 10:44:57 2022 +0200
Commit: Noel Grandin 
CommitDate: Fri Mar 11 19:26:45 2022 +0100

use more SfxItemSet::GetItemIfSet

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

diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx 
b/extensions/source/propctrlr/formcomponenthandler.cxx
index 20a21ad8ae72..69e418b64e3d 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2715,18 +2715,15 @@ namespace pcr
 {
 const SfxItemSet* pResult = aDialog.GetOutputItemSet();
 
-const SfxPoolItem* pItem = pResult->GetItem( 
SID_ATTR_NUMBERFORMAT_INFO );
-const SvxNumberInfoItem* pInfoItem = dynamic_cast< const 
SvxNumberInfoItem* >( pItem );
-if (pInfoItem)
+if (const SvxNumberInfoItem* pInfoItem = pResult->GetItem( 
SID_ATTR_NUMBERFORMAT_INFO ))
 {
 for (sal_uInt32 key : pInfoItem->GetDelFormats())
 pFormatter->DeleteEntry(key);
 }
 
-pItem = nullptr;
-if ( SfxItemState::SET == pResult->GetItemState( 
SID_ATTR_NUMBERFORMAT_VALUE, false, &pItem ) )
+if ( const SfxUInt32Item* pItem = pResult->GetItemIfSet( 
SID_ATTR_NUMBERFORMAT_VALUE, false ) )
 {
-_out_rNewValue <<= static_cast( static_cast< 
const SfxUInt32Item* >( pItem )->GetValue() );
+_out_rNewValue <<= static_cast( 
pItem->GetValue() );
 bChanged = true;
 }
 }
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 56c5f9135b71..26cd00923873 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -227,13 +227,12 @@ void SwEnvFormatPage::Edit(std::string_view rIdent, bool 
bSender)
 if (aDlg.run() == RET_OK)
 {
 // maybe relocate defaults
-const SfxPoolItem* pItem = nullptr;
+const SfxUInt16Item* pDefaultsItem = nullptr;
 SfxItemSet* pOutputSet = 
const_cast(aDlg.GetOutputItemSet());
 sal_uInt16 nNewDist;
 
-if( SfxItemState::SET == pOutputSet->GetItemState( 
SID_ATTR_TABSTOP_DEFAULTS,
-false, &pItem ) &&
-nDefDist != (nNewDist = static_cast(pItem)->GetValue()) )
+if( (pDefaultsItem = pOutputSet->GetItemIfSet( 
SID_ATTR_TABSTOP_DEFAULTS, false )) &&
+nDefDist != (nNewDist = pDefaultsItem->GetValue()) )
 {
 SvxTabStopItem aDefTabs( 0, 0, SvxTabAdjust::Default, 
RES_PARATR_TABSTOP );
 MakeDefTabs( nNewDist, aDefTabs );
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index f12ae77f4180..e03eb2945999 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -562,9 +562,8 @@ void SwColumnPage::Reset(const SfxItemSet *rSet)
 }
 if (m_xBalanceColsCB->get_visible())
 {
-const SfxPoolItem* pItem;
-if( SfxItemState::SET == rSet->GetItemState( RES_COLUMNBALANCE, false, 
&pItem ))
-m_xBalanceColsCB->set_active(!static_cast(pItem)->GetValue());
+if( const SwFormatNoBalancedColumns* pItem = rSet->GetItemIfSet( 
RES_COLUMNBALANCE, false ) )
+m_xBalanceColsCB->set_active(!pItem->GetValue());
 else
 m_xBalanceColsCB->set_active(true);
 }
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 66837f87fe43..a48a939dfbeb 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -870,13 +870,12 @@ void SwFramePage::Reset( const SfxItemSet *rSet )
 ::SetFieldUnit(*m_xAtHorzPosED, aMetric);
 ::SetFieldUnit(*m_xAtVertPosED, aMetric);
 
-const SfxPoolItem* pItem = nullptr;
 const SwFormatAnchor& rAnchor = rSet->Get(RES_ANCHOR);
 
-if (SfxItemState::SET == rSet->GetItemState(FN_OLE_IS_MATH, false, &pItem))
-m_bIsMathOLE = static_cast(pItem)->GetValue();
-if (SfxItemState::SET == rSet->GetItemState(FN_MATH_BASELINE_ALIGNMENT, 
false, &pItem))
-m_bIsMathBaselineAlignment = static_cast(pItem)->GetValue();
+if (const SfxBoolItem* pMathItem = rSet->GetItemIfSet(FN_OLE_IS_MATH, 
false))

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 4 commits - solenv/gdb vcl/source xmlsecurity/source

2022-03-11 Thread Caolán McNamara (via logerrit)

 solenv/gdb/boost/util/printing.py  |2 -
 solenv/gdb/libreoffice/util/printing.py|2 -
 vcl/source/gdi/svmconverter.cxx|   20 +
 vcl/source/outdev/hatch.cxx|7 
 xmlsecurity/source/component/documentdigitalsignatures.cxx |   13 +++-
 5 files changed, 40 insertions(+), 4 deletions(-)

New commits:
commit 02e0899b58f54f71f6b0c364f7ff30d1a5bd4a0f
Author: Caolán McNamara 
AuthorDate: Sun Mar 6 15:49:28 2022 +
Commit: Michael Stahl 
CommitDate: Fri Mar 11 15:52:42 2022 +0100

ofz: Too many hatch points

Change-Id: I08cb9d09a9bb48ab31763f50bc2fa23cf723330f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131014
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit bee0950a4c5bd996a8df0185b03c0f98e7a3de9c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131370
Tested-by: Michael Stahl 

diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx
index 2059aa364824..f65b28ae5c24 100644
--- a/vcl/source/outdev/hatch.cxx
+++ b/vcl/source/outdev/hatch.cxx
@@ -373,7 +373,14 @@ void OutputDevice::DrawHatchLine( const tools::Line& 
rLine, const tools::PolyPol
 nAdd = 1;
 
 if( nAdd )
+{
+if (nPCounter == HATCH_MAXPOINTS)
+{
+SAL_WARN("vcl.gdi", "too many hatch points");
+return;
+}
 pPtBuffer[ nPCounter++ ] = Point( FRound( fX ), 
FRound( fY ) );
+}
 }
 
 aCurSegment.SetStart( aCurSegment.GetEnd() );
commit 205a73755b02ece750f85f95f7091d490facc3ee
Author: Caolán McNamara 
AuthorDate: Fri Mar 4 10:38:50 2022 +
Commit: Michael Stahl 
CommitDate: Fri Mar 11 15:52:13 2022 +0100

clamp and add some logging like SvmReader

LIBREOFFICE-OWMTGGWJ

Change-Id: I8f744e1ab2684a0f0995abcc3e753a684a3b970a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130982
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 19add15932e579c931480eed42eeea52d0551897)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131369
Tested-by: Michael Stahl 

diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index a9773ffbd682..b1bd726969f5 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -504,6 +504,23 @@ namespace
 nFollowingActionCount = remainingActions;
 return std::min(remainingActions, nFollowingActionCount);
 }
+
+void ClampRange(const OUString& rStr, sal_Int32& rIndex, sal_Int32& 
rLength)
+{
+const sal_Int32 nStrLength = rStr.getLength();
+
+if (rIndex < 0 || rIndex > nStrLength)
+{
+SAL_WARN("vcl.gdi", "inconsistent offset");
+rIndex = nStrLength;
+}
+
+if (rLength < 0 || rLength > nStrLength - rIndex)
+{
+SAL_WARN("vcl.gdi", "inconsistent len");
+rLength = nStrLength - rIndex;
+}
+}
 }
 
 #define LF_FACESIZE 32
@@ -927,6 +944,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 OUString aStr(OStringToOUString(aByteStr, eActualCharSet));
 if ( nUnicodeCommentActionNumber == i )
 ImplReadUnicodeComment( nUnicodeCommentStreamPos, 
rIStm, aStr );
+ClampRange(aStr, nIndex, nLen);
 rMtf.AddAction( new MetaTextAction( aPt, aStr, nIndex, 
nLen ) );
 }
 
@@ -1017,6 +1035,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 }
 if ( nUnicodeCommentActionNumber == i )
 ImplReadUnicodeComment( nUnicodeCommentStreamPos, 
rIStm, aStr );
+ClampRange(aStr, nIndex, nLen);
 rMtf.AddAction( new MetaTextArrayAction( aPt, aStr, 
pDXAry.get(), nIndex, nLen ) );
 }
 
@@ -1042,6 +1061,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 OUString aStr(OStringToOUString(aByteStr, eActualCharSet));
 if ( nUnicodeCommentActionNumber == i )
 ImplReadUnicodeComment( nUnicodeCommentStreamPos, 
rIStm, aStr );
+ClampRange(aStr, nIndex, nLen);
 rMtf.AddAction( new MetaStretchTextAction( aPt, nWidth, 
aStr, nIndex, nLen ) );
 }
 
commit 2c8c221b88f2e2bb5b29a6c1bcce1ea75e98136a
Author: Caolán McNamara 
AuthorDate: Thu Mar 3 14:22:37 2022 +
Commit: Michael Stahl 
CommitDate: Fri Mar 11 15:50:21 2022 +0100

compare authors using Thumbprint

Reviewed-on

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 3 commits - vcl/source xmlsecurity/source

2022-03-11 Thread Caolán McNamara (via logerrit)

 vcl/source/gdi/svmconverter.cxx|   20 +
 vcl/source/outdev/hatch.cxx|7 
 xmlsecurity/source/component/documentdigitalsignatures.cxx |   15 +++--
 3 files changed, 39 insertions(+), 3 deletions(-)

New commits:
commit 10f8abb05b771bca293706a8dc7513ae2123c640
Author: Caolán McNamara 
AuthorDate: Sun Mar 6 15:49:28 2022 +
Commit: Michael Stahl 
CommitDate: Fri Mar 11 15:53:16 2022 +0100

ofz: Too many hatch points

Change-Id: I08cb9d09a9bb48ab31763f50bc2fa23cf723330f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131014
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit bee0950a4c5bd996a8df0185b03c0f98e7a3de9c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131370
Tested-by: Michael Stahl 

diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx
index 33ff9e648213..4d05467aacc4 100644
--- a/vcl/source/outdev/hatch.cxx
+++ b/vcl/source/outdev/hatch.cxx
@@ -370,7 +370,14 @@ void OutputDevice::DrawHatchLine( const tools::Line& 
rLine, const tools::PolyPol
 nAdd = 1;
 
 if( nAdd )
+{
+if (nPCounter == HATCH_MAXPOINTS)
+{
+SAL_WARN("vcl.gdi", "too many hatch points");
+return;
+}
 pPtBuffer[ nPCounter++ ] = Point( FRound( fX ), 
FRound( fY ) );
+}
 }
 
 aCurSegment.SetStart( aCurSegment.GetEnd() );
commit 8727f47611af8dfb5ac186cc47e7b38741ccfb76
Author: Caolán McNamara 
AuthorDate: Fri Mar 4 10:38:50 2022 +
Commit: Michael Stahl 
CommitDate: Fri Mar 11 15:52:09 2022 +0100

clamp and add some logging like SvmReader

LIBREOFFICE-OWMTGGWJ

Change-Id: I8f744e1ab2684a0f0995abcc3e753a684a3b970a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130982
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 19add15932e579c931480eed42eeea52d0551897)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131369
Tested-by: Michael Stahl 

diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index dc48dea5c718..f61cbdb4e29c 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -244,6 +244,23 @@ namespace
 nFollowingActionCount = remainingActions;
 return std::min(remainingActions, nFollowingActionCount);
 }
+
+void ClampRange(const OUString& rStr, sal_Int32& rIndex, sal_Int32& 
rLength)
+{
+const sal_Int32 nStrLength = rStr.getLength();
+
+if (rIndex < 0 || rIndex > nStrLength)
+{
+SAL_WARN("vcl.gdi", "inconsistent offset");
+rIndex = nStrLength;
+}
+
+if (rLength < 0 || rLength > nStrLength - rIndex)
+{
+SAL_WARN("vcl.gdi", "inconsistent len");
+rLength = nStrLength - rIndex;
+}
+}
 }
 
 #define LF_FACESIZE 32
@@ -687,6 +704,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 OUString aStr(OStringToOUString(aByteStr, eActualCharSet));
 if ( nUnicodeCommentActionNumber == i )
 ImplReadUnicodeComment( nUnicodeCommentStreamPos, 
rIStm, aStr );
+ClampRange(aStr, nIndex, nLen);
 rMtf.AddAction( new MetaTextAction( aPt, aStr, nIndex, 
nLen ) );
 }
 
@@ -777,6 +795,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 }
 if ( nUnicodeCommentActionNumber == i )
 ImplReadUnicodeComment( nUnicodeCommentStreamPos, 
rIStm, aStr );
+ClampRange(aStr, nIndex, nLen);
 rMtf.AddAction( new MetaTextArrayAction( aPt, aStr, 
pDXAry.get(), nIndex, nLen ) );
 }
 
@@ -803,6 +822,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 OUString aStr(OStringToOUString(aByteStr, eActualCharSet));
 if ( nUnicodeCommentActionNumber == i )
 ImplReadUnicodeComment( nUnicodeCommentStreamPos, 
rIStm, aStr );
+ClampRange(aStr, nIndex, nLen);
 rMtf.AddAction( new MetaStretchTextAction( aPt, nWidth, 
aStr, nIndex, nLen ) );
 }
 
commit 0ce93b38af84453aba8002c098ac168b0fadfc97
Author: Caolán McNamara 
AuthorDate: Thu Mar 3 14:22:37 2022 +
Commit: Michael Stahl 
CommitDate: Fri Mar 11 15:48:16 2022 +0100

compare authors using Thumbprint

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130929
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 6544220

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg

2022-03-11 Thread Rizal Muttaqin (via logerrit)

 icon-themes/breeze/cmd/32/autocorrectdlg.png|binary
 icon-themes/breeze/cmd/32/insertfooter.png  |binary
 icon-themes/breeze/cmd/32/insertheader.png  |binary
 icon-themes/breeze/cmd/32/pasteonlyformula.png  |binary
 icon-themes/breeze/cmd/32/pasteonlytext.png |binary
 icon-themes/breeze/cmd/32/pasteonlyvalue.png|binary
 icon-themes/breeze/cmd/32/pastespecial.png  |binary
 icon-themes/breeze/cmd/32/pasteunformatted.png  |binary
 icon-themes/breeze/cmd/32/scriptorganizer.png   |binary
 icon-themes/breeze/cmd/32/textattributes.png|binary
 icon-themes/breeze/cmd/lc_autocorrectdlg.png|binary
 icon-themes/breeze/cmd/lc_insertfooter.png  |binary
 icon-themes/breeze/cmd/lc_insertheader.png  |binary
 icon-themes/breeze/cmd/lc_pasteonlyformula.png  |binary
 icon-themes/breeze/cmd/lc_pasteonlytext.png |binary
 icon-themes/breeze/cmd/lc_pasteonlyvalue.png|binary
 icon-themes/breeze/cmd/lc_pastespecial.png  |binary
 icon-themes/breeze/cmd/lc_scriptorganizer.png   |binary
 icon-themes/breeze/cmd/sc_autocorrectdlg.png|binary
 icon-themes/breeze/cmd/sc_insertfooter.png  |binary
 icon-themes/breeze/cmd/sc_insertheader.png  |binary
 icon-themes/breeze/cmd/sc_pastespecial.png  |binary
 icon-themes/breeze/cmd/sc_scriptorganizer.png   |binary
 icon-themes/breeze/links.txt|   12 
 icon-themes/breeze_dark/cmd/32/autocorrectdlg.png   |binary
 icon-themes/breeze_dark/cmd/32/insertfooter.png |binary
 icon-themes/breeze_dark/cmd/32/insertheader.png |binary
 icon-themes/breeze_dark/cmd/32/pasteonlyformula.png |binary
 icon-themes/breeze_dark/cmd/32/pasteonlytext.png|binary
 icon-themes/breeze_dark/cmd/32/pasteonlyvalue.png   |binary
 icon-themes/breeze_dark/cmd/32/pastespecial.png |binary
 icon-themes/breeze_dark/cmd/32/pasteunformatted.png |binary
 icon-themes/breeze_dark/cmd/32/scriptorganizer.png  |binary
 icon-themes/breeze_dark/cmd/32/textattributes.png   |binary
 icon-themes/breeze_dark/cmd/lc_autocorrectdlg.png   |binary
 icon-themes/breeze_dark/cmd/lc_insertfooter.png |binary
 icon-themes/breeze_dark/cmd/lc_insertheader.png |binary
 icon-themes/breeze_dark/cmd/lc_pasteonlyformula.png |binary
 icon-themes/breeze_dark/cmd/lc_pasteonlytext.png|binary
 icon-themes/breeze_dark/cmd/lc_pasteonlyvalue.png   |binary
 icon-themes/breeze_dark/cmd/lc_pastespecial.png |binary
 icon-themes/breeze_dark/cmd/lc_scriptorganizer.png  |binary
 icon-themes/breeze_dark/cmd/sc_autocorrectdlg.png   |binary
 icon-themes/breeze_dark/cmd/sc_insertfooter.png |binary
 icon-themes/breeze_dark/cmd/sc_insertheader.png |binary
 icon-themes/breeze_dark/cmd/sc_pastespecial.png |binary
 icon-themes/breeze_dark/cmd/sc_scriptorganizer.png  |binary
 icon-themes/breeze_dark/links.txt   |   12 
 icon-themes/breeze_dark_svg/cmd/32/autocorrectdlg.svg   |1 +
 icon-themes/breeze_dark_svg/cmd/32/insertfooter.svg |1 +
 icon-themes/breeze_dark_svg/cmd/32/insertheader.svg |1 +
 icon-themes/breeze_dark_svg/cmd/32/pasteonlyformula.svg |1 +
 icon-themes/breeze_dark_svg/cmd/32/pasteonlytext.svg|1 +
 icon-themes/breeze_dark_svg/cmd/32/pasteonlyvalue.svg   |1 +
 icon-themes/breeze_dark_svg/cmd/32/pastespecial.svg |1 +
 icon-themes/breeze_dark_svg/cmd/32/pasteunformatted.svg |1 +
 icon-themes/breeze_dark_svg/cmd/32/scriptorganizer.svg  |1 +
 icon-themes/breeze_dark_svg/cmd/32/textattributes.svg   |1 +
 icon-themes/breeze_dark_svg/cmd/lc_autocorrectdlg.svg   |1 +
 icon-themes/breeze_dark_svg/cmd/lc_insertfooter.svg |1 +
 icon-themes/breeze_dark_svg/cmd/lc_insertheader.svg |1 +
 icon-themes/breeze_dark_svg/cmd/lc_pasteonlyformula.svg |1 +
 icon-themes/breeze_dark_svg/cmd/lc_pasteonlytext.svg|1 +
 icon-themes/breeze_dark_svg/cmd/lc_pasteonlyvalue.svg   |1 +
 icon-themes/breeze_dark_svg/cmd/lc_pastespecial.svg |1 +
 icon-themes/breeze_dark_svg/cmd/lc_scriptorganizer.svg  |2 +-
 icon-themes/breeze_dark_svg/cmd/sc_autocorrectdlg.svg   |2 +-
 icon-themes/breeze_dark_svg/cmd/sc_insertfooter.svg |1 +
 icon-themes/breeze_dark_svg/cmd/sc_insertheader.svg |1 +
 icon-themes/breeze_dark_svg/cmd/sc_pastespecial.svg |2 +-
 icon-themes/breeze_dark_svg/cmd/sc_scriptorganizer.svg  |2 +-
 icon-themes/breeze_svg/cmd/32/autocorrectdlg.svg|1 +
 icon-themes/breeze_svg/cmd/32/insertfooter.svg  |1 +
 icon-themes/breeze_svg/cmd/32/insertheader.svg  |1 +
 icon-themes/breeze_svg/cmd/32/pasteonlyformula.svg  |1 +
 icon-themes/breeze_svg/cmd/32/pasteonlytext.svg |1 +
 ic

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg

2022-03-11 Thread Rizal Muttaqin (via logerrit)

 icon-themes/breeze/cmd/32/autocorrectdlg.png|binary
 icon-themes/breeze/cmd/32/insertfooter.png  |binary
 icon-themes/breeze/cmd/32/insertheader.png  |binary
 icon-themes/breeze/cmd/32/pasteonlyformula.png  |binary
 icon-themes/breeze/cmd/32/pasteonlytext.png |binary
 icon-themes/breeze/cmd/32/pasteonlyvalue.png|binary
 icon-themes/breeze/cmd/32/pastespecial.png  |binary
 icon-themes/breeze/cmd/32/pasteunformatted.png  |binary
 icon-themes/breeze/cmd/32/scriptorganizer.png   |binary
 icon-themes/breeze/cmd/32/textattributes.png|binary
 icon-themes/breeze/cmd/lc_autocorrectdlg.png|binary
 icon-themes/breeze/cmd/lc_insertfooter.png  |binary
 icon-themes/breeze/cmd/lc_insertheader.png  |binary
 icon-themes/breeze/cmd/lc_pasteonlyformula.png  |binary
 icon-themes/breeze/cmd/lc_pasteonlytext.png |binary
 icon-themes/breeze/cmd/lc_pasteonlyvalue.png|binary
 icon-themes/breeze/cmd/lc_pastespecial.png  |binary
 icon-themes/breeze/cmd/lc_scriptorganizer.png   |binary
 icon-themes/breeze/cmd/sc_autocorrectdlg.png|binary
 icon-themes/breeze/cmd/sc_insertfooter.png  |binary
 icon-themes/breeze/cmd/sc_insertheader.png  |binary
 icon-themes/breeze/cmd/sc_pastespecial.png  |binary
 icon-themes/breeze/cmd/sc_scriptorganizer.png   |binary
 icon-themes/breeze/links.txt|   12 
 icon-themes/breeze_dark/cmd/32/autocorrectdlg.png   |binary
 icon-themes/breeze_dark/cmd/32/insertfooter.png |binary
 icon-themes/breeze_dark/cmd/32/insertheader.png |binary
 icon-themes/breeze_dark/cmd/32/pasteonlyformula.png |binary
 icon-themes/breeze_dark/cmd/32/pasteonlytext.png|binary
 icon-themes/breeze_dark/cmd/32/pasteonlyvalue.png   |binary
 icon-themes/breeze_dark/cmd/32/pastespecial.png |binary
 icon-themes/breeze_dark/cmd/32/pasteunformatted.png |binary
 icon-themes/breeze_dark/cmd/32/scriptorganizer.png  |binary
 icon-themes/breeze_dark/cmd/32/textattributes.png   |binary
 icon-themes/breeze_dark/cmd/lc_autocorrectdlg.png   |binary
 icon-themes/breeze_dark/cmd/lc_insertfooter.png |binary
 icon-themes/breeze_dark/cmd/lc_insertheader.png |binary
 icon-themes/breeze_dark/cmd/lc_pasteonlyformula.png |binary
 icon-themes/breeze_dark/cmd/lc_pasteonlytext.png|binary
 icon-themes/breeze_dark/cmd/lc_pasteonlyvalue.png   |binary
 icon-themes/breeze_dark/cmd/lc_pastespecial.png |binary
 icon-themes/breeze_dark/cmd/lc_scriptorganizer.png  |binary
 icon-themes/breeze_dark/cmd/sc_autocorrectdlg.png   |binary
 icon-themes/breeze_dark/cmd/sc_insertfooter.png |binary
 icon-themes/breeze_dark/cmd/sc_insertheader.png |binary
 icon-themes/breeze_dark/cmd/sc_pastespecial.png |binary
 icon-themes/breeze_dark/cmd/sc_scriptorganizer.png  |binary
 icon-themes/breeze_dark/links.txt   |   12 
 icon-themes/breeze_dark_svg/cmd/32/autocorrectdlg.svg   |1 +
 icon-themes/breeze_dark_svg/cmd/32/insertfooter.svg |1 +
 icon-themes/breeze_dark_svg/cmd/32/insertheader.svg |1 +
 icon-themes/breeze_dark_svg/cmd/32/pasteonlyformula.svg |1 +
 icon-themes/breeze_dark_svg/cmd/32/pasteonlytext.svg|1 +
 icon-themes/breeze_dark_svg/cmd/32/pasteonlyvalue.svg   |1 +
 icon-themes/breeze_dark_svg/cmd/32/pastespecial.svg |1 +
 icon-themes/breeze_dark_svg/cmd/32/pasteunformatted.svg |1 +
 icon-themes/breeze_dark_svg/cmd/32/scriptorganizer.svg  |1 +
 icon-themes/breeze_dark_svg/cmd/32/textattributes.svg   |1 +
 icon-themes/breeze_dark_svg/cmd/lc_autocorrectdlg.svg   |1 +
 icon-themes/breeze_dark_svg/cmd/lc_insertfooter.svg |1 +
 icon-themes/breeze_dark_svg/cmd/lc_insertheader.svg |1 +
 icon-themes/breeze_dark_svg/cmd/lc_pasteonlyformula.svg |1 +
 icon-themes/breeze_dark_svg/cmd/lc_pasteonlytext.svg|1 +
 icon-themes/breeze_dark_svg/cmd/lc_pasteonlyvalue.svg   |1 +
 icon-themes/breeze_dark_svg/cmd/lc_pastespecial.svg |1 +
 icon-themes/breeze_dark_svg/cmd/lc_scriptorganizer.svg  |2 +-
 icon-themes/breeze_dark_svg/cmd/sc_autocorrectdlg.svg   |2 +-
 icon-themes/breeze_dark_svg/cmd/sc_insertfooter.svg |1 +
 icon-themes/breeze_dark_svg/cmd/sc_insertheader.svg |1 +
 icon-themes/breeze_dark_svg/cmd/sc_pastespecial.svg |2 +-
 icon-themes/breeze_dark_svg/cmd/sc_scriptorganizer.svg  |2 +-
 icon-themes/breeze_svg/cmd/32/autocorrectdlg.svg|1 +
 icon-themes/breeze_svg/cmd/32/insertfooter.svg  |1 +
 icon-themes/breeze_svg/cmd/32/insertheader.svg  |1 +
 icon-themes/breeze_svg/cmd/32/pasteonlyformula.svg  |1 +
 icon-themes/breeze_svg/cmd/32/pasteonlytext.svg |1 +
 ic

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - vcl/source

2022-03-11 Thread Caolán McNamara (via logerrit)

 vcl/source/gdi/svmconverter.cxx |   20 
 1 file changed, 20 insertions(+)

New commits:
commit 13f95543670e1ad23b878a55a33942e88ef0b80f
Author: Caolán McNamara 
AuthorDate: Fri Mar 4 10:38:50 2022 +
Commit: Michael Stahl 
CommitDate: Fri Mar 11 15:44:47 2022 +0100

clamp and add some logging like SvmReader

LIBREOFFICE-OWMTGGWJ

Change-Id: I8f744e1ab2684a0f0995abcc3e753a684a3b970a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130982
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 19add15932e579c931480eed42eeea52d0551897)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131369
Tested-by: Michael Stahl 

diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index dc48dea5c718..f61cbdb4e29c 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -244,6 +244,23 @@ namespace
 nFollowingActionCount = remainingActions;
 return std::min(remainingActions, nFollowingActionCount);
 }
+
+void ClampRange(const OUString& rStr, sal_Int32& rIndex, sal_Int32& 
rLength)
+{
+const sal_Int32 nStrLength = rStr.getLength();
+
+if (rIndex < 0 || rIndex > nStrLength)
+{
+SAL_WARN("vcl.gdi", "inconsistent offset");
+rIndex = nStrLength;
+}
+
+if (rLength < 0 || rLength > nStrLength - rIndex)
+{
+SAL_WARN("vcl.gdi", "inconsistent len");
+rLength = nStrLength - rIndex;
+}
+}
 }
 
 #define LF_FACESIZE 32
@@ -687,6 +704,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 OUString aStr(OStringToOUString(aByteStr, eActualCharSet));
 if ( nUnicodeCommentActionNumber == i )
 ImplReadUnicodeComment( nUnicodeCommentStreamPos, 
rIStm, aStr );
+ClampRange(aStr, nIndex, nLen);
 rMtf.AddAction( new MetaTextAction( aPt, aStr, nIndex, 
nLen ) );
 }
 
@@ -777,6 +795,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 }
 if ( nUnicodeCommentActionNumber == i )
 ImplReadUnicodeComment( nUnicodeCommentStreamPos, 
rIStm, aStr );
+ClampRange(aStr, nIndex, nLen);
 rMtf.AddAction( new MetaTextArrayAction( aPt, aStr, 
pDXAry.get(), nIndex, nLen ) );
 }
 
@@ -803,6 +822,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 OUString aStr(OStringToOUString(aByteStr, eActualCharSet));
 if ( nUnicodeCommentActionNumber == i )
 ImplReadUnicodeComment( nUnicodeCommentStreamPos, 
rIStm, aStr );
+ClampRange(aStr, nIndex, nLen);
 rMtf.AddAction( new MetaStretchTextAction( aPt, nWidth, 
aStr, nIndex, nLen ) );
 }

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - vcl/source

2022-03-11 Thread Caolán McNamara (via logerrit)

 vcl/source/outdev/hatch.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 80a50d733c14314784737e5b933b38f6de3845a8
Author: Caolán McNamara 
AuthorDate: Sun Mar 6 15:49:28 2022 +
Commit: Michael Stahl 
CommitDate: Fri Mar 11 15:44:31 2022 +0100

ofz: Too many hatch points

Change-Id: I08cb9d09a9bb48ab31763f50bc2fa23cf723330f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131014
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit bee0950a4c5bd996a8df0185b03c0f98e7a3de9c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131370
Tested-by: Michael Stahl 

diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx
index 33ff9e648213..4d05467aacc4 100644
--- a/vcl/source/outdev/hatch.cxx
+++ b/vcl/source/outdev/hatch.cxx
@@ -370,7 +370,14 @@ void OutputDevice::DrawHatchLine( const tools::Line& 
rLine, const tools::PolyPol
 nAdd = 1;
 
 if( nAdd )
+{
+if (nPCounter == HATCH_MAXPOINTS)
+{
+SAL_WARN("vcl.gdi", "too many hatch points");
+return;
+}
 pPtBuffer[ nPCounter++ ] = Point( FRound( fX ), 
FRound( fY ) );
+}
 }
 
 aCurSegment.SetStart( aCurSegment.GetEnd() );

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

2022-03-11 Thread Luboš Luňák (via logerrit)

 include/svx/framelink.hxx   |   11 +++
 svx/source/dialog/framelink.cxx |5 -
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 6e88e4edfba146f6163e7a1173dbd4644b21432e
Author: Luboš Luňák 
AuthorDate: Fri Mar 11 08:49:17 2022 +0100
Commit: Luboš Luňák 
CommitDate: Fri Mar 11 15:37:13 2022 +0100

make svx::frame::Style ctor inline

ScDocument: :FillInfo() may result in calling it often.
Change-Id: I05d0582befc57c4959c33fae6dec3d340b8a49ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131338
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index 2ee2a6f556e0..ae35185a4eb6 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -167,6 +167,17 @@ public:
 
 inline bool operator>( const Style& rL, const Style& rR ) { return 
rR.operator<(rL); }
 
+inline Style::Style()
+: mfPrim(0)
+, mfDist(0)
+, mfSecn(0)
+, mfPatternScale(1.0)
+, meRefMode(RefMode::Centered)
+, mnType(SvxBorderLineStyle::SOLID)
+, mbWordTableCell(false)
+, mbUseGapColor(false)
+{}
+
 }
 
 
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 6400eb33d8b0..77098bd3e80d 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -31,11 +31,6 @@ using namespace editeng;
 namespace svx::frame
 {
 
-Style::Style()
-{
-Clear();
-}
-
 Style::Style( double nP, double nD, double nS, SvxBorderLineStyle nType, 
double fScale )
 {
 Clear();

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

2022-03-11 Thread Caolán McNamara (via logerrit)

 vcl/inc/strings.hrc |4 
 1 file changed, 4 deletions(-)

New commits:
commit 916421d72528f99d48af29eeaf92a5a6bb33bfd9
Author: Caolán McNamara 
AuthorDate: Fri Mar 11 12:12:38 2022 +
Commit: Caolán McNamara 
CommitDate: Fri Mar 11 15:34:53 2022 +0100

remove a pair of newly unneeded translations

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

diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc
index 0439162f07c3..83beea008e9e 100644
--- a/vcl/inc/strings.hrc
+++ b/vcl/inc/strings.hrc
@@ -67,10 +67,6 @@
 #define SV_STDTEXT_PREFERENCES   
NC_("SV_STDTEXT_PREFERENCES", "Preferences...")
 #define SV_STDTEXT_ALLFILETYPES  
NC_("SV_STDTEXT_ALLFILETYPES", "Any type")
 
-// dear loplugins, please don't remove this constant, it will be used in 
follow-up commits
-#define STR_FPICKER_ALREADYEXISTOVERWRITE_SECONDARY  
NC_("STR_FPICKER_ALREADYEXISTOVERWRITE_SECONDARY", "The file already exists in 
\"$dirname$\". Replacing it will overwrite its contents.")
-#define STR_FPICKER_ALLFORMATS   
NC_("STR_FPICKER_ALLFORMATS", "All Formats")
-
 #define SV_ACCESSERROR_NO_FONTS  
NC_("SV_ACCESSERROR_NO_FONTS", "No fonts could be found on the system.")
 
 #define SV_PRINT_NOPAGES NC_("SV_PRINT_NOPAGES", 
"No pages")

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

2022-03-11 Thread Caolán McNamara (via logerrit)

 vcl/source/app/svdata.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5343835d72f235743c44f12da3c60c25dec5c6fd
Author: Caolán McNamara 
AuthorDate: Fri Mar 11 12:44:59 2022 +
Commit: Caolán McNamara 
CommitDate: Fri Mar 11 15:11:44 2022 +0100

silence 'sal/rtl/strtmpl.hxx:162: Found non-ASCII char' warning

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

diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 1493729c9b1d..cb553176cc36 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -284,7 +284,7 @@ namespace vcl
 sal_uInt32 nUnits = SAL_N_ELEMENTS(SV_FUNIT_STRINGS);
 for (sal_uInt32 i = 0; i < nUnits; ++i)
 {
-if 
(rEnglishMetricString.equalsAscii(SV_FUNIT_STRINGS[i].first.mpId))
+if (rEnglishMetricString.toUtf8() == 
SV_FUNIT_STRINGS[i].first.mpId)
 return SV_FUNIT_STRINGS[i].second;
 }
 return FieldUnit::NONE;

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

2022-03-11 Thread Mike Kaganski (via logerrit)

 starmath/source/view.cxx |   21 -
 1 file changed, 4 insertions(+), 17 deletions(-)

New commits:
commit c964700d16d99d1569373a1eb9a1352fb3512915
Author: Mike Kaganski 
AuthorDate: Fri Mar 11 15:19:41 2022 +0300
Commit: Mike Kaganski 
CommitDate: Fri Mar 11 15:03:51 2022 +0100

Related: tdf#128610 Avoid use-after-free

Creating SvMemoryStream from string makes it non-owning, i.e. pointing
to the string's memory. So the string must outlive the stream.

Since commit 64bc8b45b5c23efc5fe57585a69aa4263aaf4e83
  Date   Wed Jul 08 12:31:43 2015 +
i#107734 Support for Math Input Panel in Windows 7

Was only working by chance, when destructor didn't clean the memory
(e.g., in optimized release builds) and the released memory hasn't
been reused yet.

Change-Id: I2e0c195de7bd2aff2889a94ef0f2eb084411933f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131373
Tested-by: Mike Kaganski 
Reviewed-by: Mike Kaganski 

diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index eb1555a9a29b..77886a5795dc 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1832,31 +1832,18 @@ void SmViewShell::Execute(SfxRequest& rReq)
 SfxFilter::GetFilterByName(MATHML_XML);
 aClipboardMedium.SetFilter(pMathFilter);
 
-std::unique_ptr pStrm;
 // The text to be imported might asserts encoding 
like 'encoding="utf-8"' but FORMAT_STRING is UTF-16.
 // Force encoding to UTF-16, if encoding exists.
-bool bForceUTF16 = false;
 sal_Int32 nPosL = aString.indexOf("encoding=\"");
-sal_Int32 nPosU = -1;
 if ( nPosL >= 0 && nPosL +10 < aString.getLength() 
)
 {
 nPosL += 10;
-nPosU = aString.indexOf( '"',nPosL);
+sal_Int32 nPosU = aString.indexOf( '"',nPosL);
 if (nPosU > nPosL)
-{
-bForceUTF16 = true;
-}
+aString = aString.replaceAt(nPosL, nPosU - 
nPosL, u"UTF-16");
 }
-if ( bForceUTF16 )
-{
-OUString aNewString = aString.replaceAt( 
nPosL, nPosU-nPosL, u"UTF-16");
-pStrm.reset(new SvMemoryStream( 
const_cast(aNewString.getStr()), aNewString.getLength() * 
sizeof(sal_Unicode), StreamMode::READ));
-}
-else
-{
-pStrm.reset(new SvMemoryStream( 
const_cast(aString.getStr()), aString.getLength() * 
sizeof(sal_Unicode), StreamMode::READ));
-}
-uno::Reference xStrm2( new 
::utl::OInputStreamWrapper(*pStrm) );
+SvMemoryStream aStrm( const_cast(aString.getStr()), aString.getLength() * sizeof(sal_Unicode), 
StreamMode::READ);
+uno::Reference xStrm2( new 
::utl::OInputStreamWrapper(aStrm) );
 aClipboardMedium.setStreamToLoadFrom(xStrm2, true 
/*bIsReadOnly*/);
 InsertFrom(aClipboardMedium);
 GetDoc()->UpdateText();

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

2022-03-11 Thread Kohei Yoshida (via logerrit)

 sc/inc/column.hxx   |5 +
 sc/source/core/data/column4.cxx |   22 +++---
 2 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit f19ae9b5e629d163314ee18d56973d0561d5fb3b
Author: Kohei Yoshida 
AuthorDate: Thu Mar 10 22:50:17 2022 -0500
Commit: Kohei Yoshida 
CommitDate: Fri Mar 11 15:01:52 2022 +0100

tdf#147744: Make sure to pass valid position hints.

When pasting a single cell to a range with filtered rows, the existing
code wasn't updating the position hint iterator after inserting cloned
formula cells via ScColumn::CloneFormulaCell().  This caused the next
call into the cell store to receive an invalid position hint.

This problem has been there all along, but apparently it did not cause
a process termination with the previous storage layout of
multi_type_vector for a reason unknown to me.

Change-Id: Ie1a4b99c7077536499c6373ccb7022961e9d93e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131331
Tested-by: Jenkins
Tested-by: Xisco Fauli 
Reviewed-by: Kohei Yoshida 

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index b6fde6801a2f..689f0c0ccbd0 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -408,6 +408,11 @@ public:
 bool HasFormulaCell() const;
 bool HasFormulaCell( SCROW nRow1, SCROW nRow2 ) const;
 
+void CloneFormulaCell(
+sc::ColumnBlockPosition& rBlockPos,
+const ScFormulaCell& rSrc, const sc::CellTextAttr& rAttr,
+const std::vector& rRanges );
+
 void CloneFormulaCell(
 const ScFormulaCell& rSrc, const sc::CellTextAttr& rAttr,
 const std::vector& rRanges );
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 6e93ce9b8df8..3a7145608de8 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -312,7 +312,7 @@ void ScColumn::CopyOneCellFromClip( 
sc::CopyFromClipContext& rCxt, SCROW nRow1,
 std::vector aRanges;
 aRanges.reserve(1);
 aRanges.emplace_back(nRow1, nRow2);
-CloneFormulaCell(*rSrcCell.mpFormula, rSrcAttr, aRanges);
+CloneFormulaCell(*pBlockPos, *rSrcCell.mpFormula, rSrcAttr, 
aRanges);
 }
 break;
 default:
@@ -571,12 +571,10 @@ void ScColumn::DeleteRanges( const 
std::vector& rRanges, InsertDele
 }
 
 void ScColumn::CloneFormulaCell(
+sc::ColumnBlockPosition& rBlockPos,
 const ScFormulaCell& rSrc, const sc::CellTextAttr& rAttr,
 const std::vector& rRanges )
 {
-sc::CellStoreType::iterator itPos = maCells.begin();
-sc::CellTextAttrStoreType::iterator itAttrPos = maCellTextAttrs.begin();
-
 SCCOL nMatrixCols = 0;
 SCROW nMatrixRows = 0;
 ScMatrixMode nMatrixFlag = rSrc.GetMatrixFlag();
@@ -629,10 +627,10 @@ void ScColumn::CloneFormulaCell(
 }
 }
 
-itPos = maCells.set(itPos, nRow1, aFormulas.begin(), aFormulas.end());
+rBlockPos.miCellPos = maCells.set(rBlockPos.miCellPos, nRow1, 
aFormulas.begin(), aFormulas.end());
 
 // Join the top and bottom of the pasted formula cells as needed.
-sc::CellStoreType::position_type aPosObj = maCells.position(itPos, 
nRow1);
+sc::CellStoreType::position_type aPosObj = 
maCells.position(rBlockPos.miCellPos, nRow1);
 
 assert(aPosObj.first->type == sc::element_type_formula);
 ScFormulaCell* pCell = sc::formula_block::at(*aPosObj.first->data, 
aPosObj.second);
@@ -644,12 +642,22 @@ void ScColumn::CloneFormulaCell(
 JoinNewFormulaCell(aPosObj, *pCell);
 
 std::vector aTextAttrs(nLen, rAttr);
-itAttrPos = maCellTextAttrs.set(itAttrPos, nRow1, aTextAttrs.begin(), 
aTextAttrs.end());
+rBlockPos.miCellTextAttrPos = maCellTextAttrs.set(
+rBlockPos.miCellTextAttrPos, nRow1, aTextAttrs.begin(), 
aTextAttrs.end());
 }
 
 CellStorageModified();
 }
 
+void ScColumn::CloneFormulaCell(
+const ScFormulaCell& rSrc, const sc::CellTextAttr& rAttr,
+const std::vector& rRanges )
+{
+sc::ColumnBlockPosition aBlockPos;
+InitBlockPosition(aBlockPos);
+CloneFormulaCell(aBlockPos, rSrc, rAttr, rRanges);
+}
+
 std::unique_ptr ScColumn::ReleaseNote( SCROW nRow )
 {
 if (!GetDoc().ValidRow(nRow))

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

2022-03-11 Thread Caolán McNamara (via logerrit)

 sw/qa/core/data/html/pass/ofz43310-1.html |binary
 sw/source/filter/html/htmlsect.cxx|   16 +---
 sw/source/filter/html/htmltab.cxx |   19 ---
 sw/source/filter/html/swhtml.hxx  |2 --
 4 files changed, 9 insertions(+), 28 deletions(-)

New commits:
commit 2c13433ed38e08be60824f21a73ba29f78b9520f
Author: Caolán McNamara 
AuthorDate: Thu Mar 10 21:04:28 2022 +
Commit: Caolán McNamara 
CommitDate: Fri Mar 11 14:15:38 2022 +0100

ofz#43310 don't try and delete prior header/footer contents

If a duplicate appears, just hide the prior ones.

FWIW our own html export only exports a single header/footer as far as I
can see.

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

diff --git a/sw/qa/core/data/html/pass/ofz43310-1.html 
b/sw/qa/core/data/html/pass/ofz43310-1.html
new file mode 100644
index ..e84d1cccf5d7
Binary files /dev/null and b/sw/qa/core/data/html/pass/ofz43310-1.html differ
diff --git a/sw/source/filter/html/htmlsect.cxx 
b/sw/source/filter/html/htmlsect.cxx
index c684f0a9affb..d5de7077a8bf 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -194,7 +194,11 @@ void SwHTMLParser::NewDivision( HtmlTokenId nToken )
 }
 else
 {
-// Create a new node at the beginning of the section
+// Our own html export only exports one "header" at most (and one 
"footer")
+
+// Create a new node at the beginning of the section if a 
duplicate arises
+// and hide the original header/footers content by putting it into 
a hidden
+// document-level section
 SwNodeIndex aSttIdx( rContentStIdx, 1 );
 pCNd = m_xDoc->GetNodes().MakeTextNode( aSttIdx,
 
m_pCSS1Parser->GetTextCollFromPool(RES_POOLCOLL_TEXT));
@@ -205,13 +209,11 @@ void SwHTMLParser::NewDivision( HtmlTokenId nToken )
 
 const SwStartNode *pStNd =
 static_cast( &rContentStIdx.GetNode() );
-aDelPam.GetPoint()->nNode = pStNd->EndOfSectionIndex() - 1;
+aDelPam.GetPoint()->nNode = pStNd->EndOfSectionIndex();
 
-if (!PendingTableInPaM(aDelPam))
-{
-m_xDoc->getIDocumentContentOperations().DeleteRange(aDelPam);
-m_xDoc->getIDocumentContentOperations().DelFullPara(aDelPam);
-}
+SwSectionData aSection(SectionType::Content, 
m_xDoc->GetUniqueSectionName());
+if (SwSection* pOldContent = m_xDoc->InsertSwSection(aDelPam, 
aSection, nullptr, nullptr, false))
+pOldContent->SetHidden(true);
 
 // update page style
 for( size_t i=0; i < m_xDoc->GetPageDescCnt(); i++ )
diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index dad2219b01f1..d5cde194f99b 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -5248,23 +5248,4 @@ std::shared_ptr 
SwHTMLParser::BuildTable(SvxAdjust eParentAdjust,
 return xRetTable;
 }
 
-bool SwHTMLParser::PendingTableInPaM(SwPaM& rPam) const
-{
-bool bRet = false;
-for (const auto& a : m_aTables)
-{
-const SwTable *pTable = a->GetSwTable();
-if (!pTable)
-continue;
-const SwTableNode* pTableNode = pTable->GetTableNode();
-if (!pTableNode)
-continue;
-SwNodeIndex aTableNodeIndex(*pTableNode);
-bRet = (aTableNodeIndex >= rPam.Start()->nNode && aTableNodeIndex <= 
rPam.End()->nNode);
-if (bRet)
-break;
-}
-return bRet;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index a0b714307974..346e612eb19c 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -874,8 +874,6 @@ private:
 bool HasCurrentParaFlys( bool bNoSurroundOnly = false,
  bool bSurroundOnly = false ) const;
 
-bool PendingTableInPaM(SwPaM& rPam) const;
-
 class TableDepthGuard
 {
 private:

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

2022-03-11 Thread Xisco Fauli (via logerrit)

 sc/qa/uitest/calc_tests/mergedRowsColumns.py |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit 13acb2c06d9db2f8d79e4cbdc5b76b38a45b5933
Author: Xisco Fauli 
AuthorDate: Fri Mar 11 12:42:48 2022 +0100
Commit: Xisco Fauli 
CommitDate: Fri Mar 11 14:06:56 2022 +0100

tdf#63766: remove incorrect UItest

the issue is still reproducible in master, thus this test
makes no sense

Change-Id: I101230ef13fd6408bab28e8fb7df6efe4ea3f9fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131371
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests/mergedRowsColumns.py 
b/sc/qa/uitest/calc_tests/mergedRowsColumns.py
index 386aa1ca8eb0..8399d8b76777 100644
--- a/sc/qa/uitest/calc_tests/mergedRowsColumns.py
+++ b/sc/qa/uitest/calc_tests/mergedRowsColumns.py
@@ -151,16 +151,6 @@ class mergedRowsColumns(UITestCase):
 self.assertEqual(get_cell_by_position(calc_doc, 0, 9, 
21).getString(), "2")
 self.assertEqual(get_cell_by_position(calc_doc, 0, 11, 
21).getString(), "2")
 
-def test_merge_merged_cells_tdf63766(self):
-with self.ui_test.load_file(get_url_for_data_file("tdf105412.ods")) as 
calc_doc:
-xTopWindow = self.xUITest.getTopFocusWindow()
-gridwin = xTopWindow.getChild("grid_window")
-
-gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": 
"C19:F22"}))
-self.xUITest.executeCommand(".uno:ToggleMergeCells")
-self.assertEqual(get_cell_by_position(calc_doc, 0, 2, 
18).getString(), "L6")
-self.xUITest.executeCommand(".uno:Undo")
-
 def test_move_merged_cells(self):
 with self.ui_test.create_doc_in_start_center("calc"):
 xTopWindow = self.xUITest.getTopFocusWindow()

[Libreoffice-commits] core.git: include/xmloff schema/libreoffice xmloff/qa xmloff/source

2022-03-11 Thread Miklos Vajna (via logerrit)

 include/xmloff/txtparae.hxx |2 
 include/xmloff/xmltoken.hxx |1 
 schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng |   17 +
 xmloff/qa/unit/text.cxx |   35 ++
 xmloff/source/core/xmltoken.cxx |1 
 xmloff/source/text/txtparae.cxx |   39 
 xmloff/source/token/tokens.txt  |1 
 7 files changed, 96 insertions(+)

New commits:
commit 07c2b73d16425fb6d3ea8ab9ec15c87e9548acda
Author: Miklos Vajna 
AuthorDate: Fri Mar 11 12:29:30 2022 +0100
Commit: Miklos Vajna 
CommitDate: Fri Mar 11 14:04:50 2022 +0100

sw clearing breaks: add ODF export

Write the clearing break as:



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

diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index eaf23409bd7a..70716c1f77a2 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -321,6 +321,8 @@ protected:
 
 void exportSoftPageBreak();
 
+void exportTextLineBreak(const 
css::uno::Reference& xPropSet);
+
 void exportTextRange(
 const css::uno::Reference< css::text::XTextRange > & rTextRange,
 bool bAutoStyles,
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 4f7cd7e148a4..26b46bf890d6 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1173,6 +1173,7 @@ namespace xmloff::token {
 XML_LIMIT,
 XML_LINE,
 XML_LINE_BREAK,
+XML_CLEAR,
 XML_LINE_DISTANCE,
 XML_LINE_HEIGHT,
 XML_LINE_HEIGHT_AT_LEAST,
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng 
b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index 9698c0448bdf..7b3eff94de1c 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -2634,6 +2634,23 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
+  
+  
+
+  
+
+
+  
+none
+left
+right
+all
+  
+
+  
+
+  
+
   
   
 
diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx
index 71772edb3585..e0289183d2c4 100644
--- a/xmloff/qa/unit/text.cxx
+++ b/xmloff/qa/unit/text.cxx
@@ -269,6 +269,41 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testListId)
 assertXPathNoAttribute(pXmlDoc, "//text:list", "id");
 }
 
+CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testClearingBreakExport)
+{
+// Given a document with a clearing break:
+getComponent() = loadFromDesktop("private:factory/swriter");
+uno::Reference xMSF(getComponent(), 
uno::UNO_QUERY);
+uno::Reference xTextDocument(getComponent(), 
uno::UNO_QUERY);
+uno::Reference xLineBreak(
+xMSF->createInstance("com.sun.star.text.LineBreak"), uno::UNO_QUERY);
+uno::Reference xLineBreakProps(xLineBreak, 
uno::UNO_QUERY);
+// SwLineBreakClear::ALL;
+sal_Int16 eClear = 3;
+xLineBreakProps->setPropertyValue("Clear", uno::makeAny(eClear));
+uno::Reference xText = xTextDocument->getText();
+uno::Reference xCursor = xText->createTextCursor();
+xText->insertTextContent(xCursor, xLineBreak, /*bAbsorb=*/false);
+
+// When exporting to ODT:
+uno::Reference xStorable(getComponent(), uno::UNO_QUERY);
+uno::Sequence aStoreProps = 
comphelper::InitPropertySequence({
+{ "FilterName", uno::makeAny(OUString("writer8")) },
+});
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+xStorable->storeToURL(aTempFile.GetURL(), aStoreProps);
+validate(aTempFile.GetFileName(), test::ODF);
+
+// Then make sure the expected markup is used:
+std::unique_ptr pStream = parseExportStream(aTempFile, 
"content.xml");
+xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get());
+// Without the accompanying fix in place, this failed with:
+// - XPath '//text:line-break' number of nodes is incorrect
+// i.e. the clearing break was lost on export.
+assertXPath(pXmlDoc, "//text:line-break", "clear", "all");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index c7db64b00174..d1827fcd2915 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -1186,6 +1186,7 @@ namespace xmloff::token {
 TOKEN( "limit",   XML_LIMIT ),
 TOKEN( "line",XML_LINE ),
 TOKEN( "line-break",  XML_LINE_BREAK ),
+TOKEN( "clear",

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

2022-03-11 Thread Xisco Fauli (via logerrit)

 sc/qa/uitest/calc_tests4/tdf94208.py |   47 ---
 sc/qa/unit/uicalc/uicalc.cxx |   46 ++
 2 files changed, 46 insertions(+), 47 deletions(-)

New commits:
commit 1f5f94d153fbade9cd96f841f1084fe16815f4f3
Author: Xisco Fauli 
AuthorDate: Fri Mar 11 12:31:03 2022 +0100
Commit: Xisco Fauli 
CommitDate: Fri Mar 11 13:46:07 2022 +0100

tdf#94208: sc: move UItest to CppUnittest

The original test was incomplete and didn't fail without
the fix in place

Change-Id: I0ddec239b9cb06d90aed21be8b916f39d51a3a38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131367
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests4/tdf94208.py 
b/sc/qa/uitest/calc_tests4/tdf94208.py
deleted file mode 100644
index 7301f4664a76..
--- a/sc/qa/uitest/calc_tests4/tdf94208.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-from uitest.framework import UITestCase
-from uitest.uihelper.calc import enter_text_to_cell
-from libreoffice.calc.document import get_cell_by_position
-from libreoffice.uno.propertyvalue import mkPropertyValues
-#Bug 94208 - Undo after Control-D Fill doesn't broadcast deleted 
(undo-inserted) cells for calculation
-
-class tdf94208(UITestCase):
-
-def test_tdf94208_Undo_fill_down_rows_selected(self):
-with self.ui_test.create_doc_in_start_center("calc") as document:
-xCalcDoc = self.xUITest.getTopFocusWindow()
-gridwin = xCalcDoc.getChild("grid_window")
-
-#1 - Fill data
-enter_text_to_cell(gridwin, "A3", "Range")
-enter_text_to_cell(gridwin, "A4", "Range")
-enter_text_to_cell(gridwin, "A5", "Range")
-enter_text_to_cell(gridwin, "A6", "Range")
-enter_text_to_cell(gridwin, "A7", "Range")
-enter_text_to_cell(gridwin, "A8", "Range")
-enter_text_to_cell(gridwin, "B6", "test")
-#2 - Select rows three though eight.
-gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": 
"A3:A8"}))
-self.xUITest.executeCommand(".uno:SelectRow")
-#3 - type Control-D/Fill Down
-self.xUITest.executeCommand(".uno:FillDown")
-#4 - undo.
-self.xUITest.executeCommand(".uno:Undo")
-#5 -  Ouch! The data isn't right.
-self.assertEqual(get_cell_by_position(document, 0, 0, 
2).getString(), "Range")
-self.assertEqual(get_cell_by_position(document, 0, 0, 
3).getString(), "Range")
-self.assertEqual(get_cell_by_position(document, 0, 0, 
4).getString(), "Range")
-self.assertEqual(get_cell_by_position(document, 0, 0, 
5).getString(), "Range")
-self.assertEqual(get_cell_by_position(document, 0, 0, 
6).getString(), "Range")
-self.assertEqual(get_cell_by_position(document, 0, 0, 
6).getString(), "Range")
-self.assertEqual(get_cell_by_position(document, 0, 1, 
5).getString(), "test")
-
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index 40c469134930..56f70c19bc48 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -349,6 +349,52 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf63805)
 CPPUNIT_ASSERT_EQUAL(OUString(""), pDoc->GetString(ScAddress(0, 1, 0)));
 }
 
+CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf94208)
+{
+mxComponent = loadFromDesktop("private:factory/scalc");
+ScModelObj* pModelObj = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pModelObj);
+ScDocument* pDoc = pModelObj->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+insertStringToCell(*pModelObj, "A1", "=COUNTA(B:B)");
+insertStringToCell(*pModelObj, "A3", "Range");
+insertStringToCell(*pModelObj, "A4", "Range");
+insertStringToCell(*pModelObj, "A5", "Range");
+insertStringToCell(*pModelObj, "A6", "Range");
+insertStringToCell(*pModelObj, "A7", "Range");
+insertStringToCell(*pModelObj, "A8", "Range");
+insertStringToCell(*pModelObj, "B6", "Test");
+
+CPPUNIT_ASSERT_EQUAL(1.0, pDoc->GetValue(ScAddress(0, 0, 0)));
+
+goToCell("A3:A8");
+
+dispatchCommand(mxComponent, ".uno:SelectRow", {});
+Scheduler::ProcessEventsToIdle();
+
+//type Control-D/Fill Down
+dispatchCommand(mxComponent, ".uno:FillDown", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(0.0, pDoc->GetValue(ScAddress(0, 0, 0)));
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+// Without the fix in place, this test woul

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - xmlsecurity/source

2022-03-11 Thread Caolán McNamara (via logerrit)

 xmlsecurity/source/component/documentdigitalsignatures.cxx |   15 ++---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 5b9965f03e2b2016d0c1b444e9c839aa9c9a5851
Author: Caolán McNamara 
AuthorDate: Thu Mar 3 14:22:37 2022 +
Commit: Michael Stahl 
CommitDate: Fri Mar 11 13:42:28 2022 +0100

compare authors using Thumbprint

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130929
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 65442205b5b274ad309308162f150f8d41648f72)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130866
Reviewed-by: Michael Stahl 
(cherry picked from commit a7aaa78acea4c1d51283c2fce54ff9f5339026f8)

Change-Id: I338f58eb07cbf0a3d13a7dafdaddac09252a8546
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131368
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx 
b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index ecc87ddf570a..6ef8c1d875ee 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -651,9 +651,18 @@ sal_Bool DocumentDigitalSignatures::isAuthorTrusted(
 Sequence< SvtSecurityOptions::Certificate > aTrustedAuthors = 
SvtSecurityOptions().GetTrustedAuthors();
 
 return std::any_of(aTrustedAuthors.begin(), aTrustedAuthors.end(),
-[&xAuthor, &sSerialNum](const SvtSecurityOptions::Certificate& 
rAuthor) {
-return xmlsecurity::EqualDistinguishedNames(rAuthor[0], 
xAuthor->getIssuerName(), xmlsecurity::NOCOMPAT)
-&& ( rAuthor[1] == sSerialNum );
+[this, &xAuthor, &sSerialNum](const SvtSecurityOptions::Certificate& 
rAuthor) {
+if (!xmlsecurity::EqualDistinguishedNames(rAuthor[0], 
xAuthor->getIssuerName(), xmlsecurity::NOCOMPAT))
+return false;
+if (rAuthor[1] != sSerialNum)
+return false;
+
+DocumentSignatureManager aSignatureManager(mxCtx, {});
+if (!aSignatureManager.init())
+return false;
+uno::Reference xCert =
+
aSignatureManager.getSecurityEnvironment()->createCertificateFromAscii(rAuthor[2]);
+return xCert->getSHA1Thumbprint() == xAuthor->getSHA1Thumbprint();
 });
 }

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

2022-03-11 Thread László Németh (via logerrit)

 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |8 +
 sw/qa/extras/ooxmlexport/ooxmlexport16.cxx   |6 -
 sw/source/filter/ww8/docxattributeoutput.cxx |  147 ++-
 3 files changed, 108 insertions(+), 53 deletions(-)

New commits:
commit 554d95b2b4ece9cd570dfbad357bfedafc6a4dd1
Author: László Németh 
AuthorDate: Thu Mar 10 11:00:36 2022 +0100
Commit: László Németh 
CommitDate: Fri Mar 11 13:23:37 2022 +0100

tdf#147760 tdf#142902 DOCX export: anonymize date and moveFromRangeStart

Anonymization exported a zeroed w:date in change tracking
and commenting elements w:ins, w:del, w:moveFrom, w:moveTo,
w:cellIns, w:cellDel, w:comment, w:moveFromRangeStart and
w:moveToRangeStart instead of simply skipping it, according
to OOXML.

Also don't export w:date, if the imported DOCX was anonymized
by Word's Document Inspector, i.e. it doesn't contain w:date.

Fix also missing anonymization of author and date of
moveFromRangeStart and moveToRangeStart elements.

Follow-up to commit 2c51746997478ad5d0e7cc64aa6489769c473d43
"tdf#146171 DOCX: fix loss of change tracking, if no date",
commit 9e1e88ad5cf2dc0e9b188c60930445652a6c7519
"tdf#145720 DOCX export: fix loss of tracked moving" and
commit ded2452a52d21131347a0dc2e25c8161f20fcfad
"tdf#142902 DOCX export: remove personal info of comments and changes".

Change-Id: If79402e4723886ceab3b4b9c24e83793f87cd513
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131317
Tested-by: Jenkins
Reviewed-by: László Németh 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131343

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index d39c1fdd6bcd..d7d0784e7285 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -933,8 +933,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf145720, "tdf104797.docx")
 // mandatory authors and dates
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[1]/w:moveFrom/w:moveFromRangeStart", "author", 
u"Tekijä");
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:moveTo/w:moveToRangeStart", "author", u"Tekijä");
-assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[1]/w:moveFrom/w:moveFromRangeStart", "date", 
"1970-01-01T00:00:00Z");
-assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:moveTo/w:moveToRangeStart", "date", 
"1970-01-01T00:00:00Z");
+// no date (anonymized change)
+// This failed, date was exported as w:date="0-00-00T00:00:00Z", and 
later "1970-01-01T00:00:00Z"
+assertXPathNoAttribute(pXmlDoc, 
"/w:document/w:body/w:p[1]/w:moveFrom/w:moveFromRangeStart",
+   "date");
+assertXPathNoAttribute(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:moveTo/w:moveToRangeStart",
+   "date");
 }
 }
 
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index 78db013bc159..ae8b96c99f66 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -653,6 +653,7 @@ CPPUNIT_TEST_FIXTURE(Test, 
testTdf146171_invalid_change_date)
 // false alarm? during ODF roundtrip:
 // 'Error: "1970-01-01" does not satisfy the "dateTime" type'
 // disable and check only the conversion of the invalid (zeroed) change 
date
+// -00-00T00:00:00Z, resulting loss of change tracking during ODF 
roundtrip
 // reload("writer8", "tdf146171.odt");
 reload("Office Open XML Text", "tdf146171.docx");
 
@@ -661,8 +662,9 @@ CPPUNIT_TEST_FIXTURE(Test, 
testTdf146171_invalid_change_date)
 assertXPath(pXmlDoc, "//w:ins", 4);
 // This was 0
 assertXPath(pXmlDoc, "//w:del", 1);
-// This was -00-00T00:00:00Z, resulting loss of change tracking during 
ODF roundtrip
-assertXPath(pXmlDoc, "//w:del", "date", "1970-01-01T00:00:00Z");
+// no date (anonymized change)
+// This failed, date was exported as w:date="1970-01-01T00:00:00Z" before 
fixing tdf#147760
+assertXPathNoAttribute(pXmlDoc, "//w:del", "date");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf139580, "tdf139580.odt")
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 959e391e3e37..7bddf3121813 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1913,16 +1913,32 @@ void 
DocxAttributeOutput::DoWriteBookmarkTagEnd(sal_Int32 const nId)
 void DocxAttributeOutput::DoWriteMoveRangeTagStart(const OString & 
bookmarkName,
 bool bFrom, const SwRedlineData* pRedlineData)
 {
-const OUString &rAuthor( SW_MOD()->GetRedlineAuthor( 
pRedlineData->GetAuthor() ) );
-OString aDate( DateTimeToOString( pRedlineData->GetTimeStamp() ) );
+bool bRemovePersonalInfo = SvtSecurityOptions::IsOptionSet(
+

New Defects reported by Coverity Scan for LibreOffice

2022-03-11 Thread scan-admin

Hi,

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

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

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


** CID 1502952:(DEADCODE)
/sw/source/filter/ww8/docxattributeoutput.cxx: 8553 in 
DocxAttributeOutput::WritePostitFields()()
/sw/source/filter/ww8/docxattributeoutput.cxx: 8553 in 
DocxAttributeOutput::WritePostitFields()()



*** CID 1502952:(DEADCODE)
/sw/source/filter/ww8/docxattributeoutput.cxx: 8553 in 
DocxAttributeOutput::WritePostitFields()()
8547  ? "Author" + OUString::number( 
GetExport().GetInfoID(f->GetPar1()) )
8548  : f->GetPar1(),
8549 FSNS( XML_w, XML_initials ), bRemovePersonalInfo
8550  ? OUString::number( 
GetExport().GetInfoID(f->GetInitials()) )
8551  : f->GetInitials() );
8552 else
>>> CID 1502952:(DEADCODE)
>>> Execution cannot reach this statement: ".OUString(rtl::O...".
8553 m_pSerializer->startElementNS( XML_w, XML_comment, FSNS( 
XML_w, XML_id ), idstr,
8554 FSNS( XML_w, XML_author ), bRemovePersonalInfo
8555  ? "Author" + OUString::number( 
GetExport().GetInfoID(f->GetPar1()) )
8556  : f->GetPar1(),
8557 FSNS( XML_w, XML_date ), DateTimeToOString( aDateTime 
),
8558 FSNS( XML_w, XML_initials ), bRemovePersonalInfo
/sw/source/filter/ww8/docxattributeoutput.cxx: 8553 in 
DocxAttributeOutput::WritePostitFields()()
8547  ? "Author" + OUString::number( 
GetExport().GetInfoID(f->GetPar1()) )
8548  : f->GetPar1(),
8549 FSNS( XML_w, XML_initials ), bRemovePersonalInfo
8550  ? OUString::number( 
GetExport().GetInfoID(f->GetInitials()) )
8551  : f->GetInitials() );
8552 else
>>> CID 1502952:(DEADCODE)
>>> Execution cannot reach this statement: ".OUString(std::e...".
8553 m_pSerializer->startElementNS( XML_w, XML_comment, FSNS( 
XML_w, XML_id ), idstr,
8554 FSNS( XML_w, XML_author ), bRemovePersonalInfo
8555  ? "Author" + OUString::number( 
GetExport().GetInfoID(f->GetPar1()) )
8556  : f->GetPar1(),
8557 FSNS( XML_w, XML_date ), DateTimeToOString( aDateTime 
),
8558 FSNS( XML_w, XML_initials ), bRemovePersonalInfo

** CID 1502951:(DEADCODE)
/sw/source/filter/ww8/docxattributeoutput.cxx: 3571 in 
DocxAttributeOutput::Redline(const SwRedlineData *)()
/sw/source/filter/ww8/docxattributeoutput.cxx: 3525 in 
DocxAttributeOutput::Redline(const SwRedlineData *)()



*** CID 1502951:(DEADCODE)
/sw/source/filter/ww8/docxattributeoutput.cxx: 3571 in 
DocxAttributeOutput::Redline(const SwRedlineData *)()
3565 m_pSerializer->startElementNS( XML_w, XML_pPrChange,
3566 FSNS( XML_w, XML_id ), aId,
3567 FSNS( XML_w, XML_author ), bRemovePersonalInfo
3568 ? "Author" + OUString::number( 
GetExport().GetInfoID(rAuthor) )
3569 : rAuthor );
3570 else
>>> CID 1502951:(DEADCODE)
>>> Execution cannot reach this statement: ".OUString(std::e...".
3571 m_pSerializer->startElementNS( XML_w, XML_pPrChange,
3572 FSNS( XML_w, XML_id ), aId,
3573 FSNS( XML_w, XML_author ), bRemovePersonalInfo
3574 ? "Author" + OUString::number( 
GetExport().GetInfoID(rAuthor) )
3575 : rAuthor,
3576 FSNS( XML_w, XML_date ), DateTimeToOString( aDateTime 
) );
/sw/source/filter/ww8/docxattributeoutput.cxx: 3525 in 
DocxAttributeOutput::Redline(const SwRedlineData *)()
3519 m_pSerializer->startElementNS( XML_w, XML_rPrChange,
3520 FSNS( XML_w, XML_id ), aId,
3521 FSNS( XML_w, XML_author ), bRemovePersonalInfo
3522 ? "Author" + OUString::number( 
GetExport().GetInfoID(rAuthor) )
3523 : rAuthor );
3524 else
>>> CID 1502951:(DEADCODE)
>>> Execution cannot reach this statement: ".OUString(std::e...".
3525 m_pSerializer->startElementNS( XML_w, XML_rPrChange,
3526 FSNS( XML_w, XML_id ), aId,
3527 FSNS( XML_w, XML_author ), bRemoveP

[Libreoffice-commits] core.git: fpicker/inc fpicker/source include/fpicker vcl/inc vcl/qt5 vcl/unx

2022-03-11 Thread Julien Nabet (via logerrit)

 fpicker/source/aqua/resourceprovider.mm|2 -
 fpicker/source/office/RemoteFilesDialog.cxx|2 -
 fpicker/source/office/iodlg.cxx|2 -
 fpicker/source/win32/VistaFilePickerImpl.cxx   |2 -
 fpicker/source/win32/resourceprovider.cxx  |2 -
 include/fpicker/strings.hrc|2 +
 vcl/inc/strings.hrc|   19 -
 vcl/qt5/QtFilePicker.cxx   |   37 +--
 vcl/unx/gtk3/fpicker/resourceprovider.cxx  |   48 -
 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx |   31 +++-
 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx |4 +-
 vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx   |4 +-
 12 files changed, 69 insertions(+), 86 deletions(-)

New commits:
commit 3307afa99c28fd282094e9558795b0a20ba5c6a0
Author: Julien Nabet 
AuthorDate: Mon Mar 7 21:44:07 2022 +0100
Commit: Caolán McNamara 
CommitDate: Fri Mar 11 13:10:45 2022 +0100

tdf#114150: Remove duplication of strings found in file dialogs

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

diff --git a/fpicker/source/aqua/resourceprovider.mm 
b/fpicker/source/aqua/resourceprovider.mm
index 34b0359a231d..951833ae2714 100644
--- a/fpicker/source/aqua/resourceprovider.mm
+++ b/fpicker/source/aqua/resourceprovider.mm
@@ -29,7 +29,7 @@
 #include 
 
 #include "NSString_OOoAdditions.hxx"
-#include 
+#include 
 #include "resourceprovider.hxx"
 
 using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx 
b/fpicker/source/office/RemoteFilesDialog.cxx
index c36d55deb81b..d417488e4a55 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -12,7 +12,7 @@
 #include "fpsmartcontent.hxx"
 #include "QueryFolderName.hxx"
 #include "RemoteFilesDialog.hxx"
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index c358636ca071..72b3b7733062 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -25,7 +25,7 @@
 #include 
 #include "OfficeControlAccess.hxx"
 #include "PlacesListBox.hxx"
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/VistaFilePickerImpl.cxx
index a38e237e2511..dbd0f87983a9 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -32,7 +32,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/fpicker/source/win32/resourceprovider.cxx 
b/fpicker/source/win32/resourceprovider.cxx
index ff841b385b26..3515e9432146 100644
--- a/fpicker/source/win32/resourceprovider.cxx
+++ b/fpicker/source/win32/resourceprovider.cxx
@@ -31,7 +31,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
 using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
diff --git a/fpicker/inc/fpsofficeResMgr.hxx 
b/include/fpicker/fpsofficeResMgr.hxx
similarity index 100%
rename from fpicker/inc/fpsofficeResMgr.hxx
rename to include/fpicker/fpsofficeResMgr.hxx
diff --git a/include/fpicker/strings.hrc b/include/fpicker/strings.hrc
index 4dd7fb5fa50c..efce3a69f9da 100644
--- a/include/fpicker/strings.hrc
+++ b/include/fpicker/strings.hrc
@@ -29,6 +29,8 @@
 #define STR_SVT_FOLDERPICKER_DEFAULT_TITLE  
NC_("STR_SVT_FOLDERPICKER_DEFAULT_TITLE", "Select Path")
 #define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION
NC_("STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION", "Please select a folder.")
 #define STR_SVT_ALREADYEXISTOVERWRITE   
NC_("STR_SVT_ALREADYEXISTOVERWRITE", "A file named \"$filename$\" already 
exists.\n\nDo you want to replace it?")
+#define STR_SVT_ALREADYEXISTOVERWRITE_SECONDARY 
NC_("STR_SVT_ALREADYEXISTOVERWRITE_SECONDARY", "The file already exists in 
\"$dirname$\". Replacing it will overwrite its contents.")
+#define STR_SVT_ALLFORMATS  NC_("STR_SVT_ALLFORMATS", 
"All Formats")
 #define STR_SVT_DELETESERVICE   
NC_("STR_SVT_DELETESERVICE", "Are you sure you want to delete the 
service?\n\"$servicename$\"")
 #define STR_SVT_ROOTLABEL   NC_("STR_SVT_ROOTLABEL", 
"Root")
 #define STR_FILTERNAME_ALL  NC_("STR_FILTERNAME_ALL", 
"All files")
diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc
index 33462929e300..0439162f07c3 100644
--- a/vcl/inc/strings.hrc
+++ b/vcl/inc/strings.hrc
@@ -67,28 +67,9 @@
 #define SV_STDTEXT_PREFERENCES   
NC_("SV_STDTEXT_PREFERENCES", "Preferences...")
 #define SV_STDTEXT_ALLFILETYPES

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

2022-03-11 Thread Stephan Bergmann (via logerrit)

 extensions/source/update/check/updatecheckconfig.cxx |4 
 extensions/source/update/check/updatecheckconfig.hxx |2 --
 2 files changed, 6 deletions(-)

New commits:
commit d680b29e05dd3ac2e64e47c4e1f83a4e38b1db24
Author: Stephan Bergmann 
AuthorDate: Fri Mar 11 10:55:38 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Mar 11 13:01:31 2022 +0100

loplugin:trivialdestructor

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

diff --git a/extensions/source/update/check/updatecheckconfig.cxx 
b/extensions/source/update/check/updatecheckconfig.cxx
index 30e444051e3f..6a9236ed6987 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -75,10 +75,6 @@ const char * const aUpdateEntryProperties[] = {
 
 const sal_uInt32 nUpdateEntryProperties = 
SAL_N_ELEMENTS(aUpdateEntryProperties);
 
-NamedValueByNameAccess::~NamedValueByNameAccess()
-{
-}
-
 css::uno::Any NamedValueByNameAccess::getValue(const char * pName)
 {
 const sal_Int32 nLen = m_rValues.getLength();
diff --git a/extensions/source/update/check/updatecheckconfig.hxx 
b/extensions/source/update/check/updatecheckconfig.hxx
index 75e65e6e8be0..a9836c624822 100644
--- a/extensions/source/update/check/updatecheckconfig.hxx
+++ b/extensions/source/update/check/updatecheckconfig.hxx
@@ -40,8 +40,6 @@ public:
 const css::uno::Sequence< css::beans::NamedValue >& rValues) :
 m_rValues(rValues) {} ;
 
-~NamedValueByNameAccess();
-
 css::uno::Any getValue(const char * pName);
 };

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - emfio/inc emfio/qa emfio/source include/tools tools/inc tools/source

2022-03-11 Thread Bartosz Kosiorek (via logerrit)

 emfio/inc/mtftools.hxx|4 +
 emfio/qa/cppunit/emf/EmfImportTest.cxx|   48 ++
 emfio/qa/cppunit/emf/data/TestSetArcDirection.emf |binary
 emfio/source/reader/emfreader.cxx |   16 +--
 emfio/source/reader/mtftools.cxx  |9 
 include/tools/poly.hxx|3 -
 tools/inc/poly.h  |2 
 tools/source/generic/poly.cxx |   41 --
 8 files changed, 104 insertions(+), 19 deletions(-)

New commits:
commit 6ab0f5a11d88dc40e56eb8210ed9493973d44e27
Author: Bartosz Kosiorek 
AuthorDate: Mon Mar 7 12:26:03 2022 +0100
Commit: Xisco Fauli 
CommitDate: Fri Mar 11 12:46:14 2022 +0100

tdf#113066 tdf#142204 EMF Implement SETARCDIRECTION

Change-Id: I30206c68ecf1829ba0094e6259b8ed7dc05f2e9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131103
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek 
(cherry picked from commit 7b28920382d3820344bfc4075bac98f85e838dba)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131206
Reviewed-by: Xisco Fauli 

diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx
index 8e3ccba65b84..85523ee25cce 100644
--- a/emfio/inc/mtftools.hxx
+++ b/emfio/inc/mtftools.hxx
@@ -455,6 +455,7 @@ namespace emfio
 WinMtfClipPath  maClipPath;
 XForm   aXForm;
 
+boolbClockWiseArcDirection;
 boolbFillStyleSelected;
 };
 
@@ -566,6 +567,7 @@ namespace emfio
 ScaledFontDetectCorrectHelper maScaledFontHelper;
 
 boolmbNopMode : 1;
+boolmbClockWiseArcDirection : 1;
 boolmbFillStyleSelected : 1;
 boolmbClipNeedsUpdate : 1;
 boolmbComplexClip : 1;
@@ -619,6 +621,8 @@ namespace emfio
 
 voidSetGfxMode(sal_Int32 nGfxMode) { mnGfxMode = 
nGfxMode; };
 sal_Int32   GetGfxMode() const { return mnGfxMode; };
+voidSetArcDirection(bool bCounterClockWise);
+boolIsArcDirectionClockWise() { return 
mbClockWiseArcDirection; };
 voidSetBkMode(BkMode nMode);
 voidSetBkColor(const Color& rColor);
 voidSetTextColor(const Color& rColor);
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx 
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index c5e966e48040..799f8eef9c46 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -61,6 +61,7 @@ class Test : public test::BootstrapFixture, public 
XmlTestTools, public unotest:
 void TestChordWithModifyWorldTransform();
 void TestEllipseWithSelectClipPath();
 void TestEllipseXformIntersectClipRect();
+void TestSetArcDirection();
 void TestDrawPolyLine16WithClip();
 void TestFillRegion();
 void TestExtTextOutOpaqueAndClipTransform();
@@ -103,6 +104,7 @@ public:
 CPPUNIT_TEST(TestChordWithModifyWorldTransform);
 CPPUNIT_TEST(TestEllipseWithSelectClipPath);
 CPPUNIT_TEST(TestEllipseXformIntersectClipRect);
+CPPUNIT_TEST(TestSetArcDirection);
 CPPUNIT_TEST(TestDrawPolyLine16WithClip);
 CPPUNIT_TEST(TestFillRegion);
 CPPUNIT_TEST(TestExtTextOutOpaqueAndClipTransform);
@@ -717,6 +719,52 @@ void Test::TestEllipseXformIntersectClipRect()
 "3625,320 3625,320");
 }
 
+void Test::TestSetArcDirection()
+{
+// EMF import test with records: SETARCDIRECTION, ARC, PIE
+Primitive2DSequence aSequence = 
parseEmf(u"/emfio/qa/cppunit/emf/data/TestSetArcDirection.emf");
+CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
+drawinglayer::Primitive2dXmlDump dumper;
+xmlDocUniquePtr pDocument
+= 
dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence));
+CPPUNIT_ASSERT(pDocument);
+
+assertXPath(pDocument, aXPathPrefix + "polypolygoncolor", "color", 
"#ff");
+assertXPath(
+pDocument, aXPathPrefix + "polypolygoncolor/polypolygon", "path",
+"m1640 1570-1000-950 50-50 50-50 50-50 50-40 60-40 50-40 60-30 60-40 
60-20 60-30 70-20 "
+"60-20 70-10 60-20h70l70-10h60 70l70 10 60 10 70 10 70 20 60 20 60 20 
70 30 60 30 60 30 50 "
+"40 60 40 50 40 50 40 50 50 50 50 50 50 40 60 40 60 40 60 30 60 30 60 
30 60 20 70 30 70 10 "
+"60 20 70 10 70 10 70 10 70v80 70l-10 70v70l-10 70-20 70-20 70z");
+assertXPath(pDocument, aXPathPrefix + "polygonhairline", 2);
+assertXPath(pDocument, aXPathPrefix + "polygonhairline[1]", "color", 
"#00");
+assertXPath(pDocument, aXPathPrefix + "polygonhairline[2]", "color", 
"#00");
+assertXPathContent(
+pDocument, aXPathPrefix + "polygonhairline[1]/polygon",
+"1070,1570 1110,1560 1160,1540 1200,1530 1250,1520 1300,1510 1350,1510 
1400,1500 1440,1500 "

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - solenv/gdb

2022-03-11 Thread Stephan Bergmann (via logerrit)

 solenv/gdb/boost/util/printing.py   |2 +-
 solenv/gdb/libreoffice/util/printing.py |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a667c95403fc2aad2900928d7842fe1b7b069c85
Author: Stephan Bergmann 
AuthorDate: Thu Sep 24 09:53:24 2020 +0200
Commit: Michael Stahl 
CommitDate: Fri Mar 11 12:35:01 2022 +0100

Fix Python deprecation warnings

I noticed these "DeprecationWarning: Using or importing the ABCs from
'collections' instead of from 'collections.abc' is deprecated since Python 
3.3,
and in 3.9 it will stop working" now when running tests with
CPPUNITTRACE='gdb --args' on Fedora 32.

Change-Id: If263dacb9df5c1fffd2be2418e13e69b96070c77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103294
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 4a899a5f8a72ea29a6919316afe3627de9f33e95)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131344
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/solenv/gdb/boost/util/printing.py 
b/solenv/gdb/boost/util/printing.py
index 1d5d0bac9fc6..4088f3a3fa3b 100644
--- a/solenv/gdb/boost/util/printing.py
+++ b/solenv/gdb/boost/util/printing.py
@@ -19,7 +19,7 @@
 # along with this program.  If not, see .
 
 
-from collections import Mapping
+from collections.abc import Mapping
 import gdb
 import re
 import six
diff --git a/solenv/gdb/libreoffice/util/printing.py 
b/solenv/gdb/libreoffice/util/printing.py
index 9cbae3080a64..7ce29899355a 100644
--- a/solenv/gdb/libreoffice/util/printing.py
+++ b/solenv/gdb/libreoffice/util/printing.py
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from collections import Mapping
+from collections.abc import Mapping
 import gdb
 import re
 import six

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

2022-03-11 Thread Noel Grandin (via logerrit)

 sw/source/ui/chrdlg/chardlg.cxx |   22 +-
 sw/source/ui/chrdlg/numpara.cxx |   14 +++---
 sw/source/ui/config/optcomp.cxx |5 --
 sw/source/ui/config/optload.cxx |   24 +--
 sw/source/ui/config/optpage.cxx |   87 +++-
 sw/source/ui/dbui/dbinsdlg.cxx  |5 --
 6 files changed, 67 insertions(+), 90 deletions(-)

New commits:
commit a188ffa01616673c011c7bc1a392a6f6fa81f93b
Author: Noel Grandin 
AuthorDate: Wed Mar 9 08:59:09 2022 +0200
Commit: Noel Grandin 
CommitDate: Fri Mar 11 11:40:31 2022 +0100

use SfxItemSet::GetItemIfSet in sw/.../ui

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

diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index d4d748fc4dab..b7564dc414a9 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -154,13 +154,15 @@ SwCharURLPage::SwCharURLPage(weld::Container* pPage, 
weld::DialogController* pCo
 m_xVisitedLB->set_size_request(nMaxWidth , -1);
 m_xNotVisitedLB->set_size_request(nMaxWidth , -1);
 
-const SfxPoolItem* pItem;
-SfxObjectShell* pShell;
-if(SfxItemState::SET == rCoreSet.GetItemState(SID_HTML_MODE, false, 
&pItem) ||
-( nullptr != ( pShell = SfxObjectShell::Current()) &&
-nullptr != (pItem = pShell->GetItem(SID_HTML_MODE
+const SfxUInt16Item* pItem = rCoreSet.GetItemIfSet(SID_HTML_MODE, false);
+if (!pItem)
 {
-sal_uInt16 nHtmlMode = static_cast(pItem)->GetValue();
+if (SfxObjectShell* pShell = SfxObjectShell::Current())
+pItem = pShell->GetItem(SID_HTML_MODE);
+}
+if (pItem)
+{
+sal_uInt16 nHtmlMode = pItem->GetValue();
 if (HTMLMODE_ON & nHtmlMode)
 m_xCharStyleContainer->hide();
 }
@@ -194,10 +196,8 @@ SwCharURLPage::~SwCharURLPage()
 
 void SwCharURLPage::Reset(const SfxItemSet* rSet)
 {
-const SfxPoolItem* pItem;
-if (SfxItemState::SET == rSet->GetItemState(RES_TXTATR_INETFMT, false, 
&pItem))
+if (const SwFormatINetFormat* pINetFormat = 
rSet->GetItemIfSet(RES_TXTATR_INETFMT, false))
 {
-const SwFormatINetFormat* pINetFormat = static_cast( pItem);
 m_xURLED->set_text(INetURLObject::decode(pINetFormat->GetValue(),
 INetURLObject::DecodeMechanism::Unambiguous));
 m_xURLED->save_value();
@@ -229,9 +229,9 @@ void SwCharURLPage::Reset(const SfxItemSet* rSet)
 if( pINetFormat->GetMacroTable() )
 m_oINetMacroTable = *pINetFormat->GetMacroTable();
 }
-if (SfxItemState::SET == rSet->GetItemState(FN_PARAM_SELECTION, false, 
&pItem))
+if (const SfxStringItem* pItem = rSet->GetItemIfSet(FN_PARAM_SELECTION, 
false))
 {
-m_xTextED->set_text(static_cast(pItem)->GetValue());
+m_xTextED->set_text(pItem->GetValue());
 m_xTextFT->set_sensitive(false);
 m_xTextED->set_sensitive(false);
 }
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 064439a1be15..f67627b2dad0 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -61,13 +61,15 @@ 
SwParagraphNumTabPage::SwParagraphNumTabPage(weld::Container* pPage, weld::Dialo
 m_xRestartParaCountCB->set_state(TRISTATE_FALSE);
 m_xEditNumStyleBtn->set_sensitive(false);
 
-const SfxPoolItem* pItem;
-SfxObjectShell* pObjSh;
-if(SfxItemState::SET == rAttr.GetItemState(SID_HTML_MODE, false, &pItem) ||
-( nullptr != ( pObjSh = SfxObjectShell::Current()) &&
-  nullptr != (pItem = pObjSh->GetItem(SID_HTML_MODE
+const SfxUInt16Item* pItem = rAttr.GetItemIfSet(SID_HTML_MODE, false);
+if (!pItem)
 {
-const sal_uInt16 nHtmlMode = static_cast(pItem)->GetValue();
+if (SfxObjectShell* pObjSh = SfxObjectShell::Current())
+pItem = pObjSh->GetItem(SID_HTML_MODE);
+}
+if(pItem)
+{
+const sal_uInt16 nHtmlMode = pItem->GetValue();
 
 if (HTMLMODE_ON & nHtmlMode)
 m_xCountParaFram->hide();
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 071b2fa1c76c..848d424b6db0 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -187,10 +187,9 @@ void SwCompatibilityOptPage::InitControls( const 
SfxItemSet& rSet )
 {
 // init objectshell and detect document name
 OUString sDocTitle;
-const SfxPoolItem* pItem = nullptr;
 SfxObjectShell* pObjShell = nullptr;
-if ( SfxItemState::SET == rSet.GetItemState( FN_PARAM_WRTSHELL, false, 
&pItem ) )
-m_pWrtShell = static_cast(static_cast(pItem)->GetValue());
+if ( const SwPtrItem* pItem = rSet.GetItemIfSet( FN_PARAM_WRTSHELL, false 
) )
+m_pWrtShell = static_cast(pItem->GetValue());
 if ( m_pWrtShell )
 {
 pObjShell = m_pWr

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-7.0-10.0' - include/unotest sw/inc sw/source unotest/Library_unotest.mk unotest/source xmloff/CppunitTest_xmloff_text.mk xmloff/qa xmloff/s

2022-03-11 Thread Miklos Vajna (via logerrit)

 include/unotest/macros_test.hxx   |9 ++
 sw/inc/numrule.hxx|3 ++
 sw/source/core/doc/number.cxx |   23 +
 sw/source/core/unocore/unoparagraph.cxx   |   16 
 unotest/Library_unotest.mk|1 
 unotest/source/cpp/macros_test.cxx|   17 +
 xmloff/CppunitTest_xmloff_text.mk |2 +
 xmloff/qa/unit/data/list-id.fodt  |   23 +
 xmloff/qa/unit/text.cxx   |   39 +-
 xmloff/source/text/XMLTextNumRuleInfo.cxx |9 ++
 xmloff/source/text/XMLTextNumRuleInfo.hxx |4 +++
 xmloff/source/text/txtparae.cxx   |4 +--
 12 files changed, 147 insertions(+), 3 deletions(-)

New commits:
commit 5dbdd9624f6988380638d47b0b416833e38bf890
Author: Miklos Vajna 
AuthorDate: Thu Mar 10 16:29:48 2022 +0100
Commit: Miklos Vajna 
CommitDate: Fri Mar 11 11:03:54 2022 +0100

ODT export: omit unreferenced 

This attribute is needed when a numbering is built using multiple,
independent  elements. In that case the markup to connect
these are either:



...



In case there is no other list in-between, or:



...



In case there are other lists in-between.

This means that at least in case all the text nodes of the numbering are
after each other, then the random value in xml:id="..." is never
referenced, so it can be omitted.

This helps deterministic ODF output when the input is HTML, where there
are never text:continue-list="..." attributes that would refer to these
xml:id="..." attributes.

(cherry picked from commit 8f48f91009caa86d896f247059874242ed18bf39)

Conflicts:
xmloff/source/text/XMLTextNumRuleInfo.cxx

Change-Id: Ice69422a12d4229879f89f3a4a24ed926c6d43af

diff --git a/include/unotest/macros_test.hxx b/include/unotest/macros_test.hxx
index c60ea1fe97ce..7c0c5cbf6cae 100644
--- a/include/unotest/macros_test.hxx
+++ b/include/unotest/macros_test.hxx
@@ -26,6 +26,11 @@ struct TestMacroInfo
 };
 
 class BasicDLL;
+class SvStream;
+namespace utl
+{
+class TempFile;
+}
 
 namespace unotest {
 
@@ -43,6 +48,10 @@ public:
 const OUString& rCommand,
 const css::uno::Sequence& 
rPropertyValues);
 
+/// Opens rStreamName from rTempFile, assuming it's a ZIP storage.
+static std::unique_ptr parseExportStream(const utl::TempFile& 
rTempFile,
+   const OUString& 
rStreamName);
+
 protected:
 css::uno::Reference< css::frame::XDesktop2> mxDesktop;
 
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 6152e6bee99f..b0bf138afb33 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -270,6 +270,9 @@ public:
 void dumpAsXml(xmlTextWriterPtr w) const;
 void GetGrabBagItem(css::uno::Any& rVal) const;
 void SetGrabBagItem(const css::uno::Any& rVal);
+
+/// Is it possible that this numbering has multiple lists?
+bool HasContinueList() const;
 };
 
 /// namespace for static functions and methods for numbering and bullets
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 1de08ae9f761..b812897a9ae1 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1099,6 +1099,29 @@ void SwNumRule::SetGrabBagItem(const uno::Any& rVal)
 mpGrabBagItem->PutValue(rVal, 0);
 }
 
+bool SwNumRule::HasContinueList() const
+{
+// In case all text nodes are after each other, then we won't have a later 
list that wants to
+// continue us.
+sal_uLong nIndex(0);
+for (size_t i = 0; i < maTextNodeList.size(); ++i)
+{
+SwTextNode* pNode = maTextNodeList[i];
+if (i > 0)
+{
+if (pNode->GetIndex() != nIndex + 1)
+{
+// May have a continue list.
+return true;
+}
+}
+nIndex = pNode->GetIndex();
+}
+
+// Definitely won't have a continue list.
+return false;
+}
+
 namespace numfunc
 {
 namespace {
diff --git a/sw/source/core/unocore/unoparagraph.cxx 
b/sw/source/core/unocore/unoparagraph.cxx
index 3fef41218cad..45fbd9c31e41 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -930,6 +930,22 @@ static beans::PropertyState 
lcl_SwXParagraph_getPropertyState(
 bDone = true;
 break;
 }
+case FN_UNO_LIST_ID:
+{
+if (*ppSet)
+{
+if ((*ppSet)->GetItemState(RES_PARATR_LIST_ID, false) == 
SfxItemState::SET)
+{
+SwNumRule* pNumRule = rTextNode.GetNumRule();
+if (!pNumRule || pNumRule->HasContinueList())
+{
+

[Libreoffice-commits] core.git: Changes to 'distro/mimo/mimo-7-1'

2022-03-11 Thread Michael Stahl (via logerrit)

New branch 'distro/mimo/mimo-7-1' available with the following commits:

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7-1-branch-point'

2022-03-11 Thread Michael Stahl (via logerrit)

Tag 'mimo-7-1-branch-point' created by Andras Timar 
 at 2022-03-11 10:13 +

mimo-7-1-branch-point

Changes since co-2021-branch-point-425:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-2' - configure.ac

2022-03-11 Thread Andras Timar (via logerrit)

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

New commits:
commit e1c0d46bba342854e437956495d34a55e7855440
Author: Andras Timar 
AuthorDate: Fri Mar 11 11:11:21 2022 +0100
Commit: Andras Timar 
CommitDate: Fri Mar 11 11:11:21 2022 +0100

Bump version to 7.2.7.0.M0

diff --git a/configure.ac b/configure.ac
index 7d9603a47783..6b2246b4ccde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.2.7.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.2.7.0.M0],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Changes to 'distro/mimo/mimo-7-2'

2022-03-11 Thread Attila Bakos (NISZ) (via logerrit)

New branch 'distro/mimo/mimo-7-2' available with the following commits:

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7-2-branch-point'

2022-03-11 Thread Attila Bakos (NISZ) (via logerrit)

Tag 'mimo-7-2-branch-point' created by Andras Timar 
 at 2022-03-11 09:55 +

mimo-7-2-branch-point

Changes since libreoffice-7-2-branch-point-1013:
---
 0 files changed
---

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

2022-03-11 Thread Mike Kaganski (via logerrit)

 sc/source/core/inc/interpre.hxx  |   13 ---
 sc/source/core/tool/interpr1.cxx |   46 ++-
 2 files changed, 13 insertions(+), 46 deletions(-)

New commits:
commit 459ee2660cba282ae988da43fdd3147a2ebce58b
Author: Mike Kaganski 
AuthorDate: Fri Mar 11 08:46:08 2022 +0300
Commit: Mike Kaganski 
CommitDate: Fri Mar 11 10:54:59 2022 +0100

Simplify MayBeRegExp/MayBeWildcard

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

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 5d06319b2538..47763ed8fea4 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -150,21 +150,10 @@ public:
 
 static void GlobalExit();   // called by ScGlobal::Clear()
 
-/// Could string be a regular expression?
-/// if regularExpressions are disabled the function returns false 
regardless
-/// of the string content.
-static bool MayBeRegExp( const OUString& rStr );
-
-/** Could string be a wildcard (*,?,~) expression?
-If wildcards are disabled the function returns false regardless of the
-string content.
- */
-static bool MayBeWildcard( const OUString& rStr );
-
 /** Detect if string should be used as regular expression or wildcard
 expression or literal string.
  */
-static utl::SearchParam::SearchType DetectSearchType( const OUString& 
rStr, const ScDocument& rDoc );
+static utl::SearchParam::SearchType DetectSearchType(std::u16string_view 
rStr, const ScDocument& rDoc );
 
 /// Fail safe division, returning a FormulaError::DivisionByZero coded 
into a double
 /// if denominator is 0.0
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index d79962324754..f85c2190150d 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -9910,52 +9910,30 @@ void ScInterpreter::ScErrorType_ODF()
 PushNA();
 }
 
-bool ScInterpreter::MayBeRegExp( const OUString& rStr )
+static bool MayBeRegExp( std::u16string_view rStr )
 {
-if ( rStr.isEmpty() || (rStr.getLength() == 1 && !rStr.startsWith(".")) )
+if ( rStr.empty() || (rStr.size() == 1 && rStr[0] != '.') )
 return false;   // single meta characters can not be a regexp
 // First two characters are wildcard '?' and '*' characters.
-static const sal_Unicode cre[] = { 
'?','*','+','.','[',']','^','$','\\','<','>','(',')','|', 0 };
-const sal_Unicode* p1 = rStr.getStr();
-sal_Unicode c1;
-while ( ( c1 = *p1++ ) != 0 )
-{
-const sal_Unicode* p2 = cre;
-while ( *p2 )
-{
-if ( c1 == *p2++ )
-return true;
-}
-}
-return false;
+std::u16string_view cre(u"?*+.[]^$\\<>()|");
+return rStr.find_first_of(cre) != std::u16string_view::npos;
 }
 
-bool ScInterpreter::MayBeWildcard( const OUString& rStr )
+static bool MayBeWildcard( std::u16string_view rStr )
 {
 // Wildcards with '~' escape, if there are no wildcards then an escaped
 // character does not make sense, but it modifies the search pattern in an
 // Excel compatible wildcard search...
-static const sal_Unicode cw[] = { '*','?','~', 0 };
-const sal_Unicode* p1 = rStr.getStr();
-sal_Unicode c1;
-while ( ( c1 = *p1++ ) != 0 )
-{
-const sal_Unicode* p2 = cw;
-while ( *p2 )
-{
-if ( c1 == *p2++ )
-return true;
-}
-}
-return false;
+std::u16string_view cw(u"*?~");
+return rStr.find_first_of(cw) != std::u16string_view::npos;
 }
 
-utl::SearchParam::SearchType ScInterpreter::DetectSearchType( const OUString& 
rStr, const ScDocument& rDoc )
+utl::SearchParam::SearchType ScInterpreter::DetectSearchType( 
std::u16string_view rStr, const ScDocument& rDoc )
 {
-if (rDoc.GetDocOptions().IsFormulaWildcardsEnabled())
-return MayBeWildcard( rStr ) ? utl::SearchParam::SearchType::Wildcard 
: utl::SearchParam::SearchType::Normal;
-if (rDoc.GetDocOptions().IsFormulaRegexEnabled())
-return MayBeRegExp( rStr ) ? utl::SearchParam::SearchType::Regexp : 
utl::SearchParam::SearchType::Normal;
+const auto eType = rDoc.GetDocOptions().GetFormulaSearchType();
+if ((eType == utl::SearchParam::SearchType::Wildcard && 
MayBeWildcard(rStr))
+|| (eType == utl::SearchParam::SearchType::Regexp && 
MayBeRegExp(rStr)))
+return eType;
 return utl::SearchParam::SearchType::Normal;
 }

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

2022-03-11 Thread Miklos Vajna (via logerrit)

 vcl/qa/cppunit/pdfexport/data/pdf-image-annots.odg |binary
 vcl/qa/cppunit/pdfexport/pdfexport.cxx |   20 
 vcl/source/gdi/pdfwriter_impl.cxx  |   16 ++--
 3 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit 4158c7380a3be30899dd4164c2299c52ac732c5d
Author: Miklos Vajna 
AuthorDate: Wed Mar 9 13:36:27 2022 +0100
Commit: Xisco Fauli 
CommitDate: Fri Mar 11 10:45:28 2022 +0100

PDF export of PDF images: don't preserve annotations in general

Regression from 33c9bc0225a92f26770f9ef20b252af47853e7b9 (PDF export of
PDF images: preserve hyperlinks, 2022-01-07), the problem was that we
want to preserve hyperlinks, but annotations are added by the PDF export
explicitly, so it isn't a good idea to "preserve" them as well.

Fix the problem by going back to the old behavior, except when the
annotation sub-type is /Link.

This keeps hyperlinks working but doesn't lead to duplicated comments
when re-exporting an image + adding comments explicitly.

Change-Id: I910990da59bdc1150cc346f1a5471cb6da55dd2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131243
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit 63dba12b779dd4d007c8cb8cf4b967bd78077cac)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131205
Reviewed-by: Xisco Fauli 

diff --git a/vcl/qa/cppunit/pdfexport/data/pdf-image-annots.odg 
b/vcl/qa/cppunit/pdfexport/data/pdf-image-annots.odg
new file mode 100644
index ..6dee0145c536
Binary files /dev/null and b/vcl/qa/cppunit/pdfexport/data/pdf-image-annots.odg 
differ
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 8934e11c0e9f..6c69f4a2d693 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -3061,6 +3061,26 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testURIs)
 CPPUNIT_ASSERT_EQUAL(URIs[i].out, pURIElem->GetValue());
 }
 }
+
+CPPUNIT_TEST_FIXTURE(PdfExportTest, testPdfImageAnnots)
+{
+// Given a document with a PDF image that has 2 comments (popup, text) and 
a hyperlink:
+aMediaDescriptor["FilterName"] <<= OUString("draw_pdf_Export");
+
+// When saving to PDF:
+saveAsPDF(u"pdf-image-annots.odg");
+
+// Then make sure only the hyperlink is kept, since Draw itself has its 
own comments:
+std::unique_ptr pPdfDocument = parseExport();
+CPPUNIT_ASSERT(pPdfDocument);
+std::unique_ptr pPdfPage = 
pPdfDocument->openPage(/*nIndex=*/0);
+CPPUNIT_ASSERT(pPdfPage);
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 1
+// - Actual  : 3
+// i.e. not only the hyperlink but also the 2 comments were exported, 
leading to duplication.
+CPPUNIT_ASSERT_EQUAL(1, pPdfPage->getAnnotationCount());
+}
 } // end anonymous namespace
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 141c4f823fc1..0a971622d5bc 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -8438,7 +8438,7 @@ void PDFWriterImpl::writeReferenceXObject(const 
ReferenceXObjectEmit& rEmit)
 return;
 }
 
-// Merge page annotations (links, etc) from pPage to our page.
+// Merge link annotations from pPage to our page.
 std::vector aAnnots;
 if (auto pArray = 
dynamic_cast(pPage->Lookup("Annots")))
 {
@@ -8456,7 +8456,19 @@ void PDFWriterImpl::writeReferenceXObject(const 
ReferenceXObjectEmit& rEmit)
 continue;
 }
 
-// Annotation refers to an object, remember it.
+auto pType = 
dynamic_cast(pObject->Lookup("Type"));
+if (!pType || pType->GetValue() != "Annot")
+{
+continue;
+}
+
+auto pSubtype = 
dynamic_cast(pObject->Lookup("Subtype"));
+if (!pSubtype || pSubtype->GetValue() != "Link")
+{
+continue;
+}
+
+// Reference to a link annotation object, remember it.
 aAnnots.push_back(pObject);
 }
 }

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

2022-03-11 Thread Dennis Francis (via logerrit)

 chart2/source/controller/main/ChartController.cxx |   15 +++
 svx/source/svdraw/svdmrkv.cxx |8 
 2 files changed, 23 insertions(+)

New commits:
commit be5e01372659897e50c7334ce205ceda4e3d1db5
Author: Dennis Francis 
AuthorDate: Mon Mar 7 12:17:07 2022 +0530
Commit: Szymon Kłos 
CommitDate: Fri Mar 11 10:36:28 2022 +0100

lokCalcRTL: chart-edit: no bounding box

Fix for selections(svx-marks) similar to the fix for chart edit mode
tile painting

```
4fd2a14c6ee68f0574766ec7ec3dca35debe9d20
lokCalcRTL: global RTL: fix chart edit mode rendering
```

Change-Id: I2b5a2af7023b09254b8471b750122bec10126bde
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131091
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index 137396b3e64b..18165659f9e0 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -62,6 +62,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -71,6 +72,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -721,7 +723,20 @@ void ChartController::impl_createDrawViewController()
 {
 if( m_pDrawModelWrapper )
 {
+bool bLokCalcGlobalRTL = false;
+if(comphelper::LibreOfficeKit::isActive() && 
AllSettings::GetLayoutRTL())
+{
+uno::Reference< XChartDocument > xChartDoc(getModel(), 
uno::UNO_QUERY);
+if (xChartDoc.is())
+{
+ChartModel& rModel = dynamic_cast(*xChartDoc);
+uno::Reference 
xSSDoc(rModel.getParent(), uno::UNO_QUERY);
+if (xSSDoc.is())
+bLokCalcGlobalRTL = true;
+}
+}
 m_pDrawViewWrapper.reset( new 
DrawViewWrapper(m_pDrawModelWrapper->getSdrModel(),GetChartWindow()) );
+m_pDrawViewWrapper->SetNegativeX(bLokCalcGlobalRTL);
 m_pDrawViewWrapper->attachParentReferenceDevice( getModel() );
 }
 }
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 57ab32e44f81..ce6e2532473b 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -775,6 +775,14 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle 
const & rRect, const S
 if (pViewShellWindow && pViewShellWindow->IsAncestorOf(*pWin))
 {
 Point aOffsetPx = 
pWin->GetOffsetPixelFrom(*pViewShellWindow);
+if (mbNegativeX && AllSettings::GetLayoutRTL())
+{
+// mbNegativeX is set only for Calc in RTL mode.
+// If global RTL flag is set, vcl-window X offset of 
chart window is
+// mirrored w.r.t parent window rectangle. This needs 
to be reverted.
+aOffsetPx.setX(pViewShellWindow->GetOutOffXPixel() + 
pViewShellWindow->GetSizePixel().Width()
+- pWin->GetOutOffXPixel() - 
pWin->GetSizePixel().Width());
+}
 Point aLogicOffset = pWin->PixelToLogic(aOffsetPx);
 addLogicOffset = aLogicOffset;
 aSelection.Move(aLogicOffset.getX(), aLogicOffset.getY());

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-7.0' - include/unotest sw/inc sw/source unotest/Library_unotest.mk unotest/source xmloff/CppunitTest_xmloff_text.mk xmloff/qa xmloff/source

2022-03-11 Thread Miklos Vajna (via logerrit)

 include/unotest/macros_test.hxx   |9 ++
 sw/inc/numrule.hxx|3 ++
 sw/source/core/doc/number.cxx |   23 +
 sw/source/core/unocore/unoparagraph.cxx   |   16 
 unotest/Library_unotest.mk|1 
 unotest/source/cpp/macros_test.cxx|   17 +
 xmloff/CppunitTest_xmloff_text.mk |2 +
 xmloff/qa/unit/data/list-id.fodt  |   23 +
 xmloff/qa/unit/text.cxx   |   39 +-
 xmloff/source/text/XMLTextNumRuleInfo.cxx |9 ++
 xmloff/source/text/XMLTextNumRuleInfo.hxx |4 +++
 xmloff/source/text/txtparae.cxx   |4 +--
 12 files changed, 147 insertions(+), 3 deletions(-)

New commits:
commit 76474f8f6ae0919d5754da9f186463b2c17ec4ea
Author: Miklos Vajna 
AuthorDate: Thu Mar 10 16:29:48 2022 +0100
Commit: Miklos Vajna 
CommitDate: Fri Mar 11 10:32:49 2022 +0100

ODT export: omit unreferenced 

This attribute is needed when a numbering is built using multiple,
independent  elements. In that case the markup to connect
these are either:



...



In case there is no other list in-between, or:



...



In case there are other lists in-between.

This means that at least in case all the text nodes of the numbering are
after each other, then the random value in xml:id="..." is never
referenced, so it can be omitted.

This helps deterministic ODF output when the input is HTML, where there
are never text:continue-list="..." attributes that would refer to these
xml:id="..." attributes.

(cherry picked from commit 8f48f91009caa86d896f247059874242ed18bf39)

Conflicts:
xmloff/source/text/XMLTextNumRuleInfo.cxx

Change-Id: Ice69422a12d4229879f89f3a4a24ed926c6d43af

diff --git a/include/unotest/macros_test.hxx b/include/unotest/macros_test.hxx
index c60ea1fe97ce..7c0c5cbf6cae 100644
--- a/include/unotest/macros_test.hxx
+++ b/include/unotest/macros_test.hxx
@@ -26,6 +26,11 @@ struct TestMacroInfo
 };
 
 class BasicDLL;
+class SvStream;
+namespace utl
+{
+class TempFile;
+}
 
 namespace unotest {
 
@@ -43,6 +48,10 @@ public:
 const OUString& rCommand,
 const css::uno::Sequence& 
rPropertyValues);
 
+/// Opens rStreamName from rTempFile, assuming it's a ZIP storage.
+static std::unique_ptr parseExportStream(const utl::TempFile& 
rTempFile,
+   const OUString& 
rStreamName);
+
 protected:
 css::uno::Reference< css::frame::XDesktop2> mxDesktop;
 
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 6152e6bee99f..b0bf138afb33 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -270,6 +270,9 @@ public:
 void dumpAsXml(xmlTextWriterPtr w) const;
 void GetGrabBagItem(css::uno::Any& rVal) const;
 void SetGrabBagItem(const css::uno::Any& rVal);
+
+/// Is it possible that this numbering has multiple lists?
+bool HasContinueList() const;
 };
 
 /// namespace for static functions and methods for numbering and bullets
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 1de08ae9f761..b812897a9ae1 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1099,6 +1099,29 @@ void SwNumRule::SetGrabBagItem(const uno::Any& rVal)
 mpGrabBagItem->PutValue(rVal, 0);
 }
 
+bool SwNumRule::HasContinueList() const
+{
+// In case all text nodes are after each other, then we won't have a later 
list that wants to
+// continue us.
+sal_uLong nIndex(0);
+for (size_t i = 0; i < maTextNodeList.size(); ++i)
+{
+SwTextNode* pNode = maTextNodeList[i];
+if (i > 0)
+{
+if (pNode->GetIndex() != nIndex + 1)
+{
+// May have a continue list.
+return true;
+}
+}
+nIndex = pNode->GetIndex();
+}
+
+// Definitely won't have a continue list.
+return false;
+}
+
 namespace numfunc
 {
 namespace {
diff --git a/sw/source/core/unocore/unoparagraph.cxx 
b/sw/source/core/unocore/unoparagraph.cxx
index 3fef41218cad..45fbd9c31e41 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -930,6 +930,22 @@ static beans::PropertyState 
lcl_SwXParagraph_getPropertyState(
 bDone = true;
 break;
 }
+case FN_UNO_LIST_ID:
+{
+if (*ppSet)
+{
+if ((*ppSet)->GetItemState(RES_PARATR_LIST_ID, false) == 
SfxItemState::SET)
+{
+SwNumRule* pNumRule = rTextNode.GetNumRule();
+if (!pNumRule || pNumRule->HasContinueList())
+{
+

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

2022-03-11 Thread Luboš Luňák (via logerrit)

 compilerplugins/clang/redundantfcast.cxx |3 ++-
 sc/inc/attarray.hxx  |4 
 sc/inc/column.hxx|7 +++
 sc/inc/documentimport.hxx|9 +++--
 sc/inc/table.hxx |1 +
 sc/qa/unit/subsequent_export_test2.cxx   |4 ++--
 sc/source/core/data/documentimport.cxx   |   17 -
 sc/source/core/data/table2.cxx   |   31 +++
 sc/source/filter/excel/xistyle.cxx   |   17 -
 sc/source/filter/oox/sheetdatabuffer.cxx |   16 +++-
 sc/source/filter/xml/xmlcoli.cxx |1 -
 11 files changed, 93 insertions(+), 17 deletions(-)

New commits:
commit dddee125cc32f1ad5228e598a7de04e9654e65c1
Author: Luboš Luňák 
AuthorDate: Thu Mar 10 15:03:25 2022 +0100
Commit: Luboš Luňák 
CommitDate: Fri Mar 11 10:09:03 2022 +0100

load ods/xlsx with full row attributes without allocating all columns

If there's e.g. an entire row bold, it's enough to set default
attribute for unallocated columns.

This also reverts the workaround from commit 297ab561c6754, as it's
no longer necessary.

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

diff --git a/compilerplugins/clang/redundantfcast.cxx 
b/compilerplugins/clang/redundantfcast.cxx
index ac768caf276e..be9565c9fbe8 100644
--- a/compilerplugins/clang/redundantfcast.cxx
+++ b/compilerplugins/clang/redundantfcast.cxx
@@ -329,7 +329,8 @@ public:
 if (fn == SRCDIR "/bridges/source/jni_uno/jni_bridge.cxx")
 return false;
 // TODO constructing a temporary to pass to a && param
-if (fn == SRCDIR "/sc/source/ui/view/viewfunc.cxx")
+if (fn == SRCDIR "/sc/source/ui/view/viewfunc.cxx"
+|| fn == SRCDIR "/sc/source/core/data/table2.cxx")
 return false;
 // tdf#145203: FIREBIRD cannot create a table
 if (fn == SRCDIR 
"/connectivity/source/drivers/firebird/DatabaseMetaData.cxx")
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index c08da494c142..8153b441ffe6 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -82,6 +82,10 @@ struct ScAttrEntry
 {
 SCROW   nEndRow;
 const ScPatternAttr*pPattern;
+bool operator==( const ScAttrEntry& other ) const
+{
+return nEndRow == other.nEndRow && pPattern == other.pPattern;
+}
 };
 
 class ScAttrArray
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 2cf4bdd66573..b6fde6801a2f 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -140,6 +140,8 @@ public:
 return static_cast(GetAttr(nRow, sal_uInt16(nWhich), 
nStartRow, nEndRow));
 }
 
+voidSetAttrEntries(std::vector && vNewData);
+
 const ScPatternAttr*GetPattern( SCROW nRow ) const;
 const ScPatternAttr*GetMostUsedPattern( SCROW nStartRow, SCROW nEndRow 
) const;
 SCROW   ApplySelectionCache( SfxItemPoolCache* pCache, const 
ScMarkData& rMark, ScEditDataArray* pDataArray, bool* const pIsChanged,
@@ -1009,4 +1011,9 @@ inline void ScColumn::SetPatternArea( SCROW nStartRow, 
SCROW nEndRow,
 pAttrArray->SetPatternArea( nStartRow, nEndRow, &rPatAttr, 
true/*bPutToPool*/ );
 }
 
+inline void ScColumnData::SetAttrEntries(std::vector && vNewData)
+{
+pAttrArray->SetAttrEntries( std::move( vNewData ));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/documentimport.hxx b/sc/inc/documentimport.hxx
index a80053b6ff80..2ffc75d67b82 100644
--- a/sc/inc/documentimport.hxx
+++ b/sc/inc/documentimport.hxx
@@ -53,6 +53,11 @@ public:
 ~Attrs();
 Attrs& operator=( Attrs const & ) = delete; // MSVC2015 workaround
 Attrs( Attrs const & ) = delete; // MSVC2015 workaround
+bool operator==(const Attrs& other) const
+{
+return mvData == other.mvData && mbLatinNumFmtOnly == 
other.mbLatinNumFmtOnly;
+}
+Attrs& operator=( Attrs&& attrs ) = default;
 };
 
 ScDocumentImport() = delete;
@@ -115,11 +120,11 @@ public:
 void fillDownCells(const ScAddress& rPos, SCROW nFillSize);
 
 /**
- * Set an array of cell attributes to specified column.  This call
+ * Set an array of cell attributes to specified range of columns.  This 
call
  * transfers the ownership of the ScAttrEntry array from the caller to the
  * column.
  */
-void setAttrEntries( SCTAB nTab, SCCOL nCol, Attrs&& rAttrs );
+void setAttrEntries( SCTAB nTab, SCCOL nColStart, SCCOL nColEnd, Attrs&& 
rAttrs );
 
 void setRowsVisible(SCTAB nTab, SCROW nRowStart, SCROW nRowEnd, bool 
bVisible);
 
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index e7d91a5cad97..532f6cf10124 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -736,6 +736,7 @@ public:
 voidApplyPatternAr

[Libreoffice-commits] core.git: chart2/source dbaccess/source desktop/source framework/source include/oox include/sfx2 include/svx oox/source reportdesign/source sc/inc sc/source sd/source sfx2/source

2022-03-11 Thread Noel Grandin (via logerrit)

 chart2/source/controller/dialogs/TitleDialogData.cxx  |2 -
 chart2/source/controller/inc/TitleDialogData.hxx  |2 -
 chart2/source/inc/CommonConverters.hxx|2 -
 chart2/source/tools/CommonConverters.cxx  |2 -
 chart2/source/view/charttypes/BarChart.cxx|   16 +++---
 chart2/source/view/charttypes/BarChart.hxx|   16 +++---
 chart2/source/view/charttypes/NetChart.cxx|4 +--
 chart2/source/view/charttypes/NetChart.hxx|4 +--
 chart2/source/view/inc/ShapeFactory.hxx   |4 +--
 chart2/source/view/main/ChartView.cxx |2 -
 chart2/source/view/main/ShapeFactory.cxx  |4 +--
 dbaccess/source/ui/browser/unodatbr.cxx   |2 -
 dbaccess/source/ui/inc/unodatbr.hxx   |2 -
 desktop/source/deployment/gui/dp_gui_updatedialog.cxx |4 +--
 desktop/source/deployment/gui/dp_gui_updatedialog.hxx |4 +--
 framework/source/uiconfiguration/CommandImageResolver.cxx |2 -
 framework/source/uiconfiguration/CommandImageResolver.hxx |2 -
 include/oox/drawingml/shape.hxx   |2 -
 include/sfx2/dispatch.hxx |2 -
 include/svx/ColorSets.hxx |2 -
 include/svx/svdoedge.hxx  |2 -
 include/svx/svdundo.hxx   |2 -
 oox/source/drawingml/diagram/diagramhelper.cxx|2 -
 oox/source/drawingml/diagram/diagramhelper.hxx|2 -
 oox/source/drawingml/shape.cxx|2 -
 oox/source/drawingml/table/predefined-table-styles.cxx|2 -
 oox/source/export/shapes.cxx  |4 +--
 reportdesign/source/ui/dlg/Navigator.cxx  |4 +--
 sc/inc/Sparkline.hxx  |2 -
 sc/inc/document.hxx   |2 -
 sc/source/core/data/Sparkline.cxx |2 -
 sc/source/core/data/document.cxx  |4 +--
 sc/source/filter/oox/SparklineFragment.cxx|2 -
 sc/source/ui/inc/gridwin.hxx  |2 -
 sc/source/ui/sidebar/CellLineStyleValueSet.cxx|2 -
 sc/source/ui/sidebar/CellLineStyleValueSet.hxx|2 -
 sc/source/ui/view/gridwin4.cxx|2 -
 sd/source/ui/dlg/sdtreelb.cxx |2 -
 sd/source/ui/inc/sdtreelb.hxx |2 -
 sfx2/source/control/dispatch.cxx  |2 -
 slideshow/source/engine/opengl/TransitionerImpl.cxx   |8 +++
 solenv/lockfile/lockfile.c|4 +--
 solenv/lockfile/lockfile.h|2 -
 svx/source/form/filtnav.cxx   |2 -
 svx/source/form/navigatortree.cxx |2 -
 svx/source/inc/filtnav.hxx|2 -
 svx/source/inc/fmexpl.hxx |2 -
 svx/source/styles/ColorSets.cxx   |6 ++---
 svx/source/svdraw/svdoedge.cxx|2 -
 svx/source/svdraw/svdundo.cxx |2 -
 sw/inc/textboxhelper.hxx  |2 -
 sw/source/core/doc/textboxhelper.cxx  |2 -
 sw/source/core/edit/edlingu.cxx   |8 +++
 sw/source/filter/ww8/docxattributeoutput.cxx  |6 ++---
 sw/source/filter/ww8/docxattributeoutput.hxx  |6 ++---
 ucb/source/ucp/webdav-curl/DAVSessionFactory.cxx  |2 -
 ucb/source/ucp/webdav-curl/DAVSessionFactory.hxx  |2 -
 writerfilter/source/dmapper/PropertyMap.cxx   |2 -
 writerfilter/source/dmapper/PropertyMap.hxx   |2 -
 59 files changed, 95 insertions(+), 95 deletions(-)

New commits:
commit 69b5f0b6579c6574a8fe68ab2a64208ec767db55
Author: Noel Grandin 
AuthorDate: Thu Mar 10 21:53:47 2022 +0200
Commit: Noel Grandin 
CommitDate: Fri Mar 11 10:05:39 2022 +0100

loplugin:constparams

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

diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx 
b/chart2/source/controller/dialogs/TitleDialogData.cxx
index 7f48d90a0b24..4a5167c31073 100644
--- a/chart2/source/controller/dialogs/TitleDialogData.cxx
+++ b/chart2/source/controller/dialogs/TitleDialogData.cxx
@@ -73,7 +73,7 @@ void TitleDialogData::readFromModel( const 
rtl::Reference<::chart::ChartModel>&
 bool TitleDialogData::writeDifferenceToModel(
   cons

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

2022-03-11 Thread Stephan Bergmann (via logerrit)

 comphelper/source/misc/configuration.cxx |   20 +++-
 include/comphelper/configuration.hxx |   10 --
 2 files changed, 11 insertions(+), 19 deletions(-)

New commits:
commit 4015b22dbc10bc246a3ef704d8b75e8f8cdca519
Author: Stephan Bergmann 
AuthorDate: Fri Mar 11 08:04:03 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Mar 11 09:49:03 2022 +0100

Simplify ConfigurationWrapper singleton construction a bit

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

diff --git a/comphelper/source/misc/configuration.cxx 
b/comphelper/source/misc/configuration.cxx
index 11c3f97ad1cd..a8ef15ac9178 100644
--- a/comphelper/source/misc/configuration.cxx
+++ b/comphelper/source/misc/configuration.cxx
@@ -41,12 +41,6 @@ namespace com::sun::star::uno { class XComponentContext; }
 
 namespace {
 
-comphelper::detail::ConfigurationWrapper& GetTheConfigurationWrapper()
-{
-static comphelper::detail::ConfigurationWrapper 
WRAPPER(comphelper::getProcessComponentContext());
-return WRAPPER;
-}
-
 OUString getDefaultLocale(
 css::uno::Reference< css::uno::XComponentContext > const & context)
 {
@@ -72,7 +66,7 @@ OUString extendLocalizedPath(std::u16string_view path, 
OUString const & locale)
 std::shared_ptr< comphelper::ConfigurationChanges >
 comphelper::ConfigurationChanges::create()
 {
-return GetTheConfigurationWrapper().createChanges();
+return detail::ConfigurationWrapper::get().createChanges();
 }
 
 comphelper::ConfigurationChanges::~ConfigurationChanges() {}
@@ -111,7 +105,8 @@ comphelper::ConfigurationChanges::getSet(OUString const & 
path) const
 comphelper::detail::ConfigurationWrapper const &
 comphelper::detail::ConfigurationWrapper::get()
 {
-return GetTheConfigurationWrapper();
+static comphelper::detail::ConfigurationWrapper WRAPPER;
+return WRAPPER;
 }
 
 namespace
@@ -138,16 +133,15 @@ public:
 
 } // namespace
 
-comphelper::detail::ConfigurationWrapper::ConfigurationWrapper(
-css::uno::Reference< css::uno::XComponentContext > const & context):
-context_(context),
-access_(css::configuration::ReadWriteAccess::create(context, "*"))
+comphelper::detail::ConfigurationWrapper::ConfigurationWrapper():
+context_(comphelper::getProcessComponentContext()),
+access_(css::configuration::ReadWriteAccess::create(context_, "*"))
 {
 // Set up a configuration notifier to invalidate the cache as needed.
 try
 {
 css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider(
-css::configuration::theDefaultProvider::get( context ) );
+css::configuration::theDefaultProvider::get( context_ ) );
 
 // set root path
 css::uno::Sequence< css::uno::Any > params {
diff --git a/include/comphelper/configuration.hxx 
b/include/comphelper/configuration.hxx
index 8525b816a3c5..622c65e95e52 100644
--- a/include/comphelper/configuration.hxx
+++ b/include/comphelper/configuration.hxx
@@ -85,12 +85,6 @@ class COMPHELPER_DLLPUBLIC ConfigurationWrapper {
 public:
 static ConfigurationWrapper const & get();
 
-SAL_DLLPRIVATE explicit ConfigurationWrapper(
-css::uno::Reference< css::uno::XComponentContext >
-const & context);
-
-SAL_DLLPRIVATE ~ConfigurationWrapper();
-
 bool isReadOnly(OUString const & path) const;
 
 css::uno::Any getPropertyValue(OUString const & path) const;
@@ -127,6 +121,10 @@ public:
 std::shared_ptr< ConfigurationChanges > createChanges() const;
 
 private:
+SAL_DLLPRIVATE explicit ConfigurationWrapper();
+
+SAL_DLLPRIVATE ~ConfigurationWrapper();
+
 ConfigurationWrapper(const ConfigurationWrapper&) = delete;
 ConfigurationWrapper& operator=(const ConfigurationWrapper&) = delete;

[Libreoffice-commits] core.git: basctl/source basegfx/source basic/source compilerplugins/clang dbaccess/source desktop/source drawinglayer/source editeng/source filter/source hwpfilter/source include

2022-03-11 Thread Noel Grandin (via logerrit)

 basctl/source/basicide/docsignature.cxx   |4 
 basctl/source/inc/docsignature.hxx|1 
 basegfx/source/curve/b2dcubicbezier.cxx   |2 
 basic/source/runtime/dllmgr-none.cxx  |2 
 basic/source/runtime/dllmgr.hxx   |2 
 basic/source/sbx/sbxdec.cxx   |4 
 basic/source/sbx/sbxdec.hxx   |2 
 compilerplugins/clang/trivialdestructor.cxx   |  133 
++
 dbaccess/source/ui/querydesign/TableFieldInfo.cxx |2 
 dbaccess/source/ui/querydesign/TableFieldInfo.hxx |1 
 desktop/source/app/cmdlineargs.cxx|2 
 desktop/source/app/cmdlineargs.hxx|1 
 drawinglayer/source/attribute/sdrglowattribute.cxx|2 
 editeng/source/editeng/eertfpar.cxx   |4 
 filter/source/msfilter/svdfppt.cxx|5 
 hwpfilter/source/htags.cxx|4 
 hwpfilter/source/htags.h  |3 
 include/basegfx/curve/b2dcubicbezier.hxx  |1 
 include/drawinglayer/attribute/sdrglowattribute.hxx   |2 
 include/editeng/editdata.hxx  |1 
 include/filter/msfilter/svdfppt.hxx   |1 
 include/jvmaccess/unovirtualmachine.hxx   |2 
 include/jvmaccess/virtualmachine.hxx  |2 
 include/oox/drawingml/chart/modelbase.hxx |1 
 include/svl/itemiter.hxx  |1 
 include/svx/colorwindow.hxx   |1 
 include/svx/dlgctl3d.hxx  |1 
 include/svx/fmobjfac.hxx  |1 
 include/svx/objfac3d.hxx  |1 
 include/svx/svdview.hxx   |1 
 include/vcl/GraphicNativeMetadata.hxx |1 
 include/vcl/GraphicNativeTransform.hxx|1 
 include/vcl/cvtgrf.hxx|1 
 include/vcl/mtfxmldump.hxx|1 
 include/vcl/toolkit/treelistbox.hxx   |1 
 include/xmloff/DashStyle.hxx  |2 
 include/xmloff/GradientStyle.hxx  |2 
 include/xmloff/HatchStyle.hxx |2 
 include/xmloff/MarkerStyle.hxx|2 
 include/xmloff/xmlnume.hxx|1 
 jvmaccess/source/unovirtualmachine.cxx|2 
 jvmaccess/source/virtualmachine.cxx   |3 
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx  |5 
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx  |1 
 lotuswordpro/inc/lwpdropcapmgr.hxx|1 
 lotuswordpro/source/filter/lwpdivopts.cxx |5 
 lotuswordpro/source/filter/lwpdivopts.hxx |2 
 lotuswordpro/source/filter/lwpdropcapmgr.cxx  |2 
 lotuswordpro/source/filter/lwpframelayout.cxx |2 
 lotuswordpro/source/filter/lwpframelayout.hxx |1 
 lotuswordpro/source/filter/lwplaypiece.cxx|9 
 lotuswordpro/source/filter/lwplaypiece.hxx|3 
 lotuswordpro/source/filter/lwpsdwfileloader.cxx   |2 
 lotuswordpro/source/filter/lwpsdwfileloader.hxx   |1 
 lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx |4 
 lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx |1 
 oox/inc/drawingml/chart/plotareamodel.hxx |2 
 oox/inc/drawingml/chart/seriesmodel.hxx   |1 
 oox/inc/drawingml/chart/titlemodel.hxx|1 
 oox/source/drawingml/chart/modelbase.cxx  |4 
 oox/source/drawingml/chart/plotareamodel.cxx  |8 
 oox/source/drawingml/chart/seriesmodel.cxx|4 
 oox/source/drawingml/chart/titlemodel.cxx |4 
 package/inc/CRC32.hxx |1 
 package/source/zipapi/CRC32.cxx   |3 
 sc/inc/compressedarray.hxx|1 
 sc/inc/dpoutputgeometry.hxx

56 matches

Mail list logo