diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:24:05 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:26 +0100 |
| commit | 226dd312e17fd3b97db17a131b703bbb9ab009f2 (patch) | |
| tree | 4ada21bcafb3af89f3ee2f6c01ec9feaedfc1a6a | |
| parent | 9f806fcad27f96ad4530478ec4a4fdce69e20c8e (diff) | |
extensions: Use appropriate OUString functions on string constants
Change-Id: I4f117b3339753af254768724c38167f3595fbe69
| -rw-r--r-- | extensions/source/dbpilots/unoautopilot.inl | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/propcontroller.cxx | 6 | ||||
| -rw-r--r-- | extensions/source/propctrlr/stringrepresentation.cxx | 3 | ||||
| -rw-r--r-- | extensions/source/update/check/updatehdl.cxx | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl index 4d6452be578b..77f3cf6e795d 100644 --- a/extensions/source/dbpilots/unoautopilot.inl +++ b/extensions/source/dbpilots/unoautopilot.inl @@ -107,7 +107,7 @@ void OUnoAutoPilot<TYPE, SERVICEINFO>::implInitialize(const com::sun::star::uno: { ::com::sun::star::beans::PropertyValue aArgument; if (_rValue >>= aArgument) - if (aArgument.Name.equals("ObjectModel")) + if (aArgument.Name == "ObjectModel") { aArgument.Value >>= m_xObjectModel; return; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 188bdefdf7e3..77b518878526 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -650,7 +650,7 @@ namespace pcr return; OUString sOldSelection = m_sPageSelection; - m_sPageSelection = ""; + m_sPageSelection.clear(); const sal_uInt16 nCurrentPage = m_pView->getActivaPage(); if ( (sal_uInt16)-1 != nCurrentPage ) @@ -1373,7 +1373,7 @@ namespace pcr OUString sPlcHolder = PcrRes(RID_EMBED_IMAGE_PLACEHOLDER).toString(); bool bIsPlaceHolderValue = false; - if ( rName.equals( PROPERTY_IMAGE_URL ) ) + if ( rName == PROPERTY_IMAGE_URL ) { // if the prop value is the PlaceHolder // can ignore it @@ -1421,7 +1421,7 @@ namespace pcr OSL_FAIL("OPropertyBrowserController::Commit : caught an exception !"); } - m_sCommittingProperty = ""; + m_sCommittingProperty.clear(); } diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 329424794a87..5aff8779de91 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -626,8 +626,7 @@ OUString SAL_CALL _getImplementationName() { uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() { uno::Sequence< OUString > s(1); - s[0] = OUString( - "com.sun.star.inspection.StringRepresentation"); + s[0] = "com.sun.star.inspection.StringRepresentation"; return s; } diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 7be1b3abe9b0..6bc0b3ad3df7 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -320,7 +320,7 @@ void SAL_CALL UpdateHandler::actionPerformed( awt::ActionEvent const & rEvent ) } } - if ( rEvent.ActionCommand.equals( COMMAND_CLOSE ) ) + if ( rEvent.ActionCommand == COMMAND_CLOSE ) { if ( ( mnLastCtrlState & ( 1 << CLOSE_BUTTON ) ) == ( 1 << CLOSE_BUTTON ) ) eButton = CLOSE_BUTTON; |