summaryrefslogtreecommitdiff
path: root/sd/source/ui/accessibility
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-01-12 20:16:43 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-01-12 20:16:43 +0100
commitabf7b94123a555c4f3e90a0ae41bd7a842d1c1fb (patch)
tree6e0208e0450308652be1a0a512f98023b35ca489 /sd/source/ui/accessibility
parentb271fb5ba1a8f7da2120d7037de087b02eb16c91 (diff)
More loplugin:cstylecast: sd
auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable loplugin:cstylecast for some more cases" plus solenv/clang-format/reformat-formatted-files Change-Id: I144975b94fe2725ac740a953ca2133e99f8a3fce
Diffstat (limited to 'sd/source/ui/accessibility')
-rw-r--r--sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx4
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterView.cxx4
-rw-r--r--sd/source/ui/accessibility/AccessibleViewForwarder.cxx14
3 files changed, 11 insertions, 11 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 601ca86992c2..97b53cbcf162 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -719,7 +719,7 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
sValue = sName + sDisplay ;
sName = ";page-number:";
sValue += sName;
- sValue += OUString::number((sal_Int16)((sal_uInt16)((pDrViewSh->getCurrentPage()->GetPageNum()-1)>>1) + 1)) ;
+ sValue += OUString::number(static_cast<sal_Int16>(static_cast<sal_uInt16>((pDrViewSh->getCurrentPage()->GetPageNum()-1)>>1) + 1)) ;
sName = ";total-pages:";
sValue += sName;
sValue += OUString::number(pDrViewSh->GetPageTabControl().GetPageCount()) ;
@@ -807,7 +807,7 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
sValue = sName + sDisplay ;
sName = ";page-number:";
sValue += sName;
- sValue += OUString::number((sal_Int16)((sal_uInt16)((pCurrPge->GetPageNum()-1)>>1) + 1)) ;
+ sValue += OUString::number(static_cast<sal_Int16>(static_cast<sal_uInt16>((pCurrPge->GetPageNum()-1)>>1) + 1)) ;
sName = ";total-pages:";
sValue += sName;
sValue += OUString::number(pDoc->GetSdPageCount(PageKind::Standard)) ;
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 0e8d7df003e5..85c65293d485 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -731,7 +731,7 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetAcces
{
AccessibleSlideSorterObject* pChild = nullptr;
- if (nIndex>=0 && (sal_uInt32)nIndex<maPageObjects.size())
+ if (nIndex>=0 && static_cast<sal_uInt32>(nIndex)<maPageObjects.size())
{
if (maPageObjects[nIndex] == nullptr)
{
@@ -756,7 +756,7 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetAcces
}
else
{
- OSL_ASSERT(nIndex>=0 && (sal_uInt32)nIndex<maPageObjects.size());
+ OSL_ASSERT(nIndex>=0 && static_cast<sal_uInt32>(nIndex)<maPageObjects.size());
}
return pChild;
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index 1090412acc8c..72d7afcb985b 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -43,7 +43,7 @@ AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, OutputDev
if(&rOutDev == &rDevice)
{
- mnWindowId = (sal_uInt16)a;
+ mnWindowId = static_cast<sal_uInt16>(a);
break;
}
}
@@ -58,9 +58,9 @@ AccessibleViewForwarder::~AccessibleViewForwarder()
{
::tools::Rectangle aVisibleArea;
- if((sal_uInt32)mnWindowId < mpView->PaintWindowCount())
+ if(static_cast<sal_uInt32>(mnWindowId) < mpView->PaintWindowCount())
{
- SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId);
+ SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow(static_cast<sal_uInt32>(mnWindowId));
aVisibleArea = pPaintWindow->GetVisibleArea();
}
@@ -74,9 +74,9 @@ AccessibleViewForwarder::~AccessibleViewForwarder()
Point AccessibleViewForwarder::LogicToPixel (const Point& rPoint) const
{
OSL_ASSERT (mpView != nullptr);
- if((sal_uInt32)mnWindowId < mpView->PaintWindowCount())
+ if(static_cast<sal_uInt32>(mnWindowId) < mpView->PaintWindowCount())
{
- SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId);
+ SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow(static_cast<sal_uInt32>(mnWindowId));
OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
::tools::Rectangle aBBox(static_cast<vcl::Window&>(rOutDev).GetWindowExtentsRelative(nullptr));
return rOutDev.LogicToPixel (rPoint) + aBBox.TopLeft();
@@ -88,9 +88,9 @@ Point AccessibleViewForwarder::LogicToPixel (const Point& rPoint) const
Size AccessibleViewForwarder::LogicToPixel (const Size& rSize) const
{
OSL_ASSERT (mpView != nullptr);
- if((sal_uInt32)mnWindowId < mpView->PaintWindowCount())
+ if(static_cast<sal_uInt32>(mnWindowId) < mpView->PaintWindowCount())
{
- SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId);
+ SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow(static_cast<sal_uInt32>(mnWindowId));
OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
return rOutDev.LogicToPixel (rSize);
}