Kaydet (Commit) 8da1d786 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Remove WorkPathVariable support from KDE backends

...now that b5c05876 "Related: rhbz#1065807
recover using xdg templates and documents settings" handles WorkPathVariable in
the generic shell/source/backends/desktopbe/desktopbackend.cxx code.

Change-Id: I3920cdb3f54688462813d212569c9b33a1371333
üst 72812a38
......@@ -86,17 +86,6 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
bool ATToolSupport = false;
return css::beans::Optional< css::uno::Any >(
true, uno::makeAny( OUString::boolean( ATToolSupport ) ) );
} else if (id == "WorkPathVariable")
{
QString aDocumentsDir( KGlobalSettings::documentPath() );
OUString sDocumentsDir;
OUString sDocumentsURL;
if ( aDocumentsDir.endsWith(QChar('/')) )
aDocumentsDir.truncate ( aDocumentsDir.length() - 1 );
sDocumentsDir = reinterpret_cast<const sal_Unicode *>(aDocumentsDir.utf16());
osl_getFileURLFromSystemPath( sDocumentsDir.pData, &sDocumentsURL.pData );
return css::beans::Optional< css::uno::Any >(
true, uno::makeAny( sDocumentsURL ) );
} else if (id == "ooInetFTPProxyName")
{
QString aFTPProxy;
......
......@@ -167,7 +167,7 @@ css::uno::Any Service::getPropertyValue(OUString const & PropertyName)
css::uno::RuntimeException, std::exception)
{
if (PropertyName == "EnableATToolSupport" || PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight"
|| PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName"
|| PropertyName == "SourceViewFontName" || PropertyName == "ooInetFTPProxyName"
|| PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort"
|| PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy"
|| PropertyName == "ooInetProxyType" )
......
......@@ -82,17 +82,6 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
bool ATToolSupport = false;
return css::beans::Optional< css::uno::Any >(
true, uno::makeAny( OUString::boolean( ATToolSupport ) ) );
} else if (id == "WorkPathVariable")
{
QString aDocumentsDir( KGlobalSettings::documentPath() );
OUString sDocumentsDir;
OUString sDocumentsURL;
if ( aDocumentsDir.endsWith(QChar('/')) )
aDocumentsDir.truncate ( aDocumentsDir.length() - 1 );
sDocumentsDir = reinterpret_cast<const sal_Unicode *>(aDocumentsDir.ucs2());
osl_getFileURLFromSystemPath( sDocumentsDir.pData, &sDocumentsURL.pData );
return css::beans::Optional< css::uno::Any >(
true, uno::makeAny( sDocumentsURL ) );
} else if (id == "ooInetFTPProxyName")
{
QString aFTPProxy;
......
......@@ -169,7 +169,7 @@ css::uno::Any Service::getPropertyValue(OUString const & PropertyName)
css::uno::RuntimeException, std::exception)
{
if ( PropertyName == "EnableATToolSupport" || PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight"
|| PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName"
|| PropertyName == "SourceViewFontName" || PropertyName == "ooInetFTPProxyName"
|| PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort"
|| PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy"
|| PropertyName == "ooInetProxyType" )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment