INTEGRATION: CWS pb12 (1.7.6); FILE MERGED

2006/02/08 13:31:36 pb 1.7.6.1: fix: #i60061# before change the directory please stop inplace-editing

1 files changed, 15 insertions, 8 deletions

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index f6066a2966..d207eb5099 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: iodlg.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: obo $ $Date: 2006-01-20 12:38:10 $
+ *  last change: $Author: obo $ $Date: 2006-03-29 08:36:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -967,6 +967,8 @@ void SvtFileDialog::Init_Impl
 
 IMPL_STATIC_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton*, pBtn )
 {
+    pThis->_pFileView->EndInplaceEditing( false );
+
     INetURLObject aObj( pThis->_pFileView->GetViewURL() );
     String sFolderName = aObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8 );
     svtools::QueryFolderNameDialog aDlg( pThis, sFolderName, String( SvtResId( STR_SVT_NEW_FOLDER ) ) );
@@ -1248,8 +1250,8 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
     // #97148# & #102204# ---------
     if ( aFileName.Len() )
     {
-        // Make sure we have own Interaction Handler in place. We do not need 
-        // to intercept interactions here, but to record the fact that there 
+        // Make sure we have own Interaction Handler in place. We do not need
+        // to intercept interactions here, but to record the fact that there
         // was an interaction.
         SmartContent::InteractionHandlerType eInterActionHandlerType
             = pThis->m_aContent.queryCurrentInteractionHandler();
@@ -1260,9 +1262,9 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
 
         bFolder = pThis->m_aContent.isFolder( aFileName );
 
-        // access denied to the given resource - and interaction was already 
+        // access denied to the given resource - and interaction was already
         // used => break following operations
-        OFilePickerInteractionHandler* pHandler 
+        OFilePickerInteractionHandler* pHandler
             = pThis->m_aContent.getOwnInteractionHandler();
 
         OSL_ENSURE( pHandler, "Got no Interaction Handler!!!" );
@@ -1279,7 +1281,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
             return 0;
         }
 
-        // restore previous Interaction Handler 
+        // restore previous Interaction Handler
         if ( eInterActionHandlerType == SmartContent::IHT_NONE )
             pThis->m_aContent.disableInteractionHandler();
         else if ( eInterActionHandlerType == SmartContent::IHT_DEFAULT )
@@ -1687,7 +1689,8 @@ void SvtFileDialog::UpdateControls( const String& rURL )
             {
                 // no Fsys path for server file system ( only UCB has mountpoints! )
                 if ( INET_PROT_FILE != aObj.GetProtocol() )
-                    sText = rURL.Copy( INetURLObject::GetScheme( aObj.GetProtocol() ).getLength() );
+                    sText = rURL.Copy( static_cast< USHORT >(
+                        INetURLObject::GetScheme( aObj.GetProtocol() ).getLength() ) );
             }
 
             if ( !sText.Len() && aObj.getSegmentCount() )
@@ -2410,6 +2413,8 @@ const String& SvtFileDialog::GetStandardDir() const
 
 void SvtFileDialog::PrevLevel_Impl()
 {
+    _pFileView->EndInplaceEditing( false );
+
     String sDummy;
     executeAsync( AsyncPickerAction::ePrevLevel, sDummy, sDummy );
 }
@@ -2418,6 +2423,8 @@ void SvtFileDialog::PrevLevel_Impl()
 
 void SvtFileDialog::OpenURL_Impl( const String& _rURL )
 {
+    _pFileView->EndInplaceEditing( false );
+
     DBG_ASSERT( m_aURLFilter.isUrlAllowed( _rURL ), "SvtFileDialog::OpenURL_Impl: forbidden URL! Should have been handled by the caller!" );
     executeAsync( AsyncPickerAction::eOpenURL, _rURL, getMostCurrentFilter( _pImp ) );
 }