From 49c2b9808df8a6b197dec666dfc0cda6321a4306 Mon Sep 17 00:00:00 2001 From: Robinson Tryon Date: Wed, 25 Nov 2015 06:03:10 -0500 Subject: bin/rename-sw-abbreviations.sh This commit renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I77e5134f42f25e3786afa36b7a505c7e3237a9e8 --- sw/source/core/inc/dbg_lay.hxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'sw/source/core/inc/dbg_lay.hxx') diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx index 0febbf8f9a07..04bf1e6f3ee9 100644 --- a/sw/source/core/inc/dbg_lay.hxx +++ b/sw/source/core/inc/dbg_lay.hxx @@ -58,7 +58,7 @@ #include "swtypes.hxx" class SwImplProtocol; -class SwFrm; +class SwFrame; class SwImplEnterLeave; class SwProtocol @@ -71,7 +71,7 @@ public: static sal_uLong Record() { return nRecord; } static void SetRecord( sal_uLong nNew ) { nRecord = nNew; } static bool Record( sal_uLong nFunc ) { return 0 != (( nFunc | PROT_INIT ) & nRecord); } - static void Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAction, void* pParam ); + static void Record( const SwFrame* pFrame, sal_uLong nFunction, sal_uLong nAction, void* pParam ); static void Init(); static void Stop(); }; @@ -79,14 +79,14 @@ public: class SwEnterLeave { SwImplEnterLeave* pImpl; - void Ctor( const SwFrm* pFrm, sal_uLong nFunc, sal_uLong nAct, void* pPar ); + void Ctor( const SwFrame* pFrame, sal_uLong nFunc, sal_uLong nAct, void* pPar ); void Dtor(); public: - SwEnterLeave( const SwFrm* pFrm, sal_uLong nFunc, sal_uLong nAct, void* pPar ) + SwEnterLeave( const SwFrame* pFrame, sal_uLong nFunc, sal_uLong nAct, void* pPar ) { if( SwProtocol::Record( nFunc ) ) - Ctor( pFrm, nFunc, nAct, pPar ); + Ctor( pFrame, nFunc, nAct, pPar ); else pImpl = nullptr; } @@ -97,18 +97,18 @@ public: } }; -#define PROTOCOL( pFrm, nFunc, nAct, pPar ) { if( SwProtocol::Record( nFunc ) )\ - SwProtocol::Record( pFrm, nFunc, nAct, pPar ); } +#define PROTOCOL( pFrame, nFunc, nAct, pPar ) { if( SwProtocol::Record( nFunc ) )\ + SwProtocol::Record( pFrame, nFunc, nAct, pPar ); } #define PROTOCOL_INIT SwProtocol::Init(); #define PROTOCOL_STOP SwProtocol::Stop(); -#define PROTOCOL_ENTER( pFrm, nFunc, nAct, pPar ) SwEnterLeave aEnter( pFrm, nFunc, nAct, pPar ); +#define PROTOCOL_ENTER( pFrame, nFunc, nAct, pPar ) SwEnterLeave aEnter( pFrame, nFunc, nAct, pPar ); #else -#define PROTOCOL( pFrm, nFunc, nAct, pPar ) +#define PROTOCOL( pFrame, nFunc, nAct, pPar ) #define PROTOCOL_INIT #define PROTOCOL_STOP -#define PROTOCOL_ENTER( pFrm, nFunc, nAct, pPar ) +#define PROTOCOL_ENTER( pFrame, nFunc, nAct, pPar ) #endif -- cgit v1.2.3