summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ucb/source/cacher/cachedcontentresultset.cxx2
-rw-r--r--ucb/source/cacher/dynamicresultsetwrapper.cxx2
-rw-r--r--ucb/source/core/ucb.cxx2
-rw-r--r--ucb/source/core/ucbcmds.cxx10
-rw-r--r--ucb/source/sorter/sortresult.cxx20
-rw-r--r--ucb/source/ucp/ext/ucpext_content.cxx2
-rw-r--r--ucb/source/ucp/file/filglob.cxx2
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.cxx2
-rw-r--r--ucb/source/ucp/gio/gio_content.cxx38
-rw-r--r--ucb/source/ucp/webdav-neon/ContentProperties.cxx13
-rw-r--r--ucb/source/ucp/webdav-neon/NeonSession.cxx26
-rw-r--r--ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx2
-rw-r--r--ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx2
-rw-r--r--ucbhelper/source/client/content.cxx4
14 files changed, 61 insertions, 66 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 93db8c575688..c9592879397f 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -1492,7 +1492,7 @@ sal_Bool SAL_CALL CachedContentResultSet
return true;
sal_Int32 nNewRow = m_nRow + rows;
- if( nNewRow < 0 )
+ if( nNewRow < 0 )
nNewRow = 0;
if( impl_isKnownValidPosition( nNewRow ) )
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index c7aa27949429..fc6d0dbf90de 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -240,7 +240,7 @@ void DynamicResultSetWrapper::impl_notify( const ListEvent& Changes )
aWelcome.Old = m_xMyResultOne;
aWelcome.New = m_xMyResultTwo;
- rAction.ActionInfo <<= aWelcome;
+ rAction.ActionInfo <<= aWelcome;
}
else
{
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 6b3cf12a8f3b..24687458cf64 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -303,7 +303,7 @@ void SAL_CALL UniversalContentBroker::dispose()
m_pDisposeEventListeners->disposeAndClear( aEvt );
}
- if ( m_xNotifier.is() )
+ if ( m_xNotifier.is() )
m_xNotifier->removeChangesListener( this );
}
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 8df2f9f94b1c..c7c62dfc374c 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -337,12 +337,12 @@ OUString createDesiredName(
}
// query, fragment present?
- sal_Int32 nPos = aName.indexOf( '?' );
- if ( nPos == -1 )
- nPos = aName.indexOf( '#' );
+ sal_Int32 nPos = aName.indexOf( '?' );
+ if ( nPos == -1 )
+ nPos = aName.indexOf( '#' );
- if ( nPos != -1 )
- aName = aName.copy( 0, nPos );
+ if ( nPos != -1 )
+ aName = aName.copy( 0, nPos );
}
return aName;
}
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 147df9c760ee..118524114b82 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -952,8 +952,8 @@ sal_IntPtr SortedResultSet::CompareImpl( const Reference < XResultSet >& xResult
nTmp = static_cast<sal_Int32>(aTwo.Year) - static_cast<sal_Int32>(aOne.Year);
if ( !nTmp ) {
nTmp = static_cast<sal_Int32>(aTwo.Month) - static_cast<sal_Int32>(aOne.Month);
- if ( !nTmp )
- nTmp = static_cast<sal_Int32>(aTwo.Day) - static_cast<sal_Int32>(aOne.Day);
+ if ( !nTmp )
+ nTmp = static_cast<sal_Int32>(aTwo.Day) - static_cast<sal_Int32>(aOne.Day);
}
if ( nTmp < 0 )
@@ -976,14 +976,13 @@ sal_IntPtr SortedResultSet::CompareImpl( const Reference < XResultSet >& xResult
aTwo = xRowTwo->getTime( nColumn );
nTmp = static_cast<sal_Int32>(aTwo.Hours) - static_cast<sal_Int32>(aOne.Hours);
- if ( !nTmp ) {
+ if ( !nTmp )
nTmp = static_cast<sal_Int32>(aTwo.Minutes) - static_cast<sal_Int32>(aOne.Minutes);
- if ( !nTmp ) {
+ if ( !nTmp )
nTmp = static_cast<sal_Int32>(aTwo.Seconds) - static_cast<sal_Int32>(aOne.Seconds);
if ( !nTmp )
nTmp = static_cast<sal_Int32>(aTwo.NanoSeconds)
- static_cast<sal_Int32>(aOne.NanoSeconds);
- }}
if ( nTmp < 0 )
nCompare = -1;
@@ -1005,20 +1004,19 @@ sal_IntPtr SortedResultSet::CompareImpl( const Reference < XResultSet >& xResult
aTwo = xRowTwo->getTimestamp( nColumn );
nTmp = static_cast<sal_Int32>(aTwo.Year) - static_cast<sal_Int32>(aOne.Year);
- if ( !nTmp ) {
+ if ( !nTmp )
nTmp = static_cast<sal_Int32>(aTwo.Month) - static_cast<sal_Int32>(aOne.Month);
- if ( !nTmp ) {
+ if ( !nTmp )
nTmp = static_cast<sal_Int32>(aTwo.Day) - static_cast<sal_Int32>(aOne.Day);
- if ( !nTmp ) {
+ if ( !nTmp )
nTmp = static_cast<sal_Int32>(aTwo.Hours) - static_cast<sal_Int32>(aOne.Hours);
- if ( !nTmp ) {
+ if ( !nTmp )
nTmp = static_cast<sal_Int32>(aTwo.Minutes) - static_cast<sal_Int32>(aOne.Minutes);
- if ( !nTmp ) {
+ if ( !nTmp )
nTmp = static_cast<sal_Int32>(aTwo.Seconds) - static_cast<sal_Int32>(aOne.Seconds);
if ( !nTmp )
nTmp = static_cast<sal_Int32>(aTwo.NanoSeconds)
- static_cast<sal_Int32>(aOne.NanoSeconds);
- }}}}}
if ( nTmp < 0 )
nCompare = -1;
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 6ba10687a970..9d5376c14d7c 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -234,7 +234,7 @@ namespace ucb { namespace ucp { namespace ext
else if ( aCommand.Name == "open" )
{
OpenCommandArgument2 aOpenCommand;
- if ( !( aCommand.Argument >>= aOpenCommand ) )
+ if ( !( aCommand.Argument >>= aOpenCommand ) )
{
::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException(
OUString(), *this, -1 ) ),
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index e19be3458919..e7c96e49f62f 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -749,7 +749,7 @@ namespace fileaccess {
{
ioErrorCode = IOErrorCode_GENERAL;
aMsg = "a general error during transfer command";
- break;
+ break;
}
default:
ioErrorCode = IOErrorCode_GENERAL;
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 3d79dca53259..9962b7b1d465 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -649,7 +649,7 @@ sal_Int32 InsertData::read(sal_Int8 *dest,sal_Int32 nBytesRequested)
sal_Int32 m = 0;
if(m_xInputStream.is()) {
- Sequence<sal_Int8> seq(nBytesRequested);
+ Sequence<sal_Int8> seq(nBytesRequested);
m = m_xInputStream->readBytes(seq,nBytesRequested);
memcpy(dest,seq.getConstArray(),m);
}
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index a581c34adb2a..7f363f5e2921 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -161,56 +161,56 @@ uno::Any convertToException(GError *pError, const uno::Reference< uno::XInterfac
{
case G_IO_ERROR_FAILED:
{ io::IOException aExcept(sMessage, rContext);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_NOT_MOUNTED:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_NOT_EXISTING_PATH, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_NOT_FOUND:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_NOT_EXISTING, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_EXISTS:
{ ucb::NameClashException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, sName);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_INVALID_ARGUMENT:
{ lang::IllegalArgumentException aExcept(sMessage, rContext, -1 );
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_PERMISSION_DENIED:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_ACCESS_DENIED, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_IS_DIRECTORY:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_NO_FILE, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_NOT_REGULAR_FILE:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_NO_FILE, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_NOT_DIRECTORY:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_NO_DIRECTORY, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_FILENAME_TOO_LONG:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_NAME_TOO_LONG, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_PENDING:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_PENDING, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_CLOSED:
case G_IO_ERROR_CANCELLED:
@@ -218,45 +218,45 @@ uno::Any convertToException(GError *pError, const uno::Reference< uno::XInterfac
case G_IO_ERROR_WRONG_ETAG:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_GENERAL, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_NOT_SUPPORTED:
case G_IO_ERROR_CANT_CREATE_BACKUP:
case G_IO_ERROR_WOULD_MERGE:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_NOT_SUPPORTED, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_NO_SPACE:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_OUT_OF_DISK_SPACE, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_INVALID_FILENAME:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_INVALID_CHARACTER, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_READ_ONLY:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_WRITE_PROTECTED, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_TIMED_OUT:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_DEVICE_NOT_READY, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_WOULD_RECURSE:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_RECURSIVE, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_BUSY:
case G_IO_ERROR_WOULD_BLOCK:
{ ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
task::InteractionClassification_ERROR, ucb::IOErrorCode_LOCKING_VIOLATION, aArgs);
- EXCEPT(aExcept); }
+ EXCEPT(aExcept); }
break;
case G_IO_ERROR_HOST_NOT_FOUND:
{ ucb::InteractiveNetworkResolveNameException aExcept(sMessage, rContext,
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx
index 2a9186b059cb..c13f0ed0b550 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx
@@ -236,7 +236,7 @@ void ContentProperties::UCBNamesToDAVNames(
{
if ( !bCreationDate )
{
- propertyNames.push_back( DAVProperties::CREATIONDATE );
+ propertyNames.push_back( DAVProperties::CREATIONDATE );
bCreationDate = true;
}
}
@@ -244,8 +244,7 @@ void ContentProperties::UCBNamesToDAVNames(
{
if ( !bLastModified )
{
- propertyNames.push_back(
- DAVProperties::GETLASTMODIFIED );
+ propertyNames.push_back( DAVProperties::GETLASTMODIFIED );
bLastModified = true;
}
}
@@ -253,8 +252,7 @@ void ContentProperties::UCBNamesToDAVNames(
{
if ( !bContentType )
{
- propertyNames.push_back(
- DAVProperties::GETCONTENTTYPE );
+ propertyNames.push_back( DAVProperties::GETCONTENTTYPE );
bContentType = true;
}
}
@@ -262,8 +260,7 @@ void ContentProperties::UCBNamesToDAVNames(
{
if ( !bContentLength )
{
- propertyNames.push_back(
- DAVProperties::GETCONTENTLENGTH );
+ propertyNames.push_back( DAVProperties::GETCONTENTLENGTH );
bContentLength = true;
}
}
@@ -271,7 +268,7 @@ void ContentProperties::UCBNamesToDAVNames(
{
if ( !bResourceType )
{
- propertyNames.push_back( DAVProperties::RESOURCETYPE );
+ propertyNames.push_back( DAVProperties::RESOURCETYPE );
bResourceType = true;
}
}
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 6d1215b7fe21..667d24b05351 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -1025,10 +1025,10 @@ void NeonSession::PROPFIND( const OUString & inPath,
#if defined SAL_LOG_INFO
{ //debug
SAL_INFO( "ucb.ucp.webdav", "PROPFIND - relative URL: <" << inPath << "> Depth: " << inDepth );
- for(const auto& rPropName : inPropNames)
- {
+ for(const auto& rPropName : inPropNames)
+ {
SAL_INFO( "ucb.ucp.webdav", "PROPFIND - property requested: " << rPropName );
- }
+ }
} //debug
#endif
@@ -1726,22 +1726,22 @@ bool NeonSession::UNLOCK( NeonLock * pLock )
if ( ne_unlock( m_pHttpSession, pLock ) == NE_OK )
{
#if defined SAL_LOG_INFO
- {
- char * p = ne_uri_unparse( &(pLock->uri) );
- SAL_INFO( "ucb.ucp.webdav", "UNLOCK (from store) - relative URL: <" << p << "> token: <" << pLock->token << "> succeeded." );
- ne_free( p );
- }
+ {
+ char * p = ne_uri_unparse( &(pLock->uri) );
+ SAL_INFO( "ucb.ucp.webdav", "UNLOCK (from store) - relative URL: <" << p << "> token: <" << pLock->token << "> succeeded." );
+ ne_free( p );
+ }
#endif
return true;
}
else
{
#if defined SAL_LOG_INFO
- {
- char * p = ne_uri_unparse( &(pLock->uri) );
- SAL_INFO( "ucb.ucp.webdav", "UNLOCK (from store) - relative URL: <" << p << "> token: <" << pLock->token << "> failed!" );
- ne_free( p );
- }
+ {
+ char * p = ne_uri_unparse( &(pLock->uri) );
+ SAL_INFO( "ucb.ucp.webdav", "UNLOCK (from store) - relative URL: <" << p << "> token: <" << pLock->token << "> failed!" );
+ ne_free( p );
+ }
#endif
return false;
}
diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
index 173c3f9c4c20..659bf5d49cc1 100644
--- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
@@ -494,7 +494,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
// Encode value! It must not contain XML reserved chars!
aStringValue = encodeValue( aStringValue );
- rOutData = aXMLPre;
+ rOutData = aXMLPre;
rOutData += aStringType;
rOutData += aXMLMid;
rOutData += aStringValue;
diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
index 66591aa1f749..253999e6079c 100644
--- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
@@ -474,7 +474,7 @@ bool DataSupplier::getData()
}
}
- m_pImpl->m_bCountFinal = true;
+ m_pImpl->m_bCountFinal = true;
// Callback possible, because listeners may be informed!
aGuard.clear();
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 3308ac3b892e..0af6636c80d1 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -1008,7 +1008,7 @@ bool Content::isFolder()
>>= bFolder )
return bFolder;
- ucbhelper::cancelCommandExecution(
+ ucbhelper::cancelCommandExecution(
makeAny( UnknownPropertyException(
"Unable to retrieve value of property 'IsFolder'!",
get() ) ),
@@ -1031,7 +1031,7 @@ bool Content::isDocument()
>>= bDoc )
return bDoc;
- ucbhelper::cancelCommandExecution(
+ ucbhelper::cancelCommandExecution(
makeAny( UnknownPropertyException(
"Unable to retrieve value of property 'IsDocument'!",
get() ) ),