diff options
| author | Jun NOGATA <nogajun@gmail.com> | 2021-05-29 18:07:12 +0900 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-13 13:05:34 +0200 |
| commit | 6d4a1716624a8a045ff4e90bd221b563be44be11 (patch) | |
| tree | a887011549aea1ed13df952d1909fd7b30cf4b98 /cui | |
| parent | f62b88e7ccc46c77364a489c981a1024118aed7a (diff) | |
Add PowerPoint compatible screen size for Impress
I realized that Impress does not have the same screen
size as PowerPoint. tdf#142286, tdf#142288
When I load a PowerPoint slide into Impress,
it was a custom size, but when I add this screen size,
it shows up with the screen size name.
And when I load a slide with the added screen size
into PowerPoint, it also shows up with the PowerPoint
preset screen size name and not the custom size.
The screen sizes I have added are as follows
* Widescreen (Current PowerPoint default)
* On-scren Show (4:3)
* On-scren Show (16:9) (Google slide defualt)
* On-scren Show (16:10)
Change-Id: I33e2bbc36b2c92ecbb85c610c864f735bf540d03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116374
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/page.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 71df320eb902..d7bc0cc6a9d7 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -968,7 +968,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeSelect_Impl, weld::ComboBox&, void) // Draw: if paper format the margin shall be 1 cm tools::Long nTmp = 0; - bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )||( PAPER_SCREEN_16_9 == ePaper)||( PAPER_SCREEN_16_10 == ePaper)); + bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )||( PAPER_SCREEN_16_9 == ePaper)||( PAPER_SCREEN_16_10 == ePaper)||( PAPER_WIDESCREEN == ePaper)||( PAPER_ONSCREENSHOW_4_3 == ePaper)||( PAPER_ONSCREENSHOW_16_9 == ePaper)||( PAPER_ONSCREENSHOW_16_10 == ePaper)); if ( !bScreen ) // no margin if screen @@ -1367,7 +1367,7 @@ DeactivateRC SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) // If not, stay on the TabPage. Paper ePaper = m_xPaperSizeBox->get_active_id(); - if ( ePaper != PAPER_SCREEN_4_3 && ePaper != PAPER_SCREEN_16_9 && ePaper != PAPER_SCREEN_16_10 && IsMarginOutOfRange() ) + if ( ePaper != PAPER_SCREEN_4_3 && ePaper != PAPER_SCREEN_16_9 && ePaper != PAPER_SCREEN_16_10 && ePaper != PAPER_WIDESCREEN && ePaper != PAPER_ONSCREENSHOW_4_3 && ePaper != PAPER_ONSCREENSHOW_16_9 && ePaper != PAPER_ONSCREENSHOW_16_10 && IsMarginOutOfRange() ) { std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, |