summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2013-01-08 10:14:52 -0500
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-01-08 10:16:35 -0500
commit7ec3861d69a8c18488706564b27dbc344e3b5cd1 (patch)
tree47fc717e9a5320a02ef037d563def291a85835f0 /svx/source
parent59555e5b38d62b92397d7f3eac5097211ed261c4 (diff)
Remove one variant of HasField() which takes arcane TypeId.
Change-Id: Ic8236b291ed5f318f67378bbc57b7cf027cbb92a
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx12
-rw-r--r--svx/source/svdraw/svdotext.cxx8
2 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index b5aaeacf8c0e..cc003debd548 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -117,12 +117,12 @@ namespace drawinglayer
{
const EditTextObject& rETO = maOutlinerParaObject.GetTextObject();
- mbContainsPageField = rETO.HasField(SvxPageField::StaticType());
- mbContainsPageCountField = rETO.HasField(SvxPagesField::StaticType());
- mbContainsOtherFields = rETO.HasField(SvxHeaderField::StaticType())
- || rETO.HasField(SvxFooterField::StaticType())
- || rETO.HasField(SvxDateTimeField::StaticType())
- || rETO.HasField(SvxAuthorField::StaticType());
+ mbContainsPageField = rETO.HasField(SvxPageField::StaticClassId());
+ mbContainsPageCountField = rETO.HasField(SvxPagesField::StaticClassId());
+ mbContainsOtherFields = rETO.HasField(SvxHeaderField::StaticClassId())
+ || rETO.HasField(SvxFooterField::StaticClassId())
+ || rETO.HasField(SvxDateTimeField::StaticClassId())
+ || rETO.HasField(SvxAuthorField::StaticClassId());
}
bool SdrTextPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 7a662aa645a2..72ab07f745fa 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1167,16 +1167,16 @@ void SdrTextObj::ImpCheckMasterCachable()
if(!bNotVisibleAsMaster && pOutlinerParaObject && pOutlinerParaObject->IsEditDoc() )
{
const EditTextObject& rText= pOutlinerParaObject->GetTextObject();
- bNotMasterCachable=rText.HasField(SvxPageField::StaticType());
+ bNotMasterCachable=rText.HasField(SvxPageField::StaticClassId());
if( !bNotMasterCachable )
{
- bNotMasterCachable=rText.HasField(SvxHeaderField::StaticType());
+ bNotMasterCachable=rText.HasField(SvxHeaderField::StaticClassId());
if( !bNotMasterCachable )
{
- bNotMasterCachable=rText.HasField(SvxFooterField::StaticType());
+ bNotMasterCachable=rText.HasField(SvxFooterField::StaticClassId());
if( !bNotMasterCachable )
{
- bNotMasterCachable=rText.HasField(SvxDateTimeField::StaticType());
+ bNotMasterCachable=rText.HasField(SvxDateTimeField::StaticClassId());
}
}
}