diff options
Diffstat (limited to 'sw/source/core/fields/docufld.cxx')
| -rw-r--r-- | sw/source/core/fields/docufld.cxx | 171 |
1 files changed, 151 insertions, 20 deletions
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index dcaea13af7eb..0f84d40c5c1c 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -247,7 +247,14 @@ sal_uInt16 SwPageNumberField::GetSubType() const return nSubType; } +<<<<<<< local BOOL SwPageNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +======= +/*-----------------05.03.98 10:25------------------- + +--------------------------------------------------*/ +sal_Bool SwPageNumberField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const +>>>>>>> other { switch( nWhichId ) { @@ -278,9 +285,14 @@ BOOL SwPageNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const return sal_True; } +<<<<<<< local BOOL SwPageNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +======= +--------------------------------------------------*/ +sal_Bool SwPageNumberField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) +>>>>>>> other { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; sal_Int16 nSet = 0; switch( nWhichId ) { @@ -312,7 +324,7 @@ BOOL SwPageNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId ) nSubType = PG_NEXT; break; default: - bRet = FALSE; + bRet = sal_False; } break; case FIELD_PROP_PAR1: @@ -333,7 +345,7 @@ SwAuthorFieldType::SwAuthorFieldType() { } -String SwAuthorFieldType::Expand(ULONG nFmt) const +String SwAuthorFieldType::Expand(sal_uLong nFmt) const { String sRet; SvtUserOptions& rOpt = SW_MOD()->GetUserOptions(); @@ -376,7 +388,14 @@ SwField* SwAuthorField::Copy() const return pTmp; } +<<<<<<< local BOOL SwAuthorField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +======= +/*-----------------05.03.98 11:15------------------- + +--------------------------------------------------*/ +sal_Bool SwAuthorField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const +>>>>>>> other { sal_Bool bVal; switch( nWhichId ) @@ -401,7 +420,12 @@ BOOL SwAuthorField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const return sal_True; } +<<<<<<< local BOOL SwAuthorField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +======= +--------------------------------------------------*/ +sal_Bool SwAuthorField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) +>>>>>>> other { switch( nWhichId ) { @@ -436,7 +460,7 @@ SwFileNameFieldType::SwFileNameFieldType(SwDoc *pDocument) pDoc = pDocument; } -String SwFileNameFieldType::Expand(ULONG nFmt) const +String SwFileNameFieldType::Expand(sal_uLong nFmt) const { String aRet; const SwDocShell* pDShell = pDoc->GetDocShell(); @@ -517,7 +541,14 @@ SwField* SwFileNameField::Copy() const return pTmp; } +<<<<<<< local BOOL SwFileNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +======= +/*-----------------05.03.98 08:59------------------- + +--------------------------------------------------*/ +sal_Bool SwFileNameField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const +>>>>>>> other { switch( nWhichId ) { @@ -543,7 +574,7 @@ BOOL SwFileNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const case FIELD_PROP_BOOL2: { - BOOL bVal = IsFixed(); + sal_Bool bVal = IsFixed(); rAny.setValue(&bVal, ::getBooleanCppuType()); } break; @@ -557,7 +588,12 @@ BOOL SwFileNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const return sal_True; } +<<<<<<< local BOOL SwFileNameField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +======= +--------------------------------------------------*/ +sal_Bool SwFileNameField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) +>>>>>>> other { switch( nWhichId ) { @@ -568,7 +604,7 @@ BOOL SwFileNameField::PutValue( const uno::Any& rAny, USHORT nWhichId ) // here only a int16 sal_Int32 nType = 0; rAny >>= nType; - BOOL bFixed = IsFixed(); + sal_Bool bFixed = IsFixed(); switch( nType ) { case text::FilenameDisplayFormat::PATH: @@ -614,7 +650,7 @@ SwTemplNameFieldType::SwTemplNameFieldType(SwDoc *pDocument) pDoc = pDocument; } -String SwTemplNameFieldType::Expand(ULONG nFmt) const +String SwTemplNameFieldType::Expand(sal_uLong nFmt) const { ASSERT( nFmt < FF_END, "Expand: kein guelt. Fmt!" ); @@ -688,7 +724,14 @@ SwField* SwTemplNameField::Copy() const return pTmp; } +<<<<<<< local BOOL SwTemplNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +======= +/*-----------------05.03.98 08:59------------------- + +--------------------------------------------------*/ +sal_Bool SwTemplNameField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const +>>>>>>> other { switch ( nWhichId ) { @@ -714,7 +757,12 @@ BOOL SwTemplNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const return sal_True; } +<<<<<<< local BOOL SwTemplNameField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +======= +--------------------------------------------------*/ +sal_Bool SwTemplNameField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) +>>>>>>> other { switch ( nWhichId ) { @@ -838,7 +886,14 @@ void SwDocStatField::ChangeExpansion( const SwFrm* pFrm ) pFrm->FindPageFrm()->GetPageDesc()->GetNumType().GetNumberingType() ); } +<<<<<<< local BOOL SwDocStatField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +======= +/*-----------------05.03.98 11:38------------------- + +--------------------------------------------------*/ +sal_Bool SwDocStatField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const +>>>>>>> other { switch ( nWhichId ) { @@ -851,9 +906,14 @@ BOOL SwDocStatField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const return sal_True; } +<<<<<<< local BOOL SwDocStatField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +======= +--------------------------------------------------*/ +sal_Bool SwDocStatField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) +>>>>>>> other { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; switch ( nWhichId ) { case FIELD_PROP_USHORT2: @@ -865,7 +925,7 @@ BOOL SwDocStatField::PutValue( const uno::Any& rAny, USHORT nWhichId ) nSet != SVX_NUM_BITMAP) { SetFormat(nSet); - bRet = TRUE; + bRet = sal_True; } } break; @@ -892,7 +952,7 @@ SwFieldType* SwDocInfoFieldType::Copy() const return pTyp; } -void lcl_GetLocalDataWrapper( ULONG nLang, +void lcl_GetLocalDataWrapper( sal_uLong nLang, const LocaleDataWrapper **ppAppLocalData, const LocaleDataWrapper **ppLocalData ) { @@ -1227,7 +1287,7 @@ void SwDocInfoField::SetLanguage(sal_uInt16 nLng) /* --------------------------------------------------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwDocInfoField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +sal_Bool SwDocInfoField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const { switch( nWhichId ) { @@ -1277,7 +1337,7 @@ BOOL SwDocInfoField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const /* --------------------------------------------------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwDocInfoField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +sal_Bool SwDocInfoField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { sal_Int32 nValue = 0; switch( nWhichId ) @@ -1572,7 +1632,7 @@ sal_uInt16 SwHiddenTxtField::GetSubType() const /* --------------------------------------------------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwHiddenTxtField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +sal_Bool SwHiddenTxtField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const { const String* pOut = 0; switch( nWhichId ) @@ -1605,7 +1665,7 @@ BOOL SwHiddenTxtField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const /* --------------------------------------------------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwHiddenTxtField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +sal_Bool SwHiddenTxtField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { switch( nWhichId ) { @@ -1626,7 +1686,7 @@ BOOL SwHiddenTxtField::PutValue( const uno::Any& rAny, USHORT nWhichId ) break; case FIELD_PROP_PAR4: ::GetString( rAny, aContent); - bValid = TRUE; + bValid = sal_True; break; default: DBG_ERROR("illegal property"); @@ -1710,7 +1770,12 @@ SwField* SwHiddenParaField::Copy() const return pFld; } +<<<<<<< local BOOL SwHiddenParaField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +======= +--------------------------------------------------*/ +sal_Bool SwHiddenParaField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const +>>>>>>> other { switch ( nWhichId ) { @@ -1730,7 +1795,12 @@ BOOL SwHiddenParaField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const return sal_True; } +<<<<<<< local BOOL SwHiddenParaField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +======= +--------------------------------------------------*/ +sal_Bool SwHiddenParaField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) +>>>>>>> other { switch ( nWhichId ) { @@ -1870,7 +1940,14 @@ sal_uInt32 SwPostItField::GetNumberOfParagraphs() const return (mpText) ? mpText->Count() : 1; } +<<<<<<< local BOOL SwPostItField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +======= +/*-----------------05.03.98 13:42------------------- + +--------------------------------------------------*/ +sal_Bool SwPostItField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const +>>>>>>> other { switch( nWhichId ) { @@ -1930,7 +2007,15 @@ BOOL SwPostItField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const return sal_True; } +<<<<<<< local BOOL SwPostItField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +======= + +/*-----------------05.03.98 13:42------------------- + +--------------------------------------------------*/ +sal_Bool SwPostItField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) +>>>>>>> other { switch( nWhichId ) { @@ -1961,7 +2046,7 @@ BOOL SwPostItField::PutValue( const uno::Any& rAny, USHORT nWhichId ) { util::DateTime aDateTimeValue; if(!(rAny >>= aDateTimeValue)) - return FALSE; + return sal_False; aDateTime.Set100Sec(aDateTimeValue.HundredthSeconds); aDateTime.SetSec(aDateTimeValue.Seconds); aDateTime.SetMin(aDateTimeValue.Minutes); @@ -2071,7 +2156,14 @@ void SwExtUserField::SetSubType(sal_uInt16 nSub) nType = nSub; } +<<<<<<< local BOOL SwExtUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +======= +/*-----------------05.03.98 14:14------------------- + +--------------------------------------------------*/ +sal_Bool SwExtUserField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const +>>>>>>> other { switch( nWhichId ) { @@ -2097,7 +2189,12 @@ BOOL SwExtUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const return sal_True; } +<<<<<<< local BOOL SwExtUserField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +======= +--------------------------------------------------*/ +sal_Bool SwExtUserField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) +>>>>>>> other { switch( nWhichId ) { @@ -2186,7 +2283,14 @@ void SwRefPageSetField::SetPar2(const String& rStr) SetOffset( (short) rStr.ToInt32() ); } +<<<<<<< local BOOL SwRefPageSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +======= +/*-----------------05.03.98 14:52------------------- + +--------------------------------------------------*/ +sal_Bool SwRefPageSetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const +>>>>>>> other { switch( nWhichId ) { @@ -2202,7 +2306,12 @@ BOOL SwRefPageSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const return sal_True; } +<<<<<<< local BOOL SwRefPageSetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +======= +--------------------------------------------------*/ +sal_Bool SwRefPageSetField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) +>>>>>>> other { switch( nWhichId ) { @@ -2449,7 +2558,12 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm, } } +<<<<<<< local BOOL SwRefPageGetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +======= +--------------------------------------------------*/ +sal_Bool SwRefPageGetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const +>>>>>>> other { switch( nWhichId ) { @@ -2465,7 +2579,12 @@ BOOL SwRefPageGetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const return sal_True; } +<<<<<<< local BOOL SwRefPageGetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +======= +--------------------------------------------------*/ +sal_Bool SwRefPageGetField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) +>>>>>>> other { switch( nWhichId ) { @@ -2580,7 +2699,14 @@ void SwJumpEditField::SetPar2(const String& rStr) sHelp = rStr; } +<<<<<<< local BOOL SwJumpEditField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +======= +/*-----------------05.03.98 15:00------------------- + +--------------------------------------------------*/ +sal_Bool SwJumpEditField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const +>>>>>>> other { switch( nWhichId ) { @@ -2612,7 +2738,12 @@ BOOL SwJumpEditField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const return sal_True; } +<<<<<<< local BOOL SwJumpEditField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +======= +--------------------------------------------------*/ +sal_Bool SwJumpEditField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) +>>>>>>> other { switch( nWhichId ) { @@ -2690,8 +2821,8 @@ void SwCombinedCharField::SetPar1(const String& rStr) sCharacters = rStr.Copy( 0, MAX_COMBINED_CHARACTERS ); } -BOOL SwCombinedCharField::QueryValue( uno::Any& rAny, - USHORT nWhichId ) const +sal_Bool SwCombinedCharField::QueryValue( uno::Any& rAny, + sal_uInt16 nWhichId ) const { switch( nWhichId ) { @@ -2704,8 +2835,8 @@ BOOL SwCombinedCharField::QueryValue( uno::Any& rAny, return sal_True; } -BOOL SwCombinedCharField::PutValue( const uno::Any& rAny, - USHORT nWhichId ) +sal_Bool SwCombinedCharField::PutValue( const uno::Any& rAny, + sal_uInt16 nWhichId ) { switch( nWhichId ) { |