From f8c6d3406005aa7a6e408ca25f61a0db35acd6be Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 22 May 2015 12:14:36 +0100 Subject: [PATCH 002/398] LOK: remove unused LOK_PARTMODE_EMBEDDEDOBJ Change-Id: I8cbb5b7a134fb84bd2c363b06f06f7f40964521f (cherry picked from commit 39321c5ffa9b4196308575be6dd19f2b2924214f) --- include/LibreOfficeKit/LibreOfficeKitEnums.h | 7 ++----- libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 9 +-------- sd/source/ui/unoidl/unomodel.cxx | 15 +-------------- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h index 5293aa9be4c0..66237e4512cf 100644 --- a/include/LibreOfficeKit/LibreOfficeKitEnums.h +++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h @@ -28,11 +28,8 @@ LibreOfficeKitDocumentType; typedef enum { - LOK_PARTMODE_DEFAULT, - LOK_PARTMODE_SLIDE, - LOK_PARTMODE_NOTES, - LOK_PARTMODE_SLIDENOTES, - LOK_PARTMODE_EMBEDDEDOBJ + LOK_PARTMODE_SLIDES, + LOK_PARTMODE_NOTES } LibreOfficeKitPartMode; diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index 83ec9d23c113..d20f43d90627 100644 --- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx @@ -312,11 +312,8 @@ static void changePart( GtkWidget* pSelector, gpointer /* pItem */ ) static void populatePartModeSelector( GtkComboBoxText* pSelector ) { - gtk_combo_box_text_append_text( pSelector, "Default" ); - gtk_combo_box_text_append_text( pSelector, "Slide" ); + gtk_combo_box_text_append_text( pSelector, "Standard" ); 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 ); } @@ -331,10 +328,6 @@ static void changePartMode( GtkWidget* pSelector, gpointer /* pItem */ ) { 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 diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 7a9bf2af2671..4148035c899a 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2346,22 +2346,9 @@ void SdXImpressDocument::setPartMode( int nPartMode ) PageKind aPageKind( PK_STANDARD ); switch ( nPartMode ) { - case LOK_PARTMODE_EMBEDDEDOBJ: - // 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; + case LOK_PARTMODE_SLIDES: break; case LOK_PARTMODE_NOTES: - // TODO: this shows combined slides + notes aPageKind = PK_NOTES; break; } -- 2.12.0