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
500ffae7
Kaydet (Commit)
500ffae7
authored
Nis 19, 2017
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sw: convert some OSL_ENSURE to assert in docnew.cxx
Change-Id: Ic3962728abc31accc7dd51b5291c58c5bfaa21a6
üst
447a0132
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
9 deletions
+8
-9
docnew.cxx
sw/source/core/doc/docnew.cxx
+8
-9
No files found.
sw/source/core/doc/docnew.cxx
Dosyayı görüntüle @
500ffae7
...
...
@@ -500,8 +500,8 @@ SwDoc::~SwDoc()
mpFootnoteInfo
->
ReleaseCollection
();
mpEndNoteInfo
->
ReleaseCollection
();
OSL_ENSURE
(
mpDfltTextFormatColl
==
(
*
mpTextFormatCollTable
)[
0
],
"Default-Text-Collection must always be at the start"
);
assert
(
mpDfltTextFormatColl
==
(
*
mpTextFormatCollTable
)[
0
]
&&
"Default-Text-Collection must always be at the start"
);
// Optimization: Based on the fact that Standard is always 2nd in the
// array, we should delete it as the last. With this we avoid
...
...
@@ -511,8 +511,8 @@ SwDoc::~SwDoc()
mpTextFormatCollTable
->
DeleteAndDestroy
(
1
,
mpTextFormatCollTable
->
size
());
delete
mpTextFormatCollTable
;
OSL_ENSURE
(
mpDfltGrfFormatColl
==
(
*
mpGrfFormatCollTable
)[
0
],
"DefaultGrfCollection must always be at the start"
);
assert
(
mpDfltGrfFormatColl
==
(
*
mpGrfFormatCollTable
)[
0
]
&&
"DefaultGrfCollection must always be at the start"
);
mpGrfFormatCollTable
->
DeleteAndDestroy
(
1
,
mpGrfFormatCollTable
->
size
());
delete
mpGrfFormatCollTable
;
...
...
@@ -607,9 +607,8 @@ void SwDoc::SetDocShell( SwDocShell* pDSh )
// set DocShell pointer also on DrawModel
InitDrawModelAndDocShell
(
mpDocShell
,
GetDocumentDrawModelManager
().
GetDrawModel
());
OSL_ENSURE
(
!
GetDocumentDrawModelManager
().
GetDrawModel
()
||
GetDocumentDrawModelManager
().
GetDrawModel
()
->
GetPersist
()
==
GetPersist
(),
"draw model's persist is out of sync"
);
assert
(
!
GetDocumentDrawModelManager
().
GetDrawModel
()
||
GetDocumentDrawModelManager
().
GetDrawModel
()
->
GetPersist
()
==
GetPersist
());
}
}
...
...
@@ -643,8 +642,8 @@ void SwDoc::ClearDoc()
// if there are still FlyFrames dangling around, delete them too
while
(
!
mpSpzFrameFormatTable
->
empty
()
)
getIDocumentLayoutAccess
().
DelLayoutFormat
((
*
mpSpzFrameFormatTable
)[
mpSpzFrameFormatTable
->
size
()
-
1
]);
OSL_ENSURE
(
!
GetDocumentDrawModelManager
().
GetDrawModel
()
||
!
GetDocumentDrawModelManager
().
GetDrawModel
()
->
GetPage
(
0
)
->
GetObjCount
(),
"not all DrawObjects removed from the page"
);
assert
(
!
GetDocumentDrawModelManager
().
GetDrawModel
()
||
!
GetDocumentDrawModelManager
().
GetDrawModel
()
->
GetPage
(
0
)
->
GetObjCount
()
);
getIDocumentRedlineAccess
().
GetRedlineTable
().
DeleteAndDestroyAll
();
getIDocumentRedlineAccess
().
GetExtraRedlineTable
().
DeleteAndDestroyAll
();
...
...
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