Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
655248f1
Kaydet (Commit)
655248f1
authored
Kas 12, 2015
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sd: rename static variable SdDrawDocument::pDocLockedInsertingLinks
Change-Id: I6092d64f0e64d295253505b27c9aee7874d9ecce
üst
cd3b8cc5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
drawdoc.hxx
sd/inc/drawdoc.hxx
+2
-1
drawdoc.cxx
sd/source/core/drawdoc.cxx
+5
-5
pglink.cxx
sd/source/core/pglink.cxx
+2
-2
No files found.
sd/inc/drawdoc.hxx
Dosyayı görüntüle @
655248f1
...
@@ -467,7 +467,8 @@ public:
...
@@ -467,7 +467,8 @@ public:
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
/** Create and insert a set of two new pages: a standard (draw) page and
the associated notes page. The new pages are inserted directly
the associated notes page. The new pages are inserted directly
...
...
sd/source/core/drawdoc.cxx
Dosyayı görüntüle @
655248f1
...
@@ -112,7 +112,7 @@ using ::com::sun::star::lang::XMultiServiceFactory;
...
@@ -112,7 +112,7 @@ using ::com::sun::star::lang::XMultiServiceFactory;
using
::
com
::
sun
::
star
::
beans
::
PropertyValue
;
using
::
com
::
sun
::
star
::
beans
::
PropertyValue
;
SdDrawDocument
*
SdDrawDocument
::
pDocLockedInsertingLinks
=
nullptr
;
SdDrawDocument
*
SdDrawDocument
::
s_
pDocLockedInsertingLinks
=
nullptr
;
PresentationSettings
::
PresentationSettings
()
PresentationSettings
::
PresentationSettings
()
:
mbAll
(
true
),
:
mbAll
(
true
),
...
@@ -692,14 +692,14 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
...
@@ -692,14 +692,14 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
/** updates all links, only links in this document should by resolved */
/** updates all links, only links in this document should by resolved */
void
SdDrawDocument
::
UpdateAllLinks
()
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?
pLinkManager
->
UpdateAllLinks
();
// query box: update all links?
if
(
pDocLockedInsertingLinks
==
this
)
if
(
s_pDocLockedInsertingLinks
==
this
)
pDocLockedInsertingLinks
=
nullptr
;
// unlock inserting links
s_
pDocLockedInsertingLinks
=
nullptr
;
// unlock inserting links
}
}
}
}
...
...
sd/source/core/pglink.cxx
Dosyayı görüntüle @
655248f1
...
@@ -96,7 +96,7 @@ SdPageLink::~SdPageLink()
...
@@ -96,7 +96,7 @@ SdPageLink::~SdPageLink()
bool
bNoDialogs
=
false
;
bool
bNoDialogs
=
false
;
bool
bCopy
=
false
;
bool
bCopy
=
false
;
if
(
pDoc
->
pDocLockedInsertingLinks
)
if
(
pDoc
->
s_pDocLockedInsertingLinks
)
{
{
// resolving links while loading pDoc
// resolving links while loading pDoc
bNoDialogs
=
true
;
bNoDialogs
=
true
;
...
@@ -106,7 +106,7 @@ SdPageLink::~SdPageLink()
...
@@ -106,7 +106,7 @@ SdPageLink::~SdPageLink()
pDoc
->
InsertBookmarkAsPage
(
aBookmarkList
,
nullptr
,
bLink
,
bReplace
,
pDoc
->
InsertBookmarkAsPage
(
aBookmarkList
,
nullptr
,
bLink
,
bReplace
,
nInsertPos
,
bNoDialogs
,
nullptr
,
bCopy
,
true
,
true
);
nInsertPos
,
bNoDialogs
,
nullptr
,
bCopy
,
true
,
true
);
if
(
!
pDoc
->
pDocLockedInsertingLinks
)
if
(
!
pDoc
->
s_pDocLockedInsertingLinks
)
pDoc
->
CloseBookmarkDoc
();
pDoc
->
CloseBookmarkDoc
();
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment