From 2c4588340ee8387513dd067ecb53dc0058b12ccc Mon Sep 17 00:00:00 2001 From: Cédric Bosdonnat Date: Fri, 1 Jun 2012 10:46:25 +0200 Subject: CMIS UCP: Fixed folder creation and nodes renaming Change-Id: I2c49b95279d90ebb06f38ed83061a5f1a905a555 --- svtools/inc/svtools/fileview.hxx | 2 +- svtools/source/contnr/fileview.cxx | 22 ++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx index c5ec78ead9fb..4778bd9a6e0f 100644 --- a/svtools/inc/svtools/fileview.hxx +++ b/svtools/inc/svtools/fileview.hxx @@ -98,7 +98,7 @@ public: String GetCurrentURL() const; sal_Bool GetParentURL( String& _rParentURL ) const; - sal_Bool CreateNewFolder( const String& rNewFolder ); + void CreatedFolder( const String& rUrl, const String& rNewFolder ); void SetHelpId( const rtl::OString& rHelpId ); const rtl::OString& GetHelpId( ) const; diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 11f80bf73bc0..9f100f8ca79d 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1293,23 +1293,13 @@ String SvtFileView::GetCurrentURL() const } // ----------------------------------------------------------------------------- -sal_Bool SvtFileView::CreateNewFolder( const String& rNewFolder ) +void SvtFileView::CreatedFolder( const String& rUrl, const String& rNewFolder ) { - sal_Bool bRet = sal_False; - INetURLObject aObj( mpImp->maViewURL ); - aObj.insertName( rNewFolder, false, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL ); - String sURL = aObj.GetMainURL( INetURLObject::NO_DECODE ); - if ( ::utl::UCBContentHelper::MakeFolder( sURL, sal_True ) ) - { - String sTitle = aObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); - String sEntry = mpImp->FolderInserted( sURL, sTitle ); - SvLBoxEntry* pEntry = mpImp->mpView->InsertEntry( sEntry, mpImp->maFolderImage, mpImp->maFolderImage ); - SvtContentEntry* pUserData = new SvtContentEntry( sURL, sal_True ); - pEntry->SetUserData( pUserData ); - mpImp->mpView->MakeVisible( pEntry ); - bRet = sal_True; - } - return bRet; + String sEntry = mpImp->FolderInserted( rUrl, rNewFolder ); + SvLBoxEntry* pEntry = mpImp->mpView->InsertEntry( sEntry, mpImp->maFolderImage, mpImp->maFolderImage ); + SvtContentEntry* pUserData = new SvtContentEntry( rUrl, sal_True ); + pEntry->SetUserData( pUserData ); + mpImp->mpView->MakeVisible( pEntry ); } // ----------------------------------------------------------------------- -- cgit