diff options
| author | Rob Snelders <programming@ertai.nl> | 2012-07-05 20:45:15 +0200 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-07-06 14:04:01 +0400 |
| commit | b8c5f6577911ebb15ad7eb7f60ad5bb9d8d37f0b (patch) | |
| tree | d18a731c30a34975fc415a7d51c303538d142058 | |
| parent | 5eb74b1fcad83c605cc00e377460e0ae313d7277 (diff) | |
fdo#42986 - UI wide screen format (16:10): Add Page size
Change-Id: Ie769c9a65e85f91395b3495fadb6f5e688cbe9af
| -rw-r--r-- | cui/source/tabpages/page.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/page.h | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/page.src | 1 | ||||
| -rw-r--r-- | i18nutil/inc/i18nutil/paper.hxx | 5 | ||||
| -rw-r--r-- | 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 0c5ea75b806f..ecdc05f13c6d 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -997,7 +997,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 @@ -1408,7 +1408,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 58ebb4eba01f..7630200081c0 100644 --- a/cui/source/tabpages/page.h +++ b/cui/source/tabpages/page.h @@ -66,6 +66,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 0397b2d8c810..0026f9a6dd1a 100644 --- a/cui/source/tabpages/page.src +++ b/cui/source/tabpages/page.src @@ -470,6 +470,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 98b88bd6373d..65ebb3859c60 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 8f4fb919131e..e67cf7458109 100644 --- a/i18nutil/source/utility/paper.cxx +++ b/i18nutil/source/utility/paper.cxx @@ -154,7 +154,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 }; |