basctl/source/basicide/baside2.hxx | 2 +-
basctl/source/basicide/bastypes.cxx | 5 -----
basctl/source/inc/baside3.hxx | 2 +-
basctl/source/inc/bastypes.hxx | 1 -
basic/source/sbx/sbxbase.cxx | 5 -----
include/basic/sbx.hxx | 2 +-
include/basic/sbxcore.hxx | 1 -
include/basic/sbxvar.hxx | 2 +-
8 files changed, 4 insertions(+), 16 deletions(-)
New commits:
commit 87b0eb0183e9a379a3e715dcb5de29b29e406686
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Thu Mar 29 08:38:22 2018 +0200
loplugin:virtualdown in basctl,basic
Change-Id: If0d729ee84263a5afb2c7acb2d62b08602aa59f4
Reviewed-on: https://gerrit.libreoffice.org/52046
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index 653b27bcef4e..bff95c0ef7cc 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -369,7 +369,7 @@ public:
BasicStatus& GetBasicStatus() { return m_aStatus; }
virtual bool IsModified () override;
- virtual bool IsPasteAllowed () override;
+ virtual bool IsPasteAllowed ();
void ShowCursor( bool bOn );
diff --git a/basctl/source/basicide/bastypes.cxx
b/basctl/source/basicide/bastypes.cxx
index e69e37c4aaa6..765387522416 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -195,11 +195,6 @@ bool BaseWindow::IsModified ()
return true;
}
-bool BaseWindow::IsPasteAllowed ()
-{
- return false;
-}
-
::svl::IUndoManager* BaseWindow::GetUndoManager()
{
return nullptr;
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index c553466268c8..2b7733e56b15 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -101,7 +101,7 @@ public:
virtual void StoreData() override;
virtual bool IsModified() override;
- virtual bool IsPasteAllowed() override;
+ virtual bool IsPasteAllowed();
virtual svl::IUndoManager* GetUndoManager() override;
// return number of pages to be printed
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index fa30b4c15295..09820d2f6e43 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -204,7 +204,6 @@ public:
virtual EntryDescriptor CreateEntryDescriptor() = 0;
virtual bool IsModified();
- virtual bool IsPasteAllowed();
virtual bool AllowUndo();
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index a99a26751dac..5e027372b7b6 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -74,11 +74,6 @@ SbxDataType SbxBase::GetType() const
return SbxEMPTY;
}
-SbxClassType SbxBase::GetClass() const
-{
- return SbxClassType::DontCare;
-}
-
bool SbxBase::IsFixed() const
{
return IsSet( SbxFlagBits::Fixed );
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 3bc9b9953017..96fb4cd07a1a 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -127,7 +127,7 @@ public:
virtual void Clear() override;
sal_uInt16 Count() const;
virtual SbxDataType GetType() const override;
- virtual SbxClassType GetClass() const override;
+ virtual SbxClassType GetClass() const;
SbxVariableRef& GetRef( sal_uInt16 );
SbxVariable* Get( sal_uInt16 );
void Put( SbxVariable*, sal_uInt16 );
diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx
index e0d90d367885..9d6b45652a16 100644
--- a/include/basic/sbxcore.hxx
+++ b/include/basic/sbxcore.hxx
@@ -73,7 +73,6 @@ public:
virtual void SetModified( bool );
virtual SbxDataType GetType() const;
- virtual SbxClassType GetClass() const;
virtual void Clear() = 0;
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index c5cd2826114b..ae41a2b069a1 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -121,7 +121,7 @@ public:
bool IsNumericRTL() const; // #41692 Interface for Basic
bool ImpIsNumeric( bool bOnlyIntntl ) const; // Implementation
- virtual SbxClassType GetClass() const override;
+ virtual SbxClassType GetClass() const;
virtual SbxDataType GetType() const override;
SbxDataType GetFullType() const { return aData.eType;}
bool SetType( SbxDataType );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
