diff options
Diffstat (limited to 'editeng/source')
32 files changed, 601 insertions, 605 deletions
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 16ab1eacc1d1..2863deb1718a 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -18,11 +18,11 @@ */ -//------------------------------------------------------------------------ + // // Global header // -//------------------------------------------------------------------------ + #include <limits.h> #include <vector> @@ -55,11 +55,11 @@ #include <editeng/outliner.hxx> #include <svl/intitem.hxx> -//------------------------------------------------------------------------ + // // Project-local header // -//------------------------------------------------------------------------ + #include <com/sun/star/beans/PropertyState.hpp> @@ -78,11 +78,11 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::accessibility; -//------------------------------------------------------------------------ + // // AccessibleEditableTextPara implementation // -//------------------------------------------------------------------------ + namespace accessibility { @@ -2888,6 +2888,6 @@ namespace accessibility } // end of namespace accessibility -//------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx index 0407c88b019c..2773d7bfffa5 100644 --- a/editeng/source/accessibility/AccessibleHyperlink.cxx +++ b/editeng/source/accessibility/AccessibleHyperlink.cxx @@ -30,11 +30,11 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------ + // // AccessibleHyperlink implementation // -//------------------------------------------------------------------------ + namespace accessibility { @@ -130,6 +130,6 @@ namespace accessibility } // end of namespace accessibility -//------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx index 65d728097dd6..39f4a561e5b4 100644 --- a/editeng/source/accessibility/AccessibleParaManager.cxx +++ b/editeng/source/accessibility/AccessibleParaManager.cxx @@ -18,22 +18,22 @@ */ -//------------------------------------------------------------------------ + // // Global header // -//------------------------------------------------------------------------ + #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <cppuhelper/weakref.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> -//------------------------------------------------------------------------ + // // Project-local header // -//------------------------------------------------------------------------ + #include <editeng/unoedhlp.hxx> #include <editeng/unopracc.hxx> @@ -415,6 +415,6 @@ namespace accessibility } -//------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/accessibility/AccessibleSelectionBase.cxx b/editeng/source/accessibility/AccessibleSelectionBase.cxx index 4f9936e71688..3f3b62c0c3e5 100644 --- a/editeng/source/accessibility/AccessibleSelectionBase.cxx +++ b/editeng/source/accessibility/AccessibleSelectionBase.cxx @@ -25,21 +25,21 @@ using namespace ::com::sun::star::accessibility; namespace accessibility { - // --------------------------- + // - AccessibleSelectionBase - - // --------------------------- + AccessibleSelectionBase::AccessibleSelectionBase() { } - //-------------------------------------------------------------------- + AccessibleSelectionBase::~AccessibleSelectionBase() { } - //-------------------------------------------------------------------- + void SAL_CALL AccessibleSelectionBase::selectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { @@ -47,7 +47,7 @@ namespace accessibility OCommonAccessibleSelection::selectAccessibleChild( nChildIndex ); } - //-------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleSelectionBase::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { @@ -55,7 +55,7 @@ namespace accessibility return( OCommonAccessibleSelection::isAccessibleChildSelected( nChildIndex ) ); } - //-------------------------------------------------------------------- + void SAL_CALL AccessibleSelectionBase::clearAccessibleSelection( ) throw (uno::RuntimeException) { @@ -63,7 +63,7 @@ namespace accessibility OCommonAccessibleSelection::clearAccessibleSelection(); } - //-------------------------------------------------------------------- + void SAL_CALL AccessibleSelectionBase::selectAllAccessibleChildren( ) throw (uno::RuntimeException) { @@ -71,7 +71,7 @@ namespace accessibility OCommonAccessibleSelection::selectAllAccessibleChildren(); } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChildCount( ) throw (uno::RuntimeException) { @@ -79,7 +79,7 @@ namespace accessibility return( OCommonAccessibleSelection::getSelectedAccessibleChildCount() ); } - //-------------------------------------------------------------------- + uno::Reference< XAccessible > SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { @@ -87,7 +87,7 @@ namespace accessibility return( OCommonAccessibleSelection::getSelectedAccessibleChild( nSelectedChildIndex ) ); } - //-------------------------------------------------------------------- + void SAL_CALL AccessibleSelectionBase::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index a973a5e77fd4..e931b2e9ea19 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -18,11 +18,11 @@ */ -//------------------------------------------------------------------------ + // // Global header // -//------------------------------------------------------------------------ + #include <limits.h> #include <vector> @@ -38,11 +38,11 @@ #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/accessibility/AccessibleTextType.hpp> -//------------------------------------------------------------------------ + // // Project-local header // -//------------------------------------------------------------------------ + #include <editeng/editdata.hxx> #include <editeng/unopracc.hxx> @@ -78,11 +78,11 @@ namespace accessibility } }; sal_Unicode cNewLine(0x0a); - //------------------------------------------------------------------------ + // // Static Helper // - //------------------------------------------------------------------------ + ESelection MakeSelection( sal_Int32 nStartPara, sal_Int32 nStartIndex, sal_Int32 nEndPara, sal_Int32 nEndIndex ) { @@ -96,11 +96,11 @@ namespace accessibility nEndPara, static_cast< sal_uInt16 >(nEndIndex) ); } - //------------------------------------------------------------------------ + // // AccessibleStaticTextBase_Impl declaration // - //------------------------------------------------------------------------ + /** AccessibleStaticTextBase_Impl @@ -208,11 +208,11 @@ namespace accessibility }; - //------------------------------------------------------------------------ + // // AccessibleStaticTextBase_Impl implementation // - //------------------------------------------------------------------------ + AccessibleStaticTextBase_Impl::AccessibleStaticTextBase_Impl() : mxThis( NULL ), @@ -492,11 +492,11 @@ namespace accessibility } return sal_False; } - //------------------------------------------------------------------------ + // // AccessibleStaticTextBase implementation // - //------------------------------------------------------------------------ + SAL_WNODEPRECATED_DECLARATIONS_PUSH AccessibleStaticTextBase::AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource > pEditSource ) : @@ -1126,6 +1126,6 @@ namespace accessibility } // end of namespace accessibility -//------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/accessibility/AccessibleStringWrap.cxx b/editeng/source/accessibility/AccessibleStringWrap.cxx index b923d39bf6d2..566e8bd0ad19 100644 --- a/editeng/source/accessibility/AccessibleStringWrap.cxx +++ b/editeng/source/accessibility/AccessibleStringWrap.cxx @@ -25,11 +25,11 @@ #include <editeng/svxfont.hxx> #include <editeng/AccessibleStringWrap.hxx> -//------------------------------------------------------------------------ + // // AccessibleStringWrap implementation // -//------------------------------------------------------------------------ + AccessibleStringWrap::AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const OUString& rText ) : mrDev( rDev ), diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 5a8f0a6b6325..71c8593bdb7e 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/wrkwin.hxx> #include <vcl/dialog.hxx> #include <vcl/msgbox.hxx> @@ -94,9 +93,6 @@ static bool bDebugPaint = false; static SfxItemPool* pGlobalPool=0; -// ---------------------------------------------------------------------- -// EditEngine -// ---------------------------------------------------------------------- EditEngine::EditEngine( SfxItemPool* pItemPool ) { pImpEditEngine = new ImpEditEngine( this, pItemPool ); @@ -248,7 +244,7 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const P #endif // Align to the pixel boundary, so that it becomes exactly the same - // as Paint (). + // as Paint () Rectangle aOutRect( pOutDev->LogicToPixel( rOutRect ) ); aOutRect = pOutDev->PixelToLogic( aOutRect ); diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 0c91733ac868..cba107f40ac2 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -57,7 +57,7 @@ using std::endl; using namespace com::sun::star; -//-------------------------------------------------------------- + XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem, sal_uInt16 nStart, sal_uInt16 nEnd ) { diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index b640a3b26877..7d5d15d15644 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -64,7 +64,7 @@ static inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, shor rPoint = pOutDev->PixelToLogic( rPoint ); } -// ---------------------------------------------------------------------- + // class ImpEditView // ---------------------------------------------------------------------- ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ) : diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 43d3f702482c..782402108ea9 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -3057,9 +3057,9 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( sal_Bool bIgnoreExtraSpace ) long nMaxWidth = 0; long nCurWidth = 0; - // -------------------------------------------------- + // Over all the paragraphs ... - // -------------------------------------------------- + sal_Int32 nParas = GetParaPortions().Count(); for ( sal_Int32 nPara = 0; nPara < nParas; nPara++ ) { @@ -3069,9 +3069,9 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( sal_Bool bIgnoreExtraSpace ) const SvxLRSpaceItem& rLRItem = GetLRSpaceItem( pPortion->GetNode() ); sal_Int32 nSpaceBeforeAndMinLabelWidth = GetSpaceBeforeAndMinLabelWidth( pPortion->GetNode() ); - // -------------------------------------------------- + // On the lines of the paragraph ... - // -------------------------------------------------- + sal_Int32 nLines = (sal_Int32)pPortion->GetLines().Count(); for ( sal_Int32 nLine = 0; nLine < nLines; nLine++ ) { diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 88337a915341..ab8c3d800611 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -594,9 +594,9 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) bool bProcessingEmptyLine = ( pParaPortion->GetNode()->Len() == 0 ); bool bEmptyNodeWithPolygon = ( pParaPortion->GetNode()->Len() == 0 ) && GetTextRanger(); - // --------------------------------------------------------------- + // Fast special treatment for empty paragraphs ... - // --------------------------------------------------------------- + if ( ( pParaPortion->GetNode()->Len() == 0 ) && !GetTextRanger() ) { // fast special treatment ... @@ -608,9 +608,9 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) return FinishCreateLines( pParaPortion ); } - // --------------------------------------------------------------- + // Initialization ...... - // --------------------------------------------------------------- + // Always format for 100%: bool bMapChanged = ImpCheckRefMapMode(); @@ -621,9 +621,9 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) pParaPortion->GetLines().Append(pL); } - // --------------------------------------------------------------- + // Get Paragraph attributes ...... - // --------------------------------------------------------------- + ContentNode* const pNode = pParaPortion->GetNode(); sal_Bool bRightToLeftPara = IsRightToLeft( nPara ); @@ -697,10 +697,10 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) } - // --------------------------------------------------------------- + // Search for line with InvalidPos, start one line before // Flag the line => do not remove it ! - // --------------------------------------------------------------- + sal_Int32 nLine = pParaPortion->GetLines().Count()-1; for ( sal_Int32 nL = 0; nL <= nLine; nL++ ) @@ -731,9 +731,9 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) pParaPortion->SetBulletX( 0 ); // if Bullet is set incorrectly } - // --------------------------------------------------------------- + // Reformat all lines from here ... - // --------------------------------------------------------------- + sal_Int32 nDelFromLine = -1; bool bLineBreak = false; @@ -1275,9 +1275,9 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) nRemainingWidth, bCanHyphenate && bHyphenatePara ); } - // ------------------------------------------------------------------ + // Line finished => adjust - // ------------------------------------------------------------------ + // CalcTextSize should be replaced by a continuous registering! Size aTextSize = pLine->CalcTextSize( *pParaPortion ); @@ -1440,9 +1440,9 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) break; } - // ----------------------------------------------------------------- + // Check whether the line must be re-issued ... - // ----------------------------------------------------------------- + pLine->SetInvalid(); // If a portion was wrapped there may be far too many positions in @@ -2879,9 +2879,9 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt long nVertLineSpacing = CalcVertLineSpacing(aStartPos); - // -------------------------------------------------- + // Over all the paragraphs ... - // -------------------------------------------------- + for ( sal_Int32 n = 0; n < GetParaPortions().Count(); n++ ) { const ParaPortion* pPortion = GetParaPortions()[n]; @@ -2901,9 +2901,9 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt ( IsVertical() && ( ( aStartPos.X() - nParaHeight ) < aClipRect.Right() ) ) ) ) { - // -------------------------------------------------- + // Over the lines of the paragraph ... - // -------------------------------------------------- + sal_Int32 nLines = pPortion->GetLines().Count(); sal_Int32 nLastLine = nLines-1; @@ -2964,9 +2964,9 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt bPaintBullet = rBulletState.GetValue() ? true : false; } - // -------------------------------------------------- + // Over the Portions of the line ... - // -------------------------------------------------- + bool bParsingFields = false; ::std::vector< sal_Int32 >::iterator itSubLines; diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index 4a59051ee76f..2da1753d4f20 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -382,14 +382,14 @@ BorderWidthImpl SvxBorderLine::getWidthImpl( SvxBorderStyle nStyle ) return aImpl; } -// ----------------------------------------------------------------------- + SvxBorderLine::SvxBorderLine( const SvxBorderLine& r ) { *this = r; } -// ----------------------------------------------------------------------- + SvxBorderLine& SvxBorderLine::operator=( const SvxBorderLine& r ) { @@ -407,7 +407,7 @@ SvxBorderLine& SvxBorderLine::operator=( const SvxBorderLine& r ) return *this; } -// ----------------------------------------------------------------------- + void SvxBorderLine::ScaleMetrics( long nMult, long nDiv ) { @@ -514,7 +514,7 @@ sal_uInt16 SvxBorderLine::GetDistance() const return (sal_uInt16)Scale( m_aWidthImpl.GetGap( m_nWidth ), m_nMult, m_nDiv ); } -// ----------------------------------------------------------------------- + bool SvxBorderLine::operator==( const SvxBorderLine& rCmp ) const { @@ -611,7 +611,7 @@ Color SvxBorderLine::GetColorGap( ) const return aResult; } -// ----------------------------------------------------------------------- + OUString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index b9d687df002e..c2dfcbd9d07b 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -28,11 +28,11 @@ #define BULITEM_VERSION ((sal_uInt16)2) -// ----------------------------------------------------------------------- + TYPEINIT1(SvxBulletItem,SfxPoolItem); -// ----------------------------------------------------------------------- + void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont ) { @@ -59,7 +59,7 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont ) rStream.WriteUChar( rFont.IsTransparent() ); } -// ----------------------------------------------------------------------- + Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer ) { @@ -100,7 +100,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer ) } -// ----------------------------------------------------------------------- + SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ) { @@ -109,7 +109,7 @@ SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ) nValidMask = 0xFFFF; } -// ----------------------------------------------------------------------- + SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) : SfxPoolItem(_nWhich) @@ -166,7 +166,7 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) nValidMask = 0xFFFF; } -// ----------------------------------------------------------------------- + SvxBulletItem::SvxBulletItem( const SvxBulletItem& rItem) : SfxPoolItem( rItem ) { @@ -183,7 +183,7 @@ SvxBulletItem::SvxBulletItem( const SvxBulletItem& rItem) : SfxPoolItem( rItem ) nValidMask = rItem.nValidMask; } -// ----------------------------------------------------------------------- + SvxBulletItem::~SvxBulletItem() { @@ -191,21 +191,21 @@ SvxBulletItem::~SvxBulletItem() delete pGraphicObject; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxBulletItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxBulletItem( *this ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxBulletItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) const { return new SvxBulletItem( rStrm, Which() ); } -// ----------------------------------------------------------------------- + void SvxBulletItem::SetDefaultFont_Impl() { @@ -214,7 +214,7 @@ void SvxBulletItem::SetDefaultFont_Impl() aFont.SetTransparent( true ); } -// ----------------------------------------------------------------------- + void SvxBulletItem::SetDefaults_Impl() { @@ -227,14 +227,14 @@ void SvxBulletItem::SetDefaults_Impl() nScale = 75; } -// ----------------------------------------------------------------------- + sal_uInt16 SvxBulletItem::GetVersion( sal_uInt16 /*nVersion*/ ) const { return BULITEM_VERSION; } -// ----------------------------------------------------------------------- + void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom ) { @@ -267,7 +267,7 @@ void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom ) } -// ----------------------------------------------------------------------- + bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) const { @@ -305,7 +305,7 @@ bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) const return true; } -// ----------------------------------------------------------------------- + SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { @@ -367,7 +367,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c return rStrm; } -//------------------------------------------------------------------------ + OUString SvxBulletItem::GetFullText() const { @@ -377,7 +377,7 @@ OUString SvxBulletItem::GetFullText() const return aStr.makeStringAndClear(); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxBulletItem::GetPresentation ( @@ -405,7 +405,7 @@ SfxItemPresentation SvxBulletItem::GetPresentation return eRet; } -//------------------------------------------------------------------------ + const GraphicObject& SvxBulletItem::GetGraphicObject() const { @@ -418,7 +418,7 @@ const GraphicObject& SvxBulletItem::GetGraphicObject() const } } -//------------------------------------------------------------------------ + void SvxBulletItem::SetGraphicObject( const GraphicObject& rGraphicObject ) { diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 9887a5a72105..99f05750bb56 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -223,26 +223,26 @@ TYPEINIT1( SvxFieldItem, SfxPoolItem ); SV_IMPL_PERSIST1( SvxFieldData, SvPersistBase ); -// ----------------------------------------------------------------------- + SvxFieldData::SvxFieldData() { } -// ----------------------------------------------------------------------- + SvxFieldData::~SvxFieldData() { } -// ----------------------------------------------------------------------- + SvxFieldData* SvxFieldData::Clone() const { return new SvxFieldData; } -// ----------------------------------------------------------------------- + bool SvxFieldData::operator==( const SvxFieldData& rFld ) const { @@ -251,13 +251,13 @@ bool SvxFieldData::operator==( const SvxFieldData& rFld ) const return true; // Basic class is always the same. } -// ----------------------------------------------------------------------- + void SvxFieldData::Load( SvPersistStream & /*rStm*/ ) { } -// ----------------------------------------------------------------------- + void SvxFieldData::Save( SvPersistStream & /*rStm*/ ) { @@ -274,7 +274,7 @@ MetaAction* SvxFieldData::createEndComment() const return new MetaCommentAction( "FIELD_SEQ_END" ); } -// ----------------------------------------------------------------------- + SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const sal_uInt16 nId ) : SfxPoolItem( nId ) @@ -282,7 +282,7 @@ SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const sal_uInt16 nId ) : pField = pFld; // belongs directly to the item } -// ----------------------------------------------------------------------- + SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) : SfxPoolItem( nId ) @@ -290,7 +290,7 @@ SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) : pField = rField.Clone(); } -// ----------------------------------------------------------------------- + SvxFieldItem::SvxFieldItem( const SvxFieldItem& rItem ) : SfxPoolItem ( rItem ) @@ -298,21 +298,21 @@ SvxFieldItem::SvxFieldItem( const SvxFieldItem& rItem ) : pField = rItem.GetField() ? rItem.GetField()->Clone() : 0; } -// ----------------------------------------------------------------------- + SvxFieldItem::~SvxFieldItem() { delete pField; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxFieldItem::Clone( SfxItemPool* ) const { return new SvxFieldItem(*this); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, sal_uInt16 ) const { @@ -329,7 +329,7 @@ SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, sal_uInt16 ) const return new SvxFieldItem( pData, Which() ); } -// ----------------------------------------------------------------------- + SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { @@ -350,7 +350,7 @@ SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) co return rStrm; } -// ----------------------------------------------------------------------- + bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const { @@ -373,7 +373,7 @@ bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const SV_IMPL_PERSIST1( SvxDateField, SvxFieldData ); -// ----------------------------------------------------------------------- + SvxDateField::SvxDateField() { @@ -382,7 +382,7 @@ SvxDateField::SvxDateField() eFormat = SVXDATEFORMAT_STDSMALL; } -// ----------------------------------------------------------------------- + SvxDateField::SvxDateField( const Date& rDate, SvxDateType eT, SvxDateFormat eF ) { @@ -391,14 +391,14 @@ SvxDateField::SvxDateField( const Date& rDate, SvxDateType eT, SvxDateFormat eF eFormat = eF; } -// ----------------------------------------------------------------------- + SvxFieldData* SvxDateField::Clone() const { return new SvxDateField( *this ); } -// ----------------------------------------------------------------------- + bool SvxDateField::operator==( const SvxFieldData& rOther ) const { @@ -411,7 +411,7 @@ bool SvxDateField::operator==( const SvxFieldData& rOther ) const ( eFormat == rOtherFld.eFormat ) ); } -// ----------------------------------------------------------------------- + void SvxDateField::Load( SvPersistStream & rStm ) { @@ -425,7 +425,7 @@ void SvxDateField::Load( SvPersistStream & rStm ) eFormat= (SvxDateFormat)nFormat; } -// ----------------------------------------------------------------------- + void SvxDateField::Save( SvPersistStream & rStm ) { @@ -434,7 +434,7 @@ void SvxDateField::Save( SvPersistStream & rStm ) rStm.WriteUInt16( (sal_uInt16)eFormat ); } -// ----------------------------------------------------------------------- + OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const { @@ -514,14 +514,14 @@ MetaAction* SvxDateField::createBeginComment() const SV_IMPL_PERSIST1( SvxURLField, SvxFieldData ); -// ----------------------------------------------------------------------- + SvxURLField::SvxURLField() { eFormat = SVXURLFORMAT_URL; } -// ----------------------------------------------------------------------- + SvxURLField::SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLFormat eFmt ) : aURL( rURL ), aRepresentation( rRepres ) @@ -529,14 +529,14 @@ SvxURLField::SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLF eFormat = eFmt; } -// ----------------------------------------------------------------------- + SvxFieldData* SvxURLField::Clone() const { return new SvxURLField( *this ); } -// ----------------------------------------------------------------------- + bool SvxURLField::operator==( const SvxFieldData& rOther ) const { @@ -550,7 +550,7 @@ bool SvxURLField::operator==( const SvxFieldData& rOther ) const ( aTargetFrame == rOtherFld.aTargetFrame ) ); } -// ----------------------------------------------------------------------- + static void write_unicode( SvPersistStream & rStm, const OUString& rString ) { @@ -587,7 +587,7 @@ void SvxURLField::Load( SvPersistStream & rStm ) aTargetFrame = read_unicode( rStm ); } -// ----------------------------------------------------------------------- + void SvxURLField::Save( SvPersistStream & rStm ) { @@ -747,13 +747,13 @@ void SvxTableField::Save( SvPersistStream & /*rStm*/ ) { } -//---------------------------------------------------------------------------- + // SvxExtTimeField -//---------------------------------------------------------------------------- + SV_IMPL_PERSIST1( SvxExtTimeField, SvxFieldData ); -//---------------------------------------------------------------------------- + SvxExtTimeField::SvxExtTimeField() : m_nFixTime( Time(Time::SYSTEM).GetTime() ) @@ -762,7 +762,7 @@ SvxExtTimeField::SvxExtTimeField() eFormat = SVXTIMEFORMAT_STANDARD; } -//---------------------------------------------------------------------------- + SvxExtTimeField::SvxExtTimeField( const Time& rTime, SvxTimeType eT, SvxTimeFormat eF ) : m_nFixTime( rTime.GetTime() ) @@ -771,14 +771,14 @@ SvxExtTimeField::SvxExtTimeField( const Time& rTime, SvxTimeType eT, SvxTimeForm eFormat = eF; } -//---------------------------------------------------------------------------- + SvxFieldData* SvxExtTimeField::Clone() const { return new SvxExtTimeField( *this ); } -//---------------------------------------------------------------------------- + bool SvxExtTimeField::operator==( const SvxFieldData& rOther ) const { @@ -791,7 +791,7 @@ bool SvxExtTimeField::operator==( const SvxFieldData& rOther ) const ( eFormat == rOtherFld.eFormat ) ); } -//---------------------------------------------------------------------------- + void SvxExtTimeField::Load( SvPersistStream & rStm ) { @@ -805,7 +805,7 @@ void SvxExtTimeField::Load( SvPersistStream & rStm ) eFormat= (SvxTimeFormat) nFormat; } -//---------------------------------------------------------------------------- + void SvxExtTimeField::Save( SvPersistStream & rStm ) { @@ -814,7 +814,7 @@ void SvxExtTimeField::Save( SvPersistStream & rStm ) rStm.WriteUInt16( (sal_uInt16) eFormat ); } -//---------------------------------------------------------------------------- + OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const { @@ -892,13 +892,13 @@ MetaAction* SvxExtTimeField::createBeginComment() const return new MetaCommentAction( "FIELD_SEQ_BEGIN" ); } -//---------------------------------------------------------------------------- + // SvxExtFileField -//---------------------------------------------------------------------------- + SV_IMPL_PERSIST1( SvxExtFileField, SvxFieldData ); -//---------------------------------------------------------------------------- + SvxExtFileField::SvxExtFileField() { @@ -906,7 +906,7 @@ SvxExtFileField::SvxExtFileField() eFormat = SVXFILEFORMAT_FULLPATH; } -//---------------------------------------------------------------------------- + SvxExtFileField::SvxExtFileField( const OUString& rStr, SvxFileType eT, SvxFileFormat eF ) { @@ -915,14 +915,14 @@ SvxExtFileField::SvxExtFileField( const OUString& rStr, SvxFileType eT, SvxFileF eFormat = eF; } -//---------------------------------------------------------------------------- + SvxFieldData* SvxExtFileField::Clone() const { return new SvxExtFileField( *this ); } -//---------------------------------------------------------------------------- + bool SvxExtFileField::operator==( const SvxFieldData& rOther ) const { @@ -935,7 +935,7 @@ bool SvxExtFileField::operator==( const SvxFieldData& rOther ) const ( eFormat == rOtherFld.eFormat ) ); } -//---------------------------------------------------------------------------- + void SvxExtFileField::Load( SvPersistStream & rStm ) { @@ -951,7 +951,7 @@ void SvxExtFileField::Load( SvPersistStream & rStm ) eFormat= (SvxFileFormat) nFormat; } -//---------------------------------------------------------------------------- + void SvxExtFileField::Save( SvPersistStream & rStm ) { @@ -962,7 +962,7 @@ void SvxExtFileField::Save( SvPersistStream & rStm ) rStm.WriteUInt16( (sal_uInt16) eFormat ); } -//---------------------------------------------------------------------------- + OUString SvxExtFileField::GetFormatted() const { @@ -1039,13 +1039,13 @@ OUString SvxExtFileField::GetFormatted() const return aString; } -//---------------------------------------------------------------------------- + // SvxAuthorField -//---------------------------------------------------------------------------- + SV_IMPL_PERSIST1( SvxAuthorField, SvxFieldData ); -//---------------------------------------------------------------------------- + SvxAuthorField::SvxAuthorField() { @@ -1053,7 +1053,7 @@ SvxAuthorField::SvxAuthorField() eFormat = SVXAUTHORFORMAT_FULLNAME; } -//---------------------------------------------------------------------------- + SvxAuthorField::SvxAuthorField( const OUString& rFirstName, const OUString& rLastName, @@ -1067,14 +1067,14 @@ SvxAuthorField::SvxAuthorField( const OUString& rFirstName, eFormat = eF; } -//---------------------------------------------------------------------------- + SvxFieldData* SvxAuthorField::Clone() const { return new SvxAuthorField( *this ); } -//---------------------------------------------------------------------------- + bool SvxAuthorField::operator==( const SvxFieldData& rOther ) const { @@ -1089,7 +1089,7 @@ bool SvxAuthorField::operator==( const SvxFieldData& rOther ) const ( eFormat == rOtherFld.eFormat ) ); } -//---------------------------------------------------------------------------- + void SvxAuthorField::Load( SvPersistStream & rStm ) { @@ -1106,7 +1106,7 @@ void SvxAuthorField::Load( SvPersistStream & rStm ) eFormat= (SvxAuthorFormat) nFormat; } -//---------------------------------------------------------------------------- + void SvxAuthorField::Save( SvPersistStream & rStm ) { @@ -1118,7 +1118,7 @@ void SvxAuthorField::Save( SvPersistStream & rStm ) rStm.WriteUInt16( (sal_uInt16) eFormat ); } -//---------------------------------------------------------------------------- + OUString SvxAuthorField::GetFormatted() const { diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index c70dd1d0b956..23c1177f2ed6 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -166,7 +166,7 @@ SfxPoolItem* SvxPaperBinItem::Clone( SfxItemPool* ) const return new SvxPaperBinItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxPaperBinItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -174,7 +174,7 @@ SvStream& SvxPaperBinItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxPaperBinItem::Create( SvStream& rStrm, sal_uInt16 ) const { @@ -183,7 +183,7 @@ SfxPoolItem* SvxPaperBinItem::Create( SvStream& rStrm, sal_uInt16 ) const return new SvxPaperBinItem( Which(), nBin ); } -// ----------------------------------------------------------------------- + SfxItemPresentation SvxPaperBinItem::GetPresentation ( @@ -232,7 +232,7 @@ SvxSizeItem::SvxSizeItem( const sal_uInt16 nId, const Size& rSize ) : { } -// ----------------------------------------------------------------------- + bool SvxSizeItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -255,7 +255,7 @@ bool SvxSizeItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return true; } -// ----------------------------------------------------------------------- + bool SvxSizeItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -305,7 +305,7 @@ bool SvxSizeItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -// ----------------------------------------------------------------------- + SvxSizeItem::SvxSizeItem( const sal_uInt16 nId ) : @@ -313,7 +313,7 @@ SvxSizeItem::SvxSizeItem( const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + bool SvxSizeItem::operator==( const SfxPoolItem& rAttr ) const { @@ -322,14 +322,14 @@ bool SvxSizeItem::operator==( const SfxPoolItem& rAttr ) const return ( aSize == ( (SvxSizeItem&)rAttr ).GetSize() ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxSizeItem::Clone( SfxItemPool* ) const { return new SvxSizeItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxSizeItem::GetPresentation ( @@ -368,7 +368,7 @@ SfxItemPresentation SvxSizeItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + SvStream& SvxSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -378,7 +378,7 @@ SvStream& SvxSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co return rStrm; } -// ----------------------------------------------------------------------- + bool SvxSizeItem::ScaleMetrics( long nMult, long nDiv ) { @@ -387,14 +387,14 @@ bool SvxSizeItem::ScaleMetrics( long nMult, long nDiv ) return true; } -// ----------------------------------------------------------------------- + bool SvxSizeItem::HasMetrics() const { return true; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxSizeItem::Create( SvStream& rStrm, sal_uInt16 ) const { @@ -427,7 +427,7 @@ SvxLRSpaceItem::SvxLRSpaceItem( const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight, const long nTLeft, const short nOfset, @@ -448,7 +448,7 @@ SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight, { } -// ----------------------------------------------------------------------- + bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { bool bRet = true; @@ -493,7 +493,7 @@ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return bRet; } -// ----------------------------------------------------------------------- + bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -551,7 +551,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -// ----------------------------------------------------------------------- + // Adapt nLeftMargin and nTxtLeft. @@ -563,7 +563,7 @@ void SvxLRSpaceItem::AdjustLeft() nLeftMargin = nTxtLeft; } -// ----------------------------------------------------------------------- + bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const { @@ -584,14 +584,14 @@ bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const bExplicitZeroMarginValLeft == rOther.IsExplicitZeroMarginValLeft() ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxLRSpaceItem::Clone( SfxItemPool* ) const { return new SvxLRSpaceItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxLRSpaceItem::GetPresentation ( @@ -682,7 +682,7 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + // BulletFI: Before 501 in the Outliner the bullet was not on the position of // the FI, so in older documents one must set FI to 0. @@ -736,7 +736,7 @@ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) con return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxLRSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const { @@ -800,7 +800,7 @@ SfxPoolItem* SvxLRSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) cons return pAttr; } -// ----------------------------------------------------------------------- + sal_uInt16 SvxLRSpaceItem::GetVersion( sal_uInt16 nFileVersion ) const { @@ -809,7 +809,7 @@ sal_uInt16 SvxLRSpaceItem::GetVersion( sal_uInt16 nFileVersion ) const : LRSPACE_NEGATIVE_VERSION; } -// ----------------------------------------------------------------------- + bool SvxLRSpaceItem::ScaleMetrics( long nMult, long nDiv ) { @@ -820,7 +820,7 @@ bool SvxLRSpaceItem::ScaleMetrics( long nMult, long nDiv ) return true; } -// ----------------------------------------------------------------------- + bool SvxLRSpaceItem::HasMetrics() const { @@ -839,7 +839,7 @@ SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nId ) { } -// ----------------------------------------------------------------------- + SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow, const sal_uInt16 nId ) @@ -852,7 +852,7 @@ SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow, { } -// ----------------------------------------------------------------------- + bool SvxULSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -879,7 +879,7 @@ bool SvxULSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return true; } -// ----------------------------------------------------------------------- + bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -941,7 +941,7 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -// ----------------------------------------------------------------------- + bool SvxULSpaceItem::operator==( const SfxPoolItem& rAttr ) const { @@ -954,14 +954,14 @@ bool SvxULSpaceItem::operator==( const SfxPoolItem& rAttr ) const nPropLower == ( (SvxULSpaceItem&)rAttr ).nPropLower ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxULSpaceItem::Clone( SfxItemPool* ) const { return new SvxULSpaceItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxULSpaceItem::GetPresentation ( @@ -1028,7 +1028,7 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + SvStream& SvxULSpaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -1039,7 +1039,7 @@ SvStream& SvxULSpaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxULSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const { @@ -1063,14 +1063,14 @@ SfxPoolItem* SvxULSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) cons return pAttr; } -// ----------------------------------------------------------------------- + sal_uInt16 SvxULSpaceItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const { return ULSPACE_16_VERSION; } -// ----------------------------------------------------------------------- + bool SvxULSpaceItem::ScaleMetrics( long nMult, long nDiv ) { @@ -1079,7 +1079,7 @@ bool SvxULSpaceItem::ScaleMetrics( long nMult, long nDiv ) return true; } -// ----------------------------------------------------------------------- + bool SvxULSpaceItem::HasMetrics() const { @@ -1093,7 +1093,7 @@ SfxPoolItem* SvxPrintItem::Clone( SfxItemPool* ) const return new SvxPrintItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxPrintItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -1101,7 +1101,7 @@ SvStream& SvxPrintItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) c return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxPrintItem::Create( SvStream& rStrm, sal_uInt16 ) const { @@ -1110,7 +1110,7 @@ SfxPoolItem* SvxPrintItem::Create( SvStream& rStrm, sal_uInt16 ) const return new SvxPrintItem( Which(), sal_Bool( bIsPrint != 0 ) ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxPrintItem::GetPresentation ( @@ -1148,7 +1148,7 @@ SfxPoolItem* SvxOpaqueItem::Clone( SfxItemPool* ) const return new SvxOpaqueItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxOpaqueItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -1156,7 +1156,7 @@ SvStream& SvxOpaqueItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxOpaqueItem::Create( SvStream& rStrm, sal_uInt16 ) const { @@ -1165,7 +1165,7 @@ SfxPoolItem* SvxOpaqueItem::Create( SvStream& rStrm, sal_uInt16 ) const return new SvxOpaqueItem( Which(), sal_Bool( bIsOpaque != 0 ) ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxOpaqueItem::GetPresentation ( @@ -1241,14 +1241,14 @@ bool SvxProtectItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxProtectItem::Clone( SfxItemPool* ) const { return new SvxProtectItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxProtectItem::GetPresentation ( @@ -1289,7 +1289,7 @@ SfxItemPresentation SvxProtectItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -1301,7 +1301,7 @@ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const { @@ -1328,7 +1328,7 @@ SvxShadowItem::SvxShadowItem( const sal_uInt16 nId, aShadowColor = *pColor; } -// ----------------------------------------------------------------------- + bool SvxShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -1364,7 +1364,7 @@ bool SvxShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return true; } -// ----------------------------------------------------------------------- + bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -1426,7 +1426,7 @@ bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -// ----------------------------------------------------------------------- + bool SvxShadowItem::operator==( const SfxPoolItem& rAttr ) const { @@ -1437,14 +1437,14 @@ bool SvxShadowItem::operator==( const SfxPoolItem& rAttr ) const ( eLocation == ( (SvxShadowItem&)rAttr ).GetLocation() ) ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxShadowItem::Clone( SfxItemPool* ) const { return new SvxShadowItem( *this ); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxShadowItem::CalcShadowSpace( sal_uInt16 nShadow ) const { @@ -1482,7 +1482,7 @@ sal_uInt16 SvxShadowItem::CalcShadowSpace( sal_uInt16 nShadow ) const return nSpace; } -//------------------------------------------------------------------------ + SfxItemPresentation SvxShadowItem::GetPresentation ( @@ -1536,7 +1536,7 @@ SfxItemPresentation SvxShadowItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -1549,7 +1549,7 @@ SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) return rStrm; } -// ----------------------------------------------------------------------- + bool SvxShadowItem::ScaleMetrics( long nMult, long nDiv ) { @@ -1557,14 +1557,14 @@ bool SvxShadowItem::ScaleMetrics( long nMult, long nDiv ) return true; } -// ----------------------------------------------------------------------- + bool SvxShadowItem::HasMetrics() const { return true; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const { @@ -1582,14 +1582,14 @@ SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const return new SvxShadowItem( Which(), &aColor, _nWidth, (SvxShadowLocation)cLoc ); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxShadowItem::GetValueCount() const { return SVX_SHADOW_END; // SVX_SHADOW_BOTTOMRIGHT + 1 } -// ----------------------------------------------------------------------- + OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const { @@ -1597,14 +1597,14 @@ OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const return EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + nPos ); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxShadowItem::GetEnumValue() const { return (sal_uInt16)GetLocation(); } -// ----------------------------------------------------------------------- + void SvxShadowItem::SetEnumValue( sal_uInt16 nVal ) { @@ -1628,7 +1628,7 @@ SvxBoxItem::SvxBoxItem( const SvxBoxItem& rCpy ) : pRight = rCpy.GetRight() ? new SvxBorderLine( *rCpy.GetRight() ) : 0; } -// ----------------------------------------------------------------------- + SvxBoxItem::SvxBoxItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), @@ -1645,7 +1645,7 @@ SvxBoxItem::SvxBoxItem( const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + SvxBoxItem::~SvxBoxItem() { @@ -1655,7 +1655,7 @@ SvxBoxItem::~SvxBoxItem() delete pRight; } -// ----------------------------------------------------------------------- + SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& rBox ) { @@ -1670,7 +1670,7 @@ SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& rBox ) return *this; } -// ----------------------------------------------------------------------- + inline sal_Bool CmpBrdLn( const SvxBorderLine* pBrd1, const SvxBorderLine* pBrd2 ) { @@ -1685,7 +1685,7 @@ inline sal_Bool CmpBrdLn( const SvxBorderLine* pBrd1, const SvxBorderLine* pBrd2 return bRet; } -// ----------------------------------------------------------------------- + bool SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const { @@ -1702,7 +1702,7 @@ bool SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const CmpBrdLn( pRight, ( (SvxBoxItem&)rAttr ).GetRight() ) ); } -// ----------------------------------------------------------------------- + table::BorderLine2 SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, bool bConvert) { table::BorderLine2 aLine; @@ -1719,7 +1719,7 @@ table::BorderLine2 SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, bool bC aLine.Color = aLine.InnerLineWidth = aLine.OuterLineWidth = aLine.LineDistance = 0; return aLine; } -// ----------------------------------------------------------------------- + bool SvxBoxItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -1812,7 +1812,7 @@ lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_B } -// ----------------------------------------------------------------------- + bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, bool bConvert) { return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, sal_True); @@ -1841,7 +1841,7 @@ SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, Svx return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, bGuessWidth); } -// ----------------------------------------------------------------------- + namespace { @@ -2078,14 +2078,14 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxBoxItem::Clone( SfxItemPool* ) const { return new SvxBoxItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxBoxItem::GetPresentation ( @@ -2228,7 +2228,7 @@ SfxItemPresentation SvxBoxItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const { @@ -2270,7 +2270,7 @@ SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const return rStrm; } -// ----------------------------------------------------------------------- + sal_uInt16 SvxBoxItem::GetVersion( sal_uInt16 nFFVer ) const { @@ -2282,7 +2282,7 @@ sal_uInt16 SvxBoxItem::GetVersion( sal_uInt16 nFFVer ) const SOFFICE_FILEFORMAT_40==nFFVer ? 0 : BOX_BORDER_STYLE_VERSION; } -// ----------------------------------------------------------------------- + bool SvxBoxItem::ScaleMetrics( long nMult, long nDiv ) { @@ -2297,14 +2297,14 @@ bool SvxBoxItem::ScaleMetrics( long nMult, long nDiv ) return true; } -// ----------------------------------------------------------------------- + bool SvxBoxItem::HasMetrics() const { return true; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxBoxItem::Create( SvStream& rStrm, sal_uInt16 nIVersion ) const { @@ -2344,7 +2344,7 @@ SfxPoolItem* SvxBoxItem::Create( SvStream& rStrm, sal_uInt16 nIVersion ) const return pAttr; } -// ----------------------------------------------------------------------- + const SvxBorderLine *SvxBoxItem::GetLine( sal_uInt16 nLine ) const { @@ -2372,7 +2372,7 @@ const SvxBorderLine *SvxBoxItem::GetLine( sal_uInt16 nLine ) const return pRet; } -// ----------------------------------------------------------------------- + void SvxBoxItem::SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine ) { @@ -2402,7 +2402,7 @@ void SvxBoxItem::SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine ) } } -// ----------------------------------------------------------------------- + sal_uInt16 SvxBoxItem::GetDistance() const { @@ -2418,7 +2418,7 @@ sal_uInt16 SvxBoxItem::GetDistance() const return nDist; } -// ----------------------------------------------------------------------- + sal_uInt16 SvxBoxItem::GetDistance( sal_uInt16 nLine ) const { @@ -2444,7 +2444,7 @@ sal_uInt16 SvxBoxItem::GetDistance( sal_uInt16 nLine ) const return nDist; } -// ----------------------------------------------------------------------- + void SvxBoxItem::SetDistance( sal_uInt16 nNew, sal_uInt16 nLine ) { @@ -2467,7 +2467,7 @@ void SvxBoxItem::SetDistance( sal_uInt16 nNew, sal_uInt16 nLine ) } } -// ----------------------------------------------------------------------- + sal_uInt16 SvxBoxItem::CalcLineSpace( sal_uInt16 nLine, bool bIgnoreLine ) const { @@ -2518,7 +2518,7 @@ SvxBoxInfoItem::SvxBoxInfoItem( const sal_uInt16 nId ) : ResetFlags(); } -// ----------------------------------------------------------------------- + SvxBoxInfoItem::SvxBoxInfoItem( const SvxBoxInfoItem& rCpy ) : SfxPoolItem( rCpy ), @@ -2533,7 +2533,7 @@ SvxBoxInfoItem::SvxBoxInfoItem( const SvxBoxInfoItem& rCpy ) : nDefDist = rCpy.GetDefDist(); } -// ----------------------------------------------------------------------- + SvxBoxInfoItem::~SvxBoxInfoItem() { @@ -2541,7 +2541,7 @@ SvxBoxInfoItem::~SvxBoxInfoItem() delete pVert; } -// ----------------------------------------------------------------------- + SvxBoxInfoItem &SvxBoxInfoItem::operator=( const SvxBoxInfoItem& rCpy ) { @@ -2558,7 +2558,7 @@ SvxBoxInfoItem &SvxBoxInfoItem::operator=( const SvxBoxInfoItem& rCpy ) return *this; } -// ----------------------------------------------------------------------- + bool SvxBoxInfoItem::operator==( const SfxPoolItem& rAttr ) const { @@ -2577,7 +2577,7 @@ bool SvxBoxInfoItem::operator==( const SfxPoolItem& rAttr ) const ); } -// ----------------------------------------------------------------------- + void SvxBoxInfoItem::SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine ) { @@ -2600,14 +2600,14 @@ void SvxBoxInfoItem::SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine ) } } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxBoxInfoItem::Clone( SfxItemPool* ) const { return new SvxBoxInfoItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxBoxInfoItem::GetPresentation ( @@ -2621,7 +2621,7 @@ SfxItemPresentation SvxBoxInfoItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -2655,7 +2655,7 @@ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) return rStrm; } -// ----------------------------------------------------------------------- + bool SvxBoxInfoItem::ScaleMetrics( long nMult, long nDiv ) { @@ -2665,14 +2665,14 @@ bool SvxBoxInfoItem::ScaleMetrics( long nMult, long nDiv ) return true; } -// ----------------------------------------------------------------------- + bool SvxBoxInfoItem::HasMetrics() const { return true; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const { @@ -2709,7 +2709,7 @@ SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const return pAttr; } -// ----------------------------------------------------------------------- + void SvxBoxInfoItem::ResetFlags() { @@ -2779,7 +2779,7 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return true; } -// ----------------------------------------------------------------------- + bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { @@ -2953,7 +2953,7 @@ bool SvxFmtBreakItem::operator==( const SfxPoolItem& rAttr ) const return GetValue() == ( (SvxFmtBreakItem&)rAttr ).GetValue(); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxFmtBreakItem::GetPresentation ( @@ -2978,7 +2978,7 @@ SfxItemPresentation SvxFmtBreakItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const { @@ -2986,7 +2986,7 @@ OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const return EE_RESSTR(RID_SVXITEMS_BREAK_BEGIN + nPos); } -// ----------------------------------------------------------------------- + bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { style::BreakType eBreak = style::BreakType_NONE; @@ -3003,7 +3003,7 @@ bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) cons rVal <<= eBreak; return true; } -// ----------------------------------------------------------------------- + bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { style::BreakType nBreak; @@ -3033,14 +3033,14 @@ bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) return true; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxFmtBreakItem::Clone( SfxItemPool* ) const { return new SvxFmtBreakItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const { @@ -3050,7 +3050,7 @@ SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) co return rStrm; } -// ----------------------------------------------------------------------- + sal_uInt16 SvxFmtBreakItem::GetVersion( sal_uInt16 nFFVer ) const { @@ -3062,7 +3062,7 @@ sal_uInt16 SvxFmtBreakItem::GetVersion( sal_uInt16 nFFVer ) const SOFFICE_FILEFORMAT_40==nFFVer ? 0 : FMTBREAK_NOAUTO; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxFmtBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const { @@ -3073,7 +3073,7 @@ SfxPoolItem* SvxFmtBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) con return new SvxFmtBreakItem( (const SvxBreak)eBreak, Which() ); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxFmtBreakItem::GetValueCount() const { @@ -3087,7 +3087,7 @@ SfxPoolItem* SvxFmtKeepItem::Clone( SfxItemPool* ) const return new SvxFmtKeepItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -3095,7 +3095,7 @@ SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxFmtKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const { @@ -3104,7 +3104,7 @@ SfxPoolItem* SvxFmtKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const return new SvxFmtKeepItem( sal_Bool( bIsKeep != 0 ), Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxFmtKeepItem::GetPresentation ( @@ -3145,7 +3145,7 @@ SvxLineItem::SvxLineItem( const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + SvxLineItem::SvxLineItem( const SvxLineItem& rCpy ) : @@ -3154,14 +3154,14 @@ SvxLineItem::SvxLineItem( const SvxLineItem& rCpy ) : pLine = rCpy.GetLine() ? new SvxBorderLine( *rCpy.GetLine() ) : 0; } -// ----------------------------------------------------------------------- + SvxLineItem::~SvxLineItem() { delete pLine; } -// ----------------------------------------------------------------------- + SvxLineItem& SvxLineItem::operator=( const SvxLineItem& rLine ) { @@ -3170,7 +3170,7 @@ SvxLineItem& SvxLineItem::operator=( const SvxLineItem& rLine ) return *this; } -// ----------------------------------------------------------------------- + bool SvxLineItem::operator==( const SfxPoolItem& rAttr ) const { @@ -3179,7 +3179,7 @@ bool SvxLineItem::operator==( const SfxPoolItem& rAttr ) const return CmpBrdLn( pLine, ((SvxLineItem&)rAttr).GetLine() ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxLineItem::Clone( SfxItemPool* ) const { @@ -3212,7 +3212,7 @@ bool SvxLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemId ) const return true; } -// ----------------------------------------------------------------------- + bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId ) { @@ -3254,7 +3254,7 @@ bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId ) return false; } -//------------------------------------------------------------------------ + SfxItemPresentation SvxLineItem::GetPresentation ( @@ -3283,7 +3283,7 @@ SfxItemPresentation SvxLineItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + SvStream& SvxLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -3302,7 +3302,7 @@ SvStream& SvxLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co return rStrm; } -// ----------------------------------------------------------------------- + bool SvxLineItem::ScaleMetrics( long nMult, long nDiv ) { @@ -3310,14 +3310,14 @@ bool SvxLineItem::ScaleMetrics( long nMult, long nDiv ) return true; } -// ----------------------------------------------------------------------- + bool SvxLineItem::HasMetrics() const { return true; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxLineItem::Create( SvStream& rStrm, sal_uInt16 ) const { @@ -3335,7 +3335,7 @@ SfxPoolItem* SvxLineItem::Create( SvStream& rStrm, sal_uInt16 ) const return _pLine; } -// ----------------------------------------------------------------------- + void SvxLineItem::SetLine( const SvxBorderLine* pNew ) { @@ -3363,14 +3363,14 @@ public: SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0), pStream(0) {} }; -// ----------------------------------------------------------------------- + void SvxBrushItem::SetDoneLink( const Link& rLink ) { pImpl->aDoneLink = rLink; } -// ----------------------------------------------------------------------- + SvxBrushItem::SvxBrushItem( sal_uInt16 _nWhich ) : @@ -3387,7 +3387,7 @@ SvxBrushItem::SvxBrushItem( sal_uInt16 _nWhich ) : { } -// ----------------------------------------------------------------------- + SvxBrushItem::SvxBrushItem( const Color& rColor, sal_uInt16 _nWhich) : @@ -3404,7 +3404,7 @@ SvxBrushItem::SvxBrushItem( const Color& rColor, sal_uInt16 _nWhich) : { } -// ----------------------------------------------------------------------- + SvxBrushItem::SvxBrushItem( const Graphic& rGraphic, SvxGraphicPosition ePos, sal_uInt16 _nWhich ) : @@ -3423,7 +3423,7 @@ SvxBrushItem::SvxBrushItem( const Graphic& rGraphic, SvxGraphicPosition ePos, DBG_ASSERT( GPOS_NONE != ePos, "SvxBrushItem-Ctor with GPOS_NONE == ePos" ); } -// ----------------------------------------------------------------------- + SvxBrushItem::SvxBrushItem( const GraphicObject& rGraphicObj, SvxGraphicPosition ePos, sal_uInt16 _nWhich ) : @@ -3442,7 +3442,7 @@ SvxBrushItem::SvxBrushItem( const GraphicObject& rGraphicObj, DBG_ASSERT( GPOS_NONE != ePos, "SvxBrushItem-Ctor with GPOS_NONE == ePos" ); } -// ----------------------------------------------------------------------- + SvxBrushItem::SvxBrushItem( const OUString& rLink, const OUString& rFilter, @@ -3462,7 +3462,7 @@ SvxBrushItem::SvxBrushItem( DBG_ASSERT( GPOS_NONE != ePos, "SvxBrushItem-Ctor with GPOS_NONE == ePos" ); } -// ----------------------------------------------------------------------- + SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, sal_uInt16 _nWhich ) @@ -3577,7 +3577,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, } } -// ----------------------------------------------------------------------- + SvxBrushItem::SvxBrushItem( const SvxBrushItem& rItem ) : @@ -3593,7 +3593,7 @@ SvxBrushItem::SvxBrushItem( const SvxBrushItem& rItem ) : *this = rItem; } -// ----------------------------------------------------------------------- + SvxBrushItem::~SvxBrushItem() { @@ -3601,14 +3601,14 @@ SvxBrushItem::~SvxBrushItem() delete pImpl; } -// ----------------------------------------------------------------------- + sal_uInt16 SvxBrushItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const { return BRUSH_GRAPHIC_VERSION; } -// ----------------------------------------------------------------------- + static inline sal_Int8 lcl_PercentToTransparency(long nPercent) { //0xff must not be returned! @@ -3683,7 +3683,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return true; } -// ----------------------------------------------------------------------- + bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { @@ -3804,7 +3804,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -// ----------------------------------------------------------------------- + SfxItemPresentation SvxBrushItem::GetPresentation ( @@ -3845,7 +3845,7 @@ SfxItemPresentation SvxBrushItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + SvxBrushItem& SvxBrushItem::operator=( const SvxBrushItem& rItem ) { @@ -3872,7 +3872,7 @@ SvxBrushItem& SvxBrushItem::operator=( const SvxBrushItem& rItem ) return *this; } -// ----------------------------------------------------------------------- + bool SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const { @@ -3912,21 +3912,21 @@ bool SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const return bEqual; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxBrushItem::Clone( SfxItemPool* ) const { return new SvxBrushItem( *this ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxBrushItem::Create( SvStream& rStream, sal_uInt16 nVersion ) const { return new SvxBrushItem( rStream, nVersion, Which() ); } -// ----------------------------------------------------------------------- + SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) const { @@ -3964,14 +3964,14 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) return rStream; } -// ----------------------------------------------------------------------- + void SvxBrushItem::PurgeMedium() const { DELETEZ( pImpl->pStream ); } -// ----------------------------------------------------------------------- + const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) const { if ( bLoadAgain && !maStrLink.isEmpty() && !pImpl->pGraphicObject ) @@ -4010,7 +4010,7 @@ const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) co return pImpl->pGraphicObject; } -// ----------------------------------------------------------------------- + const Graphic* SvxBrushItem::GetGraphic(OUString const & referer) const { @@ -4018,7 +4018,7 @@ const Graphic* SvxBrushItem::GetGraphic(OUString const & referer) const return( pGrafObj ? &( pGrafObj->GetGraphic() ) : NULL ); } -// ----------------------------------------------------------------------- + void SvxBrushItem::SetGraphicPos( SvxGraphicPosition eNew ) { @@ -4039,7 +4039,7 @@ void SvxBrushItem::SetGraphicPos( SvxGraphicPosition eNew ) } } -// ----------------------------------------------------------------------- + void SvxBrushItem::SetGraphic( const Graphic& rNew ) { @@ -4061,7 +4061,7 @@ void SvxBrushItem::SetGraphic( const Graphic& rNew ) } } -// ----------------------------------------------------------------------- + void SvxBrushItem::SetGraphicObject( const GraphicObject& rNewObj ) { @@ -4083,7 +4083,7 @@ void SvxBrushItem::SetGraphicObject( const GraphicObject& rNewObj ) } } -// ----------------------------------------------------------------------- + void SvxBrushItem::SetGraphicLink( const OUString& rNew ) { @@ -4096,7 +4096,7 @@ void SvxBrushItem::SetGraphicLink( const OUString& rNew ) } } -// ----------------------------------------------------------------------- + void SvxBrushItem::SetGraphicFilter( const OUString& rNew ) { diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx index ec28bbbd9c7a..8b32cb02ae45 100644 --- a/editeng/source/items/itemtype.cxx +++ b/editeng/source/items/itemtype.cxx @@ -25,7 +25,7 @@ #include <editeng/eerdll.hxx> #include <rtl/ustrbuf.hxx> -// ----------------------------------------------------------------------- + OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper* pIntl ) { @@ -128,14 +128,14 @@ OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, co return sRet.makeStringAndClear(); } -// ----------------------------------------------------------------------- + OUString GetSvxString( sal_uInt16 nId ) { return EE_RESSTR( nId ); } -// ----------------------------------------------------------------------- + OUString GetColorString( const Color& rCol ) { @@ -170,7 +170,7 @@ OUString GetColorString( const Color& rCol ) return sStr; } -// ----------------------------------------------------------------------- + sal_uInt16 GetMetricId( SfxMapUnit eUnit ) { diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index 0fcb3d31b32a..dfe61a8582f8 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -47,7 +47,7 @@ SfxSpellCheckItem::SfxSpellCheckItem xSpellCheck = xChecker; } -// ----------------------------------------------------------------------- + SfxSpellCheckItem::SfxSpellCheckItem( const SfxSpellCheckItem& rItem ) : @@ -56,7 +56,7 @@ SfxSpellCheckItem::SfxSpellCheckItem( const SfxSpellCheckItem& rItem ) : { } -//------------------------------------------------------------------------ + SfxItemPresentation SfxSpellCheckItem::GetPresentation ( @@ -83,14 +83,14 @@ SfxItemPresentation SfxSpellCheckItem::GetPresentation } } -// ----------------------------------------------------------------------- + SfxPoolItem* SfxSpellCheckItem::Clone( SfxItemPool* ) const { return new SfxSpellCheckItem( *this ); } -// ----------------------------------------------------------------------- + bool SfxSpellCheckItem::operator==( const SfxPoolItem& rItem ) const { @@ -107,7 +107,7 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const sal_uInt16 nId ) : nMinLead = nMinTrail = 0; } -// ----------------------------------------------------------------------- + SfxHyphenRegionItem::SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ) : @@ -118,7 +118,7 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ) : { } -// ----------------------------------------------------------------------- + bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const { @@ -128,14 +128,14 @@ bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const ( ( (SfxHyphenRegionItem&)rAttr ).nMinTrail == nMinTrail ) ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SfxHyphenRegionItem::Clone( SfxItemPool* ) const { return new SfxHyphenRegionItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation SfxHyphenRegionItem::GetPresentation ( @@ -166,7 +166,7 @@ SfxItemPresentation SfxHyphenRegionItem::GetPresentation } } -// ----------------------------------------------------------------------- + SfxPoolItem* SfxHyphenRegionItem::Create(SvStream& rStrm, sal_uInt16 ) const { @@ -178,7 +178,7 @@ SfxPoolItem* SfxHyphenRegionItem::Create(SvStream& rStrm, sal_uInt16 ) const return pAttr; } -// ----------------------------------------------------------------------- + SvStream& SfxHyphenRegionItem::Store( SvStream& rStrm, sal_uInt16 ) const { diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx index 76b29bf559e5..ebce024c6bc0 100644 --- a/editeng/source/items/paperinf.cxx +++ b/editeng/source/items/paperinf.cxx @@ -33,7 +33,7 @@ inline sal_Bool IsValidPrinter( const Printer* pPtr ) return pPtr->GetName().isEmpty() ? sal_False : sal_True; } -//------------------------------------------------------------------------ + Size SvxPaperInfo::GetPaperSize( Paper ePaper, MapUnit eUnit ) { @@ -84,7 +84,7 @@ Size SvxPaperInfo::GetPaperSize( const Printer* pPrinter ) return aSize; } -// ----------------------------------------------------------------------- + Paper SvxPaperInfo::GetSvxPaper( const Size &rSize, MapUnit eUnit, bool bSloppy ) { @@ -95,7 +95,7 @@ Paper SvxPaperInfo::GetSvxPaper( const Size &rSize, MapUnit eUnit, bool bSloppy return aInfo.getPaper(); } -// ----------------------------------------------------------------------- + long SvxPaperInfo::GetSloppyPaperDimension( long nSize, MapUnit eUnit ) { @@ -104,7 +104,7 @@ long SvxPaperInfo::GetSloppyPaperDimension( long nSize, MapUnit eUnit ) return eUnit == MAP_100TH_MM ? nSize : OutputDevice::LogicToLogic(nSize, MAP_100TH_MM, eUnit); } -// ----------------------------------------------------------------------- + Size SvxPaperInfo::GetDefaultPaperSize( MapUnit eUnit ) { diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 64b75294193b..9c0748d0d880 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star; // STATIC DATA ----------------------------------------------------------- -// ----------------------------------------------------------------------- + TYPEINIT1_FACTORY(SvxLineSpacingItem, SfxPoolItem , new SvxLineSpacingItem(LINE_SPACE_DEFAULT_HEIGHT, 0)); @@ -80,7 +80,7 @@ TYPEINIT1_FACTORY(SvxForbiddenRuleItem, SfxBoolItem, new SvxForbiddenRuleItem(sa TYPEINIT1_FACTORY(SvxParaVertAlignItem, SfxUInt16Item, new SvxParaVertAlignItem(0, 0)); TYPEINIT1_FACTORY(SvxParaGridItem, SfxBoolItem, new SvxParaGridItem(sal_True, 0)); -// ----------------------------------------------------------------------- + SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId ) : SfxEnumItemInterface( nId ) @@ -92,7 +92,7 @@ SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId eInterLineSpace = SVX_INTER_LINE_SPACE_OFF; } -// ----------------------------------------------------------------------- + bool SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const { @@ -226,14 +226,14 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxLineSpacingItem::Clone( SfxItemPool * ) const { return new SvxLineSpacingItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxLineSpacingItem::GetPresentation ( @@ -251,7 +251,7 @@ SfxItemPresentation SvxLineSpacingItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -274,7 +274,7 @@ SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const return pAttr; } -// ----------------------------------------------------------------------- + SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { @@ -286,14 +286,14 @@ SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion* return rStrm; } -// ----------------------------------------------------------------------- + sal_uInt16 SvxLineSpacingItem::GetValueCount() const { return SVX_LINESPACE_END; // SVX_LINESPACE_TWO_LINES + 1 } -// ----------------------------------------------------------------------- + OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const { @@ -317,7 +317,7 @@ OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const return aText; } -// ----------------------------------------------------------------------- + sal_uInt16 SvxLineSpacingItem::GetEnumValue() const { @@ -332,7 +332,7 @@ sal_uInt16 SvxLineSpacingItem::GetEnumValue() const return nVal; } -// ----------------------------------------------------------------------- + void SvxLineSpacingItem::SetEnumValue( sal_uInt16 nVal ) { @@ -353,7 +353,7 @@ SvxAdjustItem::SvxAdjustItem(const SvxAdjust eAdjst, const sal_uInt16 nId ) SetAdjust( eAdjst ); } -// ----------------------------------------------------------------------- + bool SvxAdjustItem::operator==( const SfxPoolItem& rAttr ) const { @@ -419,14 +419,14 @@ bool SvxAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxAdjustItem::Clone( SfxItemPool * ) const { return new SvxAdjustItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxAdjustItem::GetPresentation ( @@ -450,14 +450,14 @@ SfxItemPresentation SvxAdjustItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + sal_uInt16 SvxAdjustItem::GetValueCount() const { return SVX_ADJUST_END; // SVX_ADJUST_BLOCKLINE + 1 } -// ----------------------------------------------------------------------- + OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const { @@ -465,21 +465,21 @@ OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const return EE_RESSTR(RID_SVXITEMS_ADJUST_BEGIN + nPos); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxAdjustItem::GetEnumValue() const { return (sal_uInt16)GetAdjust(); } -// ----------------------------------------------------------------------- + void SvxAdjustItem::SetEnumValue( sal_uInt16 nVal ) { SetAdjust( (const SvxAdjust)nVal ); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxAdjustItem::GetVersion( sal_uInt16 nFileVersion ) const { @@ -487,7 +487,7 @@ sal_uInt16 SvxAdjustItem::GetVersion( sal_uInt16 nFileVersion ) const ? 0 : ADJUST_LASTBLOCK_VERSION; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxAdjustItem::Create(SvStream& rStrm, sal_uInt16 nVersion) const { @@ -505,7 +505,7 @@ SfxPoolItem* SvxAdjustItem::Create(SvStream& rStrm, sal_uInt16 nVersion) const return pRet; } -// ----------------------------------------------------------------------- + SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const { @@ -531,14 +531,14 @@ SvxWidowsItem::SvxWidowsItem(const sal_uInt8 nL, const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxWidowsItem::Clone( SfxItemPool * ) const { return new SvxWidowsItem( *this ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxWidowsItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -547,7 +547,7 @@ SfxPoolItem* SvxWidowsItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxWidowsItem( nLines, Which() ); } -// ----------------------------------------------------------------------- + SvStream& SvxWidowsItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { @@ -555,7 +555,7 @@ SvStream& SvxWidowsItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c return rStrm; } -//------------------------------------------------------------------------ + SfxItemPresentation SvxWidowsItem::GetPresentation ( @@ -602,14 +602,14 @@ SvxOrphansItem::SvxOrphansItem(const sal_uInt8 nL, const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxOrphansItem::Clone( SfxItemPool * ) const { return new SvxOrphansItem( *this ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxOrphansItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -618,7 +618,7 @@ SfxPoolItem* SvxOrphansItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxOrphansItem( nLines, Which() ); } -// ----------------------------------------------------------------------- + SvStream& SvxOrphansItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { @@ -626,7 +626,7 @@ SvStream& SvxOrphansItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) return rStrm; } -//------------------------------------------------------------------------ + SfxItemPresentation SvxOrphansItem::GetPresentation ( @@ -677,7 +677,7 @@ SvxHyphenZoneItem::SvxHyphenZoneItem( const bool bHyph, const sal_uInt16 nId ) : nMaxHyphens = 255; } -// ----------------------------------------------------------------------- + bool SvxHyphenZoneItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -698,7 +698,7 @@ bool SvxHyphenZoneItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) con } return true; } -// ----------------------------------------------------------------------- + bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; @@ -726,7 +726,7 @@ bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -// ----------------------------------------------------------------------- + bool SvxHyphenZoneItem::operator==( const SfxPoolItem& rAttr ) const { @@ -739,14 +739,14 @@ bool SvxHyphenZoneItem::operator==( const SfxPoolItem& rAttr ) const && (((SvxHyphenZoneItem&)rAttr).nMaxHyphens == nMaxHyphens) ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxHyphenZoneItem::Clone( SfxItemPool * ) const { return new SvxHyphenZoneItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxHyphenZoneItem::GetPresentation ( @@ -805,7 +805,7 @@ SfxItemPresentation SvxHyphenZoneItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -821,7 +821,7 @@ SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const return pAttr; } -// ----------------------------------------------------------------------- + SvStream& SvxHyphenZoneItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { @@ -843,7 +843,7 @@ SvxTabStop::SvxTabStop() cFill = cDfltFillChar; } -// ----------------------------------------------------------------------- + SvxTabStop::SvxTabStop( const sal_Int32 nPos, const SvxTabAdjust eAdjst, const sal_Unicode cDec, const sal_Unicode cFil ) @@ -853,13 +853,13 @@ SvxTabStop::SvxTabStop( const sal_Int32 nPos, const SvxTabAdjust eAdjst, m_cDecimal = cDec; cFill = cFil; } -// ----------------------------------------------------------------------------- + void SvxTabStop::fillDecimal() const { if ( cDfltDecimalChar == m_cDecimal ) m_cDecimal = SvtSysLocale().GetLocaleData().getNumDecimalSep()[0]; } -// ----------------------------------------------------------------------- + OUString SvxTabStop::GetValueString() const { @@ -894,7 +894,7 @@ SvxTabStopItem::SvxTabStopItem( sal_uInt16 _nWhich ) : } } -// ----------------------------------------------------------------------- + SvxTabStopItem::SvxTabStopItem( const sal_uInt16 nTabs, const sal_uInt16 nDist, @@ -910,7 +910,7 @@ SvxTabStopItem::SvxTabStopItem( const sal_uInt16 nTabs, } } -// ----------------------------------------------------------------------- + SvxTabStopItem::SvxTabStopItem( const SvxTabStopItem& rTSI ) : SfxPoolItem( rTSI.Which() ), @@ -918,7 +918,7 @@ SvxTabStopItem::SvxTabStopItem( const SvxTabStopItem& rTSI ) : { } -// ----------------------------------------------------------------------- + sal_uInt16 SvxTabStopItem::GetPos( const SvxTabStop& rTab ) const { @@ -926,7 +926,7 @@ sal_uInt16 SvxTabStopItem::GetPos( const SvxTabStop& rTab ) const return it != maTabStops.end() ? it - maTabStops.begin() : SVX_TAB_NOTFOUND; } -// ----------------------------------------------------------------------- + sal_uInt16 SvxTabStopItem::GetPos( const sal_Int32 nPos ) const { @@ -934,7 +934,7 @@ sal_uInt16 SvxTabStopItem::GetPos( const sal_Int32 nPos ) const return it != maTabStops.end() ? it - maTabStops.begin() : SVX_TAB_NOTFOUND; } -// ----------------------------------------------------------------------- + SvxTabStopItem& SvxTabStopItem::operator=( const SvxTabStopItem& rTSI ) { @@ -1077,7 +1077,7 @@ bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } return true; } -// ----------------------------------------------------------------------- + bool SvxTabStopItem::operator==( const SfxPoolItem& rAttr ) const { @@ -1094,14 +1094,14 @@ bool SvxTabStopItem::operator==( const SfxPoolItem& rAttr ) const return true; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxTabStopItem::Clone( SfxItemPool * ) const { return new SvxTabStopItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxTabStopItem::GetPresentation ( @@ -1136,7 +1136,7 @@ SfxItemPresentation SvxTabStopItem::GetPresentation return ePres; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxTabStopItem::Create( SvStream& rStrm, sal_uInt16 ) const { @@ -1158,7 +1158,7 @@ SfxPoolItem* SvxTabStopItem::Create( SvStream& rStrm, sal_uInt16 ) const return pAttr; } -// ----------------------------------------------------------------------- + SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { @@ -1215,7 +1215,7 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) return rStrm; } -// ----------------------------------------------------------------------- + bool SvxTabStopItem::Insert( const SvxTabStop& rTab ) { sal_uInt16 nTabPos = GetPos(rTab); @@ -1223,7 +1223,7 @@ bool SvxTabStopItem::Insert( const SvxTabStop& rTab ) Remove(nTabPos); return maTabStops.insert( rTab ).second; } -// ----------------------------------------------------------------------- + void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart, sal_uInt16 nEnd ) { @@ -1246,13 +1246,13 @@ void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart, SvxFmtSplitItem::~SvxFmtSplitItem() { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxFmtSplitItem::Clone( SfxItemPool * ) const { return new SvxFmtSplitItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { @@ -1260,7 +1260,7 @@ SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxFmtSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const { @@ -1269,7 +1269,7 @@ SfxPoolItem* SvxFmtSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const return new SvxFmtSplitItem( sal_Bool( bIsSplit != 0 ), Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxFmtSplitItem::GetPresentation ( @@ -1299,14 +1299,14 @@ SfxItemPresentation SvxFmtSplitItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// -------------------------------------------------------------------- + SfxPoolItem* SvxPageModelItem::Clone( SfxItemPool* ) const { return new SvxPageModelItem( *this ); } -//------------------------------------------------------------------------ + bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { @@ -1369,7 +1369,7 @@ SfxItemPresentation SvxPageModelItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -//------------------------------------------------------------------------ + SvxScriptSpaceItem::SvxScriptSpaceItem( sal_Bool bOn, const sal_uInt16 nId ) : SfxBoolItem( nId, bOn ) @@ -1421,7 +1421,7 @@ SfxItemPresentation SvxScriptSpaceItem::GetPresentation( return SFX_ITEM_PRESENTATION_NONE; } -//------------------------------------------------------------------------ + SvxHangingPunctuationItem::SvxHangingPunctuationItem( bool bOn, const sal_uInt16 nId ) @@ -1474,7 +1474,7 @@ SfxItemPresentation SvxHangingPunctuationItem::GetPresentation( } return SFX_ITEM_PRESENTATION_NONE; } -//------------------------------------------------------------------------ + SvxForbiddenRuleItem::SvxForbiddenRuleItem( sal_Bool bOn, const sal_uInt16 nId ) diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 157ac624ed99..6d9b8288f519 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -109,7 +109,7 @@ sal_Bool SvxFontItem::bEnableStoreUnicodeNames = sal_False; // STATIC DATA ----------------------------------------------------------- -// ----------------------------------------------------------------------- + TYPEINIT1(SvxFontListItem, SfxPoolItem); TYPEINIT1_FACTORY(SvxFontItem, SfxPoolItem, new SvxFontItem(0)); @@ -164,7 +164,7 @@ SvxFontListItem::SvxFontListItem( const FontList* pFontLst, } } -// ----------------------------------------------------------------------- + SvxFontListItem::SvxFontListItem( const SvxFontListItem& rItem ) : @@ -174,14 +174,14 @@ SvxFontListItem::SvxFontListItem( const SvxFontListItem& rItem ) : { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxFontListItem::Clone( SfxItemPool* ) const { return new SvxFontListItem( *this ); } -// ----------------------------------------------------------------------- + bool SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const { @@ -196,7 +196,7 @@ bool SvxFontListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nM return true; } -//------------------------------------------------------------------------ + SfxItemPresentation SvxFontListItem::GetPresentation ( @@ -220,7 +220,7 @@ SvxFontItem::SvxFontItem( const sal_uInt16 nId ) : eTextEncoding = RTL_TEXTENCODING_DONTKNOW; } -// ----------------------------------------------------------------------- + SvxFontItem::SvxFontItem( const FontFamily eFam, const OUString& aName, const OUString& aStName, const FontPitch eFontPitch, @@ -236,7 +236,7 @@ SvxFontItem::SvxFontItem( const FontFamily eFam, const OUString& aName, eTextEncoding = eFontTextEncoding; } -// ----------------------------------------------------------------------- + SvxFontItem& SvxFontItem::operator=(const SvxFontItem& rFont) { aFamilyName = rFont.GetFamilyName(); @@ -246,7 +246,7 @@ SvxFontItem& SvxFontItem::operator=(const SvxFontItem& rFont) eTextEncoding = rFont.GetCharSet(); return *this; } -// ----------------------------------------------------------------------- + bool SvxFontItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { @@ -276,7 +276,7 @@ bool SvxFontItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } return true; } -// ----------------------------------------------------------------------- + bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId) { nMemberId &= ~CONVERT_TWIPS; @@ -339,7 +339,7 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId) return true; } -// ----------------------------------------------------------------------- + bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const { @@ -362,14 +362,14 @@ bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const return bRet; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxFontItem::Clone( SfxItemPool * ) const { return new SvxFontItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -396,7 +396,7 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -439,7 +439,7 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const (FontPitch)eFontPitch, (rtl_TextEncoding)eFontTextEncoding, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxFontItem::GetPresentation ( @@ -463,7 +463,7 @@ SfxItemPresentation SvxFontItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -//------------------------------------------------------------------------ + void SvxFontItem::EnableStoreUnicodeNames( sal_Bool bEnable ) { @@ -477,21 +477,21 @@ SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const sal_uInt16 nId { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxPostureItem::Clone( SfxItemPool * ) const { return new SvxPostureItem( *this ); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxPostureItem::GetValueCount() const { return ITALIC_NORMAL + 1; // ITALIC_NONE also belongs here } -// ----------------------------------------------------------------------- + SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -499,7 +499,7 @@ SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -508,7 +508,7 @@ SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxPostureItem( (const FontItalic)nPosture, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxPostureItem::GetPresentation ( @@ -532,7 +532,7 @@ SfxItemPresentation SvxPostureItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const { @@ -591,21 +591,21 @@ bool SvxPostureItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } return true; } -// ----------------------------------------------------------------------- + bool SvxPostureItem::HasBoolValue() const { return true; } -// ----------------------------------------------------------------------- + bool SvxPostureItem::GetBoolValue() const { return ( (FontItalic)GetValue() >= ITALIC_OBLIQUE ); } -// ----------------------------------------------------------------------- + void SvxPostureItem::SetBoolValue( sal_Bool bVal ) { @@ -621,42 +621,42 @@ SvxWeightItem::SvxWeightItem( const FontWeight eWght, const sal_uInt16 nId ) : -// ----------------------------------------------------------------------- + bool SvxWeightItem::HasBoolValue() const { return true; } -// ----------------------------------------------------------------------- + bool SvxWeightItem::GetBoolValue() const { return (FontWeight)GetValue() >= WEIGHT_BOLD; } -// ----------------------------------------------------------------------- + void SvxWeightItem::SetBoolValue( sal_Bool bVal ) { SetValue( (sal_uInt16)(bVal ? WEIGHT_BOLD : WEIGHT_NORMAL) ); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxWeightItem::GetValueCount() const { return WEIGHT_BLACK; // WEIGHT_DONTKNOW does not belong } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxWeightItem::Clone( SfxItemPool * ) const { return new SvxWeightItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -664,7 +664,7 @@ SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -673,7 +673,7 @@ SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxWeightItem( (FontWeight)nWeight, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxWeightItem::GetPresentation ( @@ -697,7 +697,7 @@ SfxItemPresentation SvxWeightItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const { @@ -757,14 +757,14 @@ SvxFontHeightItem::SvxFontHeightItem( const sal_uLong nSz, SetHeight( nSz,nPrp ); // calculate in percentage } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxFontHeightItem::Clone( SfxItemPool * ) const { return new SvxFontHeightItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const { @@ -784,7 +784,7 @@ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const @@ -810,7 +810,7 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm, return pItem; } -// ----------------------------------------------------------------------- + bool SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const { @@ -1037,7 +1037,7 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -//------------------------------------------------------------------------ + SfxItemPresentation SvxFontHeightItem::GetPresentation ( @@ -1077,7 +1077,7 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + sal_uInt16 SvxFontHeightItem::GetVersion(sal_uInt16 nFileVersion) const { @@ -1086,7 +1086,7 @@ sal_uInt16 SvxFontHeightItem::GetVersion(sal_uInt16 nFileVersion) const : FONTHEIGHT_UNIT_VERSION; } -// ----------------------------------------------------------------------- + bool SvxFontHeightItem::ScaleMetrics( long nMult, long nDiv ) { @@ -1094,7 +1094,7 @@ bool SvxFontHeightItem::ScaleMetrics( long nMult, long nDiv ) return true; } -// ----------------------------------------------------------------------- + bool SvxFontHeightItem::HasMetrics() const { @@ -1146,14 +1146,14 @@ SvxFontWidthItem::SvxFontWidthItem( const sal_uInt16 nSz, const sal_uInt16 nPrp, nProp = nPrp; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxFontWidthItem::Clone( SfxItemPool * ) const { return new SvxFontWidthItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxFontWidthItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -1161,7 +1161,7 @@ SvStream& SvxFontWidthItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ return rStrm; } -// ----------------------------------------------------------------------- + bool SvxFontWidthItem::ScaleMetrics( long nMult, long nDiv ) { @@ -1169,14 +1169,14 @@ bool SvxFontWidthItem::ScaleMetrics( long nMult, long nDiv ) return true; } -// ----------------------------------------------------------------------- + bool SvxFontWidthItem::HasMetrics() const { return true; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxFontWidthItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) const @@ -1191,7 +1191,7 @@ SfxPoolItem* SvxFontWidthItem::Create( SvStream& rStrm, return pItem; } -// ----------------------------------------------------------------------- + bool SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const { @@ -1236,7 +1236,7 @@ bool SvxFontWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -//------------------------------------------------------------------------ + SfxItemPresentation SvxFontWidthItem::GetPresentation ( @@ -1276,28 +1276,28 @@ SvxTextLineItem::SvxTextLineItem( const FontUnderline eSt, const sal_uInt16 nId { } -// ----------------------------------------------------------------------- + bool SvxTextLineItem::HasBoolValue() const { return true; } -// ----------------------------------------------------------------------- + bool SvxTextLineItem::GetBoolValue() const { return (FontUnderline)GetValue() != UNDERLINE_NONE; } -// ----------------------------------------------------------------------- + void SvxTextLineItem::SetBoolValue( sal_Bool bVal ) { SetValue( (sal_uInt16)(bVal ? UNDERLINE_SINGLE : UNDERLINE_NONE) ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const { @@ -1306,14 +1306,14 @@ SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const return pNew; } -// ----------------------------------------------------------------------- + sal_uInt16 SvxTextLineItem::GetValueCount() const { return UNDERLINE_DOTTED + 1; // UNDERLINE_NONE also belongs here } -// ----------------------------------------------------------------------- + SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -1321,7 +1321,7 @@ SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -1330,7 +1330,7 @@ SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxTextLineItem( (FontUnderline)nState, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxTextLineItem::GetPresentation ( @@ -1356,7 +1356,7 @@ SfxItemPresentation SvxTextLineItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + OUString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const { @@ -1440,7 +1440,7 @@ SvxUnderlineItem::SvxUnderlineItem( const FontUnderline eSt, const sal_uInt16 nI { } -//------------------------------------------------------------------------ + SfxPoolItem* SvxUnderlineItem::Clone( SfxItemPool * ) const { @@ -1449,7 +1449,7 @@ SfxPoolItem* SvxUnderlineItem::Clone( SfxItemPool * ) const return pNew; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -1458,7 +1458,7 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxUnderlineItem( (FontUnderline)nState, Which() ); } -// ----------------------------------------------------------------------- + OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { @@ -1473,7 +1473,7 @@ SvxOverlineItem::SvxOverlineItem( const FontUnderline eSt, const sal_uInt16 nId { } -//------------------------------------------------------------------------ + SfxPoolItem* SvxOverlineItem::Clone( SfxItemPool * ) const { @@ -1482,7 +1482,7 @@ SfxPoolItem* SvxOverlineItem::Clone( SfxItemPool * ) const return pNew; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -1491,7 +1491,7 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxOverlineItem( (FontUnderline)nState, Which() ); } -// ----------------------------------------------------------------------- + OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { @@ -1506,42 +1506,42 @@ SvxCrossedOutItem::SvxCrossedOutItem( const FontStrikeout eSt, const sal_uInt16 { } -// ----------------------------------------------------------------------- + bool SvxCrossedOutItem::HasBoolValue() const { return true; } -// ----------------------------------------------------------------------- + bool SvxCrossedOutItem::GetBoolValue() const { return (FontStrikeout)GetValue() != STRIKEOUT_NONE; } -// ----------------------------------------------------------------------- + void SvxCrossedOutItem::SetBoolValue( sal_Bool bVal ) { SetValue( (sal_uInt16)(bVal ? STRIKEOUT_SINGLE : STRIKEOUT_NONE) ); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxCrossedOutItem::GetValueCount() const { return STRIKEOUT_DOUBLE + 1; // STRIKEOUT_NONE belongs also here } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const { return new SvxCrossedOutItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -1549,7 +1549,7 @@ SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion* return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -1558,7 +1558,7 @@ SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxCrossedOutItem( (FontStrikeout)eCross, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxCrossedOutItem::GetPresentation ( @@ -1582,7 +1582,7 @@ SfxItemPresentation SvxCrossedOutItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const { @@ -1631,14 +1631,14 @@ SvxShadowedItem::SvxShadowedItem( const sal_Bool bShadowed, const sal_uInt16 nId { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxShadowedItem::Clone( SfxItemPool * ) const { return new SvxShadowedItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -1646,7 +1646,7 @@ SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -1655,7 +1655,7 @@ SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxShadowedItem( nState, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxShadowedItem::GetPresentation ( @@ -1692,14 +1692,14 @@ SvxAutoKernItem::SvxAutoKernItem( const bool bAutoKern, const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxAutoKernItem::Clone( SfxItemPool * ) const { return new SvxAutoKernItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -1707,7 +1707,7 @@ SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -1716,7 +1716,7 @@ SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxAutoKernItem( nState, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxAutoKernItem::GetPresentation ( @@ -1754,14 +1754,14 @@ SvxWordLineModeItem::SvxWordLineModeItem( const sal_Bool bWordLineMode, { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxWordLineModeItem::Clone( SfxItemPool * ) const { return new SvxWordLineModeItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -1769,7 +1769,7 @@ SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersio return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -1778,7 +1778,7 @@ SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxWordLineModeItem( bValue, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxWordLineModeItem::GetPresentation ( @@ -1815,14 +1815,14 @@ SvxContourItem::SvxContourItem( const bool bContoured, const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxContourItem::Clone( SfxItemPool * ) const { return new SvxContourItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -1830,7 +1830,7 @@ SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -1839,7 +1839,7 @@ SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxContourItem( bValue, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxContourItem::GetPresentation ( @@ -1876,14 +1876,14 @@ SvxPropSizeItem::SvxPropSizeItem( const sal_uInt16 nPercent, const sal_uInt16 nI { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxPropSizeItem::Clone( SfxItemPool * ) const { return new SvxPropSizeItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxPropSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -1891,7 +1891,7 @@ SvStream& SvxPropSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -1900,7 +1900,7 @@ SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxPropSizeItem( nSize, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxPropSizeItem::GetPresentation ( @@ -1922,7 +1922,7 @@ SvxColorItem::SvxColorItem( const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + SvxColorItem::SvxColorItem( const Color& rCol, const sal_uInt16 nId ) : SfxPoolItem( nId ), @@ -1930,7 +1930,7 @@ SvxColorItem::SvxColorItem( const Color& rCol, const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + SvxColorItem::SvxColorItem( SvStream &rStrm, const sal_uInt16 nId ) : SfxPoolItem( nId ) @@ -1940,7 +1940,7 @@ SvxColorItem::SvxColorItem( SvStream &rStrm, const sal_uInt16 nId ) : mColor = aColor; } -// ----------------------------------------------------------------------- + SvxColorItem::SvxColorItem( const SvxColorItem &rCopy ) : SfxPoolItem( rCopy ), @@ -1948,13 +1948,13 @@ SvxColorItem::SvxColorItem( const SvxColorItem &rCopy ) : { } -// ----------------------------------------------------------------------- + SvxColorItem::~SvxColorItem() { } -// ----------------------------------------------------------------------- + sal_uInt16 SvxColorItem::GetVersion( sal_uInt16 nFFVer ) const { DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer || @@ -1964,7 +1964,7 @@ sal_uInt16 SvxColorItem::GetVersion( sal_uInt16 nFFVer ) const return SOFFICE_FILEFORMAT_50 >= nFFVer ? VERSION_USEAUTOCOLOR : 0; } -// ----------------------------------------------------------------------- + bool SvxColorItem::operator==( const SfxPoolItem& rAttr ) const { @@ -1973,7 +1973,7 @@ bool SvxColorItem::operator==( const SfxPoolItem& rAttr ) const return mColor == ( (const SvxColorItem&)rAttr ).mColor; } -// ----------------------------------------------------------------------- + bool SvxColorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { @@ -1981,7 +1981,7 @@ bool SvxColorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const return true; } -// ----------------------------------------------------------------------- + bool SvxColorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { @@ -1993,14 +1993,14 @@ bool SvxColorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) return true; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxColorItem::Clone( SfxItemPool * ) const { return new SvxColorItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxColorItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const { @@ -2012,14 +2012,14 @@ SvStream& SvxColorItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxColorItem::Create(SvStream& rStrm, sal_uInt16 /*nVer*/ ) const { return new SvxColorItem( rStrm, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxColorItem::GetPresentation ( @@ -2043,7 +2043,7 @@ SfxItemPresentation SvxColorItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + void SvxColorItem::SetValue( const Color& rNewCol ) { @@ -2059,7 +2059,7 @@ SvxCharSetColorItem::SvxCharSetColorItem( const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + SvxCharSetColorItem::SvxCharSetColorItem( const Color& rCol, const rtl_TextEncoding _eFrom, @@ -2071,14 +2071,14 @@ SvxCharSetColorItem::SvxCharSetColorItem( const Color& rCol, } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxCharSetColorItem::Clone( SfxItemPool * ) const { return new SvxCharSetColorItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -2087,7 +2087,7 @@ SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersio return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -2098,7 +2098,7 @@ SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxCharSetColorItem( aColor, (rtl_TextEncoding)cSet, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxCharSetColorItem::GetPresentation ( @@ -2119,14 +2119,14 @@ SvxKerningItem::SvxKerningItem( const short nKern, const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxKerningItem::Clone( SfxItemPool * ) const { return new SvxKerningItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxKerningItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -2134,7 +2134,7 @@ SvStream& SvxKerningItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) return rStrm; } -// ----------------------------------------------------------------------- + bool SvxKerningItem::ScaleMetrics( long nMult, long nDiv ) { @@ -2142,14 +2142,14 @@ bool SvxKerningItem::ScaleMetrics( long nMult, long nDiv ) return true; } -// ----------------------------------------------------------------------- + bool SvxKerningItem::HasMetrics() const { return true; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -2158,7 +2158,7 @@ SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxKerningItem( nValue, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxKerningItem::GetPresentation ( @@ -2207,7 +2207,7 @@ bool SvxKerningItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const rVal <<= nVal; return true; } -// ----------------------------------------------------------------------- + bool SvxKerningItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId) { sal_Int16 nVal = sal_Int16(); @@ -2226,21 +2226,21 @@ SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + sal_uInt16 SvxCaseMapItem::GetValueCount() const { return SVX_CASEMAP_END; // SVX_CASEMAP_KAPITAELCHEN + 1 } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxCaseMapItem::Clone( SfxItemPool * ) const { return new SvxCaseMapItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -2248,7 +2248,7 @@ SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -2257,7 +2257,7 @@ SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxCaseMapItem( (const SvxCaseMap)cMap, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxCaseMapItem::GetPresentation ( @@ -2281,7 +2281,7 @@ SfxItemPresentation SvxCaseMapItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const { @@ -2331,7 +2331,7 @@ SvxEscapementItem::SvxEscapementItem( const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape, const sal_uInt16 nId ) : @@ -2343,7 +2343,7 @@ SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape, nProp = 58; } -// ----------------------------------------------------------------------- + SvxEscapementItem::SvxEscapementItem( const short _nEsc, const sal_uInt8 _nProp, @@ -2354,7 +2354,7 @@ SvxEscapementItem::SvxEscapementItem( const short _nEsc, { } -// ----------------------------------------------------------------------- + bool SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const { @@ -2364,14 +2364,14 @@ bool SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const nProp == ((SvxEscapementItem&)rAttr).nProp ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxEscapementItem::Clone( SfxItemPool * ) const { return new SvxEscapementItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -2388,7 +2388,7 @@ SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion* return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -2398,14 +2398,14 @@ SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxEscapementItem( _nEsc, _nProp, Which() ); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxEscapementItem::GetValueCount() const { return SVX_ESCAPEMENT_END; // SVX_ESCAPEMENT_SUBSCRIPT + 1 } -//------------------------------------------------------------------------ + SfxItemPresentation SvxEscapementItem::GetPresentation ( @@ -2439,7 +2439,7 @@ SfxItemPresentation SvxEscapementItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const { @@ -2447,7 +2447,7 @@ OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const return EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxEscapementItem::GetEnumValue() const { @@ -2458,7 +2458,7 @@ sal_uInt16 SvxEscapementItem::GetEnumValue() const return SVX_ESCAPEMENT_OFF; } -// ----------------------------------------------------------------------- + void SvxEscapementItem::SetEnumValue( sal_uInt16 nVal ) { @@ -2534,7 +2534,7 @@ SvxLanguageItem::SvxLanguageItem( const LanguageType eLang, const sal_uInt16 nId { } -// ----------------------------------------------------------------------- + sal_uInt16 SvxLanguageItem::GetValueCount() const { @@ -2546,14 +2546,14 @@ sal_uInt16 SvxLanguageItem::GetValueCount() const return 0; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxLanguageItem::Clone( SfxItemPool * ) const { return new SvxLanguageItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxLanguageItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -2561,7 +2561,7 @@ SvStream& SvxLanguageItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -2570,7 +2570,7 @@ SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxLanguageItem( (LanguageType)nValue, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxLanguageItem::GetPresentation ( @@ -2646,14 +2646,14 @@ SvxNoLinebreakItem::SvxNoLinebreakItem( const sal_Bool bBreak, const sal_uInt16 { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxNoLinebreakItem::Clone( SfxItemPool* ) const { return new SvxNoLinebreakItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -2661,7 +2661,7 @@ SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -2670,7 +2670,7 @@ SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxNoLinebreakItem( bValue, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxNoLinebreakItem::GetPresentation ( @@ -2691,14 +2691,14 @@ SvxNoHyphenItem::SvxNoHyphenItem( const sal_Bool bHyphen, const sal_uInt16 nId ) { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxNoHyphenItem::Clone( SfxItemPool* ) const { return new SvxNoHyphenItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -2706,7 +2706,7 @@ SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, sal_uInt16 ) const { @@ -2715,7 +2715,7 @@ SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, sal_uInt16 ) const return new SvxNoHyphenItem( bValue, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxNoHyphenItem::GetPresentation ( @@ -2734,29 +2734,29 @@ SfxItemPresentation SvxNoHyphenItem::GetPresentation * */ -// ----------------------------------------------------------------------- + // class SvxLineColorItem (== SvxColorItem) -// ----------------------------------------------------------------------- + SvxLineColorItem::SvxLineColorItem( const sal_uInt16 nId ) : SvxColorItem( nId ) { } -// ----------------------------------------------------------------------- + SvxLineColorItem::SvxLineColorItem( const SvxLineColorItem &rCopy ) : SvxColorItem( rCopy ) { } -// ----------------------------------------------------------------------- + SvxLineColorItem::~SvxLineColorItem() { } -//------------------------------------------------------------------------ + SfxItemPresentation SvxLineColorItem::GetPresentation ( @@ -2779,14 +2779,14 @@ SvxBlinkItem::SvxBlinkItem( const bool bBlink, const sal_uInt16 nId ) : { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxBlinkItem::Clone( SfxItemPool * ) const { return new SvxBlinkItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { @@ -2794,7 +2794,7 @@ SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) c return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, sal_uInt16) const { @@ -2803,7 +2803,7 @@ SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxBlinkItem( nState, Which() ); } -// ----------------------------------------------------------------------- + SfxItemPresentation SvxBlinkItem::GetPresentation ( @@ -2841,14 +2841,14 @@ SvxEmphasisMarkItem::SvxEmphasisMarkItem( const FontEmphasisMark nValue, { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxEmphasisMarkItem::Clone( SfxItemPool * ) const { return new SvxEmphasisMarkItem( *this ); } -// ----------------------------------------------------------------------- + SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const @@ -2857,7 +2857,7 @@ SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm, return rStrm; } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, sal_uInt16 ) const { @@ -2866,7 +2866,7 @@ SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, sal_uInt16 ) const return new SvxEmphasisMarkItem( (FontEmphasisMark)nValue, Which() ); } -//------------------------------------------------------------------------ + SfxItemPresentation SvxEmphasisMarkItem::GetPresentation ( @@ -2902,7 +2902,7 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- + bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 730f7eca4371..95b6f4195f9c 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -168,7 +168,7 @@ SvxSpellWrapper::SvxSpellWrapper( Window* pWn, bEndDone = bReverse && bStart && !bOther; } -// ----------------------------------------------------------------------- + SvxSpellWrapper::SvxSpellWrapper( Window* pWn, Reference< XHyphenator > &xHyphenator, @@ -189,7 +189,7 @@ SvxSpellWrapper::SvxSpellWrapper( Window* pWn, { } -// ----------------------------------------------------------------------- + sal_Int16 SvxSpellWrapper::CheckSpellLang( Reference< XSpellChecker1 > xSpell, sal_Int16 nLang) @@ -241,14 +241,14 @@ sal_Int16 SvxSpellWrapper::CheckHyphLang( return (sal_Int16) nVal; } -// ----------------------------------------------------------------------- + void SvxSpellWrapper::SpellStart( SvxSpellArea /*eSpell*/ ) { // Here, the necessary preparations be made for SpellContinue in the } // given area. -// ----------------------------------------------------------------------- + sal_Bool SvxSpellWrapper::HasOtherCnt() @@ -256,7 +256,7 @@ sal_Bool SvxSpellWrapper::HasOtherCnt() return sal_False; // Is there a special area? } -// ----------------------------------------------------------------------- + sal_Bool SvxSpellWrapper::SpellMore() @@ -264,7 +264,7 @@ sal_Bool SvxSpellWrapper::SpellMore() return sal_False; // Should additional documents be examined? } -// ----------------------------------------------------------------------- + void SvxSpellWrapper::SpellEnd() @@ -274,7 +274,7 @@ void SvxSpellWrapper::SpellEnd() ShowLanguageErrors(); } -// ----------------------------------------------------------------------- + sal_Bool SvxSpellWrapper::SpellContinue() @@ -282,27 +282,27 @@ sal_Bool SvxSpellWrapper::SpellContinue() return sal_False; } -// ----------------------------------------------------------------------- + void SvxSpellWrapper::AutoCorrect( const OUString&, const OUString& ) { } -// ----------------------------------------------------------------------- + void SvxSpellWrapper::ScrollArea() { // Set Scroll area } -// ----------------------------------------------------------------------- + void SvxSpellWrapper::ChangeWord( const OUString&, const sal_uInt16 ) { // Insert Word } -// ----------------------------------------------------------------------- + void SvxSpellWrapper::ChangeThesWord( const OUString& ) @@ -310,7 +310,7 @@ void SvxSpellWrapper::ChangeThesWord( const OUString& ) // replace word due to Thesaurus. } -// ----------------------------------------------------------------------- + void SvxSpellWrapper::StartThesaurus( const OUString &rWord, sal_uInt16 nLanguage ) { @@ -332,27 +332,27 @@ void SvxSpellWrapper::StartThesaurus( const OUString &rWord, sal_uInt16 nLanguag delete pDlg; } -// ----------------------------------------------------------------------- + void SvxSpellWrapper::ReplaceAll( const OUString &, sal_Int16 ) { // Replace Word from the Replace list } -// ----------------------------------------------------------------------- + void SvxSpellWrapper::SetLanguage( const sal_uInt16 ) { // Set Language } -// ----------------------------------------------------------------------- + void SvxSpellWrapper::InsertHyphen( const sal_uInt16 ) { // inserting and deleting Hyphae } -// ----------------------------------------------------------------------- + // Testing of the document areas in the order specified by the flags @@ -392,7 +392,7 @@ void SvxSpellWrapper::SpellDocument( ) }; } -// ----------------------------------------------------------------------- + // Select the next area @@ -484,7 +484,7 @@ sal_Bool SvxSpellWrapper::SpellNext( ) return bGoOn; } -// ----------------------------------------------------------------------- + Reference< XDictionary > SvxSpellWrapper::GetAllRightDic() const { @@ -528,7 +528,7 @@ Reference< XDictionary > SvxSpellWrapper::GetAllRightDic() const return xDic; } -// ----------------------------------------------------------------------- + sal_Bool SvxSpellWrapper::FindSpellError() { diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index d018737769de..1dec1eaf538f 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -56,9 +56,9 @@ #include <cassert> using ::std::advance; -// ---------------------------------------------------------------------- + // Outliner -// ---------------------------------------------------------------------- + void Outliner::ImplCheckDepth( sal_Int16& rnDepth ) const { diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 9c9248c45199..3722a8bfe673 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -203,7 +203,7 @@ void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet, } } -// -------------------- + void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) { diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx index da17745587c7..b2025f658239 100644 --- a/editeng/source/uno/unoedhlp.cxx +++ b/editeng/source/uno/unoedhlp.cxx @@ -22,7 +22,7 @@ #include <editeng/editeng.hxx> #include <svl/itemset.hxx> -//------------------------------------------------------------------------ + TYPEINIT1( SvxEditSourceHint, TextHint ); @@ -55,7 +55,7 @@ sal_Int32 SvxEditSourceHint::GetEndValue() const return mnEnd; } TYPEINIT1( SvxEditSourceHintEndPara , SvxEditSourceHint ); -//------------------------------------------------------------------------ + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<SfxHint> SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify ) diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 00b155d09a46..1512635c5ee2 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -18,11 +18,11 @@ */ -//------------------------------------------------------------------------ + // // Global header // -//------------------------------------------------------------------------ + #include <limits.h> #include <vector> @@ -33,11 +33,11 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> -//------------------------------------------------------------------------ + // // Project-local header // -//------------------------------------------------------------------------ + #include "editeng/unoedprx.hxx" #include <editeng/unotext.hxx> #include <editeng/unoedhlp.hxx> @@ -300,7 +300,7 @@ sal_Bool SvxAccessibleTextIndex::IsEditableRange( const SvxAccessibleTextIndex& return sal_True; } -//--------------------------------------------------------------------------------- + SvxEditSourceAdapter::SvxEditSourceAdapter() : mbEditSourceValid( sal_False ) { @@ -428,7 +428,7 @@ sal_Bool SvxEditSourceAdapter::IsValid() const } -//-------------------------------------------------------------------------------------- + SvxAccessibleTextAdapter::SvxAccessibleTextAdapter() : mpTextForwarder( NULL ) { @@ -1173,7 +1173,7 @@ void SvxAccessibleTextAdapter::CopyText(const SvxTextForwarder&) -//--------------------------------------------------------------------------------------- + SvxAccessibleTextEditViewAdapter::SvxAccessibleTextEditViewAdapter() : mpViewForwarder(NULL) diff --git a/editeng/source/uno/unoedsrc.cxx b/editeng/source/uno/unoedsrc.cxx index ebeb6f4622ce..afeacc492198 100644 --- a/editeng/source/uno/unoedsrc.cxx +++ b/editeng/source/uno/unoedsrc.cxx @@ -22,19 +22,19 @@ #include <editeng/unoedsrc.hxx> -//------------------------------------------------------------------------ + void SvxEditSource::addRange( SvxUnoTextRangeBase* ) { } -//------------------------------------------------------------------------ + void SvxEditSource::removeRange( SvxUnoTextRangeBase* ) { } -//------------------------------------------------------------------------ + const SvxUnoTextRangeBaseList& SvxEditSource::getRanges() const { @@ -42,19 +42,19 @@ const SvxUnoTextRangeBaseList& SvxEditSource::getRanges() const return gList; } -//------------------------------------------------------------------------ + SvxTextForwarder::~SvxTextForwarder() { } -//------------------------------------------------------------------------ + SvxViewForwarder::~SvxViewForwarder() { } -//------------------------------------------------------------------------ + SvxEditSource::~SvxEditSource() { diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx index 4b6774dc46c9..c0b3fbff90bf 100644 --- a/editeng/source/uno/unofored.cxx +++ b/editeng/source/uno/unofored.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------ + SvxEditEngineForwarder::SvxEditEngineForwarder( EditEngine& rEngine ) : rEditEngine( rEngine ) @@ -502,6 +502,6 @@ void SvxEditEngineForwarder::CopyText(const SvxTextForwarder& rSource) delete pNewTextObject; } -//------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx index b7ddc3da8f23..72b73cf45429 100644 --- a/editeng/source/uno/unoforou.cxx +++ b/editeng/source/uno/unoforou.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------ + SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, sal_Bool bOutlText /* = sal_False */ ) : rOutliner( rOutl ), @@ -577,7 +577,7 @@ void SvxOutlinerForwarder::CopyText(const SvxTextForwarder& rSource) delete pNewOutlinerParaObject; } -//------------------------------------------------------------------------ + sal_Int32 SvxTextForwarder::GetNumberingStartValue( sal_Int32 ) @@ -598,6 +598,6 @@ void SvxTextForwarder::SetParaIsNumberingRestart( sal_Int32, sal_Bool ) { } -//------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 4363c54cb1df..6975695dcb05 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -34,14 +34,14 @@ using namespace ::rtl; using ::std::vector; -//---------------------------------------------------------------------- + struct SfxItemPropertyMapEntryHash { size_t operator()(const SfxItemPropertyMapEntry* pMap) const { return (size_t)pMap; } }; -//---------------------------------------------------------------------- + struct SvxIDPropertyCombine { @@ -56,13 +56,13 @@ SvxItemPropertySet::SvxItemPropertySet( const SfxItemPropertyMapEntry* pMap, Sfx { } -//---------------------------------------------------------------------- + SvxItemPropertySet::~SvxItemPropertySet() { ClearAllUsrAny(); } -//---------------------------------------------------------------------- + uno::Any* SvxItemPropertySet::GetUsrAnyForID(sal_uInt16 nWID) const { for ( size_t i = 0, n = aCombineList.size(); i < n; ++i ) @@ -74,7 +74,7 @@ uno::Any* SvxItemPropertySet::GetUsrAnyForID(sal_uInt16 nWID) const return NULL; } -//---------------------------------------------------------------------- + void SvxItemPropertySet::AddUsrAnyForID(const uno::Any& rAny, sal_uInt16 nWID) { SvxIDPropertyCombine* pNew = new SvxIDPropertyCombine; @@ -83,7 +83,7 @@ void SvxItemPropertySet::AddUsrAnyForID(const uno::Any& rAny, sal_uInt16 nWID) aCombineList.push_back( pNew ); } -//---------------------------------------------------------------------- + void SvxItemPropertySet::ClearAllUsrAny() { @@ -92,7 +92,7 @@ void SvxItemPropertySet::ClearAllUsrAny() aCombineList.clear(); } -//---------------------------------------------------------------------- + sal_Bool SvxUnoCheckForPositiveValue( const uno::Any& rVal ) { @@ -104,7 +104,7 @@ sal_Bool SvxUnoCheckForPositiveValue( const uno::Any& rVal ) } -//---------------------------------------------------------------------- + uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ) const { uno::Any aVal; @@ -150,7 +150,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* return aVal; } -//---------------------------------------------------------------------- + void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet, bool bDontConvertNegativeValues ) const { if(!pMap || !pMap->nWID) @@ -202,7 +202,7 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa } } -//---------------------------------------------------------------------- + uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap ) const { // Already entered a value? Then finish quickly @@ -257,7 +257,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* return aVal; } -//---------------------------------------------------------------------- + void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal ) const { @@ -268,14 +268,14 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa *pUsrAny = rVal; } -//---------------------------------------------------------------------- + const SfxItemPropertySimpleEntry* SvxItemPropertySet::getPropertyMapEntry(const OUString &rName) const { return m_aPropertyMap.getByName( rName ); } -//---------------------------------------------------------------------- + uno::Reference< beans::XPropertySetInfo > SvxItemPropertySet::getPropertySetInfo() const { @@ -284,7 +284,7 @@ uno::Reference< beans::XPropertySetInfo > SvxItemPropertySet::getPropertySetInf return m_xInfo; } -//---------------------------------------------------------------------- + #ifndef TWIPS_TO_MM #define TWIPS_TO_MM(val) ((val * 127 + 36) / 72) @@ -330,7 +330,7 @@ void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, uno::Any & rMetric ) th } } -//---------------------------------------------------------------------- + /** converts the given any with a metric from 100th/mm to the given metric if needed */ void SvxUnoConvertFromMM( const SfxMapUnit eDestinationMapUnit, uno::Any & rMetric ) throw() diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 0461b378073d..e7bfb33e667d 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -2317,7 +2317,7 @@ sal_Int64 SAL_CALL SvxUnoTextBase::getSomething( const uno::Sequence< sal_Int8 > } } -// -------------------------------------------------------------------- + SvxUnoText::SvxUnoText( ) throw() { @@ -2413,7 +2413,7 @@ sal_Int64 SAL_CALL SvxUnoText::getSomething( const uno::Sequence< sal_Int8 >& rI } -// -------------------------------------------------------------------- + SvxDummyTextSource::~SvxDummyTextSource() { diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index d37c8a994805..f086a226bb33 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -86,7 +86,7 @@ public: /////////////////////////////////////////////////////////////////////// -//------------------------------------------------------------------------ + SvxEditEngineSourceImpl::SvxEditEngineSourceImpl( EditEngine* pEditEngine ) : maRefCount(0), @@ -95,21 +95,21 @@ SvxEditEngineSourceImpl::SvxEditEngineSourceImpl( EditEngine* pEditEngine ) { } -//------------------------------------------------------------------------ + SvxEditEngineSourceImpl::~SvxEditEngineSourceImpl() { delete mpTextForwarder; } -//------------------------------------------------------------------------ + void SAL_CALL SvxEditEngineSourceImpl::acquire() { osl_atomic_increment( &maRefCount ); } -//------------------------------------------------------------------------ + void SAL_CALL SvxEditEngineSourceImpl::release() { @@ -117,7 +117,7 @@ void SAL_CALL SvxEditEngineSourceImpl::release() delete this; } -//------------------------------------------------------------------------ + SvxTextForwarder* SvxEditEngineSourceImpl::GetTextForwarder() { @@ -127,9 +127,9 @@ SvxTextForwarder* SvxEditEngineSourceImpl::GetTextForwarder() return mpTextForwarder; } -// -------------------------------------------------------------------- + // SvxTextEditSource -// -------------------------------------------------------------------- + SvxEditEngineSource::SvxEditEngineSource( EditEngine* pEditEngine ) { @@ -137,7 +137,7 @@ SvxEditEngineSource::SvxEditEngineSource( EditEngine* pEditEngine ) mpImpl->acquire(); } -// -------------------------------------------------------------------- + SvxEditEngineSource::SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl ) { @@ -145,28 +145,28 @@ SvxEditEngineSource::SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl ) mpImpl->acquire(); } -//------------------------------------------------------------------------ + SvxEditEngineSource::~SvxEditEngineSource() { mpImpl->release(); } -//------------------------------------------------------------------------ + SvxEditSource* SvxEditEngineSource::Clone() const { return new SvxEditEngineSource( mpImpl ); } -//------------------------------------------------------------------------ + SvxTextForwarder* SvxEditEngineSource::GetTextForwarder() { return mpImpl->GetTextForwarder(); } -//------------------------------------------------------------------------ + void SvxEditEngineSource::UpdateData() { diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index bf764daaddab..d18961fb2d0d 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -122,7 +122,7 @@ private: const uno::Reference< XText > mxText; }; -// -------------------------------------------------------------------- + SvxXMLXTextImportComponent::SvxXMLXTextImportComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, |