|
 |
f325b2 |
From f8c6d3406005aa7a6e408ca25f61a0db35acd6be Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Fri, 22 May 2015 12:14:36 +0100
|
|
|
f325b2 |
Subject: [PATCH 002/398] LOK: remove unused LOK_PARTMODE_EMBEDDEDOBJ
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I8cbb5b7a134fb84bd2c363b06f06f7f40964521f
|
|
|
f325b2 |
(cherry picked from commit 39321c5ffa9b4196308575be6dd19f2b2924214f)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
include/LibreOfficeKit/LibreOfficeKitEnums.h | 7 ++-----
|
|
|
f325b2 |
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 9 +--------
|
|
|
f325b2 |
sd/source/ui/unoidl/unomodel.cxx | 15 +--------------
|
|
|
f325b2 |
3 files changed, 4 insertions(+), 27 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h
|
|
|
f325b2 |
index 5293aa9be4c0..66237e4512cf 100644
|
|
|
f325b2 |
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
|
|
|
f325b2 |
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
|
|
|
f325b2 |
@@ -28,11 +28,8 @@ LibreOfficeKitDocumentType;
|
|
|
f325b2 |
|
|
|
f325b2 |
typedef enum
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- LOK_PARTMODE_DEFAULT,
|
|
|
f325b2 |
- LOK_PARTMODE_SLIDE,
|
|
|
f325b2 |
- LOK_PARTMODE_NOTES,
|
|
|
f325b2 |
- LOK_PARTMODE_SLIDENOTES,
|
|
|
f325b2 |
- LOK_PARTMODE_EMBEDDEDOBJ
|
|
|
f325b2 |
+ LOK_PARTMODE_SLIDES,
|
|
|
f325b2 |
+ LOK_PARTMODE_NOTES
|
|
|
f325b2 |
}
|
|
|
f325b2 |
LibreOfficeKitPartMode;
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
index 83ec9d23c113..d20f43d90627 100644
|
|
|
f325b2 |
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
@@ -312,11 +312,8 @@ static void changePart( GtkWidget* pSelector, gpointer /* pItem */ )
|
|
|
f325b2 |
|
|
|
f325b2 |
static void populatePartModeSelector( GtkComboBoxText* pSelector )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- gtk_combo_box_text_append_text( pSelector, "Default" );
|
|
|
f325b2 |
- gtk_combo_box_text_append_text( pSelector, "Slide" );
|
|
|
f325b2 |
+ gtk_combo_box_text_append_text( pSelector, "Standard" );
|
|
|
f325b2 |
gtk_combo_box_text_append_text( pSelector, "Notes" );
|
|
|
f325b2 |
- gtk_combo_box_text_append_text( pSelector, "Combined (SlideNotes)" );
|
|
|
f325b2 |
- gtk_combo_box_text_append_text( pSelector, "Embedded Objects" );
|
|
|
f325b2 |
gtk_combo_box_set_active( GTK_COMBO_BOX(pSelector), 0 );
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -331,10 +328,6 @@ static void changePartMode( GtkWidget* pSelector, gpointer /* pItem */ )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
lok_docview_set_partmode( LOK_DOCVIEW(pDocView), ePartMode );
|
|
|
f325b2 |
}
|
|
|
f325b2 |
-
|
|
|
f325b2 |
- // The number of items could change e.g. if we change from slide
|
|
|
f325b2 |
- // to embeddede obj mode -- hence we should update the part list.
|
|
|
f325b2 |
- populatePartSelector();
|
|
|
f325b2 |
}
|
|
|
f325b2 |
#endif
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
|
|
|
f325b2 |
index 7a9bf2af2671..4148035c899a 100644
|
|
|
f325b2 |
--- a/sd/source/ui/unoidl/unomodel.cxx
|
|
|
f325b2 |
+++ b/sd/source/ui/unoidl/unomodel.cxx
|
|
|
f325b2 |
@@ -2346,22 +2346,9 @@ void SdXImpressDocument::setPartMode( int nPartMode )
|
|
|
f325b2 |
PageKind aPageKind( PK_STANDARD );
|
|
|
f325b2 |
switch ( nPartMode )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- case LOK_PARTMODE_EMBEDDEDOBJ:
|
|
|
f325b2 |
- // This will probably be handled higher up, i.e.
|
|
|
f325b2 |
- // we probably shouldn't be handling this here.
|
|
|
f325b2 |
- // (However we don't offer embedded object-only
|
|
|
f325b2 |
- // rendering anywhere yet, so this may be a
|
|
|
f325b2 |
- // completely incorrect comment.)
|
|
|
f325b2 |
- assert( false );
|
|
|
f325b2 |
- // And let's fall through in a normal build.
|
|
|
f325b2 |
- case LOK_PARTMODE_DEFAULT:
|
|
|
f325b2 |
- case LOK_PARTMODE_SLIDE:
|
|
|
f325b2 |
- break;
|
|
|
f325b2 |
- case LOK_PARTMODE_SLIDENOTES:
|
|
|
f325b2 |
- aPageKind = PK_NOTES;
|
|
|
f325b2 |
+ case LOK_PARTMODE_SLIDES:
|
|
|
f325b2 |
break;
|
|
|
f325b2 |
case LOK_PARTMODE_NOTES:
|
|
|
f325b2 |
- // TODO: this shows combined slides + notes
|
|
|
f325b2 |
aPageKind = PK_NOTES;
|
|
|
f325b2 |
break;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|