svx/inc/svx/dialogs.hrc |1
svx/source/stbctrls/stbctrls.src |5 +++
writerfilter/Library_rtftok.mk|1
writerfilter/inc/rtftok/RTFDocument.hxx |4 ++
writerfilter/source/filter/RtfFilter.cxx |8 +
writerfilter/source/rtftok/rtfdocumentfactory.cxx |5 ++-
writerfilter/source/rtftok/rtfdocumentimpl.cxx|8 +++--
writerfilter/source/rtftok/rtfdocumentimpl.hxx|4 ++
writerfilter/source/rtftok/rtftokenizer.cxx | 30 --
writerfilter/source/rtftok/rtftokenizer.hxx |3 +-
10 files changed, 58 insertions(+), 11 deletions(-)
New commits:
commit fe2395678a2d31e5e809e52bb49495cc3ab8b381
Author: Miklos Vajna
Date: Tue Jan 10 18:53:55 2012 +0100
fdo#38057 implement RTF import progressbar
(cherry picked from commit 92c7b6733e55a6ab62bc231ecf0ffd5c0da7c8d2)
Conflicts:
writerfilter/source/rtftok/rtftokenizer.cxx
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 079be0a..76b0c0a 100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -1175,5 +1175,6 @@
#define RID_SVXBMP_DOC_MODIFIED_FEEDBACK (SVX_OOO_BUILD_START + 3)
#define RID_SVXSTR_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 4)
#define RID_SVXSTR_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 5)
+#define RID_SVXSTR_DOC_LOAD (SVX_OOO_BUILD_START + 6)
#endif
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index c2e0999..dea916d 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -97,6 +97,11 @@ String RID_SVXSTR_DOC_MODIFIED_NO
Text [ en-US ] = "The document has not been modified since the last save.";
};
+String RID_SVXSTR_DOC_LOAD
+{
+Text [ en-US ] = "Loading document...";
+};
+
// PopupMenu -
Menu RID_SVXMNU_ZOOM
{
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
index 9ee5cde..3835a5d 100644
--- a/writerfilter/Library_rtftok.mk
+++ b/writerfilter/Library_rtftok.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,rtftok,\
utl \
tl \
resourcemodel \
+ vcl \
$(gb_STDLIBS) \
))
diff --git a/writerfilter/inc/rtftok/RTFDocument.hxx
b/writerfilter/inc/rtftok/RTFDocument.hxx
index 72fe6bd..15b94eb 100644
--- a/writerfilter/inc/rtftok/RTFDocument.hxx
+++ b/writerfilter/inc/rtftok/RTFDocument.hxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
namespace writerfilter {
namespace rtftok {
@@ -62,7 +63,8 @@ namespace writerfilter {
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & xContext,
::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > const & xInputStream,
::com::sun::star::uno::Reference<
::com::sun::star::lang::XComponent > const & xDstDoc,
-::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame > const & xFrame);
+::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame > const & xFrame,
+::com::sun::star::uno::Reference<
::com::sun::star::task::XStatusIndicator > const & xStatusIndicator);
};
} // namespace rtftok
} // namespace writerfilter
diff --git a/writerfilter/source/filter/RtfFilter.cxx
b/writerfilter/source/filter/RtfFilter.cxx
index 8786539..067fae9 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
using namespace ::rtl;
using namespace ::cppu;
@@ -89,14 +90,19 @@ sal_Bool RtfFilter::filter( const uno::Sequence<
beans::PropertyValue >& aDescri
uno::Reference xFrame =
aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_FRAME(),
uno::Reference());
+uno::Reference xStatusIndicator =
aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_STATUSINDICATOR(),
+uno::Reference());
+
writerfilter::Stream::Pointer_t pStream(
new writerfilter::dmapper::DomainMapper(m_xContext,
xInputStream, m_xDstDoc, writerfilter::dmapper::DOCUMENT_RTF));
writerfilter::rtftok::RTFDocument::Pointer_t const pDocument(
-
writerfilter::rtftok::RTFDocumentFactory::createDocument(m_xContext,
xInputStream, m_xDstDoc, xFrame));
+
writerfilter::rtftok::RTFDocumentFactory::createDocument(m_xContext,
xInputStream, m_xDstDoc, xFrame, xStatusIndicator));
pDocument->resolve(*pStream);
#ifdef DEBUG_IMPORT
dmapperLogger->endDocument();
#endif
+if (xStatusIndicator.is())
+xStatusIndicator->end();
return sal_True;
}
catch (const uno::Except
