summaryrefslogtreecommitdiffstats
path: root/svtools/source/edit
diff options
context:
space:
mode:
Diffstat (limited to 'svtools/source/edit')
-rw-r--r--svtools/source/edit/syntaxhighlight.cxx39
-rw-r--r--svtools/source/edit/textdoc.cxx33
-rw-r--r--svtools/source/edit/textdoc.hxx4
-rw-r--r--svtools/source/edit/texteng.cxx58
-rw-r--r--svtools/source/edit/textundo.cxx41
-rw-r--r--svtools/source/edit/textview.cxx36
-rw-r--r--svtools/source/edit/txtattr.cxx21
7 files changed, 5 insertions, 227 deletions
diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx
index f859e9930cf9..df9c9d1acea9 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.cxx
@@ -237,6 +237,8 @@ extern "C" int CDECL compare_strings( const void *arg1, const void *arg2 )
}
+namespace {
+
class LetterTable
{
bool IsLetterTab[256];
@@ -252,6 +254,8 @@ public:
bool isLetterUnicode( sal_Unicode c );
};
+}
+
class BasicSimpleCharClass
{
static LetterTable aLetterTable;
@@ -671,41 +675,6 @@ sal_Bool SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
return sal_True;
}
-String SimpleTokenizer_Impl::getTokStr
- ( /*out*/const sal_Unicode* pStartPos, /*out*/const sal_Unicode* pEndPos )
-{
- return String( pStartPos, (sal_uInt16)( pEndPos - pStartPos ) );
-}
-
-#ifdef DBG_UTIL
-// TEST: Token ausgeben
-String SimpleTokenizer_Impl::getFullTokenStr( /*out*/TokenTypes eType,
- /*out*/const sal_Unicode* pStartPos, /*out*/const sal_Unicode* pEndPos )
-{
- String aOut;
- switch( eType )
- {
- case TT_UNKNOWN: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_UNKNOWN:") ); break;
- case TT_IDENTIFIER: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_IDENTIFIER:") ); break;
- case TT_WHITESPACE: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_WHITESPACE:") ); break;
- case TT_NUMBER: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_NUMBER:") ); break;
- case TT_STRING: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_STRING:") ); break;
- case TT_EOL: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_EOL:") ); break;
- case TT_COMMENT: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_COMMENT:") ); break;
- case TT_ERROR: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_ERROR:") ); break;
- case TT_OPERATOR: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_OPERATOR:") ); break;
- case TT_KEYWORDS: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_KEYWORD:") ); break;
- case TT_PARAMETER: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_PARAMETER:") ); break;
- }
- if( eType != TT_EOL )
- {
- aOut += String( pStartPos, (sal_uInt16)( pEndPos - pStartPos ) );
- }
- aOut += String( RTL_CONSTASCII_USTRINGPARAM("\n") );
- return aOut;
-}
-#endif
-
SimpleTokenizer_Impl::SimpleTokenizer_Impl( HighlighterLanguage aLang ): aLanguage(aLang)
{
memset( aCharTypeTab, 0, sizeof( aCharTypeTab ) );
diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx
index fa7536035288..615ac1258f4d 100644
--- a/svtools/source/edit/textdoc.cxx
+++ b/svtools/source/edit/textdoc.cxx
@@ -216,23 +216,6 @@ void TextCharAttribList::DeleteEmptyAttribs()
mbHasEmptyAttribs = sal_False;
}
-#ifdef DBG_UTIL
-sal_Bool TextCharAttribList::DbgCheckAttribs()
-{
- sal_Bool bOK = sal_True;
- for ( sal_uInt16 nAttr = 0; nAttr < Count(); nAttr++ )
- {
- TextCharAttrib* pAttr = GetObject( nAttr );
- if ( pAttr->GetStart() > pAttr->GetEnd() )
- {
- bOK = sal_False;
- OSL_FAIL( "Attr verdreht" );
- }
- }
- return bOK;
-}
-#endif
-
// -------------------------------------------------------------------------
// (+) class TextNode
// -------------------------------------------------------------------------
@@ -307,10 +290,6 @@ void TextNode::ExpandAttribs( sal_uInt16 nIndex, sal_uInt16 nNew )
if ( bResort )
maCharAttribs.ResortAttribs();
-
-#ifdef EDITDEBUG
- DBG_ASSERT( CheckOrderedList( (TextCharAttribs*)&maCharAttribs ), "Expand: Start-Liste verdreht" );
-#endif
}
void TextNode::CollapsAttribs( sal_uInt16 nIndex, sal_uInt16 nDeleted )
@@ -374,10 +353,6 @@ void TextNode::CollapsAttribs( sal_uInt16 nIndex, sal_uInt16 nDeleted )
if ( bResort )
maCharAttribs.ResortAttribs();
-
-#ifdef EDITDEBUG
- DBG_ASSERT( CheckOrderedList( (TextCharAttribs)&maCharAttribs ), "Collaps: Start-Liste verdreht" );
-#endif
}
void TextNode::InsertText( sal_uInt16 nPos, const String& rText )
@@ -460,10 +435,6 @@ void TextNode::Append( const TextNode& rNode )
maText += rNode.GetText();
-#ifdef EDITDEBUG
- DBG_ASSERT( maCharAttribs.DbgCheckAttribs(), "Attribute VOR AppendAttribs kaputt" );
-#endif
-
const sal_uInt16 nAttribs = rNode.GetCharAttribs().Count();
for ( sal_uInt16 nAttr = 0; nAttr < nAttribs; nAttr++ )
{
@@ -499,10 +470,6 @@ void TextNode::Append( const TextNode& rNode )
maCharAttribs.InsertAttrib( pNewAttrib );
}
}
-
-#ifdef EDITDEBUG
- DBG_ASSERT( maCharAttribs.DbgCheckAttribs(), "Attribute NACH AppendAttribs kaputt" );
-#endif
}
// -------------------------------------------------------------------------
diff --git a/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx
index c52190ca4d63..41a134da4899 100644
--- a/svtools/source/edit/textdoc.hxx
+++ b/svtools/source/edit/textdoc.hxx
@@ -69,10 +69,6 @@ public:
TextCharAttrib* FindEmptyAttrib( sal_uInt16 nWhich, sal_uInt16 nPos );
sal_Bool HasAttrib( sal_uInt16 nWhich ) const;
sal_Bool HasBoundingAttrib( sal_uInt16 nBound );
-
-#ifdef DBG_UTIL
- sal_Bool DbgCheckAttribs();
-#endif
};
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index 15412276e587..9decddde44f9 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -253,12 +253,6 @@ void TextEngine::SetFont( const Font& rFont )
}
}
-void TextEngine::SetDefTab( sal_uInt16 nDefTab )
-{
- mnDefTab = nDefTab;
- // evtl neu setzen?
-}
-
void TextEngine::SetMaxTextLen( sal_uLong nLen )
{
mnMaxTextLen = nLen;
@@ -359,29 +353,6 @@ void TextEngine::SetUpdateMode( sal_Bool bUpdate )
}
}
-sal_Bool TextEngine::DoesKeyMoveCursor( const KeyEvent& rKeyEvent )
-{
- sal_Bool bDoesMove = sal_False;
-
- switch ( rKeyEvent.GetKeyCode().GetCode() )
- {
- case KEY_UP:
- case KEY_DOWN:
- case KEY_LEFT:
- case KEY_RIGHT:
- case KEY_HOME:
- case KEY_END:
- case KEY_PAGEUP:
- case KEY_PAGEDOWN:
- {
- if ( !rKeyEvent.GetKeyCode().IsMod2() )
- bDoesMove = sal_True;
- }
- break;
- }
- return bDoesMove;
-}
-
sal_Bool TextEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent )
{
sal_Bool bDoesChange = sal_False;
@@ -1509,11 +1480,7 @@ void TextEngine::SeekCursor( sal_uLong nPara, sal_uInt16 nPos, Font& rFont, Outp
if ( ( ( pAttrib->GetStart() < nPos ) && ( pAttrib->GetEnd() >= nPos ) )
|| !pNode->GetText().Len() )
{
- if ( pAttrib->Which() != TEXTATTR_FONTCOLOR )
- {
- pAttrib->GetAttr().SetFont( rFont );
- }
- else
+ if ( pAttrib->Which() == TEXTATTR_FONTCOLOR )
{
if ( pOutDev )
pOutDev->SetTextColor( ((TextAttribFontColor&)pAttrib->GetAttr()).GetColor() );
@@ -1553,15 +1520,6 @@ void TextEngine::SeekCursor( sal_uLong nPara, sal_uInt16 nPos, Font& rFont, Outp
}
}
-void TextEngine::SetUpdateMode( sal_Bool bUp, TextView* pCurView, sal_Bool bForceUpdate )
-{
- sal_Bool bChanged = ( GetUpdateMode() != bUp );
-
- mbUpdate = bUp;
- if ( mbUpdate && ( bChanged || bForceUpdate ) )
- FormatAndUpdate( pCurView );
-}
-
void TextEngine::FormatAndUpdate( TextView* pCurView )
{
if ( mbDowning )
@@ -1953,9 +1911,6 @@ void TextEngine::CreateTextPortions( sal_uLong nPara, sal_uInt16 nStartPos )
}
DBG_ASSERT( pTEParaPortion->GetTextPortions().Count(), "Keine Portions?!" );
-#ifdef EDITDEBUG
- DBG_ASSERT( pTEParaPortion->DbgCheckTextPortions(), "Portions kaputt?" );
-#endif
}
void TextEngine::RecalcTextPortion( sal_uLong nPara, sal_uInt16 nStartPos, short nNewChars )
@@ -2048,10 +2003,6 @@ void TextEngine::RecalcTextPortion( sal_uLong nPara, sal_uInt16 nStartPos, short
}
DBG_ASSERT( pTEParaPortion->GetTextPortions().Count(), "RecalcTextPortions: Keine mehr da!" );
}
-
-#ifdef EDITDEBUG
- DBG_ASSERT( pTEParaPortion->DbgCheckTextPortions(), "Portions kaputt?" );
-#endif
}
void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange, TextSelection const* pSelection )
@@ -2242,13 +2193,6 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
pOutDev->Erase( aTabArea );
}
}
-#ifdef EDITDEBUG
- Rectangle aTabArea( aTmpPos, Point( aTmpPos.X()+nTxtWidth, aTmpPos.Y()+mnCharHeight-1 ) );
- Color aOldColor = pOutDev->GetFillColor();
- pOutDev->SetFillColor( (y%2) ? COL_RED : COL_GREEN );
- pOutDev->DrawRect( aTabArea );
- pOutDev->SetFillColor( aOldColor );
-#endif
}
break;
default: OSL_FAIL( "ImpPaint: Unknown Portion-Type !" );
diff --git a/svtools/source/edit/textundo.cxx b/svtools/source/edit/textundo.cxx
index 660c272397f5..56aea0d2c0fa 100644
--- a/svtools/source/edit/textundo.cxx
+++ b/svtools/source/edit/textundo.cxx
@@ -43,7 +43,6 @@ TYPEINIT1( TextUndoConnectParas, TextUndo );
TYPEINIT1( TextUndoSplitPara, TextUndo );
TYPEINIT1( TextUndoInsertChars, TextUndo );
TYPEINIT1( TextUndoRemoveChars, TextUndo );
-TYPEINIT1( TextUndoSetAttribs, TextUndo );
TextUndoManager::TextUndoManager( TextEngine* p )
@@ -296,44 +295,4 @@ void TextUndoRemoveChars::Redo()
SetSelection( aPaM );
}
-
-TextUndoSetAttribs::TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelection& rSel )
- : TextUndo( pTextEngine ), maSelection( rSel )
-{
- maSelection.Justify();
-// aNewAttribs.Set( rNewItems );
-// mbSetIsRemove = sal_False;
-// mnRemoveWhich = 0;
-// mnSpecial = 0;
-}
-
-TextUndoSetAttribs::~TextUndoSetAttribs()
-{
- // ...............
-}
-
-void TextUndoSetAttribs::Undo()
-{
- for ( sal_uLong nPara = maSelection.GetStart().GetPara(); nPara <= maSelection.GetEnd().GetPara(); nPara++ )
- {
-// ContentAttribsInfo* pInf = aPrevAttribs[ (sal_uInt16)(nPara-aESel.nStartPara) ];
-// GetTextEngine()->RemoveCharAttribs( nPara );
-// TextNode* pNode = GetTextEngine()->GetTextDoc().GetObject( nPara );
-// for ( sal_uInt16 nAttr = 0; nAttr < pInf->GetPrevCharAttribs().Count(); nAttr++ )
-// {
-// GetTextEngine()->GetTextDoc().InsertAttrib( pNode, pX->GetStart(), pX->GetEnd(), *pX->GetItem() );
-// }
- }
- SetSelection( maSelection );
-}
-
-void TextUndoSetAttribs::Redo()
-{
-// if ( !bSetIsRemove )
-// GetTextEngine()->SetAttribs( aSel, aNewAttribs, nSpecial );
-// else
-// GetTextEngine()->RemoveCharAttribs( aSel, bRemoveParaAttribs, nRemoveWhich );
- SetSelection( maSelection );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx
index f2b370a9a923..1ee50008aeaf 100644
--- a/svtools/source/edit/textview.cxx
+++ b/svtools/source/edit/textview.cxx
@@ -1427,22 +1427,6 @@ void TextView::InsertText( const XubString& rStr, sal_Bool bSelect )
}
*/
-// OLD
-TextPaM TextView::CursorLeft( const TextPaM& rPaM, sal_Bool bWordMode )
-{
- return bWordMode ? CursorWordLeft( rPaM ) : CursorLeft( rPaM, (sal_uInt16)i18n::CharacterIteratorMode::SKIPCELL );
-
- // Remove (sal_uInt16) typecasts in this file when removing this method!
-}
-
-// OLD
-TextPaM TextView::CursorRight( const TextPaM& rPaM, sal_Bool bWordMode )
-{
- return bWordMode ? CursorWordRight( rPaM ) : CursorRight( rPaM, (sal_uInt16)i18n::CharacterIteratorMode::SKIPCELL );
-
- // Remove (sal_uInt16) typecasts in this file when removing this method!
-}
-
TextPaM TextView::CursorLeft( const TextPaM& rPaM, sal_uInt16 nCharacterIteratorMode )
{
TextPaM aPaM( rPaM );
@@ -2006,15 +1990,6 @@ void TextView::SetPaintSelection( sal_Bool bPaint )
}
}
-void TextView::SetHighlightSelection( sal_Bool bSelectByHighlight )
-{
- if ( bSelectByHighlight != mpImpl->mbHighlightSelection )
- {
- // Falls umschalten zwischendurch moeglich...
- mpImpl->mbHighlightSelection = bSelectByHighlight;
- }
-}
-
sal_Bool TextView::Read( SvStream& rInput )
{
sal_Bool bDone = mpImpl->mpTextEngine->Read( rInput, &mpImpl->maSelection );
@@ -2022,11 +1997,6 @@ sal_Bool TextView::Read( SvStream& rInput )
return bDone;
}
-sal_Bool TextView::Write( SvStream& rOutput )
-{
- return mpImpl->mpTextEngine->Read( rOutput, &mpImpl->maSelection );
-}
-
bool TextView::ImplTruncateNewText( rtl::OUString& rNewText ) const
{
bool bTruncated = false;
@@ -2439,18 +2409,12 @@ const Point& TextView::GetStartDocPos() const
{ return mpImpl->maStartDocPos; }
void TextView::SetAutoIndentMode( sal_Bool bAutoIndent )
{ mpImpl->mbAutoIndent = bAutoIndent; }
-sal_Bool TextView::IsAutoIndentMode() const
-{ return mpImpl->mbAutoIndent; }
sal_Bool TextView::IsReadOnly() const
{ return mpImpl->mbReadOnly; }
void TextView::SetAutoScroll( sal_Bool bAutoScroll )
{ mpImpl->mbAutoScroll = bAutoScroll; }
sal_Bool TextView::IsAutoScroll() const
{ return mpImpl->mbAutoScroll; }
-sal_Bool TextView::IsPaintSelection() const
-{ return mpImpl->mbPaintSelection; }
-sal_Bool TextView::IsHighlightSelection() const
-{ return mpImpl->mbHighlightSelection; }
sal_Bool TextView::HasSelection() const
{ return mpImpl->maSelection.HasRange(); }
sal_Bool TextView::IsInsertMode() const
diff --git a/svtools/source/edit/txtattr.cxx b/svtools/source/edit/txtattr.cxx
index 022a40ae848f..e932cbee585a 100644
--- a/svtools/source/edit/txtattr.cxx
+++ b/svtools/source/edit/txtattr.cxx
@@ -39,15 +39,6 @@ TextAttrib::~TextAttrib()
{
}
-void TextAttrib::SetFont( Font& ) const
-{
-}
-
-TextAttrib* TextAttrib::Clone() const
-{
- return NULL;
-}
-
int TextAttrib::operator==( const TextAttrib& rAttr ) const
{
return mnWhich == rAttr.mnWhich;
@@ -115,18 +106,6 @@ int TextAttribFontWeight::operator==( const TextAttrib& rAttr ) const
}
-TextAttribHyperLink::TextAttribHyperLink( const XubString& rURL )
- : TextAttrib( TEXTATTR_HYPERLINK ), maURL( rURL )
-{
- maColor = COL_BLUE;
-}
-
-TextAttribHyperLink::TextAttribHyperLink( const XubString& rURL, const XubString& rDescription )
- : TextAttrib( TEXTATTR_HYPERLINK ), maURL( rURL ), maDescription( rDescription )
-{
- maColor = COL_BLUE;
-}
-
TextAttribHyperLink::TextAttribHyperLink( const TextAttribHyperLink& rAttr )
: TextAttrib( rAttr ), maURL( rAttr.maURL ), maDescription( rAttr.maDescription )
{
generated by cgit (git 2.34.1) at 2024-08-21 12:15:06 +0000