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

Resolves: fdo#79178 Crash when opening a form created with a previous version

Browse Source 
A regression from c2c530da69 I think. Rework
this to follow the same ctor + init pattern as the others

move the fillCache out of the ctor to acquire the obj first, then
call the extra init before returning it

Change-Id: Ia0dc878654780294a4935f07ac70c4358ca51dfc
This commit is contained in:
Caolán McNamara
2014-05-25 15:26:21 +01:00
parent ddb73c6137
commit 637bb5adf7
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
framework/source/accelerators/documentacceleratorconfiguration.cxx
View File

@@ -98,14 +98,14 @@ public:
virtual sal_Bool SAL_CALL hasStorage() virtual sal_Bool SAL_CALL hasStorage()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
/** read all data into the cache. */ /** read all data into the cache. */
void impl_ts_fillCache(); void fillCache();
private:
/** forget all currently cached data AND(!) /** forget all currently cached data AND(!)
forget all currently used storages. */ forget all currently used storages. */
void impl_ts_clearCache(); void clearCache();
}; };
DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration( DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration(
@@ -128,8 +128,6 @@ DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration(
css::uno::Reference< css::embed::XStorage >()); css::uno::Reference< css::embed::XStorage >());
} }
} }
impl_ts_fillCache();
} }
DocumentAcceleratorConfiguration::~DocumentAcceleratorConfiguration() DocumentAcceleratorConfiguration::~DocumentAcceleratorConfiguration()
@@ -150,10 +148,10 @@ void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Refer
} }
if (bForgetOldStorages) if (bForgetOldStorages)
impl_ts_clearCache(); clearCache();
if (xStorage.is()) if (xStorage.is())
impl_ts_fillCache(); fillCache();
} }
sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage() sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage()
@@ -163,7 +161,7 @@ sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage()
return m_xDocumentRoot.is(); return m_xDocumentRoot.is();
} }
void DocumentAcceleratorConfiguration::impl_ts_fillCache() void DocumentAcceleratorConfiguration::fillCache()
{ {
css::uno::Reference< css::embed::XStorage > xDocumentRoot; css::uno::Reference< css::embed::XStorage > xDocumentRoot;
{ {
@@ -203,7 +201,7 @@ void DocumentAcceleratorConfiguration::impl_ts_fillCache()
{} {}
} }
void DocumentAcceleratorConfiguration::impl_ts_clearCache() void DocumentAcceleratorConfiguration::clearCache()
{ {
m_aPresetHandler.forgetCachedStorages(); m_aPresetHandler.forgetCachedStorages();
} }
@@ -215,7 +213,12 @@ com_sun_star_comp_framework_DocumentAcceleratorConfiguration_get_implementation(
css::uno::XComponentContext *context, css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &arguments) css::uno::Sequence<css::uno::Any> const &arguments)
{ {
return cppu::acquire(new DocumentAcceleratorConfiguration(context, arguments)); DocumentAcceleratorConfiguration *inst = new DocumentAcceleratorConfiguration(context, arguments);
css::uno::XInterface *acquired_inst = cppu::acquire(inst);
inst->fillCache();
return acquired_inst;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */