diff options
Diffstat (limited to 'editeng/source/uno')
| -rw-r--r-- | editeng/source/uno/UnoForbiddenCharsTable.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/uno/unoedhlp.cxx | 16 | ||||
| -rw-r--r-- | editeng/source/uno/unoedprx.cxx | 24 | ||||
| -rw-r--r-- | editeng/source/uno/unoedsrc.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/uno/unofdesc.cxx | 12 | ||||
| -rw-r--r-- | editeng/source/uno/unofield.cxx | 136 | ||||
| -rw-r--r-- | editeng/source/uno/unofored.cxx | 40 | ||||
| -rw-r--r-- | editeng/source/uno/unoforou.cxx | 18 | ||||
| -rw-r--r-- | editeng/source/uno/unoipset.cxx | 14 | ||||
| -rw-r--r-- | editeng/source/uno/unonrule.cxx | 6 | ||||
| -rw-r--r-- | editeng/source/uno/unopracc.cxx | 8 | ||||
| -rw-r--r-- | editeng/source/uno/unotext.cxx | 114 | ||||
| -rw-r--r-- | editeng/source/uno/unotext2.cxx | 54 | ||||
| -rw-r--r-- | editeng/source/uno/unoviwed.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/uno/unoviwou.cxx | 2 |
15 files changed, 226 insertions, 226 deletions
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx index 3e1a5f9143ad..5d3c3b468f6e 100644 --- a/editeng/source/uno/UnoForbiddenCharsTable.cxx +++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx index a23590d0f797..d186a3c2c256 100644 --- a/editeng/source/uno/unoedhlp.cxx +++ b/editeng/source/uno/unoedhlp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,14 +38,14 @@ TYPEINIT1( SvxEditSourceHint, TextHint ); -SvxEditSourceHint::SvxEditSourceHint( ULONG _nId ) : +SvxEditSourceHint::SvxEditSourceHint( ULONG _nId ) : TextHint( _nId ), mnStart( 0 ), mnEnd( 0 ) { } -SvxEditSourceHint::SvxEditSourceHint( ULONG _nId, ULONG nValue, ULONG nStart, ULONG nEnd ) : +SvxEditSourceHint::SvxEditSourceHint( ULONG _nId, ULONG nValue, ULONG nStart, ULONG nEnd ) : TextHint( _nId, nValue ), mnStart( nStart), mnEnd( nEnd ) @@ -79,7 +79,7 @@ void SvxEditSourceHint::SetStartValue( ULONG n ) void SvxEditSourceHint::SetEndValue( ULONG n ) { - mnEnd = n; + mnEnd = n; } //------------------------------------------------------------------------ @@ -96,7 +96,7 @@ void SvxEditSourceHint::SetEndValue( ULONG n ) case EE_NOTIFY_PARAGRAPHINSERTED: return ::std::auto_ptr<SfxHint>( new TextHint( TEXT_HINT_PARAINSERTED, aNotify->nParagraph ) ); - case EE_NOTIFY_PARAGRAPHREMOVED: + case EE_NOTIFY_PARAGRAPHREMOVED: return ::std::auto_ptr<SfxHint>( new TextHint( TEXT_HINT_PARAREMOVED, aNotify->nParagraph ) ); case EE_NOTIFY_PARAGRAPHSMOVED: @@ -135,16 +135,16 @@ void SvxEditSourceHint::SetEndValue( ULONG n ) sal_Bool SvxEditSourceHelper::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, const EditEngine& rEE, USHORT nPara, USHORT nIndex ) { EECharAttribArray aCharAttribs; - + rEE.GetCharAttribs( nPara, aCharAttribs ); - + // find closest index in front of nIndex USHORT nAttr, nCurrIndex; sal_Int32 nClosestStartIndex; for( nAttr=0, nClosestStartIndex=0; nAttr<aCharAttribs.Count(); ++nAttr ) { nCurrIndex = aCharAttribs[nAttr].nStart; - + if( nCurrIndex > nIndex ) break; // aCharAttribs array is sorted in increasing order for nStart values diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 1c42104550f4..23f9878eccc4 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -129,7 +129,7 @@ public: sal_Bool IsEditableRange( const SvxAccessibleTextIndex& rEnd ) const; private: - USHORT mnPara; + USHORT mnPara; sal_Int32 mnIndex; sal_Int32 mnEEIndex; sal_Int32 mnFieldOffset; @@ -201,7 +201,7 @@ void SvxAccessibleTextIndex::SetEEIndex( USHORT nEEIndex, const SvxTextForwarder mnEEIndex = nEEIndex; // calculate unknowns - USHORT nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() ); + USHORT nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() ); mnIndex = nEEIndex; @@ -247,7 +247,7 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder& mnIndex = nIndex; // calculate unknowns - USHORT nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() ); + USHORT nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() ); DBG_ASSERT(nIndex >= 0 && nIndex <= USHRT_MAX, "SvxAccessibleTextIndex::SetIndex: index value overflow"); @@ -589,7 +589,7 @@ void SvxAccessibleTextAdapter::SetParaAttribs( USHORT nPara, const SfxItemSet& r void SvxAccessibleTextAdapter::RemoveAttribs( const ESelection& , sal_Bool , sal_uInt16 ) { DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder"); -} +} void SvxAccessibleTextAdapter::GetPortions( USHORT nPara, SvUShorts& rList ) const { @@ -698,7 +698,7 @@ void SvxAccessibleTextAdapter::FieldClicked( const SvxFieldItem& rField, USHORT sal_Int32 SvxAccessibleTextAdapter::CalcLogicalIndex( USHORT nPara, USHORT nEEIndex ) { DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder"); - + SvxAccessibleTextIndex aIndex; aIndex.SetEEIndex(nPara, nEEIndex, *mrTextForwarder); return aIndex.GetIndex(); @@ -707,7 +707,7 @@ sal_Int32 SvxAccessibleTextAdapter::CalcLogicalIndex( USHORT nPara, USHORT nEEIn USHORT SvxAccessibleTextAdapter::CalcEditEngineIndex( USHORT nPara, sal_Int32 nLogicalIndex ) { DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder"); - + SvxAccessibleTextIndex aIndex; aIndex.SetIndex(nPara, nLogicalIndex, *mrTextForwarder); return aIndex.GetEEIndex(); @@ -1070,12 +1070,12 @@ USHORT SvxAccessibleTextAdapter::GetLineLen( USHORT nPara, USHORT nLine ) const void SvxAccessibleTextAdapter::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const { mrTextForwarder->GetLineBoundaries( rStart, rEnd, nParagraph, nLine ); -} +} USHORT SvxAccessibleTextAdapter::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const { return mrTextForwarder->GetLineNumberAtIndex( nPara, nIndex ); -} +} sal_Bool SvxAccessibleTextAdapter::Delete( const ESelection& rSel ) { @@ -1248,7 +1248,7 @@ Point SvxAccessibleTextEditViewAdapter::PixelToLogic( const Point& rPoint, const return mrViewForwarder->PixelToLogic(rPoint, rMapMode); } - + sal_Bool SvxAccessibleTextEditViewAdapter::GetSelection( ESelection& rSel ) const { DBG_ASSERT(mrViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder"); @@ -1308,8 +1308,8 @@ sal_Bool SvxAccessibleTextEditViewAdapter::Paste() return mrViewForwarder->Paste(); } -void SvxAccessibleTextEditViewAdapter::SetForwarder( SvxEditViewForwarder& rForwarder, - SvxAccessibleTextAdapter& rTextForwarder ) +void SvxAccessibleTextEditViewAdapter::SetForwarder( SvxEditViewForwarder& rForwarder, + SvxAccessibleTextAdapter& rTextForwarder ) { mrViewForwarder = &rForwarder; mrTextForwarder = &rTextForwarder; diff --git a/editeng/source/uno/unoedsrc.cxx b/editeng/source/uno/unoedsrc.cxx index aa54261945fe..91bca0a9e39d 100644 --- a/editeng/source/uno/unoedsrc.cxx +++ b/editeng/source/uno/unoedsrc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ SvxEditViewForwarder* SvxEditSource::GetEditViewForwarder( sal_Bool ) return NULL; } -SfxBroadcaster& SvxEditSource::GetBroadcaster() const +SfxBroadcaster& SvxEditSource::GetBroadcaster() const { DBG_ERROR("SvxEditSource::GetBroadcaster called for implementation missing this feature!"); diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx index 7ae4e31700ec..419892316bcc 100644 --- a/editeng/source/uno/unofdesc.cxx +++ b/editeng/source/uno/unofdesc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -144,12 +144,12 @@ void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDes const SfxPoolItem* pItem = NULL; { SvxFontItem* pFontItem = (SvxFontItem*)&rSet.Get( EE_CHAR_FONTINFO, TRUE ); - rDesc.Name = pFontItem->GetFamilyName(); - rDesc.StyleName = pFontItem->GetStyleName(); - rDesc.Family = sal::static_int_cast< sal_Int16 >( + rDesc.Name = pFontItem->GetFamilyName(); + rDesc.StyleName = pFontItem->GetStyleName(); + rDesc.Family = sal::static_int_cast< sal_Int16 >( pFontItem->GetFamily()); - rDesc.CharSet = pFontItem->GetCharSet(); - rDesc.Pitch = sal::static_int_cast< sal_Int16 >( + rDesc.CharSet = pFontItem->GetCharSet(); + rDesc.Pitch = sal::static_int_cast< sal_Int16 >( pFontItem->GetPitch()); } { diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 1ef3d1c3ce0b..6a00140341e1 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,45 +54,45 @@ using namespace ::com::sun::star; aAny <<= uno::Reference< xint >(this) -#define WID_DATE 0 -#define WID_BOOL1 1 -#define WID_BOOL2 2 -#define WID_INT32 3 -#define WID_INT16 4 -#define WID_STRING1 5 -#define WID_STRING2 6 -#define WID_STRING3 7 +#define WID_DATE 0 +#define WID_BOOL1 1 +#define WID_BOOL2 2 +#define WID_INT32 3 +#define WID_INT16 4 +#define WID_STRING1 5 +#define WID_STRING2 6 +#define WID_STRING3 7 class SvxUnoFieldData_Impl { public: - sal_Bool mbBoolean1; - sal_Bool mbBoolean2; - sal_Int32 mnInt32; - sal_Int16 mnInt16; - OUString msString1; - OUString msString2; - OUString msString3; + sal_Bool mbBoolean1; + sal_Bool mbBoolean2; + sal_Int32 mnInt32; + sal_Int16 mnInt16; + OUString msString1; + OUString msString2; + OUString msString3; util::DateTime maDateTime; - OUString msPresentation; + OUString msPresentation; }; const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) { static SfxItemPropertyMapEntry aExDateTimeFieldPropertyMap_Impl[] = { - { MAP_CHAR_LEN("DateTime"), WID_DATE, &::getCppuType((const util::DateTime*)0), 0, 0 }, - { MAP_CHAR_LEN("IsFixed"), WID_BOOL1, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsDate"), WID_BOOL2, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("NumberFormat"), WID_INT32, &::getCppuType((const sal_Int16*)0), 0, 0 }, + { MAP_CHAR_LEN("DateTime"), WID_DATE, &::getCppuType((const util::DateTime*)0), 0, 0 }, + { MAP_CHAR_LEN("IsFixed"), WID_BOOL1, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsDate"), WID_BOOL2, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("NumberFormat"), WID_INT32, &::getCppuType((const sal_Int16*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aExDateTimeFieldPropertySet_Impl(aExDateTimeFieldPropertyMap_Impl); static SfxItemPropertyMapEntry aDateTimeFieldPropertyMap_Impl[] = { - { MAP_CHAR_LEN("IsDate"), WID_BOOL2, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsDate"), WID_BOOL2, &::getBooleanCppuType(), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aDateTimeFieldPropertySet_Impl(aDateTimeFieldPropertyMap_Impl); @@ -100,10 +100,10 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) static SfxItemPropertyMapEntry aUrlFieldPropertyMap_Impl[] = { - { MAP_CHAR_LEN("Format"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, - { MAP_CHAR_LEN("Representation"), WID_STRING1, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("TargetFrame"), WID_STRING2, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("URL"), WID_STRING3, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("Format"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, + { MAP_CHAR_LEN("Representation"), WID_STRING1, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("TargetFrame"), WID_STRING2, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("URL"), WID_STRING3, &::getCppuType((const OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aUrlFieldPropertySet_Impl(aUrlFieldPropertyMap_Impl); @@ -116,27 +116,27 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) static SfxItemPropertyMapEntry aExtFileFieldPropertyMap_Impl[] = { - { MAP_CHAR_LEN("IsFixed"), WID_BOOL1, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("FileFormat"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, - { MAP_CHAR_LEN("CurrentPresentation"), WID_STRING1,&::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("IsFixed"), WID_BOOL1, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("FileFormat"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, + { MAP_CHAR_LEN("CurrentPresentation"), WID_STRING1,&::getCppuType((const OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aExtFileFieldPropertySet_Impl(aExtFileFieldPropertyMap_Impl); static SfxItemPropertyMapEntry aAuthorFieldPropertyMap_Impl[] = { - { MAP_CHAR_LEN("IsFixed"), WID_BOOL1, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("CurrentPresentation"), WID_STRING1,&::getCppuType((const OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("Content"), WID_STRING2,&::getCppuType((const OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("AuthorFormat"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, - { MAP_CHAR_LEN("FullName"), WID_BOOL2, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsFixed"), WID_BOOL1, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("CurrentPresentation"), WID_STRING1,&::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("Content"), WID_STRING2,&::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("AuthorFormat"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, + { MAP_CHAR_LEN("FullName"), WID_BOOL2, &::getBooleanCppuType(), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aAuthorFieldPropertySet_Impl(aAuthorFieldPropertyMap_Impl); static SfxItemPropertyMapEntry aMeasureFieldPropertyMap_Impl[] = { - { MAP_CHAR_LEN("Kind"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, + { MAP_CHAR_LEN("Kind"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aMeasureFieldPropertySet_Impl(aMeasureFieldPropertyMap_Impl); @@ -157,13 +157,13 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) return &aAuthorFieldPropertySet_Impl; case ID_MEASUREFIELD: return &aMeasureFieldPropertySet_Impl; -// case ID_PAGEFIELD: -// case ID_PAGESFIELD: -// case ID_FILEFIELD: -// case ID_TABLEFIELD: -// case ID_HEADERFIELD: -// case ID_FOOTERFIELD: -// case ID_DATETIMEFIELD:: +// case ID_PAGEFIELD: +// case ID_PAGESFIELD: +// case ID_FILEFIELD: +// case ID_TABLEFIELD: +// case ID_HEADERFIELD: +// case ID_FOOTERFIELD: +// case ID_DATETIMEFIELD:: default: return &aEmptyPropertySet_Impl; } @@ -195,10 +195,10 @@ static sal_Int16 getFileNameDisplayFormat( SvxFileFormat nFormat ) { switch( nFormat ) { - case SVXFILEFORMAT_NAME_EXT: return text::FilenameDisplayFormat::NAME_AND_EXT; - case SVXFILEFORMAT_FULLPATH: return text::FilenameDisplayFormat::FULL; - case SVXFILEFORMAT_PATH: return text::FilenameDisplayFormat::PATH; -// case SVXFILEFORMAT_NAME: + case SVXFILEFORMAT_NAME_EXT: return text::FilenameDisplayFormat::NAME_AND_EXT; + case SVXFILEFORMAT_FULLPATH: return text::FilenameDisplayFormat::FULL; + case SVXFILEFORMAT_PATH: return text::FilenameDisplayFormat::PATH; +// case SVXFILEFORMAT_NAME: default: return text::FilenameDisplayFormat::NAME; } } @@ -207,10 +207,10 @@ static SvxFileFormat setFileNameDisplayFormat( sal_Int16 nFormat ) { switch( nFormat ) { - case text::FilenameDisplayFormat::FULL: return SVXFILEFORMAT_FULLPATH; - case text::FilenameDisplayFormat::PATH: return SVXFILEFORMAT_PATH; - case text::FilenameDisplayFormat::NAME: return SVXFILEFORMAT_NAME; -// case text::FilenameDisplayFormat::NAME_AND_EXT: + case text::FilenameDisplayFormat::FULL: return SVXFILEFORMAT_FULLPATH; + case text::FilenameDisplayFormat::PATH: return SVXFILEFORMAT_PATH; + case text::FilenameDisplayFormat::NAME: return SVXFILEFORMAT_NAME; +// case text::FilenameDisplayFormat::NAME_AND_EXT: default: return SVXFILEFORMAT_NAME_EXT; } @@ -261,10 +261,10 @@ inline Time setTime( util::DateTime& rDate ) UNO3_GETIMPLEMENTATION_IMPL( SvxUnoTextField ); SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw() -: OComponentHelper( getMutex() ) -, mpPropSet(NULL) -, mnServiceId(nServiceId) -, mpImpl( new SvxUnoFieldData_Impl ) +: OComponentHelper( getMutex() ) +, mpPropSet(NULL) +, mnServiceId(nServiceId) +, mpImpl( new SvxUnoFieldData_Impl ) { mpPropSet = ImplGetFieldItemPropertySet(mnServiceId); @@ -315,11 +315,11 @@ SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw() } SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > xAnchor, const OUString& rPresentation, const SvxFieldData* pData ) throw() -: OComponentHelper( getMutex() ) -, mxAnchor( xAnchor ) -, mpPropSet(NULL) -, mnServiceId(ID_UNKNOWN) -, mpImpl( new SvxUnoFieldData_Impl ) +: OComponentHelper( getMutex() ) +, mxAnchor( xAnchor ) +, mpPropSet(NULL) +, mnServiceId(ID_UNKNOWN) +, mpImpl( new SvxUnoFieldData_Impl ) { DBG_ASSERT(pData, "pFieldData == NULL! [CL]" ); @@ -379,14 +379,14 @@ SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > xAnchor, co case ID_AUTHORFIELD: mpImpl->msString1 = ((SvxAuthorField*)pData)->GetFormatted(); mpImpl->msString2 = ((SvxAuthorField*)pData)->GetFormatted(); - mpImpl->mnInt16 = sal::static_int_cast< sal_Int16 >( + mpImpl->mnInt16 = sal::static_int_cast< sal_Int16 >( ((SvxAuthorField*)pData)->GetFormat()); mpImpl->mbBoolean1 = ((SvxAuthorField*)pData)->GetType() == SVXAUTHORTYPE_FIX; mpImpl->mbBoolean2 = ((SvxAuthorField*)pData)->GetFormat() != SVXAUTHORFORMAT_SHORTNAME; break; case ID_MEASUREFIELD: - mpImpl->mnInt16 = sal::static_int_cast< sal_Int16 >(((SdrMeasureField*)pData)->GetMeasureFieldKind()); + mpImpl->mnInt16 = sal::static_int_cast< sal_Int16 >(((SdrMeasureField*)pData)->GetMeasureFieldKind()); break; } } @@ -424,7 +424,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() { Time aTime( setTime( mpImpl->maDateTime ) ); pData = new SvxExtTimeField( aTime, mpImpl->mbBoolean1?SVXTIMETYPE_FIX:SVXTIMETYPE_VAR ); - + if( mpImpl->mnInt32 >= SVXTIMEFORMAT_APPDEFAULT && mpImpl->mnInt32 <= SVXTIMEFORMAT_AM_HMSH ) ((SvxExtTimeField*)pData)->SetFormat( (SvxTimeFormat)mpImpl->mnInt32 ); } @@ -567,7 +567,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoTextField::getTypes() *pTypes++ = ::getCppuType(( const uno::Reference< text::XTextField >*)0); *pTypes++ = ::getCppuType(( const uno::Reference< beans::XPropertySet >*)0); *pTypes++ = ::getCppuType(( const uno::Reference< lang::XServiceInfo >*)0); - *pTypes++ = ::getCppuType(( const uno::Reference< lang::XUnoTunnel >*)0); + *pTypes++ = ::getCppuType(( const uno::Reference< lang::XUnoTunnel >*)0); } return maTypeSequence; } @@ -1027,9 +1027,9 @@ sal_Int32 SvxUnoTextField::GetFieldId( const SvxFieldData* pFieldData ) const th return ID_PAGEFIELD; else if( pFieldData->ISA( SvxPagesField ) ) return ID_PAGESFIELD; - else if( pFieldData->ISA( SvxTimeField ) ) + else if( pFieldData->ISA( SvxTimeField ) ) return ID_TIMEFIELD; - else if( pFieldData->ISA( SvxFileField ) ) + else if( pFieldData->ISA( SvxFileField ) ) return ID_FILEFIELD; else if( pFieldData->ISA( SvxTableField ) ) return ID_TABLEFIELD; @@ -1041,7 +1041,7 @@ sal_Int32 SvxUnoTextField::GetFieldId( const SvxFieldData* pFieldData ) const th return ID_AUTHORFIELD; else if( pFieldData->ISA( SvxDateField ) ) return ID_EXT_DATEFIELD; - else if( pFieldData->ISA( SdrMeasureField ) ) + else if( pFieldData->ISA( SdrMeasureField ) ) return ID_MEASUREFIELD; else if( pFieldData->ISA( SvxHeaderField ) ) return ID_HEADERFIELD; @@ -1066,7 +1066,7 @@ static const sal_Char* pOldServiceNames[] = "com.sun.star.text.TextField.PageNumber", "com.sun.star.text.TextField.PageCount", "com.sun.star.text.TextField.DateTime", - "com.sun.star.text.TextField.DocInfo.Title", // SvxFileField is used for title + "com.sun.star.text.TextField.DocInfo.Title", // SvxFileField is used for title "com.sun.star.text.TextField.SheetName", "com.sun.star.text.TextField.DateTime", "com.sun.star.text.TextField.FileName", @@ -1120,7 +1120,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rt uno::Reference< uno::XInterface > xRet; const OUString aTextFieldPrexit( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.textfield.") ); - + // #i93308# up to OOo 3.2 we used this wrong namespace name with the capital T & F. This is // fixed since OOo 3.2 but for compatibility we will still provide support for the wrong notation. const OUString aTextFieldPrexit2( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextField.") ); diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx index 98ec0d7e7701..51ba135f0768 100644 --- a/editeng/source/uno/unofored.cxx +++ b/editeng/source/uno/unofored.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #include <editeng/unoedhlp.hxx> #include <editeng/editdata.hxx> #include <editeng/outliner.hxx> -#include <editeng/editobj.hxx> // nur fuer die GetText-Kruecke +#include <editeng/editobj.hxx> // nur fuer die GetText-Kruecke #include <editeng/unofored.hxx> @@ -54,7 +54,7 @@ SvxEditEngineForwarder::SvxEditEngineForwarder( EditEngine& rEngine ) : SvxEditEngineForwarder::~SvxEditEngineForwarder() { - // die EditEngine muss ggf. von aussen geloescht werden + // die EditEngine muss ggf. von aussen geloescht werden } USHORT SvxEditEngineForwarder::GetParagraphCount() const @@ -128,7 +128,7 @@ void SvxEditEngineForwarder::SetParaAttribs( USHORT nPara, const SfxItemSet& rSe void SvxEditEngineForwarder::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ) { rEditEngine.RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich ); -} +} SfxItemPool* SvxEditEngineForwarder::GetPool() const { @@ -161,8 +161,8 @@ void SvxEditEngineForwarder::QuickSetAttribs( const SfxItemSet& rSet, const ESel } BOOL SvxEditEngineForwarder::IsValid() const -{ - // cannot reliably query EditEngine state +{ + // cannot reliably query EditEngine state // while in the middle of an update return rEditEngine.GetUpdateMode(); } @@ -181,7 +181,7 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe { EECharAttribArray aAttribs; - const SfxPoolItem* pLastItem = NULL; + const SfxPoolItem* pLastItem = NULL; SfxItemState eState = SFX_ITEM_DEFAULT; @@ -203,8 +203,8 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe // get list of char attribs rEditEngine.GetCharAttribs( nPara, aAttribs ); - BOOL bEmpty = TRUE; // we found no item inside the selektion of this paragraph - BOOL bGaps = FALSE; // we found items but theire gaps between them + BOOL bEmpty = TRUE; // we found no item inside the selektion of this paragraph + BOOL bGaps = FALSE; // we found items but theire gaps between them USHORT nLastEnd = nPos; const SfxPoolItem* pParaItem = NULL; @@ -216,10 +216,10 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe const sal_Bool bEmptyPortion = aAttrib.nStart == aAttrib.nEnd; if( (!bEmptyPortion && (aAttrib.nStart >= nEndPos)) || (bEmptyPortion && (aAttrib.nStart > nEndPos)) ) - break; // break if we are already behind our selektion + break; // break if we are already behind our selektion if( (!bEmptyPortion && (aAttrib.nEnd <= nPos)) || (bEmptyPortion && (aAttrib.nEnd < nPos)) ) - continue; // or if the attribute ends before our selektion + continue; // or if the attribute ends before our selektion if( aAttrib.pAttr->Which() != nWhich ) continue; // skip if is not the searched item @@ -262,7 +262,7 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe { if( *pParaItem != *pTempItem ) return SFX_ITEM_DONTCARE; - } + } else { pParaItem = pTempItem; @@ -327,7 +327,7 @@ LanguageType SvxEditEngineForwarder::GetLanguage( USHORT nPara, USHORT nIndex ) USHORT SvxEditEngineForwarder::GetFieldCount( USHORT nPara ) const { - return rEditEngine.GetFieldCount(nPara); + return rEditEngine.GetFieldCount(nPara); } EFieldInfo SvxEditEngineForwarder::GetFieldInfo( USHORT nPara, USHORT nField ) const @@ -391,7 +391,7 @@ Rectangle SvxEditEngineForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) c Rectangle SvxEditEngineForwarder::GetParaBounds( USHORT nPara ) const { const Point aPnt = rEditEngine.GetDocPosTopLeft( nPara ); - ULONG nWidth; + ULONG nWidth; ULONG nHeight; ULONG nTextWidth; @@ -409,7 +409,7 @@ Rectangle SvxEditEngineForwarder::GetParaBounds( USHORT nPara ) const } else { - nWidth = rEditEngine.CalcTextWidth(); + nWidth = rEditEngine.CalcTextWidth(); nHeight = rEditEngine.GetTextHeight( nPara ); return Rectangle( 0, aPnt.Y(), nWidth, aPnt.Y() + nHeight ); @@ -431,7 +431,7 @@ sal_Bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, USHORT& nPa // #101701# Size aSize( rEditEngine.CalcTextWidth(), rEditEngine.GetTextHeight() ); ::std::swap( aSize.Width(), aSize.Height() ); - Point aEEPos( SvxEditSourceHelper::UserSpaceToEE( rPos, + Point aEEPos( SvxEditSourceHelper::UserSpaceToEE( rPos, aSize, rEditEngine.IsVertical() == TRUE )); @@ -473,17 +473,17 @@ USHORT SvxEditEngineForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const { return rEditEngine.GetLineLen(nPara, nLine); } - + void SvxEditEngineForwarder::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nPara, USHORT nLine ) const { rEditEngine.GetLineBoundaries(rStart, rEnd, nPara, nLine); } - + USHORT SvxEditEngineForwarder::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const { return rEditEngine.GetLineNumberAtIndex(nPara, nIndex); } - + sal_Bool SvxEditEngineForwarder::QuickFormatDoc( BOOL ) { @@ -553,7 +553,7 @@ void SvxEditEngineForwarder::CopyText(const SvxTextForwarder& rSource) EditTextObject* pNewTextObject = pSourceForwarder->rEditEngine.CreateTextObject(); rEditEngine.SetText( *pNewTextObject ); delete pNewTextObject; -} +} //------------------------------------------------------------------------ diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx index e6978ba453f1..a7b67a342660 100644 --- a/editeng/source/uno/unoforou.cxx +++ b/editeng/source/uno/unoforou.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,8 +76,8 @@ USHORT SvxOutlinerForwarder::GetTextLen( USHORT nParagraph ) const String SvxOutlinerForwarder::GetText( const ESelection& rSel ) const { - //! GetText(ESelection) sollte es wohl auch mal am Outliner geben - // solange den Hack fuer die EditEngine uebernehmen: + //! GetText(ESelection) sollte es wohl auch mal am Outliner geben + // solange den Hack fuer die EditEngine uebernehmen: EditEngine* pEditEngine = (EditEngine*)&rOutliner.GetEditEngine(); return pEditEngine->GetText( rSel, LINEEND_LF ); } @@ -128,8 +128,8 @@ SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, BOOL bOnlyH } } - //! gibt's das nicht am Outliner ??? - //! und warum ist GetAttribs an der EditEngine nicht const? + //! gibt's das nicht am Outliner ??? + //! und warum ist GetAttribs an der EditEngine nicht const? EditEngine& rEditEngine = (EditEngine&)rOutliner.GetEditEngine(); SfxItemSet aSet( ImplOutlinerForwarderGetAttribs( rSel, bOnlyHardAttrib, rEditEngine ) ); @@ -431,16 +431,16 @@ USHORT SvxOutlinerForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const { return rOutliner.GetLineLen(nPara, nLine); } - + void SvxOutlinerForwarder::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nPara, USHORT nLine ) const { return rOutliner.GetEditEngine().GetLineBoundaries( rStart, rEnd, nPara, nLine ); } - + USHORT SvxOutlinerForwarder::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const { return rOutliner.GetEditEngine().GetLineNumberAtIndex( nPara, nIndex ); -} +} sal_Bool SvxOutlinerForwarder::QuickFormatDoc( BOOL ) { @@ -492,7 +492,7 @@ sal_Bool SvxOutlinerForwarder::SetDepth( USHORT nPara, sal_Int16 nNewDepth ) { rOutliner.SetDepth( pPara, nNewDepth ); -// const bool bOutlinerText = pSdrObject && (pSdrObject->GetObjInventor() == SdrInventor) && (pSdrObject->GetObjIdentifier() == OBJ_OUTLINETEXT); +// const bool bOutlinerText = pSdrObject && (pSdrObject->GetObjInventor() == SdrInventor) && (pSdrObject->GetObjIdentifier() == OBJ_OUTLINETEXT); if( bOutlinerText ) rOutliner.SetLevelDependendStyleSheet( nPara ); diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index d3e973444616..3616dda34c80 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,8 +56,8 @@ struct SfxItemPropertyMapEntryHash struct SvxIDPropertyCombine { - sal_uInt16 nWID; - uno::Any aAny; + sal_uInt16 nWID; + uno::Any aAny; }; DECLARE_LIST( SvxIDPropertyCombineList, SvxIDPropertyCombine * ) @@ -152,7 +152,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* { if ( !bDontConvertNegativeValues || SvxUnoCheckForPositiveValue( aVal ) ) SvxUnoConvertToMM( eMapUnit, aVal ); - } + } } else if ( pMap->pType->getTypeClass() == uno::TypeClass_ENUM && aVal.getValueType() == ::getCppuType((const sal_Int32*)0) ) @@ -267,7 +267,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* if(pMap->nMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM) { SvxUnoConvertToMM( eMapUnit, aVal ); - } + } } if ( pMap->pType->getTypeClass() == uno::TypeClass_ENUM && @@ -312,10 +312,10 @@ uno::Reference< beans::XPropertySetInfo > SvxItemPropertySet::getPropertySetInf //---------------------------------------------------------------------- #ifndef TWIPS_TO_MM -#define TWIPS_TO_MM(val) ((val * 127 + 36) / 72) +#define TWIPS_TO_MM(val) ((val * 127 + 36) / 72) #endif #ifndef MM_TO_TWIPS -#define MM_TO_TWIPS(val) ((val * 72 + 63) / 127) +#define MM_TO_TWIPS(val) ((val * 72 + 63) / 127) #endif /** converts the given any with a metric to 100th/mm if needed */ diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 12d0d0986af8..a9c5dd6f6da4 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -192,7 +192,7 @@ Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames( ) Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sal_Int32 nIndex) const throw() { - // NumberingRule aRule; + // NumberingRule aRule; const SvxNumberFormat& rFmt = maRule.GetLevel((sal_uInt16) nIndex); sal_uInt16 nIdx = 0; @@ -286,7 +286,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa return aSeq; } -void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::PropertyValue >& rProperties, sal_Int32 nIndex) +void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::PropertyValue >& rProperties, sal_Int32 nIndex) throw( RuntimeException, IllegalArgumentException ) { SvxNumberFormat aFmt(maRule.GetLevel( (sal_uInt16)nIndex )); diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx index 6a0ebeede6a0..759c8c686da8 100644 --- a/editeng/source/uno/unopracc.cxx +++ b/editeng/source/uno/unopracc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ uno::Reference< text::XText > SAL_CALL SvxAccessibleTextPropertySet::getText() t // TODO (empty?) return uno::Reference< text::XText > (); } - + uno::Any SAL_CALL SvxAccessibleTextPropertySet::queryAggregation( const uno::Type & ) throw(uno::RuntimeException) { // TODO (empty?) @@ -103,7 +103,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes() thr { static ::cppu::OTypeCollection* pTypeCollection = NULL ; - // double-checked locking pattern. + // double-checked locking pattern. if ( pTypeCollection == NULL ) { osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ; @@ -112,7 +112,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes() thr if ( pTypeCollection == NULL ) { // Create a static typecollection ... - static ::cppu::OTypeCollection aTypeCollection( + static ::cppu::OTypeCollection aTypeCollection( ::getCppuType( static_cast< const uno::Reference< beans::XPropertySet >* > (0) ), ::getCppuType( static_cast< const uno::Reference< beans::XMultiPropertySet >* > (0) ), ::getCppuType( static_cast< const uno::Reference< beans::XPropertyState >* > (0) ), diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 4c9aadfdae98..d0bf0b206b84 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,10 +79,10 @@ const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap() SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, {0,0,0,0,0,0} }; return aSvxTextPortionPropertyMap; @@ -108,8 +108,8 @@ const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap() SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, {0,0,0,0,0,0} }; @@ -118,7 +118,7 @@ const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap() const SfxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSfxPropertySet() { static SfxItemPropertySet aTextCursorSfxPropertySet( ImplGetSvxUnoOutlinerTextCursorPropertyMap() ); - return &aTextCursorSfxPropertySet; + return &aTextCursorSfxPropertySet; } // ==================================================================== @@ -274,15 +274,15 @@ SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxEditSource* pSource, const Sv } SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxUnoTextRangeBase& rRange ) throw() -: text::XTextRange() -, beans::XPropertySet() -, beans::XMultiPropertySet() +: text::XTextRange() +, beans::XPropertySet() +, beans::XMultiPropertySet() , beans::XMultiPropertyStates() -, beans::XPropertyState() -, lang::XServiceInfo() -, text::XTextRangeCompare() -, lang::XUnoTunnel() -, mpPropSet(rRange.getPropertySet()) +, beans::XPropertyState() +, lang::XServiceInfo() +, text::XTextRangeCompare() +, lang::XUnoTunnel() +, mpPropSet(rRange.getPropertySet()) { SolarMutexGuard aGuard; @@ -444,14 +444,14 @@ void SAL_CALL SvxUnoTextRangeBase::setString(const OUString& aString) CheckSelection( maSelection, pForwarder ); String aConverted( aString ); - aConverted.ConvertLineEnd( LINEEND_LF ); // Zeilenenden nur einfach zaehlen + aConverted.ConvertLineEnd( LINEEND_LF ); // Zeilenenden nur einfach zaehlen pForwarder->QuickInsertText( aConverted, maSelection ); mpEditSource->UpdateData(); - // Selektion anpassen - //! Wenn die EditEngine bei QuickInsertText die Selektion zurueckgeben wuerde, - //! waer's einfacher... + // Selektion anpassen + //! Wenn die EditEngine bei QuickInsertText die Selektion zurueckgeben wuerde, + //! waer's einfacher... CollapseToStart(); sal_uInt16 nLen = aConverted.Len(); @@ -538,9 +538,9 @@ void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pM { if(!SetPropertyValueHelper( rOldSet, pMap, rValue, rNewSet, &rSelection, GetEditSource() )) { - // Fuer Teile von zusammengesetzten Items mit mehreren Properties (z.B. Hintergrund) - // muss vorher das alte Item aus dem Dokument geholt werden - rNewSet.Put(rOldSet.Get(pMap->nWID)); // altes Item in neuen Set + // Fuer Teile von zusammengesetzten Items mit mehreren Properties (z.B. Hintergrund) + // muss vorher das alte Item aus dem Dokument geholt werden + rNewSet.Put(rOldSet.Get(pMap->nWID)); // altes Item in neuen Set mpPropSet->setPropertyValue(pMap, rValue, rNewSet, false ); } } @@ -658,7 +658,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& Propert else pAttribs = pForwarder->GetAttribs( GetSelection() ).Clone(); - // Dontcare durch Default ersetzen, damit man immer eine Reflection hat + // Dontcare durch Default ersetzen, damit man immer eine Reflection hat pAttribs->ClearInvalidItems(); getPropertyValue( pMap, aAny, *pAttribs ); @@ -1071,7 +1071,7 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxIt return beans::PropertyState_DIRECT_VALUE; case SFX_ITEM_DEFAULT: return beans::PropertyState_DEFAULT_VALUE; -// case SFX_ITEM_UNKNOWN: +// case SFX_ITEM_UNKNOWN: } } } @@ -1213,9 +1213,9 @@ sal_Bool SvxUnoTextRangeBase::_getOnePropertyStates(const SfxItemSet* pSet, cons case SFX_ITEM_DEFAULT: rState = beans::PropertyState_DEFAULT_VALUE; break; -// case SFX_ITEM_UNKNOWN: -// case SFX_ITEM_DONTCARE: -// case SFX_ITEM_DISABLED: +// case SFX_ITEM_UNKNOWN: +// case SFX_ITEM_DONTCARE: +// case SFX_ITEM_DISABLED: default: rState = beans::PropertyState_AMBIGUOUS_VALUE; } @@ -1327,7 +1327,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp // Default aus ItemPool holen if(pPool->IsWhich(pMap->nWID)) { - SfxItemSet aSet( *pPool, pMap->nWID, pMap->nWID); + SfxItemSet aSet( *pPool, pMap->nWID, pMap->nWID); aSet.Put(pPool->GetDefaultItem(pMap->nWID)); return mpPropSet->getPropertyValue(pMap, aSet, true, false ); } @@ -1351,7 +1351,7 @@ void SAL_CALL SvxUnoTextRangeBase::setAllPropertiesToDefault( ) throw (uno::Run PropertyEntryVector_t::const_iterator aIt = aEntries.begin(); while( aIt != aEntries.end() ) { - _setPropertyToDefault( pForwarder, &(*aIt), -1 ); + _setPropertyToDefault( pForwarder, &(*aIt), -1 ); ++aIt; } } @@ -1409,7 +1409,7 @@ sal_Bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, sal_Bool Expand) throw() { CheckSelection( maSelection, mpEditSource->GetTextForwarder() ); - // #75098# use end position, as in Writer (start is anchor, end is cursor) + // #75098# use end position, as in Writer (start is anchor, end is cursor) sal_uInt16 nNewPos = maSelection.nEndPos; sal_uInt16 nNewPar = maSelection.nEndPara; @@ -1422,7 +1422,7 @@ sal_Bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, sal_Bool Expand) throw() else { if ( !pForwarder ) - pForwarder = mpEditSource->GetTextForwarder(); // erst hier, wenn's noetig ist... + pForwarder = mpEditSource->GetTextForwarder(); // erst hier, wenn's noetig ist... --nNewPar; nCount -= nNewPos + 1; @@ -1451,7 +1451,7 @@ sal_Bool SvxUnoTextRangeBase::GoRight(sal_Int16 nCount, sal_Bool Expand) throw( CheckSelection( maSelection, pForwarder ); - sal_uInt16 nNewPos = maSelection.nEndPos + nCount; //! Ueberlauf ??? + sal_uInt16 nNewPos = maSelection.nEndPos + nCount; //! Ueberlauf ??? sal_uInt16 nNewPar = maSelection.nEndPara; sal_Bool bOk = sal_True; @@ -1528,7 +1528,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames_Static() SAL_THROW(()) { - uno::Sequence< OUString > aSeq; + uno::Sequence< OUString > aSeq; comphelper::ServiceInfoHelper::addToSequence( aSeq, 3, "com.sun.star.style.CharacterProperties", "com.sun.star.style.CharacterPropertiesComplex", "com.sun.star.style.CharacterPropertiesAsian"); @@ -1735,12 +1735,12 @@ SvxUnoTextBase::SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPrope } SvxUnoTextBase::SvxUnoTextBase( const SvxUnoTextBase& rText ) throw() -: SvxUnoTextRangeBase( rText ) +: SvxUnoTextRangeBase( rText ) , text::XTextAppend() , text::XTextCopy() -, container::XEnumerationAccess() -, text::XTextRangeMover() -, lang::XTypeProvider() +, container::XEnumerationAccess() +, text::XTextRangeMover() +, lang::XTypeProvider() { xParentText = rText.xParentText; } @@ -1758,15 +1758,15 @@ ESelection SvxUnoTextBase::InsertField( const SvxFieldItem& rField ) throw() pForwarder->QuickInsertField( rField, GetSelection() ); GetEditSource()->UpdateData(); - // Selektion anpassen - //! Wenn die EditEngine bei QuickInsertText die Selektion zurueckgeben wuerde, - //! waer's einfacher... + // Selektion anpassen + //! Wenn die EditEngine bei QuickInsertText die Selektion zurueckgeben wuerde, + //! waer's einfacher... CollapseToStart(); - GoRight( 1, sal_True ); // Feld ist immer 1 Zeichen + GoRight( 1, sal_True ); // Feld ist immer 1 Zeichen } - return GetSelection(); // Selektion mit dem Feld + return GetSelection(); // Selektion mit dem Feld } // XInterface @@ -1891,11 +1891,11 @@ void SAL_CALL SvxUnoTextBase::insertString( const uno::Reference< text::XTextRan SvxUnoTextRangeBase* pRange = SvxUnoTextRange::getImplementation( xRange ); if(pRange) { - // setString am SvxUnoTextRangeBase statt selber QuickInsertText und UpdateData, - // damit die Selektion am SvxUnoTextRangeBase angepasst wird. - //! Eigentlich muessten alle Cursor-Objekte dieses Textes angepasst werden! + // setString am SvxUnoTextRangeBase statt selber QuickInsertText und UpdateData, + // damit die Selektion am SvxUnoTextRangeBase angepasst wird. + //! Eigentlich muessten alle Cursor-Objekte dieses Textes angepasst werden! - if (!bAbsorb) // nicht ersetzen -> hinten anhaengen + if (!bAbsorb) // nicht ersetzen -> hinten anhaengen pRange->CollapseToEnd(); pRange->setString( aString ); @@ -1921,7 +1921,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text { case text::ControlCharacter::PARAGRAPH_BREAK: { - const String aText( (sal_Unicode)13 ); // '\r' geht auf'm Mac nicht + const String aText( (sal_Unicode)13 ); // '\r' geht auf'm Mac nicht insertString( xRange, aText, bAbsorb ); return; @@ -1964,7 +1964,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text if(pRange) { ESelection aRange = pRange->GetSelection(); -// ESelection aOldSelection = aRange; +// ESelection aOldSelection = aRange; aRange.nStartPos = pForwarder->GetTextLen( aRange.nStartPara ); @@ -1972,7 +1972,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text aRange.nEndPos = aRange.nStartPos; pRange->SetSelection( aRange ); - const String aText( (sal_Unicode)13 ); // '\r' geht auf'm Mac nicht + const String aText( (sal_Unicode)13 ); // '\r' geht auf'm Mac nicht pRange->setString( aText ); aRange.nStartPos = 0; @@ -2208,9 +2208,9 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendParagraph( // set properties for new appended (now last) paragraph ESelection aSel( nParaCount, 0, nParaCount, 0 ); SfxItemSet aItemSet( *pTextForwarder->GetEmptyItemSetPtr() ); - SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps, - ImplGetSvxUnoOutlinerTextCursorSfxPropertySet(), - pTextForwarder, + SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps, + ImplGetSvxUnoOutlinerTextCursorSfxPropertySet(), + pTextForwarder, nParaCount ); pTextForwarder->QuickSetAttribs( aItemSet, aSel ); pEditSource->UpdateData(); @@ -2240,7 +2240,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraph( USHORT nPara = nParaCount - 1; ESelection aSel( nPara, 0, nPara, 0 ); SfxItemSet aItemSet( *pTextForwarder->GetEmptyItemSetPtr() ); - SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps, + SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps, ImplGetSvxUnoOutlinerTextCursorSfxPropertySet(), pTextForwarder, nPara ); pTextForwarder->QuickSetAttribs( aItemSet, aSel ); pEditSource->UpdateData(); @@ -2278,7 +2278,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion( pEditSource->UpdateData(); SfxItemSet aItemSet( *pTextForwarder->GetEmptyItemSetPtr() ); - SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps, + SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps, ImplGetSvxTextPortionSfxPropertySet(), pTextForwarder, nPara ); pTextForwarder->QuickSetAttribs( aItemSet, aSel ); SvxUnoTextRange* pRange = new SvxUnoTextRange( *this ); @@ -2673,11 +2673,11 @@ void SvxDummyTextSource::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT { rStart = rEnd = 0; } - + USHORT SvxDummyTextSource::GetLineNumberAtIndex( USHORT /*nPara*/, USHORT /*nIndex*/ ) const { return 0; -} +} sal_Bool SvxDummyTextSource::QuickFormatDoc( BOOL ) { diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index 5a1132fb23ea..ced114204bdf 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,20 +124,20 @@ static SvxUnoText* getDummyText() throw() } SvxUnoTextContent::SvxUnoTextContent() throw() -: SvxUnoTextRangeBase(*getDummyText()) -, mnParagraph(0) -, mrParentText(*getDummyText()) -, maDisposeListeners(maDisposeContainerMutex) -, mbDisposing( false ) +: SvxUnoTextRangeBase(*getDummyText()) +, mnParagraph(0) +, mrParentText(*getDummyText()) +, maDisposeListeners(maDisposeContainerMutex) +, mbDisposing( false ) { } SvxUnoTextContent::SvxUnoTextContent( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw() -: SvxUnoTextRangeBase(rText) -, mnParagraph(nPara) -, mrParentText(rText) -, maDisposeListeners(maDisposeContainerMutex) -, mbDisposing( false ) +: SvxUnoTextRangeBase(rText) +, mnParagraph(nPara) +, mrParentText(rText) +, maDisposeListeners(maDisposeContainerMutex) +, mbDisposing( false ) { mxParentText = const_cast<SvxUnoTextBase*>(&rText); if( GetEditSource() && GetEditSource()->GetTextForwarder() ) @@ -145,14 +145,14 @@ SvxUnoTextContent::SvxUnoTextContent( const SvxUnoTextBase& rText, sal_uInt16 nP } SvxUnoTextContent::SvxUnoTextContent( const SvxUnoTextContent& rContent ) throw() -: SvxUnoTextRangeBase(rContent) -, text::XTextContent() -, container::XEnumerationAccess() -, lang::XTypeProvider() -, cppu::OWeakAggObject() -, mrParentText(rContent.mrParentText) -, maDisposeListeners(maDisposeContainerMutex) -, mbDisposing( false ) +: SvxUnoTextRangeBase(rContent) +, text::XTextContent() +, container::XEnumerationAccess() +, lang::XTypeProvider() +, cppu::OWeakAggObject() +, mrParentText(rContent.mrParentText) +, maDisposeListeners(maDisposeContainerMutex) +, mbDisposing( false ) { mxParentText = rContent.mxParentText; mnParagraph = rContent.mnParagraph; @@ -262,7 +262,7 @@ void SAL_CALL SvxUnoTextContent::dispose() SolarMutexGuard aGuard; if( mbDisposing ) - return; // catched a recursion + return; // catched a recursion mbDisposing = true; @@ -408,7 +408,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames() // ==================================================================== SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw() -: mxParentText( const_cast<SvxUnoTextBase*>(&rText) ), +: mxParentText( const_cast<SvxUnoTextBase*>(&rText) ), mrParentText( rText ), mnParagraph( nPara ), mnNextPortion( 0 ) @@ -498,17 +498,17 @@ uno::Reference< uno::XInterface > SvxUnoTextCursor_NewInstance() } SvxUnoTextCursor::SvxUnoTextCursor( const SvxUnoTextBase& rText ) throw() -: SvxUnoTextRangeBase(rText), +: SvxUnoTextRangeBase(rText), mxParentText( const_cast<SvxUnoTextBase*>(&rText) ) { } SvxUnoTextCursor::SvxUnoTextCursor( const SvxUnoTextCursor& rCursor ) throw() -: SvxUnoTextRangeBase(rCursor) -, text::XTextCursor() -, lang::XTypeProvider() -, cppu::OWeakAggObject() -, mxParentText(rCursor.mxParentText) +: SvxUnoTextRangeBase(rCursor) +, text::XTextCursor() +, lang::XTypeProvider() +, cppu::OWeakAggObject() +, mxParentText(rCursor.mxParentText) { } diff --git a/editeng/source/uno/unoviwed.cxx b/editeng/source/uno/unoviwed.cxx index bdc6ada90c86..2ea5fddd09e8 100644 --- a/editeng/source/uno/unoviwed.cxx +++ b/editeng/source/uno/unoviwed.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/uno/unoviwou.cxx b/editeng/source/uno/unoviwou.cxx index 4bb7bd9dd8c4..6c4c024de39f 100644 --- a/editeng/source/uno/unoviwou.cxx +++ b/editeng/source/uno/unoviwou.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |