summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2017-09-08 10:57:55 +0200
committerAndras Timar <andras.timar@collabora.com>2017-09-12 21:57:15 +0200
commite2cfcd56ca8f3de4480ee85712cff3182999635c (patch)
tree55019e8c513ef31f077aaa9cfa3343bfd1fe30a1 /sw/inc
parent348bc3c6a8142ed605e260ae930d76e6cec7f656 (diff)
tdf#108572 remove connections only for current shell
Also remove connections to temp files. Change-Id: Ie5c09eb365d1246e053dc52884c72687ac226f3c Reviewed-on: https://gerrit.libreoffice.org/42095 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/42208 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/dbmgr.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index d4797b303e23..b80f051a4d55 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -259,7 +259,7 @@ friend class SwConnectionDisposedListener_Impl;
OUString m_sEmbeddedName;
/// Store last registrations to revoke or commit
- static std::vector<OUString> m_aUncommitedRegistrations;
+ static std::vector<std::pair<SwDocShell*, OUString>> m_aUncommitedRegistrations;
/// The document that owns this manager.
SwDoc* m_pDoc;
@@ -486,7 +486,7 @@ public:
void RevokeLastRegistrations();
/// Accept not commited registrations
- static void CommitLastRegistrations();
+ void CommitLastRegistrations();
};
#endif