pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-04-07 14:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

[de] Add bidi parameter to the paragraph properties

Browse Source
This commit is contained in:
KirillovIlya
2024-06-13 14:55:01 +03:00
committed by Ilya Kirillov
parent 9410980bd2
commit 1114c2a3b7
2 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/bidi/bidi-types.js
View File

@ -62,7 +62,7 @@
SS : 0x00400000, // Segment Separator
WS : 0x00800000, // WhiteSpace
FS : 0x01000000, // FIRST
FS : 0x01000000 // FIRST
};
@ -95,7 +95,7 @@
const DIRECTION = {
L : TYPE.L,
R : TYPE.R
}
};
//--------------------------------------------------------export----------------------------------------------------
AscBidi.FLAG = FLAG;
AscBidi.TYPE = TYPE;

40
word/Editor/Styles.js
View File

@ -15703,6 +15703,7 @@ CCalculatedFrame.prototype.GetFramePr = function()
function CParaPr()
{
this.Bidi = undefined;
this.ContextualSpacing = undefined; // Удалять ли интервал между параграфами одинакового стиля
this.Ind = new CParaInd(); // Отступы
this.Jc = undefined; // Прилегание параграфа
@ -15747,6 +15748,7 @@ CParaPr.prototype.Copy = function(bCopyPrChange, oPr)
{
var ParaPr = new CParaPr();
ParaPr.Bidi = this.Bidi;
ParaPr.ContextualSpacing = this.ContextualSpacing;
if (undefined != this.Ind)
@ -15863,6 +15865,9 @@ CParaPr.prototype.createDuplicateForSmartArt = function (bCopyPrChange, oPr) {
};
CParaPr.prototype.Merge = function(ParaPr)
{
if (undefined !== ParaPr.Bidi)
this.Bidi = ParaPr.Bidi;
if (undefined != ParaPr.ContextualSpacing)
this.ContextualSpacing = ParaPr.ContextualSpacing;
@ -16013,6 +16018,7 @@ CParaPr.prototype.Merge = function(ParaPr)
};
CParaPr.prototype.InitDefault = function(nCompatibilityMode)
{
this.Bidi = false;
this.ContextualSpacing = false;
this.Ind = new CParaInd();
this.Ind.Left = 0;
@ -16054,6 +16060,7 @@ CParaPr.prototype.InitDefault = function(nCompatibilityMode)
};
CParaPr.prototype.Set_FromObject = function(ParaPr)
{
this.Bidi = ParaPr.Bidi;
this.ContextualSpacing = ParaPr.ContextualSpacing;
this.Ind = new CParaInd();
@ -16186,6 +16193,9 @@ CParaPr.prototype.Compare = function(ParaPr)
// При сравнении добавляем 1 элемент Locked
var Result_ParaPr = new CParaPr();
Result_ParaPr.Locked = false;
if (ParaPr.Bidi === this.Bidi)
Result_ParaPr.Bidi = ParaPr.Bidi;
if (ParaPr.ContextualSpacing === this.ContextualSpacing)
Result_ParaPr.ContextualSpacing = ParaPr.ContextualSpacing;
@ -16466,6 +16476,12 @@ CParaPr.prototype.Write_ToBinary = function(Writer)
Writer.WriteBool(this.SuppressLineNumbers);
Flags |= 16777216;
}
if (undefined !== this.Bidi)
{
Writer.WriteBool(this.Bidi);
Flags |= (1 << 25);
}
var EndPos = Writer.GetCurPosition();
Writer.Seek(StartPos);
@ -16598,6 +16614,9 @@ CParaPr.prototype.Read_FromBinary = function(Reader)
if (Flags & 16777216)
this.SuppressLineNumbers = Reader.GetBool();
if (Flags & (1 << 25))
this.Bidi = Reader.GetBool();
};
CParaPr.prototype.isEqual = function(ParaPrUOld,ParaPrNew)
{
@ -16644,7 +16663,9 @@ CParaPr.prototype.Is_Equal = function(ParaPr)
|| this.PStyle !== ParaPr.PStyle
|| true !== IsEqualStyleObjects(this.FramePr, ParaPr.FramePr)
|| this.OutlineLvl !== ParaPr.OutlineLvl
|| this.SuppressLineNumbers !== ParaPr.SuppressLineNumbers);
|| this.SuppressLineNumbers !== ParaPr.SuppressLineNumbers
|| this.Bidi !== ParaPr.Bidi
);
};
CParaPr.prototype.IsEqual = function(paraPr)
{
@ -16721,6 +16742,9 @@ CParaPr.prototype.GetDiff = function(oParaPr)
if (this.SuppressLineNumbers !== oParaPr.SuppressLineNumbers)
oResultParaPr.SuppressLineNumbers = this.SuppressLineNumbers;
if (this.Bidi !== oParaPr.Bidi)
oResultParaPr.Bidi = this.Bidi;
return oResultParaPr;
};
@ -16852,7 +16876,9 @@ CParaPr.prototype.Is_Empty = function(oPr)
|| undefined !== this.NumPr
|| undefined !== this.PStyle
|| undefined !== this.OutlineLvl
|| undefined !== this.SuppressLineNumbers);
|| undefined !== this.SuppressLineNumbers
|| undefined !== this.Bidi
);
};
CParaPr.prototype.IsEmpty = function()
{
@ -16944,6 +16970,14 @@ CParaPr.prototype.RemovePrChange = function()
delete this.PrChange;
delete this.ReviewInfo;
};
CParaPr.prototype.GetBidi = function()
{
return this.Bidi;
};
CParaPr.prototype.SetBidi = function(isBidi)
{
this.Bidi = isBidi;
};
CParaPr.prototype.GetContextualSpacing = function()
{
return this.ContextualSpacing;
@ -17136,6 +17170,8 @@ CParaPr.prototype.CheckBorderSpaces = function()
//----------------------------------------------------------------------------------------------------------------------
// CParaPr Export
//----------------------------------------------------------------------------------------------------------------------
CParaPr.prototype['get_Bidi'] = CParaPr.prototype.get_Bidi = CParaPr.prototype['Get_Bidi'] = CParaPr.prototype.GetBidi;
CParaPr.prototype['put_Bidi'] = CParaPr.prototype.put_Bidi = CParaPr.prototype.SetBidi;
CParaPr.prototype['get_ContextualSpacing'] = CParaPr.prototype.get_ContextualSpacing = CParaPr.prototype['Get_ContextualSpacing'] = CParaPr.prototype.GetContextualSpacing;
CParaPr.prototype['put_ContextualSpacing'] = CParaPr.prototype.put_ContextualSpacing = CParaPr.prototype.SetContextualSpacing;
CParaPr.prototype['get_IndLeft'] = CParaPr.prototype.get_IndLeft = CParaPr.prototype['Get_IndLeft'] = CParaPr.prototype.GetIndLeft;