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
2b1737f6
Kaydet (Commit)
2b1737f6
authored
May 07, 2017
tarafından
Chris Sherlock
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
tdf#43157: convert svx module away from OSL_ASSERT to assert
Change-Id: I3d76e4237a1c8a389244fab6e8f546d818b77d9a
üst
c3c5c168
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
31 additions
and
31 deletions
+31
-31
ChildrenManagerImpl.cxx
svx/source/accessibility/ChildrenManagerImpl.cxx
+1
-1
SpellDialogChildWindow.cxx
svx/source/dialog/SpellDialogChildWindow.cxx
+1
-1
sdrtextprimitive2d.cxx
svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+1
-1
attributeproperties.cxx
svx/source/sdr/properties/attributeproperties.cxx
+2
-2
AreaPropertyPanelBase.cxx
svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+1
-1
charthelper.cxx
svx/source/svdraw/charthelper.cxx
+1
-1
svditer.cxx
svx/source/svdraw/svditer.cxx
+1
-1
svdmrkv.cxx
svx/source/svdraw/svdmrkv.cxx
+1
-1
svdoole2.cxx
svx/source/svdraw/svdoole2.cxx
+2
-2
svdpage.cxx
svx/source/svdraw/svdpage.cxx
+17
-17
unoshcol.cxx
svx/source/unodraw/unoshcol.cxx
+1
-1
xmlgrhlp.cxx
svx/source/xml/xmlgrhlp.cxx
+1
-1
xtable.cxx
svx/source/xoutdev/xtable.cxx
+1
-1
No files found.
svx/source/accessibility/ChildrenManagerImpl.cxx
Dosyayı görüntüle @
2b1737f6
...
...
@@ -279,7 +279,7 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes (
{
SolarMutexGuard
g
;
OSL_ASSERT
(
maShapeTreeInfo
.
GetViewForwarder
()
!=
nullptr
);
assert
(
maShapeTreeInfo
.
GetViewForwarder
()
!=
nullptr
);
tools
::
Rectangle
aVisibleArea
=
maShapeTreeInfo
.
GetViewForwarder
()
->
GetVisibleArea
();
...
...
svx/source/dialog/SpellDialogChildWindow.cxx
Dosyayı görüntüle @
2b1737f6
...
...
@@ -52,7 +52,7 @@ SfxBindings& SpellDialogChildWindow::GetBindings() const
void
SpellDialogChildWindow
::
InvalidateSpellDialog
()
{
OSL_ASSERT
(
m_xAbstractSpellDialog
);
assert
(
m_xAbstractSpellDialog
);
if
(
m_xAbstractSpellDialog
)
m_xAbstractSpellDialog
->
Invalidate
();
}
...
...
svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
Dosyayı görüntüle @
2b1737f6
...
...
@@ -52,7 +52,7 @@ namespace
}
catch
(
const
uno
::
Exception
&
)
{
OSL_ASSERT
(
false
);
assert
(
false
);
}
}
...
...
svx/source/sdr/properties/attributeproperties.cxx
Dosyayı görüntüle @
2b1737f6
...
...
@@ -243,7 +243,7 @@ namespace sdr
void
AttributeProperties
::
MoveToItemPool
(
SfxItemPool
*
pSrcPool
,
SfxItemPool
*
pDestPool
,
SdrModel
*
pNewModel
)
{
OSL_ASSERT
(
pNewModel
!=
nullptr
);
assert
(
pNewModel
!=
nullptr
);
if
(
pSrcPool
&&
pDestPool
&&
(
pSrcPool
!=
pDestPool
))
{
...
...
@@ -282,7 +282,7 @@ namespace sdr
// name or use the default.
// Look up the style in the new document.
OSL_ASSERT
(
pNewModel
->
GetStyleSheetPool
()
!=
nullptr
);
assert
(
pNewModel
->
GetStyleSheetPool
()
!=
nullptr
);
SfxStyleSheet
*
pNewStyleSheet
=
dynamic_cast
<
SfxStyleSheet
*>
(
pNewModel
->
GetStyleSheetPool
()
->
Find
(
pStySheet
->
GetName
(),
...
...
svx/source/sidebar/area/AreaPropertyPanelBase.cxx
Dosyayı görüntüle @
2b1737f6
...
...
@@ -1273,7 +1273,7 @@ IMPL_LINK( AreaPropertyPanelBase, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void )
if
(
!
mxTrGrPopup
)
mxTrGrPopup
=
VclPtr
<
AreaTransparencyGradientPopup
>::
Create
(
*
this
);
mxTrGrPopup
->
Rearrange
(
mpFloatTransparenceItem
.
get
());
OSL_ASSERT
(
pToolBox
->
GetItemCommand
(
pToolBox
->
GetCurItemId
())
==
UNO_SIDEBARGRADIENT
);
assert
(
pToolBox
->
GetItemCommand
(
pToolBox
->
GetCurItemId
())
==
UNO_SIDEBARGRADIENT
);
mxTrGrPopup
->
StartPopupMode
(
pToolBox
,
FloatWinPopupFlags
::
GrabFocus
);
}
...
...
svx/source/svdraw/charthelper.cxx
Dosyayı görüntüle @
2b1737f6
...
...
@@ -50,7 +50,7 @@ bool ChartHelper::isGL3DDiagram( const css::uno::Reference<css::chart2::XDiagram
//iterate through all chart types in the current coordinate system
uno
::
Reference
<
chart2
::
XChartTypeContainer
>
xChartTypeContainer
(
xCooSys
,
uno
::
UNO_QUERY
);
OSL_ASSERT
(
xChartTypeContainer
.
is
());
assert
(
xChartTypeContainer
.
is
());
if
(
!
xChartTypeContainer
.
is
()
)
continue
;
...
...
svx/source/svdraw/svditer.cxx
Dosyayı görüntüle @
2b1737f6
...
...
@@ -65,7 +65,7 @@ void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMod
{
SdrObject
*
pObj
=
bUseZOrder
?
rObjList
.
GetObj
(
nIdx
)
:
rObjList
.
GetObjectForNavigationPosition
(
nIdx
);
OSL_ASSERT
(
pObj
!=
nullptr
);
assert
(
pObj
!=
nullptr
);
if
(
pObj
)
ImpProcessObj
(
pObj
,
eMode
,
bUseZOrder
);
}
...
...
svx/source/svdraw/svdmrkv.cxx
Dosyayı görüntüle @
2b1737f6
...
...
@@ -1394,7 +1394,7 @@ bool SdrMarkView::MarkNextObj(bool bPrev)
if
(
nMarkCount
!=
0
)
{
nChgMarkNum
=
bPrev
?
0
:
nMarkCount
-
1
;
SdrMark
*
pM
=
GetSdrMarkByIndex
(
nChgMarkNum
);
OSL_ASSERT
(
pM
!=
nullptr
);
assert
(
pM
!=
nullptr
);
if
(
pM
->
GetMarkedSdrObj
()
!=
nullptr
)
nSearchObjNum
=
pM
->
GetMarkedSdrObj
()
->
GetNavigationPosition
();
}
...
...
svx/source/svdraw/svdoole2.cxx
Dosyayı görüntüle @
2b1737f6
...
...
@@ -1585,7 +1585,7 @@ void SdrOle2Obj::ImpSetVisAreaSize()
GetObjRef
();
if
(
mpImpl
->
mxObjRef
.
is
())
{
OSL_ASSERT
(
pModel
);
assert
(
pModel
);
sal_Int64
nMiscStatus
=
mpImpl
->
mxObjRef
->
getStatus
(
GetAspect
()
);
// the client is required to get access to scaling
...
...
@@ -1650,7 +1650,7 @@ void SdrOle2Obj::ImpSetVisAreaSize()
// make the new object area known to the client
// compared to the "else" branch aRect might have been changed by the object and no additional scaling was applied
// WHY this ->
OSL_ASSERT
( pClient );
// WHY this ->
assert
( pClient );
if
(
pClient
)
pClient
->
SetObjArea
(
maRect
);
...
...
svx/source/svdraw/svdpage.cxx
Dosyayı görüntüle @
2b1737f6
...
...
@@ -395,7 +395,7 @@ SdrObject* SdrObjList::NbcRemoveObject(size_t nObjNum)
{
if
(
nObjNum
>=
maList
.
size
())
{
OSL_ASSERT
(
nObjNum
<
maList
.
size
());
assert
(
nObjNum
<
maList
.
size
());
return
nullptr
;
}
...
...
@@ -426,7 +426,7 @@ SdrObject* SdrObjList::RemoveObject(size_t nObjNum)
{
if
(
nObjNum
>=
maList
.
size
())
{
OSL_ASSERT
(
nObjNum
<
maList
.
size
());
assert
(
nObjNum
<
maList
.
size
());
return
nullptr
;
}
...
...
@@ -473,8 +473,8 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum)
{
if
(
nObjNum
>=
maList
.
size
()
||
pNewObj
==
nullptr
)
{
OSL_ASSERT
(
nObjNum
<
maList
.
size
());
OSL_ASSERT
(
pNewObj
!=
nullptr
);
assert
(
nObjNum
<
maList
.
size
());
assert
(
pNewObj
!=
nullptr
);
return
nullptr
;
}
...
...
@@ -508,12 +508,12 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, size_t nObjNum)
{
if
(
nObjNum
>=
maList
.
size
())
{
OSL_ASSERT
(
nObjNum
<
maList
.
size
());
assert
(
nObjNum
<
maList
.
size
());
return
nullptr
;
}
if
(
pNewObj
==
nullptr
)
{
OSL_ASSERT
(
pNewObj
!=
nullptr
);
assert
(
pNewObj
!=
nullptr
);
return
nullptr
;
}
...
...
@@ -562,8 +562,8 @@ SdrObject* SdrObjList::SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum)
{
if
(
nOldObjNum
>=
maList
.
size
()
||
nNewObjNum
>=
maList
.
size
())
{
OSL_ASSERT
(
nOldObjNum
<
maList
.
size
());
OSL_ASSERT
(
nNewObjNum
<
maList
.
size
());
assert
(
nOldObjNum
<
maList
.
size
());
assert
(
nNewObjNum
<
maList
.
size
());
return
nullptr
;
}
...
...
@@ -675,7 +675,7 @@ SdrObject* SdrObjList::GetObj(size_t nNum) const
{
if
(
nNum
>=
maList
.
size
())
{
OSL_ASSERT
(
nNum
<
maList
.
size
());
assert
(
nNum
<
maList
.
size
());
return
nullptr
;
}
else
...
...
@@ -768,8 +768,8 @@ void SdrObjList::SetObjectNavigationPosition (
maList
.
end
(),
mxNavigationOrder
->
begin
());
}
OSL_ASSERT
(
mxNavigationOrder
.
get
()
!=
nullptr
);
OSL_ASSERT
(
mxNavigationOrder
->
size
()
==
maList
.
size
());
assert
(
mxNavigationOrder
.
get
()
!=
nullptr
);
assert
(
mxNavigationOrder
->
size
()
==
maList
.
size
());
SdrObjectWeakRef
aReference
(
&
rObject
);
...
...
@@ -815,7 +815,7 @@ SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigat
// index is correct and look up the object in mxNavigationOrder.
if
(
nNavigationPosition
>=
mxNavigationOrder
->
size
())
{
OSL_ASSERT
(
nNavigationPosition
<
mxNavigationOrder
->
size
());
assert
(
nNavigationPosition
<
mxNavigationOrder
->
size
());
}
else
return
(
*
mxNavigationOrder
)[
nNavigationPosition
].
get
();
...
...
@@ -826,7 +826,7 @@ SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigat
// instead.
if
(
nNavigationPosition
>=
maList
.
size
())
{
OSL_ASSERT
(
nNavigationPosition
<
maList
.
size
());
assert
(
nNavigationPosition
<
maList
.
size
());
}
else
return
maList
[
nNavigationPosition
];
...
...
@@ -893,7 +893,7 @@ void SdrObjList::InsertObjectIntoContainer (
SdrObject
&
rObject
,
const
sal_uInt32
nInsertPosition
)
{
OSL_ASSERT
(
nInsertPosition
<=
maList
.
size
());
assert
(
nInsertPosition
<=
maList
.
size
());
// Update the navigation positions.
if
(
HasObjectNavigationOrder
())
...
...
@@ -921,7 +921,7 @@ void SdrObjList::ReplaceObjectInContainer (
{
if
(
nObjectPosition
>=
maList
.
size
())
{
OSL_ASSERT
(
nObjectPosition
<
maList
.
size
());
assert
(
nObjectPosition
<
maList
.
size
());
return
;
}
...
...
@@ -931,7 +931,7 @@ void SdrObjList::ReplaceObjectInContainer (
// A user defined position of the object that is to be replaced is
// not transferred to the new object so erase the former and append
// the later object from/to the navigation order.
OSL_ASSERT
(
nObjectPosition
<
maList
.
size
());
assert
(
nObjectPosition
<
maList
.
size
());
SdrObjectWeakRef
aReference
(
maList
[
nObjectPosition
]);
WeakSdrObjectContainerType
::
iterator
iObject
(
::
std
::
find
(
mxNavigationOrder
->
begin
(),
...
...
@@ -955,7 +955,7 @@ void SdrObjList::RemoveObjectFromContainer (
{
if
(
nObjectPosition
>=
maList
.
size
())
{
OSL_ASSERT
(
nObjectPosition
<
maList
.
size
());
assert
(
nObjectPosition
<
maList
.
size
());
return
;
}
...
...
svx/source/unodraw/unoshcol.cxx
Dosyayı görüntüle @
2b1737f6
...
...
@@ -109,7 +109,7 @@ void SvxShapeCollection::release() throw()
}
// only the alive ref holds the object
OSL_ASSERT
(
m_refCount
==
1
);
assert
(
m_refCount
==
1
);
// destroy the object if xHoldAlive decrement the refcount to 0
return
;
}
...
...
svx/source/xml/xmlgrhlp.cxx
Dosyayı görüntüle @
2b1737f6
...
...
@@ -980,7 +980,7 @@ SvXMLGraphicImportExportHelper::SvXMLGraphicImportExportHelper( SvXMLGraphicHelp
void
SAL_CALL
SvXMLGraphicImportExportHelper
::
disposing
()
{
Reference
<
XComponent
>
xComp
(
m_xGraphicObjectResolver
,
UNO_QUERY
);
OSL_ASSERT
(
xComp
.
is
());
assert
(
xComp
.
is
());
if
(
xComp
.
is
())
xComp
->
dispose
();
// m_xBinaryStreamResolver is a reference to the same object => don't call
...
...
svx/source/xoutdev/xtable.cxx
Dosyayı görüntüle @
2b1737f6
...
...
@@ -360,7 +360,7 @@ XPropertyListRef XPropertyList::CreatePropertyList( XPropertyListType aType,
OSL_FAIL
(
"unknown xproperty type"
);
break
;
}
OSL_ASSERT
(
!
pRet
.
is
()
||
pRet
->
meType
==
aType
);
assert
(
!
pRet
.
is
()
||
pRet
->
meType
==
aType
);
return
pRet
;
}
...
...
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