mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lokdocview: handle LOK_CALLBACK_DOCUMENT_SIZE_CHANGED

Browse Source 
Change-Id: Ib1b99221afbf9810bad5fd49fbf62c7a20fd28e4
This commit is contained in:
Miklos Vajna 2015-05-27 17:12:28 +02:00
parent 63a40c4501
commit 8cbb94a2b7
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libreofficekit/source/gtk/lokdocview.cxx
View File

@ -170,6 +170,8 @@ struct LOKDocView_Impl
* the tiles that intersect with pPartial. * the tiles that intersect with pPartial.
*/ */
void renderDocument(GdkRectangle* pPartial); void renderDocument(GdkRectangle* pPartial);
/// Sets rWidth and rHeight from a "width, height" string.
void payloadToSize(const char* pPayload, long& rWidth, long& rHeight);
/// Returns the GdkRectangle of a width,height,x,y string. /// Returns the GdkRectangle of a width,height,x,y string.
static GdkRectangle payloadToRectangle(const char* pPayload); static GdkRectangle payloadToRectangle(const char* pPayload);
/// Returns the GdkRectangles of a w,h,x,y;w2,h2,x2,y2;... string. /// Returns the GdkRectangles of a w,h,x,y;w2,h2,x2,y2;... string.
@ -844,6 +846,21 @@ void LOKDocView_Impl::renderDocument(GdkRectangle* pPartial)
} }
} }
void LOKDocView_Impl::payloadToSize(const char* pPayload, long& rWidth, long& rHeight)
{
rWidth = rHeight = 0;
gchar** ppCoordinates = g_strsplit(pPayload, ", ", 2);
gchar** ppCoordinate = ppCoordinates;
if (!*ppCoordinate)
return;
rWidth = atoi(*ppCoordinate);
++ppCoordinate;
if (!*ppCoordinate)
return;
rHeight = atoi(*ppCoordinate);
g_strfreev(ppCoordinates);
}
GdkRectangle LOKDocView_Impl::payloadToRectangle(const char* pPayload) GdkRectangle LOKDocView_Impl::payloadToRectangle(const char* pPayload)
{ {
GdkRectangle aRet; GdkRectangle aRet;
@ -913,8 +930,8 @@ const char* LOKDocView_Impl::callbackTypeToString(int nType)
return "LOK_CALLBACK_STATUS_INDICATOR_FINISH"; return "LOK_CALLBACK_STATUS_INDICATOR_FINISH";
case LOK_CALLBACK_SEARCH_NOT_FOUND: case LOK_CALLBACK_SEARCH_NOT_FOUND:
return "LOK_CALLBACK_SEARCH_NOT_FOUND"; return "LOK_CALLBACK_SEARCH_NOT_FOUND";
case LOK_CALLBACK_PAGE_COUNT_CHANGED: case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
return "LOK_CALLBACK_PAGE_COUNT_CHANGED"; return "LOK_CALLBACK_DOCUMENT_SIZE_CHANGED";
case LOK_CALLBACK_SET_PART: case LOK_CALLBACK_SET_PART:
return "LOK_CALLBACK_SET_PART"; return "LOK_CALLBACK_SET_PART";
} }
@ -1014,9 +1031,9 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData* pCallback)
searchNotFound(pCallback->m_aPayload); searchNotFound(pCallback->m_aPayload);
} }
break; break;
case LOK_CALLBACK_PAGE_COUNT_CHANGED: case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
{ {
m_pDocument->pClass->getDocumentSize(m_pDocument, &m_nDocumentWidthTwips, &m_nDocumentHeightTwips); LOKDocView_Impl::payloadToSize(pCallback->m_aPayload.c_str(), m_nDocumentWidthTwips, m_nDocumentHeightTwips);
} }
break; break;
case LOK_CALLBACK_SET_PART: case LOK_CALLBACK_SET_PART: