[Libreoffice-commits] core.git: editeng/source include/editeng
Noel Grandin
noel.grandin at collabora.co.uk
Fri Oct 21 13:00:30 UTC 2016
editeng/source/accessibility/AccessibleImageBullet.cxx | 2 -
editeng/source/editeng/editobj.cxx | 14 +------------
editeng/source/items/bulitem.cxx | 12 +++++------
editeng/source/items/frmitems.cxx | 8 -------
editeng/source/rtf/svxrtf.cxx | 18 +++--------------
include/editeng/AccessibleImageBullet.hxx | 2 -
include/editeng/brushitem.hxx | 2 -
include/editeng/bulletitem.hxx | 8 -------
include/editeng/editobj.hxx | 3 --
include/editeng/svxrtf.hxx | 5 ----
10 files changed, 14 insertions(+), 60 deletions(-)
New commits:
commit 861a322c662eb48b8da21c9d3ad1fa1f2f961391
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Oct 21 14:14:39 2016 +0200
loplugin:expandablemethodds in include/editeng
Change-Id: Iaf56cb9c16a4cbfb9ab1636228c77d1033a334f5
Reviewed-on: https://gerrit.libreoffice.org/30132
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index f595104..466a339 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -265,7 +265,7 @@ namespace accessibility
GetViewForwarder() );
// offset from shape/cell
- Point aOffset = GetEEOffset();
+ Point aOffset = maEEOffset;
return awt::Rectangle( aScreenRect.Left() + aOffset.X(),
aScreenRect.Top() + aOffset.Y(),
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 9ae54ef..33939f5f6 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -379,7 +379,7 @@ void EditTextObject::Store( SvStream& rOStream ) const
sal_uInt32 nStructSz = 0;
rOStream.WriteUInt32( nStructSz );
- StoreData( rOStream );
+ mpImpl->StoreData(rOStream);
sal_uInt64 const nEndPos = rOStream.Tell();
nStructSz = nEndPos - nStartPos - sizeof( nWhich ) - sizeof( nStructSz );
@@ -410,7 +410,7 @@ EditTextObject* EditTextObject::Create( SvStream& rIStream )
return nullptr;
EditTextObject* pTxtObj = new EditTextObject(nullptr);
- pTxtObj->CreateData(rIStream);
+ pTxtObj->mpImpl->CreateData(rIStream);
// Make sure that the stream is left at the correct place.
std::size_t nFullSz = sizeof( nWhich ) + sizeof( nStructSz ) + nStructSz;
@@ -418,16 +418,6 @@ EditTextObject* EditTextObject::Create( SvStream& rIStream )
return pTxtObj;
}
-void EditTextObject::StoreData( SvStream& rStrm ) const
-{
- mpImpl->StoreData(rStrm);
-}
-
-void EditTextObject::CreateData( SvStream& rStrm )
-{
- mpImpl->CreateData(rStrm);
-}
-
EditTextObject* EditTextObject::Clone() const
{
return new EditTextObject(*this);
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 5e2b919..1283f32 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -221,13 +221,13 @@ void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom )
_aFont.SetFamily( aNewFont.GetFamilyType() );
_aFont.SetStyleName( aNewFont.GetStyleName() );
_aFont.SetColor( aNewFont.GetColor() );
- SetSymbol( rCopyFrom.GetSymbol() );
+ SetSymbol( rCopyFrom.cSymbol );
SetGraphicObject( rCopyFrom.GetGraphicObject() );
- SetScale( rCopyFrom.GetScale() );
- SetStart( rCopyFrom.GetStart() );
- SetStyle( rCopyFrom.GetStyle() );
- SetPrevText( rCopyFrom.GetPrevText() );
- SetFollowText( rCopyFrom.GetFollowText() );
+ SetScale( rCopyFrom.nScale );
+ SetStart( rCopyFrom.nStart );
+ SetStyle( rCopyFrom.nStyle );
+ aPrevText = rCopyFrom.aPrevText;
+ aFollowText = rCopyFrom.aFollowText;
SetFont( _aFont );
}
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 98e17c9..7a51ddc 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3655,7 +3655,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
if (!(rVal >>= nVal))
return false;
- SetShadingValue( nVal );
+ nShadingValue = nVal;
}
break;
}
@@ -3979,12 +3979,6 @@ void SvxBrushItem::SetGraphicFilter( const OUString& rNew )
}
-void SvxBrushItem::SetShadingValue( const sal_Int32 nNew )
-{
- nShadingValue = nNew;
-}
-
-
SvxGraphicPosition SvxBrushItem::WallpaperStyle2GraphicPos( WallpaperStyle eStyle )
{
SvxGraphicPosition eResult;
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 8c40e4b..c88070c 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -112,9 +112,9 @@ SvParserState SvxRTFParser::CallParser()
if( !aColorTbl.empty() )
ClearColorTbl();
if (!m_FontTable.empty())
- ClearFontTbl();
+ m_FontTable.clear();
if (!m_StyleTable.empty())
- ClearStyleTbl();
+ m_StyleTable.clear();
if( !aAttrStack.empty() )
ClearAttrStack();
@@ -747,16 +747,6 @@ void SvxRTFParser::ClearColorTbl()
}
}
-void SvxRTFParser::ClearFontTbl()
-{
- m_FontTable.clear();
-}
-
-void SvxRTFParser::ClearStyleTbl()
-{
- m_StyleTable.clear();
-}
-
void SvxRTFParser::ClearAttrStack()
{
for( size_t nCnt = aAttrStack.size(); nCnt; --nCnt )
@@ -1178,7 +1168,7 @@ void SvxRTFItemStackType::MoveFullNode(const EditNodeIdx &rOldNode,
{
bool bSameEndAsStart = (pSttNd == pEndNd);
- if (GetSttNodeIdx() == rOldNode.GetIdx())
+ if (pSttNd->GetIdx() == rOldNode.GetIdx())
{
delete pSttNd;
pSttNd = rNewNode.Clone();
@@ -1186,7 +1176,7 @@ void SvxRTFItemStackType::MoveFullNode(const EditNodeIdx &rOldNode,
pEndNd = pSttNd;
}
- if (!bSameEndAsStart && GetEndNodeIdx() == rOldNode.GetIdx())
+ if (!bSameEndAsStart && pEndNd->GetIdx() == rOldNode.GetIdx())
{
delete pEndNd;
pEndNd = rNewNode.Clone();
diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx
index 1b33069..174963d 100644
--- a/include/editeng/AccessibleImageBullet.hxx
+++ b/include/editeng/AccessibleImageBullet.hxx
@@ -178,8 +178,6 @@ namespace accessibility
*/
SvxViewForwarder& GetViewForwarder() const;
- const Point& GetEEOffset() const { return maEEOffset; }
-
// the paragraph index in the edit engine (guarded by solar mutex)
sal_Int32 mnParagraphIndex;
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index 75a8593..cbdb89c 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -105,8 +105,6 @@ public:
const OUString& GetGraphicLink() const { return maStrLink; }
const OUString& GetGraphicFilter() const { return maStrFilter; }
- void SetShadingValue( const sal_Int32 nNew );
-
//UUUU get graphic transparency in percent
sal_Int8 getGraphicTransparency() const;
void setGraphicTransparency(sal_Int8 nNew);
diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx
index aef6d07..3d75512 100644
--- a/include/editeng/bulletitem.hxx
+++ b/include/editeng/bulletitem.hxx
@@ -70,22 +70,14 @@ public:
virtual SvStream& Store( SvStream & , sal_uInt16 nItemVersion ) const override;
OUString GetFullText() const;
- sal_Unicode GetSymbol() const { return cSymbol; }
- const OUString& GetPrevText() const { return aPrevText; }
- const OUString& GetFollowText() const { return aFollowText; }
- sal_uInt16 GetStart() const { return nStart; }
long GetWidth() const { return nWidth; }
- SvxBulletStyle GetStyle() const { return nStyle; }
const vcl::Font& GetFont() const { return aFont; }
- sal_uInt16 GetScale() const { return nScale; }
const GraphicObject& GetGraphicObject() const;
void SetGraphicObject( const GraphicObject& rGraphicObject );
void SetSymbol( sal_Unicode c) { cSymbol = c; }
- void SetPrevText( const OUString& rStr) { aPrevText = rStr;}
- void SetFollowText(const OUString& rStr) { aFollowText=rStr;}
void SetStart( sal_uInt16 nNew ) { nStart = nNew; }
void SetWidth( long nNew ) { nWidth = nNew; }
diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx
index 6920d06..da35f32 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -68,9 +68,6 @@ class EDITENG_DLLPUBLIC EditTextObject : public SfxItemPoolUser
EditTextObject( SfxItemPool* pPool );
- void StoreData( SvStream& rStrm ) const;
- void CreateData( SvStream& rStrm );
-
public:
EditTextObject( const EditTextObject& r );
virtual ~EditTextObject();
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 0ffa552..1018440 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -216,8 +216,6 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
void operator=(SvxRTFParser const&) = delete;
void ClearColorTbl();
- void ClearFontTbl();
- void ClearStyleTbl();
void ClearAttrStack();
SvxRTFItemStackType* GetAttrSet_(); // Create new ItemStackType:s
@@ -355,9 +353,6 @@ public:
void MoveFullNode(const EditNodeIdx &rOldNode,
const EditNodeIdx &rNewNode);
- sal_Int32 GetSttNodeIdx() const { return pSttNd->GetIdx(); }
- sal_Int32 GetEndNodeIdx() const { return pEndNd->GetIdx(); }
-
const EditNodeIdx& GetSttNode() const { return *pSttNd; }
const EditNodeIdx& GetEndNode() const { return *pEndNd; }
More information about the Libreoffice-commits
mailing list