summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Impress.xcs10
-rw-r--r--sd/source/ui/app/optsitem.cxx54
-rw-r--r--sd/source/ui/dlg/tpoption.cxx5
-rw-r--r--sd/source/ui/func/fusldlg.cxx2
-rw-r--r--sd/source/ui/inc/optsitem.hxx1
-rw-r--r--sd/source/ui/inc/tpoption.hxx1
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx4
-rw-r--r--sd/uiconfig/simpress/ui/optimpressgeneralpage.ui33
8 files changed, 30 insertions, 80 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index f5f9a42ac487..5fe21cdfcc5e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -614,16 +614,6 @@
<info>
<desc>Specifies configuration items governing behavior when starting a presentation.</desc>
</info>
- <prop oor:name="CurrentPage" oor:type="xs:boolean" oor:nillable="false">
- <!-- OldPath: Impress/Other/Start -->
- <!-- OldLocation: Soffice.cfg -->
- <!-- UIHints: Tools - Options - Presentation Other [Section] Start presentation -->
- <info>
- <desc>Indicates whether to start the presentation with the current (true) or the first (false) page.</desc>
- <label>Always with current page</label>
- </info>
- <value>true</value>
- </prop>
<prop oor:name="EnableSdremote" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Indicates whether to enable the Impress remote controller.</desc>
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 9435add8da1d..ee478f30bbfe 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -487,7 +487,6 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
bPickThrough( sal_True ),
bDoubleClickTextEdit( sal_True ),
bClickChangeRotation( sal_False ),
- bStartWithActualPage( sal_False ),
bEnableSdremote( sal_False ),
bEnablePresenterScreen( sal_True),
bSolidDragging( sal_True ),
@@ -523,7 +522,6 @@ sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const
IsPickThrough() == rOpt.IsPickThrough() &&
IsDoubleClickTextEdit() == rOpt.IsDoubleClickTextEdit() &&
IsClickChangeRotation() == rOpt.IsClickChangeRotation() &&
- IsStartWithActualPage() == rOpt.IsStartWithActualPage() &&
IsEnableSdremote() == rOpt.IsEnableSdremote() &&
IsEnablePresenterScreen() == rOpt.IsEnablePresenterScreen()&&
IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() &&
@@ -569,7 +567,6 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
// just for impress
"NewDoc/AutoPilot",
- "Start/CurrentPage",
"Compatibility/AddBetween",
"ShowUndoDeleteWarning",
"SlideshowRespectZOrder",
@@ -616,38 +613,36 @@ sal_Bool SdOptionsMisc::ReadData( const Any* pValues )
if( pValues[14].hasValue() )
SetStartWithTemplate( *(sal_Bool*) pValues[ 14 ].getValue() );
if( pValues[15].hasValue() )
- SetStartWithActualPage( *(sal_Bool*) pValues[ 15 ].getValue() );
+ SetSummationOfParagraphs( *(sal_Bool*) pValues[ 15 ].getValue() );
if( pValues[16].hasValue() )
- SetSummationOfParagraphs( *(sal_Bool*) pValues[ 16 ].getValue() );
+ SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 16 ].getValue() );
+
if( pValues[17].hasValue() )
- SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 17 ].getValue() );
+ SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 17 ].getValue());
if( pValues[18].hasValue() )
- SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 18 ].getValue());
+ SetPreviewNewEffects(*(sal_Bool*) pValues[ 18 ].getValue());
if( pValues[19].hasValue() )
- SetPreviewNewEffects(*(sal_Bool*) pValues[ 19 ].getValue());
+ SetPreviewChangedEffects(*(sal_Bool*) pValues[ 19 ].getValue());
if( pValues[20].hasValue() )
- SetPreviewChangedEffects(*(sal_Bool*) pValues[ 20 ].getValue());
+ SetPreviewTransitions(*(sal_Bool*) pValues[ 20 ].getValue());
if( pValues[21].hasValue() )
- SetPreviewTransitions(*(sal_Bool*) pValues[ 21 ].getValue());
+ SetDisplay(*(sal_Int32*) pValues[ 21 ].getValue());
if( pValues[22].hasValue() )
- SetDisplay(*(sal_Int32*) pValues[ 22 ].getValue());
+ SetPresentationPenColor( getSafeValue< sal_Int32 >( pValues[ 22 ] ) );
if( pValues[23].hasValue() )
- SetPresentationPenColor( getSafeValue< sal_Int32 >( pValues[ 23 ] ) );
+ SetPresentationPenWidth( getSafeValue< double >( pValues[ 23 ] ) );
if( pValues[24].hasValue() )
- SetPresentationPenWidth( getSafeValue< double >( pValues[ 24 ] ) );
+ SetEnableSdremote( *(sal_Bool*) pValues[ 24 ].getValue() );
if( pValues[25].hasValue() )
- SetEnableSdremote( *(sal_Bool*) pValues[ 25 ].getValue() );
-
- if( pValues[26].hasValue() )
- SetEnablePresenterScreen( *(sal_Bool*) pValues[ 26 ].getValue() );
+ SetEnablePresenterScreen( *(sal_Bool*) pValues[ 25 ].getValue() );
}
return sal_True;
@@ -677,21 +672,20 @@ sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const
if( GetConfigId() == SDCFG_IMPRESS )
{
pValues[ 14 ] <<= IsStartWithTemplate();
- pValues[ 15 ] <<= IsStartWithActualPage();
- pValues[ 16 ] <<= IsSummationOfParagraphs();
- pValues[ 17 ] <<= IsShowUndoDeleteWarning();
- pValues[ 18 ] <<= IsSlideshowRespectZOrder();
+ pValues[ 15 ] <<= IsSummationOfParagraphs();
+ pValues[ 16 ] <<= IsShowUndoDeleteWarning();
+ pValues[ 17 ] <<= IsSlideshowRespectZOrder();
- pValues[ 19 ] <<= IsPreviewNewEffects();
- pValues[ 20 ] <<= IsPreviewChangedEffects();
- pValues[ 21 ] <<= IsPreviewTransitions();
+ pValues[ 18 ] <<= IsPreviewNewEffects();
+ pValues[ 19 ] <<= IsPreviewChangedEffects();
+ pValues[ 20 ] <<= IsPreviewTransitions();
- pValues[ 22 ] <<= GetDisplay();
+ pValues[ 21 ] <<= GetDisplay();
- pValues[ 23 ] <<= GetPresentationPenColor();
- pValues[ 24 ] <<= GetPresentationPenWidth();
- pValues[ 25 ] <<= IsEnableSdremote();
- pValues[ 26 ] <<= IsEnablePresenterScreen();
+ pValues[ 22 ] <<= GetPresentationPenColor();
+ pValues[ 23 ] <<= GetPresentationPenWidth();
+ pValues[ 24 ] <<= IsEnableSdremote();
+ pValues[ 25 ] <<= IsEnablePresenterScreen();
}
return sal_True;
@@ -718,7 +712,6 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
if( pOpts )
{
maOptionsMisc.SetStartWithTemplate( pOpts->IsStartWithTemplate() );
- maOptionsMisc.SetStartWithActualPage( pOpts->IsStartWithActualPage() );
maOptionsMisc.SetEnableSdremote( pOpts->IsEnableSdremote() );
maOptionsMisc.SetEnablePresenterScreen( pOpts->IsEnablePresenterScreen() );
maOptionsMisc.SetSummationOfParagraphs( pOpts->IsSummationOfParagraphs() );
@@ -802,7 +795,6 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const
pOpts->SetPickThrough( maOptionsMisc.IsPickThrough() );
pOpts->SetDoubleClickTextEdit( maOptionsMisc.IsDoubleClickTextEdit() );
pOpts->SetClickChangeRotation( maOptionsMisc.IsClickChangeRotation() );
- pOpts->SetStartWithActualPage( maOptionsMisc.IsStartWithActualPage() );
pOpts->SetEnableSdremote( maOptionsMisc.IsEnableSdremote() );
pOpts->SetEnablePresenterScreen( maOptionsMisc.IsEnablePresenterScreen() );
pOpts->SetSummationOfParagraphs( maOptionsMisc.IsSummationOfParagraphs() );
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 163f84a4d76e..55ba52b06ec4 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -207,7 +207,6 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs )
get(m_pCbxCopy , "copywhenmove");
get(m_pCbxMarkedHitMovesAlways , "objalwymov");
get(m_pLbMetric , "units");
- get(m_pCbxStartWithActualPage , "strtwithPag");
get(m_pCbxEnableSdremote , "enremotcont");
get(m_pCbxEnablePresenterScreen , "enprsntcons");
get(m_pCbxUsePrinterMetrics , "printermetrics");
@@ -376,7 +375,6 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs )
m_pCbxPickThrough->GetSavedValue() != m_pCbxPickThrough->IsChecked() ||
m_pCbxMasterPageCache->GetSavedValue() != m_pCbxMasterPageCache->IsChecked() ||
m_pCbxCopy->GetSavedValue() != m_pCbxCopy->IsChecked() ||
- m_pCbxStartWithActualPage->GetSavedValue() != m_pCbxStartWithActualPage->IsChecked() ||
m_pCbxEnableSdremote->GetSavedValue() != m_pCbxEnableSdremote->IsChecked() ||
m_pCbxEnablePresenterScreen->GetSavedValue()!= m_pCbxEnablePresenterScreen->IsChecked() ||
m_pCbxCompatibility->GetSavedValue() != m_pCbxCompatibility->IsChecked() ||
@@ -390,7 +388,6 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs )
aOptsItem.GetOptionsMisc().SetPickThrough( m_pCbxPickThrough->IsChecked() );
aOptsItem.GetOptionsMisc().SetMasterPagePaintCaching( m_pCbxMasterPageCache->IsChecked() );
aOptsItem.GetOptionsMisc().SetDragWithCopy( m_pCbxCopy->IsChecked() );
- aOptsItem.GetOptionsMisc().SetStartWithActualPage( m_pCbxStartWithActualPage->IsChecked() );
aOptsItem.GetOptionsMisc().SetEnableSdremote( m_pCbxEnableSdremote->IsChecked() );
aOptsItem.GetOptionsMisc().SetEnablePresenterScreen( m_pCbxEnablePresenterScreen->IsChecked() );
aOptsItem.GetOptionsMisc().SetSummationOfParagraphs( m_pCbxCompatibility->IsChecked() );
@@ -448,7 +445,6 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs )
m_pCbxPickThrough->Check( aOptsItem.GetOptionsMisc().IsPickThrough() );
m_pCbxMasterPageCache->Check( aOptsItem.GetOptionsMisc().IsMasterPagePaintCaching() );
m_pCbxCopy->Check( aOptsItem.GetOptionsMisc().IsDragWithCopy() );
- m_pCbxStartWithActualPage->Check( aOptsItem.GetOptionsMisc().IsStartWithActualPage() );
m_pCbxEnableSdremote->Check( aOptsItem.GetOptionsMisc().IsEnableSdremote() );
m_pCbxEnablePresenterScreen->Check( aOptsItem.GetOptionsMisc().IsEnablePresenterScreen() );
m_pCbxCompatibility->Check( aOptsItem.GetOptionsMisc().IsSummationOfParagraphs() );
@@ -552,7 +548,6 @@ void SdTpOptionsMisc::SetDrawMode()
{
m_pScaleFrame->Show();
m_pNewDocumentFrame->Hide();
- m_pCbxStartWithActualPage->Hide();
m_pCbxEnableSdremote->Hide();
m_pCbxEnablePresenterScreen->Hide();
m_pCbxCompatibility->Hide();
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 64a028a238b3..b5ac8f79fbe5 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -88,7 +88,6 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
}
SdCustomShowList* pCustomShowList = mpDoc->GetCustomShowList(); // No Create
- sal_Bool bStartWithActualPage = SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsStartWithActualPage();
if( aFirstPage.isEmpty() && pPage )
aFirstPage = pPage->GetName();
@@ -104,7 +103,6 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
aDlgSet.Put( SfxBoolItem( ATTR_PRESENT_CHANGE_PAGE, !rPresentationSettings.mbLockedPages ) );
aDlgSet.Put( SfxBoolItem( ATTR_PRESENT_ALWAYS_ON_TOP, rPresentationSettings.mbAlwaysOnTop ) );
aDlgSet.Put( SfxBoolItem( ATTR_PRESENT_FULLSCREEN, rPresentationSettings.mbFullScreen ) );
- aDlgSet.Put( SfxBoolItem( ATTR_PRESENT_START_ACTUAL_PAGE, bStartWithActualPage ) );
aDlgSet.Put( SfxUInt32Item( ATTR_PRESENT_PAUSE_TIMEOUT, rPresentationSettings.mnPauseTimeout ) );
aDlgSet.Put( SfxBoolItem( ATTR_PRESENT_SHOW_PAUSELOGO, rPresentationSettings.mbShowPauseLogo ) );
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index d300734ea3ad..2cf00f02f914 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -272,7 +272,6 @@ public:
sal_Bool IsPickThrough() const { Init(); return (sal_Bool) bPickThrough; }
sal_Bool IsDoubleClickTextEdit() const { Init(); return (sal_Bool) bDoubleClickTextEdit; }
sal_Bool IsClickChangeRotation() const { Init(); return (sal_Bool) bClickChangeRotation; }
- sal_Bool IsStartWithActualPage() const { Init(); return (sal_Bool) bStartWithActualPage; }
sal_Bool IsEnableSdremote() const { Init(); return (sal_Bool) bEnableSdremote; }
sal_Bool IsEnablePresenterScreen() const { Init(); return (sal_Bool) bEnablePresenterScreen; }
sal_Bool IsSolidDragging() const { Init(); return (sal_Bool) bSolidDragging; }
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index 3c29a4570458..67635ade1cdf 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -89,7 +89,6 @@ private:
ListBox *m_pLbMetric;
MetricField *m_pMtrFldTabstop;
- CheckBox *m_pCbxStartWithActualPage;
CheckBox *m_pCbxEnableSdremote;
CheckBox *m_pCbxEnablePresenterScreen;
CheckBox *m_pCbxUsePrinterMetrics;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 429653f6bfa3..a047e439ae9b 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -916,9 +916,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
OUString aPresSlide( maPresSettings.maPresPage );
SdPage* pStartPage = mpViewShell ? mpViewShell->GetActualPage() : 0;
- bool bStartWithActualSlide = pStartPage &&
- ( (meAnimationMode != ANIMATIONMODE_SHOW) ||
- SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsStartWithActualPage() );
+ bool bStartWithActualSlide = pStartPage;
// times should be measured?
if( mbRehearseTimings )
diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
index 595f8f0da50c..eae37638de0e 100644
--- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
+++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Fri Jan 10 17:09:42 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
@@ -372,25 +371,8 @@
<property name="column_spacing">12</property>
<property name="column_homogeneous">True</property>
<child>
- <object class="GtkCheckButton" id="enprsntcons">
- <property name="label" translatable="yes">Enable Presenter Console</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="strtwithPag">
- <property name="label" translatable="yes">Always with current page</property>
+ <object class="GtkCheckButton" id="enremotcont">
+ <property name="label" translatable="yes">Enable remote control</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -406,8 +388,8 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="enremotcont">
- <property name="label" translatable="yes">Enable remote control</property>
+ <object class="GtkCheckButton" id="enprsntcons">
+ <property name="label" translatable="yes">Enable Presenter Console</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -416,15 +398,12 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 08:31:41 +0000