From 6731193a9be9be4db9d36c526d0611375570d88d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 11 Apr 2024 22:02:41 +0300 Subject: [PATCH 1/3] [SSE] For bug 67084 --- apps/spreadsheeteditor/main/app/view/FileMenuPanels.js | 4 ++-- apps/spreadsheeteditor/main/app/view/PrintSettings.js | 4 ++-- apps/spreadsheeteditor/main/app/view/Toolbar.js | 8 ++++---- .../mobile/src/store/spreadsheetSettings.js | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index ca430a6299..1c4cce7009 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -2599,10 +2599,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:'305|487', displayValue:['Super B/A3', '30,5', '48,7', 'cm'], caption: 'Super B/A3'} ], dataHint: '2', dataHintDirection: 'bottom', diff --git a/apps/spreadsheeteditor/main/app/view/PrintSettings.js b/apps/spreadsheeteditor/main/app/view/PrintSettings.js index 53ab1b9e8d..65bea46c1d 100644 --- a/apps/spreadsheeteditor/main/app/view/PrintSettings.js +++ b/apps/spreadsheeteditor/main/app/view/PrintSettings.js @@ -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:'305|487', displayValue:'Super B/A3 (30,5 cm x 48,7 cm)', caption: 'Super B/A3'} ] }); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 2fcf3e8160..d0043ac3de 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1974,11 +1974,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', @@ -1998,11 +1998,11 @@ define([ }, { 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] } ] }), diff --git a/apps/spreadsheeteditor/mobile/src/store/spreadsheetSettings.js b/apps/spreadsheeteditor/mobile/src/store/spreadsheetSettings.js index 9d2757b448..fa71f306fb 100644 --- a/apps/spreadsheeteditor/mobile/src/store/spreadsheetSettings.js +++ b/apps/spreadsheeteditor/mobile/src/store/spreadsheetSettings.js @@ -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: '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] }, From 96a606e1d7ec12f30ecb6838599f24dbdc23c598 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 21 May 2024 22:46:04 +0300 Subject: [PATCH 2/3] [SSE] Fix envelope choukei 3 page size --- apps/presentationeditor/main/app/view/FileMenuPanels.js | 2 +- apps/spreadsheeteditor/main/app/view/FileMenuPanels.js | 2 +- apps/spreadsheeteditor/main/app/view/Toolbar.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index cd5d0e0eb1..3d8cb31630 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -2126,7 +2126,7 @@ define([ { 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: 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: 11, displayValue: ['Envelope Choukei 3', '12', '23,5', 'cm'], caption: 'Envelope Choukei 3', size: [120, 235]}, { value: 12, displayValue: ['Super B/A3', '33,02', '48,25', 'cm'], caption: 'Super B/A3', size: [330.2, 482.5]}, { 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]}, diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 1c4cce7009..5549118acc 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -2601,7 +2601,7 @@ define([ {value:'297|420', displayValue:['A3', '29,7', '42', 'cm'], caption: 'A3'}, {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:'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', diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index d0043ac3de..240148dcb2 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1990,11 +1990,11 @@ 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', From 12e8f83b43d6ab90f95acc5c65eedf46d02ada60 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 21 May 2024 23:26:12 +0300 Subject: [PATCH 3/3] Bug 67084: fix page size --- apps/documenteditor/main/app/view/FileMenuPanels.js | 6 +++--- apps/documenteditor/main/app/view/PageSizeDialog.js | 6 +++--- apps/documenteditor/main/app/view/Toolbar.js | 12 ++++++------ .../mobile/src/store/documentSettings.js | 6 +++--- apps/pdfeditor/main/app/view/FileMenuPanels.js | 6 +++--- .../main/app/view/FileMenuPanels.js | 4 ++-- .../main/app/view/FileMenuPanels.js | 2 +- .../spreadsheeteditor/main/app/view/PrintSettings.js | 2 +- .../mobile/src/store/spreadsheetSettings.js | 4 ++-- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 2c9c6731c7..d8e1c316d8 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -2678,10 +2678,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]}, diff --git a/apps/documenteditor/main/app/view/PageSizeDialog.js b/apps/documenteditor/main/app/view/PageSizeDialog.js index 15dee7caee..505f99d984 100644 --- a/apps/documenteditor/main/app/view/PageSizeDialog.js +++ b/apps/documenteditor/main/app/view/PageSizeDialog.js @@ -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]}, diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index bcc39f2e6a..2d6d20c85f 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1238,11 +1238,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', @@ -1254,19 +1254,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'} diff --git a/apps/documenteditor/mobile/src/store/documentSettings.js b/apps/documenteditor/mobile/src/store/documentSettings.js index 50a73a764e..bd01303c4a 100644 --- a/apps/documenteditor/mobile/src/store/documentSettings.js +++ b/apps/documenteditor/mobile/src/store/documentSettings.js @@ -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] }, diff --git a/apps/pdfeditor/main/app/view/FileMenuPanels.js b/apps/pdfeditor/main/app/view/FileMenuPanels.js index 3c1e0ad93b..bf87837e76 100644 --- a/apps/pdfeditor/main/app/view/FileMenuPanels.js +++ b/apps/pdfeditor/main/app/view/FileMenuPanels.js @@ -2373,10 +2373,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]}, diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 3d8cb31630..99781f2b0a 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -2124,10 +2124,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', '12', '23,5', 'cm'], caption: 'Envelope Choukei 3', size: [120, 235]}, - { value: 12, displayValue: ['Super B/A3', '33,02', '48,25', 'cm'], caption: 'Super B/A3', size: [330.2, 482.5]}, + { 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]}, diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 5549118acc..33fc3fe507 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -2601,7 +2601,7 @@ define([ {value:'297|420', displayValue:['A3', '29,7', '42', 'cm'], caption: 'A3'}, {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:'120|235', displayValue:['Envelope Choukei 3', '12', '23,5', 'cm'], caption: 'Envelope Choukei 3'}, + {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', diff --git a/apps/spreadsheeteditor/main/app/view/PrintSettings.js b/apps/spreadsheeteditor/main/app/view/PrintSettings.js index 65bea46c1d..039ff18a68 100644 --- a/apps/spreadsheeteditor/main/app/view/PrintSettings.js +++ b/apps/spreadsheeteditor/main/app/view/PrintSettings.js @@ -163,7 +163,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', {value:'297|420', displayValue:'A3 (29,7 cm x 42 cm)', caption: 'A3'}, {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:'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'} ] }); diff --git a/apps/spreadsheeteditor/mobile/src/store/spreadsheetSettings.js b/apps/spreadsheeteditor/mobile/src/store/spreadsheetSettings.js index fa71f306fb..9bb7fce791 100644 --- a/apps/spreadsheeteditor/mobile/src/store/spreadsheetSettings.js +++ b/apps/spreadsheeteditor/mobile/src/store/spreadsheetSettings.js @@ -48,8 +48,8 @@ export class storeSpreadsheetSettings { { caption: 'A3', subtitle: '29,7 ' + txtCm + ' x 42 ' + txtCm, value: [297, 420] }, { 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: '30,5 ' + txtCm + ' x 48,7 ' + txtCm, value: [305, 487] }, + { 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] },