You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2012/02/27 11:02:54 UTC
svn commit: r1294086 - /incubator/ooo/trunk/main/ucb/source/ucp/webdav/
Author: orw
Date: Mon Feb 27 10:02:54 2012
New Revision: 1294086
URL: http://svn.apache.org/viewvc?rev=1294086&view=rev
Log:
warning-free ucb/source/ucp/webdav - author: Pavel@Janik.cz
added some line end clean-ups
Modified:
incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx
incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
incubator/ooo/trunk/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx?rev=1294086&r1=1294085&r2=1294086&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx Mon Feb 27 10:02:54 2012
@@ -44,8 +44,6 @@ SerfCopyReqProcImpl::~SerfCopyReqProcImp
serf_bucket_t * SerfCopyReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest )
{
- serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest );
-
// create serf request
serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest,
"COPY",
Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx?rev=1294086&r1=1294085&r2=1294086&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx Mon Feb 27 10:02:54 2012
@@ -40,8 +40,6 @@ SerfDeleteReqProcImpl::~SerfDeleteReqPro
serf_bucket_t * SerfDeleteReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest )
{
- serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest );
-
// create serf request
serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest,
"DELETE",
Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx?rev=1294086&r1=1294085&r2=1294086&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx Mon Feb 27 10:02:54 2012
@@ -79,8 +79,6 @@ SerfGetReqProcImpl::~SerfGetReqProcImpl(
serf_bucket_t * SerfGetReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest )
{
- serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest );
-
// create serf request
serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest,
"GET",
Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx?rev=1294086&r1=1294085&r2=1294086&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx Mon Feb 27 10:02:54 2012
@@ -44,8 +44,6 @@ SerfHeadReqProcImpl::~SerfHeadReqProcImp
serf_bucket_t * SerfHeadReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest )
{
- serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest );
-
// create serf request
serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest,
"HEAD",
Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx?rev=1294086&r1=1294085&r2=1294086&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx Mon Feb 27 10:02:54 2012
@@ -40,8 +40,6 @@ SerfMkColReqProcImpl::~SerfMkColReqProcI
serf_bucket_t * SerfMkColReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest )
{
- serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest );
-
// create serf request
serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest,
"MKCOL",
Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx?rev=1294086&r1=1294085&r2=1294086&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx Mon Feb 27 10:02:54 2012
@@ -44,8 +44,6 @@ SerfMoveReqProcImpl::~SerfMoveReqProcImp
serf_bucket_t * SerfMoveReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest )
{
- serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest );
-
// create serf request
serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest,
"MOVE",
Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx?rev=1294086&r1=1294085&r2=1294086&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx Mon Feb 27 10:02:54 2012
@@ -83,15 +83,15 @@ SerfPropFindReqProcImpl::~SerfPropFindRe
{
}
-#define PROPFIND_HEADER "<?xml version=\"1.0\" encoding=\"utf-8\"?><propfind xmlns=\"DAV:\">"
-#define PROPFIND_TRAILER "</propfind>"
+#define PROPFIND_HEADER "<?xml version=\"1.0\" encoding=\"utf-8\"?><propfind xmlns=\"DAV:\">"
+#define PROPFIND_TRAILER "</propfind>"
serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest )
{
serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest );
// body bucket - certain properties OR all properties OR only property names
- serf_bucket_t* body_bkt = 0;
+ serf_bucket_t* body_bkt = 0;
rtl::OUString aBodyText;
{
// create and fill body bucket with requested properties
@@ -107,43 +107,43 @@ serf_bucket_t * SerfPropFindReqProcImpl:
DAVProperties::createSerfPropName( (*mpPropNames)[ theIndex ],
thePropName );
- /* <*propname* xmlns="*propns*" /> */
- aBodyText += rtl::OUString::createFromAscii( "<" );
- aBodyText += rtl::OUString::createFromAscii( thePropName.name );
- aBodyText += rtl::OUString::createFromAscii( " xmlnx=\"" );
- aBodyText += rtl::OUString::createFromAscii( thePropName.nspace );
- aBodyText += rtl::OUString::createFromAscii( "\"/>" );
+ /* <*propname* xmlns="*propns*" /> */
+ aBodyText += rtl::OUString::createFromAscii( "<" );
+ aBodyText += rtl::OUString::createFromAscii( thePropName.name );
+ aBodyText += rtl::OUString::createFromAscii( " xmlnx=\"" );
+ aBodyText += rtl::OUString::createFromAscii( thePropName.nspace );
+ aBodyText += rtl::OUString::createFromAscii( "\"/>" );
}
-
- aBodyText = rtl::OUString::createFromAscii( "<prop>" ) +
- aBodyText +
- rtl::OUString::createFromAscii( "</prop>" );
+
+ aBodyText = rtl::OUString::createFromAscii( "<prop>" ) +
+ aBodyText +
+ rtl::OUString::createFromAscii( "</prop>" );
}
else
{
if ( mbOnlyPropertyNames )
{
- aBodyText = rtl::OUString::createFromAscii( "<propname/>" );
- }
- else
+ aBodyText = rtl::OUString::createFromAscii( "<propname/>" );
+ }
+ else
{
- aBodyText = rtl::OUString::createFromAscii( "<allprop/>" );
- }
+ aBodyText = rtl::OUString::createFromAscii( "<allprop/>" );
+ }
}
-
- aBodyText = rtl::OUString::createFromAscii( PROPFIND_HEADER ) +
- aBodyText +
- rtl::OUString::createFromAscii( PROPFIND_TRAILER );
- body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ),
- pSerfBucketAlloc );
- }
+
+ aBodyText = rtl::OUString::createFromAscii( PROPFIND_HEADER ) +
+ aBodyText +
+ rtl::OUString::createFromAscii( PROPFIND_TRAILER );
+ body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ),
+ pSerfBucketAlloc );
+ }
// create serf request
serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest,
"PROPFIND",
getPathStr(),
body_bkt,
- serf_request_get_alloc( inSerfRequest ) );
+ pSerfBucketAlloc );
// TODO - correct header data
// set request header fields
@@ -213,5 +213,5 @@ bool SerfPropFindReqProcImpl::processSer
/* NOTREACHED */
return true;
}
-
+
} // namespace http_dav_ucp
Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx?rev=1294086&r1=1294085&r2=1294086&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx Mon Feb 27 10:02:54 2012
@@ -43,15 +43,15 @@ SerfPropPatchReqProcImpl::~SerfPropPatch
{
}
-#define PROPPATCH_HEADER "<?xml version=\"1.0\" encoding=\"utf-8\"?><propertyupdate xmlns=\"DAV:\">"
-#define PROPPATCH_TRAILER "</propertyupdate>"
+#define PROPPATCH_HEADER "<?xml version=\"1.0\" encoding=\"utf-8\"?><propertyupdate xmlns=\"DAV:\">"
+#define PROPPATCH_TRAILER "</propertyupdate>"
serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_t * inSerfRequest )
{
serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest );
// body bucket
- serf_bucket_t* body_bkt = 0;
+ serf_bucket_t* body_bkt = 0;
rtl::OUString aBodyText;
{
// create and fill body bucket with properties to be set or removed
@@ -63,9 +63,9 @@ serf_bucket_t * SerfPropPatchReqProcImpl
{
// <*operation code*><prop>
ProppatchOperation lastOp = (*mpProperties)[ 0 ].operation;
- aBodyText += rtl::OUString::createFromAscii( "<" );
- aBodyText += rtl::OUString::createFromAscii( OpCodes[lastOp] );
- aBodyText += rtl::OUString::createFromAscii( "><prop>" );
+ aBodyText += rtl::OUString::createFromAscii( "<" );
+ aBodyText += rtl::OUString::createFromAscii( OpCodes[lastOp] );
+ aBodyText += rtl::OUString::createFromAscii( "><prop>" );
SerfPropName thePropName;
for ( int n = 0; n < nPropCount; ++n )
@@ -75,28 +75,28 @@ serf_bucket_t * SerfPropPatchReqProcImpl
DAVProperties::createSerfPropName( rProperty.name,
thePropName );
- if ( rProperty.operation != lastOp )
- {
- // </prop></*last operation code*><*operation code><prop>
- aBodyText += rtl::OUString::createFromAscii( "</prop></" );
- aBodyText += rtl::OUString::createFromAscii( OpCodes[lastOp] );
- aBodyText += rtl::OUString::createFromAscii( "><" );
- aBodyText += rtl::OUString::createFromAscii( OpCodes[rProperty.operation] );
- aBodyText += rtl::OUString::createFromAscii( "><prop>" );
- }
-
- // <*propname* xmlns="*propns*"
- aBodyText += rtl::OUString::createFromAscii( "<" );
- aBodyText += rtl::OUString::createFromAscii( thePropName.name );
- aBodyText += rtl::OUString::createFromAscii( " xmlns=\"" );
- aBodyText += rtl::OUString::createFromAscii( thePropName.nspace );
- aBodyText += rtl::OUString::createFromAscii( "\"" );
-
- if ( rProperty.operation == PROPSET )
- {
- // >*property value*</*propname*>
- aBodyText += rtl::OUString::createFromAscii( ">" );
-
+ if ( rProperty.operation != lastOp )
+ {
+ // </prop></*last operation code*><*operation code><prop>
+ aBodyText += rtl::OUString::createFromAscii( "</prop></"
+ aBodyText += rtl::OUString::createFromAscii( OpCodes[lastOp] );
+ aBodyText += rtl::OUString::createFromAscii( "><" );
+ aBodyText += rtl::OUString::createFromAscii( OpCodes[rProperty.operation] );
+ aBodyText += rtl::OUString::createFromAscii( "><prop>" );
+ }
+
+ // <*propname* xmlns="*propns*"
+ aBodyText += rtl::OUString::createFromAscii( "<" );
+ aBodyText += rtl::OUString::createFromAscii( thePropName.name );
+ aBodyText += rtl::OUString::createFromAscii( " xmlns=\"" );
+ aBodyText += rtl::OUString::createFromAscii( thePropName.nspace );
+ aBodyText += rtl::OUString::createFromAscii( "\"" );
+
+ if ( rProperty.operation == PROPSET )
+ {
+ // >*property value*</*propname*>
+ aBodyText += rtl::OUString::createFromAscii( ">" );
+
rtl::OUString aStringValue;
if ( DAVProperties::isUCBDeadProperty( thePropName ) )
{
@@ -107,42 +107,42 @@ serf_bucket_t * SerfPropPatchReqProcImpl
{
rProperty.value >>= aStringValue;
}
- aBodyText += aStringValue;
- aBodyText += rtl::OUString::createFromAscii( "</" );
- aBodyText += rtl::OUString::createFromAscii( thePropName.name );
- aBodyText += rtl::OUString::createFromAscii( ">" );
- }
- else
- {
- // />
- aBodyText += rtl::OUString::createFromAscii( "/>" );
- }
-
- lastOp = rProperty.operation;
+ aBodyText += aStringValue;
+ aBodyText += rtl::OUString::createFromAscii( "</" );
+ aBodyText += rtl::OUString::createFromAscii( thePropName.name );
+ aBodyText += rtl::OUString::createFromAscii( ">" );
+ }
+ else
+ {
+ // />
+ aBodyText += rtl::OUString::createFromAscii( "/>" );
+ }
+
+ lastOp = rProperty.operation;
}
- // </prop></*last operation code*>
- aBodyText += rtl::OUString::createFromAscii( "</prop></" );
- aBodyText += rtl::OUString::createFromAscii( OpCodes[lastOp] );
- aBodyText += rtl::OUString::createFromAscii( ">" );
+ // </prop></*last operation code*>
+ aBodyText += rtl::OUString::createFromAscii( "</prop></" );
+ aBodyText += rtl::OUString::createFromAscii( OpCodes[lastOp] );
+ aBodyText += rtl::OUString::createFromAscii( ">" );
// add PropPatch xml header in front
- aBodyText = rtl::OUString::createFromAscii( PROPPATCH_HEADER ) + aBodyText;
-
- // add PropPatch xml trailer at end
- aBodyText += rtl::OUString::createFromAscii( PROPPATCH_TRAILER );
+ aBodyText = rtl::OUString::createFromAscii( PROPPATCH_HEADER ) + aBodyText;
+
+ // add PropPatch xml trailer at end
+ aBodyText += rtl::OUString::createFromAscii( PROPPATCH_TRAILER );
- body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ),
- pSerfBucketAlloc );
+ body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ),
+ pSerfBucketAlloc );
}
- }
+ }
// create serf request
serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest,
"PROPPATCH",
getPathStr(),
body_bkt,
- serf_request_get_alloc( inSerfRequest ) );
+ pSerfBucketAlloc ) ;
// TODO - correct header data
// set request header fields
@@ -194,5 +194,5 @@ bool SerfPropPatchReqProcImpl::processSe
/* NOTREACHED */
return true;
}
-
+
} // namespace http_dav_ucp
Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx?rev=1294086&r1=1294085&r2=1294086&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx Mon Feb 27 10:02:54 2012
@@ -327,11 +327,6 @@ void SerfRequestProcessor::postprocessPr
return;
}
- // DEBUG INFO
- const char* SerfErrorStr = serf_error_string( inStatus );
- char AprErrorStr[256];
- apr_strerror( inStatus, AprErrorStr, sizeof( AprErrorStr ) );
-
switch ( inStatus )
{
case APR_EGENERAL:
Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx?rev=1294086&r1=1294085&r2=1294086&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx Mon Feb 27 10:02:54 2012
@@ -205,6 +205,7 @@ static rtl::OUString encodeValue( const
return rtl::OUString( aResult );
}
+/*
//////////////////////////////////////////////////////////////////////////
static rtl::OUString decodeValue( const rtl::OUString & rValue )
{
@@ -323,6 +324,7 @@ static rtl::OUString decodeValue( const
return rtl::OUString( aResult );
}
+*/
//////////////////////////////////////////////////////////////////////////
// static