From 94d85ef550ad17efba5dec09290d0e8176a8b455 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Mon, 10 Jan 2011 16:11:35 +0100 Subject: removetooltypes01: #i112600# remove tooltypes from svx --- svx/source/svdraw/svdotxfl.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'svx/source/svdraw/svdotxfl.cxx') diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx index fe21621c1b9a..575ff909e4dd 100644 --- a/svx/source/svdraw/svdotxfl.cxx +++ b/svx/source/svdraw/svdotxfl.cxx @@ -33,7 +33,7 @@ #include #include -static BOOL bInit = FALSE; +static sal_Bool bInit = sal_False; // Do not remove this, it is still used in src536a! void SdrRegisterFieldClasses() @@ -44,15 +44,15 @@ void SdrRegisterFieldClasses() SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxHeaderField); SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxFooterField); SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxDateTimeField); - bInit = TRUE; + bInit = sal_True; } } ///////////////////////////////////////////////////////////////////////////////////////////////// */ -FASTBOOL SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, USHORT /*nPara*/, USHORT /*nPos*/, - FASTBOOL /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const +int SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, + int /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const { - return FALSE; + return sal_False; } -- cgit From 66356194e2a9b45df904e6452b954b9e15a121c3 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Tue, 11 Jan 2011 16:23:55 +0100 Subject: removetooltypes01: #i112600# do not affect FASTBOOL in this cws --- svx/source/svdraw/svdotxfl.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'svx/source/svdraw/svdotxfl.cxx') diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx index 575ff909e4dd..444796adb30c 100644 --- a/svx/source/svdraw/svdotxfl.cxx +++ b/svx/source/svdraw/svdotxfl.cxx @@ -50,8 +50,8 @@ void SdrRegisterFieldClasses() ///////////////////////////////////////////////////////////////////////////////////////////////// */ -int SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, - int /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const +FASTBOOL SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, + FASTBOOL /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const { return sal_False; } -- cgit