diff options
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/iahndl-ioexceptions.cxx | 11 | ||||
| -rw-r--r-- | uui/source/iahndl.cxx | 4 |
2 files changed, 4 insertions, 11 deletions
diff --git a/uui/source/iahndl-ioexceptions.cxx b/uui/source/iahndl-ioexceptions.cxx index 8d21c8f99948..2103e0318a95 100644 --- a/uui/source/iahndl-ioexceptions.cxx +++ b/uui/source/iahndl-ioexceptions.cxx @@ -248,9 +248,7 @@ UUIInteractionHelper::handleInteractiveIOException( RTL_CONSTASCII_USTRINGPARAM( "Removable")), &bRemovable); - nErrorCode - = aResourceType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("volume")) + nErrorCode = aResourceType == "volume" ? (bRemovable ? ERRCODE_UUI_IO_NOTREADY_VOLUME_REMOVABLE : ERRCODE_UUI_IO_NOTREADY_VOLUME) @@ -301,12 +299,9 @@ UUIInteractionHelper::handleInteractiveIOException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ResourceType")), &aResourceType); - nErrorCode - = aResourceType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("volume")) + nErrorCode = aResourceType == "volume" ? ERRCODE_UUI_IO_NOTEXISTS_VOLUME - : (aResourceType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("folder")) + : (aResourceType == "folder" ? ERRCODE_UUI_IO_NOTEXISTS_FOLDER : ERRCODE_UUI_IO_NOTEXISTS); aArguments.push_back(aArgUri); diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 38739bd9f3ed..4011f6a16324 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -1123,9 +1123,7 @@ UUIInteractionHelper::getContextProperty() for (sal_Int32 i = 0; i < m_aProperties.getLength(); ++i) { beans::PropertyValue aProperty; - if ((m_aProperties[i] >>= aProperty) - && aProperty. - Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Context"))) + if ((m_aProperties[i] >>= aProperty) && aProperty.Name == "Context" ) { rtl::OUString aContext; aProperty.Value >>= aContext; |