[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-2' - 121 commits - basctl/source basic/source bin/check-elf-dynamic-objects chart2/qa chart2/source comphelper/source configure.ac connectivity/source cui/inc cui/source cui/uiconfig dbaccess/source desktop/source download.lst drawinglayer/source extensions/source external/epoxy external/libxslt filter/source fpicker/source helpcontent2 icon-themes/colibre icon-themes/colibre_svg icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg include/comphelper include/oox include/sfx2 include/sot include/svl include/svx include/unotools include/vcl l10ntools/source librelogo/source offapi/com oox/inc oox/source readlicense_oo/license sc/qa sc/source sc/uiconfig sdext/source sd/qa sd/source sd/uiconfig setup_native/source sfx2/Library_sfx.mk sfx2/source shell/source slideshow/source solenv/clang-format solenv/flatpak-manifest.in sot/source svl/Library_svl.mk svl/source svtools/source svx/source sw/Library_sw.mk sw/qa sw/source sw/uiconf ig sysui/CustomTarget_infoplist.mk sysui/Package_infoplist.mk translations ucb/source unotools/source vcl/headless vcl/inc vcl/Library_vclplug_gtk3_kde5.mk vcl/Library_vclplug_win.mk vcl/osx vcl/qa vcl/qt5 vcl/quartz vcl/source vcl/unx vcl/win writerfilter/source xmloff/source
Grzegorz Araminowicz (via logerrit)
logerrit at kemper.freedesktop.org
Tue May 21 08:56:46 UTC 2019
basctl/source/basicide/baside2b.cxx | 19
basctl/source/basicide/moduldlg.cxx | 4
basic/source/sbx/sbxvalue.cxx | 36
bin/check-elf-dynamic-objects | 2
chart2/qa/extras/xshape/chart2xshape.cxx | 26
chart2/source/controller/main/ChartController_TextEdit.cxx | 2
comphelper/source/misc/dispatchcommand.cxx | 28
configure.ac | 2
connectivity/source/drivers/evoab2/EApi.cxx | 1
connectivity/source/drivers/jdbc/Class.cxx | 11
cui/inc/strings.hrc | 1
cui/source/dialogs/cuicharmap.cxx | 17
cui/source/dialogs/cuigaldlg.cxx | 9
cui/source/factory/dlgfact.cxx | 9
cui/source/factory/dlgfact.hxx | 4
cui/source/factory/init.cxx | 2
cui/source/inc/border.hxx | 2
cui/source/inc/cuicharmap.hxx | 5
cui/source/inc/cuitabarea.hxx | 1
cui/source/inc/paragrph.hxx | 28
cui/source/inc/tabstpge.hxx | 4
cui/source/options/personalization.cxx | 10
cui/source/tabpages/autocdlg.cxx | 4
cui/source/tabpages/border.cxx | 21
cui/source/tabpages/chardlg.cxx | 2
cui/source/tabpages/numpages.cxx | 2
cui/source/tabpages/paragrph.cxx | 20
cui/source/tabpages/tabstpge.cxx | 30
cui/source/tabpages/tpbitmap.cxx | 20
cui/uiconfig/ui/customizedialog.ui | 2
cui/uiconfig/ui/menuassignpage.ui | 6
dbaccess/source/ui/dlg/generalpage.cxx | 5
desktop/source/app/app.cxx | 4
download.lst | 8
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx | 9
drawinglayer/source/processor2d/vclprocessor2d.cxx | 45
extensions/source/macosx/spotlight/OOoContentDataParser.m | 4
external/epoxy/Library_epoxy.mk | 2
external/epoxy/UnpackedTarball_epoxy.mk | 12
external/epoxy/epoxy.noegl.by.default.patch | 3
external/epoxy/epoxy.windows.api.patch | 78
external/libxslt/UnpackedTarball_libxslt.mk | 1
external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 | 120
filter/source/msfilter/msdffimp.cxx | 6
fpicker/source/office/OfficeFilePicker.cxx | 2
fpicker/source/office/OfficeFolderPicker.cxx | 2
helpcontent2 | 2
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
include/comphelper/dispatchcommand.hxx | 9
include/oox/drawingml/shape.hxx | 25
include/oox/export/drawingml.hxx | 6
include/oox/ppt/presentationfragmenthandler.hxx | 2
include/sfx2/flatpak.hxx | 34
include/sfx2/linkmgr.hxx | 3
include/sfx2/sfxhelp.hxx | 2
include/sot/formats.hxx | 3
include/svl/zforlist.hxx | 7
include/svx/svxdlg.hxx | 3
include/unotools/ucbstreamhelper.hxx | 8
include/vcl/GraphicLoader.hxx | 7
include/vcl/graphicfilter.hxx | 3
include/vcl/weld.hxx | 12
l10ntools/source/ulfconv/msi-encodinglist.txt | 10
librelogo/source/LibreLogo/LibreLogo.py | 6
offapi/com/sun/star/util/NumberFormat.idl | 7
oox/inc/drawingml/graphicproperties.hxx | 3
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 6
oox/source/drawingml/fillproperties.cxx | 17
oox/source/drawingml/shape.cxx | 74
oox/source/export/drawingml.cxx | 55
oox/source/ppt/extdrawingfragmenthandler.cxx | 6
oox/source/ppt/extdrawingfragmenthandler.hxx | 1
oox/source/ppt/pptshape.cxx | 4
oox/source/ppt/pptshapegroupcontext.cxx | 58
oox/source/ppt/presentationfragmenthandler.cxx | 20
oox/source/shape/ShapeContextHandler.cxx | 19
oox/source/shape/WpgContext.cxx | 6
oox/source/shape/WpsContext.cxx | 8
readlicense_oo/license/CREDITS.fodt | 8593 +++++-----
sc/qa/unit/copy_paste_test.cxx | 65
sc/qa/unit/data/functions/statistical/fods/rank.fods | 739
sc/qa/unit/subsequent_filters-test.cxx | 12
sc/source/core/data/document.cxx | 3
sc/source/core/data/table1.cxx | 7
sc/source/core/data/table7.cxx | 10
sc/source/core/tool/interpr4.cxx | 21
sc/source/core/tool/interpr5.cxx | 9
sc/source/filter/oox/sheetdatabuffer.cxx | 3
sc/source/ui/attrdlg/tabpages.cxx | 51
sc/source/ui/inc/tabpages.hxx | 13
sc/source/ui/miscdlgs/acredlin.cxx | 45
sc/source/ui/view/cellsh1.cxx | 5
sc/source/ui/view/tabvwsha.cxx | 2
sc/source/ui/view/viewfun6.cxx | 5
sc/source/ui/view/viewutil.cxx | 3
sc/uiconfig/scalc/ui/paratemplatedialog.ui | 1
sd/qa/unit/data/odp/image_transparency.odp |binary
sd/qa/unit/data/pptx/crop-to-shape.pptx |binary
sd/qa/unit/data/pptx/smartart-interopgrabbag.pptx |binary
sd/qa/unit/data/pptx/tdf123684.pptx |binary
sd/qa/unit/data/pptx/tdf125346.pptx |binary
sd/qa/unit/data/pptx/tdf125346_2.pptx |binary
sd/qa/unit/data/pptx/tdf125360.pptx |binary
sd/qa/unit/data/pptx/tdf125360_1.pptx |binary
sd/qa/unit/data/pptx/tdf125360_2.pptx |binary
sd/qa/unit/data/xml/n819614_0.xml | 10
sd/qa/unit/export-tests-ooxml1.cxx | 32
sd/qa/unit/export-tests-ooxml2.cxx | 155
sd/qa/unit/import-tests-smartart.cxx | 22
sd/qa/unit/import-tests.cxx | 43
sd/source/ui/animations/CustomAnimationPane.cxx | 2
sd/source/ui/dlg/copydlg.cxx | 24
sd/source/ui/func/fuarea.cxx | 2
sd/source/ui/func/fubullet.cxx | 3
sd/source/ui/func/fuline.cxx | 2
sd/source/ui/func/futransf.cxx | 2
sd/source/ui/tools/PreviewRenderer.cxx | 5
sd/uiconfig/sdraw/popupmenu/textbox.xml | 2
sd/uiconfig/sdraw/ui/notebookbar.ui | 32
sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 40
sd/uiconfig/simpress/popupmenu/textbox.xml | 2
sd/uiconfig/simpress/ui/notebookbar.ui | 32
sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 40
sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui | 74
sdext/source/minimizer/graphiccollector.cxx | 6
setup_native/source/win32/customactions/inst_msu/inst_msu.cxx | 120
sfx2/Library_sfx.mk | 1
sfx2/source/appl/childwin.cxx | 2
sfx2/source/appl/flatpak.cxx | 99
sfx2/source/appl/linkmgr2.cxx | 5
sfx2/source/appl/sfxhelp.cxx | 74
sfx2/source/dialog/versdlg.cxx | 6
sfx2/source/view/viewsh.cxx | 12
shell/source/backends/kde5be/kde5backend.cxx | 56
slideshow/source/engine/shapes/viewmediashape.cxx | 1
solenv/clang-format/blacklist | 2
solenv/flatpak-manifest.in | 3
sot/source/base/exchange.cxx | 3
sot/source/base/formats.cxx | 19
svl/Library_svl.mk | 5
svl/source/crypto/cryptosign.cxx | 33
svtools/source/dialogs/ServerDetailsControls.cxx | 11
svx/source/gallery2/galbrws1.cxx | 4
svx/source/items/pageitem.cxx | 31
svx/source/svdraw/svdograf.cxx | 2
sw/Library_sw.mk | 1
sw/qa/core/data/doc/tdf124937.doc |binary
sw/qa/core/data/odt/pass/tdf122599-1.odt |binary
sw/qa/core/data/ooxml/fail/ofz14422-1.docx |binary
sw/qa/extras/layout/layout.cxx | 29
sw/qa/extras/odfimport/data/tdf113289.odt |binary
sw/qa/extras/odfimport/odfimport.cxx | 9
sw/qa/extras/ooxmlexport/data/tdf124594.docx |binary
sw/qa/extras/ooxmlexport/data/textinput.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 22
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 33
sw/qa/extras/ooxmlimport/data/tdf124398.docx |binary
sw/qa/extras/ooxmlimport/data/tdf124754.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 27
sw/qa/extras/uiwriter/data/test_anchor_as_character.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 21
sw/qa/extras/uiwriter/uiwriter2.cxx | 53
sw/qa/uitest/librelogo/compile.py | 1
sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 8
sw/source/core/doc/DocumentRedlineManager.cxx | 27
sw/source/core/doc/doc.cxx | 2
sw/source/core/doc/doclay.cxx | 44
sw/source/core/doc/doctxm.cxx | 2
sw/source/core/docnode/swbaslnk.cxx | 6
sw/source/core/edit/autofmt.cxx | 8
sw/source/core/inc/dialoghelp.hxx | 30
sw/source/core/inc/txmsrt.hxx | 4
sw/source/core/layout/layact.cxx | 2
sw/source/core/layout/pagechg.cxx | 12
sw/source/core/layout/tabfrm.cxx | 2
sw/source/core/text/frmform.cxx | 9
sw/source/core/text/itrform2.cxx | 1
sw/source/core/text/txtfrm.cxx | 2
sw/source/core/tox/txmsrt.cxx | 16
sw/source/core/txtnode/atrflyin.cxx | 2
sw/source/core/undo/rolbck.cxx | 9
sw/source/core/view/dialoghelp.cxx | 48
sw/source/filter/ww8/docxexport.cxx | 6
sw/source/filter/ww8/docxsdrexport.cxx | 26
sw/source/filter/ww8/ww8par3.cxx | 12
sw/source/ui/misc/insfnote.cxx | 2
sw/source/ui/misc/srtdlg.cxx | 2
sw/source/uibase/app/apphdl.cxx | 2
sw/source/uibase/app/docst.cxx | 2
sw/source/uibase/docvw/edtwin.cxx | 2
sw/source/uibase/inc/uitool.hxx | 12
sw/source/uibase/shells/annotsh.cxx | 3
sw/source/uibase/shells/drwtxtsh.cxx | 3
sw/source/uibase/shells/textsh.cxx | 3
sw/source/uibase/shells/textsh1.cxx | 26
sw/source/uibase/shells/txtattr.cxx | 5
sw/source/uibase/shells/txtnum.cxx | 2
sw/source/uibase/uiview/viewling.cxx | 2
sw/source/uibase/utlui/prcntfld.cxx | 12
sw/source/uibase/utlui/uitool.cxx | 34
sw/uiconfig/swriter/ui/columndialog.ui | 6
sw/uiconfig/swriter/ui/indexentry.ui | 6
sw/uiconfig/swriter/ui/tocindexpage.ui | 14
sysui/CustomTarget_infoplist.mk | 8
sysui/Package_infoplist.mk | 7
translations | 2
ucb/source/ucp/gio/gio_content.cxx | 52
ucb/source/ucp/gio/gio_content.hxx | 9
unotools/source/ucbhelper/ucbstreamhelper.cxx | 16
vcl/Library_vclplug_gtk3_kde5.mk | 2
vcl/Library_vclplug_win.mk | 2
vcl/headless/svpgdi.cxx | 49
vcl/inc/headless/svpgdi.hxx | 2
vcl/inc/qt5/Qt5DragAndDrop.hxx | 2
vcl/inc/quartz/salgdi.h | 6
vcl/inc/win/DWriteTextRenderer.hxx | 15
vcl/inc/win/winlayout.hxx | 3
vcl/osx/DataFlavorMapping.cxx | 1
vcl/osx/salframe.cxx | 2
vcl/osx/salnativewidgets.cxx | 17
vcl/qa/cppunit/complextext.cxx | 2
vcl/qt5/Qt5DragAndDrop.cxx | 26
vcl/qt5/Qt5Frame.cxx | 1
vcl/qt5/Qt5Widget.cxx | 25
vcl/quartz/ctfonts.cxx | 5
vcl/quartz/salgdi.cxx | 9
vcl/source/app/salvtables.cxx | 32
vcl/source/control/edit.cxx | 3
vcl/source/filter/graphicfilter.cxx | 6
vcl/source/gdi/bmpacc.cxx | 4
vcl/source/gdi/dibtools.cxx | 2
vcl/source/graphic/GraphicLoader.cxx | 7
vcl/source/treelist/transfer.cxx | 14
vcl/source/window/builder.cxx | 6
vcl/source/window/dialog.cxx | 10
vcl/unx/generic/printer/cupsmgr.cxx | 36
vcl/unx/gtk3/gtk3gtkinst.cxx | 3
vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx | 8
vcl/unx/gtk3_kde5/kde5_filepicker.cxx | 20
vcl/win/gdi/DWriteTextRenderer.cxx | 33
vcl/win/gdi/winlayout.cxx | 31
writerfilter/source/dmapper/GraphicImport.cxx | 32
xmloff/source/style/XMLFootnoteSeparatorImport.cxx | 5
247 files changed, 7126 insertions(+), 5678 deletions(-)
New commits:
commit cdb764a6367daaa4842be57d144275a87c2802b4
Author: Grzegorz Araminowicz <grzegorz.araminowicz at collabora.com>
AuthorDate: Fri Mar 15 23:50:13 2019 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue May 21 09:30:23 2019 +0200
PPTX import: save also OOXDrawing in InteropGrabBag
Change-Id: Ieaf341dd13e06046044f3523c3aad74476160402
Reviewed-on: https://gerrit.libreoffice.org/69328
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/72473
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index aaade775c00c..9e879b47bc9c 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -225,6 +225,8 @@ public:
/// Changes reference semantics to value semantics for fill properties.
void cloneFillProperties();
+ void keepDiagramDrawing(::oox::core::XmlFilterBase& rFilterBase, const OUString& rFragmentPath);
+
protected:
enum FrameType
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 3e04f3b7494e..4848f4086e02 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -64,6 +64,7 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/xml/AttributeData.hpp>
+#include <com/sun/star/xml/dom/XDocument.hpp>
#include <com/sun/star/xml/sax/XFastSAXSerializable.hpp>
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
@@ -1394,6 +1395,22 @@ Reference< XShape > const & Shape::createAndInsert(
return mxShape;
}
+void Shape::keepDiagramDrawing(XmlFilterBase& rFilterBase, const OUString& rFragmentPath)
+{
+ uno::Sequence<uno::Any> diagramDrawing(2);
+ // drawingValue[0] => dom, drawingValue[1] => Sequence of associated relationships
+
+ sal_Int32 length = maDiagramDoms.getLength();
+ maDiagramDoms.realloc(length + 1);
+
+ diagramDrawing[0] <<= rFilterBase.importFragment(rFragmentPath);
+ diagramDrawing[1] <<= resolveRelationshipsOfTypeFromOfficeDoc(rFilterBase, rFragmentPath, "image");
+
+ beans::PropertyValue* pValue = maDiagramDoms.getArray();
+ pValue[length].Name = "OOXDrawing";
+ pValue[length].Value <<= diagramDrawing;
+}
+
void Shape::keepDiagramCompatibilityInfo()
{
try
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx
index 9a775655518f..6535e12d3f81 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -148,17 +148,20 @@ void PPTShapeGroupContext::importExtDrawings( )
if( pGraphicShape )
{
for (auto const& extDrawing : pGraphicShape->getExtDrawings())
- {
- getFilter().importFragment( new ExtDrawingFragmentHandler( getFilter(), getFragmentPathFromRelId(extDrawing),
- mpSlidePersistPtr,
- meShapeLocation,
- mpGroupShapePtr,
- pGraphicShape ) );
- // Apply font color imported from color fragment
- if( pGraphicShape->getFontRefColorForNodes().isUsed() )
- applyFontRefColor(mpGroupShapePtr, pGraphicShape->getFontRefColorForNodes());
- }
- pGraphicShape = oox::drawingml::ShapePtr( nullptr );
+ {
+ OUString aFragmentPath = getFragmentPathFromRelId(extDrawing);
+ getFilter().importFragment( new ExtDrawingFragmentHandler( getFilter(), aFragmentPath,
+ mpSlidePersistPtr,
+ meShapeLocation,
+ mpGroupShapePtr,
+ pGraphicShape ) );
+ pGraphicShape->keepDiagramDrawing(getFilter(), aFragmentPath);
+
+ // Apply font color imported from color fragment
+ if( pGraphicShape->getFontRefColorForNodes().isUsed() )
+ applyFontRefColor(mpGroupShapePtr, pGraphicShape->getFontRefColorForNodes());
+ }
+ pGraphicShape = oox::drawingml::ShapePtr( nullptr );
}
}
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index b80af12ac15e..2747572f0479 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -425,23 +425,8 @@ ShapeContextHandler::getShape()
oox::drawingml::ShapePtr pShapePtr( new Shape( "com.sun.star.drawing.GroupShape" ) );
pShapePtr->setDiagramType();
mxFilterBase->importFragment(new ShapeDrawingFragmentHandler(*mxFilterBase, aFragmentPath, pShapePtr));
-
- uno::Sequence<beans::PropertyValue> aValue(mpShape->getDiagramDoms());
- uno::Sequence < uno::Any > diagramDrawing(2);
- // drawingValue[0] => dom, drawingValue[1] => Sequence of associated relationships
-
- sal_Int32 length = aValue.getLength();
- aValue.realloc(length+1);
-
- diagramDrawing[0] <<= mxFilterBase->importFragment( aFragmentPath );
- diagramDrawing[1] <<= pShapePtr->resolveRelationshipsOfTypeFromOfficeDoc(
- *mxFilterBase, aFragmentPath, "image" );
-
- beans::PropertyValue* pValue = aValue.getArray();
- pValue[length].Name = "OOXDrawing";
- pValue[length].Value <<= diagramDrawing;
-
- pShapePtr->setDiagramDoms( aValue );
+ pShapePtr->setDiagramDoms(mpShape->getDiagramDoms());
+ pShapePtr->keepDiagramDrawing(*mxFilterBase, aFragmentPath);
pShapePtr->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix, pShapePtr->getFillProperties() );
xResult = pShapePtr->getXShape();
diff --git a/sd/qa/unit/import-tests-smartart.cxx b/sd/qa/unit/import-tests-smartart.cxx
index fc09e270247f..c8f64fee859f 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -916,6 +916,7 @@ void SdImportTestSmartArt::testInteropGrabBag()
CPPUNIT_ASSERT(aGrabBag.find("OOXLayout") != aGrabBag.end());
CPPUNIT_ASSERT(aGrabBag.find("OOXStyle") != aGrabBag.end());
CPPUNIT_ASSERT(aGrabBag.find("OOXColor") != aGrabBag.end());
+ CPPUNIT_ASSERT(aGrabBag.find("OOXDrawing") != aGrabBag.end());
xDocShRef->DoClose();
}
commit f8586c223f07ddff4bba5d5c694cee33ac811412
Author: Grzegorz Araminowicz <grzegorz.araminowicz at collabora.com>
AuthorDate: Thu Mar 14 08:25:12 2019 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue May 21 09:29:50 2019 +0200
PPTX import: import SmartArt drawing into single GroupShape
before that there were imported two GroupShapes:
- empty one with properties like id, name, InteropGrapBag
- second one with actual shapes
also fixed tests that relyed on that behaviour
Change-Id: I2b94a53e21666b16725c4353448d75e916e4f9df
Reviewed-on: https://gerrit.libreoffice.org/69252
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/72472
diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx
index a0d40ea0412c..cf8d8e50ed3c 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.cxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.cxx
@@ -29,7 +29,7 @@ ExtDrawingFragmentHandler::ExtDrawingFragmentHandler( XmlFilterBase& rFilter,
mpSlidePersistPtr (rSlidePersistPtr ),
meShapeLocation( eShapeLocation ),
mpGroupShapePtr( pGroupShapePtr ),
- mpOrgShapePtr( pShapePtr )
+ mpShapePtr( pShapePtr )
{
}
@@ -49,10 +49,6 @@ ExtDrawingFragmentHandler::onCreateContext( ::sal_Int32 aElement,
case DSP_TOKEN( drawing ):
break;
case DSP_TOKEN( spTree ):
- mpShapePtr = oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, "com.sun.star.drawing.GroupShape" ) );
- mpShapePtr->setPosition( mpOrgShapePtr->getPosition() );
- mpShapePtr->setName( mpOrgShapePtr->getName() );
-
return new PPTShapeGroupContext(
*this, mpSlidePersistPtr, meShapeLocation, mpGroupShapePtr,
mpShapePtr );
diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx
index 83dfcd216e8f..cdde03777bc1 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.hxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.hxx
@@ -34,7 +34,6 @@ private:
const oox::ppt::SlidePersistPtr mpSlidePersistPtr;
const oox::ppt::ShapeLocation meShapeLocation;
oox::drawingml::ShapePtr const mpGroupShapePtr;
- oox::drawingml::ShapePtr mpOrgShapePtr; // Original Shape data, if any
oox::drawingml::ShapePtr mpShapePtr;
};
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx
index 1180af3f10fb..9a775655518f 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -71,9 +71,12 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext( sal_Int32 aElementToken
{
case PPT_TOKEN( cNvPr ):
{
+ // don't override SmartArt properties for embedded drawing's spTree
mpGroupShapePtr->setHidden( rAttribs.getBool( XML_hidden, false ) );
- mpGroupShapePtr->setId( rAttribs.getString( XML_id ).get() );
- mpGroupShapePtr->setName( rAttribs.getString( XML_name ).get() );
+ if (mpGroupShapePtr->getId().isEmpty())
+ mpGroupShapePtr->setId(rAttribs.getString(XML_id).get());
+ if (mpGroupShapePtr->getName().isEmpty())
+ mpGroupShapePtr->setName( rAttribs.getString( XML_name ).get() );
break;
}
case PPT_TOKEN( ph ):
diff --git a/sd/qa/unit/data/xml/n819614_0.xml b/sd/qa/unit/data/xml/n819614_0.xml
index e51b520d3130..fc109917c460 100644
--- a/sd/qa/unit/data/xml/n819614_0.xml
+++ b/sd/qa/unit/data/xml/n819614_0.xml
@@ -14,7 +14,7 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="182" positionY="2544" sizeX="25125" sizeY="16293" type="com.sun.star.drawing.GroupShape">
+ <XShape positionX="182" positionY="2544" sizeX="25125" sizeY="16293" type="com.sun.star.drawing.GroupShape" name="Content Placeholder 4">
<XShapes>
<XShape positionX="10751" positionY="3496" sizeX="1563" sizeY="253" type="com.sun.star.drawing.CustomShape" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="TOP" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName="">
<FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
@@ -6824,12 +6824,4 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="0" positionY="0" sizeX="100" sizeY="100" type="com.sun.star.drawing.GroupShape" name="Content Placeholder 4">
- <XShapes/>
- <Transformation>
- <Line1 column1="101.000000" column2="0.000000" column3="0.000000"/>
- <Line2 column1="0.000000" column2="101.000000" column3="0.000000"/>
- <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
- </Transformation>
- </XShape>
</XShapes>
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx
index 7cc50e21f963..3e832aad4e3f 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -231,7 +231,7 @@ void SdOOXMLExportTest1::testBnc870233_2()
// Second smart art has "dk2" font color (style)
{
- const SdrObjGroup *pObjGroup = dynamic_cast<SdrObjGroup *>(pPage->GetObj(2)); // FIXME should be 1, smartart import creates an additional empty group for some reason
+ const SdrObjGroup *pObjGroup = dynamic_cast<SdrObjGroup *>(pPage->GetObj(1));
CPPUNIT_ASSERT(pObjGroup);
const SdrTextObj *pObj = dynamic_cast<SdrTextObj *>(pObjGroup->GetSubList()->GetObj(0));
checkFontAttributes<Color, SvxColorItem>( pObj, Color(0x1F497D) );
@@ -239,7 +239,7 @@ void SdOOXMLExportTest1::testBnc870233_2()
// Third smart art has white font color (style)
{
- const SdrObjGroup *pObjGroup = dynamic_cast<SdrObjGroup *>(pPage->GetObj(4)); // FIXME should be 2, smartart import creates an additional empty group for some reason
+ const SdrObjGroup *pObjGroup = dynamic_cast<SdrObjGroup *>(pPage->GetObj(2));
CPPUNIT_ASSERT(pObjGroup);
const SdrTextObj *pObj = dynamic_cast<SdrTextObj *>(pObjGroup->GetSubList()->GetObj(0));
checkFontAttributes<Color, SvxColorItem>(pObj, Color(0xffffff));
@@ -381,7 +381,7 @@ void SdOOXMLExportTest1::testBnc880763()
CPPUNIT_ASSERT_EQUAL( Color(0x0000ff),(static_cast< const XColorItem& >(pObj->GetMergedItem(XATTR_FILLCOLOR))).GetColorValue());
// Second object at the front has green background color
- pObj = pPage->GetObj(2); // FIXME should be 1, smartart import creates an additional empty group for some reason
+ pObj = pPage->GetObj(1);
CPPUNIT_ASSERT_MESSAGE( "no object", pObj != nullptr);
CPPUNIT_ASSERT_EQUAL( Color(0x00ff00),(static_cast< const XColorItem& >(pObj->GetMergedItem(XATTR_FILLCOLOR))).GetColorValue());
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index 80090c1656ae..7555ce0ea1e4 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -1417,10 +1417,10 @@ void SdOOXMLExportTest2::testGroupsPosition()
xDocShRef->DoClose();
xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
- assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[3]/p:spPr/a:xfrm/a:off", "x", "6796800");
- assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[3]/p:spPr/a:xfrm/a:off", "y", "4273920");
assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp[1]/p:sp[1]/p:spPr/a:xfrm/a:off", "x", "4040640");
assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp[1]/p:sp[1]/p:spPr/a:xfrm/a:off", "y", "4273920");
+ assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp[1]/p:sp[3]/p:spPr/a:xfrm/a:off", "x", "6796800");
+ assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp[1]/p:sp[3]/p:spPr/a:xfrm/a:off", "y", "4273920");
}
void SdOOXMLExportTest2::testGroupsRotatedPosition()
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 14a907316d70..6ca42293bf1c 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -444,6 +444,7 @@ void SdImportTest::testN862510_2()
const SdrPage *pPage = GetPage( 1, xDocShRef );
{
+ CPPUNIT_ASSERT_EQUAL(size_t(1), pPage->GetObjCount());
SdrObjGroup *pGrpObj = dynamic_cast<SdrObjGroup *>( pPage->GetObj( 0 ) );
CPPUNIT_ASSERT( pGrpObj );
SdrObjCustomShape *pObj = dynamic_cast<SdrObjCustomShape *>( pGrpObj->GetSubList()->GetObj( 0 ) );
commit 3807fb7c541632a4d21afba88c27865957036f0a
Author: Grzegorz Araminowicz <grzegorz.araminowicz at collabora.com>
AuthorDate: Fri Mar 8 12:45:24 2019 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue May 21 09:29:26 2019 +0200
PPTX import: save SmartArt markup into InteropGrabBag
it will allow to preserve SmartArt when saving PPTX files
Change-Id: I9bb66c59d202b4ce426864599014d042d4aa04b0
Reviewed-on: https://gerrit.libreoffice.org/68916
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/72471
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 88fe31d2dd02..aaade775c00c 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -227,6 +227,15 @@ public:
protected:
+ enum FrameType
+ {
+ FRAMETYPE_GENERIC, ///< Generic shape, no special type.
+ FRAMETYPE_OLEOBJECT, ///< OLE object embedded in a shape.
+ FRAMETYPE_CHART, ///< Chart embedded in a shape.
+ FRAMETYPE_DIAGRAM, ///< Complex diagram drawing shape.
+ FRAMETYPE_TABLE ///< A table embedded in a shape.
+ };
+
css::uno::Reference< css::drawing::XShape > const &
createAndInsert(
::oox::core::XmlFilterBase& rFilterBase,
@@ -247,7 +256,8 @@ protected:
ShapeIdMap* pShapeMap,
const basegfx::B2DHomMatrix& aTransformation );
- void keepDiagramCompatibilityInfo( ::oox::core::XmlFilterBase const & rFilterBase );
+ void keepDiagramCompatibilityInfo();
+ void convertSmartArtToMetafile( ::oox::core::XmlFilterBase const& rFilterBase );
css::uno::Reference< css::drawing::XShape >
renderDiagramToGraphic( ::oox::core::XmlFilterBase const & rFilterBase );
@@ -306,20 +316,13 @@ protected:
::std::vector<OUString> maExtDrawings;
Color maFontRefColorForNodes;
+ FrameType meFrameType; ///< Type for graphic frame shapes.
+
private:
- enum FrameType
- {
- FRAMETYPE_GENERIC, ///< Generic shape, no special type.
- FRAMETYPE_OLEOBJECT, ///< OLE object embedded in a shape.
- FRAMETYPE_CHART, ///< Chart embedded in a shape.
- FRAMETYPE_DIAGRAM, ///< Complex diagram drawing shape.
- FRAMETYPE_TABLE ///< A table embedded in a shape.
- };
typedef std::shared_ptr< ::oox::vml::OleObjectInfo > OleObjectInfoRef;
typedef std::shared_ptr< ChartShapeInfo > ChartShapeInfoRef;
- FrameType meFrameType; ///< Type for graphic frame shapes.
OleObjectInfoRef mxOleObjectInfo; ///< Additional data for OLE objects.
ChartShapeInfoRef mxChartShapeInfo; ///< Additional data for chart shapes.
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index d45a88a692cf..3e04f3b7494e 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -284,8 +284,9 @@ void Shape::addShape(
if( meFrameType == FRAMETYPE_DIAGRAM )
{
+ keepDiagramCompatibilityInfo();
if( !SvtFilterOptions::Get().IsSmartArt2Shape() )
- keepDiagramCompatibilityInfo( rFilterBase );
+ convertSmartArtToMetafile( rFilterBase );
}
}
}
@@ -1393,7 +1394,7 @@ Reference< XShape > const & Shape::createAndInsert(
return mxShape;
}
-void Shape::keepDiagramCompatibilityInfo( XmlFilterBase const & rFilterBase )
+void Shape::keepDiagramCompatibilityInfo()
{
try
{
@@ -1424,21 +1425,33 @@ void Shape::keepDiagramCompatibilityInfo( XmlFilterBase const & rFilterBase )
xSet->setPropertyValue( aGrabBagPropName, Any( aGrabBag ) );
} else
xSet->setPropertyValue( aGrabBagPropName, Any( maDiagramDoms ) );
+ }
+ catch( const Exception& e )
+ {
+ SAL_WARN( "oox.drawingml", "Shape::keepDiagramCompatibilityInfo: " << e );
+ }
+}
- xSet->setPropertyValue( "MoveProtect", Any( true ) );
- xSet->setPropertyValue( "SizeProtect", Any( true ) );
+void Shape::convertSmartArtToMetafile(XmlFilterBase const & rFilterBase)
+{
+ try
+ {
+ Reference<XPropertySet> xSet(mxShape, UNO_QUERY_THROW);
+
+ xSet->setPropertyValue("MoveProtect", Any(true));
+ xSet->setPropertyValue("SizeProtect", Any(true));
// Replace existing shapes with a new Graphic Object rendered
// from them
- Reference < XShape > xShape( renderDiagramToGraphic( rFilterBase ) );
- Reference < XShapes > xShapes( mxShape, UNO_QUERY_THROW );
- while( xShapes->hasElements() )
- xShapes->remove( Reference < XShape > ( xShapes->getByIndex( 0 ), UNO_QUERY_THROW ) );
- xShapes->add( xShape );
+ Reference<XShape> xShape(renderDiagramToGraphic(rFilterBase));
+ Reference<XShapes> xShapes(mxShape, UNO_QUERY_THROW);
+ while (xShapes->hasElements())
+ xShapes->remove(Reference<XShape>(xShapes->getByIndex(0), UNO_QUERY_THROW));
+ xShapes->add(xShape);
}
- catch( const Exception& e )
+ catch (const Exception& e)
{
- SAL_WARN( "oox.drawingml", "Shape::keepDiagramCompatibilityInfo: " << e );
+ SAL_WARN("oox.drawingml", "Shape::convertSmartArtToMetafile: " << e);
}
}
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 92c573b6f5ea..0121f8905e3d 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -33,6 +33,7 @@
#include <sal/log.hxx>
#include <oox/ppt/slidepersist.hxx>
#include <oox/token/tokens.hxx>
+#include <unotools/fltrcfg.hxx>
using namespace ::oox::core;
using namespace ::oox::drawingml;
@@ -397,6 +398,9 @@ void PPTShape::addShape(
Reference<XShapes> xShapes(xShape, UNO_QUERY);
if (xShapes.is())
addChildren( rFilterBase, *this, pTheme, xShapes, pShapeMap, aTransformation );
+
+ if (meFrameType == FRAMETYPE_DIAGRAM)
+ keepDiagramCompatibilityInfo();
}
}
catch (const Exception&)
diff --git a/sd/qa/unit/data/pptx/smartart-interopgrabbag.pptx b/sd/qa/unit/data/pptx/smartart-interopgrabbag.pptx
new file mode 100644
index 000000000000..ef678b6c3398
Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-interopgrabbag.pptx differ
diff --git a/sd/qa/unit/import-tests-smartart.cxx b/sd/qa/unit/import-tests-smartart.cxx
index e4a2fafd9df3..fc09e270247f 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -68,6 +68,7 @@ public:
void testOrgChart();
void testCycleMatrix();
void testPictureStrip();
+ void testInteropGrabBag();
CPPUNIT_TEST_SUITE(SdImportTestSmartArt);
@@ -100,6 +101,7 @@ public:
CPPUNIT_TEST(testOrgChart);
CPPUNIT_TEST(testCycleMatrix);
CPPUNIT_TEST(testPictureStrip);
+ CPPUNIT_TEST(testInteropGrabBag);
CPPUNIT_TEST_SUITE_END();
};
@@ -899,6 +901,25 @@ void SdImportTestSmartArt::testPictureStrip()
xDocShRef->DoClose();
}
+void SdImportTestSmartArt::testInteropGrabBag()
+{
+ sd::DrawDocShellRef xDocShRef = loadURL(
+ m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-interopgrabbag.pptx"), PPTX);
+ uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
+ CPPUNIT_ASSERT(xGroup.is());
+
+ uno::Reference<beans::XPropertySet> xPropertySet(xGroup, uno::UNO_QUERY_THROW);
+ uno::Sequence<beans::PropertyValue> aGrabBagSeq;
+ xPropertySet->getPropertyValue("InteropGrabBag") >>= aGrabBagSeq;
+ comphelper::SequenceAsHashMap aGrabBag(aGrabBagSeq);
+ CPPUNIT_ASSERT(aGrabBag.find("OOXData") != aGrabBag.end());
+ CPPUNIT_ASSERT(aGrabBag.find("OOXLayout") != aGrabBag.end());
+ CPPUNIT_ASSERT(aGrabBag.find("OOXStyle") != aGrabBag.end());
+ CPPUNIT_ASSERT(aGrabBag.find("OOXColor") != aGrabBag.end());
+
+ xDocShRef->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTestSmartArt);
CPPUNIT_PLUGIN_IMPLEMENT();
commit 5e3a3e7d37aecd353ebab78f24e7b32a66a7df83
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon May 20 19:31:36 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue May 21 08:02:10 2019 +0200
tdf#125360: PPTX: Shape fill transparency is not exported
.. if the original shape fill is defined with a theme
Override the alpha value with the current value get from
FillTransparence API attirbute even if the color is defined
with a style or a color scheme.
Reviewed-on: https://gerrit.libreoffice.org/72596
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
(cherry picked from commit 259d01a34d27df2fbfd11c3bf6fe9dc508ff6ac2)
Change-Id: I09d26238a9c2b501279e6749687dc535e614bbd6
Reviewed-on: https://gerrit.libreoffice.org/72618
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 24adf475be16..2da61a6f5300 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -170,14 +170,14 @@ public:
OUString WriteImage( const Graphic &rGraphic , bool bRelPathToMedia = false);
void WriteColor( ::Color nColor, sal_Int32 nAlpha = MAX_PERCENT );
- void WriteColor( const OUString& sColorSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations );
- void WriteColorTransformations( const css::uno::Sequence< css::beans::PropertyValue >& aTransformations );
+ void WriteColor( const OUString& sColorSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT );
+ void WriteColorTransformations( const css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT );
void WriteGradientStop( sal_uInt16 nStop, ::Color nColor );
void WriteLineArrow( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, bool bLineStart );
void WriteConnectorConnections( EscherConnectorListEntry& rConnectorEntry, sal_Int32 nStartID, sal_Int32 nEndID );
void WriteSolidFill( ::Color nColor, sal_Int32 nAlpha = MAX_PERCENT );
- void WriteSolidFill( const OUString& sSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations );
+ void WriteSolidFill( const OUString& sSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT );
void WriteSolidFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
void WriteGradientFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
void WriteGradientFill( css::awt::Gradient rGradient );
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 23065ec67678..30f330226788 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -231,7 +231,7 @@ void DrawingML::WriteColor( ::Color nColor, sal_Int32 nAlpha )
}
}
-void DrawingML::WriteColor( const OUString& sColorSchemeName, const Sequence< PropertyValue >& aTransformations )
+void DrawingML::WriteColor( const OUString& sColorSchemeName, const Sequence< PropertyValue >& aTransformations, sal_Int32 nAlpha )
{
// prevent writing a tag with empty val attribute
if( sColorSchemeName.isEmpty() )
@@ -242,7 +242,15 @@ void DrawingML::WriteColor( const OUString& sColorSchemeName, const Sequence< Pr
mpFS->startElementNS( XML_a, XML_schemeClr,
XML_val, USS( sColorSchemeName ),
FSEND );
- WriteColorTransformations( aTransformations );
+ WriteColorTransformations( aTransformations, nAlpha );
+ mpFS->endElementNS( XML_a, XML_schemeClr );
+ }
+ else if(nAlpha < MAX_PERCENT)
+ {
+ mpFS->startElementNS( XML_a, XML_schemeClr,
+ XML_val, USS( sColorSchemeName ),
+ FSEND );
+ mpFS->singleElementNS(XML_a, XML_alpha, XML_val, OString::number(nAlpha), FSEND);
mpFS->endElementNS( XML_a, XML_schemeClr );
}
else
@@ -253,15 +261,22 @@ void DrawingML::WriteColor( const OUString& sColorSchemeName, const Sequence< Pr
}
}
-void DrawingML::WriteColorTransformations( const Sequence< PropertyValue >& aTransformations )
+void DrawingML::WriteColorTransformations( const Sequence< PropertyValue >& aTransformations, sal_Int32 nAlpha )
{
for( sal_Int32 i = 0; i < aTransformations.getLength(); i++ )
{
sal_Int32 nToken = Color::getColorTransformationToken( aTransformations[i].Name );
if( nToken != XML_TOKEN_INVALID && aTransformations[i].Value.hasValue() )
{
- sal_Int32 nValue = aTransformations[i].Value.get<sal_Int32>();
- mpFS->singleElementNS( XML_a, nToken, XML_val, I32S( nValue ), FSEND );
+ if(nToken == XML_alpha && nAlpha < MAX_PERCENT)
+ {
+ mpFS->singleElementNS( XML_a, nToken, XML_val, I32S( nAlpha ), FSEND );
+ }
+ else
+ {
+ sal_Int32 nValue = aTransformations[i].Value.get<sal_Int32>();
+ mpFS->singleElementNS( XML_a, nToken, XML_val, I32S( nValue ), FSEND );
+ }
}
}
}
@@ -273,10 +288,10 @@ void DrawingML::WriteSolidFill( ::Color nColor, sal_Int32 nAlpha )
mpFS->endElementNS( XML_a, XML_solidFill );
}
-void DrawingML::WriteSolidFill( const OUString& sSchemeName, const Sequence< PropertyValue >& aTransformations )
+void DrawingML::WriteSolidFill( const OUString& sSchemeName, const Sequence< PropertyValue >& aTransformations, sal_Int32 nAlpha )
{
mpFS->startElementNS( XML_a, XML_solidFill, FSEND );
- WriteColor( sSchemeName, aTransformations );
+ WriteColor( sSchemeName, aTransformations, nAlpha );
mpFS->endElementNS( XML_a, XML_solidFill );
}
@@ -326,22 +341,36 @@ void DrawingML::WriteSolidFill( const Reference< XPropertySet >& rXPropSet )
else if ( !sColorFillScheme.isEmpty() )
{
// the shape had a scheme color and the user didn't change it
- WriteSolidFill( sColorFillScheme, aTransformations );
+ WriteSolidFill( sColorFillScheme, aTransformations, nAlpha );
}
else if ( aStyleProperties.hasElements() )
{
sal_uInt32 nThemeColor = 0;
+ sal_Int32 nThemeAlpha = MAX_PERCENT;
for( sal_Int32 i=0; i < aStyleProperties.getLength(); ++i )
{
if( aStyleProperties[i].Name == "Color" )
{
aStyleProperties[i].Value >>= nThemeColor;
- break;
+ }
+ else if(aStyleProperties[i].Name == "Transformations" )
+ {
+ Sequence< PropertyValue > aStyleTransformations;
+ aStyleProperties[i].Value >>= aStyleTransformations;
+ for( sal_Int32 j = 0; j < aStyleTransformations.getLength(); j++ )
+ {
+ if (aStyleTransformations[j].Name == "alpha" )
+ {
+ aStyleTransformations[j].Value >>= nThemeAlpha;
+ break;
+ }
+ }
}
}
- if ( nFillColor != nThemeColor )
+ if ( nFillColor != nThemeColor || nAlpha != nThemeAlpha )
// the shape contains a theme but it wasn't being used
WriteSolidFill( ::Color(nFillColor & 0xffffff), nAlpha );
+
// in case the shape used the style color and the user didn't change it,
// we must not write a <a: solidFill> tag.
}
diff --git a/sd/qa/unit/data/pptx/tdf125360.pptx b/sd/qa/unit/data/pptx/tdf125360.pptx
new file mode 100644
index 000000000000..c1a3045bc17b
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf125360.pptx differ
diff --git a/sd/qa/unit/data/pptx/tdf125360_1.pptx b/sd/qa/unit/data/pptx/tdf125360_1.pptx
new file mode 100644
index 000000000000..cfc5798369db
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf125360_1.pptx differ
diff --git a/sd/qa/unit/data/pptx/tdf125360_2.pptx b/sd/qa/unit/data/pptx/tdf125360_2.pptx
new file mode 100644
index 000000000000..4f6b16455f71
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf125360_2.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index b712a7d26769..80090c1656ae 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -198,6 +198,9 @@ public:
void testTdf99213();
void testTdf125346();
void testTdf125346_2();
+ void testTdf125360();
+ void testTdf125360_1();
+ void testTdf125360_2();
CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
@@ -279,6 +282,9 @@ public:
CPPUNIT_TEST(testTdf99213);
CPPUNIT_TEST(testTdf125346);
CPPUNIT_TEST(testTdf125346_2);
+ CPPUNIT_TEST(testTdf125360);
+ CPPUNIT_TEST(testTdf125360_1);
+ CPPUNIT_TEST(testTdf125360_2);
CPPUNIT_TEST_SUITE_END();
@@ -2118,6 +2124,76 @@ void SdOOXMLExportTest2::testTdf125346_2()
xDocShRef->DoClose();
}
+void SdOOXMLExportTest2::testTdf125360()
+{
+ // Check whether the changed fill transparency is exported correctly.
+ // Color is defined by shape style
+ ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf125360.pptx"), PPTX);
+
+ uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) );
+
+ xShape->setPropertyValue("FillTransparence", uno::makeAny(static_cast<sal_Int32>(23)));
+
+ utl::TempFile tempFile;
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+
+ xShape.set( getShapeFromPage( 0, 0, xDocShRef ) );
+
+ sal_Int32 nTransparence = 0;
+ xShape->getPropertyValue("FillTransparence") >>= nTransparence;
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(23), nTransparence);
+
+ xDocShRef->DoClose();
+}
+
+void SdOOXMLExportTest2::testTdf125360_1()
+{
+ // Check whether the changed fill transparency is exported correctly.
+ // Color is defined by color scheme
+ ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf125360_1.pptx"), PPTX);
+
+ uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) );
+
+ xShape->setPropertyValue("FillTransparence", uno::makeAny(static_cast<sal_Int32>(23)));
+
+ utl::TempFile tempFile;
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+
+ xShape.set( getShapeFromPage( 0, 0, xDocShRef ) );
+
+ sal_Int32 nTransparence = 0;
+ xShape->getPropertyValue("FillTransparence") >>= nTransparence;
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(23), nTransparence);
+
+ xDocShRef->DoClose();
+}
+
+void SdOOXMLExportTest2::testTdf125360_2()
+{
+ // Check whether the changed fill transparency is exported correctly.
+ // Color is defined by color scheme with a transparency
+ ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf125360_2.pptx"), PPTX);
+
+ uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) );
+
+ sal_Int32 nTransparence = 0;
+ xShape->getPropertyValue("FillTransparence") >>= nTransparence;
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(82), nTransparence);
+
+ xShape->setPropertyValue("FillTransparence", uno::makeAny(static_cast<sal_Int32>(23)));
+
+ utl::TempFile tempFile;
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+
+ xShape.set( getShapeFromPage( 0, 0, xDocShRef ) );
+
+ nTransparence = 0;
+ xShape->getPropertyValue("FillTransparence") >>= nTransparence;
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(23), nTransparence);
+
+ xDocShRef->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
CPPUNIT_PLUGIN_IMPLEMENT();
commit 2b95e5bdf91204ecc03bcf98375c2620b71f1c3d
Author: Mark Hung <marklh9 at gmail.com>
AuthorDate: Tue May 14 01:49:03 2019 +0800
Commit: Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Mon May 20 11:34:36 2019 +0200
tdf#124937 reset m_pFirstOfBorderMerge before truncate.
SwLinePortion::Truncate() called in
SwTextFormatter::FormatReset() delete the portion referred
by m_pFirstOfBorderMerge.
Change-Id: I68e134c86db617d37ea2efa09dad4409772146b5
Reviewed-on: https://gerrit.libreoffice.org/72300
Tested-by: Jenkins
Reviewed-by: Mark Hung <marklh9 at gmail.com>
(cherry picked from commit 96acebb72211b4718eb3038c427df37b55b17b0b)
Reviewed-on: https://gerrit.libreoffice.org/72512
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
diff --git a/sw/qa/core/data/doc/tdf124937.doc b/sw/qa/core/data/doc/tdf124937.doc
new file mode 100644
index 000000000000..4a3f91f7c020
Binary files /dev/null and b/sw/qa/core/data/doc/tdf124937.doc differ
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 473ed0ad5c63..a0778ad9a064 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1861,6 +1861,7 @@ void SwTextFormatter::FeedInf( SwTextFormatInfo &rInf ) const
void SwTextFormatter::FormatReset( SwTextFormatInfo &rInf )
{
+ m_pFirstOfBorderMerge = nullptr;
m_pCurr->Truncate();
m_pCurr->Init();
if( pBlink && m_pCurr->IsBlinking() )
commit 2506c835834acfdc344227a82f407e3b818db321
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Sat May 18 15:13:59 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Sun May 19 21:20:11 2019 +0200
tdf#125346: PPTX export: Shape has wrong fill color comming from theme
Write the correct theme path to the InteropGrabBag, the same path
what is generated and checked in the export code.
Reviewed-on: https://gerrit.libreoffice.org/72500
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
(cherry picked from commit a8bba60e8b655167ad91edcd0c2d1723d525b546)
Change-Id: I32617c1a11cf3bafb142f7c8839b498aaac49aa0
Reviewed-on: https://gerrit.libreoffice.org/72521
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx
index ab24a8262fae..bb9166e24afc 100644
--- a/include/oox/ppt/presentationfragmenthandler.hxx
+++ b/include/oox/ppt/presentationfragmenthandler.hxx
@@ -50,7 +50,7 @@ private:
void importSlide( const ::oox::core::FragmentHandlerRef& rSlideFragmentHandler,
const oox::ppt::SlidePersistPtr& rPersist );
void importSlide(sal_uInt32 nSlide, bool bFirstSlide, bool bImportNotes);
- void saveThemeToGrabBag(const oox::drawingml::ThemePtr& pThemePtr, const OUString& sTheme);
+ void saveThemeToGrabBag(const oox::drawingml::ThemePtr& pThemePtr, sal_Int32 nThemeIdx);
std::vector< OUString > maSlideMasterVector;
std::vector< OUString > maSlidesVector;
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index f2477b2cef6e..13bba2da95a3 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -160,7 +160,7 @@ static void ResolveTextFields( XmlFilterBase const & rFilter )
}
void PresentationFragmentHandler::saveThemeToGrabBag(const oox::drawingml::ThemePtr& pThemePtr,
- const OUString& sTheme)
+ sal_Int32 nThemeIdx)
{
if (!pThemePtr)
return;
@@ -198,8 +198,11 @@ void PresentationFragmentHandler::saveThemeToGrabBag(const oox::drawingml::Theme
aCurrentTheme[nId].Value = rColor;
}
+
// add new theme to the sequence
- aTheme[0].Name = sTheme;
+ // Export code uses the master slide's index to find the right theme
+ // so use the same index in the grabbag.
+ aTheme[0].Name = "ppt/theme/theme" + OUString::number(nThemeIdx) + ".xml";
const uno::Any& rCurrentTheme = makeAny(aCurrentTheme);
aTheme[0].Value = rCurrentTheme;
@@ -273,10 +276,17 @@ void PresentationFragmentHandler::importSlide(sal_uInt32 nSlide, bool bFirstPage
Reference< drawing::XMasterPagesSupplier > xMPS( xModel, uno::UNO_QUERY_THROW );
Reference< drawing::XDrawPages > xMasterPages( xMPS->getMasterPages(), uno::UNO_QUERY_THROW );
+ sal_Int32 nIndex;
if( rFilter.getMasterPages().empty() )
- xMasterPages->getByIndex( 0 ) >>= xMasterPage;
+ {
+ nIndex = 0;
+ xMasterPages->getByIndex( nIndex ) >>= xMasterPage;
+ }
else
- xMasterPage = xMasterPages->insertNewByIndex( xMasterPages->getCount() );
+ {
+ nIndex = xMasterPages->getCount();
+ xMasterPage = xMasterPages->insertNewByIndex( nIndex );
+ }
pMasterPersistPtr = std::make_shared<SlidePersist>( rFilter, true, false, xMasterPage,
ShapePtr( new PPTShape( Master, "com.sun.star.drawing.GroupShape" ) ), mpTextListStyle );
@@ -306,7 +316,7 @@ void PresentationFragmentHandler::importSlide(sal_uInt32 nSlide, bool bFirstPage
UNO_QUERY_THROW));
rThemes[ aThemeFragmentPath ] = pThemePtr;
pThemePtr->setFragment(xDoc);
- saveThemeToGrabBag(pThemePtr, aThemeFragmentPath);
+ saveThemeToGrabBag(pThemePtr, nIndex + 1);
}
else
{
diff --git a/sd/qa/unit/data/pptx/tdf125346.pptx b/sd/qa/unit/data/pptx/tdf125346.pptx
new file mode 100644
index 000000000000..32fbbdf52e96
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf125346.pptx differ
diff --git a/sd/qa/unit/data/pptx/tdf125346_2.pptx b/sd/qa/unit/data/pptx/tdf125346_2.pptx
new file mode 100644
index 000000000000..53225581026e
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf125346_2.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index 62014c9ee7a0..b712a7d26769 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -196,6 +196,8 @@ public:
void testTdf118825();
void testTdf119118();
void testTdf99213();
+ void testTdf125346();
+ void testTdf125346_2();
CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
@@ -275,6 +277,8 @@ public:
CPPUNIT_TEST(testTdf118825);
CPPUNIT_TEST(testTdf119118);
CPPUNIT_TEST(testTdf99213);
+ CPPUNIT_TEST(testTdf125346);
+ CPPUNIT_TEST(testTdf125346_2);
CPPUNIT_TEST_SUITE_END();
@@ -2043,6 +2047,77 @@ void SdOOXMLExportTest2::testTdf99213()
xDocShRef->DoClose();
}
+void SdOOXMLExportTest2::testTdf125346()
+{
+ // There are two themes in the test document, make sure we use the right theme
+ ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf125346.pptx"), PPTX);
+ utl::TempFile tempFile;
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+
+ uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) );
+ uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_SET_THROW );
+
+ drawing::FillStyle aFillStyle( drawing::FillStyle_NONE );
+ xPropSet->getPropertyValue("FillStyle") >>= aFillStyle;
+ CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, aFillStyle);
+
+ sal_Int32 nFillColor;
+ xPropSet->getPropertyValue("FillColor") >>= nFillColor;
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0x90C226), nFillColor);
+
+ xDocShRef->DoClose();
+}
+
+void SdOOXMLExportTest2::testTdf125346_2()
+{
+ // There are two themes in the test document, make sure we use the right theme
+ // Test more slides with different themes
+ ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf125346_2.pptx"), PPTX);
+ utl::TempFile tempFile;
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+
+ {
+ uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) );
+ uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_SET_THROW );
+
+ drawing::FillStyle aFillStyle( drawing::FillStyle_NONE );
+ xPropSet->getPropertyValue("FillStyle") >>= aFillStyle;
+ CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, aFillStyle);
+
+ sal_Int32 nFillColor;
+ xPropSet->getPropertyValue("FillColor") >>= nFillColor;
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0x90C226), nFillColor);
+ }
+
+ {
+ uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 1, xDocShRef ) );
+ uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_SET_THROW );
+
+ drawing::FillStyle aFillStyle( drawing::FillStyle_NONE );
+ xPropSet->getPropertyValue("FillStyle") >>= aFillStyle;
+ CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, aFillStyle);
+
+ sal_Int32 nFillColor;
+ xPropSet->getPropertyValue("FillColor") >>= nFillColor;
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0x052F61), nFillColor);
+ }
+
+ {
+ uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 2, xDocShRef ) );
+ uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_SET_THROW );
+
+ drawing::FillStyle aFillStyle( drawing::FillStyle_NONE );
+ xPropSet->getPropertyValue("FillStyle") >>= aFillStyle;
+ CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, aFillStyle);
+
+ sal_Int32 nFillColor;
+ xPropSet->getPropertyValue("FillColor") >>= nFillColor;
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0x90C226), nFillColor);
+ }
+
+ xDocShRef->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
CPPUNIT_PLUGIN_IMPLEMENT();
commit c25b5c2c3d019f1a282ba3fe65eb577ff1c8870b
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 17 15:44:02 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat May 18 10:41:34 2019 +0200
Resolves: tdf#125104 crash on getting text desc of numbering
this seems to have been wrong for a very long time, but we used
to get away with it back in the .src era with presumably amusingly
random strings from other parts of the ui shown in the summary
of changes are of the organizer page of the dialog
Change-Id: If223182170ba8519d7899f8044f01c2a12f4e391
Reviewed-on: https://gerrit.libreoffice.org/72491
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
Tested-by: Jenkins
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index bbf80d45d5c0..9f6c9a4ac3a1 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -22,10 +22,15 @@
#include <utility>
#include <osl/diagnose.h>
+#include <comphelper/processfactory.hxx>
#include <tools/stream.hxx>
+#include <tools/resary.hxx>
#include <svx/pageitem.hxx>
+#include <svx/strarray.hxx>
#include <editeng/itemtype.hxx>
#include <svx/unomid.hxx>
+#include <com/sun/star/text/DefaultNumberingProvider.hpp>
+#include <com/sun/star/text/XNumberingTypeInfo.hpp>
#include <com/sun/star/style/NumberingType.hpp>
#include <com/sun/star/style/PageStyleLayout.hpp>
#include <com/sun/star/style/BreakType.hpp>
@@ -95,6 +100,26 @@ static const char* RID_SVXITEMS_PAGE_NUMS[] =
RID_SVXITEMS_PAGE_NUM_NONE
};
+namespace
+{
+ OUString GetNumberingDescription(SvxNumType eNumType)
+ {
+ // classic ones, keep displaying the old name
+ if (eNumType <= css::style::NumberingType::NUMBER_NONE)
+ return SvxResId(RID_SVXITEMS_PAGE_NUMS[eNumType]);
+ // new ones, reuse the text used in the numbering dropdown list
+ sal_uInt32 n = SvxNumberingTypeTable::FindIndex(eNumType);
+ if (n != RESARRAY_INDEX_NOTFOUND)
+ return SvxNumberingTypeTable::GetString(n);
+ css::uno::Reference<css::uno::XComponentContext> xContext = comphelper::getProcessComponentContext();
+ css::uno::Reference<css::text::XDefaultNumberingProvider> xDefNum = css::text::DefaultNumberingProvider::create(xContext);
+ css::uno::Reference<css::text::XNumberingTypeInfo> xInfo(xDefNum, css::uno::UNO_QUERY);
+ if (!xInfo.is())
+ return OUString();
+ return xInfo->getNumberingIdentifier(eNumType);
+ }
+}
+
bool SvxPageItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -114,8 +139,7 @@ bool SvxPageItem::GetPresentation
{
rText = aDescName + cpDelimTmp;
}
- assert(eNumType <= css::style::NumberingType::NUMBER_NONE && "enum overflow");
- rText += SvxResId(RID_SVXITEMS_PAGE_NUMS[eNumType]) + cpDelimTmp;
+ rText += GetNumberingDescription(eNumType) + cpDelimTmp;
if ( bLandscape )
rText += SvxResId(RID_SVXITEMS_PAGE_LAND_TRUE);
else
@@ -134,8 +158,7 @@ bool SvxPageItem::GetPresentation
{
rText += aDescName + cpDelimTmp;
}
- assert(eNumType <= css::style::NumberingType::NUMBER_NONE && "enum overflow");
- rText += SvxResId(RID_SVXITEMS_PAGE_NUMS[eNumType]) + cpDelimTmp;
+ rText += GetNumberingDescription(eNumType) + cpDelimTmp;
if ( bLandscape )
rText += SvxResId(RID_SVXITEMS_PAGE_LAND_TRUE);
else
commit 21e1aa9d6b13b39b87435f8998c7ea6123a069fd
Author: Katarina Behrens <Katarina.Behrens at cib.de>
AuthorDate: Wed May 15 20:12:23 2019 +0200
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sat May 18 00:25:51 2019 +0200
tdf#125267: relax the requirement of fixed value of current filter
In a filepicker, user can select any file filter ('All files' for
example) and still choose to open .odb file. Specific UIName of
the current filter ('ODF Database' in this case) shouldn't therefore
be a hard requirement, the correct file extension is enough.
Change-Id: I641a267c545c66aa4d34954922783cc5ff7efd24
Reviewed-on: https://gerrit.libreoffice.org/72377
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
(cherry picked from commit dc17f247daeb281dda531ff335873d563db5b653)
Reviewed-on: https://gerrit.libreoffice.org/72453
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 9f1c2c6f58a6..06a6e7d8b720 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -701,7 +701,10 @@ namespace dbaui
if ( aFileDlg.Execute() == ERRCODE_NONE )
{
OUString sPath = aFileDlg.GetPath();
- if ( aFileDlg.GetCurrentFilter() != pFilter->GetUIName() || !pFilter->GetWildcard().Matches(sPath) )
+ // check for aFileDlg.GetCurrentFilter used to be here but current fpicker filter
+ // can be set to anything, see tdf#125267 how this breaks if other value
+ // than 'ODF Database' is selected. Let's therefore check only if wildcard matches
+ if ( !pFilter->GetWildcard().Matches(sPath) )
{
OUString sMessage(DBA_RES(STR_ERR_USE_CONNECT_TO));
std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(GetFrameWeld(),
commit 90cf72f8a4988b4978c40d19ec7a4db314b97480
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Fri May 17 17:30:38 2019 +0200
Commit: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Fri May 17 17:31:51 2019 +0200
update credits
Change-Id: I7d712426ff82242fd1a53779ad1e7df6d6fa86d9
(cherry picked from commit b5bc0d40ce55ced3c5019bdce27395e2a4f74454)
diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt
index ad5c69379a8f..dbb04b1ff79e 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="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">
- <office:meta><dc:title>Credits » LibreOffice</dc:title><meta:keyword>Credits</meta:keyword><meta:keyword>contributors</meta:keyword><meta:keyword>coders</meta:keyword><meta:keyword>developers</meta:keyword><dc:description>Credits for the LibreOffice development/coding.</dc:description><meta:generator>LibreOffice/6.2.3.2$Linux_X86_64 LibreOffice_project/aecc05fe267cc68dde00352a451aa867b3b546ac</meta:generator><dc:date>2012-02-20T22:17:18.060000000</dc:date><meta:editing-duration>PT14M12S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:document-statistic meta:table-count="5" meta:image-count="1" meta:object-count="0" meta:page-count="2" meta:paragraph-count="3939" meta:word-count="14347" meta:character-count="103195" meta:non-whitespace-character-count="90344"/><meta:user-defined meta:name="google-site-verification">JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA</meta:user-defined></office:meta>
+ <office:meta><dc:title>Credits » LibreOffice</dc:title><meta:keyword>Credits</meta:keyword><meta:keyword>contributors</meta:keyword><meta:keyword>coders</meta:keyword><meta:keyword>developers</meta:keyword><dc:description>Credits for the LibreOffice development/coding.</dc:description><meta:generator>LibreOffice/6.2.3.2$Linux_X86_64 LibreOffice_project/aecc05fe267cc68dde00352a451aa867b3b546ac</meta:generator><dc:date>2012-02-20T22:17:18.060000000</dc:date><meta:editing-duration>PT14M12S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:document-statistic meta:table-count="4" meta:image-count="1" meta:object-count="0" meta:page-count="2" meta:paragraph-count="3945" meta:word-count="14382" meta:character-count="103466" meta:non-whitespace-character-count="90586"/><meta:user-defined meta:name="google-site-verification">JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA</meta:user-defined></office:meta>
<office:settings>
<config:config-item-set config:name="ooo:view-settings">
- <config:config-item config:name="ViewAreaTop" config:type="long">584</config:config-item>
+ <config:config-item config:name="ViewAreaTop" config:type="long">552</config:config-item>
<config:config-item config:name="ViewAreaLeft" config:type="long">501</config:config-item>
<config:config-item config:name="ViewAreaWidth" config:type="long">32440</config:config-item>
<config:config-item config:name="ViewAreaHeight" config:type="long">18152</config:config-item>
@@ -16,9 +16,9 @@
<config:config-item config:name="ViewLeft" config:type="long">3649</config:config-item>
<config:config-item config:name="ViewTop" config:type="long">3471</config:config-item>
<config:config-item config:name="VisibleLeft" config:type="long">501</config:config-item>
- <config:config-item config:name="VisibleTop" config:type="long">584</config:config-item>
+ <config:config-item config:name="VisibleTop" config:type="long">552</config:config-item>
<config:config-item config:name="VisibleRight" config:type="long">32939</config:config-item>
- <config:config-item config:name="VisibleBottom" config:type="long">18734</config:config-item>
+ <config:config-item config:name="VisibleBottom" config:type="long">18703</config:config-item>
<config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
<config:config-item config:name="ViewLayoutColumns" config:type="short">0</config:config-item>
<config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
@@ -114,7 +114,7 @@
<config:config-item config:name="EmbedAsianScriptFonts" config:type="boolean">true</config:config-item>
<config:config-item config:name="TabAtLeftIndentForParagraphsInList" config:type="boolean">false</config:config-item>
<config:config-item config:name="PrintRightPages" config:type="boolean">true</config:config-item>
- <config:config-item config:name="Rsid" config:type="int">8509381</config:config-item>
+ <config:config-item config:name="Rsid" config:type="int">8636398</config:config-item>
<config:config-item config:name="MathBaselineAlignment" config:type="boolean">false</config:config-item>
<config:config-item config:name="MsWordCompTrailingBlanks" config:type="boolean">false</config:config-item>
<config:config-item config:name="InvertBorderSpacing" config:type="boolean">false</config:config-item>
@@ -325,105 +325,87 @@
</office:styles>
<office:automatic-styles>
<style:style style:name="Tabelle1" style:family="table">
- <style:table-properties style:width="26.174cm" table:align="left"/>
+ <style:table-properties style:width="27.788cm" table:align="left"/>
</style:style>
<style:style style:name="Tabelle1.A" style:family="table-column">
- <style:table-column-properties style:column-width="6.775cm"/>
+ <style:table-column-properties style:column-width="6.299cm"/>
</style:style>
<style:style style:name="Tabelle1.B" style:family="table-column">
- <style:table-column-properties style:column-width="6.828cm"/>
+ <style:table-column-properties style:column-width="6.061cm"/>
</style:style>
<style:style style:name="Tabelle1.C" style:family="table-column">
- <style:table-column-properties style:column-width="6.272cm"/>
+ <style:table-column-properties style:column-width="8.521cm"/>
</style:style>
<style:style style:name="Tabelle1.D" style:family="table-column">
- <style:table-column-properties style:column-width="6.299cm"/>
+ <style:table-column-properties style:column-width="6.907cm"/>
</style:style>
<style:style style:name="Tabelle1.A1" style:family="table-cell">
<style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/>
</style:style>
- <style:style style:name="Tabelle1.B325" style:family="table-cell">
+ <style:style style:name="Tabelle1.D326" style:family="table-cell">
+ <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
+ </style:style>
+ <style:style style:name="Tabelle1.C333" style:family="table-cell">
<style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
</style:style>
<style:style style:name="Tabelle2" style:family="table">
- <style:table-properties style:width="18.184cm" table:align="left"/>
+ <style:table-properties style:width="17.999cm" table:align="left"/>
</style:style>
<style:style style:name="Tabelle2.A" style:family="table-column">
- <style:table-column-properties style:column-width="5.32cm"/>
+ <style:table-column-properties style:column-width="3.865cm"/>
</style:style>
<style:style style:name="Tabelle2.B" style:family="table-column">
- <style:table-column-properties style:column-width="3.865cm"/>
+ <style:table-column-properties style:column-width="3.838cm"/>
</style:style>
<style:style style:name="Tabelle2.C" style:family="table-column">
- <style:table-column-properties style:column-width="4.817cm"/>
+ <style:table-column-properties style:column-width="6.193cm"/>
</style:style>
<style:style style:name="Tabelle2.D" style:family="table-column">
- <style:table-column-properties style:column-width="4.182cm"/>
+ <style:table-column-properties style:column-width="4.103cm"/>
</style:style>
<style:style style:name="Tabelle2.A1" style:family="table-cell">
<style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/>
</style:style>
- <style:style style:name="Tabelle2.C7" style:family="table-cell">
+ <style:style style:name="Tabelle2.C33" style:family="table-cell">
<style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
</style:style>
<style:style style:name="Tabelle3" style:family="table">
- <style:table-properties style:width="17.999cm" table:align="left"/>
+ <style:table-properties style:width="17.02cm" table:align="left"/>
</style:style>
<style:style style:name="Tabelle3.A" style:family="table-column">
- <style:table-column-properties style:column-width="3.865cm"/>
+ <style:table-column-properties style:column-width="3.918cm"/>
</style:style>
<style:style style:name="Tabelle3.B" style:family="table-column">
- <style:table-column-properties style:column-width="3.838cm"/>
+ <style:table-column-properties style:column-width="4.897cm"/>
</style:style>
<style:style style:name="Tabelle3.C" style:family="table-column">
- <style:table-column-properties style:column-width="6.193cm"/>
- </style:style>
- <style:style style:name="Tabelle3.D" style:family="table-column">
- <style:table-column-properties style:column-width="4.103cm"/>
+ <style:table-column-properties style:column-width="4.288cm"/>
</style:style>
<style:style style:name="Tabelle3.A1" style:family="table-cell">
<style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/>
</style:style>
- <style:style style:name="Tabelle3.C33" style:family="table-cell">
+ <style:style style:name="Tabelle3.B3" style:family="table-cell">
<style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
</style:style>
<style:style style:name="Tabelle4" style:family="table">
- <style:table-properties style:width="17.02cm" table:align="left"/>
+ <style:table-properties style:width="31.201cm" table:align="left"/>
</style:style>
<style:style style:name="Tabelle4.A" style:family="table-column">
- <style:table-column-properties style:column-width="3.918cm"/>
+ <style:table-column-properties style:column-width="6.669cm"/>
</style:style>
<style:style style:name="Tabelle4.B" style:family="table-column">
- <style:table-column-properties style:column-width="4.897cm"/>
+ <style:table-column-properties style:column-width="5.902cm"/>
</style:style>
<style:style style:name="Tabelle4.C" style:family="table-column">
- <style:table-column-properties style:column-width="4.288cm"/>
- </style:style>
- <style:style style:name="Tabelle4.A1" style:family="table-cell">
- <style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/>
- </style:style>
- <style:style style:name="Tabelle4.B3" style:family="table-cell">
- <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
- </style:style>
- <style:style style:name="Tabelle5" style:family="table">
- <style:table-properties style:width="32.016cm" table:align="left"/>
- </style:style>
- <style:style style:name="Tabelle5.A" style:family="table-column">
- <style:table-column-properties style:column-width="6.828cm"/>
- </style:style>
- <style:style style:name="Tabelle5.B" style:family="table-column">
- <style:table-column-properties style:column-width="11.744cm"/>
+ <style:table-column-properties style:column-width="6.722cm"/>
</style:style>
- <style:style style:name="Tabelle5.C" style:family="table-column">
- <style:table-column-properties style:column-width="6.66cm"/>
+ <style:style style:name="Tabelle4.D" style:family="table-column">
+ <style:table-column-properties style:column-width="11.908cm"/>
</style:style>
- <style:style style:name="Tabelle5.D" style:family="table-column">
- <style:table-column-properties style:column-width="6.784cm"/>
- </style:style>
- <style:style style:name="Tabelle5.A1" style:family="table-cell">
+ <style:style style:name="Tabelle4.A1" style:family="table-cell">
<style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/>
</style:style>
- <style:style style:name="Tabelle5.D616" style:family="table-cell">
+ <style:style style:name="Tabelle4.D616" style:family="table-cell">
<style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
</style:style>
<style:style style:name="P1" style:family="paragraph" style:parent-style-name="Table_20_Contents">
@@ -1059,7 +1041,7 @@
</office:binary-data>
</draw:image>
</draw:frame>Credits</text:p>
- <text:p text:style-name="Text_20_body">1427 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2019-04-25 14:12:30.</text:p>
+ <text:p text:style-name="Text_20_body">1433 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2019-05-17 11:02:01.</text:p>
<text:p text:style-name="Text_20_body"><text:span text:style-name="T1">*</text:span> marks developers whose first contributions happened after 2010-09-28.</text:p>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Developers committing code since 2010-09-28</text:h>
<table:table table:name="Tabelle1" table:style-name="Tabelle1">
@@ -1083,16 +1065,16 @@
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Caolán McNamara<text:line-break/>Commits: 25940<text:line-break/>Joined: 2000-10-10</text:p>
+ <text:p text:style-name="Table_20_Contents">Caolán McNamara<text:line-break/>Commits: 26036<text:line-break/>Joined: 2000-10-10</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Vladimir Glazunov<text:line-break/>Commits: 25434<text:line-break/>Joined: 2000-12-04</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Stephan Bergmann<text:line-break/>Commits: 16926<text:line-break/>Joined: 2000-10-04</text:p>
+ <text:p text:style-name="Table_20_Contents">Stephan Bergmann<text:line-break/>Commits: 16967<text:line-break/>Joined: 2000-10-04</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Noel Grandin<text:line-break/>Commits: 11234<text:line-break/>Joined: <text:span text:style-name="T2">2011-12-12</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Noel Grandin<text:line-break/>Commits: 11289<text:line-break/>Joined: <text:span text:style-name="T2">2011-12-12</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1100,10 +1082,10 @@
<text:p text:style-name="Table_20_Contents">Ivo Hinkelmann<text:line-break/>Commits: 9480<text:line-break/>Joined: 2002-09-09</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Tor Lillqvist<text:line-break/>Commits: 8566<text:line-break/>Joined: 2010-03-23</text:p>
+ <text:p text:style-name="Table_20_Contents">Tor Lillqvist<text:line-break/>Commits: 8575<text:line-break/>Joined: 2010-03-23</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Miklos Vajna<text:line-break/>Commits: 7399<text:line-break/>Joined: 2010-07-29</text:p>
+ <text:p text:style-name="Table_20_Contents">Miklos Vajna<text:line-break/>Commits: 7428<text:line-break/>Joined: 2010-07-29</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Michael Stahl<text:line-break/>Commits: 6418<text:line-break/>Joined: 2008-06-16</text:p>
@@ -1120,12 +1102,12 @@
<text:p text:style-name="Table_20_Contents">Frank Schoenheit [fs]<text:line-break/>Commits: 5008<text:line-break/>Joined: 2000-09-19</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Eike Rathke<text:line-break/>Commits: 4631<text:line-break/>Joined: 2000-10-11</text:p>
+ <text:p text:style-name="Table_20_Contents">Eike Rathke<text:line-break/>Commits: 4646<text:line-break/>Joined: 2000-10-11</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">David Tardon<text:line-break/>Commits: 3622<text:line-break/>Joined: 2009-11-12</text:p>
+ <text:p text:style-name="Table_20_Contents">David Tardon<text:line-break/>Commits: 3623<text:line-break/>Joined: 2009-11-12</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Hans-Joachim Lankenau<text:line-break/>Commits: 3007<text:line-break/>Joined: 2000-09-19</text:p>
@@ -1134,12 +1116,12 @@
<text:p text:style-name="Table_20_Contents">Ocke Janssen [oj]<text:line-break/>Commits: 2850<text:line-break/>Joined: 2000-09-20</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Jan Holesovsky<text:line-break/>Commits: 2586<text:line-break/>Joined: 2009-06-23</text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Julien Nabet<text:line-break/>Commits: 2600<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-04</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Julien Nabet<text:line-break/>Commits: 2582<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-04</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents">Jan Holesovsky<text:line-break/>Commits: 2589<text:line-break/>Joined: 2009-06-23</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Mathias Bauer<text:line-break/>Commits: 2580<text:line-break/>Joined: 2000-09-20</text:p>
@@ -1148,12 +1130,12 @@
<text:p text:style-name="Table_20_Contents">Oliver Specht<text:line-break/>Commits: 2549<text:line-break/>Joined: 2000-09-21</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Michael Meeks<text:line-break/>Commits: 2319<text:line-break/>Joined: 2004-08-05</text:p>
+ <text:p text:style-name="Table_20_Contents">Michael Meeks<text:line-break/>Commits: 2328<text:line-break/>Joined: 2004-08-05</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Bjoern Michaelsen<text:line-break/>Commits: 2282<text:line-break/>Joined: 2009-10-14</text:p>
+ <text:p text:style-name="Table_20_Contents">Bjoern Michaelsen<text:line-break/>Commits: 2283<text:line-break/>Joined: 2009-10-14</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Norbert Thiebaud<text:line-break/>Commits: 2176<text:line-break/>Joined: <text:span text:style-name="T2">2010-09-29</text:span></text:p>
@@ -1162,7 +1144,7 @@
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Thomas Arnhold<text:line-break/>Commits: 2176<text:line-break/>Joined: <text:span text:style-name="T2">2011-01-16</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Tomaž Vajngerl<text:line-break/>Commits: 2127<text:line-break/>Joined: <text:span text:style-name="T2">2012-06-02</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Tomaž Vajngerl<text:line-break/>Commits: 2155<text:line-break/>Joined: <text:span text:style-name="T2">2012-06-02</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1170,13 +1152,13 @@
<text:p text:style-name="Table_20_Contents">Philipp Lohmann [pl]<text:line-break/>Commits: 2089<text:line-break/>Joined: 2000-09-21</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Andras Timar<text:line-break/>Commits: 1885<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-02</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Andras Timar<text:line-break/>Commits: 1887<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-02</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Christian Lippka<text:line-break/>Commits: 1805<text:line-break/>Joined: 2000-09-25</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Luboš Luňák<text:line-break/>Commits: 1712<text:line-break/>Joined: 2010-09-21</text:p>
+ <text:p text:style-name="Table_20_Contents">Luboš Luňák<text:line-break/>Commits: 1739<text:line-break/>Joined: 2010-09-21</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1184,18 +1166,18 @@
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Matúš Kukan<text:line-break/>Commits: 1712<text:line-break/>Joined: <text:span text:style-name="T2">2011-04-06</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Takeshi Abe<text:line-break/>Commits: 1481<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-08</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Takeshi Abe<text:line-break/>Commits: 1482<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-08</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Matteo Casalin<text:line-break/>Commits: 1476<text:line-break/>Joined: <text:span text:style-name="T2">2011-11-13</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Armin Le Grand<text:line-break/>Commits: 1451<text:line-break/>Joined: 2000-09-25</text:p>
+ <text:p text:style-name="Table_20_Contents">Armin Le Grand<text:line-break/>Commits: 1453<text:line-break/>Joined: 2000-09-25</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Thorsten Behrens<text:line-break/>Commits: 1389<text:line-break/>Joined: 2001-04-25</text:p>
+ <text:p text:style-name="Table_20_Contents">Thorsten Behrens<text:line-break/>Commits: 1390<text:line-break/>Joined: 2001-04-25</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Fridrich Štrba<text:line-break/>Commits: 1338<text:line-break/>Joined: 2007-02-22</text:p>
@@ -1204,21 +1186,21 @@
<text:p text:style-name="Table_20_Contents">Thomas Lange [tl]<text:line-break/>Commits: 1310<text:line-break/>Joined: 2000-09-22</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Niklas Nebel<text:line-break/>Commits: 1296<text:line-break/>Joined: 2000-09-19</text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Andrea Gelmini<text:line-break/>Commits: 1299<text:line-break/>Joined: <text:span text:style-name="T2">2014-10-30</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Daniel Rentz [dr]<text:line-break/>Commits: 1206<text:line-break/>Joined: 2000-09-28</text:p>
+ <text:p text:style-name="Table_20_Contents">Niklas Nebel<text:line-break/>Commits: 1296<text:line-break/>Joined: 2000-09-19</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Chris Sherlock<text:line-break/>Commits: 1204<text:line-break/>Joined: <text:span text:style-name="T2">2013-02-25</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents">Daniel Rentz [dr]<text:line-break/>Commits: 1206<text:line-break/>Joined: 2000-09-28</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Andrea Gelmini<text:line-break/>Commits: 1195<text:line-break/>Joined: <text:span text:style-name="T2">2014-10-30</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Chris Sherlock<text:line-break/>Commits: 1204<text:line-break/>Joined: <text:span text:style-name="T2">2013-02-25</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Tamás Zolnai<text:line-break/>Commits: 1050<text:line-break/>Joined: <text:span text:style-name="T2">2012-08-06</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Tamás Zolnai<text:line-break/>Commits: 1053<text:line-break/>Joined: <text:span text:style-name="T2">2012-08-06</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1229,10 +1211,10 @@
<text:p text:style-name="Table_20_Contents">Petr Mladek<text:line-break/>Commits: 958<text:line-break/>Joined: 2006-10-03</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Noel Power<text:line-break/>Commits: 950<text:line-break/>Joined: 2002-09-24</text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Mike Kaganski<text:line-break/>Commits: 954<text:line-break/>Joined: <text:span text:style-name="T2">2015-04-26</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Mike Kaganski<text:line-break/>Commits: 912<text:line-break/>Joined: <text:span text:style-name="T2">2015-04-26</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents">Noel Power<text:line-break/>Commits: 950<text:line-break/>Joined: 2002-09-24</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1254,24 +1236,24 @@
<text:p text:style-name="Table_20_Contents">Sven Jacobi<text:line-break/>Commits: 850<text:line-break/>Joined: 2000-09-21</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Olivier Hallot<text:line-break/>Commits: 836<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-25</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Olivier Hallot<text:line-break/>Commits: 844<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-25</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Herbert Dürr<text:line-break/>Commits: 827<text:line-break/>Joined: 2000-10-17</text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>andreas kainz<text:line-break/>Commits: 841<text:line-break/>Joined: <text:span text:style-name="T2">2015-03-18</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Martin Gallwey<text:line-break/>Commits: 827<text:line-break/>Joined: 2000-11-08</text:p>
+ <text:p text:style-name="Table_20_Contents">Herbert Dürr<text:line-break/>Commits: 827<text:line-break/>Joined: 2000-10-17</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>andreas kainz<text:line-break/>Commits: 812<text:line-break/>Joined: <text:span text:style-name="T2">2015-03-18</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents">Martin Gallwey<text:line-break/>Commits: 827<text:line-break/>Joined: 2000-11-08</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Mikhail Voytenko<text:line-break/>Commits: 793<text:line-break/>Joined: 2001-01-16</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Samuel Mehrbrodt<text:line-break/>Commits: 753<text:line-break/>Joined: <text:span text:style-name="T2">2011-06-08</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Samuel Mehrbrodt<text:line-break/>Commits: 764<text:line-break/>Joined: <text:span text:style-name="T2">2011-06-08</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Carsten Driesner<text:line-break/>Commits: 748<text:line-break/>Joined: 2000-10-06</text:p>
@@ -1279,10 +1261,10 @@
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Joachim Lingner<text:line-break/>Commits: 745<text:line-break/>Joined: 2000-10-05</text:p>
+ <text:p text:style-name="Table_20_Contents">Christian Lohmaier<text:line-break/>Commits: 745<text:line-break/>Joined: 2008-06-01</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Christian Lohmaier<text:line-break/>Commits: 741<text:line-break/>Joined: 2008-06-01</text:p>
+ <text:p text:style-name="Table_20_Contents">Joachim Lingner<text:line-break/>Commits: 745<text:line-break/>Joined: 2000-10-05</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Andrzej Hunt<text:line-break/>Commits: 733<text:line-break/>Joined: <text:span text:style-name="T2">2012-03-27</text:span></text:p>
@@ -1296,18 +1278,18 @@
<text:p text:style-name="Table_20_Contents">Release Engineering<text:line-break/>Commits: 728<text:line-break/>Joined: 2008-10-02</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Maxim Monastirsky<text:line-break/>Commits: 714<text:line-break/>Joined: <text:span text:style-name="T2">2013-10-27</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Katarina Behrens<text:line-break/>Commits: 719<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-13</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Katarina Behrens<text:line-break/>Commits: 707<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-13</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Maxim Monastirsky<text:line-break/>Commits: 714<text:line-break/>Joined: <text:span text:style-name="T2">2013-10-27</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Michael Stahl<text:line-break/>Commits: 688<text:line-break/>Joined: <text:span text:style-name="T2">2018-04-03</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Michael Stahl<text:line-break/>Commits: 714<text:line-break/>Joined: <text:span text:style-name="T2">2018-04-03</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Zdeněk Crhonek<text:line-break/>Commits: 680<text:line-break/>Joined: <text:span text:style-name="T2">2016-05-19</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Zdeněk Crhonek<text:line-break/>Commits: 694<text:line-break/>Joined: <text:span text:style-name="T2">2016-05-19</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Joerg Skottke [jsk]<text:line-break/>Commits: 678<text:line-break/>Joined: 2008-06-17</text:p>
@@ -1327,21 +1309,21 @@
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Gabor Kelemen<text:line-break/>Commits: 625<text:line-break/>Joined: <text:span text:style-name="T2">2013-06-18</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Rafael Dominguez<text:line-break/>Commits: 606<text:line-break/>Joined: <text:span text:style-name="T2">2011-02-13</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Jens Carl<text:line-break/>Commits: 617<text:line-break/>Joined: <text:span text:style-name="T2">2014-05-28</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Jens Carl<text:line-break/>Commits: 596<text:line-break/>Joined: <text:span text:style-name="T2">2014-05-28</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Rafael Dominguez<text:line-break/>Commits: 606<text:line-break/>Joined: <text:span text:style-name="T2">2011-02-13</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Jochen Nitschke<text:line-break/>Commits: 584<text:line-break/>Joined: <text:span text:style-name="T2">2016-02-02</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Jan-Marek Glogowski<text:line-break/>Commits: 594<text:line-break/>Joined: <text:span text:style-name="T2">2013-11-14</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Yousuf Philips<text:line-break/>Commits: 569<text:line-break/>Joined: <text:span text:style-name="T2">2014-09-21</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Jochen Nitschke<text:line-break/>Commits: 584<text:line-break/>Joined: <text:span text:style-name="T2">2016-02-02</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Jan-Marek Glogowski<text:line-break/>Commits: 566<text:line-break/>Joined: <text:span text:style-name="T2">2013-11-14</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Yousuf Philips<text:line-break/>Commits: 569<text:line-break/>Joined: <text:span text:style-name="T2">2014-09-21</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Thomas Benisch [tbe]<text:line-break/>Commits: 551<text:line-break/>Joined: 2000-10-23</text:p>
@@ -1363,7 +1345,7 @@
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Szymon Kłos<text:line-break/>Commits: 495<text:line-break/>Joined: <text:span text:style-name="T2">2014-03-22</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Szymon Kłos<text:line-break/>Commits: 497<text:line-break/>Joined: <text:span text:style-name="T2">2014-03-22</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Peter Foley<text:line-break/>Commits: 489<text:line-break/>Joined: <text:span text:style-name="T2">2011-09-04</text:span></text:p>
@@ -1377,10 +1359,10 @@
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Adolfo Jayme Barrientos<text:line-break/>Commits: 411<text:line-break/>Joined: <text:span text:style-name="T2">2013-06-21</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Adolfo Jayme Barrientos<text:line-break/>Commits: 412<text:line-break/>Joined: <text:span text:style-name="T2">2013-06-21</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Justin Luth<text:line-break/>Commits: 395<text:line-break/>Joined: <text:span text:style-name="T2">2014-09-30</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Justin Luth<text:line-break/>Commits: 397<text:line-break/>Joined: <text:span text:style-name="T2">2014-09-30</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="Table_20_Contents">Dirk Voelzke<text:line-break/>Commits: 392<text:line-break/>Joined: 2000-11-27</text:p>
@@ -1397,10 +1379,10 @@
<text:p text:style-name="Table_20_Contents">Martin Hollmichel<text:line-break/>Commits: 371<text:line-break/>Joined: 2000-09-19</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Pranav Kant<text:line-break/>Commits: 366<text:line-break/>Joined: <text:span text:style-name="T2">2015-03-01</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>László Németh<text:line-break/>Commits: 370<text:line-break/>Joined: <text:span text:style-name="T2">2010-09-29</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>László Németh<text:line-break/>Commits: 363<text:line-break/>Joined: <text:span text:style-name="T2">2010-09-29</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Pranav Kant<text:line-break/>Commits: 366<text:line-break/>Joined: <text:span text:style-name="T2">2015-03-01</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1450,10 +1432,10 @@
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Robert Antoni Buj Gelonch<text:line-break/>Commits: 247<text:line-break/>Joined: <text:span text:style-name="T2">2014-06-11</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Laurent BP<text:line-break/>Commits: 244<text:line-break/>Joined: <text:span text:style-name="T2">2011-08-31</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Laurent BP<text:line-break/>Commits: 246<text:line-break/>Joined: <text:span text:style-name="T2">2011-08-31</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Mark Hung<text:line-break/>Commits: 241<text:line-break/>Joined: <text:span text:style-name="T2">2014-11-04</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Mark Hung<text:line-break/>Commits: 243<text:line-break/>Joined: <text:span text:style-name="T2">2014-11-04</text:span></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list