[Libreoffice-commits] core.git: include/svx include/vcl sc/source svx/source vcl/inc vcl/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jun 11 13:11:10 UTC 2020
include/svx/svdograf.hxx | 3 -
include/vcl/builder.hxx | 4 --
include/vcl/lstbox.hxx | 2 -
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 8 -----
sc/source/ui/inc/AccessibleDocument.hxx | 1
sc/source/ui/inc/AccessibleSpreadsheet.hxx | 1
svx/source/svdraw/svdograf.cxx | 5 ---
vcl/inc/listbox.hxx | 8 -----
vcl/source/control/imp_listbox.cxx | 28 ++---------------
vcl/source/control/listbox.cxx | 5 ---
vcl/source/window/builder.cxx | 30 -------------------
11 files changed, 4 insertions(+), 91 deletions(-)
New commits:
commit 2126215fb3b2e77145cbf7f1d8e93ee3cca761b3
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jun 11 12:03:08 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jun 11 15:09:59 2020 +0200
loplugin:unusedmethods
Change-Id: I1050fabdc0c98bbb0cc1d81a41c5b6ac3404cacf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96111
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index db4a3f168892..f58fd0fe3d9d 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -199,9 +199,6 @@ public:
bool isEmbeddedVectorGraphicData() const;
GDIMetaFile getMetafileFromEmbeddedVectorGraphicData() const;
- /// Returns the page number of the embedded data (typically to re-render or import it).
- sal_Int32 getEmbeddedPageNumber() const;
-
virtual SdrObjectUniquePtr DoConvertToPolyObj(bool bBezier, bool bAddText) const override;
virtual void AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly = false ) override;
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index b2bc2488bd03..c135af4f150e 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -270,8 +270,6 @@ private:
std::vector<WidgetAdjustmentMap> m_aNumericFormatterAdjustmentMaps;
std::vector<WidgetAdjustmentMap> m_aFormattedFormatterAdjustmentMaps;
- std::vector<WidgetAdjustmentMap> m_aTimeFormatterAdjustmentMaps;
- std::vector<WidgetAdjustmentMap> m_aDateFormatterAdjustmentMaps;
std::vector<WidgetAdjustmentMap> m_aScrollAdjustmentMaps;
std::vector<WidgetAdjustmentMap> m_aSliderAdjustmentMaps;
@@ -341,8 +339,6 @@ private:
void connectNumericFormatterAdjustment(const OString &id, const OUString &rAdjustment);
void connectFormattedFormatterAdjustment(const OString &id, const OUString &rAdjustment);
- void connectTimeFormatterAdjustment(const OString &id, const OUString &rAdjustment);
- void connectDateFormatterAdjustment(const OString &id, const OUString &rAdjustment);
void extractGroup(const OString &id, stringmap &rVec);
void extractModel(const OString &id, stringmap &rVec);
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index d72de5b0b637..ff44aa59af14 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -225,8 +225,6 @@ public:
sal_uInt16 GetDisplayLineCount() const;
- void EnableMirroring();
-
/** checks whether a certain point lies within the bounds of
a listbox item and returns the item as well as the character position
the point is at.
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index b2c743b8234b..f9d45373618c 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -1652,12 +1652,4 @@ bool ScAccessibleSpreadsheet::GetFormulaCurrentFocusCell(ScAddress &addr)
return false;
}
-uno::Reference < XAccessible > ScAccessibleSpreadsheet::GetActiveCell()
-{
- if( m_mapSelectionSend.find( maActiveCell ) != m_mapSelectionSend.end() )
- return m_mapSelectionSend[maActiveCell];
- else
- return getAccessibleCellAt(maActiveCell.Row(), maActiveCell .Col());
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx
index 364fbcb3e7c9..975046b55be5 100644
--- a/sc/source/ui/inc/AccessibleDocument.hxx
+++ b/sc/source/ui/inc/AccessibleDocument.hxx
@@ -252,7 +252,6 @@ private:
static OUString GetCurrentCellDescription();
tools::Rectangle GetVisibleArea_Impl() const;
- css::uno::Sequence< css::uno::Any > GetScAccFlowToSequence();
public:
ScDocument *GetDocument() const ;
ScAddress GetCurCellAddress() const;
diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
index f2ecf98429de..4ef24c81f61b 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -77,7 +77,6 @@ public:
void VisAreaChanged();
void FireFirstCellFocus();
- css::uno::Reference < css::accessibility::XAccessible > GetActiveCell();
bool IsScAddrFormulaSel (const ScAddress &addr) const;
bool IsFormulaMode();
ScMyAddress CalcScAddressFromRangeList(ScRangeList *pMarkedRanges,sal_Int32 nSelectedChildIndex);
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index be60f5697ca1..beac686d733d 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -888,11 +888,6 @@ GDIMetaFile SdrGrafObj::GetMetaFile(GraphicType &rGraphicType) const
return GDIMetaFile();
}
-sal_Int32 SdrGrafObj::getEmbeddedPageNumber() const
-{
- return mpGraphicObject->GetGraphic().getPageNumber();
-}
-
SdrObjectUniquePtr SdrGrafObj::DoConvertToPolyObj(bool bBezier, bool bAddText ) const
{
SdrObject* pRetval = nullptr;
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 1e4512eef338..65cd4d2089a5 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -216,7 +216,6 @@ private:
bool mbUserDrawEnabled : 1; ///< UserDraw possible
bool mbInUserDraw : 1; ///< In UserDraw
bool mbReadOnly : 1; ///< ReadOnly
- bool mbMirroring : 1; ///< pb: #106948# explicit mirroring for calc
bool mbCenter : 1; ///< center Text output
bool mbRight : 1; ///< right align Text output
bool mbEdgeBlending : 1;
@@ -362,10 +361,6 @@ public:
DrawTextFlags ImplGetTextStyle() const;
- /// pb: #106948# explicit mirroring for calc
- void EnableMirroring() { mbMirroring = true; }
- bool IsMirroring() const { return mbMirroring; }
-
bool GetEdgeBlending() const { return mbEdgeBlending; }
void SetEdgeBlending(bool bNew) { mbEdgeBlending = bNew; }
@@ -498,9 +493,6 @@ public:
bool GetEdgeBlending() const { return mbEdgeBlending; }
void SetEdgeBlending(bool bNew);
-
- /// pb: #106948# explicit mirroring for calc
- void EnableMirroring() { maLBWindow->EnableMirroring(); }
};
class ImplListBoxFloatingWindow : public FloatingWindow
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 795385434d67..c8b337ad0929 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -470,9 +470,6 @@ ImplListBoxWindow::ImplListBoxWindow( vcl::Window* pParent, WinBits nWinStyle )
mbIsDropdown = ( nWinStyle & WB_DROPDOWN );
mbEdgeBlending = false;
- // pb: #106948# explicit mirroring for calc
- mbMirroring = false;
-
mnCurrentPos = LISTBOX_ENTRY_NOTFOUND;
mnTrackingSaveSelection = LISTBOX_ENTRY_NOTFOUND;
@@ -1769,11 +1766,6 @@ void ImplListBoxWindow::DrawEntry(vcl::RenderContext& rRenderContext, sal_Int32
aImgSz = aImage.GetSizePixel();
Point aPtImg(gnBorder - mnLeft, nY + ((nEntryHeight - aImgSz.Height()) / 2));
- // pb: #106948# explicit mirroring for calc
- if (mbMirroring)
- // right aligned
- aPtImg.setX( mnMaxWidth + gnBorder - aImgSz.Width() - mnLeft );
-
if (!IsZoom())
{
rRenderContext.DrawImage(aPtImg, aImage);
@@ -1822,15 +1814,6 @@ void ImplListBoxWindow::DrawEntry(vcl::RenderContext& rRenderContext, sal_Int32
aTextRect.AdjustLeft(nImageWidth + IMG_TXT_DISTANCE );
}
- // pb: #106948# explicit mirroring for calc
- if (mbMirroring)
- {
- // right aligned
- aTextRect.SetLeft( nMaxWidth + gnBorder - rRenderContext.GetTextWidth(aStr) - mnLeft );
- if (aImgSz.Width() > 0)
- aTextRect.AdjustLeft( -(aImgSz.Width() + IMG_TXT_DISTANCE) );
- }
-
DrawTextFlags nDrawStyle = ImplGetTextStyle();
if (pEntry->mnFlags & ListBoxEntryFlags::MultiLine)
nDrawStyle |= MULTILINE_ENTRY_DRAW_FLAGS;
@@ -2391,16 +2374,13 @@ void ImplListBox::ImplResizeControls()
if ( mbHScroll )
aInnerSz.AdjustHeight( -nSBWidth );
- // pb: #106948# explicit mirroring for calc
- // Scrollbar on left or right side?
- bool bMirroring = maLBWindow->IsMirroring();
- Point aWinPos( bMirroring && mbVScroll ? nSBWidth : 0, 0 );
+ Point aWinPos( 0, 0 );
maLBWindow->SetPosSizePixel( aWinPos, aInnerSz );
// ScrollBarBox
if( mbVScroll && mbHScroll )
{
- Point aBoxPos( bMirroring ? 0 : aInnerSz.Width(), aInnerSz.Height() );
+ Point aBoxPos( aInnerSz.Width(), aInnerSz.Height() );
mpScrollBarBox->SetPosSizePixel( aBoxPos, Size( nSBWidth, nSBWidth ) );
mpScrollBarBox->Show();
}
@@ -2413,7 +2393,7 @@ void ImplListBox::ImplResizeControls()
if( mbVScroll )
{
// Scrollbar on left or right side?
- Point aVPos( bMirroring ? 0 : aOutSz.Width() - nSBWidth, 0 );
+ Point aVPos( aOutSz.Width() - nSBWidth, 0 );
mpVScrollBar->SetPosSizePixel( aVPos, Size( nSBWidth, aInnerSz.Height() ) );
mpVScrollBar->Show();
}
@@ -2427,7 +2407,7 @@ void ImplListBox::ImplResizeControls()
// horizontal ScrollBar
if( mbHScroll )
{
- Point aHPos( ( bMirroring && mbVScroll ) ? nSBWidth : 0, aOutSz.Height() - nSBWidth );
+ Point aHPos( 0, aOutSz.Height() - nSBWidth );
mpHScrollBar->SetPosSizePixel( aHPos, Size( aInnerSz.Width(), nSBWidth ) );
mpHScrollBar->Show();
}
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index 47c4b792cd51..ab993d3f102f 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -1351,11 +1351,6 @@ sal_uInt16 ListBox::GetDisplayLineCount() const
return mpImplLB->GetDisplayLineCount();
}
-void ListBox::EnableMirroring()
-{
- mpImplLB->EnableMirroring();
-}
-
tools::Rectangle ListBox::GetDropDownPosSizePixel() const
{
return mpFloatWin ? mpFloatWin->GetWindowExtentsRelative( const_cast<ListBox*>(this) ) : tools::Rectangle();
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 11b67010356c..ff1f4ca9fe64 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -628,24 +628,6 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr
mungeAdjustment(*pTarget, *pAdjustment);
}
- for (auto const& elem : m_pParserState->m_aTimeFormatterAdjustmentMaps)
- {
- TimeField *pTarget = dynamic_cast<TimeField*>(get(elem.m_sID));
- const Adjustment *pAdjustment = get_adjustment_by_name(elem.m_sValue.toUtf8());
- SAL_WARN_IF(!pTarget || !pAdjustment, "vcl", "missing elements of spinbutton/adjustment");
- if (pTarget && pAdjustment)
- mungeAdjustment(*pTarget, *pAdjustment);
- }
-
- for (auto const& elem : m_pParserState->m_aDateFormatterAdjustmentMaps)
- {
- DateField *pTarget = dynamic_cast<DateField*>(get(elem.m_sID));
- const Adjustment *pAdjustment = get_adjustment_by_name(elem.m_sValue.toUtf8());
- SAL_WARN_IF(!pTarget || !pAdjustment, "vcl", "missing elements of spinbutton/adjustment");
- if (pTarget && pAdjustment)
- mungeAdjustment(*pTarget, *pAdjustment);
- }
-
//Set ScrollBar adjustments when everything has been imported
for (auto const& elem : m_pParserState->m_aScrollAdjustmentMaps)
{
@@ -1424,18 +1406,6 @@ void VclBuilder::connectFormattedFormatterAdjustment(const OString &id, const OU
m_pParserState->m_aFormattedFormatterAdjustmentMaps.emplace_back(id, rAdjustment);
}
-void VclBuilder::connectTimeFormatterAdjustment(const OString &id, const OUString &rAdjustment)
-{
- if (!rAdjustment.isEmpty())
- m_pParserState->m_aTimeFormatterAdjustmentMaps.emplace_back(id, rAdjustment);
-}
-
-void VclBuilder::connectDateFormatterAdjustment(const OString &id, const OUString &rAdjustment)
-{
- if (!rAdjustment.isEmpty())
- m_pParserState->m_aDateFormatterAdjustmentMaps.emplace_back(id, rAdjustment);
-}
-
bool VclBuilder::extractAdjustmentToMap(const OString& id, VclBuilder::stringmap& rMap, std::vector<WidgetAdjustmentMap>& rAdjustmentMap)
{
VclBuilder::stringmap::iterator aFind = rMap.find(OString("adjustment"));
More information about the Libreoffice-commits
mailing list