include/vcl/tabctrl.hxx | 4 ----
include/xmloff/xmlictxt.hxx | 1 -
sc/inc/hints.hxx | 1 -
sc/source/ui/inc/inputwin.hxx | 2 --
vcl/inc/qt5/Qt5Frame.hxx | 2 --
vcl/qt5/Qt5Frame.cxx | 11 -----------
vcl/source/control/tabctrl.cxx | 31 ++++++-------------------------
7 files changed, 6 insertions(+), 46 deletions(-)
New commits:
commit eeed9103350d886f5913aed9b525d863a421dffa
Author: Noel <noelgran...@gmail.com>
AuthorDate: Tue Nov 3 18:25:54 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Nov 4 06:34:37 2020 +0100
loplugin:unusedmethods
Change-Id: I58fb6477222a26455f5db0a7d972c46f290c085c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105261
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 0eb067fd1110..c63c7a0fd019 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -118,10 +118,6 @@ public:
void SetTabPageSizePixel( const Size& rSize );
- // pixel offset for the tab items, default is (0,0)
- void SetItemsOffset( const Point& rOffs );
- Point GetItemsOffset() const;
-
void InsertPage( sal_uInt16 nPageId, const OUString& rText,
sal_uInt16 nPos = TAB_APPEND );
void RemovePage( sal_uInt16 nPageId );
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 03dd3121ba5c..95b631e1c2af 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -55,7 +55,6 @@ class XMLOFF_DLLPUBLIC SvXMLImportContext : public
css::xml::sax::XFastContextHa
sal_uInt16 mnPrefix;
bool mbPrefixAndLocalNameFilledIn;
- SAL_DLLPRIVATE std::unique_ptr<SvXMLNamespaceMap> TakeRewindMap() { return
std::move(m_pRewindMap); }
SAL_DLLPRIVATE void PutRewindMap(std::unique_ptr<SvXMLNamespaceMap> p) {
m_pRewindMap = std::move(p); }
protected:
diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index 203beb97de16..88fff30b4b2f 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -36,7 +36,6 @@ public:
ScPaintHint( const ScRange& rRng, PaintPartFlags nPaint );
virtual ~ScPaintHint() override;
- void SetPrintFlag(bool bSet) { bPrint = bSet; }
SCCOL GetStartCol() const { return aRange.aStart.Col(); }
SCROW GetStartRow() const { return aRange.aStart.Row(); }
SCTAB GetStartTab() const { return aRange.aStart.Tab(); }
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index fc1843c405ff..03a6cf359941 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -225,8 +225,6 @@ public:
virtual void StopEditEngine(bool bAll) override;
virtual void TextGrabFocus() override;
- void GrabFocus() { mxTextWnd->GrabFocus(); }
-
vcl::Window& GetVclParent() { return mrParent; }
private:
diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index e0439e97f383..c35b45739e7d 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -210,8 +210,6 @@ public:
virtual void SetApplicationID(const OUString&) override;
inline bool CallCallback(SalEvent nEvent, const void* pEvent) const;
-
- cairo_t* getCairoContext() const;
};
inline bool Qt5Frame::CallCallback(SalEvent nEvent, const void* pEvent) const
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index f25360378268..06984b983a79 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -1437,15 +1437,4 @@ void Qt5Frame::handleDragLeave()
m_bInDrag = false;
}
-cairo_t* Qt5Frame::getCairoContext() const
-{
- cairo_t* cr = nullptr;
- if (m_bUseCairo)
- {
- cr = cairo_create(m_pSurface.get());
- assert(cr);
- }
- return cr;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 04e1e909f5b3..8f75270c237b 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -81,7 +81,6 @@ struct ImplTabCtrlData
{
std::unordered_map< int, int > maLayoutPageIdToLine;
std::unordered_map< int, int > maLayoutLineToPageId;
- Point maItemsOffset; // offset of the
tabitems
std::vector< ImplTabItem > maItemList;
VclPtr<ListBox> mpListBox;
};
@@ -400,8 +399,8 @@ bool TabControl::ImplPlaceTabs( tools::Long nWidth )
tools::Long nMaxWidth = nWidth;
- const tools::Long nOffsetX = 2 + GetItemsOffset().X();
- const tools::Long nOffsetY = 2 + GetItemsOffset().Y();
+ const tools::Long nOffsetX = 2;
+ const tools::Long nOffsetY = 2;
//fdo#66435 throw Knuth/Tex minimum raggedness algorithm at the problem
//of ugly bare tabs on lines of their own
@@ -418,8 +417,6 @@ bool TabControl::ImplPlaceTabs( tools::Long nWidth )
//aBreakIndexes will contain the indexes of the last tab on each row
std::deque<size_t>
aBreakIndexes(MinimumRaggednessWrap::GetEndOfLineIndexes(aWidths, nMaxWidth -
nOffsetX - 2));
- nMaxWidth -= GetItemsOffset().X();
-
tools::Long nX = nOffsetX;
tools::Long nY = nOffsetY;
@@ -490,9 +487,9 @@ bool TabControl::ImplPlaceTabs( tools::Long nWidth )
for ( sal_uInt16 i = 0; i < nLines+1; i++ )
{
if ( i <= nCurLine )
- nLineHeightAry[i] = nIH*(nLines-(nCurLine-i)) +
GetItemsOffset().Y();
+ nLineHeightAry[i] = nIH*(nLines-(nCurLine-i));
else
- nLineHeightAry[i] = nIH*(i-nCurLine-1) + GetItemsOffset().Y();
+ nLineHeightAry[i] = nIH*(i-nCurLine-1);
}
nLinePosAry[nLines+1] =
static_cast<sal_uInt16>(mpTabCtrlData->maItemList.size());
@@ -2083,20 +2080,6 @@ tools::Rectangle TabControl::GetTabBounds( sal_uInt16
nPageId ) const
return aRet;
}
-void TabControl::SetItemsOffset( const Point& rOffs )
-{
- if( mpTabCtrlData )
- mpTabCtrlData->maItemsOffset = rOffs;
-}
-
-Point TabControl::GetItemsOffset() const
-{
- if( mpTabCtrlData )
- return mpTabCtrlData->maItemsOffset;
- else
- return Point();
-}
-
Size TabControl::ImplCalculateRequisition(sal_uInt16& nHeaderHeight) const
{
Size aOptimalPageSize(0, 0);
@@ -2338,8 +2321,8 @@ bool NotebookbarTabControlBase::ImplPlaceTabs(
tools::Long nWidth )
tools::Long nShortcutsWidth = m_pShortcuts != nullptr ?
m_pShortcuts->GetSizePixel().getWidth() + 1 : 0;
tools::Long nFullWidth = nShortcutsWidth;
- const tools::Long nOffsetX = 2 + GetItemsOffset().X() + nShortcutsWidth;
- const tools::Long nOffsetY = 2 + GetItemsOffset().Y();
+ const tools::Long nOffsetX = 2 + nShortcutsWidth;
+ const tools::Long nOffsetY = 2;
//fdo#66435 throw Knuth/Tex minimum raggedness algorithm at the problem
//of ugly bare tabs on lines of their own
@@ -2356,8 +2339,6 @@ bool NotebookbarTabControlBase::ImplPlaceTabs(
tools::Long nWidth )
nFullWidth += nTabWidth;
}
- nMaxWidth -= GetItemsOffset().X();
-
tools::Long nX = nOffsetX;
tools::Long nY = nOffsetY;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
