CWS-TOOLING: integrate CWS dr72

2009-08-26 10:24:00 +0200 dr  r275402 : #i92645# CODEPAGE is encrypted...
2009-08-24 14:37:36 +0200 dr  r275316 : #i10000# enable exceptions for xlroot.cxx
2009-08-24 14:33:15 +0200 dr  r275313 : #i10000# link openssl under solaris correctly
2009-08-21 17:41:16 +0200 dr  r275267 : #i10000# unxlngi6 warning
2009-08-21 15:35:56 +0200 dr  r275265 : #i10000# remove files again, already deleted in previous milestone...
2009-08-21 11:24:57 +0200 dr  r275227 : #160401# port to DEV300
2009-08-21 09:53:45 +0200 dr  r275221 : #i92645# full support for encrypted Word2007 files
2009-08-21 09:50:52 +0200 dr  r275219 : #i92645# final changes for decryption
2009-08-20 19:48:40 +0200 dr  r275195 : #i104370# missing parentheses, patch from cmc
2009-08-20 18:28:22 +0200 dr  r275193 : #i92645# rework package decryption to repair 'Reload Document' functionality
2009-08-20 13:55:14 +0200 dr  r275179 : #i92645# add new property names
2009-08-19 19:24:21 +0200 dr  r275159 : #160401# open writeprotected files read-only, merged to DEV300
2009-08-18 14:41:47 +0200 dr  r275109 : #i92645# add 'Aborted' property
2009-08-18 11:20:34 +0200 dr  r275084 : #i92645# write back password to medium
2009-08-17 17:52:51 +0200 dr  r275066 : #i92645# detect Word2007 docs with oox detection impl, this adds support of encryped Word2007; correct detection of templates and macro-enabled docs
2009-08-17 17:51:31 +0200 dr  r275065 : #i92645# detect Word2007 docs with oox detection impl, this adds support of encryped Word2007; correct detection of templates and macro-enabled docs
2009-08-17 11:06:39 +0200 dr  r275035 : #i92645# more password handling
2009-08-17 11:05:21 +0200 dr  r275034 : #i92645# use new password input mechanism for BIFF filter and dumper in oox
2009-08-14 16:33:53 +0200 nn  r274996 : #i104228# DelBroadcastAreasInRange: remove area from hash_set before deleting
2009-08-14 16:27:12 +0200 nn  r274995 : #i104059# restore a change lost in the integration of fhawfixes1
2009-08-14 16:24:00 +0200 dr  r274994 : #i92645# adapt BIFF import to latest changes
2009-08-14 16:21:30 +0200 dr  r274993 : #i92645# adapt BIFF import to latest changes
2009-08-14 16:20:43 +0200 dr  r274992 : #i92645# do not add default passwords to media descriptor
2009-08-13 19:20:45 +0200 dr  r274965 : #i92645# add a helper to request a document password
2009-08-13 19:09:35 +0200 dr  r274964 : #i92645# add a helper to request a document password
2009-08-13 19:09:03 +0200 dr  r274963 : #i92645# add a helper to request a document password
2009-08-13 14:35:01 +0200 dr  r274946 : #i92645# comment typo
2009-08-13 14:33:47 +0200 dr  r274945 : #i92645# add a helper to request a document password
2009-08-13 14:04:47 +0200 dr  r274941 : #i92645# add a helper to request a document password
2009-08-13 14:04:22 +0200 dr  r274940 : #i92645# add a helper to request a document password
2009-08-13 11:16:27 +0200 dr  r274927 : #i42303# show quick help if field name too long for button
2009-08-13 10:55:48 +0200 dr  r274925 : #i31600# cut field name and add ellipsis, if too long for button
2009-08-12 18:47:26 +0200 dr  r274914 : #i92645# ask user for a password
2009-08-12 18:02:39 +0200 dr  r274909 : #i104183# move svtools/DocPasswordRequest to comphelper to be able to use it in oox
2009-08-12 16:59:11 +0200 dr  r274906 : #i104183# move svtools/DocPasswordRequest to comphelper to be able to use it in oox
2009-08-12 16:41:18 +0200 dr  r274905 : #i104183# move svtools/DocPasswordRequest to comphelper to be able to use it in oox
2009-08-12 16:40:33 +0200 dr  r274904 : #i104183# move svtools/DocPasswordRequest to comphelper to be able to use it in oox
2009-08-12 16:40:08 +0200 dr  r274903 : #i104183# move svtools/DocPasswordRequest to comphelper to be able to use it in oox
2009-08-12 16:39:30 +0200 dr  r274902 : #i104183# move svtools/DocPasswordRequest to comphelper to be able to use it in oox
2009-08-12 16:15:28 +0200 dr  r274899 : #i104183# move svtools/DocPasswordRequest to comphelper to be able to use it in oox
2009-08-11 19:51:12 +0200 dr  r274877 : #i92645# open encrypted MSOOXML package protected with standard XL password 'VelvetSweatshop'

1 files changed, 7 insertions, 7 deletions

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 9d6f6fd34f..f406be65a5 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -46,7 +46,7 @@
 #include <unotools/tempfile.hxx>
 #include <svtools/sfxecode.hxx>
 
-#include <svtools/docpasswdrequest.hxx>
+#include <comphelper/docpasswordrequest.hxx>
 #include <hintids.hxx>
 
 #include <svx/tstpitem.hxx>
@@ -579,7 +579,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
             pObj->SetMergedItemSet(aSet);
             pObj->SetModel(pSdrModel);
 
-            if (bVerticalText && dynamic_cast< SdrTextObj* >( pObj ) )				
+            if (bVerticalText && dynamic_cast< SdrTextObj* >( pObj ) )
                 dynamic_cast< SdrTextObj* >( pObj )->SetVerticalWriting(sal_True);
 
             if ( bIsSimpleDrawingTextBox )
@@ -2221,7 +2221,7 @@ void SwWW8ImplReader::PostProcessAttrs()
  is only in use for 6/7 and for 8+ if we are in 8bit mode then the encoding
  is always 1252.
 
- So a encoding converter that on an undefined character attempts to 
+ So a encoding converter that on an undefined character attempts to
  convert from 1252 on the undefined character
 */
 sal_Size Custom8BitToUnicode(rtl_TextToUnicodeConverter hConverter,
@@ -2612,7 +2612,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
                     SwPosition aEndPos = *pPaM->GetPoint();
                     SwPaM aFldPam(pFieldCtx->GetPtNode(), pFieldCtx->GetPtCntnt(), aEndPos.nNode, aEndPos.nContent.GetIndex());
                     IDocumentMarkAccess* const pMarkAccess = rDoc.getIDocumentMarkAccess();
-                    ::sw::mark::IFieldmark* pFieldmark = 
+                    ::sw::mark::IFieldmark* pFieldmark =
                         dynamic_cast< ::sw::mark::IFieldmark*>(pMarkAccess->makeMark(
                             aFldPam,
                             pFieldCtx->GetBookmarkName(),
@@ -4171,8 +4171,8 @@ namespace
                 uno::Reference< task::XInteractionHandler > xHandler( rMedium.GetInteractionHandler() );
                 if( xHandler.is() )
                 {
-                    RequestDocumentPassword* pRequest = new RequestDocumentPassword(
-                        task::PasswordRequestMode_PASSWORD_ENTER,
+                    ::comphelper::DocPasswordRequest* pRequest = new ::comphelper::DocPasswordRequest(
+                        ::comphelper::DocPasswordRequestType_MS, task::PasswordRequestMode_PASSWORD_ENTER,
                         INetURLObject( rMedium.GetOrigURL() ).GetName( INetURLObject::DECODE_WITH_CHARSET ) );
                     uno::Reference< task::XInteractionRequest > xRequest( pRequest );
 
@@ -4348,7 +4348,7 @@ ULONG SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGloss)
                         if ( pMedium )
                         {
                             SfxItemSet* pSet = pMedium->GetItemSet();
-                            if ( pSet )								
+                            if ( pSet )
                                 pSet->Put( SfxStringItem(SID_PASSWORD, sUniPassword) );
                         }
                     }