CWS-TOOLING: integrate CWS cmis01

2009-02-03 20:05:24 +0100 tkr  r267341 : #i95301# fixed crash due wrong array length + resolve merge conflicts
2009-01-12 08:35:39 +0100 tkr  r266134 : #158978# support unescaped whitespaces in webdav
2009-01-12 08:33:10 +0100 tkr  r266133 : #i95307# build error after rebasing fixed
2009-01-07 09:47:09 +0100 tkr  r265948 : #159046# Add new path to the wntmsci12 search path
2009-01-05 15:34:19 +0100 tkr  r265873 : CWS-TOOLING: rebase CWS cmis01 to trunk@265758 (milestone: DEV300:m38)
2008-12-23 09:38:53 +0100 tkr  r265774 : #158537# new property
2008-12-23 09:36:25 +0100 tkr  r265773 : #158537# new property
2008-10-29 13:08:30 +0100 mav  r262791 : #i94273# let the interaction handler be used for authentication
2008-10-24 15:56:26 +0200 tkr  r262649 : #i95310# NTLM support
2008-10-22 18:14:02 +0200 mav  r262611 : #i94273# fix the http scenario
2008-10-22 12:41:12 +0200 tkr  r262596 : #i95310# NTLM support repaired (new neon version)
2008-10-22 12:38:47 +0200 tkr  r262595 : #i95310# NTLM support repaired (new neon version)
2008-10-22 12:38:31 +0200 tkr  r262594 : #i95310# NTLM support repaired (new neon version)
2008-10-22 12:29:43 +0200 tkr  r262593 : #i95307# Add blacklist support
2008-10-22 12:29:24 +0200 tkr  r262592 : #i95307# Add blacklist support
2008-10-22 12:29:07 +0200 tkr  r262591 : #i95307# Add blacklist support
2008-10-22 12:28:44 +0200 tkr  r262590 : #i95307# Add blacklist support
2008-10-22 12:25:01 +0200 tkr  r262589 : #i95307# Add blacklist support
2008-10-22 12:24:28 +0200 tkr  r262588 : #i95307# Add blacklist support
2008-10-22 12:22:36 +0200 tkr  r262587 : #i95307# Add blacklist support
2008-10-21 12:46:34 +0200 mav  r262568 : #i94273# allow to specify the suggested on IO SaveAs directory and filename
2008-10-21 12:44:49 +0200 mav  r262566 : #i94273# allow to specify the suggested on IO SaveAs directory and filename

7 files changed, 53 insertions, 5 deletions

diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index c4992b7b12..916b7bccf8 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -504,6 +504,7 @@ SvtFileDialog* SvtFilePicker::implCreateDialog( Window* _pParent )
     {
         String sStandardDir = String( m_aStandardDir );
         dialog->SetStandardDir( sStandardDir );
+        dialog->SetBlackList( m_aBlackList );
     }
 
     return dialog;
@@ -1094,6 +1095,10 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
                         m_aStandardDir = sStandardDir;
                     }
                 }
+                else if ( namedValue.Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BlackList" ) ) ) )
+                {
+                    namedValue.Value >>= m_aBlackList;
+                }
             }
         }
     }
@@ -1117,6 +1122,13 @@ sal_Bool SvtFilePicker::implHandleInitializationArgument( const ::rtl::OUString&
         return sal_True;
     }
 
+    if ( _rName.equalsAscii( "BlackList" ) )
+    {
+        OSL_VERIFY( _rValue >>= m_aBlackList );
+        return sal_True;
+    }
+
+
 
     return OCommonPicker::implHandleInitializationArgument( _rName, _rValue );
 }
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 0eb9e03437..7244602edb 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -61,6 +61,7 @@ typedef ::std::list < ElementEntry_Impl >					ElementList;
 
 typedef ::com::sun::star::beans::StringPair					UnoFilterEntry;
 typedef ::com::sun::star::uno::Sequence< UnoFilterEntry >	UnoFilterList;	// can be transported more effectively
+typedef ::com::sun::star::uno::Sequence< ::rtl::OUString >	OUStringList;	// can be transported more effectively
 
 // class SvtFilePicker ---------------------------------------------------
 
@@ -91,6 +92,7 @@ private:
     ::rtl::OUString		m_aOldHideDirectory;
 
     ::rtl::OUString		m_aStandardDir;
+    OUStringList    	m_aBlackList;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >
                         m_xListener;
diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx
index 33f3c23f6e..467f7d99ac 100644
--- a/fpicker/source/office/asyncfilepicker.cxx
+++ b/fpicker/source/office/asyncfilepicker.cxx
@@ -95,7 +95,12 @@ namespace svt
     }
 
     //--------------------------------------------------------------------
-    void AsyncPickerAction::execute( const String& _rURL, const String& _rFilter, sal_Int32 _nMinTimeout, sal_Int32 _nMaxTimeout )
+    void AsyncPickerAction::execute( 
+        const String& _rURL, 
+        const String& _rFilter, 
+        sal_Int32 _nMinTimeout, 
+        sal_Int32 _nMaxTimeout, 
+        const OUStringList& rBlackList )
     {
         DBG_TESTSOLARMUTEX();
             // if this asserts, we'd need to have an own mutex per instance
@@ -129,7 +134,7 @@ namespace svt
             break;
 
         case eOpenURL:
-            eResult = m_pView->Initialize( _rURL, _rFilter, pActionDescriptor.get() );
+            eResult = m_pView->Initialize( _rURL, _rFilter, pActionDescriptor.get(), rBlackList );
             break;
 
         case eExecuteFilter:
diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx
index a8917f5d28..79f7cf2697 100644
--- a/fpicker/source/office/asyncfilepicker.hxx
+++ b/fpicker/source/office/asyncfilepicker.hxx
@@ -37,13 +37,19 @@
 #include <tools/link.hxx>
 #include <tools/string.hxx>
 #include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
+#include <com/sun/star/uno/Sequence.h>
 
 class SvtFileView;
 class SvtFileDialog;
+
+typedef ::com::sun::star::uno::Sequence< ::rtl::OUString >	OUStringList;
+
 //........................................................................
 namespace svt
 {
 //........................................................................
+    
 
     //====================================================================
     //= AsyncPickerAction
@@ -82,7 +88,12 @@ namespace svt
                 If smaller than or equal to <arg>_nMinTimeout</arg>, it will be corrected to
                 <arg>_nMinTimeout</arg> + 30000.
         */
-        void execute( const String& _rURL, const String& _rFilter, sal_Int32 _nMinTimeout, sal_Int32 _nMaxTimeout );
+        void execute( 
+            const String& _rURL, 
+            const String& _rFilter, 
+            sal_Int32 _nMinTimeout, 
+            sal_Int32 _nMaxTimeout,
+            const OUStringList& rBlackList = OUStringList() );
 
         /// cancels the running action
         void cancel();
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 7f16b47135..00e714106e 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -2319,7 +2319,7 @@ void SvtFileDialog::executeAsync( ::svt::AsyncPickerAction::Action _eAction,
     m_aConfiguration.getNodeValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Timeout/Max" ) ) ) >>= nMaxTimeout;
 
     m_bInExecuteAsync = true;
-    m_pCurrentAsyncAction->execute( _rURL, _rFilter, bReallyAsync ? nMinTimeout : -1, nMaxTimeout );
+    m_pCurrentAsyncAction->execute( _rURL, _rFilter, bReallyAsync ? nMinTimeout : -1, nMaxTimeout, GetBlackList() );
     m_bInExecuteAsync = false;
 }
 
@@ -2356,6 +2356,17 @@ void SvtFileDialog::SetStandardDir( const String& rStdDir )
     _pImp->SetStandardDir( aObj.GetMainURL( INetURLObject::NO_DECODE ) );
 }
 
+void SvtFileDialog::SetBlackList( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList )
+{
+    _pImp->SetBlackList( rBlackList );
+}
+
+//*****************************************************************************
+
+const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SvtFileDialog::GetBlackList() const
+{
+    return _pImp->GetBlackList();
+}
 //*****************************************************************************
 
 const String& SvtFileDialog::GetStandardDir() const
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 197cf77bcc..c680e394d0 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -215,7 +215,9 @@ public:
 
             void				FileSelect();
             void				FilterSelect();
-
+    
+    void						SetBlackList( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList );
+    const ::com::sun::star::uno::Sequence< ::rtl::OUString >& GetBlackList() const;
     void						SetStandardDir( const String& rStdDir );
     const String&				GetStandardDir() const;
     SvStringsDtor*				GetPathList() const;		// bei MultiSelektion
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 0479e5df6d..d28cb57154 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -199,6 +199,8 @@ private:
 
     const SvtFileDialogFilter_Impl*	_pCurFilter;
     String							m_sCurrentFilterDisplayName;	// may differ from _pCurFilter->GetName in case it is a cached entry
+    
+    ::com::sun::star::uno::Sequence< ::rtl::OUString > _aBlackList;
 
 public:
     SvtFileDialogFilterList_Impl*	_pFilter;
@@ -260,6 +262,9 @@ public:
                             SvtExpFileDlg_Impl( WinBits nBits );
                             ~SvtExpFileDlg_Impl();
 
+
+    inline void			    SetBlackList( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList ) { _aBlackList = rBlackList; }
+    inline const ::com::sun::star::uno::Sequence< ::rtl::OUString >& GetBlackList() const { return _aBlackList; }
     void					SetStandardDir( const String& _rDir );
     inline const String&	GetStandardDir() const			{ return _aStdDir; }
     inline void				DisableFilterBoxAutoWidth() 	{ _pLbFilter->EnableDDAutoWidth( FALSE ); }