diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-12 20:58:46 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-13 11:03:06 +0100 |
| commit | 655248f1b504af18782caaa5b903623145ab80e5 (patch) | |
| tree | 6233204b4b43c3a1abe8b23121b2ad9d807f91b9 /sd | |
| parent | cd3b8cc57d0e0f77da32438e95c3ab1cf79338bc (diff) | |
sd: rename static variable SdDrawDocument::pDocLockedInsertingLinks
Change-Id: I6092d64f0e64d295253505b27c9aee7874d9ecce
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/drawdoc.hxx | 3 | ||||
| -rw-r--r-- | sd/source/core/drawdoc.cxx | 10 | ||||
| -rw-r--r-- | sd/source/core/pglink.cxx | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index e6765254837c..6343217ced19 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -467,7 +467,8 @@ public: public: - SAL_DLLPRIVATE static SdDrawDocument* pDocLockedInsertingLinks; // static to prevent recursions while resolving links + /// static to prevent recursions while resolving links + SAL_DLLPRIVATE static SdDrawDocument* s_pDocLockedInsertingLinks; /** Create and insert a set of two new pages: a standard (draw) page and the associated notes page. The new pages are inserted directly diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 91cb397822aa..6702e9d7ad0b 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -112,7 +112,7 @@ using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::beans::PropertyValue; -SdDrawDocument* SdDrawDocument::pDocLockedInsertingLinks = nullptr; +SdDrawDocument* SdDrawDocument::s_pDocLockedInsertingLinks = nullptr; PresentationSettings::PresentationSettings() : mbAll( true ), @@ -692,14 +692,14 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) /** updates all links, only links in this document should by resolved */ void SdDrawDocument::UpdateAllLinks() { - if ( !pDocLockedInsertingLinks && pLinkManager && !pLinkManager->GetLinks().empty() ) + if (!s_pDocLockedInsertingLinks && pLinkManager && !pLinkManager->GetLinks().empty()) { - pDocLockedInsertingLinks = this; // lock inserting links. only links in this document should by resolved + s_pDocLockedInsertingLinks = this; // lock inserting links. only links in this document should by resolved pLinkManager->UpdateAllLinks(); // query box: update all links? - if( pDocLockedInsertingLinks == this ) - pDocLockedInsertingLinks = nullptr; // unlock inserting links + if (s_pDocLockedInsertingLinks == this) + s_pDocLockedInsertingLinks = nullptr; // unlock inserting links } } diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx index c68b625472fc..6f54c58f9eb2 100644 --- a/sd/source/core/pglink.cxx +++ b/sd/source/core/pglink.cxx @@ -96,7 +96,7 @@ SdPageLink::~SdPageLink() bool bNoDialogs = false; bool bCopy = false; - if( pDoc->pDocLockedInsertingLinks ) + if (pDoc->s_pDocLockedInsertingLinks) { // resolving links while loading pDoc bNoDialogs = true; @@ -106,7 +106,7 @@ SdPageLink::~SdPageLink() pDoc->InsertBookmarkAsPage(aBookmarkList, nullptr, bLink, bReplace, nInsertPos, bNoDialogs, nullptr, bCopy, true, true); - if( !pDoc->pDocLockedInsertingLinks ) + if (!pDoc->s_pDocLockedInsertingLinks) pDoc->CloseBookmarkDoc(); } } |