summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2017-09-02 15:33:37 +0200
committerJulien Nabet <serval2412@yahoo.fr>2017-09-02 18:09:26 +0200
commit9a46ad2f762765348f7aef6e44774a47871362ae (patch)
treeae9583874357a28cf6d67db98d1e47bde912dbb7 /dbaccess
parent22a7f60b64a424e88f5e0247267f21afaf9db1e1 (diff)
tdf#96703: getDocumentStorage is called during initialization
So use DocumentGuard::MethodUsedDuringInit instead of DocumentGuard::DefaultMethod to avoid com.sun.star.lang.NotInitializedException Then we'll got to tackle ODatabaseModelImpl::getOrCreateRootStorage: no source to create the storage from! Change-Id: I1f01bb46088445f3cb3264baee9ad4d45bb5fa8c Reviewed-on: https://gerrit.libreoffice.org/41837 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 1f769fbc633b..cad3cfb231b1 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1937,7 +1937,7 @@ void SAL_CALL ODatabaseDocument::switchToStorage( const Reference< XStorage >& _
Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentStorage( )
{
- DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
+ DocumentGuard aGuard(*this, DocumentGuard::MethodUsedDuringInit);
return m_pImpl->getOrCreateRootStorage();
}