Hi,
Remove some comments from editeng module. Patch under LGPLv3+/MPL.
Thanks
--
Arnaud Versini
From 2ee13ad2712a562a4b88525d66c427ddf9c014ee Mon Sep 17 00:00:00 2001
From: Arnaud Versini <arnaud.versini@gmail.com>
Date: Sun, 13 Feb 2011 15:20:16 +0100
Subject: [PATCH] Remove bogus comments and dead code from editeng.
---
editeng/source/editeng/editdoc.cxx | 39 +-------
editeng/source/editeng/editdoc2.cxx | 30 ------
editeng/source/editeng/editeng.cxx | 86 ----------------
editeng/source/editeng/editsel.hxx | 6 -
editeng/source/editeng/editundo.cxx | 42 --------
editeng/source/editeng/eehtml.cxx | 193 ++++++++++++++---------------------
editeng/source/editeng/eeobj.cxx | 2 +-
editeng/source/editeng/eeobj.hxx | 3 -
editeng/source/editeng/impedit.cxx | 3 +-
editeng/source/editeng/impedit2.cxx | 103 +++----------------
editeng/source/editeng/textconv.cxx | 3 -
11 files changed, 97 insertions(+), 413 deletions(-)
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 78b4515..4a21814 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -408,10 +408,6 @@ EditCharAttrib* MakeCharAttrib( SfxItemPool& rPool, const SfxPoolItem& rAttr,
US
return pNew;
}
-// -------------------------------------------------------------------------
-// class EditLine
-// -------------------------------------------------------------------------
-
EditLine::EditLine()
{
DBG_CTOR( EE_EditLine, 0 );
@@ -545,9 +541,6 @@ Size EditLine::CalcTextSize( ParaPortion& rParaPortion )
return aSz;
}
- // -------------------------------------------------------------------------
-// class EditLineList
-// -------------------------------------------------------------------------
EditLineList::EditLineList()
{
}
@@ -588,9 +581,6 @@ USHORT EditLineList::FindLine( USHORT nChar, BOOL bInclEnd )
return ( Count() - 1 );
}
- // -------------------------------------------------------------------------
-// class EditSelection
-// -------------------------------------------------------------------------
BOOL EditPaM::DbgIsBuggy( EditDoc& rDoc )
{
if ( !pNode )
@@ -682,10 +672,6 @@ BOOL EditSelection::Adjust( const ContentList& rNodes )
return bSwap;
}
-
- // -------------------------------------------------------------------------
-// class EditPaM
-// -------------------------------------------------------------------------
BOOL operator == ( const EditPaM& r1, const EditPaM& r2 )
{
if ( r1.GetNode() != r2.GetNode() )
@@ -709,10 +695,6 @@ BOOL operator != ( const EditPaM& r1, const EditPaM& r2 )
return !( r1 == r2 );
}
-
- // -------------------------------------------------------------------------
-// class ContentNode
-// -------------------------------------------------------------------------
ContentNode::ContentNode( SfxItemPool& rPool ) : aContentAttribs( rPool )
{
DBG_CTOR( EE_ContentNode, 0 );
@@ -935,7 +917,7 @@ void ContentNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted, SfxItemPool& r
DBG_ASSERT( pAttrib->GetStart() <= pAttrib->GetEnd(), "Collaps: Attribut verdreht!" );
DBG_ASSERT( ( pAttrib->GetEnd() <= Len()) || bDelAttr, "Collaps: Attrib groesser als
Absatz!" );
- if ( bDelAttr /* || pAttrib->IsEmpty() */ )
+ if ( bDelAttr )
{
bResort = TRUE;
aCharAttribList.GetAttribs().Remove( nAttr );
@@ -1125,9 +1107,6 @@ void ContentNode::SetWrongList( WrongList* p )
pWrongList = p;
}
- // -------------------------------------------------------------------------
-// class ContentAttribs
-// -------------------------------------------------------------------------
ContentAttribs::ContentAttribs( SfxItemPool& rPool ) :
aAttribSet( rPool, EE_PARA_START, EE_CHAR_END )
{
@@ -1202,10 +1181,6 @@ BOOL ContentAttribs::HasItem( USHORT nWhich )
}
-
- // ----------------------------------------------------------------------
-// class ItemList
-// ----------------------------------------------------------------------
ItemList::ItemList() : CurrentItem( 0 )
{
}
@@ -1240,9 +1215,7 @@ void ItemList::Insert( const SfxPoolItem* pItem )
CurrentItem = aItemPool.size() - 1;
}
- // -------------------------------------------------------------------------
-// class EditDoc
-// -------------------------------------------------------------------------
+
EditDoc::EditDoc( SfxItemPool* pPool )
{
if ( pPool )
@@ -1861,9 +1834,7 @@ void EditDoc::InsertAttrib( ContentNode* pNode, USHORT nStart, USHORT nEnd,
cons
{
if ( pAttr->IsInside( nStart ) ) // splitten
{
- // ???????????????????????????????
// eigentlich noch pruefen, ob wirklich splittet, oder return !
- // ???????????????????????????????
USHORT nOldEnd = pAttr->GetEnd();
pAttr->GetEnd() = nStart;
pAttr = MakeCharAttrib( GetItemPool(), *(pAttr->GetItem()), nStart, nOldEnd );
@@ -1997,10 +1968,6 @@ void EditDoc::FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT
nEndPos,
}
- // -------------------------------------------------------------------------
-// class EditCharAttribList
-// -------------------------------------------------------------------------
-
CharAttribList::CharAttribList()
{
DBG_CTOR( EE_CharAttribList, 0 );
@@ -2273,7 +2240,6 @@ ULONG SvxFontTable::GetId( const SvxFontItem& rFontItem )
return 0;
}
-//=============================================================================
SvxColorList::SvxColorList()
{
}
@@ -2313,7 +2279,6 @@ SvxColorItem* SvxColorList::GetObject( size_t nIndex )
return ( nIndex >= aColorList.size() ) ? NULL : aColorList[ nIndex ];
}
-//=============================================================================
EditEngineItemPool::EditEngineItemPool( BOOL bPersistenRefCounts )
: SfxItemPool( String( "EditEngineItemPool", RTL_TEXTENCODING_ASCII_US ), EE_ITEMS_START,
EE_ITEMS_END,
aItemInfos, 0, bPersistenRefCounts )
diff --git a/editeng/source/editeng/editdoc2.cxx b/editeng/source/editeng/editdoc2.cxx
index 71077d0..34f5969 100644
--- a/editeng/source/editeng/editdoc2.cxx
+++ b/editeng/source/editeng/editdoc2.cxx
@@ -69,27 +69,7 @@ DBG_NAME( EE_ParaPortion )
SV_IMPL_VARARR( CharPosArray, sal_Int32 );
-/*
-BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle )
-{
- if ( GetParent() == rStyle.GetName() )
- return TRUE;
-
- if ( GetParent().Len() && ( GetParent() != GetName() ) )
- {
- EditStyleSheet* pS = (EditStyleSheet*)GetPool().Find( GetParent(), rStyle.GetFamily() );
- if ( pS )
- return pS->HasStyleAsAnyParent( rStyle );
- }
- return FALSE;
-}
-
-*/
-
-// -------------------------------------------------------------------------
-// class TextPortionList
-// -------------------------------------------------------------------------
TextPortionList::TextPortionList()
{
}
@@ -148,10 +128,6 @@ USHORT TextPortionList::GetStartPos( USHORT nPortion )
}
-// -------------------------------------------------------------------------
-// class ExtraPortionInfo
-// -------------------------------------------------------------------------
-
ExtraPortionInfo::ExtraPortionInfo()
{
nOrgWidth = 0;
@@ -183,9 +159,6 @@ void ExtraPortionInfo::DestroyOrgDXArray()
}
-// -------------------------------------------------------------------------
-// class ParaPortion
-// -------------------------------------------------------------------------
ParaPortion::ParaPortion( ContentNode* pN )
{
DBG_CTOR( EE_ParaPortion, 0 );
@@ -358,9 +331,6 @@ static USHORT FastGetPos( const VoidPtr *pPtrArray, USHORT nPtrArrayLen,
return USHRT_MAX;
}
-// -------------------------------------------------------------------------
-// class ParaPortionList
-// -------------------------------------------------------------------------
ParaPortionList::ParaPortionList() : nLastCache( 0 )
{
}
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 3b9b25e..055e815 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2781,90 +2781,7 @@ sal_Bool EditEngine::IsSimpleCharInput( const KeyEvent& rKeyEvent )
void EditEngine::ImportBulletItem( SvxNumBulletItem& /*rNumBullet*/, sal_uInt16 /*nLevel*/,
const SvxBulletItem* /*pOldBullet*/, const SvxLRSpaceItem*
/*pOldLRSpace*/ )
{
-/* TL_NFLR
- if ( pOldBullet || pOldLRSpace )
- {
- // Numberformat dynamisch, weil Zuweisungsoperator nicht implementiert.
-
- // Altes NumBulletItem nur uebernehmen, wenn kein altes BulletItem
- const SvxNumberFormat* pFmt = ( !pOldBullet && ( rNumBullet.GetNumRule()->GetLevelCount()
nLevel ) ) ?
- rNumBullet.GetNumRule()->Get( nLevel ) : NULL;
- SvxNumberFormat* pNumberFormat = pFmt
- ? new SvxNumberFormat( *pFmt )
- : new SvxNumberFormat( SVX_NUM_NUMBER_NONE );
- if ( pOldBullet )
- {
- // Style
- SvxExtNumType eNumType;
- switch( pOldBullet->GetStyle() )
- {
- case BS_BMP: eNumType = SVX_NUM_BITMAP;
break;
- case BS_BULLET: eNumType = SVX_NUM_CHAR_SPECIAL;
break;
- case BS_ROMAN_BIG: eNumType = SVX_NUM_ROMAN_UPPER;
break;
- case BS_ROMAN_SMALL: eNumType = SVX_NUM_ROMAN_LOWER; break;
- case BS_ABC_BIG: eNumType = SVX_NUM_CHARS_UPPER_LETTER; break;
- case BS_ABC_SMALL: eNumType = SVX_NUM_CHARS_LOWER_LETTER; break;
- case BS_123: eNumType = SVX_NUM_ARABIC;
break;
- default: eNumType = SVX_NUM_NUMBER_NONE;
break;
- }
- pNumberFormat->SetNumberingType(
- sal::static_int_cast< sal_Int16 >( eNumType ) );
-
- // Justification
- SvxAdjust eAdjust;
- switch( pOldBullet->GetJustification() & (BJ_HRIGHT|BJ_HCENTER|BJ_HLEFT) )
- {
- case BJ_HRIGHT: eAdjust = SVX_ADJUST_RIGHT; break;
- case BJ_HCENTER: eAdjust = SVX_ADJUST_CENTER; break;
- default: eAdjust = SVX_ADJUST_LEFT; break;
- }
- pNumberFormat->SetNumAdjust(eAdjust);
-
- // Prefix/Suffix
- pNumberFormat->SetPrefix( pOldBullet->GetPrevText() );
- pNumberFormat->SetSuffix( pOldBullet->GetFollowText() );
-
- //Font
- if ( eNumType != SVX_NUM_BITMAP )
- {
- Font aTmpFont = pOldBullet->GetFont();
- pNumberFormat->SetBulletFont( &aTmpFont );
- }
-
- // Color
- pNumberFormat->SetBulletColor( pOldBullet->GetFont().GetColor() );
- // Start
- pNumberFormat->SetStart( pOldBullet->GetStart() );
-
- // Scale
- pNumberFormat->SetBulletRelSize( pOldBullet->GetScale() );
-
- // Bullet/Bitmap
- if( eNumType == SVX_NUM_CHAR_SPECIAL )
- {
- pNumberFormat->SetBulletChar( pOldBullet->GetSymbol() );
- }
- else if( eNumType == SVX_NUM_BITMAP )
- {
- SvxBrushItem aBItem( Graphic( pOldBullet->GetBitmap() ), GPOS_NONE, SID_ATTR_BRUSH
);
- pNumberFormat->SetGraphicBrush( &aBItem );
- }
- }
-
- // Einzug und Erstzeileneinzug
-//TL_NFLR if ( pOldLRSpace )
-//TL_NFLR {
-//TL_NFLR short nLSpace = (short)pOldLRSpace->GetTxtLeft();
-//TL_NFLR pNumberFormat->SetLSpace( nLSpace );
-//TL_NFLR pNumberFormat->SetAbsLSpace( nLSpace );
-//TL_NFLR pNumberFormat->SetFirstLineOffset( pOldLRSpace->GetTxtFirstLineOfst() );
-//TL_NFLR }
-
- rNumBullet.GetNumRule()->SetLevel( nLevel, *pNumberFormat );
- delete pNumberFormat;
- }
-*/
}
BOOL EditEngine::HasValidData( const ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XTransferable >& rTransferable )
@@ -2915,9 +2832,6 @@ BOOL EditEngine::IsFirstWordCapitalization() const
}
-// ---------------------------------------------------
-
-
EFieldInfo::EFieldInfo()
{
pFieldItem = NULL;
diff --git a/editeng/source/editeng/editsel.hxx b/editeng/source/editeng/editsel.hxx
index 78e7a11..3182bc6 100644
--- a/editeng/source/editeng/editsel.hxx
+++ b/editeng/source/editeng/editsel.hxx
@@ -33,9 +33,6 @@
class EditView;
-// ----------------------------------------------------------------------
-// class EditSelFunctionSet
-// ----------------------------------------------------------------------
class EditSelFunctionSet: public FunctionSet
{
private:
@@ -59,9 +56,6 @@ public:
EditView* GetCurView() { return pCurView; }
};
- // ----------------------------------------------------------------------
-// class EditSelectionEngine
-// ----------------------------------------------------------------------
class EditSelectionEngine : public SelectionEngine
{
private:
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index e928126..f0a48d2 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -67,9 +67,6 @@ void lcl_DoSetSelection( EditView* pView, USHORT nPara )
pView->GetImpEditView()->SetEditSelection( aSel );
}
- // -----------------------------------------------------------------------
-// EditUndoManager
-// ------------------------------------------------------------------------
EditUndoManager::EditUndoManager( ImpEditEngine* p )
{
pImpEE = p;
@@ -145,9 +142,6 @@ BOOL EditUndoManager::Redo( USHORT nCount )
return bDone;
}
- // -----------------------------------------------------------------------
-// EditUndo
-// ------------------------------------------------------------------------
EditUndo::EditUndo( USHORT nI, ImpEditEngine* p )
{
DBG_CTOR( EditUndo, 0 );
@@ -182,9 +176,6 @@ XubString EditUndo::GetComment() const
return aComment;
}
- // -----------------------------------------------------------------------
-// EditUndoDelContent
-// ------------------------------------------------------------------------
EditUndoDelContent::EditUndoDelContent( ImpEditEngine* _pImpEE, ContentNode* pNode, USHORT n )
: EditUndo( EDITUNDO_DELCONTENT, _pImpEE )
{
@@ -242,9 +233,6 @@ void EditUndoDelContent::Redo()
_pImpEE->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM, aPaM ) );
}
- // -----------------------------------------------------------------------
-// EditUndoConnectParas
-// ------------------------------------------------------------------------
EditUndoConnectParas::EditUndoConnectParas( ImpEditEngine* _pImpEE, USHORT nN, USHORT nSP,
const SfxItemSet& rLeftParaAttribs, const SfxItemSet&
rRightParaAttribs,
const SfxStyleSheet* pLeftStyle, const SfxStyleSheet*
pRightStyle, BOOL bBkwrd )
@@ -311,9 +299,6 @@ void EditUndoConnectParas::Redo()
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM,
aPaM ) );
}
- // -----------------------------------------------------------------------
-// EditUndoSplitPara
-// ------------------------------------------------------------------------
EditUndoSplitPara::EditUndoSplitPara( ImpEditEngine* _pImpEE, USHORT nN, USHORT nSP )
: EditUndo( EDITUNDO_SPLITPARA, _pImpEE )
{
@@ -339,9 +324,6 @@ void EditUndoSplitPara::Redo()
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM,
aPaM ) );
}
- // -----------------------------------------------------------------------
-// EditUndoInsertChars
-// ------------------------------------------------------------------------
EditUndoInsertChars::EditUndoInsertChars( ImpEditEngine* _pImpEE, const EPaM& rEPaM, const
XubString& rStr )
: EditUndo( EDITUNDO_INSERTCHARS, _pImpEE ),
aEPaM( rEPaM ), aText( rStr )
@@ -386,9 +368,6 @@ BOOL EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
return FALSE;
}
- // -----------------------------------------------------------------------
-// EditUndoRemoveChars
-// ------------------------------------------------------------------------
EditUndoRemoveChars::EditUndoRemoveChars( ImpEditEngine* _pImpEE, const EPaM& rEPaM, const
XubString& rStr )
: EditUndo( EDITUNDO_REMOVECHARS, _pImpEE ),
aEPaM( rEPaM ), aText( rStr )
@@ -415,9 +394,6 @@ void EditUndoRemoveChars::Redo()
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewPaM );
}
- // -----------------------------------------------------------------------
-// EditUndoInsertFeature
-// ------------------------------------------------------------------------
EditUndoInsertFeature::EditUndoInsertFeature( ImpEditEngine* _pImpEE, const EPaM& rEPaM, const
SfxPoolItem& rFeature)
: EditUndo( EDITUNDO_INSERTFEATURE, _pImpEE ), aEPaM( rEPaM )
{
@@ -454,9 +430,6 @@ void EditUndoInsertFeature::Redo()
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aSel );
}
- // -----------------------------------------------------------------------
-// EditUndoMoveParagraphs
-// ------------------------------------------------------------------------
EditUndoMoveParagraphs::EditUndoMoveParagraphs
( ImpEditEngine* _pImpEE, const Range& rParas, USHORT n )
: EditUndo( EDITUNDO_MOVEPARAGRAPHS, _pImpEE ),
@@ -499,9 +472,6 @@ void EditUndoMoveParagraphs::Redo()
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
}
- // -----------------------------------------------------------------------
-// EditUndoSetStyleSheet
-// ------------------------------------------------------------------------
EditUndoSetStyleSheet::EditUndoSetStyleSheet( ImpEditEngine* _pImpEE, USHORT nP,
const XubString& rPrevName, SfxStyleFamily ePrevFam,
const XubString& rNewName, SfxStyleFamily eNewFam,
@@ -533,9 +503,6 @@ void EditUndoSetStyleSheet::Redo()
lcl_DoSetSelection( GetImpEditEngine()->GetActiveView(), nPara );
}
- // -----------------------------------------------------------------------
-// EditUndoSetParaAttribs
-// ------------------------------------------------------------------------
EditUndoSetParaAttribs::EditUndoSetParaAttribs( ImpEditEngine* _pImpEE, USHORT nP, const
SfxItemSet& rPrevItems, const SfxItemSet& rNewItems )
: EditUndo( EDITUNDO_PARAATTRIBS, _pImpEE ),
aPrevItems( rPrevItems ),
@@ -562,9 +529,6 @@ void EditUndoSetParaAttribs::Redo()
lcl_DoSetSelection( GetImpEditEngine()->GetActiveView(), nPara );
}
- // -----------------------------------------------------------------------
-// EditUndoSetAttribs
-// ------------------------------------------------------------------------
EditUndoSetAttribs::EditUndoSetAttribs( ImpEditEngine* _pImpEE, const ESelection& rESel, const
SfxItemSet& rNewItems )
: EditUndo( EDITUNDO_ATTRIBS, _pImpEE ),
aESel( rESel ),
@@ -655,9 +619,6 @@ void EditUndoSetAttribs::ImpSetSelection( EditView* /*pView*/ )
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aSel );
}
- // -----------------------------------------------------------------------
-// EditUndoTransliteration
-// ------------------------------------------------------------------------
EditUndoTransliteration::EditUndoTransliteration( ImpEditEngine* _pImpEE, const ESelection& rESel,
sal_Int32 nM )
: EditUndo( EDITUNDO_TRANSLITERATE, _pImpEE ), aOldESel( rESel )
{
@@ -720,9 +681,6 @@ void EditUndoTransliteration::Redo()
GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
}
- // -----------------------------------------------------------------------
-// EditUndoMarkSelection
-// ------------------------------------------------------------------------
EditUndoMarkSelection::EditUndoMarkSelection( ImpEditEngine* _pImpEE, const ESelection& rSel )
: EditUndo( EDITUNDO_MARKSELECTION, _pImpEE ), aSelection( rSel )
{
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index 50a776a..16506c0 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -228,7 +228,7 @@ void EditHTMLParser::NextToken( int nToken )
break;
case HTML_CENTER_ON:
- case HTML_CENTER_OFF: // if ( bInPara )
+ case HTML_CENTER_OFF:
{
USHORT nNode = pImpEditEngine->GetEditDoc().GetPos(
aCurSel.Max().GetNode() );
SfxItemSet aItems(
aCurSel.Max().GetNode()->GetContentAttribs().GetItems() );
@@ -570,148 +570,111 @@ void EditHTMLParser::ImpSetAttribs( const SfxItemSet& rItems,
EditSelection* pSe
USHORT nEndNode = pImpEditEngine->GetEditDoc().GetPos( pEN );
DBG_ASSERT( nStartNode == nEndNode, "ImpSetAttribs: Mehrere Absaetze?" );
#endif
-
-/*
- for ( USHORT z = nStartNode+1; z < nEndNode; z++ )
- {
- DBG_ASSERT( pImpEditEngine->GetEditDoc().SaveGetObject( z ), "Node existiert noch
nicht(RTF)" );
- pImpEditEngine->SetParaAttribs( z, rSet.GetAttrSet() );
- }
-
- if ( aStartPaM.GetNode() != aEndPaM.GetNode() )
+ if ( ( aStartPaM.GetIndex() == 0 ) && ( aEndPaM.GetIndex() == aEndPaM.GetNode()->Len() ) )
{
- // Den Rest des StartNodes...
- if ( aStartPaM.GetIndex() == 0 )
- pImpEditEngine->SetParaAttribs( nStartNode, rSet.GetAttrSet() );
- else
- pImpEditEngine->SetAttribs( EditSelection( aStartPaM, EditPaM( aStartPaM.GetNode(),
aStartPaM.GetNode()->Len() ) ), rSet.GetAttrSet() );
-
- // Den Anfang des EndNodes....
- if ( aEndPaM.GetIndex() == aEndPaM.GetNode()->Len() )
- pImpEditEngine->SetParaAttribs( nEndNode, rSet.GetAttrSet() );
- else
- pImpEditEngine->SetAttribs( EditSelection( EditPaM( aEndPaM.GetNode(), 0 ), aEndPaM ),
rSet.GetAttrSet() );
+ // Muesse gemergt werden:
+ SfxItemSet aItems( pImpEditEngine->GetParaAttribs( nStartNode ) );
+ aItems.Put( rItems );
+ pImpEditEngine->SetParaAttribs( nStartNode, aItems );
}
else
-*/
- {
- if ( ( aStartPaM.GetIndex() == 0 ) && ( aEndPaM.GetIndex() == aEndPaM.GetNode()->Len() ) )
- {
- // Muesse gemergt werden:
- SfxItemSet aItems( pImpEditEngine->GetParaAttribs( nStartNode ) );
- aItems.Put( rItems );
- pImpEditEngine->SetParaAttribs( nStartNode, aItems );
- }
- else
- pImpEditEngine->SetAttribs( EditSelection( aStartPaM, aEndPaM ), rItems );
- }
+ pImpEditEngine->SetAttribs( EditSelection( aStartPaM, aEndPaM ), rItems );
}
void EditHTMLParser::ImpSetStyleSheet( USHORT nHLevel )
{
/*
- nHLevel: 0: Ausschalten
- 1-6: Heading
- STYLE_PRE: Preformatted
+ nHLevel: 0: Ausschalten
+ 1-6: Heading
+ STYLE_PRE: Preformatted
*/
+ // Harte Attribute erzeugen...
+ // Reicht fuer Calc, bei StyleSheets muesste noch geklaert werden,
+ // dass diese auch in der App liegen sollten, damit sie beim
+ // fuettern in eine andere Engine auch noch da sind...
-// if ( pImpEditEngine->GetStatus().DoImportRTFStyleSheets() )
-// {
-// SvxRTFStyleType* pS = GetStyleTbl().Get( rSet.StyleNo() );
-// DBG_ASSERT( pS, "Vorlage in RTF nicht definiert!" );
-// if ( pS )
-// pImpEditEngine->SetStyleSheet( EditSelection( aStartPaM, aEndPaM ),
pS->sName, SFX_STYLE_FAMILY_ALL );
-// }
-// else
- {
- // Harte Attribute erzeugen...
- // Reicht fuer Calc, bei StyleSheets muesste noch geklaert werden,
- // dass diese auch in der App liegen sollten, damit sie beim
- // fuettern in eine andere Engine auch noch da sind...
+ USHORT nNode = pImpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() );
- USHORT nNode = pImpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() );
-// SfxItemSet aItems( pImpEditEngine->GetEmptyItemSet() );
- SfxItemSet aItems( aCurSel.Max().GetNode()->GetContentAttribs().GetItems() );
+ SfxItemSet aItems( aCurSel.Max().GetNode()->GetContentAttribs().GetItems() );
- aItems.ClearItem( EE_PARA_ULSPACE );
+ aItems.ClearItem( EE_PARA_ULSPACE );
- aItems.ClearItem( EE_CHAR_FONTHEIGHT );
- aItems.ClearItem( EE_CHAR_FONTINFO );
- aItems.ClearItem( EE_CHAR_WEIGHT );
+ aItems.ClearItem( EE_CHAR_FONTHEIGHT );
+ aItems.ClearItem( EE_CHAR_FONTINFO );
+ aItems.ClearItem( EE_CHAR_WEIGHT );
- aItems.ClearItem( EE_CHAR_FONTHEIGHT_CJK );
- aItems.ClearItem( EE_CHAR_FONTINFO_CJK );
- aItems.ClearItem( EE_CHAR_WEIGHT_CJK );
+ aItems.ClearItem( EE_CHAR_FONTHEIGHT_CJK );
+ aItems.ClearItem( EE_CHAR_FONTINFO_CJK );
+ aItems.ClearItem( EE_CHAR_WEIGHT_CJK );
- aItems.ClearItem( EE_CHAR_FONTHEIGHT_CTL );
- aItems.ClearItem( EE_CHAR_FONTINFO_CTL );
- aItems.ClearItem( EE_CHAR_WEIGHT_CTL );
+ aItems.ClearItem( EE_CHAR_FONTHEIGHT_CTL );
+ aItems.ClearItem( EE_CHAR_FONTINFO_CTL );
+ aItems.ClearItem( EE_CHAR_WEIGHT_CTL );
- // Fett in den ersten 3 Headings
- if ( ( nHLevel >= 1 ) && ( nHLevel <= 3 ) )
- {
- SvxWeightItem aWeightItem( WEIGHT_BOLD, EE_CHAR_WEIGHT );
- aItems.Put( aWeightItem );
+ // Fett in den ersten 3 Headings
+ if ( ( nHLevel >= 1 ) && ( nHLevel <= 3 ) )
+ {
+ SvxWeightItem aWeightItem( WEIGHT_BOLD, EE_CHAR_WEIGHT );
+ aItems.Put( aWeightItem );
- SvxWeightItem aWeightItemCJK( WEIGHT_BOLD, EE_CHAR_WEIGHT_CJK );
- aItems.Put( aWeightItem );
+ SvxWeightItem aWeightItemCJK( WEIGHT_BOLD, EE_CHAR_WEIGHT_CJK );
+ aItems.Put( aWeightItem );
- SvxWeightItem aWeightItemCTL( WEIGHT_BOLD, EE_CHAR_WEIGHT_CTL );
- aItems.Put( aWeightItem );
- }
+ SvxWeightItem aWeightItemCTL( WEIGHT_BOLD, EE_CHAR_WEIGHT_CTL );
+ aItems.Put( aWeightItem );
+ }
- // Fonthoehe und Abstaende, wenn LogicToLogic moeglich:
- MapUnit eUnit = pImpEditEngine->GetRefMapMode().GetMapUnit();
- if ( ( eUnit != MAP_PIXEL ) && ( eUnit != MAP_SYSFONT ) &&
- ( eUnit != MAP_APPFONT ) && ( eUnit != MAP_RELATIVE ) )
- {
- long nPoints = 10;
- if ( nHLevel == 1 )
- nPoints = 22;
- else if ( nHLevel == 2 )
- nPoints = 16;
- else if ( nHLevel == 3 )
- nPoints = 12;
- else if ( nHLevel == 4 )
- nPoints = 11;
+ // Fonthoehe und Abstaende, wenn LogicToLogic moeglich:
+ MapUnit eUnit = pImpEditEngine->GetRefMapMode().GetMapUnit();
+ if ( ( eUnit != MAP_PIXEL ) && ( eUnit != MAP_SYSFONT ) &&
+ ( eUnit != MAP_APPFONT ) && ( eUnit != MAP_RELATIVE ) )
+ {
+ long nPoints = 10;
+ if ( nHLevel == 1 )
+ nPoints = 22;
+ else if ( nHLevel == 2 )
+ nPoints = 16;
+ else if ( nHLevel == 3 )
+ nPoints = 12;
+ else if ( nHLevel == 4 )
+ nPoints = 11;
- nPoints = OutputDevice::LogicToLogic( nPoints, MAP_POINT, eUnit );
+ nPoints = OutputDevice::LogicToLogic( nPoints, MAP_POINT, eUnit );
- SvxFontHeightItem aHeightItem( nPoints, 100, EE_CHAR_FONTHEIGHT );
- aItems.Put( aHeightItem );
+ SvxFontHeightItem aHeightItem( nPoints, 100, EE_CHAR_FONTHEIGHT );
+ aItems.Put( aHeightItem );
- SvxFontHeightItem aHeightItemCJK( nPoints, 100, EE_CHAR_FONTHEIGHT_CJK );
- aItems.Put( aHeightItemCJK );
+ SvxFontHeightItem aHeightItemCJK( nPoints, 100, EE_CHAR_FONTHEIGHT_CJK );
+ aItems.Put( aHeightItemCJK );
- SvxFontHeightItem aHeightItemCTL( nPoints, 100, EE_CHAR_FONTHEIGHT_CTL );
- aItems.Put( aHeightItemCTL );
+ SvxFontHeightItem aHeightItemCTL( nPoints, 100, EE_CHAR_FONTHEIGHT_CTL );
+ aItems.Put( aHeightItemCTL );
- // Absatzabstaende, wenn Heading:
- if ( !nHLevel || ((nHLevel >= 1) && (nHLevel <= 6)) )
- {
- SvxULSpaceItem aULSpaceItem( EE_PARA_ULSPACE );
- aULSpaceItem.SetUpper( (USHORT)OutputDevice::LogicToLogic( 42, MAP_10TH_MM,
eUnit ) );
- aULSpaceItem.SetLower( (USHORT)OutputDevice::LogicToLogic( 35, MAP_10TH_MM,
eUnit ) );
- aItems.Put( aULSpaceItem );
- }
- }
+ // Absatzabstaende, wenn Heading:
+ if ( !nHLevel || ((nHLevel >= 1) && (nHLevel <= 6)) )
+ {
+ SvxULSpaceItem aULSpaceItem( EE_PARA_ULSPACE );
+ aULSpaceItem.SetUpper( (USHORT)OutputDevice::LogicToLogic( 42, MAP_10TH_MM, eUnit ) );
+ aULSpaceItem.SetLower( (USHORT)OutputDevice::LogicToLogic( 35, MAP_10TH_MM, eUnit ) );
+ aItems.Put( aULSpaceItem );
+ }
+ }
- // Bei Pre einen proportionalen Font waehlen
- if ( nHLevel == STYLE_PRE )
- {
- Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_SYSTEM, 0 );
- SvxFontItem aFontItem( aFont.GetFamily(), aFont.GetName(), XubString(),
aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO );
- aItems.Put( aFontItem );
+ // Bei Pre einen proportionalen Font waehlen
+ if ( nHLevel == STYLE_PRE )
+ {
+ Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_SYSTEM, 0 );
+ SvxFontItem aFontItem( aFont.GetFamily(), aFont.GetName(), XubString(), aFont.GetPitch(),
aFont.GetCharSet(), EE_CHAR_FONTINFO );
+ aItems.Put( aFontItem );
- SvxFontItem aFontItemCJK( aFont.GetFamily(), aFont.GetName(), XubString(),
aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
- aItems.Put( aFontItemCJK );
+ SvxFontItem aFontItemCJK( aFont.GetFamily(), aFont.GetName(), XubString(),
aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
+ aItems.Put( aFontItemCJK );
- SvxFontItem aFontItemCTL( aFont.GetFamily(), aFont.GetName(), XubString(),
aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
- aItems.Put( aFontItemCTL );
- }
+ SvxFontItem aFontItemCTL( aFont.GetFamily(), aFont.GetName(), XubString(),
aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
+ aItems.Put( aFontItemCTL );
+ }
- pImpEditEngine->SetParaAttribs( nNode, aItems );
- }
+ pImpEditEngine->SetParaAttribs( nNode, aItems );
}
void EditHTMLParser::ImpInsertText( const String& rText )
diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index 34d5959..6f66053 100644
--- a/editeng/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -106,7 +106,7 @@ sal_Bool EditDataObject::isDataFlavorSupported( const datatransfer::DataFlavor&
sal_Bool bSupported = sal_False;
ULONG nT = SotExchange::GetFormat( rFlavor );
- if ( ( nT == SOT_FORMAT_STRING ) || ( nT == SOT_FORMAT_RTF ) /* || ( nT == SOT_FORMAT_XML ) */
|| ( nT == SOT_FORMATSTR_ID_EDITENGINE ) )
+ if ( ( nT == SOT_FORMAT_STRING ) || ( nT == SOT_FORMAT_RTF ) || ( nT ==
SOT_FORMATSTR_ID_EDITENGINE ) )
bSupported = sal_True;
return bSupported;
diff --git a/editeng/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx
index f6fa28f..5629721 100644
--- a/editeng/source/editeng/eeobj.hxx
+++ b/editeng/source/editeng/eeobj.hxx
@@ -45,9 +45,6 @@ private:
String maOfficeBookmark;
-// String maNetscapeBookmark;
-// SvMemoryStream maRTFData;
-
public:
EditDataObject();
~EditDataObject();
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index bfb199d..0292f36 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1833,9 +1833,8 @@ void ImpEditView::dragOver( const
::com::sun::star::datatransfer::dnd::DropTarge
if ( GetOutputArea().IsInside( aMousePos ) && !bReadOnly )
{
-// sal_Int8 nSupportedActions = bReadOnly ? datatransfer::dnd::DNDConstants::ACTION_COPY :
datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE;
- if ( pDragAndDropInfo && pDragAndDropInfo->bHasValidData /* && ( nSupportedActions &
rDTDE.DropAction ) MT: Default = 0x80 ?! */ )
+ if ( pDragAndDropInfo && pDragAndDropInfo->bHasValidData )
{
bAccept = sal_True;
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index d610c68..12cebcf 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -80,18 +80,6 @@ using namespace ::com::sun::star;
USHORT lcl_CalcExtraSpace( ParaPortion*, const SvxLineSpacingItem& rLSItem )
{
USHORT nExtra = 0;
- /* if ( ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
- && ( rLSItem.GetPropLineSpace() != 100 ) )
- {
- // ULONG nH = pPortion->GetNode()->GetCharAttribs().GetDefFont().GetSize().Height();
- ULONG nH = pPortion->GetLines().GetObject( 0 )->GetHeight();
- long n = nH * rLSItem.GetPropLineSpace();
- n /= 100;
- n -= nH; // nur den Abstand
- if ( n > 0 )
- nExtra = (USHORT)n;
- }
- else */
if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
{
nExtra = rLSItem.GetInterLineSpace();
@@ -100,10 +88,6 @@ USHORT lcl_CalcExtraSpace( ParaPortion*, const SvxLineSpacingItem& rLSItem )
return nExtra;
}
- // ----------------------------------------------------------------------
-// class ImpEditEngine
-// ----------------------------------------------------------------------
-
ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
aPaperSize( 0x7FFFFFFF, 0x7FFFFFFF ),
aMinAutoPaperSize( 0x0, 0x0 ),
@@ -1043,7 +1027,6 @@ EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const
EditPaM&
if ( !bEmptyLine )
{
String aLine( *aPaM.GetNode(), pLine->GetStart(), pLine->GetEnd() - pLine->GetStart() );
-// USHORT nPosInLine = aPaM.GetIndex() - pLine->GetStart();
const sal_Unicode* pLineString = aLine.GetBuffer();
@@ -1064,7 +1047,7 @@ EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const
EditPaM&
USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTmp,
TRUE );
TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
USHORT nRTLLevel = pTextPortion->GetRightToLeft();
-// BOOL bParaRTL = IsRightToLeft( nPara );
+
BOOL bPortionRTL = nRTLLevel%2 ? TRUE : FALSE;
if ( bStart )
@@ -1096,7 +1079,6 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const
EditPaM
EditLine* pLine = pParaPortion->GetLines().GetObject( nLine );
BOOL bEmptyLine = pLine->GetStart() == pLine->GetEnd();
-// USHORT nCurrentCursorFlags = pEditView->pImpEditView->nExtraCursorFlags;
pEditView->pImpEditView->nExtraCursorFlags = 0;
BOOL bParaRTL = IsRightToLeft( nPara );
@@ -1222,8 +1204,6 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const
EditPaM
{
if ( bWasBehind || bRTLPortion || bBeforePortion )
nVisPos++;
-// if ( bWasBehind && bRTLPortion )
-// nVisPos++;
}
bGotoEndOfPrevLine = nVisPos < 0;
@@ -1233,31 +1213,19 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const
EditPaM
{
USHORT nLogPos = (USHORT)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
-/*
- if ( nLogPos == aPaM.GetIndex() )
- {
- if ( bVisualToLeft )
- bGotoEndOfPrevLine = TRUE;
- else
- bGotoStartOfNextLine = TRUE;
- }
- else
-*/
- {
- aPaM.GetIndex() = pLine->GetStart() + nLogPos;
-
- // RTL portion, stay visually on the left side.
- USHORT _nPortionStart;
- // USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion(
aPaM.GetIndex(), nPortionStart, !bRTLPortion );
- USHORT _nTextPortion = pParaPortion->GetTextPortions().FindPortion(
aPaM.GetIndex(), _nPortionStart, TRUE );
- TextPortion* _pTextPortion = pParaPortion->GetTextPortions().GetObject(
_nTextPortion );
- if ( bVisualToLeft && !bRTLPortion && ( _pTextPortion->GetRightToLeft() % 2 ) )
- aPaM.GetIndex()++;
- else if ( !bVisualToLeft && bRTLPortion && ( bWasBehind ||
!(_pTextPortion->GetRightToLeft() % 2 )) )
- aPaM.GetIndex()++;
-
- pEditView->pImpEditView->SetCursorBidiLevel( _nPortionStart );
- }
+ aPaM.GetIndex() = pLine->GetStart() + nLogPos;
+
+ // RTL portion, stay visually on the left side.
+ USHORT _nPortionStart;
+
+ USHORT _nTextPortion = pParaPortion->GetTextPortions().FindPortion(
aPaM.GetIndex(), _nPortionStart, TRUE );
+ TextPortion* _pTextPortion = pParaPortion->GetTextPortions().GetObject(
_nTextPortion );
+ if ( bVisualToLeft && !bRTLPortion && ( _pTextPortion->GetRightToLeft() % 2 ) )
+ aPaM.GetIndex()++;
+ else if ( !bVisualToLeft && bRTLPortion && ( bWasBehind ||
!(_pTextPortion->GetRightToLeft() % 2 )) )
+ aPaM.GetIndex()++;
+
+ pEditView->pImpEditView->SetCursorBidiLevel( _nPortionStart );
}
}
@@ -1699,9 +1667,6 @@ sal_Bool ImpEditEngine::IsInputSequenceCheckingRequired( sal_Unicode nChar,
cons
return bIsSequenceChecking;
}
-/*************************************************************************
- * lcl_HasStrongLTR
- *************************************************************************/
bool lcl_HasStrongLTR ( const String& rTxt, xub_StrLen nStart, xub_StrLen nEnd )
{
for ( xub_StrLen nCharIdx = nStart; nCharIdx < nEnd; ++nCharIdx )
@@ -1723,8 +1688,6 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara )
ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
rTypes.Remove( 0, rTypes.Count() );
-// pParaPortion->aExtraCharInfos.Remove( 0, pParaPortion->aExtraCharInfos.Count() );
-
ContentNode* pNode = pParaPortion->GetNode();
if ( pNode->Len() )
{
@@ -2091,7 +2054,6 @@ BOOL ImpEditEngine::HasDifferentRTLLevels( const ContentNode* pNode )
BYTE ImpEditEngine::GetRightToLeft( USHORT nPara, USHORT nPos, USHORT* pStart, USHORT* pEnd )
{
-// BYTE nRightToLeft = IsRightToLeft( nPara ) ? 1 : 0;
BYTE nRightToLeft = 0;
ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
@@ -2101,7 +2063,6 @@ BYTE ImpEditEngine::GetRightToLeft( USHORT nPara, USHORT nPos, USHORT*
pStart, U
if ( !pParaPortion->aWritingDirectionInfos.Count() )
InitWritingDirections( nPara );
-// BYTE nType = 0;
WritingDirectionInfos& rDirInfos = pParaPortion->aWritingDirectionInfos;
for ( USHORT n = 0; n < rDirInfos.Count(); n++ )
{
@@ -2152,7 +2113,6 @@ SvxCellVerJustify ImpEditEngine::GetVerJustification( USHORT nPara ) const
return static_cast<SvxCellVerJustify>(rItem.GetEnumValue());
}
-
// ----------------------------------------------------------------------
// Textaenderung
// ----------------------------------------------------------------------
@@ -2167,7 +2127,7 @@ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, USHORT nChars,
EditUndo
USHORT nStart = rPaM.GetIndex();
USHORT nEnd = nStart + nChars;
CharAttribArray& rAttribs = rPaM.GetNode()->GetCharAttribs().GetAttribs();
-// USHORT nAttrs = rAttribs.Count();
+
for ( USHORT nAttr = 0; nAttr < rAttribs.Count(); nAttr++ )
{
EditCharAttrib* pAttr = rAttribs[nAttr];
@@ -3058,7 +3018,6 @@ BOOL ImpEditEngine::UpdateFields()
ContentNode* pNode = GetEditDoc().GetObject( nPara );
DBG_ASSERT( pNode, "NULL-Pointer im Doc" );
CharAttribArray& rAttribs = pNode->GetCharAttribs().GetAttribs();
-// USHORT nAttrs = rAttribs.Count();
for ( USHORT nAttr = 0; nAttr < rAttribs.Count(); nAttr++ )
{
EditCharAttrib* pAttr = rAttribs[nAttr];
@@ -3194,8 +3153,6 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace )
// Ueber alle Absaetze...
// --------------------------------------------------
USHORT nParas = GetParaPortions().Count();
-// USHORT nBiggestPara = 0;
-// USHORT nBiggestLine = 0;
for ( USHORT nPara = 0; nPara < nParas; nPara++ )
{
ParaPortion* pPortion = GetParaPortions().GetObject( nPara );
@@ -3743,24 +3700,6 @@ EditSelection ImpEditEngine::InsertText( uno::Reference<
datatransfer::XTransfer
if ( !bDone )
{
- // Bookmark
- /*
- String aURL = ...;
- String aTxt = ...;
- // Feld nur einfuegen, wenn Factory vorhanden.
- if ( ITEMDATA() && ITEMDATA()->GetClassManager().Get( SVX_URLFIELD ) )
- {
- SvxFieldItem aField( SvxURLField( aURL, aTxt, SVXURLFORMAT_URL ),
EE_FEATURE_FIELD );
- aNewSelection = InsertField( aPaM, aField );
- UpdateFields();
- }
- else
- aNewSelection = ImpInsertText( aPaM, aURL );
- }
- */
- }
- if ( !bDone )
- {
// RTF
SotExchange::GetFormatDataFlavor( SOT_FORMAT_RTF, aFlavor );
if ( rxDataObj->isDataFlavorSupported( aFlavor ) )
@@ -4077,7 +4016,6 @@ long ImpEditEngine::GetPortionXOffset( ParaPortion* pParaPortion, EditLine*
pLin
case PORTIONKIND_TEXT:
case PORTIONKIND_HYPHENATOR:
case PORTIONKIND_TAB:
-// case PORTIONKIND_EXTRASPACE:
{
nX += pPortion->GetSize().Width();
}
@@ -4589,17 +4527,6 @@ BOOL ImpEditEngine::DoVisualCursorTraveling( const ContentNode* )
{
// Don't check if it's necessary, because we also need it when leaving the paragraph
return IsVisualCursorTravelingEnabled();
-/*
- BOOL bDoVisualCursorTraveling = FALSE;
-
- if ( IsVisualCursorTravelingEnabled() && pNode->Len() )
- {
- // Only necessary when RTL text in LTR para or LTR text in RTL para
- bDoVisualCursorTraveling = HasDifferentRTLLevels( pNode );
- }
-
- return bDoVisualCursorTraveling;
-*/
}
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index b37e767..6c16aeb 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -112,7 +112,6 @@ sal_Bool TextConvWrapper::ConvNext_impl()
}
- //ResMgr* pMgr = DIALOG_MGR();
sal_Bool bGoOn = sal_False;
if ( bStartDone && bEndDone )
@@ -162,8 +161,6 @@ sal_Bool TextConvWrapper::FindConvText_impl()
{
// modified version of SvxSpellWrapper::FindSpellError
- //ShowLanguageErrors();
-
sal_Bool bFound = sal_False;
pWin->EnterWait();
--
1.7.1
Context
- [Libreoffice] [Patch] Remove bogus comments and dead code from editeng · Arnaud Versini
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.