diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2017-09-02 15:33:37 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-09-15 12:38:09 +0200 |
| commit | 4f269f8c8965be157e0584ead84a65347d8b6b69 (patch) | |
| tree | 1cb86589504d3b9ea9952488466912f3d2dc814d | |
| parent | 7f208a5287a6eda301b0c3c797d5e21181ce27d2 (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>
(cherry picked from commit 9a46ad2f762765348f7aef6e44774a47871362ae)
Reviewed-on: https://gerrit.libreoffice.org/41852
Reviewed-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | dbaccess/source/core/dataaccess/databasedocument.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 0c42e19325c2..11b1da287569 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -1963,7 +1963,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(); } |