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

2021-10-16 Thread Julien Nabet (via logerrit)
 ucb/source/ucp/cmis/cmis_content.cxx |6 ++
 ucb/source/ucp/webdav-neon/NeonSession.cxx   |4 +---
 ucb/source/ucp/webdav-neon/webdavcontent.cxx |9 ++---
 ucb/source/ucp/webdav/SerfSession.cxx|4 +---
 ucb/source/ucp/webdav/webdavcontent.cxx  |9 ++---
 5 files changed, 8 insertions(+), 24 deletions(-)

New commits:
commit 6cce3821ff14b41b704e279034680ce81d2b14ca
Author: Julien Nabet 
AuthorDate: Sat Oct 16 22:46:14 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 23:42:16 2021 +0200

Simplify vector initialization in ucb

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

diff --git a/ucb/source/ucp/cmis/cmis_content.cxx 
b/ucb/source/ucp/cmis/cmis_content.cxx
index 202e0a07b169..7ba1a129ebf5 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -2080,8 +2080,6 @@ namespace cmis
 return;
 
 std::map< std::string, libcmis::PropertyPtr >::iterator propIt = 
m_pObjectProps.find(rName);
-std::vector< std::string > values;
-values.push_back(rValue);
 
 if ( propIt == m_pObjectProps.end( ) && getObjectType( xEnv ).get( ) )
 {
@@ -2091,13 +2089,13 @@ namespace cmis
 if ( typeIt != propsTypes.end( ) )
 {
 libcmis::PropertyTypePtr propType = typeIt->second;
-libcmis::PropertyPtr property( new libcmis::Property( 
propType, values ) );
+libcmis::PropertyPtr property( new libcmis::Property( 
propType, { rValue }) );
 m_pObjectProps.insert(std::pair< std::string, 
libcmis::PropertyPtr >(rName, property));
 }
 }
 else if ( propIt != m_pObjectProps.end( ) )
 {
-propIt->second->setValues( values );
+propIt->second->setValues( { rValue } );
 }
 }
 }
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx 
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 979537a52e28..246b42fb7fb7 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -1776,10 +1776,8 @@ bool NeonSession::removeExpiredLocktoken( const OUString 
& inURL,
 // @@@ Alternative: use ne_lock_discover() => less overhead
 
 std::vector< DAVResource > aResources;
-std::vector< OUString > aPropNames;
-aPropNames.push_back( DAVProperties::LOCKDISCOVERY );
 
-PROPFIND( rEnv.m_aRequestURI, DAVZERO, aPropNames, aResources, rEnv );
+PROPFIND( rEnv.m_aRequestURI, DAVZERO, { DAVProperties::LOCKDISCOVERY 
}, aResources, rEnv );
 
 if ( aResources.empty() )
 return false;
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx 
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 45907b8a53d3..a40d4e1dcf1a 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -867,9 +867,6 @@ void Content::addProperty( const 
ucb::PropertyCommandArgument& aCmdArg,
 ProppatchValue aValue(
 PROPSET, aCmdArg.Property.Name, aCmdArg.DefaultValue );
 
-std::vector< ProppatchValue > aProppatchValues;
-aProppatchValues.push_back( aValue );
-
 try
 {
 // Set property value at server.
@@ -882,7 +879,7 @@ void Content::addProperty( const 
ucb::PropertyCommandArgument& aCmdArg,
 // clean cached value of PROPFIND property names
 // PROPPATCH can change them
 removeCachedPropertyNames( xResAccess->getURL() );
-xResAccess->PROPPATCH( aProppatchValues, xEnv );
+xResAccess->PROPPATCH( { aValue }, xEnv );
 {
 osl::Guard< osl::Mutex > aGuard( m_aMutex );
 m_xResAccess.reset(new DAVResourceAccess(*xResAccess));
@@ -958,9 +955,7 @@ void Content::removeProperty( const OUString& Name,
 
 try
 {
-std::vector< ProppatchValue > aProppatchValues;
 ProppatchValue aValue( PROPREMOVE, Name, uno::Any() );
-aProppatchValues.push_back( aValue );
 
 // Remove property value from server.
 std::unique_ptr< DAVResourceAccess > xResAccess;
@@ -972,7 +967,7 @@ void Content::removeProperty( const OUString& Name,
 // clean cached value of PROPFIND property names
 // PROPPATCH can change them
 removeCachedPropertyNames( xResAccess->getURL() );
-xResAccess->PROPPATCH( aProppatchValues, xEnv );
+xResAccess->PROPPATCH( { aValue }, xEnv );
 {
 osl::Guard< osl::Mutex > aGuard( m_aMutex );
 m_xResAccess.reset(new DAVResourceAccess(*xResAccess));
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx 
b/ucb/source/ucp/webdav/SerfSession.cxx
index 2f1b4d2626c9..a4aba7726931 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -1175,10 +1175,8 @@ bool Serf

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

2021-10-16 Thread Caolán McNamara (via logerrit)
 sc/source/ui/docshell/externalrefmgr.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e7d99ed15a33de67e436f23096fd2de2ab2e400f
Author: Caolán McNamara 
AuthorDate: Sat Oct 16 21:02:45 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 16 23:02:10 2021 +0200

cid#1492880 make Improper use of negative value explicit

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

diff --git a/sc/source/ui/docshell/externalrefmgr.cxx 
b/sc/source/ui/docshell/externalrefmgr.cxx
index 0da26f43b63f..f715da330b78 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1768,7 +1768,8 @@ void 
ScExternalRefManager::storeRangeNameTokens(sal_uInt16 nFileId, const OUStri
 case svSingleRef:
 {
 const ScSingleRefData& rRef = *pToken->GetSingleRef();
-OUString aTabName = maRefCache.getTableName(nFileId, 
rRef.Tab());
+size_t nCacheId = rRef.Tab();
+OUString aTabName = maRefCache.getTableName(nFileId, 
nCacheId);
 ScExternalSingleRefToken aNewToken(nFileId, 
svl::SharedString(aTabName),   // string not interned
 *pToken->GetSingleRef());
 pNewArray->AddToken(aNewToken);
@@ -1778,7 +1779,8 @@ void 
ScExternalRefManager::storeRangeNameTokens(sal_uInt16 nFileId, const OUStri
 case svDoubleRef:
 {
 const ScSingleRefData& rRef = *pToken->GetSingleRef();
-OUString aTabName = maRefCache.getTableName(nFileId, 
rRef.Tab());
+size_t nCacheId = rRef.Tab();
+OUString aTabName = maRefCache.getTableName(nFileId, 
nCacheId);
 ScExternalDoubleRefToken aNewToken(nFileId, 
svl::SharedString(aTabName),   // string not interned
 *pToken->GetDoubleRef());
 pNewArray->AddToken(aNewToken);


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

2021-10-16 Thread Julien Nabet (via logerrit)
 svl/source/fsstor/ostreamcontainer.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 68314bdba8d91a7e30c0c061fd3e31847c6a8187
Author: Julien Nabet 
AuthorDate: Sat Oct 16 13:43:41 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 20:58:09 2021 +0200

Simplify vector initialization in svl

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

diff --git a/svl/source/fsstor/ostreamcontainer.cxx 
b/svl/source/fsstor/ostreamcontainer.cxx
index 99b8afb1e9c0..bfa6962ee9c4 100644
--- a/svl/source/fsstor/ostreamcontainer.cxx
+++ b/svl/source/fsstor/ostreamcontainer.cxx
@@ -141,9 +141,11 @@ uno::Sequence< uno::Type > SAL_CALL 
OFSStreamContainer::getTypes()
 
 if ( !m_aTypes.hasElements() )
 {
-std::vector tmp;
-tmp.push_back(cppu::UnoType::get());
-tmp.push_back(cppu::UnoType::get());
+std::vector tmp
+{
+cppu::UnoType::get(),
+cppu::UnoType::get()
+};
 
 if ( m_xSeekable.is() )
 tmp.push_back(cppu::UnoType::get());


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

2021-10-16 Thread Mike Kaganski (via logerrit)
 embeddedobj/source/msole/oleembed.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 8133aa39939bd65c7c4078ff002ab88675e84ccc
Author: Mike Kaganski 
AuthorDate: Sat Oct 16 19:33:20 2021 +0300
Commit: Mike Kaganski 
CommitDate: Sat Oct 16 20:51:17 2021 +0200

Fix a forgotten return of the value

... ever since its introduction in commit
5ea5c0afebd272d5f44e6524c0f67b5317639919

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

diff --git a/embeddedobj/source/msole/oleembed.cxx 
b/embeddedobj/source/msole/oleembed.cxx
index ba678d4dfb87..01cf44b9fcaa 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -110,8 +110,7 @@ uno::Sequence< sal_Int32 > 
OleEmbeddedObject::GetIntermediateVerbsSequence_Impl(
 // actually there will be only one verb
 if ( m_nObjectState == embed::EmbedStates::RUNNING && nNewState == 
embed::EmbedStates::ACTIVE )
 {
-uno::Sequence< sal_Int32 > aVerbs( 1 );
-aVerbs[0] = embed::EmbedVerbs::MS_OLEVERB_OPEN;
+return { embed::EmbedVerbs::MS_OLEVERB_OPEN };
 }
 
 return uno::Sequence< sal_Int32 >();


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

2021-10-16 Thread Caolán McNamara (via logerrit)
 lotuswordpro/source/filter/lwppagelayout.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 7422ef83a1304d34cd303a7160efd4e76cc44a49
Author: Caolán McNamara 
AuthorDate: Sat Oct 16 14:04:35 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 16 20:36:40 2021 +0200

ofz#40004 Timeout

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

diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx 
b/lotuswordpro/source/filter/lwppagelayout.cxx
index 0a72db8f7d30..735a0791c2e2 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -607,8 +607,11 @@ sal_Int32 LwpPageLayout::GetPageNumber(sal_uInt16 
nLayoutNumber)
 
 //get first pagehint
 LwpPageHint* pPageHint = 
dynamic_cast(pHeadTail->GetHead().obj().get());
+o3tl::sorted_vector aSeen;
 while (pPageHint)
 {
+aSeen.insert(pPageHint);
+
 if (GetObjectID() == pPageHint->GetPageLayoutID())
 {
 sal_uInt16 nNumber = pPageHint->GetPageNumber();
@@ -635,7 +638,11 @@ sal_Int32 LwpPageLayout::GetPageNumber(sal_uInt16 
nLayoutNumber)
 break;
 }
 }
+
 pPageHint = 
dynamic_cast(pPageHint->GetNext().obj().get());
+
+if (aSeen.find(pPageHint) != aSeen.end())
+throw std::runtime_error("loop in conversion");
 }
 if (nPageNumber >= 0)
 {


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

2021-10-16 Thread Eike Rathke (via logerrit)
 sc/source/core/data/formulacell.cxx |7 +++
 sc/source/core/tool/interpr5.cxx|   19 +++
 2 files changed, 26 insertions(+)

New commits:
commit 54a9b7c1db72459f95ed334de34a0e2289329bd2
Author: Eike Rathke 
AuthorDate: Fri Oct 15 21:56:34 2021 +0200
Commit: Caolán McNamara 
CommitDate: Sat Oct 16 20:12:15 2021 +0200

Resolves: tdf#145085 HYPERLINK() do not force a 2nd row URL cell in array 
mode

... but fake a 1-row result dimension instead.

However, keep the behaviour that if a 2-rows array was entered the
2nd row displays the URL and not the repeated cell text.

Change-Id: I4800715a4028c647b763c6d729759ff4c099748f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123680
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 459f9de8a87373c826eadab142850cc3fa578fca)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123635
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 0b8dfd9c6f9d..5250e5e9c59a 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1101,6 +1101,13 @@ void ScFormulaCell::GetResultDimensions( SCSIZE& rCols, 
SCSIZE& rRows )
 if (pMat)
 {
 pMat->GetDimensions( rCols, rRows );
+if (pCode->IsHyperLink())
+{
+// Row 2 element is the URL that is not to be displayed and the
+// result dimension not to be extended.
+assert(rRows == 2);
+rRows = 1;
+}
 return;
 }
 }
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 1e16518ae8da..2c79e14a6a95 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -3239,6 +3239,25 @@ void ScInterpreter::ScMatRef()
 pMat->GetDimensions( nCols, nRows );
 SCSIZE nC = static_cast(aPos.Col() - aAdr.Col());
 SCSIZE nR = static_cast(aPos.Row() - aAdr.Row());
+#if 0
+// XXX: this could be an additional change for tdf#145085 to not
+// display the URL in a voluntary entered 2-rows array context.
+// However, that might as well be used on purpose to implement a check
+// on the URL, which existing documents may have done, the more that
+// before the accompanying change of
+// ScFormulaCell::GetResultDimensions() the cell array was forced to
+// two rows. Do not change without compelling reason. Note that this
+// repeating top cell is what Excel implements, but it has no
+// additional value so probably isn't used there. Exporting to and
+// using in Excel though will lose this capability.
+if (aCell.mpFormula->GetCode()->IsHyperLink())
+{
+// Row 2 element is the URL that is not to be displayed, fake a
+// 1-row cell-text-only matrix that is repeated.
+assert(nRows == 2);
+nR = 0;
+}
+#endif
 if ((nCols <= nC && nCols != 1) || (nRows <= nR && nRows != 1))
 PushNA();
 else


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

2021-10-16 Thread Caolán McNamara (via logerrit)
 sc/qa/unit/data/qpro/pass/ofz40008-1.wb2 |binary
 sc/source/core/data/table5.cxx   |3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7528bb3c5098a67f32523c028d83dfbc79a7c6a0
Author: Caolán McNamara 
AuthorDate: Sat Oct 16 14:12:03 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 16 20:10:59 2021 +0200

ofz#40008 check if column exists before EndListening attempt

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

diff --git a/sc/qa/unit/data/qpro/pass/ofz40008-1.wb2 
b/sc/qa/unit/data/qpro/pass/ofz40008-1.wb2
new file mode 100644
index ..d4adc7d484c9
Binary files /dev/null and b/sc/qa/unit/data/qpro/pass/ofz40008-1.wb2 differ
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 646984b7c699..e885f4c704bd 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -1148,7 +1148,8 @@ void ScTable::EndListening(sc::EndListeningContext& rCxt, 
const ScAddress& rAddr
 if (!ValidCol(rAddress.Col()))
 return;
 
-aCol[rAddress.Col()].EndListening(rCxt, rAddress, rListener);
+if (rAddress.Col() < aCol.size())
+aCol[rAddress.Col()].EndListening(rCxt, rAddress, rListener);
 }
 
 void ScTable::SetPageStyle(const OUString& rName)


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

2021-10-16 Thread Julien Nabet (via logerrit)
 sc/qa/unit/pivottable_filters_test.cxx|7 ++-
 sc/qa/unit/ucalc_sharedformula.cxx|8 ++--
 sc/source/core/data/column4.cxx   |6 ++
 sc/source/core/data/dpfilteredcache.cxx   |4 +---
 sc/source/core/data/formulacell.cxx   |3 +--
 sc/source/core/data/table3.cxx|   18 ++
 sc/source/core/tool/interpr8.cxx  |3 +--
 sc/source/filter/excel/xlroot.cxx |3 +--
 sc/source/ui/app/inputhdl.cxx |3 +--
 sc/source/ui/cctrl/checklistmenu.cxx  |7 +--
 sc/source/ui/condformat/condformatmgr.cxx |7 +--
 sc/source/ui/dialogs/searchresults.cxx|9 ++---
 sc/source/ui/docshell/docfunc.cxx |3 +--
 sc/source/ui/miscdlgs/conflictsdlg.cxx|9 ++---
 sc/source/ui/miscdlgs/sharedocdlg.cxx |   13 +
 sc/source/ui/namedlg/namemgrtable.cxx |6 +++---
 sc/source/ui/vba/excelvbahelper.cxx   |3 +--
 sc/source/ui/vba/vbawindow.cxx|3 +--
 sc/source/ui/view/tabvwshf.cxx|3 +--
 19 files changed, 59 insertions(+), 59 deletions(-)

New commits:
commit f6a5efc7cde6e7d723e05b866bc6de1bb56913b0
Author: Julien Nabet 
AuthorDate: Sat Oct 16 10:16:37 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 19:05:05 2021 +0200

Simplify vector initialization in sc

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

diff --git a/sc/qa/unit/pivottable_filters_test.cxx 
b/sc/qa/unit/pivottable_filters_test.cxx
index cfca0c29cadf..8ad8fbffee81 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -432,11 +432,8 @@ void 
ScPivotTableFiltersTest::testPivotTableSharedCacheGroupODS()
 }
 
 std::sort(aGrpValues.begin(), aGrpValues.end());
-std::vector aChecks;
-aChecks.push_back(ScDPItemData::DateFirst);
-aChecks.push_back(2012);
-aChecks.push_back(2013);
-aChecks.push_back(ScDPItemData::DateLast);
+std::vector aChecks{ ScDPItemData::DateFirst, 2012, 
2013,
+ScDPItemData::DateLast };
 CPPUNIT_ASSERT_MESSAGE("Unexpected group values for the year 
group.",
bool(aGrpValues == aChecks));
 }
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx 
b/sc/qa/unit/ucalc_sharedformula.cxx
index 1f7bc50ed2f5..3e96ed80ce57 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -1550,10 +1550,7 @@ void TestSharedFormula::testSharedFormulaMoveBlock()
 clearFormulaCellChangedFlag(*m_pDoc, aFormulaRange);
 
 // Make sure these formula cells in B1:B3 have correct positions even 
after the move.
-std::vector aRows;
-aRows.push_back(0);
-aRows.push_back(1);
-aRows.push_back(2);
+std::vector aRows { 0, 1, 2 };
 bool bRes = checkFormulaPositions(*m_pDoc, 0, 1, aRows.data(), 
aRows.size());
 CPPUNIT_ASSERT(bRes);
 
@@ -1928,8 +1925,7 @@ void 
TestSharedFormula::testSharedFormulaUnshareAreaListeners()
 // Set formula cell vector.
 {
 ScFormulaCell* pCell = new ScFormulaCell( *m_pDoc, aPos, 
"=B4");
-std::vector aCells;
-aCells.push_back(pCell);
+std::vector aCells { pCell };
 m_pDoc->SetFormulaCells( aPos, aCells);
 }
 break;
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index f7f7d2a294da..b4491b869966 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -435,8 +435,7 @@ void ScColumn::ConvertFormulaToValue(
 if (!GetDoc().ValidRow(nRow1) || !GetDoc().ValidRow(nRow2) || nRow1 > 
nRow2)
 return;
 
-std::vector aBounds;
-aBounds.push_back(nRow1);
+std::vector aBounds { nRow1 };
 if (nRow2 < GetDoc().MaxRow()-1)
 aBounds.push_back(nRow2+1);
 
@@ -496,8 +495,7 @@ void ScColumn::SwapNonEmpty(
 sc::TableValues& rValues, sc::StartListeningContext& rStartCxt, 
sc::EndListeningContext& rEndCxt )
 {
 const ScRange& rRange = rValues.getRange();
-std::vector aBounds;
-aBounds.push_back(rRange.aStart.Row());
+std::vector aBounds { rRange.aStart.Row() };
 if (rRange.aEnd.Row() < GetDoc().MaxRow()-1)
 aBounds.push_back(rRange.aEnd.Row()+1);
 
diff --git a/sc/source/core/data/dpfilteredcache.cxx 
b/sc/source/core/data/dpfilteredcache.cxx
index 16e11c183b83..19b1782076c2 100644
--- a/sc/source/core/data/dpfilteredcache.cxx
+++ b/sc/source/core/data/dpfilteredcache.cxx
@@ -41,9 +41,7 @@ bool ScDPFilteredCache::SingleFilter::match(const 
ScDPItemData& rCellData) const
 
 std::vector ScDPFilteredCa

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

2021-10-16 Thread Julien Nabet (via logerrit)
 sfx2/source/control/listview.cxx |   13 +++--
 sfx2/source/dialog/versdlg.cxx   |5 +
 sfx2/source/doc/autoredactdialog.cxx |7 +--
 3 files changed, 9 insertions(+), 16 deletions(-)

New commits:
commit 62078c534f96e859d4e8c0ead6337a876344e4ab
Author: Julien Nabet 
AuthorDate: Sat Oct 16 13:43:31 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 19:02:18 2021 +0200

Simplify vector initialization in sfx2

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

diff --git a/sfx2/source/control/listview.cxx b/sfx2/source/control/listview.cxx
index 5b53ee5b67f9..0aa1781c8f13 100644
--- a/sfx2/source/control/listview.cxx
+++ b/sfx2/source/control/listview.cxx
@@ -49,12 +49,13 @@ ListView::ListView(std::unique_ptr 
xTreeView)
 , mnSortColumn(-2)
 {
 auto nDigitWidth = mxTreeView->get_approximate_digit_width();
-std::vector aWidths;
-aWidths.push_back(static_cast(nDigitWidth * 5)); /* Icon Column */
-aWidths.push_back(static_cast(nDigitWidth * 24)); /* Name Column */
-aWidths.push_back(static_cast(nDigitWidth * 22)); /* Category Column 
*/
-aWidths.push_back(static_cast(nDigitWidth * 15)); /* Application 
Column */
-aWidths.push_back(static_cast(nDigitWidth * 18)); /* Modify Column */
+std::vector aWidths{
+static_cast(nDigitWidth * 5), /* Icon Column */
+static_cast(nDigitWidth * 24), /* Name Column */
+static_cast(nDigitWidth * 22), /* Category Column */
+static_cast(nDigitWidth * 15), /* Application Column */
+static_cast(nDigitWidth * 18) /* Modify Column */
+};
 
 mxTreeView->set_column_fixed_widths(aWidths);
 mxTreeView->set_selection_mode(SelectionMode::Multiple);
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 1c11e5fd422f..6de0d866c30b 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -140,10 +140,7 @@ namespace
 }
 }
 
-std::vector aWidths;
-aWidths.push_back(nMax);
-aWidths.push_back(nMaxAuthorWidth);
-rVersionBox.set_column_fixed_widths(aWidths);
+rVersionBox.set_column_fixed_widths({ nMax, nMaxAuthorWidth });
 }
 }
 
diff --git a/sfx2/source/doc/autoredactdialog.cxx 
b/sfx2/source/doc/autoredactdialog.cxx
index 2e47a702d2f9..a951217fe665 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -43,12 +43,7 @@ TargetsTable::TargetsTable(std::unique_ptr 
xControl)
 : m_xControl(std::move(xControl))
 {
 m_xControl->set_size_request(555, 250);
-std::vector aWidths;
-aWidths.push_back(100);
-aWidths.push_back(50);
-aWidths.push_back(200);
-aWidths.push_back(105);
-aWidths.push_back(105);
+std::vector aWidths{ 100, 50, 200, 105, 105 };
 m_xControl->set_column_fixed_widths(aWidths);
 m_xControl->set_selection_mode(SelectionMode::Multiple);
 }


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

2021-10-16 Thread Julien Nabet (via logerrit)
 sw/qa/core/uwriter.cxx  |   14 ++-
 sw/source/core/docnode/node.cxx |8 +-
 sw/source/core/table/swtable.cxx|3 --
 sw/source/core/txtnode/ndtxt.cxx|4 ---
 sw/source/filter/ww8/docxexport.cxx |7 +
 sw/source/filter/ww8/rtfattributeoutput.cxx |   18 ++
 sw/source/filter/ww8/rtfexport.cxx  |   15 
 sw/source/filter/ww8/ww8par2.cxx|   34 ++--
 sw/source/ui/chrdlg/swuiccoll.cxx   |7 -
 sw/source/ui/dbui/addresslistdialog.cxx |7 -
 sw/source/ui/dbui/mmoutputtypepage.cxx  |8 --
 sw/source/ui/dbui/selectdbtabledialog.cxx   |4 +--
 sw/source/ui/index/cnttab.cxx   |9 ---
 sw/source/ui/misc/bookmark.cxx  |7 -
 sw/source/ui/misc/glosbib.cxx   |4 ---
 sw/source/uibase/uiview/pview.cxx   |   16 -
 sw/source/uibase/uiview/view2.cxx   |8 --
 17 files changed, 84 insertions(+), 89 deletions(-)

New commits:
commit 8ec8bbcd4b1af73527859255d84af9f5990426bb
Author: Julien Nabet 
AuthorDate: Sat Oct 16 14:18:43 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 18:13:33 2021 +0200

Simplify vector initialization in sw

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

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 02f384f6c414..4c839d061f0f 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1564,12 +1564,14 @@ namespace
 void SwDocTest::testIntrusiveRing()
 {
 TestRing aRing1, aRing2, aRing3, aRing4, aRing5;
-std::vector vRings;
-vRings.push_back(&aRing1);
-vRings.push_back(&aRing2);
-vRings.push_back(&aRing3);
-vRings.push_back(&aRing4);
-vRings.push_back(&aRing5);
+std::vector vRings
+{
+&aRing1,
+&aRing2,
+&aRing3,
+&aRing4,
+&aRing5
+};
 CPPUNIT_ASSERT_EQUAL(static_cast(1), 
aRing1.GetRingContainer().size());
 CPPUNIT_ASSERT(aRing1.lonely());
 CPPUNIT_ASSERT(aRing2.lonely());
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 7c0403239130..e2598a1a53bd 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1668,9 +1668,7 @@ bool SwContentNode::ResetAttr( sal_uInt16 nWhich1, 
sal_uInt16 nWhich2 )
 sal_uInt16 nDel = 0;
 if ( !nWhich2 || nWhich2 < nWhich1 )
 {
-std::vector aClearWhichIds;
-aClearWhichIds.push_back( nWhich1 );
-nDel = ClearItemsFromAttrSet( aClearWhichIds );
+nDel = ClearItemsFromAttrSet( { nWhich1 } );
 }
 else
 nDel = AttrSetHandleHelper::ClearItem_BC( mpAttrSet, *this, 
nWhich1, nWhich2, nullptr, nullptr );
@@ -1736,9 +1734,7 @@ sal_uInt16 SwContentNode::ResetAllAttr()
 // If Modify is locked, do not send out any Modifys
 if( IsModifyLocked() )
 {
-std::vector aClearWhichIds;
-aClearWhichIds.push_back(0);
-sal_uInt16 nDel = ClearItemsFromAttrSet( aClearWhichIds );
+sal_uInt16 nDel = ClearItemsFromAttrSet( { 0 } );
 if( !GetpSwAttrSet()->Count() ) // Empty? Delete
 mpAttrSet.reset();
 return nDel;
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index ff85241e1cdf..c3b508493667 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1045,9 +1045,8 @@ static void lcl_CalcNewWidths( std::vector 
&rSpanPos, ChangeList& rC
 return;
 }
 std::vector aNewSpanPos;
-ChangeList aNewChanges;
 ChangeList::iterator pCurr = rChanges.begin();
-aNewChanges.push_back( *pCurr ); // Nullposition
+ChangeList aNewChanges { *pCurr }; // Nullposition
 std::vector::iterator pSpan = rSpanPos.begin();
 sal_uInt16 nCurr = 0;
 SwTwips nOrgSum = 0;
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 6ca45bf97a7d..8179e4139f46 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2972,9 +2972,7 @@ SwTextNode* SwTextNode::MakeNewTextNode( const 
SwNodeIndex& rPos, bool bNext,
 // #i75353#
 if ( bClearHardSetNumRuleWhenFormatCollChanges )
 {
-std::vector aClearWhichIds;
-aClearWhichIds.push_back( RES_PARATR_NUMRULE );
-if ( ClearItemsFromAttrSet( aClearWhichIds ) != 0 )
+if ( ClearItemsFromAttrSet( { RES_PARATR_NUMRULE } ) != 0 )
 {
 InvalidateInSwCache(RES_ATTRSET_CHG);
 }
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index b610adf30f7d..b90fc8c74a02 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/sourc

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

2021-10-16 Thread Julien Nabet (via logerrit)
 svx/qa/unit/svdraw/test_SdrTextObject.cxx |7 
---
 svx/source/dialog/ctredlin.cxx|   23 
++
 svx/source/dialog/docrecovery.cxx |   11 
+++-
 svx/source/form/datanavi.cxx  |7 
++-
 svx/source/sdr/primitive2d/sdrdecompositiontools.cxx  |5 --
 svx/source/sidebar/inspector/InspectorTextPanel.cxx   |4 -
 svx/source/tbxctrls/PaletteManager.cxx|7 
+--
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx |9 
++-
 8 files changed, 41 insertions(+), 32 deletions(-)

New commits:
commit 9d98fadd5e943f4c3f87d0c269815c7a0feee217
Author: Julien Nabet 
AuthorDate: Sat Oct 16 13:43:59 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 18:13:21 2021 +0200

Simplify vector initialization in svx

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

diff --git a/svx/qa/unit/svdraw/test_SdrTextObject.cxx 
b/svx/qa/unit/svdraw/test_SdrTextObject.cxx
index 93b06272fd3d..218db2a52f0e 100644
--- a/svx/qa/unit/svdraw/test_SdrTextObject.cxx
+++ b/svx/qa/unit/svdraw/test_SdrTextObject.cxx
@@ -27,11 +27,8 @@ public:
 
 void SdrTextObjTest::AllFamiliesCanBeRestoredFromSavedString()
 {
-std::vector allFamilies;
-allFamilies.push_back(SfxStyleFamily::Char);
-allFamilies.push_back(SfxStyleFamily::Para);
-allFamilies.push_back(SfxStyleFamily::Page);
-allFamilies.push_back(SfxStyleFamily::Pseudo);
+std::vector allFamilies{ SfxStyleFamily::Char, 
SfxStyleFamily::Para,
+ SfxStyleFamily::Page, 
SfxStyleFamily::Pseudo };
 
 for (SfxStyleFamily family : allFamilies)
 {
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 3797df20d398..78b9974ec05d 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -358,10 +359,12 @@ void SvxRedlinTable::SetWriterView()
 pTreeView = xWriterTreeView.get();
 
 auto nDigitWidth = pTreeView->get_approximate_digit_width();
-std::vector aWidths;
-aWidths.push_back(nDigitWidth * 10);
-aWidths.push_back(nDigitWidth * 20);
-aWidths.push_back(nDigitWidth * 20);
+std::vector aWidths
+{
+o3tl::narrowing(nDigitWidth * 10),
+o3tl::narrowing(nDigitWidth * 20),
+o3tl::narrowing(nDigitWidth * 20)
+};
 pTreeView->set_column_fixed_widths(aWidths);
 }
 
@@ -374,11 +377,13 @@ void SvxRedlinTable::SetCalcView()
 pTreeView = xCalcTreeView.get();
 
 auto nDigitWidth = pTreeView->get_approximate_digit_width();
-std::vector aWidths;
-aWidths.push_back(nDigitWidth * 20);
-aWidths.push_back(nDigitWidth * 20);
-aWidths.push_back(nDigitWidth * 20);
-aWidths.push_back(nDigitWidth * 20);
+std::vector aWidths
+{
+o3tl::narrowing(nDigitWidth * 20),
+o3tl::narrowing(nDigitWidth * 20),
+o3tl::narrowing(nDigitWidth * 20),
+o3tl::narrowing(nDigitWidth * 20)
+};
 pTreeView->set_column_fixed_widths(aWidths);
 }
 
diff --git a/svx/source/dialog/docrecovery.cxx 
b/svx/source/dialog/docrecovery.cxx
index 1c86f078042f..94130ae491e7 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -24,6 +24,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -657,10 +658,12 @@ RecoveryDialog::RecoveryDialog(weld::Window* pParent, 
RecoveryCore* pCore)
 
m_xProgressBar->set_size_request(m_xProgressBar->get_approximate_digit_width() 
* 50, -1);
 m_xProgress = new PluginProgress(m_xProgressBar.get());
 
-std::vector aWidths;
-aWidths.push_back(m_xFileListLB->get_checkbox_column_width());
-aWidths.push_back(60 * nWidth / 100);
-aWidths.push_back(m_xFileListLB->get_checkbox_column_width());
+std::vector aWidths
+{
+o3tl::narrowing(m_xFileListLB->get_checkbox_column_width()),
+o3tl::narrowing(60 * nWidth / 100),
+o3tl::narrowing(m_xFileListLB->get_checkbox_column_width())
+};
 m_xFileListLB->set_column_fixed_widths(aWidths);
 
 m_xNextBtn->set_sensitive(true);
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 45d7f8ab284e..4d5ac51af1d3 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -27,6 +27,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2636,8 +2637,10 @@ namespace svxform
 
m_xNamespacesList->set_size_request(m_xNamespacesList->get_approximate_digit_width()
 * 80,
 
m_xNamespacesList->get_height_rows(8));
 
-std::vector aWidths;
-  

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

2021-10-16 Thread Julien Nabet (via logerrit)
 filter/source/msfilter/escherex.cxx  |   18 --
 filter/source/pdf/impdialog.cxx  |   15 ---
 reportdesign/source/filter/xml/xmlExport.cxx |   17 +++--
 3 files changed, 31 insertions(+), 19 deletions(-)

New commits:
commit edf82470de0f7796992666a0c2b5c56dc66c94fd
Author: Julien Nabet 
AuthorDate: Sat Oct 16 10:15:30 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 18:13:05 2021 +0200

Simplify vector initialization in filter

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

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index fecb2fa45291..5ab075d6050a 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1907,14 +1907,20 @@ bool EscherPropertyContainer::CreatePolygonProperties(
 
 const sal_uInt16 nPolyCount(aPolyPolygon.Count());
 sal_uInt32 nTotalPoints(0);
-std::vector< sal_uInt8 > aVertices(4, 0);
-std::vector< sal_uInt8 > aSegments(4, 0);
 
-aVertices.push_back(static_cast(0xf0));
-aVertices.push_back(static_cast(0xff));
+std::vector< sal_uInt8 > aVertices
+{
+0, 0, 0, 0,
+static_cast(0xf0),
+static_cast(0xff)
+};
 
-aSegments.push_back(static_cast(2));
-aSegments.push_back(static_cast(0));
+std::vector< sal_uInt8 > aSegments
+{
+0, 0, 0, 0,
+static_cast(2),
+static_cast(0)
+};
 
 for(sal_uInt16 j(0); j < nPolyCount; ++j)
 {
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index e15d8a4c9bdd..c1a3c94d5a85 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -449,13 +449,14 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
 maConfigItem.WriteBool( "EnableCopyingOfContent", mbCanCopyOrExtract );
 maConfigItem.WriteBool( "EnableTextAccessForAccessibilityTools", 
mbCanExtractForAccessibility );
 
-std::vector aRet;
-
-aRet.push_back(comphelper::makePropertyValue("Watermark", 
maWatermarkText));
-aRet.push_back(comphelper::makePropertyValue("EncryptFile", mbEncrypt));
-aRet.push_back(comphelper::makePropertyValue("PreparedPasswords", 
mxPreparedPasswords));
-aRet.push_back(comphelper::makePropertyValue("RestrictPermissions", 
mbRestrictPermissions));
-aRet.push_back(comphelper::makePropertyValue("PreparedPermissionPassword", 
maPreparedOwnerPassword));
+std::vector aRet
+{
+comphelper::makePropertyValue("Watermark", maWatermarkText),
+comphelper::makePropertyValue("EncryptFile", mbEncrypt),
+comphelper::makePropertyValue("PreparedPasswords", 
mxPreparedPasswords),
+comphelper::makePropertyValue("RestrictPermissions", 
mbRestrictPermissions),
+comphelper::makePropertyValue("PreparedPermissionPassword", 
maPreparedOwnerPassword)
+};
 if( mbIsRangeChecked )
 aRet.push_back(comphelper::makePropertyValue("PageRange", 
msPageRange));
 else if( mbSelectionIsChecked )
commit ac10792ed4ca8d92f60c95ab4acd5b911e42cec7
Author: Julien Nabet 
AuthorDate: Sat Oct 16 10:16:17 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 18:12:49 2021 +0200

Simplify vector initialization in reportdesign

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

diff --git a/reportdesign/source/filter/xml/xmlExport.cxx 
b/reportdesign/source/filter/xml/xmlExport.cxx
index d9a673e81250..df89720fe7c5 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include "xmlExport.hxx"
 #include "xmlAutoStyle.hxx"
 #include 
@@ -497,15 +498,19 @@ void ORptExport::exportSectionAutoStyle(const 
Reference& _xProp)
 const sal_Int32 nOffset = 
rptui::getStyleProperty(xReport,PROPERTY_LEFTMARGIN);
 const sal_Int32 nCount  = _xProp->getCount();
 
-::std::vector aColumnPos;
+::std::vector aColumnPos
+{
+nOffset,
+aSize.Width - 
rptui::getStyleProperty(xReport,PROPERTY_RIGHTMARGIN)
+};
 aColumnPos.reserve(2*(nCount + 1));
-aColumnPos.push_back(nOffset);
-aColumnPos.push_back(aSize.Width - 
rptui::getStyleProperty(xReport,PROPERTY_RIGHTMARGIN));
 
-::std::vector aRowPos;
+::std::vector aRowPos
+{
+0,
+o3tl::narrowing(_xProp->getHeight())
+};
 aRowPos.reserve(2*(nCount + 1));
-aRowPos.push_back(0);
-aRowPos.push_back(_xProp->getHeight());
 
 
 ::std::vector aRowPosAutoGrow;


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

2021-10-16 Thread Julien Nabet (via logerrit)
 sal/osl/unx/backtraceapi.cxx   |8 +---
 sal/qa/osl/process/osl_process.cxx |   10 ++
 2 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 8546cdb2ad25b03ac152615357cab0006340d92f
Author: Julien Nabet 
AuthorDate: Sat Oct 16 10:16:25 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 18:12:29 2021 +0200

Simplify vector initialization in sal

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

diff --git a/sal/osl/unx/backtraceapi.cxx b/sal/osl/unx/backtraceapi.cxx
index e98d8d663f39..b372a500f7f0 100644
--- a/sal/osl/unx/backtraceapi.cxx
+++ b/sal/osl/unx/backtraceapi.cxx
@@ -79,10 +79,12 @@ void process_file_addr2line( const char* file, 
std::vector& frameData
 OUString arg1("-Cfe");
 OUString arg2 = OUString::fromUtf8(file);
 std::vector addrs;
-std::vector args;
+std::vector args
+{
+arg1.pData,
+arg2.pData
+};
 args.reserve(frameData.size() + 2);
-args.push_back( arg1.pData );
-args.push_back( arg2.pData );
 for( FrameData& frame : frameData )
 {
 if( frame.file != nullptr && strcmp( file, frame.file ) == 0 )
diff --git a/sal/qa/osl/process/osl_process.cxx 
b/sal/qa/osl/process/osl_process.cxx
index 58510e3a1e08..c396a06b5782 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -382,10 +382,12 @@ public:
 
 osl_freeProcessHandle(process);
 
-std::vector different_child_env_vars;
-different_child_env_vars.push_back(ENV1);
-different_child_env_vars.push_back(ENV2);
-different_child_env_vars.push_back(ENV4);
+std::vector different_child_env_vars
+{
+ENV1,
+ENV2,
+ENV4
+};
 
 CPPUNIT_ASSERT_MESSAGE
 (


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

2021-10-16 Thread Julien Nabet (via logerrit)
 oox/source/drawingml/shape.cxx |   22 ++
 1 file changed, 14 insertions(+), 8 deletions(-)

New commits:
commit e44fc2be0d9b0ed7b8983aca42471303e1fca55f
Author: Julien Nabet 
AuthorDate: Sat Oct 16 10:16:06 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 18:12:11 2021 +0200

Simplify vector initialization in oox

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

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 50a3c6ae5528..6821dffc9f34 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1349,10 +1349,12 @@ Reference< XShape > const & Shape::createAndInsert(
 }
 
 // Store original fill and line colors of the shape and the theme 
color name to InteropGrabBag
-std::vector aProperties;
-
aProperties.push_back(comphelper::makePropertyValue("EmuLineWidth", 
aLineProperties.moLineWidth.get(0)));
-
aProperties.push_back(comphelper::makePropertyValue("OriginalSolidFillClr", 
aShapeProps.getProperty(PROP_FillColor)));
-
aProperties.push_back(comphelper::makePropertyValue("OriginalLnSolidFillClr", 
aShapeProps.getProperty(PROP_LineColor)));
+std::vector aProperties
+{
+comphelper::makePropertyValue("EmuLineWidth", 
aLineProperties.moLineWidth.get(0)),
+comphelper::makePropertyValue("OriginalSolidFillClr", 
aShapeProps.getProperty(PROP_FillColor)),
+comphelper::makePropertyValue("OriginalLnSolidFillClr", 
aShapeProps.getProperty(PROP_LineColor))
+};
 OUString sColorFillScheme = 
aFillProperties.maFillColor.getSchemeName();
 if( !aFillProperties.maFillColor.isPlaceHolder() && 
!sColorFillScheme.isEmpty() )
 {
@@ -1380,8 +1382,10 @@ Reference< XShape > const & Shape::createAndInsert(
 { // for each stop in the gradient definition:
 
 // save position
-std::vector aGradientStop;
-
aGradientStop.push_back(comphelper::makePropertyValue("Pos", rPos));
+std::vector aGradientStop
+{
+comphelper::makePropertyValue("Pos", rPos)
+};
 
 OUString sStopColorScheme = rColor.getSchemeName();
 if( sStopColorScheme.isEmpty() )
@@ -1422,8 +1426,10 @@ Reference< XShape > const & Shape::createAndInsert(
 PropertyValue aEffect = it->getEffect();
 if( !aEffect.Name.isEmpty() )
 {
-std::vector aEffectsGrabBag;
-
aEffectsGrabBag.push_back(comphelper::makePropertyValue("Attribs", 
aEffect.Value));
+std::vector aEffectsGrabBag
+{
+comphelper::makePropertyValue("Attribs", 
aEffect.Value)
+};
 
 Color& aColor( it->moColor );
 OUString sColorScheme = aColor.getSchemeName();


[Libreoffice-commits] core.git: 2 commits - drawinglayer/qa drawinglayer/source helpcompiler/source

2021-10-16 Thread Julien Nabet (via logerrit)
 drawinglayer/qa/unit/border.cxx   |   35 +-
 drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx |3 
 helpcompiler/source/HelpLinker.cxx|   10 +-
 3 files changed, 25 insertions(+), 23 deletions(-)

New commits:
commit 881329a30612fb822d6c770efabc249bbefeb126
Author: Julien Nabet 
AuthorDate: Sat Oct 16 10:14:56 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 18:11:52 2021 +0200

Simplify vector initialization in drawinglayer

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

diff --git a/drawinglayer/qa/unit/border.cxx b/drawinglayer/qa/unit/border.cxx
index fdb3cc71a3a8..53bd420ee726 100644
--- a/drawinglayer/qa/unit/border.cxx
+++ b/drawinglayer/qa/unit/border.cxx
@@ -49,17 +49,18 @@ CPPUNIT_TEST_FIXTURE(DrawinglayerBorderTest, 
testDoubleDecompositionSolid)
 basegfx::BColor aColorLeft;
 std::vector 
aDashing(svtools::GetLineDashing(SvxBorderLineStyle::DOUBLE, 10.0));
 const drawinglayer::attribute::StrokeAttribute 
aStrokeAttribute(std::move(aDashing));
-std::vector aBorderlines;
+std::vector aBorderlines{
 
-aBorderlines.push_back(drawinglayer::primitive2d::BorderLine(
-drawinglayer::attribute::LineAttribute(aColorLeft, fLeftWidth), 
fExtendLeftStart,
-fExtendLeftStart, fExtendLeftEnd, fExtendLeftEnd));
+drawinglayer::primitive2d::BorderLine(
+drawinglayer::attribute::LineAttribute(aColorLeft, fLeftWidth), 
fExtendLeftStart,
+fExtendLeftStart, fExtendLeftEnd, fExtendLeftEnd),
 
-aBorderlines.push_back(drawinglayer::primitive2d::BorderLine(fDistance));
+drawinglayer::primitive2d::BorderLine(fDistance),
 
-aBorderlines.push_back(drawinglayer::primitive2d::BorderLine(
-drawinglayer::attribute::LineAttribute(aColorRight, fRightWidth), 
fExtendRightStart,
-fExtendRightStart, fExtendRightEnd, fExtendRightEnd));
+drawinglayer::primitive2d::BorderLine(
+drawinglayer::attribute::LineAttribute(aColorRight, fRightWidth), 
fExtendRightStart,
+fExtendRightStart, fExtendRightEnd, fExtendRightEnd)
+};
 
 rtl::Reference aBorder(
 new drawinglayer::primitive2d::BorderLinePrimitive2D(aStart, aEnd, 
std::move(aBorderlines),
@@ -113,17 +114,17 @@ CPPUNIT_TEST_FIXTURE(DrawinglayerBorderTest, 
testDoublePixelProcessing)
 basegfx::BColor aColorLeft;
 std::vector 
aDashing(svtools::GetLineDashing(SvxBorderLineStyle::DOUBLE, 10.0));
 const drawinglayer::attribute::StrokeAttribute 
aStrokeAttribute(std::move(aDashing));
-std::vector aBorderlines;
+std::vector aBorderlines{
+drawinglayer::primitive2d::BorderLine(
+drawinglayer::attribute::LineAttribute(aColorLeft, fLeftWidth), 
fExtendLeftStart,
+fExtendLeftStart, fExtendLeftEnd, fExtendLeftEnd),
 
-aBorderlines.push_back(drawinglayer::primitive2d::BorderLine(
-drawinglayer::attribute::LineAttribute(aColorLeft, fLeftWidth), 
fExtendLeftStart,
-fExtendLeftStart, fExtendLeftEnd, fExtendLeftEnd));
+drawinglayer::primitive2d::BorderLine(fDistance),
 
-aBorderlines.push_back(drawinglayer::primitive2d::BorderLine(fDistance));
-
-aBorderlines.push_back(drawinglayer::primitive2d::BorderLine(
-drawinglayer::attribute::LineAttribute(aColorRight, fRightWidth), 
fExtendRightStart,
-fExtendRightStart, fExtendRightEnd, fExtendRightEnd));
+drawinglayer::primitive2d::BorderLine(
+drawinglayer::attribute::LineAttribute(aColorRight, fRightWidth), 
fExtendRightStart,
+fExtendRightStart, fExtendRightEnd, fExtendRightEnd)
+};
 
 rtl::Reference aBorder(
 new drawinglayer::primitive2d::BorderLinePrimitive2D(aStart, aEnd, 
std::move(aBorderlines),
diff --git a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx 
b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
index 4887802e17a4..010083b42291 100644
--- a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
@@ -37,8 +37,7 @@ namespace drawinglayer::primitive3d
 
 if(getPolyPolygon3D().count())
 {
-std::vector< basegfx::B3DPolyPolygon > aFill;
-aFill.push_back(getPolyPolygon3D());
+std::vector< basegfx::B3DPolyPolygon > aFill { 
getPolyPolygon3D() };
 
 // get full range
 const basegfx::B3DRange aRange(getRangeFrom3DGeometry(aFill));
commit cd5ee8c7d3f06fe78e6b3993845a3c2abc7cb72a
Author: Julien Nabet 
AuthorDate: Sat Oct 16 10:15:56 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 18:11:39 2021 +0200

Simplify vector initialization in helpcompiler

Change-Id: I800fa0a6ac3b0dce1e0408858646dc7db5510623

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

2021-10-16 Thread Julien Nabet (via logerrit)
 extensions/source/propctrlr/formcomponenthandler.cxx  |   49 +-
 sdext/source/minimizer/optimizerdialogcontrols.cxx|   86 ++
 sdext/source/presenter/PresenterCanvasHelper.cxx  |7 -
 sdext/source/presenter/PresenterPaneBorderPainter.cxx |8 +
 sdext/source/presenter/PresenterToolBar.cxx   |   14 +-
 sdext/source/presenter/PresenterWindowManager.cxx |6 -
 6 files changed, 94 insertions(+), 76 deletions(-)

New commits:
commit 741658c57c9653d58bd9abbe630f469ca7f64a6b
Author: Julien Nabet 
AuthorDate: Sat Oct 16 10:15:13 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 18:11:26 2021 +0200

Simplify vector initialization in extensions

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

diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx 
b/extensions/source/propctrlr/formcomponenthandler.cxx
index bf3feb4acb1a..a783f1e49bd0 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -878,30 +878,31 @@ namespace pcr
 Sequence< OUString > SAL_CALL 
FormComponentPropertyHandler::getActuatingProperties( )
 {
 ::osl::MutexGuard aGuard( m_aMutex );
-std::vector< OUString > aInterestingProperties;
-aInterestingProperties.push_back(  PROPERTY_DATASOURCE );
-aInterestingProperties.push_back(  PROPERTY_COMMAND );
-aInterestingProperties.push_back(  PROPERTY_COMMANDTYPE );
-aInterestingProperties.push_back(  PROPERTY_LISTSOURCE );
-aInterestingProperties.push_back(  PROPERTY_LISTSOURCETYPE );
-aInterestingProperties.push_back(  PROPERTY_SUBMIT_ENCODING );
-aInterestingProperties.push_back(  PROPERTY_REPEAT );
-aInterestingProperties.push_back(  PROPERTY_TABSTOP );
-aInterestingProperties.push_back(  PROPERTY_BORDER );
-aInterestingProperties.push_back(  PROPERTY_CONTROLSOURCE );
-aInterestingProperties.push_back(  PROPERTY_DROPDOWN );
-aInterestingProperties.push_back(  PROPERTY_IMAGE_URL );
-aInterestingProperties.push_back(  PROPERTY_TARGET_URL );
-aInterestingProperties.push_back(  PROPERTY_STRINGITEMLIST );
-aInterestingProperties.push_back(  PROPERTY_BUTTONTYPE );
-aInterestingProperties.push_back(  PROPERTY_ESCAPE_PROCESSING );
-aInterestingProperties.push_back(  PROPERTY_TRISTATE );
-aInterestingProperties.push_back(  PROPERTY_DECIMAL_ACCURACY );
-aInterestingProperties.push_back(  PROPERTY_SHOWTHOUSANDSEP );
-aInterestingProperties.push_back(  PROPERTY_FORMATKEY );
-aInterestingProperties.push_back(  PROPERTY_EMPTY_IS_NULL );
-aInterestingProperties.push_back(  PROPERTY_TOGGLE );
-return comphelper::containerToSequence(aInterestingProperties);
+return
+{
+PROPERTY_DATASOURCE,
+PROPERTY_COMMAND,
+PROPERTY_COMMANDTYPE,
+PROPERTY_LISTSOURCE,
+PROPERTY_LISTSOURCETYPE,
+PROPERTY_SUBMIT_ENCODING,
+PROPERTY_REPEAT,
+PROPERTY_TABSTOP,
+PROPERTY_BORDER,
+PROPERTY_CONTROLSOURCE,
+PROPERTY_DROPDOWN,
+PROPERTY_IMAGE_URL,
+PROPERTY_TARGET_URL,
+PROPERTY_STRINGITEMLIST,
+PROPERTY_BUTTONTYPE,
+PROPERTY_ESCAPE_PROCESSING,
+PROPERTY_TRISTATE,
+PROPERTY_DECIMAL_ACCURACY,
+PROPERTY_SHOWTHOUSANDSEP,
+PROPERTY_FORMATKEY,
+PROPERTY_EMPTY_IS_NULL,
+PROPERTY_TOGGLE
+};
 }
 
 LineDescriptor SAL_CALL 
FormComponentPropertyHandler::describePropertyLine( const OUString& 
_rPropertyName,
commit d64a6e2245169e5e4a3f8bc5388b4fff4984e5f4
Author: Julien Nabet 
AuthorDate: Sat Oct 16 12:46:10 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 18:11:13 2021 +0200

Simplify vector initialization in sdext

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

diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx 
b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index 79832c36fb2f..23011e50716b 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -419,13 +419,15 @@ void OptimizerDialog::UpdateControlStatesPage0()
 void OptimizerDialog::InitPage0()
 {
 Sequence< OUString > aItemList;
-std::vector< OUString > aControlList;
-aControlList.push_back( InsertFixedText( *this, "FixedText0Pg0", 
getString( STR_INTRODUCTION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false, 
true, mnTabIndex++ ) );
-aControlList.push_back( InsertFixedText( *this, "F

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

2021-10-16 Thread Julien Nabet (via logerrit)
 sd/source/core/pglink.cxx|3 -
 sd/source/ui/dlg/headerfooterdlg.cxx |8 +--
 sd/source/ui/slidesorter/controller/SlsClipboard.cxx |3 -
 sd/source/ui/unoidl/unopage.cxx  |   50 ++-
 sd/source/ui/view/sdview.cxx |5 -
 5 files changed, 35 insertions(+), 34 deletions(-)

New commits:
commit 5393f9a53eb8b33537aedd03b7c9efc5222748d6
Author: Julien Nabet 
AuthorDate: Sat Oct 16 13:16:55 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 18:10:54 2021 +0200

Simplify vector initialization in sd

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

diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx
index 6762dcdd9bfa..358012df94f3 100644
--- a/sd/source/core/pglink.cxx
+++ b/sd/source/core/pglink.cxx
@@ -88,8 +88,7 @@ SdPageLink::~SdPageLink()
 pPage->SetBookmarkName(aBookmarkName);
 }
 
-std::vector aBookmarkList;
-aBookmarkList.push_back(aBookmarkName);
+std::vector aBookmarkList { aBookmarkName };
 sal_uInt16 nInsertPos = pPage->GetPageNum();
 bool bNoDialogs = false;
 bool bCopy = false;
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx 
b/sd/source/ui/dlg/headerfooterdlg.cxx
index ddc769551d5a..703f2f59809f 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -671,10 +671,12 @@ void PresLayoutPreview::Paint(vcl::RenderContext& 
rRenderContext, SdrTextObj con
 // apply line pattern if wanted
 if (bDotted)
 {
-std::vector aPattern;
 static const double fFactor(1.0);
-aPattern.push_back(3.0 * fFactor);
-aPattern.push_back(1.0 * fFactor);
+std::vector aPattern
+{
+3.0 * fFactor,
+1.0 * fFactor
+};
 
 basegfx::B2DPolyPolygon aDashed;
 basegfx::utils::applyLineDashing(aGeometry, aPattern, &aDashed);
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx 
b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index a902383c42e2..d4f52838c859 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -545,8 +545,7 @@ std::shared_ptr 
Clipboard::CreateTransferableUserData
 //pTransferable->SetView(&mrSlideSorter.GetView());
 
 // Set page bookmark list.
-std::vector aPageBookmarks;
-aPageBookmarks.push_back(sBookmark);
+std::vector aPageBookmarks { sBookmark };
 pTransferable->SetPageBookmarks(std::move(aPageBookmarks), false);
 
 // Replace the view referenced by the transferable with the
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 984b5fd0df2c..a9ecb7f5906c 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -2061,19 +2061,21 @@ Sequence< uno::Type > SAL_CALL SdDrawPage::getTypes()
 bool bPresPage = IsImpressDocument() && ePageKind != PageKind::Handout;
 
 // Collect the types of this class.
-::std::vector aTypes;
+::std::vector aTypes
+{
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get()
+};
 aTypes.reserve(13);
-aTypes.push_back(cppu::UnoType::get());
-aTypes.push_back(cppu::UnoType::get());
-aTypes.push_back(cppu::UnoType::get());
-aTypes.push_back(cppu::UnoType::get());
-aTypes.push_back(cppu::UnoType::get());
-aTypes.push_back(cppu::UnoType::get());
-aTypes.push_back(cppu::UnoType::get());
-aTypes.push_back(cppu::UnoType::get());
-aTypes.push_back(cppu::UnoType::get());
-aTypes.push_back(cppu::UnoType::get());
-aTypes.push_back(cppu::UnoType::get());
 if( bPresPage )
 
aTypes.push_back(cppu::UnoType::get());
 if( bPresPage && ePageKind == PageKind::Standard )
@@ -2664,18 +2666,20 @@ Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes()
 bool bPresPage = IsImpressDocument() && SvxFmDrawPage::mpPage && 
ePageKind != PageKind::Handout;
 
 // Collect the types of this class.
-::std::vector aTypes;
+::std::vector aTypes
+{
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cppu::UnoType::get(),
+cpp

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

2021-10-16 Thread Mike Kaganski (via logerrit)
 embeddedobj/source/msole/olecomponent.cxx |  206 +-
 include/systools/win32/comtools.hxx   |   52 ---
 2 files changed, 67 insertions(+), 191 deletions(-)

New commits:
commit a8a07cea28fd79e240c3abb084b88f4e23674fd6
Author: Mike Kaganski 
AuthorDate: Sat Oct 16 13:04:02 2021 +0300
Commit: Mike Kaganski 
CommitDate: Sat Oct 16 17:24:08 2021 +0200

Use sal::systools::COMReference and drop ComSmart

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

diff --git a/embeddedobj/source/msole/olecomponent.cxx 
b/embeddedobj/source/msole/olecomponent.cxx
index f57d0f1d85b8..4c44d36636fc 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "graphconvert.hxx"
@@ -57,123 +58,6 @@ using namespace ::comphelper;
 #define MAX_ENUM_ELE 20
 #define FORMATS_NUM  3
 
-//  class ComSmart =
-namespace {
-
-template< class T > class ComSmart
-{
-T* m_pInterface;
-
-void OwnRelease()
-{
-if ( m_pInterface )
-{
-T* pInterface = m_pInterface;
-m_pInterface = nullptr;
-pInterface->Release();
-}
-}
-
-public:
-ComSmart()
-: m_pInterface( nullptr )
-{}
-
-ComSmart( const ComSmart& rObj )
-: m_pInterface( rObj.m_pInterface )
-{
-if ( m_pInterface != NULL )
-m_pInterface->AddRef();
-}
-
-ComSmart( T* pInterface )
-: m_pInterface( pInterface )
-{
- if ( m_pInterface != NULL )
-m_pInterface->AddRef();
-}
-
-~ComSmart()
-{
-OwnRelease();
-}
-
-ComSmart& operator=( const ComSmart& rObj )
-{
-if(this == &rObj)
-return *this;
-
-OwnRelease();
-
-m_pInterface = rObj.m_pInterface;
-
-if ( m_pInterface != NULL )
-m_pInterface->AddRef();
-
-return *this;
-}
-
-ComSmart& operator=( T* pInterface )
-{
-OwnRelease();
-
-m_pInterface = pInterface;
-
-if ( m_pInterface != NULL )
-m_pInterface->AddRef();
-
-return *this;
-}
-
-operator T*() const
-{
-return m_pInterface;
-}
-
-T& operator*() const
-{
-return *m_pInterface;
-}
-
-T** operator&()
-{
-OwnRelease();
-
-m_pInterface = nullptr;
-
-return &m_pInterface;
-}
-
-T* operator->() const
-{
-return m_pInterface;
-}
-
-bool operator==( const ComSmart& rObj ) const
-{
-return ( m_pInterface == rObj.m_pInterface );
-}
-
-bool operator!=( const ComSmart& rObj ) const
-{
-return ( m_pInterface != rObj.m_pInterface );
-}
-
-bool operator==( const T* pInterface ) const
-{
-return ( m_pInterface == pInterface );
-}
-
-bool operator!=( const T* pInterface ) const
-{
-return ( m_pInterface != pInterface );
-}
-};
-
-}
-
-//  class ComSmart =
-
 typedef std::vector< FORMATETC* > FormatEtcList;
 
 FORMATETC const pFormatTemplates[FORMATS_NUM] = {
@@ -183,10 +67,10 @@ FORMATETC const pFormatTemplates[FORMATS_NUM] = {
 
 
 struct OleComponentNative_Impl {
-ComSmart< IUnknown > m_pObj;
-ComSmart< IOleObject > m_pOleObject;
-ComSmart< IViewObject2 > m_pViewObject2;
-ComSmart< IStorage > m_pIStorage;
+sal::systools::COMReference< IUnknown > m_pObj;
+sal::systools::COMReference< IOleObject > m_pOleObject;
+sal::systools::COMReference< IViewObject2 > m_pViewObject2;
+sal::systools::COMReference< IStorage > m_pIStorage;
 FormatEtcList m_aFormatsList;
 uno::Sequence< datatransfer::DataFlavor > m_aSupportedGraphFormats;
 
@@ -599,12 +483,11 @@ void OleComponent::RetrieveObjectDataFlavors_Impl()
 
 if ( !m_aDataFlavors.getLength() )
 {
-ComSmart< IDataObject > pDataObject;
-HRESULT hr = m_pNativeImpl->m_pObj->QueryInterface( IID_IDataObject, 
reinterpret_cast(&pDataObject) );
-if ( SUCCEEDED( hr ) && pDataObject )
+sal::systools::COMReference< IDataObject > 
pDataObject(m_pNativeImpl->m_pObj, sal::systools::COM_QUERY);
+if ( pDataObject )
 {
-ComSmart< IEnumFORMATETC > pFormatEnum;
-hr = pDataObject->EnumFormatEtc( DATADIR_GET, &pFormatEnum );
+sal::systools::COMReference< IEnumFORMATETC > pFormatEnum;
+HRESULT hr = pDataObject->EnumFormatEtc( DATADIR_GET, &pFormatEnum 
);
 if ( SUCCEEDED( hr ) && pFormatEnum )
 {
 FORMATETC pElem[ MAX_ENUM_ELE ];
@@ -651,20 +534,15 @@ bool OleComponent::InitializeObject_Impl()
 return false;
 
 // the linked object will be detecte

Re: How to get started with contribution

2021-10-16 Thread Ilmari Lauhakangas

On 16.10.2021 14.58, Shalini Bhandari wrote:

Respected sir/madam,

I am Shalini Bhandari, a computer science undergraduate. I have just 
entered my third year at Birla institute of applied science, Bhimtal. I 
am new to open source contribution but I am aware of C/C++, python, 
Django. I would love to contribute to your organization but could you 
please tell me how to get started? I am lost as to how to start.


Hoping to hear from you soon.


I have invited you to an interview.

Ilmari


Re: How to deal with dpi-dependent values in unit tests?

2021-10-16 Thread Regina Henschel

Hi Tomaž,

Tomaž Vajngerl schrieb am 16.10.2021 um 15:35:

Hi Regina,

On Fri, Oct 15, 2021 at 1:29 PM Regina Henschel > wrote:


Hi all,

the values of the bound rectangle of a Fontwork shape are dpi dependent
(I don't know why). I could increase the tolerance to cover more dpi
settings as done in https://gerrit.libreoffice.org/c/core/+/123613
or I add
      if (!IsDefaultDPI()) return;
as done in https://gerrit.libreoffice.org/c/core/+/123512

What is the preferred way to handle it?


If you can get away with IsDefaultDPI, then use that (you can't always). 
Technically we shouldn't be dependent on DPI when we deal with logical 
units, so until we find where the bug is that makes that DPI dependent, 
only the default DPI (96) should return the correct results (I think).


I have used IsDefaultDPI for now and will use it in my next patch too. I 
think now, it makes it easier to find the affected unit tests, if 
someone fixes the reason why a BoundRect of a Fontwork shape depends on DPI.


To get away with IsDefaultDPI in these cases, I would need a different 
way to detect errors in rendering of Fontwork shapes. I have no idea for 
that.


Kind regards,
Regina


How to get started with contribution

2021-10-16 Thread Shalini Bhandari
Respected sir/madam,I am Shalini Bhandari, a computer science undergraduate. I have just entered my third year at Birla institute of applied science, Bhimtal. I am new to open source contribution but I am aware of C/C++, python, Django. I would love to contribute to your organization but could you please tell me how to get started? I am lost as to how to start.Hoping to hear from you soon.Regards,Shalini Bhandari


Re: How to deal with dpi-dependent values in unit tests?

2021-10-16 Thread Tomaž Vajngerl
Hi Regina,

On Fri, Oct 15, 2021 at 1:29 PM Regina Henschel 
wrote:

> Hi all,
>
> the values of the bound rectangle of a Fontwork shape are dpi dependent
> (I don't know why). I could increase the tolerance to cover more dpi
> settings as done in https://gerrit.libreoffice.org/c/core/+/123613 or I
> add
>  if (!IsDefaultDPI()) return;
> as done in https://gerrit.libreoffice.org/c/core/+/123512
>
> What is the preferred way to handle it?
>

If you can get away with IsDefaultDPI, then use that (you can't always).
Technically we shouldn't be dependent on DPI when we deal with logical
units, so until we find where the bug is that makes that DPI dependent,
only the default DPI (96) should return the correct results (I think).

Kind regards
> Regina
>

Best Regards, Tomaž


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

2021-10-16 Thread Julien Nabet (via logerrit)
 fpicker/source/office/fileview.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 75fc91b143a4458403d68342c3636882f42c84ee
Author: Julien Nabet 
AuthorDate: Sat Oct 16 10:15:39 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 14:17:38 2021 +0200

Simplify vector initialization in fpicker

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

diff --git a/fpicker/source/office/fileview.cxx 
b/fpicker/source/office/fileview.cxx
index 42d39aca2689..788c001a5574 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -428,8 +428,7 @@ 
ViewTabListBox_Impl::ViewTabListBox_Impl(std::unique_ptr xTreeVi
 , mbEditing( false )
 , mbShowType(nFlags & FileViewFlags::SHOW_TYPE)
 {
-std::vector aWidths;
-aWidths.push_back(180);
+std::vector aWidths { 180 };
 if (nFlags & FileViewFlags::SHOW_TYPE)
 aWidths.push_back(140);
 aWidths.push_back(80);


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

2021-10-16 Thread Julien Nabet (via logerrit)
 desktop/source/app/app.cxx   |3 +--
 desktop/source/deployment/gui/dp_gui_dialog2.cxx |3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 604d464d2bdd0271ad63e5c93d4869a318eac262
Author: Julien Nabet 
AuthorDate: Sat Oct 16 10:14:28 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 13:23:30 2021 +0200

Simplify vector initialization in desktop

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

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index bd5476af896d..a026a1ede209 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1047,8 +1047,7 @@ void restartOnMac(bool passArguments) {
 {
 std::abort();
 }
-std::vector< OString > args;
-args.push_back(execPath8);
+std::vector< OString > args { execPath8 };
 bool wait = false;
 if (passArguments) {
 sal_uInt32 n = osl_getCommandArgCount();
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 6d318726bb9f..3169904aa4a6 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -592,8 +592,7 @@ void ExtMgrDialog::updatePackage( const uno::Reference< 
deployment::XPackage > &
 uno::Reference extension =
 dp_misc::getExtensionWithHighestVersion(seqExtensions);
 OSL_ASSERT(extension.is());
-std::vector< css::uno::Reference< css::deployment::XPackage > > vEntries;
-vEntries.push_back(extension);
+std::vector< css::uno::Reference< css::deployment::XPackage > > vEntries { 
extension };
 
 m_pManager->getCmdQueue()->checkForUpdates( std::move(vEntries) );
 }


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

2021-10-16 Thread Julien Nabet (via logerrit)
 cui/source/customize/acccfg.cxx|3 +--
 cui/source/customize/macropg.cxx   |9 ++---
 cui/source/dialogs/linkdlg.cxx |   11 +++
 cui/source/options/connpooloptions.cxx |9 ++---
 cui/source/options/dbregister.cxx  |   13 +
 cui/source/options/fontsubs.cxx|5 +
 cui/source/options/optaboutconfig.cxx  |   11 +++
 cui/source/options/optdict.cxx |7 +--
 cui/source/options/optfltr.cxx |8 +---
 cui/source/options/optjava.cxx |9 ++---
 cui/source/options/webconninfo.cxx |7 +--
 cui/source/tabpages/autocdlg.cxx   |   17 +++--
 cui/source/tabpages/macroass.cxx   |8 +---
 13 files changed, 74 insertions(+), 43 deletions(-)

New commits:
commit 4fd5dc6340ecd6ac09f239507622152691911d59
Author: Julien Nabet 
AuthorDate: Fri Oct 15 16:33:00 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 12:37:19 2021 +0200

Simplify vector initialization in cui

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

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index dbe8eff7c832..9745120f3591 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -889,8 +889,7 @@ 
SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(weld::Container* pPage,
 auto nNewTab = nMaxWidth + 5; // additional space
 
 // initialize Entriesbox
-std::vector aWidths;
-aWidths.push_back(nNewTab);
+std::vector aWidths{ nNewTab };
 m_xEntriesBox->set_column_fixed_widths(aWidths);
 
 //Initialize search util
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 6f03188e285c..2074060a957a 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include "macropg_impl.hxx"
+#include 
 #include 
 #include 
 #include 
@@ -500,9 +501,11 @@ void SvxMacroTabPage_::InitAndSetHandler( const Reference< 
container::XNameRepla
 mpImpl->xEventLB->connect_row_activated( LINK(this, SvxMacroTabPage_, 
DoubleClickHdl_Impl ) );
 mpImpl->xEventLB->connect_changed( LINK( this, SvxMacroTabPage_, 
SelectEvent_Impl ));
 
-std::vector aWidths;
-aWidths.push_back(mpImpl->xEventLB->get_approximate_digit_width() * 32);
-aWidths.push_back(mpImpl->xEventLB->get_checkbox_column_width());
+std::vector aWidths
+{
+o3tl::narrowing(mpImpl->xEventLB->get_approximate_digit_width() * 
32),
+mpImpl->xEventLB->get_checkbox_column_width()
+};
 mpImpl->xEventLB->set_column_fixed_widths(aWidths);
 
 mpImpl->xEventLB->show();
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index b4a494a20886..01026742da15 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 
 #include 
@@ -102,10 +103,12 @@ SvBaseLinksDlg::SvBaseLinksDlg(weld::Window * pParent, 
LinkManager* pMgr, bool b
 
 m_xTbLinks->set_selection_mode(SelectionMode::Multiple);
 
-std::vector aWidths;
-aWidths.push_back(m_xTbLinks->get_approximate_digit_width() * 30);
-aWidths.push_back(m_xTbLinks->get_approximate_digit_width() * 20);
-aWidths.push_back(m_xTbLinks->get_approximate_digit_width() * 20);
+std::vector aWidths
+{
+o3tl::narrowing(m_xTbLinks->get_approximate_digit_width() * 30),
+o3tl::narrowing(m_xTbLinks->get_approximate_digit_width() * 20),
+o3tl::narrowing(m_xTbLinks->get_approximate_digit_width() * 20)
+};
 m_xTbLinks->set_column_fixed_widths(aWidths);
 
 // UpdateTimer for DDE-/Grf-links, which are waited for
diff --git a/cui/source/options/connpooloptions.cxx 
b/cui/source/options/connpooloptions.cxx
index a478d9a652c3..1e1fa02a5529 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include "connpooloptions.hxx"
 #include "connpoolsettings.hxx"
@@ -60,9 +61,11 @@ namespace offapp
 m_xDriverList->get_height_rows(15));
 m_xDriverList->show();
 
-std::vector aWidths;
-aWidths.push_back(m_xDriverList->get_approximate_digit_width() * 50);
-aWidths.push_back(m_xDriverList->get_approximate_digit_width() * 8);
+std::vector aWidths
+{
+o3tl::narrowing(m_xDriverList->get_approximate_digit_width() 
* 50),
+o3tl::narrowing(m_xDriverList->get_approximate_digit_width() 
* 8)
+};
 m_xDriverList->set_column_fixed_widths(aWidths);
 
 m_xEnablePooling->connect_toggled( LINK(this, 
ConnectionPoolOptionsPage, OnEnabledDisabled) );
diff 

New Defects reported by Coverity Scan for LibreOffice

2021-10-16 Thread scan-admin
Hi,

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

1 new defect(s) introduced to LibreOffice found with Coverity Scan.


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


** CID 1492880:(NEGATIVE_RETURNS)



*** CID 1492880:(NEGATIVE_RETURNS)
/sc/source/ui/docshell/externalrefmgr.cxx: 1771 in 
ScExternalRefManager::storeRangeNameTokens(unsigned short, const rtl::OUString 
&, const ScTokenArray &)()
1765 bool bTokenAdded = false;
1766 switch (pToken->GetType())
1767 {
1768 case svSingleRef:
1769 {
1770 const ScSingleRefData& rRef = 
*pToken->GetSingleRef();
>>> CID 1492880:(NEGATIVE_RETURNS)
>>> "rRef->Tab()" is passed to a parameter that cannot be negative.
1771 OUString aTabName = 
maRefCache.getTableName(nFileId, rRef.Tab());
1772 ScExternalSingleRefToken aNewToken(nFileId, 
svl::SharedString(aTabName),   // string not interned
1773 *pToken->GetSingleRef());
1774 pNewArray->AddToken(aNewToken);
1775 bTokenAdded = true;
1776 }
/sc/source/ui/docshell/externalrefmgr.cxx: 1781 in 
ScExternalRefManager::storeRangeNameTokens(unsigned short, const rtl::OUString 
&, const ScTokenArray &)()
1775 bTokenAdded = true;
1776 }
1777 break;
1778 case svDoubleRef:
1779 {
1780 const ScSingleRefData& rRef = 
*pToken->GetSingleRef();
>>> CID 1492880:(NEGATIVE_RETURNS)
>>> "rRef->Tab()" is passed to a parameter that cannot be negative.
1781 OUString aTabName = 
maRefCache.getTableName(nFileId, rRef.Tab());
1782 ScExternalDoubleRefToken aNewToken(nFileId, 
svl::SharedString(aTabName),   // string not interned
1783 *pToken->GetDoubleRef());
1784 pNewArray->AddToken(aNewToken);
1785 bTokenAdded = true;
1786 }



To view the defects in Coverity Scan visit, 
https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P0qcxCbhZ31OYv50ypSs1kiFPuCn2xFdlMIFBirii0zZ9j2-2F9F2XPBcBm2BNgi9duPy3v-2FzgFDd2LJ-2BDKI-3D4ME2_OTq2XUZbbipYjyLSo6GRo-2FpVxQ9OzkDINu9UTS-2FQhSdO0F0jQniitrGlNxDIzPJiatsvszQV9nJbNxYbtjTOohGQA-2FuExu3X0beEiWtI3ZTFZLH-2BoapCju3IXlbEVrSDKQStN-2BJpSx5Yl9RV6lGVLSAigKOHNNuAS4b82mIEiX4tl-2B85u-2FPHS5nczeija9ZottU0nNNqSgMndEHF9C79K4GZK5AOOBo0Ssb-2FxvUpwWE-3D



[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - comphelper/source

2021-10-16 Thread Michael Stahl (via logerrit)
 comphelper/source/misc/storagehelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b5ec5a4b886a2ba224f4b7f5f2d92b007f199f57
Author: Michael Stahl 
AuthorDate: Fri Oct 15 10:38:10 2021 +0200
Commit: Caolán McNamara 
CommitDate: Sat Oct 16 11:15:41 2021 +0200

comphelper: fix bad error handling in CreatePackageEncryptionData()

Not sure if rtl_digest_SHA1 can realistically return an error but avoid
out-of-bounds write in this case.

(regression from commit 9188ea83c346fdc2f668178ae7538665a1b09c02)

Change-Id: If5f134cbcd9236338d1938242a469d7c79e87f06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123649
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 62128c09237152d9e0585abe2fc88f0a13274b34)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123629
Reviewed-by: Caolán McNamara 

diff --git a/comphelper/source/misc/storagehelper.cxx 
b/comphelper/source/misc/storagehelper.cxx
index cee15b1cbcb9..aeebf53e4015 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -430,7 +430,7 @@ uno::Sequence< beans::NamedValue > 
OStorageHelper::CreatePackageEncryptionData(
 if ( nError != rtl_Digest_E_None )
 {
 aEncryptionData.realloc( nSha1Ind );
-break;
+return aEncryptionData;
 }
 
 // coverity[overrun-buffer-arg : FALSE] - coverity has difficulty 
with css::uno::Sequence


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

2021-10-16 Thread Caolán McNamara (via logerrit)
 svx/uiconfig/ui/textcharacterspacingcontrol.ui |  185 -
 1 file changed, 96 insertions(+), 89 deletions(-)

New commits:
commit 17ac33abe4eb1d406da1060f772562655f973e51
Author: Caolán McNamara 
AuthorDate: Fri Oct 15 17:12:02 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 16 11:14:40 2021 +0200

add use-underline to spacing control labels

set all entries to use the same icon-size

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

diff --git a/svx/uiconfig/ui/textcharacterspacingcontrol.ui 
b/svx/uiconfig/ui/textcharacterspacingcontrol.ui
index 01cdd92d5635..ab501712f44e 100644
--- a/svx/uiconfig/ui/textcharacterspacingcontrol.ui
+++ b/svx/uiconfig/ui/textcharacterspacingcontrol.ui
@@ -12,6 +12,7 @@
 True
 False
 svx/res/symphony/spacing_very_tight.png
+1
   
   
 True
@@ -62,6 +63,7 @@
 True
 image_spacing_1
 none
+True
 0
 True
   
@@ -78,6 +80,7 @@
 True
 image_spacing_115
 none
+True
 0
 True
   
@@ -94,6 +97,7 @@
 True
 image_spacing_15
 none
+True
 0
 True
   
@@ -110,6 +114,7 @@
 True
 image_spacing_2
 none
+True
 0
 True
   
@@ -126,6 +131,7 @@
 True
 image_spacing_3
 none
+True
 0
 True
   
@@ -142,6 +148,7 @@
 True
 image_spacing_4
 none
+True
 0
 True
   
commit 507117d63f9bfa676148ed1018950dfafa6b5fc7
Author: Caolán McNamara 
AuthorDate: Fri Oct 15 17:09:29 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 16 11:14:26 2021 +0200

resave with latest glade

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

diff --git a/svx/uiconfig/ui/textcharacterspacingcontrol.ui 
b/svx/uiconfig/ui/textcharacterspacingcontrol.ui
index 66e8ae57394c..01cdd92d5635 100644
--- a/svx/uiconfig/ui/textcharacterspacingcontrol.ui
+++ b/svx/uiconfig/ui/textcharacterspacingcontrol.ui
@@ -1,141 +1,182 @@
 
-
+
 
   
+  
+-2
+1
+0.10
+1
+  
+  
+True
+False
+svx/res/symphony/spacing_very_tight.png
+  
+  
+True
+False
+svx/res/symphony/spacing_tight.png
+1
+  
+  
+True
+False
+svx/res/symphony/spacing_normal.png
+1
+  
+  
+True
+False
+svx/res/symphony/spacing_loose.png
+1
+  
+  
+True
+False
+svx/res/symphony/spacing_very_loose.png
+1
+  
+  
+True
+False
+svx/res/symphony/last_custom_common.png
+1
+  
   
-False
-True
-4
+False
+True
+4
 
-  
+  
   
 True
-False
+False
 True
 True
 
   
 Very Tight
 True
-True
-True
+True
+True
 image_spacing_1
 none
 0
-True
+True
   
   
-0
-0
+0
+0
   
 
 
   
 Tight
 True
-True
-True
+True
+True
 image_spacing_115
 none
 0
-True
+True
   
   
-0
-1
+0
+1
   
 
 
   
 Normal
 True
-True
-True
+True
+True
 image_spacing_15
 none
 0
-True
+True
   
   
-0
-2
+0
+2
   
 
 
   
 Loose
 True
-True
-True
+True
+True
 image_spacing_2
 none
 0
-True
+True
   
   
-0
-3
+0
+3
   
 
 
   
 Very Loose
 True
-True
-True
+True
+True
 image_spacing_3
 none
 0
-True
+True
   
   
-0
-4
+0
+4
   
 
 
   
 Last Custom Value
   

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

2021-10-16 Thread Caolán McNamara (via logerrit)
 svx/uiconfig/ui/sidebartextpanel.ui |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 171fcff4f027c620e977b60a48ac5014ac0cacf6
Author: Caolán McNamara 
AuthorDate: Fri Oct 15 17:08:32 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 16 11:14:01 2021 +0200

gtk4: focus can only enter popover if its parent widget can-focus

even though the popover is a separate toplevel window.

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

diff --git a/svx/uiconfig/ui/sidebartextpanel.ui 
b/svx/uiconfig/ui/sidebartextpanel.ui
index fd1a2e465e6c..b7161a6274ce 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -122,7 +122,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -133,7 +133,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -144,7 +144,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -155,7 +155,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -166,7 +166,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -191,7 +191,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -202,7 +202,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -240,7 +240,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -251,7 +251,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -276,7 +276,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -300,7 +300,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -325,7 +325,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -350,7 +350,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -361,7 +361,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -387,7 +387,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -411,7 +411,7 @@
 
   
 True
-False
+True
 True
   
   


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

2021-10-16 Thread Andrea Gelmini (via logerrit)
 wizards/source/sfwidgets/SF_PopupMenu.xba |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 05055f1873faa3544478908d2d877ec7f38c4a9c
Author: Andrea Gelmini 
AuthorDate: Fri Oct 15 20:43:00 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 10:21:56 2021 +0200

Fix typo

Change-Id: I66712db3b74e45728e3104c24823a962fd498037
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123677
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/wizards/source/sfwidgets/SF_PopupMenu.xba 
b/wizards/source/sfwidgets/SF_PopupMenu.xba
index 64a1af9a95a8..3ddda64306bd 100644
--- a/wizards/source/sfwidgets/SF_PopupMenu.xba
+++ b/wizards/source/sfwidgets/SF_PopupMenu.xba
@@ -657,7 +657,7 @@ Public Sub _Initialize(ByRef poPeer As Object _
 ''' Complete the object creation process:
 ''' - Initialize the dictionaries
 ''' - initialize the root popup menu
-''' - intialize the display area
+''' - initialize the display area
 ''' - store the arguments for later use
 ''' Args:
 ''' poPeer: a peer window
@@ -752,4 +752,4 @@ Finally:
 End Function   '  SFWidgets.SF_PopupMenu._SplitMenuItem
 
 REM  END OF SFWIDGETS.SF_POPUPMENU
-
\ No newline at end of file
+


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

2021-10-16 Thread Andrea Gelmini (via logerrit)
 wizards/source/sfwidgets/SF_PopupMenu.xba |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a38960757cda7da8911688154ec4852a6b3e5e1b
Author: Andrea Gelmini 
AuthorDate: Fri Oct 15 21:23:54 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 10:21:03 2021 +0200

Fix typo

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

diff --git a/wizards/source/sfwidgets/SF_PopupMenu.xba 
b/wizards/source/sfwidgets/SF_PopupMenu.xba
index 320ac4a22ab2..64a1af9a95a8 100644
--- a/wizards/source/sfwidgets/SF_PopupMenu.xba
+++ b/wizards/source/sfwidgets/SF_PopupMenu.xba
@@ -661,7 +661,7 @@ Public Sub _Initialize(ByRef poPeer As Object _
 ''' - store the arguments for later use
 ''' Args:
 ''' poPeer: a peer window
-''' plXPos, plYPos: the coordina
+''' plXPos, plYPos: the coordinates
 
 Try:
'  Initialize the dictionaries


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

2021-10-16 Thread Mike Kaganski (via logerrit)
 embeddedobj/source/msole/olecomponent.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 314fbd4cfa3a2f4125c9badc9033758b720db0f7
Author: Mike Kaganski 
AuthorDate: Sat Oct 16 08:27:57 2021 +0200
Commit: Julien Nabet 
CommitDate: Sat Oct 16 10:20:26 2021 +0200

Fix the copypaste error

... ever since commit 6eea9416a3a5be2d2f6aab6c58ab4e6d4b085ea8

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

diff --git a/embeddedobj/source/msole/olecomponent.cxx 
b/embeddedobj/source/msole/olecomponent.cxx
index 6122bdd6a156..f57d0f1d85b8 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -215,7 +215,7 @@ struct OleComponentNative_Impl {
 "PNG",
 cppu::UnoType>::get() );
 
-m_aSupportedGraphFormats[0] = datatransfer::DataFlavor(
+m_aSupportedGraphFormats[4] = datatransfer::DataFlavor(
 
"application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"",
 "GDIMetafile",
 cppu::UnoType>::get() );