[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 23 commits - configure.ac cui/source dbaccess/source editeng/source i18npool/source icon-themes/industrial icon-themes/sifr icon-themes/tango officecfg/registry oox/source sc/qa sc/sdi sc/source sfx2/source svtools/source svx/source sw/qa sw/sdi sw/source sysui/desktop vcl/source vcl/workben xmloff/source
Andras Timar
andras.timar at collabora.com
Tue Nov 3 09:08:33 PST 2015
configure.ac | 2
cui/source/customize/cfg.cxx | 24
dbaccess/source/core/api/KeySet.cxx | 13
editeng/source/rtf/svxrtf.cxx | 8
i18npool/source/localedata/data/vec_IT.xml | 191
icon-themes/industrial/cmd/lc_entirecell.png |binary
icon-themes/industrial/cmd/sc_entirecell.png |binary
icon-themes/sifr/cmd/32/selectall.png |binary
icon-themes/sifr/cmd/32/selectobject.png |binary
icon-themes/sifr/cmd/lc_arrowshapes.chevron.png |binary
icon-themes/sifr/cmd/lc_arrowshapes.circular-arrow.png |binary
icon-themes/sifr/cmd/lc_arrowshapes.corner-right-arrow.png |binary
icon-themes/sifr/cmd/lc_arrowshapes.down-arrow-callout.png |binary
icon-themes/sifr/cmd/lc_arrowshapes.down-arrow.png |binary
icon-themes/sifr/cmd/lc_arrowshapes.left-arrow-callout.png |binary
icon-themes/sifr/cmd/lc_arrowshapes.left-arrow.png |binary
icon-themes/sifr/cmd/lc_arrowshapes.left-right-arrow.png |binary
icon-themes/sifr/cmd/lc_arrowshapes.quad-arrow.png |binary
icon-themes/sifr/cmd/lc_arrowshapes.right-arrow-callout.png |binary
icon-themes/sifr/cmd/lc_arrowshapes.right-arrow.png |binary
icon-themes/sifr/cmd/lc_arrowshapes.up-arrow-callout.png |binary
icon-themes/sifr/cmd/lc_arrowshapes.up-down-arrow.png |binary
icon-themes/sifr/cmd/lc_basicshapes.png |binary
icon-themes/sifr/cmd/lc_ellipse.png |binary
icon-themes/sifr/cmd/lc_selectall.png |binary
icon-themes/sifr/cmd/sc_basicshapes.png |binary
icon-themes/sifr/cmd/sc_ellipse.png |binary
icon-themes/sifr/cmd/sc_selectall.png |binary
icon-themes/tango/cmd/lc_entirecell.png |binary
icon-themes/tango/cmd/lc_insertcolumnsafter-lc_insertcolumnsbefore.xcf.bz2 |binary
icon-themes/tango/cmd/lc_insertcolumnsafter.png |binary
icon-themes/tango/cmd/lc_insertcolumnsbefore.png |binary
icon-themes/tango/cmd/lc_insertrowsafter-lc_insertrowsbefore.xcf.bz2 |binary
icon-themes/tango/cmd/lc_insertrowsafter.png |binary
icon-themes/tango/cmd/lc_insertrowsbefore.png |binary
icon-themes/tango/cmd/lc_insertrowsdown.svg | 3551 ++++++++++
icon-themes/tango/cmd/lc_protect-lc_unsetcellsreadonly.xcf.bz2 |binary
icon-themes/tango/cmd/lc_protect.png |binary
icon-themes/tango/cmd/lc_splittable.png |binary
icon-themes/tango/cmd/lc_splittable.xcf.bz2 |binary
icon-themes/tango/cmd/lc_tablenumberformatdialog.png |binary
icon-themes/tango/cmd/lc_tablenumberformatdialog.xcf.bz2 |binary
icon-themes/tango/cmd/lc_unsetcellsreadonly.png |binary
icon-themes/tango/cmd/sc_deletetable.png |binary
icon-themes/tango/cmd/sc_deletetable.xcf.bz2 |binary
icon-themes/tango/cmd/sc_entirecell-sc_entirerow-sc_entirecolumn-sc_selecttable.xcf.bz2 |binary
icon-themes/tango/cmd/sc_entirecell.png |binary
icon-themes/tango/cmd/sc_entirecolumn.png |binary
icon-themes/tango/cmd/sc_entirerow.png |binary
icon-themes/tango/cmd/sc_insertcolumnsafter-sc_insertcolumnsbefore.xcf.bz2 |binary
icon-themes/tango/cmd/sc_insertcolumnsafter.png |binary
icon-themes/tango/cmd/sc_insertcolumnsbefore.png |binary
icon-themes/tango/cmd/sc_insertrowsafter-sc_insertrowsbefore.xcf.bz2 |binary
icon-themes/tango/cmd/sc_insertrowsafter.png |binary
icon-themes/tango/cmd/sc_insertrowsbefore.png |binary
icon-themes/tango/cmd/sc_selecttable.png |binary
icon-themes/tango/cmd/sc_splittable.png |binary
icon-themes/tango/cmd/sc_splittable.xcf.bz2 |binary
icon-themes/tango/cmd/sc_tablenumberformatdialog.png |binary
icon-themes/tango/cmd/sc_tablenumberformatdialog.xcf |binary
icon-themes/tango/cmd/sc_unsetcellsreadonly.png |binary
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 15
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2
oox/source/drawingml/chart/objectformatter.cxx | 1
sc/qa/unit/data/xls/pass/ooo56295-1.xls |binary
sc/qa/unit/opencl-test.cxx | 3
sc/sdi/drtxtob.sdi | 1
sc/source/core/tool/interpr4.cxx | 8
sc/source/ui/app/scdll.cxx | 1
sc/source/ui/drawfunc/futext.cxx | 1
sc/source/ui/view/drawview.cxx | 1
sc/source/ui/view/output.cxx | 5
sfx2/source/sidebar/SidebarToolBox.cxx | 30
svtools/source/config/slidesorterbaropt.cxx | 45
svtools/source/svrtf/parrtf.cxx | 21
svx/source/form/filtnav.cxx | 30
svx/source/gallery2/galctrl.cxx | 20
svx/source/tbxctrls/fontworkgallery.cxx | 17
sw/qa/extras/ooxmlimport/data/tdf89165.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 5
sw/sdi/_annotsh.sdi | 7
sw/sdi/drwtxtsh.sdi | 8
sw/source/core/layout/hffrm.cxx | 12
sw/source/core/text/itratr.cxx | 14
sw/source/uibase/app/swmodule.cxx | 1
sw/source/uibase/shells/annotsh.cxx | 2
sw/source/uibase/shells/drwtxtex.cxx | 2
sw/source/uibase/shells/textsh.cxx | 1
sw/source/uibase/shells/textsh1.cxx | 1
sysui/desktop/freedesktop/freedesktop-menus.spec | 3
sysui/desktop/share/create_tree.sh | 8
vcl/source/control/edit.cxx | 2
vcl/workben/vcldemo.cxx | 2
xmloff/source/style/styleexp.cxx | 4
94 files changed, 3874 insertions(+), 188 deletions(-)
New commits:
commit 007acbadc79eddb256e6bd794951d8f2ad1304e8
Author: Andras Timar <andras.timar at collabora.com>
Date: Tue Nov 3 18:11:16 2015 +0100
Bump to version 5.0-7
Change-Id: Ib4234314705e8ffd770ecd23552e254aa32c8e3a
diff --git a/configure.ac b/configure.ac
index 54ad873..83412c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
-AC_INIT([Collabora Office],[5.0.10.6],[],[],[https://CollaboraOffice.com/])
+AC_INIT([Collabora Office],[5.0.10.7],[],[],[https://CollaboraOffice.com/])
AC_PREREQ([2.59])
commit be11143b86475b07d525a7ef651a704ddf6383d4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 3 09:53:47 2015 +0000
read past end of pCellInfo
Change-Id: Ic024f8dd3aaf368877f5914c6106164508760da8
Reviewed-on: https://gerrit.libreoffice.org/19752
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
(cherry picked from commit 5ae015fc74330ac4c24b67370c59518084f1d201)
Reviewed-on: https://gerrit.libreoffice.org/19755
(cherry picked from commit 0da689ecb8d81cbcf1abf9cb0055cb650c8e4350)
diff --git a/sc/qa/unit/data/xls/pass/ooo56295-1.xls b/sc/qa/unit/data/xls/pass/ooo56295-1.xls
new file mode 100644
index 0000000..bd727c9
Binary files /dev/null and b/sc/qa/unit/data/xls/pass/ooo56295-1.xls differ
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 9dfc3b7..2b04c0f 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -1059,7 +1059,10 @@ void ScOutputData::DrawBackground()
for (SCCOL nMerged = 0; nMerged < nMergedCells; ++nMerged)
{
- nPosX += pRowInfo[0].pCellInfo[nX+nOldMerged+nMerged].nWidth * nLayoutSign;
+ SCCOL nCol = nX+nOldMerged+nMerged;
+ if (nCol > nX2+2)
+ break;
+ nPosX += pRowInfo[0].pCellInfo[nCol].nWidth * nLayoutSign;
}
}
drawCells( NULL, NULL, pOldColor, pOldBackground, aRect, nPosX, nSignedOneX, mpDev, NULL, pOldDataBarInfo, NULL, pOldIconSetInfo );
commit 97ea231bcdf796a1ab2a1a505e2c483f60fcc8f1
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Oct 30 16:05:42 2015 +0100
svx: add result of "badstatics" plugin to fix abuse of VCL Bitmaps
VCL Image/Bitmap/BitmapEx instances must not have static life-time
because then they will be destructed after DeInitVCL() and that
likely segfaults.
(cherry picked from commit bf18f1b3535dd17f9bf584cab15ee6a7fd431257)
Omitting the plugin itself, the fixes should be enough for release
branch.
Change-Id: I3ff8d32de729c971b190028094cb4efe206395e2
Reviewed-on: https://gerrit.libreoffice.org/19742
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit a93c08e8eeb8386d02a015c63d161220d059a6bf)
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index c258692..78a44cd 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -156,14 +156,8 @@ TYPEINIT1(FmFormItem, FmParentData);
Image FmFormItem::GetImage() const
{
- static Image aImage;
-
- if (!aImage)
- {
- ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
- aImage = aNavigatorImages.GetImage( RID_SVXIMG_FORM );
- }
- return aImage;
+ ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
+ return aNavigatorImages.GetImage( RID_SVXIMG_FORM );
}
@@ -187,14 +181,8 @@ FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) co
Image FmFilterItems::GetImage() const
{
- static Image aImage;
-
- if (!aImage)
- {
- ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
- aImage = aNavigatorImages.GetImage( RID_SVXIMG_FILTER );
- }
- return aImage;
+ ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
+ return aNavigatorImages.GetImage( RID_SVXIMG_FILTER );
}
@@ -213,14 +201,8 @@ FmFilterItem::FmFilterItem( FmFilterItems* pParent,
Image FmFilterItem::GetImage() const
{
- static Image aImage;
-
- if (!aImage)
- {
- ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
- aImage = aNavigatorImages.GetImage( RID_SVXIMG_FIELD );
- }
- return aImage;
+ ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
+ return aNavigatorImages.GetImage( RID_SVXIMG_FIELD );
}
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 2db38bd..fd8c01f 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -649,7 +649,7 @@ public:
// be done with a shader / gradient
static void SimulateBorderStretch(OutputDevice &rDev, const Rectangle& r)
{
- static BitmapEx aPageShadowMask("sw/res/page-shadow-mask.png");
+ BitmapEx aPageShadowMask("sw/res/page-shadow-mask.png");
BitmapEx aRight(aPageShadowMask);
sal_Int32 nSlice = (aPageShadowMask.GetSizePixel().Width() - 3) / 4;
commit 61fb299b76e2140b50e35150834357ba71b69159
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Tue Oct 27 14:20:03 2015 +0200
tdf#64027 sw: Make the text background color button work
Change-Id: I305163b691a8fa51ef5da0c940c59c3a3440a2dc
(cherry picked from commit 96d03636a5f932151c7842ae34631258891fe807)
Reviewed-on: https://gerrit.libreoffice.org/19738
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
(cherry picked from commit f4b8ebbd7838921cce837acb353f81df1a6d2996)
diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi
index 232388c..ed7b427 100644
--- a/sw/sdi/_annotsh.sdi
+++ b/sw/sdi/_annotsh.sdi
@@ -237,6 +237,13 @@ interface _Annotation
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+ SID_ATTR_CHAR_BACK_COLOR // api:
+ [
+ ExecMethod = Exec;
+ StateMethod = GetState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+
SID_CHAR_DLG_EFFECT
[
ExecMethod = Exec ;
diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index 4bdcea5..d134e7d 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -656,6 +656,14 @@ interface TextDrawFont
StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+
+ SID_ATTR_CHAR_BACK_COLOR // api:
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetDrawTextCtrlState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+ ]
+
SID_ATTR_CHAR_WORDLINEMODE // status(final|play)
[
ExecMethod = Execute ;
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index 1175968..9bf24ef 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -319,6 +319,7 @@ void SwDLL::RegisterControls()
SvxColorToolBoxControl::RegisterControl(SID_ATTR_LINE_COLOR, pMod );
SvxLineEndToolBoxControl::RegisterControl(SID_ATTR_LINEEND_STYLE, pMod );
SvxColorToolBoxControl::RegisterControl(SID_ATTR_FILL_COLOR, pMod);
+ SvxColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_BACK_COLOR, pMod);
SvxFontNameToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONT, pMod );
SvxColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR, pMod );
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index ba0a7f6..b2bb38d 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -260,6 +260,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
break;
}
case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break;
+ case SID_ATTR_CHAR_BACK_COLOR: nEEWhich = EE_CHAR_BKGCOLOR; break;
case SID_ATTR_CHAR_UNDERLINE:
{
if( rReq.GetArgs() )
@@ -696,6 +697,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
}
break;
case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break;
+ case SID_ATTR_CHAR_BACK_COLOR: nEEWhich = EE_CHAR_BKGCOLOR; break;
case SID_ATTR_CHAR_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE;break;
case SID_ATTR_CHAR_OVERLINE: nEEWhich = EE_CHAR_OVERLINE;break;
case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break;
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 57a8b3c..4a95d70 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -169,6 +169,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
break;
case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break;
+ case SID_ATTR_CHAR_BACK_COLOR: nEEWhich = EE_CHAR_BKGCOLOR; break;
case SID_ATTR_CHAR_UNDERLINE:
{
@@ -913,6 +914,7 @@ void SwDrawTextShell::GetDrawTextCtrlState(SfxItemSet& rSet)
}
break;
case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break;
+ case SID_ATTR_CHAR_BACK_COLOR: nEEWhich = EE_CHAR_BKGCOLOR; break;
case SID_ATTR_CHAR_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE;break;
case SID_ATTR_CHAR_OVERLINE: nEEWhich = EE_CHAR_OVERLINE;break;
case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break;
commit a3a6ea6a56430796117474b5f0171e9eebba0cd8
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Tue Oct 27 14:18:58 2015 +0200
tdf#92207 sc: Make the text background color button work
Change-Id: I687a58e17ce30ced101c4585884106cff9b6292b
(cherry picked from commit 63e1369529838728d2878afc03bf9bb9cedb59d5)
Reviewed-on: https://gerrit.libreoffice.org/19737
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
(cherry picked from commit 8fa03e0fd1cf73387634ec4945cf842d2d75b193)
diff --git a/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdi
index 9a77b17..b6867e1 100644
--- a/sc/sdi/drtxtob.sdi
+++ b/sc/sdi/drtxtob.sdi
@@ -63,6 +63,7 @@ interface TableDrawText
SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_CHAR_FONTHEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_CHAR_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+ SID_ATTR_CHAR_BACK_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_CHAR_WEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_CHAR_POSTURE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_CHAR_UNDERLINE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index aebc8b2..4de8d11 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -180,6 +180,7 @@ void ScDLL::Init()
SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod);
SvxColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR, pMod);
SvxColorToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR, pMod);
+ SvxColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_BACK_COLOR, pMod);
SvxFrameToolBoxControl ::RegisterControl(SID_ATTR_BORDER, pMod);
SvxFrameLineStyleToolBoxControl ::RegisterControl(SID_FRAME_LINESTYLE, pMod);
SvxColorToolBoxControl ::RegisterControl(SID_FRAME_LINECOLOR, pMod);
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 7b72133..43629a6 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -56,6 +56,7 @@ static void lcl_InvalidateAttribs( SfxBindings& rBindings )
rBindings.Invalidate( SID_ULINE_VAL_DOTTED );
rBindings.Invalidate( SID_ATTR_CHAR_OVERLINE );
rBindings.Invalidate( SID_ATTR_CHAR_COLOR );
+ rBindings.Invalidate( SID_ATTR_CHAR_BACK_COLOR );
rBindings.Invalidate( SID_ATTR_CHAR_FONT );
rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
rBindings.Invalidate( SID_ATTR_PARA_ADJUST_LEFT );
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 2c258c6..70bca7d 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -175,6 +175,7 @@ void ScDrawView::InvalidateDrawTextAttrs()
rBindings.Invalidate( SID_ULINE_VAL_DOTTED );
rBindings.Invalidate( SID_ATTR_CHAR_OVERLINE );
rBindings.Invalidate( SID_ATTR_CHAR_COLOR );
+ rBindings.Invalidate( SID_ATTR_CHAR_BACK_COLOR );
rBindings.Invalidate( SID_ATTR_PARA_ADJUST_LEFT );
rBindings.Invalidate( SID_ATTR_PARA_ADJUST_RIGHT );
rBindings.Invalidate( SID_ATTR_PARA_ADJUST_BLOCK );
commit f34d94cca26b1d80d671da348335e8bf7228768f
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Mon Nov 2 15:06:27 2015 +0200
Fix popup menu IDs after .ui conversion
(cherry picked from commit 9fbdb3d37fab7c8e0d6507807166c4de079d272f)
Conflicts:
cui/source/customize/cfg.cxx
Change-Id: I8955bee3ac2bb7a757c1f70dd46141833a068517
Reviewed-on: https://gerrit.libreoffice.org/19739
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
(cherry picked from commit 13ef923c64859f073d16790e6bf4dfbd3f6d2d39)
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 5e74b9c..e4da216 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2298,9 +2298,9 @@ void SvxMenuConfigPage::UpdateButtonStates()
m_pMoveUpButton->Enable( false );
m_pMoveDownButton->Enable( false );
- pPopup->EnableItem( ID_BEGIN_GROUP, true );
- pPopup->EnableItem( ID_RENAME, false );
- pPopup->EnableItem( ID_DELETE, false );
+ pPopup->EnableItem( "addseparator", true );
+ pPopup->EnableItem( "modrename", false );
+ pPopup->EnableItem( "moddelete", false );
m_pDescriptionField->SetText("");
@@ -2318,17 +2318,17 @@ void SvxMenuConfigPage::UpdateButtonStates()
if ( pEntryData->IsSeparator() )
{
- pPopup->EnableItem( ID_DELETE, true );
- pPopup->EnableItem( ID_BEGIN_GROUP, false );
- pPopup->EnableItem( ID_RENAME, false );
+ pPopup->EnableItem( "moddelete", true );
+ pPopup->EnableItem( "addseparator", false );
+ pPopup->EnableItem( "modrename", false );
m_pDescriptionField->SetText("");
}
else
{
- pPopup->EnableItem( ID_BEGIN_GROUP, true );
- pPopup->EnableItem( ID_DELETE, true );
- pPopup->EnableItem( ID_RENAME, true );
+ pPopup->EnableItem( "addseparator", true );
+ pPopup->EnableItem( "moddelete", true );
+ pPopup->EnableItem( "modrename", true );
m_pDescriptionField->SetText(pEntryData->GetHelpText());
}
@@ -2409,9 +2409,9 @@ IMPL_LINK( SvxMenuConfigPage, SelectMenu, ListBox *, pBox )
PopupMenu* pPopup = m_pModifyTopLevelButton->GetPopupMenu();
if ( pMenuData )
{
- pPopup->EnableItem( ID_DELETE, pMenuData->IsDeletable() );
- pPopup->EnableItem( ID_RENAME, pMenuData->IsRenamable() );
- pPopup->EnableItem( ID_MOVE, pMenuData->IsMovable() );
+ pPopup->EnableItem( "delete", pMenuData->IsDeletable() );
+ pPopup->EnableItem( "rename", pMenuData->IsRenamable() );
+ pPopup->EnableItem( "move", pMenuData->IsMovable() );
SvxEntries* pEntries = pMenuData->GetEntries();
SvxEntries::const_iterator iter = pEntries->begin();
commit c922174b1c8864495bf8245045af901807449b86
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Oct 12 09:07:52 2015 +0200
tdf#89165 sw: looping layout in SwHeadFootFrm::FormatSize()
FormatObjsAtFrm() returns false, indicating that the result is not
perfect, and the caller hopes that formatting all children of the frame
again will help. Make sure that in case that assumption turns out to be false, we at
least do not loop.
The loop limit is enough to make the original i#43771 bugdoc still laid
out properly.
(cherry picked from commit 51438e87d0e17a4cc3c991165d22c740b3ac1fc2)
Change-Id: Ife9bd99a628a72edb922d04e05081971b6adf340
Reviewed-on: https://gerrit.libreoffice.org/19407
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 47e8bcd703aa74deafd2e5571205f2dc565e6cf2)
diff --git a/sw/qa/extras/ooxmlimport/data/tdf89165.docx b/sw/qa/extras/ooxmlimport/data/tdf89165.docx
new file mode 100644
index 0000000..a060ca4
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf89165.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index dc460b5..1668def 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2801,6 +2801,11 @@ DECLARE_OOXMLIMPORT_TEST(testTdf90153, "tdf90153.docx")
CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, getProperty<text::TextContentAnchorType>(getShape(1), "AnchorType"));
}
+DECLARE_OOXMLIMPORT_TEST(testTdf89165, "tdf89165.docx")
+{
+ // This must not hang in layout
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index e12df3e..03f6ed4 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -246,6 +246,7 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
pFrm->_InvalidatePos();
aOldFooterPrtPos = Frm().Pos() + Prt().Pos();
}
+ int nLoopControl = 0;
while( pFrm )
{
pFrm->Calc(getRootFrm()->GetCurrShell()->GetOut());
@@ -263,9 +264,14 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
if ( !SwObjectFormatter::FormatObjsAtFrm( *pFrm,
*(pFrm->FindPageFrm()) ) )
{
- // restart format with first content
- pFrm = Lower();
- continue;
+ if (nLoopControl++ < 20)
+ {
+ // restart format with first content
+ pFrm = Lower();
+ continue;
+ }
+ else
+ SAL_WARN("sw", "SwHeadFootFrm::FormatSize: loop detection triggered");
}
}
pFrm = pFrm->GetNext();
commit c5907e7e12975a014bb12b138bd2420cb8ab76a9
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Wed Oct 21 21:55:24 2015 +0200
chart series support hatches, tdf#94227
Change-Id: Ib3a1ccda738091466d5e2866823f64b254ed5bab
(cherry picked from commit 6e3c36255b9a17095745aba2489b347bccf42423)
Reviewed-on: https://gerrit.libreoffice.org/19740
Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
Tested-by: Yousuf Philips <philipz85 at hotmail.com>
(cherry picked from commit c34958475373397bd0c29f81c12ae918646d28fb)
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index fae8249..0d6b971 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -514,6 +514,7 @@ static const sal_Int32 spnFilledPropIds[] =
PROP_FillBitmapPositionOffsetX,
PROP_FillBitmapPositionOffsetY,
PROP_FillBitmapRectanglePoint,
+ PROP_FillHatch,
PROP_END_LIST
};
commit 304bf4dd8edec47cd2b14c05ee20a3600cd98edc
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Mon Oct 19 10:19:07 2015 +0200
tdf#85767: Make also sidebar toolbox item order RTL-sensitive
do more-less the same as 2fd93f19cf6c1ce808214c does for main app
toolbars
Change-Id: If271bbb049915f4201fbce2ea587b753940a8de7
Reviewed-on: https://gerrit.libreoffice.org/19451
Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
Tested-by: Maxim Monastirsky <momonasmon at gmail.com>
(cherry picked from commit 07f75f6e645eca4825541f57e9d5e9479a17c559)
Reviewed-on: https://gerrit.libreoffice.org/19728
Tested-by: Jenkins <ci at libreoffice.org>
(cherry picked from commit 5a5963b2f1b108db4f0089f41db74b673ba038af)
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 46297a3..64df989 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -24,6 +24,7 @@
#include <vcl/builderfactory.hxx>
#include <vcl/gradient.hxx>
+#include <vcl/settings.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <svtools/miscopt.hxx>
#include <framework/imageproducer.hxx>
@@ -32,6 +33,24 @@
using namespace css;
using namespace css::uno;
+namespace {
+ void lcl_RTLizeCommandURL( OUString& rCommandURL )
+ {
+ if (rCommandURL == ".uno:ParaLeftToRight")
+ rCommandURL = ".uno:ParaRightToLeft";
+ else if (rCommandURL == ".uno:ParaRightToLeft")
+ rCommandURL = ".uno:ParaLeftToRight";
+ else if (rCommandURL == ".uno:LeftPara")
+ rCommandURL = ".uno:RightPara";
+ else if (rCommandURL == ".uno:RightPara")
+ rCommandURL = ".uno:LeftPara";
+ else if (rCommandURL == ".uno:AlignLeft")
+ rCommandURL = ".uno:AlignRight";
+ else if (rCommandURL == ".uno:AlignRight")
+ rCommandURL = ".uno:AlignLeft";
+ }
+}
+
namespace sfx2 { namespace sidebar {
SidebarToolBox::SidebarToolBox (vcl::Window* pParentWindow)
@@ -87,9 +106,16 @@ void SidebarToolBox::InsertItem(const OUString& rCommand,
const css::uno::Reference<css::frame::XFrame>& rFrame,
ToolBoxItemBits nBits, const Size& rRequestedSize, sal_uInt16 nPos)
{
- ToolBox::InsertItem(rCommand, rFrame, nBits, rRequestedSize, nPos);
+ OUString aCommand( rCommand );
+
+ if( AllSettings::GetLayoutRTL() )
+ {
+ lcl_RTLizeCommandURL( aCommand );
+ }
+
+ ToolBox::InsertItem(aCommand, rFrame, nBits, rRequestedSize, nPos);
- CreateController(GetItemId(rCommand), rFrame, std::max(rRequestedSize.Width(), 0L));
+ CreateController(GetItemId(aCommand), rFrame, std::max(rRequestedSize.Width(), 0L));
RegisterHandlers();
}
commit 009ff1e9089d69f0936421ae51f45e585ab6208d
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Fri Oct 23 17:12:43 2015 +0200
tdf#90987: SlideSorterBarOptions was missing Commit() too
Commit() of related _Impl class actually wasn't called anywhere
after 465359c35fcd8c30a2bedd3d0beb07c0c1c36cba removed it from
destructor.
The config was also never tagged as modified, so fix that too.
Change-Id: I8293fee20ec154d5d70a7cda8b015bf723b50c87
Reviewed-on: https://gerrit.libreoffice.org/19558
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
(cherry picked from commit 2e528df76b168a221c6d251d9b076bce5ba051a3)
Reviewed-on: https://gerrit.libreoffice.org/19688
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
(cherry picked from commit 7f5062f7a39f56e66992de9adaf9b8af25adab06)
diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx
index 9c729c0..4f3231e 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -94,7 +94,27 @@ class SvtSlideSorterBarOptions_Impl : public ConfigItem
*/
static Sequence< OUString > GetPropertyNames();
- protected:
+ void SetVisibleViewImpl( bool& bVisibleView, bool bVisible );
+
+ public:
+ void SetVisibleImpressView( bool bVisible)
+ { SetVisibleViewImpl( m_bVisibleImpressView, bVisible ); }
+
+ void SetVisibleOutlineView( bool bVisible)
+ { SetVisibleViewImpl( m_bVisibleOutlineView, bVisible ); }
+
+ void SetVisibleNotesView( bool bVisible)
+ { SetVisibleViewImpl( m_bVisibleNotesView, bVisible ); }
+
+ void SetVisibleHandoutView( bool bVisible)
+ { SetVisibleViewImpl( m_bVisibleHandoutView, bVisible ); }
+
+ void SetVisibleSlideSorterView( bool bVisible)
+ { SetVisibleViewImpl( m_bVisibleSlideSorterView, bVisible ); }
+
+ void SetVisibleDrawView( bool bVisible)
+ { SetVisibleViewImpl( m_bVisibleDrawView, bVisible ); }
+
};
SvtSlideSorterBarOptions_Impl::SvtSlideSorterBarOptions_Impl()
@@ -314,6 +334,15 @@ Sequence< OUString > SvtSlideSorterBarOptions_Impl::GetPropertyNames()
return Sequence< OUString >( pProperties, SAL_N_ELEMENTS( pProperties ) );
}
+void SvtSlideSorterBarOptions_Impl::SetVisibleViewImpl( bool& bVisibleView, bool bVisible )
+{
+ if( bVisibleView != bVisible )
+ {
+ bVisibleView = bVisible;
+ SetModified();
+ }
+}
+
// initialize static member, see definition for further information
// DON'T DO IT IN YOUR HEADER!
SvtSlideSorterBarOptions_Impl* SvtSlideSorterBarOptions::m_pDataContainer = NULL ;
@@ -339,6 +368,8 @@ SvtSlideSorterBarOptions::~SvtSlideSorterBarOptions()
// If last instance was deleted we must destroy our static data container!
if( m_nRefCount <= 0 )
{
+ if (m_pDataContainer->IsModified())
+ m_pDataContainer->Commit();
delete m_pDataContainer;
m_pDataContainer = NULL;
}
@@ -351,7 +382,7 @@ bool SvtSlideSorterBarOptions::GetVisibleImpressView() const
void SvtSlideSorterBarOptions::SetVisibleImpressView(bool bVisible)
{
- m_pDataContainer->m_bVisibleImpressView = bVisible;
+ m_pDataContainer->SetVisibleImpressView( bVisible );
}
bool SvtSlideSorterBarOptions::GetVisibleOutlineView() const
@@ -361,7 +392,7 @@ bool SvtSlideSorterBarOptions::GetVisibleOutlineView() const
void SvtSlideSorterBarOptions::SetVisibleOutlineView(bool bVisible)
{
- m_pDataContainer->m_bVisibleOutlineView = bVisible;
+ m_pDataContainer->SetVisibleOutlineView( bVisible );
}
bool SvtSlideSorterBarOptions::GetVisibleNotesView() const
@@ -371,7 +402,7 @@ bool SvtSlideSorterBarOptions::GetVisibleNotesView() const
void SvtSlideSorterBarOptions::SetVisibleNotesView(bool bVisible)
{
- m_pDataContainer->m_bVisibleNotesView = bVisible;
+ m_pDataContainer->SetVisibleNotesView( bVisible );
}
bool SvtSlideSorterBarOptions::GetVisibleHandoutView() const
@@ -381,7 +412,7 @@ bool SvtSlideSorterBarOptions::GetVisibleHandoutView() const
void SvtSlideSorterBarOptions::SetVisibleHandoutView(bool bVisible)
{
- m_pDataContainer->m_bVisibleHandoutView = bVisible;
+ m_pDataContainer->SetVisibleHandoutView( bVisible );
}
bool SvtSlideSorterBarOptions::GetVisibleSlideSorterView() const
@@ -391,7 +422,7 @@ bool SvtSlideSorterBarOptions::GetVisibleSlideSorterView() const
void SvtSlideSorterBarOptions::SetVisibleSlideSorterView(bool bVisible)
{
- m_pDataContainer->m_bVisibleSlideSorterView = bVisible;
+ m_pDataContainer->SetVisibleSlideSorterView( bVisible );
}
bool SvtSlideSorterBarOptions::GetVisibleDrawView() const
@@ -401,7 +432,7 @@ bool SvtSlideSorterBarOptions::GetVisibleDrawView() const
void SvtSlideSorterBarOptions::SetVisibleDrawView(bool bVisible)
{
- m_pDataContainer->m_bVisibleDrawView = bVisible;
+ m_pDataContainer->SetVisibleDrawView( bVisible );
}
namespace
commit e13e1ae22e8570334f550c7f17b8e8f98f83d010
Author: Eike Rathke <erack at redhat.com>
Date: Wed Oct 28 22:30:24 2015 +0100
Resolves: tdf#95395 force range reference to array only in array formula, also tdf#95419
... and not already if the function has a (ReferenceOr)ForceArray type
parameter somewhere else in the parameter list.
Regression triggered by commit 01eea7fe40c939311bf1920b6e8b4391a93c2e82
for MATCH, HLOOKUP and VLOOKUP first parameter, but behavior already
present since OOo for LOOKUP; FORECAST in its first parameter, PROB,
LINEST, LOGEST and TTEST in the last two parameters.
Change-Id: I4a30ea3362f86274a048b0e3f47fa12da3001a3a
(cherry picked from commit b5cd11b4b02a85a83db77ba9d8d1763f0cd88cb1)
Reviewed-on: https://gerrit.libreoffice.org/19659
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
(cherry picked from commit 956782b87d1c4a59159f9ec485f80909c19b397e)
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 43a22c9..4327d61 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1399,7 +1399,13 @@ bool ScInterpreter::ConvertMatrixParameters()
ScParameterClassification::Type eType =
ScParameterClassification::GetParameterType( pCur, nParams - i);
if ( eType != ScParameterClassification::Reference &&
- eType != ScParameterClassification::ReferenceOrForceArray)
+ eType != ScParameterClassification::ReferenceOrForceArray &&
+ // For scalar Value: convert to Array/JumpMatrix
+ // only if in array formula context, else (function
+ // has ForceArray or ReferenceOrForceArray
+ // parameter *somewhere else*) pick a normal
+ // position dependent implicit intersection later.
+ (eType != ScParameterClassification::Value || bMatrixFormula))
{
SCCOL nCol1, nCol2;
SCROW nRow1, nRow2;
commit e3dc11d4fdcb08649f2dfb0e9e60fbe1e2525d55
Author: Mark Hung <marklh9 at gmail.com>
Date: Sun Aug 30 16:08:20 2015 +0800
Fix tdf#93438 Impress generate abnormal style when copy-pasting
from Writer with Chinese UI. When user configure UI language as
Chinese, style names are also translated. However when Copy-pasting
from Writer to Impress ( select RTF fromat with paste-special),
Chinese (unicode) style names are borken into multiparts, where
some of them are empty string. Neither deleting the abnormal
style nor saving the file can be achieved. The only remedy is to
remove style with emtpy name with macro. With this patch:
1) Catch NoSuchElementException and ignores it, so
user still has chance saving file.
2) Make sure style has valid number before inserting it.
3) Prevent text breaking into multiple tokens by handling ucN in
ScanText().
Change-Id: I417f70b81c23ac63c175cc13c548068873d13a38
Reviewed-on: https://gerrit.libreoffice.org/18148
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/19685
(cherry picked from commit 52f3eb47aa42bd1a2a61088706cd3c729e274fc0)
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 56ef736..ec633c8 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -300,6 +300,7 @@ void SvxRTFParser::ReadStyleTable()
{
int nToken, bSaveChkStyleAttr = bChkStyleAttr ? 1 : 0;
sal_uInt16 nStyleNo = 0;
+ bool bHasStyleNo = false;
int _nOpenBrakets = 1; // the first was already detected earlier!!
SvxRTFStyleType* pStyle = new SvxRTFStyleType( *pAttrPool, &aWhichMap[0] );
pStyle->aAttrSet.Put( GetRTFDefaults() );
@@ -340,12 +341,16 @@ void SvxRTFParser::ReadStyleTable()
case RTF_SNEXT: pStyle->nNext = sal_uInt16(nTokenValue); break;
case RTF_OUTLINELEVEL:
case RTF_SOUTLVL: pStyle->nOutlineNo = sal_uInt8(nTokenValue); break;
- case RTF_S: nStyleNo = (short)nTokenValue; break;
+ case RTF_S: nStyleNo = (short)nTokenValue;
+ bHasStyleNo = true;
+ break;
case RTF_CS: nStyleNo = (short)nTokenValue;
+ bHasStyleNo = true;
pStyle->bIsCharFmt = true;
break;
case RTF_TEXTTOKEN:
+ if (bHasStyleNo)
{
pStyle->sName = DelCharAtEnd( aToken, ';' );
@@ -358,6 +363,7 @@ void SvxRTFParser::ReadStyleTable()
pStyle = new SvxRTFStyleType( *pAttrPool, &aWhichMap[0] );
pStyle->aAttrSet.Put( GetRTFDefaults() );
nStyleNo = 0;
+ bHasStyleNo = false;
}
break;
default:
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index fc98b87..e7be520 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -431,6 +431,24 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
aToken = sSave;
bRTF_InTextRead = false;
}
+ else if ( 'c' == nNextCh )
+ {
+ // Prevent text breaking into multiple tokens.
+ rInput.SeekRel( 2 );
+ nNextCh = GetNextChar();
+ if (RTF_ISDIGIT( nNextCh ))
+ {
+ sal_uInt8 nNewOverread = 0 ;
+ do {
+ nNewOverread *= 10;
+ nNewOverread += nNextCh - '0';
+ nNextCh = GetNextChar();
+ } while ( RTF_ISDIGIT( nNextCh ) );
+ nUCharOverread = nNewOverread;
+ aParserStates.top().nUCharOverread = nNewOverread;
+ }
+ bNextCh = 0x20 == nNextCh;
+ }
else
{
nNextCh = '\\';
@@ -448,8 +466,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
}
break;
- case sal_Unicode(EOF):
- eState = SVPAR_ERROR;
+ case sal_Unicode(EOF): eState = SVPAR_ERROR;
// continue
case '{':
case '}':
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 0ab12cc..8ca89b6 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -419,6 +419,10 @@ void XMLStyleExport::exportStyleFamily(
// not export them here and remain silent.
continue;
}
+ catch(css::container::NoSuchElementException&)
+ {
+ continue;
+ }
assert(xStyle.is());
if (!bUsed || xStyle->isInUse())
commit f81ea780e6592299df0f42defd78f872d5786ed4
Author: Matthias Freund <matti_lx at secure.mailbox.org>
Date: Fri Oct 30 16:45:06 2015 +0100
tdf#75256 sifr updates - correction and shapes
Correct selectall/selectobject, initial work for 32px
nicer lc shapes
Change-Id: I49dba5d3048e320a806023ac3693cbfe2f128257
Reviewed-on: https://gerrit.libreoffice.org/19695
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
(cherry picked from commit 12f129c0159af6d1e56dfed366def8a91570cff4)
Reviewed-on: https://gerrit.libreoffice.org/19705
(cherry picked from commit 6cdf7e00da6c3fb7698afcc41c166f1d9d7b33b8)
diff --git a/icon-themes/sifr/cmd/32/selectall.png b/icon-themes/sifr/cmd/32/selectall.png
new file mode 100644
index 0000000..6a5741a
Binary files /dev/null and b/icon-themes/sifr/cmd/32/selectall.png differ
diff --git a/icon-themes/sifr/cmd/32/selectobject.png b/icon-themes/sifr/cmd/32/selectobject.png
new file mode 100644
index 0000000..de10f5c
Binary files /dev/null and b/icon-themes/sifr/cmd/32/selectobject.png differ
diff --git a/icon-themes/sifr/cmd/lc_arrowshapes.chevron.png b/icon-themes/sifr/cmd/lc_arrowshapes.chevron.png
index f8d5d81..e30d800 100644
Binary files a/icon-themes/sifr/cmd/lc_arrowshapes.chevron.png and b/icon-themes/sifr/cmd/lc_arrowshapes.chevron.png differ
diff --git a/icon-themes/sifr/cmd/lc_arrowshapes.circular-arrow.png b/icon-themes/sifr/cmd/lc_arrowshapes.circular-arrow.png
index 06ecdee..9f98656 100644
Binary files a/icon-themes/sifr/cmd/lc_arrowshapes.circular-arrow.png and b/icon-themes/sifr/cmd/lc_arrowshapes.circular-arrow.png differ
diff --git a/icon-themes/sifr/cmd/lc_arrowshapes.corner-right-arrow.png b/icon-themes/sifr/cmd/lc_arrowshapes.corner-right-arrow.png
index ab7ba17..a1f0e0d 100644
Binary files a/icon-themes/sifr/cmd/lc_arrowshapes.corner-right-arrow.png and b/icon-themes/sifr/cmd/lc_arrowshapes.corner-right-arrow.png differ
diff --git a/icon-themes/sifr/cmd/lc_arrowshapes.down-arrow-callout.png b/icon-themes/sifr/cmd/lc_arrowshapes.down-arrow-callout.png
index 789c1a6..6bacdcd 100644
Binary files a/icon-themes/sifr/cmd/lc_arrowshapes.down-arrow-callout.png and b/icon-themes/sifr/cmd/lc_arrowshapes.down-arrow-callout.png differ
diff --git a/icon-themes/sifr/cmd/lc_arrowshapes.down-arrow.png b/icon-themes/sifr/cmd/lc_arrowshapes.down-arrow.png
index fff421b..0842772 100644
Binary files a/icon-themes/sifr/cmd/lc_arrowshapes.down-arrow.png and b/icon-themes/sifr/cmd/lc_arrowshapes.down-arrow.png differ
diff --git a/icon-themes/sifr/cmd/lc_arrowshapes.left-arrow-callout.png b/icon-themes/sifr/cmd/lc_arrowshapes.left-arrow-callout.png
index 05bf6dd..79c94db 100644
Binary files a/icon-themes/sifr/cmd/lc_arrowshapes.left-arrow-callout.png and b/icon-themes/sifr/cmd/lc_arrowshapes.left-arrow-callout.png differ
diff --git a/icon-themes/sifr/cmd/lc_arrowshapes.left-arrow.png b/icon-themes/sifr/cmd/lc_arrowshapes.left-arrow.png
index a181560..3c797ae 100644
Binary files a/icon-themes/sifr/cmd/lc_arrowshapes.left-arrow.png and b/icon-themes/sifr/cmd/lc_arrowshapes.left-arrow.png differ
diff --git a/icon-themes/sifr/cmd/lc_arrowshapes.left-right-arrow.png b/icon-themes/sifr/cmd/lc_arrowshapes.left-right-arrow.png
index d707dd7..448631e 100644
Binary files a/icon-themes/sifr/cmd/lc_arrowshapes.left-right-arrow.png and b/icon-themes/sifr/cmd/lc_arrowshapes.left-right-arrow.png differ
diff --git a/icon-themes/sifr/cmd/lc_arrowshapes.quad-arrow.png b/icon-themes/sifr/cmd/lc_arrowshapes.quad-arrow.png
index c603d91..28e194e 100644
Binary files a/icon-themes/sifr/cmd/lc_arrowshapes.quad-arrow.png and b/icon-themes/sifr/cmd/lc_arrowshapes.quad-arrow.png differ
diff --git a/icon-themes/sifr/cmd/lc_arrowshapes.right-arrow-callout.png b/icon-themes/sifr/cmd/lc_arrowshapes.right-arrow-callout.png
index 8d0ee2f..bcd7cf6 100644
Binary files a/icon-themes/sifr/cmd/lc_arrowshapes.right-arrow-callout.png and b/icon-themes/sifr/cmd/lc_arrowshapes.right-arrow-callout.png differ
diff --git a/icon-themes/sifr/cmd/lc_arrowshapes.right-arrow.png b/icon-themes/sifr/cmd/lc_arrowshapes.right-arrow.png
index a49bb94..9153460 100644
Binary files a/icon-themes/sifr/cmd/lc_arrowshapes.right-arrow.png and b/icon-themes/sifr/cmd/lc_arrowshapes.right-arrow.png differ
diff --git a/icon-themes/sifr/cmd/lc_arrowshapes.up-arrow-callout.png b/icon-themes/sifr/cmd/lc_arrowshapes.up-arrow-callout.png
index 25c6124..9fd98a4 100644
Binary files a/icon-themes/sifr/cmd/lc_arrowshapes.up-arrow-callout.png and b/icon-themes/sifr/cmd/lc_arrowshapes.up-arrow-callout.png differ
diff --git a/icon-themes/sifr/cmd/lc_arrowshapes.up-down-arrow.png b/icon-themes/sifr/cmd/lc_arrowshapes.up-down-arrow.png
index 1eeac20..c6392ee 100644
Binary files a/icon-themes/sifr/cmd/lc_arrowshapes.up-down-arrow.png and b/icon-themes/sifr/cmd/lc_arrowshapes.up-down-arrow.png differ
diff --git a/icon-themes/sifr/cmd/lc_basicshapes.png b/icon-themes/sifr/cmd/lc_basicshapes.png
index c8f014d..1a382fb 100644
Binary files a/icon-themes/sifr/cmd/lc_basicshapes.png and b/icon-themes/sifr/cmd/lc_basicshapes.png differ
diff --git a/icon-themes/sifr/cmd/lc_ellipse.png b/icon-themes/sifr/cmd/lc_ellipse.png
index 39ed588..21ad6f1 100644
Binary files a/icon-themes/sifr/cmd/lc_ellipse.png and b/icon-themes/sifr/cmd/lc_ellipse.png differ
diff --git a/icon-themes/sifr/cmd/lc_selectall.png b/icon-themes/sifr/cmd/lc_selectall.png
index 1b032b8..7a56366 100644
Binary files a/icon-themes/sifr/cmd/lc_selectall.png and b/icon-themes/sifr/cmd/lc_selectall.png differ
diff --git a/icon-themes/sifr/cmd/sc_basicshapes.png b/icon-themes/sifr/cmd/sc_basicshapes.png
index 5d1a6f7..efdc0c8 100644
Binary files a/icon-themes/sifr/cmd/sc_basicshapes.png and b/icon-themes/sifr/cmd/sc_basicshapes.png differ
diff --git a/icon-themes/sifr/cmd/sc_ellipse.png b/icon-themes/sifr/cmd/sc_ellipse.png
index 716be03..075703a 100644
Binary files a/icon-themes/sifr/cmd/sc_ellipse.png and b/icon-themes/sifr/cmd/sc_ellipse.png differ
diff --git a/icon-themes/sifr/cmd/sc_selectall.png b/icon-themes/sifr/cmd/sc_selectall.png
index 5f7a12f..089d51e 100644
Binary files a/icon-themes/sifr/cmd/sc_selectall.png and b/icon-themes/sifr/cmd/sc_selectall.png differ
commit fd60ef0c02deb879ecba3ac8adeb21be51c26285
Author: Yousuf Philips <philipz85 at hotmail.com>
Date: Mon Oct 26 01:50:36 2015 +0400
TANGO: Add icons for table/sheet management
Change-Id: Ida1ce8b62d93f37c75d0fee5e7930c75f6dbdb33
Reviewed-on: https://gerrit.libreoffice.org/19617
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
(cherry picked from commit 5eb3cdc7d80ca0b71eabce83e2a7eabf35c68564)
diff --git a/icon-themes/industrial/cmd/lc_entirecell.png b/icon-themes/industrial/cmd/lc_entirecell.png
new file mode 100644
index 0000000..f689344
Binary files /dev/null and b/icon-themes/industrial/cmd/lc_entirecell.png differ
diff --git a/icon-themes/industrial/cmd/sc_entirecell.png b/icon-themes/industrial/cmd/sc_entirecell.png
new file mode 100644
index 0000000..4f83644
Binary files /dev/null and b/icon-themes/industrial/cmd/sc_entirecell.png differ
diff --git a/icon-themes/tango/cmd/lc_entirecell.png b/icon-themes/tango/cmd/lc_entirecell.png
new file mode 100644
index 0000000..4cc0914
Binary files /dev/null and b/icon-themes/tango/cmd/lc_entirecell.png differ
diff --git a/icon-themes/tango/cmd/lc_insertcolumnsafter-lc_insertcolumnsbefore.xcf.bz2 b/icon-themes/tango/cmd/lc_insertcolumnsafter-lc_insertcolumnsbefore.xcf.bz2
new file mode 100644
index 0000000..028d09f
Binary files /dev/null and b/icon-themes/tango/cmd/lc_insertcolumnsafter-lc_insertcolumnsbefore.xcf.bz2 differ
diff --git a/icon-themes/tango/cmd/lc_insertcolumnsafter.png b/icon-themes/tango/cmd/lc_insertcolumnsafter.png
new file mode 100644
index 0000000..1972119
Binary files /dev/null and b/icon-themes/tango/cmd/lc_insertcolumnsafter.png differ
diff --git a/icon-themes/tango/cmd/lc_insertcolumnsbefore.png b/icon-themes/tango/cmd/lc_insertcolumnsbefore.png
new file mode 100644
index 0000000..fdf966c
Binary files /dev/null and b/icon-themes/tango/cmd/lc_insertcolumnsbefore.png differ
diff --git a/icon-themes/tango/cmd/lc_insertrowsafter-lc_insertrowsbefore.xcf.bz2 b/icon-themes/tango/cmd/lc_insertrowsafter-lc_insertrowsbefore.xcf.bz2
new file mode 100644
index 0000000..5609ede
Binary files /dev/null and b/icon-themes/tango/cmd/lc_insertrowsafter-lc_insertrowsbefore.xcf.bz2 differ
diff --git a/icon-themes/tango/cmd/lc_insertrowsafter.png b/icon-themes/tango/cmd/lc_insertrowsafter.png
new file mode 100644
index 0000000..4c42c5d
Binary files /dev/null and b/icon-themes/tango/cmd/lc_insertrowsafter.png differ
diff --git a/icon-themes/tango/cmd/lc_insertrowsbefore.png b/icon-themes/tango/cmd/lc_insertrowsbefore.png
new file mode 100644
index 0000000..88e4e40
Binary files /dev/null and b/icon-themes/tango/cmd/lc_insertrowsbefore.png differ
diff --git a/icon-themes/tango/cmd/lc_insertrowsdown.svg b/icon-themes/tango/cmd/lc_insertrowsdown.svg
new file mode 100644
index 0000000..f13f54b
--- /dev/null
+++ b/icon-themes/tango/cmd/lc_insertrowsdown.svg
@@ -0,0 +1,3551 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+ version="1.1"
+ id="svg2"
+ height="24"
+ width="24"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="lc_insertrowsdown.svg"
+ inkscape:export-filename="/home/jay/core/icon-themes/tango/cmd/lc_insertrowsdown.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1280"
+ inkscape:window-height="709"
+ id="namedview193"
+ showgrid="false"
+ inkscape:zoom="19.666667"
+ inkscape:cx="16.830382"
+ inkscape:cy="10.465082"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="layer1" />
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient3764">
+ <stop
+ id="stop3766"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop3768"
+ offset="1"
+ style="stop-color:#ededed;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3787-2-5-7-3-9-8-4">
+ <stop
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0"
+ id="stop3789-6-2-3-3-3-4-0" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0"
+ offset="1"
+ id="stop3791-7-7-1-3-62-8-7" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3764-7">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3766-0" />
+ <stop
+ style="stop-color:#ededed;stop-opacity:1;"
+ offset="1"
+ id="stop3768-4" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient9599">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop9602" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop9604" />
+ </linearGradient>
+ <linearGradient
+ xlink:href="#linearGradient15426"
+ id="linearGradient15432"
+ x1="-5"
+ y1="25.5"
+ x2="6"
+ y2="25.5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,1.0120868,-1.0120868,0,25.27421,1037.989)" />
+ <linearGradient
+ xlink:href="#linearGradient3848-4"
+ id="linearGradient15412"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-0.9880575,0.9880575,0,-1025.5929,24.972392)"
+ x1="-7.1125679"
+ y1="1038.495"
+ x2="6.0445609"
+ y2="1038.495" />
+ <linearGradient
+ xlink:href="#linearGradient3848-4"
+ id="linearGradient15403"
+ x1="-7.1125679"
+ y1="1038.495"
+ x2="6.0445609"
+ y2="1038.495"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-1,1,0,-1039.0291,1037.961)" />
+ <linearGradient
+ xlink:href="#linearGradient6638"
+ id="linearGradient4790"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.27035376,0,0,0.27035376,18.44696,1078.6801)"
+ x1="16.767418"
+ y1="-26.082771"
+ x2="3.4383593"
+ y2="1.7565804" />
+ <linearGradient
+ xlink:href="#linearGradient4731"
+ id="linearGradient4788"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.27035376,0,0,0.27035376,11.714144,1078.6801)"
+ x1="16.767418"
+ y1="-26.082771"
+ x2="3.4383593"
+ y2="1.7565804" />
+ <linearGradient
+ xlink:href="#linearGradient4731"
+ id="linearGradient4786"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.27035376,0,0,0.27035376,4.9813276,1078.6801)"
+ x1="16.767418"
+ y1="-26.082771"
+ x2="3.4383593"
+ y2="1.7565804" />
+ <linearGradient
+ xlink:href="#linearGradient6881"
+ id="linearGradient4782"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0807243,0,0,0.95038373,2.4016561,-1021.2751)"
+ x1="7.3413663"
+ y1="1090.5339"
+ x2="15.792633"
+ y2="1082.1084" />
+ <linearGradient
+ xlink:href="#linearGradient3848-4"
+ id="linearGradient4770"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-1,1,0,8.7236111,1069.7409)"
+ x1="15"
+ y1="18.5"
+ x2="24"
+ y2="18.5" />
+ <linearGradient
+ id="linearGradient3848-4">
+ <stop
+ style="stop-color:#51b700;stop-opacity:1;"
+ offset="0"
+ id="stop3850" />
+ <stop
+ style="stop-color:#a1f800;stop-opacity:1;"
+ offset="1"
+ id="stop3852" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6638">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop6640" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop6642" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6881">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop6883" />
+ <stop
+ style="stop-color:#303030;stop-opacity:1;"
+ offset="1"
+ id="stop6885" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4731">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4733" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4735" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient15426">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop15428" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop15430" />
+ </linearGradient>
+ <radialGradient
+ r="8.5"
+ fy="21.026667"
+ fx="11.004584"
+ cy="21.026667"
+ cx="11.004584"
+ gradientTransform="matrix(1.500003,0,0,0.1176471,-44.511565,-1035.7959)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient6898"
+ xlink:href="#linearGradient3787-2-5-7-3-9-8-4" />
+ <linearGradient
+ y2="1033.2954"
+ x2="13"
+ y1="1028.2954"
+ x1="13"
+ gradientTransform="translate(16.0046,-12.040127)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6911"
+ xlink:href="#linearGradient9599" />
+ <linearGradient
+ y2="1033.2954"
+ x2="13"
+ y1="1028.2954"
+ x1="13"
+ gradientTransform="translate(16.0046,-12.040127)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6914"
+ xlink:href="#linearGradient9599" />
+ <linearGradient
+ y2="1033.2954"
+ x2="13"
+ y1="1028.2954"
+ x1="13"
+ gradientTransform="translate(16.0046,-12.040127)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6919"
+ xlink:href="#linearGradient9599" />
+ <linearGradient
+ y2="12"
+ x2="24"
+ y1="12"
+ x1="0"
+ gradientTransform="translate(1016.3221,-40.0046)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient6939"
+ xlink:href="#linearGradient3764-7" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="65.026665"
+ x2="109.0046"
+ y1="70.026665"
+ x1="109.0046"
+ id="linearGradient6856-2"
+ xlink:href="#linearGradient3848-4-9" />
+ <linearGradient
+ id="linearGradient3848-4-9">
+ <stop
+ style="stop-color:#51b700;stop-opacity:1;"
+ offset="0"
+ id="stop3850-5" />
+ <stop
+ style="stop-color:#a1f800;stop-opacity:1;"
+ offset="1"
+ id="stop3852-0" />
+ </linearGradient>
+ <linearGradient
+ xlink:href="#linearGradient3835"
+ id="linearGradient3841"
+ x1="7.0000005"
+ y1="16.999971"
+ x2="7.0000005"
+ y2="19.999971"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0120868,0,0,1.0120868,-1.0400462,1012.6868)" />
+ <linearGradient
+ xlink:href="#linearGradient3827"
+ id="linearGradient3833"
+ x1="5.0000005"
+ y1="20.999971"
+ x2="5.0000005"
+ y2="15.999972"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ xlink:href="#linearGradient15426-1"
+ id="linearGradient15458-6"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,1.0120868,-1.0120868,0,25.27421,1037.989)"
+ x1="-5"
+ y1="25.5"
+ x2="6"
+ y2="25.5" />
+ <linearGradient
+ xlink:href="#linearGradient3848-4-4"
+ id="linearGradient15456-4"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-1,1,0,-1039.0291,1037.961)"
+ x1="-7.1125679"
+ y1="1038.495"
+ x2="6.0445609"
+ y2="1038.495" />
+ <linearGradient
+ xlink:href="#linearGradient15426-1"
+ id="linearGradient15432-7"
+ x1="-5"
+ y1="25.5"
+ x2="6"
+ y2="25.5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,1.0120868,-1.0120868,0,25.27421,1037.989)" />
+ <linearGradient
+ xlink:href="#linearGradient3848-4-4"
+ id="linearGradient15412-6"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-0.9880575,0.9880575,0,-1025.5929,24.972392)"
+ x1="-7.1125679"
+ y1="1038.495"
+ x2="6.0445609"
+ y2="1038.495" />
+ <linearGradient
+ xlink:href="#linearGradient3848-4-4"
+ id="linearGradient15403-4"
+ x1="-7.1125679"
+ y1="1038.495"
+ x2="6.0445609"
+ y2="1038.495"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-1,1,0,-1039.0291,1037.961)" />
+ <linearGradient
+ xlink:href="#linearGradient6638-0"
+ id="linearGradient4790-5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.27035376,0,0,0.27035376,18.44696,1078.6801)"
+ x1="16.767418"
+ y1="-26.082771"
+ x2="3.4383593"
+ y2="1.7565804" />
+ <linearGradient
+ xlink:href="#linearGradient4731-1"
+ id="linearGradient4788-1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.27035376,0,0,0.27035376,11.714144,1078.6801)"
+ x1="16.767418"
+ y1="-26.082771"
+ x2="3.4383593"
+ y2="1.7565804" />
+ <linearGradient
+ xlink:href="#linearGradient4731-1"
+ id="linearGradient4786-6"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.27035376,0,0,0.27035376,4.9813276,1078.6801)"
+ x1="16.767418"
+ y1="-26.082771"
+ x2="3.4383593"
+ y2="1.7565804" />
+ <linearGradient
+ xlink:href="#linearGradient6881-1"
+ id="linearGradient4782-8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0807243,0,0,0.95038373,2.4016561,-1021.2751)"
+ x1="7.3413663"
+ y1="1090.5339"
+ x2="15.792633"
+ y2="1082.1084" />
+ <linearGradient
+ xlink:href="#linearGradient3848-4-4"
+ id="linearGradient4770-7"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-1,1,0,8.7236111,1069.7409)"
+ x1="15"
+ y1="18.5"
+ x2="24"
+ y2="18.5" />
+ <linearGradient
+ id="linearGradient3848-4-4">
+ <stop
+ style="stop-color:#51b700;stop-opacity:1;"
+ offset="0"
+ id="stop3850-3" />
+ <stop
+ style="stop-color:#a1f800;stop-opacity:1;"
+ offset="1"
+ id="stop3852-05" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6638-0">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop6640-7" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop6642-2" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6881-1">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop6883-6" />
+ <stop
+ style="stop-color:#303030;stop-opacity:1;"
+ offset="1"
+ id="stop6885-5" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4731-1">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4733-7" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4735-5" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient15426-1">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop15428-0" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop15430-2" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3827">
+ <stop
+ style="stop-color:#cc0001;stop-opacity:1"
+ offset="0"
+ id="stop3829" />
+ <stop
+ style="stop-color:#ef292a;stop-opacity:1"
+ offset="1"
+ id="stop3831" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3835">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3837" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3839" />
+ </linearGradient>
+ <linearGradient
+ xlink:href="#linearGradient15426-7"
+ id="linearGradient15458"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,1.0120868,-1.0120868,0,25.27421,1037.989)"
+ x1="-5"
+ y1="25.5"
+ x2="6"
+ y2="25.5" />
+ <linearGradient
+ xlink:href="#linearGradient3848-4-3"
+ id="linearGradient15456"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-1,1,0,-1039.0291,1037.961)"
+ x1="-7.1125679"
+ y1="1038.495"
+ x2="6.0445609"
+ y2="1038.495" />
+ <linearGradient
+ xlink:href="#linearGradient15426-7"
+ id="linearGradient15432-4"
+ x1="-5"
+ y1="25.5"
+ x2="6"
+ y2="25.5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,1.0120868,-1.0120868,0,25.27421,1037.989)" />
+ <linearGradient
+ xlink:href="#linearGradient3848-4-3"
+ id="linearGradient15412-9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-0.9880575,0.9880575,0,-1025.5929,24.972392)"
+ x1="-7.1125679"
+ y1="1038.495"
+ x2="6.0445609"
+ y2="1038.495" />
+ <linearGradient
+ xlink:href="#linearGradient3848-4-3"
+ id="linearGradient15403-1"
+ x1="-7.1125679"
+ y1="1038.495"
+ x2="6.0445609"
+ y2="1038.495"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-1,1,0,-1039.0291,1037.961)" />
+ <linearGradient
+ xlink:href="#linearGradient6638-1"
+ id="linearGradient4790-3"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.27035376,0,0,0.27035376,18.44696,1078.6801)"
+ x1="16.767418"
+ y1="-26.082771"
+ x2="3.4383593"
+ y2="1.7565804" />
+ <linearGradient
+ xlink:href="#linearGradient4731-2"
+ id="linearGradient4788-2"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.27035376,0,0,0.27035376,11.714144,1078.6801)"
+ x1="16.767418"
+ y1="-26.082771"
+ x2="3.4383593"
+ y2="1.7565804" />
+ <linearGradient
+ xlink:href="#linearGradient4731-2"
+ id="linearGradient4786-0"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.27035376,0,0,0.27035376,4.9813276,1078.6801)"
+ x1="16.767418"
+ y1="-26.082771"
+ x2="3.4383593"
+ y2="1.7565804" />
+ <linearGradient
+ xlink:href="#linearGradient6881-2"
+ id="linearGradient4782-9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0807243,0,0,0.95038373,2.4016561,-1021.2751)"
+ x1="7.3413663"
+ y1="1090.5339"
+ x2="15.792633"
+ y2="1082.1084" />
+ <linearGradient
+ xlink:href="#linearGradient3848-4-3"
+ id="linearGradient4770-9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-1,1,0,8.7236111,1069.7409)"
+ x1="15"
+ y1="18.5"
+ x2="24"
+ y2="18.5" />
+ <linearGradient
+ id="linearGradient3848-4-3">
+ <stop
+ style="stop-color:#51b700;stop-opacity:1;"
+ offset="0"
+ id="stop3850-6" />
+ <stop
+ style="stop-color:#a1f800;stop-opacity:1;"
+ offset="1"
+ id="stop3852-8" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6638-1">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop6640-75" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop6642-5" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6881-2">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop6883-3" />
+ <stop
+ style="stop-color:#303030;stop-opacity:1;"
+ offset="1"
+ id="stop6885-9" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4731-2">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4733-1" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4735-2" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient15426-7">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop15428-2" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop15430-3" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3764-7-5">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3766-0-5" />
+ <stop
+ style="stop-color:#ededed;stop-opacity:1;"
+ offset="1"
+ id="stop3768-4-7" />
+ </linearGradient>
+ <linearGradient
+ xlink:href="#linearGradient15426-6"
+ id="linearGradient15458-5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,1.0120868,-1.0120868,0,25.27421,1037.989)"
+ x1="-5"
+ y1="25.5"
+ x2="6"
+ y2="25.5" />
+ <linearGradient
+ xlink:href="#linearGradient3848-4-42"
+ id="linearGradient15456-8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-1,1,0,-1039.0291,1037.961)"
+ x1="-7.1125679"
+ y1="1038.495"
+ x2="6.0445609"
+ y2="1038.495" />
+ <linearGradient
+ xlink:href="#linearGradient15426-6"
+ id="linearGradient15432-49"
+ x1="-5"
+ y1="25.5"
+ x2="6"
+ y2="25.5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,1.0120868,-1.0120868,0,25.27421,1037.989)" />
+ <linearGradient
+ xlink:href="#linearGradient3848-4-42"
+ id="linearGradient15412-60"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-0.9880575,0.9880575,0,-1025.5929,24.972392)"
+ x1="-7.1125679"
+ y1="1038.495"
+ x2="6.0445609"
+ y2="1038.495" />
+ <linearGradient
+ xlink:href="#linearGradient3848-4-42"
+ id="linearGradient15403-9"
+ x1="-7.1125679"
+ y1="1038.495"
+ x2="6.0445609"
+ y2="1038.495"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-1,1,0,-1039.0291,1037.961)" />
+ <linearGradient
+ xlink:href="#linearGradient6638-08"
+ id="linearGradient4790-9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.27035376,0,0,0.27035376,18.44696,1078.6801)"
+ x1="16.767418"
+ y1="-26.082771"
+ x2="3.4383593"
+ y2="1.7565804" />
+ <linearGradient
+ xlink:href="#linearGradient4731-0"
+ id="linearGradient4788-3"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.27035376,0,0,0.27035376,11.714144,1078.6801)"
+ x1="16.767418"
+ y1="-26.082771"
+ x2="3.4383593"
+ y2="1.7565804" />
+ <linearGradient
+ xlink:href="#linearGradient4731-0"
+ id="linearGradient4786-2"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.27035376,0,0,0.27035376,4.9813276,1078.6801)"
+ x1="16.767418"
+ y1="-26.082771"
+ x2="3.4383593"
+ y2="1.7565804" />
+ <linearGradient
+ xlink:href="#linearGradient6881-4"
+ id="linearGradient4782-95"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0807243,0,0,0.95038373,2.4016561,-1021.2751)"
+ x1="7.3413663"
+ y1="1090.5339"
+ x2="15.792633"
+ y2="1082.1084" />
+ <linearGradient
+ xlink:href="#linearGradient3848-4-42"
+ id="linearGradient4770-5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-1,1,0,8.7236111,1069.7409)"
+ x1="15"
+ y1="18.5"
+ x2="24"
+ y2="18.5" />
+ <linearGradient
+ id="linearGradient3848-4-42">
+ <stop
+ style="stop-color:#51b700;stop-opacity:1;"
+ offset="0"
+ id="stop3850-7" />
+ <stop
+ style="stop-color:#a1f800;stop-opacity:1;"
+ offset="1"
+ id="stop3852-2" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6638-08">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop6640-3" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop6642-7" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6881-4">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop6883-67" />
+ <stop
+ style="stop-color:#303030;stop-opacity:1;"
+ offset="1"
+ id="stop6885-51" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4731-0">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4733-19" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4735-6" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient15426-6">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop15428-9" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop15430-9" />
+ </linearGradient>
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="1020.4467"
+ x2="27.958569"
+ y1="1026.0494"
+ x1="27.958569"
+ id="linearGradient4392"
+ xlink:href="#linearGradient3848-4-42" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9599"
+ id="linearGradient3975"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.99541587,2.973283)"
+ x1="13"
+ y1="1028.2954"
+ x2="13"
+ y2="1033.2954" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9599"
+ id="linearGradient3978"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.99541587,2.973283)"
+ x1="13"
+ y1="1028.2954"
+ x2="13"
+ y2="1033.2954" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9599"
+ id="linearGradient3982"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.99541587,2.973283)"
+ x1="13"
+ y1="1028.2954"
+ x2="13"
+ y2="1033.2954" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3848-4-42"
+ id="linearGradient3998"
+ gradientUnits="userSpaceOnUse"
+ x1="27.958569"
+ y1="1026.0494"
+ x2="27.958569"
+ y2="1020.4467"
+ gradientTransform="translate(-15.0046,19.014041)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3764-7"
+ id="linearGradient4001"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1031.3626,-25)"
+ x1="0"
+ y1="12"
+ x2="24"
+ y2="12" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3787-2-5-7-3-9-8-4"
+ id="radialGradient4004"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.500003,0,0,0.1176471,-29.502432,-1050.8092)"
+ cx="11.004584"
+ cy="21.026667"
+ fx="11.004584"
+ fy="21.026667"
+ r="8.5" />
+ </defs>
+ <metadata
+ id="metadata7">
+ <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>
+ <g
+ transform="translate(-0.99541587,-1027.3355)"
+ id="layer1">
+ <rect
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.5;fill:url(#radialGradient4004);fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ id="rect10775-4"
+ width="24.000051"
+ height="2"
+ x="-24.995468"
+ y="-1049.3354"
+ transform="scale(-1,-1)" />
+ <rect
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4001);fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ id="rect5231"
+ width="17"
+ height="24"
+ x="1031.3625"
+ y="-25"
+ transform="matrix(0,1,-1,0,0,0)"
+ ry="1"
+ rx="0.9999826" />
+ <rect
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient3998);fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ id="rect6340"
+ width="24"
+ height="4.9999995"
+ x="1.0000005"
+ y="1039.3354" />
+ <rect
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.4;fill:#000000;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ id="rect5235"
+ width="1"
+ height="15.000038"
+ x="7.9954157"
+ y="1032.3354" />
+ <rect
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.4;fill:#000000;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ id="rect5237"
+ width="1"
+ height="15.00016"
+ x="16.995417"
+ y="1032.3353" />
+ <path
+ inkscape:connector-curvature="0"
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.2;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ d="m 1.9954159,1036.3355 0,3 6,0 0,-3 z m 1,1 4,0 0,1 -4,0 z"
+ id="path5259-0-60" />
+ <rect
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.4;fill:#000000;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ id="rect5239"
+ width="0.99996233"
+ height="22"
+ x="1035.3356"
+ y="-23.995417"
+ transform="matrix(0,1,-1,0,0,0)" />
+ <rect
+ transform="matrix(0,1,-1,0,0,0)"
+ y="-24"
+ x="1039.3627"
+ height="22"
+ width="1"
+ id="rect5241"
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.4;fill:#000000;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans" />
+ <rect
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.4;fill:#000000;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ id="rect5243"
+ width="1"
+ height="22"
+ x="1043.3354"
+ y="-24.000515"
+ transform="matrix(0,1,-1,0,0,0)" />
+ <path
+ inkscape:connector-curvature="0"
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.4;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ d="m 8.9954159,1036.3353 0,3 8.0000001,2e-4 0,-3.0002 z m 1,1 6.0000001,0 0,0.9998 -6.0000001,-2e-4 z"
+ id="path5259" />
+ <path
+ inkscape:connector-curvature="0"
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ d="m 1.9954159,1044.3355 0,3 6,0 0,-3 z m 1,0.9332 4,0 0,1.0668 -4,0 z"
+ id="path5259-0" />
+ <path
+ inkscape:connector-curvature="0"
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.4;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ d="m 9,1044.3626 0,3 8,0 0,-3 z m 1,1 6,0 0,1 -6,0 z"
+ id="path5259-0-7" />
+ <path
+ inkscape:connector-curvature="0"
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ d="m 18,1044.3626 0,3 6,0 0,-3 z m 1,1 4,0 0,1 -4,0 z"
+ id="path5259-0-3" />
+ <path
+ inkscape:connector-curvature="0"
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.2;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ d="m 1.9954159,1040.3355 0,3 6,0 0,-3 z m 1,1 4,0 0,1 -4,0 z"
+ id="path5259-0-6" />
+ <path
+ inkscape:connector-curvature="0"
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.2;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ d="m 8.9954159,1040.3355 0,3 8.0000001,0 0,-3 z m 1,1 6.0000001,0 0,1 -6.0000001,0 z"
+ id="path5259-0-7-2" />
+ <path
+ inkscape:connector-curvature="0"
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.2;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ d="m 17.995416,1040.3355 0,3 6,0 0,-3 z m 1,1 4,0 0,1 -4,0 z"
+ id="path5259-0-3-4" />
+ <path
+ inkscape:connector-curvature="0"
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.4;fill:url(#linearGradient3982);fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ d="m 1.9954159,1032.3355 0,3 6,0 0,-3 z m 1,1 4,0 0,1 -4,0 z"
+ id="path5259-0-7-8-3" />
+ <path
+ inkscape:connector-curvature="0"
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.4;fill:#000000;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ d="m 1.9954159,1031.2687 c -0.554,0 -1.00000003,0.446 -1.00000003,1 l 0,15.0668 c 0,0.554 0.44600003,1 1.00000003,1 l 22.0000001,0 c 0.554,0 1,-0.446 1,-1 l 0,-15 c 0,-0.554 -0.446,-1.0668 -1,-1.0668 z m 0,1.0668 22.0000001,0 0,15 -22.0000001,0 z"
+ id="path5233" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3039"
+ d="m 8.9954159,1032.3355 0,3 8.0000001,0 0,-3 z m 1,1 6.0000001,0 0,1 -6.0000001,0 z"
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.4;fill:url(#linearGradient3978);fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path3043"
+ d="m 17.995416,1032.3355 0,3 6,0 0,-3 z m 1,1 4,0 0,1 -4,0 z"
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.4;fill:url(#linearGradient3975);fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans" />
+ <path
+ inkscape:connector-curvature="0"
+ style="font-size:13.20734406px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.2;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+ d="m 17.995416,1036.3355 0,3 6,0 0,-3 z m 1,1 4,0 0,1 -4,0 z"
+ id="path5259-0-3-7" />
+ </g>
+ <style
+ type="text/css"
+ id="style1470">
+
+ at font-face{font-family:'TrebuchetMS-Bold';src:url("data:;base64,\
+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\
+Bv+gAAv/oAABAAX/wAABAAIAAwAMAAA=")}
+ at font-face{font-family:'Arial-BoldMT';src:url("data:;base64,\
+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\
+aHRzaXxfCHxfg0IlGvyY+60HDvrtFvut+LIG9weF1X+tHn+seKVwngiecGqUZRtaYH5wZB9kcHFo\
+fV8IfF+EOvsLGvx1+636uveZ+zAH9wzo9wjH9yEbycSAdb4fvnSyb6ZopWidZJZfCJVfkEw5Gg7d\
++LYV6KLmueIeueLMzuC5CLnf6aLzG/c19xdXI/If8iK++xj7Mxr7NVf7GSQiHiEj+xdW+zEbKi6h\
+tzMfMrdIzF3gCF3gdPL3Dhr3tHwVIqQ6vVMeU73Jb9Qb1Mmnw70fvMOk3PYa83LbWsMew1lNp0Ib\
+Qk1vU1kfWVNyOiIaDv04+DQW+636uveZ+ysGuNKzuq+iCKKutJa4G8vJeWjGHzT7iQWqXF+aYhtk\
+aYB2cB9wdXVkfFIIe1KD+wr7SRoO/av5Dvq6Fft0+1T8QAc0jVmPfR6OfJR/mIIIgpiahp4bpbGU\
+nbwfo/tuBW9KQX04G1helJxiH2KcbqF4pnimfa+EuQiFrIjN7hr4Y/sV93T3FfdnB/eu9zgF/AsH\
+DvniFvczB2RSWV9MaghqTEh7RRtES5uqUh9SqmK3csQIcsR+2e8a+TT3rfx8B/spkC+Wah6VaZ5w\
+pngId6augbUbu7aYprEfsaWlrJmyCJmykur3LBr4VPet/roHDvvimfq6Ffe/BveS/Yb3jPmGBfe3\
+BvwL/pJI+01yTXRcdWoZdGpycW53bnZne2GACIBgW4VWG1VWkZZXH3L3cAWCt7OHrhvMvJ6yqh+q\
+saO8nMYIDhwE4xQcBcEVAAAAAAEAAAAKAB4ALAABREZMVAAIAAQAAAAA//8AAQAAAAFrZXJuAAgA\
+AAABAAAAAQAEAAIAAAABAAgAAQAqAAQAAAADABAAFgAgAAEAAv+0AAIAAf+0ABn/tAACAAH/2wAC\
+/2gAAQADAAEAAgAG")}
+
+ </style>
+ <style
+ type="text/css"
+ id="style1470-6">
+
+ at font-face{font-family:'TrebuchetMS-Bold';src:url("data:;base64,\
+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\
+Bv+gAAv/oAABAAX/wAABAAIAAwAMAAA=")}
+ at font-face{font-family:'Arial-BoldMT';src:url("data:;base64,\
+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\
+aHRzaXxfCHxfg0IlGvyY+60HDvrtFvut+LIG9weF1X+tHn+seKVwngiecGqUZRtaYH5wZB9kcHFo\
+fV8IfF+EOvsLGvx1+636uveZ+zAH9wzo9wjH9yEbycSAdb4fvnSyb6ZopWidZJZfCJVfkEw5Gg7d\
++LYV6KLmueIeueLMzuC5CLnf6aLzG/c19xdXI/If8iK++xj7Mxr7NVf7GSQiHiEj+xdW+zEbKi6h\
+tzMfMrdIzF3gCF3gdPL3Dhr3tHwVIqQ6vVMeU73Jb9Qb1Mmnw70fvMOk3PYa83LbWsMew1lNp0Ib\
+Qk1vU1kfWVNyOiIaDv04+DQW+636uveZ+ysGuNKzuq+iCKKutJa4G8vJeWjGHzT7iQWqXF+aYhtk\
+aYB2cB9wdXVkfFIIe1KD+wr7SRoO/av5Dvq6Fft0+1T8QAc0jVmPfR6OfJR/mIIIgpiahp4bpbGU\
+nbwfo/tuBW9KQX04G1helJxiH2KcbqF4pnimfa+EuQiFrIjN7hr4Y/sV93T3FfdnB/eu9zgF/AsH\
+DvniFvczB2RSWV9MaghqTEh7RRtES5uqUh9SqmK3csQIcsR+2e8a+TT3rfx8B/spkC+Wah6VaZ5w\
+pngId6augbUbu7aYprEfsaWlrJmyCJmykur3LBr4VPet/roHDvvimfq6Ffe/BveS/Yb3jPmGBfe3\
+BvwL/pJI+01yTXRcdWoZdGpycW53bnZne2GACIBgW4VWG1VWkZZXH3L3cAWCt7OHrhvMvJ6yqh+q\
+saO8nMYIDhwE4xQcBcEVAAAAAAEAAAAKAB4ALAABREZMVAAIAAQAAAAA//8AAQAAAAFrZXJuAAgA\
+AAABAAAAAQAEAAIAAAABAAgAAQAqAAQAAAADABAAFgAgAAEAAv+0AAIAAf+0ABn/tAACAAH/2wAC\
+/2gAAQADAAEAAgAG")}
+
+ </style>
+ <style
+ id="style1470-0"
+ type="text/css">
+
+ at font-face{font-family:'TrebuchetMS-Bold';src:url("data:;base64,\
+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\
+Bv+gAAv/oAABAAX/wAABAAIAAwAMAAA=")}
+ at font-face{font-family:'Arial-BoldMT';src:url("data:;base64,\
+T1RUTwADACAAAQAQQ0ZGILKMO8AAAACwAAAMSUdQT1OvL77EAAAM/AAAAGxjbWFwAnkCWAAAADwA\
+AAB0AAAAAQAAAAMAAAAMAAQAaAAAABYAEAADAAYAIABDAFAAUwBlAGkAbwByAHUAef//AAAAIABB\
+AE8AUgBhAGcAawByAHQAef///+H/wf+2/7X/qP+n/6b/pP+j/6AAAQAAAAAAAAAAAAAAAAAAAAAA\
+AAAAAAABAAQCAAEBAQ1BcmlhbC1Cb2xkTVQAAQEBOvgbAfgUBPgcDBX76/xDHAgAHAdNBR6gAEiC\
+gSX/i4seoABIgoEl/4uLDAf3YA/3fxD3gRGTHAxBEgACAQFlckFyaWFsKFIpIFRyYWRlbWFyayBv\
+ZiBUaGUgTW9ub3R5cGUgQ29ycG9yYXRpb24gcGxjIHJlZ2lzdGVyZWQgaW4gdGhlIFVTIFBhdCAm\
+IFRNIE9mZi4gYW5kIGVsc2V3aGVyZS4vRlNUeXBlIDAgZGVmAAABAAEAACICADABADMBAEIEAEgC\
+AEwEAFMAAFUBAFoAAAAAGgIAAQAbAB4ATQENAZsCOgKqAzsEBgTaBVIF0wZLBtEHmQf6CBcIRQhU\
+CO4JTAnMCg0KawrICxzK95QWHAUA+pQc+wAH/nSrFfpUHATA/lQGDv4cDpEcBb8W+9YG+xT34QX8\
+3gb7DfvhBfvOBvjPHAW6BffNBrX+ChX7Xvi0+1r8tAUOkfcqHAW6FfjeBvcI4oaCxB/Egb53uGy4\
+bLBjqVgIqViaUUwaRnlMZlIeZlJYYExu5HHQX7tMCLtMo0I2Gkh8S2xMHmxMYFhWZlVlSXQ8glqG\
++wuH+1GKCPyHBve8HATGFfvn91YH9wfTjY6nH76Rs52oqAioqJmxuhq4f7ByqB5yp2WcWpEIjm42\
+jfsfG/s+/NsV/Bz3pgf2zo6RqB+3k6+fp6oIpqqZtL8at4CwdqoedqpsoWOZCJliNJL7GxsOkfrT\
++K8V97MwX/s0QvsLJT4ZPST7FmT7MRv7V/s0zvcZ+xEf+xH3GUz3Sfd7GveIyvdS9xL3Gx73G/cS\
+9zrO92Eb90f3JlYh9wQfzky9Maz7Cfu5RRh612fHVLcIt1RIoTwb+wEzZD1IH0c9afsS+0Ma+02s\
++xjOPB48zuFk9hvazqS9xB/EvbPapPYIDvcM5PloFfcpofcSuPAerNa5zsXGxMbKt9CoCLLm9Z73\
+Cxv3bPdBSPsa9xYf9xX7Gsz7TvuDGvuBS/tN+xX7GR77GvsV+0BI+2sb+277Qc73GfsVH/sV9xlL\
+90v3fRr3xZUV+zqx+xLYNh412Oxg9wob9wrstuDXH9bgsfcT9z4a9zxm9xFC3h7eQSm0+w4b+w4p\
+YThAH0A3ZvsS+z0aDiD3KRYcBbr4bwf3SPcJhHzCH9910VvEQgjEQacs+wkaMXs/ak4eak5iW1lo\
+WGhYc1eACH1EJYT7Ghv7Vfy9BhwEwgT8NPc2B/cJ2ZOash+ymqqjoqwIoayWsbYawHu3bK4ebK5j\
+oFuUCJJoRI4gGw6R9yoWHAW6+QMH9zH3Bn5x0h/ScMNctkgItkigPjQa+wJrMEpEHkpDK177FXjL\
+ZsBitV60XsM80vsG90f7shj79gb7avfTP/cGV9NvqRlvqG2gbJYIlmxZkEcbT/z4BvniBPdvBvci\
+5JGXrh+ul6egn6gIn6iVsLcavH6zcaoecKlmnluTCI5zQ437DBv7ewYOINX4cRX3tKecKq9EwF4Z\
+XsDSdOUb6tOftLwfu7OjusEaroGod6QedqNooFidaJc8oPsPqvszsvsDvEvECDHcXu33CBrWoNG2\
+zB61zMi8260IrdrrnPcFG/dM9x9jOugf6Dq7IJD7G/u8fhh+1nDCYqwIrGFMmzgbNUh5aFofbHR7\
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list