[Libreoffice-commits] .: binfilter/bf_sd binfilter/bf_svx binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Wed Sep 14 20:50:20 PDT 2011
binfilter/bf_sd/source/core/sd_drawdoc.cxx | 12 -
binfilter/bf_svx/source/editeng/editdoc.hxx | 5
binfilter/bf_svx/source/editeng/editobj2.hxx | 11 +
binfilter/bf_svx/source/editeng/editsel.hxx | 23 ++-
binfilter/bf_svx/source/editeng/editundo.hxx | 9 -
binfilter/bf_svx/source/editeng/impedit.hxx | 4
binfilter/bf_svx/source/editeng/svx_editdoc2.cxx | 68 -----------
binfilter/bf_svx/source/editeng/svx_editeng.cxx | 114 ++++++------------
binfilter/bf_svx/source/editeng/svx_editobj.cxx | 109 -----------------
binfilter/bf_svx/source/editeng/svx_editsel.cxx | 39 ------
binfilter/bf_svx/source/editeng/svx_editundo.cxx | 140 ++++++++---------------
binfilter/bf_svx/source/editeng/svx_editview.cxx | 30 ----
binfilter/bf_svx/source/editeng/svx_impedit.cxx | 40 ------
binfilter/bf_svx/source/editeng/svx_impedit2.cxx | 36 -----
binfilter/bf_svx/source/editeng/svx_impedit3.cxx | 121 -------------------
binfilter/bf_svx/source/editeng/svx_impedit4.cxx | 1
binfilter/bf_svx/source/outliner/svx_outlin2.cxx | 13 +-
binfilter/bf_svx/source/unoedit/svx_unoedhlp.cxx | 44 +------
binfilter/bf_svx/source/unoedit/svx_unofored.cxx | 108 ++---------------
binfilter/bf_svx/source/unoedit/svx_unoviwed.cxx | 9 -
binfilter/inc/bf_svx/editeng.hxx | 7 -
binfilter/inc/bf_svx/editobj.hxx | 83 +++++++++----
binfilter/inc/bf_svx/editview.hxx | 3
23 files changed, 213 insertions(+), 816 deletions(-)
New commits:
commit ef3be94313da90d0333fda4e958fdfecd65575a8
Author: Joseph Powers <jpowers27 at cox.net>
Date: Wed Sep 14 20:23:09 2011 -0700
Cleanup of DBG_BF_ASSERT() in bf_svx
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc.cxx b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
index 08d1942..db674c8 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
@@ -687,11 +687,6 @@ SvStream& operator >> (SvStream& rIn, SdDrawDocument& rDoc)
else
rDoc.SetPresPause( 0 );
- if (rDoc.nFileFormatVersion >= 18)
- {
- // Keine Aenderung
- }
-
/**************************************************************************
* So machts der Writer, und so muessen es alle machen:
* Bug 9714: Der CharSet an den Fonts muss geaendert werden, wenn
@@ -771,13 +766,6 @@ void SdDrawDocument::SetPresMouseAsPen(BOOL bNewPresMouseAsPen)
/*************************************************************************
|*
-|* "Ab Dia"-Parameter der Praesentation aendern
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* SetChanged(), das Model wurde geaendert
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/editeng/editdoc.hxx b/binfilter/bf_svx/source/editeng/editdoc.hxx
index 1b146fd..a4af2c9 100644
--- a/binfilter/bf_svx/source/editeng/editdoc.hxx
+++ b/binfilter/bf_svx/source/editeng/editdoc.hxx
@@ -291,9 +291,6 @@ struct ExtraPortionInfo
BOOL bCompressed;
long* pOrgDXArray;
-
- ~ExtraPortionInfo();
-
};
@@ -356,7 +353,7 @@ SV_DECL_PTRARR( TextPortionArray, TextPortionPtr, 0, 8 )
class TextPortionList : public TextPortionArray
{
public:
- TextPortionList();
+ TextPortionList() {};
~TextPortionList();
void Reset();
diff --git a/binfilter/bf_svx/source/editeng/editobj2.hxx b/binfilter/bf_svx/source/editeng/editobj2.hxx
index fc92826..6cf4b2c 100644
--- a/binfilter/bf_svx/source/editeng/editobj2.hxx
+++ b/binfilter/bf_svx/source/editeng/editobj2.hxx
@@ -233,9 +233,6 @@ public:
virtual void ClearPortionInfo();
-
-
-
virtual void MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart, USHORT nEnd );
virtual BOOL HasField( TypeId Type = NULL ) const;
@@ -243,7 +240,13 @@ public:
SfxItemSet GetParaAttribs( USHORT nPara ) const;
virtual void GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamily& eFamily ) const;
- virtual void SetStyleSheet( USHORT nPara, const XubString& rName, const SfxStyleFamily& eFamily );
+
+ virtual void SetStyleSheet(
+ USHORT /* nPara */,
+ const XubString& /* rName */,
+ const SfxStyleFamily& /* eFamily */
+ ) {}
+
virtual BOOL ChangeStyleSheets( const XubString& rOldName, SfxStyleFamily eOldFamily,
const String& rNewName, SfxStyleFamily eNewFamily );
virtual void ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName );
diff --git a/binfilter/bf_svx/source/editeng/editsel.hxx b/binfilter/bf_svx/source/editeng/editsel.hxx
index 2fa7e75..2645879 100644
--- a/binfilter/bf_svx/source/editeng/editsel.hxx
+++ b/binfilter/bf_svx/source/editeng/editsel.hxx
@@ -45,16 +45,23 @@ private:
public:
EditSelFunctionSet();
- virtual void BeginDrag();
+ virtual void BeginDrag() {}
+ virtual void CreateAnchor() {}
+ virtual void DestroyAnchor() {}
- virtual void CreateAnchor();
- virtual void DestroyAnchor();
+ virtual BOOL SetCursorAtPoint(
+ const Point& /* rPointPixel */,
+ BOOL bDontSelectAtCursor = FALSE
+ )
+ { return FALSE; }
- virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE );
+ virtual BOOL IsSelectionAtPoint( const Point& /* rPointPixel */ )
+ { return FALSE; }
- virtual BOOL IsSelectionAtPoint( const Point& rPointPixel );
- virtual void DeselectAtPoint( const Point& rPointPixel );
- virtual void DeselectAll();
+ virtual void DeselectAtPoint( const Point& /* rPointPixel */ )
+ {}
+
+ virtual void DeselectAll() {}
void SetCurView( EditView* pView ) { pCurView = pView; }
EditView* GetCurView() { return pCurView; }
@@ -65,8 +72,6 @@ public:
// ----------------------------------------------------------------------
class EditSelectionEngine : public SelectionEngine
{
-private:
-
public:
EditSelectionEngine();
diff --git a/binfilter/bf_svx/source/editeng/editundo.hxx b/binfilter/bf_svx/source/editeng/editundo.hxx
index 51fcf6f..e748162 100644
--- a/binfilter/bf_svx/source/editeng/editundo.hxx
+++ b/binfilter/bf_svx/source/editeng/editundo.hxx
@@ -56,9 +56,6 @@ public:
TYPEINFO();
EditUndoInsertChars( ImpEditEngine* pImpEE, const EPaM& rEPaM, const String& rStr );
- const EPaM& GetEPaM() { return aEPaM; }
- String& GetStr() { return aText; }
-
virtual void Undo();
virtual void Redo();
virtual void Repeat();
@@ -69,10 +66,6 @@ public:
};
// -----------------------------------------------------------------------
-// EditUndoRemoveChars
-// ------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
// EditUndoInsertFeature
// ------------------------------------------------------------------------
class EditUndoInsertFeature : public EditUndo
@@ -112,7 +105,6 @@ public:
const XubString& rPrevName, SfxStyleFamily ePrevFamily,
const XubString& rNewName, SfxStyleFamily eNewFamily,
const SfxItemSet& rPrevParaAttribs );
- ~EditUndoSetStyleSheet();
virtual void Undo();
virtual void Redo();
@@ -133,7 +125,6 @@ private:
public:
EditUndoSetParaAttribs( ImpEditEngine* pImpEE, USHORT nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems );
- ~EditUndoSetParaAttribs();
virtual void Undo();
virtual void Redo();
diff --git a/binfilter/bf_svx/source/editeng/impedit.hxx b/binfilter/bf_svx/source/editeng/impedit.hxx
index 8d30c67..16525d0 100644
--- a/binfilter/bf_svx/source/editeng/impedit.hxx
+++ b/binfilter/bf_svx/source/editeng/impedit.hxx
@@ -209,7 +209,6 @@ public:
EVAnchorMode GetAnchorMode() const { return eAnchorMode; }
void ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, BOOL test );
- void ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, USHORT nShowCursorFlags = 0 );
sal_Bool IsInsertMode() const { return ( ( nControl & EV_CNTRL_OVERWRITE ) == 0 ); }
@@ -221,7 +220,6 @@ public:
sal_Bool DoBigScroll() const { return ( ( nControl & EV_CNTRL_BIGSCROLL ) != 0 ); }
sal_Bool DoAutoSize() const { return ( ( nControl & EV_CNTRL_AUTOSIZE ) != 0 ); }
sal_Bool DoAutoWidth() const { return ( ( nControl & EV_CNTRL_AUTOSIZEX) != 0 ); }
- sal_Bool DoAutoHeight() const { return ( ( nControl & EV_CNTRL_AUTOSIZEY) != 0 ); }
sal_Bool DoInvalidateMore() const { return ( ( nControl & EV_CNTRL_INVONEMORE ) != 0 ); }
const Color& GetBackgroundColor() const {
@@ -355,7 +353,6 @@ private:
// Methoden...
// ================================================================
- void CursorMoved( ContentNode* pPrevNode );
void ParaAttribsChanged( ContentNode* pNode );
void TextModified();
void CalcHeight( ParaPortion* pPortion );
@@ -815,7 +812,6 @@ inline Cursor* ImpEditView::GetCursor()
return pCursor;
}
-void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit );
BYTE GetCharTypeForCompression( xub_Unicode cChar );
Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin );
diff --git a/binfilter/bf_svx/source/editeng/svx_editdoc2.cxx b/binfilter/bf_svx/source/editeng/svx_editdoc2.cxx
index cd97fd9..09bb002 100644
--- a/binfilter/bf_svx/source/editeng/svx_editdoc2.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editdoc2.cxx
@@ -49,35 +49,13 @@
namespace binfilter {
-/*N*/ DBG_NAME( EE_ParaPortion )
+DBG_NAME( EE_ParaPortion )
-/*N*/ 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;
-}
-
-*/
+SV_IMPL_VARARR( CharPosArray, sal_Int32 );
// -------------------------------------------------------------------------
// class TextPortionList
// -------------------------------------------------------------------------
-/*N*/ TextPortionList::TextPortionList()
-/*N*/ {
-/*N*/ }
-
/*N*/ TextPortionList::~TextPortionList()
/*N*/ {
/*N*/ Reset();
@@ -120,10 +98,6 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle )
/*?*/ return ( Count() - 1 );
/*N*/ }
-/*N*/ ExtraPortionInfo::~ExtraPortionInfo()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
// -------------------------------------------------------------------------
// class ParaPortion
// -------------------------------------------------------------------------
@@ -152,7 +126,6 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle )
/*N*/ {
/*N*/ if ( bInvalid == FALSE )
/*N*/ {
-/*N*/ // nInvalidPosEnd = nStart; // ??? => CreateLines
/*N*/ nInvalidPosStart = ( nDiff >= 0 ) ? nStart : ( nStart + nDiff );
/*N*/ nInvalidDiff = nDiff;
/*N*/ }
@@ -172,7 +145,6 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle )
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ // nInvalidPosEnd = pNode->Len();
/*N*/ DBG_ASSERT( ( nDiff >= 0 ) || ( (nStart+nDiff) >= 0 ), "MarkInvalid: Diff out of Range" );
/*N*/ nInvalidPosStart = Min( nInvalidPosStart, (USHORT) ( nDiff < 0 ? nStart+nDiff : nDiff ) );
/*N*/ nInvalidDiff = 0;
@@ -182,7 +154,6 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle )
/*N*/ bInvalid = TRUE;
/*N*/ aScriptInfos.Remove( 0, aScriptInfos.Count() );
/*N*/ aWritingDirectionInfos.Remove( 0, aWritingDirectionInfos.Count() );
-/*N*/ // aExtraCharInfos.Remove( 0, aExtraCharInfos.Count() );
/*N*/ }
/*N*/ void ParaPortion::MarkSelectionInvalid( USHORT nStart, USHORT /*nEnd*/ )
@@ -196,7 +167,6 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle )
/*N*/ bSimple = FALSE;
/*N*/ aScriptInfos.Remove( 0, aScriptInfos.Count() );
/*N*/ aWritingDirectionInfos.Remove( 0, aWritingDirectionInfos.Count() );
-/*N*/ // aExtraCharInfos.Remove( 0, aExtraCharInfos.Count() );
/*N*/ }
/*N*/ USHORT ParaPortion::GetLineNumber( USHORT nIndex )
@@ -298,40 +268,6 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle )
/*N*/ return 0xFFFF; // solte mal ueber EE_PARA_NOT_FOUND erreicht werden!
/*N*/ }
-
-
-
-
-/*N*/ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit, MapUnit )
-/*N*/ {
-/*N*/ switch ( rPoolItem.Which() )
-/*N*/ {
-/*N*/ case EE_PARA_LRSPACE:
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ break;
-/*N*/ case EE_PARA_ULSPACE:
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ break;
-/*N*/ case EE_PARA_SBL:
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ break;
-/*N*/ case EE_PARA_TABS:
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ break;
-/*N*/ case EE_CHAR_FONTHEIGHT:
-/*N*/ case EE_CHAR_FONTHEIGHT_CJK:
-/*N*/ case EE_CHAR_FONTHEIGHT_CTL:
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ break;
-/*N*/ }
-/*N*/ }
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/editeng/svx_editeng.cxx b/binfilter/bf_svx/source/editeng/svx_editeng.cxx
index 0de5dde..9fccca0 100644
--- a/binfilter/bf_svx/source/editeng/svx_editeng.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editeng.cxx
@@ -235,11 +235,6 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
/*N*/ sal_Bool bAutoPageSize = pImpEditEngine->GetStatus().AutoPageSize();
/*N*/ if ( bAutoPageSize || ( aNewSize.Width() != aOldSize.Width() ) )
/*N*/ {
-/*N*/ for ( sal_uInt16 nView = 0; nView < pImpEditEngine->aEditViews.Count(); nView++ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ if ( bAutoPageSize || pImpEditEngine->IsFormatted() )
/*N*/ {
/*N*/ // Aendern der Breite hat bei AutoPageSize keine Wirkung, da durch
@@ -354,14 +349,6 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
/*N*/ return pImpEditEngine->GetLineCount( nParagraph );
/*N*/ }
-/*N*/ sal_uInt16 EditEngine::GetLineLen( sal_uInt16, sal_uInt16 ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
-/*?*/ sal_uInt32 EditEngine::GetLineHeight( sal_uInt16, sal_uInt16 )
-/*?*/ {{DBG_BF_ASSERT(0, "STRIP");} return 0;
-/*?*/ }
-
/*N*/ sal_uInt16 EditEngine::GetFirstLineOffset( sal_uInt16 nParagraph )
/*N*/ {
/*N*/ DBG_CHKTHIS( EditEngine, 0 );
@@ -371,11 +358,6 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
/*N*/ return ( pPortion ? pPortion->GetFirstLineOffset() : 0 );
/*N*/ }
-/*N*/ sal_uInt32 EditEngine::GetTextHeight( sal_uInt16 ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
-
/*N*/ ESelection EditEngine::GetWord( const ESelection& rSelection, USHORT nWordType ) const
/*N*/ {
/*N*/ // ImpEditEngine-Iteration-Methods should be const!
@@ -591,10 +573,6 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
/*N*/ return pImpEditEngine->GetParaAttrib( nPara, nWhich );
/*N*/ }
-/*N*/ void EditEngine::GetCharAttribs( sal_uInt16, EECharAttribArray& ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib )
/*N*/ {
/*N*/ DBG_CHKTHIS( EditEngine, 0 );
@@ -999,12 +977,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
/*N*/ Rectangle EditEngine::GetCharacterBounds( const EPosition& rPos ) const
/*N*/ {
/*N*/ Rectangle aBounds;
-/*N*/ ContentNode* pNode = pImpEditEngine->GetEditDoc().SaveGetObject( rPos.nPara );
-/*N*/
-/*N*/ // #109151# Check against index, not paragraph
-/*N*/ if ( pNode && ( rPos.nIndex < pNode->Len() ) )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+/*N*/ pImpEditEngine->GetEditDoc().SaveGetObject( rPos.nPara );
/*N*/ return aBounds;
/*N*/ }
@@ -1041,58 +1014,49 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
// =====================================================================
// ====================== Virtuelle Methoden =======================
// =====================================================================
-/*N*/ void EditEngine::DrawingText( const Point&, const XubString&, USHORT, USHORT, const sal_Int32*, const SvxFont&, sal_uInt16, sal_uInt16, BYTE )
-/*N*/ {
-/*N*/ DBG_CHKTHIS( EditEngine, 0 );
-/*N*/ }
+void EditEngine::DrawingText( const Point&, const XubString&, USHORT, USHORT, const sal_Int32*, const SvxFont&, sal_uInt16, sal_uInt16, BYTE )
+{
+ DBG_CHKTHIS( EditEngine, 0 );
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
-/*N*/ void EditEngine::PaintingFirstLine( sal_uInt16, const Point&, long, const Point&, short, OutputDevice* )
-/*N*/ {
-/*N*/ DBG_CHKTHIS( EditEngine, 0 );
-/*N*/ }
+void EditEngine::PaintingFirstLine( sal_uInt16, const Point&, long, const Point&, short, OutputDevice* )
+{
+ DBG_CHKTHIS( EditEngine, 0 );
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
-/*N*/ void EditEngine::ParagraphInserted( sal_uInt16 )
-/*N*/ {
-/*N*/ DBG_CHKTHIS( EditEngine, 0 );
-/*N*/
-/*N*/ if ( GetNotifyHdl().IsSet() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
+void EditEngine::ParagraphInserted( sal_uInt16 )
+{
+ DBG_CHKTHIS( EditEngine, 0 );
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
-/*N*/ void EditEngine::ParagraphDeleted( sal_uInt16 )
-/*N*/ {
-/*N*/ DBG_CHKTHIS( EditEngine, 0 );
-/*N*/
-/*N*/ if ( GetNotifyHdl().IsSet() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
+void EditEngine::ParagraphDeleted( sal_uInt16 )
+{
+ DBG_CHKTHIS( EditEngine, 0 );
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
-/*N*/ sal_Bool EditEngine::FormattingParagraph( sal_uInt16 )
-/*N*/ {
-/*N*/ // return sal_True, wenn die Attribute geaendert wurden...
-/*N*/ DBG_CHKTHIS( EditEngine, 0 );
-/*N*/ return sal_False;
-/*N*/ }
+sal_Bool EditEngine::FormattingParagraph( sal_uInt16 )
+{
+ DBG_CHKTHIS( EditEngine, 0 );
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ return sal_False;
+}
-/*N*/ void EditEngine::ParaAttribsChanged( sal_uInt16 /* nParagraph */ )
-/*N*/ {
-/*N*/ DBG_CHKTHIS( EditEngine, 0 );
-/*N*/ }
+void EditEngine::ParaAttribsChanged( sal_uInt16 /* nParagraph */ )
+{
+ DBG_CHKTHIS( EditEngine, 0 );
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
-/*N*/ void EditEngine::ParagraphHeightChanged( sal_uInt16 )
-/*N*/ {
-/*N*/ DBG_CHKTHIS( EditEngine, 0 );
-/*N*/
-/*N*/ if ( GetNotifyHdl().IsSet() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
+void EditEngine::ParagraphHeightChanged( sal_uInt16 )
+{
+ DBG_CHKTHIS( EditEngine, 0 );
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
/*N*/ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
/*N*/ {
@@ -1253,10 +1217,6 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
/*N*/ {
/*N*/ pNumberFormat->SetBulletChar( pOldBullet->GetSymbol() );
/*N*/ }
-/*N*/ else if( eNumType == SVX_NUM_BITMAP )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/
/*N*/ // Einzug und Erstzeileneinzug
diff --git a/binfilter/bf_svx/source/editeng/svx_editobj.cxx b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
index 56031de..ed4d700 100644
--- a/binfilter/bf_svx/source/editeng/svx_editobj.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
@@ -159,94 +159,13 @@ EditTextObject::~EditTextObject()
DBG_DTOR( EE_EditTextObject, 0 );
}
-USHORT EditTextObject::GetParagraphCount() const
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
- return 0;
-}
-
-XubString EditTextObject::GetText( USHORT ) const
-{DBG_BF_ASSERT(0, "STRIP"); return XubString();
-}
-
-void EditTextObject::Insert( const EditTextObject&, USHORT )
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
-}
-
-void EditTextObject::ClearPortionInfo()
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
-}
-
-void EditTextObject::MergeParaAttribs( const SfxItemSet&, USHORT, USHORT )
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
-}
-
-
-
-BOOL EditTextObject::HasField( TypeId ) const
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
- return FALSE;
-}
-
SfxItemSet EditTextObject::GetParaAttribs( USHORT ) const
{
OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
return SfxItemSet( *(SfxItemPool*)NULL );
}
-void EditTextObject::GetStyleSheet( USHORT, XubString&, SfxStyleFamily& ) const
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
-}
-
-void EditTextObject::SetStyleSheet( USHORT, const XubString&, const SfxStyleFamily& )
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
-}
-
-BOOL EditTextObject::ChangeStyleSheets( const XubString&, SfxStyleFamily,
- const XubString&, SfxStyleFamily )
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
- return FALSE;
-}
-
-void EditTextObject::ChangeStyleSheetName( SfxStyleFamily,
- const XubString&, const XubString& )
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
-}
-
-USHORT EditTextObject::GetUserType() const
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
- return 0;
-}
-
-void EditTextObject::SetUserType( USHORT )
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
-}
-
-
-
-BOOL EditTextObject::IsVertical() const
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
- return FALSE;
-}
-
-void EditTextObject::SetVertical( BOOL /*bVertical*/ )
-{DBG_BF_ASSERT(0, "STRIP");
-}
-
-
-
-EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool )
+EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool )
{
ULONG nStartPos = rIStream.Tell();
@@ -285,28 +204,6 @@ EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlo
}
-void EditTextObject::CreateData( SvStream& /*rIStream*/ )
-{
- OSL_FAIL( "CreateData: Basisklasse!" );
-}
-
-USHORT EditTextObject::GetVersion() const
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
- return 0;
-}
-
-
-void EditTextObject::AdjustImportedLRSpaceItems( BOOL /*bTurnOfBullets*/ )
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
-}
-
-void EditTextObject::FinishLoad( SfxStyleSheetPool* /*pStyleSheetPool*/ )
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
-}
-
BinTextObject::BinTextObject( SfxItemPool* pP ) :
EditTextObject( EE_FORMAT_BIN )
{
@@ -564,10 +461,6 @@ void BinTextObject::GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamil
}
}
-void BinTextObject::SetStyleSheet( USHORT, const XubString&, const SfxStyleFamily& )
-{DBG_BF_ASSERT(0, "STRIP");
-}
-
BOOL BinTextObject::ImpChangeStyleSheets(
const XubString& rOldName, SfxStyleFamily eOldFamily,
const XubString& rNewName, SfxStyleFamily eNewFamily )
diff --git a/binfilter/bf_svx/source/editeng/svx_editsel.cxx b/binfilter/bf_svx/source/editeng/svx_editsel.cxx
index 9087837..7fd2384 100644
--- a/binfilter/bf_svx/source/editeng/svx_editsel.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editsel.cxx
@@ -31,9 +31,6 @@
#pragma hdrstop
#endif
-
-
-
#include <vcl/window.hxx>
#include <impedit.hxx>
@@ -48,42 +45,6 @@ namespace binfilter {
/*N*/ pCurView = NULL;
/*N*/ }
-/*N*/ void EditSelFunctionSet::CreateAnchor()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void EditSelFunctionSet::DestroyAnchor()
-/*N*/ {
-/*N*/ // Nur bei Mehrfachselektion
-/*N*/ }
-
-/*N*/ BOOL EditSelFunctionSet::SetCursorAtPoint( const Point& /*rPointPixel*/, BOOL )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return FALSE;
-/*N*/ }
-
-/*N*/ BOOL EditSelFunctionSet::IsSelectionAtPoint( const Point& /*rPointPixel*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return FALSE;
-/*N*/ }
-
-/*N*/ void EditSelFunctionSet::DeselectAtPoint( const Point& )
-/*N*/ {
-/*N*/ // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-/*N*/ // ! Implementieren, wenn Mehrfachselektion moeglich !
-/*N*/ // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-/*N*/ }
-
-/*N*/ void EditSelFunctionSet::BeginDrag()
-/*N*/ {
-/*N*/ // Nur bei Mehrfachselektion
-/*N*/ }
-
-
-/*N*/ void EditSelFunctionSet::DeselectAll()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
// ----------------------------------------------------------------------
// class EditSelectionEngine
// ----------------------------------------------------------------------
diff --git a/binfilter/bf_svx/source/editeng/svx_editundo.cxx b/binfilter/bf_svx/source/editeng/svx_editundo.cxx
index 018237b..fe6077c 100644
--- a/binfilter/bf_svx/source/editeng/svx_editundo.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editundo.cxx
@@ -101,13 +101,15 @@ DBG_NAME( EditUndo )
/*N*/ {
/*N*/ }
-/*N*/ void EditUndoInsertChars::Undo()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+void EditUndoInsertChars::Undo()
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
-/*N*/ void EditUndoInsertChars::Redo()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+void EditUndoInsertChars::Redo()
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
/*N*/ BOOL EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
/*N*/ {
@@ -127,17 +129,11 @@ DBG_NAME( EditUndo )
/*N*/ return FALSE;
/*N*/ }
-/*N*/ void EditUndoInsertChars::Repeat()
-/*N*/ {
-/*N*/ OSL_FAIL( "EditUndoInsertChars::Repeat nicht implementiert!" );
-/*N*/ }
-
- // -----------------------------------------------------------------------
-// EditUndoRemoveChars
-// ------------------------------------------------------------------------
-
-
-
+void EditUndoInsertChars::Repeat()
+{
+ OSL_FAIL( "EditUndoInsertChars::Repeat nicht implementiert!" );
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
// -----------------------------------------------------------------------
// EditUndoInsertFeature
@@ -154,26 +150,21 @@ DBG_NAME( EditUndo )
/*N*/ delete pFeature;
/*N*/ }
-/*N*/ void EditUndoInsertFeature::Undo()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void EditUndoInsertFeature::Redo()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void EditUndoInsertFeature::Repeat()
-/*N*/ {
-/*N*/ OSL_FAIL( "EditUndoInsertFeature::Repeat nicht implementiert!" );
-/*N*/ }
-
- // -----------------------------------------------------------------------
-// EditUndoMoveParagraphs
-// ------------------------------------------------------------------------
-
-
+void EditUndoInsertFeature::Undo()
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
+void EditUndoInsertFeature::Redo()
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
+void EditUndoInsertFeature::Repeat()
+{
+ OSL_FAIL( "EditUndoInsertFeature::Repeat nicht implementiert!" );
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
// -----------------------------------------------------------------------
// EditUndoSetStyleSheet
@@ -190,22 +181,21 @@ DBG_NAME( EditUndo )
/*N*/ nPara = nP;
/*N*/ }
-/*N*/ EditUndoSetStyleSheet::~EditUndoSetStyleSheet()
-/*N*/ {
-/*N*/ }
-
-/*N*/ void EditUndoSetStyleSheet::Undo()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+void EditUndoSetStyleSheet::Undo()
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
-/*N*/ void EditUndoSetStyleSheet::Redo()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+void EditUndoSetStyleSheet::Redo()
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
-/*N*/ void EditUndoSetStyleSheet::Repeat()
-/*N*/ {
-/*N*/ OSL_FAIL( "EditUndoSetStyleSheet::Repeat nicht implementiert!" );
-/*N*/ }
+void EditUndoSetStyleSheet::Repeat()
+{
+ OSL_FAIL( "EditUndoSetStyleSheet::Repeat nicht implementiert!" );
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
// -----------------------------------------------------------------------
// EditUndoSetParaAttribs
@@ -218,47 +208,21 @@ DBG_NAME( EditUndo )
/*N*/ nPara = nP;
/*N*/ }
-/*N*/ EditUndoSetParaAttribs::~EditUndoSetParaAttribs()
-/*N*/ {
-/*N*/ }
-
-/*N*/ void EditUndoSetParaAttribs::Undo()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void EditUndoSetParaAttribs::Redo()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void EditUndoSetParaAttribs::Repeat()
-/*N*/ {
-/*N*/ OSL_FAIL( "EditUndoSetParaAttribs::Repeat nicht implementiert!" );
-/*N*/ }
-
- // -----------------------------------------------------------------------
-// EditUndoSetAttribs
-// ------------------------------------------------------------------------
-
-
-
-
-
-
- // -----------------------------------------------------------------------
-// EditUndoTransliteration
-// ------------------------------------------------------------------------
-
-
-
-
-
- // -----------------------------------------------------------------------
-// EditUndoMarkSelection
-// ------------------------------------------------------------------------
-
-
+void EditUndoSetParaAttribs::Undo()
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
+void EditUndoSetParaAttribs::Redo()
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
+void EditUndoSetParaAttribs::Repeat()
+{
+ OSL_FAIL( "EditUndoSetParaAttribs::Repeat nicht implementiert!" );
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
}
diff --git a/binfilter/bf_svx/source/editeng/svx_editview.cxx b/binfilter/bf_svx/source/editeng/svx_editview.cxx
index f68ced2..258597a 100644
--- a/binfilter/bf_svx/source/editeng/svx_editview.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editview.cxx
@@ -75,26 +75,11 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ DBG_CHKTHIS( EditView, 0 );
/*N*/ DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
/*N*/
-/*N*/ // Falls jemand gerade ein leeres Attribut hinterlassen hat,
-/*N*/ // und dann der Outliner die Selektion manipulitert:
-/*N*/ if ( !pImpEditView->GetEditSelection().HasRange() )
-/*N*/ {
-/*N*/ ContentNode* pNode = pImpEditView->GetEditSelection().Max().GetNode();
-/*N*/ PIMPEE->CursorMoved( pNode );
-/*N*/ }
/*N*/ EditSelection aNewSelection( PIMPEE->ConvertSelection( rESel.nStartPara, rESel.nStartPos, rESel.nEndPara, rESel.nEndPos ) );
/*N*/
/*N*/ // Selektion darf nicht bei einem unsichtbaren Absatz Starten/Enden:
/*N*/ ParaPortion* pPortion = PIMPEE->FindParaPortion( aNewSelection.Min().GetNode() );
-/*N*/ if ( !pPortion->IsVisible() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ pPortion = PIMPEE->FindParaPortion( aNewSelection.Max().GetNode() );
-/*N*/ if ( !pPortion->IsVisible() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+/*N*/ pPortion = PIMPEE->FindParaPortion( aNewSelection.Max().GetNode() );
/*N*/
/*N*/ pImpEditView->DrawSelection(); // alte Selektion 'weg-zeichnen'
/*N*/ pImpEditView->SetEditSelection( aNewSelection );
@@ -160,7 +145,6 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ // Das ControlWord hat mehr Gewicht:
/*N*/ if ( !pImpEditView->DoAutoScroll() )
/*N*/ bGotoCursor = sal_False;
-/*N*/ pImpEditView->ShowCursor( bGotoCursor, bForceVisCursor );
/*N*/ }
/*N*/ }
@@ -170,18 +154,6 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ pImpEditView->GetCursor()->Hide();
/*N*/ }
-
-/*N*/ void EditView::Cut()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void EditView::Copy()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void EditView::Paste()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit.cxx b/binfilter/bf_svx/source/editeng/svx_impedit.cxx
index 239318e..9a35547 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit.cxx
@@ -31,28 +31,13 @@
#pragma hdrstop
#endif
-
-
-
#include <vcl/window.hxx>
#include <impedit.hxx>
#include <editeng.hxx>
-
-
-
-
-
-
-
-
-
-
#include "itemdata.hxx"
-
-
#include <flditem.hxx>
namespace binfilter {
@@ -80,11 +65,6 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ {
/*N*/ // #100856# set state before notification
/*N*/ aEditSelection = rEditSelection;
-/*N*/
-/*N*/ if ( pEditEngine->pImpEditEngine->GetNotifyHdl().IsSet() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
@@ -147,19 +127,6 @@ using namespace ::com::sun::star::linguistic2;
/*?*/ continue;
/*?*/ if ( nParaStart > GetVisDocBottom() )
/*?*/ break;
-/*?*/
-/*?*/ sal_uInt16 nStartLine = 0;
-/*?*/ sal_uInt16 nEndLine = pTmpPortion->GetLines().Count() -1;
-/*?*/ if ( nPara == nStartPara )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*?*/ if ( nPara == nEndPara )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*?*/
-/*?*/ // ueber die Zeilen iterieren....
-/*?*/ for ( sal_uInt16 nLine = nStartLine; nLine <= nEndLine; nLine++ )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ }
/*?*/
/*?*/ if ( pRegion )
@@ -247,13 +214,6 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ return aRect;
/*N*/ }
-/*N*/ void ImpEditView::ShowCursor( sal_Bool /*bGotoCursor*/, sal_Bool /*bForceVisCursor*/, USHORT /*nShowCursorFlags*/ )
-/*N*/ {
-/*N*/ // Kein ShowCursor bei einer leeren View...
-/*N*/ if ( ( aOutArea.Left() >= aOutArea.Right() ) && ( aOutArea.Top() >= aOutArea.Bottom() ) )
-/*N*/ return;
-/*N*/
-/*?*/ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
index 369a36a..27e7ddf 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
@@ -400,21 +400,9 @@ using namespace ::com::sun::star;
// ----------------------------------------------------------------------
// MISC
// ----------------------------------------------------------------------
-/*N*/ void ImpEditEngine::CursorMoved( ContentNode* pPrevNode )
-/*N*/ {
-/*N*/ // Leere Attribute loeschen, aber nur, wenn Absatz nicht leer!
-/*N*/ if ( pPrevNode->GetCharAttribs().HasEmptyAttribs() && pPrevNode->Len() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ }
-
/*N*/ void ImpEditEngine::TextModified()
/*N*/ {
/*N*/ bFormatted = FALSE;
-/*N*/
-/*N*/ if ( GetNotifyHdl().IsSet() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
@@ -874,13 +862,6 @@ using namespace ::com::sun::star;
/*N*/ DeletedNodeInfo* pInf = new DeletedNodeInfo( (ULONG)pRight, nParagraphTobeDeleted );
/*N*/ aDeletedNodes.Insert( pInf, aDeletedNodes.Count() );
/*N*/
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ if ( IsUndoEnabled() && !IsInUndo() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ #endif
-/*N*/
/*N*/ if ( bBackward )
/*N*/ {
/*?*/ pLeft->SetStyleSheet( pRight->GetStyleSheet(), TRUE );
@@ -936,25 +917,9 @@ using namespace ::com::sun::star;
/*N*/ EditPaM aStartPaM( aSel.Min() );
/*N*/ EditPaM aEndPaM( aSel.Max() );
/*N*/
-/*N*/ CursorMoved( aStartPaM.GetNode() ); // nur damit neu eingestellte Attribute verschwinden...
-/*N*/ CursorMoved( aEndPaM.GetNode() ); // nur damit neu eingestellte Attribute verschwinden...
-/*N*/
/*N*/ DBG_ASSERT( aStartPaM.GetIndex() <= aStartPaM.GetNode()->Len(), "Index im Wald in ImpDeleteSelection" );
/*N*/ DBG_ASSERT( aEndPaM.GetIndex() <= aEndPaM.GetNode()->Len(), "Index im Wald in ImpDeleteSelection" );
/*N*/
-/*N*/ USHORT nStartNode = aEditDoc.GetPos( aStartPaM.GetNode() );
-/*N*/ USHORT nEndNode = aEditDoc.GetPos( aEndPaM.GetNode() );
-/*N*/
-/*N*/ DBG_ASSERT( nEndNode != USHRT_MAX, "Start > End ?!" );
-/*N*/ DBG_ASSERT( nStartNode <= nEndNode, "Start > End ?!" );
-/*N*/
-/*N*/ // Alle Nodes dazwischen entfernen....
-/*N*/ for ( ULONG z = nStartNode+1; z < nEndNode; z++ )
-/*N*/ {
-/*?*/ // Immer nStartNode+1, wegen Remove()!
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ if ( aStartPaM.GetNode() != aEndPaM.GetNode() )
/*N*/ {
/*N*/ // Den Rest des StartNodes...
@@ -1131,7 +1096,6 @@ using namespace ::com::sun::star;
/*N*/ if ( IsCallParaInsertedOrDeleted() )
/*N*/ GetEditEnginePtr()->ParagraphInserted( nPos+1 );
/*N*/
-/*N*/ CursorMoved( rPaM.GetNode() ); // falls leeres Attribut entstanden.
/*N*/ TextModified();
/*N*/ return aPaM;
/*N*/ }
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit3.cxx b/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
index 4aafc87..3bbdd54 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
@@ -277,18 +277,6 @@ struct TabInfo
/*N*/
/*N*/ if ( aStatus.AutoPageSize() )
/*N*/ CheckAutoPageSize();
-/*N*/ else if ( nDiff )
-/*N*/ {
-/*N*/ for ( sal_uInt16 nView = 0; nView < aEditViews.Count(); nView++ )
-/*N*/ {
-/*N*/ EditView* pView = aEditViews[nView];
-/*N*/ ImpEditView* pImpView = pView->pImpEditView;
-/*N*/ if ( pImpView->DoAutoHeight() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-/*N*/ }
/*N*/ }
/*N*/
/*N*/ if ( aStatus.DoRestoreFont() )
@@ -373,12 +361,6 @@ struct TabInfo
/*?*/ aSz.Height() = aInvSize.Width();
/*N*/ }
/*N*/ aInvalidRec = Rectangle( Point(), aSz );
-/*N*/
-/*N*/
-/*N*/ for ( sal_uInt16 nView = 0; nView < aEditViews.Count(); nView++ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ }
@@ -609,10 +591,6 @@ struct TabInfo
/*N*/ long nTextExtraYOffset = 0;
/*N*/ long nTextXOffset = 0;
/*N*/ long nTextLineHeight = 0;
-/*N*/ if ( GetTextRanger() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ // Portion suchen, die nicht mehr in Zeile passt....
/*N*/ TextPortion* pPortion(NULL);
@@ -775,10 +753,6 @@ struct TabInfo
/*N*/ pLine->GetCharPosArray().Insert( pBuf, nLen, nPos );
/*N*/ }
/*N*/
-/*N*/ // And now check for Compression:
-/*N*/ if ( pPortion->GetLen() && GetAsianCompressionMode() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
/*N*/ nTmpWidth += pPortion->GetSize().Width();
/*N*/
/*N*/ pPortion->SetRightToLeft( GetRightToLeft( nPara, nTmpPos+1 ) );
@@ -946,11 +920,6 @@ struct TabInfo
/*N*/ DBG_ASSERT( (nPortionEnd-nPortionStart) == pPortion->GetLen(), "Doch eine andere Portion?!" );
/*N*/ long nRemainingWidth = nMaxLineWidth - nTmpWidth;
/*N*/ sal_Bool bCanHyphenate = ( aTmpFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL );
-/*N*/ if ( bCompressedChars && ( pPortion->GetLen() > 1 ) && pPortion->GetExtraInfos() && pPortion->GetExtraInfos()->bCompressed )
-/*N*/ {
-/*?*/ // I need the manipulated DXArray for determining the break postion...
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ ImpBreakLine( pParaPortion, pLine, pPortion, nPortionStart,
/*N*/ nRemainingWidth, bCanHyphenate && bHyphenatePara );
/*N*/ }
@@ -1066,15 +1035,6 @@ struct TabInfo
/*N*/ nMaxLineWidth = nMaxLineWidthFix;
/*N*/ }
/*N*/
-/*N*/ if ( bCompressedChars )
-/*N*/ {
-/*?*/ long nRemainingWidth = nMaxLineWidth - aTextSize.Width();
-/*?*/ if ( nRemainingWidth > 0 )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*N*/ }
-/*N*/
/*N*/ if ( pLine->IsHangingPunctuation() )
/*N*/ {
/*?*/ // Width from HangingPunctuation was set to 0 in ImpBreakLine,
@@ -1716,37 +1676,10 @@ struct TabInfo
/*N*/ // before final form of Teh Marbuta, Hah, Dal
/*N*/ // 4. Priority:
/*N*/ // before final form of Alef, Lam or Kaf
-/*N*/ if ( nIdx && nIdx + 1 == aWord.Len() &&
-/*N*/ ( 0x629 == cCh || 0x62D == cCh || 0x62F == cCh ||
-/*N*/ 0x627 == cCh || 0x644 == cCh || 0x643 == cCh ) )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ // 5. Priority:
/*N*/ // before media Bah
-/*N*/ if ( nIdx && nIdx + 1 < aWord.Len() && 0x628 == cCh )
-/*N*/ {
-/*?*/ DBG_ASSERT( 0 != cPrevCh, "No previous character" );
-/*?*/ (void)cPrevCh;
-/*?*/
-/*?*/ // check if next character is Reh, Yeh or Alef Maksura
-/*?*/ xub_Unicode cNextCh = aWord.GetChar( nIdx + 1 );
-/*?*/
-/*?*/ if ( 0x631 == cNextCh || 0x64A == cNextCh ||
-/*?*/ 0x649 == cNextCh )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*N*/ }
-/*N*/
/*N*/ // 6. Priority:
/*N*/ // other connecting possibilities
-/*N*/ if ( nIdx && nIdx + 1 == aWord.Len() &&
-/*N*/ 0x60C <= cCh && 0x6FE >= cCh )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ // Do not consider Fathatan, Dammatan, Kasratan, Fatha,
/*N*/ // Damma, Kasra, Shadda and Sukun when checking if
@@ -1810,12 +1743,6 @@ struct TabInfo
/*N*/ // Kein neues GetTextSize, sondern Werte aus Array verwenden:
/*N*/ DBG_ASSERT( nPos > pCurLine->GetStart(), "SplitTextPortion am Anfang der Zeile?" );
/*N*/ pTextPortion->GetSize().Width() = pCurLine->GetCharPosArray()[ nPos-pCurLine->GetStart()-1 ];
-/*N*/
-/*N*/ if ( pTextPortion->GetExtraInfos() && pTextPortion->GetExtraInfos()->bCompressed )
-/*N*/ {
-/*?*/ // We need the original size from the portion
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ else
/*?*/ pTextPortion->GetSize().Width() = (-1);
@@ -2521,20 +2448,6 @@ struct TabInfo
/*?*/ if ( aStatus.DoRestoreFont() )
/*?*/ GetRefDevice()->SetFont( aLclOldFont );
/*?*/
-/*?*/ // add a meta file comment if we record to a metafile
-/*?*/ GDIMetaFile* pMtf = pOutDev->GetConnectMetaFile();
-/*?*/ if( pMtf )
-/*?*/ {
-/*?*/ SvxFieldItem* pFieldItem = PTR_CAST( SvxFieldItem, pAttr->GetItem() );
-/*?*/
-/*?*/ if( pFieldItem )
-/*?*/ {
-/*?*/ const SvxFieldData* pFieldData = pFieldItem->GetField();
-/*?*/ if( pFieldData )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*?*/ }
-/*?*/ }
-/*?*/
/*?*/ }
/*N*/ else if ( pTextPortion->GetKind() == PORTIONKIND_HYPHENATOR )
/*N*/ {
@@ -2575,10 +2488,6 @@ struct TabInfo
/*N*/ else
/*N*/ {
/*N*/ short nEsc = aTmpFont.GetEscapement();
-/*N*/ if ( nOrientation )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ // nur ausgeben, was im sichtbaren Bereich beginnt:
/*N*/ // Wichtig, weil Bug bei einigen Grafikkarten bei transparentem Font, Ausgabe bei neg.
/*N*/ if ( nOrientation || ( !IsVertical() && ( ( aTmpPos.X() + nTxtWidth ) >= nFirstVisXPos ) )
@@ -2609,10 +2518,6 @@ struct TabInfo
/*?*/ bSpecialUnderline = sal_True;
/*?*/ }
/*?*/ }
-/*?*/ if ( bSpecialUnderline )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*N*/ }
/*N*/ Point aRealOutPos( aOutPos );
/*N*/ if ( ( pTextPortion->GetKind() == PORTIONKIND_TEXT )
@@ -2627,8 +2532,6 @@ struct TabInfo
/*N*/ {
/*?*/ Point aTopLeft( aTmpPos );
/*?*/ aTopLeft.Y() -= pLine->GetMaxAscent();
-/*?*/ if ( nOrientation )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*?*/ Rectangle aRect( aTopLeft, pTextPortion->GetSize() );
/*?*/ pOutDev->DrawRect( aRect );
/*N*/ }
@@ -2652,31 +2555,9 @@ struct TabInfo
/*N*/ // R2L nR2LWidth += nTxtWidth;
/*N*/ // R2L }
/*N*/
-/*N*/ if ( pTextPortion->GetKind() == PORTIONKIND_FIELD )
-/*N*/ {
-/*?*/ EditCharAttrib* pAttr = pPortion->GetNode()->GetCharAttribs().FindFeature( nIndex );
-/*?*/ DBG_ASSERT( pAttr, "Feld nicht gefunden" );
-/*?*/ DBG_ASSERT( pAttr && pAttr->GetItem()->ISA( SvxFieldItem ), "Feld vom falschen Typ!" );
-/*?*/
-/*?*/ // add a meta file comment if we record to a metafile
-/*?*/ GDIMetaFile* pMtf = pOutDev->GetConnectMetaFile();
-/*?*/ if( pMtf )
-/*?*/ {
-/*?*/ SvxFieldItem* pFieldItem = PTR_CAST( SvxFieldItem, pAttr->GetItem() );
-/*?*/
-/*?*/ if( pFieldItem )
-/*?*/ {
-/*?*/ const SvxFieldData* pFieldData = pFieldItem->GetField();
-/*?*/ if( pFieldData )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*?*/ }
-/*?*/ }
-/*?*/
-/*N*/ }
-/*N*/
/*N*/ }
/*N*/ break;
-/*N*/ // case PORTIONKIND_EXTRASPACE:
+/*N*/ // case PORTIONKIND_EXTRASPACE:
/*N*/ case PORTIONKIND_TAB:
/*N*/ {
/*?*/ if ( pTextPortion->GetExtraValue() && ( pTextPortion->GetExtraValue() != ' ' ) )
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit4.cxx b/binfilter/bf_svx/source/editeng/svx_impedit4.cxx
index 465440d..3b4f5ec 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit4.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit4.cxx
@@ -352,7 +352,6 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ else
/*N*/ {
/*?*/ SfxPoolItem* pNew = pX->GetItem()->Clone();
-/*?*/ ConvertItem( *pNew, eSourceUnit, eDestUnit );
/*?*/ pAttr = MakeCharAttrib( aEditDoc.GetItemPool(), *pNew, pX->GetStart()+nStartPos, pX->GetEnd()+nStartPos );
/*?*/ delete pNew;
/*N*/ }
diff --git a/binfilter/bf_svx/source/outliner/svx_outlin2.cxx b/binfilter/bf_svx/source/outliner/svx_outlin2.cxx
index dca5628..5acf7fe 100644
--- a/binfilter/bf_svx/source/outliner/svx_outlin2.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outlin2.cxx
@@ -262,16 +262,18 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ return pEditEngine->GetLineCount( (USHORT)nParagraph );
/*N*/ }
-/*N*/ USHORT Outliner::GetLineLen( ULONG nParagraph, USHORT nLine ) const
+/*N*/ USHORT Outliner::GetLineLen( ULONG /* nParagraph */, USHORT /* nLine */ ) const
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
-/*N*/ return pEditEngine->GetLineLen( (USHORT)nParagraph, nLine );
+ DBG_BF_ASSERT(0, "STRIP");
+/*N*/ return 0;
/*N*/ }
-/*?*/ ULONG Outliner::GetLineHeight( ULONG nParagraph, ULONG nLine )
+/*?*/ ULONG Outliner::GetLineHeight( ULONG /* nParagraph */, ULONG /* nLine */ )
/*?*/ {
/*?*/ DBG_CHKTHIS(Outliner,0);
-/*?*/ return pEditEngine->GetLineHeight( (USHORT)nParagraph, (USHORT)nLine );
+ DBG_BF_ASSERT(0, "STRIP");
+/*?*/ return 0;
/*?*/ }
/*N*/ void Outliner::QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich )
@@ -320,7 +322,8 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ ULONG Outliner::GetTextHeight( ULONG nParagraph ) const
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
-/*N*/ return pEditEngine->GetTextHeight((USHORT)nParagraph );
+ DBG_BF_ASSERT(0, "STRIP");
+/*N*/ return 0;
/*N*/ }
/*N*/ Point Outliner::GetDocPos( const Point& rPaperPos ) const
diff --git a/binfilter/bf_svx/source/unoedit/svx_unoedhlp.cxx b/binfilter/bf_svx/source/unoedit/svx_unoedhlp.cxx
index f72ba84..4bfa59e 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unoedhlp.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unoedhlp.cxx
@@ -38,43 +38,19 @@ namespace binfilter {
//------------------------------------------------------------------------
-sal_Bool SvxEditSourceHelper::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, const EditEngine& rEE, USHORT nPara, USHORT nIndex )
+sal_Bool SvxEditSourceHelper::GetAttributeRun(
+ USHORT& nStartIndex,
+ USHORT& nEndIndex,
+ const EditEngine& rEE,
+ USHORT nPara,
+ USHORT /* nIndex */
+)
{
- EECharAttribArray aCharAttribs;
-
- rEE.GetCharAttribs( nPara, aCharAttribs );
-
- // find closest index in front of nIndex
- USHORT nAttr, nCurrIndex;
- sal_Int32 nClosestStartIndex;
- for( nAttr=0, nClosestStartIndex=0; nAttr<aCharAttribs.Count(); ++nAttr )
- {
- nCurrIndex = aCharAttribs[nAttr].nStart;
-
- if( nCurrIndex > nIndex )
- break; // aCharAttribs array is sorted in increasing order for nStart values
-
- if( nCurrIndex > nClosestStartIndex )
- {
- nClosestStartIndex = nCurrIndex;
- }
- }
-
- // find closest index behind of nIndex
- sal_Int32 nClosestEndIndex;
- for( nAttr=0, nClosestEndIndex=rEE.GetTextLen(nPara); nAttr<aCharAttribs.Count(); ++nAttr )
- {
- nCurrIndex = aCharAttribs[nAttr].nEnd;
-
- if( nCurrIndex > nIndex &&
- nCurrIndex < nClosestEndIndex )
- {
- nClosestEndIndex = nCurrIndex;
- }
- }
+ sal_Int32 nClosestStartIndex = 0;
+ sal_Int32 nClosestEndIndex = rEE.GetTextLen(nPara);
nStartIndex = static_cast<USHORT>( nClosestStartIndex );
- nEndIndex = static_cast<USHORT>( nClosestEndIndex );
+ nEndIndex = static_cast<USHORT>( nClosestEndIndex );
return sal_True;
}
diff --git a/binfilter/bf_svx/source/unoedit/svx_unofored.cxx b/binfilter/bf_svx/source/unoedit/svx_unofored.cxx
index dd8dc5d..8e6c47e 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unofored.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unofored.cxx
@@ -165,97 +165,14 @@ XubString SvxEditEngineForwarder::CalcFieldValue( const SvxFieldItem& rField, US
return rEditEngine.CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor );
}
-USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, USHORT nWhich )
+USHORT GetSvxEditEngineItemState(
+ EditEngine& rEditEngine,
+ const ESelection& rSel,
+ USHORT /* nWhich */
+)
{
- EECharAttribArray aAttribs;
-
- const SfxPoolItem* pLastItem = NULL;
-
- SfxItemState eState = SFX_ITEM_DEFAULT;
-
- // check all paragraphs inside the selection
- for( USHORT nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++ )
- {
- SfxItemState eParaState = SFX_ITEM_DEFAULT;
-
- // calculate start and endpos for this paragraph
- USHORT nPos = 0;
- if( rSel.nStartPara == nPara )
- nPos = rSel.nStartPos;
-
- USHORT nEndPos = rSel.nEndPos;
- if( rSel.nEndPara != nPara )
- nEndPos = rEditEngine.GetTextLen( nPara );
-
-
- // get list of char attribs
- rEditEngine.GetCharAttribs( nPara, aAttribs );
-
- BOOL bEmpty = TRUE; // we found no item inside the selektion of this paragraph
- BOOL bGaps = FALSE; // we found items but theire gaps between them
- USHORT nLastEnd = nPos;
-
- const SfxPoolItem* pParaItem = NULL;
-
- for( USHORT nAttrib = 0; nAttrib < aAttribs.Count(); nAttrib++ )
- {
- struct EECharAttrib aAttrib = aAttribs.GetObject( nAttrib );
- DBG_ASSERT( aAttrib.pAttr, "GetCharAttribs gives corrupt data" );
-
- const sal_Bool bEmptyPortion = aAttrib.nStart == aAttrib.nEnd;
- if( (!bEmptyPortion && (aAttrib.nStart >= nEndPos)) || (bEmptyPortion && (aAttrib.nStart > nEndPos)) )
- break; // break if we are already behind our selektion
-
- if( (!bEmptyPortion && (aAttrib.nEnd <= nPos)) || (bEmptyPortion && (aAttrib.nEnd < nPos)) )
- continue; // or if the attribute ends before our selektion
-
- if( aAttrib.pAttr->Which() != nWhich )
- continue; // skip if is not the searched item
-
- // if we already found an item
- if( pParaItem )
- {
- // ... and its different to this one than the state is dont care
- if( *pParaItem != *aAttrib.pAttr )
- return SFX_ITEM_DONTCARE;
- }
- else
- {
- pParaItem = aAttrib.pAttr;
- }
-
- if( bEmpty )
- bEmpty = FALSE;
-
- if( !bGaps && aAttrib.nStart > nLastEnd )
- bGaps = TRUE;
-
- nLastEnd = aAttrib.nEnd;
- }
-
- if( !bEmpty && !bGaps && nLastEnd < ( nEndPos - 1 ) )
- bGaps = TRUE;
- if( bEmpty )
- eParaState = SFX_ITEM_DEFAULT;
- else if( bGaps )
- eParaState = SFX_ITEM_DONTCARE;
- else
- eParaState = SFX_ITEM_SET;
-
- // if we already found an item check if we found the same
- if( pLastItem )
- {
- if( (pParaItem == NULL) || (*pLastItem != *pParaItem) )
- return SFX_ITEM_DONTCARE;
- }
- else
- {
- pLastItem = pParaItem;
- eState = eParaState;
- }
- }
-
- return eState;
+ DBG_BF_ASSERT(0, "STRIP");
+ return SFX_ITEM_DEFAULT;
}
USHORT SvxEditEngineForwarder::GetItemState( const ESelection& rSel, USHORT nWhich ) const
@@ -323,9 +240,9 @@ Rectangle SvxEditEngineForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) c
// #109151# Don't use paragraph height, but line height
// instead. aLast is already CTL-correct
if( bIsVertical)
- aLast.SetSize( Size( rEditEngine.GetLineHeight(nPara,0), 1 ) );
+ aLast.SetSize( Size( 0, 1 ) );
else
- aLast.SetSize( Size( 1, rEditEngine.GetLineHeight(nPara,0) ) );
+ aLast.SetSize( Size( 1, 0 ) );
}
return aLast;
@@ -350,7 +267,7 @@ Rectangle SvxEditEngineForwarder::GetParaBounds( USHORT nPara ) const
// Hargl. EditEngine's 'external' methods return the rotated
// dimensions, 'internal' methods like GetTextHeight( n )
// don't rotate.
- nWidth = rEditEngine.GetTextHeight( nPara );
+ nWidth = 0;
nHeight = rEditEngine.GetTextHeight();
nTextWidth = rEditEngine.GetTextHeight();
@@ -359,7 +276,7 @@ Rectangle SvxEditEngineForwarder::GetParaBounds( USHORT nPara ) const
else
{
nWidth = rEditEngine.CalcTextWidth();
- nHeight = rEditEngine.GetTextHeight( nPara );
+ nHeight = 0;
return Rectangle( 0, aPnt.Y(), nWidth, aPnt.Y() + nHeight );
}
@@ -420,7 +337,8 @@ USHORT SvxEditEngineForwarder::GetLineCount( USHORT nPara ) const
USHORT SvxEditEngineForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const
{
- return rEditEngine.GetLineLen(nPara, nLine);
+ DBG_BF_ASSERT(0, "STRIP");
+ return 0;
}
sal_Bool SvxEditEngineForwarder::QuickFormatDoc( BOOL )
diff --git a/binfilter/bf_svx/source/unoedit/svx_unoviwed.cxx b/binfilter/bf_svx/source/unoedit/svx_unoviwed.cxx
index 3d3877b..f88ae8c 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unoviwed.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unoviwed.cxx
@@ -36,10 +36,12 @@ namespace binfilter {
SvxEditEngineViewForwarder::~SvxEditEngineViewForwarder()
{
+ DBG_BF_ASSERT(0, "STRIP");
}
BOOL SvxEditEngineViewForwarder::IsValid() const
{
+ DBG_BF_ASSERT(0, "STRIP");
return sal_True;
}
@@ -115,21 +117,22 @@ sal_Bool SvxEditEngineViewForwarder::SetSelection( const ESelection& rSelection
sal_Bool SvxEditEngineViewForwarder::Copy()
{
- mrView.Copy();
+ DBG_BF_ASSERT(0, "STRIP");
return sal_True;
}
sal_Bool SvxEditEngineViewForwarder::Cut()
{
- mrView.Cut();
+ DBG_BF_ASSERT(0, "STRIP");
return sal_True;
}
sal_Bool SvxEditEngineViewForwarder::Paste()
{
- mrView.Paste();
+ DBG_BF_ASSERT(0, "STRIP");
return sal_True;
}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svx/editeng.hxx b/binfilter/inc/bf_svx/editeng.hxx
index 4f7b9c0..ef30fa5 100644
--- a/binfilter/inc/bf_svx/editeng.hxx
+++ b/binfilter/inc/bf_svx/editeng.hxx
@@ -168,13 +168,10 @@ public:
String GetText( USHORT nParagraph ) const;
xub_StrLen GetTextLen( USHORT nParagraph ) const;
- sal_uInt32 GetTextHeight( USHORT nParagraph ) const;
USHORT GetParagraphCount() const;
USHORT GetLineCount( USHORT nParagraph ) const;
- xub_StrLen GetLineLen( USHORT nParagraph, USHORT nLine ) const;
- sal_uInt32 GetLineHeight( USHORT nParagraph, USHORT nLine = 0 );
USHORT GetFirstLineOffset( USHORT nParagraph );
ParagraphInfos GetParagraphInfos( USHORT nPara );
USHORT FindParagraph( long nDocPosY );
@@ -198,8 +195,6 @@ public:
void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet );
const SfxItemSet& GetParaAttribs( USHORT nPara ) const;
- void GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const;
-
SfxItemSet GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd, sal_uInt8 nFlags = 0xFF ) const;
SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = EditEngineAttribs_All );
@@ -207,8 +202,6 @@ public:
const SfxPoolItem& GetParaAttrib( USHORT nPara, USHORT nWhich );
-
-
SfxUndoManager& GetUndoManager();
void UndoActionStart( USHORT nId );
void UndoActionEnd( USHORT nId );
diff --git a/binfilter/inc/bf_svx/editobj.hxx b/binfilter/inc/bf_svx/editobj.hxx
index 0f8c165..c0b5577 100644
--- a/binfilter/inc/bf_svx/editobj.hxx
+++ b/binfilter/inc/bf_svx/editobj.hxx
@@ -58,23 +58,31 @@ protected:
EditTextObject( USHORT nWhich );
EditTextObject( const EditTextObject& r );
- virtual void StoreData( SvStream& ) const {}
- virtual void CreateData( SvStream& rIStream );
+ virtual void StoreData( SvStream& ) const
+ {}
+
+ virtual void CreateData( SvStream& /* rIStream */ )
+ {}
public:
virtual ~EditTextObject();
USHORT Which() const { return nWhich; }
- virtual USHORT GetUserType() const; // Fuer OutlinerMode, der kann das aber nicht kompatibel speichern
- virtual void SetUserType( USHORT n );
+ virtual USHORT GetUserType() const
+ { return 0; }
+
+ virtual void SetUserType( USHORT /* n */ )
+ {}
+ virtual BOOL IsVertical() const
+ { return FALSE; }
- virtual BOOL IsVertical() const;
- virtual
- void SetVertical( BOOL bVertical );
+ virtual void SetVertical( BOOL bVertical )
+ {}
- virtual USHORT GetVersion() const; // Solange der Outliner keine Recordlaenge speichert
+ virtual USHORT GetVersion() const
+ { return 0; }
virtual EditTextObject* Clone() const = 0;
@@ -82,31 +90,60 @@ public:
static EditTextObject* Create( SvStream& rIStream,
SfxItemPool* pGlobalTextObjectPool = 0 );
- // Zur 5.1 hat sich die Bedeutung des LRSpaceItems fuer den Outliner geaendert...
- virtual void AdjustImportedLRSpaceItems( BOOL bTurnOfBullets );
- virtual void FinishLoad( SfxStyleSheetPool* pStyleSheetPool );
-
- virtual USHORT GetParagraphCount() const;
+ virtual void AdjustImportedLRSpaceItems( BOOL /* bTurnOfBullets */ )
+ {}
- virtual XubString GetText( USHORT nParagraph ) const;
- virtual void Insert( const EditTextObject& rObj, USHORT nPara );
+ virtual void FinishLoad( SfxStyleSheetPool* /* pStyleSheetPool */ )
+ {}
- virtual void ClearPortionInfo();
+ virtual USHORT GetParagraphCount() const
+ { return 0; }
+ virtual XubString GetText( USHORT nParagraph ) const
+ { return XubString(); }
+ virtual void Insert( const EditTextObject& /* rObj */, USHORT /* nPara */ )
+ {}
+ virtual void ClearPortionInfo()
+ {}
- virtual void MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart = EE_CHAR_START, USHORT nEnd = EE_CHAR_END );
+ virtual void MergeParaAttribs(
+ const SfxItemSet& rAttribs,
+ USHORT nStart = EE_CHAR_START,
+ USHORT nEnd = EE_CHAR_END
+ ) {}
- virtual BOOL HasField( TypeId aType = NULL ) const;
+ virtual BOOL HasField( TypeId aType = NULL ) const
+ { return FALSE; }
virtual SfxItemSet GetParaAttribs( USHORT nPara ) const;
- virtual void GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamily& eFamily ) const;
- virtual void SetStyleSheet( USHORT nPara, const XubString& rName, const SfxStyleFamily& eFamily );
- virtual BOOL ChangeStyleSheets( const XubString& rOldName, SfxStyleFamily eOldFamily,
- const XubString& rNewName, SfxStyleFamily eNewFamily );
- virtual void ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName );
+ virtual void GetStyleSheet(
+ USHORT /* nPara */,
+ XubString& /* rName */,
+ SfxStyleFamily& /* eFamily */
+ ) const {}
+
+ virtual void SetStyleSheet(
+ USHORT /* nPara */,
+ const XubString& /* rName */,
+ const SfxStyleFamily& /* eFamily */
+ ) {}
+
+ virtual BOOL ChangeStyleSheets(
+ const XubString& /* rOldName */,
+ SfxStyleFamily /* eOldFamily */,
+ const XubString& /* rNewName */,
+ SfxStyleFamily /* eNewFamily */
+ )
+ { return FALSE; }
+
+ virtual void ChangeStyleSheetName(
+ SfxStyleFamily /* eFamily */,
+ const XubString& /* rOldName */,
+ const XubString& /* rNewName */
+ ) {}
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_svx/editview.hxx b/binfilter/inc/bf_svx/editview.hxx
index bb79879..da94136 100644
--- a/binfilter/inc/bf_svx/editview.hxx
+++ b/binfilter/inc/bf_svx/editview.hxx
@@ -103,9 +103,6 @@ public:
const Rectangle& GetVisArea() const;
- void Cut();
- void Copy();
- void Paste();
};
}//end of namespace binfilter
More information about the Libreoffice-commits
mailing list