summaryrefslogtreecommitdiff
path: root/ucb/source
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2011-10-17 17:07:36 +0200
committerLuboš Luňák <l.lunak@suse.cz>2011-10-17 17:12:17 +0200
commit4901bdf4c4971e9b8235ab9bfbd0ee1088d51b45 (patch)
tree3ef9df749c805a1c997c30b914f2a49bb759a737 /ucb/source
parenta3f899125e6d619e185d5e8317d3abd6ac541c14 (diff)
Revert "CMIS: use another name to show than the one extracted from the base URL"
The commit makes LO unusable, it fails during startup, smoketest fails as well. This reverts commit cd1a12dc552e9d34c7481c83b07a6f6af0e8762b.
Diffstat (limited to 'ucb/source')
-rw-r--r--ucb/source/ucp/cmis/cmis_content.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index f765f1947069..d72041e5e9b6 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -126,9 +126,6 @@ namespace cmis
for( sal_Int32 n = 0; n < nProps; ++n )
{
const beans::Property& rProp = pProps[ n ];
-#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "Property: %s\n", rtl::OUStringToOString( rProp.Name, RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) )
{
@@ -144,9 +141,8 @@ namespace cmis
else
xRow->appendVoid( rProp );
}
- else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TitleOnServer" ) ) )
+ else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
{
- // TODO Set the path instead of the name
xRow->appendString( rProp, rtl::OUString::createFromAscii( m_pObject->getName().c_str() ) );
}
else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsReadOnly" ) ) )
@@ -358,7 +354,7 @@ namespace cmis
beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ),
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
- beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TitleOnServer" ) ),
+ beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),
-1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND ),
beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) ),