This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 61c60ce468 Update Presentation wizard for wide screen formats (#180)
61c60ce468 is described below
commit 61c60ce468d7a80b769dffbdaf7100505d3ea9f6
Author: Matthias Seidel <[email protected]>
AuthorDate: Sat Jan 4 19:20:42 2025 +0100
Update Presentation wizard for wide screen formats (#180)
* Update Presentation wizard for wide screen format
* Additional changes
* Update dlgass.cxx
Use better scaling for Bitmap
* Fixed small Cut and Paste error
* Update 01050200.xhp
* Update Help file
* Update 01050200.xhp
* Update sdmod1.cxx
(cherry picked from commit dad2ac5bb40510a7412898d3ea2dd7b1a0d98e74)
---
.../source/text/shared/autopi/01050200.xhp | 35 ++++++++++++----------
main/sd/inc/sdenumdef.hxx | 2 +-
main/sd/source/ui/app/sdmod1.cxx | 26 +++++-----------
main/sd/source/ui/dlg/dlgass.cxx | 12 ++++++--
main/sd/source/ui/dlg/dlgass.src | 12 +++++++-
main/sd/source/ui/inc/dlgass.hrc | 29 +++++++++---------
6 files changed, 63 insertions(+), 53 deletions(-)
diff --git a/main/helpcontent2/source/text/shared/autopi/01050200.xhp
b/main/helpcontent2/source/text/shared/autopi/01050200.xhp
index e2b7eaf927..294aec59ac 100644
--- a/main/helpcontent2/source/text/shared/autopi/01050200.xhp
+++ b/main/helpcontent2/source/text/shared/autopi/01050200.xhp
@@ -31,31 +31,34 @@
<body>
<section id="autopilotseite2">
<bookmark branch="hid/SD_HID_SD_AUTOPILOT_PAGE2" xml-lang="en-US"
id="bm_id3150247"/>
-<paragraph id="hd_id3151100" role="heading" level="1" oldref="1" l10n="U"
xml-lang="en-US"><link href="text/shared/autopi/01050200.xhp"
name="Presentation Wizard Page 2">Presentation Wizard Page 2</link></paragraph>
-<paragraph role="paragraph" id="par_id3156027" l10n="U" xml-lang="en-US"
oldref="19">Selects the medium and the background of your
presentation.</paragraph>
+<paragraph id="hd_id3151100" role="heading" level="1" l10n="U"
xml-lang="en-US"><link href="text/shared/autopi/01050200.xhp"
name="Presentation Wizard Page 2">Presentation Wizard Page 2</link></paragraph>
+<paragraph role="paragraph" id="par_id3156027" l10n="U"
xml-lang="en-US">Selects the medium and the background of your
presentation.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#dtapsz"/>
</section>
<bookmark branch="hid/SD_HID_SD_AUTOPILOT_PAGETEMPLATES" xml-lang="en-US"
id="bm_id3153311"/><bookmark branch="hid/sd:ListBox:DLG_ASS:LB_PAGE2_LAYOUT"
xml-lang="en-US" id="bm_id3152552"/>
-<paragraph role="heading" level="2" id="hd_id3153749" l10n="U"
xml-lang="en-US" oldref="20">Select a slide design</paragraph>
-<paragraph l10n="U" role="paragraph" id="par_id3155338" xml-lang="en-US"
oldref="26"><ahelp hid="SD:LISTBOX:DLG_ASS:LB_PAGE2_LAYOUT"
visibility="visible">Allows you to select a slide design for the presentation
you selected on page 1 of the Wizard.</ahelp> In the upper list box you can
choose from two slide design types (Presentation Backgrounds and
Presentations). In the lower list box, you can select one of the templates for
your presentation.</paragraph>
-<paragraph role="heading" level="2" id="hd_id3149177" l10n="U"
xml-lang="en-US" oldref="21">Select an output medium</paragraph>
+<paragraph role="heading" level="2" id="hd_id3153749" l10n="U"
xml-lang="en-US">Select a slide design</paragraph>
+<paragraph l10n="U" role="paragraph" id="par_id3155338"
xml-lang="en-US"><ahelp hid="SD:LISTBOX:DLG_ASS:LB_PAGE2_LAYOUT"
visibility="visible">Allows you to select a slide design for the presentation
you selected on page 1 of the Wizard.</ahelp> In the upper list box you can
choose from two slide design types (Presentation Backgrounds and
Presentations). In the lower list box, you can select one of the templates for
your presentation.</paragraph>
+<paragraph role="heading" level="2" id="hd_id3149177" l10n="U"
xml-lang="en-US">Select an output medium</paragraph>
<bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM5"
xml-lang="en-US" id="bm_id3152781"/>
-<paragraph role="heading" level="3" id="hd_id3153681" l10n="U"
xml-lang="en-US" oldref="32">Original</paragraph>
-<paragraph l10n="U" role="paragraph" id="par_id3156347" xml-lang="en-US"
oldref="33"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM5"
visibility="visible">Uses the original page format of the
template.</ahelp></paragraph>
+<paragraph role="heading" level="3" id="hd_id3153681" l10n="U"
xml-lang="en-US">Original</paragraph>
+<paragraph l10n="U" role="paragraph" id="par_id3156347"
xml-lang="en-US"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM5"
visibility="visible">Uses the original page format of the
template.</ahelp></paragraph>
<bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM3"
xml-lang="en-US" id="bm_id3147210"/>
-<paragraph role="heading" level="3" id="hd_id3147653" l10n="U"
xml-lang="en-US" oldref="23">Overhead sheet</paragraph>
-<paragraph l10n="U" role="paragraph" id="par_id3153032" xml-lang="en-US"
oldref="30"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM3"
visibility="visible">Creates a presentation to be used as overhead
transparencies.</ahelp></paragraph>
+<paragraph role="heading" level="3" id="hd_id3147653" l10n="U"
xml-lang="en-US">Overhead sheet</paragraph>
+<paragraph l10n="U" role="paragraph" id="par_id3153032"
xml-lang="en-US"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM3"
visibility="visible">Creates a presentation to be used as overhead
transparencies.</ahelp></paragraph>
<bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM4"
xml-lang="en-US" id="bm_id3146948"/>
-<paragraph role="heading" level="3" id="hd_id3148685" l10n="U"
xml-lang="en-US" oldref="24">Paper</paragraph>
-<paragraph l10n="U" role="paragraph" id="par_id3155419" xml-lang="en-US"
oldref="31"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM4"
visibility="visible">Creates a presentation that can be printed on
paper.</ahelp></paragraph>
+<paragraph role="heading" level="3" id="hd_id3148685" l10n="U"
xml-lang="en-US">Paper</paragraph>
+<paragraph l10n="U" role="paragraph" id="par_id3155419"
xml-lang="en-US"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM4"
visibility="visible">Creates a presentation that can be printed on
paper.</ahelp></paragraph>
<bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM1"
xml-lang="en-US" id="bm_id3153349"/>
-<paragraph role="heading" level="3" id="hd_id3148491" l10n="U"
xml-lang="en-US" oldref="25">Screen</paragraph>
-<paragraph l10n="U" role="paragraph" id="par_id3145119" xml-lang="en-US"
oldref="28"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM1"
visibility="visible">Creates a computer screen presentation only.</ahelp> The
screen is adjusted by default.</paragraph>
+<paragraph role="heading" level="3" id="hd_id3148491" l10n="U"
xml-lang="en-US">Screen (4:3)</paragraph>
+<paragraph l10n="U" role="paragraph" id="par_id3145119"
xml-lang="en-US"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM1"
visibility="visible">Creates a presentation for displays with an aspect ratio
of 4:3.</ahelp></paragraph>
<bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM2"
xml-lang="en-US" id="bm_id3149579"/>
-<paragraph role="heading" level="3" id="hd_id3154898" l10n="U"
xml-lang="en-US" oldref="22">Slide</paragraph>
-<paragraph l10n="U" role="paragraph" id="par_id3153821" xml-lang="en-US"
oldref="29"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM2"
visibility="visible">Creates a presentation to be used as
slides.</ahelp></paragraph>
-<paragraph xml-lang="en-US" role="paragraph" id="par_id3155388" l10n="U"
oldref="12">Continue to <link href="text/shared/autopi/01050300.xhp"
name="Presentation Wizard Page 3">Presentation Wizard Page 3</link>.</paragraph>
+<paragraph role="heading" level="3" id="hd_id3149579" l10n="U"
xml-lang="en-US">Screen (16:9)</paragraph>
+<paragraph l10n="U" role="paragraph" id="par_id3153821"
xml-lang="en-US"><ahelp hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM2"
visibility="visible">Creates a presentation for displays with an aspect ratio
of 16:9.</ahelp></paragraph>
+<bookmark branch="hid/sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM6"
xml-lang="en-US" id="bm_id"/>
+<paragraph role="heading" level="3" id="hd_id" l10n="U"
xml-lang="en-US">Screen (16:10)</paragraph>
+<paragraph l10n="U" role="paragraph" id="par_id" xml-lang="en-US"><ahelp
hid="SD:RADIOBUTTON:DLG_ASS:RB_PAGE2_MEDIUM6" visibility="visible">Creates a
presentation for displays with an aspect ratio of 16:10.</ahelp></paragraph>
+<paragraph xml-lang="en-US" role="paragraph" id="par_id3155388"
l10n="U">Continue to <link href="text/shared/autopi/01050300.xhp"
name="Presentation Wizard Page 3">Presentation Wizard Page 3</link>.</paragraph>
</body>
</helpdocument>
diff --git a/main/sd/inc/sdenumdef.hxx b/main/sd/inc/sdenumdef.hxx
index 49c0f182f4..5fb40d1eaa 100644
--- a/main/sd/inc/sdenumdef.hxx
+++ b/main/sd/inc/sdenumdef.hxx
@@ -24,7 +24,7 @@
#ifndef _SD_ENUMDEF_HXX
#define _SD_ENUMDEF_HXX
-enum OutputType { OUTPUT_PAGE, OUTPUT_OVERHEAD, OUTPUT_SLIDE,
OUTPUT_PRESENTATION_4_BY_3, OUTPUT_PRESENTATION_16_BY_9,
OUTPUT_PRESENTATION_16_BY_10, OUTPUT_ORIGINAL };
+enum OutputType { OUTPUT_PAGE, OUTPUT_OVERHEAD, OUTPUT_SCREEN_4_BY_3,
OUTPUT_SCREEN_16_BY_9, OUTPUT_SCREEN_16_BY_10, OUTPUT_ORIGINAL };
enum StartType { ST_EMPTY, ST_TEMPLATE, ST_OPEN };
#define RET_SNAP_DELETE 111
diff --git a/main/sd/source/ui/app/sdmod1.cxx b/main/sd/source/ui/app/sdmod1.cxx
index c021ee233b..aa3029027f 100644
--- a/main/sd/source/ui/app/sdmod1.cxx
+++ b/main/sd/source/ui/app/sdmod1.cxx
@@ -122,7 +122,7 @@ void SdModule::Execute(SfxRequest& rReq)
case SID_AUTOSPELL_CHECK:
{
- // automatische Rechtschreibpruefung
+ // automatische Rechtschreibprüfung
const SfxPoolItem* pItem;
if( pSet && SFX_ITEM_SET == pSet->GetItemState(
SID_AUTOSPELL_CHECK, sal_False,
&pItem ) )
@@ -303,7 +303,7 @@ void SdModule::OutlineToImpress (SfxRequest& rRequest)
if (pViewSh)
{
- // AutoLayouts muessen fertig sein
+ // AutoLayouts müssen fertig sein
pDoc->StopWorkStartupDelay();
SfxViewFrame* pViewFrame =
pViewSh->GetViewFrame();
@@ -346,7 +346,7 @@ static bool bOnce = false;
void SdModule::GetState(SfxItemSet& rItemSet)
{
- // Autopilot waehrend der Praesentation disablen
+ // Autopilot während der Präsentation disablen
if (rItemSet.GetItemState(SID_SD_AUTOPILOT) != SFX_ITEM_UNKNOWN)
{
if (!SvtModuleOptions().IsImpress())
@@ -797,7 +797,7 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell,
SfxViewFrame* pViewF
if( pPrinter && pPrinter->IsValid())
{
// Der Printer gibt leider kein exaktes
- // Format (z.B. A4) zurueck
+ // Format (z.B. A4) zurück
Size aSize(pPrinter->GetPaperSize());
Paper ePaper = SvxPaperInfo::GetSvxPaper(
aSize, MAP_100TH_MM, sal_True);
@@ -809,7 +809,7 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell,
SfxViewFrame* pViewF
if (aSize.Height() > aSize.Width())
{
- // Always Landscape
+ // Always use Landscape
aNewSize.Width() = aSize.Height();
aNewSize.Height() = aSize.Width();
}
@@ -840,17 +840,7 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell*
pDocShell, SfxViewFrame* pViewF
}
break;
- case OUTPUT_SLIDE:
- {
- aNewSize = Size(27000, 18000);
- nLeft =0;
- nRight=0;
- nUpper=0;
- nLower=0;
- }
- break;
-
- case OUTPUT_PRESENTATION_4_BY_3:
+ case OUTPUT_SCREEN_4_BY_3:
{
aNewSize = Size(28000, 21000);
nLeft =0;
@@ -860,7 +850,7 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell,
SfxViewFrame* pViewF
}
break;
- case OUTPUT_PRESENTATION_16_BY_9: // not used yet
+ case OUTPUT_SCREEN_16_BY_9:
{
aNewSize = Size(28000, 15750);
nLeft =0;
@@ -870,7 +860,7 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell,
SfxViewFrame* pViewF
}
break;
- case OUTPUT_PRESENTATION_16_BY_10: // not used yet
+ case OUTPUT_SCREEN_16_BY_10:
{
aNewSize = Size(28000, 17500);
nLeft =0;
diff --git a/main/sd/source/ui/dlg/dlgass.cxx b/main/sd/source/ui/dlg/dlgass.cxx
index 3a642b9ed0..e04ddca799 100644
--- a/main/sd/source/ui/dlg/dlgass.cxx
+++ b/main/sd/source/ui/dlg/dlgass.cxx
@@ -90,7 +90,7 @@ void InterpolateFixedBitmap( FixedBitmap * pBitmap )
{
Bitmap aBmp( pBitmap->GetBitmap() );
Size aSize = pBitmap->GetSizePixel();
- aBmp.Scale( aSize, BMP_SCALE_INTERPOLATE );
+ aBmp.Scale( aSize, BMP_SCALE_BESTQUALITY );
pBitmap->SetBitmap( aBmp );
}
@@ -322,6 +322,7 @@ public:
RadioButton* mpPage2Medium3RB;
RadioButton* mpPage2Medium4RB;
RadioButton* mpPage2Medium5RB;
+ RadioButton* mpPage2Medium6RB;
// Page 3
FixedBitmap* mpPage3FB;
@@ -488,6 +489,8 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow,
const Link& rFinishLink,
mpPage2Medium1RB = new RadioButton( pWindow,
SdResId(RB_PAGE2_MEDIUM1) ));
maAssistentFunc.InsertControl(2,
mpPage2Medium2RB = new RadioButton( pWindow,
SdResId(RB_PAGE2_MEDIUM2) ));
+ maAssistentFunc.InsertControl(2,
+ mpPage2Medium6RB = new RadioButton( pWindow,
SdResId(RB_PAGE2_MEDIUM6) ));
mpPage2Medium5RB->Check();
mpPage2RegionLB->SetSelectHdl(LINK(this,AssistentDlgImpl,SelectRegionHdl));
@@ -710,6 +713,7 @@ AssistentDlgImpl::~AssistentDlgImpl()
delete mpPage2Medium3RB;
delete mpPage2Medium4RB;
delete mpPage2Medium5RB;
+ delete mpPage2Medium6RB;
// Page 3
delete mpPage3FB;
@@ -1929,9 +1933,11 @@ SfxObjectShellLock AssistentDlg::GetDocument()
OutputType AssistentDlg::GetOutputMedium() const
{
if(mpImpl->mpPage2Medium1RB->IsChecked())
- return OUTPUT_PRESENTATION_4_BY_3;
+ return OUTPUT_SCREEN_4_BY_3;
else if(mpImpl->mpPage2Medium2RB->IsChecked())
- return OUTPUT_SLIDE;
+ return OUTPUT_SCREEN_16_BY_9;
+ else if(mpImpl->mpPage2Medium6RB->IsChecked())
+ return OUTPUT_SCREEN_16_BY_10;
else if(mpImpl->mpPage2Medium3RB->IsChecked())
return OUTPUT_OVERHEAD;
else if(mpImpl->mpPage2Medium4RB->IsChecked())
diff --git a/main/sd/source/ui/dlg/dlgass.src b/main/sd/source/ui/dlg/dlgass.src
index 21d5b96943..de84bb29e1 100644
--- a/main/sd/source/ui/dlg/dlgass.src
+++ b/main/sd/source/ui/dlg/dlgass.src
@@ -211,7 +211,17 @@ ModalDialog DLG_ASS
Pos = MAP_APPFONT ( 75, 135 ) ;
Size = MAP_APPFONT ( 59, 10 ) ;
TabStop = TRUE ;
- Text [ en-US ] = "Sli~de" ;
+ Text [ en-US ] = "Sc~reen (16:9)" ;
+ };
+
+ RadioButton RB_PAGE2_MEDIUM6
+ {
+ HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM6" ;
+ OutputSize = TRUE ;
+ Pos = MAP_APPFONT ( 75, 149 ) ;
+ Size = MAP_APPFONT ( 59, 10 ) ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "Sc~reen (16:10)" ;
};
RadioButton RB_PAGE2_MEDIUM3
diff --git a/main/sd/source/ui/inc/dlgass.hrc b/main/sd/source/ui/inc/dlgass.hrc
index 486ea699f3..7c2d223e45 100644
--- a/main/sd/source/ui/inc/dlgass.hrc
+++ b/main/sd/source/ui/inc/dlgass.hrc
@@ -50,21 +50,22 @@
#define RB_PAGE2_MEDIUM3 37
#define RB_PAGE2_MEDIUM4 38
#define RB_PAGE2_MEDIUM5 39
+#define RB_PAGE2_MEDIUM6 40
-#define FB_PAGE3 40
-#define FL_PAGE3_EFFECT 41
-#define FT_PAGE3_EFFECT 42
-#define LB_PAGE3_EFFECT 43
-#define FT_PAGE3_SPEED 44
-#define LB_PAGE3_SPEED 45
-#define FL_PAGE3_PRESTYPE 46
-#define RB_PAGE3_LIVE 47
-#define RB_PAGE3_KIOSK 48
-#define FT_PAGE3_TIME 49
-#define TMF_PAGE3_TIME 50
-#define FT_PAGE3_BREAK 51
-#define TMF_PAGE3_BREAK 52
-#define CB_PAGE3_LOGO 53
+#define FB_PAGE3 41
+#define FL_PAGE3_EFFECT 42
+#define FT_PAGE3_EFFECT 43
+#define LB_PAGE3_EFFECT 44
+#define FT_PAGE3_SPEED 45
+#define LB_PAGE3_SPEED 46
+#define FL_PAGE3_PRESTYPE 47
+#define RB_PAGE3_LIVE 48
+#define RB_PAGE3_KIOSK 49
+#define FT_PAGE3_TIME 50
+#define TMF_PAGE3_TIME 51
+#define FT_PAGE3_BREAK 52
+#define TMF_PAGE3_BREAK 53
+#define CB_PAGE3_LOGO 54
#define FB_PAGE4 20
#define FL_PAGE4_PERSONAL 21
