[Libreoffice-commits] .: 2 commits - sfx2/source ucb/source

[Cédric Bosdonnat]

 sfx2/source/doc/sfxbasemodel.cxx     |   23 +++++++++++++++++++++++
 ucb/source/ucp/cmis/cmis_content.cxx |    8 ++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

New commits:
commit 32d1dbdfadd0f3a3c71531c6f816568e7bd5d069
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 18 10:47:59 2011 +0200

    CMIS: Fixed the smoketests failure by catching some exceptions

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index c335aea..cbd04f2 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3771,23 +3771,30 @@ css::uno::Reference< css::frame::XUntitledNumbers > SfxBaseModel::impl_getUntitl
         SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
         if ( pMedium )
         {
-            ::ucbhelper::Content aContent( pMedium->GetName(), com::sun::star::uno::Reference < ucb::XCommandEnvironment >() );
-            com::sun::star::uno::Reference < beans::XPropertySetInfo > xProps = aContent.getProperties();
-            if ( xProps.is() )
-            {
-                ::rtl::OUString aServerTitle( RTL_CONSTASCII_USTRINGPARAM("TitleOnServer") );
-                if ( xProps->hasPropertyByName( aServerTitle ) )
+            try {
+                ::ucbhelper::Content aContent( pMedium->GetName(),
+                    uno::Reference<ucb::XCommandEnvironment>() );
+                const uno::Reference < beans::XPropertySetInfo > xProps
+                     = aContent.getProperties();
+                if ( xProps.is() )
                 {
-                    uno::Any aAny = aContent.getPropertyValue( aServerTitle );
-                    aAny >>= aResult;
+                    ::rtl::OUString aServerTitle( RTL_CONSTASCII_USTRINGPARAM("TitleOnServer") );
+                    if ( xProps->hasPropertyByName( aServerTitle ) )
+                    {
+                        uno::Any aAny = aContent.getPropertyValue( aServerTitle );
+                        aAny >>= aResult;
+                    }
                 }
             }
-            else
+            catch (ucb::ContentCreationException &)
+            {
+            }
+            catch (ucb::CommandAbortedException &)
             {
-                SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairedDocItem, SfxBoolItem, SID_REPAIRPACKAGE, sal_False );
-                if ( pRepairedDocItem && pRepairedDocItem->GetValue() )
-                    aResult += String( SfxResId(STR_REPAIREDDOCUMENT) );
             }
+            SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairedDocItem, SfxBoolItem, SID_REPAIRPACKAGE, sal_False );
+            if ( pRepairedDocItem && pRepairedDocItem->GetValue() )
+                aResult += String( SfxResId(STR_REPAIREDDOCUMENT) );
         }
 
         if ( m_pData->m_pObjectShell->IsReadOnlyUI() || (pMedium && pMedium->IsReadOnly()) )
commit 228051c11a5757507656460f7d28852aa9b5b540
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Tue Oct 18 08:03:11 2011 +0200

    Reapply "CMIS: use another name to show than the one extracted from the base URL
    
    This reverts commit 4901bdf4c4971e9b8235ab9bfbd0ee1088d51b45.

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 777929d..c335aea 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -55,6 +55,7 @@
 #include <com/sun/star/document/XStorageChangeListener.hpp>
 #include <com/sun/star/document/XActionLockable.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/script/provider/XScriptProviderFactory.hpp>
 #include <com/sun/star/script/provider/XScriptProvider.hpp>
@@ -65,6 +66,7 @@
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/frame/XTransientDocumentsDocumentContentFactory.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <comphelper/enumhelper.hxx>  // can be removed when this is a "real" service
 
 #include <cppuhelper/interfacecontainer.hxx>
@@ -3769,9 +3771,23 @@ css::uno::Reference< css::frame::XUntitledNumbers > SfxBaseModel::impl_getUntitl
         SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
         if ( pMedium )
         {
-            SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairedDocItem, SfxBoolItem, SID_REPAIRPACKAGE, sal_False );
-            if ( pRepairedDocItem && pRepairedDocItem->GetValue() )
-                aResult += String( SfxResId(STR_REPAIREDDOCUMENT) );
+            ::ucbhelper::Content aContent( pMedium->GetName(), com::sun::star::uno::Reference < ucb::XCommandEnvironment >() );
+            com::sun::star::uno::Reference < beans::XPropertySetInfo > xProps = aContent.getProperties();
+            if ( xProps.is() )
+            {
+                ::rtl::OUString aServerTitle( RTL_CONSTASCII_USTRINGPARAM("TitleOnServer") );
+                if ( xProps->hasPropertyByName( aServerTitle ) )
+                {
+                    uno::Any aAny = aContent.getPropertyValue( aServerTitle );
+                    aAny >>= aResult;
+                }
+            }
+            else
+            {
+                SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairedDocItem, SfxBoolItem, SID_REPAIRPACKAGE, sal_False );
+                if ( pRepairedDocItem && pRepairedDocItem->GetValue() )
+                    aResult += String( SfxResId(STR_REPAIREDDOCUMENT) );
+            }
         }
 
         if ( m_pData->m_pObjectShell->IsReadOnlyUI() || (pMedium && pMedium->IsReadOnly()) )
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index d72041e..f765f19 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -126,6 +126,9 @@ 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" ) ) )
             {
@@ -141,8 +144,9 @@ namespace cmis
                 else
                     xRow->appendVoid( rProp );
             }
-            else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
+            else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TitleOnServer" ) ) )
             {
+                // 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" ) ) )
@@ -354,7 +358,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( "Title" ) ),
+            beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TitleOnServer" ) ),
                 -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                 beans::PropertyAttribute::BOUND ),
             beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) ),