Skip to content

Commit

Permalink
Merge pull request #3002 from ONLYOFFICE/fix/bug-67084
Browse files Browse the repository at this point in the history 
Fix/bug 67084
  • Loading branch information
@JuliaRadzhabova
JuliaRadzhabova authored May 21, 2024
2 parents 9a6b84c + 12e8f83 commit b24dcc4
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 36 deletions.
6 changes: 3 additions & 3 deletions apps/documenteditor/main/app/view/FileMenuPanels.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2711,10 +2711,10 @@ define([
{ value: 6, displayValue: ['Envelope DL', '11', '22', 'cm'], caption: 'Envelope DL', size: [110, 220]},
{ value: 7, displayValue: ['Tabloid', '27,94', '43,18', 'cm'], caption: 'Tabloid', size: [279.4, 431.8]},
{ value: 8, displayValue: ['A3', '29,7', '42', 'cm'], caption: 'A3', size: [297, 420]},
{ value: 9, displayValue: ['Tabloid Oversize', '30,48', '45,71', 'cm'], caption: 'Tabloid Oversize', size: [304.8, 457.1]},
{ value: 9, displayValue: ['Tabloid Oversize', '29,69', '45,72', 'cm'], caption: 'Tabloid Oversize', size: [296.9, 457.2]},
{ value: 10, displayValue: ['ROC 16K', '19,68', '27,3', 'cm'], caption: 'ROC 16K', size: [196.8, 273]},
{ value: 11, displayValue: ['Envelope Choukei 3', '11,99', '23,49', 'cm'], caption: 'Envelope Choukei 3', size: [119.9, 234.9]},
{ value: 12, displayValue: ['Super B/A3', '33,02', '48,25', 'cm'], caption: 'Super B/A3', size: [330.2, 482.5]},
{ value: 11, displayValue: ['Envelope Choukei 3', '12', '23,5', 'cm'], caption: 'Envelope Choukei 3', size: [120, 235]},
{ value: 12, displayValue: ['Super B/A3', '30,5', '48,7', 'cm'], caption: 'Super B/A3', size: [305, 487]},
{ value: 13, displayValue: ['A4', '84,1', '118,9', 'cm'], caption: 'A0', size: [841, 1189]},
{ value: 14, displayValue: ['A4', '59,4', '84,1', 'cm'], caption: 'A1', size: [594, 841]},
{ value: 16, displayValue: ['A4', '42', '59,4', 'cm'], caption: 'A2', size: [420, 594]},
Expand Down
6 changes: 3 additions & 3 deletions apps/documenteditor/main/app/view/PageSizeDialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@ define([
{ value: 6, displayValue: 'Envelope DL', size: [110, 220]},
{ value: 7, displayValue: 'Tabloid', size: [279.4, 431.8]},
{ value: 8, displayValue: 'A3', size: [297, 420]},
{ value: 9, displayValue: 'Tabloid Oversize', size: [304.8, 457.1]},
{ value: 9, displayValue: 'Tabloid Oversize', size: [296.9, 457.2]},
{ value: 10, displayValue: 'ROC 16K', size: [196.8, 273]},
{ value: 11, displayValue: 'Envelope Choukei 3', size: [119.9, 234.9]},
{ value: 12, displayValue: 'Super B/A3', size: [330.2, 482.5]},
{ value: 11, displayValue: 'Envelope Choukei 3', size: [120, 235]},
{ value: 12, displayValue: 'Super B/A3', size: [305, 487]},
{ value: 13, displayValue: 'A0', size: [841, 1189]},
{ value: 14, displayValue: 'A1', size: [594, 841]},
{ value: 16, displayValue: 'A2', size: [420, 594]},
Expand Down
12 changes: 6 additions & 6 deletions apps/documenteditor/main/app/view/Toolbar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1338,11 +1338,11 @@ define([
},
{
caption: 'Tabloid Oversize',
subtitle: '30,48cm x 45,71cm',
subtitle: '29,69cm x 45,72cm',
template: pageSizeTemplate,
checkable: true,
toggleGroup: 'menuPageSize',
value: [304.8, 457.1]
value: [296.9, 457.2]
},
{
caption: 'ROC 16K',
Expand All @@ -1354,19 +1354,19 @@ define([
},
{
caption: 'Envelope Choukei 3',
subtitle: '11,99cm x 23,49cm',
subtitle: '12cm x 23,5',
template: pageSizeTemplate,
checkable: true,
toggleGroup: 'menuPageSize',
value: [119.9, 234.9]
value: [120, 235]
},
{
caption: 'Super B/A3',
subtitle: '33,02cm x 48,25cm',
subtitle: '30,5cm x 48,7cm',
template: pageSizeTemplate,
checkable: true,
toggleGroup: 'menuPageSize',
value: [330.2, 482.5]
value: [305, 487]
},
{caption: '--'},
{caption: this.textPageSizeCustom, value: 'advanced'}
Expand Down
6 changes: 3 additions & 3 deletions apps/documenteditor/mobile/src/store/documentSettings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ export class storeDocumentSettings {
{ caption: 'Envelope DL', subtitle: '11 ' + txtCm + ' x 22 ' + txtCm, value: [110, 220] },
{ caption: 'Tabloid', subtitle: '27,94 ' + txtCm + ' x 43,18 ' + txtCm, value: [279.4, 431.8] },
{ caption: 'A3', subtitle: '29,7 ' + txtCm + ' x 42 ' + txtCm, value: [297, 420] },
{ caption: 'Tabloid Oversize', subtitle: '30,48 ' + txtCm + ' x 45,71 ' + txtCm, value: [304.8, 457.1] },
{ caption: 'Tabloid Oversize', subtitle: '29,69 ' + txtCm + ' x 45,72 ' + txtCm, value: [296.9, 457.2] },
{ caption: 'ROC 16K', subtitle: '19,68 ' + txtCm + ' x 27,3 ' + txtCm, value: [196.8, 273] },
{ caption: 'Envelope Choukei 3', subtitle: '11,99 ' + txtCm + ' x 23,49 ' + txtCm, value: [119.9, 234.9] },
{ caption: 'Super B/A3', subtitle: '33,02 ' + txtCm + ' x 48,25 ' + txtCm, value: [330.2, 482.5] },
{ caption: 'Envelope Choukei 3', subtitle: '12 ' + txtCm + ' x 23,5 ' + txtCm, value: [120, 235] },
{ caption: 'Super B/A3', subtitle: '30,5 ' + txtCm + ' x 48,7 ' + txtCm, value: [305, 487] },
{ caption: 'A0', subtitle: '84,1 ' + txtCm + ' x 118,9 ' + txtCm, value: [841, 1189] },
{ caption: 'A1', subtitle: '59,4 ' + txtCm + ' x 84,1 ' + txtCm, value: [594, 841] },
{ caption: 'A2', subtitle: '42 ' + txtCm + ' x 59,4 ' + txtCm, value: [420, 594] },
Expand Down
6 changes: 3 additions & 3 deletions apps/pdfeditor/main/app/view/FileMenuPanels.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2416,10 +2416,10 @@ define([
{ value: 6, displayValue: ['Envelope DL', '11', '22', 'cm'], caption: 'Envelope DL', size: [110, 220]},
{ value: 7, displayValue: ['Tabloid', '27,94', '43,18', 'cm'], caption: 'Tabloid', size: [279.4, 431.8]},
{ value: 8, displayValue: ['A3', '29,7', '42', 'cm'], caption: 'A3', size: [297, 420]},
{ value: 9, displayValue: ['Tabloid Oversize', '30,48', '45,71', 'cm'], caption: 'Tabloid Oversize', size: [304.8, 457.1]},
{ value: 9, displayValue: ['Tabloid Oversize', '29,69', '45,72', 'cm'], caption: 'Tabloid Oversize', size: [296.9, 457.2]},
{ value: 10, displayValue: ['ROC 16K', '19,68', '27,3', 'cm'], caption: 'ROC 16K', size: [196.8, 273]},
{ value: 11, displayValue: ['Envelope Choukei 3', '11,99', '23,49', 'cm'], caption: 'Envelope Choukei 3', size: [119.9, 234.9]},
{ value: 12, displayValue: ['Super B/A3', '33,02', '48,25', 'cm'], caption: 'Super B/A3', size: [330.2, 482.5]},
{ value: 11, displayValue: ['Envelope Choukei 3', '12', '23,5', 'cm'], caption: 'Envelope Choukei 3', size: [120, 235]},
{ value: 12, displayValue: ['Super B/A3', '30,5', '48,7', 'cm'], caption: 'Super B/A3', size: [305, 487]},
{ value: 13, displayValue: ['A4', '84,1', '118,9', 'cm'], caption: 'A0', size: [841, 1189]},
{ value: 14, displayValue: ['A4', '59,4', '84,1', 'cm'], caption: 'A1', size: [594, 841]},
{ value: 16, displayValue: ['A4', '42', '59,4', 'cm'], caption: 'A2', size: [420, 594]},
Expand Down
6 changes: 3 additions & 3 deletions apps/presentationeditor/main/app/view/FileMenuPanels.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2161,10 +2161,10 @@ define([
{ value: 6, displayValue: ['Envelope DL', '11', '22', 'cm'], caption: 'Envelope DL', size: [110, 220]},
{ value: 7, displayValue: ['Tabloid', '27,94', '43,18', 'cm'], caption: 'Tabloid', size: [279.4, 431.8]},
{ value: 8, displayValue: ['A3', '29,7', '42', 'cm'], caption: 'A3', size: [297, 420]},
{ value: 9, displayValue: ['Tabloid Oversize', '30,48', '45,71', 'cm'], caption: 'Tabloid Oversize', size: [304.8, 457.1]},
{ value: 9, displayValue: ['Tabloid Oversize', '29,69', '45,72', 'cm'], caption: 'Tabloid Oversize', size: [296.9, 457.2]},
{ value: 10, displayValue: ['ROC 16K', '19,68', '27,3', 'cm'], caption: 'ROC 16K', size: [196.8, 273]},
{ value: 11, displayValue: ['Envelope Choukei 3', '11,99', '23,49', 'cm'], caption: 'Envelope Choukei 3', size: [119.9, 234.9]},
{ value: 12, displayValue: ['Super B/A3', '33,02', '48,25', 'cm'], caption: 'Super B/A3', size: [330.2, 482.5]},
{ value: 11, displayValue: ['Envelope Choukei 3', '12', '23,5', 'cm'], caption: 'Envelope Choukei 3', size: [120, 235]},
{ value: 12, displayValue: ['Super B/A3', '30,5', '48,7', 'cm'], caption: 'Super B/A3', size: [305, 487]},
{ value: 13, displayValue: ['A4', '84,1', '118,9', 'cm'], caption: 'A0', size: [841, 1189]},
{ value: 14, displayValue: ['A4', '59,4', '84,1', 'cm'], caption: 'A1', size: [594, 841]},
{ value: 16, displayValue: ['A4', '42', '59,4', 'cm'], caption: 'A2', size: [420, 594]},
Expand Down
6 changes: 3 additions & 3 deletions apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2639,10 +2639,10 @@ define([
{value:'110|220', displayValue:['Envelope DL', '11', '22', 'cm'], caption: 'Envelope DL'},
{value:'279.4|431.8', displayValue:['Tabloid', '27,94', '43,18', 'cm'], caption: 'Tabloid'},
{value:'297|420', displayValue:['A3', '29,7', '42', 'cm'], caption: 'A3'},
{value:'304.8|457.1', displayValue:['Tabloid Oversize', '30,48', '45,71', 'cm'], caption: 'Tabloid Oversize'},
{value:'296.9|457.2', displayValue:['Tabloid Oversize', '29,69', '45,72', 'cm'], caption: 'Tabloid Oversize'},
{value:'196.8|273', displayValue:['ROC 16K', '19,68', '27,3', 'cm'], caption: 'ROC 16K'},
{value:'119.9|234.9', displayValue:['Envelope Choukei 3', '11,99', '23,49', 'cm'], caption: 'Envelope Choukei 3'},
{value:'330.2|482.5', displayValue:['Super B/A3', '33,02', '48,25', 'cm'], caption: 'Super B/A3'}
{value:'120|235', displayValue:['Envelope Choukei 3', '12', '23,5', 'cm'], caption: 'Envelope Choukei 3'},
{value:'305|487', displayValue:['Super B/A3', '30,5', '48,7', 'cm'], caption: 'Super B/A3'}
],
dataHint: '2',
dataHintDirection: 'bottom',
Expand Down
6 changes: 3 additions & 3 deletions apps/spreadsheeteditor/main/app/view/PrintSettings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,10 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
{value:'110|220', displayValue:'Envelope DL (11 cm x 22 cm)', caption: 'Envelope DL'},
{value:'279.4|431.8', displayValue:'Tabloid (27,94 cm x 43,18 cm)', caption: 'Tabloid'},
{value:'297|420', displayValue:'A3 (29,7 cm x 42 cm)', caption: 'A3'},
{value:'304.8|457.1', displayValue:'Tabloid Oversize (30,48 cm x 45,71 cm)', caption: 'Tabloid Oversize'},
{value:'296.9|457.2', displayValue:'Tabloid Oversize (29,69 cm x 45,72 cm)', caption: 'Tabloid Oversize'},
{value:'196.8|273', displayValue:'ROC 16K (19,68 cm x 27,3 cm)', caption: 'ROC 16K'},
{value:'119.9|234.9', displayValue:'Envelope Choukei 3 (11,99 cm x 23,49 cm)', caption: 'Envelope Choukei 3'},
{value:'330.2|482.5', displayValue:'Super B/A3 (33,02 cm x 48,25 cm)', caption: 'Super B/A3'}
{value:'120|235', displayValue:'Envelope Choukei 3 (12 cm x 23,5 cm)', caption: 'Envelope Choukei 3'},
{value:'305|487', displayValue:'Super B/A3 (30,5 cm x 48,7 cm)', caption: 'Super B/A3'}
]
});

Expand Down
12 changes: 6 additions & 6 deletions apps/spreadsheeteditor/main/app/view/Toolbar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1982,11 +1982,11 @@ define([
},
{
caption: 'Tabloid Oversize',
subtitle: '30,48cm x 45,71cm',
subtitle: '29,69cm x 45,72cm',
template: pageSizeTemplate,
checkable: true,
toggleGroup: 'menuPageSize',
value: [304.8, 457.1]
value: [296.9, 457.2]
},
{
caption: 'ROC 16K',
Expand All @@ -1998,19 +1998,19 @@ define([
},
{
caption: 'Envelope Choukei 3',
subtitle: '11,99cm x 23,49cm',
subtitle: '12cm x 23,5cm',
template: pageSizeTemplate,
checkable: true,
toggleGroup: 'menuPageSize',
value: [119.9, 234.9]
value: [120, 235]
},
{
caption: 'Super B/A3',
subtitle: '33,02cm x 48,25cm',
subtitle: '30,5cm x 48,7cm',
template: pageSizeTemplate,
checkable: true,
toggleGroup: 'menuPageSize',
value: [330.2, 482.5]
value: [305, 487]
}
]
}),
Expand Down
6 changes: 3 additions & 3 deletions apps/spreadsheeteditor/mobile/src/store/spreadsheetSettings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ export class storeSpreadsheetSettings {
{ caption: 'Envelope DL', subtitle: '11 ' + txtCm + ' x 22 ' + txtCm, value: [110, 220] },
{ caption: 'Tabloid', subtitle: '27,94 ' + txtCm + ' x 43,18 ' + txtCm, value: [279.4, 431.8] },
{ caption: 'A3', subtitle: '29,7 ' + txtCm + ' x 42 ' + txtCm, value: [297, 420] },
{ caption: 'Tabloid Oversize', subtitle: '30,48 ' + txtCm + ' x 45,71 ' + txtCm, value: [304.8, 457.1] },
{ caption: 'Tabloid Oversize', subtitle: '29,69 ' + txtCm + ' x 45,72 ' + txtCm, value: [296.9, 457.2] },
{ caption: 'ROC 16K', subtitle: '19,68 ' + txtCm + ' x 27,3 ' + txtCm, value: [196.8, 273] },
{ caption: 'Envelope Choukei 3', subtitle: '11,99 ' + txtCm + ' x 23,49 ' + txtCm, value: [119.9, 234.9] },
{ caption: 'Super B/A3', subtitle: '33,02 ' + txtCm + ' x 48,25 ' + txtCm, value: [330.2, 482.5] },
{ caption: 'Envelope Choukei 3', subtitle: '12 ' + txtCm + ' x 23,5 ' + txtCm, value: [120, 235] },
{ caption: 'Super B/A3', subtitle: '30,5 ' + txtCm + ' x 48,7 ' + txtCm, value: [305, 487] },
{ caption: 'A0', subtitle: '84,1 ' + txtCm + ' x 118,9 ' + txtCm, value: [841, 1189] },
{ caption: 'A1', subtitle: '59,4 ' + txtCm + ' x 84,1 ' + txtCm, value: [594, 841] },
{ caption: 'A2', subtitle: '42 ' + txtCm + ' x 59,4 ' + txtCm, value: [420, 594] },
Expand Down

0 comments on commit b24dcc4

Please sign in to comment.