This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 209aa30e26 Fixed typos, cleanup
209aa30e26 is described below
commit 209aa30e2684c87a2a6c9764ed56be634f71c33e
Author: mseidel <[email protected]>
AuthorDate: Sun Apr 6 17:51:28 2025 +0200
Fixed typos, cleanup
(cherry picked from commit 578c68243c10255d9e286af768bee9c46628b77b)
---
main/automation/source/simplecm/tcpio.cxx | 28 +-
main/cppuhelper/source/weak.cxx | 319 ++++++++++-----------
main/dbaccess/inc/dataview.hxx | 25 +-
.../source/primitive2d/groupprimitive2d.cxx | 23 +-
.../source/primitive3d/groupprimitive3d.cxx | 23 +-
.../source/engine/animationnodes/nodetools.cxx | 172 +++++------
main/vcl/unx/kde4/main.cxx | 38 +--
main/vos/source/conditn.cxx | 18 +-
8 files changed, 316 insertions(+), 330 deletions(-)
diff --git a/main/automation/source/simplecm/tcpio.cxx
b/main/automation/source/simplecm/tcpio.cxx
index ee0fd2c722..056ac5b8f7 100644
--- a/main/automation/source/simplecm/tcpio.cxx
+++ b/main/automation/source/simplecm/tcpio.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,30 +7,28 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_automation.hxx"
#include "tcpio.hxx"
-/// implement ITransmiter
+// implement ITransmiter
comm_USHORT TCPIO::TransferBytes( const void* pBuffer, comm_UINT32 nLen )
{
- vos::OGuard aGuard( aMSocketWriteAccess );
- if ( !pStreamSocket )
+ vos::OGuard aGuard( aMSocketWriteAccess );
+ if ( !pStreamSocket )
{
nLastSent = 0;
return C_ERROR_PERMANENT;
@@ -42,10 +40,10 @@ comm_USHORT TCPIO::TransferBytes( const void* pBuffer,
comm_UINT32 nLen )
}
-/// implement IReceiver
+// implement IReceiver
comm_USHORT TCPIO::ReceiveBytes( void* pBuffer, comm_UINT32 nLen )
{
- vos::OGuard aGuard( aMSocketReadAccess );
+ vos::OGuard aGuard( aMSocketReadAccess );
if ( !pStreamSocket )
{
nLastReceived = 0;
@@ -61,7 +59,9 @@ comm_USHORT TCPIO::ReceiveBytes( void* pBuffer, comm_UINT32
nLen )
// helper
void TCPIO::SetStreamSocket( vos::OStreamSocket *pSocket )
{
- vos::OGuard aRGuard( aMSocketReadAccess );
- vos::OGuard aWGuard( aMSocketWriteAccess );
- pStreamSocket = pSocket;
+ vos::OGuard aRGuard( aMSocketReadAccess );
+ vos::OGuard aWGuard( aMSocketWriteAccess );
+ pStreamSocket = pSocket;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/cppuhelper/source/weak.cxx b/main/cppuhelper/source/weak.cxx
index 648342c650..e2a7763c88 100644
--- a/main/cppuhelper/source/weak.cxx
+++ b/main/cppuhelper/source/weak.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cppuhelper.hxx"
#include <osl/mutex.hxx>
@@ -35,11 +33,11 @@
using namespace osl;
using namespace com::sun::star::uno;
-/** */ //for docpp
+// for docpp
namespace cppu
-{
+{
-// due to static Reflection destruction from usr, ther must be a mutex leak
(#73272#)
+// due to static Reflection destruction from usr, there must be a mutex leak
(#73272#)
inline static Mutex & getWeakMutex() SAL_THROW( () )
{
static Mutex * s_pMutex = 0;
@@ -62,31 +60,31 @@ public:
, m_pObject(pObj)
, m_aReferences( getWeakMutex() )
{}
-
+
// XInterface
Any SAL_CALL queryInterface( const Type & rType )
throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL acquire() throw();
void SAL_CALL release() throw();
-
+
// XAdapter
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL queryAdapted() throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL addReference( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XReference >& xRef )
throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL removeReference( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XReference >& xRef )
throw(::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL queryAdapted() throw(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL addReference( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XReference >& xRef )
throw(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL removeReference( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XReference >& xRef )
throw(::com::sun::star::uno::RuntimeException);
- /// Called from the weak object if the reference count goes to zero.
+ // Called from the weak object if the reference count goes to zero.
void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
private:
- OWeakConnectionPoint(OWeakConnectionPoint &); // not defined
- void operator =(OWeakConnectionPoint &); // not defined
+ OWeakConnectionPoint(OWeakConnectionPoint &); // not defined
+ void operator =(OWeakConnectionPoint &); // not defined
- virtual ~OWeakConnectionPoint() {}
+ virtual ~OWeakConnectionPoint() {}
- /// The reference counter.
- oslInterlockedCount m_aRefCount;
- /// The weak object
+ // The reference counter.
+ oslInterlockedCount m_aRefCount;
+ // The weak object
OWeakObject* m_pObject;
- /// The container to hold the weak references
+ // The container to hold the weak references
OInterfaceContainerHelper m_aReferences;
};
@@ -102,7 +100,7 @@ Any SAL_CALL OWeakConnectionPoint::queryInterface( const
Type & rType )
void SAL_CALL OWeakConnectionPoint::acquire() throw()
{
osl_incrementInterlockedCount( &m_aRefCount );
-}
+}
// XInterface
void SAL_CALL OWeakConnectionPoint::release() throw()
@@ -113,40 +111,40 @@ void SAL_CALL OWeakConnectionPoint::release() throw()
void SAL_CALL OWeakConnectionPoint::dispose()
throw(::com::sun::star::uno::RuntimeException)
{
- Any ex;
+ Any ex;
OInterfaceIteratorHelper aIt( m_aReferences );
while( aIt.hasMoreElements() )
- {
- try
- {
- ((XReference *)aIt.next())->dispose();
- }
- catch (com::sun::star::lang::DisposedException &) {}
- catch (RuntimeException &)
- {
- ex = cppu::getCaughtException();
- }
- }
- if (ex.hasValue())
- {
- cppu::throwException(ex);
- }
-}
-
+ {
+ try
+ {
+ ((XReference *)aIt.next())->dispose();
+ }
+ catch (com::sun::star::lang::DisposedException &) {}
+ catch (RuntimeException &)
+ {
+ ex = cppu::getCaughtException();
+ }
+ }
+ if (ex.hasValue())
+ {
+ cppu::throwException(ex);
+ }
+}
+
// XInterface
Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted()
throw(::com::sun::star::uno::RuntimeException)
{
Reference< XInterface > ret;
-
+
ClearableMutexGuard guard(getWeakMutex());
-
+
if (m_pObject)
{
oslInterlockedCount n = osl_incrementInterlockedCount(
&m_pObject->m_refCount );
-
+
if (n > 1)
{
- // The refence is incremented. The object cannot be
destroyed.
+ // The reference is incremented. The object cannot be
destroyed.
// Release the guard at the earliest point.
guard.clear();
// WeakObject has a (XInterface *) cast operator
@@ -157,7 +155,7 @@ Reference< XInterface > SAL_CALL
OWeakConnectionPoint::queryAdapted() throw(::co
// Another thread wait in the dispose method at the
guard
n = osl_decrementInterlockedCount(
&m_pObject->m_refCount );
}
-
+
return ret;
}
@@ -166,14 +164,14 @@ void SAL_CALL OWeakConnectionPoint::addReference(const
Reference< XReference >&
throw(::com::sun::star::uno::RuntimeException)
{
m_aReferences.addInterface( (const Reference< XInterface > &)rRef );
-}
+}
// XInterface
void SAL_CALL OWeakConnectionPoint::removeReference(const Reference<
XReference >& rRef)
throw(::com::sun::star::uno::RuntimeException)
{
m_aReferences.removeInterface( (const Reference< XInterface > &)rRef );
-}
+}
//------------------------------------------------------------------------
@@ -183,8 +181,8 @@ void SAL_CALL OWeakConnectionPoint::removeReference(const
Reference< XReference
#ifdef _MSC_VER
// Accidentally occurs in msvc mapfile = > had to be outlined.
OWeakObject::OWeakObject() SAL_THROW( () )
- : m_refCount( 0 ),
- m_pWeakConnectionPoint( 0 )
+ : m_refCount( 0 ),
+ m_pWeakConnectionPoint( 0 )
{
}
#endif
@@ -195,43 +193,43 @@ Any SAL_CALL OWeakObject::queryInterface( const Type &
rType ) throw(::com::sun:
return ::cppu::queryInterface(
rType,
static_cast< XWeak * >( this ), static_cast< XInterface * >(
this ) );
-}
+}
// XInterface
void SAL_CALL OWeakObject::acquire() throw()
{
osl_incrementInterlockedCount( &m_refCount );
-}
+}
// XInterface
void SAL_CALL OWeakObject::release() throw()
{
- if (osl_decrementInterlockedCount( &m_refCount ) == 0) {
- // notify/clear all weak-refs before object's dtor is executed
- // (which may check weak-refs to this object):
- disposeWeakConnectionPoint();
- // destroy object:
- delete this;
- }
-}
+ if (osl_decrementInterlockedCount( &m_refCount ) == 0) {
+ // notify/clear all weak-refs before object's dtor is executed
+ // (which may check weak-refs to this object):
+ disposeWeakConnectionPoint();
+ // destroy object:
+ delete this;
+ }
+}
void OWeakObject::disposeWeakConnectionPoint()
{
- OSL_PRECOND( m_refCount == 0, "OWeakObject::disposeWeakConnectionPoint:
only to be called with a ref count of 0!" );
- if (m_pWeakConnectionPoint != 0) {
- OWeakConnectionPoint * const p = m_pWeakConnectionPoint;
- m_pWeakConnectionPoint = 0;
- try {
- p->dispose();
- }
- catch (RuntimeException const& exc) {
- OSL_ENSURE(
- false, OUStringToOString(
- exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
- static_cast<void>(exc);
- }
- p->release();
- }
+ OSL_PRECOND( m_refCount == 0, "OWeakObject::disposeWeakConnectionPoint:
only to be called with a ref count of 0!" );
+ if (m_pWeakConnectionPoint != 0) {
+ OWeakConnectionPoint * const p = m_pWeakConnectionPoint;
+ m_pWeakConnectionPoint = 0;
+ try {
+ p->dispose();
+ }
+ catch (RuntimeException const& exc) {
+ OSL_ENSURE(
+ false, OUStringToOString(
+ exc.Message, RTL_TEXTENCODING_ASCII_US
).getStr() );
+ static_cast<void>(exc);
+ }
+ p->release();
+ }
}
OWeakObject::~OWeakObject() SAL_THROW( (RuntimeException) )
@@ -253,9 +251,9 @@ Reference< XAdapter > SAL_CALL OWeakObject::queryAdapter()
m_pWeakConnectionPoint = p;
}
}
-
+
return m_pWeakConnectionPoint;
-}
+}
//------------------------------------------------------------------------
//-- OWeakAggObject ----------------------------------------------------
@@ -272,7 +270,7 @@ void OWeakAggObject::acquire() throw()
x->acquire();
else
OWeakObject::acquire();
-}
+}
// XInterface
void OWeakAggObject::release() throw()
@@ -289,7 +287,7 @@ Any OWeakAggObject::queryInterface( const Type & rType )
throw(::com::sun::star:
{
Reference< XInterface > x( xDelegator ); // harden ref
return (x.is() ? x->queryInterface( rType ) : queryAggregation( rType
));
-
+
// // set rOut to zero, if failed
// if( !xDelegator.queryHardRef( aUik, rOut ) )
// {
@@ -297,7 +295,7 @@ Any OWeakAggObject::queryInterface( const Type & rType )
throw(::com::sun::star:
// if( !xDelegator.queryHardRef( ((XInterface*)0)->getSmartUik(),
x ) )
// // reference is not valid
// queryAggregation( aUik, rOut );
-// }
+// }
// return rOut.is();
}
@@ -321,17 +319,16 @@ void OWeakAggObject::setDelegator( const
Reference<XInterface > & rDelegator ) t
/** */ //for docpp
namespace com
-{
+{
/** */ //for docpp
namespace sun
-{
+{
/** */ //for docpp
namespace star
-{
+{
/** */ //for docpp
namespace uno
-{
-
+{
//------------------------------------------------------------------------
//-- OWeakRefListener -----------------------------------------------------
@@ -342,19 +339,19 @@ public:
OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () );
OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW( () );
virtual ~OWeakRefListener() SAL_THROW( () );
-
+
// XInterface
- Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException);
- void SAL_CALL acquire() throw();
- void SAL_CALL release() throw();
-
+ Any SAL_CALL queryInterface( const Type & rType )
throw(RuntimeException);
+ void SAL_CALL acquire() throw();
+ void SAL_CALL release() throw();
+
// XReference
void SAL_CALL dispose()
throw(::com::sun::star::uno::RuntimeException);
- /// The reference counter.
- oslInterlockedCount m_aRefCount;
- /// The connection point of the weak object
- Reference< XAdapter > m_XWeakConnectionPoint;
+ // The reference counter.
+ oslInterlockedCount m_aRefCount;
+ // The connection point of the weak object
+ Reference< XAdapter > m_XWeakConnectionPoint;
private:
OWeakRefListener& SAL_CALL operator=(const OWeakRefListener& rRef)
SAL_THROW( () );
@@ -362,76 +359,76 @@ private:
OWeakRefListener::OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( ()
)
: com::sun::star::uno::XReference()
- , m_aRefCount( 1 )
+ , m_aRefCount( 1 )
{
- try
- {
+ try
+ {
m_XWeakConnectionPoint = rRef.m_XWeakConnectionPoint;
-
+
if (m_XWeakConnectionPoint.is())
- {
- m_XWeakConnectionPoint->addReference((XReference*)this);
- }
- }
- catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no
unexpected()
- osl_decrementInterlockedCount( &m_aRefCount );
+ {
+ m_XWeakConnectionPoint->addReference((XReference*)this);
+ }
+ }
+ catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no
unexpected()
+ osl_decrementInterlockedCount( &m_aRefCount );
}
OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt)
SAL_THROW( () )
: m_aRefCount( 1 )
{
- try
- {
+ try
+ {
Reference< XWeak > xWeak( Reference< XWeak >::query( xInt ) );
-
+
if (xWeak.is())
{
m_XWeakConnectionPoint = xWeak->queryAdapter();
-
+
if (m_XWeakConnectionPoint.is())
{
- m_XWeakConnectionPoint->addReference((XReference*)this);
+ m_XWeakConnectionPoint->addReference((XReference*)this);
}
}
- }
- catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no
unexpected()
- osl_decrementInterlockedCount( &m_aRefCount );
+ }
+ catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no
unexpected()
+ osl_decrementInterlockedCount( &m_aRefCount );
}
OWeakRefListener::~OWeakRefListener() SAL_THROW( () )
{
- try
- {
+ try
+ {
if (m_XWeakConnectionPoint.is())
- {
- acquire(); // don't die again
+ {
+ acquire(); // don't die again
m_XWeakConnectionPoint->removeReference((XReference*)this);
- }
- }
- catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no
unexpected()
-}
+ }
+ }
+ catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no
unexpected()
+}
// XInterface
Any SAL_CALL OWeakRefListener::queryInterface( const Type & rType )
throw(RuntimeException)
{
return ::cppu::queryInterface(
rType, static_cast< XReference * >( this ), static_cast<
XInterface * >( this ) );
-}
+}
// XInterface
void SAL_CALL OWeakRefListener::acquire() throw()
{
osl_incrementInterlockedCount( &m_aRefCount );
-}
+}
// XInterface
void SAL_CALL OWeakRefListener::release() throw()
{
if( ! osl_decrementInterlockedCount( &m_aRefCount ) )
delete this;
-}
+}
-void SAL_CALL OWeakRefListener::dispose()
+void SAL_CALL OWeakRefListener::dispose()
throw(::com::sun::star::uno::RuntimeException)
{
Reference< XAdapter > xAdp;
@@ -446,7 +443,7 @@ void SAL_CALL OWeakRefListener::dispose()
if( xAdp.is() )
xAdp->removeReference((XReference*)this);
-}
+}
//------------------------------------------------------------------------
//-- WeakReferenceHelper
----------------------------------------------------------
@@ -459,7 +456,7 @@ WeakReferenceHelper::WeakReferenceHelper(const Reference<
XInterface >& xInt) SA
m_pImpl = new OWeakRefListener(xInt);
m_pImpl->acquire();
}
-}
+}
WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef)
SAL_THROW( () )
: m_pImpl( 0 )
@@ -474,59 +471,59 @@ WeakReferenceHelper::WeakReferenceHelper(const
WeakReferenceHelper& rWeakRef) SA
void WeakReferenceHelper::clear() SAL_THROW( () )
{
- try
- {
- if (m_pImpl)
- {
- if (m_pImpl->m_XWeakConnectionPoint.is())
- {
- m_pImpl->m_XWeakConnectionPoint->removeReference(
- (XReference*)m_pImpl);
- m_pImpl->m_XWeakConnectionPoint.clear();
- }
- m_pImpl->release();
- m_pImpl = 0;
- }
- }
- catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no
unexpected()
+ try
+ {
+ if (m_pImpl)
+ {
+ if (m_pImpl->m_XWeakConnectionPoint.is())
+ {
+
m_pImpl->m_XWeakConnectionPoint->removeReference(
+ (XReference*)m_pImpl);
+ m_pImpl->m_XWeakConnectionPoint.clear();
+ }
+ m_pImpl->release();
+ m_pImpl = 0;
+ }
+ }
+ catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no
unexpected()
}
WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper&
rWeakRef) SAL_THROW( () )
{
- if (this == &rWeakRef)
- {
- return *this;
- }
- Reference< XInterface > xInt( rWeakRef.get() );
- return operator = ( xInt );
+ if (this == &rWeakRef)
+ {
+ return *this;
+ }
+ Reference< XInterface > xInt( rWeakRef.get() );
+ return operator = ( xInt );
}
WeakReferenceHelper & SAL_CALL
WeakReferenceHelper::operator= (const Reference< XInterface > & xInt)
SAL_THROW( () )
{
- try
- {
- clear();
+ try
+ {
+ clear();
if (xInt.is())
{
m_pImpl = new OWeakRefListener(xInt);
m_pImpl->acquire();
}
- }
- catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no
unexpected()
- return *this;
+ }
+ catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no
unexpected()
+ return *this;
}
WeakReferenceHelper::~WeakReferenceHelper() SAL_THROW( () )
{
- clear();
+ clear();
}
Reference< XInterface > WeakReferenceHelper::get() const SAL_THROW( () )
{
- try
- {
+ try
+ {
Reference< XAdapter > xAdp;
{
MutexGuard guard(cppu::getWeakMutex());
@@ -536,13 +533,15 @@ Reference< XInterface > WeakReferenceHelper::get() const
SAL_THROW( () )
if (xAdp.is())
return xAdp->queryAdapted();
- }
- catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no
unexpected()
-
+ }
+ catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no
unexpected()
+
return Reference< XInterface >();
}
}
}
}
-}
+}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/dbaccess/inc/dataview.hxx b/main/dbaccess/inc/dataview.hxx
index 3637dc98fe..a795819b49 100644
--- a/main/dbaccess/inc/dataview.hxx
+++ b/main/dbaccess/inc/dataview.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
#ifndef DBAUI_DATAVIEW_HXX
#define DBAUI_DATAVIEW_HXX
@@ -38,21 +37,21 @@ namespace dbaui
class IController;
class DBACCESS_DLLPUBLIC ODataView : public Window
{
- ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory;
// the service factory to work with
+ ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; // the
service factory to work with
protected:
- IController& m_rController; // the controller in
where we resides in
- FixedLine m_aSeparator;
+ IController& m_rController; // the controller in
where we resides in
+ FixedLine m_aSeparator;
::std::auto_ptr< ::svt::AcceleratorExecute> m_pAccel;
public:
- ODataView( Window* pParent,
+ ODataView( Window* pParent,
IController& _rController,
- const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& ,
+ const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& ,
WinBits nStyle = 0 );
virtual ~ODataView();
- /// late construction
+ // late construction
virtual void Construct();
// initialize will be called when after the controller finished
his initialize method
virtual void initialize(){}
@@ -77,7 +76,7 @@ namespace dbaui
// window overridables
virtual void Paint( const Rectangle& _rRect );
- /// re-arrange all controls, including the toolbox, it's
separator, and the "real view"
+ // re-arrange all controls, including the toolbox, it's
separator, and the "real view"
virtual void resizeAll( const Rectangle& _rPlayground );
// re-arrange the controls belonging to the document itself
@@ -85,3 +84,5 @@ namespace dbaui
};
}
#endif // DBAUI_DATAVIEW_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/drawinglayer/source/primitive2d/groupprimitive2d.cxx
b/main/drawinglayer/source/primitive2d/groupprimitive2d.cxx
index 064826056a..fab21f9603 100644
--- a/main/drawinglayer/source/primitive2d/groupprimitive2d.cxx
+++ b/main/drawinglayer/source/primitive2d/groupprimitive2d.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,32 +7,26 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_drawinglayer.hxx"
#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
-//////////////////////////////////////////////////////////////////////////////
-
using namespace com::sun::star;
-//////////////////////////////////////////////////////////////////////////////
-
namespace drawinglayer
{
namespace primitive2d
@@ -43,8 +37,8 @@ namespace drawinglayer
{
}
- /** The compare opertator uses the Sequence::==operator, so
only checking if
- the rererences are equal. All non-equal references are
interpreted as
+ /** The compare operator uses the Sequence::==operator, so only
checking if
+ the references are equal. All non-equal references are
interpreted as
non-equal.
*/
bool GroupPrimitive2D::operator==( const BasePrimitive2D&
rPrimitive ) const
@@ -59,7 +53,7 @@ namespace drawinglayer
return false;
}
- /// default: just return children, so all renderers not
supporting group will use it's content
+ // default: just return children, so all renderers not
supporting group will use its content
Primitive2DSequence GroupPrimitive2D::get2DDecomposition(const
geometry::ViewInformation2D& /*rViewInformation*/) const
{
return getChildren();
@@ -71,5 +65,4 @@ namespace drawinglayer
} // end of namespace primitive2d
} // end of namespace drawinglayer
-//////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/drawinglayer/source/primitive3d/groupprimitive3d.cxx
b/main/drawinglayer/source/primitive3d/groupprimitive3d.cxx
index ff4b7ee880..cc299b778d 100644
--- a/main/drawinglayer/source/primitive3d/groupprimitive3d.cxx
+++ b/main/drawinglayer/source/primitive3d/groupprimitive3d.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,32 +7,26 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_drawinglayer.hxx"
#include <drawinglayer/primitive3d/groupprimitive3d.hxx>
#include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
-//////////////////////////////////////////////////////////////////////////////
-
using namespace com::sun::star;
-//////////////////////////////////////////////////////////////////////////////
-
namespace drawinglayer
{
namespace primitive3d
@@ -43,8 +37,8 @@ namespace drawinglayer
{
}
- /** The compare opertator uses the Sequence::==operator, so
only checking if
- the rererences are equal. All non-equal references are
interpreted as
+ /** The compare operator uses the Sequence::==operator, so only
checking if
+ the references are equal. All non-equal references are
interpreted as
non-equal.
*/
bool GroupPrimitive3D::operator==( const BasePrimitive3D&
rPrimitive ) const
@@ -59,7 +53,7 @@ namespace drawinglayer
return false;
}
- /// default: just return children, so all renderers not
supporting group will use it's content
+ // default: just return children, so all renderers not
supporting group will use its content
Primitive3DSequence GroupPrimitive3D::get3DDecomposition(const
geometry::ViewInformation3D& /*rViewInformation*/) const
{
return getChildren();
@@ -71,5 +65,4 @@ namespace drawinglayer
} // end of namespace primitive3d
} // end of namespace drawinglayer
-//////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/slideshow/source/engine/animationnodes/nodetools.cxx
b/main/slideshow/source/engine/animationnodes/nodetools.cxx
index 6561d5637d..592c2a6d6e 100644
--- a/main/slideshow/source/engine/animationnodes/nodetools.cxx
+++ b/main/slideshow/source/engine/animationnodes/nodetools.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_slideshow.hxx"
@@ -38,87 +36,89 @@ using namespace ::com::sun::star;
namespace slideshow
{
- namespace internal
- {
+ namespace internal
+ {
#if defined(VERBOSE) && defined(DBG_UTIL)
- int& debugGetCurrentOffset()
- {
- static int lcl_nOffset = 0; // to make each tree output distinct
-
- return lcl_nOffset;
- }
-
- void debugNodesShowTree( const BaseNode* pNode )
- {
- if( pNode )
- pNode->showState();
-
- ++debugGetCurrentOffset();
- }
-
- void debugNodesShowTreeWithin( const BaseNode* pNode )
- {
- if( pNode )
- pNode->showTreeFromWithin();
-
- ++debugGetCurrentOffset();
- }
+ int& debugGetCurrentOffset()
+ {
+ static int lcl_nOffset = 0; // to make each tree output
distinct
+
+ return lcl_nOffset;
+ }
+
+ void debugNodesShowTree( const BaseNode* pNode )
+ {
+ if( pNode )
+ pNode->showState();
+
+ ++debugGetCurrentOffset();
+ }
+
+ void debugNodesShowTreeWithin( const BaseNode* pNode )
+ {
+ if( pNode )
+ pNode->showTreeFromWithin();
+
+ ++debugGetCurrentOffset();
+ }
#endif
- AttributableShapeSharedPtr lookupAttributableShape( const
ShapeManagerSharedPtr& rShapeManager,
- const
uno::Reference< drawing::XShape >& xShape )
- {
- ENSURE_OR_THROW( rShapeManager,
- "lookupAttributableShape(): invalid
ShapeManager" );
-
- ShapeSharedPtr pShape( rShapeManager->lookupShape( xShape ) );
-
- ENSURE_OR_THROW( pShape,
- "lookupAttributableShape(): no shape found for
given XShape" );
-
- AttributableShapeSharedPtr pRes(
- ::boost::dynamic_pointer_cast< AttributableShape >( pShape ) );
-
- // TODO(E3): Cannot throw here, people might set animation info
- // for non-animatable shapes from the API. AnimationNodes must
catch
- // the exception and handle that differently
- ENSURE_OR_THROW( pRes,
- "lookupAttributableShape(): shape found does not
implement AttributableShape interface" );
-
- return pRes;
- }
-
- bool isIndefiniteTiming( const uno::Any& rAny )
- {
- if( !rAny.hasValue() )
- return true;
-
- animations::Timing eTiming;
-
- if( !(rAny >>= eTiming) ||
- eTiming != animations::Timing_INDEFINITE )
- {
- return false;
- }
-
- return true;
- }
-
- /// Extract the node type from the user data
- bool getNodeType( sal_Int16&
o_rNodeType,
- const uno::Sequence< beans::NamedValue >&
rValues )
- {
- beans::NamedValue aNamedValue;
-
- if( findNamedValue( &aNamedValue,
- rValues,
- ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("node-type") ) ) )
- {
- if( (aNamedValue.Value >>= o_rNodeType) )
- return true;
- }
-
- return false;
- }
- }
+ AttributableShapeSharedPtr lookupAttributableShape( const
ShapeManagerSharedPtr& rShapeManager,
+
const uno::Reference< drawing::XShape
>& xShape )
+ {
+ ENSURE_OR_THROW( rShapeManager,
+
"lookupAttributableShape(): invalid ShapeManager" );
+
+ ShapeSharedPtr pShape( rShapeManager->lookupShape(
xShape ) );
+
+ ENSURE_OR_THROW( pShape,
+
"lookupAttributableShape(): no shape found for given XShape" );
+
+ AttributableShapeSharedPtr pRes(
+ ::boost::dynamic_pointer_cast<
AttributableShape >( pShape ) );
+
+ // TODO(E3): Cannot throw here, people might set
animation info
+ // for non-animatable shapes from the API.
AnimationNodes must catch
+ // the exception and handle that differently
+ ENSURE_OR_THROW( pRes,
+
"lookupAttributableShape(): shape found does not implement AttributableShape
interface" );
+
+ return pRes;
+ }
+
+ bool isIndefiniteTiming( const uno::Any& rAny )
+ {
+ if( !rAny.hasValue() )
+ return true;
+
+ animations::Timing eTiming;
+
+ if( !(rAny >>= eTiming) ||
+ eTiming != animations::Timing_INDEFINITE )
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ // Extract the node type from the user data
+ bool getNodeType( sal_Int16&
o_rNodeType,
+ const uno::Sequence<
beans::NamedValue >& rValues )
+ {
+ beans::NamedValue aNamedValue;
+
+ if( findNamedValue( &aNamedValue,
+ rValues,
+
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("node-type") ) ) )
+ {
+ if( (aNamedValue.Value >>= o_rNodeType) )
+ return true;
+ }
+
+ return false;
+ }
+ }
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vcl/unx/kde4/main.cxx b/main/vcl/unx/kde4/main.cxx
index 0b633a9c66..b45080c5ab 100644
--- a/main/vcl/unx/kde4/main.cxx
+++ b/main/vcl/unx/kde4/main.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
@@ -39,20 +37,20 @@
#include <rtl/string.hxx>
-/// entry point for the KDE4 VCL plugin
+// entry point for the KDE4 VCL plugin
extern "C" {
VCLPLUG_KDE4_PUBLIC SalInstance* create_SalInstance( oslModule )
{
- /* #i92121# workaround deadlocks in the X11 implementation
- */
- static const char* pNoXInitThreads = getenv( "SAL_NO_XINITTHREADS" );
- /* #i90094#
- from now on we know that an X connection will be
- established, so protect X against itself
- */
- if( ! ( pNoXInitThreads && *pNoXInitThreads ) )
- XInitThreads();
-
+ /* #i92121# workaround deadlocks in the X11 implementation
+ */
+ static const char* pNoXInitThreads = getenv(
"SAL_NO_XINITTHREADS" );
+ /* #i90094#
+ from now on we know that an X connection will be
+ established, so protect X against itself
+ */
+ if( ! ( pNoXInitThreads && *pNoXInitThreads ) )
+ XInitThreads();
+
#if QT_VERSION < 0x050000
// Qt 4.x support needs >= 4.1.0
rtl::OString aVersion( qVersion() );
@@ -73,12 +71,12 @@ extern "C" {
return NULL;
}
#endif
-
+
KDESalInstance* pInstance = new KDESalInstance( new
SalYieldMutex() );
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "created KDESalInstance 0x%p\n", pInstance );
#endif
-
+
// initialize SalData
KDEData *salData = new KDEData();
SetSalData(salData);
@@ -89,3 +87,5 @@ extern "C" {
return pInstance;
}
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vos/source/conditn.cxx b/main/vos/source/conditn.cxx
index 9037e3b9d0..de4867dee1 100644
--- a/main/vos/source/conditn.cxx
+++ b/main/vos/source/conditn.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#include <osl/time.h>
#include <vos/conditn.hxx>
#include <vos/diagnose.hxx>
@@ -29,7 +27,7 @@ using namespace vos;
VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OCondition, vos),
VOS_NAMESPACE(OCondition, vos), VOS_NAMESPACE(OObject, vos), 0);
-/// initial state of condition is not set
+// initial state of condition is not set
OCondition::OCondition()
{
m_Condition= osl_createCondition();
@@ -40,13 +38,13 @@ OCondition::~OCondition()
osl_destroyCondition(m_Condition);
}
-/// set condition to sal_True => wait() will not block, check() returns
sal_True
+// set condition to sal_True => wait() will not block, check() returns sal_True
void OCondition::set()
{
osl_setCondition(m_Condition);
}
-/// set condition to sal_False => wait() will block, check() returns sal_False
+// set condition to sal_False => wait() will block, check() returns sal_False
void OCondition::reset()
{
osl_resetCondition(m_Condition);
@@ -69,3 +67,5 @@ sal_Bool OCondition::check()
{
return osl_checkCondition(m_Condition);
}
+
+/* vim: set noet sw=4 ts=4: */
