[Libreoffice-commits] core.git: 4 commits - basic/source include/basic include/svx sd/source svx/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jun 11 05:53:56 UTC 2019
basic/source/sbx/sbxvalue.cxx | 5 -
include/basic/sbxvar.hxx | 3
include/svx/AccessibleControlShape.hxx | 3
include/svx/AccessibleGraphicShape.hxx | 3
include/svx/AccessibleOLEShape.hxx | 3
include/svx/AccessibleShape.hxx | 3
include/svx/ctredlin.hxx | 5 -
include/svx/svdtext.hxx | 1
sd/source/ui/inc/AccessiblePageShape.hxx | 3
sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx | 3
sd/source/ui/inc/AccessiblePresentationOLEShape.hxx | 3
sd/source/ui/inc/AccessiblePresentationShape.hxx | 3
svx/source/accessibility/AccessibleShape.cxx | 64 ----------------
svx/source/dialog/ctredlin.cxx | 4 -
svx/source/inc/cell.hxx | 2
svx/source/svdraw/svdtext.cxx | 5 -
16 files changed, 11 insertions(+), 102 deletions(-)
New commits:
commit 583c1400c22ce8aab2623216b59c25a83a073bad
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jun 10 09:26:45 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Jun 11 07:53:04 2019 +0200
loplugin:virtualdown in SbxValue
Change-Id: I746b6b7e18265366903825ccf6c94f672dc92db9
Reviewed-on: https://gerrit.libreoffice.org/73770
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 8b0f16491633..1a011b6706d1 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -690,11 +690,6 @@ bool SbxValue::ImpIsNumeric( bool bOnlyIntntl ) const
|| ( t >= SbxCHAR && t <= SbxUINT );
}
-SbxClassType SbxValue::GetClass() const
-{
- return SbxClassType::Value;
-}
-
SbxDataType SbxValue::GetType() const
{
return SbxDataType( aData.eType & 0x0FFF );
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index b0add15b4f47..446f1fe4c1ec 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -124,7 +124,6 @@ public:
bool IsNumericRTL() const; // #41692 Interface for Basic
bool ImpIsNumeric( bool bOnlyIntntl ) const; // Implementation
- virtual SbxClassType GetClass() const;
virtual SbxDataType GetType() const override;
SbxDataType GetFullType() const { return aData.eType;}
bool SetType( SbxDataType );
@@ -272,7 +271,7 @@ public:
void SetUserData( sal_uInt32 n ) { nUserData = n; }
virtual SbxDataType GetType() const override;
- virtual SbxClassType GetClass() const override;
+ virtual SbxClassType GetClass() const;
// Parameter-Interface
virtual SbxInfo* GetInfo();
commit ab6849db5540b1836f91708acc4ae8a9f49a6d7c
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jun 10 09:21:56 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Jun 11 07:52:55 2019 +0200
loplugin:virtualdown in AccessibleShape
Change-Id: I35c8c4b2c561f3ce4fdc3d94cc74463abbc087f4
Reviewed-on: https://gerrit.libreoffice.org/73769
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index 8c8115d9d748..2ea2f73dd6d7 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -138,8 +138,7 @@ private:
CreateAccessibleName( ) override;
/// Create a description string that contains the accessible description.
- virtual OUString
- CreateAccessibleDescription( ) override;
+ OUString CreateAccessibleDescription();
#ifdef DBG_UTIL
/// Set the specified state
diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx
index 7be88770c30c..8b613ea7e0e4 100644
--- a/include/svx/AccessibleGraphicShape.hxx
+++ b/include/svx/AccessibleGraphicShape.hxx
@@ -94,8 +94,7 @@ protected:
CreateAccessibleBaseName () override;
/// Create a description string that contains the accessible description.
- virtual OUString
- CreateAccessibleDescription () override;
+ OUString CreateAccessibleDescription();
private:
AccessibleGraphicShape (const AccessibleGraphicShape&) = delete;
diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx
index c25eb75fae54..3c4f71651582 100644
--- a/include/svx/AccessibleOLEShape.hxx
+++ b/include/svx/AccessibleOLEShape.hxx
@@ -100,8 +100,7 @@ protected:
CreateAccessibleBaseName () override;
/// Create a description string that contains the accessible description.
- virtual OUString
- CreateAccessibleDescription () override;
+ OUString CreateAccessibleDescription();
private:
AccessibleOLEShape (const AccessibleOLEShape&) = delete;
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index 79f44f439c45..9a2f206dfb8a 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -411,9 +411,6 @@ protected:
virtual OUString
CreateAccessibleName() override;
- /// Create a description string that contains the accessible description.
- virtual OUString
- CreateAccessibleDescription();
/// @throws css::uno::RuntimeException
OUString
GetFullAccessibleName(AccessibleShape *shape);
diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx
index f076bb4affd2..1c9bda097225 100644
--- a/sd/source/ui/inc/AccessiblePageShape.hxx
+++ b/sd/source/ui/inc/AccessiblePageShape.hxx
@@ -112,8 +112,7 @@ protected:
CreateAccessibleName() override;
/// Create a description string that contains the accessible description.
- virtual OUString
- CreateAccessibleDescription() override;
+ static OUString CreateAccessibleDescription();
private:
css::uno::Reference<css::drawing::XDrawPage> mxPage;
diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
index 288cda8a169b..07fabcd6e409 100644
--- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
+++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
@@ -53,8 +53,7 @@ public:
CreateAccessibleBaseName () override;
/// Create a description string that contains the accessible description.
- virtual OUString
- CreateAccessibleDescription () override;
+ OUString CreateAccessibleDescription();
/// Return this object's role.
virtual sal_Int16 SAL_CALL getAccessibleRole () override;
};
diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
index 9ae951438168..46e69d16845c 100644
--- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
+++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
@@ -50,8 +50,7 @@ public:
CreateAccessibleBaseName () override;
/// Create a description string that contains the accessible description.
- virtual OUString
- CreateAccessibleDescription () override;
+ OUString CreateAccessibleDescription();
/// Return this object's role.
virtual sal_Int16 SAL_CALL getAccessibleRole () override;
};
diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx
index ae918ebcb1f8..96ce2f06fdfd 100644
--- a/sd/source/ui/inc/AccessiblePresentationShape.hxx
+++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx
@@ -50,8 +50,7 @@ public:
CreateAccessibleBaseName () override;
/// Create a description string that contains the accessible description.
- virtual OUString
- CreateAccessibleDescription () override;
+ OUString CreateAccessibleDescription();
OUString GetStyle() override;
private:
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 832852576472..5eb3bbfd5698 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -1069,70 +1069,6 @@ OUString AccessibleShape::GetFullAccessibleName (AccessibleShape *shape)
return sName;
}
-OUString
- AccessibleShape::CreateAccessibleDescription()
-{
- DescriptionGenerator aDG (mxShape);
- aDG.Initialize (CreateAccessibleBaseName());
- switch (ShapeTypeHandler::Instance().GetTypeId (mxShape))
- {
- case DRAWING_3D_CUBE:
- case DRAWING_3D_EXTRUDE:
- case DRAWING_3D_LATHE:
- case DRAWING_3D_SPHERE:
- aDG.Add3DProperties ();
- break;
-
- case DRAWING_3D_SCENE:
- case DRAWING_GROUP:
- case DRAWING_PAGE:
- // No further information is appended.
- break;
-
- case DRAWING_CAPTION:
- case DRAWING_CLOSED_BEZIER:
- case DRAWING_CLOSED_FREEHAND:
- case DRAWING_ELLIPSE:
- case DRAWING_POLY_POLYGON:
- case DRAWING_POLY_POLYGON_PATH:
- case DRAWING_RECTANGLE:
- aDG.AddLineProperties ();
- aDG.AddFillProperties ();
- break;
-
- case DRAWING_CONNECTOR:
- case DRAWING_LINE:
- case DRAWING_MEASURE:
- case DRAWING_OPEN_BEZIER:
- case DRAWING_OPEN_FREEHAND:
- case DRAWING_POLY_LINE:
- case DRAWING_POLY_LINE_PATH:
- aDG.AddLineProperties ();
- break;
-
- case DRAWING_CONTROL:
- aDG.AddProperty ("ControlBackground", DescriptionGenerator::PropertyType::Color, "");
- aDG.AddProperty ("ControlBorder", DescriptionGenerator::PropertyType::Integer, "");
- break;
-
- case DRAWING_TEXT:
- aDG.AddTextProperties ();
- break;
-
- default:
- aDG.Initialize ("Unknown accessible shape");
- uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
- if (xDescriptor.is())
- {
- aDG.AppendString ("service name=");
- aDG.AppendString (xDescriptor->getShapeType());
- }
- }
-
- return aDG();
-}
-
-
// protected
void AccessibleShape::disposing()
{
commit 3cd343ca62d80753f88135aa88ea0dc4d935f315
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jun 10 08:40:56 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Jun 11 07:52:45 2019 +0200
loplugin:virtualdown in SvxTPFilter
Change-Id: I544fe7eff02102372d7578caa8cf86ce58811b20
Reviewed-on: https://gerrit.libreoffice.org/73768
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index d2b4b5061618..ac4864a5ba05 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -143,7 +143,6 @@ public:
SvxTPage(weld::Container* pParent, const OUString& rUIXMLDescription, const OString& rID);
virtual ~SvxTPage();
virtual void ActivatePage();
- virtual void DeactivatePage();
void Show() { m_xContainer->show(); }
};
@@ -191,7 +190,7 @@ public:
SvxTPFilter(weld::Container* pParent);
virtual ~SvxTPFilter() override;
- virtual void DeactivatePage() override;
+ void DeactivatePage();
void SetRedlinTable(SvxRedlinTable*);
Date GetFirstDate() const;
@@ -302,7 +301,7 @@ public:
void SetUndoClickHdl( const Link<SvxTPView*,void>& rLink ) { UndoClickLk = rLink; }
virtual void ActivatePage() override;
- virtual void DeactivatePage() override;
+ void DeactivatePage();
};
// Redlining - Control (Accept- Changes)
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 71584916fcb9..f912a6fc7f9c 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -307,10 +307,6 @@ void SvxTPage::ActivatePage()
{
}
-void SvxTPage::DeactivatePage()
-{
-}
-
SvxTPView::SvxTPView(weld::Container* pParent, weld::Builder* pTopLevel)
: SvxTPage(pParent, "svx/ui/redlineviewpage.ui", "RedlineViewPage")
, bEnableAccept(true)
commit 749306002e9a6fcc83966d90f45d2a7817cd6ce6
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jun 10 08:37:58 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Jun 11 07:52:35 2019 +0200
loplugin:virtualdown in SdrText
Change-Id: I2783d36c3f2165d65a124c623e8dc48d7b938a62
Reviewed-on: https://gerrit.libreoffice.org/73767
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx
index a02d9390ef3e..1abce1655a22 100644
--- a/include/svx/svdtext.hxx
+++ b/include/svx/svdtext.hxx
@@ -70,7 +70,6 @@ public:
protected:
virtual const SfxItemSet& GetObjectItemSet();
- virtual void SetObjectItem(const SfxPoolItem& rItem);
virtual SfxStyleSheet* GetStyleSheet() const;
private:
diff --git a/svx/source/inc/cell.hxx b/svx/source/inc/cell.hxx
index c17d878b5812..93959e210256 100644
--- a/svx/source/inc/cell.hxx
+++ b/svx/source/inc/cell.hxx
@@ -186,7 +186,7 @@ public:
protected:
SVX_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet() override;
- SVX_DLLPRIVATE virtual void SetObjectItem(const SfxPoolItem& rItem) override;
+ SVX_DLLPRIVATE void SetObjectItem(const SfxPoolItem& rItem);
SVX_DLLPRIVATE static css::uno::Any GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertySimpleEntry* pMap );
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index a3bc07431670..231bfa69a161 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -133,11 +133,6 @@ const SfxItemSet& SdrText::GetObjectItemSet()
return mrObject.GetObjectItemSet();
}
-void SdrText::SetObjectItem(const SfxPoolItem& rItem)
-{
- mrObject.SetObjectItem( rItem );
-}
-
SfxStyleSheet* SdrText::GetStyleSheet() const
{
return mrObject.GetStyleSheet();
More information about the Libreoffice-commits
mailing list