mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS-TOOLING: integrate CWS tkr20

Browse Source 
2009-05-08 08:31:10 +0200 tkr  r271700 : ##i97329# fixed merge conflict during rebase
2009-05-07 08:30:15 +0200 tkr  r271622 : CWS-TOOLING: rebase CWS tkr20 to trunk@271427 (milestone: DEV300:m47)
2009-04-17 14:36:42 +0200 tkr  r270947 : #i73893# implemented the XCommandProcessor:Abort method
2009-03-20 14:08:15 +0100 tkr  r269806 : #i96392# use $(CPU) variable to determine if openssl should build with 64 bit
2009-03-19 16:15:26 +0100 tkr  r269754 : #i96392# use $(CPU) variable to determine if openssl should build with 64 bit
2009-03-19 16:09:04 +0100 tkr  r269753 : #i96392# use $(CPU) variable to determine if openssl should build with 64 bit
2009-03-19 15:57:05 +0100 tkr  r269752 : #i97003# Ask password container if persistent storage should be used
2009-03-19 15:53:18 +0100 tkr  r269751 : #i97003# ask if password container should use the persistent storage
2009-03-19 09:08:18 +0100 tkr  r269726 : #i99774# ucb: patch to silence warnings in gcc 4.4
2009-03-19 09:05:38 +0100 tkr  r269725 : #i99046# remove mime-type
2009-03-19 09:04:56 +0100 tkr  r269724 : #i97329# fixed truncated text on buttons
2009-03-19 09:03:50 +0100 tkr  r269723 : #i97542# Warning errors in uui / empty bodys in for loops
This commit is contained in:
Kurt Zenker
2009-06-03 16:42:24 +00:00
parent a6aafcb54e
commit d0d8f99a31
14 changed files with 70 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ucb/source/ucp/file/filrec.cxx
View File

@@ -64,7 +64,7 @@ sal_Bool ReconnectingFile::reconnect()
if ( nResult == ::osl::FileBase::E_None )
{
if ( uFlags & OpenFlag_Create )
m_nFlags = uFlags & ( ~OpenFlag_Create ) | OpenFlag_Write;
m_nFlags = (uFlags & ( ~OpenFlag_Create )) | OpenFlag_Write;
else
m_nFlags = uFlags;

3
ucb/source/ucp/webdav/DAVAuthListener.hxx
View File

@@ -48,7 +48,8 @@ class DAVAuthListener : public salhelper::SimpleReferenceObject
const ::rtl::OUString & inRealm,
const ::rtl::OUString & inHostName,
::rtl::OUString & inoutUserName,
::rtl::OUString & outPassWord ) = 0;
::rtl::OUString & outPassWord,
const sal_Bool & bAllowPersistentStoring) = 0;
};
} // namespace webdav_ucp

3
ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
View File

@@ -63,7 +63,8 @@ namespace webdav_ucp
virtual int authenticate( const ::rtl::OUString & inRealm,
const ::rtl::OUString & inHostName,
::rtl::OUString & inoutUserName,
::rtl::OUString & outPassWord );
::rtl::OUString & outPassWord,
const sal_Bool & bAllowPersistentStoring);
private:
com::sun::star::uno::Reference<

14
ucb/source/ucp/webdav/DAVResourceAccess.cxx
View File

@@ -59,7 +59,8 @@ int DAVAuthListener_Impl::authenticate(
const ::rtl::OUString & inRealm,
const ::rtl::OUString & inHostName,
::rtl::OUString & inoutUserName,
::rtl::OUString & outPassWord )
::rtl::OUString & outPassWord,
const sal_Bool & bAllowPersistentStoring)
{
if ( m_xEnv.is() )
{
@@ -79,7 +80,9 @@ int DAVAuthListener_Impl::authenticate(
= new ucbhelper::SimpleAuthenticationRequest( inHostName,
inRealm,
inoutUserName,
outPassWord );
outPassWord,
::rtl::OUString(),
bAllowPersistentStoring);
xIH->handle( xRequest.get() );
rtl::Reference< ucbhelper::InteractionContinuation > xSelection
@@ -530,6 +533,13 @@ void DAVResourceAccess::GET(
while ( bRetry );
}
//=========================================================================
void DAVResourceAccess::ABORT()
throw( DAVException )
{
initialize();
m_xSession->ABORT();
}
//=========================================================================
namespace {

4
ucb/source/ucp/webdav/DAVResourceAccess.hxx
View File

@@ -215,6 +215,10 @@ public:
com::sun::star::ucb::XCommandEnvironment > & xEnv )
throw( DAVException );
void
ABORT()
throw( DAVException );
// helper
static void getUserRequestHeaders(
const com::sun::star::uno::Reference<

3
ucb/source/ucp/webdav/DAVSession.hxx
View File

@@ -134,6 +134,9 @@ public:
const DAVRequestEnvironment & rEnv )
throw( DAVException ) = 0;
virtual void ABORT()
throw( DAVException ) = 0;
virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
POST( const rtl::OUString & inPath,
const rtl::OUString & rContentType,

21
ucb/source/ucp/webdav/NeonSession.cxx
View File

@@ -60,6 +60,7 @@
#include <com/sun/star/security/CertificateContainerStatus.hpp>
#include <com/sun/star/security/CertificateContainer.hpp>
#include <com/sun/star/security/XCertificateContainer.hpp>
#include <com/sun/star/task/XMasterPasswordHandling.hpp>
#ifndef _SIMPLECERTIFICATIONVALIDATIONREQUEST_HXX_
@@ -329,11 +330,19 @@ extern "C" int NeonSession_NeonAuth( void * inUserData,
//thePassWord = rtl::OUString::createFromAscii( inoutPassWord );
}
//i97003 (tkr): Ask XMasterPasswordHandling if we should store the credentials persistently and give this information to the SimpleAuthenticationRequest
uno::Reference< ::com::sun::star::task::XMasterPasswordHandling > xMasterPasswordHandling =
uno::Reference< ::com::sun::star::task::XMasterPasswordHandling >(
theSession->getMSF().get()->createInstance( rtl::OUString::createFromAscii( "com.sun.star.task.PasswordContainer" )), uno::UNO_QUERY );
// -
int theRetVal = pListener->authenticate(
rtl::OUString::createFromAscii( inRealm ),
theSession->getHostName(),
theUserName,
thePassWord );
thePassWord,
xMasterPasswordHandling.is() ? xMasterPasswordHandling->isPersistentStoringAllowed() : sal_False);
rtl::OString aUser(
rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) );
if ( aUser.getLength() > ( NE_ABUFSIZ - 1 ) )
@@ -1249,6 +1258,16 @@ void NeonSession::POST( const rtl::OUString & inPath,
HandleError( theRetVal );
}
// -------------------------------------------------------------------
// ABORT
// -------------------------------------------------------------------
void NeonSession::ABORT()
throw ( DAVException )
{
if (NULL !=m_pHttpSession)
ne_close_connection(m_pHttpSession);
}
// -------------------------------------------------------------------
// MKCOL
// -------------------------------------------------------------------

3
ucb/source/ucp/webdav/NeonSession.hxx
View File

@@ -209,6 +209,9 @@ class NeonSession : public DAVSession
const DAVRequestEnvironment & rEnv )
throw ( DAVException );
virtual void ABORT()
throw ( DAVException );
// Note: Uncomment the following if locking support is required
/*
virtual void LOCK (const Lock & inLock,

16
ucb/source/ucp/webdav/webdavcontent.cxx
View File

@@ -862,8 +862,20 @@ uno::Any SAL_CALL Content::execute(
void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
throw( uno::RuntimeException )
{
// @@@ Implement logic to abort running commands, if this makes
// sense for your conten.t
try
{
std::auto_ptr< DAVResourceAccess > xResAccess;
{
osl::MutexGuard aGuard( m_aMutex );
xResAccess.reset(
new DAVResourceAccess( *m_xResAccess.get() ) );
}
xResAccess->ABORT();
}
catch ( DAVException const & /*e*/ )
{
// ABORT command failed!
}
}
//=========================================================================

2
uui/source/masterpasscrtdlg.cxx
View File

@@ -119,7 +119,7 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog
{
for( nNewLabelHeight = ( nTextWidth / nLableWidth + 1 ) * nTextHeight;
nNewLabelHeight < aRect.GetHeight();
nNewLabelHeight += nTextHeight ) {}
nNewLabelHeight += nTextHeight ) {};
}
long nDelta = nNewLabelHeight - nLabelHeight;

2
uui/source/passcrtdlg.cxx
View File

@@ -101,7 +101,7 @@ PasswordCreateDialog::PasswordCreateDialog( Window* _pParent, ResMgr * pResMgr )
long nNewLabelHeight = 0;
for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight;
nNewLabelHeight < aRect.GetHeight();
nNewLabelHeight += nTextHeight ) ;
nNewLabelHeight += nTextHeight ) {} ;
long nDelta = nNewLabelHeight - nLabelHeight;

2
uui/source/passworddlg.cxx
View File

@@ -92,7 +92,7 @@ PasswordDialog::PasswordDialog
long nNewLabelHeight = 0;
for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight;
nNewLabelHeight < aRect.GetHeight();
nNewLabelHeight += nTextHeight ) ;
nNewLabelHeight += nTextHeight ) {} ;
long nDelta = nNewLabelHeight - nLabelHeight;

7
uui/source/sslwarndlg.hrc
View File

@@ -43,7 +43,7 @@
// Dims
#define DLG_WIDTH 210
#define DLG_WIDTH 240
#define DLG_HEIGHT 125
#define DLG_WARMIMG_HEIGHT 20
@@ -55,8 +55,9 @@
#define DLG_CTLBTN_START_Y DLG_HEIGHT - RSC_SP_CTRL_X - RSC_CD_PUSHBUTTON_HEIGHT
#define DLG_CTLBTN_CANCEL_PUSHBUTTON_WIDTH RSC_CD_PUSHBUTTON_WIDTH + 5
#define DLG_CTLBTN_CANCEL_START_X DLG_WIDTH - 15 - DLG_CTLBTN_CANCEL_PUSHBUTTON_WIDTH
#define DLG_CTLBTN_CANCEL_PUSHBUTTON_WIDTH RSC_CD_PUSHBUTTON_WIDTH + 20
#define DLG_CTLBTN_CANCEL_START_X DLG_WIDTH - 45 - DLG_CTLBTN_CANCEL_PUSHBUTTON_WIDTH
#define DLG_CTLBTN_OK_START_X DLG_CTLBTN_CANCEL_START_X - RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_GROUP_X
#define DLG_CTLBTN_CERT_PUSHBUTTON_WIDTH RSC_CD_PUSHBUTTON_WIDTH + 25
#define DLG_CTLBTN_CERT_START_X DLG_TEXT_START_X
#endif //UUI_SSLWARN_HRC

4
uui/source/sslwarndlg.src
View File

@@ -52,7 +52,7 @@ ModalDialog DLG_UUI_SSLWARN
FixedText FT_LABEL_1
{
Pos = MAP_APPFONT( DLG_TEXT_START_X, RSC_SP_DLG_INNERBORDER_TOP );
Size = MAP_APPFONT( 165, DLG_TEXT_1_HEIGHT );
Size = MAP_APPFONT( 195, DLG_TEXT_1_HEIGHT );
Text [ en-US ] = "No Text";
@@ -63,7 +63,7 @@ ModalDialog DLG_UUI_SSLWARN
PushButton PB_VIEW__CERTIFICATE
{
Pos = MAP_APPFONT( DLG_CTLBTN_CERT_START_X, DLG_CTLBTN_START_Y );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Size = MAP_APPFONT( DLG_CTLBTN_CERT_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "View Certificate";