diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-12 17:51:36 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-12 17:51:36 +0100 |
| commit | 9d94148b0429acf77880742c0569bbebddd794f9 (patch) | |
| tree | c00c90f36e6703c437dc9057ab55cb624633c343 /desktop/source/deployment | |
| parent | bca00da68640bb052c1628270ce3924b7228d7b8 (diff) | |
desktop: Use appropriate OUString functions on string constants
Change-Id: I5791c212a103fe9c2a5376545944a70454b28bdd
Diffstat (limited to 'desktop/source/deployment')
| -rw-r--r-- | desktop/source/deployment/inc/dp_ucb.h | 3 | ||||
| -rw-r--r-- | desktop/source/deployment/manager/dp_manager.cxx | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h index 2b267056fd31..ee68c63ce935 100644 --- a/desktop/source/deployment/inc/dp_ucb.h +++ b/desktop/source/deployment/inc/dp_ucb.h @@ -45,8 +45,7 @@ struct DESKTOP_DEPLOYMENTMISC_DLLPUBLIC StrTitle } static OUString getTitle( ::ucbhelper::Content &rContent ) { - return OUString( rContent.getPropertyValue( - OUString::createFromAscii( "Title" ) ).get<OUString>() ); + return rContent.getPropertyValue("Title").get<OUString>(); } // just return titles - the ucbhelper should have a simpler API for this [!] static css::uno::Reference< css::sdbc::XResultSet > diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index a4eb6c6bde33..8d9050187448 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -192,16 +192,11 @@ void PackageManagerImpl::initActivationLayer( Reference<sdbc::XRow>( xResultSet, UNO_QUERY_THROW )->getString( 1 /* Title */ ) ); - - const char extensionRemoved[] = "removed"; - if (title.endsWith( extensionRemoved )) + if (title.endsWith("removed", &title)) { //save the file name withouth the "removed" part - sal_Int32 index = title.lastIndexOfAsciiL( - extensionRemoved, sizeof(extensionRemoved) - 1); - OUString remFile = title.copy(0, index); removedEntries.push_back(::rtl::Uri::encode( - remFile, rtl_UriCharClassPchar, + title, rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ) ); } |