[Libreoffice-commits] core.git: include/LibreOfficeKit libreofficekit/qa sd/source

[Miklos Vajna]

 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(-)

New commits:
commit 39321c5ffa9b4196308575be6dd19f2b2924214f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri May 22 12:14:36 2015 +0100

    LOK: remove unused LOK_PARTMODE_EMBEDDEDOBJ
    
    Change-Id: I8cbb5b7a134fb84bd2c363b06f06f7f40964521f

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index ffa2f64..9b65e88 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 d4d010f..ae6cfa6 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -293,11 +293,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 );
 }
 
@@ -312,10 +309,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 5190351..be7f64f 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2321,22 +2321,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;
     }