summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-05-19 23:42:05 -0400
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-05-21 12:13:49 -0400
commita6e5c7934679329f84eca3c5eb8d021b277c905b (patch)
tree0ebd59ec10c103888216459e33cc9e5b4835e685 /include
parentc126f210bb62143eea6263e37dedcb2fba24cade (diff)
cp#1000072: Improve on-load updates of external links.
* Load all linked external sources up front, rather than on-demand after the cache purge. * Try to pre-populate updated caches rather than leaving them blank and wait until it gets filled during formula calculation. * Disable polling of stale doc shell instances while the update is on-going. This improves the update performance especially when the update takes a long time. * Only close one doc shell instance at a time, even when there are multiple stale doc shell instances that need to be closed, to prevent too long of a pause. * Show progress bar during the update to give the user some visual feedback of the progress. * Skip loading of styles for the linked external document shells. We don't need them. For now, this is ODS only. * Minor performance improvement of ODS import. Conflicts: include/sfx2/sfxmodelfactory.hxx sc/inc/sc.hrc sc/inc/xmlwrap.hxx sc/source/core/data/documen8.cxx sc/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlwrap.cxx sc/source/ui/docshell/docsh.cxx sfx2/source/doc/objxtor.cxx Change-Id: I80aa71fa27e4960e9256253369aa898dd542c9b5
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/sfxmodelfactory.hxx14
1 files changed, 6 insertions, 8 deletions
diff --git a/include/sfx2/sfxmodelfactory.hxx b/include/sfx2/sfxmodelfactory.hxx
index 70cfcf5b1507..ed932e00dea6 100644
--- a/include/sfx2/sfxmodelfactory.hxx
+++ b/include/sfx2/sfxmodelfactory.hxx
@@ -25,16 +25,14 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-//........................................................................
+#define SFXMODEL_STANDARD (sal_uInt64)(0x0000)
+#define SFXMODEL_EMBEDDED_OBJECT (sal_uInt64)(0x0001)
+#define SFXMODEL_EXTERNAL_LINK (sal_uInt64)(0x0002)
+#define SFXMODEL_DISABLE_EMBEDDED_SCRIPTS (sal_uInt64)(0x0004)
+#define SFXMODEL_DISABLE_DOCUMENT_RECOVERY (sal_uInt64)(0x0008)
+
namespace sfx2
{
-//........................................................................
-
- #define SFXMODEL_STANDARD (sal_uInt64)(0x0000)
- #define SFXMODEL_EMBEDDED_OBJECT (sal_uInt64)(0x0001)
- #define SFXMODEL_DISABLE_EMBEDDED_SCRIPTS (sal_uInt64)(0x0002)
- #define SFXMODEL_DISABLE_DOCUMENT_RECOVERY (sal_uInt64)(0x0004)
-
typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ( SAL_CALL * SfxModelFactoryFunc ) (
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,
const sal_uInt64 _nCreationFlags