[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 6 commits - extras/source i18nlangtag/qa i18nlangtag/source include/svtools reportbuilder/java reportdesign/source sfx2/source svx/source sw/qa sw/source
Oliver Specht
oliver.specht at cib.de
Wed Feb 10 20:36:08 UTC 2016
extras/source/autocorr/lang/es/DocumentList.xml | 33 ++++++++++
i18nlangtag/qa/cppunit/test_languagetag.cxx | 1
i18nlangtag/source/isolang/isolang.cxx | 1
include/svtools/rtfkeywd.hxx | 1
reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java | 1
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java | 1
reportdesign/source/filter/xml/xmlExport.cxx | 7 ++
sfx2/source/dialog/styledlg.cxx | 2
svx/source/sidebar/area/AreaPropertyPanel.cxx | 2
sw/qa/extras/rtfexport/data/page-background.rtf | 30 +++++++++
sw/qa/extras/rtfexport/rtfexport.cxx | 7 ++
sw/qa/extras/rtfimport/data/page-background.rtf | 30 ---------
sw/qa/extras/rtfimport/rtfimport.cxx | 7 --
sw/source/filter/ww8/docxexport.cxx | 16 ----
sw/source/filter/ww8/docxexport.hxx | 3
sw/source/filter/ww8/rtfexport.cxx | 24 +++++++
sw/source/filter/ww8/wrtww8.cxx | 16 ++++
sw/source/filter/ww8/wrtww8.hxx | 2
18 files changed, 126 insertions(+), 58 deletions(-)
New commits:
commit d4589fb377d14820481b04a59393ee261d921fda
Author: Oliver Specht <oliver.specht at cib.de>
Date: Tue Feb 2 10:44:40 2016 +0100
tdf#97051: prevent duplicate copy of SfxItemSet
the patch f7424ed710e54bb2437a28380b03ed7c26290edc introduced copying of
the input item set of SfxTabDialog so now the item set of the style must
not be copied anymore.
Change-Id: If4155ee5999f0c5cd2ac754578a2c1b5ec33b14b
Reviewed-on: https://gerrit.libreoffice.org/22022
Reviewed-by: Oliver Specht <oliver.specht at cib.de>
Tested-by: Oliver Specht <oliver.specht at cib.de>
(cherry picked from commit 869c73d0d2512e483ceedcc895b7cb86e0974ab2)
(cherry picked from commit 08004a12fa0d7f08cff53b5cf6b6c2409bd47754)
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index 1735f1b..67bb258 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -43,7 +43,7 @@ SfxStyleDialog::SfxStyleDialog
*/
: SfxTabDialog(pParent, rID, rUIXMLDescription,
- rStyle.GetItemSet().Clone(), true)
+ &rStyle.GetItemSet(), true)
, pStyle( &rStyle )
{
commit a438d37224fe86ee3ed280bf0a165d70d265db9e
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Feb 3 22:39:46 2016 +0100
reportbuilder: tdf#92720: add loext namespace
... to allow export of paragraphs in shapes.
(regression from 6acc6c011d3afd6834efeee1b2efe43652a86f2e)
Change-Id: I2c23e686a2cfcd997d3393b0f9fb4cdcab7252b7
(cherry picked from commit 969a760e2bad7f65c28eba425af1751946b09d76)
Reviewed-on: https://gerrit.libreoffice.org/22090
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
(cherry picked from commit c29bc3305e835d6f32195b4d9528e64b64d4019e)
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java b/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java
index 2774359..6a7d144 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java
@@ -51,6 +51,7 @@ public class OfficeNamespaces
public static final String OOREPORT_NS = "http://openoffice.org/2005/report";
public static final String GRDDL_NS = "http://www.w3.org/2003/g/data-view#";
public static final String CONFIG = "urn:oasis:names:tc:opendocument:xmlns:config:1.0";
+ public static final String LOEXT_NS = "urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0";
private OfficeNamespaces()
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index 8518bc6..beffe31 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -383,6 +383,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
rootAttributes.addNamespaceDeclaration("xsd", OfficeNamespaces.XSD_NS);
rootAttributes.addNamespaceDeclaration("xsi", OfficeNamespaces.XSI_NS);
rootAttributes.addNamespaceDeclaration("grddl", OfficeNamespaces.GRDDL_NS);
+ rootAttributes.addNamespaceDeclaration("loext", OfficeNamespaces.LOEXT_NS);
rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version",
ODF_VERSION);
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index bf7594e9..99d41fa 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -251,6 +251,13 @@ ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext, OUStrin
if( getExportFlags() & (SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) )
{
_GetNamespaceMap().Add( GetXMLToken(XML_NP_XHTML),GetXMLToken(XML_N_XHTML), XML_NAMESPACE_XHTML );
+ // loext, needed for paragraphs inside shapes
+ if (getDefaultVersion() > SvtSaveOptions::ODFVER_012)
+ {
+ _GetNamespaceMap().Add(
+ GetXMLToken(XML_NP_LO_EXT), GetXMLToken(XML_N_LO_EXT),
+ XML_NAMESPACE_LO_EXT);
+ }
}
// GRDDL: to convert RDFa and meta.xml to RDF
if( getExportFlags() & (SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) )
commit e9e8c1075a8424febcef7aab996d3d55a6852926
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Jan 12 09:06:49 2016 +0100
tdf#61511 RTF export: handle page background solid color fill
(cherry picked from commit b0058366190b63fcbc112b43d387f7600a7fe55d)
Conflicts:
sw/qa/extras/rtfexport/rtfexport.cxx
Change-Id: I562419b6d4fb791ef5b255effe9a4510d930bdbc
Reviewed-on: https://gerrit.libreoffice.org/22085
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 7e8be547eb44b0211ab45e21c6961e2dc3995a84)
diff --git a/include/svtools/rtfkeywd.hxx b/include/svtools/rtfkeywd.hxx
index d57fd13..55d97f5 100644
--- a/include/svtools/rtfkeywd.hxx
+++ b/include/svtools/rtfkeywd.hxx
@@ -1207,6 +1207,7 @@
#define LO_STRING_SVTOOLS_RTF_LEVELPICTURE "\\levelpicture"
#define LO_STRING_SVTOOLS_RTF_BRDRSH "\\brdrsh"
#define LO_STRING_SVTOOLS_RTF_GENERATOR "\\generator"
+#define LO_STRING_SVTOOLS_RTF_VIEWBKSP "\\viewbksp"
#endif // INCLUDED_SVTOOLS_RTFKEYWD_HXX
diff --git a/sw/qa/extras/rtfimport/data/page-background.rtf b/sw/qa/extras/rtfexport/data/page-background.rtf
similarity index 96%
rename from sw/qa/extras/rtfimport/data/page-background.rtf
rename to sw/qa/extras/rtfexport/data/page-background.rtf
index e19d2d4..68c3ccf 100644
--- a/sw/qa/extras/rtfimport/data/page-background.rtf
+++ b/sw/qa/extras/rtfexport/data/page-background.rtf
@@ -1,6 +1,6 @@
{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch31506\stshfloch31506\stshfhich31506\stshfbi31507\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0
\viewbksp1
-{\*\background
+{\*\background
{\shp
{\*\shpinst\shpleft0\shptop0\shpright0\shpbottom0\shpfhdr0\shpbxmargin\shpbxignore\shpbymargin\shpbyignore\shpwr0\shpwrk0\shpfblwtxt1
{\sp
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx
index 33d6ca4..56040f8 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -912,6 +912,13 @@ DECLARE_RTFEXPORT_TEST(testTdf90421, "tdf90421.fodt")
}
}
+DECLARE_RTFEXPORT_TEST(testPageBackground, "page-background.rtf")
+{
+ // The problem was that \background was ignored.
+ uno::Reference<beans::XPropertySet> xPageStyle(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0x92D050), getProperty<sal_Int32>(xPageStyle, "BackColor"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 0544b1e..67efc3d 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1221,13 +1221,6 @@ DECLARE_RTFIMPORT_TEST(testFdo64671, "fdo64671.rtf")
getRun(getParagraph(1), 1, OUString("\xC5\xBD", 2, RTL_TEXTENCODING_UTF8));
}
-DECLARE_RTFIMPORT_TEST(testPageBackground, "page-background.rtf")
-{
- // The problem was that \background was ignored.
- uno::Reference<beans::XPropertySet> xPageStyle(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0x92D050), getProperty<sal_Int32>(xPageStyle, "BackColor"));
-}
-
DECLARE_RTFIMPORT_TEST(testFdo81944, "fdo81944.rtf")
{
// font properties in style were not imported
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 833c213..d3000eb 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1507,22 +1507,6 @@ bool DocxExport::isMirroredMargin()
return bMirroredMargins;
}
-boost::optional<SvxBrushItem> DocxExport::getBackground()
-{
- boost::optional<SvxBrushItem> oRet;
- const SwFrameFormat &rFormat = m_pDoc->GetPageDesc(0).GetMaster();
- SvxBrushItem aBrush(RES_BACKGROUND);
- SfxItemState eState = rFormat.GetBackgroundState(aBrush);
-
- if (SfxItemState::SET == eState)
- {
- // The 'color' is set for the first page style - take it and use it as the background color of the entire DOCX
- if (aBrush.GetColor().GetColor() != COL_AUTO)
- oRet.reset(aBrush);
- }
- return oRet;
-}
-
void DocxExport::WriteMainText()
{
// setup the namespaces
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index c028498..3aaa853 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -245,9 +245,6 @@ private:
/// Write word/embeddings/Worksheet[n].xlsx
void WriteEmbeddings();
- /// Get background color of the document, if there is one.
- boost::optional<SvxBrushItem> getBackground();
-
/// return true if Page Layout is set as Mirrored
bool isMirroredMargin();
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 6c7da6a..efbf120 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -389,6 +389,30 @@ void RtfExport::WriteMainText()
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
+ if (boost::optional<SvxBrushItem> oBrush = getBackground())
+ {
+ Strm().WriteCharPtr(LO_STRING_SVTOOLS_RTF_VIEWBKSP).WriteChar('1');
+ Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_BACKGROUND);
+ Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SHP);
+ Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPINST);
+
+ std::vector< std::pair<OString, OString> > aProperties;
+ aProperties.push_back(std::make_pair<OString, OString>("shapeType", "1"));
+ aProperties.push_back(std::make_pair<OString, OString>("fillColor", OString::number(msfilter::util::BGRToRGB(oBrush->GetColor().GetColor()))));
+ for (size_t i = 0; i < aProperties.size(); ++i)
+ {
+ Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{");
+ Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " ");
+ Strm().WriteCharPtr(aProperties[i].first.getStr());
+ Strm().WriteCharPtr("}{" OOO_STRING_SVTOOLS_RTF_SV " ");
+ Strm().WriteCharPtr(aProperties[i].second.getStr());
+ Strm().WriteCharPtr("}}");
+ }
+ Strm().WriteChar('}'); // shpinst
+ Strm().WriteChar('}'); // shp
+ Strm().WriteChar('}'); // background
+ }
+
SwTableNode* pTableNode = m_pCurPam->GetNode().FindTableNode();
if (m_pWriter && m_pWriter->bWriteOnlyFirstTable
&& pTableNode != 0)
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 9dad99d..9525c5b 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1396,6 +1396,22 @@ void WW8Export::AppendBookmark( const OUString& rName, bool bSkip )
m_pBkmks->Append( nSttCP, rName );
}
+boost::optional<SvxBrushItem> MSWordExportBase::getBackground()
+{
+ boost::optional<SvxBrushItem> oRet;
+ const SwFrameFormat &rFormat = m_pDoc->GetPageDesc(0).GetMaster();
+ SvxBrushItem aBrush(RES_BACKGROUND);
+ SfxItemState eState = rFormat.GetBackgroundState(aBrush);
+
+ if (SfxItemState::SET == eState)
+ {
+ // The 'color' is set for the first page style - take it and use it as the background color of the entire DOCX
+ if (aBrush.GetColor().GetColor() != COL_AUTO)
+ oRet.reset(aBrush);
+ }
+ return oRet;
+}
+
// #i120928 collect all the graphics of bullets applied to paragraphs
int MSWordExportBase::CollectGrfsOfBullets()
{
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index c0bddbb..863d467 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -876,6 +876,8 @@ protected:
void SetCurPam(sal_uLong nStt, sal_uLong nEnd);
+ /// Get background color of the document, if there is one.
+ boost::optional<SvxBrushItem> getBackground();
/// Populates m_vecBulletPic with all the bullet graphics used by numberings.
int CollectGrfsOfBullets();
/// Write the numbering picture bullets.
commit f31e11b68d1f2b43d0a761dd6da54df20a65d81d
Author: Eike Rathke <erack at redhat.com>
Date: Fri Jan 22 22:30:39 2016 +0100
tdf#97315 forward compatibility for [eu-ES] mapping to [eu]
Commit 72c5e230f9cda8e18f63f7bbc6567487b4c5a5e0 maps [eu] to [eu-ES] for
5.2 (cherry-picked to 5.1), enable 5.0.5 to read that but still save
[eu].
Change-Id: I2aa82023a1ffb411c034beceb0bc999885adb026
Reviewed-on: https://gerrit.libreoffice.org/21727
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 9c9876c8b63fb47814e05141c74a4fc244cfa56c)
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index b76547c..f13863c 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -665,6 +665,7 @@ static bool checkMapping( const OUString& rStr1, const OUString& rStr2 )
if (rStr1 == "ku-SY" ) return rStr2 == "kmr-Latn-SY";
if (rStr1 == "ku-IQ" ) return rStr2 == "ckb-IQ";
if (rStr1 == "ku-IR" ) return rStr2 == "ckb-IR";
+ if (rStr1 == "eu-ES" ) return rStr2 == "eu";
return rStr1 == rStr2;
}
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index ee8406c..c56e14b 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -240,6 +240,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_ARABIC_SUDAN, "ar", "SD", 0 },
{ LANGUAGE_ARABIC_PRIMARY_ONLY, "ar", "" , 0 },
{ LANGUAGE_BASQUE, "eu", "" , 0 },
+ { LANGUAGE_BASQUE, "eu", "ES", kSAME },
{ LANGUAGE_BULGARIAN, "bg", "BG", 0 },
{ LANGUAGE_CZECH, "cs", "CZ", 0 },
{ LANGUAGE_CZECH, "cz", "" , kSAME },
commit 33e77ccd730278fd04d14be4f49b62eba1242d23
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Tue Jul 21 19:01:26 2015 +0200
avoid crash with color listbox for now
(cherry picked from commit 5ee0e6ab93ad791f5e79506efafd16cb7364ffb1)
Change-Id: I36ac6513546961ec8d8d1e9437a8ef88574acbf4
Reviewed-on: https://gerrit.libreoffice.org/22121
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 939941d63493a38bb10c72ebf7084b636458459a)
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 766ba52..05f1af9 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -236,7 +236,7 @@ IMPL_LINK(AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox)
mpLbFillAttr->Hide();
mpToolBoxColor->Show();
const OUString aTmpStr;
- const Color aColor = mpColorItem->GetColorValue();
+ const Color aColor = mpColorItem ? mpColorItem->GetColorValue() : COL_AUTO;
const XFillColorItem aXFillColorItem( aTmpStr, aColor );
// #i122676# change FillStyle and Color in one call
commit baa0de864b3252e3aa912437d69f99a07899d6ca
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Thu Feb 4 16:54:11 2016 +0100
update emoji autocorrect entries from po-files
Change-Id: I79aa36de24af751004107dc350e4e0672d02c9c4
(cherry picked from commit 004f24fcb12bc9f43e6c812ef2751b777dc44031)
diff --git a/extras/source/autocorr/lang/es/DocumentList.xml b/extras/source/autocorr/lang/es/DocumentList.xml
index c9b44b1..014b86d 100644
--- a/extras/source/autocorr/lang/es/DocumentList.xml
+++ b/extras/source/autocorr/lang/es/DocumentList.xml
@@ -563,6 +563,7 @@
<block-list:block block-list:abbreviated-name=":^a:" block-list:name="ᵃ"/>
<block-list:block block-list:abbreviated-name=":_a:" block-list:name="ₐ"/>
<block-list:block block-list:abbreviated-name=":^A:" block-list:name="ᴬ"/>
+ <block-list:block block-list:abbreviated-name=":aburrido:" block-list:name="😒"/>
<block-list:block block-list:abbreviated-name=":Acuario:" block-list:name="♒"/>
<block-list:block block-list:abbreviated-name=":Adi Shakti:" block-list:name="☬"/>
<block-list:block block-list:abbreviated-name=":aduanero:" block-list:name="🛃"/>
@@ -629,6 +630,7 @@
<block-list:block block-list:abbreviated-name=":bandera triangular:" block-list:name="🚩"/>
<block-list:block block-list:abbreviated-name=":baño:" block-list:name="🚻"/>
<block-list:block block-list:abbreviated-name=":barbería:" block-list:name="💈"/>
+ <block-list:block block-list:abbreviated-name=":barco:" block-list:name="🚢"/>
<block-list:block block-list:abbreviated-name=":barniz:" block-list:name="💅"/>
<block-list:block block-list:abbreviated-name=":básquetbol:" block-list:name="🏀"/>
<block-list:block block-list:abbreviated-name=":basura:" block-list:name="🚮"/>
@@ -746,6 +748,7 @@
<block-list:block block-list:abbreviated-name=":candado3:" block-list:name="🔐"/>
<block-list:block block-list:abbreviated-name=":candado abierto:" block-list:name="🔓"/>
<block-list:block block-list:abbreviated-name=":candado:" block-list:name="🔒"/>
+ <block-list:block block-list:abbreviated-name=":cansado:" block-list:name="😩"/>
<block-list:block block-list:abbreviated-name=":cansancio:" block-list:name="😫"/>
<block-list:block block-list:abbreviated-name=":Capricornio:" block-list:name="♑"/>
<block-list:block block-list:abbreviated-name=":cara de mareo:" block-list:name="😵"/>
@@ -773,6 +776,7 @@
<block-list:block block-list:abbreviated-name=":cd:" block-list:name="💿"/>
<block-list:block block-list:abbreviated-name=":celebración:" block-list:name="🙌"/>
<block-list:block block-list:abbreviated-name=":céntimo:" block-list:name="¢"/>
+ <block-list:block block-list:abbreviated-name=":ceñudo:" block-list:name="😦"/>
<block-list:block block-list:abbreviated-name=":cerdo2:" block-list:name="🐷"/>
<block-list:block block-list:abbreviated-name=":cerdo:" block-list:name="🐖"/>
<block-list:block block-list:abbreviated-name=":cerezas:" block-list:name="🍒"/>
@@ -797,12 +801,14 @@
<block-list:block block-list:abbreviated-name=":coche:" block-list:name="🚗"/>
<block-list:block block-list:abbreviated-name=":cocodrilo:" block-list:name="🐊"/>
<block-list:block block-list:abbreviated-name=":cóctel:" block-list:name="🍸"/>
+ <block-list:block block-list:abbreviated-name=":cohete:" block-list:name="🚀"/>
<block-list:block block-list:abbreviated-name=":cólera:" block-list:name="💢"/>
<block-list:block block-list:abbreviated-name=":cometa:" block-list:name="☄"/>
<block-list:block block-list:abbreviated-name=":comodín:" block-list:name="🃏"/>
<block-list:block block-list:abbreviated-name=":concha:" block-list:name="🐚"/>
<block-list:block block-list:abbreviated-name=":conejo2:" block-list:name="🐰"/>
<block-list:block block-list:abbreviated-name=":conejo:" block-list:name="🐇"/>
+ <block-list:block block-list:abbreviated-name=":confuso:" block-list:name="😕"/>
<block-list:block block-list:abbreviated-name=":conjunto vacío:" block-list:name="∅"/>
<block-list:block block-list:abbreviated-name=":construcción:" block-list:name="🚧"/>
<block-list:block block-list:abbreviated-name=":contiene:" block-list:name="∋"/>
@@ -817,6 +823,7 @@
<block-list:block block-list:abbreviated-name=":corazón decorativo:" block-list:name="💟"/>
<block-list:block block-list:abbreviated-name=":corazones2:" block-list:name="♡"/>
<block-list:block block-list:abbreviated-name=":corazones:" block-list:name="♥"/>
+ <block-list:block block-list:abbreviated-name=":corazones girando:" block-list:name="💞"/>
<block-list:block block-list:abbreviated-name=":corazón roto:" block-list:name="💔"/>
<block-list:block block-list:abbreviated-name=":corbata:" block-list:name="👔"/>
<block-list:block block-list:abbreviated-name=":corchea1:" block-list:name="𝅘𝅥𝅮"/>
@@ -861,6 +868,7 @@
<block-list:block block-list:abbreviated-name=":cultivo:" block-list:name="🌾"/>
<block-list:block block-list:abbreviated-name=":cumpleaños:" block-list:name="🎂"/>
<block-list:block block-list:abbreviated-name=":curri:" block-list:name="🍛"/>
+ <block-list:block block-list:abbreviated-name=":cuteness:" block-list:name="💠"/>
<block-list:block block-list:abbreviated-name=":dado1:" block-list:name="⚀"/>
<block-list:block block-list:abbreviated-name=":dado2:" block-list:name="⚁"/>
<block-list:block block-list:abbreviated-name=":dado3:" block-list:name="⚂"/>
@@ -911,6 +919,8 @@
<block-list:block block-list:abbreviated-name=":dseda:" block-list:name="ζ"/>
<block-list:block block-list:abbreviated-name=":Dseda:" block-list:name="Ζ"/>
<block-list:block block-list:abbreviated-name=":duende:" block-list:name="👺"/>
+ <block-list:block block-list:abbreviated-name=":dulce sonrisa:" block-list:name="😅"/>
+ <block-list:block block-list:abbreviated-name=":durmiendo:" block-list:name="😴"/>
<block-list:block block-list:abbreviated-name=":dvd:" block-list:name="📀"/>
<block-list:block block-list:abbreviated-name=":E2:" block-list:name="⇒"/>
<block-list:block block-list:abbreviated-name=":^e:" block-list:name="ᵉ"/>
@@ -1004,7 +1014,10 @@
<block-list:block block-list:abbreviated-name=":gato2:" block-list:name="🐱"/>
<block-list:block block-list:abbreviated-name=":gato:" block-list:name="🐈"/>
<block-list:block block-list:abbreviated-name=":gato con ojos de corazón:" block-list:name="😻"/>
+ <block-list:block block-list:abbreviated-name=":gato gritando:" block-list:name="🙀"/>
<block-list:block block-list:abbreviated-name=":gato jubiloso:" block-list:name="😹"/>
+ <block-list:block block-list:abbreviated-name=":gato llorando:" block-list:name="😿"/>
+ <block-list:block block-list:abbreviated-name=":gato pucheros:" block-list:name="😾"/>
<block-list:block block-list:abbreviated-name=":gato socarrón:" block-list:name="😼"/>
<block-list:block block-list:abbreviated-name=":gato sonriente2:" block-list:name="😺"/>
<block-list:block block-list:abbreviated-name=":gato sonriente:" block-list:name="😸"/>
@@ -1022,6 +1035,7 @@
<block-list:block block-list:abbreviated-name=":gotita:" block-list:name="💧"/>
<block-list:block block-list:abbreviated-name=":grado:" block-list:name="°"/>
<block-list:block block-list:abbreviated-name=":graduación:" block-list:name="🎓"/>
+ <block-list:block block-list:abbreviated-name=":granizado:" block-list:name="🍧"/>
<block-list:block block-list:abbreviated-name=":grito:" block-list:name="😱"/>
<block-list:block block-list:abbreviated-name=":grivna:" block-list:name="₴"/>
<block-list:block block-list:abbreviated-name=":>=:" block-list:name="≥"/>
@@ -1029,6 +1043,7 @@
<block-list:block block-list:abbreviated-name=":guardaequipajes:" block-list:name="🛅"/>
<block-list:block block-list:abbreviated-name=":guardia:" block-list:name="💂"/>
<block-list:block block-list:abbreviated-name=":guiño:" block-list:name="😉"/>
+ <block-list:block block-list:abbreviated-name=":guión:" block-list:name="💨"/>
<block-list:block block-list:abbreviated-name=":guitarra:" block-list:name="🎸"/>
<block-list:block block-list:abbreviated-name=":Halloween:" block-list:name="🎃"/>
<block-list:block block-list:abbreviated-name=":hamburguesa:" block-list:name="🍔"/>
@@ -1093,6 +1108,7 @@
<block-list:block block-list:abbreviated-name=":ji:" block-list:name="χ"/>
<block-list:block block-list:abbreviated-name=":Ji:" block-list:name="Χ"/>
<block-list:block block-list:abbreviated-name=":jota:" block-list:name="🂫"/>
+ <block-list:block block-list:abbreviated-name=":juego:" block-list:name="😂"/>
<block-list:block block-list:abbreviated-name=":Júpiter:" block-list:name="♃"/>
<block-list:block block-list:abbreviated-name=":kappa:" block-list:name="κ"/>
<block-list:block block-list:abbreviated-name=":Kappa:" block-list:name="Κ"/>
@@ -1135,6 +1151,7 @@
<block-list:block block-list:abbreviated-name=":llamada:" block-list:name="📲"/>
<block-list:block block-list:abbreviated-name=":llave:" block-list:name="🔑"/>
<block-list:block block-list:abbreviated-name=":llave inglesa:" block-list:name="🔧"/>
+ <block-list:block block-list:abbreviated-name=":llorando:" block-list:name="😢"/>
<block-list:block block-list:abbreviated-name=":lluvia2:" block-list:name="⛆"/>
<block-list:block block-list:abbreviated-name=":lluvia:" block-list:name="☔"/>
<block-list:block block-list:abbreviated-name=":lobo:" block-list:name="🐺"/>
@@ -1155,6 +1172,7 @@
<block-list:block block-list:abbreviated-name=":mahjong:" block-list:name="🀄"/>
<block-list:block block-list:abbreviated-name=":maíz:" block-list:name="🌽"/>
<block-list:block block-list:abbreviated-name=":maletín:" block-list:name="💼"/>
+ <block-list:block block-list:abbreviated-name=":malo:" block-list:name="🙅"/>
<block-list:block block-list:abbreviated-name=":mano:" block-list:name="✋"/>
<block-list:block block-list:abbreviated-name=":manos abiertas:" block-list:name="👐"/>
<block-list:block block-list:abbreviated-name=":manzana:" block-list:name="🍎"/>
@@ -1175,6 +1193,7 @@
<block-list:block block-list:abbreviated-name=":md:" block-list:name="💽"/>
<block-list:block block-list:abbreviated-name=":megáfono2:" block-list:name="📣"/>
<block-list:block block-list:abbreviated-name=":megáfono:" block-list:name="📢"/>
+ <block-list:block block-list:abbreviated-name=":melocotón:" block-list:name="🍑"/>
<block-list:block block-list:abbreviated-name=":melón:" block-list:name="🍈"/>
<block-list:block block-list:abbreviated-name=":memorando:" block-list:name="📝"/>
<block-list:block block-list:abbreviated-name=":menguante cóncava:" block-list:name="🌘"/>
@@ -1186,16 +1205,21 @@
<block-list:block block-list:abbreviated-name=":Mi:" block-list:name="Μ"/>
<block-list:block block-list:abbreviated-name=":micrófono:" block-list:name="🎤"/>
<block-list:block block-list:abbreviated-name=":microscopio:" block-list:name="🔬"/>
+ <block-list:block block-list:abbreviated-name=":miedoso:" block-list:name="😨"/>
<block-list:block block-list:abbreviated-name=":miel:" block-list:name="🍯"/>
<block-list:block block-list:abbreviated-name=":minibús:" block-list:name="🚐"/>
<block-list:block block-list:abbreviated-name=":mochila:" block-list:name="🎒"/>
<block-list:block block-list:abbreviated-name=":modo vibratorio:" block-list:name="📳"/>
<block-list:block block-list:abbreviated-name=":mono2:" block-list:name="🐵"/>
<block-list:block block-list:abbreviated-name=":mono:" block-list:name="🐒"/>
+ <block-list:block block-list:abbreviated-name=":mono no hablo:" block-list:name="🙊"/>
+ <block-list:block block-list:abbreviated-name=":mono no oigo:" block-list:name="🙉"/>
+ <block-list:block block-list:abbreviated-name=":mono no veo:" block-list:name="🙈"/>
<block-list:block block-list:abbreviated-name=":monorriel:" block-list:name="🚝"/>
<block-list:block block-list:abbreviated-name=":montaña:" block-list:name="⛰"/>
<block-list:block block-list:abbreviated-name=":montaña rusa:" block-list:name="🎢"/>
<block-list:block block-list:abbreviated-name=":móvil:" block-list:name="📱"/>
+ <block-list:block block-list:abbreviated-name=":mueca:" block-list:name="😬"/>
<block-list:block block-list:abbreviated-name=":mujer:" block-list:name="👩"/>
<block-list:block block-list:abbreviated-name=":mujeres:" block-list:name="🚺"/>
<block-list:block block-list:abbreviated-name=":mujer vieja:" block-list:name="👵"/>
@@ -1269,6 +1293,7 @@
<block-list:block block-list:abbreviated-name=":Ómicron:" block-list:name="Ο"/>
<block-list:block block-list:abbreviated-name=":onda:" block-list:name="👋"/>
<block-list:block block-list:abbreviated-name=":oníguiri:" block-list:name="🍙"/>
+ <block-list:block block-list:abbreviated-name=":ordenador:" block-list:name="💻"/>
<block-list:block block-list:abbreviated-name=":oreja:" block-list:name="👂"/>
<block-list:block block-list:abbreviated-name=":orejas de conejo:" block-list:name="👯"/>
<block-list:block block-list:abbreviated-name=":oso:" block-list:name="🐻"/>
@@ -1317,6 +1342,7 @@
<block-list:block block-list:abbreviated-name=":peón blanco:" block-list:name="♙"/>
<block-list:block block-list:abbreviated-name=":peón negro:" block-list:name="♟"/>
<block-list:block block-list:abbreviated-name=":pera:" block-list:name="🍐"/>
+ <block-list:block block-list:abbreviated-name=":perplejo:" block-list:name="😖"/>
<block-list:block block-list:abbreviated-name=":perro2:" block-list:name="🐶"/>
<block-list:block block-list:abbreviated-name=":perro:" block-list:name="🐕"/>
<block-list:block block-list:abbreviated-name=":perseverancia:" block-list:name="😣"/>
@@ -1380,6 +1406,7 @@
<block-list:block block-list:abbreviated-name=":puño:" block-list:name="✊"/>
<block-list:block block-list:abbreviated-name=":punto base:" block-list:name="‱"/>
<block-list:block block-list:abbreviated-name=":punto medio:" block-list:name="·"/>
+ <block-list:block block-list:abbreviated-name=":rabia:" block-list:name="😡"/>
<block-list:block block-list:abbreviated-name=":radiactividad:" block-list:name="☢"/>
<block-list:block block-list:abbreviated-name=":radio:" block-list:name="📻"/>
<block-list:block block-list:abbreviated-name=":raíz cuadrada:" block-list:name="√"/>
@@ -1426,6 +1453,7 @@
<block-list:block block-list:abbreviated-name=":rombo:" block-list:name="◊"/>
<block-list:block block-list:abbreviated-name=":ropa de mujer:" block-list:name="👚"/>
<block-list:block block-list:abbreviated-name=":rosa:" block-list:name="🌹"/>
+ <block-list:block block-list:abbreviated-name=":ruborizado:" block-list:name="😊"/>
<block-list:block block-list:abbreviated-name=":rueda de la fortuna:" block-list:name="🎡"/>
<block-list:block block-list:abbreviated-name=":rugby:" block-list:name="🏉"/>
<block-list:block block-list:abbreviated-name=":rupia:" block-list:name="₹"/>
@@ -1460,9 +1488,11 @@
<block-list:block block-list:abbreviated-name=":silencio de corchea:" block-list:name="𝄾"/>
<block-list:block block-list:abbreviated-name=":silencio de negra:" block-list:name="𝄽"/>
<block-list:block block-list:abbreviated-name=":silencio de redonda:" block-list:name="𝄻"/>
+ <block-list:block block-list:abbreviated-name=":silencioso:" block-list:name="😯"/>
<block-list:block block-list:abbreviated-name=":silla de ruedas:" block-list:name="♿"/>
<block-list:block block-list:abbreviated-name=":sin boca:" block-list:name="😶"/>
<block-list:block block-list:abbreviated-name=":sin expresión:" block-list:name="😑"/>
+ <block-list:block block-list:abbreviated-name=":snowboarder:" block-list:name="🏂"/>
<block-list:block block-list:abbreviated-name=":SO2:" block-list:name="⇙"/>
<block-list:block block-list:abbreviated-name=":SO:" block-list:name="↙"/>
<block-list:block block-list:abbreviated-name=":sobre2:" block-list:name="📨"/>
@@ -1482,9 +1512,11 @@
<block-list:block block-list:abbreviated-name=":sonrisa2:" block-list:name="☻"/>
<block-list:block block-list:abbreviated-name=":sonrisa:" block-list:name="☺"/>
<block-list:block block-list:abbreviated-name=":sonrisita:" block-list:name="😏"/>
+ <block-list:block block-list:abbreviated-name=":sonrojado:" block-list:name="😳"/>
<block-list:block block-list:abbreviated-name=":sostenido:" block-list:name="♯"/>
<block-list:block block-list:abbreviated-name=":subconjunto:" block-list:name="⊂"/>
<block-list:block block-list:abbreviated-name=":sudor:" block-list:name="😓"/>
+ <block-list:block block-list:abbreviated-name=":sudor frio:" block-list:name="😰"/>
<block-list:block block-list:abbreviated-name=":sumatoria:" block-list:name="∑"/>
<block-list:block block-list:abbreviated-name=":superconjunto:" block-list:name="⊃"/>
<block-list:block block-list:abbreviated-name=":surfista:" block-list:name="🏄"/>
@@ -1546,6 +1578,7 @@
<block-list:block block-list:abbreviated-name=":tractor:" block-list:name="🚜"/>
<block-list:block block-list:abbreviated-name=":tragamonedas:" block-list:name="🎰"/>
<block-list:block block-list:abbreviated-name=":tráiler:" block-list:name="🚛"/>
+ <block-list:block block-list:abbreviated-name=":tranquilo:" block-list:name="😌"/>
<block-list:block block-list:abbreviated-name=":transbordador:" block-list:name="⛴"/>
<block-list:block block-list:abbreviated-name=":tranvía2:" block-list:name="🚋"/>
<block-list:block block-list:abbreviated-name=":tranvía:" block-list:name="🚊"/>
More information about the Libreoffice-commits
mailing list