summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/accessibility/AccessibleStaticTextBase.cxx41
-rw-r--r--editeng/source/editeng/editeng.cxx6
-rw-r--r--editeng/source/editeng/impedit.hxx1
-rw-r--r--editeng/source/editeng/impedit3.cxx9
-rw-r--r--editeng/source/editeng/impedit4.cxx8
-rw-r--r--editeng/source/editeng/textconv.cxx7
-rw-r--r--editeng/source/editeng/textconv.hxx1
-rw-r--r--editeng/source/outliner/outliner.cxx2
-rw-r--r--editeng/source/rtf/rtfitem.cxx1
-rw-r--r--editeng/source/rtf/svxrtf.cxx22
10 files changed, 2 insertions, 96 deletions
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index abc190339c8b..6a1c21c362c5 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -130,13 +130,8 @@ namespace accessibility
void SetOffset( const Point& );
- void UpdateChildren();
void Dispose();
-#ifdef DBG_UTIL
- void CheckInvariants() const;
-#endif
-
AccessibleEditableTextPara& GetParagraph( sal_Int32 nPara ) const;
sal_Int32 GetParagraphCount() const;
@@ -232,15 +227,6 @@ namespace accessibility
if( mpTextParagraph )
mpTextParagraph->SetEEOffset( rPoint );
-
- // in all cases, check visibility afterwards.
- UpdateChildren();
- }
-
- void AccessibleStaticTextBase_Impl::UpdateChildren()
- {
-
- // currently no children
}
void AccessibleStaticTextBase_Impl::Dispose()
@@ -256,13 +242,6 @@ namespace accessibility
mpTextParagraph = NULL;
}
-#ifdef DBG_UTIL
- void AccessibleStaticTextBase_Impl::CheckInvariants() const
- {
- // TODO
- }
-#endif
-
AccessibleEditableTextPara& AccessibleStaticTextBase_Impl::GetParagraph( sal_Int32 nPara ) const
{
@@ -494,11 +473,8 @@ namespace accessibility
// precondition: solar mutex locked
DBG_TESTSOLARMUTEX();
- mpImpl->CheckInvariants();
-
mpImpl->SetEditSource( std::move(pEditSource) );
- mpImpl->CheckInvariants();
#else
mpImpl->SetEditSource( std::move(pEditSource) );
#endif
@@ -506,15 +482,8 @@ namespace accessibility
void AccessibleStaticTextBase::SetEventSource( const uno::Reference< XAccessible >& rInterface )
{
-#ifdef DBG_UTIL
- mpImpl->CheckInvariants();
-#endif
-
mpImpl->SetEventSource( rInterface );
-#ifdef DBG_UTIL
- mpImpl->CheckInvariants();
-#endif
}
void AccessibleStaticTextBase::SetOffset( const Point& rPoint )
@@ -523,11 +492,8 @@ namespace accessibility
// precondition: solar mutex locked
DBG_TESTSOLARMUTEX();
- mpImpl->CheckInvariants();
-
mpImpl->SetOffset( rPoint );
- mpImpl->CheckInvariants();
#else
mpImpl->SetOffset( rPoint );
#endif
@@ -535,15 +501,8 @@ namespace accessibility
void AccessibleStaticTextBase::Dispose()
{
-#ifdef DBG_UTIL
- mpImpl->CheckInvariants();
-#endif
-
mpImpl->Dispose();
-#ifdef DBG_UTIL
- mpImpl->CheckInvariants();
-#endif
}
// XAccessibleContext
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 2093382f414a..c65c8910d380 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2462,12 +2462,6 @@ void EditEngine::ParagraphConnected( sal_Int32 /*nLeftParagraph*/, sal_Int32 /*n
{
}
-bool EditEngine::FormattingParagraph( sal_Int32 )
-{
- // return true, if the Attribute was changed ...
- return false;
-}
-
void EditEngine::ParaAttribsChanged( sal_Int32 /* nParagraph */ )
{
}
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 093aa105a677..72c35e3db28c 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -629,7 +629,6 @@ private:
sal_uInt32 WriteText( SvStream& rOutput, EditSelection aSel );
sal_uInt32 WriteRTF( SvStream& rOutput, EditSelection aSel );
sal_uInt32 WriteXML(SvStream& rOutput, const EditSelection& rSel);
- sal_uInt32 WriteHTML( SvStream& rOutput, EditSelection aSel );
sal_uInt32 WriteBin(SvStream& rOutput, const EditSelection& rSel, bool bStoreUnicode = false);
void WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, sal_Int32 nPara, sal_Int32 nPos,
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 70ca386ecfad..bf4f5afa7fc2 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -380,15 +380,6 @@ void ImpEditEngine::FormatDoc()
ParaPortion* pParaPortion = GetParaPortions()[nPara];
if ( pParaPortion->MustRepaint() || ( pParaPortion->IsInvalid() && pParaPortion->IsVisible() ) )
{
- if ( pParaPortion->IsInvalid() )
- {
- bool bChangedByDerivedClass = GetEditEnginePtr()->FormattingParagraph( nPara );
- if ( bChangedByDerivedClass )
- {
- pParaPortion->GetTextPortions().Reset();
- pParaPortion->MarkSelectionInvalid( 0, pParaPortion->GetNode()->Len() );
- }
- }
// No formatting should be necessary for MustRepaint()!
if ( ( pParaPortion->MustRepaint() && !pParaPortion->IsInvalid() )
|| CreateLines( nPara, nY ) )
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index f0aa045ccea3..5c1a50628364 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -213,7 +213,7 @@ void ImpEditEngine::Write(SvStream& rOutput, EETextFormat eFormat, const EditSel
else if ( eFormat == EE_FORMAT_XML )
WriteXML( rOutput, rSel );
else if ( eFormat == EE_FORMAT_HTML )
- WriteHTML( rOutput, rSel );
+ ;
else if ( eFormat == EE_FORMAT_BIN)
WriteBin( rOutput, rSel );
else
@@ -998,12 +998,6 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
}
}
-sal_uInt32 ImpEditEngine::WriteHTML( SvStream&, EditSelection )
-{
- return 0;
-}
-
-
EditTextObject* ImpEditEngine::CreateTextObject()
{
EditSelection aCompleteSelection;
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index f22478e7d94b..62c9a29ca6d9 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -134,7 +134,6 @@ bool TextConvWrapper::FindConvText_impl()
}
else
{
- ConvEnd_impl();
bConvert = ConvNext_impl();
}
}
@@ -223,11 +222,6 @@ void TextConvWrapper::ConvStart_impl( SvxSpellArea eArea )
}
-void TextConvWrapper::ConvEnd_impl()
-{
-}
-
-
bool TextConvWrapper::ConvContinue_impl()
{
// modified version of EditSpellWrapper::SpellContinue
@@ -572,7 +566,6 @@ void TextConvWrapper::Convert()
m_bStartChk = false;
ConvStart_impl( SVX_SPELL_BODY_END );
ConvertDocument();
- ConvEnd_impl();
}
diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx
index 712e0f9dc1c3..012811c457c8 100644
--- a/editeng/source/editeng/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -56,7 +56,6 @@ class TextConvWrapper : public editeng::HangulHanjaConversion
// from EditSpellWrapper copied and modified
void ConvStart_impl( SvxSpellArea eSpell ); // former SpellStart
- void ConvEnd_impl(); // former SpellEnd
bool ConvContinue_impl(); // former SpellContinue
void SelectNewUnit_impl( const sal_Int32 nUnitStart,
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index fe6e6ca84bde..83a0f7ad5086 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -223,7 +223,7 @@ void Outliner::Init( sal_uInt16 nMode )
const bool bWasUndoEnabled(IsUndoEnabled());
EnableUndo(false);
- ImplInitDepth( 0, GetMinDepth(), false );
+ ImplInitDepth( 0, -1, false );
GetUndoManager().Clear();
EnableUndo(bWasUndoEnabled);
}
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 6083cf16d706..36ab6059bdb6 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -222,7 +222,6 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
{
case RTF_PARD:
RTFPardPlain( true, &pSet );
- ResetPard();
nStyleNo = 0;
bPardTokenRead = true;
break;
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 1d3f79428f9e..552c52a77b27 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -85,18 +85,6 @@ SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn,
pDfltColor = new Color;
}
-void SvxRTFParser::EnterEnvironment()
-{
-}
-
-void SvxRTFParser::LeaveEnvironment()
-{
-}
-
-void SvxRTFParser::ResetPard()
-{
-}
-
SvxRTFParser::~SvxRTFParser()
{
if( !aColorTbl.empty() )
@@ -224,13 +212,11 @@ INSINGLECHAR:
case '{':
if (bNewGroup) // Nesting!
_GetAttrSet();
- EnterEnvironment();
bNewGroup = true;
break;
case '}':
if( !bNewGroup ) // Empty Group ??
AttrGroupEnd();
- LeaveEnvironment();
bNewGroup = false;
break;
case RTF_INFO:
@@ -1230,11 +1216,6 @@ void SvxRTFItemStackType::MoveFullNode(const SvxNodeIdx &rOldNode,
}
}
-bool SvxRTFParser::UncompressableStackEntry(const SvxRTFItemStackType &) const
-{
- return false;
-}
-
void SvxRTFItemStackType::Compress( const SvxRTFParser& rParser )
{
ENSURE_OR_RETURN_VOID(pChildList, "Compress: no ChildList" );
@@ -1270,9 +1251,6 @@ void SvxRTFItemStackType::Compress( const SvxRTFParser& rParser )
return;
}
- if (rParser.UncompressableStackEntry(*pTmp))
- return;
-
if( n )
{
// Search for all which are set over the whole area
generated by cgit (git 2.34.1) at 2025-01-10 05:22:12 +0000