[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - libreofficekit/source
Jan Holesovsky
kendy at collabora.com
Wed Apr 1 00:10:38 PDT 2015
libreofficekit/source/gtk/lokdocview.cxx | 18 ------------------
1 file changed, 18 deletions(-)
New commits:
commit 35a706f13c7fee2cc6868d059ccb6a1b3ec25da3
Author: Jan Holesovsky <kendy at collabora.com>
Date: Wed Apr 1 09:06:43 2015 +0200
Revert "sc tiled editing: Invalidate graphic selection."
This reverts commit e3a87d7577eea1f015791ee154d98510cebc239e.
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index a3293ee..f5a3257 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -34,8 +34,6 @@
// Number of handles around a graphic selection.
#define GRAPHIC_HANDLE_COUNT 8
-static void lok_docview_callback_worker(int nType, const char* pPayload, void* pData);
-
// We know that VirtualDevices use a DPI of 96.
static const int DPI = 96;
@@ -983,23 +981,7 @@ static gboolean lok_docview_callback(gpointer pData)
case LOK_CALLBACK_GRAPHIC_SELECTION:
{
if (strcmp(pCallback->m_pPayload, "EMPTY") != 0)
- {
- // invalidate old graphic selection
- gchar* pRect = g_strdup_printf("%d, %d, %d, %d",
- pCallback->m_pDocView->m_pImpl->m_aGraphicSelection.x, pCallback->m_pDocView->m_pImpl->m_aGraphicSelection.y,
- pCallback->m_pDocView->m_pImpl->m_aGraphicSelection.width, pCallback->m_pDocView->m_pImpl->m_aGraphicSelection.height);
- lok_docview_callback_worker(LOK_CALLBACK_INVALIDATE_TILES, pRect, pCallback->m_pDocView);
- g_free (pRect);
-
pCallback->m_pDocView->m_pImpl->m_aGraphicSelection = LOKDocView_Impl::payloadToRectangle(pCallback->m_pPayload);
-
- // invalidate new graphic selection
- pRect = g_strdup_printf("%d, %d, %d, %d",
- pCallback->m_pDocView->m_pImpl->m_aGraphicSelection.x, pCallback->m_pDocView->m_pImpl->m_aGraphicSelection.y,
- pCallback->m_pDocView->m_pImpl->m_aGraphicSelection.width, pCallback->m_pDocView->m_pImpl->m_aGraphicSelection.height);
- lok_docview_callback_worker(LOK_CALLBACK_INVALIDATE_TILES, pRect, pCallback->m_pDocView);
- g_free (pRect);
- }
else
memset(&pCallback->m_pDocView->m_pImpl->m_aGraphicSelection, 0, sizeof(pCallback->m_pDocView->m_pImpl->m_aGraphicSelection));
gtk_widget_queue_draw(GTK_WIDGET(pCallback->m_pDocView->m_pImpl->m_pEventBox));
More information about the Libreoffice-commits
mailing list