[Libreoffice-commits] core.git: accessibility/source compilerplugins/clang include/vcl svtools/inc svtools/source vcl/inc vcl/unx
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Sep 26 18:14:55 UTC 2019
accessibility/source/extended/AccessibleGridControlTable.cxx | 4 +-
compilerplugins/clang/virtualdead.results | 15 -----------
include/vcl/accessibletable.hxx | 2 -
svtools/inc/table/tablecontrol.hxx | 2 -
svtools/source/table/tablecontrol.cxx | 12 --------
vcl/inc/unx/saldata.hxx | 3 --
vcl/unx/generic/app/saldata.cxx | 9 ------
7 files changed, 2 insertions(+), 45 deletions(-)
New commits:
commit 250c2ec78b9218a4d42f1fc6cdb12b15687d6eeb
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Sep 26 08:17:45 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Sep 26 20:13:30 2019 +0200
loplugin:virtualdead in vcl
Change-Id: I54cacce6d843f41f220ac5350868bd6d70dbc6b4
Reviewed-on: https://gerrit.libreoffice.org/79585
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index dabafb4b719e..93df16335d91 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -111,7 +111,7 @@ OUString SAL_CALL AccessibleGridControlTable::getAccessibleRowDescription( sal_I
ensureIsAlive();
ensureIsValidRow( nRow );
- return m_aTable.GetRowDescription( nRow );
+ return "row description";
}
OUString SAL_CALL AccessibleGridControlTable::getAccessibleColumnDescription( sal_Int32 nColumn )
@@ -120,7 +120,7 @@ OUString SAL_CALL AccessibleGridControlTable::getAccessibleColumnDescription( sa
ensureIsAlive();
ensureIsValidColumn( nColumn );
- return m_aTable.GetColumnDescription( static_cast<sal_uInt16>(nColumn) );
+ return "col description";
}
Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessibleRowHeaders()
diff --git a/compilerplugins/clang/virtualdead.results b/compilerplugins/clang/virtualdead.results
index 64e263fbb9ff..d12c812faf4c 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -181,12 +181,6 @@ include/vbahelper/vbahelperinterface.hxx:91
include/vbahelper/vbareturntypes.hxx:41
type-parameter-?-? ooo::vba::DefaultReturnHelper::getValue()
unknown2
-include/vcl/accessibletable.hxx:94
- class rtl::OUString vcl::table::IAccessibleTable::GetRowDescription(int,)const
- "row description"
-include/vcl/accessibletable.hxx:96
- class rtl::OUString vcl::table::IAccessibleTable::GetColumnDescription(unsigned short,)const
- "col description"
sc/source/core/opencl/formulagroupcl.cxx:1059
void sc::opencl::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,)
empty
@@ -262,15 +256,6 @@ vcl/inc/salprn.hxx:85
vcl/inc/salprn.hxx:116
enum SalPrinterError SalPrinter::GetErrorCode()
0
-vcl/inc/unx/saldata.hxx:54
- void X11SalData::initNWF()
- empty
-vcl/inc/unx/saldata.hxx:55
- void X11SalData::deInitNWF()
- empty
-vcl/inc/wizdlg.hxx:214
- _Bool vcl::RoadmapWizard::leaveState(short,)
- 1
writerfilter/inc/ooxml/OOXMLDocument.hxx:216
void writerfilter::ooxml::OOXMLDocument::setXNoteType(unsigned int,)
empty
diff --git a/include/vcl/accessibletable.hxx b/include/vcl/accessibletable.hxx
index f132466c1590..738832a3adcb 100644
--- a/include/vcl/accessibletable.hxx
+++ b/include/vcl/accessibletable.hxx
@@ -91,9 +91,7 @@ public:
virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex)= 0;
virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint)= 0;
virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const= 0;
- virtual OUString GetRowDescription( sal_Int32 _nRow ) const = 0;
virtual OUString GetRowName(sal_Int32 _nIndex) const = 0;
- virtual OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0;
virtual OUString GetColumnName( sal_Int32 _nIndex ) const = 0;
virtual OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0;
diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx
index 2b8b88de90b6..41b1491af34c 100644
--- a/svtools/inc/table/tablecontrol.hxx
+++ b/svtools/inc/table/tablecontrol.hxx
@@ -146,9 +146,7 @@ namespace svt { namespace table
virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override;
virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override;
virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const override;
- virtual OUString GetRowDescription( sal_Int32 _nRow ) const override;
virtual OUString GetRowName(sal_Int32 _nIndex) const override;
- virtual OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const override;
virtual OUString GetColumnName( sal_Int32 _nIndex ) const override;
virtual bool HasRowHeader() override;
virtual bool HasColHeader() override;
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 4f36256ff6cf..175d711d4704 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -379,12 +379,6 @@ namespace svt { namespace table
}
- OUString TableControl::GetRowDescription( sal_Int32) const
- {
- return "row description";
- }
-
-
OUString TableControl::GetRowName( sal_Int32 _nIndex) const
{
OUString sRowName;
@@ -393,12 +387,6 @@ namespace svt { namespace table
}
- OUString TableControl::GetColumnDescription( sal_uInt16) const
- {
- return "col description";
- }
-
-
OUString TableControl::GetColumnName( sal_Int32 _nIndex) const
{
return GetModel()->getColumnModel(_nIndex)->getName();
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index 3201c6e70700..14cf63473215 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -51,9 +51,6 @@ public:
virtual void Init();
virtual void Dispose() override;
- virtual void initNWF();
- virtual void deInitNWF();
-
void DeleteDisplay(); // for shutdown
SalXLib* GetLib() const { return pXLib_.get(); }
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 48cfd1ae4d1f..42dc10e0fc85 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -254,7 +254,6 @@ X11SalData::~X11SalData()
void X11SalData::Dispose()
{
- deInitNWF();
delete GetDisplay();
SetSalData( nullptr );
}
@@ -272,14 +271,6 @@ void X11SalData::Init()
pXLib_->Init();
}
-void X11SalData::initNWF()
-{
-}
-
-void X11SalData::deInitNWF()
-{
-}
-
void X11SalData::ErrorTrapPush()
{
PushXErrorLevel( true );
More information about the Libreoffice-commits
mailing list