Attachment 63363 Details for Bug 42986 – Patch to have 16:10 format in Impress

[patch] Patch to have 16:10 format in Impress

0001-fdo-42986-UI-wide-screen-format-16-10-Add-Page-size.patch (text/plain), 3.78 KB, created by Rob Snelders on 2012-06-22 12:58:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Snelders

Created: 2012-06-22 12:58:41 UTC

Size: 3.78 KB

patch

obsolete

>From 16b3dcc06b3e4c13303c0d2aa831f356f00dd181 Mon Sep 17 00:00:00 2001
>From: Rob Snelders <programming@ertai.nl>
>Date: Fri, 22 Jun 2012 21:23:01 +0200
>Subject: [PATCH] fdo#42986 UI wide screen format (16:10): Add Page size
>
>Change-Id: Ibc246b782f6b51321c5e60b2c4d5039ba9c6c5b6
>---
> cui/source/tabpages/page.cxx      |    4 ++--
> cui/source/tabpages/page.h        |    1 +
> cui/source/tabpages/page.src      |    1 +
> i18nutil/inc/i18nutil/paper.hxx   |    5 +++--
> i18nutil/source/utility/paper.cxx |    3 ++-
> 5 files changed, 9 insertions(+), 5 deletions(-)
>
>diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
>index b30d45d..f42ed55 100644
>--- a/cui/source/tabpages/page.cxx
>+++ b/cui/source/tabpages/page.cxx
>@@ -988,7 +988,7 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox )
>         {
>             // Draw: if paper format the margin shall be 1 cm
>             long nTmp = 0;
>-            sal_Bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )|| ( PAPER_SCREEN_16_9 == ePaper));
>+            sal_Bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )||( PAPER_SCREEN_16_9 == ePaper)||( PAPER_SCREEN_16_10 == ePaper));
> 
>             if ( !bScreen )
>                 // no margin if screen
>@@ -1399,7 +1399,7 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
>     sal_uInt16 nPos = aPaperSizeBox.GetSelectEntryPos();
>     Paper ePaper = (Paper)(sal_uLong)aPaperSizeBox.GetEntryData( nPos );
> 
>-    if ( ePaper != PAPER_SCREEN_4_3 && ePaper != PAPER_SCREEN_16_9 && IsMarginOutOfRange() )
>+    if ( ePaper != PAPER_SCREEN_4_3 && ePaper != PAPER_SCREEN_16_9 && ePaper != PAPER_SCREEN_16_10 && IsMarginOutOfRange() )
>     {
>         if ( QueryBox( this, WB_YES_NO | WB_DEF_NO, aPrintRangeQueryText ).Execute() == RET_NO )
>         {
>diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h
>index 87858fe..c539b6c 100644
>--- a/cui/source/tabpages/page.h
>+++ b/cui/source/tabpages/page.h
>@@ -75,6 +75,7 @@
> #define PAPERSIZE_POSTCARD_JP   46
> #define PAPERSIZE_A6            56
> #define PAPERSIZE_SCREEN_16_9   78
>+#define PAPERSIZE_SCREEN_16_10  79
> 
> #endif
> 
>diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
>index 367c98a..6ac1eae 100644
>--- a/cui/source/tabpages/page.src
>+++ b/cui/source/tabpages/page.src
>@@ -454,6 +454,7 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
>         < "Dia Slide" ; PAPERSIZE_DIA ; > ;
>         < "Screen 4:3" ; PAPERSIZE_SCREEN_4_3 ; > ;
>         < "Screen 16:9" ; PAPERSIZE_SCREEN_16_9 ; > ;
>+	< "Screen 16:10" ; PAPERSIZE_SCREEN_16_10 ; > ;
>         < "Japanese Postcard" ; PAPERSIZE_POSTCARD_JP; > ;
>     };
> };
>diff --git a/i18nutil/inc/i18nutil/paper.hxx b/i18nutil/inc/i18nutil/paper.hxx
>index 98b88bd..65ebb38 100644
>--- a/i18nutil/inc/i18nutil/paper.hxx
>+++ b/i18nutil/inc/i18nutil/paper.hxx
>@@ -117,11 +117,12 @@ enum Paper
>     PAPER_ARCHC,
>     PAPER_ARCHD,
>     PAPER_ARCHE,
>-    PAPER_SCREEN_16_9
>+    PAPER_SCREEN_16_9,
>+    PAPER_SCREEN_16_10
> };
> 
> // defined for 'equal size' test with the implementation array
>-#define NUM_PAPER_ENTRIES   (PAPER_SCREEN_16_9 - PAPER_A0 + 1)
>+#define NUM_PAPER_ENTRIES   (PAPER_SCREEN_16_10 - PAPER_A0 + 1)
> 
> // ---------
> // - Paper -
>diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx
>index 0f6b813..e7ee05d 100644
>--- a/i18nutil/source/utility/paper.cxx
>+++ b/i18nutil/source/utility/paper.cxx
>@@ -156,7 +156,8 @@ static PageDesc aDinTab[] =
>     { IN2MM100( 18 ),    IN2MM100( 24 ),     "ARCHC",  NULL },
>     { IN2MM100( 24 ),    IN2MM100( 36 ),     "ARCHD",  NULL },
>     { IN2MM100( 36 ),    IN2MM100( 48 ),     "ARCHE",  NULL },
>-    { MM2MM100( 157.5),  MM2MM100( 280 ),    NULL,  NULL } //Screen 16:9
>+    { MM2MM100( 157.5),  MM2MM100( 280 ),    NULL,  NULL }, //Screen 16:9
>+    { MM2MM100( 175 ),   MM2MM100( 280 ),    NULL,  NULL }  //Screen 16:10
> 
> };
> 
>-- 
>1.7.9.5
>

Actions: View

Attachments on bug 42986: 63363