summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Riemer <ruderphilipp@gmail.com>2012-06-07 14:15:00 +0200
committerPhilipp Weissenbacher <p.weissenbacher@gmail.com>2012-06-13 20:29:14 +0200
commit74b5a0dd4bb150fe807e678d157149f607ca246d (patch)
tree34186f5c8aac279af37c6b91a7617194f1e4c92b
parent9ea4189c507455caebaf1c96457b98cac789584a (diff)
minor code cleanups in sw/source/core/inc
-rw-r--r--sw/source/core/inc/fieldhint.hxx1
-rw-r--r--sw/source/core/inc/finalthreadmanager.hxx5
-rw-r--r--sw/source/core/inc/fntcache.hxx4
-rw-r--r--sw/source/core/inc/frame.hxx3
-rw-r--r--sw/source/core/inc/ifinishedthreadlistener.hxx7
-rw-r--r--sw/source/core/inc/ithreadlistenerowner.hxx9
-rw-r--r--sw/source/core/inc/laycache.hxx4
7 files changed, 15 insertions, 18 deletions
diff --git a/sw/source/core/inc/fieldhint.hxx b/sw/source/core/inc/fieldhint.hxx
index 210cc7493e7b..165e404f6c95 100644
--- a/sw/source/core/inc/fieldhint.hxx
+++ b/sw/source/core/inc/fieldhint.hxx
@@ -34,6 +34,7 @@
class SwFieldHint : public SfxHint
{
SwPaM* pPaM;
+
public:
SwFieldHint( SwPaM* p )
: pPaM(p)
diff --git a/sw/source/core/inc/finalthreadmanager.hxx b/sw/source/core/inc/finalthreadmanager.hxx
index 19e902c53a37..dc1c6e57b46c 100644
--- a/sw/source/core/inc/finalthreadmanager.hxx
+++ b/sw/source/core/inc/finalthreadmanager.hxx
@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _FINALTHREADMANAGER_HXX
#define _FINALTHREADMANAGER_HXX
@@ -35,10 +36,7 @@
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/util/XJobManager.hpp"
#include "com/sun/star/frame/XTerminateListener2.hpp"
-
-
#include <osl/mutex.hxx>
-
#include <list>
class CancelJobsThread;
@@ -56,7 +54,6 @@ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL _crea
} // closing service helper namespace
-
class FinalThreadManager : public ::cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo,
com::sun::star::util::XJobManager,
com::sun::star::frame::XTerminateListener2 >
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index e0eeb508355e..7affcf1f50e2 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _FNTCACHE_HXX
#define _FNTCACHE_HXX
@@ -37,7 +38,7 @@ class Printer;
class OutputDevice;
class FontMetric;
class SwFntObj;
-class SwDrawTextInfo; // DrawText
+class SwDrawTextInfo;
class ViewShell;
class SwSubFont;
class MapMode;
@@ -45,7 +46,6 @@ class MapMode;
class SwFntCache : public SwCache
{
public:
-
inline SwFntCache() : SwCache(50
#ifdef DBG_UTIL
, rtl::OString(RTL_CONSTASCII_STRINGPARAM("Global Font-Cache pFntCache"))
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 544655a1a093..b1ad339afae5 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef SW_FRAME_HXX
#define SW_FRAME_HXX
@@ -366,8 +367,10 @@ protected:
// painted if <bCompletePaint> is sal_True.
sal_Bool bCompletePaint : 1;
sal_Bool bRetouche : 1; // frame is responsible for retouching
+
public:
sal_Bool bUnUsed2 : 1;
+
protected:
sal_Bool bInfInvalid : 1; // InfoFlags are invalid
sal_Bool bInfBody : 1; // Frm is in document body
diff --git a/sw/source/core/inc/ifinishedthreadlistener.hxx b/sw/source/core/inc/ifinishedthreadlistener.hxx
index fbf6099f8456..257da22ecf9e 100644
--- a/sw/source/core/inc/ifinishedthreadlistener.hxx
+++ b/sw/source/core/inc/ifinishedthreadlistener.hxx
@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _IFINISHEDTHREADLISTENER_HXX
#define _IFINISHEDTHREADLISTENER_HXX
@@ -39,16 +40,14 @@
*/
class IFinishedThreadListener
{
- public:
-
+public:
inline virtual ~IFinishedThreadListener()
{
};
virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) = 0;
- protected:
-
+protected:
inline IFinishedThreadListener()
{
};
diff --git a/sw/source/core/inc/ithreadlistenerowner.hxx b/sw/source/core/inc/ithreadlistenerowner.hxx
index 8ba165774ee7..dc40f34de48b 100644
--- a/sw/source/core/inc/ithreadlistenerowner.hxx
+++ b/sw/source/core/inc/ithreadlistenerowner.hxx
@@ -25,11 +25,11 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _ITHREADLISTENEROWNER_HXX
#define _ITHREADLISTENEROWNER_HXX
#include <ifinishedthreadlistener.hxx>
-
#include <boost/weak_ptr.hpp>
/** interface class of the owner of a thread listener
@@ -40,18 +40,15 @@
*/
class IThreadListenerOwner
{
- public:
-
+public:
inline virtual ~IThreadListenerOwner()
{
};
virtual boost::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef() = 0;
-
virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) = 0;
- protected:
-
+protected:
inline IThreadListenerOwner()
{
};
diff --git a/sw/source/core/inc/laycache.hxx b/sw/source/core/inc/laycache.hxx
index e355f8b00054..05d6250227c9 100644
--- a/sw/source/core/inc/laycache.hxx
+++ b/sw/source/core/inc/laycache.hxx
@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _LAYCACHE_HXX
#define _LAYCACHE_HXX
@@ -48,11 +49,11 @@ class SvStream;
* during the Read(..) function the lock count will set to $8000.
*
**************************************************************************/
-
class SwLayoutCache
{
SwLayCacheImpl *pImpl;
sal_uInt16 nLockCount;
+
public:
SwLayoutCache() : pImpl( NULL ), nLockCount( 0 ) {}
~SwLayoutCache();
@@ -74,7 +75,6 @@ public:
sal_Bool CompareLayout( const SwDoc& rDoc ) const;
#endif
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */