diff options
| author | Rob Snelders <programming@ertai.nl> | 2012-04-18 23:30:26 +0200 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-04-23 22:18:33 +0400 |
| commit | 9c99dac0968c405537cd6094a46c7f6de01ccc4e (patch) | |
| tree | 2c125552b168c666dc550288933f3318fc2b9be5 /cui | |
| parent | 67d022ac0ce5e67565e0589f4cd9eb05a8fd5a3c (diff) | |
fdo#42986 Add Presentationsize 16:9 Widescreen
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/page.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/page.h | 3 | ||||
| -rw-r--r-- | cui/source/tabpages/page.src | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index efa495bd26e8..417b311c99df 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -989,7 +989,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 == ePaper ); + sal_Bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )|| ( PAPER_SCREEN_16_9 == ePaper)); if ( !bScreen ) // no margin if screen @@ -1400,7 +1400,7 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) sal_uInt16 nPos = aPaperSizeBox.GetSelectEntryPos(); Paper ePaper = (Paper)(sal_uLong)aPaperSizeBox.GetEntryData( nPos ); - if ( ePaper != PAPER_SCREEN && IsMarginOutOfRange() ) + if ( ePaper != PAPER_SCREEN_4_3 && ePaper != PAPER_SCREEN_16_9 && 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 bc7ad78018a5..87858fee4579 100644 --- a/cui/source/tabpages/page.h +++ b/cui/source/tabpages/page.h @@ -54,7 +54,7 @@ #define PAPERSIZE_C65 16 #define PAPERSIZE_DL 17 #define PAPERSIZE_DIA 18 -#define PAPERSIZE_SCREEN 19 +#define PAPERSIZE_SCREEN_4_3 19 #define PAPERSIZE_C 20 #define PAPERSIZE_D 21 #define PAPERSIZE_E 22 @@ -74,6 +74,7 @@ #define PAPERSIZE_B6_JIS 36 #define PAPERSIZE_POSTCARD_JP 46 #define PAPERSIZE_A6 56 +#define PAPERSIZE_SCREEN_16_9 78 #endif diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src index 91873c7383fa..2137ff238808 100644 --- a/cui/source/tabpages/page.src +++ b/cui/source/tabpages/page.src @@ -452,7 +452,8 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW < "C5 Envelope" ; PAPERSIZE_C5 ; > ; < "C4 Envelope" ; PAPERSIZE_C4 ; > ; < "Dia Slide" ; PAPERSIZE_DIA ; > ; - < "Screen" ; PAPERSIZE_SCREEN ; > ; + < "Screen 4:3" ; PAPERSIZE_SCREEN_4_3 ; > ; + < "Screen 16:9" ; PAPERSIZE_SCREEN_16_9 ; > ; < "Japanese Postcard" ; PAPERSIZE_POSTCARD_JP; > ; }; }; |