summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2018-01-11 22:42:07 +0100
committerEike Rathke <erack@redhat.com>2018-01-16 12:34:03 +0100
commit2c202d82ed024c65e1bde3b93cb14dd4a03bd2a5 (patch)
tree616b76e3603d64bbc5a60d400664be4d1eb92728
parent24b339c8a7aa01c51aa36cd81da0e66dbeecb8b8 (diff)
shapes provide their name through the container::XNamed interface, tdf#114932
This is actually a problem introduced by 1c80246e5ff8aeb3e05384d86766a56aa878c7be and not by 5ee141ee2fb77c3cc452ac656235d7e83e15072c as mentioned in the bug report. Change-Id: I5f4032c13cf5eac3e515ada10b9bfa87598da438 Reviewed-on: https://gerrit.libreoffice.org/47841 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit cfa0b631d00f1c17d15646ddcf78093b7f4df03b) Reviewed-on: https://gerrit.libreoffice.org/47843 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Eike Rathke <erack@redhat.com>
-rw-r--r--sc/source/ui/navipi/navipi.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index e84c61e056dc..79ebee607a68 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -809,9 +809,9 @@ void ScNavigatorDlg::UpdateSelection()
uno::Reference< drawing::XShape > xShape;
if( xIndexAccess->getByIndex(0) >>= xShape )
{
- uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
- OUString sName;
- if( ( xProps->getPropertyValue("Name") >>= sName ) && !sName.isEmpty() )
+ uno::Reference< container::XNamed > xNamed( xShape, uno::UNO_QUERY_THROW );
+ OUString sName = xNamed->getName();
+ if (!sName.isEmpty())
{
aLbEntries->SelectEntryByName( ScContentId::DRAWING, sName );
}