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

[Caolán McNamara (via logerrit)]

 sw/source/uibase/shells/txtattr.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 647660cf844f265dd2ad7c78e6cb13844fbf3613
Author: Caolán McNamara 
AuthorDate: Thu Apr 25 17:22:28 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Apr 26 08:56:41 2019 +0200

Resolves: tdf#124919 fontsize grow/shrink unable to use SwShellTableCursor

so if that's active fallback to creating a vector of simple pams

Change-Id: I282bd9f9675985ddbd88ba088aee81609e14d101
Reviewed-on: https://gerrit.libreoffice.org/71318
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/uibase/shells/txtattr.cxx 
b/sw/source/uibase/shells/txtattr.cxx
index bfde65efa7d2..ad4d7785b33f 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -251,7 +251,9 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
 const SvxFontHeightItem* pSize( static_cast(
 aSetItem.GetItemOfScript( nScriptTypes 
) ) );
 std::vector 
>> vItems;
-if ( pSize ) // selected text has one size
+// simple case where selected text has one size and
+// (tdf#124919) selection is not multiple table cells
+if (pSize && !rWrtSh.IsTableMode())
 {
 // must create new one, otherwise document is without pam
 SwPaM* pPaM = rWrtSh.GetCursor();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Balazs Varga (via logerrit)]

 chart2/source/view/main/ChartView.cxx  |   18 --
 sw/qa/extras/layout/data/tdf124796.odt |binary
 sw/qa/extras/layout/layout.cxx |   24 
 3 files changed, 40 insertions(+), 2 deletions(-)

New commits:
commit 2ec293ab590c440fe7e36f5b7fcbef4cbfe5133c
Author: Balazs Varga 
AuthorDate: Thu Apr 25 15:00:55 2019 +0200
Commit: László Németh 
CommitDate: Fri Apr 26 08:50:10 2019 +0200

tdf#124796 Fix chart primary Y axis scaling

Re-scale the primary Y axis if the secondary axis
is deleted and the dataseries still attached to the
secondary axis.

Change-Id: I6e7958766d23a74569ce8529ddf1bdafa89f1870
Reviewed-on: https://gerrit.libreoffice.org/71302
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 8b0548f909ee..d165ccb05251 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -441,6 +441,7 @@ void 
SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
 bool bConnectBars = false;
 bool bGroupBarsPerAxis = true;
 bool bIncludeHiddenCells = true;
+bool bSecondaryYaxisVisible = true;
 sal_Int32 nStartingAngle = 90;
 sal_Int32 n3DRelativeHeight = 100;
 try
@@ -479,7 +480,19 @@ void 
SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
 {
 uno::Reference< XCoordinateSystem > xCooSys( aCooSysList[nCS] );
 VCoordinateSystem* pVCooSys = 
addCooSysToList(m_rVCooSysList,xCooSys,rChartModel);
-
+// Let's check whether the secondary Y axis is visible
+try
+{
+Reference< beans::XPropertySet > 
xAxisProp(xCooSys->getAxisByDimension(1, 1), uno::UNO_QUERY);
+if (xAxisProp.is())
+{
+xAxisProp->getPropertyValue("Show") >>= bSecondaryYaxisVisible;
+}
+}
+catch (const lang::IndexOutOfBoundsException& e)
+{
+SAL_WARN("chart2", "Exception caught. " << e);
+}
 //iterate through all chart types in the current coordinate system
 uno::Reference< XChartTypeContainer > xChartTypeContainer( xCooSys, 
uno::UNO_QUERY );
 OSL_ASSERT( xChartTypeContainer.is());
@@ -563,7 +576,8 @@ void 
SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
 
 //ignore secondary axis for charttypes that do not support them
 if( pSeries->getAttachedAxisIndex() != MAIN_AXIS_INDEX &&
-!ChartTypeHelper::isSupportingSecondaryAxis( xChartType, 
nDimensionCount ) )
+  ( !ChartTypeHelper::isSupportingSecondaryAxis( xChartType, 
nDimensionCount ) ||
+!bSecondaryYaxisVisible ) )
 {
 pSeries->setAttachedAxisIndex(MAIN_AXIS_INDEX);
 }
diff --git a/sw/qa/extras/layout/data/tdf124796.odt 
b/sw/qa/extras/layout/data/tdf124796.odt
new file mode 100644
index ..2a8d2c816ad1
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf124796.odt differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 91705c8e18d9..c17adf1bba92 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2340,6 +2340,30 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf122800)
 // This failed, if the textarray length of the first axis label not 22.
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124796)
+{
+SwDoc* pDoc = createDoc("tdf124796.odt");
+SwDocShell* pShell = pDoc->GetDocShell();
+
+// Dump the rendering of the first page as an XML file.
+std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+xmlDocPtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+
+// This failed, if the minimum value of Y axis is not -10.
+assertXPathContent(
+pXmlDoc,
+
"/metafile/push[1]/push[1]/push[1]/push[3]/push[1]/push[1]/push[1]/textarray[5]/text",
+"-10");
+
+// This failed, if the maximum value of Y axis is not 15.
+assertXPathContent(
+pXmlDoc,
+
"/metafile/push[1]/push[1]/push[1]/push[3]/push[1]/push[1]/push[1]/textarray[10]/text",
+"15");
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf116925)
 {
 SwDoc* pDoc = createDoc("tdf116925.docx");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 sc/source/core/data/postit.cxx |  133 -
 1 file changed, 67 insertions(+), 66 deletions(-)

New commits:
commit 92d7f55c1688295677519163cc8f94c6af52dc8e
Author: Noel Grandin 
AuthorDate: Thu Apr 25 13:49:31 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Apr 26 08:31:39 2019 +0200

flatten ScPostIt::CreateCaptionFromInitData

Change-Id: I109fd4a9f58f604852622e3dca87e1beadcad858
Reviewed-on: https://gerrit.libreoffice.org/71303
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 69c2d4887dcc..1bff48ca9407 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -1009,74 +1009,75 @@ void ScPostIt::CreateCaptionFromInitData( const 
ScAddress& rPos ) const
 // Captions are not created in Undo documents and only rarely in Clipboard,
 // but otherwise we need caption or initial data.
 assert((maNoteData.mxCaption || maNoteData.mxInitData.get()) || 
mrDoc.IsUndo() || mrDoc.IsClipboard());
-if( maNoteData.mxInitData.get() )
-{
-/*  This function is called from ScPostIt::Clone() when copying cells
-to the clipboard/undo document, and when copying cells from the
-clipboard/undo document. The former should always be called first,
-so if called in an clipboard/undo document, the caption should have
-been created already. However, for clipboard in case the
-originating document was destructed a new caption has to be
-created. */
-OSL_ENSURE( !mrDoc.IsUndo() && (!mrDoc.IsClipboard() || 
!maNoteData.mxCaption),
-"ScPostIt::CreateCaptionFromInitData - note caption should not 
be created in undo/clip documents" );
-
-/*  #i104915# Never try to create notes in Undo document, leads to
-crash due to missing document members (e.g. row height array). */
-if( !maNoteData.mxCaption && !mrDoc.IsUndo() )
-{
-if (mrDoc.IsClipboard())
-mrDoc.InitDrawLayer();  // ensure there is a drawing layer
+if( !maNoteData.mxInitData.get() )
+return;
 
-// ScNoteCaptionCreator c'tor creates the caption and inserts it 
into the document and maNoteData
-ScNoteCaptionCreator aCreator( mrDoc, rPos, maNoteData );
-if( maNoteData.mxCaption )
-{
-// Prevent triple change broadcasts of the same object.
-maNoteData.mxCaption->getSdrModelFromSdrObject().setLock(true);
-ScCaptionInitData& rInitData = *maNoteData.mxInitData;
-
-// transfer ownership of outliner object to caption, or set 
simple text
-OSL_ENSURE( rInitData.mxOutlinerObj.get() || 
!rInitData.maSimpleText.isEmpty(),
-"ScPostIt::CreateCaptionFromInitData - need either 
outliner para object or simple text" );
-if (rInitData.mxOutlinerObj)
-maNoteData.mxCaption->SetOutlinerParaObject( 
std::move(rInitData.mxOutlinerObj) );
-else
-maNoteData.mxCaption->SetText( rInitData.maSimpleText );
-
-// copy all items or set default items; reset shadow items
-ScCaptionUtil::SetDefaultItems( *maNoteData.mxCaption, mrDoc );
-if (rInitData.mxItemSet)
-ScCaptionUtil::SetCaptionItems( *maNoteData.mxCaption, 
*rInitData.mxItemSet );
-
-// set position and size of the caption object
-if( rInitData.mbDefaultPosSize )
-{
-// set other items and fit caption size to text
-maNoteData.mxCaption->SetMergedItem( 
makeSdrTextMinFrameWidthItem( SC_NOTECAPTION_WIDTH ) );
-maNoteData.mxCaption->SetMergedItem( 
makeSdrTextMaxFrameWidthItem( SC_NOTECAPTION_MAXWIDTH_TEMP ) );
-maNoteData.mxCaption->AdjustTextFrameWidthAndHeight();
-aCreator.AutoPlaceCaption();
-}
-else
-{
-tools::Rectangle aCellRect = ScDrawLayer::GetCellRect( 
mrDoc, rPos, true );
-bool bNegPage = mrDoc.IsNegativePage( rPos.Tab() );
-long nPosX = bNegPage ? (aCellRect.Left() - 
rInitData.maCaptionOffset.X()) : (aCellRect.Right() + 
rInitData.maCaptionOffset.X());
-long nPosY = aCellRect.Top() + 
rInitData.maCaptionOffset.Y();
-tools::Rectangle aCaptRect( Point( nPosX, nPosY ), 
rInitData.maCaptionSize );
-maNoteData.mxCaption->SetLogicRect( aCaptRect );
-aCreator.FitCaptionToRect();
-}
-
-// End prevent triple change broadcasts of the same object.
-
maNoteData.mxCaption->getSdrModelFromSdrObject().setLock(false);
-ma

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

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

 sw/qa/extras/ooxmlexport/data/tdf67207.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|   32 ++
 sw/source/filter/ww8/docxexport.cxx   |   23 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   28 +--
 writerfilter/source/dmapper/PropertyIds.cxx   |4 ++
 writerfilter/source/dmapper/PropertyIds.hxx   |4 ++
 writerfilter/source/dmapper/SettingsTable.cxx |   29 +++
 writerfilter/source/dmapper/SettingsTable.hxx |2 +
 8 files changed, 120 insertions(+), 2 deletions(-)

New commits:
commit 071c3309260aeae22f464d26bfa56a747f6a02cb
Author: László Németh 
AuthorDate: Wed Apr 24 12:30:56 2019 +0200
Commit: László Németh 
CommitDate: Fri Apr 26 08:28:11 2019 +0200

tdf#67207 DOCX mail merge: fix export/import of database fields

to support the registered databases (containing ODS, XLSX
sheet or ODT text table data sources).

Now database fields don't lose their database connection,
and File->Print can merge mails after DOCX export/import, if
the LO instance has got a registered database with the same
name and table, as in saved in w:settings/w:mailMerge/w:query
element of the DOCX document in the form of

SELECT * FROM [databaseName].dbo.[tableName]$

query.

Notes:

– This fix supports only single table usage.

– The exported DOCX document is editable in MSO, too,
  without losing the database connection in LO later.

Change-Id: I97826b7ee7defd0243dbaffa0325c5b11dd2c0d1
Reviewed-on: https://gerrit.libreoffice.org/71228
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf67207.docx 
b/sw/qa/extras/ooxmlexport/data/tdf67207.docx
new file mode 100644
index ..b0604c266394
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf67207.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 1e2bd17db9a7..7d9b392f635b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -988,6 +988,38 @@ DECLARE_OOXMLIMPORT_TEST(testTdf123054, "tdf123054.docx")
  getProperty(getParagraph(20), 
"ParaStyleName"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf67207_MERGEFIELD_DATABASE, "tdf67207.docx")
+{
+// database fields use the database "database" and its table "Sheet1"
+uno::Reference xTextField = getProperty< 
uno::Reference >(getRun(getParagraph(2), 2), "TextField");
+CPPUNIT_ASSERT(xTextField.is());
+uno::Reference xServiceInfo(xTextField, 
uno::UNO_QUERY_THROW);
+uno::Reference xDependent(xTextField, 
uno::UNO_QUERY_THROW);
+
+
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.TextField.Database"));
+OUString sValue;
+xTextField->getPropertyValue("Content") >>= sValue;
+CPPUNIT_ASSERT_EQUAL(OUString::fromUtf8(""), sValue);
+
+uno::Reference xFiledMaster = 
xDependent->getTextFieldMaster();
+uno::Reference xFiledMasterServiceInfo(xFiledMaster, 
uno::UNO_QUERY_THROW);
+
+
CPPUNIT_ASSERT(xFiledMasterServiceInfo->supportsService("com.sun.star.text.fieldmaster.Database"));
+
+// Defined properties: DataBaseName, Name, DataTableName, DataColumnName, 
DependentTextFields, DataCommandType, InstanceName, DataBaseURL
+CPPUNIT_ASSERT(xFiledMaster->getPropertyValue("DataBaseName") >>= sValue);
+CPPUNIT_ASSERT_EQUAL(OUString("database"), sValue);
+sal_Int32 nCommandType;
+CPPUNIT_ASSERT(xFiledMaster->getPropertyValue("DataCommandType") >>= 
nCommandType);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nCommandType); // 
css::sdb::CommandType::TABLE
+CPPUNIT_ASSERT(xFiledMaster->getPropertyValue("DataTableName") >>= sValue);
+CPPUNIT_ASSERT_EQUAL(OUString("Sheet1"), sValue);
+CPPUNIT_ASSERT(xFiledMaster->getPropertyValue("DataColumnName") >>= 
sValue);
+CPPUNIT_ASSERT_EQUAL(OUString("c1"), sValue);
+CPPUNIT_ASSERT(xFiledMaster->getPropertyValue("InstanceName") >>= sValue);
+
CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.text.fieldmaster.DataBase.database.Sheet1.c1"),
 sValue);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 501f632ff3f2..3b9e677e7219 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -63,6 +64,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -979,6 +981,27 @@ void DocxExport::WriteSettings()
 pFS->endElementNS( XML_w, XML_compat );
 }
 
+// export current mail merge database and table names
+SwDBData aData = m_pDoc->GetDBData();
+if ( !aData.sDataSource.isEmpty() && aData.nCommandType == 
cs

[Libreoffice-commits] core.git: compilerplugins/clang include/vcl vcl/osx

[Tor Lillqvist (via logerrit)]

 compilerplugins/clang/store/constantfunction.cxx |4 
 compilerplugins/clang/unusedmethods.results  |2 --
 include/vcl/svmain.hxx   |1 -
 vcl/osx/salinst.cxx  |2 +-
 4 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit e1a75c1c3069efa303c480d0e50928c0761f468f
Author: Tor Lillqvist 
AuthorDate: Thu Apr 25 19:15:50 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Apr 26 08:20:09 2019 +0200

There is no ImplSVMainHook()

Change-Id: Ief2636425712f60cfc6e8f68ee0d3fb01608d8ba
Reviewed-on: https://gerrit.libreoffice.org/71317
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/compilerplugins/clang/store/constantfunction.cxx 
b/compilerplugins/clang/store/constantfunction.cxx
index a1b795d63ea7..0673df7a2521 100644
--- a/compilerplugins/clang/store/constantfunction.cxx
+++ b/compilerplugins/clang/store/constantfunction.cxx
@@ -179,10 +179,6 @@ bool ConstantFunction::VisitFunctionDecl(const 
FunctionDecl * pFunctionDecl) {
 if (aFunctionName == "ExceptionThrower_acquire_release_nop") {
 return true;
 }
-// different hook function is called on different platforms, 
/vcl/source/app/svmainhook.cxx
-if (aFunctionName == "ImplSVMainHook") {
-return true;
-}
 // used as a callback, /vcl/source/filter/jpeg/JpegReader.cxx
 if (aFunctionName == "term_source") {
 return true;
diff --git a/compilerplugins/clang/unusedmethods.results 
b/compilerplugins/clang/unusedmethods.results
index 02bb0d181978..fec68affafdc 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -688,8 +688,6 @@ include/vcl/svapp.hxx:169
  ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,const 
class std::__debug::vector > &)
 include/vcl/svapp.hxx:798
 void Application::AppEvent(const class ApplicationEvent &)
-include/vcl/svmain.hxx:27
-_Bool ImplSVMainHook(int *)
 include/vcl/syswin.hxx:172
 void SystemWindow::SetIdleDebugName(const char *)
 include/vcl/tabdlg.hxx:49
diff --git a/include/vcl/svmain.hxx b/include/vcl/svmain.hxx
index 6305c090d289..ca6010784490 100644
--- a/include/vcl/svmain.hxx
+++ b/include/vcl/svmain.hxx
@@ -24,7 +24,6 @@
 #include 
 
 // #i47888# allow for alternative initialization as required for e.g. MacOSX
-bool ImplSVMainHook( int* );
 VCL_DLLPUBLIC int ImplSVMain();
 
 VCL_DLLPUBLIC int SVMain();
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 089b1e438b66..b31f870d9e12 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -979,7 +979,7 @@ bool AquaSalInstance::SVMainHook(int* pnInit)
 NSApplicationMain( 1, pArgv );
 #endif
 
-return true; // indicate that ImplSVMainHook is implemented
+return true;
 }
 
 /* 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: scp2/macros scp2/source

[Stephan Bergmann (via logerrit)]

 scp2/macros/macro.pl  |   14 --
 scp2/source/ooo/directory_ooo.scp |4 
 2 files changed, 18 deletions(-)

New commits:
commit 8e3f4aeb401cb478374928d78bcbfc737bfd4d97
Author: Stephan Bergmann 
AuthorDate: Thu Apr 25 18:36:55 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Apr 26 07:46:11 2019 +0200

ITERATE_ALL_LANG_DIR_LPROJ appears to be unused

The Bundle_Contents_Resources_Lang dir gids (its only use) have been unused
since f0b57c30fdb5ecdd25879844159b9038399bc6de "Info.plist et al were no 
longer
found when creating a .dmg", and those Contents/Resources/*.lproj dirs are
created on demand now, anyway.

Change-Id: Ia3e867307c4fc31180594d507721577a21cc20b1
Reviewed-on: https://gerrit.libreoffice.org/71319
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 20f456917937..38ea02eb31dc 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -76,20 +76,6 @@ sub write_ITERATE_ALL_LANG
 print OUTFILE "\\\n";
 }
 print OUTFILE "\n\n";
-
-print OUTFILE "#define ITERATE_ALL_LANG_DIR_LPROJ(gid,parent) ";
-foreach $lang (@helplangs) {
-my $shortlang = $lang;
-$shortlang = "en" if $shortlang eq "en-US";
-my $speciallang = $lang;
-$speciallang =~ s/-/_/;
-print OUTFILE "\\\nDirectory CONCAT3(gid_Dir_,gid,_$speciallang)";
-print OUTFILE "\\\n\tParentID = CONCAT2(gid_Dir_,parent);";
-print OUTFILE "\\\n\tDosName = \"$shortlang.lproj\"; ";
-print OUTFILE "\\\nEnd ";
-print OUTFILE "\\\n";
-}
-print OUTFILE "\n\n";
 }
 
 sub write_ALL_LANG
diff --git a/scp2/source/ooo/directory_ooo.scp 
b/scp2/source/ooo/directory_ooo.scp
index 60e3f842173b..d172f74a3f84 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -38,10 +38,6 @@ End
 #endif
 
 #ifdef MACOSX
-ITERATE_ALL_LANG_DIR_LPROJ(Bundle_Contents_Resources_Lang,Bundle_Contents_Resources)
-#endif
-
-#ifdef MACOSX
 Directory gid_Dir_Bundle_Contents_Library
 ParentID = gid_Dir_Bundle_Contents;
 HostName = "Library";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/macros

[Stephan Bergmann (via logerrit)]

 scp2/macros/macro.pl |   13 -
 1 file changed, 13 deletions(-)

New commits:
commit b04ec537b292c57db8ef06e138493bcf20e55282
Author: Stephan Bergmann 
AuthorDate: Thu Apr 25 17:26:42 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Apr 26 07:45:53 2019 +0200

DIR_ISOLANGUAGE_ALL_LANG_LPROJ is apparently unused

...since dfc4ace4278d6c9e77ec150f947a1a6ee454d70d "fdo#62442: Move the
InfoPlist.strings files into the app from langpacks"

Change-Id: Ia9913f3edcce1e9a9156de54a43d24766f8682ae
Reviewed-on: https://gerrit.libreoffice.org/71316
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 7f54298f9a3e..20f456917937 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -47,7 +47,6 @@ write_ALL_LANG();
 write_OTHER_LANGS();
 write_DIR_ISOLANGUAGE_ALL_LANG_2();
 write_DIR_ISOLANGUAGE_ALL_LANG();
-write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ();
 write_EXTRA_ALL_LANG();
 write_EXTRA_ALL_LANG_BUT_EN_US();
 write_MO_ALL_LANG_EXCEPT_EN_US_AND_QTZ();
@@ -130,18 +129,6 @@ sub write_DIR_ISOLANGUAGE_ALL_LANG
 print OUTFILE "\n\n";
 }
 
-sub write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ
-{
-print OUTFILE "#define DIR_ISOLANGUAGE_ALL_LANG_LPROJ ";
-foreach $lang (@completelangiso) {
-my $speciallang = $lang;
-if ( $speciallang eq "en-US" ) { $speciallang = "en"; }
-print OUTFILE "\\\n\tDosName ($lang) = \"$speciallang.lproj\"";
-print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-}
-print OUTFILE "\n\n";
-}
-
 sub write_EXTRA_ALL_LANG
 {
 print OUTFILE "#define EXTRA_ALL_LANG(name,ext) ";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt (via logerrit)]

 toolkit/source/controls/dialogcontrol.cxx |2 +-
 toolkit/source/controls/tabpagemodel.cxx  |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit df2fc7c3e58758fc87de70d462be5d2eb26eea4a
Author: Samuel Mehrbrodt 
AuthorDate: Fri Apr 26 07:27:10 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Fri Apr 26 07:35:42 2019 +0200

Fix typos

Change-Id: I155673b9b1b2ba1f275877ce7885cf3f99fcb2e3
Reviewed-on: https://gerrit.libreoffice.org/71340
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/toolkit/source/controls/dialogcontrol.cxx 
b/toolkit/source/controls/dialogcontrol.cxx
index a2fc60f9c8e0..ef23735bdc25 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -523,7 +523,7 @@ void SAL_CALL UnoDialogControl::windowMoved( const 
css::awt::WindowEvent& e )
 if ( !pOutDev || mbPosModified )
 return;
 
-// Currentley we are simply using MapUnit::MapAppFont
+// Currently we are simply using MapUnit::MapAppFont
 ::Size aTmp( e.X, e.Y );
 aTmp = ImplMapPixelToAppFont( pOutDev, aTmp );
 
diff --git a/toolkit/source/controls/tabpagemodel.cxx 
b/toolkit/source/controls/tabpagemodel.cxx
index f3538c5ddda5..afbd535692ce 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -238,7 +238,7 @@ void SAL_CALL UnoControlTabPage::windowResized( const 
css::awt::WindowEvent& e )
 if ( !pOutDev || mbSizeModified )
 return;
 
-// Currentley we are simply using MapUnit::MapAppFont
+// Currently we are simply using MapUnit::MapAppFont
 ::Size aAppFontSize( e.Width, e.Height );
 
 Reference< XControl > xDialogControl( *this, UNO_QUERY_THROW );
@@ -276,7 +276,7 @@ void SAL_CALL UnoControlTabPage::windowMoved( const 
css::awt::WindowEvent& e )
 if ( !pOutDev || mbPosModified )
 return;
 
-// Currentley we are simply using MapUnit::MapAppFont
+// Currently we are simply using MapUnit::MapAppFont
 ::Size aTmp( e.X, e.Y );
 aTmp = ImplMapPixelToAppFont( pOutDev, aTmp );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jens Carl (via logerrit)]

 sc/qa/unoapi/knownissues.xcl |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 8dabb2ae2d34f94a50ef5f94bf4bf01b2aca2071
Author: Jens Carl 
AuthorDate: Thu Apr 25 15:34:08 2019 -0700
Commit: Jens Carl 
CommitDate: Fri Apr 26 07:11:31 2019 +0200

Related tdf#43309 Enable test

Enable test sc.ScCellRangeObj::com::sun::star::chart::XChartData
as of commit eb7a731bcfbacec15b77889f0ac545d36ef5ad19 the test is ported
to C++ and discussed with sberg in
https://bugs.documentfoundation.org/show_bug.cgi?id=43309#c7.

Change-Id: I2652122bd61f7586d6afa190eaece8edf938e28d
Reviewed-on: https://gerrit.libreoffice.org/71335
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/sc/qa/unoapi/knownissues.xcl b/sc/qa/unoapi/knownissues.xcl
index b400fef1ee8c..ca1efe74688c 100644
--- a/sc/qa/unoapi/knownissues.xcl
+++ b/sc/qa/unoapi/knownissues.xcl
@@ -218,9 +218,6 @@ sc.ScCellObj::com::sun::star::beans::XPropertySet
 sc.ScCellRangesObj::com::sun::star::table::CellProperties
 sc.ScCellRangesObj::com::sun::star::beans::XPropertySet
 
-### fdo43309 ###
-sc.ScCellRangeObj::com::sun::star::chart::XChartData
-
 ### fdo44167 ###
 sc.ScDatabaseRangeObj::com::sun::star::sheet::XDatabaseRange
 sc.ScDatabaseRangeObj::com::sun::star::util::XRefreshable
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

[Andrea Gelmini (via logerrit)]

 compilerplugins/clang/store/cascadingassignop.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1a9bd0ee5a34663ef1643df7a9b4c57dcbff16ad
Author: Andrea Gelmini 
AuthorDate: Wed Apr 24 13:21:19 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 26 07:05:09 2019 +0200

Fix typo

Change-Id: Ie687feebfccf27c366922acfc29ff12cdfa325ba
Reviewed-on: https://gerrit.libreoffice.org/71338
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/compilerplugins/clang/store/cascadingassignop.hxx 
b/compilerplugins/clang/store/cascadingassignop.hxx
index adc3eac77ba7..26080c004beb 100644
--- a/compilerplugins/clang/store/cascadingassignop.hxx
+++ b/compilerplugins/clang/store/cascadingassignop.hxx
@@ -21,7 +21,7 @@ struct WalkCounter;
 
 // The class implementing the plugin action.
 class CascadingAssignOp
-// Inherits from the Clang class that will allow examing the Clang AST 
tree (i.e. syntax tree).
+// Inherits from the Clang class that will allow examining the Clang AST 
tree (i.e. syntax tree).
 : public FilteringPlugin< CascadingAssignOp >
 {
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 filter/source/msfilter/svdfppt.cxx|6 +++---
 include/filter/msfilter/svdfppt.hxx   |2 +-
 sd/source/filter/eppt/epptbase.hxx|6 +++---
 sd/source/filter/eppt/pptx-stylesheet.cxx |2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 07d99a6315de6453bb94b0afddf921d2e1aba896
Author: Andrea Gelmini 
AuthorDate: Thu Apr 25 17:16:05 2019 +0200
Commit: Julien Nabet 
CommitDate: Fri Apr 26 07:04:02 2019 +0200

Fix typo in code

Change-Id: If9e4f46239a42a663a2251aafabfd66268a7c9e3
Reviewed-on: https://gerrit.libreoffice.org/71315
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 5b74dafd011b..d6ad2b72f11c 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1010,8 +1010,8 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, 
DffObjData& rObjData, Svx
 {
 if ( !rPersistEntry.pPresentationObjects )
 {
-rPersistEntry.pPresentationObjects.reset( new 
sal_uInt32[ PPT_STYLESHEETENTRYS ] );
-memset( rPersistEntry.pPresentationObjects.get(), 0, 
PPT_STYLESHEETENTRYS * 4 );
+rPersistEntry.pPresentationObjects.reset( new 
sal_uInt32[ PPT_STYLESHEETENTRIES ] );
+memset( rPersistEntry.pPresentationObjects.get(), 0, 
PPT_STYLESHEETENTRIES * 4 );
 }
 if ( !rPersistEntry.pPresentationObjects[ 
static_cast(nDestinationInstance) ] )
 rPersistEntry.pPresentationObjects[ 
static_cast(nDestinationInstance) ] = rObjData.rSpHd.GetRecBegFilePos();
@@ -3331,7 +3331,7 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& 
rMan, SvStream& rSt, const
 {
 case PPT_PST_ExtendedParagraphMasterAtom :
 {
-if ( aHd.nRecInstance < PPT_STYLESHEETENTRYS )
+if ( aHd.nRecInstance < PPT_STYLESHEETENTRIES )
 {
 sal_uInt16 nDepth = 0, i = 0;
 rSt.ReadUInt16(nDepth);
diff --git a/include/filter/msfilter/svdfppt.hxx 
b/include/filter/msfilter/svdfppt.hxx
index b55458f94f6e..c378a10ebb6f 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -688,7 +688,7 @@ struct  PPTTextSpecInfoAtomInterpreter
 
 };
 
-#define PPT_STYLESHEETENTRYS9
+#define PPT_STYLESHEETENTRIES9
 
 struct PPTExtParaLevel
 {
diff --git a/sd/source/filter/eppt/epptbase.hxx 
b/sd/source/filter/eppt/epptbase.hxx
index 39598f2780bc..349db840e633 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -200,7 +200,7 @@ private:
 std::vector maFonts;
 };
 
-#define PPTEX_STYLESHEETENTRYS  9
+#define PPTEX_STYLESHEETENTRIES  9
 
 enum PPTExTextAttr
 {
@@ -302,8 +302,8 @@ class PPTExStyleSheet
 
 public:
 
-std::unique_ptr  mpCharSheet[ 
PPTEX_STYLESHEETENTRYS ];
-std::unique_ptr  mpParaSheet[ 
PPTEX_STYLESHEETENTRYS ];
+std::unique_ptr  mpCharSheet[ 
PPTEX_STYLESHEETENTRIES ];
+std::unique_ptr  mpParaSheet[ 
PPTEX_STYLESHEETENTRIES ];
 
 PPTExStyleSheet( sal_uInt16 nDefaultTab, PPTExBulletProvider* 
pBuProv );
 ~PPTExStyleSheet();
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx 
b/sd/source/filter/eppt/pptx-stylesheet.cxx
index a9caf39b8721..4057458c8ee3 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -411,7 +411,7 @@ void PPTExStyleSheet::SetStyleSheet( const 
css::uno::Reference< css::beans::XPro
 
 bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 
nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue )
 {
-assert(nInstance < PPTEX_STYLESHEETENTRYS && nLevel < 5);
+assert(nInstance < PPTEX_STYLESHEETENTRIES && nLevel < 5);
 
 const PPTExParaLevel& rPara = mpParaSheet[ nInstance ]->maParaLevel[ 
nLevel ];
 const PPTExCharLevel& rChar = mpCharSheet[ nInstance ]->maCharLevel[ 
nLevel ];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Fwd: [libreoffice-l10n] Compiling LO in a container, with the latest translations

[Sophia Schröder]

Could be of interest outside l10n too.

 Weitergeleitete Nachricht 
Betreff:[libreoffice-l10n] Compiling LO in a container, with the
latest translations
Datum:  Sun, 21 Apr 2019 07:22:42 +0200
Von:Dashamir Hoxha 
An: LibreOffice l10n 



Hi,

I have developed some scripts for compiling LO (in a docker container),
with the latest translations downloaded from Pootle.
I followed these instructions:
- https://wiki.documentfoundation.org/Development/BuildingOnLinux
- https://listarchives.libreoffice.org/global/l10n/msg11444.html

You can check these scripts here:
- https://gitlab.com/docker-scripts/libreoffice
- https://gitlab.com/docker-scripts/libreoffice/blob/master/scripts/clone.sh
-
https://gitlab.com/docker-scripts/libreoffice/blob/master/scripts/git-checkout.sh
-
https://gitlab.com/docker-scripts/libreoffice/blob/master/scripts/compile.sh
-
https://gitlab.com/docker-scripts/libreoffice/blob/master/scripts/update-translations.sh

Please let me know if I have missed anything or if there is something that
can be done more efficiently. Of course, feel free to use or reuse these
scripts, if needed.

Regards,
Dashamir

-- 
To unsubscribe e-mail to: l10n+unsubscr...@global.libreoffice.org
Problems? https://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: https://wiki.documentfoundation.org/Netiquette
List archive: https://listarchives.libreoffice.org/global/l10n/
Privacy Policy: https://www.documentfoundation.org/privacy



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

Read and write on linux server

[Manfred Rebentisch]

Hello,
i am new to this list. Is this the right place to talk about developing
linux-server-software using libreoffice headless?

I want to use libreoffice libraries for generation of ods or xlsx files
from my c++ application lib.

Thank you

Manfred

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scripting/workben

[Matthias Seidel (via logerrit)]

 scripting/workben/installer/Scripting.xcs |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 684c35380a72f81bd6a026615723b06b3e14fa6e
Author: Matthias Seidel 
AuthorDate: Thu Apr 25 23:37:12 2019 +
Commit: Matthias Seidel 
CommitDate: Thu Apr 25 23:37:12 2019 +

Fixed typo

diff --git a/scripting/workben/installer/Scripting.xcs 
b/scripting/workben/installer/Scripting.xcs
index 3c26b83295e9..18690c2a8ee6 100644
--- a/scripting/workben/installer/Scripting.xcs
+++ b/scripting/workben/installer/Scripting.xcs
@@ -1,6 +1,6 @@
 
 
 
 
@@ -25,18 +25,18 @@
 http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="Scripting" 
oor:package="org.openoffice.Office" xml:lang="en-US">

DF
-
-Contains the various settings needed by the 
Scripting Framework and its runtimes.
+   
+   Contains the various settings needed by 
the Scripting Framework and its runtimes.




-   
-   Specifies the runtimes available 
to the Scriptying Framework.
+   
+   Specifies the runtimes available 
to the Scripting Framework.



-   
+   
Lists the file 
extensions that are recognized by this runtime.


@@ -45,7 +45,7 @@



-   
+   
Lists the registered Scripting 
Framework runtimes.


___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sc/qa/unit/subsequent_filters-test.cxx |2 +-
 vcl/unx/gtk/gtksalframe.cxx|2 +-
 vcl/unx/gtk3/gtk3gtkframe.cxx  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 08c529c6c146c09a33c175225866aa7a97653cf4
Author: Andrea Gelmini 
AuthorDate: Thu Apr 25 17:12:34 2019 +0200
Commit: Jens Carl 
CommitDate: Fri Apr 26 00:07:31 2019 +0200

Fix typos

Change-Id: I81d85cb8ae8b0075929beb01e8991d895b94d0c4
Reviewed-on: https://gerrit.libreoffice.org/71314
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index fa9abf92f4f1..af6daec5f255 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -4266,7 +4266,7 @@ void ScFiltersTest::testAutoheight2Rows()
 
 // We will do relative comparison, because calculated autoheight
 // can be different on different platforms
-CPPUNIT_ASSERT_MESSAGE("Row #3 shoud be thinner than #1", nHeight3 < 
nHeight1);
+CPPUNIT_ASSERT_MESSAGE("Row #3 should be thinner than #1", nHeight3 < 
nHeight1);
 
 xDocSh->DoClose();
 }
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index ebb35874bfef..abad3d42a241 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -140,7 +140,7 @@ sal_uInt16 GtkSalFrame::GetKeyCode(guint keyval)
 switch( keyval )
 {
 // - - - - - Sun keyboard, see vcl/unx/source/app/saldisp.cxx
-// althopugh GDK_KEY_F1 ... GDK_KEY_L10 are known to
+// although GDK_KEY_F1 ... GDK_KEY_L10 are known to
 // gdk/gdkkeysyms.h, they are unlikely to be generated
 // except possibly by Solaris systems
 // this whole section needs review
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 33f5f08c1f17..802359a38807 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -137,7 +137,7 @@ sal_uInt16 GtkSalFrame::GetKeyCode(guint keyval)
 switch( keyval )
 {
 // - - - - - Sun keyboard, see vcl/unx/source/app/saldisp.cxx
-// althopugh GDK_KEY_F1 ... GDK_KEY_L10 are known to
+// although GDK_KEY_F1 ... GDK_KEY_L10 are known to
 // gdk/gdkkeysyms.h, they are unlikely to be generated
 // except possibly by Solaris systems
 // this whole section needs review
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 icon-themes/colibre/cmd/lc_deleteallannotation.png |binary
 icon-themes/colibre/cmd/lc_deleteannotation.png|binary
 icon-themes/colibre/cmd/lc_editannotation.png  |binary
 icon-themes/colibre/cmd/lc_hideallnotes.png|binary
 icon-themes/colibre/cmd/lc_hidenote.png|binary
 icon-themes/colibre/cmd/lc_nextannotation.png  |binary
 icon-themes/colibre/cmd/lc_previousannotation.png  |binary
 icon-themes/colibre/cmd/lc_showallnotes.png|binary
 icon-themes/colibre/cmd/lc_showannotations.png |binary
 icon-themes/colibre/cmd/lc_shownote.png|binary
 icon-themes/colibre/cmd/sc_deleteallannotation.png |binary
 icon-themes/colibre/cmd/sc_deleteannotation.png|binary
 icon-themes/colibre/cmd/sc_editannotation.png  |binary
 icon-themes/colibre/cmd/sc_hideallnotes.png|binary
 icon-themes/colibre/cmd/sc_hidenote.png|binary
 icon-themes/colibre/cmd/sc_nextannotation.png  |binary
 icon-themes/colibre/cmd/sc_previousannotation.png  |binary
 icon-themes/colibre/cmd/sc_showallnotes.png|binary
 icon-themes/colibre/cmd/sc_showannotations.png |binary
 icon-themes/colibre/cmd/sc_shownote.png|binary
 icon-themes/colibre_svg/cmd/lc_deleteallannotation.svg |2 -
 icon-themes/colibre_svg/cmd/lc_deleteannotation.svg|2 -
 icon-themes/colibre_svg/cmd/lc_editannotation.svg  |2 -
 icon-themes/colibre_svg/cmd/lc_hideallnotes.svg|4 +-
 icon-themes/colibre_svg/cmd/lc_hidenote.svg|   15 +++
 icon-themes/colibre_svg/cmd/lc_nextannotation.svg  |2 -
 icon-themes/colibre_svg/cmd/lc_previousannotation.svg  |2 -
 icon-themes/colibre_svg/cmd/lc_showallnotes.svg|4 +-
 icon-themes/colibre_svg/cmd/lc_showannotations.svg |2 -
 icon-themes/colibre_svg/cmd/lc_shownote.svg|1 
 icon-themes/colibre_svg/cmd/sc_deleteallannotation.svg |4 +-
 icon-themes/colibre_svg/cmd/sc_deleteannotation.svg|2 -
 icon-themes/colibre_svg/cmd/sc_editannotation.svg  |2 -
 icon-themes/colibre_svg/cmd/sc_hideallnotes.svg|4 +-
 icon-themes/colibre_svg/cmd/sc_hidenote.svg|   34 -
 icon-themes/colibre_svg/cmd/sc_nextannotation.svg  |2 -
 icon-themes/colibre_svg/cmd/sc_previousannotation.svg  |2 -
 icon-themes/colibre_svg/cmd/sc_showallnotes.svg|4 +-
 icon-themes/colibre_svg/cmd/sc_showannotations.svg |2 -
 icon-themes/colibre_svg/cmd/sc_shownote.svg|   30 +++
 40 files changed, 69 insertions(+), 53 deletions(-)

New commits:
commit b91a8dc8358153f6fa25a394732c946a9e1bd359
Author: andreas kainz 
AuthorDate: Thu Apr 25 15:28:50 2019 +0200
Commit: andreas_kainz 
CommitDate: Thu Apr 25 22:33:53 2019 +0200

tdf#107144 make notes icons yellow in colibre

Change-Id: I607f0a463f45c6d299b97f0ef5dfd6e704d6bb41
Reviewed-on: https://gerrit.libreoffice.org/71304
Reviewed-by: andreas_kainz 
Tested-by: andreas_kainz 

diff --git a/icon-themes/colibre/cmd/lc_deleteallannotation.png 
b/icon-themes/colibre/cmd/lc_deleteallannotation.png
index c6deb0ffd75b..586507d45031 100644
Binary files a/icon-themes/colibre/cmd/lc_deleteallannotation.png and 
b/icon-themes/colibre/cmd/lc_deleteallannotation.png differ
diff --git a/icon-themes/colibre/cmd/lc_deleteannotation.png 
b/icon-themes/colibre/cmd/lc_deleteannotation.png
index eaf5973463a7..6e0d6ce2fe3e 100644
Binary files a/icon-themes/colibre/cmd/lc_deleteannotation.png and 
b/icon-themes/colibre/cmd/lc_deleteannotation.png differ
diff --git a/icon-themes/colibre/cmd/lc_editannotation.png 
b/icon-themes/colibre/cmd/lc_editannotation.png
index 1c64ca4df77c..bf2e1660eb7a 100644
Binary files a/icon-themes/colibre/cmd/lc_editannotation.png and 
b/icon-themes/colibre/cmd/lc_editannotation.png differ
diff --git a/icon-themes/colibre/cmd/lc_hideallnotes.png 
b/icon-themes/colibre/cmd/lc_hideallnotes.png
index 3702b5b62623..682f18291af1 100644
Binary files a/icon-themes/colibre/cmd/lc_hideallnotes.png and 
b/icon-themes/colibre/cmd/lc_hideallnotes.png differ
diff --git a/icon-themes/colibre/cmd/lc_hidenote.png 
b/icon-themes/colibre/cmd/lc_hidenote.png
new file mode 100644
index ..682f18291af1
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_hidenote.png differ
diff --git a/icon-themes/colibre/cmd/lc_nextannotation.png 
b/icon-themes/colibre/cmd/lc_nextannotation.png
index 679084a9fe0b..f971836f0e67 100644
Binary files a/icon-themes/colibre/cmd/lc_nextannotation.png and 
b/icon-themes/colibre/cmd/lc_nextannotation.png differ
diff --git a/icon-themes/colibre/cmd/lc_previousannotation.png 
b/icon-themes/colibre/cmd/lc_previousannotation.png
index 38aa6d827065..b7d436904513 100644
Binary files a/icon-themes/colibre/cmd/lc_previousannotation.png and 
b/icon-themes/colibre/cmd/lc_previousannotation.png differ
diff --git a/icon-

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

[Eike Rathke (via logerrit)]

 include/i18nlangtag/lang.h |4 
 1 file changed, 4 insertions(+)

New commits:
commit 7c0935a335dd1e4223d98db2edc6482747ce43ab
Author: Eike Rathke 
AuthorDate: Thu Apr 25 22:10:53 2019 +0200
Commit: Eike Rathke 
CommitDate: Thu Apr 25 22:15:14 2019 +0200

Add LANGUAGE_reserved_0x and LANGUAGE_reserved_0xF2EE

Change-Id: I7fcefd5b2da2055f56cf574358a96d2a071c13b6

diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index d49b701d94c8..f9a84d660fee 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -470,6 +470,10 @@ namespace o3tl
 #define LANGUAGE_Neither_defined_nor_reserved_0x1C0C LanguageType(0x1C0C)
 #define LANGUAGE_Neither_defined_nor_reserved_0x2008 LanguageType(0x2008)
 
+/* MS defines these as reserved, whatever that might imply.. */
+#define LANGUAGE_reserved_0xLanguageType(0x)  /* primary 
0x2ee, sub 0x3b */
+#define LANGUAGE_reserved_0xF2EELanguageType(0xF2EE)  /* primary 
0x2ee, sub 0x3c */
+
 /*! use only for import/export of MS documents, number formatter maps it to
  *! LANGUAGE_SYSTEM and then to effective system language */
 #define LANGUAGE_SYSTEM_DEFAULT LanguageType(0x0800)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Milan Crha (via logerrit)]

 connectivity/source/drivers/evoab2/EApi.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit efa314eb3068f5108c573657ab6cf422cb7729f4
Author: Milan Crha 
AuthorDate: Thu Apr 25 08:38:52 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 25 22:10:39 2019 +0200

Resolves: rhbz#1702810 Prepare for upcoming libebook soname version bump

as noted here:
https://mail.gnome.org/archives/desktop-devel-list/2019-April/msg00016.html

wrt:
https://gitlab.gnome.org/GNOME/evolution-data-server/issues/33

Change-Id: I88f900b3adf12de545b1d2d16da67eae22fde748
Reviewed-on: https://gerrit.libreoffice.org/71281
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/connectivity/source/drivers/evoab2/EApi.cxx 
b/connectivity/source/drivers/evoab2/EApi.cxx
index 41bc62c9ab20..c802778cff2e 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -21,6 +21,7 @@
 #define  DECLARE_FN_POINTERS 1
 #include "EApi.h"
 static const char *eBookLibNames[] = {
+"libebook-1.2.so.20", // evolution-data-server 3.33.2+
 "libebook-1.2.so.19", // evolution-data-server 3.24+
 "libebook-1.2.so.16",
 "libebook-1.2.so.15",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

 i18nlangtag/source/isolang/MS-LCID.lst |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 59aafd852df421eb369175c163e085898c0b2e38
Author: Eike Rathke 
AuthorDate: Thu Apr 25 22:07:58 2019 +0200
Commit: Eike Rathke 
CommitDate: Thu Apr 25 22:09:04 2019 +0200

Re-generate from 3/13/2019 13.0 revision

Only clarifications on 0x001A and 0x002E, plus two new reserved
0x and 0xF2EE.

Note that the whole bunch of 0x1000 "assignments" is not handled
and not listed here.

Change-Id: I3d3e86052c8d36a2ac49db9caa167957b5468ec3

diff --git a/i18nlangtag/source/isolang/MS-LCID.lst 
b/i18nlangtag/source/isolang/MS-LCID.lst
index 08352d9caaa2..51be289245e6 100644
--- a/i18nlangtag/source/isolang/MS-LCID.lst
+++ b/i18nlangtag/source/isolang/MS-LCID.lst
@@ -23,7 +23,7 @@
 0x0017 rm
 0x0018 ro
 0x0019 ru
-0x001A bs, hr, or sr
+0x001A hr
 0x001B sk
 0x001C sq
 0x001D sv
@@ -43,7 +43,7 @@
 0x002B hy
 0x002C az
 0x002D eu
-0x002E dsb or hsb
+0x002E hsb
 0x002F mk
 0x0030 st
 0x0031 ts
@@ -460,3 +460,5 @@
 0x7C67 ff-Latn
 0x7C68 ha-Latn
 0x7C92 ku-Arab
+0xF2EE reserved
+0x reserved
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

 i18nlangtag/source/isolang/MS-LCID-to-list.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 37c8dcc4dd8f3e2fb54f5d0630bd75bf105a947e
Author: Eike Rathke 
AuthorDate: Thu Apr 25 21:53:31 2019 +0200
Commit: Eike Rathke 
CommitDate: Thu Apr 25 21:55:12 2019 +0200

Generate .lst.h output with LanguageType(0x)

Change-Id: If9dd9437ebdc83e9093d4ea00f31d2e2da95b7d2

diff --git a/i18nlangtag/source/isolang/MS-LCID-to-list.sh 
b/i18nlangtag/source/isolang/MS-LCID-to-list.sh
index 5ab9ff012988..adb2e1b14a37 100755
--- a/i18nlangtag/source/isolang/MS-LCID-to-list.sh
+++ b/i18nlangtag/source/isolang/MS-LCID-to-list.sh
@@ -95,7 +95,7 @@ gawk -e '
 }
 break;
 }
-printf "#define %-35s %s\n", def, val;
+printf "#define %-35s LanguageType(%s)\n", def, val;
 print mapping;
 print ""
 }
___
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.0' - desktop/source

[Henry Castro (via logerrit)]

 desktop/source/lib/init.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 33191f604756bbfde04eea9a85fd7ac283c6eceb
Author: Henry Castro 
AuthorDate: Thu Apr 11 14:22:15 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Thu Apr 25 21:37:59 2019 +0200

lok: add missing parameter to PostExtTextInputEvent function

Change-Id: I91fbfd97da0c4ad1ad90710ab781c71ca99367e5
Reviewed-on: https://gerrit.libreoffice.org/70609
Tested-by: Jenkins
Reviewed-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/70665
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ece913b25e80..35943999d12b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2839,7 +2839,8 @@ static void 
doc_postWindowExtTextInputEvent(LibreOfficeKitDocument* pThis, unsig
OUString::fromUtf8(OString(pText, 
strlen(pText;
 break;
 case LOK_EXT_TEXTINPUT_END:
-pWindow->PostExtTextInputEvent(VclEventId::EndExtTextInput, "");
+pWindow->PostExtTextInputEvent(VclEventId::EndExtTextInput,
+   OUString::fromUtf8(OString(pText, 
strlen(pText;
 break;
 default:
 assert(false && "Unhandled External Text input event!");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: canvas/Executable_canvasdemo.mk connectivity/Library_mysqlc.mk connectivity/Library_postgresql-sdbc-impl.mk desktop/CppunitTest_desktop_app.mk desktop/CppunitTest_deskt

[Stephan Bergmann (via logerrit)]

 canvas/Executable_canvasdemo.mk |1 -
 connectivity/Library_mysqlc.mk  |2 +-
 connectivity/Library_postgresql-sdbc-impl.mk|1 -
 desktop/CppunitTest_desktop_app.mk  |1 -
 desktop/CppunitTest_desktop_lokinit.mk  |1 -
 desktop/Library_crashreport.mk  |1 -
 desktop/Library_sofficeapp.mk   |3 ---
 external/clucene/Library_clucene.mk |1 -
 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 +-
 svl/Library_svl.mk  |5 -
 svx/Executable_gengal.mk|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 -
 38 files changed, 11 insertions(+), 65 deletions(-)

New commits:
commit b1141fa61073b3f24e1a3574afa55a954e5a153d
Author: Stephan Bergmann 
AuthorDate: Thu Apr 25 11:48:39 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Apr 25 21:27:43 2019 +0200

Cut down on -pthread/-lpthread proliferation

Building against libstdc++ effectively always requires -pthread anyway (as
various standard C++ headers require it, see the comment added to
solenv/gbuild/platform/unxgcc.mk), so many explicit uses of 
-pthread/-lpthread
can be removed.

Doing a (partial) test build on Linux with Clang -stdlib=libc++ suggests 
that
libc++ indeed doesn't need -pthread as libstdc++ does.

The remaining uses of -pthread/-lpthread are mostly in configure.ac for the
various BSDs (which somebody else might want to clean up now), and related 
to
external projects.  I tried to be careful to remove -pthread/-lpthread from
makefiles only when C++ object files are involved (so -pthread will now be
included on the link command line by default).

Change-Id: I936e082839cb9a434bd273ce5a1f187a4245dfa1
Reviewed-on: https://gerrit.libreoffice.org/71291
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/canvas/Executable_canvasdemo.mk b/canvas/Executable_canvasdemo.mk
index a86a4a717510..8af599ff1760 100644
--- a/canvas/Executable_canvasdemo.mk
+++ b/canvas/Executable_canvasdemo.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_Executable_use_static_libraries,canvasdemo,\
 ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
 $(eval $(call gb_Executable_add_libs,canvasdemo,\
 -lm $(DLOPEN_LIBS) \
--lpthread \
 -lX11 \
 ))
 
diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index 455f9b2224df..0999b46d3eec 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,mysqlc,\
 $(eval $(call gb_Library_add_libs,mysqlc,\
$(if $(filter-out WNT,$(OS)),$(if $(filter HAIKU MACOSX SOLARIS,$(OS)),\
-lz -lm,-rdynamic -lz -lcrypt -lm)) \
-   $(if $(filter LINUX,$(OS)),-lpthread -ldl,) \
+   $(if $(filter LINUX,$(OS)),-ldl,) \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,mysqlc))
diff --git a/con

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

[Miklos Vajna (via logerrit)]

 sw/qa/uitest/writer_tests5/tdf121591.py |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1029d2a3ea3e6ec6f9b8a90a00e2b2b595fef5f2
Author: Miklos Vajna 
AuthorDate: Wed Apr 24 19:30:13 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Apr 25 20:25:45 2019 +0200

UITest_writer_tests5: disable flaky print preview test

Change-Id: I22431e026c1802e33064aa60267de0edbdf856ca
Reviewed-on: https://gerrit.libreoffice.org/71253
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/uitest/writer_tests5/tdf121591.py 
b/sw/qa/uitest/writer_tests5/tdf121591.py
index ad61a14eb247..df6deac658b7 100644
--- a/sw/qa/uitest/writer_tests5/tdf121591.py
+++ b/sw/qa/uitest/writer_tests5/tdf121591.py
@@ -14,6 +14,8 @@ from uitest.uihelper.common import select_pos
 class tdf121591(UITestCase):
 
def test_tdf121591_frame_print_preview(self):
+# FIXME unstable test
+return
 self.ui_test.create_doc_in_start_center("writer")
 document = self.ui_test.get_component()
 xWriterDoc = self.xUITest.getTopFocusWindow()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 librelogo/source/LibreLogo/LibreLogo.py |6 +++---
 sw/qa/uitest/librelogo/compile.py   |1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 0718458f1ae80c798c13400fd87c989faba01937
Author: László Németh 
AuthorDate: Wed Apr 17 00:37:54 2019 +0200
Commit: László Németh 
CommitDate: Thu Apr 25 20:21:16 2019 +0200

LibreLogo: fix RANGE with a single function argument

in a FOR loop, by removing the range(x,,)-like double
commas in this case, too, during program compilation.

Previous empty (missing) argument of RANGE was checked
by the terminating comma, but it can be a white space
after it, as in the following example:

FOR i IN RANGE COUNT 'letter' [ PRINT i ]

Change-Id: I67d0a4f089be06f30003d1b979b8f1801dbfa2e9
Reviewed-on: https://gerrit.libreoffice.org/71263
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/librelogo/source/LibreLogo/LibreLogo.py 
b/librelogo/source/LibreLogo/LibreLogo.py
index d4fa0cfea340..e58537b2338a 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -1764,10 +1764,10 @@ def __l2p__(i, par, insub, inarray):
 for j in range(par["names"][subname]):
 # add commas, except if already added, eg. with special RANGE
 # (variable argument counts: RANGE 1 or RANGE 1 100 or RANGE 1 
100 10)
-if j > 0 and par["out"][-1] != ",":
-par["out"] = re.sub("( *),$",",\\1", par["out"] + ",")
+if j > 0 and par["out"].rstrip()[-1] != ",":
+par["out"] = re.sub("( +),$",",\\1", par["out"] + ",")
 __l2p__(i, par, True, False)
-par["out"] = re.sub("( *)\\)$", ")\\1", par["out"] + ")")
+par["out"] = re.sub("( +)\\)$", ")\\1", par["out"] + ")")
 # operators
 elif pos in par["op"]:
 op = i[pos:par["op"][pos]]
diff --git a/sw/qa/uitest/librelogo/compile.py 
b/sw/qa/uitest/librelogo/compile.py
index 28905a36b897..89e538b8c926 100644
--- a/sw/qa/uitest/librelogo/compile.py
+++ b/sw/qa/uitest/librelogo/compile.py
@@ -74,6 +74,7 @@ class LibreLogoCompileTest(UITestCase):
 ("WHILE REPCOUNT < 10 [ ]", "REPCOUNT2 = 1\nwhile REPCOUNT2 < 
10 :\n __checkhalt__()\n REPCOUNT = REPCOUNT2\n REPCOUNT2 += 1"),
 # for
 ("FOR i in [1, 2, 3] [ ]", "REPCOUNT4 = 1\nfor i in [1, 2, 3] 
:\n __checkhalt__()\n REPCOUNT = REPCOUNT4\n REPCOUNT4 += 1"),
+("FOR i IN RANGE COUNT 'letters' [ ]", "REPCOUNT6 = 1\nfor i 
in range(len(u'letters'),) :\n __checkhalt__()\n REPCOUNT = REPCOUNT6\n 
REPCOUNT6 += 1"),
 # PROCEDURE
 ("TO x\nLABEL 2\nEND", "global x\ndef x():\n __checkhalt__()\n 
%s\n label(2)\n %s" % (((self.LS),)*2)),
 # FUNCTION
___
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/modules/installer/simplepackage.pm |5 -
 1 file changed, 5 deletions(-)

New commits:
commit c379ba47a786a6a7422c8fcdbfec32ddbcf88b90
Author: Stephan Bergmann 
AuthorDate: Thu Apr 25 14:22:21 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Apr 25 20:10:39 2019 +0200

No need to explicitly create Conents/Resources/*.lproj/ directories

At least since 7a08bfeabe21193e04b9747a831653efcfc63190 "tdf#122244 Put
InfoPlist.strings files at correct places on macOS" those directories that 
have
actual content are created on demand.  (That is, empty such directories are 
no
longer created, but I assume that's a feature rather than a bug.)

Change-Id: If753483c78fbf39e76c9565a407e7ff27ca32efb
Reviewed-on: https://gerrit.libreoffice.org/71300
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index 46f9f477d1b1..489f2127688e 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -405,11 +405,6 @@ sub create_package
 {
 my $subdir = 
"$tempdir/$packagename/$volume_name_classic_app.app/Contents/Resources";
 if ( ! -d $subdir ) { 
installer::systemactions::create_directory($subdir); }
-# iterate over macOS localizations
-foreach $lang ("ca", "cs", "da", "de", "el", "en", "es", "fi", 
"fr", "hr", "hu", "id", "it", "ja", "ko", "ms", "nl", "no", "pl", "pt", 
"pt_PT", "ro", "ru", "sk", "sv", "th", "tr", "uk", "vi", "zh_CN", "zh_TW")
-{
-installer::systemactions::create_directory($subdir . "/" . 
$lang . ".lproj");
-}
 if ( defined($ENV{'MACOSX_CODESIGNING_IDENTITY'}) && 
$ENV{'MACOSX_CODESIGNING_IDENTITY'} ne "" )
 {
 $systemcall = 
"$ENV{'SRCDIR'}/solenv/bin/macosx-codesign-app-bundle 
$localtempdir/$folder/$volume_name_classic_app.app";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 sc/qa/unit/subsequent_filters-test.cxx |   15 +++
 sc/source/filter/excel/colrowst.cxx|2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit e056abae09796f2b3806e94e62cae7f0d262d4d5
Author: Mike Kaganski 
AuthorDate: Thu Apr 25 15:30:49 2019 +0300
Commit: Mike Kaganski 
CommitDate: Thu Apr 25 20:09:39 2019 +0200

tdf#50916: XLS: make sure to set default widths to all columns

See 
https://lists.freedesktop.org/archives/libreoffice/2019-April/082479.html
Ths partially reverts commit 1463625ae26900d2461fd72a5a2c894b9f1b8726

Change-Id: I36ec01c8d331d879143f60e12dc239158a8822ec
Reviewed-on: https://gerrit.libreoffice.org/71301
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 578ff72435d2..fa9abf92f4f1 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -248,6 +248,7 @@ public:
 void testTdf62268();
 void testVBAMacroFunctionODS();
 void testAutoheight2Rows();
+void testXLSDefColWidth();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testBooleanFormatXLSX);
@@ -387,6 +388,7 @@ public:
 CPPUNIT_TEST(testTdf62268);
 CPPUNIT_TEST(testVBAMacroFunctionODS);
 CPPUNIT_TEST(testAutoheight2Rows);
+CPPUNIT_TEST(testXLSDefColWidth);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -4269,6 +4271,19 @@ void ScFiltersTest::testAutoheight2Rows()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testXLSDefColWidth()
+{
+// XLS has only 256 columns; but on import, we need to set default width 
to all above that limit
+ScDocShellRef xDocSh = loadDoc("chartx.", FORMAT_XLS); // just some XLS 
with narrow columns
+ScDocument& rDoc = xDocSh->GetDocument();
+
+int nWidth = rDoc.GetColWidth(MAXCOL, 0, false);
+// This was 1280
+CPPUNIT_ASSERT_EQUAL(1005, nWidth);
+
+xDocSh->DoClose();
+}
+
 ScFiltersTest::ScFiltersTest()
   : ScBootstrapFixture( "sc/qa/unit/data" )
 {
diff --git a/sc/source/filter/excel/colrowst.cxx 
b/sc/source/filter/excel/colrowst.cxx
index 5640335f08b8..fb8e3e1c3836 100644
--- a/sc/source/filter/excel/colrowst.cxx
+++ b/sc/source/filter/excel/colrowst.cxx
@@ -184,7 +184,7 @@ void XclImpColRowSettings::Convert( SCTAB nScTab )
 // column widths --
 
 maColWidths.build_tree();
-for( SCCOL nCol : rDoc.GetColumnsRange(nScTab, 0, MAXCOL) )
+for (SCCOL nCol = 0; nCol <= MAXCOL; ++nCol)
 {
 sal_uInt16 nWidth = mnDefWidth;
 if (GetColFlag(nCol, ExcColRowFlags::Used))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 icon-themes/colibre/res/sx03126.png |binary
 icon-themes/colibre_svg/res/sx03126.svg |8 +++-
 icon-themes/sifr/res/sx03126.png|binary
 icon-themes/sifr_dark/res/sx03126.png   |binary
 icon-themes/sifr_svg/res/sx03126.svg|6 ++
 5 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 5e4c1e6ba425ce0b75864e4584a846957b032e61
Author: andreas kainz 
AuthorDate: Thu Apr 25 00:20:57 2019 +0200
Commit: andreas_kainz 
CommitDate: Thu Apr 25 19:02:47 2019 +0200

tdf#117891 base table icons in main window tables

Change-Id: Ibe76cc8950e26f0b78425f91faae2f44b5474ea7
Reviewed-on: https://gerrit.libreoffice.org/71264
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/colibre/res/sx03126.png 
b/icon-themes/colibre/res/sx03126.png
index dd3109a5fa28..f3df2adda5d6 100644
Binary files a/icon-themes/colibre/res/sx03126.png and 
b/icon-themes/colibre/res/sx03126.png differ
diff --git a/icon-themes/colibre_svg/res/sx03126.svg 
b/icon-themes/colibre_svg/res/sx03126.svg
index a050e847ff72..7d61b7ce16d9 100644
--- a/icon-themes/colibre_svg/res/sx03126.svg
+++ b/icon-themes/colibre_svg/res/sx03126.svg
@@ -1 +1,7 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
+
+
+
+
+ />
+ 
\ No newline at end of file
diff --git a/icon-themes/sifr/res/sx03126.png b/icon-themes/sifr/res/sx03126.png
new file mode 100644
index ..d045a2a7bdaa
Binary files /dev/null and b/icon-themes/sifr/res/sx03126.png differ
diff --git a/icon-themes/sifr_dark/res/sx03126.png 
b/icon-themes/sifr_dark/res/sx03126.png
new file mode 100644
index ..3e115a3c0006
Binary files /dev/null and b/icon-themes/sifr_dark/res/sx03126.png differ
diff --git a/icon-themes/sifr_svg/res/sx03126.svg 
b/icon-themes/sifr_svg/res/sx03126.svg
new file mode 100644
index ..53bede9db4bb
--- /dev/null
+++ b/icon-themes/sifr_svg/res/sx03126.svg
@@ -0,0 +1,6 @@
+http://www.w3.org/2000/svg"; viewBox="0 0 16 16">
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl |   14 +-
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 6909838e2966b3fd3c2de6b6db70d952cd8b3114
Author: Andrea Gelmini 
AuthorDate: Thu Apr 25 18:08:33 2019 +0200
Commit: Julien Nabet 
CommitDate: Thu Apr 25 18:41:38 2019 +0200

Fix typo

Change-Id: Ie608aea0cd65d6bc6a3c5d700650ac3b9d3241a9
Reviewed-on: https://gerrit.libreoffice.org/70998
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl 
b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index 8b378b42bf96..2f4830d0b9ed 100644
--- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
@@ -779,7 +779,7 @@
 
 
 
+if the parent would be an automatic (unnamed) 
style, the style information have to be embedded to this style -->
 
 
 
@@ -5986,7 +5986,7 @@
 
 
 
-
+
 
 
 
@@ -6541,7 +6541,7 @@
  )
  ) "/>
 
-
+
 
 
@@ -7026,7 +7026,7 @@
 
 
 
-
+
 
 
 
@@ -7049,7 +7049,7 @@
 
 
 
-
+
 
 
 
@@ -8863,7 +8863,7 @@
 
 
 
-
+
 
 
 
@@ -8893,7 +8893,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - connectivity/source

[Milan Crha (via logerrit)]

 connectivity/source/drivers/evoab2/EApi.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 97d1ba1d9a4f85e365596b756f4050c6770340bd
Author: Milan Crha 
AuthorDate: Thu Apr 25 08:38:52 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 25 18:28:38 2019 +0200

Resolves: rhbz#1702810 Prepare for upcoming libebook soname version bump

as noted here:
https://mail.gnome.org/archives/desktop-devel-list/2019-April/msg00016.html

wrt:
https://gitlab.gnome.org/GNOME/evolution-data-server/issues/33

Change-Id: I88f900b3adf12de545b1d2d16da67eae22fde748
Reviewed-on: https://gerrit.libreoffice.org/71282
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/connectivity/source/drivers/evoab2/EApi.cxx 
b/connectivity/source/drivers/evoab2/EApi.cxx
index 1830cae593af..9514e4793889 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -21,6 +21,7 @@
 #define  DECLARE_FN_POINTERS 1
 #include "EApi.h"
 static const char *eBookLibNames[] = {
+"libebook-1.2.so.20", // evolution-data-server 3.33.2+
 "libebook-1.2.so.19", // evolution-data-server 3.24+
 "libebook-1.2.so.16",
 "libebook-1.2.so.15",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sc/source/ui/view/drawvie3.cxx |   14 +++---
 sc/source/ui/view/prevwsh2.cxx |   16 
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit f9fef3b54a474f756aa06f156f5c61fea609c07e
Author: Xisco Fauli 
AuthorDate: Thu Apr 25 11:38:52 2019 +0200
Commit: Xisco Faulí 
CommitDate: Thu Apr 25 18:21:51 2019 +0200

Re-arrange the conditions to avoid the dynamic_cast

Similar to 88be8aa14d52ad102dc6b01c1c962d4e6cac4941

Change-Id: Ia6f725fd6c6cee3135191a998ea43c1e6f90fc23
Reviewed-on: https://gerrit.libreoffice.org/71287
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index 6fcf91da5542..a1b02bdc265f 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -176,7 +176,13 @@ void adjustAnchoredPosition(const SdrHint& rHint, const 
ScDocument& rDoc, SCTAB
 
 void ScDrawView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 {
-if (dynamic_cast(&rHint))
// Sheet has been deleted
+if (rHint.GetId() == SfxHintId::ThisIsAnSdrHint)
+{
+const SdrHint* pSdrHint = static_cast( &rHint );
+adjustAnchoredPosition(*pSdrHint, *pDoc, nTab);
+FmFormView::Notify( rBC,rHint );
+}
+else if (dynamic_cast(&rHint))
// Sheet has been deleted
 {
 SCTAB nDelTab = static_cast(rHint).GetTab();
 if (ValidTab(nDelTab))
@@ -191,12 +197,6 @@ void ScDrawView::Notify( SfxBroadcaster& rBC, const 
SfxHint& rHint )
 if ( nTab == static_cast(rHint).GetTab() )
 UpdateWorkArea();
 }
-else if (rHint.GetId() == SfxHintId::ThisIsAnSdrHint)
-{
-const SdrHint* pSdrHint = static_cast( &rHint );
-adjustAnchoredPosition(*pSdrHint, *pDoc, nTab);
-FmFormView::Notify( rBC,rHint );
-}
 else
 FmFormView::Notify( rBC,rHint );
 }
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index b1066328816f..8a4e5212b512 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -30,7 +30,14 @@ void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& 
rHint )
 {
 bool bDataChanged = false;
 
-if (const ScPaintHint* pPaintHint = dynamic_cast(&rHint))
+if (rHint.GetId() == SfxHintId::ThisIsAnSdrHint)
+{
+const SdrHint* pSdrHint = static_cast(&rHint);
+// SdrHints are no longer used for invalidating, thus react on 
objectchange instead
+if(SdrHintKind::ObjectChange == pSdrHint->GetKind())
+bDataChanged = true;
+}
+else if (const ScPaintHint* pPaintHint = dynamic_cast(&rHint))
 {
 if ( pPaintHint->GetPrintFlag() )
 {
@@ -39,13 +46,6 @@ void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& 
rHint )
 bDataChanged = true;
 }
 }
-else if (rHint.GetId() == SfxHintId::ThisIsAnSdrHint)
-{
-const SdrHint* pSdrHint = static_cast(&rHint);
-// SdrHints are no longer used for invalidating, thus react on 
objectchange instead
-if(SdrHintKind::ObjectChange == pSdrHint->GetKind())
-bDataChanged = true;
-}
 else
 {
 switch ( rHint.GetId() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 icon-themes/breeze/links.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a0edb53e63b9fa7ed5983d6500aece1e5eff380b
Author: andreas kainz 
AuthorDate: Wed Apr 24 22:17:42 2019 +0200
Commit: Caolán McNamara 
CommitDate: Thu Apr 25 17:29:59 2019 +0200

tdf#99185 Breeze icons for folder and form is identical

Change-Id: If10507a51cf4b680034e225ec011f43f624ca34c
Reviewed-on: https://gerrit.libreoffice.org/71259
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index a179c75bae14..d8670a9fd21c 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1087,7 +1087,7 @@ dbaccess/res/exerror.png cmd/sc_cancel.png
 dbaccess/res/exinfo.png cmd/sc_helpindex.png
 
 dbaccess/res/form_16.png cmd/sc_dbformedit.png
-dbaccess/res/forms_16.png cmd/sc_dbformedit.png
+dbaccess/res/forms_16.png cmd/sc_open.png
 
 dbaccess/res/lc036.png cmd/lc_dbnewreport.png
 dbaccess/res/lc037.png cmd/lc_delete.png
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 cui/source/inc/border.hxx  |2 ++
 cui/source/tabpages/border.cxx |   21 +
 2 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit ea7af3d1c589ba72169a1e05ff5800bd77ca861a
Author: Caolán McNamara 
AuthorDate: Thu Apr 25 11:14:53 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 25 17:29:39 2019 +0200

Resolves: tdf#124804 border considered changed when it isn't

Change-Id: Ib4b6031b31500a8a2086721124b5b8f554f7c1c5
Reviewed-on: https://gerrit.libreoffice.org/71296
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index a57db4dc58f0..733538499ec0 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -49,6 +49,8 @@ public:
 void SetControlValue(const SvxShadowItem& rItem);
 void SetControlDontKnow();
 
+bool get_value_changed_from_saved() const;
+
 private:
 SvtValueSet&mrVsPos;
 weld::MetricSpinButton& mrMfSize;
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index d9cd2e4a2c2c..f024fa707deb 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -159,9 +159,18 @@ void ShadowControlsWrapper::SetControlValue(const 
SvxShadowItem& rItem)
 mrVsPos.SetNoSelection();
 break;
 }
+mrVsPos.SaveValue();
 mrMfSize.set_value(mrMfSize.normalize(rItem.GetWidth()), FieldUnit::TWIP);
-mrLbColor.SelectEntry(rItem.GetColor());
 mrMfSize.save_value();
+mrLbColor.SelectEntry(rItem.GetColor());
+mrLbColor.SaveValue();
+}
+
+bool ShadowControlsWrapper::get_value_changed_from_saved() const
+{
+return mrVsPos.IsValueChangedFromSaved() ||
+   mrMfSize.get_value_changed_from_saved() ||
+   mrLbColor.IsValueChangedFromSaved();
 }
 
 void ShadowControlsWrapper::SetControlDontKnow()
@@ -863,16 +872,12 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* 
rCoreAttrs )
 bAttrsChanged = true;
 }
 
-if (m_xShadowControls)
+if (m_xShadowControls && m_xShadowControls->get_value_changed_from_saved())
 {
 sal_uInt16 nShadowId = pPool->GetWhich(mnShadowSlot);
 const SvxShadowItem& rOldShadowItem = *static_cast(rCoreAttrs->GetItem(nShadowId));
-SvxShadowItem aNewShadowItem = 
m_xShadowControls->GetControlValue(rOldShadowItem);
-if (aNewShadowItem != rOldShadowItem)
-{
-rCoreAttrs->Put(aNewShadowItem);
-bAttrsChanged = true;
-}
+rCoreAttrs->Put(m_xShadowControls->GetControlValue(rOldShadowItem));
+bAttrsChanged = true;
 }
 
 if (m_xMarginControls && m_xMarginControls->get_value_changed_from_saved())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in

[Stephan Bergmann (via logerrit)]

 Makefile.in |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 0b56eb2c10ab4ca027f1a37e04519366b3cd7433
Author: Stephan Bergmann 
AuthorDate: Thu Apr 25 13:36:58 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Apr 25 17:02:41 2019 +0200

That bin directory should no longer be there

...at least since 7a08bfeabe21193e04b9747a831653efcfc63190 "tdf#122244 Put
InfoPlist.strings files at correct places on macOS", though it wasn't under
Contents/ at least as of lately, anyway.

The code to remove it had been added with
f345a2c52af0333b46b4b74e686883c8cb9ffab4 "We don't want those
bin/InfoPlist_*.zip files in the app bundle".  I don't know how to do a
--enable-macosx-code-signing build on macOS to verify that it can indeed be
removed, though.

Change-Id: I61d91bd47abf8f4b5d9e117d9943e0682ebef2cb
Reviewed-on: https://gerrit.libreoffice.org/71298
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/Makefile.in b/Makefile.in
index 0066401b869a..5423596012e0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -356,9 +356,6 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
mkdir "$$lproj"; \
done
 #
-# And remove the "bin" folder which should not be there
-   rm -rf $(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/bin
-#
 # Remove unnecessary executables in the LibreOfficePython framework
rm -rf 
$(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/bin
 #
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 cui/uiconfig/ui/customizedialog.ui |2 +-
 cui/uiconfig/ui/menuassignpage.ui  |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 254c344c4bee0516f8dcc1b31bd3c551a6a332c1
Author: Caolán McNamara 
AuthorDate: Thu Apr 25 09:04:06 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 25 16:43:43 2019 +0200

Resolves: tdf#124932 fix Shortcut Keys etc tab traversal

Change-Id: I9d0204161a0efe91ebcddaf5b2931ab156221b79
Reviewed-on: https://gerrit.libreoffice.org/71283
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/uiconfig/ui/customizedialog.ui 
b/cui/uiconfig/ui/customizedialog.ui
index 1fca1949f439..4c0e690c75ef 100644
--- a/cui/uiconfig/ui/customizedialog.ui
+++ b/cui/uiconfig/ui/customizedialog.ui
@@ -92,7 +92,7 @@
 
   
 True
-False
+True
 True
 True
 True
diff --git a/cui/uiconfig/ui/menuassignpage.ui 
b/cui/uiconfig/ui/menuassignpage.ui
index e69080d09fe4..2b96de9ed246 100644
--- a/cui/uiconfig/ui/menuassignpage.ui
+++ b/cui/uiconfig/ui/menuassignpage.ui
@@ -374,7 +374,7 @@
 
   
 True
-True
+False
 4
 True
   
@@ -419,7 +419,7 @@
 
   
 True
-True
+False
 5
 True
   
@@ -457,7 +457,7 @@
   
 1
 True
-True
+False
 True
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

[Michael Meeks]

* Present:
  + Olivier, Christian, Eike, Kendy, Thorsten, Heiko, Xisco, Caolan,
Michael S, Michael M, Michael W, Stephan

* Completed Action Items:
+ mentors to check through the list here (All)
+ https://summerofcode.withgoogle.com/
+ drop ESC advice on alien formats into relevant bug ticket (Heiko)
+ https://bugs.documentfoundation.org/show_bug.cgi?id=115291#c15 

* Pending Action Items:
+ run the certification script (Kendy)

* Release Engineering update (Christian)
+ 6.2.4 rc1 – next week starting April 29th
+ 6.1.6 rc2
   + tagged before the call – builds triggered
+ 6.3 alpha1: early May, week 19
+ Remotes
+ Android viewer
+ Online

* Documentation (Olivier)
+ New Help
+ fixes in build (sberg, himanjin1)
+ Fixes in search (buovjaga)
+ Helpcontent2
+ fixes (ohallot)
+ updates in function names (kompilainen)
+ Google Seasons of DOC
+ Awaiting April 30th for response
+ Guides:
+ Stalled. Will interact with GSoD

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
251(251) (topicUI) bugs open, 211(211) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months  
 added 11(7) 20(10)34(9)   78(11) 
 commented 71(30)   217(34)   493(35)1390(66) 
   removed  0(-3) 5(-1)13(0)   22(-1) 
  resolved  3(1) 11(-4)50(-5) 132(2)  
+ top 10 contributors:
  Tietze, Heiko made 89 changes in 1 month, and 568 changes in 1 year
  Roman Kuznetsov made 70 changes in 1 month, and 188 changes in 1 year
  Kainz, Andreas made 63 changes in 1 month, and 208 changes in 1 year
  Foote, V Stuart made 36 changes in 1 month, and 201 changes in 1 year
  Dieter Praas made 33 changes in 1 month, and 149 changes in 1 year
  Xisco Faulí made 33 changes in 1 month, and 254 changes in 1 year
  Thomas Lendo made 24 changes in 1 month, and 223 changes in 1 year
  Brinzing, Oliver made 20 changes in 1 month, and 26 changes in 1 year
  Cor Nouws made 15 changes in 1 month, and 113 changes in 1 year
  Mehrbrodt, Samuel made 10 changes in 1 month, and 67 changes in 1 year

   + New needsUXEval between Apr/18-25

  * Context toolbar make jumping ui
+ https://bugs.documentfoundation.org/show_bug.cgi?id=124835 
  * Formatting: Formula result has different alignment than regular values
+ https://bugs.documentfoundation.org/show_bug.cgi?id=124860 
  * close button on menubar didn't use the color of the menubar
+ https://bugs.documentfoundation.org/show_bug.cgi?id=124928 
  * Save icon breaks icon customization
 + https://bugs.documentfoundation.org/show_bug.cgi?id=98193  
  => in discussion

  * Help->About LibreOffice dialog does not specify whether 32 or 64 bit 
is installed
+ https://bugs.documentfoundation.org/show_bug.cgi?id=124936
+ proposal is to add 32bits when its not 64.
  * UI: the wording around tools - options - LibreOffice Calc - Formula -
Recalculation on File Load is questionable
+ https://bugs.documentfoundation.org/show_bug.cgi?id=124784 
  => new/easyhack
+ currently option is Never
   + it is dangerous currently (Heiko)
 + might need an update.
 + can re-calculate alien formats
   + Is there a good reason to break calcs ? (Michael)
   + no way to detect if you need re-calculation (Eike)
 + would be there always for Alien formats.
   + sometimes we have to calculate this (Eike)
 + can have some other wording, but …
+ suggestion is two-fold (Heiko)
   + not having a blocking dialog
 → info-bar is not controversial (Michael)
   + ask the user or not.
 → asking the user is controversial (Michael, Eike)
+ problem can be with files stored in an older version (Eike)
   + these can need re-calculating from an old version.
   + if we add a bug & then save it – things break (Kendy)
   + perhaps safest always recalculate – but poor performance (Eike)
  + could depend on the version – before 6.2.3 
eg. but not a friend of that.
   + new, older + alien format options ? (Heiko)
  + not clear to the user why he should choose any of them (Eike)
   + should do something familiar (Michael)

  * Option to turn off autocomplete text in quick find
+ https://bugs.documentfoundation.org/show_bug.cgi?id=124774 
  => wfm

* Crash Testing (Caolan)
+ Google / ossfuzz:
  + 12 (+2,-0) issues
  + fix in gerrit.
+ Crash testing:
  + 6(-2) import failure, 22(+18) export failures
- export failures are really uncove

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

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.Toolbar.js |3 ++-
 loleaflet/src/control/Permission.js  |5 -
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 4247dad6f54c7084710937d7efd460fac265ccd2
Author: Tor Lillqvist 
AuthorDate: Thu Apr 25 14:16:54 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Apr 25 17:29:01 2019 +0300

tdf#124950: Don't pop up keyboard on iOS when clicking in toolbar

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 43cb889c9..287a1598d 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -115,7 +115,8 @@ function onClick(e, id, item, subItem) {
throw new Error('unknown id: ' + id);
}
var docLayer = map._docLayer;
-   if (id !== 'zoomin' && id !== 'zoomout') {
+   // In the iOS app we don't want clicking on the toolbar to pop up the 
keyboard.
+   if (!window.ThisIsTheiOSApp && id !== 'zoomin' && id !== 'zoomout') {
map.focus();
}
if (item.disabled) {
commit 981db95a28b6001e1fc7e236155f13eec46d346e
Author: Tor Lillqvist 
AuthorDate: Thu Apr 25 13:47:11 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Apr 25 17:27:30 2019 +0300

tdf#124950: Don't pop up keyboard on iOS when clicking the 
mobile-edit-button

Only when the user taps in the document, or selects some text in it,
is it obvious that they want to be able to type into it.

This is just one of the instances where the on-screen keyboard popped
up for no good reason.

diff --git a/loleaflet/src/control/Permission.js 
b/loleaflet/src/control/Permission.js
index 37ad81a05..de4fc7e63 100644
--- a/loleaflet/src/control/Permission.js
+++ b/loleaflet/src/control/Permission.js
@@ -16,7 +16,10 @@ L.Map.include({
button.hide();
that._enterEditMode('edit');
that.fire('editorgotfocus');
-   that.focus();
+   // In the iOS app, just clicking the 
mobile-edit-button is
+   // not reason enough to pop up the 
on-screen keyboard.
+   if (!window.ThisIsTheiOSApp)
+   that.focus();
});
 
// temporarily, before the user touches the 
floating action button
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: ios/Mobile.xcodeproj

[Libreoffice Gerrit user]

 ios/Mobile.xcodeproj/project.pbxproj |4 
 1 file changed, 4 deletions(-)

New commits:
commit 05e4cf90f985b765186549c80c41f9c2bd64c8b2
Author: Tor Lillqvist 
AuthorDate: Thu Apr 25 17:25:15 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Apr 25 17:25:15 2019 +0300

Remove leftovers of loading.html from iOS app project, too

Change-Id: Iecbbbc8ea42c0e26e6dde3f38a57482ad60135d5

diff --git a/ios/Mobile.xcodeproj/project.pbxproj 
b/ios/Mobile.xcodeproj/project.pbxproj
index c4ec1ae61..d11d84fd1 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
BE00F8A021396585001CE2D4 /* loleaflet.html in Resources */ = 
{isa = PBXBuildFile; fileRef = BE00F89621396585001CE2D4 /* loleaflet.html */; };
BE00F8A121396585001CE2D4 /* bundle.css in Resources */ = {isa = 
PBXBuildFile; fileRef = BE00F89721396585001CE2D4 /* bundle.css */; };
BE00F8A321396585001CE2D4 /* bundle.js in Resources */ = {isa = 
PBXBuildFile; fileRef = BE00F89921396585001CE2D4 /* bundle.js */; };
-   BE00F8A621396585001CE2D4 /* loading.html in Resources */ = {isa 
= PBXBuildFile; fileRef = BE00F89C21396585001CE2D4 /* loading.html */; };
BE00F8A721396585001CE2D4 /* loleaflet-help.html in Resources */ 
= {isa = PBXBuildFile; fileRef = BE00F89D21396585001CE2D4 /* 
loleaflet-help.html */; };
BE00F8A821396585001CE2D4 /* images in Resources */ = {isa = 
PBXBuildFile; fileRef = BE00F89E21396585001CE2D4 /* images */; };
BE00F8B5213ED543001CE2D4 /* libiconv.tbd in Frameworks */ = 
{isa = PBXBuildFile; fileRef = BE00F8B4213ED543001CE2D4 /* libiconv.tbd */; };
@@ -71,7 +70,6 @@
BE00F89621396585001CE2D4 /* loleaflet.html */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = 
loleaflet.html; path = ../../../loleaflet/dist/loleaflet.html; sourceTree = 
""; };
BE00F89721396585001CE2D4 /* bundle.css */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; name = 
bundle.css; path = ../../../loleaflet/dist/bundle.css; sourceTree = ""; 
};
BE00F89921396585001CE2D4 /* bundle.js */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; 
name = bundle.js; path = ../../../loleaflet/dist/bundle.js; sourceTree = 
""; };
-   BE00F89C21396585001CE2D4 /* loading.html */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = 
loading.html; path = ../../../loleaflet/dist/loading.html; sourceTree = 
""; };
BE00F89D21396585001CE2D4 /* loleaflet-help.html */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = 
"loleaflet-help.html"; path = "../../../loleaflet/dist/loleaflet-help.html"; 
sourceTree = ""; };
BE00F89E21396585001CE2D4 /* images */ = {isa = 
PBXFileReference; lastKnownFileType = folder; name = images; path = 
../../../loleaflet/dist/images; sourceTree = ""; };
BE00F8B4213ED543001CE2D4 /* libiconv.tbd */ = {isa = 
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; 
name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
@@ -693,7 +691,6 @@
BE00F89721396585001CE2D4 /* bundle.css */,
BE00F89921396585001CE2D4 /* bundle.js */,
BE00F89E21396585001CE2D4 /* images */,
-   BE00F89C21396585001CE2D4 /* loading.html */,
BE00F89D21396585001CE2D4 /* loleaflet-help.html 
*/,
BE00F89621396585001CE2D4 /* loleaflet.html */,
);
@@ -1720,7 +1717,6 @@
BE8D85CB214055F3009F1860 /* share in Resources 
*/,
BE80E46821B7066D00859C97 /* Templates in 
Resources */,
BEB0E5D921C7CA800085A0CF /* Settings.bundle in 
Resources */,
-   BE00F8A621396585001CE2D4 /* loading.html in 
Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - 2 commits - loleaflet/js loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/js/toolbar.js |3 ++-
 loleaflet/src/control/Permission.js |5 -
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit a3e2d55736b0157c35e5e842daca73e401d754db
Author: Tor Lillqvist 
AuthorDate: Thu Apr 25 14:16:54 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Apr 25 17:12:40 2019 +0300

tdf#124950: Don't pop up keyboard on iOS when clicking in toolbar

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 71327fa7c..959e6e8c1 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -115,7 +115,8 @@ function onClick(e, id, item, subItem) {
throw new Error('unknown id: ' + id);
}
var docLayer = map._docLayer;
-   if (id !== 'zoomin' && id !== 'zoomout') {
+   // In the iOS app we don't want clicking on the toolbar to pop up the 
keyboard.
+   if (!window.ThisIsTheiOSApp && id !== 'zoomin' && id !== 'zoomout') {
map.focus();
}
if (item.disabled) {
commit 45656129c2e04408d86340c4ad82c681a2425b74
Author: Tor Lillqvist 
AuthorDate: Thu Apr 25 13:47:11 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Apr 25 17:12:40 2019 +0300

tdf#124950: Don't pop up keyboard on iOS when clicking the 
mobile-edit-button

Only when the user taps in the document, or selects some text in it,
is it obvious that they want to be able to type into it.

This is just one of the instances where the on-screen keyboard popped
up for no good reason.

diff --git a/loleaflet/src/control/Permission.js 
b/loleaflet/src/control/Permission.js
index 37ad81a05..de4fc7e63 100644
--- a/loleaflet/src/control/Permission.js
+++ b/loleaflet/src/control/Permission.js
@@ -16,7 +16,10 @@ L.Map.include({
button.hide();
that._enterEditMode('edit');
that.fire('editorgotfocus');
-   that.focus();
+   // In the iOS app, just clicking the 
mobile-edit-button is
+   // not reason enough to pop up the 
on-screen keyboard.
+   if (!window.ThisIsTheiOSApp)
+   that.focus();
});
 
// temporarily, before the user touches the 
floating action button
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |6 ++
 sw/qa/core/data/ooxml/fail/ofz14422-1.docx  |binary
 2 files changed, 6 insertions(+)

New commits:
commit 8b20381b936f643c0d6f7525a2acdbdc20366493
Author: Caolán McNamara 
AuthorDate: Wed Apr 24 11:38:53 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 25 16:08:12 2019 +0200

ofz#14422 null deref

Change-Id: Icd00e2aaa5932564668cd12ce4ee63aecc34419a
Reviewed-on: https://gerrit.libreoffice.org/71226
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 96e305b46a00..323fafe12045 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -1290,6 +1290,12 @@ bool LayoutNode::setupShape( const ShapePtr& rShape, 
const dgm::Point* pPresNode
 continue;
 }
 
+if (!aDataNode2->second->mpShape)
+{
+//busted, skip it
+continue;
+}
+
 rShape->setDataNodeType(aDataNode2->second->mnType);
 
 if (rItem.mnDepth == 0)
diff --git a/sw/qa/core/data/ooxml/fail/ofz14422-1.docx 
b/sw/qa/core/data/ooxml/fail/ofz14422-1.docx
new file mode 100644
index ..8284f6afc4b3
Binary files /dev/null and b/sw/qa/core/data/ooxml/fail/ofz14422-1.docx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/qa/cppunit/complextext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e898d3ce8f12c6f4b4f3a8202812fe8871e0a7f
Author: Caolán McNamara 
AuthorDate: Thu Apr 25 11:06:35 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 25 16:07:17 2019 +0200

test unreliable under windows

Change-Id: I1f46c6043b3263ef983991ffa4aa0418006d55a7
Reviewed-on: https://gerrit.libreoffice.org/71292
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 2009c6a67aa8..eb2913b75ae9 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -96,11 +96,11 @@ void VclComplexTextTest::testArabic()
 // this sporadically returns 75 or 74 on some of the windows tinderboxes 
eg. tb73
 CPPUNIT_ASSERT_EQUAL(72L, nTextWidth);
 CPPUNIT_ASSERT_EQUAL(nTextWidth, aCharWidths.back());
-#endif
 
 // text advance width and line height
 CPPUNIT_ASSERT_EQUAL(72L, pOutDev->GetTextWidth(aOneTwoThree));
 CPPUNIT_ASSERT_EQUAL(14L, pOutDev->GetTextHeight());
+#endif
 
 // exact bounding rectangle, not essentially the same as text width/height
 #if defined(MACOSX) || defined(_WIN32)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/Library_mysqlc.mk connectivity/qa connectivity/source

[Tamas Bunth (via logerrit)]

 connectivity/Library_mysqlc.mk   |1 
 connectivity/qa/connectivity/mysql/mysql.cxx |   32 
 connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx |  353 
--
 connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx |5 
 4 files changed, 210 insertions(+), 181 deletions(-)

New commits:
commit 406aef41d1368a46d36757072592e93efd9ae08e
Author: Tamas Bunth 
AuthorDate: Mon Apr 22 19:09:24 2019 +0200
Commit: Andras Timar 
CommitDate: Thu Apr 25 15:47:38 2019 +0200

mysqlc: Allow conversions between different types

Change-Id: I54c1f438a755267db0896637c79f915de9113f83
Reviewed-on: https://gerrit.libreoffice.org/71074
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index 9dba7769a9a2..455f9b2224df 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_sdk_api,mysqlc))
 
 $(eval $(call gb_Library_use_libraries,mysqlc,\
cppu \
+dbtools \
sal \
salhelper \
comphelper \
diff --git a/connectivity/qa/connectivity/mysql/mysql.cxx 
b/connectivity/qa/connectivity/mysql/mysql.cxx
index 1cbe34790421..00ff9423aa4a 100644
--- a/connectivity/qa/connectivity/mysql/mysql.cxx
+++ b/connectivity/qa/connectivity/mysql/mysql.cxx
@@ -53,6 +53,7 @@ public:
 void testMultipleResultsets();
 void testDBMetaData();
 void testTimestampField();
+void testNumericConversionPrepared();
 
 CPPUNIT_TEST_SUITE(MysqlTestDriver);
 CPPUNIT_TEST(testDBConnection);
@@ -61,6 +62,7 @@ public:
 CPPUNIT_TEST(testMultipleResultsets);
 CPPUNIT_TEST(testDBMetaData);
 CPPUNIT_TEST(testTimestampField);
+CPPUNIT_TEST(testNumericConversionPrepared);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -373,6 +375,36 @@ void MysqlTestDriver::testTimestampField()
 xStatement->executeUpdate("DROP TABLE myTestTable");
 }
 
+/**
+ * Test getting value from a decimal type column from a result set of a
+ * prepared statement, getting as a tinyint, string, short, int, long.
+ */
+void MysqlTestDriver::testNumericConversionPrepared()
+{
+Reference xConnection = m_xDriver->connect(m_sUrl, m_infos);
+if (!xConnection.is())
+CPPUNIT_ASSERT_MESSAGE("cannot connect to data source!", 
xConnection.is());
+uno::Reference xStatement = xConnection->createStatement();
+CPPUNIT_ASSERT(xStatement.is());
+xStatement->executeUpdate("DROP TABLE IF EXISTS myTestTable");
+
+xStatement->executeUpdate("CREATE TABLE myTestTable (myDecimal 
DECIMAL(4,2))");
+xStatement->executeUpdate("INSERT INTO myTestTable VALUES (11.22)");
+Reference xPrepared
+= xConnection->prepareStatement("SELECT * from myTestTable");
+Reference xResultSet = xPrepared->executeQuery();
+xResultSet->next(); // use it
+Reference xRow(xResultSet, UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("11.22"), xRow->getString(1));
+// converting to integer types results in rounding down the number
+CPPUNIT_ASSERT_EQUAL(static_cast(11), xRow->getByte(1));
+CPPUNIT_ASSERT_EQUAL(static_cast(11), xRow->getShort(1));
+CPPUNIT_ASSERT_EQUAL(static_cast(11), xRow->getInt(1));
+CPPUNIT_ASSERT_EQUAL(static_cast(11), xRow->getLong(1));
+
+xStatement->executeUpdate("DROP TABLE myTestTable");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(MysqlTestDriver);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index a3e45937b610..b3630072c143 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -38,6 +38,7 @@ using namespace rtl;
 #include 
 
 using namespace connectivity::mysqlc;
+using namespace connectivity;
 using namespace cppu;
 using namespace com::sun::star;
 using namespace com::sun::star::lang;
@@ -51,6 +52,52 @@ using namespace ::comphelper;
 using ::osl::MutexGuard;
 
 #include 
+#include 
+#include 
+
+namespace
+{
+const std::type_index getTypeFromMysqlType(enum_field_types type)
+{
+switch (type)
+{
+case MYSQL_TYPE_TINY:
+return std::type_index(typeid(sal_Int8));
+case MYSQL_TYPE_SHORT:
+return std::type_index(typeid(sal_Int16));
+case MYSQL_TYPE_LONG:
+return std::type_index(typeid(sal_Int32));
+case MYSQL_TYPE_LONGLONG:
+return std::type_index(typeid(sal_Int64));
+case MYSQL_TYPE_FLOAT:
+return std::type_index(typeid(float));
+case MYSQL_TYPE_DOUBLE:
+return std::type_index(typeid(double));
+case MYSQL_TYPE_TIMESTAMP:
+case MYSQL_TYPE_DATETIME:
+return std::type_index(typeid(DateTime));
+case MYSQL_TYPE_DATE:
+return std::type_index(

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

[Tamas Bunth (via logerrit)]

 connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx |2 ++
 connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx |4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e884223505535d497bb5c7cd96dd17daaf4c415c
Author: Tamas Bunth 
AuthorDate: Thu Apr 25 12:17:06 2019 +0200
Commit: Andras Timar 
CommitDate: Thu Apr 25 15:46:25 2019 +0200

mysqlc: move template specialization to namespace

so gcc 4.8 would be happy about it.
See:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480

Change-Id: I7e696758c5598b9e64947bc9b1606c653becddce
Reviewed-on: https://gerrit.libreoffice.org/71294
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index 10cc65122dfa..cc9348860d7a 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -199,6 +199,7 @@ template  T 
OPreparedResultSet::retrieveValue(sal_Int32 nColumnIndex
 return getRowSetValue(nColumnIndex);
 }
 
+namespace connectivity { namespace mysqlc {
 template <> uno::Sequence 
OPreparedResultSet::retrieveValue(sal_Int32 column)
 {
 // TODO make conversion possible
@@ -257,6 +258,7 @@ template <> OUString 
OPreparedResultSet::retrieveValue(sal_Int32 column)
 OUString sReturn = OUString(sStr, *m_aData[column - 1].length, m_encoding);
 return sReturn;
 }
+}}
 
 ORowSetValue OPreparedResultSet::getRowSetValue(sal_Int32 nColumnIndex)
 {
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx 
b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
index e89345ba0196..048d7a44217c 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
@@ -93,8 +93,8 @@ class OPreparedResultSet final : public OBase_Mutex,
 
 void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const 
SAL_OVERRIDE;
 
-template  T safelyRetrieveValue(const sal_Int32 nColumnIndex);
-template  T retrieveValue(const sal_Int32 nColumnIndex);
+template  T safelyRetrieveValue(sal_Int32 nColumnIndex);
+template  T retrieveValue(sal_Int32 nColumnIndex);
 connectivity::ORowSetValue getRowSetValue(sal_Int32 nColumnIndex);
 
 // you can't delete objects of this type
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-6.1.6.2'

[Libreoffice Gerrit user]

Tag 'libreoffice-6.1.6.2' created by Christian Lohmaier 
 at 2019-04-25 13:26 +

Tag libreoffice-6.1.6.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlzBtYIACgkQ9DSh76/u
rqOiVw/+M9/CQPzREYRLHfbAp6euKumEtbLFTBEaXmlhdlKNe7lfpYz/W24eWWP2
zwCWhgsVeaom13KnYQ7ZOEISMnBd4O0rk6FbpCvXD/VM89BPAE5/4AOUTrmZxLOd
+9rxKu26mWsbLQjHiZl6AHwJzWTnylBCCutMtMKEooKGgRHseznnY3CkzC4oHp52
DICAl9UitsIs6uTUDX6hAX7SpFegJKFSrLICLOY+yZXmgEhSRsNCBJVyg7X7pNV+
3S0ArqhJnnewRZk1sp9WHxyC9kuwjkt4yI1YSi7hpLpdMBh7puS/aXDkw+oqdLLz
YWpmEQ7PUOmmFMkPD8WAqFDIAf0Nl4rbSMuUuH1a+w419HIktAQjXQaGaOUV1Vw/
9ZHHMjU8kxwQTDN+7hff2Hq69oFA8Brm9BmjwMQjrCjoRKqRb8bgd71xvQyGuSBn
PHMv+i5hyDijA5gAVFs0rWMyNdczS5DbfCzrk1p07X3BJv4AOIK7Hyjmqy6xsjWX
T6tA/nmvntgTSEXaCvl8LX/BfVIyMxV1hd+vCMsJSLZMKlDVV4YvECpq+fGk6sGz
MNCqOJnsKAi+/fYQoEY/leXXAbygFxGZzMayBGwYD9PxrYG/g8so9WaeVJsuWCcF
MmsGIgPaGxVPdQCU3oXIZ1oMFVNP+56KIEGP1DYH/D8XoPwdaq4=
=SR3D
-END PGP SIGNATURE-

Changes since libreoffice-6-1-branch-point-31:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-6.1.6.2'

[Libreoffice Gerrit user]

Tag 'libreoffice-6.1.6.2' created by Christian Lohmaier 
 at 2019-04-25 13:26 +

Tag libreoffice-6.1.6.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlzBtX4ACgkQ9DSh76/u
rqN/NBAAucAL6Ki+lOkmjeLkZkwTebB9yS9kMLLKsH6I5SCG00J67F+ixITodvoR
EPlaj+ALhqqb+Jkx1WCC0Py4zSAAtQGWSHqFngzR2AYMEikM5oAPnDDXwK/6U/gP
de7Iv74ZGrx/LOmpQiWggas3XAbxXWnz4gKzFmwJCVFa53m9sYRKcvvaXkryWpvB
3r6FWQunGeHPVM13wL7IYyUDoS2z3nyquIuZuyZlXKCWapsgH8+AK3NQY+NcupRm
rGmOTgV/PSSyuP7FbigECxKxmAKKDHfc7CEorPdOgOq/y/uTGFlWaluHcEK+Fqn9
sJnNCM7zqfiBYtmCdHzjHc/IPe21iwg/S2/4NYmiDsF1mYFog8XRYzsECxiI82eh
GBmPvFNUR4ECsvOJDkjvvblQtjnQbux6rEE7JlYX78R7RR8icGk7nGHERuJSSETk
TYTeGxJzzcY12FYkwozXMFJXSh/K7L0VbTknp4xUB9UvTuNO7U39vrMSnsHGl+CX
iSTg22+6c0VfnOBibbtnCFGdJDMtOb7EGl9oHvcuHrGkt6tleqIwP9ej98R5fD4X
/NWh2rlr2oe6zTmtaGcHNZ/tO7Ds+3ZlKdin1e9jJfIuxjVRvnqjbZMZNrKzMQ0I
37qy0lei8luFofUahzXDB+CwsTn3zBegjHU0YNADA0XmfpuTs7A=
=CFVu
-END PGP SIGNATURE-

Changes since libreoffice-6-1-branch-point-13:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-6.1.6.2'

[Libreoffice Gerrit user]

Tag 'libreoffice-6.1.6.2' created by Christian Lohmaier 
 at 2019-04-25 13:26 +

Tag libreoffice-6.1.6.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlzBtYIACgkQ9DSh76/u
rqNz5Q/9Fj6DJ8tKDpiJpY7UlPdG6roFHvpSLqi9I2qRSkvmlZ/RiRTBwczgwOEP
xGwM6+mMwF0AMubUERPnc+YXCwXhJl52m1MZAS1g0d/MuvVgTp10IG94Ok0Lz6dh
4AjjZEPFiKo7dLgdrUAugKHKev8/OOudsAWzwCeSj3Xyp6GQpnAvZVuriyBM+gm5
WZ8EK8gIxVlnCkK2xKG5g8A+QFA5piHDiiq44gGOn2mKO5WwGEruP/+YTEYycgP9
WeYonTJOadelyi7JdkHfwI0T2OwZlrPk5z4EDnWSI9/y9h8XiGSXHHNH6uYBlNBg
kF3I0cOGkLZKknYcwW+PtdXUVhu2jIPog9MeUSxRx3tQileuyasF33tkbvvp/cVF
qWBRjEQWdvUSE0ZLNAkb1cB5B80q44JOzN82DRPbcm+zEWtygosr1TX7HkqPGx2a
Xr8zWwSboL5L7QETEnWm2WgupOZMNzS8uQQ9pSOn9jb0lywY98I/1cO7En+wXpXz
6/ZDEcxGlRrELy5SQZBHEAy1yiZPwnyTp9HqAMTUNg9eI2WeFkqctcNVFYQ2jAkZ
BPYFKJ552p3EawFw98z4Su+lC3prh2gUDQcTgMopomBLevf2osPwXSWUuEOcddRS
+ZEgsExaxoUmPaPwaickjMY9Gwn/WMqTE84wB3q2DB4SUgVp+24=
=lYKO
-END PGP SIGNATURE-

Changes since libreoffice-6-1-branch-point-71:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-6' - configure.ac

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 2638cbf7179e3d31a96ea0a0fefad1fde475feb0
Author: Christian Lohmaier 
AuthorDate: Thu Apr 25 15:27:05 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Apr 25 15:27:05 2019 +0200

bump product version to 6.1.6.2.0+

Change-Id: I86d97d3baa4d4372ef6c6807c024b8de591ca0e6

diff --git a/configure.ac b/configure.ac
index 70c546e3bd38..c5dc39a84f9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.1.6.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.1.6.2.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-6.1.6.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-6.1.6.2' created by Christian Lohmaier 
 at 2019-04-25 13:26 +

Tag libreoffice-6.1.6.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlzBtYIACgkQ9DSh76/u
rqNdFBAAlJYzVEW4uDRCIjoO1BdAPN+aDV6VGLzglE0Klwk2OWs7thhLKxzC06BF
7tkn04EVS8bMz+KzjXpk+1xEgSDLpz1sk98vqtoRleFoVOI27wXkwbhEnSVW04o7
RzB6CxjBBO4mQxyz8zunT2ZfYJQrIbAs7hMoaFaUGmKPtMgukYweQt1mh3Igbaup
CWbU192o4kAM3qqSfmuZKPSb4KQrZKx8YwllGNRznieXbDRTwxySIusFfVUt6A6h
io3aTRt8TPco2DC9WL56HK8yAsDhPGe9cEgEcteMl+crtOEXuPo2UMFyc1bAg9nd
TT8GWGDr74qjRwzAhSi4jHo1EcL5DlRjz+FDwlGXAx5MXyT3i4+KaVysZzKKDuqd
GQBVbFy9fS5EF1Drr3MDHgPcoVMtSEguse8dN7kPtCt+5m3PZwangz8stSbsM0Qj
S4KLyjtsjd3nJdlcfR6DGeIRklmMQ3LqqnTowRVz3lZk4L/p7UqYVrqy6zmlYeLP
bW8WePq3fsiPK/JNaFjz9EDBZTJqct50wcijOUjTFbpBkWtI659HJo62tk50TcPO
xfvQHSImR0LqzyBnH0GtNPm/b/z2lUQ95OTLMdN2b3klydvnA7dXrzhTh0LpHtMN
IhiT3xQaeZoKkH0rbERGzSkZh7/oi8mQKnTzr7HSPFhlFkQKVSs=
=EP1g
-END PGP SIGNATURE-

Changes since libreoffice-6-1-branch-point-1521:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |2 
 svx/source/accessibility/AccessibleEmptyEditSource.cxx|2 
 svx/source/accessibility/AccessibleTextHelper.cxx |  107 ++
 svx/source/svdraw/svdoedge.cxx|3 
 4 files changed, 57 insertions(+), 57 deletions(-)

New commits:
commit 7ec3baef938d62d16558b7ee7fd84eb02b206551
Author: Xisco Fauli 
AuthorDate: Thu Apr 25 10:41:12 2019 +0200
Commit: Xisco Faulí 
CommitDate: Thu Apr 25 15:22:04 2019 +0200

Convert remaining SdrHint to static_cast

follow-up of 10c934147d469965dba6abc78efd02759a010b8e

Change-Id: I2085173dffd71dbbc68a0574400bebe132626dd9
Reviewed-on: https://gerrit.libreoffice.org/71284
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx 
b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 99201f1d748f..e0fdacb4665f 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -323,7 +323,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const 
SfxHint& rHint)
 if( pSdrModel && pSdrModel->isLocked() )
 return;
 
-const SdrHint* pSdrHint = dynamic_cast< const SdrHint* >( &rHint );
+const SdrHint* pSdrHint = ( rHint.GetId() == SfxHintId::ThisIsAnSdrHint ? 
static_cast(&rHint) : nullptr );
 
 //#i76053# do nothing when only changes on the hidden draw page were made 
( e.g. when the symbols for the dialogs are created )
 SdrPageView* pSdrPageView = GetPageView();
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx 
b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index 88fb69043cc1..dea02a4fc359 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -298,7 +298,7 @@ namespace accessibility
 
 void AccessibleEmptyEditSource::Notify( SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint )
 {
-const SdrHint* pSdrHint = dynamic_cast( &rHint );
+const SdrHint* pSdrHint = ( rHint.GetId() == 
SfxHintId::ThisIsAnSdrHint ? static_cast(&rHint) : nullptr );
 
 if( pSdrHint && pSdrHint->GetKind() == SdrHintKind::BeginEdit &&
 &mrObj == pSdrHint->GetObject() && mpEditSource.get() )
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx 
b/svx/source/accessibility/AccessibleTextHelper.cxx
index 8eae723f0653..f48771522017 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -1132,17 +1132,49 @@ namespace accessibility
 {
 const SfxHint& rHint = *pHint;
 
-// determine hint type
-const SdrHint* pSdrHint = dynamic_cast( &rHint 
);
-const TextHint* pTextHint = dynamic_cast( 
&rHint );
-const SvxViewChangedHint* pViewHint = dynamic_cast( &rHint );
-const SvxEditSourceHint* pEditSourceHint = dynamic_cast( &rHint );
 
 try
 {
-const sal_Int32 nParas = 
GetTextForwarder().GetParagraphCount();
 
-if( pEditSourceHint )
+if (rHint.GetId() == SfxHintId::ThisIsAnSdrHint)
+{
+const SdrHint* pSdrHint = static_cast< const SdrHint* 
>( &rHint );
+
+switch( pSdrHint->GetKind() )
+{
+case SdrHintKind::BeginEdit:
+{
+if(!IsActive())
+{
+break;
+}
+// change children state
+maParaManager.SetActive();
+
+// per definition, edit mode text has the focus
+SetFocus( true );
+break;
+}
+
+case SdrHintKind::EndEdit:
+{
+// focused child now loses focus
+ESelection aSelection;
+if( GetEditViewForwarder().GetSelection( 
aSelection ) )
+SetChildFocus( aSelection.nEndPara, false 
);
+
+// change children state
+maParaManager.SetActive( false );
+
+maLastSelection = ESelection( 
EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND,
+  
EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND);
+break;
+}
+default:
+  

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-6' - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 2572 ++--
 1 file changed, 1299 insertions(+), 1273 deletions(-)

New commits:
commit 977b3ee27a0c8f79466e0a6434eff7fd796d2504
Author: Christian Lohmaier 
AuthorDate: Thu Apr 25 15:09:06 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Apr 25 15:19:19 2019 +0200

update credits

Change-Id: I28e8d8e4ab940ae838fc555702b5580dc76931dd
(cherry picked from commit 982137545d5263bfcc28e896708ec851b8bcce99)
(cherry picked from commit d907fdc4e8170ac393f79ab2f4958e7a4cad27fa)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index c1181c23b06d..ad5c69379a8f 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.2.2.2$Linux_X86_64
 
LibreOffice_project/2b840030fec2aae0fd2658d8d4f9548af4e3518d2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.2.3.2$Linux_X86_64
 
LibreOffice_project/aecc05fe267cc68dde00352a451aa867b3b546ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   540
+   584
501
-   21068
-   26450
+   32440
+   18152
true
true

 
  view2
- 3577
- 3434
+ 3649
+ 3471
  501
- 540
- 21567
- 26988
+ 584
+ 32939
+ 18734
  0
  0
  false
@@ -114,7 +114,7 @@
true
false
true
-   8497088
+   8509381
false
false
false
@@ -325,37 +325,40 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -364,19 +367,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -385,19 +388,16 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

@@ -406,24 +406,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1059,7 +1059,7 @@

   
  Credits
-1422 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2019-04-07 12:25:13.
+1427 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2019-04-25 14:12:30.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1083,16 +1083,16 @@
  
  
   
-   Caolán 
McNamaraCommits: 25868Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 25940Joined: 
2000-10-10
   
   
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Stephan 
BergmannCommits: 16896Joined:

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 2572 ++--
 1 file changed, 1299 insertions(+), 1273 deletions(-)

New commits:
commit d907fdc4e8170ac393f79ab2f4958e7a4cad27fa
Author: Christian Lohmaier 
AuthorDate: Thu Apr 25 15:09:06 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Apr 25 15:17:54 2019 +0200

update credits

Change-Id: I28e8d8e4ab940ae838fc555702b5580dc76931dd
(cherry picked from commit 982137545d5263bfcc28e896708ec851b8bcce99)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index c1181c23b06d..ad5c69379a8f 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.2.2.2$Linux_X86_64
 
LibreOffice_project/2b840030fec2aae0fd2658d8d4f9548af4e3518d2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.2.3.2$Linux_X86_64
 
LibreOffice_project/aecc05fe267cc68dde00352a451aa867b3b546ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   540
+   584
501
-   21068
-   26450
+   32440
+   18152
true
true

 
  view2
- 3577
- 3434
+ 3649
+ 3471
  501
- 540
- 21567
- 26988
+ 584
+ 32939
+ 18734
  0
  0
  false
@@ -114,7 +114,7 @@
true
false
true
-   8497088
+   8509381
false
false
false
@@ -325,37 +325,40 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -364,19 +367,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -385,19 +388,16 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

@@ -406,24 +406,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1059,7 +1059,7 @@

   
  Credits
-1422 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2019-04-07 12:25:13.
+1427 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2019-04-25 14:12:30.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1083,16 +1083,16 @@
  
  
   
-   Caolán 
McNamaraCommits: 25868Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 25940Joined: 
2000-10-10
   
   
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Stephan 
BergmannCommits: 16896Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16926Joined: 
2000-10-04
 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - 2 commits - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 3224 ++--
 1 file changed, 1654 insertions(+), 1570 deletions(-)

New commits:
commit e46e4035fb9cead03c14972c9e861ea6a8c686aa
Author: Christian Lohmaier 
AuthorDate: Thu Apr 25 15:09:06 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Apr 25 15:12:44 2019 +0200

update credits

Change-Id: I28e8d8e4ab940ae838fc555702b5580dc76931dd
(cherry picked from commit 982137545d5263bfcc28e896708ec851b8bcce99)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index c1181c23b06d..ad5c69379a8f 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.2.2.2$Linux_X86_64
 
LibreOffice_project/2b840030fec2aae0fd2658d8d4f9548af4e3518d2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.2.3.2$Linux_X86_64
 
LibreOffice_project/aecc05fe267cc68dde00352a451aa867b3b546ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   540
+   584
501
-   21068
-   26450
+   32440
+   18152
true
true

 
  view2
- 3577
- 3434
+ 3649
+ 3471
  501
- 540
- 21567
- 26988
+ 584
+ 32939
+ 18734
  0
  0
  false
@@ -114,7 +114,7 @@
true
false
true
-   8497088
+   8509381
false
false
false
@@ -325,37 +325,40 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -364,19 +367,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -385,19 +388,16 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

@@ -406,24 +406,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1059,7 +1059,7 @@

   
  Credits
-1422 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2019-04-07 12:25:13.
+1427 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2019-04-25 14:12:30.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1083,16 +1083,16 @@
  
  
   
-   Caolán 
McNamaraCommits: 25868Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 25940Joined: 
2000-10-10
   
   
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Stephan 
BergmannCommits: 16896Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16926Joined: 
2000-10-04
 

[Libreoffice-commits] core.git: readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 2572 ++--
 1 file changed, 1299 insertions(+), 1273 deletions(-)

New commits:
commit 982137545d5263bfcc28e896708ec851b8bcce99
Author: Christian Lohmaier 
AuthorDate: Thu Apr 25 15:09:06 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Apr 25 15:09:06 2019 +0200

update credits

Change-Id: I28e8d8e4ab940ae838fc555702b5580dc76931dd

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index c1181c23b06d..ad5c69379a8f 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.2.2.2$Linux_X86_64
 
LibreOffice_project/2b840030fec2aae0fd2658d8d4f9548af4e3518d2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.2.3.2$Linux_X86_64
 
LibreOffice_project/aecc05fe267cc68dde00352a451aa867b3b546ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   540
+   584
501
-   21068
-   26450
+   32440
+   18152
true
true

 
  view2
- 3577
- 3434
+ 3649
+ 3471
  501
- 540
- 21567
- 26988
+ 584
+ 32939
+ 18734
  0
  0
  false
@@ -114,7 +114,7 @@
true
false
true
-   8497088
+   8509381
false
false
false
@@ -325,37 +325,40 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -364,19 +367,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -385,19 +388,16 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

@@ -406,24 +406,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1059,7 +1059,7 @@

   
  Credits
-1422 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2019-04-07 12:25:13.
+1427 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2019-04-25 14:12:30.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1083,16 +1083,16 @@
  
  
   
-   Caolán 
McNamaraCommits: 25868Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 25940Joined: 
2000-10-10
   
   
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Stephan 
BergmannCommits: 16896Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16926Joined: 
2000-10-04
   
   
-   *Noel GrandinCommits: 
11177Joined: 2011-12-12
+  

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

[heiko tietze (via logerrit)]

 sfx2/source/dialog/infobar.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 16751ae50c96443fb2027d6de5a1dbcf88d78763
Author: heiko tietze 
AuthorDate: Thu Apr 25 11:16:58 2019 +0200
Commit: Heiko Tietze 
CommitDate: Thu Apr 25 14:59:05 2019 +0200

tdf#106229 - New icon for infobar type success needed

InfoBarType::Success adjusted to the newly added successbox
see also I829218d014c13698d075e0fcd3162801d31ba093

Change-Id: I6b542928f3d1d1940b9da36b4c40cd8af97fb2f5
Reviewed-on: https://gerrit.libreoffice.org/71285
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index afc71404b6c8..5c65dc18ff40 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -80,7 +80,7 @@ OUString GetInfoBarIconName(InfoBarType ibType)
aRet = "vcl/res/infobox.svg";
break;
 case InfoBarType::Success:
-aRet = "cmd/lc_apply.svg";
+aRet = "vcl/res/successbox.svg";
 break;
 case InfoBarType::Warning:
 aRet = "vcl/res/warningbox.svg";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Minutes from the UX/design meeting 2019-Apr-25

[Heiko Tietze]

Present: Cor, Heiko

Tickets 

 * Display components of formula without edit
   + https://bugs.documentfoundation.org/show_bug.cgi?id=124102
   + WFM (Heiko, Eike, Cor)
   + alternative is the detective
   => resolve as WFM

 * EDITING: Need Default Keyboard Shortcut for Strike-Through
   + https://bugs.documentfoundation.org/show_bug.cgi?id=64849
   + ctrl+K suggested but not working
   + no need as customization works well; ctrl+k used for hyperlink (Dave)
   + though some apps provide a shortcut it's not one of the most frequently 
used features
   + we are short on good shortcuts, ctrl+k or - are occupied
   => keep it for customization

 * UI: the wording around tools - options - LibreOffice Calc - Formula - 
Recalculation on File Load is questionable
   + https://bugs.documentfoundation.org/show_bug.cgi?id=124784
   + use "ODF spreadsheet" (without "not saved...") and update help (Cor)
 + "recent" was it years ago
   + show the recalculation option with an infobar in case of "prompt user" 
(and make it the default)
   => go with this potential easyhack

 * Inform user when a font style doesn't exist (bold, italic,...)
   + https://bugs.documentfoundation.org/show_bug.cgi?id=100900
   + WFM, expert users know their fonts and there arent too many avergae fonts 
without bold/italic (Heiko)
   + +1 for the idea (Thomas, Tomaz, Cor, kellnerp)
 Cor on the fence - later on..
   + potential solutions
 + use icons with subtle decorations (small star at the edge when bold not 
included) with drawback at customization
 + add some kind of identification to the icon, eg. a frame
 + just have a tooltip "this weight is calculated"
   + icon decoration and tooltip dont work with menus (Format > Text > Bold 
or Style [F11] > Emphasis)
 + show an infobar when the file is loaded and fonts are included that 
neeed math
   + however.. requires to scan the doc, scan present fonts
   + and inform user if font is used, or only if font style, not present, 
is used
   + and mention font names too...
+ rather lots of things to do/consider for situations where we must 
consider that the involved user
  should have knowledge..
   => keep open, favorize infobar to show missing fonts and missing font 
properties

 * PARAGRAPH BORDER: Modification border always adds a new border
   + https://bugs.documentfoundation.org/show_bug.cgi?id=124748
   + "Merge with next paragraph" off by default
   + wouldnt change the default for rare case(s) (Cor)
   => closed as NAB (Stuart)

 * tabs in calc (for sheets) and draw (for layer) style
   + https://bugs.documentfoundation.org/show_bug.cgi?id=124572
   + and https://bugs.documentfoundation.org/show_bug.cgi?id=97555 for multi 
selection
   + proposed solutions are not perfect (Cor)
   + respect the system theming (Heiko)
   => WFM (Cor, Heiko)





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

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

[Mike Kaganski (via logerrit)]

 include/test/xmltesttools.hxx |   12 +++-
 test/source/xmltesttools.cxx  |5 +
 2 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 3fef9fa3f5d260dd1264b67d8b42aad476332eea
Author: Mike Kaganski 
AuthorDate: Thu Apr 25 12:51:40 2019 +0300
Commit: Mike Kaganski 
CommitDate: Thu Apr 25 14:42:13 2019 +0200

assertXPath: disallow passing rAttribute without rExpectedValue

Change-Id: I7fb59039429361dad04fb68507f40545f9c4dd6d
Reviewed-on: https://gerrit.libreoffice.org/71290
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx
index 4f725f5948c5..c24a81eb65d6 100644
--- a/include/test/xmltesttools.hxx
+++ b/include/test/xmltesttools.hxx
@@ -61,12 +61,14 @@ protected:
 int   getXPathPosition(xmlDocPtr pXmlDoc, const OString& rXPath, 
const OUString& rChildName);
 /**
  * Assert that rXPath exists, and returns exactly one node.
- * In case rAttribute is provided, the rXPath's attribute's value must
- * equal to the rExpected value.
  */
-void  assertXPath(xmlDocPtr pXmlDoc, const OString& rXPath,
-  const OString& rAttribute = OString(),
-  const OUString& rExpectedValue = OUString());
+void  assertXPath(xmlDocPtr pXmlDoc, const OString& rXPath);
+/**
+ * Assert that rXPath exists, returns exactly one node, and the rXPath's 
attribute's value
+ * equals to the rExpected value.
+ */
+void  assertXPath(xmlDocPtr pXmlDoc, const OString& rXPath, const 
OString& rAttribute,
+  const OUString& rExpectedValue);
 void  assertXPathAttrs(xmlDocPtr pXmlDoc, const OString& rXPath,
   const std::vector>& 
aPairVector);
 /**
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index 123af01b28db..20149cc03c37 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -135,6 +135,11 @@ OUString XmlTestTools::getXPathContent(xmlDocPtr pXmlDoc, 
const OString& rXPath)
 CPPUNIT_FAIL("Invalid XPath type");
 }
 
+void XmlTestTools::assertXPath(xmlDocPtr pXmlDoc, const OString& rXPath)
+{
+getXPath(pXmlDoc, rXPath, ""); // it asserts that rXPath exists, and 
returns exactly one node
+}
+
 void XmlTestTools::assertXPath(xmlDocPtr pXmlDoc, const OString& rXPath, const 
OString& rAttribute, const OUString& rExpectedValue)
 {
 OUString aValue = getXPath(pXmlDoc, rXPath, rAttribute);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 3157f70088c0c56c121f22d8687f3f7d01941978
Author: Christian Lohmaier 
AuthorDate: Thu Apr 25 14:12:30 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Apr 25 14:26:46 2019 +0200

Update git submodules

* Update translations from branch 'master'
  - update translations for master

and force-fix errors using pocheck

Change-Id: I04522500fe14e0d09925b196ccf7b7f94f3bfe64

diff --git a/translations b/translations
index 46a65ed74391..926f46dde833 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 46a65ed74391c4b44de7cc244d63bd603b6485a5
+Subproject commit 926f46dde833fdfeacd21a62dacd192b7ed1412c
___
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.0' - sd/source

[Jan Holesovsky (via logerrit)]

 sd/source/ui/unoidl/unomodel.cxx |   11 ---
 1 file changed, 11 deletions(-)

New commits:
commit 7e291eedbad335bf8bbc8a17cc3d633bf66d0e90
Author: Jan Holesovsky 
AuthorDate: Thu Apr 25 05:54:15 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Thu Apr 25 14:26:36 2019 +0200

sd lok: Remove the .uno:LeftPaneImpress call from sd lok initialization.

According to my testing, this makes no difference and the moving of
slides and multiple selection behaves the same way with or without this.

So let's return to not activating the SlideSorterBar, because otherwise
we are doing a lot of pixel bashing behind the scenes unnecessarily.

Having said that, if we want to activate it at some stage, it is better
to do something like the following (+ remove the explicit LOK-only if's
from svtools/source/config/slidesorterbaropt.cxx):

  SvtSlideSorterBarOptions().SetVisibleImpressView(true);

instead (and potentially we can also make it floating not to occupy the
space in the main view by

  GetWindow()->SetFloatingMode(true);

in the LOK case in sd/source/ui/dlg/PaneChildWindows.cxxi).

Change-Id: I86b23b484674ad4c6a75246ee6186ad9b828931f
Reviewed-on: https://gerrit.libreoffice.org/71271
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 96ba362c3c7b..fe0c82d9309a 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -32,7 +32,6 @@
 
 #include 
 
-#include 
 #include 
 #include 
 #include 
@@ -2512,16 +2511,6 @@ void 
SdXImpressDocument::initializeForTiledRendering(const css::uno::Sequence 
aPropertyValuesVector({aSynchronMode});
-
-// Create the SlideSorter which is used for multiselection and reordering.
-static const OUString aLeftPaneCommand(".uno:LeftPaneImpress");
-comphelper::dispatchCommand(aLeftPaneCommand, 
comphelper::containerToSequence(aPropertyValuesVector));
 }
 
 void SdXImpressDocument::postKeyEvent(int nType, int nCharCode, int nKeyCode)
___
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.0' - 2 commits - desktop/qa sd/qa

[Jan Holesovsky (via logerrit)]

 desktop/qa/desktop_lib/test_desktop_lib.cxx  |2 
 sd/qa/unit/tiledrendering/tiledrendering.cxx |  118 ---
 2 files changed, 6 insertions(+), 114 deletions(-)

New commits:
commit 5fd55f1e9fb37c3e0ac84823ff089906cd47aca2
Author: Jan Holesovsky 
AuthorDate: Thu Apr 25 06:06:19 2019 +0200
Commit: Ashod Nakashian 
CommitDate: Thu Apr 25 14:15:29 2019 +0200

Revert "disable unreliable SdTiledRenderingTest::testPasteTextOnSlide"

This shouldn't be necessary after the patch that removes the
.uno:LeftPaneImpress and revert of the unit test changs.

This reverts commit 23b03b5e21d936d1fdb2096c1c57b932a1c6f9e3.

Change-Id: Ie056d66b1d88c317e1b44ebe290313c307d807ae
Reviewed-on: https://gerrit.libreoffice.org/71273
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index c80ea10db842..1765db27be7d 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -2081,7 +2081,6 @@ void SdTiledRenderingTest::testTdf115783()
 
 void SdTiledRenderingTest::testPasteTextOnSlide()
 {
-#if 0
 // Load the document.
 comphelper::LibreOfficeKit::setActive();
 SdXImpressDocument* pXImpressDocument = 
createDoc("paste_text_onslide.odp");
@@ -2143,7 +2142,6 @@ void SdTiledRenderingTest::testPasteTextOnSlide()
 CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast(7393), aPos.getY(), 100);
 
 comphelper::LibreOfficeKit::setActive(false);
-#endif
 }
 
 void SdTiledRenderingTest::testTdf115873()
commit 59e8d4679a2104e329ca562d6c4ad5a2b7113793
Author: Jan Holesovsky 
AuthorDate: Wed Apr 24 22:16:52 2019 +0200
Commit: Ashod Nakashian 
CommitDate: Thu Apr 25 14:15:18 2019 +0200

Revert "sd: fix unittest failures due to enabling slide-sorter"

At the moment, the commit that was supposed to fix the unit tests is
actually breaking them for me, so let's revert.

This reverts commit 72da60a4fac5657de69c0651dd8e0a94fcc49b97.

Change-Id: I8ea636985de12ea19ad32a6064ece2d90589b7f9
Reviewed-on: https://gerrit.libreoffice.org/71272
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index ef83adc8f3e3..a952dcd0a0a0 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -1896,6 +1896,8 @@ void DesktopLOKTest::testPaintPartTile()
 //CPPUNIT_ASSERT(aView1.m_bTilesInvalidated);
 
 mxComponent.clear();
+
+comphelper::LibreOfficeKit::setActive(false);
 }
 
 void DesktopLOKTest::testWriterCommentInsertCursor()
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index b2f6a59f43cd..c80ea10db842 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -2087,55 +2087,6 @@ void SdTiledRenderingTest::testPasteTextOnSlide()
 SdXImpressDocument* pXImpressDocument = 
createDoc("paste_text_onslide.odp");
 CPPUNIT_ASSERT(pXImpressDocument);
 
-// Drain events.
-Scheduler::ProcessEventsToIdle();
-
-pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN,
-  convertMm100ToTwip(0), 
convertMm100ToTwip(0),
-  1, MOUSE_LEFT, 0);
-pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP,
-  convertMm100ToTwip(0), 
convertMm100ToTwip(0),
-  1, MOUSE_LEFT, 0);
-Scheduler::ProcessEventsToIdle();
-
-// select second text object
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::TAB);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::TAB);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::TAB);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::TAB);
-Scheduler::ProcessEventsToIdle();
-
-// step into text editing
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, '1', 0);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, '1', 0);
-Scheduler::ProcessEventsToIdle();
-
-// select full text
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_LEFT | 
KEY_SHIFT);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_LEFT | 
KEY_SHIFT);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_LEFT | 
KEY_SHIFT);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_LEFT | 
KEY_SHIFT);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_LEFT | 
KEY_SHIFT);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_LEFT | 
KEY_SHIFT);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_LEFT | 
KEY_SHIFT);
-pXImpressDocument-

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

[Henry Castro (via logerrit)]

 sw/source/core/doc/DocumentRedlineManager.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 40cddf85c58239258c794d28090183534eb4d6fc
Author: Henry Castro 
AuthorDate: Wed Mar 27 14:41:54 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Thu Apr 25 13:34:36 2019 +0200

tdf#120338: The paragraph formatting changes are not undone, part 1

Rejecting paragraph formatting is not implemented yet.
"Reject All" command is affected because the changes were not removed

Change-Id: Ic4af1def97025643ecbc5cf0752cd06d9b94c74a
Reviewed-on: https://gerrit.libreoffice.org/69865
Tested-by: Jenkins
Reviewed-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/70202
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 6aad179ab11e..b372114720f5 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -2342,6 +2342,7 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM& 
rPam, bool bCallDelete
 
 void DocumentRedlineManager::AcceptAllRedline(bool bAccept)
 {
+bool bSuccess = true;
 OUString sUndoStr;
 IDocumentUndoRedo& rUndoMgr = m_rDoc.GetIDocumentUndoRedo();
 
@@ -2358,12 +2359,12 @@ void DocumentRedlineManager::AcceptAllRedline(bool 
bAccept)
 rUndoMgr.StartUndo(bAccept ? SwUndoId::ACCEPT_REDLINE : 
SwUndoId::REJECT_REDLINE, &aRewriter);
 }
 
-while (mpRedlineTable->size() > 0)
+while (!mpRedlineTable->empty() && bSuccess)
 {
 if (bAccept)
-AcceptRedline(mpRedlineTable->size() - 1, true);
+bSuccess = AcceptRedline(mpRedlineTable->size() - 1, true);
 else
-RejectRedline(mpRedlineTable->size() - 1, true);
+bSuccess = RejectRedline(mpRedlineTable->size() - 1, true);
 }
 
 if (!sUndoStr.isEmpty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sysui/CustomTarget_infoplist.mk sysui/Package_infoplist.mk

[Stephan Bergmann (via logerrit)]

 sysui/CustomTarget_infoplist.mk |8 ++--
 sysui/Package_infoplist.mk  |7 ---
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 7a08bfeabe21193e04b9747a831653efcfc63190
Author: Stephan Bergmann 
AuthorDate: Thu Apr 25 08:39:03 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Apr 25 13:27:14 2019 +0200

tdf#122244 Put InfoPlist.strings files at correct places on macOS

Don't know how this got broken, presumably somewhere along the line from
01344a8ca57636ac87108c22f777a02fe6d963d5 "convert sysui to gbuild and add to
tail_build" through 4430ace32a8dfd534d5e1c64ec7855edad11e5c4 "tdf#90753:
AutoInstall more packages" to the current state, where a spurious bin 
directory
containing InfoPlist_*.zip files containing (empty) InfoPlist.strings files 
is
placed in instdir/ and in the root window of .dmg files.

As discussed in the 
 "Localizing Property List Values"
section, those InfoPlist.strings files shall apparently be placed into the
Contents/Resources/*.lproj/ directories.  (And the zip wrappers were 
presumably
needed in the past to transport their payload to the proper places in the
installation set, and are now obsolete.)

The list of Apple language IDs for the *.lproj directories was already
duplicated in Makefile.in (test-install target) and
solenv/bin/modules/installer/simplepackage.pm (sub create_package).  
Ultimately
those lists should all be consolidated.  Also, mapping from our language IDs
(see solenv/inc/langlist.mk) to the Apple *.lproj ones needs some fixing 
(e.g.,
from zh-CN to zh_CN), and it is not clear to me why the old code explicilty
added en-US to the gb_WITH_LANG list of languages for which to generate
InfoPlist_*.zip and InfoPlist.strings files (when that would presumably be 
the
non-localized strings stored in Info.plist itself).  But as mentiond, those
InfoPlist.strings files are all empty anyway (which may be due to another 
bug?),
so it shouldn't matter much---at least for now---what
Contents/Resources/*.lproj/InfoPlist.strings files exactly are present in an
installation set.

Change-Id: Iaadce2375ed319928891bace44f9866622ec3084
Reviewed-on: https://gerrit.libreoffice.org/71277
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sysui/CustomTarget_infoplist.mk b/sysui/CustomTarget_infoplist.mk
index f8625c2d1132..c98b8679b261 100644
--- a/sysui/CustomTarget_infoplist.mk
+++ b/sysui/CustomTarget_infoplist.mk
@@ -17,8 +17,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,sysui/infoplist))
 $(eval $(call gb_CustomTarget_register_targets,sysui/infoplist,\
PkgInfo \
Info.plist \
-   $(foreach lang,en-US $(gb_WITH_LANG),\
-   InfoPlist_$(lang).zip InfoPlist_$(lang)/InfoPlist.strings) \
+   $(foreach lang,$(filter ca cs da de el en es fi fr hr hu id it ja ko ms 
nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW,$(gb_WITH_LANG)),\
+   InfoPlist_$(lang)/InfoPlist.strings) \
 ))
 
 $(info_WORKDIR)/PkgInfo:
@@ -28,10 +28,6 @@ $(info_WORKDIR)/PkgInfo:
 $(info_WORKDIR)/Info.plist: $(info_BUILDDIR)/Info.plist
cp $< $@
 
-$(info_WORKDIR)/InfoPlist_%.zip: $(info_WORKDIR)/InfoPlist_%/InfoPlist.strings
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ZIP,1)
-   zip -j $@ $<
-
 $(info_WORKDIR)/InfoPlist_%/InfoPlist.strings: \
$(info_WORKDIR)/Info.plist $(info_WORKDIR)/documents.ulf
mkdir -p $(dir $@)
diff --git a/sysui/Package_infoplist.mk b/sysui/Package_infoplist.mk
index 3f224ae4c157..7712b3e77e4e 100644
--- a/sysui/Package_infoplist.mk
+++ b/sysui/Package_infoplist.mk
@@ -17,8 +17,9 @@ $(eval $(call 
gb_Package_add_files,infoplist,$(PRODUCTNAME_WITHOUT_SPACES).app/C
Info.plist \
 ))
 
-$(eval $(call gb_Package_add_files,infoplist,bin,\
-   $(foreach lang,en-US $(gb_WITH_LANG),InfoPlist_$(lang).zip) \
-))
+$(foreach lang,$(filter ca cs da de el en es fi fr hr hu id it ja ko ms nl no 
pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW,$(gb_WITH_LANG)),\
+$(eval $(call 
gb_Package_add_files,infoplist,$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/Resources/$(lang).lproj,\
+   InfoPlist_$(lang)/InfoPlist.strings \
+)))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 sc/source/ui/inc/viewdata.hxx  |4 ++--
 sc/source/ui/view/viewdata.cxx |   23 ++-
 2 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 5e2270a1be33a3408b01729a75a09516fd4408b2
Author: Henry Castro 
AuthorDate: Fri Mar 29 09:01:05 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Thu Apr 25 13:26:38 2019 +0200

sc lok: avoid save incorrect data, whether the pane has ...

horizontal / vertical splits

In the tiled rendering case the horizontal / vertical splits were
not implemented, so the leftmost visible column is 0.
So preserve horizontal / vertical splits when saving the document

Change-Id: I15b6f009910e51fdaf475de5aac1ebded16c1956
Reviewed-on: https://gerrit.libreoffice.org/69926
Tested-by: Jenkins
Reviewed-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/70079
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 7b58edc13736..b94c3343f70b 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -396,8 +396,8 @@ public:
 
 SCTAB   GetTabNo() const{ return nTabNo; }
 ScSplitPos  GetActivePart() const   { return 
pThisTab->eWhichActive; }
-SCCOL   GetPosX( ScHSplitPos eWhich ) const { return 
pThisTab->nPosX[eWhich]; }
-SCROW   GetPosY( ScVSplitPos eWhich ) const { return 
pThisTab->nPosY[eWhich]; }
+SCCOL   GetPosX( ScHSplitPos eWhich ) const;
+SCROW   GetPosY( ScVSplitPos eWhich ) const;
 SCCOL   GetCurX() const { return 
pThisTab->nCurX; }
 SCROW   GetCurY() const { return 
pThisTab->nCurY; }
 SCCOL   GetCurXForTab( SCTAB nTabIndex ) const;
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index c144256df7a7..ff46031d37ff 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -565,7 +565,6 @@ void ScViewDataTable::ReadUserDataSequence(const 
uno::Sequence >= nTemp32;
-nPosX[SC_SPLIT_LEFT] = bIsTiledRendering ? 0 :
-   SanitizeCol( static_cast(nTemp32));
+nPosX[SC_SPLIT_LEFT] = SanitizeCol( static_cast(nTemp32));
 }
 else if (sName == SC_POSITIONRIGHT)
 {
 aSettings[i].Value >>= nTemp32;
-nPosX[SC_SPLIT_RIGHT] = bIsTiledRendering ? 0 :
-SanitizeCol( static_cast(nTemp32));
+nPosX[SC_SPLIT_RIGHT] = SanitizeCol( static_cast(nTemp32));
 }
 else if (sName == SC_POSITIONTOP)
 {
 aSettings[i].Value >>= nTemp32;
-nPosY[SC_SPLIT_TOP] = bIsTiledRendering ? 0 :
-  SanitizeRow( static_cast(nTemp32));
+nPosY[SC_SPLIT_TOP] = SanitizeRow( static_cast(nTemp32));
 }
 else if (sName == SC_POSITIONBOTTOM)
 {
 aSettings[i].Value >>= nTemp32;
-nPosY[SC_SPLIT_BOTTOM] = bIsTiledRendering ? 0 :
- SanitizeRow( static_cast(nTemp32));
+nPosY[SC_SPLIT_BOTTOM] = SanitizeRow( static_cast(nTemp32));
 }
 else if (sName == SC_ZOOMTYPE)
 {
@@ -1364,6 +1359,16 @@ void ScViewData::ResetOldCursor()
 pThisTab->mbOldCursorValid = false;
 }
 
+SCCOL ScViewData::GetPosX( ScHSplitPos eWhich ) const
+{
+return comphelper::LibreOfficeKit::isActive() ? 0 : 
pThisTab->nPosX[eWhich];
+}
+
+SCROW ScViewData::GetPosY( ScVSplitPos eWhich ) const
+{
+return comphelper::LibreOfficeKit::isActive() ? 0 : 
pThisTab->nPosY[eWhich];
+}
+
 SCCOL ScViewData::GetCurXForTab( SCTAB nTabIndex ) const
 {
 if (!ValidTab(nTabIndex) || (nTabIndex >= 
static_cast(maTabData.size(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit e65819e14aeccb59679ac900bf73dcc990da63e4
Author: Ilmari Lauhakangas 
AuthorDate: Tue Apr 23 13:02:54 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Apr 25 13:03:49 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-2'
  - tdf#124725 use window.location.pathname

So any backslashes will be forward instead.

Change-Id: I92aa4e0e6cb599431ba16da5bc481f5ad3877481
Reviewed-on: https://gerrit.libreoffice.org/71124
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index 6543664118f1..455c31acf023 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6543664118f1ddaa7ec4ecfec7a42889fa8f76a9
+Subproject commit 455c31acf023c7c739629eb41eb957c5727dd62d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-2' - help3xsl/help.js

[Libreoffice Gerrit user]

 help3xsl/help.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 455c31acf023c7c739629eb41eb957c5727dd62d
Author: Ilmari Lauhakangas 
AuthorDate: Tue Apr 23 13:02:54 2019 +0200
Commit: Olivier Hallot 
CommitDate: Thu Apr 25 13:03:49 2019 +0200

tdf#124725 use window.location.pathname

So any backslashes will be forward instead.

Change-Id: I92aa4e0e6cb599431ba16da5bc481f5ad3877481
Reviewed-on: https://gerrit.libreoffice.org/71124
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
Tested-by: Jenkins

diff --git a/help3xsl/help.js b/help3xsl/help.js
index e806eeed4..7789c17ae 100644
--- a/help3xsl/help.js
+++ b/help3xsl/help.js
@@ -8,7 +8,7 @@
  */
 
 // Pagination and fuzzy search
-var url = document.URL;
+var url = window.location.pathname;
 var moduleRegex = new RegExp('text\\/(\\w+)\\/');
 var regexArray = moduleRegex.exec(url);
 var currentModule = null;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - setup_native/source

[Mike Kaganski (via logerrit)]

 setup_native/source/win32/customactions/inst_msu/inst_msu.cxx |  120 +++---
 1 file changed, 86 insertions(+), 34 deletions(-)

New commits:
commit 1151e8fe6c8061f8b9c4777fba9665464ab5b5b8
Author: Mike Kaganski 
AuthorDate: Sun Apr 21 22:39:43 2019 +0300
Commit: Caolán McNamara 
CommitDate: Thu Apr 25 13:00:55 2019 +0200

tdf#124794: Wait for WU service stopped before launching wusa.exe

It seems that wusa.exe would fail with error code 0x80080005
if launched too soon after WU service was sent a stop control
(which was added in tdf#123832).

Change-Id: I470a8a8e933e8a0cd6208c095ed63c1761b3b434
Reviewed-on: https://gerrit.libreoffice.org/71045
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/71062
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx 
b/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx
index d81532020cce..d8c196ccd1a8 100644
--- a/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx
+++ b/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx
@@ -181,6 +181,46 @@ public:
 }
 };
 
+// This class uses MsiProcessMessage to check for user input: it returns 
IDCANCEL when user cancels
+// installation. It throws a special exception, to be intercepted in main 
action function to return
+// corresponding exit code.
+class UserInputChecker
+{
+public:
+class eUserCancelled
+{
+};
+
+UserInputChecker(MSIHANDLE hInstall)
+: m_hInstall(hInstall)
+, m_hProgressRec(MsiCreateRecord(3))
+{
+// Use explicit progress messages
+MsiRecordSetInteger(m_hProgressRec, 1, 1);
+MsiRecordSetInteger(m_hProgressRec, 2, 1);
+MsiRecordSetInteger(m_hProgressRec, 3, 0);
+int nResult = MsiProcessMessage(m_hInstall, INSTALLMESSAGE_PROGRESS, 
m_hProgressRec);
+if (nResult == IDCANCEL)
+throw eUserCancelled();
+// Prepare the record to following progress update calls
+MsiRecordSetInteger(m_hProgressRec, 1, 2);
+MsiRecordSetInteger(m_hProgressRec, 2, 0); // step by 0 - don't move 
progress
+MsiRecordSetInteger(m_hProgressRec, 3, 0);
+}
+
+void ThrowIfUserCancelled()
+{
+// Check if user has cancelled
+int nResult = MsiProcessMessage(m_hInstall, INSTALLMESSAGE_PROGRESS, 
m_hProgressRec);
+if (nResult == IDCANCEL)
+throw eUserCancelled();
+}
+
+private:
+MSIHANDLE m_hInstall;
+PMSIHANDLE m_hProgressRec;
+};
+
 // Checks if Windows Update service is disabled, and if it is, enables it 
temporarily.
 // Also stops the service if it's currently running, because it seems that 
wusa.exe
 // does not freeze when it starts the service itself.
@@ -200,7 +240,7 @@ public:
 if (mhService)
 {
 EnsureServiceEnabled(mhInstall, mhService.get(), false);
-StopService(mhInstall, mhService.get());
+StopService(mhInstall, mhService.get(), false);
 }
 }
 catch (std::exception& e)
@@ -230,8 +270,9 @@ private:
 // Stop currently running service to prevent wusa.exe from hanging 
trying to detect if the
 // update is applicable (sometimes this freezes it ~indefinitely; 
it seems that it doesn't
 // happen if wusa.exe starts the service itself: 
https://superuser.com/questions/1044528/).
+// tdf#124794: Wait for service to stop.
 if (nCurrentStatus == SERVICE_RUNNING)
-StopService(hInstall, hService.get());
+StopService(hInstall, hService.get(), true);
 
 if (nCurrentStatus == SERVICE_RUNNING
 || !EnsureServiceEnabled(hInstall, hService.get(), true))
@@ -260,9 +301,8 @@ private:
 DWORD nCbRequired = 0;
 if (!QueryServiceConfigW(hService, nullptr, 0, &nCbRequired))
 {
-DWORD nError = GetLastError();
-if (nError != ERROR_INSUFFICIENT_BUFFER)
-ThrowLastError("QueryServiceConfigW");
+if (DWORD nError = GetLastError(); nError != 
ERROR_INSUFFICIENT_BUFFER)
+ThrowWin32Error("QueryServiceConfigW", nError);
 }
 std::unique_ptr pBuf(new char[nCbRequired]);
 LPQUERY_SERVICE_CONFIGW pConfig = 
reinterpret_cast(pBuf.get());
@@ -336,7 +376,7 @@ private:
 return aServiceStatus.dwCurrentState;
 }
 
-static void StopService(MSIHANDLE hInstall, SC_HANDLE hService)
+static void StopService(MSIHANDLE hInstall, SC_HANDLE hService, bool bWait)
 {
 try
 {
@@ -344,12 +384,34 @@ private:
 {
 SERVICE_STATUS aServiceStatus{};
 if (!ControlService(hService, SERVICE_CONTROL_STOP, 
&aServiceStatus))
-WriteLog(hInstall, Win32ErrorMessage("ControlService

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/qa

[Andras Timar (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter2.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a835ffa3945a393e0d58705f50682c6e635e9f8a
Author: Andras Timar 
AuthorDate: Thu Apr 25 12:49:54 2019 +0200
Commit: Andras Timar 
CommitDate: Thu Apr 25 12:49:54 2019 +0200

disable SwUiWriterTest2::testTdf122942 on Mac

Change-Id: I1c7e1ea5b3ba5fa8b6969081b0df4eba48af327c

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index a5b74cc8265b..2da2640e7fcc 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -433,6 +433,7 @@ void SwUiWriterTest2::testMixedFormFieldInsertion()
 
 void SwUiWriterTest2::testTdf122942()
 {
+#ifndef MACOSX
 load(DATA_DIRECTORY, "tdf122942.odt");
 SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
 SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
@@ -471,6 +472,7 @@ void SwUiWriterTest2::testTdf122942()
 CPPUNIT_ASSERT(pObject2);
 const tools::Rectangle& rOutRect2 = pObject2->GetLastBoundRect();
 CPPUNIT_ASSERT(rOutRect2.Top() > rOutRect1.Top() && rOutRect2.Top() < 
rOutRect1.Bottom());
+#endif
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest2);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice ESC call, Thur - 16:00 central European (local) time

[Michael Meeks]

Hi everyone,

Prototype agenda below, bug metrics also at the link below;
extra items appreciated as last-week:

https://demo.collaboracloudsuite.com/tdf/

For now we continue using the public jitsi server:

https://meet.jit.si/tdfesc

ATB,

Michael.

* Completed Action Items:

* Pending Action Items:
+ run the certification script (Kendy)
+ drop ESC advice on alien formats into relevant bug ticket (Heiko)
+ mentors to check through the list here (All)
+ https://summerofcode.withgoogle.com/

* Release Engineering update (Christian)
+ 6.2.4 rc1 – next week starting April 29th
+ 6.1.6 rc2 - status
+ 6.3 alpha1: early May, week 19
+ Remotes
+ Android viewer
+ Online

* Documentation (Olivier)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
251(251) (topicUI) bugs open, 211(211) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months  
 added 11(7) 20(10)34(9)   78(11) 
 commented 71(30)   217(34)   493(35)1390(66) 
   removed  0(-3) 5(-1)13(0)   22(-1) 
  resolved  3(1) 11(-4)50(-5) 132(2)  
+ top 10 contributors:
  Tietze, Heiko made 89 changes in 1 month, and 568 changes in 1 year
  Roman Kuznetsov made 70 changes in 1 month, and 188 changes in 1 year
  Kainz, Andreas made 63 changes in 1 month, and 208 changes in 1 year
  Foote, V Stuart made 36 changes in 1 month, and 201 changes in 1 year
  Dieter Praas made 33 changes in 1 month, and 149 changes in 1 year
  Xisco Faulí made 33 changes in 1 month, and 254 changes in 1 year
  Thomas Lendo made 24 changes in 1 month, and 223 changes in 1 year
  Brinzing, Oliver made 20 changes in 1 month, and 26 changes in 1 year
  Cor Nouws made 15 changes in 1 month, and 113 changes in 1 year
  Mehrbrodt, Samuel made 10 changes in 1 month, and 67 changes in 1 year

* Crash Testing (Caolan)
+ Google / ossfuzz:
  + ?? 10 (+0,-0) issues
+ Crash testing:
  + 8(-19) import failure, 4(-2) export failures
+ ForcePoint, round 9
  + complete (?)
+ CNA bits – got 1st batch of CVE numbers.
  + CVE-2019-9847 assigned
+ coverity suspended / old – until new version that supports c++17(?)

* Crash Reporting (Xisco)
  + http://crashreport.libreoffice.org/stats/version/6.1.4.2
+ 990 (-127)
  + http://crashreport.libreoffice.org/stats/version/6.1.5.2
+ 1132 (-12)
  + http://crashreport.libreoffice.org/stats/version/6.2.1.2
+ 1168 (-300)
  + http://crashreport.libreoffice.org/stats/version/6.2.2.2
+ 2467 (+468)

* Hackfests & Events (?)
   + this year hackfests coming up:
+ Paris in Summer (Sophie)
  + first week of July Fri/Sat 5th / 6th
+ near Gare de Nord, La Mouette working on communication
  + designing a flier – avoids stomping on exams at end of June
  + https://wiki.documentfoundation.org/Hackfest/Paris2019 
  + hope to have a Hackfest NG setup again – mentees, please speak up!
  + people are adding themselves to the wiki already.
+ tentative Dresden: late autumn (past mid-October, for having students)
  + Brussels Hackathon – October (?) → Italo to confirm.
   + hope to have one each quarter.

* GSOC 2019 (Thorsten/Xisco/Moggi/Heiko)
   + Timeline:
 + April 22, 2019: Organization Slot Request
 + May 1, 2019: Organization Project Selection
 + May 6, 2019: Student Projects Announced

* C++ lectures (Xisco)
+ https://wiki.documentfoundation.org/Events/C%2B%2BLectures
+ NEXT SESSION: April, 25
+ need to discuss the direction as to whether we continue.

* mentoring/easyhack update
  committer...   1 week   1 month 3 months  12 months   
  open   39(-44)  99(-12) 103(-12)  113(-12)
   reviews 1040(-306)   4715(-32)   13175(-511)   47409(408)
merged  203(-68)1139(-20)3564(-117)   14598(-45)
 abandoned8(1)83(1)   180(-5)   809(-2) 
   own commits  193(-32) 949(-13)3141(-65)14344(-89)
review commits   71(-12) 310(14)  869(-49) 3828(-23)
contributor...   1 week1 month   3 months   12 months   
  open 26(0)  58(7) 58(5)   59(5)   
   reviews 45(-78)   311(-1)   540(-14)   5654(-636)
merged 55(-14)   223(31)   454(20)1752(-7)  
 abandoned  6(-18)47(-4)   100(5)  317(-6)  
   own commits 56(-10)   223(31)   495(3) 1805(17)  
review commits  0(0)   0(0)  0(0)0(0)   
+ easyHack statistics:
   needsDevEval 93(93)   needsUXEval 0(0)   cleanup_comments 260(260)  

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

[Xisco Fauli (via logerrit)]

 sw/qa/uitest/writer_tests5/tdf117039.py |3 +++
 sw/qa/uitest/writer_tests5/tdf118540.py |3 +++
 sw/qa/uitest/writer_tests5/tdf121591.py |3 +++
 3 files changed, 9 insertions(+)

New commits:
commit 6ff2fd1f986da64e43398e9c66393bb44b29be63
Author: Xisco Fauli 
AuthorDate: Thu Apr 25 09:25:41 2019 +0200
Commit: Caolán McNamara 
CommitDate: Thu Apr 25 12:31:46 2019 +0200

Blind fix for flaky print preview test

I faced the same problem in

https://cgit.freedesktop.org/libreoffice/contrib/dev-tools/commit/?id=f631db9e5e83706ed2678fb4db737700dd623a1b

Change-Id: I1adcc418e0efa7e77e1dda5b9dccd7c55cb5267f
Reviewed-on: https://gerrit.libreoffice.org/71280
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/qa/uitest/writer_tests5/tdf117039.py 
b/sw/qa/uitest/writer_tests5/tdf117039.py
index f2750b35c2a8..9045f71c9f9c 100644
--- a/sw/qa/uitest/writer_tests5/tdf117039.py
+++ b/sw/qa/uitest/writer_tests5/tdf117039.py
@@ -24,6 +24,9 @@ class tdf117039(UITestCase):
 document = self.ui_test.get_component()
 self.xUITest.executeCommand(".uno:PrintPreview")  #open print preview
 self.xUITest.executeCommand(".uno:ClosePreview")  # close print preview
+
+self.xUITest.getTopFocusWindow() #Get focus after closing preview
+
 #verify
 self.assertEqual(document.Text.String[0:22], "Test digital signature")
 self.ui_test.close_doc()
diff --git a/sw/qa/uitest/writer_tests5/tdf118540.py 
b/sw/qa/uitest/writer_tests5/tdf118540.py
index 0e00ad7ec0f3..a7b403d3b750 100644
--- a/sw/qa/uitest/writer_tests5/tdf118540.py
+++ b/sw/qa/uitest/writer_tests5/tdf118540.py
@@ -29,6 +29,9 @@ class tdf118540(UITestCase):
 xOkBtn = xDialog.getChild("ok")
 xOkBtn.executeAction("CLICK", tuple())
 self.xUITest.executeCommand(".uno:ClosePreview")  # close print preview
+
+self.xUITest.getTopFocusWindow() #Get focus after closing preview
+
 #verify
 self.assertEqual(document.Text.String[0:4], "Test")
 self.ui_test.close_doc()
diff --git a/sw/qa/uitest/writer_tests5/tdf121591.py 
b/sw/qa/uitest/writer_tests5/tdf121591.py
index 04a42eec2ac9..ad61a14eb247 100644
--- a/sw/qa/uitest/writer_tests5/tdf121591.py
+++ b/sw/qa/uitest/writer_tests5/tdf121591.py
@@ -28,6 +28,9 @@ class tdf121591(UITestCase):
 #open and close print preview
 self.xUITest.executeCommand(".uno:PrintPreview")  #open print preview
 self.xUITest.executeCommand(".uno:ClosePreview")  # close print preview
+
+self.xUITest.getTopFocusWindow() #Get focus after closing preview
+
 #verify nr. of frames
 self.assertEqual(document.TextFrames.getCount(), 1)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e43f2dddc29f2ed2c6ebed104ea69b19a88b168e
Author: Justin Luth 
AuthorDate: Thu Apr 25 10:04:59 2019 +0300
Commit: Stephan Bergmann 
CommitDate: Thu Apr 25 11:36:37 2019 +0200

related tdf#123636: fix unit test for tinderbox

Change-Id: Ia7dc9879aeaa978d1cb1b0573fb69bd63bd5d4e0
Reviewed-on: https://gerrit.libreoffice.org/71278
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 41c04f56c687..5bf170249e1a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -98,7 +98,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123636_newlinePageBreak3, 
"tdf123636_newlinePage
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of Pages", 2, getPages() );
 
 xmlDocPtr pDump = parseLayoutDump();
-assertXPath(pDump, "/root/page[1]/body/txt[3]", "Last line on page 1");
+assertXPath(pDump, "/root/page[1]/body/txt[3]/Text[1]", "Portion", "Last 
line on page 1");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf123636_newlinePageBreak4, 
"tdf123636_newlinePageBreak4.docx")
@@ -109,7 +109,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123636_newlinePageBreak4, 
"tdf123636_newlinePage
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of Pages", 2, getPages() );
 
 xmlDocPtr pDump = parseLayoutDump();
-assertXPath(pDump, "/root/page[2]/body/txt[1]", "");
+assertXPath(pDump, "/root/page[2]/body/txt[1]/Text", 0);
 }
 
 DECLARE_OOXMLEXPORT_TEST(tdf123912_protectedForm, 
"tdf123912_protectedForm.odt")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen (via logerrit)]

 io/IwyuFilter_io.yaml   |   36 
 io/qa/textinputstream.cxx   |4 --
 io/source/TextInputStream/TextInputStream.cxx   |7 +---
 io/source/TextOutputStream/TextOutputStream.cxx |7 +---
 io/source/acceptor/acc_pipe.cxx |1 
 io/source/acceptor/acc_socket.cxx   |2 -
 io/source/acceptor/acceptor.cxx |5 ---
 io/source/acceptor/acceptor.hxx |4 ++
 io/source/connector/connector.cxx   |6 
 io/source/connector/ctr_pipe.cxx|1 
 io/source/connector/ctr_socket.cxx  |1 
 io/source/services.cxx  |2 -
 io/source/services.hxx  |4 +-
 io/source/stm/odata.cxx |1 
 io/source/stm/omark.cxx |6 
 io/source/stm/opipe.cxx |6 ++--
 io/source/stm/opump.cxx |9 --
 io/source/stm/streamhelper.cxx  |4 --
 io/source/stm/streamhelper.hxx  |4 ++
 19 files changed, 56 insertions(+), 54 deletions(-)

New commits:
commit f9b8c2d57b10de6344ffc0b09947484a586b
Author: Gabor Kelemen 
AuthorDate: Tue Mar 19 01:54:54 2019 +0100
Commit: Miklos Vajna 
CommitDate: Thu Apr 25 11:28:15 2019 +0200

tdf#42949 Fix IWYU warnings in io/

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I16dfde335816053e5821d5e975b27b6e4819b1a8
Reviewed-on: https://gerrit.libreoffice.org/71135
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/io/IwyuFilter_io.yaml b/io/IwyuFilter_io.yaml
new file mode 100644
index ..9d4609898341
--- /dev/null
+++ b/io/IwyuFilter_io.yaml
@@ -0,0 +1,36 @@
+---
+assumeFilename: io/source/services.cxx
+blacklist:
+io/source/acceptor/acceptor.cxx:
+# Avoid loplugin:unreffun error
+- services.hxx
+io/source/connector/connector.hxx:
+# Base class needs full type
+- com/sun/star/connection/XConnection.hpp
+- com/sun/star/connection/XConnectionBroadcaster.hpp
+# Don't replace with impl. detail
+- osl/socket.hxx
+- osl/pipe.hxx
+io/source/connector/connector.cxx:
+# Avoid loplugin:unreffun error
+- services.hxx
+io/source/TextInputStream/TextInputStream.cxx:
+# Avoid loplugin:unreffun error
+- services.hxx
+io/source/TextOutputStream/TextOutputStream.cxx:
+# Avoid loplugin:unreffun error
+- services.hxx
+io/source/stm/odata.cxx:
+# Avoid loplugin:unreffun error
+- services.hxx
+io/source/stm/opipe.cxx:
+# Avoid loplugin:unreffun error
+- services.hxx
+io/source/stm/opump.cxx:
+# Avoid loplugin:unreffun error
+- services.hxx
+# Don't replace with URE API impl. detail
+- cppuhelper/interfacecontainer.hxx
+io/source/stm/omark.cxx:
+# Avoid loplugin:unreffun error
+- services.hxx
diff --git a/io/qa/textinputstream.cxx b/io/qa/textinputstream.cxx
index 6e67f5e986ed..dfeb478f975c 100644
--- a/io/qa/textinputstream.cxx
+++ b/io/qa/textinputstream.cxx
@@ -12,17 +12,13 @@
 #include 
 #include 
 #include 
-#include 
 
-#include 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/io/source/TextInputStream/TextInputStream.cxx 
b/io/source/TextInputStream/TextInputStream.cxx
index 3594d0008119..06b8753f6999 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -19,11 +19,7 @@
 
 #include 
 
-#include 
-
-#include 
 #include 
-#include 
 #include 
 
 #include 
@@ -39,6 +35,8 @@
 
 #include 
 
+namespace com::sun::star::uno { class XComponentContext; }
+
 #define IMPLEMENTATION_NAME "com.sun.star.comp.io.TextInputStream"
 #define SERVICE_NAME "com.sun.star.io.TextInputStream"
 
@@ -47,7 +45,6 @@ using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::registry;
 
 namespace io_TextInputStream
 {
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx 
b/io/source/TextOutputStream/TextOutputStream.cxx
index 4caef34cd5c2..ce911ce318bc 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -19,11 +19,7 @@
 
 
 
-#include 
-
-#include 
 #include 
-#include 
 #include 
 
 #include 
@@ -35,6 +31,8 @@
 
 #include 
 
+namespace com::sun::star::uno { class XComponentContext; }
+
 #define IMPLEMENTATION_NAME "com.sun.star.comp.io.TextOutputStream"
 #define SERVICE_NAME "com.sun.star.io.TextOutputStream"
 
@@ -43,7 +41,6 @@ using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::io;
-using namespace ::com::su

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

[Vasily Melenchuk (via logerrit)]

 sc/qa/unit/data/ods/autoheight2rows.ods |binary
 sc/qa/unit/subsequent_filters-test.cxx  |   18 ++
 2 files changed, 18 insertions(+)

New commits:
commit 5a2aba31867e0912700f6c976f152116d902fe21
Author: Vasily Melenchuk 
AuthorDate: Wed Apr 24 12:50:50 2019 +0300
Commit: Thorsten Behrens 
CommitDate: Thu Apr 25 11:27:17 2019 +0200

calc: extra unittest for rows autoheight on load

Change-Id: Ie5310d3c3d4fde59a0718dbda228c638b7e0c366
Reviewed-on: https://gerrit.libreoffice.org/71235
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sc/qa/unit/data/ods/autoheight2rows.ods 
b/sc/qa/unit/data/ods/autoheight2rows.ods
new file mode 100644
index ..b687701240c1
Binary files /dev/null and b/sc/qa/unit/data/ods/autoheight2rows.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index e7b719d35a14..f4d579504a3c 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -247,6 +247,7 @@ public:
 void testCharacterSetXLSXML();
 void testTdf62268();
 void testVBAMacroFunctionODS();
+void testAutoheight2Rows();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testBooleanFormatXLSX);
@@ -385,6 +386,7 @@ public:
 CPPUNIT_TEST(testCondFormatFormulaListenerXLSX);
 CPPUNIT_TEST(testTdf62268);
 CPPUNIT_TEST(testVBAMacroFunctionODS);
+CPPUNIT_TEST(testAutoheight2Rows);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -4251,6 +4253,22 @@ void ScFiltersTest::testVBAMacroFunctionODS()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testAutoheight2Rows()
+{
+ScDocShellRef xDocSh = loadDoc("autoheight2rows.", FORMAT_ODS);
+ScDocument& rDoc = xDocSh->GetDocument();
+
+SCTAB nTab = 0;
+int nHeight1 = rDoc.GetRowHeight(0, nTab, false);
+int nHeight3 = rDoc.GetRowHeight(2, nTab, false);
+
+// We will do relative comparison, because calculated autoheight
+// can be different on different platforms
+CPPUNIT_ASSERT_MESSAGE("Row #3 shoud be thinner than #1", nHeight3 < 
nHeight1);
+
+xDocSh->DoClose();
+}
+
 ScFiltersTest::ScFiltersTest()
   : ScBootstrapFixture( "sc/qa/unit/data" )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Compile error "no matching function"

[Tor Lillqvist]

>
>
>
> > *kit/Kit.cpp:1670:55: error: no matching function for call to
> > ‘lok::Document::createView(const char*)’
> > _loKitDocument->createView(options.c_str());*
>
>
This was broken for a short while but has been fixed already. Please pull.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-6' - filter/source include/vcl vcl/source

[Luboš Luňák (via logerrit)]

 filter/source/msfilter/msdffimp.cxx |6 +-
 include/vcl/graphicfilter.hxx   |3 ++-
 vcl/source/filter/graphicfilter.cxx |4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit fb295e046297db896583f74ee78736d656d25f75
Author: Luboš Luňák 
AuthorDate: Tue Apr 23 15:48:41 2019 +0200
Commit: Michael Stahl 
CommitDate: Thu Apr 25 10:43:54 2019 +0200

lazy image loading shouldn't read the entire .xls file (tdf#124828)

b11188835d3b87cd changed msfilter to use
GraphicFilter::ImportUnloadedGraphic() to lazy-load images
from the document. However, that function in some cases simply
reads the entire rest of the passed SvStream, which in this case
is the entire .xls file. And the document from tdf#124828 is ~50MiB
and contains ~4000 images => 100+ GiB memory required.

Reviewed-on: https://gerrit.libreoffice.org/71136
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit af84fc9d906626255aaf136eefc5e55236e0e8a6)
Reviewed-on: https://gerrit.libreoffice.org/71221
Reviewed-by: Xisco Faulí 
Signed-off-by: Xisco Fauli 

Change-Id: I74926383204ec642eabb28b62e2cf2e1ff8054a9
Reviewed-on: https://gerrit.libreoffice.org/71225
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit cf01389718fb2ef84697542d69a7ee2c25e544fc)
Reviewed-on: https://gerrit.libreoffice.org/71239
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 96db3884ddbf..62dcebdea248 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6552,7 +6552,11 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& 
rBLIPStream, Graphic& rData, tool
 else
 {   // and unleash our filter
 GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
-Graphic aGraphic = rGF.ImportUnloadedGraphic(*pGrStream);
+// ImportUnloadedGraphic() may simply read the entire rest of the 
stream,
+// which may be very large if the whole document is large. Limit 
the read
+// size to the size of this record.
+sal_uInt64 maxSize = pGrStream == &rBLIPStream ? nLength : 0;
+Graphic aGraphic = rGF.ImportUnloadedGraphic(*pGrStream, maxSize);
 if (aGraphic)
 {
 rData = aGraphic;
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 2f24cf10e085..34083e41d153 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -294,7 +294,8 @@ public:
css::uno::Sequence< 
css::beans::PropertyValue >* pFilterData,
WmfExternal const *pExtHeader = nullptr );
 
-Graphic ImportUnloadedGraphic(SvStream& rIStream);
+// Setting sizeLimit limits how much will be read from the stream.
+Graphic ImportUnloadedGraphic(SvStream& rIStream, sal_uInt64 sizeLimit = 
0);
 
 const FilterErrorEx&GetLastError() const { return *pErrorEx;}
 voidResetLastError();
diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index 072c1c31e5c8..cad4d4ae1fd5 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1439,7 +1439,7 @@ void GraphicFilter::ImportGraphics(std::vector< 
std::shared_ptr >& rGra
 }
 }
 
-Graphic GraphicFilter::ImportUnloadedGraphic(SvStream& rIStream)
+Graphic GraphicFilter::ImportUnloadedGraphic(SvStream& rIStream, sal_uInt64 
sizeLimit)
 {
 Graphic aGraphic;
 sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW;
@@ -1454,7 +1454,7 @@ Graphic GraphicFilter::ImportUnloadedGraphic(SvStream& 
rIStream)
 ErrCode nStatus = ImpTestOrFindFormat("", rIStream, nFormat);
 
 rIStream.Seek(nStreamBegin);
-const sal_uInt32 nStreamLength(rIStream.Seek(STREAM_SEEK_TO_END) - 
nStreamBegin);
+const sal_uInt32 nStreamLength( sizeLimit ? sizeLimit : 
rIStream.Seek(STREAM_SEEK_TO_END) - nStreamBegin);
 
 OUString aFilterName = pConfig->GetImportFilterName(nFormat);
 OUString aExternalFilterName = pConfig->GetExternalFilterName(nFormat, 
false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_sv

[andreas kainz (via logerrit)]

 icon-themes/breeze/vcl/res/successbox.png  |binary
 icon-themes/breeze_dark/vcl/res/successbox.png |binary
 icon-themes/breeze_svg/vcl/res/successbox.svg  |   63 +
 icon-themes/colibre/vcl/res/successbox.png |binary
 icon-themes/colibre_svg/vcl/res/successbox.svg |   12 
 icon-themes/sifr/vcl/res/successbox.png|binary
 icon-themes/sifr_dark/vcl/res/successbox.png   |binary
 icon-themes/sifr_svg/vcl/res/successbox.svg|6 ++
 8 files changed, 81 insertions(+)

New commits:
commit 36534437d773dc517a348331c6a6e9336f390e90
Author: andreas kainz 
AuthorDate: Thu Apr 25 01:03:14 2019 +0200
Commit: andreas_kainz 
CommitDate: Thu Apr 25 10:42:06 2019 +0200

tdf#106229 new icon for infobar type success needed

Change-Id: I829218d014c13698d075e0fcd3162801d31ba093
Reviewed-on: https://gerrit.libreoffice.org/71265
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/breeze/vcl/res/successbox.png 
b/icon-themes/breeze/vcl/res/successbox.png
new file mode 100644
index ..4a0076f9d09c
Binary files /dev/null and b/icon-themes/breeze/vcl/res/successbox.png differ
diff --git a/icon-themes/breeze_dark/vcl/res/successbox.png 
b/icon-themes/breeze_dark/vcl/res/successbox.png
new file mode 100644
index ..4a0076f9d09c
Binary files /dev/null and b/icon-themes/breeze_dark/vcl/res/successbox.png 
differ
diff --git a/icon-themes/breeze_svg/vcl/res/successbox.svg 
b/icon-themes/breeze_svg/vcl/res/successbox.svg
new file mode 100644
index ..e280cac0328a
--- /dev/null
+++ b/icon-themes/breeze_svg/vcl/res/successbox.svg
@@ -0,0 +1,63 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+  
+  
+
diff --git a/icon-themes/colibre/vcl/res/successbox.png 
b/icon-themes/colibre/vcl/res/successbox.png
new file mode 100644
index ..88ec60c2dbd0
Binary files /dev/null and b/icon-themes/colibre/vcl/res/successbox.png differ
diff --git a/icon-themes/colibre_svg/vcl/res/successbox.svg 
b/icon-themes/colibre_svg/vcl/res/successbox.svg
new file mode 100644
index ..8dec7c1a2b08
--- /dev/null
+++ b/icon-themes/colibre_svg/vcl/res/successbox.svg
@@ -0,0 +1,12 @@
+http://www.w3.org/2000/svg";>
+  
+  
+
diff --git a/icon-themes/sifr/vcl/res/successbox.png 
b/icon-themes/sifr/vcl/res/successbox.png
new file mode 100644
index ..5c16afe7a806
Binary files /dev/null and b/icon-themes/sifr/vcl/res/successbox.png differ
diff --git a/icon-themes/sifr_dark/vcl/res/successbox.png 
b/icon-themes/sifr_dark/vcl/res/successbox.png
new file mode 100644
index ..42b269b20ebe
Binary files /dev/null and b/icon-themes/sifr_dark/vcl/res/successbox.png differ
diff --git a/icon-themes/sifr_svg/vcl/res/successbox.svg 
b/icon-themes/sifr_svg/vcl/res/successbox.svg
new file mode 100644
index ..69b77a2b0cc6
--- /dev/null
+++ b/icon-themes/sifr_svg/vcl/res/successbox.svg
@@ -0,0 +1,6 @@
+http://www.w3.org/2000/svg"; viewBox="0 0 32 32">
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Compile error "no matching function"

[Miklos Vajna]

Hi,

On Wed, Apr 24, 2019 at 04:43:46PM +0200, edoardo EMAT  
wrote:
> I'm trying to compile libre office online on my xubuntu but i've the
> following error:
> 
> *kit/Kit.cpp:1670:55: error: no matching function for call to
> ‘lok::Document::createView(const char*)’
> _loKitDocument->createView(options.c_str());*

Do you try to build online.git master against core.git master? If so,
can you provide 1) what options you used (in both cases) and 2) what
commits you build?

Regards,

Miklos


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

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

[Caolán McNamara (via logerrit)]

 sw/source/core/inc/frame.hxx|   15 ++-
 sw/source/core/layout/ssfrm.cxx |   30 +-
 2 files changed, 31 insertions(+), 14 deletions(-)

New commits:
commit ee8c90c469c2caeca24a9621847ec796d011f3bf
Author: Caolán McNamara 
AuthorDate: Wed Apr 24 20:36:50 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 25 09:31:30 2019 +0200

ubsan: use after free

Change-Id: I1a3396d434f6cc5bb615bcb2fe06a819bc11c013
Reviewed-on: https://gerrit.libreoffice.org/71256
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 6e0d653690c4..ab1047d0348f 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -1237,19 +1237,8 @@ public:
 //Flag pFrame for SwFrameDeleteGuard lifetime that we shouldn't delete
 //it in e.g. SwSectionFrame::MergeNext etc because we will need it
 //again after the SwFrameDeleteGuard dtor
-explicit SwFrameDeleteGuard(SwFrame* pFrame)
-: m_pForbidFrame((pFrame && !pFrame->IsDeleteForbidden()) ?
-pFrame : nullptr)
-{
-if (m_pForbidFrame)
-m_pForbidFrame->ForbidDelete();
-}
-
-~SwFrameDeleteGuard()
-{
-if (m_pForbidFrame)
-m_pForbidFrame->AllowDelete();
-}
+explicit SwFrameDeleteGuard(SwFrame* pFrame);
+~SwFrameDeleteGuard();
 };
 
 typedef long (SwFrame:: *SwFrameGet)() const;
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 741b942c6850..9e496a1bd2ec 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -468,6 +468,33 @@ void SwTextFrame::RegisterToNode(SwTextNode & rNode, bool 
const isForceNodeAsFir
 }
 }
 
+//Flag pFrame for SwFrameDeleteGuard lifetime that we shouldn't delete
+//it in e.g. SwSectionFrame::MergeNext etc because we will need it
+//again after the SwFrameDeleteGuard dtor
+SwFrameDeleteGuard::SwFrameDeleteGuard(SwFrame* pFrame)
+: m_pForbidFrame((pFrame && !pFrame->IsDeleteForbidden()) ? pFrame : 
nullptr)
+{
+if (m_pForbidFrame)
+{
+m_pForbidFrame->ForbidDelete();
+}
+}
+
+SwFrameDeleteGuard::~SwFrameDeleteGuard()
+{
+if (m_pForbidFrame)
+{
+const bool bLogicErrorThrown = !m_pForbidFrame->IsDeleteForbidden();
+if (bLogicErrorThrown)
+{
+// see testForcepoint80
+SwFrame::DestroyFrame(m_pForbidFrame);
+return;
+}
+m_pForbidFrame->AllowDelete();
+}
+}
+
 void SwLayoutFrame::DestroyImpl()
 {
 while (!m_VertPosOrientFramesFor.empty())
@@ -527,7 +554,8 @@ void SwLayoutFrame::DestroyImpl()
 pFrame->AllowDelete();
 bFatalError = true;
 }
-SwFrame::DestroyFrame(pFrame);
+else
+SwFrame::DestroyFrame(pFrame);
 pFrame = m_pLower;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sd/source/ui/slidesorter/controller/SlsListener.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 40f257e6df97ef9aedda0c8d2e4e8f410f074563
Author: Xisco Fauli 
AuthorDate: Wed Apr 24 18:12:41 2019 +0200
Commit: Xisco Faulí 
CommitDate: Thu Apr 25 09:17:09 2019 +0200

Re-arrange the conditions to avoid the dynamic_cast

Similar to 88be8aa14d52ad102dc6b01c1c962d4e6cac4941

Change-Id: I616ad50bfdc4c11be9b377e218636092adc3bd42
Reviewed-on: https://gerrit.libreoffice.org/71249
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx 
b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 0a25ae07c71b..2ca2e62d46c7 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -288,6 +288,11 @@ void Listener::Notify (
 break;
 }
 }
+else if (rHint.GetId() == SfxHintId::DocChanged)
+{
+mrController.CheckForMasterPageAssignment();
+mrController.CheckForSlideTransitionAssignment();
+}
 else if (dynamic_cast(&rHint))
 {
 const ViewShellHint& rViewShellHint = static_cast(rHint);
@@ -322,11 +327,6 @@ void Listener::Notify (
 break;
 }
 }
-else if (rHint.GetId() == SfxHintId::DocChanged)
-{
-mrController.CheckForMasterPageAssignment();
-mrController.CheckForSlideTransitionAssignment();
-}
 }
 
 IMPL_LINK(Listener, EventMultiplexerCallback, 
::sd::tools::EventMultiplexerEvent&, rEvent, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin xmloff/inc xmloff/source xmloff/util

[Miklos Vajna (via logerrit)]

 solenv/bin/native-code.py   |1 +
 xmloff/inc/facreg.hxx   |5 -
 xmloff/source/core/facreg.cxx   |1 -
 xmloff/source/draw/sdxmlexp.cxx |9 -
 xmloff/util/xo.component|3 ++-
 5 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 5537c283a766337ee7b128d6f7fab5dd56937489
Author: Miklos Vajna 
AuthorDate: Wed Apr 24 21:12:32 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Apr 25 09:04:43 2019 +0200

xmloff: create XMLImpressMetaExportOasis instances with an uno constructor

Change-Id: I350c2c96cd178878ae687dd5214fcabfcf7675e7
Reviewed-on: https://gerrit.libreoffice.org/71254
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 78f12deee3f7..bf4fc822fdf5 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -259,6 +259,7 @@ core_constructor_list = [
 "com_sun_star_comp_Impress_XMLOasisExporter_get_implementation",
 "com_sun_star_comp_Impress_XMLOasisStylesExporter_get_implementation",
 "com_sun_star_comp_Impress_XMLOasisContentExporter_get_implementation",
+"com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation",
 # xmlscript/util/xmlscript.component
 "com_sun_star_comp_xmlscript_XMLBasicExporter",
 "com_sun_star_comp_xmlscript_XMLBasicImporter",
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index 60c49bfb3c75..5acd7cbc23ed 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -56,11 +56,6 @@ css::uno::Reference 
XMLImpressSettingsImportOasis_createIn
 css::uno::Reference const & rSMgr);
 
 // impress oasis export
-OUString XMLImpressMetaExportOasis_getImplementationName() throw();
-css::uno::Sequence 
XMLImpressMetaExportOasis_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference 
XMLImpressMetaExportOasis_createInstance(
-css::uno::Reference const & rSMgr);
 OUString XMLImpressSettingsExportOasis_getImplementationName() throw();
 css::uno::Sequence 
XMLImpressSettingsExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 1a8e929e835b..68c2524d77f1 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -63,7 +63,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const 
sal_Char * pImplName, voi
 else SINGLEFACTORY( XMLImpressSettingsImportOasis )
 
 // impress oasis export
-else SINGLEFACTORY( XMLImpressMetaExportOasis )
 else SINGLEFACTORY( XMLImpressSettingsExportOasis )
 
 else SINGLEFACTORY( AnimationsImport )
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 78312ff011c3..c1ec00e33d77 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2680,7 +2680,14 @@ 
com_sun_star_comp_Impress_XMLOasisContentExporter_get_implementation(
  | SvXMLExportFlags::FONTDECLS));
 }
 
-SERVICE( XMLImpressMetaExportOasis, 
"com.sun.star.comp.Impress.XMLOasisMetaExporter", "XMLImpressMetaExportOasis", 
false, SvXMLExportFlags::OASIS|SvXMLExportFlags::META );
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation(
+uno::XComponentContext* pCtx, uno::Sequence const& /*rSeq*/)
+{
+return cppu::acquire(new SdXMLExport(pCtx, "XMLImpressMetaExportOasis", 
false,
+ SvXMLExportFlags::OASIS | 
SvXMLExportFlags::META));
+}
+
 SERVICE( XMLImpressSettingsExportOasis, 
"com.sun.star.comp.Impress.XMLOasisSettingsExporter", 
"XMLImpressSettingsExportOasis", false, 
SvXMLExportFlags::OASIS|SvXMLExportFlags::SETTINGS );
 
 SERVICE( XMLImpressExportOOO, "com.sun.star.comp.Impress.XMLExporter", 
"XMLImpressExportOOO", false, 
SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED
 );
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index ec69df766a2d..02441b5d5961 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -116,7 +116,8 @@
   
 
   
-  
+  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits