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
839cb94a
Kaydet (Commit)
839cb94a
authored
Mar 27, 2012
tarafından
Rafael Dominguez
Kaydeden (comit)
Caolán McNamara
Nis 11, 2012
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Replace deprecated List for std::vector<SdPage*>.
üst
2ea6cc6a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
15 deletions
+11
-15
drawdoc3.cxx
sd/source/core/drawdoc3.cxx
+11
-15
No files found.
sd/source/core/drawdoc3.cxx
Dosyayı görüntüle @
839cb94a
...
@@ -1664,12 +1664,12 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
...
@@ -1664,12 +1664,12 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
}
}
// Liste mit Seiten fuellen
// Liste mit Seiten fuellen
List
*
pPageList
=
new
List
;
std
::
vector
<
SdPage
*>
aPage
List
;
// #98456, this has to be removed according to CL (KA 07/08/2002)
// #98456, this has to be removed according to CL (KA 07/08/2002)
// #109884# but we need them again to restore the styles of the presentation objects while undo
// #109884# but we need them again to restore the styles of the presentation objects while undo
pPageList
->
Insert
(
pMaster
,
LIST_APPEND
);
aPageList
.
push_back
(
pMaster
);
pPageList
->
Insert
(
pNotesMaster
,
LIST_APPEND
);
aPageList
.
push_back
(
pNotesMaster
);
if
(
bMaster
||
bLayoutReloaded
)
if
(
bMaster
||
bLayoutReloaded
)
{
{
...
@@ -1679,21 +1679,20 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
...
@@ -1679,21 +1679,20 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
String
aTest
=
pPage
->
GetLayoutName
();
String
aTest
=
pPage
->
GetLayoutName
();
if
(
aTest
==
aOldPageLayoutName
)
if
(
aTest
==
aOldPageLayoutName
)
{
{
pPageList
->
Insert
(
pPage
,
LIST_APPEND
);
aPageList
.
push_back
(
pPage
);
}
}
}
}
}
}
else
else
{
{
pPageList
->
Insert
(
pSelectedPage
,
LIST_APPEND
);
aPageList
.
push_back
(
pSelectedPage
);
pPageList
->
Insert
(
pNotes
,
LIST_APPEND
);
aPageList
.
push_back
(
pNotes
);
}
}
pPage
=
(
SdPage
*
)
pPageList
->
First
();
for
(
std
::
vector
<
SdPage
*>::
iterator
pIter
=
aPageList
.
begin
();
pIter
!=
aPageList
.
end
();
++
pIter
)
while
(
pPage
)
{
{
AutoLayout
eAutoLayout
=
pPage
->
GetAutoLayout
();
AutoLayout
eAutoLayout
=
(
*
pIter
)
->
GetAutoLayout
();
if
(
bUndo
)
if
(
bUndo
)
{
{
...
@@ -1702,15 +1701,12 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
...
@@ -1702,15 +1701,12 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
(
this
,
(
this
,
pPage
->
IsMasterPage
()
?
aLayoutName
:
aOldLayoutName
,
pPage
->
IsMasterPage
()
?
aLayoutName
:
aOldLayoutName
,
aLayoutName
,
aLayoutName
,
eAutoLayout
,
eAutoLayout
,
sal_False
,
pPage
);
eAutoLayout
,
eAutoLayout
,
sal_False
,
*
pIter
);
pUndoMgr
->
AddUndoAction
(
pPLUndoAction
);
pUndoMgr
->
AddUndoAction
(
pPLUndoAction
);
}
}
pPage
->
SetPresentationLayout
(
aLayoutName
);
(
*
pIter
)
->
SetPresentationLayout
(
aLayoutName
);
pPage
->
SetAutoLayout
(
eAutoLayout
);
(
*
pIter
)
->
SetAutoLayout
(
eAutoLayout
);
pPage
=
(
SdPage
*
)
pPageList
->
Next
();
}
}
delete
pPageList
;
/*********************************************************************
/*********************************************************************
|* Neue Masterpages angleichen
|* Neue Masterpages angleichen
...
...
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