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

1 files changed, 29 insertions, 1 deletions

diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 23fc4b84b6..1351b21dc2 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -53,8 +53,11 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/uno/Sequence.h>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase1.hxx>
+#include <rtl/ustring.hxx>
+
 
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/synchronousdispatch.hxx>
@@ -93,6 +96,7 @@
 #include <sfx2/new.hxx>
 #include <sfx2/objitem.hxx>
 #include <sfx2/objsh.hxx>
+#include <svtools/slstitm.hxx>
 #include "objshimp.hxx"
 #include "openflag.hxx"
 #include <sfx2/passwd.hxx>
@@ -535,6 +539,13 @@ SfxObjectShellLock SfxApplication::NewDoc_Impl( const String& rFact, const SfxIt
     {
         if ( pSet )
         {
+            // TODO/LATER: Should the other arguments be transfered as well?
+            SFX_ITEMSET_ARG( pSet, pDefaultPathItem, SfxStringItem, SID_DEFAULTFILEPATH, FALSE);
+            if ( pDefaultPathItem )
+                xDoc->GetMedium()->GetItemSet()->Put( *pDefaultPathItem );
+            SFX_ITEMSET_ARG( pSet, pDefaultNameItem, SfxStringItem, SID_DEFAULTFILENAME, FALSE);
+            if ( pDefaultNameItem )
+                xDoc->GetMedium()->GetItemSet()->Put( *pDefaultNameItem );
             SFX_ITEMSET_ARG( pSet, pTitleItem, SfxStringItem, SID_DOCINFO_TITLE, FALSE );
             if ( pTitleItem )
                 xDoc->GetMedium()->GetItemSet()->Put( *pTitleItem );
@@ -573,12 +584,22 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq )
    else
         aFactName = SvtModuleOptions().GetDefaultModuleName();
 
+
     SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, GetPool() );
     String aFact = String::CreateFromAscii("private:factory/");
     aFact += aFactName;
     aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aFact ) );
     aReq.AppendItem( SfxFrameItem( SID_DOCFRAME, GetFrame() ) );
     aReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii( "_default" ) ) );
+
+    // TODO/LATER: Should the other arguments be transfered as well?
+    SFX_REQUEST_ARG( rReq, pDefaultPathItem, SfxStringItem, SID_DEFAULTFILEPATH, FALSE);
+    if ( pDefaultPathItem )
+        aReq.AppendItem( *pDefaultPathItem );
+    SFX_REQUEST_ARG( rReq, pDefaultNameItem, SfxStringItem, SID_DEFAULTFILENAME, FALSE);
+    if ( pDefaultNameItem )
+        aReq.AppendItem( *pDefaultNameItem );
+
     SFX_APP()->ExecuteSlot( aReq );
     const SfxViewFrameItem* pItem = PTR_CAST( SfxViewFrameItem, aReq.GetReturnValue() );
     if ( pItem )
@@ -877,8 +898,15 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         if ( pStandardDirItem )
             sStandardDir = pStandardDirItem->GetValue();
 
+        ::com::sun::star::uno::Sequence< ::rtl::OUString >	aBlackList;
+
+        SFX_REQUEST_ARG( rReq, pBlackListItem, SfxStringListItem, SID_BLACK_LIST, FALSE );
+        if ( pBlackListItem )
+            pBlackListItem->GetStringList( aBlackList );
+
+
         ULONG nErr = sfx2::FileOpenDialog_Impl(
-                WB_OPEN | SFXWB_MULTISELECTION | SFXWB_SHOWVERSIONS, String(), pURLList, aFilter, pSet, &aPath, nDialog, sStandardDir );
+                WB_OPEN | SFXWB_MULTISELECTION | SFXWB_SHOWVERSIONS, String(), pURLList, aFilter, pSet, &aPath, nDialog, sStandardDir, aBlackList );
 
         if ( nErr == ERRCODE_ABORT )
         {