summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-14 14:00:46 +0200
committerNoel Grandin <noel@peralex.com>2015-04-23 13:08:48 +0200
commit79ed057b955a8d23e8289b9a5898c8bdaebabbfa (patch)
tree0b512b13f7b59e12a44395ea50814fda15902f04 /sdext
parent12ba9e3cad05a665aee2150ef831f0dbc92d7e2d (diff)
loplugin:staticmethods
Change-Id: I6207b475127099872c6f3764331006688129b673
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/presenter/PresenterAccessibility.cxx6
-rw-r--r--sdext/source/presenter/PresenterTextView.cxx6
-rw-r--r--sdext/source/presenter/PresenterTextView.hxx1
-rw-r--r--sdext/source/presenter/PresenterTheme.cxx12
4 files changed, 7 insertions, 18 deletions
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 0a22ca345896..beb609a83ede 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -1632,15 +1632,11 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount()
}
sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint (
- const css::awt::Point& rPoint)
+ const css::awt::Point& )
throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
-
sal_Int32 nIndex (-1);
- if (mpParagraph)
- nIndex = mpParagraph->GetIndexAtPoint(rPoint);
-
return nIndex;
}
diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index 6ce7e3235ae6..e0b3838ef660 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -992,12 +992,6 @@ awt::Rectangle PresenterTextParagraph::GetCharacterBounds (
return awt::Rectangle(sal_Int32(nX+0.5), sal_Int32(nY+0.5), 0, 0);
}
-sal_Int32 PresenterTextParagraph::GetIndexAtPoint (const awt::Point& rPoint) const
-{
- (void)rPoint;
- return -1;
-}
-
sal_Int8 PresenterTextParagraph::GetTextDirection() const
{
// Find first portion that has a non-neutral text direction.
diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx
index 349e9df6902b..0229d79fac1c 100644
--- a/sdext/source/presenter/PresenterTextView.hxx
+++ b/sdext/source/presenter/PresenterTextView.hxx
@@ -123,7 +123,6 @@ public:
css::awt::Rectangle GetCharacterBounds (
sal_Int32 nGlobalCharacterIndex,
const bool bCaretBox);
- sal_Int32 GetIndexAtPoint (const css::awt::Point& rPoint) const;
void SetupCellArray (
const PresenterTheme::SharedFontDescriptor& rpFont);
void Format (
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 36387a2861b1..0e8af211d1da 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -113,12 +113,12 @@ public:
PresenterConfigurationAccess& rConfiguration,
const OUString& rsThemeName);
- BorderSize ReadBorderSize (const Reference<container::XNameAccess>& rxNode);
+ static BorderSize ReadBorderSize (const Reference<container::XNameAccess>& rxNode);
private:
- Any GetByName (
+ static Any GetByName (
const Reference<container::XNameAccess>& rxNode,
- const OUString& rsName) const;
+ const OUString& rsName);
};
/** A PaneStyle describes how a pane is rendered.
@@ -766,7 +766,7 @@ PresenterTheme::SharedFontDescriptor ReadContext::ReadFont (
Any ReadContext::GetByName (
const Reference<container::XNameAccess>& rxNode,
- const OUString& rsName) const
+ const OUString& rsName)
{
OSL_ASSERT(rxNode.is());
if (rxNode->hasByName(rsName))
@@ -903,9 +903,9 @@ void PaneStyleContainer::ProcessPaneStyle(
xFontNode, "", PresenterTheme::SharedFontDescriptor());
Reference<container::XNameAccess> xInnerBorderSizeNode (rValues[3], UNO_QUERY);
- pStyle->maInnerBorderSize = rReadContext.ReadBorderSize(xInnerBorderSizeNode);
+ pStyle->maInnerBorderSize = ReadContext::ReadBorderSize(xInnerBorderSizeNode);
Reference<container::XNameAccess> xOuterBorderSizeNode (rValues[4], UNO_QUERY);
- pStyle->maOuterBorderSize = rReadContext.ReadBorderSize(xOuterBorderSizeNode);
+ pStyle->maOuterBorderSize = ReadContext::ReadBorderSize(xOuterBorderSizeNode);
if (pStyle->mpParentStyle.get() != NULL)
{