[Libreoffice-commits] core.git: editeng/source include/editeng sc/source sd/source svx/source
Matúš Kukan
matus.kukan at collabora.com
Wed Sep 3 12:05:56 PDT 2014
editeng/source/editeng/editeng.cxx | 5 -----
editeng/source/outliner/outlin2.cxx | 4 ++--
include/editeng/editeng.hxx | 1 -
include/editeng/outliner.hxx | 2 +-
sc/source/core/data/column2.cxx | 2 +-
sc/source/ui/app/inputhdl.cxx | 6 +++---
sd/source/ui/func/fuexpand.cxx | 2 +-
sd/source/ui/func/fusumry.cxx | 2 +-
svx/source/sdr/properties/textproperties.cxx | 2 +-
svx/source/svdraw/svdedxv.cxx | 2 +-
svx/source/table/cell.cxx | 2 +-
11 files changed, 12 insertions(+), 18 deletions(-)
New commits:
commit d59e728be6d71cfb86c5f2904df793e9dd2d1af5
Author: Matúš Kukan <matus.kukan at collabora.com>
Date: Wed Sep 3 19:38:22 2014 +0200
Remove (misleading) EditEngine::QuickRemoveCharAttribs
Change-Id: I7a0be4e204a239dfdd9c184b3d54a69debe8a208
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index ed9f9ff..9f0e73f 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2070,11 +2070,6 @@ void EditEngine::QuickFormatDoc( bool bFull )
pImpEditEngine->UpdateViews( NULL );
}
-void EditEngine::QuickRemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich )
-{
- pImpEditEngine->RemoveCharAttribs( nPara, nWhich );
-}
-
void EditEngine::SetStyleSheet(const EditSelection& aSel, SfxStyleSheet* pStyle)
{
pImpEditEngine->SetStyleSheet(aSel, pStyle);
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 43ca90b..168f103 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -334,9 +334,9 @@ sal_uLong Outliner::GetLineHeight( sal_Int32 nParagraph, sal_Int32 nLine )
return pEditEngine->GetLineHeight( nParagraph, nLine );
}
-void Outliner::QuickRemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich )
+void Outliner::RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich )
{
- pEditEngine->QuickRemoveCharAttribs( nPara, nWhich );
+ pEditEngine->RemoveCharAttribs( nPara, nWhich );
}
EESpellState Outliner::HasSpellErrors()
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 76468d8..c9f73e8 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -374,7 +374,6 @@ public:
sal_uInt32 GetControlWord() const;
void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );
- void QuickRemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0 );
void QuickMarkInvalid( const ESelection& rSel );
void QuickFormatDoc( bool bFull = false );
void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 218d9ff..1b47f6f 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -906,7 +906,7 @@ public:
// Only for EditEngine mode
void QuickInsertText( const OUString& rText, const ESelection& rSel );
void QuickDelete( const ESelection& rSel );
- void QuickRemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0 );
+ void RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0 );
void QuickFormatDoc( bool bFull = false );
bool UpdateFields();
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 5382913..0284f0b 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1064,7 +1064,7 @@ public:
sal_Int32 nParCount = mpEngine->GetParagraphCount();
for (sal_Int32 nPar=0; nPar<nParCount; nPar++)
{
- mpEngine->QuickRemoveCharAttribs(nPar);
+ mpEngine->RemoveCharAttribs(nPar);
const SfxItemSet& rOld = mpEngine->GetParaAttribs(nPar);
if ( rOld.Count() )
{
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 8ba9457..05e0251 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1612,7 +1612,7 @@ void ScInputHandler::UpdateParenthesis()
// Remove old highlighting
sal_Int32 nCount = pEngine->GetParagraphCount();
for (sal_Int32 i=0; i<nCount; i++)
- pEngine->QuickRemoveCharAttribs( i, EE_CHAR_WEIGHT );
+ pEngine->RemoveCharAttribs( i, EE_CHAR_WEIGHT );
}
ESelection aSelThis( 0,nPos, 0,nPos+1 );
@@ -1807,7 +1807,7 @@ void ScInputHandler::RemoveRangeFinder()
pEngine->SetUpdateMode(false);
sal_Int32 nCount = pEngine->GetParagraphCount(); // Could just have been inserted
for (sal_Int32 i=0; i<nCount; i++)
- pEngine->QuickRemoveCharAttribs( i, EE_CHAR_COLOR );
+ pEngine->RemoveCharAttribs( i, EE_CHAR_COLOR );
pEngine->SetUpdateMode(true);
EditView* pActiveView = pTopView ? pTopView : pTableView;
@@ -3662,7 +3662,7 @@ bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine )
// Delete attributes
for (sal_Int32 i=0; i<nParCnt; i++)
- rDestEngine.QuickRemoveCharAttribs( i );
+ rDestEngine.RemoveCharAttribs( i );
// Combine paragraphs
while ( nParCnt > 1 )
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index 83cc837..6df9b36 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -121,7 +121,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
for (sal_Int32 nPara = 0; nPara < nParaCount1; nPara++)
{
- pOutl->QuickRemoveCharAttribs(nPara);
+ pOutl->RemoveCharAttribs(nPara);
pOutl->SetParaAttribs(nPara, aEmptyEEAttr);
}
diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx
index da0a333..dc5283d 100644
--- a/sd/source/ui/func/fusumry.cxx
+++ b/sd/source/ui/func/fusumry.cxx
@@ -200,7 +200,7 @@ void FuSummaryPage::DoExecute( SfxRequest& )
for (sal_Int32 nPara = 0; nPara < nParaCount; nPara++)
{
pOutl->SetStyleSheet( nPara, pStyle );
- pOutl->QuickRemoveCharAttribs(nPara);
+ pOutl->RemoveCharAttribs(nPara);
pOutl->SetParaAttribs(nPara, aEmptyEEAttr);
pOutl->SetDepth(pOutl->GetParagraph(nPara), 0);
}
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 6ab12ed..e4a2a5f 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -328,7 +328,7 @@ namespace sdr
if(nW >= EE_ITEMS_START && nW <= EE_ITEMS_END)
{
- rOutliner.QuickRemoveCharAttribs(nPara, nW);
+ rOutliner.RemoveCharAttribs(nPara, nW);
}
}
pItem = aIter.NextItem();
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index ea649b0..3908354 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2048,7 +2048,7 @@ void SdrObjEditView::ApplyFormatPaintBrushToText( SfxItemSet& rFormatSet, SdrTex
for(sal_Int32 nPara = 0; nPara < nParaCount; nPara++)
{
if( !bNoCharacterFormats )
- rOutliner.QuickRemoveCharAttribs( nPara, /* remove all */0 );
+ rOutliner.RemoveCharAttribs( nPara, /* remove all */0 );
SfxItemSet aSet(rOutliner.GetParaAttribs(nPara));
aSet.Put(CreatePaintSet( GetFormatRangeImpl(true), *aSet.GetPool(), rFormatSet, aSet, bNoCharacterFormats, bNoParagraphFormats ) );
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index fbc353b..bbe6d31 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -266,7 +266,7 @@ namespace sdr
SfxItemSet aSet(pOutliner->GetParaAttribs(nPara));
aSet.Put(rSet);
if (aSet.GetItemState(EE_CHAR_COLOR, false) == SFX_ITEM_ON)
- pOutliner->QuickRemoveCharAttribs( nPara, EE_CHAR_COLOR );
+ pOutliner->RemoveCharAttribs( nPara, EE_CHAR_COLOR );
pOutliner->SetParaAttribs(nPara, aSet);
}
More information about the Libreoffice-commits
mailing list