You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2021/03/30 14:21:08 UTC
[openoffice] branch AOO41X updated (1d7a88d -> fbdc613)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git.
from 1d7a88d Added m4a to list of audio files
new 1748116 Add claws-mail to senddoc script
new 9c5a96d Update calendar_gregorian.cxx (#123)
new 9aef04a Added new Japanese era Reiwa
new e5208b0 Added startdate Reiwa era to gengou_eraArray
new 25e830b use std::vector instead of fixed-size array of cffLocal objects (#89)
new fbdc613 Use correct graphic
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../source/text/swriter/01/05060200.xhp | 23 ++-
.../source/calendar/calendar_gregorian.cxx | 5 +-
main/i18npool/source/localedata/data/ja_JP.xml | 5 +
main/shell/source/unix/misc/senddoc.sh | 154 ++++++++++-----------
main/vcl/source/fontsubset/cff.cxx | 117 ++++++++++------
5 files changed, 172 insertions(+), 132 deletions(-)
[openoffice] 06/06: Use correct graphic
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit fbdc61302809a891b29882b60a23b602684f5e11
Author: mseidel <ms...@apache.org>
AuthorDate: Fri Feb 5 01:06:33 2021 +0100
Use correct graphic
(cherry picked from commit 901a9e506a5df3a26338899e29fa60a42e65b337)
---
.../source/text/swriter/01/05060200.xhp | 23 +++++++++++-----------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/main/helpcontent2/source/text/swriter/01/05060200.xhp b/main/helpcontent2/source/text/swriter/01/05060200.xhp
index 616ed44..15feedc 100644
--- a/main/helpcontent2/source/text/swriter/01/05060200.xhp
+++ b/main/helpcontent2/source/text/swriter/01/05060200.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -10,21 +10,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
-
-
+
<meta>
<topic id="textswriter0105060200xml" indexer="include">
<title id="tit" xml-lang="en-US">Wrap</title>
@@ -38,7 +37,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:TextWrap" id="bm_id3154564" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapMenu" id="bm_id0801200803335347" localize="false"/>
<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05060200.xhp" name="Wrap">Wrap</link></paragraph>
-<paragraph role="paragraph" id="par_id3154478" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="umlauftext"><ahelp hid=".uno:TextWrap">Specify the way you want text to wrap around an object.</ahelp> You can also specify the spacing between the text and the object.
+<paragraph role="paragraph" id="par_id3154478" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="umlauftext"><ahelp hid=".uno:TextWrap">Specify the way you want text to wrap around an object.</ahelp> You can also specify the spacing between the text and the object.
</variable></paragraph>
</section>
<section id="howtoget">
@@ -56,7 +55,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3149038" xml-lang="en-US" l10n="E">
-<image id="img_id3149044" src="sw/imglst/wr07.png" width="0.82cm" height="0.82cm"><alt id="alt_id3149044" xml-lang="en-US">Icon</alt>
+<image id="img_id3149044" src="sw/imglst/wr01.png" width="0.82cm" height="0.82cm"><alt id="alt_id3149044" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -160,19 +159,19 @@
<bookmark xml-lang="en-US" branch="hid/.uno:WrapAnchorOnly" id="bm_id7795797" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapAnchorOnly" id="bm_id3154324" localize="false"/>
<paragraph role="heading" id="hd_id3153229" xml-lang="en-US" level="3" l10n="U" oldref="28">First Paragraph</paragraph>
-<paragraph role="paragraph" id="par_id3154333" xml-lang="en-US" l10n="U" oldref="29"><variable id="ersterabsatztext"><ahelp hid=".uno:WrapAnchorOnly">Starts a new paragraph below the object after you press Enter.</ahelp> The space between the paragraphs is determined by the size of the object.
+<paragraph role="paragraph" id="par_id3154333" xml-lang="en-US" l10n="U" oldref="29"><variable id="ersterabsatztext"><ahelp hid=".uno:WrapAnchorOnly">Starts a new paragraph below the object after you press Enter.</ahelp> The space between the paragraphs is determined by the size of the object.
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_WRAP:CB_TRANSPARENT" id="bm_id3150086" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapThroughTransparent" id="bm_id7503356" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapThroughTransparent" id="bm_id3150090" localize="false"/>
<paragraph role="heading" id="hd_id3148790" xml-lang="en-US" level="3" l10n="U" oldref="30">In Background</paragraph>
-<paragraph role="paragraph" id="par_id3150100" xml-lang="en-US" l10n="U" oldref="31"><variable id="hintergrundtext"><ahelp hid=".uno:WrapThroughTransparent">Moves the selected object to the background. This option is only available if you selected the<emph> Through</emph> wrap type.</ahelp>
+<paragraph role="paragraph" id="par_id3150100" xml-lang="en-US" l10n="U" oldref="31"><variable id="hintergrundtext"><ahelp hid=".uno:WrapThroughTransparent">Moves the selected object to the background. This option is only available if you selected the <emph>Through</emph> wrap type.</ahelp>
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_WRAP:CB_OUTLINE" id="bm_id3149369" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapContour" id="bm_id2682094" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapContour" id="bm_id3149372" localize="false"/>
<paragraph role="heading" id="hd_id3149358" xml-lang="en-US" level="3" l10n="U" oldref="47">Contour</paragraph>
-<paragraph role="paragraph" id="par_id3155793" xml-lang="en-US" l10n="U" oldref="48"><variable id="konturtext"><ahelp hid=".uno:WrapContour">Wraps text around the shape of the object. This option is not available for the <emph>Through</emph> wrap type, or for frames.</ahelp> To change the contour of an object, select the object, and then choose <emph>Format - Wrap - </emph><link href="text/swriter/01/05060201.xhp" name="Edit Contour"><emph>Edit Contour</emph></link>.
+<paragraph role="paragraph" id="par_id3155793" xml-lang="en-US" l10n="U" oldref="48"><variable id="konturtext"><ahelp hid=".uno:WrapContour">Wraps text around the shape of the object. This option is not available for the <emph>Through</emph> wrap type, or for frames.</ahelp> To change the contour of an object, select the object, and then choose <emph>Format - Wrap - </emph><link href="text/swriter/01/05060201.xhp" name="Edit Contour"><emph>Edit Contour</emph></link>.
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_WRAP:CB_ONLYOUTSIDE" id="bm_id3154632" localize="false"/>
<paragraph role="heading" id="hd_id3154620" xml-lang="en-US" level="3" l10n="U" oldref="51">Only outside</paragraph>
[openoffice] 04/06: Added startdate Reiwa era to gengou_eraArray
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit e5208b09c0a01cf77217de429ca2cadc3bcc487d
Author: DiGro <di...@yahoo.co.uk>
AuthorDate: Fri Mar 5 15:28:43 2021 +0100
Added startdate Reiwa era to gengou_eraArray
The startdate for the era Reiwa, that started May, 1 2019, needs to be added to the gengou_eraArray variable to get it show the correct date in Jp localization
(cherry picked from commit ca5aee89f915a1c23d6e35736bc5cfe0735a8500)
---
main/i18npool/source/calendar/calendar_gregorian.cxx | 1 +
1 file changed, 1 insertion(+)
diff --git a/main/i18npool/source/calendar/calendar_gregorian.cxx b/main/i18npool/source/calendar/calendar_gregorian.cxx
index 3fbd324..b39bd5a 100644
--- a/main/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/main/i18npool/source/calendar/calendar_gregorian.cxx
@@ -218,6 +218,7 @@ static Era gengou_eraArray[] = {
{1912, 7, 30},
{1926, 12, 25},
{1989, 1, 8},
+ {2019, 5, 1},
{0, 0, 0}
};
Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray)
[openoffice] 02/06: Update calendar_gregorian.cxx (#123)
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 9c5a96dc7e1656ff67a97844ce499e4df82ca60f
Author: Matthias Seidel <ms...@apache.org>
AuthorDate: Fri Mar 5 22:15:39 2021 +0100
Update calendar_gregorian.cxx (#123)
(cherry picked from commit 2d1d3dced4c5807160b07c866f3fd25353ef4da2)
---
main/i18npool/source/calendar/calendar_gregorian.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/i18npool/source/calendar/calendar_gregorian.cxx b/main/i18npool/source/calendar/calendar_gregorian.cxx
index fcf68ca..3fbd324 100644
--- a/main/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/main/i18npool/source/calendar/calendar_gregorian.cxx
@@ -133,9 +133,9 @@ Calendar_gregorian::Calendar_gregorian()
{
init(NULL);
}
-Calendar_gregorian::Calendar_gregorian(Era *_earArray)
+Calendar_gregorian::Calendar_gregorian(Era *_eraArray)
{
- init(_earArray);
+ init(_eraArray);
}
void SAL_CALL
Calendar_gregorian::init(Era *_eraArray)
[openoffice] 05/06: use std::vector instead of fixed-size array of
cffLocal objects (#89)
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 25e830b3af9370ce4c6f67ce14efa5a08dac831c
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Mon Feb 8 17:44:32 2021 +0100
use std::vector instead of fixed-size array of cffLocal objects (#89)
Also cleanup (compilation warnings, data types used only once) and add
some comments
(cherry picked from commit 28337f97741b07126276d340a03620ea61fffcac)
---
main/vcl/source/fontsubset/cff.cxx | 117 ++++++++++++++++++++++++-------------
1 file changed, 76 insertions(+), 41 deletions(-)
diff --git a/main/vcl/source/fontsubset/cff.cxx b/main/vcl/source/fontsubset/cff.cxx
index 8cdb160..56b695a 100644
--- a/main/vcl/source/fontsubset/cff.cxx
+++ b/main/vcl/source/fontsubset/cff.cxx
@@ -158,7 +158,14 @@ static const char* pStdEncNames[] = {
// --------------------------------------------------------------------
-// TOP DICT keywords (also covers PRIV DICT keywords)
+/** TOP DICT keywords (also covers PRIV DICT keywords)
+ *
+ * Refer to the CFF Specification, tables 9 and 23.
+ *
+ * This array is indexed by operand.
+ *
+ * The first character tells the type of operand ('s': SID, 'b': boolean etc.).
+ */
static const char* pDictOps[] = {
"sVersion", "sNotice", "sFullName", "sFamilyName",
"sWeight", "aFontBBox", "dBlueValues", "dOtherBlues",
@@ -172,7 +179,16 @@ static const char* pDictOps[] = {
// --------------------------------------------------------------------
-// TOP DICT escapes (also covers PRIV DICT escapes)
+/** TOP DICT escapes (also covers PRIV DICT escapes)
+ *
+ * Refer to the CFF Specification, tables 9 and 23.
+ *
+ * These operators come after the escape operator (no. 12).
+ *
+ * This array is indexed by operand.
+ *
+ * The first character tells the type of operand ('s': SID, 'b': boolean etc.).
+ */
static const char* pDictEscs[] = {
"sCopyright", "bIsFixedPitch", "nItalicAngle", "nUnderlinePosition",
"nUnderlineThickness", "nPaintType", "tCharstringType", "aFontMatrix",
@@ -290,11 +306,17 @@ struct TYPE2OP
// ====================================================================
+/** Data layout of a CFF FontSet
+ *
+ * Refer to the CFF specification, chapter 2
+ */
struct CffGlobal
{
explicit CffGlobal();
+ // Offset of the Name INDEX inside the CFF data
int mnNameIdxBase;
+ // Number of objects stored in the Name INDEX
int mnNameIdxCount;
int mnStringIdxBase;
int mnStringIdxCount;
@@ -353,34 +375,19 @@ struct CffLocal
// ====================================================================
-class SubsetterContext
-{
-public:
- virtual ~SubsetterContext( void);
- virtual bool emitAsType1( class Type1Emitter&,
- const sal_GlyphId* pGlyphIds, const U8* pEncoding,
- GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& ) = 0;
-};
-
-// --------------------------------------------------------------------
-
-SubsetterContext::~SubsetterContext( void)
-{}
-
-// ====================================================================
-
class CffSubsetterContext
-: public SubsetterContext
-, private CffGlobal
+: private CffGlobal
{
public:
- static const int NMAXSTACK = 48; // see CFF.appendixB
- static const int NMAXHINTS = 2*96; // see CFF.appendixB
- static const int NMAXTRANS = 32; // see CFF.appendixB
+ // Refer to Type 2 charstring format appendix B, "Type 2 Charstring Implementation Limits"
+ static const int NMAXSTACK = 48; // argument stack
+ static const int NMAXHINTS = 2*96; // number of stem hints (H/V total)
+ static const int NMAXTRANS = 32; // TransientArray elements
public:
explicit CffSubsetterContext( const U8* pBasePtr, int nBaseLen);
virtual ~CffSubsetterContext( void);
+ // Begin parsing the CFF data
void initialCffRead( void);
bool emitAsType1( class Type1Emitter&,
const sal_GlyphId* pGlyphIds, const U8* pEncoding,
@@ -397,9 +404,12 @@ private:
void callType2Subr( bool bGlobal, int nSubrNumber);
long getReadOfs( void) const { return (long)(mpReadPtr - mpBasePtr);}
+ // First byte of CFF font data
const U8* mpBasePtr;
+ // Last byte of CFF font data
const U8* mpBaseEnd;
+ // Moving cursors inside CFF font data
const U8* mpReadPtr;
const U8* mpReadEnd;
@@ -410,14 +420,29 @@ private:
long mnCntrMask;
private:
+ /** Prepare to access an element inside a CFF/CID index table
+ *
+ * nIndexBase: offset of the INDEX structure inside the CFF font data.
+ * nDataIndex: offset of the element inside the INDEX structure.
+ *
+ * Sets mpReadPtr to the beginning of the element and mpReadEnd to the end of the element.
+ *
+ * Returns the size of the element, or -1 if the data is not valid (e.g. indices are too big).
+ */
int seekIndexData( int nIndexBase, int nDataIndex);
+ /** Seek to the end of an INDEX structure
+ *
+ * nIndexBase: offset of the INDEX structure inside the CFF font data.
+ *
+ * Sets mpReadPtr to the first byte after the indicated structure.
+ */
void seekIndexEnd( int nIndexBase);
private:
const char** mpCharStringOps;
const char** mpCharStringEscs;
- CffLocal maCffLocal[256];
+ std::vector<CffLocal> maCffLocal;
CffLocal* mpCffLocal;
void readDictOp( void);
@@ -427,6 +452,12 @@ private:
int getGlyphSID( int nGlyphIndex) const;
const char* getGlyphName( int nGlyphIndex);
+ /** Decode an integer DICT Data Operand and push it.
+ *
+ * Refer to the CFF Specification, table 3.
+ *
+ * Advances mpReadPtr.
+ */
void read2push( void);
void pop2write( void);
void writeType1Val( ValType);
@@ -465,8 +496,12 @@ public: // TODO: is public really needed?
private:
// typeop exceution context
+
+ // Count of mnValStack elements
int mnStackIdx;
+ // Stack for holding CFF DICT operands
ValType mnValStack[ NMAXSTACK+4];
+ // Transient array for Type 2 storage operators (PUT, GET)
ValType mnTransVals[ NMAXTRANS];
int mnHintSize;
@@ -487,7 +522,7 @@ CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen)
, maCharWidth(-1)
{
// setCharStringType( 1);
- // TODO: new CffLocal[ mnFDAryCount];
+ maCffLocal.resize(1);
mpCffLocal = &maCffLocal[0];
}
@@ -495,7 +530,6 @@ CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen)
CffSubsetterContext::~CffSubsetterContext( void)
{
- // TODO: delete[] maCffLocal;
}
// --------------------------------------------------------------------
@@ -606,23 +640,28 @@ void CffSubsetterContext::setCharStringType( int nVal)
// --------------------------------------------------------------------
+/** Read DICT operator at mpReadPtr.
+ *
+ * Sets the attributes of CffSubsetterContext::mpCffLocal
+ */
void CffSubsetterContext::readDictOp( void)
{
ValType nVal = 0;
- int nInt = 0;
+ int nInt = 0;
const U8 c = *mpReadPtr;
- if( c <= 21 ) {
+ if( c <= 21 ) { // we are looking at an operator
int nOpId = *(mpReadPtr++);
const char* pCmdName;
if( nOpId != 12)
pCmdName = pDictOps[ nOpId];
- else {
+ else { // escape: the operator is indicated in the following byte
const U8 nExtId = *(mpReadPtr++);
pCmdName = pDictEscs[ nExtId];
nOpId = 900 + nExtId;
}
//TODO: if( nStackIdx > 0)
+ // The first byte of pCmdName indicates the type of operand
switch( *pCmdName) {
default: fprintf( stderr, "unsupported DictOp.type=\'%c\'\n", *pCmdName); break;
case 'b': // bool
@@ -714,12 +753,10 @@ void CffSubsetterContext::readDictOp( void)
}
return;
- }
-
- if( (c >= 32) || (c == 28) ) {
+ } else if( (c >= 32) || (c == 28) ) {
// --mpReadPtr;
read2push();
- } else if( c == 29 ) { // longint
+ } else if( c == 29 ) { // we are looking at a 32-bit operand
++mpReadPtr; // skip 29
int nS32 = mpReadPtr[0] << 24;
nS32 += mpReadPtr[1] << 16;
@@ -730,7 +767,7 @@ void CffSubsetterContext::readDictOp( void)
mpReadPtr += 4;
nVal = static_cast<ValType>(nS32);
push( nVal );
- } else if( c == 30) { // real number
+ } else if( c == 30) { // we are looking at a real number operand
++mpReadPtr; // skip 30
const RealType fReal = readRealVal();
// push value onto stack
@@ -747,7 +784,7 @@ void CffSubsetterContext::read2push()
const U8*& p = mpReadPtr;
const U8 c = *p;
- if( c == 28 ) {
+ if( c == 28 ) { // -32767..+32767
short nS16 = (p[1] << 8) + p[2];
if( (sizeof(nS16) != 2) && (nS16 & (1<<15)))
nS16 |= (~0U) << 15; // assuming 2s complement
@@ -1313,13 +1350,12 @@ void CffSubsetterContext::callType2Subr( bool bGlobal, int nSubrNumber)
const U8* const pOldReadPtr = mpReadPtr;
const U8* const pOldReadEnd = mpReadEnd;
- int nLen = 0;
if( bGlobal ) {
nSubrNumber += mnGlobalSubrBias;
- nLen = seekIndexData( mnGlobalSubrBase, nSubrNumber);
+ seekIndexData( mnGlobalSubrBase, nSubrNumber);
} else {
nSubrNumber += mpCffLocal->mnLocalSubrBias;
- nLen = seekIndexData( mpCffLocal->mnLocalSubrBase, nSubrNumber);
+ seekIndexData( mpCffLocal->mnLocalSubrBase, nSubrNumber);
}
while( mpReadPtr < mpReadEnd)
@@ -1486,7 +1522,6 @@ RealType CffSubsetterContext::readRealVal()
// --------------------------------------------------------------------
-// prepare to access an element inside a CFF/CID index table
int CffSubsetterContext::seekIndexData( int nIndexBase, int nDataIndex)
{
assert( (nIndexBase > 0) && (mpBasePtr + nIndexBase + 3 <= mpBaseEnd));
@@ -1527,7 +1562,6 @@ int CffSubsetterContext::seekIndexData( int nIndexBase, int nDataIndex)
// --------------------------------------------------------------------
-// skip over a CFF/CID index table
void CffSubsetterContext::seekIndexEnd( int nIndexBase)
{
assert( (nIndexBase > 0) && (mpBasePtr + nIndexBase + 3 <= mpBaseEnd));
@@ -1666,7 +1700,8 @@ void CffSubsetterContext::initialCffRead( void)
// assert( mnFontDictBase == tellRel());
mpReadPtr = mpBasePtr + mnFontDictBase;
mnFDAryCount = (mpReadPtr[0]<<8) + mpReadPtr[1];
- assert( mnFDAryCount < (int)(sizeof(maCffLocal)/sizeof(*maCffLocal)));
+ if (maCffLocal.size() < static_cast<size_t>(mnFDAryCount))
+ maCffLocal.resize(mnFDAryCount);
// read FDArray details to get access to the PRIVDICTs
for( int i = 0; i < mnFDAryCount; ++i) {
[openoffice] 03/06: Added new Japanese era Reiwa
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 9aef04a652366ecee3cc05221f8f01828523fb9c
Author: DiGro <di...@yahoo.co.uk>
AuthorDate: Thu Mar 4 16:05:44 2021 +0100
Added new Japanese era Reiwa
Thanks to a post on the forum (https://forum.openoffice.org/en/forum/viewtopic.php?f=9&p=507475&sid=fde4f7a1b5e8aeb78f60c0fb33bbe2d0#p507475)
it informs us that we probably missed the introduction of the new Japanese era on May, 1 2019
New era starts when a new emperor is inaugurated as was emperor Naruhito on May, 1 2019
Added the name of the new era 令和 (Reiwa) after the previous 平成 (Heisei) in
trunk/main/i18npool/source/localedata/data/ja_JP.xml.
Calc should now produce the new era when requested
(cherry picked from commit 2465dd0f352b9678c6d0db2b92e703e4794374c7)
---
main/i18npool/source/localedata/data/ja_JP.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/main/i18npool/source/localedata/data/ja_JP.xml b/main/i18npool/source/localedata/data/ja_JP.xml
index 2deb17e..7139146 100644
--- a/main/i18npool/source/localedata/data/ja_JP.xml
+++ b/main/i18npool/source/localedata/data/ja_JP.xml
@@ -466,6 +466,11 @@
<DefaultAbbrvName>平</DefaultAbbrvName>
<DefaultFullName>平成</DefaultFullName>
</Era>
+ <Era>
+ <EraID>Reiwa</EraID>
+ <DefaultAbbrvName>苓</DefaultAbbrvName>
+ <DefaultFullName>苓和</DefaultFullName>
+ </Era>
</Eras>
<StartDayOfWeek>
<DayID>sun</DayID>
[openoffice] 01/06: Add claws-mail to senddoc script
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 1748116db8f0d6e098990fc3e772679c618c4e4d
Author: mseidel <ms...@apache.org>
AuthorDate: Mon Mar 29 20:13:17 2021 +0200
Add claws-mail to senddoc script
(cherry picked from commit 14c7d0b58688bab6da803aa150471d9ea1fe2cbd)
---
main/shell/source/unix/misc/senddoc.sh | 154 ++++++++++++++++-----------------
1 file changed, 77 insertions(+), 77 deletions(-)
diff --git a/main/shell/source/unix/misc/senddoc.sh b/main/shell/source/unix/misc/senddoc.sh
index 7599dca..3f427c3 100644
--- a/main/shell/source/unix/misc/senddoc.sh
+++ b/main/shell/source/unix/misc/senddoc.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,30 +8,30 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
URI_ENCODE="`dirname "$0"`/uri-encode"
FOPTS=""
-# linux file utility needs -L option to resolve symlinks
+# Linux file utility needs -L option to resolve symlinks
if [ "`uname -s`" = "Linux" ]
then
FOPTS="-L"
fi
-# do not confuse the system mail clients with OOo and Java libraries
+# do not confuse the system mail clients with AOO and Java libraries
unset LD_LIBRARY_PATH
-# tries to locate the executable specified
+# tries to locate the executable specified
# as first parameter in the user's path.
which() {
if [ ! -z "$1" ]; then
@@ -44,7 +44,7 @@ which() {
fi
}
-# checks for the original mozilla start script(s)
+# checks for the original Mozilla start script(s)
# and restrict the "-remote" semantics to those.
run_mozilla() {
# find mozilla script in PATH if necessary
@@ -76,7 +76,7 @@ fi
case `basename "$MAILER" | sed 's/-.*$//'` in
iceape | mozilla | netscape | seamonkey | icedove | thunderbird)
-
+
while [ "$1" != "" ]; do
case $1 in
--to)
@@ -127,60 +127,60 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
if [ "$ATTACH" != "" ]; then
COMMAND=${COMMAND:-}${COMMAND:+,}attachment=\'${ATTACH}\'
fi
-
+
run_mozilla "$MAILER" "$COMMAND"
;;
-
- kmail)
-
- while [ "$1" != "" ]; do
- case $1 in
- --to)
- TO="${TO:-}${TO:+,}$2"
- shift
- ;;
- --cc)
- CC="${CC:-}${CC:+,}$2"
- shift
- ;;
- --bcc)
- BCC="${BCC:-}${BCC:+,}$2"
- shift
- ;;
- --subject)
- SUBJECT="$2"
- shift
- ;;
- --body)
- BODY="$2"
- shift
- ;;
- --from)
- FROM="$2"
- shift
- ;;
- --attach)
- ATTACH="${ATTACH:-}${ATTACH:+ }--attach "`echo "file://$2" | "${URI_ENCODE}"`
- shift
- ;;
- *)
- ;;
- esac
- shift;
- done
-
- ${MAILER} --composer \
- ${CC:+--cc} ${CC:+"${CC}"} \
- ${BCC:+--bcc} ${BCC:+"${BCC}"} \
- ${SUBJECT:+--subject} ${SUBJECT:+"${SUBJECT}"} \
- ${BODY:+--body} ${BODY:+"${BODY}"} \
- ${FROM:+--header} ${FROM:+"From: ${FROM}"} \
- ${ATTACH:+${ATTACH}} \
- ${TO:+"${TO}"}
- ;;
-
+
+ kmail)
+
+ while [ "$1" != "" ]; do
+ case $1 in
+ --to)
+ TO="${TO:-}${TO:+,}$2"
+ shift
+ ;;
+ --cc)
+ CC="${CC:-}${CC:+,}$2"
+ shift
+ ;;
+ --bcc)
+ BCC="${BCC:-}${BCC:+,}$2"
+ shift
+ ;;
+ --subject)
+ SUBJECT="$2"
+ shift
+ ;;
+ --body)
+ BODY="$2"
+ shift
+ ;;
+ --from)
+ FROM="$2"
+ shift
+ ;;
+ --attach)
+ ATTACH="${ATTACH:-}${ATTACH:+ }--attach "`echo "file://$2" | "${URI_ENCODE}"`
+ shift
+ ;;
+ *)
+ ;;
+ esac
+ shift;
+ done
+
+ ${MAILER} --composer \
+ ${CC:+--cc} ${CC:+"${CC}"} \
+ ${BCC:+--bcc} ${BCC:+"${BCC}"} \
+ ${SUBJECT:+--subject} ${SUBJECT:+"${SUBJECT}"} \
+ ${BODY:+--body} ${BODY:+"${BODY}"} \
+ ${FROM:+--header} ${FROM:+"From: ${FROM}"} \
+ ${ATTACH:+${ATTACH}} \
+ ${TO:+"${TO}"}
+ ;;
+
mutt)
-
+
while [ "$1" != "" ]; do
case $1 in
--from)
@@ -218,7 +218,7 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
esac
shift;
done
-
+
x-terminal-emulator -e ${MAILER} \
${FROM:+-e} ${FROM:+"set from=\"${FROM}\""} \
${CC:+-c} ${CC:+"${CC}"} \
@@ -229,9 +229,9 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
${TO:+"${TO}"} &
rm -f $BODY
;;
-
+
evolution)
-
+
while [ "$1" != "" ]; do
case $1 in
--to)
@@ -267,13 +267,13 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
esac
shift;
done
-
+
MAILTO="mailto:${TO}?${MAILTO}"
${MAILER} "${MAILTO}" &
;;
-
+
groupwise)
-
+
while [ "$1" != "" ]; do
case $1 in
--to)
@@ -309,13 +309,13 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
esac
shift;
done
-
+
MAILTO="mailto:${TO}?${MAILTO}"
${MAILER} "${MAILTO}" &
;;
dtmail)
-
+
while [ "$1" != "" ]; do
case $1 in
--to)
@@ -331,12 +331,12 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
esac
shift;
done
-
+
${MAILER} ${TO:+-T} ${TO:-} ${ATTACH:+-a} ${ATTACH:+"${ATTACH}"}
;;
- sylpheed | claws)
-
+ sylpheed | claws | claws-mail)
+
while [ "$1" != "" ]; do
case $1 in
--to)
@@ -352,7 +352,7 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
esac
shift;
done
-
+
${MAILER} ${TO:+--compose} "${TO:-}" ${ATTACH:+--attach} "${ATTACH:-}"
;;
@@ -374,7 +374,7 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
;;
"")
-
+
# DESKTOP_LAUNCH, see http://freedesktop.org/pipermail/xdg/2004-August/004489.html
if [ -n "$DESKTOP_LAUNCH" ]; then
while [ "$1" != "" ]; do
@@ -412,7 +412,7 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
esac
shift;
done
-
+
MAILTO="mailto:${TO}?${MAILTO}"
${DESKTOP_LAUNCH} "${MAILTO}" &
else
@@ -420,11 +420,11 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
exit 2
fi
;;
-
+
*)
echo "Unsupported mail client: `basename $MAILER | sed 's/-.*^//'`"
exit 2
;;
-esac
-
+esac
+
exit 0