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

[Stephan Bergmann (via logerrit)]

 scripting/source/basprov/basprov.cxx   |3 +--
 scripting/source/inc/util/MiscUtils.hxx|3 +--
 scripting/source/protocolhandler/scripthandler.cxx |3 +--
 scripting/source/provider/MasterScriptProvider.cxx |3 +--
 scripting/source/provider/ProviderCache.cxx|4 +---
 5 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 9e07acf3a9b0c9f82734c7bb23e82f7684522f13
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 21:23:21 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jun 5 08:53:18 2020 +0200

Upcoming loplugin:elidestringvar: scripting

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

diff --git a/scripting/source/basprov/basprov.cxx 
b/scripting/source/basprov/basprov.cxx
index ad990dbd4863..0d247130ff9f 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -232,8 +232,7 @@ namespace basprov
 );
 }
 
-OUString sDoc = "vnd.sun.star.tdoc";
-if ( m_sScriptingContext.startsWith( sDoc  ) )
+if ( m_sScriptingContext.startsWith( "vnd.sun.star.tdoc"  ) )
 {
 xModel = MiscUtils::tDocUrlToModel(  m_sScriptingContext );
 // TODO: use ScriptingContantsPool for SCRIPTING_DOC_REF
diff --git a/scripting/source/inc/util/MiscUtils.hxx 
b/scripting/source/inc/util/MiscUtils.hxx
index f40a51499834..e7b5bd920a58 100644
--- a/scripting/source/inc/util/MiscUtils.hxx
+++ b/scripting/source/inc/util/MiscUtils.hxx
@@ -108,8 +108,7 @@ static css::uno::Reference< css::frame::XModel > 
tDocUrlToModel( const OUString&
 try
 {
 ::ucbhelper::Content root( url, nullptr, 
comphelper::getProcessComponentContext() );
-OUString propName =  "DocumentModel";
-result = getUCBProperty( root, propName );
+result = getUCBProperty( root, "DocumentModel" );
 }
 catch ( css::ucb::ContentCreationException& )
 {
diff --git a/scripting/source/protocolhandler/scripthandler.cxx 
b/scripting/source/protocolhandler/scripthandler.cxx
index ea29661a489a..74aecbeb1e5c 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -80,8 +80,7 @@ void SAL_CALL ScriptProtocolHandler::initialize(
 // but usually it's a "real" frame)
 if ( aArguments.hasElements() && !( aArguments[ 0 ] >>= m_xFrame ) )
 {
-OUString temp = "ScriptProtocolHandler::initialize: could not extract 
reference to the frame";
-throw RuntimeException( temp );
+throw RuntimeException( "ScriptProtocolHandler::initialize: could not 
extract reference to the frame" );
 }
 
 ENSURE_OR_THROW( m_xContext.is(), "ScriptProtocolHandler::initialize: No 
Service Manager available" );
diff --git a/scripting/source/provider/MasterScriptProvider.cxx 
b/scripting/source/provider/MasterScriptProvider.cxx
index 2a12c21fb604..d6e64eb92da8 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -345,8 +345,7 @@ MasterScriptProvider::providerCache()
 ::osl::MutexGuard aGuard( m_mutex );
 if ( !m_pPCache )
 {
-OUString serviceName1 = 
"com.sun.star.script.provider.ScriptProviderForBasic";
-Sequence blacklist { serviceName1 };
+Sequence blacklist { 
"com.sun.star.script.provider.ScriptProviderForBasic" };
 
 if ( !m_bIsPkgMSP )
 {
diff --git a/scripting/source/provider/ProviderCache.cxx 
b/scripting/source/provider/ProviderCache.cxx
index e97be35acb6f..4bcbd67f9260 100644
--- a/scripting/source/provider/ProviderCache.cxx
+++ b/scripting/source/provider/ProviderCache.cxx
@@ -136,10 +136,8 @@ ProviderCache::populateCache()
 ::osl::Guard< osl::Mutex > aGuard( m_mutex );
 try
 {
-OUString const languageProviderName( 
"com.sun.star.script.provider.LanguageScriptProvider"  );
-
 Reference< container::XContentEnumerationAccess > xEnumAccess( m_xMgr, 
UNO_QUERY_THROW );
-Reference< container::XEnumeration > xEnum = 
xEnumAccess->createContentEnumeration ( languageProviderName );
+Reference< container::XEnumeration > xEnum = 
xEnumAccess->createContentEnumeration ( 
"com.sun.star.script.provider.LanguageScriptProvider" );
 
 while ( xEnum->hasMoreElements() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 shell/source/cmdmail/cmdmailsuppl.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 91f13f44f26e817b6211c48ca38dcffee4f8fa37
Author: Stephan Bergmann 
AuthorDate: Fri Jun 5 07:37:06 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jun 5 08:47:00 2020 +0200

Upcoming loplugin:elidestringvar: shell

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

diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx 
b/shell/source/cmdmail/cmdmailsuppl.cxx
index bbd0ae07d4cf..415a6c4d0051 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -159,11 +159,10 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const 
Reference< XSimpleMailM
 // Query XNameAccess interface of the 
org.openoffice.Office.Common/ExternalMailer
 // configuration node to retrieve the users preferred email 
application. This may
 // transparently by redirected to e.g. the corresponding GConf setting 
in GNOME.
-OUString aConfigRoot = "org.openoffice.Office.Common/ExternalMailer";
 
 PropertyValue aProperty;
 aProperty.Name = "nodepath";
-aProperty.Value <<= aConfigRoot;
+aProperty.Value <<= 
OUString("org.openoffice.Office.Common/ExternalMailer");
 
 Sequence< Any > aArgumentList( 1 );
 aArgumentList[0] <<= aProperty;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 3 commits - include/editeng sfx2/source sw/source

[Michael Weghorn (via logerrit)]

 include/editeng/numitem.hxx|8 ++--
 sfx2/source/doc/objserv.cxx|4 
 sw/source/core/doc/number.cxx  |4 ++--
 sw/source/core/unocore/unosett.cxx |7 ---
 sw/source/filter/ww8/wrtw8num.cxx  |2 +-
 5 files changed, 17 insertions(+), 8 deletions(-)

New commits:
commit a8770e97294b4011e6986eba6d308373c06c19bb
Merge: 700cf71e3eec cdcbf109c47d
Author: Michael Weghorn 
AuthorDate: Fri Jun 5 08:27:50 2020 +0200
Commit: Michael Weghorn 
CommitDate: Fri Jun 5 08:27:50 2020 +0200

Merge branch 'libreoffice-6-4'

into distro/lhm/libreoffice-6-4+backports

Change-Id: I7e055931d800686b9ffe67678c5df42239a5d067

commit cdcbf109c47d366539b98c6e379874ae08de08e1
Author: Vasily Melenchuk 
AuthorDate: Fri May 15 18:17:34 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Fri Jun 5 01:12:37 2020 +0200

tdf#120394: list format string can be empty

We need to distunguish when we have list format string, but it
is empty (no level text will be diplayed) or it does not exist
at all, so we need to fallback to old prefix-suffix syntax.

Change-Id: Ifd4ccd5a676db86c39d2ef48e91d191d92b9b2a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94322
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit d8329149394e4e5758a9e293b0162db050379a4e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95413

diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 52cb14858c1f..b1fa7c66b039 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 class SvxBrushItem;
@@ -102,7 +103,9 @@ public:
 private:
 OUStringsPrefix;
 OUStringsSuffix;
-OUStringsListFormat;// Format string ">%1.%2<" can be 
used instead of prefix/suffix
+std::optional sListFormat;// Format string ">%1.%2<" can 
be used instead of prefix/suffix
+// Right now it is optional 
value to dostinguish empty list format
+// and not set list format 
when we need to fallback to prefix/suffix.
 
 SvxAdjust   eNumAdjust;
 
@@ -168,7 +171,8 @@ public:
 voidSetSuffix(const OUString& rSet) { sSuffix = rSet;}
 const OUString& GetSuffix() const { return sSuffix;}
 voidSetListFormat(const OUString& rSet) { sListFormat = rSet; }
-const OUString& GetListFormat() const { return sListFormat; }
+boolHasListFormat() const { return sListFormat.has_value(); }
+const OUString& GetListFormat() const { return *sListFormat; }
 
 voidSetCharFormatName(const OUString& rSet){ 
sCharStyleName = rSet; }
 virtual OUStringGetCharFormatName()const;
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index df3dcf76bfff..481ebfada8eb 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -641,9 +641,9 @@ OUString SwNumRule::MakeNumString( const 
SwNumberTree::tNumberVector & rNumVecto
 {
 css::lang::Locale aLocale( LanguageTag::convertToLocale(nLang));
 
-OUString sLevelFormat = rMyNFormat.GetListFormat();
-if (!sLevelFormat.isEmpty())
+if (rMyNFormat.HasListFormat())
 {
+OUString sLevelFormat = rMyNFormat.GetListFormat();
 // In this case we are ignoring GetIncludeUpperLevels: we put 
all
 // level nubers requested by level format
 for (SwNumberTree::tNumberVector::size_type i=0; i <= nLevel; 
++i)
diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index 8f0d95005a2a..1f68135f7a4a 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1343,11 +1343,12 @@ uno::Sequence 
SwXNumberingRules::GetPropertiesForNumFormat
 aPropertyValues.push_back(comphelper::makePropertyValue("Suffix", 
aUString));
 
 //listformat
-aUString = rFormat.GetListFormat();
-aPropertyValues.push_back(comphelper::makePropertyValue("ListFormat", 
aUString));
+if (rFormat.HasListFormat())
+{
+aPropertyValues.push_back(comphelper::makePropertyValue("ListFormat", 
rFormat.GetListFormat()));
+}
 
 //char style name
-
 aUString.clear();
 SwStyleNameMapper::FillProgName( rCharFormatName, aUString, 
SwGetPoolIdFromName::ChrFmt);
 aPropertyValues.push_back(comphelper::makePropertyValue("CharStyleName", 
aUString));
diff --git a/sw/source/filter/ww8/wrtw8num.cxx 
b/sw/source/filter/ww8/wrtw8num.cxx
index ffd793d6db79..d08a7703ce50 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -493,7 +493,7 @@ void MSWordExportBase::NumberingLevel(
 const vcl::Font* pBulletFont=nullptr;
 

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

[Stephan Bergmann (via logerrit)]

 sccomp/qa/unit/SwarmSolverTest.cxx |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 5bc4d69007cfb715ea16e616c2fc5b90adc2f289
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 21:23:11 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jun 5 08:16:58 2020 +0200

Upcoming loplugin:elidestringvar: sccomp

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

diff --git a/sccomp/qa/unit/SwarmSolverTest.cxx 
b/sccomp/qa/unit/SwarmSolverTest.cxx
index a92eb0b65d49..7b424cabbd56 100644
--- a/sccomp/qa/unit/SwarmSolverTest.cxx
+++ b/sccomp/qa/unit/SwarmSolverTest.cxx
@@ -67,9 +67,9 @@ void SwarmSolverTest::testUnconstrained()
 uno::Reference xSheet(xIndex->getByIndex(0), 
uno::UNO_QUERY_THROW);
 
 uno::Reference xSolver;
-const OUString sSolverName("com.sun.star.comp.Calc.SwarmSolver");
 
-
xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext(sSolverName,
 m_xContext),
+xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext(
+"com.sun.star.comp.Calc.SwarmSolver", m_xContext),
 uno::UNO_QUERY_THROW);
 
 table::CellAddress aObjective(0, 1, 1);
@@ -117,9 +117,9 @@ void SwarmSolverTest::testVariableBounded()
 uno::Reference xSheet(xIndex->getByIndex(0), 
uno::UNO_QUERY_THROW);
 
 uno::Reference xSolver;
-const OUString sSolverName("com.sun.star.comp.Calc.SwarmSolver");
 
-
xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext(sSolverName,
 m_xContext),
+xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext(
+"com.sun.star.comp.Calc.SwarmSolver", m_xContext),
 uno::UNO_QUERY_THROW);
 
 table::CellAddress aObjective(0, 1, 1);
@@ -169,9 +169,9 @@ void SwarmSolverTest::testVariableConstrained()
 uno::Reference xSheet(xIndex->getByIndex(0), 
uno::UNO_QUERY_THROW);
 
 uno::Reference xSolver;
-const OUString sSolverName("com.sun.star.comp.Calc.SwarmSolver");
 
-
xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext(sSolverName,
 m_xContext),
+xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext(
+"com.sun.star.comp.Calc.SwarmSolver", m_xContext),
 uno::UNO_QUERY_THROW);
 
 table::CellAddress aObjective(0, 1, 1);
@@ -225,9 +225,9 @@ void SwarmSolverTest::testTwoVariables()
 uno::Reference xSheet(xIndex->getByIndex(0), 
uno::UNO_QUERY_THROW);
 
 uno::Reference xSolver;
-const OUString sSolverName("com.sun.star.comp.Calc.SwarmSolver");
 
-
xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext(sSolverName,
 m_xContext),
+xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext(
+"com.sun.star.comp.Calc.SwarmSolver", m_xContext),
 uno::UNO_QUERY_THROW);
 
 table::CellAddress aObjective(0, 1, 5);
@@ -288,9 +288,9 @@ void SwarmSolverTest::testMultipleVariables()
 uno::Reference xSheet(xIndex->getByIndex(0), 
uno::UNO_QUERY_THROW);
 
 uno::Reference xSolver;
-const OUString sSolverName("com.sun.star.comp.Calc.SwarmSolver");
 
-
xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext(sSolverName,
 m_xContext),
+xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext(
+"com.sun.star.comp.Calc.SwarmSolver", m_xContext),
 uno::UNO_QUERY_THROW);
 
 uno::Reference xPropSet(xSolver, 
uno::UNO_QUERY_THROW);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sd/qa/unit/dialogs-test.cxx  |3 -
 sd/qa/unit/export-tests-ooxml2.cxx   |   28 ---
 sd/qa/unit/import-tests-smartart.cxx |3 -
 sd/qa/unit/import-tests.cxx  |6 +--
 sd/qa/unit/misc-tests.cxx|   12 ++
 sd/source/core/CustomAnimationEffect.cxx |6 +--
 sd/source/core/CustomAnimationPreset.cxx |   21 +++
 sd/source/core/stlfamily.cxx |3 -
 sd/source/filter/sdpptwrp.cxx|3 -
 sd/source/filter/xml/sdxmlwrp.cxx|3 -
 sd/source/ui/app/sdmod1.cxx  |3 -
 sd/source/ui/dlg/animobjs.cxx|3 -
 sd/source/ui/dlg/inspagob.cxx|3 -
 sd/source/ui/docshell/docshel3.cxx   |9 +---
 sd/source/ui/func/fuinsfil.cxx   |3 -
 sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx |7 +--
 sd/source/ui/table/TableDesignPane.cxx   |6 +--
 sd/source/ui/unoidl/unopage.cxx  |6 +--
 18 files changed, 41 insertions(+), 87 deletions(-)

New commits:
commit 88a5f7769ed39c976129652db7de43e69c925e3c
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 23:31:11 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jun 5 07:34:57 2020 +0200

Upcoming loplugin:elidestringvar: sd

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

diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 4eb9d9884481..b0f5ce782969 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -365,12 +365,11 @@ VclPtr 
SdDialogsTest::createDialogByID(sal_uInt32 nID)
 // CreateSdInsertPagesObjsDlg(const SdDrawDocument* pDoc, 
SfxMedium* pSfxMedium, const OUString& rFileName) override;
 SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
 CPPUNIT_ASSERT(pDrawDoc);
-const OUString aFileName("foo");
 pRetval = getSdAbstractDialogFactory()->CreateSdInsertPagesObjsDlg(
 getViewShell()->GetFrameWeld(),
 pDrawDoc,
 nullptr,
-aFileName);
+"foo");
 break;
 }
 case 10:
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index c6d2f48aedde..a3ff094b7f21 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -543,10 +543,9 @@ void SdOOXMLExportTest2::testTdf123090()
 CPPUNIT_ASSERT_EQUAL(OUString("aaa"), xTextRange->getString());
 
 sal_Int32 nWidth;
-const OUString sWidth("Width");
 uno::Reference< css::table::XTableColumns > xColumns( 
xTable->getColumns(), uno::UNO_SET_THROW);
 uno::Reference< beans::XPropertySet > xRefColumn( xColumns->getByIndex(1), 
uno::UNO_QUERY_THROW );
-xRefColumn->getPropertyValue( sWidth ) >>= nWidth;
+xRefColumn->getPropertyValue( "Width" ) >>= nWidth;
 CPPUNIT_ASSERT_EQUAL( sal_Int32(9136), nWidth);
 
 xDocShRef->DoClose();
@@ -1170,11 +1169,10 @@ void SdOOXMLExportTest2::testTdf111518()
 xShell->DoClose();
 
 xmlDocUniquePtr pXmlDocRels = parseExport(tempFile, 
"ppt/slides/slide1.xml");
-OUString sExpect = "M -3.54167E-6 -4.81481E-6 L 0.39037 -0.00069 E";
 OUString sActual = getXPath(pXmlDocRels,
 
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:animMotion",
 "path");
-CPPUNIT_ASSERT_MOTIONPATH(sExpect, sActual);
+CPPUNIT_ASSERT_MOTIONPATH("M -3.54167E-6 -4.81481E-6 L 0.39037 -0.00069 
E", sActual);
 }
 
 void SdOOXMLExportTest2::testTdf100387()
@@ -2249,24 +2247,16 @@ void SdOOXMLExportTest2::testTdf120573()
 
 void SdOOXMLExportTest2::testTdf118825()
 {
-const OUString sPath1 = "M 0.0449285714285714 0.00368253968253968 C 
0.0575714285714285 -0.00095238095238096 0.0704264795523803 -0.00370117418637049 
0.0831071428571428 -0.00819047619047622 C 0.0953550597998766 
-0.0125265741339082 0.107821870086751 -0.010397536991717 0.120321428571429 
-0.0116 C 0.133179018681433 -0.0127467438724762 0.151318627483861 
-0.0158700272533852 0.1585 0.00539682539682542 C 0.16478291361998 
0.0240029898688431 0.15828642886492 0.0483806254341085 0.161392857142857 
0.0698412698412698 C 0.165179286017685 0.0959996731216037 0.17453898927982 
0.119735912694626 0.187142857142857 0.132634920634921 C 0.199788991845377 
0.145577185161529 0.215607110490848 0.142889773028431 0.230107142857143 
0.142857142857143 C 0.243821417584191 0.142826280916829 0.257716514999779 
0.142685979556724 

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

[Stephan Bergmann (via logerrit)]

 sal/qa/rtl/oustring/rtl_OUString2.cxx   |   63 +++-
 sal/qa/rtl/strings/test_oustring_concat.cxx |6 +-
 2 files changed, 21 insertions(+), 48 deletions(-)

New commits:
commit e2bb284381b3355448f44ea13931aca1aea12e25
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 18:17:41 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jun 5 07:33:57 2020 +0200

Upcoming loplugin:elidestringvar: sal

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

diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx 
b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index 4a3a405d8fc5..cbfdd800f1c3 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -560,121 +560,94 @@ public:
 {
 // search for sun, start at the end, found (pos==0)
 OUString aStr("sun java system");
-OUString aSearchStr("sun");
-lastIndexOf_oustring_offset(aStr, aSearchStr, 0, aStr.getLength());
+lastIndexOf_oustring_offset(aStr, "sun", 0, aStr.getLength());
 }
 
 void lastIndexOf_test_oustring_offset_002()
 {
 // search for sun, start at pos = 3, found (pos==0)
-OUString aStr("sun java system");
-OUString aSearchStr("sun");
-lastIndexOf_oustring_offset(aStr, aSearchStr, 0, 3);
+lastIndexOf_oustring_offset("sun java system", "sun", 0, 3);
 }
 
 void lastIndexOf_test_oustring_offset_003()
 {
 // search for sun, start at pos = 2, found (pos==-1)
-OUString aStr("sun java system");
-OUString aSearchStr("sun");
-lastIndexOf_oustring_offset(aStr, aSearchStr, -1, 2);
+lastIndexOf_oustring_offset("sun java system", "sun", -1, 2);
 }
 
 void lastIndexOf_test_oustring_offset_004()
 {
 // search for sun, start at the end, found (pos==0)
-OUString aStr("sun java system");
-OUString aSearchStr("sun");
-lastIndexOf_oustring_offset(aStr, aSearchStr, -1, 1);
+lastIndexOf_oustring_offset("sun java system", "sun", -1, 1);
 }
 
 void lastIndexOf_test_oustring_001()
 {
 // search for sun, found (pos==0)
-OUString aStr("sun java system");
-OUString aSearchStr("sun");
-lastIndexOf_oustring(aStr, aSearchStr, 0);
+lastIndexOf_oustring("sun java system", "sun", 0);
 }
 
 void lastIndexOf_test_oustring_002()
 {
 // search for sun, found (pos==4)
-OUString aStr("the sun java system");
-OUString aSearchStr("sun");
-lastIndexOf_oustring(aStr, aSearchStr, 4);
+lastIndexOf_oustring("the sun java system", "sun", 4);
 }
 
 void lastIndexOf_test_oustring_003()
 {
 // search for sun, found (pos==8)
-OUString aStr("the sun sun java system");
-OUString aSearchStr("sun");
-lastIndexOf_oustring(aStr, aSearchStr, 8);
+lastIndexOf_oustring("the sun sun java system", "sun", 8);
 }
 
 void lastIndexOf_test_oustring_004()
 {
 // search for sun, found (pos==8)
-OUString aStr("the sun sun");
-OUString aSearchStr("sun");
-lastIndexOf_oustring(aStr, aSearchStr, 8);
+lastIndexOf_oustring("the sun sun", "sun", 8);
 }
 
 void lastIndexOf_test_oustring_005()
 {
 // search for sun, found (pos==4)
-OUString aStr("the sun su");
-OUString aSearchStr("sun");
-lastIndexOf_oustring(aStr, aSearchStr, 4);
+lastIndexOf_oustring("the sun su", "sun", 4);
 }
 
 void lastIndexOf_test_oustring_006()
 {
 // search for sun, found (pos==-1)
-OUString aStr("the su su");
-OUString aSearchStr("sun");
-lastIndexOf_oustring(aStr, aSearchStr, -1);
+lastIndexOf_oustring("the su su", "sun", -1);
 }
 
 void lastIndexOf_test_oustring_007()
 {
 // search for earth, not found (-1)
-OUString aStr("the su su");
-OUString aSearchStr("earth");
-lastIndexOf_oustring(aStr, aSearchStr, -1);
+lastIndexOf_oustring("the su su", "earth", -1);
 }
 
 void lastIndexOf_test_oustring_008()
 {
 // search for earth, not found (-1)
-OUString aStr;
-OUString aSearchStr("earth");
-lastIndexOf_oustring(aStr, aSearchStr, -1);
+lastIndexOf_oustring("", "earth", -1);
 }
 
 void lastIndexOf_test_oustring_009()
 {
 // search for earth, not found (-1)
-OUString aStr;
-OUString aSe

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

[Stephan Bergmann (via logerrit)]

 sc/qa/extras/macros-test.cxx |   12 --
 sc/qa/extras/sccellrangeobj.cxx  |3 
 sc/qa/unit/helper/shared_test_impl.hxx   |3 
 sc/qa/unit/scshapetest.cxx   |3 
 sc/qa/unit/subsequent_export-test.cxx|3 
 sc/qa/unit/subsequent_filters-test.cxx   |   17 +--
 sc/qa/unit/ucalc.cxx |   52 +++--
 sc/qa/unit/ucalc_formula.cxx |   58 +++
 sc/source/core/data/documen3.cxx |3 
 sc/source/core/tool/compiler.cxx |3 
 sc/source/filter/xml/xmlwrap.cxx |3 
 sc/source/ui/Accessibility/AccessibleCellBase.cxx|4 
 sc/source/ui/Accessibility/AccessibleDocument.cxx|3 
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx |3 
 sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx   |3 
 sc/source/ui/attrdlg/scabstdlg.cxx   |4 
 sc/source/ui/docshell/docsh4.cxx |9 -
 sc/source/ui/docshell/impex.cxx  |3 
 sc/source/ui/miscdlgs/linkarea.cxx   |7 -
 sc/source/ui/vba/vbaworksheet.cxx|3 
 20 files changed, 65 insertions(+), 134 deletions(-)

New commits:
commit 4b85108773f9851f358a4daa8869eeadc638d103
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 21:23:01 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jun 5 07:34:21 2020 +0200

Upcoming loplugin:elidestringvar: sc

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

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 3801a9998895..ee1aa5c6fe27 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -77,9 +77,8 @@ void 
ScMacrosTest::saveAndReload(css::uno::Reference& xCo
 // module, we could move the test there then ) - relates to fdo#67547
 void ScMacrosTest::testMSP()
 {
-const OUString aFileNameBase("MasterScriptProviderProblem.ods");
 OUString aFileName;
-createFileURL(aFileNameBase, aFileName);
+createFileURL("MasterScriptProviderProblem.ods", aFileName);
 uno::Reference< css::lang::XComponent > xComponent = 
loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");
 
 CPPUNIT_ASSERT_MESSAGE("Failed to load MasterScriptProviderProblem.ods", 
xComponent.is());
@@ -109,9 +108,8 @@ void ScMacrosTest::testMSP()
 
 void ScMacrosTest::testPasswordProtectedStarBasic()
 {
-const OUString aFileNameBase("testTypePassword.ods");
 OUString aFileName;
-createFileURL(aFileNameBase, aFileName);
+createFileURL("testTypePassword.ods", aFileName);
 uno::Reference< css::lang::XComponent > xComponent = 
loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");
 
 CPPUNIT_ASSERT_MESSAGE("Failed to load testTypePassword.ods", 
xComponent.is());
@@ -164,9 +162,8 @@ void ScMacrosTest::testPasswordProtectedStarBasic()
 
 void ScMacrosTest::testStarBasic()
 {
-const OUString aFileNameBase("StarBasic.ods");
 OUString aFileName;
-createFileURL(aFileNameBase, aFileName);
+createFileURL("StarBasic.ods", aFileName);
 uno::Reference< css::lang::XComponent > xComponent = 
loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");
 
 CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is());
@@ -361,9 +358,8 @@ void ScMacrosTest::testVba()
 
 void ScMacrosTest::testRowColumn()
 {
-const OUString aFileNameBase("StarBasic.ods");
 OUString aFileName;
-createFileURL(aFileNameBase, aFileName);
+createFileURL("StarBasic.ods", aFileName);
 uno::Reference< css::lang::XComponent > xComponent = 
loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");
 
 CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is());
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index 1c0513a9a836..689783dafcbd 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -249,8 +249,7 @@ void ScCellRangeObj::setUp()
 CalcUnoApiTest::setUp();
 
 OUString aFileURL;
-const OUString aFileBase("xcellrangesquery.ods");
-createFileURL(aFileBase, aFileURL);
+createFileURL("xcellrangesquery.ods", aFileURL);
 mxComponent = loadFromDesktop(aFileURL, 
"com.sun.star.sheet.SpreadsheetDocument");
 }
 
diff --git a/sc/qa/unit/helper/shared_test_impl.hxx 
b/sc/qa/unit/helper/shared_test_impl.hxx
index 6dbd67769c85..e5bffd5c8f06 100644
--- a/sc/qa/unit/helper/shared_test_impl.hxx
+++ b/sc/qa/unit/helper/shared_test_impl.hxx
@@ -279,9 +279,8 @@ void testCeilingFloor_Impl(

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - bin/check-implementer-notes.py

[Thorsten Behrens (via logerrit)]

 bin/check-implementer-notes.py |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4ff0670850fa18015ca5c2b2165668ea88c25174
Author: Thorsten Behrens 
AuthorDate: Thu Jun 4 23:03:31 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Jun 5 01:15:52 2020 +0200

Battle-harden ODF implementer notes script

- make sure multiple commit hashes per line are all extracted
- adjust cut-off date to May 18th, when Michael had finished
  adding missing implementer notes

Change-Id: Ieb689442369792d701762d4325c73f17d2f3f703
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95541
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 435cda0f683644fd48a5ade15defa2589f8a66c7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95552

diff --git a/bin/check-implementer-notes.py b/bin/check-implementer-notes.py
index 378c16a6e933..10b7c168ba0e 100755
--- a/bin/check-implementer-notes.py
+++ b/bin/check-implementer-notes.py
@@ -11,7 +11,7 @@ wiki_pages = [
 
 # get all commit hashes mentioned in implementer notes
 wiki_commit_hashes = {}
-query = re.compile('\{\{commit\|(\\w+).*\}\}', re.IGNORECASE)
+query = re.compile('\{\{commit\|(\\w+)\|\\w*\|\\w*\}\}', re.IGNORECASE)
 for page in wiki_pages:
 r = http.request('GET', page)
 data = json.loads(r.data.decode('utf-8'))
@@ -21,10 +21,10 @@ for page in wiki_pages:
 
 # get all commits that change core/schema/* - and are _not_ mentioned
 # in the wiki page
-# Cut-off is Jan 1st 2020, when we started cleaning this up
+# Cut-off is May 18th 2020, when Michael Stahl had finished cleaning this up
 for commit in subprocess.check_output(
 ['git', '--no-pager', '-C', sys.path[0]+'/..', 'log',
- '--since=2020-01-01', '--format=%H', '--', 'schema/'],
+ '--since=2020-05-18', '--format=%H', '--', 'schema/'],
 stderr=subprocess.STDOUT).decode("utf-8").split("\n"):
 if commit != '' and commit not in wiki_commit_hashes:
 print('missing commit: %s' % commit)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/check-implementer-notes.py

[Thorsten Behrens (via logerrit)]

 bin/check-implementer-notes.py |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 75e1cf6c6ea83e65da248dab917b06feea6c18e4
Author: Thorsten Behrens 
AuthorDate: Thu Jun 4 23:03:31 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Jun 5 01:14:34 2020 +0200

Battle-harden ODF implementer notes script

- make sure multiple commit hashes per line are all extracted
- adjust cut-off date to May 18th, when Michael had finished
  adding missing implementer notes

Change-Id: Ieb689442369792d701762d4325c73f17d2f3f703
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95541
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/bin/check-implementer-notes.py b/bin/check-implementer-notes.py
index 378c16a6e933..10b7c168ba0e 100755
--- a/bin/check-implementer-notes.py
+++ b/bin/check-implementer-notes.py
@@ -11,7 +11,7 @@ wiki_pages = [
 
 # get all commit hashes mentioned in implementer notes
 wiki_commit_hashes = {}
-query = re.compile('\{\{commit\|(\\w+).*\}\}', re.IGNORECASE)
+query = re.compile('\{\{commit\|(\\w+)\|\\w*\|\\w*\}\}', re.IGNORECASE)
 for page in wiki_pages:
 r = http.request('GET', page)
 data = json.loads(r.data.decode('utf-8'))
@@ -21,10 +21,10 @@ for page in wiki_pages:
 
 # get all commits that change core/schema/* - and are _not_ mentioned
 # in the wiki page
-# Cut-off is Jan 1st 2020, when we started cleaning this up
+# Cut-off is May 18th 2020, when Michael Stahl had finished cleaning this up
 for commit in subprocess.check_output(
 ['git', '--no-pager', '-C', sys.path[0]+'/..', 'log',
- '--since=2020-01-01', '--format=%H', '--', 'schema/'],
+ '--since=2020-05-18', '--format=%H', '--', 'schema/'],
 stderr=subprocess.STDOUT).decode("utf-8").split("\n"):
 if commit != '' and commit not in wiki_commit_hashes:
 print('missing commit: %s' % commit)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Vasily Melenchuk (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf120394.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx   |   25 +
 sw/qa/extras/rtfimport/rtfimport.cxx |5 +-
 sw/source/core/doc/number.cxx|7 +++
 sw/source/filter/ww8/wrtw8num.cxx|   30 +++
 writerfilter/source/dmapper/NumberingManager.cxx |   44 +++
 6 files changed, 56 insertions(+), 55 deletions(-)

New commits:
commit 36c713f673796f51b9bc657492b0c16396231805
Author: Vasily Melenchuk 
AuthorDate: Sun May 17 13:35:46 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Fri Jun 5 01:13:05 2020 +0200

tdf#120394: DOCX list import: simplify zero width space hack

Since introducion of list format string hack with creation
of zero-width-space can be much more simple. It was being
used to indicate existing, but empty list label suffix to
avoid stripping down numbering.

Change-Id: I9a0c6047f806b2c656ef5dbab0c6b38200818bd2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94383
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 8401181bf0232959efb516802abcda42377ea06e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95315

diff --git a/sw/qa/extras/ooxmlexport/data/tdf120394.docx 
b/sw/qa/extras/ooxmlexport/data/tdf120394.docx
new file mode 100644
index ..39bd5886c0fe
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf120394.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index b372f2e86dcd..b95d0afe4e8f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -887,6 +887,31 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128290, 
"tdf128290.odt")
 assertXPath(pXml, "/w:document/w:body/w:tbl/w:tblPr/w:tblLayout", "type", 
"fixed");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf120394, "tdf120394.docx")
+{
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+{
+uno::Reference xPara(getParagraph(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(0), 
getProperty(xPara, "NumberingLevel"));
+CPPUNIT_ASSERT_EQUAL(OUString("1"), getProperty(xPara, 
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(2), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), 
getProperty(xPara, "NumberingLevel"));
+CPPUNIT_ASSERT_EQUAL(OUString(CHAR_ZWSP), getProperty(xPara, 
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(3), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), 
getProperty(xPara, "NumberingLevel"));
+CPPUNIT_ASSERT_EQUAL(OUString(CHAR_ZWSP), getProperty(xPara, 
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(5), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(2), 
getProperty(xPara, "NumberingLevel"));
+CPPUNIT_ASSERT_EQUAL(OUString("1.2.1"), getProperty(xPara, 
"ListLabelString"));
+}
+}
+
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf123757, "tdf123757.docx")
 {
 xmlDocUniquePtr pXml = parseExport("word/document.xml");
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 085a71aedc86..cf9d5dd31309 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -343,8 +343,7 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo49692)
 
 if (rProp.Name == "Suffix")
 {
-OUString aExpected(u'\x200B');
-CPPUNIT_ASSERT_EQUAL(aExpected, rProp.Value.get());
+CPPUNIT_ASSERT(rProp.Value.get().isEmpty());
 }
 }
 }
@@ -1358,7 +1357,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf78506)
 
 if (rProp.Name == "Suffix")
 // This was '0', invalid \levelnumbers wasn't ignored.
-CPPUNIT_ASSERT_EQUAL(CHAR_ZWSP, 
rProp.Value.get().toChar());
+CPPUNIT_ASSERT(rProp.Value.get().isEmpty());
 }
 }
 
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index d871a8033410..1de08ae9f761 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -667,6 +667,13 @@ OUString SwNumRule::MakeNumString( const 
SwNumberTree::tNumberVector & rNumVecto
 if (nPosition >= 0)
 sLevelFormat = sLevelFormat.replaceAt(nPosition, 
sFind.getLength(), sReplacement);
 }
+
+// As a fallback: caller code expects nonempty string as a 
result.
+// But if we have empty string (and had no errors before) this 
is valid result.
+// So use classical hack with zero-width-space as a string 
filling.
+if (sLevelFormat.isEmpty())
+sLevelFormat = OUStringChar(CHAR_ZWSP);
+
 aStr = sLevelFormat;
 }
 else
diff --git a/sw/source/filter/ww8/wrtw8num.cxx 
b/sw/

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

[Vasily Melenchuk (via logerrit)]

 include/editeng/numitem.hxx|8 ++--
 sw/source/core/doc/number.cxx  |4 ++--
 sw/source/core/unocore/unosett.cxx |7 ---
 sw/source/filter/ww8/wrtw8num.cxx  |2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit cdcbf109c47d366539b98c6e379874ae08de08e1
Author: Vasily Melenchuk 
AuthorDate: Fri May 15 18:17:34 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Fri Jun 5 01:12:37 2020 +0200

tdf#120394: list format string can be empty

We need to distunguish when we have list format string, but it
is empty (no level text will be diplayed) or it does not exist
at all, so we need to fallback to old prefix-suffix syntax.

Change-Id: Ifd4ccd5a676db86c39d2ef48e91d191d92b9b2a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94322
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit d8329149394e4e5758a9e293b0162db050379a4e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95413

diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 52cb14858c1f..b1fa7c66b039 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 class SvxBrushItem;
@@ -102,7 +103,9 @@ public:
 private:
 OUStringsPrefix;
 OUStringsSuffix;
-OUStringsListFormat;// Format string ">%1.%2<" can be 
used instead of prefix/suffix
+std::optional sListFormat;// Format string ">%1.%2<" can 
be used instead of prefix/suffix
+// Right now it is optional 
value to dostinguish empty list format
+// and not set list format 
when we need to fallback to prefix/suffix.
 
 SvxAdjust   eNumAdjust;
 
@@ -168,7 +171,8 @@ public:
 voidSetSuffix(const OUString& rSet) { sSuffix = rSet;}
 const OUString& GetSuffix() const { return sSuffix;}
 voidSetListFormat(const OUString& rSet) { sListFormat = rSet; }
-const OUString& GetListFormat() const { return sListFormat; }
+boolHasListFormat() const { return sListFormat.has_value(); }
+const OUString& GetListFormat() const { return *sListFormat; }
 
 voidSetCharFormatName(const OUString& rSet){ 
sCharStyleName = rSet; }
 virtual OUStringGetCharFormatName()const;
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index df3dcf76bfff..481ebfada8eb 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -641,9 +641,9 @@ OUString SwNumRule::MakeNumString( const 
SwNumberTree::tNumberVector & rNumVecto
 {
 css::lang::Locale aLocale( LanguageTag::convertToLocale(nLang));
 
-OUString sLevelFormat = rMyNFormat.GetListFormat();
-if (!sLevelFormat.isEmpty())
+if (rMyNFormat.HasListFormat())
 {
+OUString sLevelFormat = rMyNFormat.GetListFormat();
 // In this case we are ignoring GetIncludeUpperLevels: we put 
all
 // level nubers requested by level format
 for (SwNumberTree::tNumberVector::size_type i=0; i <= nLevel; 
++i)
diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index 8f0d95005a2a..1f68135f7a4a 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1343,11 +1343,12 @@ uno::Sequence 
SwXNumberingRules::GetPropertiesForNumFormat
 aPropertyValues.push_back(comphelper::makePropertyValue("Suffix", 
aUString));
 
 //listformat
-aUString = rFormat.GetListFormat();
-aPropertyValues.push_back(comphelper::makePropertyValue("ListFormat", 
aUString));
+if (rFormat.HasListFormat())
+{
+aPropertyValues.push_back(comphelper::makePropertyValue("ListFormat", 
rFormat.GetListFormat()));
+}
 
 //char style name
-
 aUString.clear();
 SwStyleNameMapper::FillProgName( rCharFormatName, aUString, 
SwGetPoolIdFromName::ChrFmt);
 aPropertyValues.push_back(comphelper::makePropertyValue("CharStyleName", 
aUString));
diff --git a/sw/source/filter/ww8/wrtw8num.cxx 
b/sw/source/filter/ww8/wrtw8num.cxx
index ffd793d6db79..d08a7703ce50 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -493,7 +493,7 @@ void MSWordExportBase::NumberingLevel(
 const vcl::Font* pBulletFont=nullptr;
 rtl_TextEncoding eChrSet=0;
 FontFamily eFamily=FAMILY_DECORATIVE;
-if (!rRule.Get(nLvl).GetListFormat().isEmpty())
+if (rRule.Get(nLvl).HasListFormat())
 {
 // Nothing to construct: we have it already
 sNumStr = rRule.Get(nLvl).GetListFormat();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freede

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - xmloff/source

[Michael Stahl (via logerrit)]

 xmloff/source/style/PageMasterExportPropMapper.cxx |   25 +++--
 1 file changed, 14 insertions(+), 11 deletions(-)

New commits:
commit 69eb1bb950d09c8edfc78f980c21645c88ac408e
Author: Michael Stahl 
AuthorDate: Thu Jun 4 13:28:33 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Jun 5 01:11:48 2020 +0200

xmloff: ODF export: fix crash on tdf125455-2.odt

FillBitmapMode is a very funny property that is stored as 2 items
XFillBmpTileItem XATTR_FILLBMP_TILE and
XFillBmpStretchItem XATTR_FILLBMP_STRETCH
and the XPropertySet implementations for it are a bit inconsistent,
e.g. sd uses .GetItem which searches the parent
and requires both items to be present,
but sw uses GetItemState(XATTR_FILLBMP_STRETCH, false) which does not
check the parent and one item is enough.

Let's just not export the attribute in case the property isn't defined.

(regression from 4d4404b79bf051de79f587bdafd82cc0addfc636)

Change-Id: I13c2e91c3e4eb15ebec508f679ba49614f493a11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95501
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit c87ed105f17ce68842cfacddf96a9082feb9981c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95428
Reviewed-by: Thorsten Behrens 

diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx 
b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 22078b2376a1..9c20a6a2b70e 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -591,19 +591,22 @@ void XMLPageMasterExportPropMapper::ContextFilter(
 backgroundSize <<= true;
 break;
 case drawing::FillStyle_BITMAP:
-assert(pFillBitmapMode);
-switch (pFillBitmapMode->maValue.get())
+if (pFillBitmapMode)
 {
-case drawing::BitmapMode_REPEAT:
-backgroundSize <<= true;
-break;
-case drawing::BitmapMode_STRETCH:
-case drawing::BitmapMode_NO_REPEAT:
-backgroundSize <<= false;
-break;
-default:
-assert(false);
+switch 
(pFillBitmapMode->maValue.get())
+{
+case drawing::BitmapMode_REPEAT:
+backgroundSize <<= true;
+break;
+case drawing::BitmapMode_STRETCH:
+case drawing::BitmapMode_NO_REPEAT:
+backgroundSize <<= false;
+break;
+default:
+assert(false);
+}
 }
+// else: leave it ambiguous if not explicitly defined
 break;
 default:
 assert(false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Vasily Melenchuk (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf83309.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx   |   14 ++
 sw/source/core/text/txttab.cxx   |   10 +-
 sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
 sw/source/filter/ww8/wrtw8num.cxx|2 +-
 writerfilter/source/dmapper/NumberingManager.cxx |4 ++--
 writerfilter/source/dmapper/NumberingManager.hxx |3 +--
 7 files changed, 28 insertions(+), 7 deletions(-)

New commits:
commit d2e428d1abb9f2907c0b87d55830e8742f8209b9
Author: Vasily Melenchuk 
AuthorDate: Fri May 29 14:25:04 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Fri Jun 5 01:11:11 2020 +0200

tdf#83309: docx import: allow for lists tabstop at zero position

Zero position is valid value for tabstop, but previously it was
treated as "no tab stop defined". Right now writer distinguishes
tab stop at zero postion and no tab stop.

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf83309.docx 
b/sw/qa/extras/ooxmlexport/data/tdf83309.docx
new file mode 100644
index ..8dfddb6ed201
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf83309.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index b95d0afe4e8f..43cdd62d5b20 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -578,6 +578,20 @@ DECLARE_OOXMLIMPORT_TEST(testTdf125038c, "tdf125038c.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("email: t...@test.test"), aActual);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf83309, "tdf83309.docx")
+{
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+OUString sNodeType;
+
+// First paragraph does not have tab before
+sNodeType = parseDump("/root/page/body/txt[1]/Text[1]", "nType");
+CPPUNIT_ASSERT_EQUAL(OUString("PortionType::Text"), sNodeType);
+
+// Second paragraph starts with tab
+sNodeType = parseDump("/root/page/body/txt[2]/Text[1]", "nType");
+CPPUNIT_ASSERT_EQUAL(OUString("PortionType::TabLeft"), sNodeType);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf121661, "tdf121661.docx")
 {
 xmlDocUniquePtr pXmlSettings = parseExport("word/settings.xml");
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index a38cbe048d44..616a919eb2e0 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -119,7 +119,7 @@ SwTabPortion *SwTextFormatter::NewTabPortion( 
SwTextFormatInfo &rInf, bool bAuto
 
 // #i24363# tab stops relative to indent
 // nSearchPos: The current position relative to the tabs origin
-const SwTwips nSearchPos = bRTL ?
+SwTwips nSearchPos = bRTL ?
nTabLeft - nCurrentAbsPos :
nCurrentAbsPos - nTabLeft;
 
@@ -127,6 +127,14 @@ SwTabPortion *SwTextFormatter::NewTabPortion( 
SwTextFormatInfo &rInf, bool bAuto
 // any hard set tab stops:
 // Note: If there are no user defined tab stops, there is always a
 // default tab stop.
+
+// If search is started from zero position (beginning of line), than
+// lets do it from -1: this will allow to include into account 
potential
+// tab stop at zero position. Yes, it will be zero width tab useless
+// mostly, but this have sense in case of lists.
+if (nSearchPos == 0)
+nSearchPos = -1;
+
 const SvxTabStop* pTabStop = m_aLineInf.GetTabStop( nSearchPos, 
nMyRight );
 if ( pTabStop )
 {
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b06cd1461d5a..937906cad902 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6995,7 +6995,7 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 
nLevel,
 
 // indentation
 m_pSerializer->startElementNS(XML_w, XML_pPr);
-if( nListTabPos != 0 )
+if( nListTabPos >= 0 )
 {
 m_pSerializer->startElementNS(XML_w, XML_tabs);
 m_pSerializer->singleElementNS( XML_w, XML_tab,
diff --git a/sw/source/filter/ww8/wrtw8num.cxx 
b/sw/source/filter/ww8/wrtw8num.cxx
index 1774c37239e7..df51bb99be36 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -583,7 +583,7 @@ void MSWordExportBase::NumberingLevel(
 
 sal_Int16 nIndentAt = 0;
 sal_Int16 nFirstLineIndex = 0;
-sal_Int16 nListTabPos = 0;
+sal_Int16 nListTabPos = -1;
 
 // #i86652#
 if (rFormat.GetPositionAndSpaceMode() == 
SvxNumberFormat::LABEL_WIDTH_AND_POSITION)
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index 047d29a065ca..8a17e6

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - configure.ac jvmfwk/CustomTarget_jreproperties.mk ridljar/Jar_libreoffice.mk ridljar/source solenv/gbuild

[Samuel Mehrbrodt (via logerrit)]

 configure.ac|   41 +---
 jvmfwk/CustomTarget_jreproperties.mk|2 
 ridljar/Jar_libreoffice.mk  |8 +
 ridljar/source/libreoffice/module-info.java |  140 
 solenv/gbuild/Jar.mk|   14 ++
 solenv/gbuild/JavaClassSet.mk   |   38 ++-
 solenv/gbuild/gbuild.mk |2 
 7 files changed, 205 insertions(+), 40 deletions(-)

New commits:
commit 8b6c0b73afbf201ffef6541625b902939dd116f6
Author: Samuel Mehrbrodt 
AuthorDate: Thu May 7 09:42:22 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Jun 5 01:10:15 2020 +0200

tdf#131572 Add java 9 module info for libreoffice.jar

Add a java module named "org.libreoffice.uno" for this jar.

This needs to be compiled with Java 9.
But since we want to keep b/c with Java 8,
the rest of the jar has to be compiled with Java 8.

This bumps the *build* requirement to Java 9 while keeping
the *runtime* requirement at Java 8.

The gbuild JavaClassSet class is changed to invoke javac twice,
where the 2nd invocation compiles with --release 9 and a --patch-modules
argument so that it finds the results of the first invocation and also
the javamaker generated files in CustomTargets.

Change-Id: I888f5dbe097cc37136e68db5919939877c981862
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91105
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 941b567a41569260fef14a7337511e8f42337323)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95049
Reviewed-by: Michael Stahl 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/configure.ac b/configure.ac
index 10da45dafaa9..de98eeaca272 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1970,7 +1970,7 @@ AC_ARG_WITH(linker-hash-style,
 
 AC_ARG_WITH(jdk-home,
 AS_HELP_STRING([--with-jdk-home=],
-[If you have installed JDK 8 or later on your system please supply the
+[If you have installed JDK 9 or later on your system please supply the
  path here. Note that this is not the location of the java command but 
the
  location of the entire distribution.]),
 ,)
@@ -7278,20 +7278,12 @@ if test "$ENABLE_JAVA" != ""; then
 reg_get_value "$bitness" 
"HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/JDK/$ver/JavaHome"
 _jdk_home=$regvalue
 fi
-if test -z "$with_jdk_home"; then
-for ver in 1.8; do
-reg_get_value "$bitness" 
"HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java Development Kit/$ver/JavaHome"
-if test -n "$regvalue"; then
-_jdk_home=$regvalue
-break
-fi
-done
-fi
+
 if test -f "$_jdk_home/lib/jvm.lib" -a -f 
"$_jdk_home/bin/java.exe"; then
 with_jdk_home="$_jdk_home"
 howfound="found automatically"
 else
-AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option 
pointing to a $bitness-bit JDK])
+AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option 
pointing to a $bitness-bit JDK >= 9])
 fi
 else
 test "$build_os" = "cygwin" && 
with_jdk_home=`win_short_path_for_make "$with_jdk_home"`
@@ -7373,24 +7365,7 @@ if test "$ENABLE_JAVA" != ""; then
 elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | $GREP 
-c "BEA"` -gt 0; then
 AC_MSG_ERROR([No valid check available. Please check the block for 
your desired java in configure.ac])
 elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | $GREP 
-c "IBM"` -gt 0; then
-JDK=ibm
-
-dnl IBM JDK specific tests
-_jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' 
| $SED s/[[-A-Za-z]]*//`
-_jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 
+ $3;}'`
-
-if test "$_jdk_ver" -lt 10800; then
-AC_MSG_ERROR([IBM JDK is too old, you need at least 8])
-fi
-
-AC_MSG_RESULT([found (IBM JDK $_jdk)])
-
-if test "$with_jdk_home" = ""; then
-AC_MSG_ERROR([In order to successfully build LibreOffice using 
the IBM JDK,
-you must use the "--with-jdk-home" configure option explicitly])
-fi
-
-JAVA_HOME=$with_jdk_home
+AC_MSG_ERROR([No valid check available. Please check the block for 
your desired java in configure.ac])
 else
 JDK=sun
 
@@ -7398,10 +7373,10 @@ you must use the "--with-jdk-home" configure option 
explicitly])
 _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' 
| $SED '/^$/d' | $SED s/[[-A-Za-z]]*//`
 _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 1

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - ridljar/Jar_unoloader.mk ridljar/source solenv/gbuild

[Samuel Mehrbrodt (via logerrit)]

 ridljar/Jar_unoloader.mk|   11 ++-
 ridljar/source/libreoffice/module-info.java |2 ++
 ridljar/source/unoloader/module-info.java   |   12 
 solenv/gbuild/JavaClassSet.mk   |1 +
 4 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 700cf71e3eeced0b39d1782c20e334bde552efce
Author: Samuel Mehrbrodt 
AuthorDate: Mon May 18 12:09:03 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Jun 5 01:10:38 2020 +0200

tdf#131572 Add java 9 module info for unoloader.jar

Add a java module named "org.libreoffice.unoloader" for this jar.

Require this module from org.libreoffice.uno
(libreoffice.jar has unoloader.jar in its classpath,
so add the same dependency to the modules)

Change-Id: I7471d65ac7a0d2c6a11c002027a21f0c441dd1f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94419
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 89cb33dde0c4cd27ca05e31ddea94b7129bc6ebb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95050
Reviewed-by: Michael Stahl 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/ridljar/Jar_unoloader.mk b/ridljar/Jar_unoloader.mk
index 50b32e8f0f88..2acf20b5b289 100644
--- a/ridljar/Jar_unoloader.mk
+++ b/ridljar/Jar_unoloader.mk
@@ -7,12 +7,21 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Jar_Jar,unoloader))
+$(eval $(call gb_Jar_Jar,unoloader,org.libreoffice.unoloader))
 
 $(eval $(call gb_Jar_set_packageroot,unoloader,com))
 
 $(eval $(call 
gb_Jar_set_manifest,unoloader,$(SRCDIR)/ridljar/source/unoloader/com/sun/star/lib/unoloader/manifest))
 
+# the module-info.class is manually added here since it's not in "com" dir
+$(eval $(call gb_Jar_add_packagedirs,unoloader,\
+   $(call gb_JavaClassSet_get_classdir,$(call 
gb_Jar_get_classsetname,unoloader))/module-info.class \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles_java9,unoloader,\
+ridljar/source/unoloader/module-info \
+))
+
 $(eval $(call gb_Jar_add_sourcefiles,unoloader,\
 ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader \
 ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader \
diff --git a/ridljar/source/libreoffice/module-info.java 
b/ridljar/source/libreoffice/module-info.java
index 4399586fc558..8d24c7ccb13c 100644
--- a/ridljar/source/libreoffice/module-info.java
+++ b/ridljar/source/libreoffice/module-info.java
@@ -8,6 +8,8 @@
 
 module org.libreoffice.uno
 {
+requires org.libreoffice.unoloader;
+
 exports com.sun.star.accessibility;
 exports com.sun.star.animations;
 exports com.sun.star.auth;
diff --git a/ridljar/source/unoloader/module-info.java 
b/ridljar/source/unoloader/module-info.java
new file mode 100644
index ..6eed39c96df4
--- /dev/null
+++ b/ridljar/source/unoloader/module-info.java
@@ -0,0 +1,12 @@
+/*
+ * 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/.
+ */
+
+module org.libreoffice.unoloader
+{
+exports com.sun.star.lib.unoloader;
+}
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 541490448b05..d3e4c3590dc5 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -56,6 +56,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,9) \
$(gb_JavaClassSet_JAVACDEBUG) \
-classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call 
gb_JavaClassSet_get_classdir,$(2))" \
+   --module-path "$(T_CP)$(gb_CLASSPATHSEP)$(call 
gb_JavaClassSet_get_classdir,$(2))" \
$(if $(T_MODULENAME),--patch-module 
$(T_MODULENAME)="$(subst $(WHITESPACE),$(gb_CLASSPATHSEP),$(strip $(dir 
$(PACKAGEDIRS") \
-d $(call gb_JavaClassSet_get_classdir,$(2)) \
@$$RESPONSEFILE &&) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - android/source bean/Jar_officebean.mk bean/JunitTest_bean_complex.mk bean/test bridges/Jar_java_uno.mk desktop/Jar_activ

[Samuel Mehrbrodt (via logerrit)]

 Repository.mk|
1 
 android/source/build.gradle  |
3 
 bean/Jar_officebean.mk   |
3 
 bean/JunitTest_bean_complex.mk   |
2 
 bean/test/applet/oooapplet/OOoViewer.java|
5 
 bridges/Jar_java_uno.mk  |
6 
 desktop/Jar_active_java.mk   |
3 
 desktop/Jar_passive_java.mk  |
3 
 desktop/scripts/unoinfo-mac.sh   |
5 
 desktop/scripts/unoinfo.sh   |
6 
 desktop/win32/source/unoinfo.cxx |
4 
 extensions/test/pgp/readme.txt   |
2 
 external/languagetool/ExternalProject_languagetool.mk|
3 
 include/jvmfwk/framework.hxx |
6 
 instsetoo_native/CustomTarget_setup.mk   |
2 
 javaunohelper/Jar_juh.mk |   
32 --
 javaunohelper/JunitTest_juh.mk   |   
14 -
 javaunohelper/util/manifest  |
1 
 jurt/Jar_jurt.mk |
2 
 nlpsolver/Jar_nlpsolver.mk   |
3 
 odk/CustomTarget_javadoc.mk  |
4 
 odk/config/cfgWin.js |
2 
 odk/config/setsdkenv_unix.sh.in  |
2 
 odk/docs/install.html|
3 
 odk/examples/DevelopersGuide/FirstSteps/build_FirstUnoContact.xml|
2 
 odk/examples/DevelopersGuide/OfficeBean/Makefile |
3 
 odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml   |
3 
 odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml |
3 
 qadevOOo/.classpath  |
3 
 qadevOOo/Jar_OOoRunner.mk|
5 
 reportbuilder/Jar_reportbuilder.mk   |
3 
 ridljar/Jar_libreoffice.mk   |  
133 ++
 ridljar/Jar_ridl.mk  |   
99 ---
 ridljar/JunitTest_bridgefactory.mk   |
2 
 ridljar/JunitTest_connections.mk |
2 
 ridljar/JunitTest_java.mk|
2 
 ridljar/JunitTest_java_remote.mk |
2 
 ridljar/JunitTest_remote.mk  |
2 
 ridljar/JunitTest_typedesc.mk|
2 
 ridljar/JunitTest_uno.mk |
2 
 ridljar/JunitTest_urp.mk |
2 
 ridljar/JunitTest_util.mk|
2 
 ridljar/Module_ridljar.mk|
2 
 ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java  |
9 
 ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java   |
2 
 ridljar/util/manifest|
9 
 scripting/Jar_HelloWorld.mk  |
3 
 scripting/Jar_Highlight.mk   |
3 
 scripting/Jar_MemoryUsage.mk |
3 
 scripting/Jar_ScriptFramework.mk |
3 
 scripting/Jar_ScriptProviderForBeanShell.mk  |
3 
 scripting/Jar_ScriptProviderForJava.mk   |
3 
 scripting/Jar_ScriptProviderForJavaScript.mk |
3 
 smoketest/Jar_TestExtension.mk   |
6 
 smoketest/Jar_smoketest.mk   |
3 
 solenv/gbuild/CppunitTest.mk |
2 
 solenv/gbuild/JunitTest.mk   |
2 
 swext/Jar_mediawiki.mk   |
3 
 testtools/Jar_testComponent.mk   |
7 
 toolkit/JunitTest_toolkit_complex.mk |
2 

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

[Miklos Vajna (via logerrit)]

 vcl/source/control/prgsbar.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit de7148f3a7c9ac5eb0f15e5ddc1d15aef8882fea
Author: Miklos Vajna 
AuthorDate: Thu Jun 13 10:06:04 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Jun 5 01:09:30 2020 +0200

tdf#95173 vcl: fix not drawn progressbar widget from UNO

Commit e6c2951f1957224aa0e7dc97b33b0450c41f92f7 (delegate RenderContext,
invalidate - prgsbar, scrbar, 2015-04-29) switched ProgressBar::SetValue() 
from
direct partial paint to invalidate + paint later, which means setting a
progressbar value, then using an external sleep (such as Python's 
time.sleep())
no longer results in an updated progressbar.

Solve the problem by explicitly processing all events with at least
TaskPriority::REPAINT priority after the invalidate in 
ProgressBar::SetValue(),
which is similar to what the Wait implementation in the basic runtime does.

(cherry picked from commit f7157f04fab298423e2c4f6a7e5f8e361164b15f)

Change-Id: I86475fb899f16b72ebefe9d3056c92cedeff4439
Reviewed-on: https://gerrit.libreoffice.org/73952
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 66bfaa01486891627b0748c4ba7b8d86e0fdc439)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95491
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx
index ac21e7c98ca3..3d440fa7be08 100644
--- a/vcl/source/control/prgsbar.cxx
+++ b/vcl/source/control/prgsbar.cxx
@@ -20,6 +20,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #define PROGRESSBAR_OFFSET  3
 #define PROGRESSBAR_WIN_OFFSET  2
@@ -181,6 +183,16 @@ void ProgressBar::SetValue( sal_uInt16 nNewPercent )
 mnPreviousPercent = mnPercent;
 mnPercent = nNewPercent;
 Invalidate();
+
+// Make sure the progressbar is actually painted even if the caller is 
busy with its task,
+// so the main loop would not be invoked.
+Idle aIdle("ProgressBar::SetValue aIdle");
+aIdle.SetPriority(TaskPriority::POST_PAINT);
+aIdle.Start();
+while (aIdle.IsActive())
+{
+Application::Yield();
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: ESC meeting minutes: 2020-06-04

[Thorsten Behrens]

Miklos Vajna wrote:
> * ODF extensions (Michael S)
>   + surprised to find 39 of them in the code
>   + please add new ones to wiki
> 
> https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes/List_of_LibreOffice_ODF_Extensions#LibreOffice_ODF_extensions
> + all these should be listed on the wiki page!
> + they didn't go into 1.3, partly due to this
> + please take care of this
> + there is a "check implementer notes" script to check missing entries 
> (Thorsten)
>   + assuming you at least added a test for the extension, the script 
> should catch badness
> AI: build a commit list + names (Thorsten)
> + please take care
> 
script is here:
 /bin/check-implementer-notes.py

Once https://gerrit.libreoffice.org/c/core/+/95541 is merged, and a
handful of manual additions to the implementer notes wiki page, we're
now down to zero hits.

So nothing to do anymore for now, but please - Cloph, could you run
this script before every major release at least, as part of the x.0.0
RC1 (or something) release process, and post the list of offenders (if
any) here?

Cheers,

-- Thorsten


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen (via logerrit)]

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

New commits:
commit c148ba2b18d42733587fbf169a08f9469daed8fe
Author: Gabor Kelemen 
AuthorDate: Fri Jun 5 00:30:46 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 5 00:30:46 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 9255147fb8e8fd4b93c254a7505aa20baddec7fd
  - tdf#127263 Connect QR Code dialogs Help button to the online help

also add some ahelp tags for the old style help

Change-Id: I6d0a660bada92041e9d4fa25a46f2aa4681b1377
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95545
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 67026c44ece5..9255147fb8e8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 67026c44ece5d04b41eb1c2f2c3ebf086d558bbd
+Subproject commit 9255147fb8e8fd4b93c254a7505aa20baddec7fd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen (via logerrit)]

 source/text/shared/guide/qrcode.xhp |   21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 9255147fb8e8fd4b93c254a7505aa20baddec7fd
Author: Gabor Kelemen 
AuthorDate: Fri Jun 5 00:22:21 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Fri Jun 5 00:30:46 2020 +0200

tdf#127263 Connect QR Code dialogs Help button to the online help

also add some ahelp tags for the old style help

Change-Id: I6d0a660bada92041e9d4fa25a46f2aa4681b1377
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95545
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/source/text/shared/guide/qrcode.xhp 
b/source/text/shared/guide/qrcode.xhp
index dd4343a0f..f43ea9209 100644
--- a/source/text/shared/guide/qrcode.xhp
+++ b/source/text/shared/guide/qrcode.xhp
@@ -20,8 +20,9 @@
 QR Code
 
 
-
 QR Code
+
+
 Generate QR Code for any text or 
URL.
 
 The QR Code 
Generation feature helps to create QR codes for any text or URL. The QR code is 
produced as an image or shape and has all the properties associated with an 
image.
@@ -29,26 +30,32 @@
 Choose 
Insert - Object - QR Code.
 
 URL or Text
-The text from which 
to generate the QR code.
+
+The 
text from which to generate the QR code.
 Error correction
 The error 
correction value for the QR Code that is to be created. The error correction of 
a QR code is a measure that helps a QR code to recover if it is 
damaged.
 There are four 
standard error correction values.
 
 
-Low: 7% of codewords can be restored.
+
+Low: 7% of codewords can be 
restored.
 
 
-Medium: 15% of codewords can be 
restored.
+
+Medium: 15% of codewords can be 
restored.
 
 
-Quartile: 25% of codewords can be 
restored.
+
+Quartile: 25% of codewords can be 
restored.
 
 
-High: 30% of codewords can be restored.
+
+High: 30% of codewords can be 
restored.
 
 
 Border
-The width in dots 
of the border surrounding the QR code.
+
+The 
width in dots of the border surrounding the QR code.
 Example
 The QR code below 
was generated for the text www.libreoffice.org:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/vcl/weld.hxx  |4 ++--
 vcl/source/app/salvtables.cxx |6 ++
 vcl/unx/gtk3/gtk3gtkinst.cxx  |6 ++
 3 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 43c7f1944b47ca06234f1b37a24fe0f9ec659111
Author: Caolán McNamara 
AuthorDate: Thu Jun 4 10:43:43 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Jun 5 00:03:45 2020 +0200

make [g|s]et_sort_indicator column argument required

which all users already do, and drop unused auto-pick of default
text column if not set

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

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index d8d6b1a0492d..fedf414432c3 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1104,8 +1104,8 @@ public:
 virtual void set_sort_order(bool bAscending) = 0;
 
 // TRUE ascending, FALSE, descending, INDET, neither (off)
-virtual void set_sort_indicator(TriState eState, int nColumn = -1) = 0;
-virtual TriState get_sort_indicator(int nColumn = -1) const = 0;
+virtual void set_sort_indicator(TriState eState, int nColumn) = 0;
+virtual TriState get_sort_indicator(int nColumn) const = 0;
 
 virtual int get_sort_column() const = 0;
 virtual void set_sort_column(int nColumn) = 0;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 2b0e1c9c28cb..e00adc86f6a5 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -4465,8 +4465,7 @@ public:
 
 virtual void set_sort_indicator(TriState eState, int col) override
 {
-if (col == -1)
-col = 0;
+assert(col >= 0 && "cannot sort on expander column");
 
 LclHeaderTabListBox* pHeaderBox = 
dynamic_cast(m_xTreeView.get());
 if (HeaderBar* pHeaderBar = pHeaderBox ? pHeaderBox->GetHeaderBar() : 
nullptr)
@@ -4488,8 +4487,7 @@ public:
 
 virtual TriState get_sort_indicator(int col) const override
 {
-if (col == -1)
-col = 0;
+assert(col >= 0 && "cannot sort on expander column");
 
 LclHeaderTabListBox* pHeaderBox = 
dynamic_cast(m_xTreeView.get());
 if (HeaderBar* pHeaderBar = pHeaderBox ? pHeaderBox->GetHeaderBar() : 
nullptr)
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index b821ebe7302d..fe4d84a7397d 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -10145,8 +10145,7 @@ public:
 
 virtual void set_sort_indicator(TriState eState, int col) override
 {
-if (col == -1)
-col = get_view_col(m_nTextCol);
+assert(col >= 0 && "cannot sort on expander column");
 
 GtkTreeViewColumn* pColumn = 
GTK_TREE_VIEW_COLUMN(g_list_nth_data(m_pColumns, col));
 assert(pColumn && "wrong count");
@@ -10162,8 +10161,7 @@ public:
 
 virtual TriState get_sort_indicator(int col) const override
 {
-if (col == -1)
-col = get_view_col(m_nTextCol);
+assert(col >= 0 && "cannot sort on expander column");
 
 GtkTreeViewColumn* pColumn = 
GTK_TREE_VIEW_COLUMN(g_list_nth_data(m_pColumns, col));
 if (!gtk_tree_view_column_get_sort_indicator(pColumn))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 package/source/xstor/xstorage.cxx  |9 +++--
 package/source/zippackage/ZipPackageFolder.cxx |   10 +++---
 package/source/zippackage/ZipPackageStream.cxx |   21 +++--
 3 files changed, 13 insertions(+), 27 deletions(-)

New commits:
commit 214077401a736d49e9c9c6e8f1dd348725455fd7
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 14:35:27 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 23:29:52 2020 +0200

Upcoming loplugin:elidestringvar: package

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

diff --git a/package/source/xstor/xstorage.cxx 
b/package/source/xstor/xstorage.cxx
index 017ee528e616..8a13fd82b32d 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -661,18 +661,15 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< 
embed::XStorage >& xDes
 // move storage properties to the destination one ( means changeable 
properties )
 if ( m_nStorageType == embed::StorageFormats::PACKAGE )
 {
-OUString aMediaTypeString = "MediaType";
-OUString aVersionString = "Version";
-xPropSet->setPropertyValue( aMediaTypeString, uno::makeAny( 
m_aMediaType ) );
-xPropSet->setPropertyValue( aVersionString, uno::makeAny( m_aVersion ) 
);
+xPropSet->setPropertyValue( "MediaType", uno::makeAny( m_aMediaType ) 
);
+xPropSet->setPropertyValue( "Version", uno::makeAny( m_aVersion ) );
 }
 
 if ( m_nStorageType == embed::StorageFormats::PACKAGE )
 {
 // if this is a root storage, the common key from current one should 
be moved there
 bool bIsRoot = false;
-OUString aRootString = "IsRoot";
-if ( ( xPropSet->getPropertyValue( aRootString ) >>= bIsRoot ) && 
bIsRoot )
+if ( ( xPropSet->getPropertyValue( "IsRoot" ) >>= bIsRoot ) && bIsRoot 
)
 {
 try
 {
diff --git a/package/source/zippackage/ZipPackageFolder.cxx 
b/package/source/zippackage/ZipPackageFolder.cxx
index 3a6b7ee19bbd..c95849df91a0 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -252,20 +252,16 @@ bool ZipPackageFolder::saveChild(
 sal_Int32 nPBKDF2IterationCount,
 const rtlRandomPool &rRandomPool)
 {
-const OUString sMediaTypeProperty ("MediaType");
-const OUString sVersionProperty ("Version");
-const OUString sFullPathProperty ("FullPath");
-
 uno::Sequence < PropertyValue > aPropSet (PKG_SIZE_NOENCR_MNFST);
 OUString sTempName = rPath + "/";
 
 if ( !GetMediaType().isEmpty() )
 {
-aPropSet[PKG_MNFST_MEDIATYPE].Name = sMediaTypeProperty;
+aPropSet[PKG_MNFST_MEDIATYPE].Name = "MediaType";
 aPropSet[PKG_MNFST_MEDIATYPE].Value <<= GetMediaType();
-aPropSet[PKG_MNFST_VERSION].Name = sVersionProperty;
+aPropSet[PKG_MNFST_VERSION].Name = "Version";
 aPropSet[PKG_MNFST_VERSION].Value <<= GetVersion();
-aPropSet[PKG_MNFST_FULLPATH].Name = sFullPathProperty;
+aPropSet[PKG_MNFST_FULLPATH].Name = "FullPath";
 aPropSet[PKG_MNFST_FULLPATH].Value <<= sTempName;
 }
 else
diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index ab237a15f5e4..71f9ad9f2ba1 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -455,13 +455,6 @@ bool ZipPackageStream::saveChild(
 {
 bool bSuccess = true;
 
-const OUString sMediaTypeProperty ("MediaType");
-const OUString sVersionProperty ("Version");
-const OUString sFullPathProperty ("FullPath");
-const OUString sInitialisationVectorProperty ("InitialisationVector");
-const OUString sSaltProperty ("Salt");
-const OUString sIterationCountProperty ("IterationCount");
-const OUString sSizeProperty ("Size");
 const OUString sDigestProperty ("Digest");
 const OUString sEncryptionAlgProperty("EncryptionAlgorithm");
 const OUString sStartKeyAlgProperty  ("StartKeyAlgorithm");
@@ -484,11 +477,11 @@ bool ZipPackageStream::saveChild(
 const bool bToBeEncrypted = m_bToBeEncrypted && 
(rEncryptionKey.hasElements() || m_bHaveOwnKey);
 const bool bToBeCompressed = bToBeEncrypted || m_bToBeCompressed;
 
-aPropSet[PKG_MNFST_MEDIATYPE].Name = sMediaTypeProperty;
+aPropSet[PKG_MNFST_MEDIATYPE].Name = "MediaType";
 aPropSet[PKG_MNFST_MEDIATYPE].Value <<= GetMediaType( );
-aPropSet[PKG_MNFST_VERSION].Name = sVersionProperty;
+aPropSet[PKG_MNFST_VERSION].Name = "Version";
 aPropSet[PKG_MNFST_VERSION].Value <<= OUString(); // no version is stored 
for streams currently
-aPropSet[PKG_MNFST_FULLPATH].Name = sFullPathProperty;
+aPropSet[PKG_MNFST_FULLPATH].Name = "FullPath";
 aPropSet[PKG_MNFST_FUL

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

[Stephan Bergmann (via logerrit)]

 sal/osl/unx/conditn.cxx |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit dbcfb91c259e8397b3de20f9b3e481b4abadf996
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 14:49:28 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 23:20:17 2020 +0200

Remove useless Result variable

It always had a statically known value ever since
9399c662f36c385b0c705eb34e636a9aec450282 "initial import".  The always-true
check for

  Result == osl_cond_result_ok

in the SAL_INFO invocation was apparently a glitch introduced with
a883b6b13b67898accdc1ffe3fd9e770612352b1 "Improve logging".

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

diff --git a/sal/osl/unx/conditn.cxx b/sal/osl/unx/conditn.cxx
index d73d67e91b37..602240922b8c 100644
--- a/sal/osl/unx/conditn.cxx
+++ b/sal/osl/unx/conditn.cxx
@@ -172,7 +172,6 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition 
Condition, const Time
 {
 oslConditionImpl* pCond;
 int nRet=0;
-oslConditionResult Result = osl_cond_result_ok;
 
 assert(Condition);
 pCond = static_cast(Condition);
@@ -206,18 +205,16 @@ oslConditionResult SAL_CALL 
osl_waitCondition(oslCondition Condition, const Time
 {
 if ( ret == ETIME || ret == ETIMEDOUT )
 {
-Result = osl_cond_result_timeout;
 nRet = pthread_mutex_unlock(&pCond->m_Lock);
 SAL_WARN_IF( nRet != 0, "sal.osl.condition", 
"osl_waitCondition(" << pCond << "): pthread_mutex_unlock failed: " << 
UnixErrnoString(nRet) );
 
-return Result;
+return osl_cond_result_timeout;
 }
 if ( ret != EINTR )
 {
-Result = osl_cond_result_error;
 nRet = pthread_mutex_unlock(&pCond->m_Lock);
 SAL_WARN_IF( nRet != 0, "sal.osl.condition", 
"osl_waitCondition(" << pCond << "): pthread_mutex_unlock failed: " << 
UnixErrnoString(nRet) );
-return Result;
+return osl_cond_result_error;
 }
 }
 }
@@ -232,11 +229,10 @@ oslConditionResult SAL_CALL 
osl_waitCondition(oslCondition Condition, const Time
 if ( nRet != 0 )
 {
 SAL_WARN( "sal.osl.condition", "osl_waitCondition(" << pCond 
<< "): pthread_cond_wait failed: " << UnixErrnoString(nRet) );
-Result = osl_cond_result_error;
 nRet = pthread_mutex_unlock(&pCond->m_Lock);
 SAL_WARN_IF( nRet != 0, "sal.osl.condition", 
"osl_waitCondition(" << pCond << "): pthread_mutex_unlock failed: " << 
UnixErrnoString(nRet) );
 
-return Result;
+return osl_cond_result_error;
 }
 }
 }
@@ -244,9 +240,9 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition 
Condition, const Time
 nRet = pthread_mutex_unlock(&pCond->m_Lock);
 SAL_WARN_IF( nRet != 0, "sal.osl.condition", "osl_waitCondition(" << pCond 
<< "): pthread_mutex_unlock failed: " << UnixErrnoString(nRet) );
 
-SAL_INFO( "sal.osl.condition", "osl_waitCondition(" << pCond << "): " << 
(Result == osl_cond_result_ok ? "OK" : "ERROR") );
+SAL_INFO( "sal.osl.condition", "osl_waitCondition(" << pCond << "): OK" );
 
-return Result;
+return osl_cond_result_ok;
 }
 
 sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 binaryurp/source/bridge.cxx |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 56428bd9ad98221ad3631dd1e0d6c80881a88056
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 16:10:48 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 23:19:39 2020 +0200

Properly handle initial object queryInterface return value


 specifies that this shall return an ANY either 
of
type VOID (so handle that) or of type css.uno.XInterface with non-null 
value (so
throw exceptions for any other kinds of return values).

Various Linux Jenkins builds had recently started to sporadically fail 
during
UITest_calc_demo, hitting the

assert(
type.get()->eTypeClass == typelib_TypeClass_ANY ||
 type.equals(css::uno::TypeDescription(data_.pType)));

in the call to binaryurp::BinaryAny::getValue 
(binaryurp/source/binaryany.cxx),
e.g. <.  
While it
is unclear why those failures happen, they highlight that this code did not
properly handle all possible (valid or invalid) input.

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

diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 1be59b933a70..4d375f414719 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -50,6 +50,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -873,10 +874,25 @@ css::uno::Reference< css::uno::XInterface > 
Bridge::getInstance(
 "com.sun.star.uno.XInterface::queryInterface"),
 false, inArgs, &ret, &outArgs);
 throwException(bExc, ret);
+auto const t = ret.getType();
+if (t.get()->eTypeClass == typelib_TypeClass_VOID) {
+return {};
+}
+if (!t.equals(ifc)) {
+throw css::uno::RuntimeException(
+"initial object queryInterface for OID \"" + sInstanceName + "\" 
returned ANY of type "
++ OUString::unacquired(&t.get()->pTypeName));
+}
+auto const val = *static_cast< uno_Interface ** >(ret.getValue(ifc));
+if (val == nullptr) {
+throw css::uno::RuntimeException(
+"initial object queryInterface for OID \"" + sInstanceName
++ "\" returned null css.uno.XInterface ANY");
+}
 return css::uno::Reference< css::uno::XInterface >(
 static_cast< css::uno::XInterface * >(
 binaryToCppMapping_.mapInterface(
-*static_cast< uno_Interface ** >(ret.getValue(ifc)),
+val,
 ifc.get())),
 SAL_NO_ACQUIRE);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 include/vcl/VectorGraphicSearch.hxx|   24 +++
 sd/source/ui/view/Outliner.cxx |   16 +++--
 vcl/qa/cppunit/VectorGraphicSearchTest.cxx |   88 -
 vcl/source/graphic/VectorGraphicSearch.cxx |   22 ---
 4 files changed, 135 insertions(+), 15 deletions(-)

New commits:
commit 112d8113388513d9c6b317e828f5d373b4a54330
Author: Tomaž Vajngerl 
AuthorDate: Thu Jun 4 18:26:58 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 4 22:48:58 2020 +0200

sd: support match case, match whole word for PDF search

THis adds support for match case and match whole word to the
VectorGraphicSearch + tests.

It uses the new options in PDF seearch in Draw/Impress.

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

diff --git a/include/vcl/VectorGraphicSearch.hxx 
b/include/vcl/VectorGraphicSearch.hxx
index c9faaa51f1c9..4601a1f5ac1d 100644
--- a/include/vcl/VectorGraphicSearch.hxx
+++ b/include/vcl/VectorGraphicSearch.hxx
@@ -25,6 +25,28 @@ enum class SearchStartPosition
 End
 };
 
+struct VCL_DLLPUBLIC VectorGraphicSearchOptions final
+{
+SearchStartPosition meStartPosition;
+bool mbMatchCase;
+bool mbMatchWholeWord;
+
+VectorGraphicSearchOptions()
+: meStartPosition(SearchStartPosition::Begin)
+, mbMatchCase(false)
+, mbMatchWholeWord(false)
+{
+}
+
+VectorGraphicSearchOptions(SearchStartPosition eStartPosition, bool 
bMatchCase,
+   bool bMatchWholeWord)
+: meStartPosition(eStartPosition)
+, mbMatchCase(bMatchCase)
+, mbMatchWholeWord(bMatchWholeWord)
+{
+}
+};
+
 class VCL_DLLPUBLIC VectorGraphicSearch final
 {
 private:
@@ -38,7 +60,7 @@ public:
 VectorGraphicSearch(Graphic const& rGraphic);
 ~VectorGraphicSearch();
 bool search(OUString const& rSearchString,
-SearchStartPosition eStartPosition = 
SearchStartPosition::Begin);
+VectorGraphicSearchOptions const& rOptions = 
VectorGraphicSearchOptions());
 basegfx::B2DSize pageSize();
 bool next();
 bool previous();
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index f8cec9464896..9b777d3a1dad 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -829,8 +829,12 @@ bool 
SdOutliner::SearchAndReplaceOnce(std::vector* pSelecti
 OUString const & rString = mpSearchItem->GetSearchString();
 bool bBackwards = mpSearchItem->GetBackward();
 
-SearchStartPosition eSearchStartPosition = bBackwards ? 
SearchStartPosition::End : SearchStartPosition::Begin;
-bool bResult = mpImpl->mpVectorGraphicSearch->search(rString, 
eSearchStartPosition);
+VectorGraphicSearchOptions aOptions;
+aOptions.meStartPosition = bBackwards ? 
SearchStartPosition::End : SearchStartPosition::Begin;
+aOptions.mbMatchCase = mpSearchItem->GetExact();
+aOptions.mbMatchWholeWord = mpSearchItem->GetWordOnly();
+
+bool bResult = mpImpl->mpVectorGraphicSearch->search(rString, 
aOptions);
 
 if (bResult)
 {
@@ -1242,11 +1246,15 @@ void SdOutliner::ProvideNextTextObject()
 auto* pGraphicObject = static_cast(mpObj);
 OUString const & rString = mpSearchItem->GetSearchString();
 bool bBackwards = mpSearchItem->GetBackward();
-SearchStartPosition eSearchStartPosition = bBackwards ? 
SearchStartPosition::End : SearchStartPosition::Begin;
+
+VectorGraphicSearchOptions aOptions;
+aOptions.meStartPosition = bBackwards ? 
SearchStartPosition::End : SearchStartPosition::Begin;
+aOptions.mbMatchCase = mpSearchItem->GetExact();
+aOptions.mbMatchWholeWord = mpSearchItem->GetWordOnly();
 
 mpImpl->mpVectorGraphicSearch = 
std::make_unique(pGraphicObject->GetGraphic());
 
-bool bResult = 
mpImpl->mpVectorGraphicSearch->search(rString, eSearchStartPosition);
+bool bResult = 
mpImpl->mpVectorGraphicSearch->search(rString, aOptions);
 if (bResult)
 {
 if (bBackwards)
diff --git a/vcl/qa/cppunit/VectorGraphicSearchTest.cxx 
b/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
index 00febce16e71..0659e4e62dcf 100644
--- a/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
+++ b/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
@@ -32,11 +32,15 @@ class VectorGraphicSearchTest : public 
test::BootstrapFixtureBase
 void test();
 void testNextPrevious();
 void testSearchStringChange();
+void testSearchMatchWholeWord();
+void testSearchMatchCase();
 
   

Re: Update of https://odfvalidator.org/

[Regina Henschel]

Hi Michael,

Michael Stahl schrieb am 04-Jun-20 um 19:38:

hi Regina,

[..]
you can run the validator from the command prompt; the easiest way is to 
make sure you have --with-export-validation in autogen.input, then on a 
master recent enough to have ODF 1.3 changes "make fetch" will download 
the jar and you can run it via:


  sh bin/odfvalidator.sh


Thank you, I have put it to my tip collection. Fortunately the web 
validator works now.


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

Re: Update of https://odfvalidator.org/

[Regina Henschel]

Hi Guilhem,

Guilhem Moulin schrieb am 04-Jun-20 um 20:19:

Hi there,

On Thu, 04 Jun 2020 at 19:38:29 +0200, Michael Stahl wrote:

On 04.06.20 16:58, Regina Henschel wrote:

Michael has listed in his summary of ODF 1.3 implementation some changes
for the validator, especially I read "Support 1.3 in web validator".

But https://odfvalidator.org/ has no item for ODF 1.3 and automatic
detection fails for ODF 1.3 too.


probably a question for tdf-infra? CC'ing Guilhem


Please use hostmas...@documentfoundation.org (or webs...@global.libreoffice.org)
for infra matters.

Updated the instance at https://odfvalidator.org/ , thanks for the poke.


Thank you. It works now.

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

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/ooxmlimport/data/tdf130804.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   13 +
 2 files changed, 13 insertions(+)

New commits:
commit 40c577f57fb16d24d5a2f76c3a5126073fff6a98
Author: Xisco Fauli 
AuthorDate: Thu Jun 4 12:13:19 2020 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 4 21:49:16 2020 +0200

tdf#130804: sw: Add unittest

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

diff --git a/sw/qa/extras/ooxmlimport/data/tdf130804.docx 
b/sw/qa/extras/ooxmlimport/data/tdf130804.docx
new file mode 100644
index ..401f23de8728
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf130804.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 141a06e144cc..ecd4c588fbbd 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -355,6 +355,19 @@ DECLARE_OOXMLIMPORT_TEST(testN766477, "n766477.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("Checkbox_Checked"), aElementNames[0]);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf130804, "tdf130804.docx")
+{
+OUString flyHeight = parseDump("/root/page/body/txt[1]/infos/bounds", 
"height");
+OUString txtHeight = 
parseDump("/root/page/body/txt[1]/anchored/fly/infos/bounds", "height");
+
+//Without the fix in place, txtHeight would have been flyHeight + 55
+CPPUNIT_ASSERT_EQUAL(flyHeight, txtHeight);
+
+// Also check the bookmark portion is ignored in the next paragraph
+OUString aTop = parseDump("/root/page/body/txt[2]/infos/prtBounds", "top");
+CPPUNIT_ASSERT_EQUAL(OUString("240"), aTop);
+}
+
 DECLARE_OOXMLIMPORT_TEST(testN758883, "n758883.docx")
 {
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/admin loleaflet/package.json

[gokaysatir (via logerrit)]

 loleaflet/admin/src/AdminSocketAnalytics.js |   29 ++--
 loleaflet/package.json  |2 -
 2 files changed, 12 insertions(+), 19 deletions(-)

New commits:
commit 9d0fc3801d1b5aeb24b7e0401ceeb9f1ac5d86ed
Author: gokaysatir 
AuthorDate: Thu Jun 4 21:25:43 2020 +0300
Commit: Henry Castro 
CommitDate: Thu Jun 4 21:21:37 2020 +0200

leaflet: update d3 package.

Change-Id: I3afe1021edf9e77ff7a62de0a0d4478c974af57b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95534
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/admin/src/AdminSocketAnalytics.js 
b/loleaflet/admin/src/AdminSocketAnalytics.js
index e965fc62e..d4fa1a149 100644
--- a/loleaflet/admin/src/AdminSocketAnalytics.js
+++ b/loleaflet/admin/src/AdminSocketAnalytics.js
@@ -97,21 +97,20 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
else if (option === 'net')
data = this._sentStatsData.concat(this._recvStatsData);
 
-   xScale = d3.scale.linear().range([this._graphMargins.left, 
this._graphWidth - this._graphMargins.right]).domain([d3.min(data, function(d) {
+   xScale = d3.scaleLinear().range([this._graphMargins.left, 
this._graphWidth - this._graphMargins.right]).domain([d3.min(data, function(d) {
return d.time;
}), d3.max(data, function(d) {
return d.time;
})]);
 
 
-   yScale = d3.scale.linear().range([this._graphHeight - 
this._graphMargins.bottom, this._graphMargins.top]).domain([d3.min(data, 
function(d) {
+   yScale = d3.scaleLinear().range([this._graphHeight - 
this._graphMargins.bottom, this._graphMargins.top]).domain([d3.min(data, 
function(d) {
return d.value;
}), d3.max(data, function(d) {
return d.value;
})]);
 
-   d3XAxis = d3.svg.axis()
-   .scale(xScale)
+   d3XAxis = d3.axisBottom(xScale)
.tickFormat(function(d) {
d = Math.abs(d / 1000);
var sUnit = 0;
@@ -128,49 +127,43 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
return d + units[i];
});
 
-   d3Line = d3.svg.line()
+   d3Line = d3.line()
.x(function(d) {
return xScale(d.time);
})
.y(function(d) {
return yScale(d.value);
})
-   .interpolate('monotone');
+   .curve(d3.curveMonotoneX);
 
if (option === 'mem') {
this._xMemScale = xScale;
this._yMemScale = yScale;
this._d3MemXAxis = d3XAxis;
-   this._d3MemYAxis = d3.svg.axis()
-   .scale(this._yMemScale)
+   this._d3MemYAxis = d3.axisLeft(this._yMemScale)
.tickFormat(function (d) {
return Util.humanizeMem(d);
-   })
-   .orient('left');
+   });
this._d3MemLine = d3Line;
}
else if (option === 'cpu') {
this._xCpuScale = xScale;
this._yCpuScale = yScale;
this._d3CpuXAxis = d3XAxis;
-   this._d3CpuYAxis = d3.svg.axis()
-   .scale(this._yCpuScale)
+   this._d3CpuYAxis = d3.axisLeft(this._yCpuScale)
.tickFormat(function (d) {
return d + '%';
-   })
-   .orient('left');
+   });
this._d3CpuLine = d3Line;
}
else if (option === 'net') {
this._xNetScale = xScale;
this._yNetScale = yScale;
this._d3NetXAxis = d3XAxis;
-   this._d3NetYAxis = d3.svg.axis()
-   .scale(this._yNetScale)
+   this._d3NetYAxis = d3.axisLeft(this._yNetScale)
.tickFormat(function (d) {
return Util.humanizeMem(d/1000) + 
'/sec';
-   })
-   .orient('left');
+   });
this._d3NetSentLine = d3Line;
this._d3NetRecvLine = d3Li

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

[Stephan Bergmann (via logerrit)]

 lotuswordpro/source/filter/lwpfribtext.cxx |   85 +
 1 file changed, 17 insertions(+), 68 deletions(-)

New commits:
commit 21e930b292b8dcfacb3a5f4dd09c69d858654b6e
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 13:57:14 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 21:17:12 2020 +0200

Upcoming loplugin:elidestringvar: lotuswordpro

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

diff --git a/lotuswordpro/source/filter/lwpfribtext.cxx 
b/lotuswordpro/source/filter/lwpfribtext.cxx
index 0ba910ab7da3..51a941c47f5a 100644
--- a/lotuswordpro/source/filter/lwpfribtext.cxx
+++ b/lotuswordpro/source/filter/lwpfribtext.cxx
@@ -261,7 +261,6 @@ void LwpFribDocVar::XFConvert(XFContentContainer* pXFPara)
 pContent = new XFInitialCreator;
 break;
 case DOCSIZE:
-{
 /*  pContent = new XFAnnotation;
 XFTextContent* pSpan = new XFTextContent();
 pSpan->SetText("Document Size is Here");
@@ -270,106 +269,56 @@ void LwpFribDocVar::XFConvert(XFContentContainer* 
pXFPara)
 static_cast(pContent)->Add(pPara);
 break;
 */
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case SMARTMASTER:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case DIVISIONNAME:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case SECTIONNAME:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case VERSIONCREATEBY:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case VERSIONCREATEDATE:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case VERSIONOTHEREDITORS:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case VERSIONNAME:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case VERSIONNUMBER:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case ALLVERSIONNAME:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case VERSIONREMARK:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case DOCUMENTCATEGORY:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case VERSIONLASTDATE:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case VERSIONLASTEDITOR:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case LASTEDIT:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case OTHEREDITORS:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 case NUMOFREVISION:
-{
-OUString text = "";
-LwpFrib::ConvertChars(pXFPara,text);
+LwpFrib::ConvertChars(pXFPara,"");
 return;
-}
 default:
 return;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 io/source/acceptor/acceptor.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit f1125b56d1d049448542c699a5c62dc6aa3a0bab
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 10:37:21 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 21:17:45 2020 +0200

Upcoming loplugin:elidestringvar: io

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

diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index d1f2bb54bf40..15df65592a33 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -119,8 +119,7 @@ namespace io_acceptor
 m_sLastDescription != sConnectionDescription )
 {
 // instantiate another acceptor for different ports
-OUString sMessage = "acceptor::accept called multiple times with 
different connection strings\n";
-throw ConnectionSetupException( sMessage );
+throw ConnectionSetupException( "acceptor::accept called multiple 
times with different connection strings\n" );
 }
 
 if( m_sLastDescription.isEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit e7f971f45a154f53be9d4df8fa6ce4f89ad5d92b
Author: Caolán McNamara 
AuthorDate: Thu Jun 4 11:18:28 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jun 4 20:58:33 2020 +0200

drop unneccessary argument and use known TextColumnId directly

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 257c403615c4..b821ebe7302d 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -11151,9 +11151,9 @@ public:
 return 
gtk_tree_selection_count_selected_rows(gtk_tree_view_get_selection(m_pTreeView));
 }
 
-int starts_with(const OUString& rStr, int col, int nStartRow, bool 
bCaseSensitive)
+int starts_with(const OUString& rStr, int nStartRow, bool bCaseSensitive)
 {
-return ::starts_with(GTK_TREE_MODEL(m_pTreeStore), rStr, 
get_model_col(col), nStartRow, bCaseSensitive);
+return ::starts_with(GTK_TREE_MODEL(m_pTreeStore), rStr, m_nTextCol, 
nStartRow, bCaseSensitive);
 }
 
 virtual void disable_notify_events() override
@@ -14638,32 +14638,32 @@ private:
 nStart = 0;
 
 // Try match case sensitive from current position
-int nPos = m_pTreeView->starts_with(aStartText, 0, nStart, true);
+int nPos = m_pTreeView->starts_with(aStartText, nStart, true);
 if (nPos == -1 && nStart != 0)
 {
 // Try match case insensitive, but from start
-nPos = m_pTreeView->starts_with(aStartText, 0, 0, true);
+nPos = m_pTreeView->starts_with(aStartText, 0, true);
 }
 
 if (!m_bAutoCompleteCaseSensitive)
 {
 // Try match case insensitive from current position
-nPos = m_pTreeView->starts_with(aStartText, 0, nStart, false);
+nPos = m_pTreeView->starts_with(aStartText, nStart, false);
 if (nPos == -1 && nStart != 0)
 {
 // Try match case insensitive, but from start
-nPos = m_pTreeView->starts_with(aStartText, 0, 0, false);
+nPos = m_pTreeView->starts_with(aStartText, 0, false);
 }
 }
 
 if (nPos == -1)
 {
 // Try match case sensitive from current position
-nPos = m_pTreeView->starts_with(aStartText, 0, nStart, true);
+nPos = m_pTreeView->starts_with(aStartText, nStart, true);
 if (nPos == -1 && nStart != 0)
 {
 // Try match case sensitive, but from start
-nPos = m_pTreeView->starts_with(aStartText, 0, 0, true);
+nPos = m_pTreeView->starts_with(aStartText, 0, true);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: trying to fix the problem with hanging UI tests

[Noel Grandin]

Hi

I know there is a fair amount of grumbling on the IRC channel, but that is
just people blowing off steam.

Nobody is seriously interested in deleting all that good work that you and
others did.

At the moment, we have some competing demands on the UI tests:

(1) on the one hand, we don't want them to hang up the jenkins builds,
which used to be a problem, but that is largely taken off care of now
thanks to the timeout plan that cloph added

(2) on the other hand, when they __do__ hang up, we want to know where and
how they hung up, which is not easy because we are dealing with two
different languages and runtimes across several different processes.

So there have been patches back and forth between various people and it
seems like we're still converging on a solution.

So take heart! All is not lost!

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

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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   33 +
 1 file changed, 25 insertions(+), 8 deletions(-)

New commits:
commit c11350e44e39eec2d992836200b90be5c9ab35eb
Author: Caolán McNamara 
AuthorDate: Thu Jun 4 11:00:39 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jun 4 20:54:55 2020 +0200

clarify and simplify the mapping of the sort column to model

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index a8e9b6c2b69f..257c403615c4 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -9108,10 +9108,10 @@ private:
 std::vector m_aSavedSortTypes;
 std::vector m_aSavedSortColumns;
 std::vector m_aViewColToModelCol;
-std::vector m_aModelColToViewCol;
 bool m_bWorkAroundBadDragRegion;
 bool m_bInDrag;
 gint m_nTextCol;
+gint m_nTextView;
 gint m_nImageCol;
 gint m_nExpanderImageCol;
 gint m_nIdCol;
@@ -9545,9 +9545,22 @@ private:
 return m_aViewColToModelCol[viewcol];
 }
 
-int get_view_col(int modelcol) const
+// We allow only one CellRenderer per TreeViewColumn except for the first
+// TreeViewColumn which can have two, where the first CellRenderer is
+// either an expander image. From outside the second CellRenderer is
+// considered index 0 in the model and the expander as -1
+int to_external_model(int modelcol) const
 {
-return m_aModelColToViewCol[modelcol];
+if (m_nExpanderImageCol == -1)
+return modelcol;
+return modelcol - 1;
+}
+
+int to_internal_model(int modelcol) const
+{
+if (m_nExpanderImageCol == -1)
+return modelcol;
+return modelcol + 1;
 }
 
 void set_column_editable(int nCol, bool bEditable)
@@ -9780,6 +9793,7 @@ public:
 , m_bWorkAroundBadDragRegion(false)
 , m_bInDrag(false)
 , m_nTextCol(-1)
+, m_nTextView(-1)
 , m_nImageCol(-1)
 , m_nExpanderImageCol(-1)
 , m_nPendingVAdjustment(-1)
@@ -9797,6 +9811,7 @@ public:
 {
 m_pColumns = gtk_tree_view_get_columns(m_pTreeView);
 int nIndex(0);
+int nViewColumn(0);
 for (GList* pEntry = g_list_first(m_pColumns); pEntry; pEntry = 
g_list_next(pEntry))
 {
 GtkTreeViewColumn* pColumn = GTK_TREE_VIEW_COLUMN(pEntry->data);
@@ -9809,7 +9824,10 @@ public:
 if (GTK_IS_CELL_RENDERER_TEXT(pCellRenderer))
 {
 if (m_nTextCol == -1)
+{
 m_nTextCol = nIndex;
+m_nTextView = nViewColumn;
+}
 m_aWeightMap[nIndex] = -1;
 m_aSensitiveMap[nIndex] = -1;
 m_aIndentMap[nIndex] = -1;
@@ -9832,11 +9850,11 @@ public:
 else if (m_nImageCol == -1)
 m_nImageCol = nIndex;
 }
-m_aModelColToViewCol.push_back(m_aViewColToModelCol.size());
 ++nIndex;
 }
 g_list_free(pRenderers);
 m_aViewColToModelCol.push_back(nIndex - 1);
+++nViewColumn;
 }
 
 m_nIdCol = nIndex++;
@@ -10159,7 +10177,7 @@ public:
 gint sort_column_id(0);
 if (!gtk_tree_sortable_get_sort_column_id(pSortable, &sort_column_id, 
nullptr))
 return -1;
-return get_view_col(sort_column_id);
+return to_external_model(sort_column_id);
 }
 
 virtual void set_sort_column(int nColumn) override
@@ -10172,7 +10190,7 @@ public:
 GtkSortType eSortType;
 GtkTreeSortable* pSortable = GTK_TREE_SORTABLE(m_pTreeStore);
 gtk_tree_sortable_get_sort_column_id(pSortable, nullptr, &eSortType);
-int nSortCol = get_model_col(nColumn);
+int nSortCol = to_internal_model(nColumn);
 gtk_tree_sortable_set_sort_func(pSortable, nSortCol, sortFunc, this, 
nullptr);
 gtk_tree_sortable_set_sort_column_id(pSortable, nSortCol, eSortType);
 }
@@ -11272,8 +11290,7 @@ public:
 
 virtual void start_editing(const weld::TreeIter& rIter) override
 {
-int col = get_view_col(m_nTextCol);
-GtkTreeViewColumn* pColumn = 
GTK_TREE_VIEW_COLUMN(g_list_nth_data(m_pColumns, col));
+GtkTreeViewColumn* pColumn = 
GTK_TREE_VIEW_COLUMN(g_list_nth_data(m_pColumns, m_nTextView));
 assert(pColumn && "wrong column");
 
 const GtkInstanceTreeIter& rGtkIter = static_cast(rIter);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/source/treelist/treelistbox.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8aee8c0cf1bdda1866594e75b0f9bd4b9a69c724
Author: Caolán McNamara 
AuthorDate: Thu Jun 4 14:02:48 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jun 4 20:53:55 2020 +0200

customize dialog menu treeview icons misplaced

since...

commit b4f7a08ea5d5fd39057f2a6c7f9a8c015370557f
Date:   Sun May 31 17:04:21 2020 +0100

use extra optimization of fdo#75058 universally

always update the expand/collapse positions

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

diff --git a/vcl/source/treelist/treelistbox.cxx 
b/vcl/source/treelist/treelistbox.cxx
index 389ed170828f..e41a11d0f103 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -1677,7 +1677,7 @@ void SvTreeListBox::SetExpandedEntryBmp( SvTreeListEntry* 
pEntry, const Image& a
 assert(pItem);
 pItem->SetBitmap2( aBmp );
 
-GetModel()->InvalidateEntry( pEntry );
+ModelHasEntryInvalidated(pEntry);
 SetEntryHeight( pEntry );
 Size aSize = aBmp.GetSizePixel();
 short nWidth = pImpl->UpdateContextBmpWidthVector( pEntry, 
static_cast(aSize.Width()) );
@@ -1695,7 +1695,7 @@ void SvTreeListBox::SetCollapsedEntryBmp(SvTreeListEntry* 
pEntry,const Image& aB
 assert(pItem);
 pItem->SetBitmap1( aBmp );
 
-GetModel()->InvalidateEntry( pEntry );
+ModelHasEntryInvalidated(pEntry);
 SetEntryHeight( pEntry );
 Size aSize = aBmp.GetSizePixel();
 short nWidth = pImpl->UpdateContextBmpWidthVector( pEntry, 
static_cast(aSize.Width()) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Update of https://odfvalidator.org/

[Guilhem Moulin]

Hi there,

On Thu, 04 Jun 2020 at 19:38:29 +0200, Michael Stahl wrote:
> On 04.06.20 16:58, Regina Henschel wrote:
>> Michael has listed in his summary of ODF 1.3 implementation some changes
>> for the validator, especially I read "Support 1.3 in web validator".
>> 
>> But https://odfvalidator.org/ has no item for ODF 1.3 and automatic
>> detection fails for ODF 1.3 too.
> 
> probably a question for tdf-infra? CC'ing Guilhem

Please use hostmas...@documentfoundation.org (or webs...@global.libreoffice.org)
for infra matters.

Updated the instance at https://odfvalidator.org/ , thanks for the poke.

Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

trying to fix the problem with hanging UI tests

[Markus Mohrhard]

Hey community,

as promised I looked into the problem with hanging UI tests and noticed
that there was a bug in the handling of the shutdown if the LibreOffice
instance can not handle an UNO based shutdown request. The most common case
for this is actually hitting an assert in the UI tests while a modal dialog
is open.

I have proposed https://gerrit.libreoffice.org/c/core/+/95300 but that
attempt was rejected by Stephan and Noel. As I'm currently not involved
enough any more I'll leave the decision about the patch with the community.
I think without the patch one can just remove the whole UI test suite as
you can not safely use an assert if a dialog is still open (or could not be
closed). The patch makes sure that actually after each test case the
soffice process will be either correctly closed or receives a SIGTERM.

A simple test case is attached to the gerrit request that will result in a
soffice process not being closed properly without the patch. As a result,
later test runs will try to use the user profile of the still running
soffice instance and fail immediately until the soffice process is killed
manually.

My impression from this interaction is that some community members would
prefer to get rid of the UI tests completely instead of trying to fix the
current issue with the tests. I have decided not to invest any more of my
spare free time into this.

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

[Libreoffice-commits] online.git: cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/impress/apply_font_spec.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2063d2bec668ebe5d908429be0481a2b43e28aaf
Author: Tamás Zolnai 
AuthorDate: Thu Jun 4 19:47:23 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Jun 4 20:14:51 2020 +0200

cypress: fix unstable test.

Change-Id: Ibfc0f1d6f4e69ea17555ca259c57b3304115711d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95532
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/mobile/impress/apply_font_spec.js 
b/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
index 04a390887..bc407e0e6 100644
--- a/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
@@ -469,6 +469,7 @@ describe('Apply font on text and on text shape.', 
function() {
 
// TODO: highlight color is not in the SVG
// At least check the mobile wizard's state
+   cy.wait(400);
impressMobileHelper.selectTextOfShape();
 
mobileHelper.openMobileWizard();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sd/sdi/_drvwsh.sdi|7 +++
 sd/source/ui/view/drviewse.cxx|1 +
 sd/uiconfig/sdraw/menubar/menubar.xml |1 +
 3 files changed, 9 insertions(+)

New commits:
commit ff56f77c06834713945b4048902fc6518655ebaa
Author: Miklos Vajna 
AuthorDate: Thu Jun 4 13:54:57 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu Jun 4 19:58:05 2020 +0200

sd signature line: add initial menu item / UNO command

Signature lines already work in Writer and Calc, this starts adding it
to Draw.

The current code is similar to SID_DRAW_RECT, just the implementation
for the UNO command is allowed in read-only mode, to be used for PDFs
opened for signing.

Also allow SID_OBJECT_SELECT is read-only mode: selecting objects makes
sense to allow (usually already works on the UI) and this is needed to
allow finishing the "create" mode in a read-only view.

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

diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 4bb8199bc49f..5053ae628801 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -1315,6 +1315,7 @@ interface DrawView
 ExecMethod = FuPermanent ;
 StateMethod = GetMenuState ;
 Export = FALSE ;
+ReadOnlyDoc = TRUE ;
 ]
 
  // Begin FormSlots
@@ -2586,6 +2587,12 @@ interface DrawView
 ExecMethod = FuPermanent ;
 StateMethod = GetMenuState ;
 ]
+SID_INSERT_SIGNATURELINE
+[
+ExecMethod = FuPermanent ;
+StateMethod = GetMenuState ;
+ReadOnlyDoc = TRUE ;
+]
 SID_AVMEDIA_PLAYER // ole : yes, status : ?
 [
 ExecMethod = FuTemporary ;
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 96b23e87f71b..bb305423ce08 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -448,6 +448,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
 case SID_CONNECTOR_LINES_CIRCLE_START:
 case SID_CONNECTOR_LINES_CIRCLE_END:
 case SID_CONNECTOR_LINES_CIRCLES:
+case SID_INSERT_SIGNATURELINE:
 {
 SetCurrentFunction( FuConstructRectangle::Create( this, 
GetActiveWindow(), mpDrawView.get(), GetDoc(), rReq, bPermanent ) );
 rReq.Done();
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml 
b/sd/uiconfig/sdraw/menubar/menubar.xml
index 836ae7897fa1..17191bdb94b3 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -71,6 +71,7 @@
 
   
   
+  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky (via logerrit)]

 sc/source/ui/app/inputhdl.cxx |   11 +++
 sc/source/ui/view/cellsh3.cxx |   16 ++--
 2 files changed, 21 insertions(+), 6 deletions(-)

New commits:
commit aed7f71d67762e6b9a8b0f65ec9d0fdd5fd42fbd
Author: Jan Holesovsky 
AuthorDate: Tue Jul 16 11:58:11 2019 +0200
Commit: Michael Meeks 
CommitDate: Thu Jun 4 19:56:14 2020 +0200

LOK: Emit the doc. modified state even when changing the cell inline.

The "LOK: emit modified status on entering cell data" patch did this
only for the formula input line, and did not change the state when the
user just clicked on the cell and started modifying it; so this patch
extends it.

Also change the actual DocumentModified state of the document directly
instead of just sending a flag, so that the state in LOOLWSD and in the
core don't get out of sync.

Change-Id: Ie516ce5a74d94247d79cf993517d7f4a6657cc94
Reviewed-on: https://gerrit.libreoffice.org/75701
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95516
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 9fa0b7da23a4..d06e374d0366 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2756,6 +2756,9 @@ void ScInputHandler::InvalidateAttribs()
 rBindings.Invalidate( SID_SET_SUB_SCRIPT );
 rBindings.Invalidate( SID_ATTR_CHAR_STRIKEOUT );
 rBindings.Invalidate( SID_ATTR_CHAR_SHADOWED );
+
+rBindings.Invalidate( SID_SAVEDOC );
+rBindings.Invalidate( SID_DOC_MODIFIED );
 }
 }
 
@@ -3779,6 +3782,14 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, 
bool bStartEdit /* = false
 // #i114511# don't count cursor keys as modification
 bool bSetModified = !bCursorKey;
 DataChanged(false, bSetModified); // also calls UpdateParenthesis()
+
+// In the LOK case, we want to set the document modified state
+// right away at the start of the edit, so that the content is
+// saved even when the user leaves the document before hitting
+// Enter
+if (comphelper::LibreOfficeKit::isActive() && bSetModified && 
pActiveViewSh && !pActiveViewSh->GetViewData().GetDocShell()->IsModified())
+pActiveViewSh->GetViewData().GetDocShell()->SetModified();
+
 InvalidateAttribs();//! in DataChanged?
 }
 }
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 9158748a9c98..df42b593bc3d 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -266,13 +266,17 @@ void ScCellShell::Execute( SfxRequest& rReq )
 {
 if ( pReqArgs )
 {
-if (comphelper::LibreOfficeKit::isActive())
+// In the LOK case, we want to set the document modified 
state
+// right away at the start of the edit, so that the 
content is
+// saved even when the user leaves the document before 
hitting
+// Enter
+// NOTE: This also means we want to set the modified state
+// regardless of the DontCommit parameter's value.
+if (comphelper::LibreOfficeKit::isActive() && 
!GetViewData()->GetDocShell()->IsModified())
 {
-// Let the client know about our entry, so if they save
-// (say because the user closes the document or 
window,)
-// this change gets persisted (assuming 
DontTerminateEdit
-// is set to false in the .uno:Save command).
-
SfxLokHelper::notifyAllViews(LOK_CALLBACK_STATE_CHANGED, 
".uno:ModifiedStatus=true");
+GetViewData()->GetDocShell()->SetModified();
+rBindings.Invalidate(SID_SAVEDOC);
+rBindings.Invalidate(SID_DOC_MODIFIED);
 }
 
 OUString aStr( static_cast(pReqArgs->
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: uitest/libreoffice

[Stephan Bergmann (via logerrit)]

 uitest/libreoffice/connection.py |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 2519377c55626dfa3191aaad266b751d29fe4917
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 14:47:56 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 19:50:30 2020 +0200

Remove unused self.pro

...which became unused with 2959c99bae8a8199a8c5c4d4933707ab98acfffa 
"uitest:
let us remove the kill part"

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

diff --git a/uitest/libreoffice/connection.py b/uitest/libreoffice/connection.py
index 5330fdb70c11..e414fa30df96 100644
--- a/uitest/libreoffice/connection.py
+++ b/uitest/libreoffice/connection.py
@@ -27,7 +27,6 @@ class OfficeConnection:
 self.soffice = None
 self.socket = None
 self.xContext = None
-self.pro = None
 
 def setUp(self):
 """  Create a new connection to a LibreOffice process
@@ -83,8 +82,7 @@ class OfficeConnection:
 env = environ
 env['LC_ALL'] = environ['LIBO_LANG']
 
-self.pro = subprocess.Popen(argv, env=env)
-return self.pro
+return subprocess.Popen(argv, env=env)
 
 def connect(self, socket):
 """ Tries to connect to the LibreOffice instance through the specified 
socket"""
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 reportdesign/source/core/sdr/RptObject.cxx |3 +--
 reportdesign/source/ui/report/ReportController.cxx |6 ++
 reportdesign/source/ui/report/propbrw.cxx  |3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 6f5943bb23853e65a93503c498bc30b57d9ec15f
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 15:13:03 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 19:49:59 2020 +0200

Upcoming loplugin:elidestringvar: reportdesign

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

diff --git a/reportdesign/source/core/sdr/RptObject.cxx 
b/reportdesign/source/core/sdr/RptObject.cxx
index 623758dcf788..df0062753b6f 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -615,8 +615,7 @@ void OUnoObject::impl_initializeModel_nothrow()
 if ( xFormatted.is() )
 {
 const Reference< XPropertySet > xModelProps( GetUnoControlModel(), 
UNO_QUERY_THROW );
-const OUString sTreatAsNumberProperty = "TreatAsNumber";
-xModelProps->setPropertyValue( sTreatAsNumberProperty, makeAny( 
false ) );
+xModelProps->setPropertyValue( "TreatAsNumber", makeAny( false ) );
 xModelProps->setPropertyValue( 
PROPERTY_VERTICALALIGN,m_xReportComponent->getPropertyValue(PROPERTY_VERTICALALIGN));
 }
 }
diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index 3bf9e9e072f7..087724e5f851 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2821,8 +2821,7 @@ Reference OReportController::getXFrame()
 m_xFrameLoader.set( frame::Desktop::create(m_xContext) );
 }
 const sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | 
frame::FrameSearchFlag::CREATE;
-const OUString sTarget("_blank");
-Reference xFrame = 
m_xFrameLoader->findFrame(sTarget,nFrameSearchFlag);
+Reference xFrame = 
m_xFrameLoader->findFrame("_blank",nFrameSearchFlag);
 return xFrame;
 }
 
@@ -3989,13 +3988,12 @@ void OReportController::checkChartEnabled()
 return;
 
 m_bChartEnabledAsked = true;
-const OUString sConfigName( "/org.openoffice.Office.ReportDesign" );
 const OUString sPropertyName( "UserData/Chart" );
 
 try
 {
 ::utl::OConfigurationTreeRoot aConfiguration(
-::utl::OConfigurationTreeRoot::createWithComponentContext( 
m_xContext, sConfigName ) );
+::utl::OConfigurationTreeRoot::createWithComponentContext( 
m_xContext, "/org.openoffice.Office.ReportDesign" ) );
 
 bool bChartEnabled = false;
 if ( aConfiguration.hasByHierarchicalName(sPropertyName) )
diff --git a/reportdesign/source/ui/report/propbrw.cxx 
b/reportdesign/source/ui/report/propbrw.cxx
index edc4e78e665a..8afd92cc5979 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -135,8 +135,7 @@ PropBrw::PropBrw(const Reference< XComponentContext >& 
_xORB, vcl::Window* pPare
 m_xBrowserController = 
inspection::ObjectInspector::createWithModel(m_xInspectorContext, 
xInspectorModel);
 if ( !m_xBrowserController.is() )
 {
-const OUString sServiceName( 
"com.sun.star.inspection.ObjectInspector" );
-ShowServiceNotAvailableError(pParent ? pParent->GetFrameWeld() 
: nullptr, sServiceName, true);
+ShowServiceNotAvailableError(pParent ? pParent->GetFrameWeld() 
: nullptr, "com.sun.star.inspection.ObjectInspector", true);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Minutes from the UX/design meeting 2020-Jun-04

[Michael Stahl]

On 04.06.20 14:53, Mike Kaganski wrote:

On 04.06.2020 15:49, Heiko Tietze wrote:

  * Undo/redo includes creating of paragraph/character style
+ https://bugs.documentfoundation.org/show_bug.cgi?id=133040
+ abandoning the undo feature for style _creation_ means also
  to not being able to undo unintentionally _deleted_ styles
  and _applying_ styles to the document is the main workflow
+ actual problem is the unexpected deletion (via undo), which we
  could prevent per confirmation box
+ annoying, however, and definitely in need for [ ] Don't show again
=> recommend to close as WFM


Please use the solutions correctly! WFM tells "the problem existed; but
it has changed at some unknown point, and now it works just as asked in
original post". It's the same as "FIXED", just the specific commit
fixing this is unknown. What you propose is WF (won't fix), which is
completely different by meaning. Confusing these sends completely
different (wrong!) message to users.


... isn't that NOTABUG ?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Update of https://odfvalidator.org/

[Michael Stahl]

hi Regina,

On 04.06.20 16:58, Regina Henschel wrote:

Hi all,

Michael has listed in his summary of ODF 1.3 implementation some changes 
for the validator, especially I read "Support 1.3 in web validator".


But https://odfvalidator.org/ has no item for ODF 1.3 and automatic 
detection fails for ODF 1.3 too.


probably a question for tdf-infra? CC'ing Guilhem

When is support for ODF 1.3 supposed to work? Is there an instance where 
support for ODF 1.3 can be tested in advance?


you can run the validator from the command prompt; the easiest way is to 
make sure you have --with-export-validation in autogen.input, then on a 
master recent enough to have ODF 1.3 changes "make fetch" will download 
the jar and you can run it via:


 sh bin/odfvalidator.sh

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

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 13 commits - connectivity/Library_postgresql-sdbc-impl.mk desktop/CppunitTest_desktop_app.mk desktop/Library_crashreport.mk deskto

[Michael Stahl (via logerrit)]

 connectivity/Library_postgresql-sdbc-impl.mk|1 
 desktop/CppunitTest_desktop_app.mk  |1 
 desktop/Library_crashreport.mk  |1 
 desktop/Library_sofficeapp.mk   |3 
 external/clucene/Library_clucene.mk |1 
 external/liblangtag/UnpackedTarball_liblangtag.mk   |3 
 external/liblangtag/Wformat-overflow.patch  |   17 
 external/libmspub/UnpackedTarball_libmspub.mk   |1 
 external/libmspub/stdint.patch  |   10 
 external/pdfium/Library_pdfium.mk   |1 
 jurt/Library_jpipe.mk   |4 
 libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk |1 
 libreofficekit/Executable_gtktiledviewer.mk |1 
 libreofficekit/Executable_tilebench.mk  |1 
 onlineupdate/Executable_test_updater_dialog.mk  |1 
 onlineupdate/Executable_updater.mk  |1 
 sal/Library_sal.mk  |3 
 sc/CppunitTest_sc_ucalc.mk  |6 
 sc/Library_sc.mk|6 
 smoketest/Executable_libtest.mk |1 
 solenv/gbuild/platform/linux.mk |2 
 solenv/gbuild/platform/unxgcc.mk|   10 
 svx/Executable_gengal.mk|2 
 sw/qa/extras/layout/data/abi11870-2.odt |binary
 sw/qa/extras/layout/layout.cxx  |8 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|   10 
 sw/source/core/access/accportions.cxx   |3 
 sw/source/core/crsr/bookmrk.cxx |   26 +
 sw/source/core/doc/docbm.cxx|   17 
 sw/source/core/inc/bookmrk.hxx  |4 
 sw/source/core/inc/scriptinfo.hxx   |   21 
 sw/source/core/inc/txttypes.hxx |1 
 sw/source/core/text/inftxt.cxx  |   18 
 sw/source/core/text/inftxt.hxx  |3 
 sw/source/core/text/itrform2.cxx|   55 ++
 sw/source/core/text/porlay.cxx  |  268 +++-
 sw/source/core/text/porlin.cxx  |   47 +-
 sw/source/core/text/porlin.hxx  |2 
 sw/source/core/text/pormulti.cxx|   20 
 sw/source/core/text/porrst.cxx  |  130 -
 sw/source/core/text/porrst.hxx  |   25 +
 sw/source/core/text/xmldump.cxx |1 
 sw/source/core/txtnode/modeltoviewhelper.cxx|2 
 vcl/Executable_icontest.mk  |1 
 vcl/Executable_lo_kde5filepicker.mk |1 
 vcl/Executable_mtfdemo.mk   |1 
 vcl/Executable_ui-previewer.mk  |1 
 vcl/Executable_vcldemo.mk   |1 
 vcl/Executable_visualbackendtest.mk |1 
 vcl/Library_desktop_detector.mk |1 
 vcl/Library_vcl.mk  |6 
 vcl/Library_vclplug_gen.mk  |1 
 vcl/Library_vclplug_gtk.mk  |1 
 vcl/Library_vclplug_gtk3.mk |1 
 vcl/Library_vclplug_gtk3_kde5.mk|1 
 vcl/Library_vclplug_kde5.mk |1 
 vcl/Library_vclplug_qt5.mk  |1 
 vcl/StaticLibrary_glxtest.mk|1 
 58 files changed, 642 insertions(+), 117 deletions(-)

New commits:
commit 5dc4b9b9ce47ecf0ebe4b442c3bcad9f6560f15c
Author: Michael Stahl 
AuthorDate: Wed Jun 3 16:03:09 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu Jun 4 18:50:42 2020 +0200

tdf#130804 sw: fix bookmark portions in line containing only as-char fly

There were 2 problems:

* due to the first bookmark portion, the line got an additional 55 twips
  of its descent added to its height in SwLineLayout::CalcLine().

* when called from SwTextFrame::CalcHeightOfLastLine(),
  SwLineLayout::MaxAscentDescent() is supposed to ignore FlyInCnt
  portions, but it didn't ignore the bookmark portion which had the same
  height, hence the resulting line spacing was 855 instead of 0 and the
  upper margin of the next paragraph increased similarly.

(regression from 4ce8120f1e53f7b81e653b01d141643013bc69ab)

Reviewed-on: https://gerrit.li

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

[Noel Grandin (via logerrit)]

 svl/qa/unit/svl.cxx  |4 ++--
 svl/source/misc/sharedstringpool.cxx |7 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit c344de1b9985b6ca10b354e24151d0bdf92dc20e
Author: Noel Grandin 
AuthorDate: Wed Jun 3 14:35:27 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 4 18:49:40 2020 +0200

fix ubsan in SharedStringPool

with a slightly dodgy fix.

regression from
commit 3581f1d71ae0d431ba28c0f3b7b263ff6212ce7b
optimize SharedStringPool::purge() and fix tests

It's not ideal - we no longer have a way of purging uppercase keys that
are longer in use.
But that doesn't cost much memory, because we are sharing those strings.

We could potentially identify them with extra book-keeping in either
intern() or purge(), but since this class is performance-sensitive, best
just to sacrifice some space in the map.

Change-Id: I85a469448f5b36b1b6889da60280edd56bbcb083
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95432
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 4aa6ae8ba911bd3420d3b74c085aa69d87339f4d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95426

diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 6b44a96729d1..2c266e4d9d31 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -392,10 +392,10 @@ void Test::testSharedStringPoolPurge()
 CPPUNIT_ASSERT_EQUAL(static_cast(3), aPool.getCount());
 CPPUNIT_ASSERT_EQUAL(static_cast(2), aPool.getCountIgnoreCase());
 
-// Ditto...
+// Nothing changes, because the upper-string is still in the map
 pStr3.reset();
 aPool.purge();
-CPPUNIT_ASSERT_EQUAL(static_cast(2), aPool.getCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(3), aPool.getCount());
 CPPUNIT_ASSERT_EQUAL(static_cast(2), aPool.getCountIgnoreCase());
 
 // Again.
diff --git a/svl/source/misc/sharedstringpool.cxx 
b/svl/source/misc/sharedstringpool.cxx
index 25898084f327..d2d890004fbd 100644
--- a/svl/source/misc/sharedstringpool.cxx
+++ b/svl/source/misc/sharedstringpool.cxx
@@ -60,7 +60,12 @@ SharedString SharedStringPool::intern( const OUString& rStr )
 // need to use the same underlying rtl_uString object so the
 // upper->upper detection in purge() works
 auto pData = insertResult.first->pData;
-mpImpl->maStrMap.insert_or_assign(mapIt, pData, pData);
+// This is dodgy, but necessary. I don't want to do a 
delete/insert because
+// this class is very performance sensitive. This does not violate 
the internals
+// the map because the new key points to something with the same 
hash and equality
+// as the old key.
+const_cast(mapIt->first) = *insertResult.first;
+mapIt->second = pData;
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: drawinglayer/source include/drawinglayer oox/source sd/qa svx/source

[A_GAN (via logerrit)]

 drawinglayer/source/primitive2d/shadowprimitive2d.cxx|   10 --
 drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx |1 +
 drawinglayer/source/processor3d/shadow3dextractor.cxx|1 +
 include/drawinglayer/primitive2d/shadowprimitive2d.hxx   |   10 --
 oox/source/drawingml/effectproperties.cxx|3 ++-
 sd/qa/unit/import-tests.cxx  |2 +-
 svx/source/sdr/primitive2d/sdrdecompositiontools.cxx |1 +
 7 files changed, 22 insertions(+), 6 deletions(-)

New commits:
commit b90d0a9dc8e7b4e6a683b35939a7ce0c3090e888
Author: A_GAN 
AuthorDate: Wed Jun 3 05:55:46 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 4 18:43:51 2020 +0200

Update ShadowPrimitive2D to support shadow blur

Add attribute for the blur radius and get function.
give more range for the shadow depends on the size of the blur radius.
update the blur radius to be imported in Hmm and the test function.

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

diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx 
b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
index 8cb8311494a5..e2c0be36ec9e 100644
--- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
@@ -23,6 +23,8 @@
 #include 
 #include 
 
+#include 
+#include 
 
 using namespace com::sun::star;
 
@@ -32,10 +34,12 @@ namespace drawinglayer::primitive2d
 ShadowPrimitive2D::ShadowPrimitive2D(
 const basegfx::B2DHomMatrix& rShadowTransform,
 const basegfx::BColor& rShadowColor,
+double fShadowBlur,
 const Primitive2DContainer& rChildren)
 :   GroupPrimitive2D(rChildren),
 maShadowTransform(rShadowTransform),
-maShadowColor(rShadowColor)
+maShadowColor(rShadowColor),
+mfShadowBlur(fShadowBlur)
 {
 }
 
@@ -46,7 +50,8 @@ namespace drawinglayer::primitive2d
 const ShadowPrimitive2D& rCompare = static_cast< const 
ShadowPrimitive2D& >(rPrimitive);
 
 return (getShadowTransform() == rCompare.getShadowTransform()
-&& getShadowColor() == rCompare.getShadowColor());
+&& getShadowColor() == rCompare.getShadowColor()
+&& getShadowBlur() == rCompare.getShadowBlur());
 }
 
 return false;
@@ -55,6 +60,7 @@ namespace drawinglayer::primitive2d
 basegfx::B2DRange ShadowPrimitive2D::getB2DRange(const 
geometry::ViewInformation2D& rViewInformation) const
 {
 basegfx::B2DRange 
aRetval(getChildren().getB2DRange(rViewInformation));
+aRetval.grow(getShadowBlur());
 aRetval.transform(getShadowTransform());
 return aRetval;
 }
diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx 
b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
index 28e9eccdacc5..afc841fcf3bd 100644
--- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
@@ -235,6 +235,7 @@ namespace drawinglayer::primitive2d
 aShadow = new ShadowPrimitive2D(
 aShadowTransform,
 aShadowColor,
+0,  // fShadowBlur = 0, there's no blur 
for text shadow yet.
 aRetval);
 }
 
diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx 
b/drawinglayer/source/processor3d/shadow3dextractor.cxx
index 45fca6d8dd38..0b653236eb1b 100644
--- a/drawinglayer/source/processor3d/shadow3dextractor.cxx
+++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx
@@ -74,6 +74,7 @@ namespace drawinglayer::processor3d
 primitive2d::BasePrimitive2D* pNew = new 
primitive2d::ShadowPrimitive2D(
 rPrimitive.getShadowTransform(),
 rPrimitive.getShadowColor(),
+0,  // shadow3d doesn't have 
rPrimitive.getShadowBlur() yet.
 aNewSubList);
 
 
if(basegfx::fTools::more(rPrimitive.getShadowTransparence(), 0.0))
diff --git a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx 
b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
index 4bff4c7aa89c..f384049862a9 100644
--- a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 namespace drawinglayer::primitive2d
@@ -51,17 +52,22 @@ namespace drawinglayer::primitive2d
 /// the shadow color to which all geometry is to be forced

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

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf133455.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx|   17 ++
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   39 +--
 writerfilter/source/dmapper/TableManager.cxx |   16 ++
 writerfilter/source/dmapper/TableManager.hxx |   33 
 writerfilter/source/dmapper/TablePropertiesHandler.cxx   |4 -
 writerfilter/source/dmapper/TablePropertiesHandler.hxx   |   11 
 7 files changed, 81 insertions(+), 39 deletions(-)

New commits:
commit da8ea444b004a0be36964ae9a778f73e752b2673
Author: László Németh 
AuthorDate: Thu Jun 4 13:32:53 2020 +0200
Commit: László Németh 
CommitDate: Thu Jun 4 18:43:16 2020 +0200

tdf#133455 DOCX import: fix table border regression

caused by commit 8ffc1299ebf83450e67cf2a89304859e2558cd27
(tdf#95033 DOCX import: apply tblPrEx table border).

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf133455.docx 
b/sw/qa/extras/ooxmlexport/data/tdf133455.docx
new file mode 100644
index ..e852976995e6
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf133455.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 6018c417ad47..690309b6827f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -726,6 +726,23 @@ DECLARE_OOXMLEXPORT_TEST(testTdf95033, "tdf95033.docx")
 assertXPath(pXmlDocument, 
"/w:document/w:body/w:tbl/w:tr[9]/w:tc[2]/w:tcPr/w:tcBorders/w:bottom[@w:val = 
'nil']", 0);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf133455, "tdf133455.docx")
+{
+xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml");
+if (!pXmlDocument)
+return;
+
+//Not disabled table cell borders
+assertXPath(pXmlDocument, 
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:top[@w:val = 
'nil']", 0);
+assertXPath(pXmlDocument, 
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:start[@w:val = 
'nil']", 0);
+assertXPath(pXmlDocument, 
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:end[@w:val = 
'nil']", 0);
+assertXPath(pXmlDocument, 
"/w:document/w:body/w:tbl/w:tr[2]/w:tc[1]/w:tcPr/w:tcBorders/w:start[@w:val = 
'nil']", 0);
+assertXPath(pXmlDocument, 
"/w:document/w:body/w:tbl/w:tr[2]/w:tc[1]/w:tcPr/w:tcBorders/w:end[@w:val = 
'nil']", 0);
+assertXPath(pXmlDocument, 
"/w:document/w:body/w:tbl/w:tr[11]/w:tc[1]/w:tcPr/w:tcBorders/w:start[@w:val = 
'nil']", 0);
+assertXPath(pXmlDocument, 
"/w:document/w:body/w:tbl/w:tr[11]/w:tc[1]/w:tcPr/w:tcBorders/w:end[@w:val = 
'nil']", 0);
+assertXPath(pXmlDocument, 
"/w:document/w:body/w:tbl/w:tr[11]/w:tc[1]/w:tcPr/w:tcBorders/w:bottom[@w:val = 
'nil']", 0);
+}
+
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128646, "tdf128646.docx")
 {
 // The problem was that not hidden shapes anchored to empty hidden 
paragraphs were imported as hidden.
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index a42478a2b0df..9c3d87de1552 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -762,11 +762,6 @@ CellPropertyValuesSeq_t 
DomainMapperTableHandler::endTableGetCellProperties(Tabl
 pCellProperties[nRow].realloc( aRowOfCellsIterator->size() );
 beans::PropertyValues* pSingleCellProperties = 
pCellProperties[nRow].getArray();
 
-static const PropertyIds pBorders[] =
-{
-PROP_TOP_BORDER, PROP_LEFT_BORDER, PROP_BOTTOM_BORDER, 
PROP_RIGHT_BORDER
-};
-
 while( aCellIterator != aCellIteratorEnd )
 {
 PropertyMapPtr pAllCellProps( new PropertyMap );
@@ -823,33 +818,15 @@ CellPropertyValuesSeq_t 
DomainMapperTableHandler::endTableGetCellProperties(Tabl
 PropertyMapPtr pStyleProps = 
rInfo.pTableStyle->GetProperties( nCnfStyleMask );
 
 // Check if we need to clean up some empty border 
definitions to match what Word does.
-// Apply also possible tblPrEx borders on cells
+static const PropertyIds pBorders[] =
+{
+PROP_TOP_BORDER, PROP_LEFT_BORDER, PROP_BOTTOM_BORDER, 
PROP_RIGHT_BORDER
+};
 for (const PropertyIds& rBorder : pBorders)
 {
 std::optional oStyleCellBorder 
= pStyleProps->getProperty(rBorder);
 std::optional oRowCellBorder;
-// we can have table border exception in row properties
-if (*aRowIter && (*aRowIt

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

[Chris Sherlock (via logerrit)]

 include/vcl/outdev.hxx |1 +
 include/vcl/print.hxx  |1 +
 vcl/source/window/decoview.cxx |5 +
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit c39738eabfb9edde552832581bf85e717b00cc79
Author: Chris Sherlock 
AuthorDate: Sun May 24 00:49:27 2020 +1000
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 4 18:36:05 2020 +0200

tdf#74702 vcl: extract GetMonochromeButtonColor()

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

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 18c47547d44a..86c18f06782e 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -537,6 +537,7 @@ public:
 
 public:
 virtual Size GetButtonBorderSize() { return Size(1, 1); };
+virtual Color GetMonochromeButtonColor() { return COL_WHITE; }
 
 /** @name Direct OutputDevice drawing functions
  */
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 6e0fd0d15c76..2e72240d42c0 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -241,6 +241,7 @@ public:
 const Gradient& rGradient );
 virtual Bitmap  GetBitmap( const Point& rSrcPt, const Size& 
rSize ) const override;
 virtual SizeGetButtonBorderSize() override;
+virtual Color   GetMonochromeButtonColor() override { return 
COL_LIGHTGRAY; }
 
 boolIsScreenComp() const override { return false; }
 
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 2d418a0ad486..fab8f183ca9d 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -509,10 +509,7 @@ void ImplDrawButton( OutputDevice *const pDev, 
tools::Rectangle aFillRect,
 }
 
 // Hack: in monochrome mode on printers we like to have grey buttons
-if ( pDev->GetOutDevType() == OUTDEV_PRINTER )
-pDev->SetFillColor( COL_LIGHTGRAY );
-else
-pDev->SetFillColor( COL_WHITE );
+pDev->SetFillColor(pDev->GetMonochromeButtonColor());
 pDev->DrawRect( aFillRect );
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sd/source sw/source

[Jan Holesovsky (via logerrit)]

 sd/source/ui/func/fuinsert.cxx  |6 +-
 sw/source/uibase/table/tablemgr.cxx |7 +--
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 67c09ed54c8a01d8d02a08e4380780e30db35df5
Author: Jan Holesovsky 
AuthorDate: Wed May 29 15:42:20 2019 +0200
Commit: Michael Meeks 
CommitDate: Thu Jun 4 18:32:34 2020 +0200

sw sd lok: Don't enter the OLE editing mode right after inserting a chart.

Turns out that it is confusing for the users that they can edit the
properties of the chart rather than its position just after inserting
it in the browser.

Let's change it accordingly.  When the user wants to edit the chart
itself, they have to double-click.

Calc is not handled in this patch.

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

diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 013b1c5aa829..22f3e26b81ce 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -89,6 +89,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace com::sun::star;
 
 namespace sd {
@@ -407,8 +409,10 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
 else
 bRet = mpView->InsertObjectAtView(pOleObj, *pPV, 
SdrInsertFlags::SETDEFLAYER);
 
-if( bRet )
+if (bRet && !comphelper::LibreOfficeKit::isActive())
 {
+// Let the chart be activated after the inserting (unless
+// via LibreOfficeKit)
 if (nSlotId == SID_INSERT_DIAGRAM)
 {
 pOleObj->SetProgName( "StarChart");
diff --git a/sw/source/uibase/table/tablemgr.cxx 
b/sw/source/uibase/table/tablemgr.cxx
index da16e077bad8..38cf44e9c142 100644
--- a/sw/source/uibase/table/tablemgr.cxx
+++ b/sw/source/uibase/table/tablemgr.cxx
@@ -47,6 +47,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 
 // Adjust line height (dialogue)
@@ -247,9 +249,10 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
 }
 pSh->EndAllAction();
 
-if ( xObj.is() )
+if (xObj.is() && !comphelper::LibreOfficeKit::isActive())
 {
-// Let the chart be activated after the inserting
+// Let the chart be activated after the inserting (unless
+// via LibreOfficeKit)
 SfxInPlaceClient* pClient = pSh->GetView().FindIPClient( xObj, 
&pSh->GetView().GetEditWin() );
 if ( !pClient )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - include/vcl sd/source vcl/qa vcl/source

[Tomaž Vajngerl (via logerrit)]

 include/vcl/VectorGraphicSearch.hxx|   24 +++
 sd/source/ui/view/Outliner.cxx |   16 +++--
 vcl/qa/cppunit/VectorGraphicSearchTest.cxx |   88 -
 vcl/source/graphic/VectorGraphicSearch.cxx |   22 ---
 4 files changed, 135 insertions(+), 15 deletions(-)

New commits:
commit c8470364bdbc142661ec89eff8e3a7e05e7695b2
Author: Tomaž Vajngerl 
AuthorDate: Thu Jun 4 18:26:58 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 4 18:26:58 2020 +0200

sd: support match case, match whole word for PDF search

THis adds support for match case and match whole word to the
VectorGraphicSearch + tests.

It uses the new options in PDF seearch in Draw/Impress.

Change-Id: I20a6382c22bf01a5a021c8bae1ff78861419c0ef

diff --git a/include/vcl/VectorGraphicSearch.hxx 
b/include/vcl/VectorGraphicSearch.hxx
index c9faaa51f1c9..4601a1f5ac1d 100644
--- a/include/vcl/VectorGraphicSearch.hxx
+++ b/include/vcl/VectorGraphicSearch.hxx
@@ -25,6 +25,28 @@ enum class SearchStartPosition
 End
 };
 
+struct VCL_DLLPUBLIC VectorGraphicSearchOptions final
+{
+SearchStartPosition meStartPosition;
+bool mbMatchCase;
+bool mbMatchWholeWord;
+
+VectorGraphicSearchOptions()
+: meStartPosition(SearchStartPosition::Begin)
+, mbMatchCase(false)
+, mbMatchWholeWord(false)
+{
+}
+
+VectorGraphicSearchOptions(SearchStartPosition eStartPosition, bool 
bMatchCase,
+   bool bMatchWholeWord)
+: meStartPosition(eStartPosition)
+, mbMatchCase(bMatchCase)
+, mbMatchWholeWord(bMatchWholeWord)
+{
+}
+};
+
 class VCL_DLLPUBLIC VectorGraphicSearch final
 {
 private:
@@ -38,7 +60,7 @@ public:
 VectorGraphicSearch(Graphic const& rGraphic);
 ~VectorGraphicSearch();
 bool search(OUString const& rSearchString,
-SearchStartPosition eStartPosition = 
SearchStartPosition::Begin);
+VectorGraphicSearchOptions const& rOptions = 
VectorGraphicSearchOptions());
 basegfx::B2DSize pageSize();
 bool next();
 bool previous();
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index f8cec9464896..9b777d3a1dad 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -829,8 +829,12 @@ bool 
SdOutliner::SearchAndReplaceOnce(std::vector* pSelecti
 OUString const & rString = mpSearchItem->GetSearchString();
 bool bBackwards = mpSearchItem->GetBackward();
 
-SearchStartPosition eSearchStartPosition = bBackwards ? 
SearchStartPosition::End : SearchStartPosition::Begin;
-bool bResult = mpImpl->mpVectorGraphicSearch->search(rString, 
eSearchStartPosition);
+VectorGraphicSearchOptions aOptions;
+aOptions.meStartPosition = bBackwards ? 
SearchStartPosition::End : SearchStartPosition::Begin;
+aOptions.mbMatchCase = mpSearchItem->GetExact();
+aOptions.mbMatchWholeWord = mpSearchItem->GetWordOnly();
+
+bool bResult = mpImpl->mpVectorGraphicSearch->search(rString, 
aOptions);
 
 if (bResult)
 {
@@ -1242,11 +1246,15 @@ void SdOutliner::ProvideNextTextObject()
 auto* pGraphicObject = static_cast(mpObj);
 OUString const & rString = mpSearchItem->GetSearchString();
 bool bBackwards = mpSearchItem->GetBackward();
-SearchStartPosition eSearchStartPosition = bBackwards ? 
SearchStartPosition::End : SearchStartPosition::Begin;
+
+VectorGraphicSearchOptions aOptions;
+aOptions.meStartPosition = bBackwards ? 
SearchStartPosition::End : SearchStartPosition::Begin;
+aOptions.mbMatchCase = mpSearchItem->GetExact();
+aOptions.mbMatchWholeWord = mpSearchItem->GetWordOnly();
 
 mpImpl->mpVectorGraphicSearch = 
std::make_unique(pGraphicObject->GetGraphic());
 
-bool bResult = 
mpImpl->mpVectorGraphicSearch->search(rString, eSearchStartPosition);
+bool bResult = 
mpImpl->mpVectorGraphicSearch->search(rString, aOptions);
 if (bResult)
 {
 if (bBackwards)
diff --git a/vcl/qa/cppunit/VectorGraphicSearchTest.cxx 
b/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
index 00febce16e71..0659e4e62dcf 100644
--- a/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
+++ b/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
@@ -32,11 +32,15 @@ class VectorGraphicSearchTest : public 
test::BootstrapFixtureBase
 void test();
 void testNextPrevious();
 void testSearchStringChange();
+void testSearchMatchWholeWord();
+void testSearchMatchCase();
 
 CPPUNIT_TEST_SUITE(VectorGraphicSearchTest);
 CPPUNIT_TEST(test);
 CPPUNIT_TEST(testNextPrevious);
 CPPUN

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

[Stephan Bergmann (via logerrit)]

 oox/qa/unit/vba_encryption.cxx   |3 +--
 oox/source/drawingml/hyperlinkcontext.cxx|   12 
 oox/source/drawingml/shape.cxx   |   18 ++
 oox/source/drawingml/textparagraph.cxx   |3 +--
 oox/source/drawingml/textparagraphproperties.cxx |3 +--
 oox/source/ppt/presentationfragmenthandler.cxx   |6 ++
 6 files changed, 15 insertions(+), 30 deletions(-)

New commits:
commit 54e35feef17580cfcbf0a2db1272fb05c85e2348
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 13:57:23 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 18:10:45 2020 +0200

Upcoming loplugin:elidestringvar: oox

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

diff --git a/oox/qa/unit/vba_encryption.cxx b/oox/qa/unit/vba_encryption.cxx
index 7e8a44cd9c20..326711cae9fc 100644
--- a/oox/qa/unit/vba_encryption.cxx
+++ b/oox/qa/unit/vba_encryption.cxx
@@ -73,8 +73,7 @@ void TestVbaEncryption::testSimple2()
 
 void TestVbaEncryption::testProjKey1()
 {
-OUString const aProjectID("{917DED54-440B-4FD1-A5C1-74ACF261E600}");
-sal_uInt8 nProjKey = VBAEncryption::calculateProjKey(aProjectID);
+sal_uInt8 nProjKey = 
VBAEncryption::calculateProjKey("{917DED54-440B-4FD1-A5C1-74ACF261E600}");
 CPPUNIT_ASSERT_EQUAL(int(0xdf), static_cast(nProjKey));
 }
 
diff --git a/oox/source/drawingml/hyperlinkcontext.cxx 
b/oox/source/drawingml/hyperlinkcontext.cxx
index 3c19892815d4..d0a09b140dcf 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -85,9 +85,7 @@ HyperLinkContext::HyperLinkContext( ContextHandler2Helper 
const & rParent,
 sal_Int32 nIndex = aPPAct.indexOf( '?' );
 OUString aPPAction( nIndex > 0 ? aPPAct.copy( 0, nIndex ) : aPPAct 
);
 
-const OUString sHlinkshowjump( "hlinkshowjump" );
-const OUString sHlinksldjump( "hlinksldjump" );
-if ( aPPAction.match( sHlinkshowjump ) )
+if ( aPPAction.match( "hlinkshowjump" ) )
 {
 const OUString sJump( "jump=" );
 if ( aPPAct.match( sJump, nIndex + 1 ) )
@@ -96,7 +94,7 @@ HyperLinkContext::HyperLinkContext( ContextHandler2Helper 
const & rParent,
 sURL += "#action?jump=" + aDestination;
 }
 }
-else if ( aPPAction.match( sHlinksldjump ) )
+else if ( aPPAction.match( "hlinksldjump" ) )
 {
 sURL.clear();
 
@@ -121,12 +119,10 @@ HyperLinkContext::HyperLinkContext( ContextHandler2Helper 
const & rParent,
 sal_Int32 nPageNumber = sHref.copy( nIndex2, nLength 
).toInt32();
 if ( nPageNumber )
 {
-const OUString sSlide( "slide" );
-const OUString sNotesSlide( "notesSlide" );
 const OUString aSlideType( sHref.copy( 0, nIndex2 ) );
-if ( aSlideType.match( sSlide ) )
+if ( aSlideType.match( "slide" ) )
 sURL = "#Slide " + OUString::number( nPageNumber );
-else if ( aSlideType.match( sNotesSlide ) )
+else if ( aSlideType.match( "notesSlide" ) )
 sURL = "#Notes " + OUString::number( nPageNumber );
 //  else: todo for other types such as notesMaster or 
slideMaster as they can't be referenced easily
 }
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 3fedf4dbb761..1e9d2ea55a46 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -587,16 +587,13 @@ static void lcl_createPresetShape(const 
uno::Reference& xShape,
 aGeomPropSeq );
 
 // Reset old properties
-const OUString sCoordinateSize( "CoordinateSize" );
-const OUString sEquations( "Equations" );
-const OUString sPath( "Path" );
 const OUString sTextPath( "TextPath" );
 const OUString sAdjustmentValues( "AdjustmentValues" );
 const OUString sPresetTextWarp( "PresetTextWarp" );
 
-lcl_resetPropertyValue( aGeomPropVec, sCoordinateSize );
-lcl_resetPropertyValue( aGeomPropVec, sEquations );
-lcl_resetPropertyValue( aGeomPropVec, sPath );
+lcl_resetPropertyValue( aGeomPropVec, "CoordinateSize" );
+lcl_resetPropertyValue( aGeomPropVec, "Equations" );
+lcl_resetPropertyValue( aGeomPropVec, "Path" );
 lcl_resetPropertyValue( aGeomPropVec, sAdjustmentValues);
 
 bool bFromWordArt(false);
@@ -899,8 +896,7 @@ Reference< XShape > const & Shape::createAndInsert(
 }
 if( !msDescription.isEmpty() )
 {
-const OUString sDescription( "Description" );
-xSet->setPropertyValu

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - extras/source

[Rene Engelhard (via logerrit)]

 extras/source/shellnew/soffice.odg |binary
 extras/source/shellnew/soffice.ods |binary
 extras/source/shellnew/soffice.odt |binary
 3 files changed

New commits:
commit f31f903628d5e578b003524d62b905289f64e58f
Author: Rene Engelhard 
AuthorDate: Mon Jun 1 09:24:40 2020 +0200
Commit: René Engelhard 
CommitDate: Thu Jun 4 17:25:21 2020 +0200

deb#961473 set A4 in extras/source/shellnew templates

it's far more used in the world than "US Letter"

Change-Id: I7dbbefc9bde543967e1f3039890bbff91fc1459c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95421
Reviewed-by: Andras Timar 
Reviewed-by: René Engelhard 
Tested-by: René Engelhard 

diff --git a/extras/source/shellnew/soffice.odg 
b/extras/source/shellnew/soffice.odg
index 0df6408db875..ac06d224ec84 100644
Binary files a/extras/source/shellnew/soffice.odg and 
b/extras/source/shellnew/soffice.odg differ
diff --git a/extras/source/shellnew/soffice.ods 
b/extras/source/shellnew/soffice.ods
index 2f3bcbc60319..33782b08fedf 100644
Binary files a/extras/source/shellnew/soffice.ods and 
b/extras/source/shellnew/soffice.ods differ
diff --git a/extras/source/shellnew/soffice.odt 
b/extras/source/shellnew/soffice.odt
index 679cc6493cc6..be6efc69f714 100644
Binary files a/extras/source/shellnew/soffice.odt and 
b/extras/source/shellnew/soffice.odt differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rene Engelhard (via logerrit)]

 extras/source/shellnew/soffice.odg |binary
 extras/source/shellnew/soffice.ods |binary
 extras/source/shellnew/soffice.odt |binary
 3 files changed

New commits:
commit 5d9348b13674baf1d27f406767274e764c758bd5
Author: Rene Engelhard 
AuthorDate: Mon Jun 1 09:24:40 2020 +0200
Commit: René Engelhard 
CommitDate: Thu Jun 4 17:23:03 2020 +0200

deb#961473 set A4 in extras/source/shellnew templates

it's far more used in the world than "US Letter"

Change-Id: I7dbbefc9bde543967e1f3039890bbff91fc1459c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95258
Reviewed-by: Andras Timar 
Reviewed-by: René Engelhard 
Tested-by: René Engelhard 

diff --git a/extras/source/shellnew/soffice.odg 
b/extras/source/shellnew/soffice.odg
index 0df6408db875..ac06d224ec84 100644
Binary files a/extras/source/shellnew/soffice.odg and 
b/extras/source/shellnew/soffice.odg differ
diff --git a/extras/source/shellnew/soffice.ods 
b/extras/source/shellnew/soffice.ods
index 2f3bcbc60319..33782b08fedf 100644
Binary files a/extras/source/shellnew/soffice.ods and 
b/extras/source/shellnew/soffice.ods differ
diff --git a/extras/source/shellnew/soffice.odt 
b/extras/source/shellnew/soffice.odt
index 679cc6493cc6..be6efc69f714 100644
Binary files a/extras/source/shellnew/soffice.odt and 
b/extras/source/shellnew/soffice.odt differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 basctl/source/inc/bastype2.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit e1958c3460966dd83e50e1570d08fe31bb348e46
Author: Caolán McNamara 
AuthorDate: Thu Jun 4 09:45:42 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jun 4 17:17:52 2020 +0200

drop unused inline method

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

diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx
index c376852e3609..92d593e3f475 100644
--- a/basctl/source/inc/bastype2.hxx
+++ b/basctl/source/inc/bastype2.hxx
@@ -272,7 +272,6 @@ public:
 return m_xControl->get_sort_indicator(nColumn);
 }
 
-int get_sort_column() const { return m_xControl->get_sort_column(); }
 void set_sort_column(int nColumn) { m_xControl->set_sort_column(nColumn); }
 
 void set_sort_func(const std::function& func)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[gokaysatir (via logerrit)]

 loleaflet/admin/src/AdminSocketSettings.js |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e703f2bac0d8dd05d44e47c45c1376e7a24a0946
Author: gokaysatir 
AuthorDate: Thu Jun 4 15:29:27 2020 +0300
Commit: Michael Meeks 
CommitDate: Thu Jun 4 17:08:21 2020 +0200

leaflet: fix admin console - shut down modal is not working properly.

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

diff --git a/loleaflet/admin/src/AdminSocketSettings.js 
b/loleaflet/admin/src/AdminSocketSettings.js
index ab43bd605..f57423634 100644
--- a/loleaflet/admin/src/AdminSocketSettings.js
+++ b/loleaflet/admin/src/AdminSocketSettings.js
@@ -36,9 +36,11 @@ var AdminSocketSettings = AdminSocketBase.extend({
$.extend({}, 
vex.dialog.buttons.YES, { text: _('OK') }),
$.extend({}, 
vex.dialog.buttons.NO, { text: _('Cancel') })
],
-   callback: function() {
+   callback: function(value) {
// TODO: Prompt for reason.
-   socketSettings.send('shutdown 
maintenance');
+   if (value) {
+   
socketSettings.send('shutdown maintenance');
+   }
}
});
});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky (via logerrit)]

 sc/source/ui/app/inputhdl.cxx |   11 +++
 sc/source/ui/view/cellsh3.cxx |   16 ++--
 2 files changed, 21 insertions(+), 6 deletions(-)

New commits:
commit af8258512eb7e58054c3d527c2af8aeaeb34364e
Author: Jan Holesovsky 
AuthorDate: Tue Jul 16 11:58:11 2019 +0200
Commit: Michael Meeks 
CommitDate: Thu Jun 4 17:07:54 2020 +0200

LOK: Emit the doc. modified state even when changing the cell inline.

The "LOK: emit modified status on entering cell data" patch did this
only for the formula input line, and did not change the state when the
user just clicked on the cell and started modifying it; so this patch
extends it.

Also change the actual DocumentModified state of the document directly
instead of just sending a flag, so that the state in LOOLWSD and in the
core don't get out of sync.

Change-Id: Ie516ce5a74d94247d79cf993517d7f4a6657cc94
Reviewed-on: https://gerrit.libreoffice.org/75701
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95517
Reviewed-by: Michael Meeks 

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index b8d126c936b7..4ccdfa70b639 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2774,6 +2774,9 @@ void ScInputHandler::InvalidateAttribs()
 rBindings.Invalidate( SID_SET_SUB_SCRIPT );
 rBindings.Invalidate( SID_ATTR_CHAR_STRIKEOUT );
 rBindings.Invalidate( SID_ATTR_CHAR_SHADOWED );
+
+rBindings.Invalidate( SID_SAVEDOC );
+rBindings.Invalidate( SID_DOC_MODIFIED );
 }
 }
 
@@ -3776,6 +3779,14 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, 
bool bStartEdit /* = false
 // #i114511# don't count cursor keys as modification
 bool bSetModified = !bCursorKey;
 DataChanged(false, bSetModified); // also calls UpdateParenthesis()
+
+// In the LOK case, we want to set the document modified state
+// right away at the start of the edit, so that the content is
+// saved even when the user leaves the document before hitting
+// Enter
+if (comphelper::LibreOfficeKit::isActive() && bSetModified && 
pActiveViewSh && !pActiveViewSh->GetViewData().GetDocShell()->IsModified())
+pActiveViewSh->GetViewData().GetDocShell()->SetModified();
+
 InvalidateAttribs();//! in DataChanged?
 }
 }
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 6b9b40cb075d..581ea4e85166 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -268,13 +268,17 @@ void ScCellShell::Execute( SfxRequest& rReq )
 {
 if ( pReqArgs )
 {
-if (comphelper::LibreOfficeKit::isActive())
+// In the LOK case, we want to set the document modified 
state
+// right away at the start of the edit, so that the 
content is
+// saved even when the user leaves the document before 
hitting
+// Enter
+// NOTE: This also means we want to set the modified state
+// regardless of the DontCommit parameter's value.
+if (comphelper::LibreOfficeKit::isActive() && 
!GetViewData()->GetDocShell()->IsModified())
 {
-// Let the client know about our entry, so if they save
-// (say because the user closes the document or 
window,)
-// this change gets persisted (assuming 
DontTerminateEdit
-// is set to false in the .uno:Save command).
-
SfxLokHelper::notifyAllViews(LOK_CALLBACK_STATE_CHANGED, 
".uno:ModifiedStatus=true");
+GetViewData()->GetDocShell()->SetModified();
+rBindings.Invalidate(SID_SAVEDOC);
+rBindings.Invalidate(SID_DOC_MODIFIED);
 }
 
 OUString aStr( static_cast(pReqArgs->
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 sd/qa/unit/tiledrendering/LOKitSearchTest.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 25da71b489228b866f20d8ea6d1926128168d1fa
Author: Tomaž Vajngerl 
AuthorDate: Wed Jun 3 12:31:34 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 4 17:01:57 2020 +0200

sd: disable LOKitSearchTest that test PDF search if no PDFium

enclose the tests with HAVE_FEATURE_PDFIUM

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

diff --git a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx 
b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
index 8c2a41eeca9e..91b5ecbc8473 100644
--- a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
+++ b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
@@ -8,6 +8,8 @@
  */
 
 #include "../sdmodeltestbase.hxx"
+#include 
+
 #include "CallbackRecorder.hxx"
 
 #include 
@@ -140,6 +142,7 @@ void lcl_search(const OUString& rKey, bool bFindAll = 
false, bool bBackwards = f
 Scheduler::ProcessEventsToIdle();
 }
 
+#if HAVE_FEATURE_PDFIUM
 SdrObject* lclGetSelectedObject(sd::ViewShell* pViewShell)
 {
 SdrView* pSdrView = pViewShell->GetView();
@@ -148,6 +151,7 @@ SdrObject* lclGetSelectedObject(sd::ViewShell* pViewShell)
 SdrObject* pObject = rMarkList.GetMark(0)->GetMarkedSdrObj();
 return pObject;
 }
+#endif
 
 } // end anonymous namespace
 
@@ -262,6 +266,7 @@ void LOKitSearchTest::testDontSearchInMasterPages()
 
 void LOKitSearchTest::testSearchInPDFNonExisting()
 {
+#if HAVE_FEATURE_PDFIUM
 SdXImpressDocument* pXImpressDocument = createDoc("PDFSearch.pdf");
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 CPPUNIT_ASSERT(pViewShell);
@@ -285,10 +290,12 @@ void LOKitSearchTest::testSearchInPDFNonExisting()
 lcl_search("NonExisting");
 
 CPPUNIT_ASSERT_EQUAL(false, mpCallbackRecorder->m_bFound);
+#endif
 }
 
 void LOKitSearchTest::testSearchInPDF()
 {
+#if HAVE_FEATURE_PDFIUM
 SdXImpressDocument* pXImpressDocument = createDoc("PDFSearch.pdf");
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 CPPUNIT_ASSERT(pViewShell);
@@ -332,10 +339,12 @@ void LOKitSearchTest::testSearchInPDF()
  mpCallbackRecorder->m_aSearchResultSelection[0]);
 CPPUNIT_ASSERT_EQUAL(tools::Rectangle(Point(3763, 1331), Size(1433, 484)),
  mpCallbackRecorder->m_aSelection[0]);
+#endif
 }
 
 void LOKitSearchTest::testSearchInPDFInMultiplePages()
 {
+#if HAVE_FEATURE_PDFIUM
 SdXImpressDocument* pXImpressDocument = createDoc("PDFSearch.pdf");
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 CPPUNIT_ASSERT(pViewShell);
@@ -422,10 +431,12 @@ void LOKitSearchTest::testSearchInPDFInMultiplePages()
 CPPUNIT_ASSERT_EQUAL(0, mpCallbackRecorder->m_aSearchResultPart[0]);
 CPPUNIT_ASSERT_EQUAL(OString("9463, 3382, 1099, 499"),
  mpCallbackRecorder->m_aSearchResultSelection[0]);
+#endif
 }
 
 void LOKitSearchTest::testSearchInPDFInMultiplePagesBackwards()
 {
+#if HAVE_FEATURE_PDFIUM
 SdXImpressDocument* pXImpressDocument = createDoc("PDFSearch.pdf");
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 CPPUNIT_ASSERT(pViewShell);
@@ -520,12 +531,14 @@ void 
LOKitSearchTest::testSearchInPDFInMultiplePagesBackwards()
 CPPUNIT_ASSERT_EQUAL(0, mpCallbackRecorder->m_aSearchResultPart[0]);
 CPPUNIT_ASSERT_EQUAL(OString("5592, 5038, 1100, 499"),
  mpCallbackRecorder->m_aSearchResultSelection[0]);
+#endif
 }
 
 // Test searching in document with mixed objects.
 // We have 2 objects: 1. Text Object, 2. Graphic Object with PDF
 void LOKitSearchTest::testSearchIn2MixedObjects()
 {
+#if HAVE_FEATURE_PDFIUM
 SdXImpressDocument* pXImpressDocument = createDoc("MixedTest1.odg");
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 CPPUNIT_ASSERT(pViewShell);
@@ -606,11 +619,13 @@ void LOKitSearchTest::testSearchIn2MixedObjects()
 
 CPPUNIT_ASSERT_EQUAL(OString("3546, 3174, 738, 402"),
  mpCallbackRecorder->m_aSearchResultSelection[0]);
+#endif
 }
 
 // Test searching in document with mixed objects. We have 6 objects.
 void LOKitSearchTest::testSearchIn6MixedObjects()
 {
+#if HAVE_FEATURE_PDFIUM
 SdXImpressDocument* pXImpressDocument = createDoc("MixedTest2.odg");
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 CPPUNIT_ASSERT(pViewShell);
@@ -770,6 +785,7 @@ void LOKitSearchTest::testSearchIn6MixedObjects()
 CPPUNIT_ASSERT_EQUAL(size_t(1), 
mpCallbackRecorder->m_aSearchResultSelection.size());
 CPPUNIT_ASSERT_EQUAL(size_t(1), 
mpCallbackRecorder->m_aSearchResultPart.size());
 CPPUNIT_ASSERT_EQUAL(pPage->GetObj(0), lclGetSelectedObject(pViewShell));
+#

Ilia Sheshukov license statement

[Ilia Sheshukov]

All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Update of https://odfvalidator.org/

[Regina Henschel]

Hi all,

Michael has listed in his summary of ODF 1.3 implementation some changes 
for the validator, especially I read "Support 1.3 in web validator".


But https://odfvalidator.org/ has no item for ODF 1.3 and automatic 
detection fails for ODF 1.3 too.


When is support for ODF 1.3 supposed to work? Is there an instance where 
support for ODF 1.3 can be tested in advance?


Kind regards
Regina

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

ESC meeting minutes: 2020-06-04

[Miklos Vajna]

* Present:
+ Michael W, Stephan, Ilmari, Cloph, Heiko, Caolan, Sophie, Eike, Olivier, 
Michael S, Miklos, Xisco, Thorsten

* Completed Action Items:
+ run ‘make check’ as part of the TDF CI for online.git (Cloph)
+ put the deprecation notice to the 7.0 release notes for macOS 10.10 & 
10.11 (Ilmari)

* Pending Action Items:
+ fix Jenkins_Callgrind at some stage (Cloph)
  [ must be an env var mismatch, custom LD_LIBRARY_PATH causes problems ]


* Release Engineering update (Cloph)
+ 7.0 status
  + UI freeze & string freeze in the first week of July
  + decide next week: if a beta2 is needed (so far nobody asked for it)
  + input from QA/l10n would be great (Thorsten)
+ no blocker fixed that would need a beta2 ATM (Xisco)
+ in favor of not having beta2 (Sophie)
  + there will be 3 RCs (Cloph)
+ 6.4 status: rc1 for 6.4.5 next week
+ 6.3 status: no more releases planned
+ Remotes
+ Android viewer
  + now green
+ Online
  + libreoffice-7-0 branch is created (Andras)

* Documentation (Olivier)
+ New Help
   + Fixes in JS and CSS (buovjaga, ohallot)
+ Helpcontents2
   + Improvements/review in Calc function syntax description (S. Fanning)
   + conversion DE-EN for section mnemonics (Johnny_M)
   + Updates in contents (ohallot, fitoshido)
+ Google Seasons of Doc
   + receiving proposals
+ Guides
   + Discussions of new templates for 7.0
 + for the guides, not for LibreOffice in general

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
243(243) (topicUI) bugs open, 275(275) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month3 months12 months
 added 10(-2) 33(-3)  90(2)  183(1)
 commented 79(-18)   400(-64)   1029(-23)   3500(5)
   removed  0(0)   2(-1)  37(0)   46(0)
  resolved  6(1)  49(-7) 126(-2) 345(2)
+ top 10 contributors:
  Heiko Tietze made 226 changes in 1 month, and 1993 changes in 1 year
  Telesto made 172 changes in 1 month, and 255 changes in 1 year
  Foote, V Stuart made 65 changes in 1 month, and 608 changes in 1 year
  Dieter Praas made 49 changes in 1 month, and 541 changes in 1 year
  BogdanB made 37 changes in 1 month, and 67 changes in 1 year
  Ilmari Lauhakangas made 33 changes in 1 month, and 129 changes in 1 
year
  Kainz, Andreas made 28 changes in 1 month, and 435 changes in 1 year
  Xisco Fauli made 27 changes in 1 month, and 579 changes in 1 year
  Martin van Zijl made 18 changes in 1 month, and 18 changes in 1 year
  Monastirsky, Maxim made 16 changes in 1 month, and 52 changes in 1 
year

  + New tickets with needsUXEval May/29-Jun/04

* User Data fields are cut
  + https://bugs.documentfoundation.org/show_bug.cgi?id=133058
* No margin or padding on the left of the cell name field
  + https://bugs.documentfoundation.org/show_bug.cgi?id=133057
* Endnote Heading for HTML and Epub exports
  + https://bugs.documentfoundation.org/show_bug.cgi?id=133577
* Sound to verify document has been saved
  + https://bugs.documentfoundation.org/show_bug.cgi?id=133585
* FIND & REPLACE DIALOG: Improve find and replace for character
  attributes
  + https://bugs.documentfoundation.org/show_bug.cgi?id=133439
* Improve word completion suggestions
  + https://bugs.documentfoundation.org/show_bug.cgi?id=133494
=> in  discussion, unconfirmed


->  * Data loss in tables when opening odt file (libreoffice writer
  document)
  + https://bugs.documentfoundation.org/show_bug.cgi?id=133611
  + text in cell, then number format is applied, text is gone
  + not a regression

* Replace hard-coded paste limit to 24117248 cells with a warning
  dialog
  + https://bugs.documentfoundation.org/show_bug.cgi?id=133545
=> new

* No freehand drawing buttons in Draw 6.4.2.2
  + https://bugs.documentfoundation.org/show_bug.cgi?id=133561
* Make "current selection" persistent in F/R dialogue
  + https://bugs.documentfoundation.org/show_bug.cgi?id=133480
* Writer comments ruler UI control problems
  + https://bugs.documentfoundation.org/show_bug.cgi?id=133569
* Pressing CTRL+W with a single document open closes LibreOffice
  + https://bugs.documentfoundation.org/show_bug.cgi?id=133542
=> WF, WFM, NAB

* Crash Testing (Caolan)
+ 15(+0) import failure, 5(+0) export failures
  progress here thanks to mst
+ ??? coverity issues
upload woes continue
+ 9 ossfuzz issues, 2 fixed but pending ossfuzz build

* Crash Reporting (Xisco)
+ https://crashreport.libreoffice.org/stats/version/6.3.6.2
  

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

[Michael Stahl (via logerrit)]

 xmloff/source/style/PageMasterExportPropMapper.cxx |   25 +++--
 1 file changed, 14 insertions(+), 11 deletions(-)

New commits:
commit 08c414f908353c38b93491ee1b6405c6489468d3
Author: Michael Stahl 
AuthorDate: Thu Jun 4 13:28:33 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu Jun 4 16:37:52 2020 +0200

xmloff: ODF export: fix crash on tdf125455-2.odt

FillBitmapMode is a very funny property that is stored as 2 items
XFillBmpTileItem XATTR_FILLBMP_TILE and
XFillBmpStretchItem XATTR_FILLBMP_STRETCH
and the XPropertySet implementations for it are a bit inconsistent,
e.g. sd uses .GetItem which searches the parent
and requires both items to be present,
but sw uses GetItemState(XATTR_FILLBMP_STRETCH, false) which does not
check the parent and one item is enough.

Let's just not export the attribute in case the property isn't defined.

(regression from 4d4404b79bf051de79f587bdafd82cc0addfc636)

Change-Id: I13c2e91c3e4eb15ebec508f679ba49614f493a11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95501
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx 
b/xmloff/source/style/PageMasterExportPropMapper.cxx
index f2f08b3a2827..5eb32ead6812 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -591,19 +591,22 @@ void XMLPageMasterExportPropMapper::ContextFilter(
 backgroundSize <<= true;
 break;
 case drawing::FillStyle_BITMAP:
-assert(pFillBitmapMode);
-switch (pFillBitmapMode->maValue.get())
+if (pFillBitmapMode)
 {
-case drawing::BitmapMode_REPEAT:
-backgroundSize <<= true;
-break;
-case drawing::BitmapMode_STRETCH:
-case drawing::BitmapMode_NO_REPEAT:
-backgroundSize <<= false;
-break;
-default:
-assert(false);
+switch 
(pFillBitmapMode->maValue.get())
+{
+case drawing::BitmapMode_REPEAT:
+backgroundSize <<= true;
+break;
+case drawing::BitmapMode_STRETCH:
+case drawing::BitmapMode_NO_REPEAT:
+backgroundSize <<= false;
+break;
+default:
+assert(false);
+}
 }
+// else: leave it ambiguous if not explicitly defined
 break;
 default:
 assert(false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Heiko Tietze (via logerrit)]

 sfx2/source/appl/appserv.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 6256b86f10d9a2bc51e72088192f3bfcf9d00437
Author: Heiko Tietze 
AuthorDate: Thu Jun 4 15:48:10 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu Jun 4 16:32:58 2020 +0200

Revert "Resolves tdf#127401 - Chinese locale pointing to wrong hub forward 
address"

This reverts commit 2788cc07e9d0d078b53a7280d524175c03c51e12.

Reason for revert: 

Change-Id: I47277e7344d5533cc09a3fd6637a0780b36fe739
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95427
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index c61a8ab7a3a7..6dd813fdf7be 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -551,7 +551,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 {
 // Open donation page based on language + script (BCP47) with 
language as fall back.
 OUString aLang = 
LanguageTag(utl::ConfigManager::getUILocale()).getLanguage();
-if (aLang == "zh") aLang = "zh-cn";//tdf#127401
 OUString aBcp47 = 
LanguageTag(utl::ConfigManager::getUILocale()).getBcp47();
 OUString sURL(officecfg::Office::Common::Menus::DonationURL::get() 
+ //https://hub.libreoffice.org/donation/
 "?BCP47=" + aBcp47 + "&LOlang=" + aLang );
@@ -561,11 +560,9 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 case SID_WHATSNEW:
 {
 // Open release notes depending on version and locale
-OUString aLang = 
LanguageTag(utl::ConfigManager::getUILocale()).getLanguage();
-if (aLang == "zh") aLang = "zh-cn";//tdf#127401
 OUString 
sURL(officecfg::Office::Common::Menus::ReleaseNotesURL::get() + 
//https://hub.libreoffice.org/ReleaseNotes/
 "?LOvers=" + utl::ConfigManager::getProductVersion() +
-"&LOlocale=" + aLang );
+"&LOlocale=" + 
LanguageTag(utl::ConfigManager::getUILocale()).getBcp47() );
 sfx2::openUriExternally(sURL, false);
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/cib/libreoffice-6-2' - 2 commits - configure.ac loleaflet/html loleaflet/src wsd/ClientSession.cpp

[Samuel Mehrbrodt (via logerrit)]

 configure.ac   |2 +-
 loleaflet/html/framed.doc.html |2 ++
 loleaflet/src/core/Socket.js   |   19 +--
 wsd/ClientSession.cpp  |   14 +-
 4 files changed, 25 insertions(+), 12 deletions(-)

New commits:
commit 9d1de9131cdc4cd2ed5ad14cc98f2dc1d5459cd8
Author: Samuel Mehrbrodt 
AuthorDate: Thu Jun 4 16:10:02 2020 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jun 4 16:10:02 2020 +0200

Release 6.2.8.0

diff --git a/configure.ac b/configure.ac
index 9a8a64c96..b9d27534e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [6.2.7.0], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [6.2.8.0], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
commit 8059a8e5703f905d26398f6f84045a69c6cad95d
Author: Samuel Mehrbrodt 
AuthorDate: Tue May 19 11:45:04 2020 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jun 4 16:09:33 2020 +0200

tdf#131123 Report back save result

Change-Id: Ie3dee5d344bc65c325b95f2746c9734bdd9e2f9d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94490
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 665b1629de30a4a402c6b10dd542de158db1f428)

diff --git a/loleaflet/html/framed.doc.html b/loleaflet/html/framed.doc.html
index 435c26e6d..872c8e155 100644
--- a/loleaflet/html/framed.doc.html
+++ b/loleaflet/html/framed.doc.html
@@ -109,6 +109,8 @@
   if (msg.Values) {
 if (msg.Values.success == true) {
   document.getElementById("ModifiedStatus").innerHTML = "Saved";
+} else {
+  document.getElementById("ModifiedStatus").innerHTML = "Error 
during save";
 }
   }
 }
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 1d66ce854..4928dc881 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -307,13 +307,20 @@ L.Socket = L.Class.extend({
}
else if (textMsg.startsWith('commandresult: ')) {
var commandresult = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
-   if (commandresult['command'] === 'savetostorage' && 
commandresult['success']) {
-   // Close any open confirmation dialogs
-   if (vex.dialogID > 0) {
-   var id = vex.dialogID;
-   vex.dialogID = -1;
-   vex.close(id);
+   if (commandresult['command'] === 'savetostorage' || 
commandresult['command'] === 'save') {
+   if (commandresult['success']) {
+   // Close any open confirmation dialogs
+   if (vex.dialogID > 0) {
+   var id = vex.dialogID;
+   vex.dialogID = -1;
+   vex.close(id);
+   }
}
+
+   var postMessageObj = {
+   success: commandresult['success']
+   };
+   this._map.fire('postMessage', {msgId: 
'Action_Save_Resp', args: postMessageObj});
}
return;
}
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index e3cb678e5..03a439054 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -267,7 +267,11 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 if (!isReadOnly() && tokens.size() > 2)
 getTokenInteger(tokens[2], "dontSaveIfUnmodified", 
dontSaveIfUnmodified);
 
-docBroker->sendUnoSave(getId(), dontTerminateEdit != 0, 
dontSaveIfUnmodified != 0);
+bool result = docBroker->sendUnoSave(getId(), dontTerminateEdit != 0, 
dontSaveIfUnmodified != 0);
+
+std::string resultstr = result ? "true" : "false";
+std::string msg = "commandresult: { \"command\": \"save\", 
\"success\": " + resultstr + " }";
+docBroker->broadcastMessage(msg);
 }
 else if (tokens[0] == "savetostorage")
 {
@@ -275,10 +279,10 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 if (tokens.size() > 1)
 getTokenInteger(tokens[1], "force", force);
 
-if (docBroker->saveToStorage(getId(), true, "" /* This is irrelevant 
when success is true*/, true))
-{
-docBroker->broadcastMessage("commandresult: { \"command\": 
\"savetostorage\", \"success\": true }");
-}
+bool result = docBroker->s

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

[gokaysatir (via logerrit)]

 loleaflet/js/global.js |8 
 1 file changed, 8 deletions(-)

New commits:
commit 9a4952dccc0f5113ebed7bb1eeb2e05650510916
Author: gokaysatir 
AuthorDate: Thu Jun 4 15:09:13 2020 +0300
Commit: Henry Castro 
CommitDate: Thu Jun 4 15:52:47 2020 +0200

leaflet: Remove old jquery-fixer code.

Change-Id: I15796cdbb21295215699eefe4ecbe25f37d4e567
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95509
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index 1c951b089..6430ec908 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -606,14 +606,6 @@
};
}
 
-   // fix jquery-ui
-   // var jQuery = require('jquery');
-   global.require = function (path) {
-   if (path=='jquery') {
-   return global.jQuery;
-   }
-   };
-
global.getParameterByName = function (name) {
name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]');
var regex = new RegExp('[\\?&]' + name + '=([^&#]*)');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp wsd/ProxyProtocol.cpp wsd/ProxyProtocol.hpp

[Michael Meeks (via logerrit)]

 wsd/DocumentBroker.cpp |   14 +-
 wsd/ProxyProtocol.cpp  |2 +-
 wsd/ProxyProtocol.hpp  |5 -
 3 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 36a4b5ad05c527fa38baf85e4f8bd65ed8d11e2f
Author: Michael Meeks 
AuthorDate: Wed Jun 3 17:14:03 2020 +0100
Commit: Michael Meeks 
CommitDate: Thu Jun 4 15:49:46 2020 +0200

Proxy: dump ProxyProtocolHandler state separately

Somewhat inelegant - nasty extra header & dynamic cast.

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

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index d13a5d1a3..55e921295 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -32,6 +32,7 @@
 #include "SenderQueue.hpp"
 #include "Storage.hpp"
 #include "TileCache.hpp"
+#include "ProxyProtocol.hpp"
 #include 
 #include 
 #include 
@@ -216,7 +217,7 @@ void DocumentBroker::setupPriorities()
 int prio = LOOLWSD::getConfigValue("per_document.batch_priority", 
5);
 Util::setProcessAndThreadPriorities(_childProcess->getPid(), prio);
 }
-#endif // !MOBILE
+#endif
 }
 
 void DocumentBroker::startThread()
@@ -2420,6 +2421,17 @@ void DocumentBroker::dumpState(std::ostream& os)
 _tileCache->dumpState(os);
 
 _poll->dumpState(os);
+
+#if !MOBILEAPP
+// Bit nasty - need a cleaner way to dump state.
+for (auto &it : _sessions)
+{
+auto proto = it.second->getProtocol();
+auto proxy = dynamic_cast(proto.get());
+if (proxy)
+proxy->dumpProxyState(os);
+}
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wsd/ProxyProtocol.cpp b/wsd/ProxyProtocol.cpp
index 4b6950a10..8e7b8a631 100644
--- a/wsd/ProxyProtocol.cpp
+++ b/wsd/ProxyProtocol.cpp
@@ -277,7 +277,7 @@ void ProxyProtocolHandler::getIOStats(uint64_t &sent, 
uint64_t &recv)
 sent = recv = 0;
 }
 
-void ProxyProtocolHandler::dumpState(std::ostream& os)
+void ProxyProtocolHandler::dumpProxyState(std::ostream& os)
 {
 os << "proxy protocol sockets: " << _outSockets.size() << " writeQueue: " 
<< _writeQueue.size() << ":\n";
 os << '\t';
diff --git a/wsd/ProxyProtocol.hpp b/wsd/ProxyProtocol.hpp
index 7a342912b..d20377b30 100644
--- a/wsd/ProxyProtocol.hpp
+++ b/wsd/ProxyProtocol.hpp
@@ -57,7 +57,10 @@ public:
 int sendBinaryMessage(const char *data, const size_t len, bool flush = 
false) const override;
 void shutdown(bool goingAway = false, const std::string &statusMessage = 
"") override;
 void getIOStats(uint64_t &sent, uint64_t &recv) override;
-void dumpState(std::ostream& os) override;
+// don't duplicate ourselves for every socket
+void dumpState(std::ostream&) override {}
+// instead do it centrally.
+void dumpProxyState(std::ostream& os);
 bool parseEmitIncoming(const std::shared_ptr &socket);
 
 void handleRequest(bool isWaiting, const std::shared_ptr &socket);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[Ilia Sheshukov (via logerrit)]

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

New commits:
commit 218791bfd7f10a6070ac5381935c9ea6ab7a4cad
Author: Ilia Sheshukov 
AuthorDate: Thu Jun 4 16:36:15 2020 +0300
Commit: Gerrit Code Review 
CommitDate: Thu Jun 4 15:36:15 2020 +0200

Update git submodules

* Update dictionaries from branch 'master'
  to 12e591abdbc5565e5018ed9b8fbe6d635ade87d7
  - Converted Russian dictionaries from KOI8-R to UTF-8

Change-Id: Id2ecf90b5bb0adb5c620916aec3527c4ef851237
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/95515
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/dictionaries b/dictionaries
index b6fee5e2945d..12e591abdbc5 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit b6fee5e2945dda9ab9830bc8cbaefab1fa8ebd39
+Subproject commit 12e591abdbc5565e5018ed9b8fbe6d635ade87d7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: ru_RU/hyph_ru_RU.dic ru_RU/ru_RU.aff ru_RU/ru_RU.dic

[Ilia Sheshukov (via logerrit)]

 ru_RU/hyph_ru_RU.dic | 7750 -
 ru_RU/ru_RU.aff  | 3166 
 ru_RU/ru_RU.dic  |292538 
+--
 3 files changed, 151727 insertions(+), 151727 deletions(-)

New commits:
commit 12e591abdbc5565e5018ed9b8fbe6d635ade87d7
Author: Ilia Sheshukov 
AuthorDate: Thu Jun 4 16:04:49 2020 +0300
Commit: Andras Timar 
CommitDate: Thu Jun 4 15:36:15 2020 +0200

Converted Russian dictionaries from KOI8-R to UTF-8

Change-Id: Id2ecf90b5bb0adb5c620916aec3527c4ef851237
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/95515
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/ru_RU/hyph_ru_RU.dic b/ru_RU/hyph_ru_RU.dic
index 1767874..1d82ffc 100644
--- a/ru_RU/hyph_ru_RU.dic
+++ b/ru_RU/hyph_ru_RU.dic
@@ -1,3875 +1,3875 @@
-KOI8-R
-.���2
-.��1�
-.���2
-.��2
-.��1�
-.��1�
-.���5
-.��1�
-.��2
-.��1�
-.��2
-.��2�1�2
-.��2�1�2
-.��2�3�2
-.��2�1�
-.���1��
-.���1�
-.��2�1�
-.��1�
-.���2
-.��1�2
-.��2�1�
-.��2�3���
-.��2��
-.��3�2��
-.���1��
-.��6�
-.��2
-.���2��
-.���2�
-.���1�
-.���2�
-.��2��
-.��2�
-.��2���
-.��1��
-.��3�2��
-.��3�2�
-.���2
-.���2
-.���2
-.�3
-.��2�3
-.��1�
-.��1�
-.��2
-.��1�
-.��1�
-.���2��
-.��2
-.��2
-.��1��
-.��1��
-.��5��
-.��2
-.��2
-.���2���
-.��1�
-.��2
-.��2�3
-.��3�4��
-.��3�4��
-.��3�4�
-.��6��2�
-.��2�1�
-.��1�2�
-.��1�2��
-.��2�
-.��5�6
-.��1�
-.��1�2
-.��1�
-.��3�2��
-.��5�
-.���2
-.2�1�2
-.���2��
-.��1�2�
-.���5�
-.��2
-.��1��
-.��1��
-.��1��
-.��1��
-.��1��
-.��1��
-.��3�2��
-.��5���
-.��5���
-.���2�1�2
-.���2�1�
-.���1��
-.��5�
-.��2
-.��1���
-.��2���
-.��1�
-.��1��
-.��3�
-.���1�2
-.��1�2
-.��1�2
-.��2���
-.��2���
-.��2���
-.��2���1
-.��2���
-.��2���
-.��2��1��
-.��3
-.���1��
-.���1�
-.���2�1�
-.���1�2�
-.���1�2�
-.���3�2�
-.2�
-.���1���
-.���3��
-.2
-.��2��
-.��2�1��
-.��2�1��
-.��2�1���
-.��2�1���
-.��2�1��
-.6�
-.��2�1
-.���1�2�
-.���5�
-.���1�
-.���1�
-.���1�
-.2�1
-.1
-.��2
-.��1��
-.��1��
-.��2�
-.��2�
-.��2
-.��2
-.��6�
-.��2
-.��2��
-.���1�
-.���2
-.��2�
-.��2��1�
-.���2��1
-.���1
-.��2
-.��2
-.��2
-.��2
-1���
-1���
-1
-1�2
-1��
-1��
-1��
-1���
-1��
-1��
-1��
-1�2���
-1�2���
-1�2��
-1�2��
-1�2��
-1�2���
-1���
-1���
-1���
-1
-1���.
-1��2
-1���
-1���
-1��
-1���
-1���
-1��
-1��2
-1���
-1��
-1��
-1��
-1���
-1��
-1�2
-1�2���
-1�2
-1�2�
-1�2���
-1�2
-1
-1
-1��
-1���.
-1�
-1
-1���
-1���
-1���
-1�
-1���2�1�
-1
-1
-1���
-1���
-1���
-1��
-1��
-1���
-1���
-1���
-1���
-1��
-1���
-1���
-1���
-1���
-1���
-1���
-1��
-1
-1
-1���
-1���
-1���
-1���
-1��
-1��2��
-1
-1
-1��2�1�
-1���
-1���
-1���.
-1�2���
-1���
-1���
-1���
-1���.
-1���
-1���
-1���
-1��.
-1��.
-1��1�
-1��1�2
-1���
-1���
-1��.
-1���
-1���
-1���
-1���.
-1
-1���
-1���
-1��
-1�2�1���
-1�2���
-1�2���
-1
-1���
-1���
-1���
-1���
-1�2
-1�2�
-1�2�
-1�2���
-1�2
-1��.
-1
-1���
-1���
-1
-1
-1���2�1�
-1
-11�
-1���
-1��
-1��
-1
-1��.
-1��
-1�2��.
-1�2.
-1���
-1
-1
-1
-1�
-1
-1
-1���
-1�2���
-1�2
-1�2���1��
-1�2
-1�2
-1�2�
-1�4�
-1��
-1��
-1��
-1��
-1��
-1
-1��
-1��
-1��2��.
-1��
-1���
-1�
-1��
-1���
-1���
-1
-1
-1��2
-1��
-1��
-1�2���
-1�2��2�1�
-1�2���
-1�2���
-1�4
-1�4���
-1
-1
-1
-1
-1
-1���
-1���
-1
-1
-1
-1
-1���
-1���2�1�
-1
-1
-1
-1
-1���
-1�2���
-1��
-1��
-1��
-1��
-1��6
-1�
-1��
-1�2���
-1��
-1��
-1
-1
-1��
-1��.
-1���
-1���.
-1��
-1��
-1��
-1��
-1��.
-1��
-1���
-1���
-1���
-1���
-1���
-1��
-1��
-1��
-1�2�
-1�2���
-1�2��2�1�
-1��2�1�
-1���
-1
-1���
-1���
-1��
-1��
-1�2�
-2�1��
-2�3�
-2�1�
-2�1���
-2�1��
-2�1�
-2�1�
-2�1�
-2�1�
-2�5�
-2
-2���
-2��.
-2���
-2�1���
-2�1���
-2�1��
-2�1��
-2�1���
-2�1���
-2�1���
-2�1��
-2�1��.
-2�1��
-2�1��.
-2�1
-2���
-2��.
-2�1�
-2�1�
-2�1�
-2�1�
-2�1�
-2�1�
-2�5�
-2
-2�1�
-2�1�
-2�1�
-2�1��.
-2�1�
-2�1�
-2�3�2
-2���
-2���
-2��
-2
-2���
-2��3��.
-2�1��
-2�1�
-2���
-2�1�
-2�1�
-2
-2
-2���
-2���
-2�1�
-2�1��
-2�1���
-2�1���
-2�1�
-2�1�
-2���
-2���.
-2���
-2�1��
-2�
-2�1�
-2�1�
-2�1�
-2�1��.
-2�1���
-2�1��.
-2�1��.
-2�1�
-2�1�
-2�1�
-2�1�
-2
-2��.
-2���
-2��
-2��
-2�1�
-2�1���
-2�1�2
-2�1���
-2�1�
-2�1�
-2�1�
-2�1�
-2�1�
-2���
-2
-2
-2���
-2�1�2
-2�1�
-2�1��
-2�1�
-2�1��
-2�1��
-2�1��
-2�1��
-2�1�2
-2�1��
-2�1�
-2�5���
-2��
-2��
-2��
-2
-2�
-2���
-2��
-2�1�
-2�1��.
-2�1.
-2�1�
-2�1�
-2�1�
-2�1���
-2�1��
-2�1���
-2�1�
-2�1�
-2�1�
-2�1�
-2�3��
-2��.
-2���
-2���
-2���
-2���
-2�1���
-2�1���
-2
-2�1
-2�1���
-2�1���
-2�1��
-2���
-2��.
-2���
-2���
-2.
-2���
-2���
-2���.
-2�
-2���
-2���
-2���.
-2
-2��2
-2���
-2�1���
-2�1�
-2�1���
-2�1�
-2�1�
-2�1�
-2�1�
-2�1�
-2�1�
-2�1�
-2�1�
-2
-2
-2
-2��.
-2�
-2���
-2���
-2���
-2���
-2���
-2���
-2���
-2���
-2��.
-2�1�
-2�1���
-2�1�
-2�1���
-2�1�
-2�1��
-2�1�
-2�1�
-2�1�2�
-2�1�
-2�1�
-2�1�
-2�1�
-2�1�
-2�1�2

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - dbaccess/Module_dbaccess.mk

[Noel Grandin (via logerrit)]

 dbaccess/Module_dbaccess.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 157cdbaf1648c7471d261e11900fd4df07435ba1
Author: Noel Grandin 
AuthorDate: Thu Jun 4 10:41:44 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 4 15:15:00 2020 +0200

disable dbaccess_hsqldb test on macos

fails 50% of the time with a core dump, and we have no way of debugging
that

Change-Id: Ieda3a241a964327d3c70a6f519a032980ce312ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95487
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 8ad4ec9eea1224b9bfe1f7ce28393b234c083c89)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95425

diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index a84bd57f2f82..49bd9d202c7f 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -61,12 +61,15 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
CppunitTest_dbaccess_hsqlschema_import \
 ))
 
+# this test fails 50% of the time on the mac jenkins buildbots
 ifeq ($(ENABLE_JAVA),TRUE)
+ifneq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_check_targets,dbaccess,\
 CppunitTest_dbaccess_hsqldb_test \
 CppunitTest_dbaccess_RowSetClones \
 ))
 endif
+endif
 
 # This runs a suite of performance tests on embedded firebird and HSQLDB.
 # Instructions on running the test can be found in 
qa/unit/embeddedb_performancetest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 hwpfilter/source/hwpreader.hxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit c851882f0a31e75108d3e492faa4aaceb5da1838
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 07:41:16 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 15:11:42 2020 +0200

Upcoming loplugin:elidestringvar: hwpfilter

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

diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 0f14e1cfde36..6d8d1b86fbaa 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -199,9 +199,8 @@ Sequence< OUString > 
HwpImportFilter::getSupportedServiceNames_Static() throw ()
 
 HwpImportFilter::HwpImportFilter(const Reference< XMultiServiceFactory >& 
rFact)
 {
-OUString sService( WRITER_IMPORTER_NAME );
 try {
-Reference< XDocumentHandler > xHandler( rFact->createInstance( 
sService ), UNO_QUERY );
+Reference< XDocumentHandler > xHandler( rFact->createInstance( 
WRITER_IMPORTER_NAME ), UNO_QUERY );
 
 HwpReader *p = new HwpReader;
 p->setDocumentHandler( xHandler );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Minutes from the UX/design meeting 2020-Jun-04

[Mike Kaganski]

On 04.06.2020 15:49, Heiko Tietze wrote:
>  * Undo/redo includes creating of paragraph/character style
>+ https://bugs.documentfoundation.org/show_bug.cgi?id=133040
>+ abandoning the undo feature for style _creation_ means also
>  to not being able to undo unintentionally _deleted_ styles
>  and _applying_ styles to the document is the main workflow
>+ actual problem is the unexpected deletion (via undo), which we
>  could prevent per confirmation box
>+ annoying, however, and definitely in need for [ ] Don't show again
>=> recommend to close as WFM

Please use the solutions correctly! WFM tells "the problem existed; but
it has changed at some unknown point, and now it works just as asked in
original post". It's the same as "FIXED", just the specific commit
fixing this is unknown. What you propose is WF (won't fix), which is
completely different by meaning. Confusing these sends completely
different (wrong!) message to users.

-- 
Best regards,
Mike Kaganski


pEpkey.asc
Description: application/pgp-keys
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Minutes from the UX/design meeting 2020-Jun-04

[Heiko Tietze]

Present: Heiko
Comments: Stuart, Xavier, Rizal, Regina

Tickets/Topic

 * Undo/redo includes creating of paragraph/character style
   + https://bugs.documentfoundation.org/show_bug.cgi?id=133040
   + abandoning the undo feature for style _creation_ means also
 to not being able to undo unintentionally _deleted_ styles
 and _applying_ styles to the document is the main workflow
   + actual problem is the unexpected deletion (via undo), which we
 could prevent per confirmation box
   + annoying, however, and definitely in need for [ ] Don't show again
   => recommend to close as WFM

 * Create a Dialog that shows up on first boot of Writer/Calc/Impress for
   the user to pick its default UI
   + https://bugs.documentfoundation.org/show_bug.cgi?id=117463
   + if the issue is just the presentation of different UI variants we could
 create a dialog for this purpose and drop the menu items
   + show info during installation
   + bad usability/marketing and WF (Stuart, Xavier)
   + UI variants have bad discoverability so +1 (Rizal)
   + if we introduce another NB, ideally per extension, it won't show up
 on this welcome dialog; the UI choice is the least important for new
 users; if we need to advertise per image we should consider a tab in
 tools > options > view (and remove the menu option) plus have thumbnails
 with the envisioned extensions (Heiko)
   => WF

 * Table Toolbar constant placing is now impossible
   + https://bugs.documentfoundation.org/show_bug.cgi?id=122030
   + keep user-defined state/position for contextual TBs
   + many similar tickets, eg. tdf#36976 to have an option
   + "workaround": use notebookbar
   => make it a duplicate

 * Make "current selection" persistent in F/R dialogue
   + https://bugs.documentfoundation.org/show_bug.cgi?id=133480
   + see also tdf#132031
   + on/off depends on document status; clicking somewhere must change this
   => WF

 * Sound to verify document has been saved
   + https://bugs.documentfoundation.org/show_bug.cgi?id=133585
   + no clear workflow yet, no urgent need
   => keep it for a few more days, then WF

 * Pressing CTRL+W with a single document open closes LibreOffice
   + https://bugs.documentfoundation.org/show_bug.cgi?id=133542
   + browsers close (FF & Chromium), editors don't (Kate)
   + see also https://wiki.mozilla.org/Ctrl_W_not_close_app
 + about:config -> browser.tabs.closeWindowWithLastTab
   + ctrl+w = uno:CloseWin -> WFM (Regina)
   + actually it goes back to start center, which closes per ctrl+w
   => WFM




signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tor Lillqvist (via logerrit)]

 libreofficekit/source/gtk/lokdocview.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 716f3e6ff560893febc95f55fc39bc46151afd7f
Author: Tor Lillqvist 
AuthorDate: Thu Jun 4 15:46:54 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Jun 4 15:49:25 2020 +0300

Change FIXME to plain comment, there apparently is nothing to do about it 
here

Change-Id: I81e50e7e604e8ef17ba0d369e8987f4c840f8361

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 8bcbd1aeb904..ae2c00bcaa08 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -891,8 +891,9 @@ static gboolean postDocumentLoad(gpointer pData)
 
 std::unique_lock aGuard(g_aLOKMutex);
 priv->m_pDocument->pClass->initializeForRendering(priv->m_pDocument, 
priv->m_aRenderingArguments.c_str());
-// FIXME: This returns the view id of the "current" view, but sadly if you 
load multiple
-// documents that is apparently not a view showing the most recently 
loaded document.
+// This returns the view id of the "current" view, but sadly if you load 
multiple documents that
+// is apparently not a view showing the most recently loaded document. Not 
much we can do here,
+// though. If that is fixed, this comment becomes incorrect.
 priv->m_nViewId = priv->m_pDocument->pClass->getView(priv->m_pDocument);
 g_aAuthorViews[getAuthorRenderingArgument(priv)] = priv->m_nViewId;
 priv->m_pDocument->pClass->registerCallback(priv->m_pDocument, 
callbackWorker, pLOKDocView);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 i18npool/qa/cppunit/test_breakiterator.cxx |4 +---
 i18npool/qa/cppunit/test_textsearch.cxx|3 +--
 i18npool/source/localedata/LocaleNode.cxx  |8 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)

New commits:
commit 3d20df43c450889ec0a8f61ea12df7338eb1ff97
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 09:11:26 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 14:33:50 2020 +0200

Upcoming loplugin:elidestringvar: i18npool

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

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index a41cd821857c..3be0ea4e8d0d 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -113,14 +113,12 @@ void TestBreakIterator::testLineBreaking()
 
 //See https://bz.apache.org/ooo/show_bug.cgi?id=17155
 {
-OUString const aTest("foo /bar/baz");
-
 aLocale.Language = "en";
 aLocale.Country = "US";
 
 {
 //Here we want the line break to leave /bar/ba clumped together on 
the next line
-i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, 
strlen("foo /bar/ba"), aLocale, 0,
+i18n::LineBreakResults aResult = m_xBreak->getLineBreak("foo 
/bar/baz", strlen("foo /bar/ba"), aLocale, 0,
 aHyphOptions, aUserOptions);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Expected a break at the first 
slash", static_cast(4), aResult.breakIndex);
 }
diff --git a/i18npool/qa/cppunit/test_textsearch.cxx 
b/i18npool/qa/cppunit/test_textsearch.cxx
index b2175b21bfa5..3d157e2cbdb4 100644
--- a/i18npool/qa/cppunit/test_textsearch.cxx
+++ b/i18npool/qa/cppunit/test_textsearch.cxx
@@ -92,7 +92,6 @@ void TestTextSearch::testSearches()
 {
 OUString str( "acababaabcababadcdaa" );
 sal_Int32 startPos = 2, endPos = 20 ;
-OUString const searchStr( "(ab)*a(c|d)+" );
 sal_Int32 const fStartRes = 10, fEndRes = 18 ;
 sal_Int32 const bStartRes = 18, bEndRes = 10 ;
 
@@ -100,7 +99,7 @@ void TestTextSearch::testSearches()
 util::SearchOptions aOptions;
 aOptions.algorithmType = util::SearchAlgorithms_REGEXP ;
 aOptions.searchFlag = util::SearchFlags::ALL_IGNORE_CASE;
-aOptions.searchString = searchStr;
+aOptions.searchString = "(ab)*a(c|d)+";
 m_xSearch->setOptions( aOptions );
 
 util::SearchResult aRes;
diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index ddc8cf46dfd1..3760ac753e06 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -711,12 +711,8 @@ void LCFormatNode::generateCode (const OFileWriter &of) 
const
 if (strcmp( of.getLocale(), "en_US") != 0)
 {
 const OUString& aCode( n->getValue());
-OUString const aPar1( "0)");
-OUString const aPar2( "-)" );
-OUString const aPar3( " )" );
-OUString const aPar4( "])" );
-if (aCode.indexOf( aPar1 ) > 0 || aCode.indexOf( aPar2 
) > 0 ||
-aCode.indexOf( aPar3 ) > 0 || aCode.indexOf( 
aPar4 ) > 0)
+if (aCode.indexOf( "0)" ) > 0 || aCode.indexOf( "-)" ) 
> 0 ||
+aCode.indexOf( " )" ) > 0 || aCode.indexOf( 
"])" ) > 0)
 fprintf( stderr, "Warning: FormatCode 
formatindex=\"%d\" for currency uses parentheses for negative amounts, which 
probably is not correct for locales not based on en_US.\n", formatindex);
 }
 // Check if we have replaceTo for "[CURRENCY]" placeholder.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti (via logerrit)]

 loleaflet/src/control/Ruler.js|7 ++-
 loleaflet/src/layer/tile/GridLayer.js |7 +--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 2d13b81e47f953854e4f4121988caa97ad31ddaa
Author: Marco Cecchetti 
AuthorDate: Sun May 24 19:03:47 2020 +0200
Commit: Michael Meeks 
CommitDate: Thu Jun 4 14:29:41 2020 +0200

loleaflet: writer zoom flickers

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

diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index 3c64f0280..cca4e46ed 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -403,7 +403,12 @@ L.Control.Ruler = L.Control.extend({
var firstTileXTranslate = parseInt(firstTile.style.left) - 
this._map._docLayer._tileWidthPx * columnNumber;
 
var tileContainer = 
mapPane.getElementsByClassName('leaflet-tile-container');
-   tileContainer = tileContainer[tileContainer.length - 1];
+   for (var i = 0; i < tileContainer.length; ++i) {
+   if (parseInt(tileContainer[i].style.zIndex) === 
this._map.getMaxZoom()) {
+   tileContainer = tileContainer[i];
+   break;
+   }
+   }
var tileContainerXTranslate = 
parseInt(tileContainer.style.transform.match(/\(([-0-9]*)/)[1]);
var mapPaneXTranslate = 
parseInt(mapPane.style.transform.match(/\(([-0-9]*)/)[1]);
 
diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index 850981777..91dd404e8 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -211,12 +211,7 @@ L.GridLayer = L.Layer.extend({
maxZoom = this.options.maxZoom;
 
for (var z in this._levels) {
-   if (this._levels[z].el.children.length || z === zoom) {
-   this._levels[z].el.style.zIndex = maxZoom - 
Math.abs(zoom - z);
-   } else {
-   L.DomUtil.remove(this._levels[z].el);
-   delete this._levels[z];
-   }
+   this._levels[z].el.style.zIndex = maxZoom - 
Math.abs(zoom - z);
}
 
var level = this._levels[zoom],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 libreofficekit/source/gtk/lokdocview.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 8d41357570ad2671b0053c462e33b1d78626dca0
Author: Tor Lillqvist 
AuthorDate: Thu Jun 4 14:45:21 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Jun 4 14:14:33 2020 +0200

Bin two leftover spurious writes to std::cerr

Change-Id: I89601e3682a5f8eca81b45af62e5aa50c481bc84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95502
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index ac5edc633ee0..8bcbd1aeb904 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1113,8 +1113,6 @@ callback (gpointer pData)
 
 priv->m_aVisibleCursor = payloadToRectangle(pDocView, 
rRectangle.c_str());
 priv->m_bCursorOverlayVisible = true;
-std::cerr << nViewId;
-std::cerr << priv->m_nViewId;
 if(nViewId == priv->m_nViewId)
 {
 g_signal_emit(pDocView, doc_view_signals[CURSOR_CHANGED], 0,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 libreofficekit/source/gtk/lokdocview.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 79c933916861d085ab844c50d7f07ba9c2d5e570
Author: Tor Lillqvist 
AuthorDate: Thu Jun 4 15:06:24 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Jun 4 14:13:46 2020 +0200

tdf#128502: Add a FIXME comment

The view id concept is badly broken. Way too many wild assumptions
that the "current" view is the one we expect here and there. For
instance here.

Change-Id: Icf36808b2c09f0b3fd8070deecf175ba7f52b5f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95508
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 75deee7a38a0..ac5edc633ee0 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -891,6 +891,8 @@ static gboolean postDocumentLoad(gpointer pData)
 
 std::unique_lock aGuard(g_aLOKMutex);
 priv->m_pDocument->pClass->initializeForRendering(priv->m_pDocument, 
priv->m_aRenderingArguments.c_str());
+// FIXME: This returns the view id of the "current" view, but sadly if you 
load multiple
+// documents that is apparently not a view showing the most recently 
loaded document.
 priv->m_nViewId = priv->m_pDocument->pClass->getView(priv->m_pDocument);
 g_aAuthorViews[getAuthorRenderingArgument(priv)] = priv->m_nViewId;
 priv->m_pDocument->pClass->registerCallback(priv->m_pDocument, 
callbackWorker, pLOKDocView);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 javaunohelper/source/preload.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 59cd904caf5d4c5dd363e0c0b4d71e638f0ffe2a
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 11:33:37 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 13:55:50 2020 +0200

Upcoming loplugin:elidestringvar: javaunohelper

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

diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx
index d491e9b4dbfb..4868a1e55f5e 100644
--- a/javaunohelper/source/preload.cxx
+++ b/javaunohelper/source/preload.cxx
@@ -50,9 +50,8 @@ static bool inited_juhx( JNIEnv * jni_env )
 {
 if (s_inited)
 return true;
-OUString lib_name = SAL_DLLPREFIX "juhx" SAL_DLLEXTENSION;
 osl::Module aModule;
-if (!aModule.loadRelative(&thisModule, lib_name, SAL_LOADMODULE_LAZY | 
SAL_LOADMODULE_GLOBAL))
+if (!aModule.loadRelative(&thisModule, SAL_DLLPREFIX "juhx" 
SAL_DLLEXTENSION, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL))
 {
 jclass c = jni_env->FindClass( "java/lang/RuntimeException" );
 jni_env->ThrowNew(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 i18nlangtag/qa/cppunit/test_languagetag.cxx |   24 
 1 file changed, 8 insertions(+), 16 deletions(-)

New commits:
commit a75d76d202e035ecd390ca3cbd83c1d9a447ca7f
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 07:41:26 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 13:55:06 2020 +0200

Upcoming loplugin:elidestringvar: i18nlangtag

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

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx 
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 925d1615473a..cafaf1cfc3b8 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -43,8 +43,7 @@ public:
 void TestLanguageTag::testAllTags()
 {
 {
-OUString const s_de_Latn_DE( "de-Latn-DE" );
-LanguageTag de_DE( s_de_Latn_DE, true );
+LanguageTag de_DE( "de-Latn-DE", true );
 OUString aBcp47 = de_DE.getBcp47();
 lang::Locale aLocale = de_DE.getLocale();
 LanguageType nLanguageType = de_DE.getLanguageType();
@@ -61,8 +60,7 @@ void TestLanguageTag::testAllTags()
 }
 
 {
-OUString const s_klingon( "i-klingon" );
-LanguageTag klingon( s_klingon, true );
+LanguageTag klingon( "i-klingon", true );
 lang::Locale aLocale = klingon.getLocale();
 CPPUNIT_ASSERT_EQUAL( OUString("tlh"), klingon.getBcp47() );
 CPPUNIT_ASSERT_EQUAL( OUString("tlh"), aLocale.Language );
@@ -141,8 +139,7 @@ void TestLanguageTag::testAllTags()
 
 // 'sh-RS' has an internal override to 'sr-Latn-RS'
 {
-OUString const s_sh_RS( "sh-RS" );
-LanguageTag sh_RS( s_sh_RS, true );
+LanguageTag sh_RS( "sh-RS", true );
 lang::Locale aLocale = sh_RS.getLocale();
 CPPUNIT_ASSERT_EQUAL( OUString("sr-Latn-RS"), sh_RS.getBcp47() );
 CPPUNIT_ASSERT_EQUAL( OUString(I18NLANGTAG_QLT) , aLocale.Language);
@@ -173,8 +170,7 @@ void TestLanguageTag::testAllTags()
 // known LangID with an override and canonicalization should work the same
 // without liblangtag.
 {
-OUString const s_bs_Latn_BA( "bs-Latn-BA" );
-LanguageTag bs_Latn_BA( s_bs_Latn_BA, true );
+LanguageTag bs_Latn_BA( "bs-Latn-BA", true );
 lang::Locale aLocale = bs_Latn_BA.getLocale();
 CPPUNIT_ASSERT_EQUAL( OUString("bs-BA"), bs_Latn_BA.getBcp47() );
 CPPUNIT_ASSERT_EQUAL( OUString("bs"), aLocale.Language );
@@ -248,9 +244,8 @@ void TestLanguageTag::testAllTags()
 
 // 'ca-XV' has an internal override to 'ca-ES-valencia'
 {
-OUString const s_ca_XV( "ca-XV" );
 OUString s_ca_ES_valencia( "ca-ES-valencia" );
-LanguageTag ca_XV( s_ca_XV, true );
+LanguageTag ca_XV( "ca-XV", true );
 lang::Locale aLocale = ca_XV.getLocale();
 CPPUNIT_ASSERT_EQUAL( s_ca_ES_valencia, ca_XV.getBcp47() );
 CPPUNIT_ASSERT_EQUAL( OUString(I18NLANGTAG_QLT) , aLocale.Language);
@@ -298,10 +293,9 @@ void TestLanguageTag::testAllTags()
 }
 
 {
-OUString const s_de_DE( "de-DE" );
 LanguageTag de_DE( lang::Locale( "de", "DE", "" ) );
 lang::Locale aLocale = de_DE.getLocale();
-CPPUNIT_ASSERT_EQUAL( s_de_DE, de_DE.getBcp47() );
+CPPUNIT_ASSERT_EQUAL( OUString("de-DE"), de_DE.getBcp47() );
 CPPUNIT_ASSERT_EQUAL( OUString("de"), aLocale.Language );
 CPPUNIT_ASSERT_EQUAL( OUString("DE"), aLocale.Country );
 CPPUNIT_ASSERT( aLocale.Variant.isEmpty() );
@@ -309,10 +303,9 @@ void TestLanguageTag::testAllTags()
 }
 
 {
-OUString const s_de_DE( "de-DE" );
 LanguageTag de_DE( LANGUAGE_GERMAN );
 lang::Locale aLocale = de_DE.getLocale();
-CPPUNIT_ASSERT_EQUAL( s_de_DE, de_DE.getBcp47() );
+CPPUNIT_ASSERT_EQUAL( OUString("de-DE"), de_DE.getBcp47() );
 CPPUNIT_ASSERT_EQUAL( OUString("de"), aLocale.Language );
 CPPUNIT_ASSERT_EQUAL( OUString("DE"), aLocale.Country );
 CPPUNIT_ASSERT( aLocale.Variant.isEmpty() );
@@ -541,8 +534,7 @@ void TestLanguageTag::testAllTags()
 
 // 'qtx' is an unknown new mslangid
 {
-OUString const s_qtx( "qtx" );
-LanguageTag qtx( s_qtx );
+LanguageTag qtx( "qtx" );
 qtx.setScriptType( LanguageTag::ScriptType::RTL );
 LanguageType n_qtx = qtx.getLanguageType();
 CPPUNIT_ASSERT_EQUAL( css::i18n::ScriptType::COMPLEX, 
MsLangId::getScriptType(n_qtx) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/svx oox/source sd/qa svx/sdi svx/source xmloff/source

[Tomaž Vajngerl (via logerrit)]

 include/svx/strings.hrc   |4 ++--
 include/svx/svddef.hxx|6 +++---
 include/svx/unoshprp.hxx  |4 ++--
 oox/source/drawingml/shape.cxx|4 ++--
 oox/source/export/drawingml.cxx   |8 
 oox/source/token/properties.txt   |2 +-
 sd/qa/unit/export-tests-ooxml2.cxx|4 ++--
 sd/qa/unit/export-tests.cxx   |4 ++--
 sd/qa/unit/import-tests.cxx   |2 +-
 svx/sdi/svx.sdi   |2 +-
 svx/source/sdr/primitive2d/sdrattributecreator.cxx|4 ++--
 svx/source/sidebar/glow/GlowPropertyPanel.cxx |2 +-
 svx/source/sidebar/softedge/SoftEdgePropertyPanel.cxx |2 +-
 svx/source/svdraw/svdattr.cxx |   12 ++--
 xmloff/source/draw/sdpropls.cxx   |4 ++--
 15 files changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 9da9d3054ab14cde2518cf9de8f7d8455800e551
Author: Tomaž Vajngerl 
AuthorDate: Mon Jun 1 23:04:00 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 4 13:34:56 2020 +0200

Use "Radius" instead of "Rad" for new properties

Change-Id: Ifd232bccf1519e0ed68195cf4344893175a675e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95331
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 7313ed6a5b63e06ddd8ce90c3b5b2f168743a2c9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95322
Tested-by: Jenkins

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index fb9ed922f551..14da2224acf4 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -511,10 +511,10 @@
 #define SIP_SA_GRAFINVERT   
NC_("SIP_SA_GRAFINVERT", "Invert")
 #define SIP_SA_GRAFMODE 
NC_("SIP_SA_GRAFMODE", "Image mode")
 #define SIP_SA_GRAFCROP 
NC_("SIP_SA_GRAFCROP", "Crop")
-#define SIP_SA_GLOW_RAD 
NC_("SIP_SA_GLOW_RAD", "Radius of glow effect")
+#define SIP_SA_GLOW_RADIUS  
NC_("SIP_SA_GLOW_RADIUS", "Radius of glow effect")
 #define SIP_SA_GLOW_COLOR   
NC_("SIP_SA_GLOW_COLOR", "Color of glow effect")
 #define SIP_SA_GLOW_TRANSPARENCY
NC_("SIP_SA_GLOW_TRANSPARENCY", "Transparency of glow effect")
-#define SIP_SA_SOFTEDGE_RAD 
NC_("SIP_SA_SOFTEDGE_RAD", "Radius of soft edge effect")
+#define SIP_SA_SOFTEDGE_RADIUS  
NC_("SIP_SA_SOFTEDGE_RADIUS", "Radius of soft edge effect")
 #define STR_ObjNameSingulMEDIA  
NC_("STR_ObjNameSingulMEDIA", "Media object")
 #define STR_ObjNamePluralMEDIA  
NC_("STR_ObjNamePluralMEDIA", "Media objects")
 // drawing layer table strings
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index 378ed9676f22..3b56f691c5fa 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -416,14 +416,14 @@ constexpr TypedWhichId 
SDRATTR_TABLE_TEXT_ROTATION (SDRATTR_T
 constexpr sal_uInt16  SDRATTR_TABLE_LAST  
(SDRATTR_TABLE_TEXT_ROTATION);
 
 constexpr sal_uInt16  SDRATTR_GLOW_FIRST 
(SDRATTR_TABLE_LAST+1);
-constexpr TypedWhichId SDRATTR_GLOW_RAD   
(SDRATTR_GLOW_FIRST+0);
+constexpr TypedWhichId SDRATTR_GLOW_RADIUS   
(SDRATTR_GLOW_FIRST+0);
 constexpr TypedWhichIdSDRATTR_GLOW_COLOR 
(SDRATTR_GLOW_FIRST+1);
 constexpr TypedWhichId 
SDRATTR_GLOW_TRANSPARENCY(SDRATTR_GLOW_FIRST + 2);
 constexpr sal_uInt16  SDRATTR_GLOW_LAST  
(SDRATTR_GLOW_TRANSPARENCY);
 
 constexpr sal_uInt16  SDRATTR_SOFTEDGE_FIRST(SDRATTR_GLOW_LAST 
+ 1);
-constexpr TypedWhichId 
SDRATTR_SOFTEDGE_RAD(SDRATTR_SOFTEDGE_FIRST + 0);
-constexpr sal_uInt16  
SDRATTR_SOFTEDGE_LAST(SDRATTR_SOFTEDGE_RAD);
+constexpr TypedWhichId 
SDRATTR_SOFTEDGE_RADIUS(SDRATTR_SOFTEDGE_FIRST + 0);
+constexpr sal_uInt16  
SDRATTR_SOFTEDGE_LAST(SDRATTR_SOFTEDGE_RADIUS);
 
 constexpr sal_uInt16 SDRATTR_END (SDRATTR_SOFTEDGE_LAST);  /* 1357 */ /* 
1333 V4+++*/ /* 1243 V4+++*/  /*1213*/ /*1085*/ /*1040*/ /*Pool V2: 1123,V1: 
1065 */
 
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index d83b24014937..9aa2ecb16dae 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -210,12 +210,12 @@
 { OUString("FontWorkShadowTransparence"),XATTR_FORMTXTSHDWTRANSP,   
::cppu::UnoType::get(),0,  0},
 
 #define GLOW_PROPERTIES \
-{ OUString{"GlowEffectRad"},  SDRATTR_GLOW_RAD, 
::cppu::UnoType::get(),0,  0, 
PropertyMoreFlags::METRIC_ITEM}, \
+{ OUString{"GlowEffectRadiu

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

[Michael Weghorn (via logerrit)]

 winaccessibility/source/UAccCOM/MAccessible.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 450a5322765324bdf6b8d3185cb39256f3bb3c90
Author: Michael Weghorn 
AuthorDate: Wed Jun 3 14:07:39 2020 +0200
Commit: Michael Weghorn 
CommitDate: Thu Jun 4 13:31:20 2020 +0200

tdf#133633 winaccessibility: Add null check

The call to 'AccObjectManagerAgent::GetIAccessibleFromResID'
may set 'pImAcc' to nullptr here (s.
'AccObjectWinManager::GetIAccessibleFromResID', which is called
from there), so handle that case gracefully.

Change-Id: I0dbd48974fd012ff086835b147cd9b9cfc8a052b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95430
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit cb55b2854de31004ab1d0277894f9f2581d5c31b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95419
Tested-by: Michael Weghorn 

diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx 
b/winaccessibility/source/UAccCOM/MAccessible.cxx
index fef53deb4471..c2db8353a888 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -785,6 +785,10 @@ STDMETHODIMP CMAccessible::get_accFocus(VARIANT *pvarChild)
 {
 IMAccessible* pIMAcc = nullptr;
 g_pAgent->GetIAccessibleFromResID(m_dFocusChildID,&pIMAcc);
+if (pIMAcc == nullptr)
+{
+return E_FAIL;
+}
 pIMAcc->AddRef();
 pvarChild->vt = VT_DISPATCH;
 pvarChild->pdispVal = pIMAcc;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Status of ODF 1.3 implementation in LibreOffice 7.0

[Samuel Mehrbrodt]

* ODF Toolkit:

The ODF Validator can now validate ODF 1.3 documents, both in the 0.9 
and 1.0 branches; the only missing feature is recognition of the new 
ODF Global Document Template media type, which requires ODFDOM to 
support ODF 1.3 first, so for this bit there are only pull requests 
that can't be merged yet.


Small correction: The pull requests to recognize the new ODF Global 
Document Template media type have been merged, into new ODF 1.3 
branches. They just haven't seen a release yet (Svante will do that at 
some point).


 * https://github.com/tdf/odftoolkit/pull/43
 * https://github.com/tdf/odftoolkit/pull/46

Regards
Samuel

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

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

[Julien Nabet (via logerrit)]

 dtrans/source/win32/clipb/MtaOleClipb.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f2dd07d30ed12ce4ae25021b34a7d84fc1f71246
Author: Julien Nabet 
AuthorDate: Thu Jun 4 11:43:58 2020 +0200
Commit: Julien Nabet 
CommitDate: Thu Jun 4 13:19:21 2020 +0200

Remnant CoInitialize comment

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

diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx 
b/dtrans/source/win32/clipb/MtaOleClipb.cxx
index 0e57b5ab1442..aaefc9170479 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -684,7 +684,7 @@ unsigned int WINAPI 
CMtaOleClipboard::clipboardChangedNotifierThreadProc( LPVOID
 // a boolean variable like m_bRun...
 while ( pInst->m_bRunClipboardNotifierThread )
 {
-// process window messages because of CoInitialize
+// process window messages because of CoInitializeEx
 MSG Msg;
 while (PeekMessageW(&Msg, nullptr, 0, 0, PM_REMOVE))
 DispatchMessageW(&Msg);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/Admin.cpp wsd/Admin.hpp wsd/AdminModel.cpp wsd/AdminModel.hpp

[Gabriel Masei (via logerrit)]

 wsd/Admin.cpp  |9 +
 wsd/Admin.hpp  |1 +
 wsd/AdminModel.cpp |   27 +--
 wsd/AdminModel.hpp |   15 +++
 4 files changed, 46 insertions(+), 6 deletions(-)

New commits:
commit 16f6d8c25a99fcd47b40b27c01d0f24e80341348
Author: Gabriel Masei 
AuthorDate: Fri May 29 14:32:04 2020 +0300
Commit: Michael Meeks 
CommitDate: Thu Jun 4 12:59:34 2020 +0200

admin: notify subscribers that doc memory has changed

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

diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 8d85dfbc7..78956b222 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -443,6 +443,8 @@ void Admin::pollingThread()
 std::chrono::duration_cast(now - 
lastMem).count();
 if (memWait <= MinStatsIntervalMs / 2) // Close enough
 {
+_model.UpdateMemoryDirty();
+
 const size_t totalMem = getTotalMemoryUsage();
 _model.addMemStats(totalMem);
 
@@ -454,6 +456,8 @@ void Admin::pollingThread()
 _lastTotalMemory = totalMem;
 }
 
+notifyDocsMemDirtyChanged();
+
 memWait += _memStatsTaskIntervalMs;
 lastMem = now;
 }
@@ -764,6 +768,11 @@ void Admin::triggerMemoryCleanup(const size_t totalMem)
 }
 }
 
+void Admin::notifyDocsMemDirtyChanged()
+{
+_model.notifyDocsMemDirtyChanged();
+}
+
 void Admin::dumpState(std::ostream& os)
 {
 // FIXME: be more helpful ...
diff --git a/wsd/Admin.hpp b/wsd/Admin.hpp
index 42e7a247a..5a3feee61 100644
--- a/wsd/Admin.hpp
+++ b/wsd/Admin.hpp
@@ -148,6 +148,7 @@ private:
 /// Memory consumption has increased, start killing kits etc. till memory 
consumption gets back
 /// under @hardModeLimit
 void triggerMemoryCleanup(size_t hardModeLimit);
+void notifyDocsMemDirtyChanged();
 
 /// Round the interval up to multiples of MinStatsIntervalMs.
 /// This is to avoid arbitrarily small intervals that hammer the server.
diff --git a/wsd/AdminModel.cpp b/wsd/AdminModel.cpp
index ab2d81df7..387796452 100644
--- a/wsd/AdminModel.cpp
+++ b/wsd/AdminModel.cpp
@@ -134,16 +134,18 @@ std::string Document::to_string() const
 return oss.str();
 }
 
-int Document::getMemoryDirty() const
+void Document::updateMemoryDirty()
 {
 // Avoid accessing smaps too often
 const time_t now = std::time(nullptr);
 if (now - _lastTimeSMapsRead >= 5)
 {
+int lastMemDirty = _memoryDirty;
 _memoryDirty = _procSMaps  ? 
Util::getPssAndDirtyFromSMaps(_procSMaps).second : 0;
 _lastTimeSMapsRead = now;
+if (lastMemDirty != _memoryDirty)
+_hasMemDirtyChanged = true;
 }
-return _memoryDirty;
 }
 
 bool Subscriber::notify(const std::string& message)
@@ -1041,4 +1043,25 @@ std::set AdminModel::getDocumentPids() const
 return pids;
 }
 
+void AdminModel::UpdateMemoryDirty()
+{
+for (const auto& it: _documents)
+{
+it.second->updateMemoryDirty();
+}
+}
+
+void AdminModel::notifyDocsMemDirtyChanged()
+{
+for (const auto& it: _documents)
+{
+int memoryDirty = it.second->getMemoryDirty();
+if (it.second->hasMemDirtyChanged())
+{
+notify("propchange " + std::to_string(it.second->getPid()) + " mem 
" + std::to_string(memoryDirty));
+it.second->setMemDirtyChanged(false);
+}
+}
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wsd/AdminModel.hpp b/wsd/AdminModel.hpp
index ae88ef8cd..98bd01495 100644
--- a/wsd/AdminModel.hpp
+++ b/wsd/AdminModel.hpp
@@ -121,7 +121,8 @@ public:
   _wopiUploadDuration(0),
   _procSMaps(nullptr),
   _lastTimeSMapsRead(0),
-  _isModified(false)
+  _isModified(false),
+  _hasMemDirtyChanged(true)
 {
 }
 
@@ -155,7 +156,8 @@ public:
 const std::map& getViews() const { return _views; }
 
 void updateLastActivityTime() { _lastActivity = std::time(nullptr); }
-int getMemoryDirty() const;
+void updateMemoryDirty();
+int getMemoryDirty() const { return _memoryDirty; }
 
 std::pair getSnapshot() const;
 const std::string getHistory() const;
@@ -182,6 +184,8 @@ public:
 void setWopiUploadDuration(const std::chrono::milliseconds 
wopiUploadDuration) { _wopiUploadDuration = wopiUploadDuration; }
 std::chrono::milliseconds getWopiUploadDuration() const { return 
_wopiUploadDuration; }
 void setProcSMapsFD(const int smapsFD) { _procSMaps = fdopen(smapsFD, 
"r"); }
+bool hasMemDirtyChanged() const { return _hasMemDirtyChanged; }
+void setMemDirtyChanged(bool changeStatus) { _hasMemDirtyChanged = 
changeStatus; }
 
 std::string to_string() const;
 
@@ -195,7 +199,7 @@ private:
 /// Hosted filename
 std::string _filename;
 /// 

[Libreoffice-commits] online.git: loleaflet/admin loleaflet/Makefile.am loleaflet/package.json wsd/FileServer.cpp

[gokaysatir (via logerrit)]

 loleaflet/Makefile.am  |2 
 loleaflet/admin/admin.html |  226 ---
 loleaflet/admin/admin.strings.js   |5 
 loleaflet/admin/adminAnalytics.html|  155 ++-
 loleaflet/admin/adminHistory.html  |   87 
 loleaflet/admin/adminLog.html  |  139 +--
 loleaflet/admin/adminSettings.html |  252 ++---
 loleaflet/admin/admintemplate.html |  105 +
 loleaflet/admin/bootstrap/LICENSE  |   21 -
 loleaflet/admin/bootstrap/dashboard.css|  160 
 loleaflet/admin/bootstrap/holder.min.js|   13 
 loleaflet/admin/bootstrap/ie10-viewport-bug-workaround.css |   13 
 loleaflet/admin/bootstrap/ie10-viewport-bug-workaround.js  |   24 -
 loleaflet/admin/css/bulma.min.css  |1 
 loleaflet/admin/dashboard.css  |  115 -
 loleaflet/admin/debug/admin.html   |  129 --
 loleaflet/admin/debug/adminAnalytics.html  |  100 -
 loleaflet/admin/debug/adminSettings.html   |  107 -
 loleaflet/admin/fonts/Montserrat-Regular.ttf   |binary
 loleaflet/admin/fonts/OFL.txt  |   93 
 loleaflet/admin/main-admin.js  |8 
 loleaflet/admin/src/AdminSocketLog.js  |   17 
 loleaflet/package.json |1 
 wsd/FileServer.cpp |   22 -
 24 files changed, 546 insertions(+), 1249 deletions(-)

New commits:
commit 5f07429b6b8a61e97b9056027a1ab95be2c5eb7d
Author: gokaysatir 
AuthorDate: Thu Jun 4 01:36:46 2020 +0300
Commit: Andras Timar 
CommitDate: Thu Jun 4 12:56:16 2020 +0200

leaflet: Update admin console & drop bootstrap package.

Change-Id: I9243393693c2464f2e9a4d24cccf9c5f3415e2ef
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95468
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 329a96357..b411a4f7c 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -54,7 +54,7 @@ LOLEAFLET_HTML_DST = $(patsubst 
$(srcdir)/html/%.html,$(DIST_FOLDER)/%.html,$(LO
 LOLEAFLET_WELCOME_SRC = $(shell find $(srcdir)/welcome -name '*.html')
 LOLEAFLET_WELCOME_DST = $(patsubst 
$(srcdir)/welcome/%.html,$(DIST_FOLDER)/welcome/%.html,$(LOLEAFLET_WELCOME_SRC))
 
-LOLEAFLET_ADMIN_SRC = $(shell find $(srcdir)/admin -name '*.html')
+LOLEAFLET_ADMIN_SRC = $(shell find $(srcdir)/admin -name '*.html' -or -name 
'*.css' -or -name '*.ttf' -or -name 'OFL.txt')
 LOLEAFLET_ADMIN_ALL = $(shell find $(srcdir)/admin -name '*')
 LOLEAFLET_ADMIN_DST = $(patsubst 
$(srcdir)/admin/%,$(DIST_FOLDER)/admin/%,$(LOLEAFLET_ADMIN_SRC))
 
diff --git a/loleaflet/admin/admin.html b/loleaflet/admin/admin.html
index 2b60f767b..9f5fc6886 100644
--- a/loleaflet/admin/admin.html
+++ b/loleaflet/admin/admin.html
@@ -1,151 +1,101 @@
-
-
-  
-
-
-
-
-
-
+
+  
+Admin.Overview(host);
 
-LibreOffice Online - Admin console
+document.write(l10nstrings.strDashboard)
 
-
-
-
-  
-  
-
-
-if (typeof brandProductName !== 'undefined') 
{l10nstrings.strProductName = brandProductName}
-document.title = l10nstrings.strProductName + ' - ' + 
l10nstrings.strAdminConsole
-
-  if (window.location.protocol == "https:") {
-  var host = 'wss://' + window.location.host + 
'%SERVICE_ROOT%/lool/adminws/';
-  }
-  else {
-  host = 'ws://' + window.location.host + 
'%SERVICE_ROOT%/lool/adminws/';
-  }
-
-  Admin.Overview(host);
-
-
-
-  
-
-  
-
-
-
-
-  
-  document.write(l10nstrings.strProductName + ' - ' + 
l10nstrings.strAdminConsole)
+
+  
+
+  document.write(l10nstrings.strUsersOnline)
+  0
 
-
-  
-document.write(l10nstrings.strSettings)
-  
+  
+  
+
+  document.write(l10nstrings.strDocumentsOpened)
+  0
 
   
-
-
-
-  
-
-  
-document.write(l10nstrings.strOverview) document.write(l10nstrings.strCurrent)
-document.write(l10nstrings.strAnalytics)
-document.write(l10nstrings.strHistory)
-document.write(l10nstrings.strLog)
-  
+  
+
+  document.write(l10nstrings.strMemoryConsumed)
+  0
 
-
-  document.write(l10nstrings.strDashboard)
-
- 
-   
- 0
- 
document.write(l10nstrings.strUsersOnline)
- 

[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/Makefile.am loleaflet/package.json

[gokaysatir (via logerrit)]

 loleaflet/Makefile.am  
|8 
 loleaflet/css/jquery-ui-lightness.css  
| 1311 ++
 loleaflet/images/jquery-ui-lightness/ui-bg_diagonals-thick_18_b81900_40x40.png 
|binary
 loleaflet/images/jquery-ui-lightness/ui-bg_diagonals-thick_20_66_40x40.png 
|binary
 loleaflet/images/jquery-ui-lightness/ui-bg_glass_100_f6f6f6_1x400.png  
|binary
 loleaflet/images/jquery-ui-lightness/ui-bg_glass_100_fdf5ce_1x400.png  
|binary
 loleaflet/images/jquery-ui-lightness/ui-bg_glass_65_ff_1x400.png   
|binary
 loleaflet/images/jquery-ui-lightness/ui-bg_gloss-wave_35_f6a828_500x100.png
|binary
 loleaflet/images/jquery-ui-lightness/ui-bg_highlight-soft_100_ee_1x100.png 
|binary
 loleaflet/images/jquery-ui-lightness/ui-bg_highlight-soft_75_ffe45c_1x100.png  
|binary
 loleaflet/images/jquery-ui-lightness/ui-icons_22_256x240.png   
|binary
 loleaflet/images/jquery-ui-lightness/ui-icons_228ef1_256x240.png   
|binary
 loleaflet/images/jquery-ui-lightness/ui-icons_ef8c08_256x240.png   
|binary
 loleaflet/images/jquery-ui-lightness/ui-icons_ffd27a_256x240.png   
|binary
 loleaflet/images/jquery-ui-lightness/ui-icons_ff_256x240.png   
|binary
 loleaflet/package.json 
|2 
 16 files changed, 1316 insertions(+), 5 deletions(-)

New commits:
commit 6f6c0a32e5e5856b4e5136149ecac50b748d70d8
Author: gokaysatir 
AuthorDate: Tue Jun 2 12:46:39 2020 +0300
Commit: Andras Timar 
CommitDate: Thu Jun 4 12:55:07 2020 +0200

leaflet: update jquery-ui package with lightness them.

Change-Id: I8273c2f7d8b46f63f582c11c2c0e81c303e04bcb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95352
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 3f68dcf12..329a96357 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -30,11 +30,11 @@ $(L10N_IOS_ALL_JS) : $(wildcard $(srcdir)/po/ui-*.po) 
$(shell find $(srcdir)/l10
done
 endif
 
-JQUERY_LIGHTNESS_IMAGE_PATH = node_modules/jquery-ui/themes/ui-lightness/images
+JQUERY_LIGHTNESS_IMAGE_PATH = $(srcdir)/images/jquery-ui-lightness
 JQUERY_LIGHTNESS_IMAGES = $(wildcard $(JQUERY_LIGHTNESS_IMAGE_PATH)/*.png)
 JQUERY_LIGHTNESS_DIST_IMAGES = $(patsubst 
$(JQUERY_LIGHTNESS_IMAGE_PATH)/%.png,$(DIST_FOLDER)/images/%.png,$(JQUERY_LIGHTNESS_IMAGES))
 
-JQUERY_MINIFIED_IMAGE_PATH = node_modules/jquery-ui/themes/base/minified/images
+JQUERY_MINIFIED_IMAGE_PATH = node_modules/jquery-ui-dist/images
 JQUERY_MINIFIED_IMAGES = $(wildcard $(JQUERY_MINIFIED_IMAGE_PATH)/*.png)
 JQUERY_MINIFIED_DIST_IMAGES = $(patsubst 
$(JQUERY_MINIFIED_IMAGE_PATH)/%.png,$(DIST_FOLDER)/images/%.png,$(JQUERY_MINIFIED_IMAGES))
 
@@ -136,7 +136,7 @@ LOLEAFLET_CSS =\
$(srcdir)/css/jsdialogs.css \
$(srcdir)/css/notebookbar.css \
$(srcdir)/css/vex.css \
-   $(builddir)/node_modules/jquery-ui/themes/ui-lightness/jquery-ui.css
+   $(srcdir)/css/jquery-ui-lightness.css
 
 LOLEAFLET_CSS_DST = $(foreach file,$(LOLEAFLET_CSS),$(DIST_FOLDER)/$(notdir 
$(file)))
 LOLEAFLET_CSS_M4 = $(strip $(foreach file,$(LOLEAFLET_CSS),$(notdir $(file
@@ -148,7 +148,7 @@ NODE_MODULES_JS =\
node_modules/jquery/dist/jquery.js \
node_modules/jquery-mousewheel/jquery.mousewheel.js \
node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \
-   node_modules/jquery-ui/jquery-ui.js \
+   node_modules/jquery-ui-dist/jquery-ui.js \
node_modules/smartmenus/dist/jquery.smartmenus.js
 
 LOLEAFLET_LIBS_JS =\
diff --git a/loleaflet/css/jquery-ui-lightness.css 
b/loleaflet/css/jquery-ui-lightness.css
new file mode 100644
index 0..6b7ec6aaf
--- /dev/null
+++ b/loleaflet/css/jquery-ui-lightness.css
@@ -0,0 +1,1311 @@
+/*! jQuery UI - v1.12.1 - 2016-09-14
+* http://jqueryui.com
+* Includes: core.css, accordion.css, autocomplete.css, menu.css, button.css, 
controlgroup.css, checkboxradio.css, datepicker.css, dialog.css, draggable.css, 
resizable.css, progressbar.css, selectable.css, selectmenu.css, slider.css, 
sortable.css, spinner.css, tabs.css, tooltip.css, theme.css
+* To view and modify this theme, visit 
http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=gloss_wave&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ff&iconColorHeader=ff&bgColorContent=ee&bgTextureContent=highlight_soft&bgImgOpacityContent=100&borderColorContent=dd&fcContent=33&iconColorContent=22&bgColorDefault=f6f6f6&bgTextureDefault=glass&bgImgOpacityDefault=100&borderColorDefault=cc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTexture

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

[Miklos Vajna (via logerrit)]

 sfx2/source/doc/objserv.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit b52d304969a15e00d82745f4d2f96c04f188eb97
Author: Miklos Vajna 
AuthorDate: Tue Jun 2 16:45:44 2020 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jun 4 12:46:12 2020 +0200

tdf#130354 sfx2: make PDF signing UI work again

Regression from commit 9112c18524c9f5e67d6cbb282586a439e3020cdb (Don't
create unnecessary tempfiles for opened doc, 2019-10-18), restore the
temporary file creation for the PDF case, as it's needed for PDF signing
to work.

(cherry picked from commit 058caeef45f9abf12e4e243aafbbb1c2ebcbc057)

Change-Id: I945f04f6ab90d0e04fb14a7634ec877fb0af1a0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95410
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 51276917bd5e..5c5b7826e075 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1594,6 +1594,10 @@ uno::Sequence< security::DocumentSignatureInformation > 
SfxObjectShell::GetDocum
 else
 {
 // Not ZIP-based, e.g. PDF.
+
+// Create temp file if needed.
+GetMedium()->CreateTempFile(/*bReplace=*/false);
+
 std::unique_ptr 
pStream(utl::UcbStreamHelper::CreateStream(GetMedium()->GetName(), 
StreamMode::READ));
 uno::Reference xStream(new 
utl::OStreamWrapper(*pStream));
 uno::Reference xInputStream(xStream, 
uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/text/porlay.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 4927143b6652ce2d19e6f476923112f0ab7fc273
Author: Michael Stahl 
AuthorDate: Wed Jun 3 16:03:09 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu Jun 4 12:40:26 2020 +0200

tdf#130804 sw: fix bookmark portions in line containing only as-char fly

There were 2 problems:

* due to the first bookmark portion, the line got an additional 55 twips
  of its descent added to its height in SwLineLayout::CalcLine().

* when called from SwTextFrame::CalcHeightOfLastLine(),
  SwLineLayout::MaxAscentDescent() is supposed to ignore FlyInCnt
  portions, but it didn't ignore the bookmark portion which had the same
  height, hence the resulting line spacing was 855 instead of 0 and the
  upper margin of the next paragraph increased similarly.

(regression from 4ce8120f1e53f7b81e653b01d141643013bc69ab)

Change-Id: I52b154a48c5d712b7e3e323d2e3e08f37bf1afd1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95438
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 97d77b670d1c2e5dd045130427c42a6b74d55889)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95423
Tested-by: Michael Stahl 

diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 2b51a2eca9bc..499dac050009 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -408,7 +408,9 @@ void SwLineLayout::CalcLine( SwTextFormatter &rLine, 
SwTextFormatInfo &rInf )
 }
 
 // Ignore drop portion height
-if( pPos->IsDropPortion() && 
static_cast(pPos)->GetLines() > 1)
+// tdf#130804 ... and bookmark portions
+if ((pPos->IsDropPortion() && 
static_cast(pPos)->GetLines() > 1)
+|| pPos->GetWhichPor() == PortionType::Bookmark)
 {
 pLast = pPos;
 pPos = pPos->GetNextPortion();
@@ -618,6 +620,8 @@ void SwLineLayout::MaxAscentDescent( SwTwips& _orAscent,
 while ( pTmpPortion )
 {
 if ( !pTmpPortion->IsBreakPortion() && !pTmpPortion->IsFlyPortion() &&
+// tdf#130804 ignore bookmark portions
+ pTmpPortion->GetWhichPor() != PortionType::Bookmark &&
  ( !_bNoFlyCntPorAndLinePor ||
( !pTmpPortion->IsFlyCntPortion() &&
  !(pTmpPortion == this && pTmpPortion->GetNextPortion() ) ) ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 loleaflet/src/control/Ruler.js |   97 +
 1 file changed, 51 insertions(+), 46 deletions(-)

New commits:
commit e49b995f53291d49febab879d52153d9e6636bb6
Author: Tomaž Vajngerl 
AuthorDate: Thu Jun 4 12:13:17 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 4 12:18:17 2020 +0200

ruler: delete tabstop on long-press when over a specific tabstop

When a long-press event occurs over a tabstop, it will now delete
it. If no specific tabstop is at the long-press position, then
insert a new tabstop.

Change-Id: I3af2847db3367c1f76d28696f4fa3d0a8017011c

diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index b3cb520b9..3c64f0280 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -300,9 +300,7 @@ L.Control.Ruler = L.Control.extend({
// least in the US. (The ruler unit to use doesn't seem to be 
stored in the document
// at least for .odt?)
for (var num = 0; num <= (this.options.pageWidth / 1000) + 1; 
num++) {
-
var marker = L.DomUtil.create('div', 
'loleaflet-ruler-maj', this._rBPContainer);
-
// The - 1 is to compensate for the left and right .5px 
borders of
// loleaflet-ruler-maj in leaflet.css.
marker.style.width = 
this.options.DraggableConvertRatio*1000 - 1 + 'px';
@@ -355,12 +353,9 @@ L.Control.Ruler = L.Control.extend({
}
 
if (!this.options.marginSet) {
-
this.options.marginSet = true;
-
this._lMarginMarker = L.DomUtil.create('div', 
'loleaflet-ruler-margin loleaflet-ruler-left', this._rFace);
this._rMarginMarker =  L.DomUtil.create('div', 
'loleaflet-ruler-margin loleaflet-ruler-right', this._rFace);
-
this._lMarginDrag = L.DomUtil.create('div', 
'loleaflet-ruler-drag loleaflet-ruler-left', this._rMarginWrapper);
this._lToolTip = L.DomUtil.create('div', 
'loleaflet-ruler-ltooltip', this._lMarginDrag);
this._rMarginDrag = L.DomUtil.create('div', 
'loleaflet-ruler-drag loleaflet-ruler-right', this._rMarginWrapper);
@@ -372,7 +367,6 @@ L.Control.Ruler = L.Control.extend({
this.options.interactive = true;
L.DomEvent.on(this._rMarginDrag, 'touchstart', 
this._initiateDrag, this);
L.DomEvent.on(this._lMarginDrag, 'touchstart', 
this._initiateDrag, this);
-
}
}
 
@@ -625,12 +619,36 @@ L.Control.Ruler = L.Control.extend({
}
return tabstop;
},
+
+   _showTabstopContextMenu: function(position, tabstopNumber) {
+   var self = this;
+   this.currentPositionInTwips = position;
+   this.currentTabStopIndex = tabstopNumber;
+   $.contextMenu({
+   selector: '.loleaflet-ruler-tabstopcontainer',
+   className: 'loleaflet-font',
+   items: {
+   inserttabstop: {
+   name: _('Insert tabstop'),
+   callback: 
(this._insertTabstop).bind(this),
+   visible: function() {
+   return 
self.currentPositionInTwips != null;
+   }
+   },
+   removetabstop: {
+   name: _('Delete tabstop'),
+   callback: 
(this._deleteTabstop).bind(this),
+   visible: function() {
+   return self.currentTabStopIndex 
!= null;
+   }
+   }
+   }
+   });
+   },
+
_initiateTabstopDrag: function(event) {
// console.log('===> _initiateTabstopDrag ' + event.type);
 
-   this.currentPositionInTwips = null;
-   this.currentTabStopIndex = null;
-
var tabstopContainer = null;
var pointX = null;
 
@@ -652,32 +670,12 @@ L.Control.Ruler = L.Control.extend({
// right-click inside tabstop container
if (event.button === 2) {
if (tabstop == null) {
-   this.currentPositionInTwips = 
this._map._docLayer._pixelsToTwips({x: pointX, y:0}).x;
+   var position = 
this._map._docLayer._pixelsToTwips({x: pointX, y:0}).x;
+   this._showTabstopContextMenu(position, 

[Libreoffice-commits] core.git: dbaccess/Module_dbaccess.mk

[Noel Grandin (via logerrit)]

 dbaccess/Module_dbaccess.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8ad4ec9eea1224b9bfe1f7ce28393b234c083c89
Author: Noel Grandin 
AuthorDate: Thu Jun 4 10:41:44 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 4 12:15:52 2020 +0200

disable dbaccess_hsqldb test on macos

fails 50% of the time with a core dump, and we have no way of debugging
that

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

diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index a84bd57f2f82..49bd9d202c7f 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -61,12 +61,15 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
CppunitTest_dbaccess_hsqlschema_import \
 ))
 
+# this test fails 50% of the time on the mac jenkins buildbots
 ifeq ($(ENABLE_JAVA),TRUE)
+ifneq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_check_targets,dbaccess,\
 CppunitTest_dbaccess_hsqldb_test \
 CppunitTest_dbaccess_RowSetClones \
 ))
 endif
+endif
 
 # This runs a suite of performance tests on embedded firebird and HSQLDB.
 # Instructions on running the test can be found in 
qa/unit/embeddedb_performancetest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/impress/apply_font_spec.js|  
 92 +
 cypress_test/integration_tests/mobile/impress/apply_paragraph_props_spec.js |  
102 ++
 cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js  |  
 73 +++
 cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js  |  
 50 +---
 4 files changed, 131 insertions(+), 186 deletions(-)

New commits:
commit 8e9627a033f9e53a4e1b382678d634a926d88cf8
Author: Tamás Zolnai 
AuthorDate: Thu Jun 4 11:18:40 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Jun 4 12:05:17 2020 +0200

cypress: extract some shared code in impress tests.

Change-Id: I2683e894bccd46cdd847f95f8298595c733486a9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95494
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/mobile/impress/apply_font_spec.js 
b/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
index 5540067ad..04a390887 100644
--- a/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
@@ -1,7 +1,8 @@
-/* global describe it cy beforeEach require expect afterEach*/
+/* global describe it cy beforeEach require afterEach*/
 
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
+var impressMobileHelper = require('./impress_mobile_helper');
 
 describe('Apply font on text and on text shape.', function() {
var testFileName = 'apply_font.odp';
@@ -11,72 +12,15 @@ describe('Apply font on text and on text shape.', 
function() {
 
mobileHelper.enableEditingMobile();
 
-   selectTextShape();
+   impressMobileHelper.selectTextShapeInTheCenter();
});
 
afterEach(function() {
helper.afterAll(testFileName);
});
 
-   function selectTextShape() {
-   // Click on the center of the slide to select the text shape 
there
-   cy.get('#document-container')
-   .then(function(items) {
-   expect(items).to.have.length(1);
-   var XPos = 
(items[0].getBoundingClientRect().left + 
items[0].getBoundingClientRect().right) / 2;
-   var YPos = 
(items[0].getBoundingClientRect().top + 
items[0].getBoundingClientRect().bottom) / 2;
-   cy.get('body')
-   .click(XPos, YPos);
-   });
-
-   cy.get('.leaflet-drag-transform-marker')
-   .should('be.visible');
-
-   cy.get('.leaflet-pane.leaflet-overlay-pane g.Page g')
-   .should('have.class', 'com.sun.star.drawing.TextShape');
-   }
-
-   function selectTextOfShape() {
-   // Double click onto the selected shape
-   cy.get('svg g .leaflet-interactive')
-   .then(function(items) {
-   expect(items).to.have.length(1);
-   var XPos = 
(items[0].getBoundingClientRect().left + 
items[0].getBoundingClientRect().right) / 2;
-   var YPos = 
(items[0].getBoundingClientRect().top + 
items[0].getBoundingClientRect().bottom) / 2;
-   cy.get('body')
-   .dblclick(XPos, YPos);
-   });
-
-   cy.get('.leaflet-cursor.blinking-cursor')
-   .should('exist');
-
-   helper.selectAllText(false);
-   }
-
function triggerNewSVG() {
-   mobileHelper.closeMobileWizard();
-
-   // Remove selection first with clicking next to the rotate 
handler
-   cy.get('.transform-handler--rotate')
-   .then(function(items) {
-   var XPos = 
items[0].getBoundingClientRect().left - 10;
-   var YPos = items[0].getBoundingClientRect().top;
-   cy.get('body')
-   .click(XPos, YPos);
-
-   cy.get('body')
-   .dblclick(XPos, YPos);
-   });
-
-   cy.get('.leaflet-drag-transform-marker')
-   .should('not.exist');
-
-   // If we click two fast on shape again
-   // then it steps into edit mode
-   cy.wait(200);
-
-   // Select text shape again which will retrigger a new SVG from 
core
-   selectTextShape();
+   impressMobileHelper.triggerNewSVGForShapeInTheCenter();
}
 
function openTextPropertiesPanel() {
@@ -334,7 +278,7 @@ describe('Apply font on text and on text shape.', 
function()

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

[Srijan Bhatia (via logerrit)]

 sd/inc/strings.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4949050c43300eee047531d856bd4a25e60980c3
Author: Srijan Bhatia 
AuthorDate: Sat May 30 21:17:14 2020 +0530
Commit: Heiko Tietze 
CommitDate: Thu Jun 4 11:59:07 2020 +0200

tdf#132137 Rename Default Style to Default Drawing Style in Draw and 
Impress.

Change-Id: I130bd0e070a3449753cc76a8f7e6352c8b7a1bba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95403
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 

diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 54c6d81362a6..0e093d1da84b 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -318,7 +318,7 @@
 #define STR_PRESOBJ_TABLE   
NC_("STR_PRESOBJ_TABLE", "Double-click to add a Spreadsheet" )
 #define STR_LAYOUT_DEFAULT_NAME 
NC_("STR_LAYOUT_DEFAULT_NAME", "Default" )
 #define STR_LAYOUT_DEFAULT_TITLE_NAME   
NC_("STR_LAYOUT_DEFAULT_TITLE_NAME", "Title" )
-#define STR_STANDARD_STYLESHEET_NAME
NC_("STR_STANDARD_STYLESHEET_NAME", "Default" )
+#define STR_STANDARD_STYLESHEET_NAME
NC_("STR_STANDARD_STYLESHEET_NAME", "Default Drawing Style" )
 #define STR_UNDO_MOVEPAGES  
NC_("STR_UNDO_MOVEPAGES", "Move slides" )
 #define STR_INSERT_PAGES
NC_("STR_INSERT_PAGES", "Insert Pages" )
 #define STR_INSERT_PAGE_DRAW
NC_("STR_INSERT_PAGE_DRAW", "Insert Page" )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: uitest/libreoffice

[Stephan Bergmann (via logerrit)]

 uitest/libreoffice/connection.py |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 8cfd9aeb3a9c6256c80d286c3579755b3403d2b1
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 09:25:37 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 11:31:30 2020 +0200

Adapt documentation

...to 43aef04d77aafb9d055957642e62b559231f3711 "Reliably wait for soffice to
terminate"

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

diff --git a/uitest/libreoffice/connection.py b/uitest/libreoffice/connection.py
index cb3ae1a0128e..5330fdb70c11 100644
--- a/uitest/libreoffice/connection.py
+++ b/uitest/libreoffice/connection.py
@@ -107,10 +107,9 @@ class OfficeConnection:
 def tearDown(self):
 """Terminate a LibreOffice instance created with the path connection 
method.
 
-First tries to terminate the soffice instance through the normal
-XDesktop::terminate method and waits for about 30 seconds before
-considering this attempt failed. After the 30 seconds the subprocess
-is terminated """
+Tries to terminate the soffice instance through the normal
+XDesktop::terminate method and waits indefinitely for the subprocess
+to terminate """
 
 if self.soffice:
 if self.xContext:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 framework/source/accelerators/acceleratorconfiguration.cxx |3 --
 framework/source/classes/taskcreator.cxx   |3 --
 framework/source/dispatch/oxt_handler.cxx  |3 --
 framework/source/services/pathsettings.cxx |   15 +++--
 framework/source/uielement/macrosmenucontroller.cxx|3 --
 framework/source/uielement/toolbarsmenucontroller.cxx  |3 --
 framework/source/uifactory/uicontrollerfactory.cxx |3 --
 7 files changed, 10 insertions(+), 23 deletions(-)

New commits:
commit 8331ecac51c5b090cb3cce7d20da5ba403a74b01
Author: Stephan Bergmann 
AuthorDate: Wed Jun 3 22:43:13 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 11:31:03 2020 +0200

Upcoming loplugin:elidestringvar: framework

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

diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx 
b/framework/source/accelerators/acceleratorconfiguration.cxx
index 6daa18b33a6c..2c01e90a47e2 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -479,9 +479,8 @@ OUString 
XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
 XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const 
css::uno::Reference< css::uno::XComponentContext >& xContext)
 : m_xContext  (xContext
 )
 {
-const OUString 
CFG_ENTRY_ACCELERATORS("org.openoffice.Office.Accelerators");
 m_xCfg.set(
- ::comphelper::ConfigurationHelper::openConfig( m_xContext, 
CFG_ENTRY_ACCELERATORS, ::comphelper::EConfigurationModes::AllLocales ),
+ ::comphelper::ConfigurationHelper::openConfig( m_xContext, 
"org.openoffice.Office.Accelerators", 
::comphelper::EConfigurationModes::AllLocales ),
  css::uno::UNO_QUERY );
 }
 
diff --git a/framework/source/classes/taskcreator.cxx 
b/framework/source/classes/taskcreator.cxx
index 65755aa8d674..aae5849b89a8 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -56,11 +56,10 @@ TaskCreator::~TaskCreator()
 css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const 
OUString& sName, const utl::MediaDescriptor& rDescriptor )
 {
 css::uno::Reference< css::lang::XSingleServiceFactory > xCreator;
-OUString sCreator = IMPLEMENTATIONNAME_FWK_TASKCREATOR;
 
 try
 {
-xCreator.set( 
m_xContext->getServiceManager()->createInstanceWithContext(sCreator, 
m_xContext), css::uno::UNO_QUERY_THROW);
+xCreator.set( 
m_xContext->getServiceManager()->createInstanceWithContext(IMPLEMENTATIONNAME_FWK_TASKCREATOR,
 m_xContext), css::uno::UNO_QUERY_THROW);
 }
 catch(const css::uno::Exception&)
 {}
diff --git a/framework/source/dispatch/oxt_handler.cxx 
b/framework/source/dispatch/oxt_handler.cxx
index 8bc67abf9105..5d6540e01a28 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -87,11 +87,10 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const 
css::util::URL& aURL,
 {
 osl::MutexGuard g(m_mutex);
 
-OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog";
 css::uno::Sequence< css::uno::Any > lParams(1);
 lParams[0] <<= aURL.Main;
 
-css::uno::Reference< css::uno::XInterface > xService = 
m_xFactory->createInstanceWithArguments( sServiceName, lParams );
+css::uno::Reference< css::uno::XInterface > xService = 
m_xFactory->createInstanceWithArguments( 
"com.sun.star.deployment.ui.PackageManagerDialog", lParams );
 css::uno::Reference< css::task::XJobExecutor > xExecuteable( xService, 
css::uno::UNO_QUERY );
 if ( xExecuteable.is() )
 xExecuteable->trigger( OUString() );
diff --git a/framework/source/services/pathsettings.cxx 
b/framework/source/services/pathsettings.cxx
index 74a9810ee402..6f288ce96da4 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -576,9 +576,6 @@ std::vector 
PathSettings::impl_readOldFormat(const OUString& sPath)
 // NO substitution here ! It's done outside ...
 PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath)
 {
-const OUString CFGPROP_INTERNALPATHS("InternalPaths");
-const OUString CFGPROP_ISSINGLEPATH("IsSinglePath");
-
 css::uno::Reference< css::container::XNameAccess > xCfg = fa_getCfgNew();
 
 // get access to the "queried" path
@@ -589,7 +586,7 @@ PathSettings::PathInfo 
PathSettings::impl_readNewFormat(const OUString& sPath)
 
 // read internal path list
 css::uno::Reference< css::container::XNameAccess > xIPath;
-xPath->getByName(CFGPROP_INTERNALPATHS) >>= xIPath;
+xPath->getByName("InternalPaths") >>= xIPath;
  

[Libreoffice-commits] online.git: cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/impress/apply_font_spec.js |   25 
--
 1 file changed, 20 insertions(+), 5 deletions(-)

New commits:
commit 7705ece999c0be69448a12cd21d23bb8442bfd2e
Author: Tamás Zolnai 
AuthorDate: Thu Jun 4 10:56:01 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Jun 4 11:29:25 2020 +0200

cypress: finish test for changing highlight color in Impress (mobile)

Unfortunately, the core generated SVG does not
have the text highlighting, so we can only check
the state of the mobile wizard.

Change-Id: I49a916113a986568c552917a5fe953165282de30
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95489
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/mobile/impress/apply_font_spec.js 
b/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
index d24b48e75..5540067ad 100644
--- a/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
@@ -244,7 +244,7 @@ describe('Apply font on text and on text shape.', 
function() {
.should('have.attr', 'fill', 'rgb(106,168,79)');
});
 
-   it.skip('Apply highlight on text shape.', function() {
+   it('Apply highlight on text shape.', function() {
openTextPropertiesPanel();
 
cy.get('.leaflet-pane.leaflet-overlay-pane g.Page 
.TextParagraph')
@@ -255,9 +255,17 @@ describe('Apply font on text and on text shape.', 
function() {
 
mobileHelper.selectFromColorPalette(1, 2, 2);
 
+   cy.get('#CharBackColor .color-sample-selected')
+   .should('have.attr', 'style', 'background-color: 
rgb(204, 0, 0);');
+
triggerNewSVG();
 
-   // TODO: highlight color is not applied on the shape
+   // TODO: highlight color is not in the SVG
+   // At least check the mobile wizard's state
+   openTextPropertiesPanel();
+
+   cy.get('#CharBackColor .color-sample-selected')
+   .should('have.attr', 'style', 'background-color: 
rgb(204, 0, 0);');
});
 
it('Apply superscript on text shape.', function() {
@@ -505,17 +513,24 @@ describe('Apply font on text and on text shape.', 
function() {
 
mobileHelper.openMobileWizard();
 
-   cy.get('.leaflet-pane.leaflet-overlay-pane g.Page 
.TextParagraph')
-   .should('not.have.attr', 'font-color');
-
cy.get('#CharBackColor')
.click();
 
mobileHelper.selectFromColorPalette(1, 2, 2);
 
+   cy.get('#CharBackColor .color-sample-selected')
+   .should('have.attr', 'style', 'background-color: 
rgb(204, 0, 0);');
+
triggerNewSVG();
 
// TODO: highlight color is not in the SVG
+   // At least check the mobile wizard's state
+   selectTextOfShape();
+
+   mobileHelper.openMobileWizard();
+
+   cy.get('#CharBackColor .color-sample-selected')
+   .should('have.attr', 'style', 'background-color: 
rgb(204, 0, 0);');
});
 
it('Apply superscript on selected text.', function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/impress/apply_font_spec.js |   14 
+++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit eba17c5f9c198748a8dc1dc07ead301a66b0b43a
Author: Tamás Zolnai 
AuthorDate: Thu Jun 4 10:49:45 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Jun 4 11:29:10 2020 +0200

cypress: finish test for changing text color in Impress (mobile)

Now this feature is fixed.

Change-Id: I274e63f328e626a0e7c9ed262ad7baf651860b90
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95488
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/mobile/impress/apply_font_spec.js 
b/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
index b95eb0ed1..d24b48e75 100644
--- a/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
@@ -224,7 +224,10 @@ describe('Apply font on text and on text shape.', 
function() {
.should('have.attr', 'font-size', '564px');
});
 
-   it.skip('Apply text color on text shape.', function() {
+   it('Apply text color on text shape.', function() {
+   cy.get('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition 
tspan')
+   .should('have.attr', 'fill', 'rgb(0,0,0)');
+
openTextPropertiesPanel();
 
cy.get('.leaflet-pane.leaflet-overlay-pane g.Page 
.TextParagraph')
@@ -237,7 +240,8 @@ describe('Apply font on text and on text shape.', 
function() {
 
triggerNewSVG();
 
-   // TODO: text color is not applied on the shape
+   cy.get('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition 
tspan')
+   .should('have.attr', 'fill', 'rgb(106,168,79)');
});
 
it.skip('Apply highlight on text shape.', function() {
@@ -475,6 +479,9 @@ describe('Apply font on text and on text shape.', 
function() {
});
 
it('Apply text color on selected text.', function() {
+   cy.get('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition 
tspan')
+   .should('have.attr', 'fill', 'rgb(0,0,0)');
+
selectTextOfShape();
 
mobileHelper.openMobileWizard();
@@ -489,7 +496,8 @@ describe('Apply font on text and on text shape.', 
function() {
 
triggerNewSVG();
 
-   // TODO: text color is not in the SVG
+   cy.get('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition 
tspan')
+   .should('have.attr', 'fill', 'rgb(106,168,79)');
});
 
it('Apply highlight on selected text.', function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/impress/apply_paragraph_props_spec.js |  
354 +-
 1 file changed, 345 insertions(+), 9 deletions(-)

New commits:
commit 8fc6a5762c1136ce1567cb5d4dec9f86424e
Author: Tamás Zolnai 
AuthorDate: Thu Jun 4 10:35:34 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Jun 4 11:01:38 2020 +0200

cypress: more paragraph properties test in impress (mobile)

Change-Id: I439ec6a26a3d5aa3324db7add72ea9003025c753
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95486
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git 
a/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_spec.js 
b/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_spec.js
index 39171c90d..9547122e5 100644
--- 
a/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_spec.js
+++ 
b/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_spec.js
@@ -62,6 +62,23 @@ describe('Apply paragraph properties.', function() {
selectTextShape();
}
 
+   function selectTextOfShape() {
+   // Double click onto the selected shape
+   cy.get('svg g .leaflet-interactive')
+   .then(function(items) {
+   expect(items).to.have.length(1);
+   var XPos = 
(items[0].getBoundingClientRect().left + 
items[0].getBoundingClientRect().right) / 2;
+   var YPos = 
(items[0].getBoundingClientRect().top + 
items[0].getBoundingClientRect().bottom) / 2;
+   cy.get('body')
+   .dblclick(XPos, YPos);
+   });
+
+   cy.get('.leaflet-cursor.blinking-cursor')
+   .should('exist');
+
+   helper.selectAllText(false);
+   }
+
function openParagraphPropertiesPanel() {
mobileHelper.openMobileWizard();
 
@@ -72,7 +89,14 @@ describe('Apply paragraph properties.', function() {
.should('be.visible');
}
 
-   it('Apply left/right alignment.', function() {
+   function openParagraphPropertiesPanel2() {
+   mobileHelper.openMobileWizard();
+
+   cy.get('#Paragraph')
+   .click();
+   }
+
+   it('Apply left/right alignment on text shape.', function() {
cy.get('.leaflet-pane.leaflet-overlay-pane g.Page 
.TextParagraph .TextPosition')
.should('have.attr', 'x', '1400');
 
@@ -99,7 +123,7 @@ describe('Apply paragraph properties.', function() {
.should('have.attr', 'x', '1400');
});
 
-   it('Apply center alignment.', function() {
+   it('Apply center alignment on text shape.', function() {
cy.get('.leaflet-pane.leaflet-overlay-pane g.Page 
.TextParagraph .TextPosition')
.should('have.attr', 'x', '1400');
 
@@ -114,7 +138,7 @@ describe('Apply paragraph properties.', function() {
.should('have.attr', 'x', '12493');
});
 
-   it('Apply justified alignment.', function() {
+   it('Apply justified alignment on text shape.', function() {
cy.get('.leaflet-pane.leaflet-overlay-pane g.Page 
.TextParagraph .TextPosition')
.should('have.attr', 'x', '1400');
 
@@ -141,7 +165,7 @@ describe('Apply paragraph properties.', function() {
.should('have.attr', 'x', '1400');
});
 
-   it('Set top/bottom alignment.', function() {
+   it('Set top/bottom alignment on text shape.', function() {
cy.get('.leaflet-pane.leaflet-overlay-pane g.Page 
.TextParagraph .TextPosition')
.should('have.attr', 'y', '4834');
 
@@ -168,7 +192,7 @@ describe('Apply paragraph properties.', function() {
.should('have.attr', 'y', '4834');
});
 
-   it('Apply center vertical alignment.', function() {
+   it('Apply center vertical alignment on text shape.', function() {
cy.get('.leaflet-pane.leaflet-overlay-pane g.Page 
.TextParagraph .TextPosition')
.should('have.attr', 'y', '4834');
 
@@ -183,7 +207,7 @@ describe('Apply paragraph properties.', function() {
.should('have.attr', 'y', '7823');
});
 
-   it('Apply default bulleting.', function() {
+   it('Apply default bulleting on text shape.', function() {
// We have no bulleting by default
cy.get('.leaflet-pane.leaflet-overlay-pane g.Page .BulletChars')
.should('not.exist');
@@ -199,7 +223,7 @@ describe('Apply paragraph properties.', function() {
.should('exist');
});
 
-   it('Apply default numbering.', function() {
+   it('Apply defa

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 37 commits - basctl/source chart2/qa compilerplugins/clang cui/source editeng/source extras/source filter/source icon-th

[Michael Weghorn (via logerrit)]

 basctl/source/basicide/baside2.hxx|3 
 basctl/source/basicide/baside2b.cxx   |   19 +
 chart2/qa/extras/chart2export.cxx |   11 
 chart2/qa/extras/data/xlsx/chart_pie2007.xlsx |binary
 compilerplugins/clang/referencecasting.cxx|3 
 cui/source/customize/cfg.cxx  |   12 
 dev/null  |binary
 editeng/source/editeng/impedit2.cxx   |   13 
 extras/source/shellnew/soffice.odg|binary
 extras/source/shellnew/soffice.ods|binary
 extras/source/shellnew/soffice.odt|binary
 filter/source/msfilter/svdfppt.cxx|   77 +---
 icon-themes/colibre/cmd/32/grafblue.png   |binary
 icon-themes/colibre/cmd/32/grafgreen.png  |binary
 icon-themes/colibre/cmd/32/grafred.png|binary
 icon-themes/colibre/cmd/lc_circlepie.png  |binary
 icon-themes/colibre/cmd/lc_grafblue.png   |binary
 icon-themes/colibre/cmd/lc_grafgreen.png  |binary
 icon-themes/colibre/cmd/lc_grafred.png|binary
 icon-themes/colibre_svg/cmd/32/grafblue.svg   |2 
 icon-themes/colibre_svg/cmd/32/grafgreen.svg  |2 
 icon-themes/colibre_svg/cmd/32/grafred.svg|2 
 icon-themes/colibre_svg/cmd/lc_circlepie.png  |binary
 icon-themes/colibre_svg/cmd/lc_grafblue.svg   |2 
 icon-themes/colibre_svg/cmd/lc_grafgreen.svg  |2 
 icon-themes/colibre_svg/cmd/lc_grafred.svg|2 
 include/filter/msfilter/svdfppt.hxx   |3 
 include/svx/itemwin.hxx   |4 
 include/svx/linectrl.hxx  |2 
 include/svx/srchdlg.hxx   |5 
 include/tools/UnitConversion.hxx  |   19 +
 include/vcl/weld.hxx  |5 
 include/vcl/window.hxx|4 
 include/xmloff/PageMasterStyleMap.hxx |1 
 include/xmloff/XMLDrawingPageStyleContext.hxx |   28 +
 include/xmloff/XMLTextMasterPageContext.hxx   |6 
 include/xmloff/prstylei.hxx   |4 
 include/xmloff/txtimp.hxx |2 
 include/xmloff/xmlimppr.hxx   |2 
 include/xmloff/xmltoken.hxx   |3 
 oox/inc/drawingml/colorchoicecontext.hxx  |   15 
 oox/source/drawingml/chart/typegroupmodel.cxx |2 
 oox/source/drawingml/colorchoicecontext.cxx   |   25 +
 oox/source/drawingml/diagram/diagram.cxx  |   17 -
 oox/source/drawingml/diagram/diagram.hxx  |   16 
 oox/source/drawingml/diagram/diagramfragmenthandler.cxx   |   15 
 oox/source/drawingml/diagram/diagramlayoutatoms.cxx   |  162 -
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx   |3 
 oox/source/drawingml/diagram/layoutatomvisitors.cxx   |4 
 package/source/manifest/ManifestImport.cxx|   31 +
 sc/qa/uitest/autofilter/data/tdf130770.ods|binary
 sc/qa/uitest/autofilter/tdf130070.py  |   73 
 sc/source/core/data/dpshttab.cxx  |   28 -
 sc/source/ui/Accessibility/AccessibleDocument.cxx |  155 -
 sc/source/ui/inc/AccessibleDocument.hxx   |7 
 sc/source/ui/view/cellsh1.cxx |   30 -
 sc/source/ui/view/gridwin.cxx |   37 --
 sc/source/ui/view/tabvwshe.cxx|   40 --
 sd/IwyuFilter_sd.yaml |1 
 sd/qa/unit/data/ppt/tdf79082.ppt  |binary
 sd/qa/unit/data/pptx/fill-color-list.pptx |binary
 sd/qa/unit/export-tests.cxx   |   42 ++
 sd/qa/unit/import-tests-smartart.cxx  |   37 ++
 sd/source/filter/eppt/epptso.cxx  |8 
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |9 
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |  151 -
 sd/source/ui/inc/AccessibleDocumentViewBase.hxx   |7 
 sd/source/ui/inc/AccessibleDrawDocumentView.hxx   |6 
 sd/source/ui/view/Outliner.cxx|   11 
 solenv/clang-format/blacklist |1 
 svx/source/dialog/srchdlg.cxx |   57 ---
 svx/source/sdr/properties/groupproperties.cxx |   17 -
 svx/source/tbxctrls/itemwin.cxx   |   14 
 svx/source/tbxctrls/linectrl.cxx

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

[Tomaž Vajngerl (via logerrit)]

 vcl/qa/cppunit/VectorGraphicSearchTest.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit e848e95faa5cea1f258c9f97d99ffc91614e5a3b
Author: Tomaž Vajngerl 
AuthorDate: Wed Jun 3 12:23:57 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 4 10:50:11 2020 +0200

vcl: disable VectorGraphicSearchTest if we don't have PDFium

enclose with HAVE_FEATURE_PDFIUM

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

diff --git a/vcl/qa/cppunit/VectorGraphicSearchTest.cxx 
b/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
index 8dbdcac0e2e1..00febce16e71 100644
--- a/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
+++ b/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
@@ -7,6 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
+#if HAVE_FEATURE_PDFIUM
+
 #include 
 #include 
 
@@ -195,4 +199,6 @@ void VectorGraphicSearchTest::testSearchStringChange()
 
 CPPUNIT_TEST_SUITE_REGISTRATION(VectorGraphicSearchTest);
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 solenv/bin/gdb-core-bt.sh  |   10 +-
 solenv/bin/lldb-core-bt.sh |6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit c9bc4f1eec5d66db36b6f9d845eb1a2d46e732bb
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 08:48:26 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 10:33:59 2020 +0200

Print out the guessed executable name that is actually passed to the 
debugger

...to avoid confusion, when the log reads e.g.

[...]
> It looks like 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/instdir/program/soffice.bin
 generated 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/workdir/UITest/calc_demo/done.core/core.10572
[...]
> Core was generated by 
`/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/instdir/program/python.'.
[...]

().

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

diff --git a/solenv/bin/gdb-core-bt.sh b/solenv/bin/gdb-core-bt.sh
index 2216e2aba5e5..b48a5a4405cc 100755
--- a/solenv/bin/gdb-core-bt.sh
+++ b/solenv/bin/gdb-core-bt.sh
@@ -20,15 +20,15 @@ then
 do
 if [ -f "$COREFILE" ]
 then
-printf '\nIt looks like %s generated %s\nBacktraces:\n' \
-"$EXECUTABLE" "$COREFILE"
-GDBCOMMANDFILE=$(mktemp)
-printf "info registers\nthread apply all backtrace full\n" \
->"$GDBCOMMANDFILE"
 guess=$(file "$COREFILE")
 guess=${guess#* execfn: \'}
 guess=${guess%%\'*}
 if [ ! -x "$guess" ]; then guess=$EXECUTABLE; fi
+printf '\nIt looks like %s generated %s\nBacktraces:\n' \
+"$guess" "$COREFILE"
+GDBCOMMANDFILE=$(mktemp)
+printf "info registers\nthread apply all backtrace full\n" \
+>"$GDBCOMMANDFILE"
 gdb -iex "add-auto-load-safe-path ${INSTDIR?}" -x 
"$GDBCOMMANDFILE" --batch "$guess" \
 "$COREFILE" && found=x
 rm "$GDBCOMMANDFILE"
diff --git a/solenv/bin/lldb-core-bt.sh b/solenv/bin/lldb-core-bt.sh
index 2bd982ec21e9..def4a8939db0 100755
--- a/solenv/bin/lldb-core-bt.sh
+++ b/solenv/bin/lldb-core-bt.sh
@@ -20,13 +20,13 @@ then
 do
 if [ -f "$COREFILE" ]
 then
-printf '\nIt looks like %s generated %s\nBacktraces:\n' \
-"$EXECUTABLE" "$COREFILE"
-$LLDBCOMMANDFILE=$(mktemp)
 guess=$(file "$COREFILE")
 guess=${guess#* execfn: \'}
 guess=${guess%%\'*}
 if [ ! -x "$guess" ]; then guess=$EXECUTABLE; fi
+printf '\nIt looks like %s generated %s\nBacktraces:\n' \
+"$guess" "$COREFILE"
+$LLDBCOMMANDFILE=$(mktemp)
 printf "target create -c $COREFILE $guess\nthread backtrace 
all\nquit\n" >"$LLDBCOMMANDFILE"
 lldb -s "$LLDBCOMMANDFILE" --batch \
 && found=x
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits