From d5c2846b37c506e58e10a6a18dd34f3d9b8f49aa Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Tue, 17 Apr 2012 10:59:19 -0400 Subject: None of the edit undo classes access ImpEditEngine directly. --- editeng/inc/editeng/editeng.hxx | 10 +++- editeng/source/editeng/editeng.cxx | 30 +++++++++++ editeng/source/editeng/editundo.cxx | 103 ++++++++++++++++++------------------ 3 files changed, 89 insertions(+), 54 deletions(-) (limited to 'editeng') diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx index 043776bdd019..523addfd8a81 100644 --- a/editeng/inc/editeng/editeng.hxx +++ b/editeng/inc/editeng/editeng.hxx @@ -171,8 +171,6 @@ private: EDITENG_DLLPRIVATE Range GetLineXPosStartEnd( const ParaPortion* pParaPortion, const EditLine* pLine) const; - EDITENG_DLLPRIVATE bool IsFormatted() const; - EDITENG_DLLPRIVATE sal_uInt16 GetOnePixelInRef() const; EDITENG_DLLPRIVATE InternalEditStatus& GetInternalEditStatus(); @@ -233,6 +231,7 @@ public: LanguageType GetLanguage( sal_uInt16 nPara, sal_uInt16 nPos ) const; void TransliterateText( const ESelection& rSelection, sal_Int32 nTransliterationMode ); + EditSelection TransliterateText( const EditSelection& rSelection, sal_Int32 nTransliterationMode ); void SetAsianCompressionMode( sal_uInt16 nCompression ); @@ -514,6 +513,7 @@ public: EditDoc& GetEditDoc(); const EditDoc& GetEditDoc() const; + bool IsFormatted() const; bool IsImportHandlerSet() const; bool IsImportRTFStyleSheetsSet() const; @@ -527,6 +527,7 @@ public: EditPaM InsertField(const EditSelection& rEditSelection, const SvxFieldItem& rFld); EditPaM InsertText(const EditSelection& aCurEditSelection, const String& rStr); + EditSelection InsertText(const EditTextObject& rTextObject, const EditSelection& rSel); EditPaM InsertParaBreak( const EditSelection& rEditSelection, bool bKeepEndingAttribs = true); EditPaM InsertLineBreak(const EditSelection& rEditSelection); @@ -542,12 +543,14 @@ public: EditPaM DeleteSelection(const EditSelection& rSel); ESelection CreateESelection(const EditSelection& rSel); + EditSelection CreateSelection(const ESelection& rSel); const SfxItemSet& GetBaseParaAttribs(sal_uInt16 nPara) const; void SetParaAttribsOnly(sal_uInt16 nPara, const SfxItemSet& rSet); void SetAttribs(const EditSelection& rSel, const SfxItemSet& rSet, sal_uInt8 nSpecial = 0); String GetSelected(const EditSelection& rSel, const LineEnd eParaSep = LINEEND_LF) const; + EditPaM DeleteSelected(const EditSelection& rSel); sal_uInt16 GetScriptType(const EditSelection& rSel) const; @@ -566,6 +569,9 @@ public: EditPaM InsertFeature(const EditSelection& rEditSelection, const SfxPoolItem& rItem); EditSelection MoveParagraphs(const Range& rParagraphs, sal_uInt16 nNewPos, EditView* pCurView); + + void RemoveCharAttribs(sal_uInt16 nPara, sal_uInt16 nWhich = 0, bool bRemoveFeatures = false); + void RemoveCharAttribs(const EditSelection& rSel, bool bRemoveParaAttribs, sal_uInt16 nWhich = 0); }; #endif // _MyEDITENG_HXX diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 81ad8806b3a6..2f9e901ef876 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -534,6 +534,11 @@ void EditEngine::TransliterateText( const ESelection& rSelection, sal_Int32 nTra pImpEditEngine->TransliterateText( pImpEditEngine->CreateSel( rSelection ), nTransliterationMode ); } +EditSelection EditEngine::TransliterateText(const EditSelection& rSelection, sal_Int32 nTransliterationMode) +{ + return pImpEditEngine->TransliterateText(rSelection, nTransliterationMode); +} + void EditEngine::SetAsianCompressionMode( sal_uInt16 n ) { DBG_CHKTHIS( EditView, 0 ); @@ -792,6 +797,16 @@ EditSelection EditEngine::MoveParagraphs(const Range& rParagraphs, sal_uInt16 nN return pImpEditEngine->MoveParagraphs(rParagraphs, nNewPos, pCurView); } +void EditEngine::RemoveCharAttribs(sal_uInt16 nPara, sal_uInt16 nWhich, bool bRemoveFeatures) +{ + pImpEditEngine->RemoveCharAttribs(nPara, nWhich, bRemoveFeatures); +} + +void EditEngine::RemoveCharAttribs(const EditSelection& rSel, bool bRemoveParaAttribs, sal_uInt16 nWhich) +{ + pImpEditEngine->RemoveCharAttribs(rSel, bRemoveParaAttribs, nWhich); +} + uno::Reference EditEngine::CreateTransferable(const EditSelection& rSelection) { return pImpEditEngine->CreateTransferable(rSelection); @@ -823,6 +838,11 @@ EditPaM EditEngine::InsertText(const EditSelection& aCurEditSelection, const Str return pImpEditEngine->InsertText(aCurEditSelection, rStr); } +EditSelection EditEngine::InsertText(const EditTextObject& rTextObject, const EditSelection& rSel) +{ + return pImpEditEngine->InsertText(rTextObject, rSel); +} + EditSelection EditEngine::InsertText( uno::Reference& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, bool bUseSpecial) @@ -909,6 +929,11 @@ ESelection EditEngine::CreateESelection(const EditSelection& rSel) return pImpEditEngine->CreateESel(rSel); } +EditSelection EditEngine::CreateSelection(const ESelection& rSel) +{ + return pImpEditEngine->CreateSel(rSel); +} + const SfxItemSet& EditEngine::GetBaseParaAttribs(sal_uInt16 nPara) const { return pImpEditEngine->GetParaAttribs(nPara); @@ -929,6 +954,11 @@ String EditEngine::GetSelected(const EditSelection& rSel, const LineEnd eParaSep return pImpEditEngine->GetSelected(rSel, eParaSep); } +EditPaM EditEngine::DeleteSelected(const EditSelection& rSel) +{ + return pImpEditEngine->DeleteSelected(rSel); +} + void EditEngine::HandleBeginPasteOrDrop(PasteOrDropInfos& rInfos) { pImpEditEngine->aBeginPasteOrDropHdl.Call(&rInfos); diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index 067d84fa8a10..ebbc6e96adcd 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -494,17 +494,17 @@ EditUndoSetStyleSheet::~EditUndoSetStyleSheet() void EditUndoSetStyleSheet::Undo() { - DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); - GetImpEditEngine()->SetStyleSheet( nPara, (SfxStyleSheet*)GetImpEditEngine()->GetStyleSheetPool()->Find( aPrevName, ePrevFamily ) ); - GetImpEditEngine()->SetParaAttribs( nPara, aPrevParaAttribs ); - lcl_DoSetSelection( GetImpEditEngine()->GetActiveView(), nPara ); + DBG_ASSERT( GetEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); + GetEditEngine()->SetStyleSheet( nPara, (SfxStyleSheet*)GetEditEngine()->GetStyleSheetPool()->Find( aPrevName, ePrevFamily ) ); + GetEditEngine()->SetParaAttribsOnly( nPara, aPrevParaAttribs ); + lcl_DoSetSelection( GetEditEngine()->GetActiveView(), nPara ); } void EditUndoSetStyleSheet::Redo() { - DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); - GetImpEditEngine()->SetStyleSheet( nPara, (SfxStyleSheet*)GetImpEditEngine()->GetStyleSheetPool()->Find( aNewName, eNewFamily ) ); - lcl_DoSetSelection( GetImpEditEngine()->GetActiveView(), nPara ); + DBG_ASSERT( GetEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); + GetEditEngine()->SetStyleSheet( nPara, (SfxStyleSheet*)GetEditEngine()->GetStyleSheetPool()->Find( aNewName, eNewFamily ) ); + lcl_DoSetSelection( GetEditEngine()->GetActiveView(), nPara ); } EditUndoSetParaAttribs::EditUndoSetParaAttribs( ImpEditEngine* _pImpEE, sal_uInt16 nP, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems ) @@ -521,16 +521,16 @@ EditUndoSetParaAttribs::~EditUndoSetParaAttribs() void EditUndoSetParaAttribs::Undo() { - DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); - GetImpEditEngine()->SetParaAttribs( nPara, aPrevItems ); - lcl_DoSetSelection( GetImpEditEngine()->GetActiveView(), nPara ); + DBG_ASSERT( GetEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); + GetEditEngine()->SetParaAttribsOnly( nPara, aPrevItems ); + lcl_DoSetSelection( GetEditEngine()->GetActiveView(), nPara ); } void EditUndoSetParaAttribs::Redo() { - DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); - GetImpEditEngine()->SetParaAttribs( nPara, aNewItems ); - lcl_DoSetSelection( GetImpEditEngine()->GetActiveView(), nPara ); + DBG_ASSERT( GetEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); + GetEditEngine()->SetParaAttribsOnly( nPara, aNewItems ); + lcl_DoSetSelection( GetEditEngine()->GetActiveView(), nPara ); } EditUndoSetAttribs::EditUndoSetAttribs( ImpEditEngine* _pImpEE, const ESelection& rESel, const SfxItemSet& rNewItems ) @@ -571,47 +571,47 @@ EditUndoSetAttribs::~EditUndoSetAttribs() void EditUndoSetAttribs::Undo() { - DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); - ImpEditEngine* _pImpEE = GetImpEditEngine(); + DBG_ASSERT( GetEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); + EditEngine* pEE = GetEditEngine(); bool bFields = false; for ( sal_uInt16 nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ ) { const ContentAttribsInfo& rInf = aPrevAttribs[nPara-aESel.nStartPara]; // first the paragraph attributes ... - _pImpEE->SetParaAttribs(nPara, rInf.GetPrevParaAttribs()); + pEE->SetParaAttribsOnly(nPara, rInf.GetPrevParaAttribs()); // Then the character attributes ... // Remove all attributes including features, are later re-established. - _pImpEE->RemoveCharAttribs(nPara, 0, true); - DBG_ASSERT( _pImpEE->GetEditDoc().GetObject( nPara ), "Undo (SetAttribs): pNode = NULL!" ); - ContentNode* pNode = _pImpEE->GetEditDoc().GetObject( nPara ); + pEE->RemoveCharAttribs(nPara, 0, true); + DBG_ASSERT( pEE->GetEditDoc().GetObject( nPara ), "Undo (SetAttribs): pNode = NULL!" ); + ContentNode* pNode = pEE->GetEditDoc().GetObject( nPara ); for (size_t nAttr = 0; nAttr < rInf.GetPrevCharAttribs().size(); ++nAttr) { const EditCharAttrib& rX = rInf.GetPrevCharAttribs()[nAttr]; // is automatically "poolsized" - _pImpEE->GetEditDoc().InsertAttrib(pNode, rX.GetStart(), rX.GetEnd(), *rX.GetItem()); + pEE->GetEditDoc().InsertAttrib(pNode, rX.GetStart(), rX.GetEnd(), *rX.GetItem()); if (rX.Which() == EE_FEATURE_FIELD) bFields = true; } } if ( bFields ) - _pImpEE->UpdateFields(); - ImpSetSelection( GetImpEditEngine()->GetActiveView() ); + pEE->UpdateFieldsOnly(); + ImpSetSelection(pEE->GetActiveView()); } void EditUndoSetAttribs::Redo() { - DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); - ImpEditEngine* _pImpEE = GetImpEditEngine(); + DBG_ASSERT( GetEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); + EditEngine* pEE = GetEditEngine(); - EditSelection aSel( _pImpEE->CreateSel( aESel ) ); + EditSelection aSel = pEE->CreateSelection(aESel); if ( !bSetIsRemove ) - _pImpEE->SetAttribs( aSel, aNewAttribs, nSpecial ); + pEE->SetAttribs( aSel, aNewAttribs, nSpecial ); else - _pImpEE->RemoveCharAttribs( aSel, bRemoveParaAttribs, nRemoveWhich ); + pEE->RemoveCharAttribs( aSel, bRemoveParaAttribs, nRemoveWhich ); - ImpSetSelection( GetImpEditEngine()->GetActiveView() ); + ImpSetSelection( GetEditEngine()->GetActiveView() ); } void EditUndoSetAttribs::AppendContentInfo(ContentAttribsInfo* pNew) @@ -621,9 +621,9 @@ void EditUndoSetAttribs::AppendContentInfo(ContentAttribsInfo* pNew) void EditUndoSetAttribs::ImpSetSelection( EditView* /*pView*/ ) { - ImpEditEngine* _pImpEE = GetImpEditEngine(); - EditSelection aSel( _pImpEE->CreateSel( aESel ) ); - GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aSel ); + EditEngine* pEE = GetEditEngine(); + EditSelection aSel = pEE->CreateSelection(aESel); + pEE->GetActiveView()->GetImpEditView()->SetEditSelection(aSel); } EditUndoTransliteration::EditUndoTransliteration( ImpEditEngine* _pImpEE, const ESelection& rESel, sal_Int32 nM ) @@ -640,26 +640,26 @@ EditUndoTransliteration::~EditUndoTransliteration() void EditUndoTransliteration::Undo() { - DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); + DBG_ASSERT( GetEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); - ImpEditEngine* _pImpEE = GetImpEditEngine(); + EditEngine* pEE = GetEditEngine(); - EditSelection aSel( _pImpEE->CreateSel( aNewESel ) ); + EditSelection aSel = pEE->CreateSelection(aNewESel); // Insert text, but don't expand Atribs at the current position: - aSel = _pImpEE->DeleteSelected( aSel ); + aSel = pEE->DeleteSelected( aSel ); EditSelection aDelSel( aSel ); - aSel = _pImpEE->InsertParaBreak( aSel ); + aSel = pEE->InsertParaBreak( aSel ); aDelSel.Max() = aSel.Min(); - aDelSel.Max().GetNode()->GetCharAttribs().DeleteEmptyAttribs( _pImpEE->GetEditDoc().GetItemPool() ); + aDelSel.Max().GetNode()->GetCharAttribs().DeleteEmptyAttribs( pEE->GetEditDoc().GetItemPool() ); EditSelection aNewSel; if ( pTxtObj ) { - aNewSel = _pImpEE->InsertText( *pTxtObj, aSel ); + aNewSel = pEE->InsertText( *pTxtObj, aSel ); } else { - aNewSel = _pImpEE->InsertText( aSel, aText ); + aNewSel = pEE->InsertText( aSel, aText ); } if ( aNewSel.Min().GetNode() == aDelSel.Max().GetNode() ) { @@ -673,19 +673,18 @@ void EditUndoTransliteration::Undo() aNewSel.Max().GetIndex() = aNewSel.Max().GetIndex() + aDelSel.Min().GetIndex(); } - _pImpEE->DeleteSelected( aDelSel ); - - GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel ); + pEE->DeleteSelected( aDelSel ); + pEE->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel ); } void EditUndoTransliteration::Redo() { - DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); - ImpEditEngine* _pImpEE = GetImpEditEngine(); + DBG_ASSERT( GetEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); + EditEngine* pEE = GetEditEngine(); - EditSelection aSel( _pImpEE->CreateSel( aOldESel ) ); - EditSelection aNewSel = _pImpEE->TransliterateText( aSel, nMode ); - GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel ); + EditSelection aSel = pEE->CreateSelection(aOldESel); + EditSelection aNewSel = pEE->TransliterateText( aSel, nMode ); + pEE->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel ); } EditUndoMarkSelection::EditUndoMarkSelection( ImpEditEngine* _pImpEE, const ESelection& rSel ) @@ -699,13 +698,13 @@ EditUndoMarkSelection::~EditUndoMarkSelection() void EditUndoMarkSelection::Undo() { - DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); - if ( GetImpEditEngine()->GetActiveView() ) + DBG_ASSERT( GetEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" ); + if ( GetEditEngine()->GetActiveView() ) { - if ( GetImpEditEngine()->IsFormatted() ) - GetImpEditEngine()->GetActiveView()->SetSelection( aSelection ); + if ( GetEditEngine()->IsFormatted() ) + GetEditEngine()->GetActiveView()->SetSelection( aSelection ); else - GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( GetImpEditEngine()->CreateSel( aSelection ) ); + GetEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( GetEditEngine()->CreateSelection(aSelection) ); } } -- cgit