Kaydet (Commit) 63a40c45 authored tarafından Miklos Vajna's avatar Miklos Vajna

LOK: change PAGE_COUNT to a more generic DOCUMENT_SIZE

Change-Id: If94af4072c321358d7bd4d678eeed181dc0f44db
üst 0f95f8ff
...@@ -143,12 +143,12 @@ typedef enum ...@@ -143,12 +143,12 @@ typedef enum
LOK_CALLBACK_SEARCH_NOT_FOUND, LOK_CALLBACK_SEARCH_NOT_FOUND,
/** /**
* Number of pages changed in the document. * Size of the document changed.
* *
* Clients should assume that data returned by an earlier * Payload format is "width, height", i.e. clients get the new size without
* lok::Document::getDocumentSize() call is no longer valid. * having to do an explicit lok::Document::getDocumentSize() call.
*/ */
LOK_CALLBACK_PAGE_COUNT_CHANGED, LOK_CALLBACK_DOCUMENT_SIZE_CHANGED,
/** /**
* The current part number is changed. * The current part number is changed.
......
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
#include <vcl/virdev.hxx> #include <vcl/virdev.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <svx/sdrpaintwindow.hxx> #include <svx/sdrpaintwindow.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#if !HAVE_FEATURE_DESKTOP #if !HAVE_FEATURE_DESKTOP
#include <vcl/sysdata.hxx> #include <vcl/sysdata.hxx>
...@@ -989,6 +990,15 @@ void SwViewShell::SizeChgNotify() ...@@ -989,6 +990,15 @@ void SwViewShell::SizeChgNotify()
const SvxNumberType& rNum = pPage->GetPageDesc()->GetNumType(); const SvxNumberType& rNum = pPage->GetPageDesc()->GetNumType();
OUString sDisplay = rNum.GetNumStr( nVirtNum ); OUString sDisplay = rNum.GetNumStr( nVirtNum );
PageNumNotify( this, pCnt->GetPhyPageNum(), nVirtNum, sDisplay ); PageNumNotify( this, pCnt->GetPhyPageNum(), nVirtNum, sDisplay );
if (isTiledRendering())
{
Size aDocSize = GetDocSize();
std::stringstream ss;
ss << aDocSize.Width() + 2L * DOCUMENTBORDER << ", " << aDocSize.Height() + 2L * DOCUMENTBORDER;
OString sRect = ss.str().c_str();
libreOfficeKitCallback(LOK_CALLBACK_DOCUMENT_SIZE_CHANGED, sRect.getStr());
}
} }
} }
} }
......
...@@ -147,7 +147,6 @@ ...@@ -147,7 +147,6 @@
#include <vcl/settings.hxx> #include <vcl/settings.hxx>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
const char sStatusDelim[] = " : "; const char sStatusDelim[] = " : ";
const char sStatusComma[] = " , "; const char sStatusComma[] = " , ";
...@@ -1281,7 +1280,6 @@ void SwView::Execute(SfxRequest &rReq) ...@@ -1281,7 +1280,6 @@ void SwView::Execute(SfxRequest &rReq)
/// invalidate page numbering field /// invalidate page numbering field
void SwView::UpdatePageNums(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const OUString& rPgStr) void SwView::UpdatePageNums(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const OUString& rPgStr)
{ {
GetWrtShell().libreOfficeKitCallback(LOK_CALLBACK_PAGE_COUNT_CHANGED, 0);
OUString sTemp(GetPageStr( nPhyNum, nVirtNum, rPgStr )); OUString sTemp(GetPageStr( nPhyNum, nVirtNum, rPgStr ));
const SfxStringItem aTmp( FN_STAT_PAGE, sTemp ); const SfxStringItem aTmp( FN_STAT_PAGE, sTemp );
// Used to distinguish which tooltip to show // Used to distinguish which tooltip to show
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment