ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

flatten getCurrentSelection a little

Browse Source 
Change-Id: I874bc1223aa9c1a2f909d82b928aa3a7011182c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/202225
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2026-03-21 12:45:05 +01:00
parent cff0defd2c
commit 50e9d3d566
1 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vcl/osx/salframeview.mm
+56 -56
View File
@@ -336,73 +336,73 @@ static NSString* getCurrentSelection()
}
css::uno::Reference<css::frame::XDesktop> xDesktop = css::frame::Desktop::create(::comphelper::getProcessComponentContext());
if (xDesktop.is())
if (!xDesktop.is())
return nil;
css::uno::Reference<css::frame::XModel> xModel(xDesktop->getCurrentComponent(), css::uno::UNO_QUERY);
if (!xModel)
return nil;
css::uno::Reference<css::uno::XInterface> xSelection(xModel->getCurrentSelection(), css::uno::UNO_QUERY);
if (!xSelection)
return nil;
css::uno::Reference<css::container::XIndexAccess> xIndexAccess(xSelection, css::uno::UNO_QUERY);
if (xIndexAccess.is())
{
css::uno::Reference<css::frame::XModel> xModel(xDesktop->getCurrentComponent(), css::uno::UNO_QUERY);
if (xModel)
if (xIndexAccess->getCount() > 0)
{
css::uno::Reference<css::uno::XInterface> xSelection(xModel->getCurrentSelection(), css::uno::UNO_QUERY);
if (xSelection)
css::uno::Reference<css::text::XTextRange> xTextRange(xIndexAccess->getByIndex(0), css::uno::UNO_QUERY);
if (xTextRange.is())
{
css::uno::Reference<css::container::XIndexAccess> xIndexAccess(xSelection, css::uno::UNO_QUERY);
if (xIndexAccess.is())
// tdf#168609 catch exceptions from SwXText::getString()
// Apparently, implementations of XTextRange::getString()
// such as SwXText::getString() can throw an exception.
OUString aStr;
try
{
if (xIndexAccess->getCount() > 0)
{
css::uno::Reference<css::text::XTextRange> xTextRange(xIndexAccess->getByIndex(0), css::uno::UNO_QUERY);
if (xTextRange.is())
{
// tdf#168609 catch exceptions from SwXText::getString()
// Apparently, implementations of XTextRange::getString()
// such as SwXText::getString() can throw an exception.
OUString aStr;
try
{
aStr = xTextRange->getString();
}
catch (css::uno::RuntimeException &)
{
TOOLS_WARN_EXCEPTION("vcl.osx", "getCurrentSelection: XTextRange::getString() threw RuntimeException");
}
return [CreateNSString(aStr) autorelease];
}
}
aStr = xTextRange->getString();
}
// The Basic IDE returns a XEnumeration with a single item
// Note: the following code was adapted from
// svx/source/tbxctrls/tbunosearchcontrollers.cxx
css::uno::Reference<css::container::XEnumeration> xEnum(xSelection, css::uno::UNO_QUERY);
if (xEnum.is() && xEnum->hasMoreElements())
catch (css::uno::RuntimeException &)
{
OUString aString;
xEnum->nextElement() >>= aString;
return [CreateNSString(aString) autorelease];
}
// The following is needed for cells and text fields in Calc
// and Impress
css::uno::Reference<css::text::XTextRange> xTextRange(xSelection, css::uno::UNO_QUERY);
if (xTextRange.is())
{
// tdf#168609 catch exceptions from SwXText::getString()
// Apparently, implementations of XTextRange::getString()
// such as SwXText::getString() can throw an exception.
OUString aStr;
try
{
aStr = xTextRange->getString();
}
catch (css::uno::RuntimeException &)
{
TOOLS_WARN_EXCEPTION("vcl.osx", "getCurrentSelection: XTextRange::getString() threw RuntimeException");
}
return [CreateNSString(aStr) autorelease];
TOOLS_WARN_EXCEPTION("vcl.osx", "getCurrentSelection: XTextRange::getString() threw RuntimeException");
}
return [CreateNSString(aStr) autorelease];
}
}
}
// The Basic IDE returns a XEnumeration with a single item
// Note: the following code was adapted from
// svx/source/tbxctrls/tbunosearchcontrollers.cxx
css::uno::Reference<css::container::XEnumeration> xEnum(xSelection, css::uno::UNO_QUERY);
if (xEnum.is() && xEnum->hasMoreElements())
{
OUString aString;
xEnum->nextElement() >>= aString;
return [CreateNSString(aString) autorelease];
}
// The following is needed for cells and text fields in Calc
// and Impress
css::uno::Reference<css::text::XTextRange> xTextRange(xSelection, css::uno::UNO_QUERY);
if (xTextRange.is())
{
// tdf#168609 catch exceptions from SwXText::getString()
// Apparently, implementations of XTextRange::getString()
// such as SwXText::getString() can throw an exception.
OUString aStr;
try
{
aStr = xTextRange->getString();
}
catch (css::uno::RuntimeException &)
{
TOOLS_WARN_EXCEPTION("vcl.osx", "getCurrentSelection: XTextRange::getString() threw RuntimeException");
}
return [CreateNSString(aStr) autorelease];
}
return nil;
}