Kaydet (Commit) 74b5a0dd authored tarafından Philipp Riemer's avatar Philipp Riemer Kaydeden (comit) Philipp Weissenbacher

minor code cleanups in sw/source/core/inc

üst 9ea4189c
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
class SwFieldHint : public SfxHint class SwFieldHint : public SfxHint
{ {
SwPaM* pPaM; SwPaM* pPaM;
public: public:
SwFieldHint( SwPaM* p ) SwFieldHint( SwPaM* p )
: pPaM(p) : pPaM(p)
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
#ifndef _FINALTHREADMANAGER_HXX #ifndef _FINALTHREADMANAGER_HXX
#define _FINALTHREADMANAGER_HXX #define _FINALTHREADMANAGER_HXX
...@@ -35,10 +36,7 @@ ...@@ -35,10 +36,7 @@
#include "com/sun/star/lang/XServiceInfo.hpp" #include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/util/XJobManager.hpp" #include "com/sun/star/util/XJobManager.hpp"
#include "com/sun/star/frame/XTerminateListener2.hpp" #include "com/sun/star/frame/XTerminateListener2.hpp"
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <list> #include <list>
class CancelJobsThread; class CancelJobsThread;
...@@ -56,7 +54,6 @@ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL _crea ...@@ -56,7 +54,6 @@ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL _crea
} // closing service helper namespace } // closing service helper namespace
class FinalThreadManager : public ::cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo, class FinalThreadManager : public ::cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo,
com::sun::star::util::XJobManager, com::sun::star::util::XJobManager,
com::sun::star::frame::XTerminateListener2 > com::sun::star::frame::XTerminateListener2 >
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
#ifndef _FNTCACHE_HXX #ifndef _FNTCACHE_HXX
#define _FNTCACHE_HXX #define _FNTCACHE_HXX
...@@ -37,7 +38,7 @@ class Printer; ...@@ -37,7 +38,7 @@ class Printer;
class OutputDevice; class OutputDevice;
class FontMetric; class FontMetric;
class SwFntObj; class SwFntObj;
class SwDrawTextInfo; // DrawText class SwDrawTextInfo;
class ViewShell; class ViewShell;
class SwSubFont; class SwSubFont;
class MapMode; class MapMode;
...@@ -45,7 +46,6 @@ class MapMode; ...@@ -45,7 +46,6 @@ class MapMode;
class SwFntCache : public SwCache class SwFntCache : public SwCache
{ {
public: public:
inline SwFntCache() : SwCache(50 inline SwFntCache() : SwCache(50
#ifdef DBG_UTIL #ifdef DBG_UTIL
, rtl::OString(RTL_CONSTASCII_STRINGPARAM("Global Font-Cache pFntCache")) , rtl::OString(RTL_CONSTASCII_STRINGPARAM("Global Font-Cache pFntCache"))
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
#ifndef SW_FRAME_HXX #ifndef SW_FRAME_HXX
#define SW_FRAME_HXX #define SW_FRAME_HXX
...@@ -366,8 +367,10 @@ protected: ...@@ -366,8 +367,10 @@ protected:
// painted if <bCompletePaint> is sal_True. // painted if <bCompletePaint> is sal_True.
sal_Bool bCompletePaint : 1; sal_Bool bCompletePaint : 1;
sal_Bool bRetouche : 1; // frame is responsible for retouching sal_Bool bRetouche : 1; // frame is responsible for retouching
public: public:
sal_Bool bUnUsed2 : 1; sal_Bool bUnUsed2 : 1;
protected: protected:
sal_Bool bInfInvalid : 1; // InfoFlags are invalid sal_Bool bInfInvalid : 1; // InfoFlags are invalid
sal_Bool bInfBody : 1; // Frm is in document body sal_Bool bInfBody : 1; // Frm is in document body
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
#ifndef _IFINISHEDTHREADLISTENER_HXX #ifndef _IFINISHEDTHREADLISTENER_HXX
#define _IFINISHEDTHREADLISTENER_HXX #define _IFINISHEDTHREADLISTENER_HXX
...@@ -39,16 +40,14 @@ ...@@ -39,16 +40,14 @@
*/ */
class IFinishedThreadListener class IFinishedThreadListener
{ {
public: public:
inline virtual ~IFinishedThreadListener() inline virtual ~IFinishedThreadListener()
{ {
}; };
virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) = 0; virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) = 0;
protected: protected:
inline IFinishedThreadListener() inline IFinishedThreadListener()
{ {
}; };
......
...@@ -25,11 +25,11 @@ ...@@ -25,11 +25,11 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
#ifndef _ITHREADLISTENEROWNER_HXX #ifndef _ITHREADLISTENEROWNER_HXX
#define _ITHREADLISTENEROWNER_HXX #define _ITHREADLISTENEROWNER_HXX
#include <ifinishedthreadlistener.hxx> #include <ifinishedthreadlistener.hxx>
#include <boost/weak_ptr.hpp> #include <boost/weak_ptr.hpp>
/** interface class of the owner of a thread listener /** interface class of the owner of a thread listener
...@@ -40,18 +40,15 @@ ...@@ -40,18 +40,15 @@
*/ */
class IThreadListenerOwner class IThreadListenerOwner
{ {
public: public:
inline virtual ~IThreadListenerOwner() inline virtual ~IThreadListenerOwner()
{ {
}; };
virtual boost::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef() = 0; virtual boost::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef() = 0;
virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) = 0; virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) = 0;
protected: protected:
inline IThreadListenerOwner() inline IThreadListenerOwner()
{ {
}; };
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
#ifndef _LAYCACHE_HXX #ifndef _LAYCACHE_HXX
#define _LAYCACHE_HXX #define _LAYCACHE_HXX
...@@ -48,11 +49,11 @@ class SvStream; ...@@ -48,11 +49,11 @@ class SvStream;
* during the Read(..) function the lock count will set to $8000. * during the Read(..) function the lock count will set to $8000.
* *
**************************************************************************/ **************************************************************************/
class SwLayoutCache class SwLayoutCache
{ {
SwLayCacheImpl *pImpl; SwLayCacheImpl *pImpl;
sal_uInt16 nLockCount; sal_uInt16 nLockCount;
public: public:
SwLayoutCache() : pImpl( NULL ), nLockCount( 0 ) {} SwLayoutCache() : pImpl( NULL ), nLockCount( 0 ) {}
~SwLayoutCache(); ~SwLayoutCache();
...@@ -74,7 +75,6 @@ public: ...@@ -74,7 +75,6 @@ public:
sal_Bool CompareLayout( const SwDoc& rDoc ) const; sal_Bool CompareLayout( const SwDoc& rDoc ) const;
#endif #endif
}; };
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment