Kaydet (Commit) 655248f1 authored tarafından Michael Stahl's avatar Michael Stahl

sd: rename static variable SdDrawDocument::pDocLockedInsertingLinks

Change-Id: I6092d64f0e64d295253505b27c9aee7874d9ecce
üst cd3b8cc5
......@@ -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
......
......@@ -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
}
}
......
......@@ -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();
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment