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

LOK_STATE_CHANGED callback implemented with sfx events interception.

Browse Source
This commit is contained in:
Siqi Liu 2015-04-13 16:23:32 +02:00
parent cc54da2237
commit 0632f77ee8
10 changed files with 134 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
View File

@ -4,6 +4,7 @@ import android.content.Intent;
import android.graphics.PointF;
import android.graphics.RectF;
import android.net.Uri;
import android.util.Log;
import org.libreoffice.canvas.SelectionHandle;
import org.libreoffice.kit.Document;
@ -73,19 +74,26 @@ public class InvalidationHandler implements Document.MessageCallback {
LibreOfficeMainActivity.mAppContext.startActivity(urlIntent);
break;
case Document.CALLBACK_STATE_CHANGED:
Log.d("Document.CALLBACK_STATE_CHANGED: " + payload);
String[] parts = payload.split(":");
boolean pressed = Boolean.parseBoolean(parts[1]);
if (parts[0].equals("Bold")) {
LOKitShell.getToolbarController().onToggleStateChanged(Document.BOLD, pressed);
} else if (parts[0].equals("Italic")) {
LOKitShell.getToolbarController().onToggleStateChanged(Document.ITALIC, pressed);
} else if (parts[0].equals("Underline")) {
LOKitShell.getToolbarController().onToggleStateChanged(Document.UNDERLINE, pressed);
} else if (parts[0].equals("Strikeout")) {
LOKitShell.getToolbarController().onToggleStateChanged(Document.STRIKEOUT, pressed);
}
stateChanged(payload);
break;
default:
Log.d(LOGTAG, "LOK_CALLBACK uncatched: " + messageID + " : " + payload);
}
}
private void stateChanged(String payload) {
String[] parts = payload.split("=");
boolean pressed = Boolean.parseBoolean(parts[1]);
if (parts[0].equals(".uno:Bold")) {
LOKitShell.getToolbarController().onToggleStateChanged(Document.BOLD, pressed);
} else if (parts[0].equals(".uno:Italic")) {
LOKitShell.getToolbarController().onToggleStateChanged(Document.ITALIC, pressed);
} else if (parts[0].equals(".uno:Underline")) {
LOKitShell.getToolbarController().onToggleStateChanged(Document.UNDERLINE, pressed);
} else if (parts[0].equals(".uno:StrikeOut")) {
LOKitShell.getToolbarController().onToggleStateChanged(Document.STRIKEOUT, pressed);
} else {
Log.d(LOGTAG, "LOK_CALLBACK_STATE_CHANGED type uncatched: " + payload);
}
}

8
android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
View File

@ -72,7 +72,13 @@ public class ToolbarController {
icon = ImageUtils.bitmapToPressed(icon);
}
menuItem.setIcon(new BitmapDrawable(mContext.getResources(), icon));
final MenuItem fMenuItem = menuItem;
final Bitmap fIcon = icon;
LOKitShell.getMainHandler().post(new Runnable() {
public void run() {
fMenuItem.setIcon(new BitmapDrawable(mContext.getResources(), fIcon));
}
});
}
public void setOptionMenu(Menu menu) {

9
include/LibreOfficeKit/LibreOfficeKitEnums.h
View File

@ -102,7 +102,14 @@ typedef enum
* User clicked on an hyperlink that should be handled by other
* applications accordingly.
*/
LOK_CALLBACK_HYPERLINK_CLICKED
LOK_CALLBACK_HYPERLINK_CLICKED,
/**
* Emit state update to the client.
* For example, when cursor is on bold text, this callback is triggered
* with payload: ".uno:Bold=true"
*/
LOK_CALLBACK_STATE_CHANGED
}
LibreOfficeKitCallbackType;

11
include/sfx2/objsh.hxx
View File

@ -49,6 +49,9 @@
#include <set>
#include <o3tl/typed_flags_set.hxx>
#define LOK_USE_UNSTABLE_API
#include <LibreOfficeKit/LibreOfficeKitTypes.h>
class SbxValue;
class SvxMacro;
class SbxArray;
@ -708,6 +711,14 @@ public:
SAL_DLLPRIVATE void CancelCheckOut( );
SAL_DLLPRIVATE void CheckIn( );
SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisVersion > GetCmisVersions();
/**
* Interface shared by document shell. Allow LOK calls from sfx.
* Default behavior doesn't do anything. relevant SfxObjectShells should override
* the default behavior and implements LOK calls.
*/
virtual void libreOfficeKitCallback(int nType, const char* pPayload) const;
virtual bool isTiledRendering() const;
};
#define SFX_GLOBAL_CLASSID \

2
include/sfx2/unoctitm.hxx
View File

@ -175,6 +175,8 @@ public:
void UnBindController();
SfxDispatcher* GetDispatcher();
void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
void InterceptLOKStateChangeEvent(const SfxObjectShell* objSh, const ::com::sun::star::frame::FeatureStateEvent& aEvent) const;
};
#endif

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

@ -857,6 +857,8 @@ const char* LOKDocView_Impl::callbackTypeToString(int nType)
return "LOK_CALLBACK_GRAPHIC_SELECTION";
case LOK_CALLBACK_HYPERLINK_CLICKED:
return "LOK_CALLBACK_HYPERLINK_CLICKED";
case LOK_CALLBACK_STATE_CHANGED:
return "LOK_CALLBACK_STATE_CHANGED";
}
return 0;
}
@ -937,6 +939,10 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData* pCallback)
gtk_show_uri(NULL, pCallback->m_aPayload.c_str(), GDK_CURRENT_TIME, &pError);
#endif
}
case LOK_CALLBACK_STATE_CHANGED:
{
g_info(pCallback->m_aPayload.c_str());
}
break;
default:
g_assert(false);

55
sfx2/source/control/unoctitm.cxx
View File

@ -68,6 +68,9 @@
#include <iostream>
#include <map>
#include <sal/log.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
@ -973,8 +976,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
pLastState = pState;
}
::cppu::OInterfaceContainerHelper* pContnr = pDispatch->GetListeners().getContainer ( aDispatchURL.Complete );
if ( bNotify && pContnr )
if (bNotify)
{
::com::sun::star::uno::Any aState;
if ( ( eState >= SfxItemState::DEFAULT ) && pState && !IsInvalidItem( pState ) && !pState->ISA(SfxVoidItem) )
@ -1015,16 +1017,24 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
aEvent.Requery = sal_False;
aEvent.State = aState;
::cppu::OInterfaceIteratorHelper aIt( *pContnr );
while( aIt.hasMoreElements() )
{
try
if (pDispatcher && pDispatcher->GetFrame()) {
InterceptLOKStateChangeEvent(
pDispatcher->GetFrame()->GetObjectShell(), aEvent);
}
::cppu::OInterfaceContainerHelper* pContnr = pDispatch->GetListeners().getContainer ( aDispatchURL.Complete );
if (pContnr) {
::cppu::OInterfaceIteratorHelper aIt( *pContnr );
while( aIt.hasMoreElements() )
{
static_cast< ::com::sun::star::frame::XStatusListener *>(aIt.next())->statusChanged( aEvent );
}
catch (const ::com::sun::star::uno::RuntimeException&)
{
aIt.remove();
try
{
static_cast< ::com::sun::star::frame::XStatusListener *>(aIt.next())->statusChanged( aEvent );
}
catch (const ::com::sun::star::uno::RuntimeException&)
{
aIt.remove();
}
}
}
}
@ -1035,4 +1045,27 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
StateChanged( nSID, eState, pState, 0 );
}
void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShell* objSh, const ::com::sun::star::frame::FeatureStateEvent& aEvent) const
{
if (!objSh || !objSh->isTiledRendering()) {
return;
}
if (aEvent.FeatureURL.Path == "Bold" ||
aEvent.FeatureURL.Path == "Italic" ||
aEvent.FeatureURL.Path == "Underline" ||
aEvent.FeatureURL.Path == "StrikeOut") {
OUStringBuffer aBuffer;
aBuffer.append(aEvent.FeatureURL.Complete);
aBuffer.append("=");
bool bTemp = false;
aEvent.State >>= bTemp;
aBuffer.append(bTemp);
OUString payload = aBuffer.makeStringAndClear();
objSh->libreOfficeKitCallback(LOK_CALLBACK_STATE_CHANGED, payload.toUtf8().getStr());
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

12
sfx2/source/doc/objcont.cxx
View File

@ -76,6 +76,10 @@
#include "querytemplate.hxx"
#include <boost/scoped_array.hpp>
#include <LibreOfficeKit/LibreOfficeKitTypes.h>
#include <typeinfo>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@ -639,4 +643,12 @@ bool SfxObjectShell::IsModifyPasswordEntered()
return pImp->m_bModifyPasswordEntered;
}
void SfxObjectShell::libreOfficeKitCallback(SAL_UNUSED_PARAMETER int nType, SAL_UNUSED_PARAMETER const char* pPayload) const {
SAL_WARN("tiled-rendering", "LOK callback interface not overridden for SfxObjectShell subclass typeId: " << typeid(*this).name());
}
bool SfxObjectShell::isTiledRendering() const {
SAL_WARN("tiled-rendering", "LOK callback interface not overridden for SfxObjectShell subclass typeId: " << typeid(*this).name());
return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

5
sw/inc/docsh.hxx
View File

@ -29,6 +29,8 @@
#include <svl/lstner.hxx>
#include <svtools/embedhlp.hxx>
#define LOK_USE_UNSTABLE_API
#include <LibreOfficeKit/LibreOfficeKitTypes.h>
class SwDoc;
class SfxDocumentInfoDialog;
@ -311,6 +313,9 @@ public:
virtual void SetChangeRecording( bool bActivate ) SAL_OVERRIDE;
virtual bool SetProtectionPassword( const OUString &rPassword ) SAL_OVERRIDE;
virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) SAL_OVERRIDE;
virtual void libreOfficeKitCallback(int nType, const char* pPayload) const SAL_OVERRIDE;
virtual bool isTiledRendering() const SAL_OVERRIDE;
};
/** Find the right DocShell and create a new one:

19
sw/source/uibase/app/docsh.cxx
View File

@ -72,6 +72,7 @@
#include <docstyle.hxx>
#include <doc.hxx>
#include <docfunc.hxx>
#include <drawdoc.hxx>
#include <IDocumentUndoRedo.hxx>
#include <IDocumentSettingAccess.hxx>
#include <IDocumentLinksAdministration.hxx>
@ -121,6 +122,9 @@
#include <sfx2/Metadatable.hxx>
#include <calbck.hxx>
#include <sal/log.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::script;
@ -1296,4 +1300,19 @@ bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal
return bRes;
}
void SwDocShell::libreOfficeKitCallback(int nType, const char* pPayload) const
{
if (!m_pDoc) {
return;
}
SwDrawModel* pDrawModel = m_pDoc->getIDocumentDrawModelAccess().GetDrawModel();
pDrawModel->libreOfficeKitCallback(nType, pPayload);
}
bool SwDocShell::isTiledRendering() const {
SwDrawModel* pDrawModel = m_pDoc->getIDocumentDrawModelAccess().GetDrawModel();
return pDrawModel->isTiledRendering();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */