CWS svxsplit: merge with m71

2 files changed, 34 insertions, 35 deletions

diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 80492708d652..bb7d15d0b5b2 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -69,7 +69,6 @@
 #include <com/sun/star/ucb/TransferInfo.hpp>
 #include <com/sun/star/ucb/XCommandProcessor.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
-#include <com/sun/star/ucb/XContentCreator.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/ucb/XAnyCompare.hpp>
@@ -794,12 +793,12 @@ String SfxDocumentTemplates::GetDefaultTemplatePath
     INetURLObject aTemplateObj( pImp->GetRootURL() );
 
     aTemplateObj.insertName( aGroupName, false,
-                         INetURLObject::LAST_SEGMENT, true,
-                         INetURLObject::ENCODE_ALL );
+                        INetURLObject::LAST_SEGMENT, true,
+                        INetURLObject::ENCODE_ALL );
 
     aTemplateObj.insertName( aTitle, false,
-                         INetURLObject::LAST_SEGMENT, true,
-                         INetURLObject::ENCODE_ALL );
+                        INetURLObject::LAST_SEGMENT, true,
+                        INetURLObject::ENCODE_ALL );
 
 
     ::rtl::OUString aResult;
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index ead9a7c9fd9a..630624e857fb 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -869,7 +869,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
 
                         ::rtl::Reference< ::comphelper::OInteractionRequest > pRequest = new ::comphelper::OInteractionRequest( makeAny( aUpdateRequest ) );
                         pRequest->addContinuation( new ::comphelper::OInteractionApprove );
-                        pRequest->addContinuation( new ::comphelper::OInteractionDisapprove );
+                        pRequest->addContinuation( new ::comphelper::OInteractionAbort );
 
                         typedef ::comphelper::OInteraction< XInteractionAskLater > OInteractionAskLater;
                         OInteractionAskLater* pLater = new OInteractionAskLater;
@@ -952,27 +952,27 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo
 
                                     if ( !pFORequest->isAbort() )
                                     {
-                                           SfxAllItemSet aNewParams( pDoc->GetPool() );
-                                           TransformParameters( SID_OPENDOC,
-                                                             pFORequest->getFilterOptions(),
-                                                             aNewParams,
-                                                             NULL );
-
-                                           SFX_ITEMSET_ARG( &aNewParams,
-                                                         pFilterOptions,
-                                                         SfxStringItem,
-                                                         SID_FILE_FILTEROPTIONS,
-                                                         sal_False );
-                                           if ( pFilterOptions )
-                                               pSet->Put( *pFilterOptions );
-
-                                           SFX_ITEMSET_ARG( &aNewParams,
-                                                         pFilterData,
-                                                         SfxUnoAnyItem,
-                                                         SID_FILTER_DATA,
-                                                         sal_False );
-                                           if ( pFilterData )
-                                               pSet->Put( *pFilterData );
+                                            SfxAllItemSet aNewParams( pDoc->GetPool() );
+                                            TransformParameters( SID_OPENDOC,
+                                                            pFORequest->getFilterOptions(),
+                                                            aNewParams,
+                                                            NULL );
+
+                                            SFX_ITEMSET_ARG( &aNewParams,
+                                                        pFilterOptions,
+                                                        SfxStringItem,
+                                                        SID_FILE_FILTEROPTIONS,
+                                                        sal_False );
+                                            if ( pFilterOptions )
+                                                pSet->Put( *pFilterOptions );
+
+                                            SFX_ITEMSET_ARG( &aNewParams,
+                                                        pFilterData,
+                                                        SfxUnoAnyItem,
+                                                        SID_FILTER_DATA,
+                                                        sal_False );
+                                            if ( pFilterData )
+                                                pSet->Put( *pFilterData );
                                     }
                                     else
                                         bAbort = TRUE;
@@ -1796,14 +1796,14 @@ sal_Bool SfxObjectShell::SaveTo_Impl
 #define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING, RTL_TEXTENCODING_UTF8).pData->buffer
             // Header for a single-valued ASCII EA data item
             typedef struct _EA_ASCII_header {
-            USHORT  usAttr;                 /* value: EAT_ASCII                        */
-            USHORT  usLen;                  /* length of data                          */
-            CHAR    szType[_MAX_PATH];  /* ASCII data fits in here ...             */
+            USHORT      usAttr;                 /* value: EAT_ASCII                        */
+            USHORT      usLen;                  /* length of data                          */
+            CHAR        szType[_MAX_PATH];      /* ASCII data fits in here ...             */
             } EA_ASCII_HEADER;
-            char    filePath[_MAX_PATH];
-            char    fileExt[_MAX_PATH];
-            char    docType[_MAX_PATH];
-            int rc;
+            char   filePath[_MAX_PATH];
+            char   fileExt[_MAX_PATH];
+            char   docType[_MAX_PATH];
+            int    rc;
             oslFileError eRet;
             ::rtl::OUString aSystemFileURL;
             const ::rtl::OUString aFileURL = rMedium.GetName();
@@ -3435,7 +3435,7 @@ sal_Bool SfxObjectShell::SaveCompleted( const uno::Reference< embed::XStorage >&
 
 
 sal_Bool StoragesOfUnknownMediaTypeAreCopied_Impl( const uno::Reference< embed::XStorage >& xSource,
-                                                    const uno::Reference< embed::XStorage >& xTarget )
+                                                   const uno::Reference< embed::XStorage >& xTarget )
 {
     OSL_ENSURE( xSource.is() && xTarget.is(), "Source and/or target storages are not available!\n" );
     if ( !xSource.is() || !xTarget.is() || xSource == xTarget )