Kaydet (Commit) 8486ec34 authored tarafından Miklos Vajna's avatar Miklos Vajna

LOK: remove unused LOK_PARTMODE_EMBEDDEDOBJ

Change-Id: I8cbb5b7a134fb84bd2c363b06f06f7f40964521f
(cherry picked from commit 39321c5f)
üst 0905209e
...@@ -28,11 +28,8 @@ LibreOfficeKitDocumentType; ...@@ -28,11 +28,8 @@ LibreOfficeKitDocumentType;
typedef enum typedef enum
{ {
LOK_PARTMODE_DEFAULT, LOK_PARTMODE_SLIDES,
LOK_PARTMODE_SLIDE, LOK_PARTMODE_NOTES
LOK_PARTMODE_NOTES,
LOK_PARTMODE_SLIDENOTES,
LOK_PARTMODE_EMBEDDEDOBJ
} }
LibreOfficeKitPartMode; LibreOfficeKitPartMode;
......
...@@ -319,11 +319,8 @@ static void changePart( GtkWidget* pSelector, gpointer /* pItem */ ) ...@@ -319,11 +319,8 @@ static void changePart( GtkWidget* pSelector, gpointer /* pItem */ )
static void populatePartModeSelector( GtkComboBoxText* pSelector ) static void populatePartModeSelector( GtkComboBoxText* pSelector )
{ {
gtk_combo_box_text_append_text( pSelector, "Default" ); gtk_combo_box_text_append_text( pSelector, "Standard" );
gtk_combo_box_text_append_text( pSelector, "Slide" );
gtk_combo_box_text_append_text( pSelector, "Notes" ); gtk_combo_box_text_append_text( pSelector, "Notes" );
gtk_combo_box_text_append_text( pSelector, "Combined (SlideNotes)" );
gtk_combo_box_text_append_text( pSelector, "Embedded Objects" );
gtk_combo_box_set_active( GTK_COMBO_BOX(pSelector), 0 ); gtk_combo_box_set_active( GTK_COMBO_BOX(pSelector), 0 );
} }
...@@ -338,10 +335,6 @@ static void changePartMode( GtkWidget* pSelector, gpointer /* pItem */ ) ...@@ -338,10 +335,6 @@ static void changePartMode( GtkWidget* pSelector, gpointer /* pItem */ )
{ {
lok_docview_set_partmode( LOK_DOCVIEW(pDocView), ePartMode ); lok_docview_set_partmode( LOK_DOCVIEW(pDocView), ePartMode );
} }
// The number of items could change e.g. if we change from slide
// to embeddede obj mode -- hence we should update the part list.
populatePartSelector();
} }
#endif #endif
......
...@@ -2347,22 +2347,9 @@ void SdXImpressDocument::setPartMode( int nPartMode ) ...@@ -2347,22 +2347,9 @@ void SdXImpressDocument::setPartMode( int nPartMode )
PageKind aPageKind( PK_STANDARD ); PageKind aPageKind( PK_STANDARD );
switch ( nPartMode ) switch ( nPartMode )
{ {
case LOK_PARTMODE_EMBEDDEDOBJ: case LOK_PARTMODE_SLIDES:
// This will probably be handled higher up, i.e.
// we probably shouldn't be handling this here.
// (However we don't offer embedded object-only
// rendering anywhere yet, so this may be a
// completely incorrect comment.)
assert( false );
// And let's fall through in a normal build.
case LOK_PARTMODE_DEFAULT:
case LOK_PARTMODE_SLIDE:
break;
case LOK_PARTMODE_SLIDENOTES:
aPageKind = PK_NOTES;
break; break;
case LOK_PARTMODE_NOTES: case LOK_PARTMODE_NOTES:
// TODO: this shows combined slides + notes
aPageKind = PK_NOTES; aPageKind = PK_NOTES;
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment