diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-06-05 10:29:25 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-05 12:00:08 +0200 |
commit | 3d6a7cf3eb7aa966601cbc019d1ad5fafdddd21f (patch) | |
tree | e6b0dcfcd9edb66b3d48fa7945cf7c57d0259ed6 /writerfilter/source/dmapper/ModelEventListener.cxx | |
parent | 6d51f9f948c5bf877ec8a53e3716f00fe5e81a23 (diff) |
bnc#820509 DOCX import: try harder to disable form design mode
Previously this only worked if we had indexes in the document as well,
but actually these are independent.
Change-Id: I28afa60d2606230c901948d4c1da8f5a7c50a9f7
Diffstat (limited to 'writerfilter/source/dmapper/ModelEventListener.cxx')
-rw-r--r-- | writerfilter/source/dmapper/ModelEventListener.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/writerfilter/source/dmapper/ModelEventListener.cxx index 8513c277b20e..8da32243252f 100644 --- a/writerfilter/source/dmapper/ModelEventListener.cxx +++ b/writerfilter/source/dmapper/ModelEventListener.cxx @@ -38,7 +38,9 @@ using namespace ::com::sun::star; -ModelEventListener::ModelEventListener() +ModelEventListener::ModelEventListener(bool bIndexes, bool bControls) + : m_bIndexes(bIndexes), + m_bControls(bControls) { } @@ -50,7 +52,7 @@ ModelEventListener::~ModelEventListener() void ModelEventListener::notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException) { - if ( rEvent.EventName == "OnFocus" ) + if ( rEvent.EventName == "OnFocus" && m_bIndexes) { try { @@ -101,6 +103,10 @@ void ModelEventListener::notifyEvent( const document::EventObject& rEvent ) thro { SAL_WARN("writerfilter", "exception while updating indexes: " << rEx.Message); } + } + + if ( rEvent.EventName == "OnFocus" && m_bControls) + { // Form design mode is enabled by default in Writer, not in Word. uno::Reference<frame::XModel> xModel(rEvent.Source, uno::UNO_QUERY); |