[Libreoffice-commits] core.git: drawinglayer/source editeng/source include/drawinglayer include/editeng
Noel Grandin
noel.grandin at collabora.co.uk
Wed Nov 9 10:34:55 UTC 2016
drawinglayer/source/attribute/sdrfillgraphicattribute.cxx | 7 --
drawinglayer/source/primitive2d/borderlineprimitive2d.cxx | 2
drawinglayer/source/primitive2d/primitivetools2d.cxx | 2
drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx | 19 +++----
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 25 +---------
editeng/source/accessibility/AccessibleImageBullet.cxx | 16 ------
editeng/source/editeng/editview.cxx | 7 --
editeng/source/editeng/eehtml.hxx | 10 ++--
editeng/source/outliner/outlin2.cxx | 5 --
editeng/source/outliner/outliner.cxx | 11 ----
editeng/source/uno/unotext.cxx | 6 --
include/drawinglayer/attribute/sdrfillgraphicattribute.hxx | 1
include/drawinglayer/primitive2d/borderlineprimitive2d.hxx | 5 --
include/drawinglayer/primitive2d/primitivetools2d.hxx | 7 --
include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx | 4 -
include/editeng/AccessibleEditableTextPara.hxx | 7 --
include/editeng/AccessibleImageBullet.hxx | 4 -
include/editeng/editview.hxx | 1
include/editeng/outliner.hxx | 2
include/editeng/unotext.hxx | 2
20 files changed, 25 insertions(+), 118 deletions(-)
New commits:
commit 30e39e4793bbfe59a53b41422b5d86a03cfe31d3
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Nov 9 10:26:36 2016 +0200
loplugin:expandablemethods in drawinglayer..editeng
Change-Id: Ic7fe13651e18b4eec90ef3fd8d7aab81197e0f39
Reviewed-on: https://gerrit.libreoffice.org/30707
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
index 09398e5..f191dc3 100644
--- a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
@@ -211,11 +211,6 @@ namespace drawinglayer
return mpSdrFillGraphicAttribute->getTiling();
}
- bool SdrFillGraphicAttribute::getStretch() const
- {
- return mpSdrFillGraphicAttribute->getStretch();
- }
-
FillGraphicAttribute SdrFillGraphicAttribute::createFillGraphicAttribute(const basegfx::B2DRange& rRange) const
{
// get logical size of bitmap (before possibly expanding it)
@@ -226,7 +221,7 @@ namespace drawinglayer
basegfx::B2DVector aBitmapTopLeft(0.0, 0.0);
//UUUU are changes needed? When stretched we are already done, all other values will have no influence
- if(getTiling() || !getStretch())
+ if(getTiling() || !mpSdrFillGraphicAttribute->getStretch())
{
// init values with range sizes
const double fRangeWidth(0.0 != rRange.getWidth() ? rRange.getWidth() : 1.0);
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 671143f..3db5cb2 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -240,7 +240,7 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive(
const basegfx::B2DPoint aTmpEnd(getEnd() + (fExt * aVector));
// Get which is the line to show
- bool bIsSolidline = isSolidLine();
+ bool bIsSolidline = mnStyle == css::table::BorderLineStyle::SOLID;
double nWidth = getLeftWidth();
basegfx::BColor aColor = getRGBColorLeft();
if ( basegfx::fTools::equal( 0.0, mfLeftWidth ) )
diff --git a/drawinglayer/source/primitive2d/primitivetools2d.cxx b/drawinglayer/source/primitive2d/primitivetools2d.cxx
index 509bff7..494a8cd 100644
--- a/drawinglayer/source/primitive2d/primitivetools2d.cxx
+++ b/drawinglayer/source/primitive2d/primitivetools2d.cxx
@@ -43,7 +43,7 @@ namespace drawinglayer
if(getBuffered2DDecomposition().empty())
{
// remember new valid DiscreteUnit
- const_cast< DiscreteMetricDependentPrimitive2D* >(this)->updateDiscreteUnit(fDiscreteUnit);
+ const_cast< DiscreteMetricDependentPrimitive2D* >(this)->mfDiscreteUnit = fDiscreteUnit;
}
// call base implementation
diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
index e0fe820..1447597 100644
--- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
@@ -346,16 +346,6 @@ namespace drawinglayer
{
}
- bool TextDecoratedPortionPrimitive2D::decoratedIsNeeded() const
- {
- return (TEXT_LINE_NONE != getFontOverline()
- || TEXT_LINE_NONE != getFontUnderline()
- || TEXT_STRIKEOUT_NONE != getTextStrikeout()
- || TEXT_FONT_EMPHASIS_MARK_NONE != getTextEmphasisMark()
- || TEXT_RELIEF_NONE != getTextRelief()
- || getShadow());
- }
-
bool TextDecoratedPortionPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
{
if(TextSimplePortionPrimitive2D::operator==(rPrimitive))
@@ -384,7 +374,14 @@ namespace drawinglayer
// inking area, so add them if needed
basegfx::B2DRange TextDecoratedPortionPrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
{
- if(decoratedIsNeeded())
+ // check if this needs to be a TextDecoratedPortionPrimitive2D or
+ // if a TextSimplePortionPrimitive2D would be suficcient
+ if (TEXT_LINE_NONE != getFontOverline()
+ || TEXT_LINE_NONE != getFontUnderline()
+ || TEXT_STRIKEOUT_NONE != getTextStrikeout()
+ || TEXT_FONT_EMPHASIS_MARK_NONE != getTextEmphasisMark()
+ || TEXT_RELIEF_NONE != getTextRelief()
+ || getShadow())
{
// decoration is used, fallback to BufferedDecompositionPrimitive2D::getB2DRange which uses
// the own local decomposition for computation and thus creates all necessary
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index a078191..2b621f4 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -585,16 +585,6 @@ namespace accessibility
aEvent );
}
- void AccessibleEditableTextPara::GotPropertyEvent( const uno::Any& rNewValue, const sal_Int16 nEventId ) const
- {
- FireEvent( nEventId, rNewValue );
- }
-
- void AccessibleEditableTextPara::LostPropertyEvent( const uno::Any& rOldValue, const sal_Int16 nEventId ) const
- {
- FireEvent( nEventId, uno::Any(), rOldValue );
- }
-
void AccessibleEditableTextPara::SetState( const sal_Int16 nStateId )
{
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
@@ -602,7 +592,7 @@ namespace accessibility
!pStateSet->contains(nStateId) )
{
pStateSet->AddState( nStateId );
- GotPropertyEvent( uno::makeAny( nStateId ), AccessibleEventId::STATE_CHANGED );
+ FireEvent( AccessibleEventId::STATE_CHANGED, uno::makeAny( nStateId ) );
}
}
@@ -613,7 +603,7 @@ namespace accessibility
pStateSet->contains(nStateId) )
{
pStateSet->RemoveState( nStateId );
- LostPropertyEvent( uno::makeAny( nStateId ), AccessibleEventId::STATE_CHANGED );
+ FireEvent( AccessibleEventId::STATE_CHANGED, uno::Any(), uno::makeAny( nStateId ) );
}
}
@@ -2798,17 +2788,8 @@ namespace accessibility
uno::Sequence< OUString> SAL_CALL AccessibleEditableTextPara::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
{
-
- const OUString sServiceName( getServiceName() );
- return uno::Sequence< OUString > (&sServiceName, 1);
- }
-
- // XServiceName
- OUString SAL_CALL AccessibleEditableTextPara::getServiceName() throw (uno::RuntimeException)
- {
-
// #105185# Using correct service now
- return OUString("com.sun.star.text.AccessibleParagraphView");
+ return { OUString("com.sun.star.text.AccessibleParagraphView") };
}
} // end of namespace accessibility
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 466a339..9075690 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -438,18 +438,6 @@ namespace accessibility
aEvent );
}
- void AccessibleImageBullet::GotPropertyEvent( const uno::Any& rNewValue, const sal_Int16 nEventId ) const
- {
-
- FireEvent( nEventId, rNewValue );
- }
-
- void AccessibleImageBullet::LostPropertyEvent( const uno::Any& rOldValue, const sal_Int16 nEventId ) const
- {
-
- FireEvent( nEventId, uno::Any(), rOldValue );
- }
-
void AccessibleImageBullet::SetState( const sal_Int16 nStateId )
{
@@ -458,7 +446,7 @@ namespace accessibility
!pStateSet->contains(nStateId) )
{
pStateSet->AddState( nStateId );
- GotPropertyEvent( uno::makeAny( nStateId ), AccessibleEventId::STATE_CHANGED );
+ FireEvent( AccessibleEventId::STATE_CHANGED, uno::makeAny( nStateId ) );
}
}
@@ -470,7 +458,7 @@ namespace accessibility
pStateSet->contains(nStateId) )
{
pStateSet->RemoveState( nStateId );
- LostPropertyEvent( uno::makeAny( nStateId ), AccessibleEventId::STATE_CHANGED );
+ FireEvent( AccessibleEventId::STATE_CHANGED, uno::Any(), uno::makeAny( nStateId ) );
}
}
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 3ada3d3..3245004 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -193,7 +193,7 @@ void EditView::InvalidateOtherViewWindows( const Rectangle& rInvRect )
{
if (comphelper::LibreOfficeKit::isActive())
{
- for (auto& pWin: GetOtherViewWindows())
+ for (auto& pWin : pImpEditView->aOutWindowSet)
{
if (pWin)
pWin->Invalidate( rInvRect );
@@ -313,11 +313,6 @@ vcl::Window* EditView::GetWindow() const
return pImpEditView->pOutWin;
}
-EditView::OutWindowSet& EditView::GetOtherViewWindows()
-{
- return pImpEditView->aOutWindowSet;
-}
-
bool EditView::HasOtherViewWindow( vcl::Window* pWin )
{
OutWindowSet& rOutWindowSet = pImpEditView->aOutWindowSet;
diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx
index b952a66..08563bc 100644
--- a/editeng/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -35,10 +35,10 @@ class EditHTMLParser : public HTMLParser
{
using HTMLParser::CallParser;
private:
- OUStringBuffer maStyleSource;
+ OUStringBuffer maStyleSource;
EditSelection aCurSel;
OUString aBaseURL;
- EditEngine* mpEditEngine;
+ EditEngine* mpEditEngine;
AnchorInfo* pCurAnchor;
bool bInPara:1;
@@ -46,9 +46,9 @@ private:
bool bFieldsInserted:1;
bool bInTitle:1;
- sal_uInt8 nInTable;
- sal_uInt8 nInCell;
- sal_uInt8 nDefListLevel;
+ sal_uInt8 nInTable;
+ sal_uInt8 nInCell;
+ sal_uInt8 nDefListLevel;
void StartPara( bool bReal );
void EndPara( bool bReal );
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 927b947..3248ba3 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -551,11 +551,6 @@ EEHorizontalTextDirection Outliner::GetDefaultHorizontalTextDirection() const
return pEditEngine->GetDefaultHorizontalTextDirection();
}
-SvtScriptType Outliner::GetScriptType( const ESelection& rSelection ) const
-{
- return pEditEngine->GetScriptType( rSelection );
-}
-
LanguageType Outliner::GetLanguage( sal_Int32 nPara, sal_Int32 nPos ) const
{
return pEditEngine->GetLanguage( nPara, nPos );
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index e9ff45b..ccd8b9a 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -168,7 +168,7 @@ void Outliner::ParagraphDeleted( sal_Int32 nPara )
if( !pEditEngine->IsInUndo() )
{
- ParagraphRemovingHdl(pPara);
+ aParaRemovingHdl.Call( { this, pPara } );
}
pParaList->Remove( nPara );
@@ -820,7 +820,7 @@ vcl::Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const
if ( !pEditEngine->IsFlatMode() )
{
ESelection aSel( nPara, 0, nPara, 0 );
- aStdFont = EditEngine::CreateFontFromItemSet( pEditEngine->GetAttribs( aSel ), GetScriptType( aSel ) );
+ aStdFont = EditEngine::CreateFontFromItemSet( pEditEngine->GetAttribs( aSel ), pEditEngine->GetScriptType( aSel ) );
}
else
{
@@ -1344,13 +1344,6 @@ void Outliner::ParagraphInsertedHdl(Paragraph* pPara)
}
-void Outliner::ParagraphRemovingHdl(Paragraph* pPara)
-{
- if( !IsInUndo() )
- aParaRemovingHdl.Call( { this, pPara } );
-}
-
-
void Outliner::DepthChangedHdl(Paragraph* pPara, ParaFlag nPrevFlags)
{
if( !IsInUndo() )
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index e100da2..cce2d8e 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1749,15 +1749,11 @@ namespace
}
};
}
-uno::Sequence< uno::Type > SAL_CALL SvxUnoTextBase::getStaticTypes() throw()
-{
- return theSvxUnoTextBaseTypes::get();
-}
uno::Sequence< uno::Type > SAL_CALL SvxUnoTextBase::getTypes()
throw (uno::RuntimeException, std::exception)
{
- return getStaticTypes();
+ return theSvxUnoTextBaseTypes::get();
}
uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextBase::getImplementationId()
diff --git a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx
index 2531fb0..60e76d8 100644
--- a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx
+++ b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx
@@ -83,7 +83,6 @@ namespace drawinglayer
const basegfx::B2DVector& getOffsetPosition() const;
const basegfx::B2DVector& getRectPoint() const;
bool getTiling() const;
- bool getStretch() const;
// FillGraphicAttribute generator
FillGraphicAttribute createFillGraphicAttribute(const basegfx::B2DRange& rRange) const;
diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index 80d3890..bd10add 100644
--- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -74,11 +74,6 @@ namespace drawinglayer
double getWidth(
const geometry::ViewInformation2D& rViewInformation) const;
- bool isSolidLine() const
- {
- return mnStyle == css::table::BorderLineStyle::SOLID;
- }
-
bool isInsideUsed() const
{
return !basegfx::fTools::equalZero(mfLeftWidth);
diff --git a/include/drawinglayer/primitive2d/primitivetools2d.hxx b/include/drawinglayer/primitive2d/primitivetools2d.hxx
index cd0bace..289fc77 100644
--- a/include/drawinglayer/primitive2d/primitivetools2d.hxx
+++ b/include/drawinglayer/primitive2d/primitivetools2d.hxx
@@ -46,13 +46,6 @@ namespace drawinglayer
*/
double mfDiscreteUnit;
- protected:
- /// helper to update discrete unit
- void updateDiscreteUnit(double fNew)
- {
- mfDiscreteUnit = fNew;
- }
-
public:
/// constructor
DiscreteMetricDependentPrimitive2D()
diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
index c1b0a57..14fd82e 100644
--- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
@@ -118,10 +118,6 @@ namespace drawinglayer
bool getEmphasisMarkBelow() const { return mbEmphasisMarkBelow; }
bool getShadow() const { return mbShadow; }
- /// check if this needs to be a TextDecoratedPortionPrimitive2D or
- /// if a TextSimplePortionPrimitive2D would be suficcient
- bool decoratedIsNeeded() const;
-
/// compare operator
virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override;
diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx
index 10b76a1..a95aae6 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -166,9 +166,6 @@ namespace accessibility
virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
- // XServiceName
- static OUString SAL_CALL getServiceName() throw (css::uno::RuntimeException);
-
/** Set the current index in the accessibility parent
@attention This method does not lock the SolarMutex,
@@ -304,10 +301,6 @@ namespace accessibility
*/
bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nIndex );
- // syntactic sugar for FireEvent
- void GotPropertyEvent( const css::uno::Any& rNewValue, const sal_Int16 nEventId ) const;
- void LostPropertyEvent( const css::uno::Any& rOldValue, const sal_Int16 nEventId ) const;
-
int getNotifierClientId() const { return mnNotifierClientId; }
/// Do we have children? This is the case for image bullets
diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx
index 174963d..6525995 100644
--- a/include/editeng/AccessibleImageBullet.hxx
+++ b/include/editeng/AccessibleImageBullet.hxx
@@ -148,10 +148,6 @@ namespace accessibility
AccessibleImageBullet( const AccessibleImageBullet& ) = delete;
AccessibleImageBullet& operator= ( const AccessibleImageBullet& ) = delete;
- // syntactic sugar for FireEvent
- void GotPropertyEvent( const css::uno::Any& rNewValue, const sal_Int16 nEventId ) const;
- void LostPropertyEvent( const css::uno::Any& rOldValue, const sal_Int16 nEventId ) const;
-
// maintain state set and send STATE_CHANGE events
void SetState( const sal_Int16 nStateId );
void UnSetState( const sal_Int16 nStateId );
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index c05371d..5653c45 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -109,7 +109,6 @@ public:
void SetWindow( vcl::Window* pWin );
vcl::Window* GetWindow() const;
- OutWindowSet& GetOtherViewWindows();
bool HasOtherViewWindow( vcl::Window* pWin );
bool AddOtherViewWindow( vcl::Window* pWin );
bool RemoveOtherViewWindow( vcl::Window* pWin );
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index cdc7cb1..25241c5 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -694,7 +694,6 @@ public:
void SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir );
EEHorizontalTextDirection GetDefaultHorizontalTextDirection() const;
- SvtScriptType GetScriptType( const ESelection& rSelection ) const;
LanguageType GetLanguage( sal_Int32 nPara, sal_Int32 nPos ) const;
void SetAsianCompressionMode( sal_uInt16 nCompressionMode );
@@ -763,7 +762,6 @@ public:
void SetParaInsertedHdl(const Link<ParagraphHdlParam,void>& rLink){aParaInsertedHdl=rLink;}
const Link<ParagraphHdlParam,void>& GetParaInsertedHdl() const { return aParaInsertedHdl; }
- void ParagraphRemovingHdl(Paragraph*);
void SetParaRemovingHdl(const Link<ParagraphHdlParam,void>& rLink){aParaRemovingHdl=rLink;}
const Link<ParagraphHdlParam,void>& GetParaRemovingHdl() const { return aParaRemovingHdl; }
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 6bd0baa..518a0bd 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -400,8 +400,6 @@ protected:
public:
UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextBase )
- static css::uno::Sequence< css::uno::Type > SAL_CALL getStaticTypes() throw();
-
css::uno::Reference< css::text::XTextCursor > createTextCursorBySelection( const ESelection& rSel );
// css::uno::XInterface
More information about the Libreoffice-commits
mailing list