[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - 36 commits - bin/symstore.sh chart2/qa configure.ac cppcanvas/source download.lst external/icu external/nss filter/Library_pdffilter.mk filter/source filter/uiconfig hwpfilter/qa hwpfilter/source icon-themes/galaxy include/oox include/vcl instsetoo_native/inc_common instsetoo_native/util Makefile.in officecfg/registry oox/source postprocess/CustomTarget_registry.mk readlicense_oo/license sc/source sd/qa sfx2/source svtools/source sw/source translations vcl/source vcl/unx
Samuel Mehrbrodt
Samuel.Mehrbrodt at cib.de
Wed Jan 31 13:59:58 UTC 2018
Rebased ref, commits from common ancestor:
commit 462403f76bb404f394c7b1fdffd3126e902d7b0b
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Fri Jan 27 16:57:49 2017 +0100
Symstore: Also add .exe and .dlls to symstore
These are needed when analyzing the minidump.
Change-Id: Ife296c298e3b2f1ca8a47dcbaaf1947e6aefdc81
Reviewed-on: https://gerrit.libreoffice.org/33631
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit 8a0416be440180d0a6cedd449307f6a9bde22eaa)
diff --git a/bin/symstore.sh b/bin/symstore.sh
index 56260c0b3906..b368eb3e6715 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -6,13 +6,17 @@ add_pdb()
type=$2
list=$3
for file in $(find "${INSTDIR}/" -name "*.${extension}"); do
+ # store dll/exe itself (needed for minidumps)
+ if [ -f "$file" ]; then
+ cygpath -w "$file" >> "$list"
+ fi
+ # store pdb file
filename=$(basename "$file" ".${extension}")
pdb="${WORKDIR}/LinkTarget/${type}/${filename}.pdb"
if [ -f "$pdb" ]; then
cygpath -w "$pdb" >> "$list"
fi
done
-
}
# check preconditions
commit 795ca50cf49e95ce56004bdf1bf0f50436a4dfcf
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date: Sun Jan 15 11:50:27 2017 +0100
gbuild: populate local symstore on Windows
Script based on Lubos' tb master script from
http://nabble.documentfoundation.org/Daily-Win32-debug-builds-td4067279.html
Change-Id: I7f3247367a63078881f3cf51cf3e2cad59ad67b5
Reviewed-on: https://gerrit.libreoffice.org/33088
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit 17e9a5bf94eb08f88f8c78c9982dd0ce48a5e2d9)
diff --git a/Makefile.in b/Makefile.in
index f1bd93b4b72f..a51b17a3bdda 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -387,6 +387,7 @@ symbols:
mkdir -p $(WORKDIR)/symbols/
ifeq ($(OS),WNT)
$(SRCDIR)/bin/symbolstore.py $(WORKDIR)/UnpackedTarball/breakpad/src/tools/windows/binaries/dump_syms.exe $(WORKDIR)/symbols/ $(INSTDIR)/program/*
+ $(SRCDIR)/bin/symstore.sh
else
$(SRCDIR)/bin/symbolstore.py $(WORKDIR)/UnpackedTarball/breakpad/src/tools/linux/dump_syms/dump_syms $(WORKDIR)/symbols/ $(INSTDIR)/program/*
endif
diff --git a/bin/symstore.sh b/bin/symstore.sh
new file mode 100755
index 000000000000..56260c0b3906
--- /dev/null
+++ b/bin/symstore.sh
@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+
+add_pdb()
+{
+ extension=$1
+ type=$2
+ list=$3
+ for file in $(find "${INSTDIR}/" -name "*.${extension}"); do
+ filename=$(basename "$file" ".${extension}")
+ pdb="${WORKDIR}/LinkTarget/${type}/${filename}.pdb"
+ if [ -f "$pdb" ]; then
+ cygpath -w "$pdb" >> "$list"
+ fi
+ done
+
+}
+
+# check preconditions
+if [ -z "${INSTDIR}" ] || [ -z "${WORKDIR}" ]; then
+ echo "INSTDIR or WORKDIR not set - script expects calling inside buildenv"
+ exit 1
+fi
+if [ ! -d "${INSTDIR}" ] || [ ! -d "${WORKDIR}" ]; then
+ echo "INSTDIR or WORKDIR not present - script expects calling after full build"
+ exit 1
+fi
+which symstore.exe > /dev/null 2>&1 || {
+ echo "symstore.exe is expected in the PATH"
+ exit 1
+}
+
+# defaults
+MAX_KEEP=5
+SYM_PATH=${WORKDIR}/symstore
+
+USAGE="Usage: $0 [-h|-k <keep_num_versions>|-p <symbol_store_path>]
+ -h: this cruft
+ -k <int>: keep this number of old symbol versions around
+ (default: ${MAX_KEEP}. Set to 0 for unlimited)
+ -p <path>: specify full path to symbol store tree
+If no path is specified, defaults to ${SYM_PATH}.
+"
+
+# process args
+while :
+do
+ case "$1" in
+ -k|--keep) MAX_KEEP="$2"; shift 2;;
+ -p|--path) SYM_PATH="$2"; shift 2;;
+ -h|--help) echo "${USAGE}"; exit 0; shift;;
+ -*) echo "${USAGE}" >&2; exit 1;;
+ *) break;;
+ esac
+done
+
+if [ $# -gt 0 ]; then
+ echo "${USAGE}" >&2
+ exit 1
+fi
+
+# populate symbol store from here
+TMPFILE=$(mktemp) || exit 1
+trap '{ rm -f ${TMPFILE}; }' EXIT
+
+# add dlls and executables
+add_pdb dll Library "${TMPFILE}"
+add_pdb exe Executable "${TMPFILE}"
+
+# stick all of it into symbol store
+symstore.exe add /compress /f "@$(cygpath -w "${TMPFILE}")" /s "$(cygpath -w "${SYM_PATH}")" /t "${PRODUCTNAME}" /v "${LIBO_VERSION_MAJOR}.${LIBO_VERSION_MINOR}.${LIBO_VERSION_MICRO}.${LIBO_VERSION_PATCH}${LIBO_VERSION_SUFFIX}${LIBO_VERSION_SUFFIX_SUFFIX}"
+rm -f "${TMPFILE}"
+
+# Cleanup symstore, older revisions will be removed. Unless the
+# .dll/.exe changes, the .pdb should be shared, so with incremental
+# tinderbox several revisions should not be that space-demanding.
+if [ "${MAX_KEEP}" -gt 0 ] && [ -d "${SYM_PATH}/000Admin" ]; then
+ to_remove=$(ls -1 "${SYM_PATH}/000Admin" | grep -v '\.txt' | grep -v '\.deleted' | sort | head -n "-${MAX_KEEP}")
+ for revision in $to_remove; do
+ symstore.exe del /i "${revision}" /s "$(cygpath -w "${SYM_PATH}")"
+ done
+fi
commit 46bb79ec4381a86bf2ac4cd78b3ea1518459ceaf
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Wed Apr 6 23:06:37 2016 +0200
PDF export of cell formulas now configurable in UI
Of course, only in Calc. I had to make filter/pdf depend
on svxcore (because of ColorListBox) but little harm done,
other filters in this dir depend on it already too
Conflicts:
filter/source/pdf/impdialog.cxx
filter/source/pdf/impdialog.hxx
filter/uiconfig/ui/pdfgeneralpage.ui
Change-Id: Id5bf99fdc738aea073bf5315e37ed5002ab0f926
diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk
index 6de7d341367e..a3151ee7c350 100644
--- a/filter/Library_pdffilter.mk
+++ b/filter/Library_pdffilter.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_custom_headers,pdffilter,\
$(eval $(call gb_Library_use_libraries,pdffilter,\
svt \
+ svxcore \
sfx \
tk \
vcl \
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 432f9e57ef20..82005e8d2b88 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -25,7 +25,12 @@
#include <vcl/layout.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
+#include <sfx2/objsh.hxx>
#include "sfx2/passwd.hxx"
+#include <sfx2/viewfrm.hxx>
+#include <svx/drawitem.hxx>
+#include <svx/svxids.hrc>
+#include <svx/xtable.hxx>
#include "svtools/miscopt.hxx"
#include "comphelper/storagehelper.hxx"
@@ -70,6 +75,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >
mnGeneralPageId(0),
mbIsPresentation( false ),
mbIsWriter( false ),
+ mbIsSpreadsheet( false ),
mbSelectionPresent( false ),
mbUseCTLFont( false ),
@@ -79,6 +85,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >
mnMaxImageResolution( 300 ),
mbUseTaggedPDF( false ),
mbExportNotes( true ),
+ mbExportFormulaAnnotation( false ),
mbViewPDF( false ),
mbExportNotesPages( false ),
mbExportOnlyNotesPages( false ),
@@ -92,6 +99,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >
mbExportBookmarks( true ),
mbExportHiddenSlides ( false),
mnOpenBookmarkLevels( -1 ),
+ mnAnnotColor( -1 ),
mbHideViewerToolbar( false ),
mbHideViewerMenubar( false ),
@@ -172,6 +180,8 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >
mbIsPresentation = true;
if ( xInfo->supportsService( "com.sun.star.text.GenericTextDocument" ) )
mbIsWriter = true;
+ if ( xInfo->supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) )
+ mbIsSpreadsheet = true;
}
}
catch(const RuntimeException &)
@@ -194,6 +204,8 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >
mbExportOnlyNotesPages = maConfigItem.ReadBool( "ExportOnlyNotesPages", false );
}
mbExportNotes = maConfigItem.ReadBool( "ExportNotes", false );
+ mbExportFormulaAnnotation = maConfigItem.ReadBool( "ExportFormulaAsAnnotation", false );
+ mnAnnotColor = maConfigItem.ReadInt32( "FormulaAnnotationHighlightColor", -1 );
mbViewPDF = maConfigItem.ReadBool( "ViewPDFAfterExport", false );
mbExportBookmarks = maConfigItem.ReadBool( "ExportBookmarks", true );
@@ -404,6 +416,7 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
maConfigItem.WriteBool( "ExportOnlyNotesPages", mbExportOnlyNotesPages );
}
maConfigItem.WriteBool( "ExportNotes", mbExportNotes );
+ maConfigItem.WriteBool( "ExportFormulaAsAnnotation", mbExportFormulaAnnotation );
maConfigItem.WriteBool( "ViewPDFAfterExport", mbViewPDF );
maConfigItem.WriteBool( "ExportBookmarks", mbExportBookmarks );
@@ -436,6 +449,7 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
maConfigItem.WriteInt32( "PageLayout", mnPageLayout );
maConfigItem.WriteBool( "FirstPageOnLeft", mbFirstPageLeft );
maConfigItem.WriteInt32( "OpenBookmarkLevels", mnOpenBookmarkLevels );
+ maConfigItem.WriteInt32( "FormulaAnnotationHighlightColor", mnAnnotColor );
maConfigItem.WriteBool( "ExportLinksRelativeFsys", mbExportRelativeFsysLinks );
maConfigItem.WriteInt32("PDFViewSelection", mnViewPDFMode );
@@ -524,6 +538,8 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(vcl::Window* pParent, const SfxItemSe
, mbExportFormFieldsUserSelection(false)
, mbIsPresentation(false)
, mbIsWriter(false)
+ , mbIsSpreadsheet(false)
+
, mpaParent(nullptr)
{
get(mpRbAll, "all");
@@ -552,6 +568,11 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(vcl::Window* pParent, const SfxItemSe
get(mpCbExportNotes, "comments");
get(mpCbExportNotesPages, "notes");
get(mpCbExportOnlyNotesPages, "onlynotes");
+ get(mpFormulaFrame, "formulaframe");
+ get(mpCbExportFormulaAnnotations, "formulas");
+ get(mpFtAnnotColor, "annotation_label");
+ get(mpLbAnnotColor, "annotation_color");
+
get(mpCbExportEmptyPages, "emptypages");
get(mpCbExportPlaceholders, "exportplaceholders" );
get(mpCbViewPDF, "viewpdf");
@@ -559,6 +580,7 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(vcl::Window* pParent, const SfxItemSe
get(mpCbWatermark, "watermark");
get(mpFtWatermark, "watermarklabel");
get(mpEdWatermark, "watermarkentry");
+ get(mpFtTransparent, "transparent");
}
@@ -592,12 +614,17 @@ void ImpPDFTabGeneralPage::dispose()
mpCbViewPDF.clear();
mpCbExportNotesPages.clear();
mpCbExportOnlyNotesPages.clear();
+ mpFormsFrame.clear();
+ mpCbExportFormulaAnnotations.clear();
+ mpFtAnnotColor.clear();
+ mpLbAnnotColor.clear();
mpCbExportEmptyPages.clear();
mpCbExportPlaceholders.clear();
mpCbAddStream.clear();
mpCbWatermark.clear();
- mpFtWatermark.clear();
mpEdWatermark.clear();
+ mpFtWatermark.clear();
+ mpFtTransparent.clear();
mpaParent.clear();
SfxTabPage::dispose();
}
@@ -619,6 +646,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent )
mpRbSelection->SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleSelectionHdl ) );
mbIsPresentation = paParent->mbIsPresentation;
mbIsWriter = paParent->mbIsWriter;
+ mbIsSpreadsheet = paParent->mbIsSpreadsheet;
mpCbExportEmptyPages->Enable( mbIsWriter );
mpCbExportPlaceholders->Enable( mbIsWriter );
@@ -695,6 +723,41 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent )
mpCbExportHiddenSlides->Show(false);
mpCbExportHiddenSlides->Check(false);
}
+ if ( mbIsSpreadsheet )
+ {
+ mpCbExportFormulaAnnotations->Show(true);
+ mpFtAnnotColor->Show(true);
+ mpLbAnnotColor->Show(true);
+
+ mpCbExportFormulaAnnotations->Check( paParent->mbExportFormulaAnnotation );
+ mpFormulaFrame->Enable( paParent->mbExportFormulaAnnotation );
+
+ SfxObjectShell* pDocSh = SfxObjectShell::Current();
+ XColorListRef pColorTable;
+
+ if ( pDocSh )
+ {
+ mpLbAnnotColor->InsertEntry( COL_TRANSPARENT, mpFtTransparent->GetText());
+
+ const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE );
+ if ( pItem != nullptr )
+ pColorTable = static_cast<const SvxColorListItem*>(pItem)->GetColorList();
+
+ if ( pColorTable.is() )
+ {
+ for ( long i = 0; i < pColorTable->Count(); i++ )
+ {
+ XColorEntry* pEntry = pColorTable->GetColor(i);
+ mpLbAnnotColor->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
+ }
+ }
+
+ mpLbAnnotColor->SelectEntry( Color( paParent->mnAnnotColor) );
+ }
+
+ mpCbExportFormulaAnnotations->SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleExportFormulaAnnotations ) );
+ }
+
mpCbExportPlaceholders->Show(mbIsWriter);
if( !mbIsWriter )
{
@@ -728,6 +791,11 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent )
paParent->mbExportBookmarks = mpCbExportBookmarks->IsChecked();
if ( mbIsPresentation )
paParent->mbExportHiddenSlides = mpCbExportHiddenSlides->IsChecked();
+ if ( mbIsSpreadsheet )
+ {
+ paParent->mbExportFormulaAnnotation = mpCbExportFormulaAnnotations->IsChecked();
+ paParent->mnAnnotColor = mpLbAnnotColor->GetSelectEntryColor().GetColor();
+ }
paParent->mbIsSkipEmptyPages = !mpCbExportEmptyPages->IsChecked();
paParent->mbIsExportPlaceholders = mpCbExportPlaceholders->IsChecked();
@@ -934,6 +1002,10 @@ ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage(vcl::Window* pParent, const SfxItemSet&
mpRbMagnZoom->SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, ToggleRbMagnHdl ) );
}
+IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleExportFormulaAnnotations, CheckBox&, void)
+{
+ mpFormulaFrame->Enable(mpCbExportFormulaAnnotations->IsChecked());
+}
ImpPDFTabOpnFtrPage::~ImpPDFTabOpnFtrPage()
{
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 99e9a0fb3d81..9fe845299ca5 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -33,6 +33,7 @@
#include <vcl/group.hxx>
#include <vcl/pdfwriter.hxx>
#include <vcl/FilterConfigItem.hxx>
+#include <svtools/ctrlbox.hxx>
#include "pdffilter.hxx"
@@ -94,6 +95,7 @@ protected:
// the following data are the configuration used throughout the dialog and pages
bool mbIsPresentation;
bool mbIsWriter;
+ bool mbIsSpreadsheet;
bool mbSelectionPresent;
bool mbUseCTLFont;
bool mbUseLosslessCompression;
@@ -103,6 +105,7 @@ protected:
bool mbUseTaggedPDF;
sal_Int32 mnPDFTypeSelection;
bool mbExportNotes;
+ bool mbExportFormulaAnnotation;
bool mbViewPDF;
bool mbExportNotesPages;
bool mbExportOnlyNotesPages;
@@ -116,6 +119,7 @@ protected:
bool mbExportBookmarks;
bool mbExportHiddenSlides;
sal_Int32 mnOpenBookmarkLevels;
+ sal_Int32 mnAnnotColor;
bool mbHideViewerToolbar;
bool mbHideViewerMenubar;
@@ -219,6 +223,12 @@ class ImpPDFTabGeneralPage : public SfxTabPage
VclPtr<CheckBox> mpCbExportBookmarks;
VclPtr<CheckBox> mpCbExportHiddenSlides;
VclPtr<CheckBox> mpCbExportNotes;
+
+ VclPtr<VclContainer> mpFormulaFrame;
+ VclPtr<CheckBox> mpCbExportFormulaAnnotations;
+ VclPtr<FixedText> mpFtAnnotColor;
+ VclPtr<ColorListBox> mpLbAnnotColor;
+
VclPtr<CheckBox> mpCbViewPDF;
VclPtr<CheckBox> mpCbExportNotesPages;
VclPtr<CheckBox> mpCbExportOnlyNotesPages;
@@ -229,10 +239,12 @@ class ImpPDFTabGeneralPage : public SfxTabPage
VclPtr<CheckBox> mpCbWatermark;
VclPtr<FixedText> mpFtWatermark;
+ VclPtr<FixedText> mpFtTransparent;
VclPtr<Edit> mpEdWatermark;
bool mbIsPresentation;
bool mbIsWriter;
+ bool mbIsSpreadsheet;
VclPtr<ImpPDFTabDialog> mpaParent;
@@ -244,6 +256,7 @@ class ImpPDFTabGeneralPage : public SfxTabPage
DECL_LINK_TYPED( ToggleWatermarkHdl, CheckBox&, void );
DECL_LINK_TYPED( ToggleAddStreamHdl, CheckBox&, void );
DECL_LINK_TYPED( ToggleExportFormFieldsHdl, CheckBox&, void );
+ DECL_LINK_TYPED( ToggleExportFormulaAnnotations, CheckBox&, void );
DECL_LINK_TYPED( ToggleExportNotesPagesHdl, CheckBox&, void );
void TogglePagesHdl();
diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui b/filter/uiconfig/ui/pdfgeneralpage.ui
index 836fd2504ffd..b652b1ed1e27 100644
--- a/filter/uiconfig/ui/pdfgeneralpage.ui
+++ b/filter/uiconfig/ui/pdfgeneralpage.ui
@@ -2,6 +2,7 @@
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">100</property>
@@ -689,6 +690,74 @@
<property name="top_attach">9</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="formulas">
+ <property name="label" translatable="yes">Export cell formulas as annotations</property>
+ <property name="visible">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.49000000953674316</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="formulaframe">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="annotation_label">
+ <property name="visible">False</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Highlight color: </property>
+ <property name="ellipsize">end</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svtlo-ColorListBox" id="annotation_color">
+ <property name="visible">False</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="transparent">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Transparent</property>
+ <property name="ellipsize">middle</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">13</property>
+ </packing>
+ </child>
</object>
</child>
</object>
commit 1515cc5b7aa605b450cbfaefcc0410e54ad6e3f3
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Fri Mar 11 17:58:47 2016 +0100
Make PDF export of cell formulas depend on configuration
Change-Id: I0d1828cb93290313f578cf40b7cd021dedd6b5ed
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 273685577f9e..75e468db5343 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5203,6 +5203,20 @@
</constraints>
<value>0</value>
</prop>
+ <prop oor:name="ExportFormulaAsAnnotation" oor:type="xs:boolean" oor:nillable="false">
+ <info>
+ <desc>Specifies if cell formulas are exported to PDF as highlight annotations
+ (in Calc documents only).</desc>
+ </info>
+ <value>false</value>
+ </prop>
+ <prop oor:name="FormulaAnnotationHighlightColor" oor:type="xs:int" oor:nillable="false">
+ <info>
+ <desc>Specifies colour used to highlight cells that have formula in exported PDF,
+ -1 if no highlight should be used (Calc documents only).</desc>
+ </info>
+ <value>-1</value>
+ </prop>
<prop oor:name="AllowDuplicateFieldNames" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Specifies whether multiple form fields exported are allowed
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index ce14e5ffc9fd..074160a79311 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -45,6 +45,7 @@
#include <vcl/pdfextoutdevdata.hxx>
#include <vcl/settings.hxx>
#include <o3tl/make_unique.hxx>
+#include <officecfg/Office/Common.hxx>
#include "output.hxx"
#include "document.hxx"
@@ -1479,6 +1480,7 @@ Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, const ScA
"LayoutStrings: different MapUnits ?!?!" );
vcl::PDFExtOutDevData* pPDFData = dynamic_cast< vcl::PDFExtOutDevData* >(mpDev->GetExtOutDevData() );
+ bool bExportFormulaAnnotation = officecfg::Office::Common::Filter::PDF::Export::ExportFormulaAsAnnotation::get();
sc::IdleSwitch aIdleSwitch(*mpDoc, false);
ScDrawStringsVars aVars( this, bPixelToLogic );
@@ -2148,7 +2150,7 @@ Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, const ScA
Rectangle aURLRect( aURLStart, aVars.GetTextSize() );
if (bHasURL)
lcl_DoHyperlinkResult(mpDev, aURLRect, aCell);
- else
+ else if (bExportFormulaAnnotation)
lcl_DoFormulaAnnotation(mpDev, aURLRect, aCell);
}
}
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index c470bcd7ebbf..b77e60f6de4d 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -39,6 +39,7 @@
#include <cppuhelper/implbase.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <o3tl/numeric.hxx>
+#include <officecfg/Office/Common.hxx>
#include <osl/file.hxx>
#include <osl/thread.h>
#include <rtl/crc.h>
@@ -4665,6 +4666,8 @@ bool PDFWriterImpl::emitNoteAnnotations()
bool PDFWriterImpl::emitFormulaAnnotations()
{
int nFormulaNotes = m_aFormulaNotes.size();
+ sal_Int32 nColor = officecfg::Office::Common::Filter::PDF::Export::FormulaAnnotationHighlightColor::get();
+ Color aColor( nColor );
for (int i = 0; i < nFormulaNotes; i++)
{
@@ -4708,7 +4711,16 @@ bool PDFWriterImpl::emitFormulaAnnotations()
aLine.append( "]" );
aLine.append( "/F 4" );
- aLine.append( "/C [1 1 0]");
+
+ if ( nColor == -1 )
+ aLine.append( "/C [0.63 0.63 0.63]/CA 0") ; // light grey-ish pop-up note, transparent highlight
+ else
+ {
+ aLine.append( "/C [");
+ appendColor( aColor, aLine);
+ aLine.append( "]/CA 1");
+ }
+
aLine.append( "/Border [0 0 1]");
aLine.append( "/Contents\n" );
appendLiteralStringEncrypt( rFormulaNote.m_aContents.Contents, rFormulaNote.m_nObject, aLine );
commit 8d7f061b8bdd536c3797507fb00674ba2b870370
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Tue Mar 8 11:41:26 2016 +0100
Show cell formula as annotation in exported PDF
Conflicts:
vcl/source/gdi/pdfextoutdevdata.cxx
Change-Id: Idca8f6a27453a0f41566098a1720ee345eff3af6
diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx
index 48fab905194d..63f71d57cd3b 100644
--- a/include/vcl/pdfextoutdevdata.hxx
+++ b/include/vcl/pdfextoutdevdata.hxx
@@ -325,6 +325,7 @@ public:
or -1 in which case the current page is used
*/
void CreateNote( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr = -1 );
+ void CreateFormulaAnnotation( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr = -1 );
/** begin a new logical structure element
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 8a95b6a4707e..ac927fda1c76 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -1058,6 +1058,7 @@ The following structure describes the permissions used in PDF security
or -1 in which case the current page is used
*/
void CreateNote( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr = -1 );
+ void CreateFormulaAnnotation( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr = -1 );
/** begin a new logical structure element
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index fa6f4022eac5..ce14e5ffc9fd 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -857,6 +857,33 @@ static void lcl_DoHyperlinkResult( OutputDevice* pDev, const Rectangle& rRect, S
}
}
+static void lcl_DoFormulaAnnotation( OutputDevice* pDev, const Rectangle& rRect, ScRefCellValue& rCell )
+{
+ vcl::PDFExtOutDevData* pPDFData = dynamic_cast< vcl::PDFExtOutDevData* >( pDev->GetExtOutDevData() );
+
+ ScFormulaCell* pFCell = rCell.mpFormula;
+
+ if (pFCell && pPDFData)
+ {
+ OUString aFormula;
+ pFCell->GetFormula( aFormula );
+
+ if ( !aFormula.isEmpty() )
+ {
+ const OUString aEquals("=");
+ OUString aAnnotation;
+ vcl::PDFNote aPDFNote;
+
+ // chop off leading '=', some PDF viewers don't like it
+ if ( aFormula.startsWith( aEquals ) )
+ aAnnotation = aFormula.copy( 1, aFormula.getLength() - 1 );
+
+ aPDFNote.Contents = aAnnotation;
+ pPDFData->CreateFormulaAnnotation( rRect, aPDFNote);
+ }
+ }
+}
+
void ScOutputData::SetSyntaxColor( vcl::Font* pFont, const ScRefCellValue& rCell )
{
switch (rCell.meType)
@@ -2114,11 +2141,15 @@ Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, const ScA
}
// PDF: whole-cell hyperlink from formula?
- bool bHasURL = pPDFData && aCell.meType == CELLTYPE_FORMULA && aCell.mpFormula->IsHyperLinkCell();
- if (bPaint && bHasURL)
+ bool bHasFormula = pPDFData && aCell.meType == CELLTYPE_FORMULA;
+ bool bHasURL = bHasFormula && aCell.mpFormula->IsHyperLinkCell();
+ if (bPaint && bHasFormula)
{
Rectangle aURLRect( aURLStart, aVars.GetTextSize() );
- lcl_DoHyperlinkResult(mpDev, aURLRect, aCell);
+ if (bHasURL)
+ lcl_DoHyperlinkResult(mpDev, aURLRect, aCell);
+ else
+ lcl_DoFormulaAnnotation(mpDev, aURLRect, aCell);
}
}
}
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 811d61849738..9d8a404f8175 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -36,6 +36,7 @@ struct PDFExtOutDevDataSync
enum Action{ CreateNamedDest,
CreateDest,
CreateLink,
+ CreateFormulaAnnotation,
SetLinkDest,
SetLinkURL,
RegisterDest,
@@ -83,6 +84,7 @@ struct GlobalSyncData
std::deque< OUString > mParaOUStrings;
std::deque< PDFWriter::DestAreaType > mParaDestAreaTypes;
std::deque< PDFNote > mParaPDFNotes;
+ std::deque< PDFNote > mParaFormulaNotes;
std::deque< PDFWriter::PageTransition > mParaPageTransitions;
::std::map< sal_Int32, PDFLinkDestination > mFutureDestinations;
@@ -251,6 +253,16 @@ void GlobalSyncData::PlayGlobalActions( PDFWriter& rWriter )
mParaPDFNotes.pop_front();
mParaInts.pop_front();
}
+ case PDFExtOutDevDataSync::CreateFormulaAnnotation :
+ {
+ rWriter.Push( PushFlags::MAPMODE );
+ rWriter.SetMapMode( mParaMapModes.front() );
+ rWriter.CreateFormulaAnnotation( mParaRects.front(), mParaFormulaNotes.front(), mParaInts.front() );
+ mParaMapModes.pop_front();
+ mParaRects.pop_front();
+ mParaFormulaNotes.pop_front();
+ mParaInts.pop_front();
+ }
break;
case PDFExtOutDevDataSync::SetAutoAdvanceTime :
{
@@ -502,6 +514,7 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc
case PDFExtOutDevDataSync::SetOutlineItemText:
case PDFExtOutDevDataSync::SetOutlineItemDest:
case PDFExtOutDevDataSync::CreateNote:
+ case PDFExtOutDevDataSync::CreateFormulaAnnotation:
case PDFExtOutDevDataSync::SetAutoAdvanceTime:
case PDFExtOutDevDataSync::SetPageTransition:
break;
@@ -702,6 +715,14 @@ void PDFExtOutDevData::CreateNote( const Rectangle& rRect, const PDFNote& rNote,
mpGlobalSyncData->mParaPDFNotes.push_back( rNote );
mpGlobalSyncData->mParaInts.push_back( nPageNr == -1 ? mnPage : nPageNr );
}
+void PDFExtOutDevData::CreateFormulaAnnotation( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr )
+{
+ mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::CreateFormulaAnnotation );
+ mpGlobalSyncData->mParaRects.push_back( rRect );
+ mpGlobalSyncData->mParaMapModes.push_back( mrOutDev.GetMapMode() );
+ mpGlobalSyncData->mParaFormulaNotes.push_back( rNote );
+ mpGlobalSyncData->mParaInts.push_back( nPageNr == -1 ? mnPage : nPageNr );
+}
void PDFExtOutDevData::SetPageTransition( PDFWriter::PageTransition eType, sal_uInt32 nMilliSec )
{
mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::SetPageTransition );
diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx
index 4ea9170942a1..dda5e16d2018 100644
--- a/vcl/source/gdi/pdfwriter.cxx
+++ b/vcl/source/gdi/pdfwriter.cxx
@@ -386,6 +386,11 @@ void PDFWriter::CreateNote( const Rectangle& rRect, const PDFNote& rNote, sal_In
xImplementation->createNote( rRect, rNote, nPageNr );
}
+void PDFWriter::CreateFormulaAnnotation( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr )
+{
+ xImplementation->createFormulaAnnotation( rRect, rNote, nPageNr );
+}
+
sal_Int32 PDFWriter::BeginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias )
{
return xImplementation->beginStructureElement( eType, rAlias );
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index e138f3869965..c470bcd7ebbf 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -4662,6 +4662,65 @@ bool PDFWriterImpl::emitNoteAnnotations()
return true;
}
+bool PDFWriterImpl::emitFormulaAnnotations()
+{
+ int nFormulaNotes = m_aFormulaNotes.size();
+
+ for (int i = 0; i < nFormulaNotes; i++)
+ {
+ const PDFNoteEntry &rFormulaNote = m_aFormulaNotes[i];
+
+ OStringBuffer aLine( 1024 );
+ aLine.append( rFormulaNote.m_nObject );
+ aLine.append( " 0 obj\n" );
+
+ aLine.append( "<</Type/Annot" );
+ aLine.append( "/Rect[" );
+
+ appendFixedInt( rFormulaNote.m_aRect.Left(), aLine );
+ aLine.append( ' ' );
+ appendFixedInt( rFormulaNote.m_aRect.Top(), aLine );
+ aLine.append( ' ' );
+ appendFixedInt( rFormulaNote.m_aRect.Right(), aLine );
+ aLine.append( ' ' );
+ appendFixedInt( rFormulaNote.m_aRect.Bottom(), aLine );
+ aLine.append( "]" );
+
+ aLine.append( "/Subtype/Highlight" );
+ aLine.append( "/QuadPoints[" );
+
+ appendFixedInt( rFormulaNote.m_aRect.Left(), aLine );
+ aLine.append( ' ' );
+ appendFixedInt( rFormulaNote.m_aRect.Top(), aLine );
+ aLine.append( ' ' );
+ appendFixedInt( rFormulaNote.m_aRect.Right(), aLine );
+ aLine.append( ' ' );
+ appendFixedInt( rFormulaNote.m_aRect.Top(), aLine );
+ aLine.append( ' ' );
+ appendFixedInt( rFormulaNote.m_aRect.Left(), aLine );
+ aLine.append( ' ' );
+ appendFixedInt( rFormulaNote.m_aRect.Bottom(), aLine );
+ aLine.append( ' ' );
+ appendFixedInt( rFormulaNote.m_aRect.Right(), aLine );
+ aLine.append( ' ' );
+ appendFixedInt( rFormulaNote.m_aRect.Bottom(), aLine );
+ aLine.append( ' ' );
+ aLine.append( "]" );
+
+ aLine.append( "/F 4" );
+ aLine.append( "/C [1 1 0]");
+ aLine.append( "/Border [0 0 1]");
+ aLine.append( "/Contents\n" );
+ appendLiteralStringEncrypt( rFormulaNote.m_aContents.Contents, rFormulaNote.m_nObject, aLine );
+ aLine.append( "\n" );
+
+ aLine.append( ">>\nendobj\n\n" );
+ CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
+ }
+
+ return true;
+}
+
Font PDFWriterImpl::replaceFont( const vcl::Font& rControlFont, const vcl::Font& rAppSetFont )
{
bool bAdjustSize = false;
@@ -5575,6 +5634,7 @@ bool PDFWriterImpl::emitAnnotations()
CHECK_RETURN( emitLinkAnnotations() );
CHECK_RETURN( emitNoteAnnotations() );
+ CHECK_RETURN( emitFormulaAnnotations() );
CHECK_RETURN( emitWidgetAnnotations() );
return true;
@@ -12186,6 +12246,27 @@ void PDFWriterImpl::createNote( const Rectangle& rRect, const PDFNote& rNote, sa
m_aPages[ nPageNr ].m_aAnnotations.push_back( m_aNotes.back().m_nObject );
}
+void PDFWriterImpl::createFormulaAnnotation( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr )
+{
+ if( nPageNr < 0 )
+ nPageNr = m_nCurrentPage;
+
+ if( nPageNr < 0 || nPageNr >= (sal_Int32)m_aPages.size() )
+ return;
+
+ m_aFormulaNotes.push_back( PDFNoteEntry() );
+ m_aFormulaNotes.back().m_nObject = createObject();
+ m_aFormulaNotes.back().m_aContents = rNote;
+ m_aFormulaNotes.back().m_aRect = rRect;
+ // convert to default user space now, since the mapmode may change
+ m_aPages[nPageNr].convertRect( m_aFormulaNotes.back().m_aRect );
+
+ // insert note to page's annotation list
+ m_aPages[ nPageNr ].m_aAnnotations.push_back( m_aFormulaNotes.back().m_nObject );
+
+ return;
+}
+
sal_Int32 PDFWriterImpl::createLink( const Rectangle& rRect, sal_Int32 nPageNr )
{
if( nPageNr < 0 )
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index c8ebcac959e9..e6451285c153 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -601,6 +601,7 @@ private:
/* contains all notes set during PDF creation
*/
std::vector<PDFNoteEntry> m_aNotes;
+ std::vector<PDFNoteEntry> m_aFormulaNotes;
/* the root of the structure tree
*/
std::vector<PDFStructureElement> m_aStructure;
@@ -853,6 +854,8 @@ i12626
bool emitLinkAnnotations();
// write all notes
bool emitNoteAnnotations();
+ // write cell formulas as annotations
+ bool emitFormulaAnnotations();
// write the appearance streams of a widget
bool emitAppearances( PDFWidget& rWidget, OStringBuffer& rAnnotDict );
// clean up radio button "On" values
@@ -1196,6 +1199,7 @@ public:
// notes
void createNote( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr = -1 );
+ void createFormulaAnnotation( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr = -1 );
// structure elements
sal_Int32 beginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias );
void endStructureElement();
commit 9d9a54677f336b078069495c6c29b186f4855f7f
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Wed Feb 10 14:42:18 2016 +0100
Branded images for msi installer
The sizes are 122 x 234, 374 x 44 installed units respectively, according to
http://msdn.microsoft.com/de-de/library/windows/desktop/aa369490%28v=vs.85%29.aspx
it is 163x312, 499x58 pixels at 96 dpi. I bumped dpi to 120 and it still looks pixelated,
but it's as good as it gets.
For better results, we need different graphics, with less fine details given the very limited
space
Change-Id: I4a7eafed16fd79f377d27afa8151cfab614b464b
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
index e267d49ab73e..471eea4c22e6 100644
Binary files a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
index b824ddf35d9d..2703670952bd 100644
Binary files a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp and b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp differ
commit 85773aaa1efa1ed562fb3178ee1859dcd6e485ed
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Tue Feb 9 11:09:30 2016 +0100
Branded application icons
sadly, this doesn't replace Windows taskbar icon, that must be living somewhere
else. It works on Linux though.
Conflicts:
icon-themes/galaxy/res/main128.png
icon-themes/galaxy/res/mainapp_16.png
icon-themes/galaxy/res/mainapp_16_8.png
icon-themes/galaxy/res/mainapp_32.png
icon-themes/galaxy/res/mainapp_32_8.png
icon-themes/galaxy/res/mainapp_48_8.png
Change-Id: I028fc68d96f02113622c5e1ec3ed830ac797be0b
diff --git a/icon-themes/galaxy/res/main128.png b/icon-themes/galaxy/res/main128.png
index 2779337e7b0a..818b7330c25b 100644
Binary files a/icon-themes/galaxy/res/main128.png and b/icon-themes/galaxy/res/main128.png differ
diff --git a/icon-themes/galaxy/res/mainapp_16.png b/icon-themes/galaxy/res/mainapp_16.png
index 94abb952996b..13945eeadfd4 100644
Binary files a/icon-themes/galaxy/res/mainapp_16.png and b/icon-themes/galaxy/res/mainapp_16.png differ
diff --git a/icon-themes/galaxy/res/mainapp_16_8.png b/icon-themes/galaxy/res/mainapp_16_8.png
index 94abb952996b..13945eeadfd4 100644
Binary files a/icon-themes/galaxy/res/mainapp_16_8.png and b/icon-themes/galaxy/res/mainapp_16_8.png differ
diff --git a/icon-themes/galaxy/res/mainapp_32.png b/icon-themes/galaxy/res/mainapp_32.png
index 2c8a21fbcf3b..c653935c0c6b 100644
Binary files a/icon-themes/galaxy/res/mainapp_32.png and b/icon-themes/galaxy/res/mainapp_32.png differ
diff --git a/icon-themes/galaxy/res/mainapp_32_8.png b/icon-themes/galaxy/res/mainapp_32_8.png
index 2c8a21fbcf3b..c653935c0c6b 100644
Binary files a/icon-themes/galaxy/res/mainapp_32_8.png and b/icon-themes/galaxy/res/mainapp_32_8.png differ
diff --git a/icon-themes/galaxy/res/mainapp_48_8.png b/icon-themes/galaxy/res/mainapp_48_8.png
index cdebedf6a051..562ea23e89c2 100644
Binary files a/icon-themes/galaxy/res/mainapp_48_8.png and b/icon-themes/galaxy/res/mainapp_48_8.png differ
commit 7766da1d9c9d5a9c2ab1cd29f7d1ee4d1e71fad5
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Tue Feb 9 10:38:29 2016 +0100
Point to CIB helpdesk
it's pretty mean, b/c German translation (which I can't change) says the site
is in English, while CIB site is in German only and can't be switched to other
lang
Change-Id: Ifbbb9e9d2bbee40998c07d1c68b61cd20d77dbc3
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index bd265622f501..8ea10386949f 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -439,8 +439,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
case SID_SEND_FEEDBACK:
{
OUString module = SfxHelp::GetCurrentModuleIdentifier();
- OUString sURL("http://hub.libreoffice.org/send-feedback/?LOversion=" + utl::ConfigManager::getAboutBoxProductVersion() +
- "&LOlocale=" + utl::ConfigManager::getLocale() + "&LOmodule=" + module.copy(module.lastIndexOf('.') + 1 ) );
+ OUString sURL("http://libreoffice.cib.de/support");
try
{
uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute(
commit 98eb2cf5d22c88b384f5c7b5b0bb9dca8755f19b
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Tue Feb 9 10:00:30 2016 +0100
Point to CIB website
this idiotic postprocess script hard-codes libreoffice.org for some reason, grr
Change-Id: Ide1f19d4da9a437e01118e8baf74c0d1a8ca2e10
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 5f511178a9c8..801293c1d221 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -68,7 +68,7 @@ LibreOffice
CHANGETARGETDIR 1
PATCHCODEFILE ooo_patchcodes.txt
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
- STARTCENTER_INFO_URL https://www.libreoffice.org/
+ STARTCENTER_INFO_URL http://libreoffice.cib.de/
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
STARTCENTER_HIDE_EXTERNAL_LINKS 0
@@ -121,7 +121,7 @@ LibreOfficeDev
CODEFILENAME codes_ooodev.txt
LOCALUSERDIR $ORIGIN/..
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
- STARTCENTER_INFO_URL https://www.libreoffice.org/
+ STARTCENTER_INFO_URL http://libreoffice.cib.de/
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
STARTCENTER_HIDE_EXTERNAL_LINKS 0
@@ -163,7 +163,7 @@ LibreOffice_SDK
CHANGETARGETDIR 1
DONTUSESTARTMENUFOLDER 1
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
- STARTCENTER_INFO_URL https://www.libreoffice.org/
+ STARTCENTER_INFO_URL http://libreoffice.cib.de/
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
STARTCENTER_HIDE_EXTERNAL_LINKS 0
@@ -209,7 +209,7 @@ LibreOfficeDev_SDK
CHANGETARGETDIR 1
DONTUSESTARTMENUFOLDER 1
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
- STARTCENTER_INFO_URL https://www.libreoffice.org/
+ STARTCENTER_INFO_URL http://libreoffice.cib.de/
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
STARTCENTER_HIDE_EXTERNAL_LINKS 0
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 6a9e2d19e457..8675d528b1e5 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -543,7 +543,7 @@ postprocess_main_SED := \
-e 's,$${PRODUCTVERSION},$(PRODUCTVERSION),g' \
-e 's,$${PRODUCTEXTENSION},.$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g' \
-e 's,$${STARTCENTER_ADDFEATURE_URL},http://extensions.libreoffice.org/,g' \
- -e 's,$${STARTCENTER_INFO_URL},https://www.libreoffice.org/,g' \
+ -e 's,$${STARTCENTER_INFO_URL},http://libreoffice.cib.de/,g' \
-e 's,$${STARTCENTER_HIDE_EXTERNAL_LINKS},0,g' \
-e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g' \
-e 's,$${SYSTEM_LIBEXTTEXTCAT_DATA},$(SYSTEM_LIBEXTTEXTCAT_DATA),g' \
diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index 16a3a1d8191c..24b066a9dac3 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -16,6 +16,7 @@
void localizeWebserviceURI( OUString& rURI )
{
+ const OUString aPrefix = "?lang=";
OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage();
if ( aLang.equalsIgnoreAsciiCase("pt")
&& Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase("br") )
@@ -30,6 +31,7 @@ void localizeWebserviceURI( OUString& rURI )
aLang = "zh-tw";
}
+ rURI += aPrefix;
rURI += aLang;
}
commit 56e6ba99aa0a07a25980f5c4341d8da7dfb95ada
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Mon Sep 21 13:47:57 2015 +0200
CIB branding for start center
Conflicts:
icon-themes/galaxy/sfx2/res/startcenter-logo.png
Change-Id: I9887fded72131c7888d6e1b1165a778c8da2952d
diff --git a/icon-themes/galaxy/sfx2/res/logo.png b/icon-themes/galaxy/sfx2/res/logo.png
index 5d7e59c8d549..1f215d3ba8d0 100644
Binary files a/icon-themes/galaxy/sfx2/res/logo.png and b/icon-themes/galaxy/sfx2/res/logo.png differ
diff --git a/icon-themes/galaxy/sfx2/res/startcenter-logo.png b/icon-themes/galaxy/sfx2/res/startcenter-logo.png
index 78bc4ebd9e20..ef903fb008a0 100644
Binary files a/icon-themes/galaxy/sfx2/res/startcenter-logo.png and b/icon-themes/galaxy/sfx2/res/startcenter-logo.png differ
diff --git a/icon-themes/galaxy/sfx2/res/startcenter-logo.svg b/icon-themes/galaxy/sfx2/res/startcenter-logo.svg
new file mode 100644
index 000000000000..e1c80e595d6a
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/startcenter-logo.svg
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg3360"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ width="368.00235"
+ height="116.34795"
+ viewBox="0 0 368.00235 116.34795"
+ sodipodi:docname="startcenter-logo.svg">
+ <metadata
+ id="metadata3366">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs3364">
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath3372">
+ <rect
+ style="fill:#ffd5d5"
+ id="rect3374"
+ width="368.00235"
+ height="116.34795"
+ x="2.077642"
+ y="105.41204" />
+ </clipPath>
+ </defs>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1173"
+ id="namedview3362"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:zoom="0.96262974"
+ inkscape:cx="182.96235"
+ inkscape:cy="110.88"
+ inkscape:window-x="1911"
+ inkscape:window-y="-9"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg3360" />
+ <image
+ width="370.07999"
+ height="221.75999"
+ preserveAspectRatio="none"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgIAAAE0CAYAAABejlvhAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
+AAATOQAAEzkBj8JWAQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAA2VSURB
+VHic7d17tJV1mcDx58ABEVkKjnhhLaTERhGJCW+V5n2p43U0Fa8BXijzlrryMs6k2aRLTYs0zBjN
+0WLQaTIgkTFRtPKaISZKyk1BFLnfDwcOzB/qck7vFhTOfvdxns/nz9+zOe/DX+e79tnvfuuGdu+1
+LgCAlNrUegEAoHaEAAAkJgQAIDEhAACJCQEASEwIAEBiQgAAEhMCAJCYEACAxIQAACQmBAAgMSEA
+AIkJAQBITAgAQGJCAAASEwIAkJgQAIDEhAAAJCYEACAxIQAAiQkBAEhMCABAYkIAABITAgCQmBAA
+gMSEAAAkJgQAIDEhAACJCQEASEwIAEBiQgAAEhMCAJCYEACAxIQAACQmBAAgMSEAAIkJAQBITAgA
+QGJCAAASEwIAkJgQAIDEhAAAJCYEACAxIQAAiQkBAEhMCABAYkIAABITAgCQmBAAgMSEAAAkJgQA
+IDEhAACJCQEASEwIAEBiQgAAEhMCAJCYEACAxIQAACQmBAAgMSEAAIkJAQBITAgAQGJCAAASEwIA
+kJgQAIDEhAAAJCYEACAxIQAAiQkBAEhMCABAYkIAABITAgCQmBAAgMSEAAAkJgQAIDEhAACJCQEA
+SEwIAEBiQgAAEhMCAJCYEACAxIQAACQmBAAgMSEAAIkJAQBITAgAQGJCAAASEwIAkJgQAIDEhAAA
+JCYEACAxIQAAiQkBAEhMCABAYkIAABITAgCQmBAAgMSEAAAkJgQAIDEhAACJCQEASEwIAEBiQgAA
+EhMCAJCYEACAxIQAACQmBAAgMSEAAIkJAQBITAgAQGJCAAASEwIAkJgQAIDEhAAAJCYEACAxIQAA
+iQkBAEhMCABAYkIAABITAgCQmBAAgMSEAAAkJgQAIDEhAACJCQEASEwIAEBiQgAAEhMCAJCYEACA
+xIQAACQmBAAgMSEAAIkJAQBITAgAQGJCAAASEwIAkJgQAIDEhAAAJCYEACAxIQAAiQkBAEhMCABA
+YkIAABITAgCQmBAAgMSEAAAkJgQAIDEhAACJCQEASEwIAEBiQgAAEhMCAJCYEACAxIQAACQmBAAg
+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
+i6MwXbQAAAAASUVORK5CYII=
+"
+ id="image3368"
+ x="0"
+ y="0"
+ clip-path="url(#clipPath3372)"
+ transform="translate(-2.077642,-105.41204)" />
+</svg>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 32c3cd7e9a28..273685577f9e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3588,14 +3588,14 @@
<info>
<desc>Specifies the background color of the start center.</desc>
</info>
- <value>14540253</value>
+ <value>9903402</value>
</prop>
<prop oor:name="StartCenterTextColor" oor:type="xs:int" oor:nillable="false">
<!-- Default 3355443 = 0x333333 as specified in tdf#90452, comment 45 -->
<info>
<desc>Specifies the text color of the buttons in the start center.</desc>
</info>
- <value>3355443</value>
+ <value>15658734</value>
</prop>
<prop oor:name="StartCenterThumbnailsBackgroundColor" oor:type="xs:int" oor:nillable="false">
<!-- Default 6710886 = 0x666666 as specified in tdf#90452, comment 45 -->
commit e5ebc3d73156f217161e6b857026eae49fa91ea9
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Tue Apr 25 22:25:18 2017 +0200
update credits
Change-Id: Id21b158bcdb4ff51950bcce0869e6c79a7e48fc4
(cherry picked from commit aa6a9bbd66beb234c54d8f881b56da6d8753c423)
diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt
index d66cdb55a913..73e6ce9098bf 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,12 +1,12 @@
<?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/5.3.1.2$Linux_X86_64 LibreOffice_project/e80a0e0fd1875e1696614d24c32df0f95f03deb2</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="3852" meta:word-count="13523" meta:character-count="97548" meta:non-whitespace-character-count="85360"/><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/5.3.2.2$Linux_X86_64 LibreOffice_project/6cd4f1ef626f15116896b1d8e1398b56da0d0ee1</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="3869" meta:word-count="13599" meta:character-count="98099" meta:non-whitespace-character-count="85845"/><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">626</config:config-item>
+ <config:config-item config:name="ViewAreaTop" config:type="long">1420</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">41197</config:config-item>
+ <config:config-item config:name="ViewAreaWidth" config:type="long">41965</config:config-item>
<config:config-item config:name="ViewAreaHeight" config:type="long">21698</config:config-item>
<config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item>
<config:config-item config:name="InBrowseMode" config:type="boolean">true</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">626</config:config-item>
- <config:config-item config:name="VisibleRight" config:type="long">41697</config:config-item>
- <config:config-item config:name="VisibleBottom" config:type="long">22322</config:config-item>
+ <config:config-item config:name="VisibleTop" config:type="long">1420</config:config-item>
+ <config:config-item config:name="VisibleRight" config:type="long">42464</config:config-item>
+ <config:config-item config:name="VisibleBottom" config:type="long">23116</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>
@@ -70,7 +70,7 @@
<config:config-item config:name="InvertBorderSpacing" config:type="boolean">false</config:config-item>
<config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item>
<config:config-item config:name="TabsRelativeToIndent" config:type="boolean">true</config:config-item>
- <config:config-item config:name="Rsid" config:type="int">6513620</config:config-item>
+ <config:config-item config:name="Rsid" config:type="int">6533120</config:config-item>
<config:config-item config:name="PrintProspectRTL" config:type="boolean">false</config:config-item>
<config:config-item config:name="PrintEmptyPages" config:type="boolean">false</config:config-item>
<config:config-item config:name="ApplyUserData" config:type="boolean">false</config:config-item>
@@ -317,40 +317,40 @@
</office:styles>
<office:automatic-styles>
<style:style style:name="Tabelle1" style:family="table">
- <style:table-properties style:width="25.857cm" table:align="left"/>
+ <style:table-properties style:width="24.507cm" table:align="left"/>
</style:style>
<style:style style:name="Tabelle1.A" style:family="table-column">
- <style:table-column-properties style:column-width="6.246cm"/>
+ <style:table-column-properties style:column-width="6.854cm"/>
</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="5.479cm"/>
</style:style>
<style:style style:name="Tabelle1.C" style:family="table-column">
- <style:table-column-properties style:column-width="6.749cm"/>
+ <style:table-column-properties style:column-width="5.346cm"/>
</style:style>
<style:style style:name="Tabelle1.D" style:family="table-column">
- <style:table-column-properties style:column-width="6.034cm"/>
+ <style:table-column-properties style:column-width="6.828cm"/>
</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.B285" style:family="table-cell">
+ <style:style style:name="Tabelle1.D287" 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.74cm" table:align="left"/>
+ <style:table-properties style:width="17.919cm" 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:style>
<style:style style:name="Tabelle2.B" style:family="table-column">
- <style:table-column-properties style:column-width="4.817cm"/>
+ <style:table-column-properties style:column-width="3.865cm"/>
</style:style>
<style:style style:name="Tabelle2.C" style:family="table-column">
- <style:table-column-properties style:column-width="3.838cm"/>
+ <style:table-column-properties style:column-width="4.817cm"/>
</style:style>
<style:style style:name="Tabelle2.D" style:family="table-column">
- <style:table-column-properties style:column-width="4.764cm"/>
+ <style:table-column-properties style:column-width="3.918cm"/>
</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"/>
@@ -398,26 +398,23 @@
<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="31.678cm" table:align="left"/>
+ <style:table-properties style:width="31.175cm" table:align="left"/>
</style:style>
<style:style style:name="Tabelle5.A" style:family="table-column">
- <style:table-column-properties style:column-width="6.219cm"/>
+ <style:table-column-properties style:column-width="6.749cm"/>
</style:style>
<style:style style:name="Tabelle5.B" style:family="table-column">
- <style:table-column-properties style:column-width="6.722cm"/>
+ <style:table-column-properties style:column-width="11.829cm"/>
</style:style>
<style:style style:name="Tabelle5.C" style:family="table-column">
- <style:table-column-properties style:column-width="6.828cm"/>
+ <style:table-column-properties style:column-width="6.246cm"/>
</style:style>
<style:style style:name="Tabelle5.D" style:family="table-column">
- <style:table-column-properties style:column-width="11.908cm"/>
+ <style:table-column-properties style:column-width="6.352cm"/>
</style:style>
<style:style style:name="Tabelle5.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.B635" 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">
<style:text-properties fo:font-size="2pt" style:font-size-asian="2pt" style:font-size-complex="2pt"/>
</style:style>
@@ -1045,7 +1042,7 @@
</office:binary-data>
</draw:image>
</draw:frame>Credits</text:p>
- <text:p text:style-name="Text_20_body">1270 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-03-29 21:12:33.</text:p>
+ <text:p text:style-name="Text_20_body">1280 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2017-04-25 17:18:09.</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">
@@ -1072,10 +1069,10 @@
<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">Caolán McNamara<text:line-break/>Commits: 21672<text:line-break/>Joined: 2000-10-10</text:p>
+ <text:p text:style-name="Table_20_Contents">Caolán McNamara<text:line-break/>Commits: 21913<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">Stephan Bergmann<text:line-break/>Commits: 13956<text:line-break/>Joined: 2000-10-04</text:p>
+ <text:p text:style-name="Table_20_Contents">Stephan Bergmann<text:line-break/>Commits: 14089<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">Ivo Hinkelmann<text:line-break/>Commits: 9480<text:line-break/>Joined: 2002-09-09</text:p>
@@ -1083,35 +1080,35 @@
</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">Tor Lillqvist<text:line-break/>Commits: 7816<text:line-break/>Joined: 2010-03-23</text:p>
+ <text:p text:style-name="Table_20_Contents">Tor Lillqvist<text:line-break/>Commits: 7833<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"><text:span text:style-name="T1">*</text:span>Noel Grandin<text:line-break/>Commits: 6479<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: 6480<text:line-break/>Joined: <text:span text:style-name="T2">2011-12-12</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">Miklos Vajna<text:line-break/>Commits: 6233<text:line-break/>Joined: 2010-07-29</text:p>
+ <text:p text:style-name="Table_20_Contents">Miklos Vajna<text:line-break/>Commits: 6280<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: 5878<text:line-break/>Joined: 2008-06-16</text:p>
+ <text:p text:style-name="Table_20_Contents">Michael Stahl<text:line-break/>Commits: 5917<text:line-break/>Joined: 2008-06-16</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">Kohei Yoshida<text:line-break/>Commits: 5482<text:line-break/>Joined: 2009-06-19</text:p>
+ <text:p text:style-name="Table_20_Contents">Kohei Yoshida<text:line-break/>Commits: 5493<text:line-break/>Joined: 2009-06-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">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"><text:span text:style-name="T1">*</text:span>Markus Mohrhard<text:line-break/>Commits: 4650<text:line-break/>Joined: <text:span text:style-name="T2">2011-03-17</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Markus Mohrhard<text:line-break/>Commits: 4684<text:line-break/>Joined: <text:span text:style-name="T2">2011-03-17</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">Eike Rathke<text:line-break/>Commits: 3736<text:line-break/>Joined: 2000-10-11</text:p>
+ <text:p text:style-name="Table_20_Contents">Eike Rathke<text:line-break/>Commits: 3771<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: 3465<text:line-break/>Joined: 2009-11-12</text:p>
+ <text:p text:style-name="Table_20_Contents">David Tardon<text:line-break/>Commits: 3469<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>
@@ -1125,16 +1122,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">Oliver Specht<text:line-break/>Commits: 2546<text:line-break/>Joined: 2000-09-21</text:p>
+ <text:p text:style-name="Table_20_Contents">Oliver Specht<text:line-break/>Commits: 2548<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">Jan Holesovsky<text:line-break/>Commits: 2417<text:line-break/>Joined: 2009-06-23</text:p>
+ <text:p text:style-name="Table_20_Contents">Jan Holesovsky<text:line-break/>Commits: 2428<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">Michael Meeks<text:line-break/>Commits: 2237<text:line-break/>Joined: 2004-08-05</text:p>
+ <text:p text:style-name="Table_20_Contents">Michael Meeks<text:line-break/>Commits: 2241<text:line-break/>Joined: 2004-08-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">Bjoern Michaelsen<text:line-break/>Commits: 2211<text:line-break/>Joined: 2009-10-14</text:p>
+ <text:p text:style-name="Table_20_Contents">Bjoern Michaelsen<text:line-break/>Commits: 2212<text:line-break/>Joined: 2009-10-14</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1148,7 +1145,7 @@
<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>Julien Nabet<text:line-break/>Commits: 2041<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"><text:span text:style-name="T1">*</text:span>Julien Nabet<text:line-break/>Commits: 2047<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>
@@ -1156,13 +1153,13 @@
<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"><text:span text:style-name="T1">*</text:span>Andras Timar<text:line-break/>Commits: 1749<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: 1755<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"><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>Tomaž Vajngerl<text:line-break/>Commits: 1618<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: 1635<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>
@@ -1181,13 +1178,13 @@
</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>Takeshi Abe<text:line-break/>Commits: 1274<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: 1288<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">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">Thorsten Behrens<text:line-break/>Commits: 1218<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">Thorsten Behrens<text:line-break/>Commits: 1203<text:line-break/>Joined: 2001-04-25</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">Armin Le Grand<text:line-break/>Commits: 1188<text:line-break/>Joined: 2000-09-25</text:p>
@@ -1195,7 +1192,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>Matteo Casalin<text:line-break/>Commits: 1136<text:line-break/>Joined: <text:span text:style-name="T2">2011-11-13</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Matteo Casalin<text:line-break/>Commits: 1161<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"><text:span text:style-name="T1">*</text:span>Noel Grandin<text:line-break/>Commits: 999<text:line-break/>Joined: <text:span text:style-name="T2">2016-09-07</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>Lionel Elie Mamane<text:line-break/>Commits: 999<text:line-break/>Joined: <text:span text:style-name="T2">2011-01-15</text:span></text:p>
@@ -1203,11 +1203,11 @@
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<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-row>
+ <table:table-row>
<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>
</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">Kai Ahrens<text:line-break/>Commits: 909<text:line-break/>Joined: 2000-09-21</text:p>
</table:table-cell>
@@ -1215,24 +1215,21 @@
<text:p text:style-name="Table_20_Contents">Henning Brinkmann<text:line-break/>Commits: 899<text:line-break/>Joined: 2002-08-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>Chris Sherlock<text:line-break/>Commits: 887<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">Cédric Bosdonnat<text:line-break/>Commits: 882<text:line-break/>Joined: 2009-11-16</text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Chris Sherlock<text:line-break/>Commits: 893<text:line-break/>Joined: <text:span text:style-name="T2">2013-02-25</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>Noel Grandin<text:line-break/>Commits: 878<text:line-break/>Joined: <text:span text:style-name="T2">2016-09-07</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents">Cédric Bosdonnat<text:line-break/>Commits: 882<text:line-break/>Joined: 2009-11-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">Malte Timmermann [mt]<text:line-break/>Commits: 864<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">Sven Jacobi<text:line-break/>Commits: 850<text:line-break/>Joined: 2000-09-21</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: 850<text:line-break/>Joined: <text:span text:style-name="T2">2012-08-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>Tamás Zolnai<text:line-break/>Commits: 839<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">Sven Jacobi<text:line-break/>Commits: 850<text:line-break/>Joined: 2000-09-21</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1282,13 +1279,13 @@
<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-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: 567<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>Maxim Monastirsky<text:line-break/>Commits: 575<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">Thomas Benisch [tbe]<text:line-break/>Commits: 551<text:line-break/>Joined: 2000-10-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">Christian Lohmaier<text:line-break/>Commits: 518<text:line-break/>Joined: 2008-06-01</text:p>
+ <text:p text:style-name="Table_20_Contents">Christian Lohmaier<text:line-break/>Commits: 527<text:line-break/>Joined: 2008-06-01</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1302,7 +1299,7 @@
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Peter Foley<text:line-break/>Commits: 488<text:line-break/>Joined: <text:span text:style-name="T2">2011-09-04</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>Khaled Hosny<text:line-break/>Commits: 471<text:line-break/>Joined: <text:span text:style-name="T2">2011-01-28</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Khaled Hosny<text:line-break/>Commits: 472<text:line-break/>Joined: <text:span text:style-name="T2">2011-01-28</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1310,21 +1307,21 @@
<text:p text:style-name="Table_20_Contents">Andreas Bregas<text:line-break/>Commits: 470<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"><text:span text:style-name="T1">*</text:span>Samuel Mehrbrodt<text:line-break/>Commits: 424<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>Zdeněk Crhonek<text:line-break/>Commits: 434<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"><text:span text:style-name="T1">*</text:span>Zdeněk Crhonek<text:line-break/>Commits: 424<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>Yousuf Philips<text:line-break/>Commits: 432<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"><text:span text:style-name="T1">*</text:span>Yousuf Philips<text:line-break/>Commits: 419<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>Samuel Mehrbrodt<text:line-break/>Commits: 427<text:line-break/>Joined: <text:span text:style-name="T2">2011-06-08</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">Rene Engelhard<text:line-break/>Commits: 411<text:line-break/>Joined: 2005-03-14</text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Katarina Behrens<text:line-break/>Commits: 416<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: 411<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">Rene Engelhard<text:line-break/>Commits: 412<text:line-break/>Joined: 2005-03-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">Dirk Voelzke<text:line-break/>Commits: 392<text:line-break/>Joined: 2000-11-27</text:p>
@@ -1344,15 +1341,15 @@
<text:p text:style-name="Table_20_Contents">Matthias Huetsch [mhu]<text:line-break/>Commits: 360<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>Jochen Nitschke<text:line-break/>Commits: 339<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>Jochen Nitschke<text:line-break/>Commits: 350<text:line-break/>Joined: <text:span text:style-name="T2">2016-02-02</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>Szymon Kłos<text:line-break/>Commits: 337<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: 347<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>David Ostrovsky<text:line-break/>Commits: 321<text:line-break/>Joined: <text:span text:style-name="T2">2012-04-01</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>David Ostrovsky<text:line-break/>Commits: 322<text:line-break/>Joined: <text:span text:style-name="T2">2012-04-01</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">Radek Doulik<text:line-break/>Commits: 305<text:line-break/>Joined: 2010-05-03</text:p>
@@ -1366,13 +1363,13 @@
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>August Sodora<text:line-break/>Commits: 285<text:line-break/>Joined: <text:span text:style-name="T2">2011-10-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>Siqi Liu<text:line-break/>Commits: 277<text:line-break/>Joined: <text:span text:style-name="T2">2013-04-13</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: 279<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>Pierre-André Jacquod<text:line-break/>Commits: 276<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-13</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Siqi Liu<text:line-break/>Commits: 277<text:line-break/>Joined: <text:span text:style-name="T2">2013-04-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>Adolfo Jayme Barrientos<text:line-break/>Commits: 274<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>Pierre-André Jacquod<text:line-break/>Commits: 276<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-13</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1391,16 +1388,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"><text:span text:style-name="T1">*</text:span>Jan-Marek Glogowski<text:line-break/>Commits: 234<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>Jan-Marek Glogowski<text:line-break/>Commits: 238<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>Andrea Gelmini<text:line-break/>Commits: 230<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>Andrea Gelmini<text:line-break/>Commits: 236<text:line-break/>Joined: <text:span text:style-name="T2">2014-10-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">Ingo Schmidt<text:line-break/>Commits: 202<text:line-break/>Joined: 2004-02-05</text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Laurent Balland-Poirier<text:line-break/>Commits: 204<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>Laurent Balland-Poirier<text:line-break/>Commits: 201<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">Ingo Schmidt<text:line-break/>Commits: 202<text:line-break/>Joined: 2004-02-05</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1419,20 +1416,23 @@
</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>Arnaud Versini<text:line-break/>Commits: 182<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-05</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Gabor Kelemen<text:line-break/>Commits: 187<text:line-break/>Joined: <text:span text:style-name="T2">2016-08-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>Marco Cecchetti<text:line-break/>Commits: 180<text:line-break/>Joined: <text:span text:style-name="T2">2011-04-14</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Marco Cecchetti<text:line-break/>Commits: 185<text:line-break/>Joined: <text:span text:style-name="T2">2011-04-14</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