[Libreoffice-commits] core.git: sw/inc sw/source
Miklos Vajna
vmiklos at suse.cz
Sun Feb 17 22:59:38 PST 2013
sw/inc/doc.hxx | 296 +++++++++++-----------
sw/source/core/bastyp/init.cxx | 6
sw/source/core/doc/doc.cxx | 252 +++++++++----------
sw/source/core/doc/docbasic.cxx | 10
sw/source/core/doc/docbm.cxx | 4
sw/source/core/doc/docchart.cxx | 12
sw/source/core/doc/doccorr.cxx | 8
sw/source/core/doc/docdde.cxx | 26 +-
sw/source/core/doc/docdesc.cxx | 64 ++--
sw/source/core/doc/docdraw.cxx | 80 +++---
sw/source/core/doc/docedt.cxx | 20 -
sw/source/core/doc/docfld.cxx | 228 ++++++++---------
sw/source/core/doc/docfmt.cxx | 118 ++++-----
sw/source/core/doc/docftn.cxx | 8
sw/source/core/doc/docglbl.cxx | 10
sw/source/core/doc/doclay.cxx | 36 +-
sw/source/core/doc/docnew.cxx | 468 ++++++++++++++++++------------------
sw/source/core/doc/docnum.cxx | 74 ++---
sw/source/core/doc/docredln.cxx | 348 +++++++++++++-------------
sw/source/core/doc/docsort.cxx | 2
sw/source/core/doc/doctxm.cxx | 50 +--
sw/source/core/doc/docxforms.cxx | 14 -
sw/source/core/doc/extinput.cxx | 24 -
sw/source/core/doc/lineinfo.cxx | 8
sw/source/core/doc/poolfmt.cxx | 56 ++--
sw/source/core/doc/visiturl.cxx | 8
sw/source/core/docnode/ndsect.cxx | 26 +-
sw/source/core/docnode/ndtbl.cxx | 18 -
sw/source/core/docnode/nodedump.cxx | 4
29 files changed, 1139 insertions(+), 1139 deletions(-)
New commits:
commit 2c9f9832fc6ab78e12c67da3687b4482a46e4bcc
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Mon Feb 18 07:54:37 2013 +0100
SwDoc: rename member variables missing their prefix
Change-Id: Id4683649aa9115f9075717768aa6cef4110c2ad2
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ccebf5c..7f95945 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -275,81 +275,81 @@ class SW_DLLPUBLIC SwDoc :
// -------------------------------------------------------------------
::boost::scoped_ptr<SwNodes> m_pNodes; ///< document content (Nodes Array)
SwAttrPool* mpAttrPool; ///< the attribute pool
- SwPageDescs aPageDescs; ///< PageDescriptors
- Link aOle2Link; ///< OLE 2.0-notification
+ SwPageDescs maPageDescs; ///< PageDescriptors
+ Link maOle2Link; ///< OLE 2.0-notification
/* @@@MAINTAINABILITY-HORROR@@@
Timer should not be members of the model
*/
- Timer aIdleTimer; ///< Own IdleTimer
- Timer aOLEModifiedTimer; ///< Timer for update modified OLE-Objecs
- Timer aStatsUpdateTimer; ///< Timer for asynchronous stats calculation
- SwDBData aDBData; ///< database descriptor
- ::com::sun::star::uno::Sequence <sal_Int8 > aRedlinePasswd;
- String sTOIAutoMarkURL; ///< ::com::sun::star::util::URL of table of index AutoMark file
- boost::ptr_vector< boost::nullable<String> > aPatternNms; // Array for names of document-templates
+ Timer maIdleTimer; ///< Own IdleTimer
+ Timer maOLEModifiedTimer; ///< Timer for update modified OLE-Objecs
+ Timer maStatsUpdateTimer; ///< Timer for asynchronous stats calculation
+ SwDBData maDBData; ///< database descriptor
+ ::com::sun::star::uno::Sequence <sal_Int8 > maRedlinePasswd;
+ String msTOIAutoMarkURL; ///< ::com::sun::star::util::URL of table of index AutoMark file
+ boost::ptr_vector< boost::nullable<String> > maPatternNms; // Array for names of document-templates
com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>
- xXForms; ///< container with XForms models
+ mxXForms; ///< container with XForms models
mutable com::sun::star::uno::Reference< com::sun::star::linguistic2::XProofreadingIterator > m_xGCIterator;
- const ::boost::scoped_ptr< ::sw::mark::MarkManager> pMarkManager;
+ const ::boost::scoped_ptr< ::sw::mark::MarkManager> mpMarkManager;
const ::boost::scoped_ptr< ::sw::MetaFieldManager > m_pMetaFieldManager;
const ::boost::scoped_ptr< ::sw::UndoManager > m_pUndoManager;
// -------------------------------------------------------------------
// Pointer
- SwFrmFmt *pDfltFrmFmt; ///< Default formats.
- SwFrmFmt *pEmptyPageFmt; ///< Format for the default empty page
- SwFrmFmt *pColumnContFmt; ///< Format for column container
- SwCharFmt *pDfltCharFmt;
- SwTxtFmtColl *pDfltTxtFmtColl; ///< Defaultformatcollections
- SwGrfFmtColl *pDfltGrfFmtColl;
-
- SwFrmFmts *pFrmFmtTbl; ///< Format table
- SwCharFmts *pCharFmtTbl;
- SwFrmFmts *pSpzFrmFmtTbl;
- SwSectionFmts *pSectionFmtTbl;
- SwFrmFmts *pTblFrmFmtTbl; ///< For tables
- SwTxtFmtColls *pTxtFmtCollTbl; ///< FormatCollections
- SwGrfFmtColls *pGrfFmtCollTbl;
-
- SwTOXTypes *pTOXTypes; ///< Tables/indices
- SwDefTOXBase_Impl * pDefTOXBases; ///< defaults of SwTOXBase's
-
- ViewShell *pCurrentView; ///< SwDoc should get a new member pCurrentView//swmod 071225
- boost::shared_ptr<SwRootFrm> pLayoutPtr;
- SdrModel *pDrawModel; ///< StarView Drawing
-
- SwDocUpdtFld *pUpdtFlds; ///< Struct for updating fields
- SwFldTypes *pFldTypes;
- SwNewDBMgr *pNewDBMgr; /**< Pointer to the new DBMgr for
+ SwFrmFmt *mpDfltFrmFmt; ///< Default formats.
+ SwFrmFmt *mpEmptyPageFmt; ///< Format for the default empty page
+ SwFrmFmt *mpColumnContFmt; ///< Format for column container
+ SwCharFmt *mpDfltCharFmt;
+ SwTxtFmtColl *mpDfltTxtFmtColl; ///< Defaultformatcollections
+ SwGrfFmtColl *mpDfltGrfFmtColl;
+
+ SwFrmFmts *mpFrmFmtTbl; ///< Format table
+ SwCharFmts *mpCharFmtTbl;
+ SwFrmFmts *mpSpzFrmFmtTbl;
+ SwSectionFmts *mpSectionFmtTbl;
+ SwFrmFmts *mpTblFrmFmtTbl; ///< For tables
+ SwTxtFmtColls *mpTxtFmtCollTbl; ///< FormatCollections
+ SwGrfFmtColls *mpGrfFmtCollTbl;
+
+ SwTOXTypes *mpTOXTypes; ///< Tables/indices
+ SwDefTOXBase_Impl * mpDefTOXBases; ///< defaults of SwTOXBase's
+
+ ViewShell *mpCurrentView; ///< SwDoc should get a new member mpCurrentView//swmod 071225
+ boost::shared_ptr<SwRootFrm> mpLayoutPtr;
+ SdrModel *mpDrawModel; ///< StarView Drawing
+
+ SwDocUpdtFld *mpUpdtFlds; ///< Struct for updating fields
+ SwFldTypes *mpFldTypes;
+ SwNewDBMgr *mpNewDBMgr; /**< Pointer to the new DBMgr for
evaluation of DB-fields. */
- VirtualDevice *pVirDev; ///< can be used for formatting
- SfxPrinter *pPrt; ///< can be used for formatting
- SwPrintData *pPrtData; ///< Print configuration
+ VirtualDevice *mpVirDev; ///< can be used for formatting
+ SfxPrinter *mpPrt; ///< can be used for formatting
+ SwPrintData *mpPrtData; ///< Print configuration
- SwDoc *pGlossaryDoc; ///< Pointer to glossary-document.
+ SwDoc *mpGlossaryDoc; ///< Pointer to glossary-document.
- SwNumRule *pOutlineRule;
- SwFtnInfo *pFtnInfo;
- SwEndNoteInfo *pEndNoteInfo;
- SwLineNumberInfo*pLineNumberInfo;
- SwFtnIdxs *pFtnIdxs;
- SwDocStat *pDocStat; ///< Statistics information.
+ SwNumRule *mpOutlineRule;
+ SwFtnInfo *mpFtnInfo;
+ SwEndNoteInfo *mpEndNoteInfo;
+ SwLineNumberInfo*mpLineNumberInfo;
+ SwFtnIdxs *mpFtnIdxs;
+ SwDocStat *mpDocStat; ///< Statistics information.
- SwDocShell *pDocShell; ///< Ptr to SfxDocShell of Doc.
- SfxObjectShellLock xTmpDocShell; ///< A temporary shell that is used to copy OLE-Nodes
+ SwDocShell *mpDocShell; ///< Ptr to SfxDocShell of Doc.
+ SfxObjectShellLock mxTmpDocShell; ///< A temporary shell that is used to copy OLE-Nodes
- sfx2::LinkManager *pLinkMgr; ///< List of linked stuff (graphics/DDE/OLE).
+ sfx2::LinkManager *mpLinkMgr; ///< List of linked stuff (graphics/DDE/OLE).
- SwAutoCorrExceptWord *pACEWord; /**< For the automated takeover of
+ SwAutoCorrExceptWord *mpACEWord; /**< For the automated takeover of
auto-corrected words that are "re-corrected". */
- SwURLStateChanged *pURLStateChgd; ///< SfxClient for changes in INetHistory
- SvNumberFormatter *pNumberFormatter;///< NumFormatter for tables / fields
+ SwURLStateChanged *mpURLStateChgd; ///< SfxClient for changes in INetHistory
+ SvNumberFormatter *mpNumberFormatter;///< NumFormatter for tables / fields
- mutable SwNumRuleTbl *pNumRuleTbl; ///< List of all named NumRules.
+ mutable SwNumRuleTbl *mpNumRuleTbl; ///< List of all named NumRules.
/// Hash map to find numrules by name
mutable boost::unordered_map<String, SwNumRule *, StringHash> maNumRuleMap;
@@ -360,30 +360,30 @@ class SW_DLLPUBLIC SwDoc :
/// relation between list style and its default list
tHashMapForLists maListStyleLists;
- SwRedlineTbl *pRedlineTbl; ///< List of all Redlines.
- String *pAutoFmtRedlnComment; ///< Comment for Redlines inserted via AutoFormat.
+ SwRedlineTbl *mpRedlineTbl; ///< List of all Redlines.
+ String *mpAutoFmtRedlnComment; ///< Comment for Redlines inserted via AutoFormat.
- SwUnoCrsrTbl *pUnoCrsrTbl;
+ SwUnoCrsrTbl *mpUnoCrsrTbl;
- SwPagePreViewPrtData *pPgPViewPrtData; ///< Indenting / spacing for printing of page view.
- SwPaM *pExtInputRing;
+ SwPagePreViewPrtData *mpPgPViewPrtData; ///< Indenting / spacing for printing of page view.
+ SwPaM *mpExtInputRing;
- SwLayouter *pLayouter; /**< ::com::sun::star::frame::Controller for complex layout formatting
+ SwLayouter *mpLayouter; /**< ::com::sun::star::frame::Controller for complex layout formatting
like footnote/endnote in sections */
- IStyleAccess *pStyleAccess; ///< handling of automatic styles
- SwLayoutCache *pLayoutCache; /**< Layout cache to read and save with the
+ IStyleAccess *mpStyleAccess; ///< handling of automatic styles
+ SwLayoutCache *mpLayoutCache; /**< Layout cache to read and save with the
document for a faster formatting */
- SwModify *pUnoCallBack;
+ SwModify *mpUnoCallBack;
IGrammarContact *mpGrammarContact; ///< for grammar checking in paragraphs during editing
mutable comphelper::ImplementationReference< SwChartDataProvider
, ::com::sun::star::chart2::data::XDataProvider >
- aChartDataProviderImplRef;
- SwChartLockController_Helper *pChartControllerHelper;
+ maChartDataProviderImplRef;
+ SwChartLockController_Helper *mpChartControllerHelper;
/// table of forbidden characters of this document
- rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable;
+ rtl::Reference<SvxForbiddenCharactersTable> mxForbiddenCharsTable;
com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > mxVbaEvents;
com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> m_xTemplateToProjectCache;
public:
@@ -402,35 +402,35 @@ private:
// -------------------------------------------------------------------
// other
- sal_uInt16 nUndoCnt; ///< Count of Undo Actions.
- sal_uInt16 nUndoSttEnd; ///< != 0 -> within parentheses.
+ sal_uInt16 mnUndoCnt; ///< Count of Undo Actions.
+ sal_uInt16 mnUndoSttEnd; ///< != 0 -> within parentheses.
- sal_uInt16 nAutoFmtRedlnCommentNo; /**< SeqNo for conjoining of AutoFmt-Redlines.
+ sal_uInt16 mnAutoFmtRedlnCommentNo; /**< SeqNo for conjoining of AutoFmt-Redlines.
by the UI. Managed by SwAutoFmt! */
- sal_uInt16 nLinkUpdMode; ///< UpdateMode for links.
- SwFldUpdateFlags eFldUpdMode;///< Automatically Update Mode for fields/charts.
- RedlineMode_t eRedlineMode; ///< Current Redline Mode.
- SwCharCompressType eChrCmprType;///< for ASIAN: compress punctuation/kana
+ sal_uInt16 mnLinkUpdMode; ///< UpdateMode for links.
+ SwFldUpdateFlags meFldUpdMode;///< Automatically Update Mode for fields/charts.
+ RedlineMode_t meRedlineMode; ///< Current Redline Mode.
+ SwCharCompressType meChrCmprType;///< for ASIAN: compress punctuation/kana
- sal_uInt32 nRsid; ///< current session ID of the document
- sal_uInt32 nRsidRoot; ///< session ID when the document was created
+ sal_uInt32 mnRsid; ///< current session ID of the document
+ sal_uInt32 mnRsidRoot; ///< session ID when the document was created
sal_Int32 mReferenceCount;
sal_Int32 mIdleBlockCount;
- sal_Int8 nLockExpFld; ///< If != 0 UpdateExpFlds() has no effect!
+ sal_Int8 mnLockExpFld; ///< If != 0 UpdateExpFlds() has no effect!
/** Draw Model Layer IDs
* LayerIds, Heaven == above document
* Hell == below document
* Controls == at the very top
*/
- SdrLayerID nHeaven;
- SdrLayerID nHell;
- SdrLayerID nControls;
- SdrLayerID nInvisibleHeaven;
- SdrLayerID nInvisibleHell;
- SdrLayerID nInvisibleControls;
+ SdrLayerID mnHeaven;
+ SdrLayerID mnHell;
+ SdrLayerID mnControls;
+ SdrLayerID mnInvisibleHeaven;
+ SdrLayerID mnInvisibleHell;
+ SdrLayerID mnInvisibleControls;
bool mbGlossDoc : 1; ///< TRUE: glossary document.
bool mbModified : 1; ///< TRUE: document has changed.
@@ -583,8 +583,8 @@ private:
bool mbLastBrowseMode : 1;
- sal_uInt32 n32DummyCompatabilityOptions1;
- sal_uInt32 n32DummyCompatabilityOptions2;
+ sal_uInt32 mn32DummyCompatabilityOptions1;
+ sal_uInt32 mn32DummyCompatabilityOptions2;
//
// COMPATIBILITY FLAGS END
//
@@ -593,7 +593,7 @@ private:
bool mbSetDrawDefaults; ///< set draw pool defaults for freshly created documents
- static SwAutoCompleteWord *pACmpltWords; ///< List of all words for AutoComplete
+ static SwAutoCompleteWord *mpACmpltWords; ///< List of all words for AutoComplete
//---------------- private methods ------------------------------
void checkRedlining(RedlineMode_t& _rReadlineMode);
@@ -1083,12 +1083,12 @@ public:
/** Footnotes
*/
// Footnote information
- const SwFtnInfo& GetFtnInfo() const { return *pFtnInfo; }
+ const SwFtnInfo& GetFtnInfo() const { return *mpFtnInfo; }
void SetFtnInfo(const SwFtnInfo& rInfo);
- const SwEndNoteInfo& GetEndNoteInfo() const { return *pEndNoteInfo; }
+ const SwEndNoteInfo& GetEndNoteInfo() const { return *mpEndNoteInfo; }
void SetEndNoteInfo(const SwEndNoteInfo& rInfo);
- SwFtnIdxs& GetFtnIdxs() { return *pFtnIdxs; }
- const SwFtnIdxs& GetFtnIdxs() const { return *pFtnIdxs; }
+ SwFtnIdxs& GetFtnIdxs() { return *mpFtnIdxs; }
+ const SwFtnIdxs& GetFtnIdxs() const { return *mpFtnIdxs; }
/// change footnotes in area
bool SetCurFtn( const SwPaM& rPam, const String& rNumStr,
sal_uInt16 nNumber, bool bIsEndNote );
@@ -1127,8 +1127,8 @@ public:
/** Database and DB-Manager
*/
- void SetNewDBMgr( SwNewDBMgr* pNewMgr ) { pNewDBMgr = pNewMgr; }
- SwNewDBMgr* GetNewDBMgr() const { return pNewDBMgr; }
+ void SetNewDBMgr( SwNewDBMgr* pNewMgr ) { mpNewDBMgr = pNewMgr; }
+ SwNewDBMgr* GetNewDBMgr() const { return mpNewDBMgr; }
void ChangeDBFields( const std::vector<String>& rOldNames,
const String& rNewName );
void SetInitDBFields(sal_Bool b);
@@ -1140,7 +1140,7 @@ public:
void ChgDBData( const SwDBData& rNewData );
SwDBData GetDBData();
const SwDBData& GetDBDesc();
- const SwDBData& _GetDBDesc() const { return aDBData; }
+ const SwDBData& _GetDBDesc() const { return maDBData; }
/** Some helper functions
*/
@@ -1190,25 +1190,25 @@ public:
bool DontExpandFmt( const SwPosition& rPos, bool bFlag = true );
/* Formats */
- const SwFrmFmts* GetFrmFmts() const { return pFrmFmtTbl; }
- SwFrmFmts* GetFrmFmts() { return pFrmFmtTbl; }
- const SwCharFmts* GetCharFmts() const { return pCharFmtTbl;}
+ const SwFrmFmts* GetFrmFmts() const { return mpFrmFmtTbl; }
+ SwFrmFmts* GetFrmFmts() { return mpFrmFmtTbl; }
+ const SwCharFmts* GetCharFmts() const { return mpCharFmtTbl;}
/** LayoutFormats (frames, DrawObjects), sometimes const sometimes not */
- const SwFrmFmts* GetSpzFrmFmts() const { return pSpzFrmFmtTbl; }
- SwFrmFmts* GetSpzFrmFmts() { return pSpzFrmFmtTbl; }
-
- const SwFrmFmt *GetDfltFrmFmt() const { return pDfltFrmFmt; }
- SwFrmFmt *GetDfltFrmFmt() { return pDfltFrmFmt; }
- const SwFrmFmt *GetEmptyPageFmt() const { return pEmptyPageFmt; }
- SwFrmFmt *GetEmptyPageFmt() { return pEmptyPageFmt; }
- const SwFrmFmt *GetColumnContFmt() const{ return pColumnContFmt; }
- SwFrmFmt *GetColumnContFmt() { return pColumnContFmt; }
- const SwCharFmt *GetDfltCharFmt() const { return pDfltCharFmt;}
- SwCharFmt *GetDfltCharFmt() { return pDfltCharFmt;}
+ const SwFrmFmts* GetSpzFrmFmts() const { return mpSpzFrmFmtTbl; }
+ SwFrmFmts* GetSpzFrmFmts() { return mpSpzFrmFmtTbl; }
+
+ const SwFrmFmt *GetDfltFrmFmt() const { return mpDfltFrmFmt; }
+ SwFrmFmt *GetDfltFrmFmt() { return mpDfltFrmFmt; }
+ const SwFrmFmt *GetEmptyPageFmt() const { return mpEmptyPageFmt; }
+ SwFrmFmt *GetEmptyPageFmt() { return mpEmptyPageFmt; }
+ const SwFrmFmt *GetColumnContFmt() const{ return mpColumnContFmt; }
+ SwFrmFmt *GetColumnContFmt() { return mpColumnContFmt; }
+ const SwCharFmt *GetDfltCharFmt() const { return mpDfltCharFmt;}
+ SwCharFmt *GetDfltCharFmt() { return mpDfltCharFmt;}
/// @return the interface of the management of (auto)styles
- IStyleAccess& GetIStyleAccess() { return *pStyleAccess; }
+ IStyleAccess& GetIStyleAccess() { return *mpStyleAccess; }
/// Remove all language dependencies from all existing formats
void RemoveAllFmtLanguageDependencies();
@@ -1217,7 +1217,7 @@ public:
bool bBroadcast = false, bool bAuto = true);
void DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast = false );
SwFrmFmt* FindFrmFmtByName( const String& rName ) const
- { return (SwFrmFmt*)FindFmtByName( (SwFmtsBase&)*pFrmFmtTbl, rName ); }
+ { return (SwFrmFmt*)FindFmtByName( (SwFmtsBase&)*mpFrmFmtTbl, rName ); }
SwCharFmt *MakeCharFmt(const String &rFmtName, SwCharFmt *pDerivedFrom,
bool bBroadcast = false,
@@ -1225,12 +1225,12 @@ public:
void DelCharFmt(sal_uInt16 nFmt, bool bBroadcast = false);
void DelCharFmt(SwCharFmt* pFmt, bool bBroadcast = false);
SwCharFmt* FindCharFmtByName( const String& rName ) const
- { return (SwCharFmt*)FindFmtByName( (SwFmtsBase&)*pCharFmtTbl, rName ); }
+ { return (SwCharFmt*)FindFmtByName( (SwFmtsBase&)*mpCharFmtTbl, rName ); }
/* Formatcollections (styles) */
// TXT
- const SwTxtFmtColl* GetDfltTxtFmtColl() const { return pDfltTxtFmtColl; }
- const SwTxtFmtColls *GetTxtFmtColls() const { return pTxtFmtCollTbl; }
+ const SwTxtFmtColl* GetDfltTxtFmtColl() const { return mpDfltTxtFmtColl; }
+ const SwTxtFmtColls *GetTxtFmtColls() const { return mpTxtFmtCollTbl; }
SwTxtFmtColl *MakeTxtFmtColl( const String &rFmtName,
SwTxtFmtColl *pDerivedFrom,
bool bBroadcast = false,
@@ -1251,20 +1251,20 @@ public:
bool bReset = true,
bool bResetListAttrs = false );
SwTxtFmtColl* FindTxtFmtCollByName( const String& rName ) const
- { return (SwTxtFmtColl*)FindFmtByName( (SwFmtsBase&)*pTxtFmtCollTbl, rName ); }
+ { return (SwTxtFmtColl*)FindFmtByName( (SwFmtsBase&)*mpTxtFmtCollTbl, rName ); }
void ChkCondColls();
- const SwGrfFmtColl* GetDfltGrfFmtColl() const { return pDfltGrfFmtColl; }
- const SwGrfFmtColls *GetGrfFmtColls() const { return pGrfFmtCollTbl; }
+ const SwGrfFmtColl* GetDfltGrfFmtColl() const { return mpDfltGrfFmtColl; }
+ const SwGrfFmtColls *GetGrfFmtColls() const { return mpGrfFmtCollTbl; }
SwGrfFmtColl *MakeGrfFmtColl(const String &rFmtName,
SwGrfFmtColl *pDerivedFrom);
SwGrfFmtColl* FindGrfFmtCollByName( const String& rName ) const
- { return (SwGrfFmtColl*)FindFmtByName( (SwFmtsBase&)*pGrfFmtCollTbl, rName ); }
+ { return (SwGrfFmtColl*)FindFmtByName( (SwFmtsBase&)*mpGrfFmtCollTbl, rName ); }
/// Table formating
- const SwFrmFmts* GetTblFrmFmts() const { return pTblFrmFmtTbl; }
- SwFrmFmts* GetTblFrmFmts() { return pTblFrmFmtTbl; }
+ const SwFrmFmts* GetTblFrmFmts() const { return mpTblFrmFmtTbl; }
+ SwFrmFmts* GetTblFrmFmts() { return mpTblFrmFmtTbl; }
sal_uInt16 GetTblFrmFmtCount( bool bUsed ) const;
SwFrmFmt& GetTblFrmFmt(sal_uInt16 nFmt, bool bUsed ) const;
SwTableFmt* MakeTblFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom);
@@ -1301,18 +1301,18 @@ public:
/// @return name of document template. Can be 0!
const String* GetDocPattern( sal_uInt16 nPos ) const
{
- if(nPos >= aPatternNms.size())
+ if(nPos >= maPatternNms.size())
return NULL;
- if(boost::is_null(aPatternNms.begin() + nPos))
+ if(boost::is_null(maPatternNms.begin() + nPos))
return NULL;
- return &(aPatternNms[nPos]);
+ return &(maPatternNms[nPos]);
}
/// Delete all unreferenced field types.
void GCFieldTypes(); ///< impl. in docfld.cxx
/// Query / connect current document with glossary document.
- void SetGlossaryDoc( SwDoc* pDoc ) { pGlossaryDoc = pDoc; }
+ void SetGlossaryDoc( SwDoc* pDoc ) { mpGlossaryDoc = pDoc; }
/// travel over PaM Ring
bool InsertGlossary( SwTextBlocks& rBlock, const String& rEntry,
@@ -1328,9 +1328,9 @@ public:
sal_Int32 nDocPageCount );
/// PageDescriptor interface.
- sal_uInt16 GetPageDescCnt() const { return aPageDescs.size(); }
- const SwPageDesc& GetPageDesc( const sal_uInt16 i ) const { return *aPageDescs[i]; }
- SwPageDesc& GetPageDesc( sal_uInt16 i ) { return *aPageDescs[i]; }
+ sal_uInt16 GetPageDescCnt() const { return maPageDescs.size(); }
+ const SwPageDesc& GetPageDesc( const sal_uInt16 i ) const { return *maPageDescs[i]; }
+ SwPageDesc& GetPageDesc( sal_uInt16 i ) { return *maPageDescs[i]; }
SwPageDesc* FindPageDescByName( const String& rName,
sal_uInt16* pPos = 0 ) const;
@@ -1398,8 +1398,8 @@ public:
void SetUpdateTOX( bool bFlag = true ) { mbUpdateTOX = bFlag; }
bool IsUpdateTOX() const { return mbUpdateTOX; }
- const String& GetTOIAutoMarkURL() const {return sTOIAutoMarkURL;}
- void SetTOIAutoMarkURL(const String& rSet) {sTOIAutoMarkURL = rSet;}
+ const String& GetTOIAutoMarkURL() const {return msTOIAutoMarkURL;}
+ void SetTOIAutoMarkURL(const String& rSet) {msTOIAutoMarkURL = rSet;}
void ApplyAutoMark();
bool IsInReading() const { return mbInReading; }
@@ -1420,7 +1420,7 @@ public:
const SwTOXType* GetTOXType( TOXTypes eTyp, sal_uInt16 nId ) const;
sal_Bool DeleteTOXType( TOXTypes eTyp, sal_uInt16 nId );
const SwTOXType* InsertTOXType( const SwTOXType& rTyp );
- const SwTOXTypes& GetTOXTypes() const { return *pTOXTypes; }
+ const SwTOXTypes& GetTOXTypes() const { return *mpTOXTypes; }
const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, bool bCreate = false );
void SetDefaultTOXBase(const SwTOXBase& rBase);
@@ -1455,7 +1455,7 @@ public:
/// Query / set rules for Outline.
inline SwNumRule* GetOutlineNumRule() const
{
- return pOutlineRule;
+ return mpOutlineRule;
}
void SetOutlineNumRule( const SwNumRule& rRule );
void PropagateOutlineRule();
@@ -1492,7 +1492,7 @@ public:
SwNumRule* GetCurrNumRule( const SwPosition& rPos ) const;
- const SwNumRuleTbl& GetNumRuleTbl() const { return *pNumRuleTbl; }
+ const SwNumRuleTbl& GetNumRuleTbl() const { return *mpNumRuleTbl; }
/**
Add numbering rule to document.
@@ -1729,8 +1729,8 @@ public:
::sw::IShellCursorSupplier * GetIShellCursorSupplier();
/// OLE 2.0-notification.
- inline void SetOle2Link(const Link& rLink) {aOle2Link = rLink;}
- inline const Link& GetOle2Link() const {return aOle2Link;}
+ inline void SetOle2Link(const Link& rLink) {maOle2Link = rLink;}
+ inline const Link& GetOle2Link() const {return maOle2Link;}
/// insert section (the ODF kind of section, not the nodesarray kind)
SwSection * InsertSwSection(SwPaM const& rRange, SwSectionData &,
@@ -1739,8 +1739,8 @@ public:
sal_uInt16 IsInsRegionAvailable( const SwPaM& rRange,
const SwNode** ppSttNd = 0 ) const;
SwSection* GetCurrSection( const SwPosition& rPos ) const;
- SwSectionFmts& GetSections() { return *pSectionFmtTbl; }
- const SwSectionFmts& GetSections() const { return *pSectionFmtTbl; }
+ SwSectionFmts& GetSections() { return *mpSectionFmtTbl; }
+ const SwSectionFmts& GetSections() const { return *mpSectionFmtTbl; }
SwSectionFmt *MakeSectionFmt( SwSectionFmt *pDerivedFrom );
void DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes = false );
void UpdateSection(sal_uInt16 const nSect, SwSectionData &,
@@ -1753,16 +1753,16 @@ public:
*/
// Pointer to SfxDocShell from Doc. Can be 0!!
- SwDocShell* GetDocShell() { return pDocShell; }
- const SwDocShell* GetDocShell() const { return pDocShell; }
+ SwDocShell* GetDocShell() { return mpDocShell; }
+ const SwDocShell* GetDocShell() const { return mpDocShell; }
void SetDocShell( SwDocShell* pDSh );
void ShareLayout( boost::shared_ptr<SwRootFrm>& rPtr);
/** in case during copying of embedded object a new shell is created,
it should be set here and cleaned later */
- void SetTmpDocShell( SfxObjectShellLock rLock ) { xTmpDocShell = rLock; }
- SfxObjectShellLock GetTmpDocShell() { return xTmpDocShell; }
+ void SetTmpDocShell( SfxObjectShellLock rLock ) { mxTmpDocShell = rLock; }
+ SfxObjectShellLock GetTmpDocShell() { return mxTmpDocShell; }
/// For Autotexts? (text modules) They have only one SVPersist at their disposal.
SfxObjectShell* GetPersist() const;
@@ -1798,7 +1798,7 @@ public:
/// Save current values for automatic registration of exceptions in Autocorrection.
void SetAutoCorrExceptWord( SwAutoCorrExceptWord* pNew );
- SwAutoCorrExceptWord* GetAutoCorrExceptWord() { return pACEWord; }
+ SwAutoCorrExceptWord* GetAutoCorrExceptWord() { return mpACEWord; }
const SwFmtINetFmt* FindINetAttr( const String& rName ) const;
@@ -1860,7 +1860,7 @@ public:
void ClearDoc(); // Deletes all content!
/// Query /set data for PagePreView.
- const SwPagePreViewPrtData* GetPreViewPrtData() const { return pPgPViewPrtData; }
+ const SwPagePreViewPrtData* GetPreViewPrtData() const { return mpPgPViewPrtData; }
// If pointer == 0 destroy pointer in document.
// Else copy object.
@@ -1870,10 +1870,10 @@ public:
/** update all modified OLE-Objects. The modification is called over the
StarOne - Interface */
void SetOLEObjModified()
- { if( GetCurrentViewShell() ) aOLEModifiedTimer.Start(); } //swmod 071107//swmod 071225
+ { if( GetCurrentViewShell() ) maOLEModifiedTimer.Start(); } //swmod 071107//swmod 071225
// -------------------- Uno - Interfaces ---------------------------
- const SwUnoCrsrTbl& GetUnoCrsrTbl() const { return *pUnoCrsrTbl; }
+ const SwUnoCrsrTbl& GetUnoCrsrTbl() const { return *mpUnoCrsrTbl; }
SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr = false );
// -------------------- FeShell - Interfaces -----------------------
@@ -1930,7 +1930,7 @@ public:
SwExtTextInput* GetExtTextInput() const;
/// Interface for access to AutoComplete-List.
- static SwAutoCompleteWord& GetAutoCompleteWords() { return *pACmpltWords; }
+ static SwAutoCompleteWord& GetAutoCompleteWords() { return *mpACmpltWords; }
bool ContainsMSVBasic() const { return mbContains_MSVBasic; }
void SetContainsMSVBasic( bool bFlag ) { mbContains_MSVBasic = bFlag; }
@@ -1943,7 +1943,7 @@ public:
void ReadLayoutCache( SvStream& rStream );
void WriteLayoutCache( SvStream& rStream );
- SwLayoutCache* GetLayoutCache() const { return pLayoutCache; }
+ SwLayoutCache* GetLayoutCache() const { return mpLayoutCache; }
/** Checks if any of the text node contains hidden characters.
Used for optimization. Changing the view option 'view hidden text'
@@ -2033,19 +2033,19 @@ public:
void Setn32DummyCompatabilityOptions1( sal_uInt32 CompatabilityOptions1 )
{
- n32DummyCompatabilityOptions1 = CompatabilityOptions1;
+ mn32DummyCompatabilityOptions1 = CompatabilityOptions1;
}
sal_uInt32 Getn32DummyCompatabilityOptions1( )
{
- return n32DummyCompatabilityOptions1;
+ return mn32DummyCompatabilityOptions1;
}
void Setn32DummyCompatabilityOptions2( sal_uInt32 CompatabilityOptions2 )
{
- n32DummyCompatabilityOptions2 = CompatabilityOptions2;
+ mn32DummyCompatabilityOptions2 = CompatabilityOptions2;
}
sal_uInt32 Getn32DummyCompatabilityOptions2( )
{
- return n32DummyCompatabilityOptions2;
+ return mn32DummyCompatabilityOptions2;
}
com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > GetVbaEventProcessor();
void SetVBATemplateToProjectCache( com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xCache ) { m_xTemplateToProjectCache = xCache; };
@@ -2095,9 +2095,9 @@ inline const SwTableNode* SwDoc::IsIdxInTbl( const SwNodeIndex& rIdx ) const
inline SvNumberFormatter* SwDoc::GetNumberFormatter( sal_Bool bCreate )
{
- if( bCreate && !pNumberFormatter )
+ if( bCreate && !mpNumberFormatter )
_CreateNumberFormatter();
- return pNumberFormatter;
+ return mpNumberFormatter;
}
inline const SvNumberFormatter* SwDoc::GetNumberFormatter( sal_Bool bCreate ) const
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index fc0114b..c8ab4d8 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -428,7 +428,7 @@ const sal_Char* pMarkToOLE = "ole";
std::vector<SvGlobalName*> *pGlobalOLEExcludeList = 0;
-SwAutoCompleteWord* SwDoc::pACmpltWords = 0;
+SwAutoCompleteWord* SwDoc::mpACmpltWords = 0;
SwCheckIt* pCheckIt = 0;
CharClass* pAppCharClass = 0;
@@ -710,7 +710,7 @@ void _InitCore()
pGlobalOLEExcludeList = new std::vector<SvGlobalName*>;
const SvxSwAutoFmtFlags& rAFlags = SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
- SwDoc::pACmpltWords = new SwAutoCompleteWord( rAFlags.nAutoCmpltListLen,
+ SwDoc::mpACmpltWords = new SwAutoCompleteWord( rAFlags.nAutoCmpltListLen,
rAFlags.nAutoCmpltWordLen );
}
@@ -738,7 +738,7 @@ void _FinitCore()
if ( aAttrTab[0]->GetRefCount() )
SfxItemPool::ReleaseDefaults( aAttrTab, POOLATTR_END-POOLATTR_BEGIN, sal_False);
#endif
- delete SwDoc::pACmpltWords;
+ delete SwDoc::mpACmpltWords;
delete SwStyleNameMapper::pTextUINameArray;
delete SwStyleNameMapper::pListsUINameArray;
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index c5879f4..7c6379a 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -252,11 +252,11 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value)
UpdateNumRule();
- if (pOutlineRule)
+ if (mpOutlineRule)
{
- pOutlineRule->Validate();
+ mpOutlineRule->Validate();
// counting of phantoms depends on <IsOldNumbering()>
- pOutlineRule->SetCountPhantoms( !mbOldNumbering );
+ mpOutlineRule->SetCountPhantoms( !mbOldNumbering );
}
}
break;
@@ -411,8 +411,8 @@ const i18n::ForbiddenCharacters*
SwDoc::getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const
{
const i18n::ForbiddenCharacters* pRet = 0;
- if( xForbiddenCharsTable.is() )
- pRet = xForbiddenCharsTable->GetForbiddenCharacters( nLang, sal_False );
+ if( mxForbiddenCharsTable.is() )
+ pRet = mxForbiddenCharsTable->GetForbiddenCharacters( nLang, sal_False );
if( bLocaleData && !pRet && pBreakIt )
pRet = &pBreakIt->GetForbidden( (LanguageType)nLang );
return pRet;
@@ -421,16 +421,16 @@ const i18n::ForbiddenCharacters*
void SwDoc::setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang,
/*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rFChars )
{
- if( !xForbiddenCharsTable.is() )
+ if( !mxForbiddenCharsTable.is() )
{
- xForbiddenCharsTable = new SvxForbiddenCharactersTable( ::comphelper::getProcessComponentContext() );
+ mxForbiddenCharsTable = new SvxForbiddenCharactersTable( ::comphelper::getProcessComponentContext() );
}
- xForbiddenCharsTable->SetForbiddenCharacters( nLang, rFChars );
- if( pDrawModel )
+ mxForbiddenCharsTable->SetForbiddenCharacters( nLang, rFChars );
+ if( mpDrawModel )
{
- pDrawModel->SetForbiddenCharsTable( xForbiddenCharsTable );
+ mpDrawModel->SetForbiddenCharsTable( mxForbiddenCharsTable );
if( !mbInReading )
- pDrawModel->ReformatAllTextObjects();
+ mpDrawModel->ReformatAllTextObjects();
}
SwRootFrm* pTmpRoot = GetCurrentLayout();
@@ -446,21 +446,21 @@ void SwDoc::setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang,
rtl::Reference<SvxForbiddenCharactersTable>& SwDoc::getForbiddenCharacterTable()
{
- if( !xForbiddenCharsTable.is() )
+ if( !mxForbiddenCharsTable.is() )
{
- xForbiddenCharsTable = new SvxForbiddenCharactersTable( ::comphelper::getProcessComponentContext() );
+ mxForbiddenCharsTable = new SvxForbiddenCharactersTable( ::comphelper::getProcessComponentContext() );
}
- return xForbiddenCharsTable;
+ return mxForbiddenCharsTable;
}
const rtl::Reference<SvxForbiddenCharactersTable>& SwDoc::getForbiddenCharacterTable() const
{
- return xForbiddenCharsTable;
+ return mxForbiddenCharsTable;
}
sal_uInt16 SwDoc::getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const
{
- sal_uInt16 nRet = nLinkUpdMode;
+ sal_uInt16 nRet = mnLinkUpdMode;
if( bGlobalSettings && GLOBALSETTING == nRet )
nRet = SW_MOD()->GetLinkUpdMode(get(IDocumentSettingAccess::HTML_MODE));
return nRet;
@@ -468,12 +468,12 @@ sal_uInt16 SwDoc::getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const
void SwDoc::setLinkUpdateMode( /*[in]*/sal_uInt16 eMode )
{
- nLinkUpdMode = eMode;
+ mnLinkUpdMode = eMode;
}
sal_uInt32 SwDoc::getRsid() const
{
- return nRsid;
+ return mnRsid;
}
void SwDoc::setRsid( sal_uInt32 nVal )
@@ -485,22 +485,22 @@ void SwDoc::setRsid( sal_uInt32 nVal )
rtl_random_getBytes( aPool, &nIncrease, sizeof ( nIncrease ) );
nIncrease &= ( 1<<17 ) - 1;
nIncrease++; // make sure the new rsid is not the same
- nRsid = nVal + nIncrease;
+ mnRsid = nVal + nIncrease;
}
sal_uInt32 SwDoc::getRsidRoot() const
{
- return nRsidRoot;
+ return mnRsidRoot;
}
void SwDoc::setRsidRoot( sal_uInt32 nVal )
{
- nRsidRoot = nVal;
+ mnRsidRoot = nVal;
}
SwFldUpdateFlags SwDoc::getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const
{
- SwFldUpdateFlags eRet = eFldUpdMode;
+ SwFldUpdateFlags eRet = meFldUpdMode;
if( bGlobalSettings && AUTOUPD_GLOBALSETTING == eRet )
eRet = SW_MOD()->GetFldUpdateFlags(get(IDocumentSettingAccess::HTML_MODE));
return eRet;
@@ -508,24 +508,24 @@ SwFldUpdateFlags SwDoc::getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) cons
void SwDoc::setFieldUpdateFlags(/*[in]*/SwFldUpdateFlags eMode )
{
- eFldUpdMode = eMode;
+ meFldUpdMode = eMode;
}
SwCharCompressType SwDoc::getCharacterCompressionType() const
{
- return eChrCmprType;
+ return meChrCmprType;
}
void SwDoc::setCharacterCompressionType( /*[in]*/SwCharCompressType n )
{
- if( eChrCmprType != n )
+ if( meChrCmprType != n )
{
- eChrCmprType = n;
- if( pDrawModel )
+ meChrCmprType = n;
+ if( mpDrawModel )
{
- pDrawModel->SetCharCompressType( static_cast<sal_uInt16>(n) );
+ mpDrawModel->SetCharCompressType( static_cast<sal_uInt16>(n) );
if( !mbInReading )
- pDrawModel->ReformatAllTextObjects();
+ mpDrawModel->ReformatAllTextObjects();
}
SwRootFrm* pTmpRoot = GetCurrentLayout();
@@ -544,8 +544,8 @@ void SwDoc::setCharacterCompressionType( /*[in]*/SwCharCompressType n )
SfxPrinter* SwDoc::getPrinter(/*[in]*/ bool bCreate ) const
{
SfxPrinter* pRet = 0;
- if ( !bCreate || pPrt )
- pRet = pPrt;
+ if ( !bCreate || mpPrt )
+ pRet = mpPrt;
else
pRet = &CreatePrinter_();
@@ -554,24 +554,24 @@ SfxPrinter* SwDoc::getPrinter(/*[in]*/ bool bCreate ) const
void SwDoc::setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged )
{
- if ( pP != pPrt )
+ if ( pP != mpPrt )
{
if ( bDeleteOld )
- delete pPrt;
- pPrt = pP;
+ delete mpPrt;
+ mpPrt = pP;
// our printer should always use TWIP. Don't rely on this being set in ViewShell::InitPrt, there
// are situations where this isn't called.
// #i108712# / 2010-02-26 / frank.schoenheit at sun.com
- if ( pPrt )
+ if ( mpPrt )
{
- MapMode aMapMode( pPrt->GetMapMode() );
+ MapMode aMapMode( mpPrt->GetMapMode() );
aMapMode.SetMapUnit( MAP_TWIP );
- pPrt->SetMapMode( aMapMode );
+ mpPrt->SetMapMode( aMapMode );
}
- if ( pDrawModel && !get( IDocumentSettingAccess::USE_VIRTUAL_DEVICE ) )
- pDrawModel->SetRefDevice( pPrt );
+ if ( mpDrawModel && !get( IDocumentSettingAccess::USE_VIRTUAL_DEVICE ) )
+ mpDrawModel->SetRefDevice( mpPrt );
}
if ( bCallPrtDataChanged &&
@@ -584,8 +584,8 @@ void SwDoc::setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDeleteOld,/*[in]*/
VirtualDevice* SwDoc::getVirtualDevice(/*[in]*/ bool bCreate ) const
{
VirtualDevice* pRet = 0;
- if ( !bCreate || pVirDev )
- pRet = pVirDev;
+ if ( !bCreate || mpVirDev )
+ pRet = mpVirDev;
else
pRet = &CreateVirtualDevice_();
@@ -594,14 +594,14 @@ VirtualDevice* SwDoc::getVirtualDevice(/*[in]*/ bool bCreate ) const
void SwDoc::setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool )
{
- if ( pVirDev != pVd )
+ if ( mpVirDev != pVd )
{
if ( bDeleteOld )
- delete pVirDev;
- pVirDev = pVd;
+ delete mpVirDev;
+ mpVirDev = pVd;
- if ( pDrawModel && get( IDocumentSettingAccess::USE_VIRTUAL_DEVICE ) )
- pDrawModel->SetRefDevice( pVirDev );
+ if ( mpDrawModel && get( IDocumentSettingAccess::USE_VIRTUAL_DEVICE ) )
+ mpDrawModel->SetRefDevice( mpVirDev );
}
}
@@ -612,7 +612,7 @@ OutputDevice* SwDoc::getReferenceDevice(/*[in]*/ bool bCreate ) const
{
pRet = getPrinter( bCreate );
- if ( bCreate && !pPrt->IsValid() )
+ if ( bCreate && !mpPrt->IsValid() )
{
pRet = getVirtualDevice( sal_True );
}
@@ -638,8 +638,8 @@ void SwDoc::setReferenceDeviceType(/*[in]*/ bool bNewVirtual,/*[in]*/ bool bNewH
else
pMyVirDev->SetReferenceDevice( VirtualDevice::REFDEV_MODE_MSO1 );
- if( pDrawModel )
- pDrawModel->SetRefDevice( pMyVirDev );
+ if( mpDrawModel )
+ mpDrawModel->SetRefDevice( pMyVirDev );
}
else
{
@@ -650,8 +650,8 @@ void SwDoc::setReferenceDeviceType(/*[in]*/ bool bNewVirtual,/*[in]*/ bool bNewH
// getReferenceDevice()->getPrinter()->CreatePrinter_()
// ->setPrinter()-> PrtDataChanged()
SfxPrinter* pPrinter = getPrinter( true );
- if( pDrawModel )
- pDrawModel->SetRefDevice( pPrinter );
+ if( mpDrawModel )
+ mpDrawModel->SetRefDevice( pPrinter );
}
set(IDocumentSettingAccess::USE_VIRTUAL_DEVICE, bNewVirtual );
@@ -663,29 +663,29 @@ void SwDoc::setReferenceDeviceType(/*[in]*/ bool bNewVirtual,/*[in]*/ bool bNewH
const JobSetup* SwDoc::getJobsetup() const
{
- return pPrt ? &pPrt->GetJobSetup() : 0;
+ return mpPrt ? &mpPrt->GetJobSetup() : 0;
}
void SwDoc::setJobsetup(/*[in]*/ const JobSetup &rJobSetup )
{
- bool bCheckPageDescs = 0 == pPrt;
+ bool bCheckPageDescs = 0 == mpPrt;
bool bDataChanged = false;
- if ( pPrt )
+ if ( mpPrt )
{
- if ( pPrt->GetName() == rJobSetup.GetPrinterName() )
+ if ( mpPrt->GetName() == rJobSetup.GetPrinterName() )
{
- if ( pPrt->GetJobSetup() != rJobSetup )
+ if ( mpPrt->GetJobSetup() != rJobSetup )
{
- pPrt->SetJobSetup( rJobSetup );
+ mpPrt->SetJobSetup( rJobSetup );
bDataChanged = true;
}
}
else
- delete pPrt, pPrt = 0;
+ delete mpPrt, mpPrt = 0;
}
- if( !pPrt )
+ if( !mpPrt )
{
//The ItemSet is deleted by Sfx!
SfxItemSet *pSet = new SfxItemSet( GetAttrPool(),
@@ -699,7 +699,7 @@ void SwDoc::setJobsetup(/*[in]*/ const JobSetup &rJobSetup )
setPrinter( p, true, true );
else
{
- pPrt = p;
+ mpPrt = p;
bDataChanged = true;
}
}
@@ -709,10 +709,10 @@ void SwDoc::setJobsetup(/*[in]*/ const JobSetup &rJobSetup )
const SwPrintData & SwDoc::getPrintData() const
{
- if(!pPrtData)
+ if(!mpPrtData)
{
SwDoc * pThis = const_cast< SwDoc * >(this);
- pThis->pPrtData = new SwPrintData;
+ pThis->mpPrtData = new SwPrintData;
// SwPrintData should be initialized from the configuration,
// the respective config item is implememted by SwPrintOptions which
@@ -721,16 +721,16 @@ const SwPrintData & SwDoc::getPrintData() const
OSL_ENSURE( pDocSh, "pDocSh is 0, can't determine if this is a WebDoc or not" );
bool bWeb = 0 != dynamic_cast< const SwWebDocShell * >(pDocSh);
SwPrintOptions aPrintOptions( bWeb );
- *pThis->pPrtData = aPrintOptions;
+ *pThis->mpPrtData = aPrintOptions;
}
- return *pPrtData;
+ return *mpPrtData;
}
void SwDoc::setPrintData(/*[in]*/ const SwPrintData& rPrtData )
{
- if(!pPrtData)
- pPrtData = new SwPrintData;
- *pPrtData = rPrtData;
+ if(!mpPrtData)
+ mpPrtData = new SwPrintData;
+ *mpPrtData = rPrtData;
}
/* Implementations the next Interface here */
@@ -741,9 +741,9 @@ void SwDoc::setPrintData(/*[in]*/ const SwPrintData& rPrtData )
*/
void SwDoc::ChgDBData(const SwDBData& rNewData)
{
- if( rNewData != aDBData )
+ if( rNewData != maDBData )
{
- aDBData = rNewData;
+ maDBData = rNewData;
SetModified();
}
GetSysFldType(RES_DBNAMEFLD)->UpdateFlds();
@@ -865,7 +865,7 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart )
if( !aBkmkArr.empty() )
_RestoreCntntIdx( this, aBkmkArr, rPos.nNode.GetIndex()-1, 0, true );
- if( IsRedlineOn() || (!IsIgnoreRedline() && !pRedlineTbl->empty() ))
+ if( IsRedlineOn() || (!IsIgnoreRedline() && !mpRedlineTbl->empty() ))
{
SwPaM aPam( rPos );
aPam.SetMark();
@@ -903,7 +903,7 @@ bool SwDoc::AppendTxtNode( SwPosition& rPos )
GetIDocumentUndoRedo().AppendUndo( new SwUndoInsert( rPos.nNode ) );
}
- if( IsRedlineOn() || (!IsIgnoreRedline() && !pRedlineTbl->empty() ))
+ if( IsRedlineOn() || (!IsIgnoreRedline() && !mpRedlineTbl->empty() ))
{
SwPaM aPam( rPos );
aPam.SetMark();
@@ -928,13 +928,13 @@ bool SwDoc::InsertString( const SwPaM &rRg, const String &rStr,
const SwPosition& rPos = *rRg.GetPoint();
- if( pACEWord ) // add to auto correction
+ if( mpACEWord ) // add to auto correction
{
- if( 1 == rStr.Len() && pACEWord->IsDeleted() )
+ if( 1 == rStr.Len() && mpACEWord->IsDeleted() )
{
- pACEWord->CheckChar( rPos, rStr.GetChar( 0 ) );
+ mpACEWord->CheckChar( rPos, rStr.GetChar( 0 ) );
}
- delete pACEWord, pACEWord = 0;
+ delete mpACEWord, mpACEWord = 0;
}
SwTxtNode *const pNode = rPos.nNode.GetNode().GetTxtNode();
@@ -994,7 +994,7 @@ bool SwDoc::InsertString( const SwPaM &rRg, const String &rStr,
}
}
- if( IsRedlineOn() || (!IsIgnoreRedline() && !pRedlineTbl->empty() ))
+ if( IsRedlineOn() || (!IsIgnoreRedline() && !mpRedlineTbl->empty() ))
{
SwPaM aPam( rPos.nNode, aTmp.GetCntnt(),
rPos.nNode, rPos.nContent.GetIndex());
@@ -1042,7 +1042,7 @@ SwFlyFrmFmt* SwDoc::Insert( const SwPaM &rRg,
return _InsNoTxtNode( *rRg.GetPoint(), GetNodes().MakeGrfNode(
SwNodeIndex( GetNodes().GetEndOfAutotext() ),
rGrfName, rFltName, pGraphic,
- pDfltGrfFmtColl ),
+ mpDfltGrfFmtColl ),
pFlyAttrSet, pGrfAttrSet, pFrmFmt );
}
@@ -1055,7 +1055,7 @@ SwFlyFrmFmt* SwDoc::Insert( const SwPaM &rRg, const GraphicObject& rGrfObj,
pFrmFmt = GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC );
return _InsNoTxtNode( *rRg.GetPoint(), GetNodes().MakeGrfNode(
SwNodeIndex( GetNodes().GetEndOfAutotext() ),
- rGrfObj, pDfltGrfFmtColl ),
+ rGrfObj, mpDfltGrfFmtColl ),
pFlyAttrSet, pGrfAttrSet, pFrmFmt );
}
@@ -1076,7 +1076,7 @@ SwFlyFrmFmt* SwDoc::Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj,
return _InsNoTxtNode( *rRg.GetPoint(), GetNodes().MakeOLENode(
SwNodeIndex( GetNodes().GetEndOfAutotext() ),
xObj,
- pDfltGrfFmtColl ),
+ mpDfltGrfFmtColl ),
pFlyAttrSet, pGrfAttrSet,
pFrmFmt );
}
@@ -1095,7 +1095,7 @@ SwFlyFrmFmt* SwDoc::InsertOLE(const SwPaM &rRg, const String& rObjName,
SwNodeIndex( GetNodes().GetEndOfAutotext() ),
rObjName,
nAspect,
- pDfltGrfFmtColl,
+ mpDfltGrfFmtColl,
0 ),
pFlyAttrSet, pGrfAttrSet,
pFrmFmt );
@@ -1108,8 +1108,8 @@ SwFlyFrmFmt* SwDoc::InsertOLE(const SwPaM &rRg, const String& rObjName,
SwFieldType *SwDoc::GetSysFldType( const sal_uInt16 eWhich ) const
{
for( sal_uInt16 i = 0; i < INIT_FLDTYPES; ++i )
- if( eWhich == (*pFldTypes)[i]->Which() )
- return (*pFldTypes)[i];
+ if( eWhich == (*mpFldTypes)[i]->Which() )
+ return (*mpFldTypes)[i];
return 0;
}
@@ -1121,7 +1121,7 @@ bool SwDoc::UpdateRsid( SwTxtNode *pTxtNode, xub_StrLen nStt, xub_StrLen nEnd )
return false;
}
- SvxRsidItem aRsid( nRsid, RES_CHRATR_RSID );
+ SvxRsidItem aRsid( mnRsid, RES_CHRATR_RSID );
SwTxtAttr* pAttr = MakeTxtAttr( *this, aRsid, nStt, nEnd );
return pTxtNode->InsertHint( pAttr, INS_DEFAULT );
}
@@ -1143,27 +1143,27 @@ bool SwDoc::UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal )
return false;
}
- SvxRsidItem aRsid( nVal ? nVal : nRsid, RES_PARATR_RSID );
+ SvxRsidItem aRsid( nVal ? nVal : mnRsid, RES_PARATR_RSID );
return pTxtNode->SetAttr( aRsid );
}
void SwDoc::SetDocStat( const SwDocStat& rStat )
{
- *pDocStat = rStat;
+ *mpDocStat = rStat;
}
const SwDocStat& SwDoc::GetDocStat() const
{
- return *pDocStat;
+ return *mpDocStat;
}
const SwDocStat& SwDoc::GetUpdatedDocStat( bool bCompleteAsync )
{
- if( pDocStat->bModified )
+ if( mpDocStat->bModified )
{
UpdateDocStat( bCompleteAsync );
}
- return *pDocStat;
+ return *mpDocStat;
}
struct _PostItFld : public _SetGetExpFld
@@ -1686,8 +1686,8 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
// returns true while there is more to do
bool SwDoc::IncrementalDocStatCalculate( long nTextNodes )
{
- pDocStat->Reset();
- pDocStat->nPara = 0; // default is 1!
+ mpDocStat->Reset();
+ mpDocStat->nPara = 0; // default is 1!
SwNode* pNd;
// This is the inner loop - at least while the paras are dirty.
@@ -1698,13 +1698,13 @@ bool SwDoc::IncrementalDocStatCalculate( long nTextNodes )
case ND_TEXTNODE:
{
SwTxtNode *pTxt = static_cast< SwTxtNode * >( pNd );
- if( pTxt->CountWords( *pDocStat, 0, pTxt->GetTxt().Len() ) )
+ if( pTxt->CountWords( *mpDocStat, 0, pTxt->GetTxt().Len() ) )
nTextNodes--;
break;
}
- case ND_TABLENODE: ++pDocStat->nTbl; break;
- case ND_GRFNODE: ++pDocStat->nGrf; break;
- case ND_OLENODE: ++pDocStat->nOLE; break;
+ case ND_TABLENODE: ++mpDocStat->nTbl; break;
+ case ND_GRFNODE: ++mpDocStat->nGrf; break;
+ case ND_OLENODE: ++mpDocStat->nOLE; break;
case ND_SECTIONNODE: break;
}
}
@@ -1719,35 +1719,35 @@ bool SwDoc::IncrementalDocStatCalculate( long nTextNodes )
{
SwPostItField const * const pField(
static_cast<SwPostItField const*>(pFmtFld->GetFld()));
- pDocStat->nAllPara += pField->GetNumberOfParagraphs();
+ mpDocStat->nAllPara += pField->GetNumberOfParagraphs();
}
}
}
- pDocStat->nPage = GetCurrentLayout() ? GetCurrentLayout()->GetPageNum() : 0;
- pDocStat->bModified = sal_False;
+ mpDocStat->nPage = GetCurrentLayout() ? GetCurrentLayout()->GetPageNum() : 0;
+ mpDocStat->bModified = sal_False;
- com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aStat( pDocStat->nPage ? 8 : 7);
+ com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aStat( mpDocStat->nPage ? 8 : 7);
sal_Int32 n=0;
aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableCount"));
- aStat[n++].Value <<= (sal_Int32)pDocStat->nTbl;
+ aStat[n++].Value <<= (sal_Int32)mpDocStat->nTbl;
aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageCount"));
- aStat[n++].Value <<= (sal_Int32)pDocStat->nGrf;
+ aStat[n++].Value <<= (sal_Int32)mpDocStat->nGrf;
aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectCount"));
- aStat[n++].Value <<= (sal_Int32)pDocStat->nOLE;
- if ( pDocStat->nPage )
+ aStat[n++].Value <<= (sal_Int32)mpDocStat->nOLE;
+ if ( mpDocStat->nPage )
{
aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageCount"));
- aStat[n++].Value <<= (sal_Int32)pDocStat->nPage;
+ aStat[n++].Value <<= (sal_Int32)mpDocStat->nPage;
}
aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParagraphCount"));
- aStat[n++].Value <<= (sal_Int32)pDocStat->nPara;
+ aStat[n++].Value <<= (sal_Int32)mpDocStat->nPara;
aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WordCount"));
- aStat[n++].Value <<= (sal_Int32)pDocStat->nWord;
+ aStat[n++].Value <<= (sal_Int32)mpDocStat->nWord;
aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharacterCount"));
- aStat[n++].Value <<= (sal_Int32)pDocStat->nChar;
+ aStat[n++].Value <<= (sal_Int32)mpDocStat->nChar;
aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NonWhitespaceCharacterCount"));
- aStat[n++].Value <<= (sal_Int32)pDocStat->nCharExcludingSpaces;
+ aStat[n++].Value <<= (sal_Int32)mpDocStat->nCharExcludingSpaces;
// For e.g. autotext documents there is no pSwgInfo (#i79945)
SfxObjectShell * const pObjShell( GetDocShell() );
@@ -1778,7 +1778,7 @@ IMPL_LINK( SwDoc, DoIdleStatsUpdate, Timer *, pTimer )
{
(void)pTimer;
if( IncrementalDocStatCalculate( 1000 ) )
- aStatsUpdateTimer.Start();
+ maStatsUpdateTimer.Start();
SwView* pView = GetDocShell() ? GetDocShell()->GetView() : NULL;
if( pView )
@@ -1788,15 +1788,15 @@ IMPL_LINK( SwDoc, DoIdleStatsUpdate, Timer *, pTimer )
void SwDoc::UpdateDocStat( bool bCompleteAsync )
{
- if( pDocStat->bModified )
+ if( mpDocStat->bModified )
{
if (!bCompleteAsync)
{
while (IncrementalDocStatCalculate()) {}
- aStatsUpdateTimer.Stop();
+ maStatsUpdateTimer.Stop();
}
else if (IncrementalDocStatCalculate())
- aStatsUpdateTimer.Start();
+ maStatsUpdateTimer.Start();
}
}
@@ -1942,16 +1942,16 @@ void SwDoc::SetModified()
// Bit 1: -> new state
long nCall = mbModified ? 3 : 2;
mbModified = sal_True;
- pDocStat->bModified = sal_True;
- if( aOle2Link.IsSet() )
+ mpDocStat->bModified = sal_True;
+ if( maOle2Link.IsSet() )
{
mbInCallModified = sal_True;
- aOle2Link.Call( (void*)nCall );
+ maOle2Link.Call( (void*)nCall );
mbInCallModified = sal_False;
}
- if( pACEWord && !pACEWord->IsDeleted() )
- delete pACEWord, pACEWord = 0;
+ if( mpACEWord && !mpACEWord->IsDeleted() )
+ delete mpACEWord, mpACEWord = 0;
}
void SwDoc::ResetModified()
@@ -1962,10 +1962,10 @@ void SwDoc::ResetModified()
long nCall = mbModified ? 1 : 0;
mbModified = sal_False;
GetIDocumentUndoRedo().SetUndoNoModifiedPosition();
- if( nCall && aOle2Link.IsSet() )
+ if( nCall && maOle2Link.IsSet() )
{
mbInCallModified = sal_True;
- aOle2Link.Call( (void*)nCall );
+ maOle2Link.Call( (void*)nCall );
mbInCallModified = sal_False;
}
}
@@ -2493,12 +2493,12 @@ void SwDoc::SetVisibleLinks(bool bFlag)
sfx2::LinkManager& SwDoc::GetLinkManager()
{
- return *pLinkMgr;
+ return *mpLinkMgr;
}
const sfx2::LinkManager& SwDoc::GetLinkManager() const
{
- return *pLinkMgr;
+ return *mpLinkMgr;
}
void SwDoc::SetLinksUpdated(const bool bNewLinksUpdated)
@@ -2696,15 +2696,15 @@ SwUnoCrsr* SwDoc::CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr )
else
pNew = new SwUnoCrsr( rPos );
- pUnoCrsrTbl->insert( pNew );
+ mpUnoCrsrTbl->insert( pNew );
return pNew;
}
void SwDoc::ChkCondColls()
{
- for (sal_uInt16 n = 0; n < pTxtFmtCollTbl->size(); n++)
+ for (sal_uInt16 n = 0; n < mpTxtFmtCollTbl->size(); n++)
{
- SwTxtFmtColl *pColl = (*pTxtFmtCollTbl)[n];
+ SwTxtFmtColl *pColl = (*mpTxtFmtCollTbl)[n];
if (RES_CONDTXTFMTCOLL == pColl->Which())
pColl->CallSwClientNotify( SwAttrHint(RES_CONDTXTFMTCOLL) );
}
@@ -2714,14 +2714,14 @@ uno::Reference< script::vba::XVBAEventProcessor >
SwDoc::GetVbaEventProcessor()
{
#ifndef DISABLE_SCRIPTING
- if( !mxVbaEvents.is() && pDocShell && ooo::vba::isAlienWordDoc( *pDocShell ) )
+ if( !mxVbaEvents.is() && mpDocShell && ooo::vba::isAlienWordDoc( *mpDocShell ) )
{
try
{
- uno::Reference< frame::XModel > xModel( pDocShell->GetModel(), uno::UNO_SET_THROW );
+ uno::Reference< frame::XModel > xModel( mpDocShell->GetModel(), uno::UNO_SET_THROW );
uno::Sequence< uno::Any > aArgs(1);
aArgs[0] <<= xModel;
- mxVbaEvents.set( ooo::vba::createVBAUnoAPIServiceWithArgs( pDocShell, "com.sun.star.script.vba.VBATextEventProcessor" , aArgs ), uno::UNO_QUERY_THROW );
+ mxVbaEvents.set( ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "com.sun.star.script.vba.VBATextEventProcessor" , aArgs ), uno::UNO_QUERY_THROW );
}
catch( uno::Exception& )
{
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index 99da17e..8b3e48b 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -82,7 +82,7 @@ bool SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs )
SbxBaseRef aRef;
SbxValue* pRetValue = new SbxValue;
aRef = pRetValue;
- eErr = pDocShell->CallBasic( rMacro.GetMacName(),
+ eErr = mpDocShell->CallBasic( rMacro.GetMacName(),
rMacro.GetLibName(),
pArgs, pRet ? pRetValue : 0 );
@@ -120,7 +120,7 @@ bool SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs )
OSL_TRACE( "SwDoc::ExecMacro URL is %s", rtl::OUStringToOString( rMacro.GetMacName(),
RTL_TEXTENCODING_UTF8).getStr() );
- eErr = pDocShell->CallXScript(
+ eErr = mpDocShell->CallXScript(
rMacro.GetMacName(), *pUnoArgs, aRet, aOutArgsIndex, aOutArgs);
delete pUnoArgs;
@@ -136,7 +136,7 @@ bool SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs )
sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
bool bCheckPtr, SbxArray* pArgs, const Link* )
{
- if( !pDocShell ) // we can't do that without a DocShell!
+ if( !mpDocShell ) // we can't do that without a DocShell!
return 0;
sal_uInt16 nRet = 0;
@@ -208,7 +208,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
const SvxMacro& rMacro = *pTbl->Get( nEvent );
if( STARBASIC == rMacro.GetScriptType() )
{
- nRet += 0 == pDocShell->CallBasic( rMacro.GetMacName(),
+ nRet += 0 == mpDocShell->CallBasic( rMacro.GetMacName(),
rMacro.GetLibName(), pArgs ) ? 1 : 0;
}
else if( EXTENDED_STYPE == rMacro.GetScriptType() )
@@ -232,7 +232,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
OSL_TRACE( "SwDoc::CallEvent URL is %s", rtl::OUStringToOString(
rMacro.GetMacName(), RTL_TEXTENCODING_UTF8).getStr() );
- nRet += 0 == pDocShell->CallXScript(
+ nRet += 0 == mpDocShell->CallXScript(
rMacro.GetMacName(), *pUnoArgs,aRet, aOutArgsIndex, aOutArgs) ? 1 : 0;
delete pUnoArgs;
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 4f43b7d..e809b7c 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1009,10 +1009,10 @@ namespace
// IDocumentMarkAccess for SwDoc
IDocumentMarkAccess* SwDoc::getIDocumentMarkAccess()
- { return static_cast< IDocumentMarkAccess* >(pMarkManager.get()); }
+ { return static_cast< IDocumentMarkAccess* >(mpMarkManager.get()); }
const IDocumentMarkAccess* SwDoc::getIDocumentMarkAccess() const
- { return static_cast< IDocumentMarkAccess* >(pMarkManager.get()); }
+ { return static_cast< IDocumentMarkAccess* >(mpMarkManager.get()); }
// SaveBookmark
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 901b8f0..226d6bb 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -206,12 +206,12 @@ SwChartDataProvider * SwDoc::GetChartDataProvider( bool bCreate ) const
// we need a mutex here
SolarMutexGuard aGuard;
- if (bCreate && !aChartDataProviderImplRef.get())
+ if (bCreate && !maChartDataProviderImplRef.get())
{
- aChartDataProviderImplRef = comphelper::ImplementationReference< SwChartDataProvider
+ maChartDataProviderImplRef = comphelper::ImplementationReference< SwChartDataProvider
, chart2::data::XDataProvider >( new SwChartDataProvider( this ) );
}
- return aChartDataProviderImplRef.get();
+ return maChartDataProviderImplRef.get();
}
@@ -248,11 +248,11 @@ void SwDoc::CreateChartInternalDataProviders( const SwTable *pTable )
SwChartLockController_Helper & SwDoc::GetChartControllerHelper()
{
- if (!pChartControllerHelper)
+ if (!mpChartControllerHelper)
{
- pChartControllerHelper = new SwChartLockController_Helper( this );
+ mpChartControllerHelper = new SwChartLockController_Helper( this );
}
- return *pChartControllerHelper;
+ return *mpChartControllerHelper;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx
index 50868ea..d7537fe 100644
--- a/sw/source/core/doc/doccorr.cxx
+++ b/sw/source/core/doc/doccorr.cxx
@@ -197,7 +197,7 @@ void SwDoc::CorrAbs(const SwNodeIndex& rOldNode,
getIDocumentMarkAccess()->correctMarksAbsolute(rOldNode, rNewPos, nOffset);
{ // fix redlines
- SwRedlineTbl& rTbl = *pRedlineTbl;
+ SwRedlineTbl& rTbl = *mpRedlineTbl;
for (sal_uInt16 n = 0; n < rTbl.size(); )
{
// is on position ??
@@ -315,7 +315,7 @@ void SwDoc::CorrRel(const SwNodeIndex& rOldNode,
getIDocumentMarkAccess()->correctMarksRelative(rOldNode, rNewPos, nOffset);
{ // fix the Redlines
- SwRedlineTbl& rTbl = *pRedlineTbl;
+ SwRedlineTbl& rTbl = *mpRedlineTbl;
SwPosition aNewPos(rNewPos);
for( sal_uInt16 n = 0; n < rTbl.size(); ++n )
{
@@ -332,9 +332,9 @@ void SwDoc::CorrRel(const SwNodeIndex& rOldNode,
SwEditShell* SwDoc::GetEditShell( ViewShell** ppSh ) const
{
// Layout and OLE shells should be available
- if( pCurrentView )
+ if( mpCurrentView )
{
- ViewShell *pSh = pCurrentView, *pVSh = pSh;
+ ViewShell *pSh = mpCurrentView, *pVSh = pSh;
if( ppSh )
*ppSh = pSh;
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index c7bbe79..20677cf 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -140,14 +140,14 @@ bool SwDoc::GetData( const rtl::OUString& rItem, const String& rMimeType,
bool bCaseSensitive = true;
while( true )
{
- ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*pMarkManager, rItem, bCaseSensitive);
+ ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*mpMarkManager, rItem, bCaseSensitive);
if(pBkmk)
return SwServerObject(*pBkmk).GetData(rValue, rMimeType);
// Do we already have the Item?
String sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
_FindItem aPara( sItem );
- BOOST_FOREACH( const SwSectionFmt* pFmt, *pSectionFmtTbl )
+ BOOST_FOREACH( const SwSectionFmt* pFmt, *mpSectionFmtTbl )
{
if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
break;
@@ -163,7 +163,7 @@ bool SwDoc::GetData( const rtl::OUString& rItem, const String& rMimeType,
}
_FindItem aPara( GetAppCharClass().lowercase( rItem ));
- BOOST_FOREACH( const SwFrmFmt* pFmt, *pTblFrmFmtTbl )
+ BOOST_FOREACH( const SwFrmFmt* pFmt, *mpTblFrmFmtTbl )
{
if (!(lcl_FindTable(pFmt, &aPara)))
break;
@@ -185,14 +185,14 @@ bool SwDoc::SetData( const rtl::OUString& rItem, const String& rMimeType,
bool bCaseSensitive = true;
while( true )
{
- ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*pMarkManager, rItem, bCaseSensitive);
+ ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*mpMarkManager, rItem, bCaseSensitive);
if(pBkmk)
return SwServerObject(*pBkmk).SetData(rMimeType, rValue);
// Do we already have the Item?
String sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
_FindItem aPara( sItem );
- BOOST_FOREACH( const SwSectionFmt* pFmt, *pSectionFmtTbl )
+ BOOST_FOREACH( const SwSectionFmt* pFmt, *mpSectionFmtTbl )
{
if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
break;
@@ -209,7 +209,7 @@ bool SwDoc::SetData( const rtl::OUString& rItem, const String& rMimeType,
String sItem(GetAppCharClass().lowercase(rItem));
_FindItem aPara( sItem );
- BOOST_FOREACH( const SwFrmFmt* pFmt, *pTblFrmFmtTbl )
+ BOOST_FOREACH( const SwFrmFmt* pFmt, *mpTblFrmFmtTbl )
{
if (!(lcl_FindTable(pFmt, &aPara)))
break;
@@ -233,7 +233,7 @@ bool SwDoc::SetData( const rtl::OUString& rItem, const String& rMimeType,
while( true )
{
// bookmarks
- ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*pMarkManager, rItem, bCaseSensitive);
+ ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*mpMarkManager, rItem, bCaseSensitive);
if(pBkmk && pBkmk->IsExpanded()
&& (0 == (pObj = pBkmk->GetRefObject())))
{
@@ -247,7 +247,7 @@ bool SwDoc::SetData( const rtl::OUString& rItem, const String& rMimeType,
_FindItem aPara(bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
// sections
- BOOST_FOREACH( const SwSectionFmt* pFmt, *pSectionFmtTbl )
+ BOOST_FOREACH( const SwSectionFmt* pFmt, *mpSectionFmtTbl )
{
if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
break;
@@ -270,7 +270,7 @@ bool SwDoc::SetData( const rtl::OUString& rItem, const String& rMimeType,
_FindItem aPara( GetAppCharClass().lowercase(rItem) );
// tables
- BOOST_FOREACH( const SwFrmFmt* pFmt, *pTblFrmFmtTbl )
+ BOOST_FOREACH( const SwFrmFmt* pFmt, *mpTblFrmFmtTbl )
{
if (!(lcl_FindTable(pFmt, &aPara)))
break;
@@ -315,7 +315,7 @@ bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
if( sCmp.EqualsAscii( pMarkToTable ) )
{
sName = rCC.lowercase( sName );
- BOOST_FOREACH( const SwFrmFmt* pFmt, *pTblFrmFmtTbl )
+ BOOST_FOREACH( const SwFrmFmt* pFmt, *mpTblFrmFmtTbl )
{
if (!(lcl_FindTable(pFmt, &aPara)))
break;
@@ -384,7 +384,7 @@ bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
bool bCaseSensitive = true;
while( true )
{
- ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*pMarkManager, sItem, bCaseSensitive);
+ ::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*mpMarkManager, sItem, bCaseSensitive);
if(pBkmk)
{
if(pBkmk->IsExpanded())
@@ -397,9 +397,9 @@ bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
//
_FindItem aPara( bCaseSensitive ? sItem : String(rCC.lowercase( sItem )) );
- if( !pSectionFmtTbl->empty() )
+ if( !mpSectionFmtTbl->empty() )
{
- BOOST_FOREACH( const SwSectionFmt* pFmt, *pSectionFmtTbl )
+ BOOST_FOREACH( const SwSectionFmt* pFmt, *mpSectionFmtTbl )
{
if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
break;
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 1852b4c..f27acb9 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -279,9 +279,9 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot,
void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
{
- OSL_ENSURE( i < aPageDescs.size(), "PageDescs is out of range." );
+ OSL_ENSURE( i < maPageDescs.size(), "PageDescs is out of range." );
- SwPageDesc *pDesc = aPageDescs[i];
+ SwPageDesc *pDesc = maPageDescs[i];
SwRootFrm* pTmpRoot = GetCurrentLayout();
if (GetIDocumentUndoRedo().DoesUndo())
@@ -441,22 +441,22 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel)
return;
// mba: test iteration as clients are removed while iteration
- SwPageDescHint aHint( aPageDescs[0] );
+ SwPageDescHint aHint( maPageDescs[0] );
pDel->CallSwClientNotify( aHint );
bool bHasLayout = HasLayout();
- if ( pFtnInfo->DependsOn( pDel ) )
+ if ( mpFtnInfo->DependsOn( pDel ) )
{
- pFtnInfo->ChgPageDesc( aPageDescs[0] );
+ mpFtnInfo->ChgPageDesc( maPageDescs[0] );
if ( bHasLayout )
{
std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), false));
}
}
- else if ( pEndNoteInfo->DependsOn( pDel ) )
+ else if ( mpEndNoteInfo->DependsOn( pDel ) )
{
- pEndNoteInfo->ChgPageDesc( aPageDescs[0] );
+ mpEndNoteInfo->ChgPageDesc( maPageDescs[0] );
if ( bHasLayout )
{
std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
@@ -464,11 +464,11 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel)
}
}
- for ( sal_uInt16 j = 0; j < aPageDescs.size(); ++j )
+ for ( sal_uInt16 j = 0; j < maPageDescs.size(); ++j )
{
- if ( aPageDescs[j]->GetFollow() == pDel )
+ if ( maPageDescs[j]->GetFollow() == pDel )
{
- aPageDescs[j]->SetFollow( 0 );
+ maPageDescs[j]->SetFollow( 0 );
if( bHasLayout )
{
std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
@@ -481,9 +481,9 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel)
void SwDoc::BroadcastStyleOperation(String rName, SfxStyleFamily eFamily,
sal_uInt16 nOp)
{
- if (pDocShell)
+ if (mpDocShell)
{
- SfxStyleSheetBasePool * pPool = pDocShell->GetStyleSheetPool();
+ SfxStyleSheetBasePool * pPool = mpDocShell->GetStyleSheetPool();
if (pPool)
{
@@ -498,12 +498,12 @@ void SwDoc::BroadcastStyleOperation(String rName, SfxStyleFamily eFamily,
void SwDoc::DelPageDesc( sal_uInt16 i, bool bBroadcast )
{
- OSL_ENSURE( i < aPageDescs.size(), "PageDescs is out of range." );
+ OSL_ENSURE( i < maPageDescs.size(), "PageDescs is out of range." );
OSL_ENSURE( i != 0, "You cannot delete the default Pagedesc.");
if ( i == 0 )
return;
- SwPageDesc *pDel = aPageDescs[i];
+ SwPageDesc *pDel = maPageDescs[i];
if (bBroadcast)
BroadcastStyleOperation(pDel->GetName(), SFX_STYLE_FAMILY_PAGE,
@@ -517,7 +517,7 @@ void SwDoc::DelPageDesc( sal_uInt16 i, bool bBroadcast )
PreDelPageDesc(pDel); // #i7983#
- aPageDescs.erase( aPageDescs.begin() + i );
+ maPageDescs.erase( maPageDescs.begin() + i );
delete pDel;
SetModified();
}
@@ -559,7 +559,7 @@ sal_uInt16 SwDoc::MakePageDesc( const String &rName, const SwPageDesc *pCpy,
pNew->GetLeft().SetFmtAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
pNew->GetFirst().SetFmtAttr( SvxFrameDirectionItem(aFrameDirection, RES_FRAMEDIR) );
}
- aPageDescs.push_back( pNew );
+ maPageDescs.push_back( pNew );
if (bBroadcast)
BroadcastStyleOperation(rName, SFX_STYLE_FAMILY_PAGE,
@@ -571,7 +571,7 @@ sal_uInt16 SwDoc::MakePageDesc( const String &rName, const SwPageDesc *pCpy,
}
SetModified();
- return (aPageDescs.size()-1);
+ return (maPageDescs.size()-1);
}
SwPageDesc* SwDoc::FindPageDescByName( const String& rName, sal_uInt16* pPos ) const
@@ -579,10 +579,10 @@ SwPageDesc* SwDoc::FindPageDescByName( const String& rName, sal_uInt16* pPos ) c
SwPageDesc* pRet = 0;
if( pPos ) *pPos = USHRT_MAX;
- for( sal_uInt16 n = 0, nEnd = aPageDescs.size(); n < nEnd; ++n )
- if( aPageDescs[ n ]->GetName() == rName )
+ for( sal_uInt16 n = 0, nEnd = maPageDescs.size(); n < nEnd; ++n )
+ if( maPageDescs[ n ]->GetName() == rName )
{
- pRet = aPageDescs[ n ];
+ pRet = maPageDescs[ n ];
if( pPos )
*pPos = n;
break;
@@ -624,10 +624,10 @@ void SwDoc::PrtDataChanged()
bEndAction = true;
bDraw = false;
- if( pDrawModel )
+ if( mpDrawModel )
{
- pDrawModel->SetAddExtLeading( get(IDocumentSettingAccess::ADD_EXT_LEADING) );
- pDrawModel->SetRefDevice( getReferenceDevice( false ) );
+ mpDrawModel->SetAddExtLeading( get(IDocumentSettingAccess::ADD_EXT_LEADING) );
+ mpDrawModel->SetRefDevice( getReferenceDevice( false ) );
}
pFntCache->Flush();
@@ -637,21 +637,21 @@ void SwDoc::PrtDataChanged()
do
{
- pSh->InitPrt( pPrt );
+ pSh->InitPrt( mpPrt );
pSh = (ViewShell*)pSh->GetNext();
}
while ( pSh != GetCurrentViewShell() );
}
}
- if ( bDraw && pDrawModel )
+ if ( bDraw && mpDrawModel )
{
const sal_Bool bTmpAddExtLeading = get(IDocumentSettingAccess::ADD_EXT_LEADING);
- if ( bTmpAddExtLeading != pDrawModel->IsAddExtLeading() )
- pDrawModel->SetAddExtLeading( bTmpAddExtLeading );
+ if ( bTmpAddExtLeading != mpDrawModel->IsAddExtLeading() )
+ mpDrawModel->SetAddExtLeading( bTmpAddExtLeading );
OutputDevice* pOutDev = getReferenceDevice( false );
- if ( pOutDev != pDrawModel->GetRefDevice() )
- pDrawModel->SetRefDevice( pOutDev );
+ if ( pOutDev != mpDrawModel->GetRefDevice() )
+ mpDrawModel->SetRefDevice( pOutDev );
}
PrtOLENotify( sal_True );
@@ -791,9 +791,9 @@ bool SwDoc::FindPageDesc( const String & rName, sal_uInt16 * pFound)
{
bool bResult = false;
sal_uInt16 nI;
- for (nI = 0; nI < aPageDescs.size(); nI++)
+ for (nI = 0; nI < maPageDescs.size(); nI++)
{
- if (aPageDescs[nI]->GetName() == rName)
+ if (maPageDescs[nI]->GetName() == rName)
{
*pFound = nI;
bResult = true;
@@ -811,7 +811,7 @@ SwPageDesc * SwDoc::GetPageDesc( const String & rName )
sal_uInt16 nI;
if (FindPageDesc(rName, &nI))
- aResult = aPageDescs[nI];
+ aResult = maPageDescs[nI];
return aResult;
}
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index c8d9ed3..6ff4c1a 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -540,7 +540,7 @@ void SwDoc::InitDrawModel()
// !! Attention: there is similar code in the Sw3 Reader (sw3imp.cxx) that
// also has to be maintained!!
- if ( pDrawModel )
+ if ( mpDrawModel )
ReleaseDrawModel();
// Setup DrawPool and EditEnginePool. Ownership is ours and only gets passed
@@ -574,38 +574,38 @@ void SwDoc::InitDrawModel()
RTL_LOGFILE_CONTEXT_TRACE( aLog, "before create DrawDocument" );
// The document owns the SdrModel. We always have two layers and one page.
- pDrawModel = new SwDrawDocument( this );
+ mpDrawModel = new SwDrawDocument( this );
- pDrawModel->EnableUndo( GetIDocumentUndoRedo().DoesUndo() );
+ mpDrawModel->EnableUndo( GetIDocumentUndoRedo().DoesUndo() );
String sLayerNm;
sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Hell" ));
- nHell = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
+ mnHell = mpDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Heaven" ));
- nHeaven = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
+ mnHeaven = mpDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Controls" ));
- nControls = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
+ mnControls = mpDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
// add invisible layers corresponding to the visible ones.
{
sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("InvisibleHell" ));
- nInvisibleHell = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
+ mnInvisibleHell = mpDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("InvisibleHeaven" ));
- nInvisibleHeaven = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
+ mnInvisibleHeaven = mpDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("InvisibleControls" ));
- nInvisibleControls = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
+ mnInvisibleControls = mpDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
}
- SdrPage* pMasterPage = pDrawModel->AllocPage( sal_False );
- pDrawModel->InsertPage( pMasterPage );
+ SdrPage* pMasterPage = mpDrawModel->AllocPage( sal_False );
+ mpDrawModel->InsertPage( pMasterPage );
RTL_LOGFILE_CONTEXT_TRACE( aLog, "after create DrawDocument" );
RTL_LOGFILE_CONTEXT_TRACE( aLog, "before create Spellchecker/Hyphenator" );
- SdrOutliner& rOutliner = pDrawModel->GetDrawOutliner();
+ SdrOutliner& rOutliner = mpDrawModel->GetDrawOutliner();
uno::Reference< XSpellChecker1 > xSpell = ::GetSpellChecker();
rOutliner.SetSpeller( xSpell );
uno::Reference<XHyphenator> xHyphenator( ::GetHyphenator() );
@@ -613,21 +613,21 @@ void SwDoc::InitDrawModel()
RTL_LOGFILE_CONTEXT_TRACE( aLog, "after create Spellchecker/Hyphenator" );
SetCalcFieldValueHdl(&rOutliner);
- SetCalcFieldValueHdl(&pDrawModel->GetHitTestOutliner());
+ SetCalcFieldValueHdl(&mpDrawModel->GetHitTestOutliner());
// Set the LinkManager in the model so that linked graphics can be inserted.
// The WinWord import needs it too.
- pDrawModel->SetLinkManager( &GetLinkManager() );
- pDrawModel->SetAddExtLeading( get(IDocumentSettingAccess::ADD_EXT_LEADING) );
+ mpDrawModel->SetLinkManager( &GetLinkManager() );
+ mpDrawModel->SetAddExtLeading( get(IDocumentSettingAccess::ADD_EXT_LEADING) );
OutputDevice* pRefDev = getReferenceDevice( false );
if ( pRefDev )
- pDrawModel->SetRefDevice( pRefDev );
+ mpDrawModel->SetRefDevice( pRefDev );
- pDrawModel->SetNotifyUndoActionHdl( LINK( this, SwDoc, AddDrawUndo ));
- if ( pCurrentView )
+ mpDrawModel->SetNotifyUndoActionHdl( LINK( this, SwDoc, AddDrawUndo ));
+ if ( mpCurrentView )
{
- ViewShell* pViewSh = pCurrentView;
+ ViewShell* pViewSh = mpCurrentView;
do
{
SwRootFrm* pRoot = pViewSh->GetLayout();
@@ -635,14 +635,14 @@ void SwDoc::InitDrawModel()
{
// Disable "multiple layout" for the moment:
// use pMasterPage instead of a new created SdrPage
- // pDrawModel->AllocPage( FALSE );
- // pDrawModel->InsertPage( pDrawPage );
+ // mpDrawModel->AllocPage( FALSE );
+ // mpDrawModel->InsertPage( pDrawPage );
SdrPage* pDrawPage = pMasterPage;
pRoot->SetDrawPage( pDrawPage );
pDrawPage->SetSize( pRoot->Frm().SSize() );
}
pViewSh = (ViewShell*)pViewSh->GetNext();
- }while( pViewSh != pCurrentView );
+ }while( pViewSh != mpCurrentView );
}
UpdateDrawDefaults();
@@ -770,11 +770,11 @@ SdrLayerID SwDoc::GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLa
void SwDoc::ReleaseDrawModel()
{
- if ( pDrawModel )
+ if ( mpDrawModel )
{
// !! Also maintain the code in the sw3io for inserting documents!!
- delete pDrawModel; pDrawModel = 0;
+ delete mpDrawModel; mpDrawModel = 0;
SfxItemPool *pSdrPool = GetAttrPool().GetSecondaryPool();
OSL_ENSURE( pSdrPool, "missing pool" );
@@ -794,16 +794,16 @@ void SwDoc::ReleaseDrawModel()
SdrModel* SwDoc::_MakeDrawModel()
{
- OSL_ENSURE( !pDrawModel, "_MakeDrawModel: Why?" );
+ OSL_ENSURE( !mpDrawModel, "_MakeDrawModel: Why?" );
InitDrawModel();
- if ( pCurrentView )
+ if ( mpCurrentView )
{
- ViewShell* pTmp = pCurrentView;
+ ViewShell* pTmp = mpCurrentView;
do
{
pTmp->MakeDrawView();
pTmp = (ViewShell*) pTmp->GetNext();
- } while ( pTmp != pCurrentView );
+ } while ( pTmp != mpCurrentView );
// Broadcast, so that the FormShell can be connected to the DrawView
if( GetDocShell() )
@@ -812,14 +812,14 @@ SdrModel* SwDoc::_MakeDrawModel()
GetDocShell()->Broadcast( aHnt );
}
} //swmod 071029//swmod 071225
- return pDrawModel;
+ return mpDrawModel;
}
/*************************************************************************/
void SwDoc::DrawNotifyUndoHdl()
{
- pDrawModel->SetNotifyUndoActionHdl( Link() );
+ mpDrawModel->SetNotifyUndoActionHdl( Link() );
}
/*************************************************************************
@@ -922,14 +922,14 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo)
/* TFFDI: The functions formerly declared 'inline'
*/
-const SdrModel* SwDoc::GetDrawModel() const { return pDrawModel; }
-SdrModel* SwDoc::GetDrawModel() { return pDrawModel; }
-SdrLayerID SwDoc::GetHeavenId() const { return nHeaven; }
-SdrLayerID SwDoc::GetHellId() const { return nHell; }
-SdrLayerID SwDoc::GetControlsId() const { return nControls; }
-SdrLayerID SwDoc::GetInvisibleHeavenId() const { return nInvisibleHeaven; }
-SdrLayerID SwDoc::GetInvisibleHellId() const { return nInvisibleHell; }
-SdrLayerID SwDoc::GetInvisibleControlsId() const { return nInvisibleControls; }
+const SdrModel* SwDoc::GetDrawModel() const { return mpDrawModel; }
+SdrModel* SwDoc::GetDrawModel() { return mpDrawModel; }
+SdrLayerID SwDoc::GetHeavenId() const { return mnHeaven; }
+SdrLayerID SwDoc::GetHellId() const { return mnHell; }
+SdrLayerID SwDoc::GetControlsId() const { return mnControls; }
+SdrLayerID SwDoc::GetInvisibleHeavenId() const { return mnInvisibleHeaven; }
+SdrLayerID SwDoc::GetInvisibleHellId() const { return mnInvisibleHell; }
+SdrLayerID SwDoc::GetInvisibleControlsId() const { return mnInvisibleControls; }
SdrModel* SwDoc::GetOrCreateDrawModel() { return GetDrawModel() ? GetDrawModel() : _MakeDrawModel(); }
// #i62875#
@@ -1031,8 +1031,8 @@ void SwDoc::SetDrawDefaults()
void SwDoc::UpdateDrawDefaults()
{
// drawing layer defaults that are set for new documents (if InitNew was called)
- if ( pDrawModel && mbSetDrawDefaults )
- pDrawModel->SetDrawingLayerPoolDefaults();
+ if ( mpDrawModel && mbSetDrawDefaults )
+ mpDrawModel->SetDrawingLayerPoolDefaults();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 539ebf4..1da5be9 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -708,11 +708,11 @@ void SwDoc::SetModified(SwPaM &rPaM)
bool SwDoc::Overwrite( const SwPaM &rRg, const String &rStr )
{
SwPosition& rPt = *(SwPosition*)rRg.GetPoint();
- if( pACEWord ) // Add to AutoCorrect
+ if( mpACEWord ) // Add to AutoCorrect
{
if( 1 == rStr.Len() )
- pACEWord->CheckChar( rPt, rStr.GetChar( 0 ) );
- delete pACEWord, pACEWord = 0;
+ mpACEWord->CheckChar( rPt, rStr.GetChar( 0 ) );
+ delete mpACEWord, mpACEWord = 0;
}
SwTxtNode *pNode = rPt.nNode.GetNode().GetTxtNode();
@@ -1581,13 +1581,13 @@ bool SwDoc::DeleteRangeImplImpl(SwPaM & rPam)
if( !rPam.HasMark() || *pStt >= *pEnd )
return false;
- if( pACEWord )
+ if( mpACEWord )
{
// if necessary the saved Word for the exception
- if( pACEWord->IsDeleted() || pStt->nNode != pEnd->nNode ||
+ if( mpACEWord->IsDeleted() || pStt->nNode != pEnd->nNode ||
pStt->nContent.GetIndex() + 1 != pEnd->nContent.GetIndex() ||
- !pACEWord->CheckDelChar( *pStt ))
- delete pACEWord, pACEWord = 0;
+ !mpACEWord->CheckDelChar( *pStt ))
+ delete mpACEWord, mpACEWord = 0;
}
{
@@ -2470,9 +2470,9 @@ SetRedlineMode( eOld );
// Save the current values to add them as automatic entries to to AutoCorrect.
void SwDoc::SetAutoCorrExceptWord( SwAutoCorrExceptWord* pNew )
{
- if( pNew != pACEWord )
- delete pACEWord;
- pACEWord = pNew;
+ if( pNew != mpACEWord )
+ delete mpACEWord;
+ mpACEWord = pNew;
}
bool SwDoc::DelFullPara( SwPaM& rPam )
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 3fe8a0b..039843d 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -73,7 +73,7 @@ extern bool IsFrameBehind( const SwTxtNode& rMyNd, sal_uInt16 nMySttPos,
*/
SwFieldType* SwDoc::InsertFldType(const SwFieldType &rFldTyp)
{
- sal_uInt16 nSize = pFldTypes->size(),
+ sal_uInt16 nSize = mpFldTypes->size(),
nFldWhich = rFldTyp.Which();
sal_uInt16 i = INIT_FLDTYPES;
@@ -95,22 +95,22 @@ SwFieldType* SwDoc::InsertFldType(const SwFieldType &rFldTyp)
const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
String sFldNm( rFldTyp.GetName() );
for( ; i < nSize; ++i )
- if( nFldWhich == (*pFldTypes)[i]->Which() &&
- rSCmp.isEqual( sFldNm, (*pFldTypes)[i]->GetName() ))
- return (*pFldTypes)[i];
+ if( nFldWhich == (*mpFldTypes)[i]->Which() &&
+ rSCmp.isEqual( sFldNm, (*mpFldTypes)[i]->GetName() ))
+ return (*mpFldTypes)[i];
}
break;
case RES_AUTHORITY:
for( ; i < nSize; ++i )
- if( nFldWhich == (*pFldTypes)[i]->Which() )
- return (*pFldTypes)[i];
+ if( nFldWhich == (*mpFldTypes)[i]->Which() )
+ return (*mpFldTypes)[i];
break;
default:
for( i = 0; i < nSize; ++i )
- if( nFldWhich == (*pFldTypes)[i]->Which() )
- return (*pFldTypes)[i];
+ if( nFldWhich == (*mpFldTypes)[i]->Which() )
+ return (*mpFldTypes)[i];
}
SwFieldType* pNew = rFldTyp.Copy();
@@ -131,17 +131,17 @@ SwFieldType* SwDoc::InsertFldType(const SwFieldType &rFldTyp)
case RES_SETEXPFLD:
((SwValueFieldType*)pNew)->SetDoc( this );
// JP 29.07.96: Optionally prepare FieldList for Calculator:
- pUpdtFlds->InsertFldType( *pNew );
+ mpUpdtFlds->InsertFldType( *pNew );
break;
case RES_AUTHORITY :
((SwAuthorityFieldType*)pNew)->SetDoc( this );
break;
}
- pFldTypes->insert( pFldTypes->begin() + nSize, pNew );
+ mpFldTypes->insert( mpFldTypes->begin() + nSize, pNew );
SetModified();
- return (*pFldTypes)[ nSize ];
+ return (*mpFldTypes)[ nSize ];
}
void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
@@ -151,7 +151,7 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
// - If it's not present, it can be re-inserted.
// - If the same type is found, the deleted one has to be renamed.
- sal_uInt16 nSize = pFldTypes->size(), nFldWhich = rFldTyp.Which();
+ sal_uInt16 nSize = mpFldTypes->size(), nFldWhich = rFldTyp.Which();
sal_uInt16 i = INIT_FLDTYPES;
OSL_ENSURE( RES_SETEXPFLD == nFldWhich ||
@@ -163,7 +163,7 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
SwFieldType* pFnd;
for( ; i < nSize; ++i )
- if( nFldWhich == (pFnd = (*pFldTypes)[i])->Which() &&
+ if( nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
rSCmp.isEqual( rFldNm, pFnd->GetName() ) )
{
// find new name
@@ -172,7 +172,7 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
String sSrch( rFldNm );
sSrch.Append( String::CreateFromInt32( nNum ));
for( i = INIT_FLDTYPES; i < nSize; ++i )
- if( nFldWhich == (pFnd = (*pFldTypes)[i])->Which() &&
+ if( nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
rSCmp.isEqual( sSrch, pFnd->GetName() ) )
break;
@@ -187,7 +187,7 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
}
// not found, so insert and delete flag
- pFldTypes->insert( pFldTypes->begin() + nSize, &rFldTyp );
+ mpFldTypes->insert( mpFldTypes->begin() + nSize, &rFldTyp );
switch( nFldWhich )
{
case RES_SETEXPFLD:
@@ -211,10 +211,10 @@ void SwDoc::RemoveFldType(sal_uInt16 nFld)
/*
* Dependent fields present -> ErrRaise
*/
- sal_uInt16 nSize = pFldTypes->size();
+ sal_uInt16 nSize = mpFldTypes->size();
if(nFld < nSize)
{
- SwFieldType* pTmp = (*pFldTypes)[nFld];
+ SwFieldType* pTmp = (*mpFldTypes)[nFld];
// JP 29.07.96: Optionally prepare FldLst for Calculator
sal_uInt16 nWhich = pTmp->Which();
@@ -222,7 +222,7 @@ void SwDoc::RemoveFldType(sal_uInt16 nFld)
{
case RES_SETEXPFLD:
case RES_USERFLD:
- pUpdtFlds->RemoveFldType( *pTmp );
+ mpUpdtFlds->RemoveFldType( *pTmp );
// no break;
case RES_DDEFLD:
if( pTmp->GetDepends() && !IsUsed( *pTmp ) )
@@ -244,14 +244,14 @@ void SwDoc::RemoveFldType(sal_uInt16 nFld)
// delete field type
delete pTmp;
}
- pFldTypes->erase( pFldTypes->begin() + nFld );
+ mpFldTypes->erase( mpFldTypes->begin() + nFld );
SetModified();
}
}
const SwFldTypes* SwDoc::GetFldTypes() const
{
- return pFldTypes;
+ return mpFldTypes;
}
/*--------------------------------------------------------------------
@@ -263,7 +263,7 @@ SwFieldType* SwDoc::GetFldType( sal_uInt16 nResId, const String& rName,
// #i51815#
) const
{
- sal_uInt16 nSize = pFldTypes->size(), i = 0;
+ sal_uInt16 nSize = mpFldTypes->size(), i = 0;
const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
switch( nResId )
@@ -287,7 +287,7 @@ SwFieldType* SwDoc::GetFldType( sal_uInt16 nResId, const String& rName,
SwFieldType* pRet = 0;
for( ; i < nSize; ++i )
{
- SwFieldType* pFldType = (*pFldTypes)[i];
+ SwFieldType* pFldType = (*mpFldTypes)[i];
String aFldName( pFldType->GetName() );
if (bDbFieldMatching && nResId == RES_DBFLD) // #i51815#
@@ -315,9 +315,9 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
// Call Modify() for every field type,
// dependent SwTxtFld get notified ...
- for( sal_uInt16 i=0; i < pFldTypes->size(); ++i)
+ for( sal_uInt16 i=0; i < mpFldTypes->size(); ++i)
{
- switch( (*pFldTypes)[i]->Which() )
+ switch( (*mpFldTypes)[i]->Which() )
{
// Update table fields second to last
// Update references last
@@ -333,10 +333,10 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
if( !pNewHt )
{
SwMsgPoolItem aUpdateDDE( RES_UPDATEDDETBL );
- (*pFldTypes)[i]->ModifyNotification( 0, &aUpdateDDE );
+ (*mpFldTypes)[i]->ModifyNotification( 0, &aUpdateDDE );
}
else
- (*pFldTypes)[i]->ModifyNotification( 0, pNewHt );
+ (*mpFldTypes)[i]->ModifyNotification( 0, pNewHt );
break;
}
case RES_GETEXPFLD:
@@ -347,7 +347,7 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
if( !pNewHt )
break;
default:
- (*pFldTypes)[i]->ModifyNotification ( 0, pNewHt );
+ (*mpFldTypes)[i]->ModifyNotification ( 0, pNewHt );
}
}
@@ -374,8 +374,8 @@ void SwDoc::UpdateUsrFlds()
{
SwCalc* pCalc = 0;
const SwFieldType* pFldType;
- for( sal_uInt16 i = INIT_FLDTYPES; i < pFldTypes->size(); ++i )
- if( RES_USERFLD == ( pFldType = (*pFldTypes)[i] )->Which() )
+ for( sal_uInt16 i = INIT_FLDTYPES; i < mpFldTypes->size(); ++i )
+ if( RES_USERFLD == ( pFldType = (*mpFldTypes)[i] )->Which() )
{
if( !pCalc )
pCalc = new SwCalc( *this );
@@ -395,8 +395,8 @@ void SwDoc::UpdateUsrFlds()
void SwDoc::UpdateRefFlds( SfxPoolItem* pHt )
{
SwFieldType* pFldType;
- for( sal_uInt16 i = 0; i < pFldTypes->size(); ++i )
- if( RES_GETREFFLD == ( pFldType = (*pFldTypes)[i] )->Which() )
+ for( sal_uInt16 i = 0; i < mpFldTypes->size(); ++i )
+ if( RES_GETREFFLD == ( pFldType = (*mpFldTypes)[i] )->Which() )
pFldType->ModifyNotification( 0, pHt );
}
@@ -404,9 +404,9 @@ void SwDoc::UpdateRefFlds( SfxPoolItem* pHt )
//optimization currently only available when no fields exist.
bool SwDoc::containsUpdatableFields()
{
- for (sal_uInt16 i = 0; i < pFldTypes->size(); ++i)
+ for (sal_uInt16 i = 0; i < mpFldTypes->size(); ++i)
{
- SwFieldType* pFldType = (*pFldTypes)[i];
+ SwFieldType* pFldType = (*mpFldTypes)[i];
SwIterator<SwFmtFld,SwFieldType> aIter(*pFldType);
if (aIter.First())
return true;
@@ -421,9 +421,9 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
SwFieldType* pFldType(0);
- for (sal_uInt16 i = 0; i < pFldTypes->size(); ++i)
+ for (sal_uInt16 i = 0; i < mpFldTypes->size(); ++i)
{
- if( RES_TABLEFLD == ( pFldType = (*pFldTypes)[i] )->Which() )
+ if( RES_TABLEFLD == ( pFldType = (*mpFldTypes)[i] )->Which() )
{
SwTableFmlUpdate* pUpdtFld = 0;
if( pHt && RES_TABLEFML_UPDATE == pHt->Which() )
@@ -673,7 +673,7 @@ void SwDoc::UpdatePageFlds( SfxPoolItem* pMsgHnt )
{
SwFieldType* pFldType;
for( sal_uInt16 i = 0; i < INIT_FLDTYPES; ++i )
- switch( ( pFldType = (*pFldTypes)[ i ] )->Which() )
+ switch( ( pFldType = (*mpFldTypes)[ i ] )->Which() )
{
case RES_PAGENUMBERFLD:
case RES_CHAPTERFLD:
@@ -691,30 +691,30 @@ void SwDoc::UpdatePageFlds( SfxPoolItem* pMsgHnt )
// ---- Remove all unreferenced field types of a document --
void SwDoc::GCFieldTypes()
{
- for( sal_uInt16 n = pFldTypes->size(); n > INIT_FLDTYPES; )
- if( !(*pFldTypes)[ --n ]->GetDepends() )
+ for( sal_uInt16 n = mpFldTypes->size(); n > INIT_FLDTYPES; )
+ if( !(*mpFldTypes)[ --n ]->GetDepends() )
RemoveFldType( n );
}
void SwDoc::LockExpFlds()
{
- ++nLockExpFld;
+ ++mnLockExpFld;
}
void SwDoc::UnlockExpFlds()
{
- if( nLockExpFld )
- --nLockExpFld;
+ if( mnLockExpFld )
+ --mnLockExpFld;
}
bool SwDoc::IsExpFldsLocked() const
{
- return 0 != nLockExpFld;
+ return 0 != mnLockExpFld;
}
SwDocUpdtFld& SwDoc::GetUpdtFlds() const
{
- return *pUpdtFlds;
+ return *mpUpdtFlds;
}
bool SwDoc::IsNewFldLst() const
@@ -1089,19 +1089,19 @@ static void lcl_CalcFld( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpFld& rSGEFl
void SwDoc::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld )
{
// create the sorted list of all SetFields
- pUpdtFlds->MakeFldList( *this, mbNewFldLst, GETFLD_CALC );
+ mpUpdtFlds->MakeFldList( *this, mbNewFldLst, GETFLD_CALC );
mbNewFldLst = sal_False;
SwNewDBMgr* pMgr = GetNewDBMgr();
pMgr->CloseAll(sal_False);
- if( !pUpdtFlds->GetSortLst()->empty() )
+ if( !mpUpdtFlds->GetSortLst()->empty() )
{
_SetGetExpFlds::const_iterator const itLast = std::upper_bound(
- pUpdtFlds->GetSortLst()->begin(),
- pUpdtFlds->GetSortLst()->end(),
+ mpUpdtFlds->GetSortLst()->begin(),
+ mpUpdtFlds->GetSortLst()->end(),
const_cast<_SetGetExpFld*>(&rToThisFld));
- for( _SetGetExpFlds::const_iterator it = pUpdtFlds->GetSortLst()->begin(); it != itLast; ++it )
+ for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != itLast; ++it )
lcl_CalcFld( *this, rCalc, **it, pMgr );
}
@@ -1111,14 +1111,14 @@ void SwDoc::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld )
void SwDoc::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt )
{
// create the sorted list of all SetFields
- pUpdtFlds->MakeFldList( *this, mbNewFldLst, GETFLD_CALC );
+ mpUpdtFlds->MakeFldList( *this, mbNewFldLst, GETFLD_CALC );
mbNewFldLst = sal_False;
SwNewDBMgr* pMgr = GetNewDBMgr();
pMgr->CloseAll(sal_False);
- for( _SetGetExpFlds::const_iterator it = pUpdtFlds->GetSortLst()->begin();
- it != pUpdtFlds->GetSortLst()->end() &&
+ for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin();
+ it != mpUpdtFlds->GetSortLst()->end() &&
( (*it)->GetNode() < nLastNd ||
( (*it)->GetNode() == nLastNd && (*it)->GetCntnt() <= nLastCnt )
);
@@ -1134,21 +1134,21 @@ void SwDoc::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblSize,
const _SetGetExpFld& rToThisFld )
{
// create the sorted list of all SetFields
- pUpdtFlds->MakeFldList( *this, mbNewFldLst, GETFLD_EXPAND );
+ mpUpdtFlds->MakeFldList( *this, mbNewFldLst, GETFLD_EXPAND );
mbNewFldLst = sal_False;
// Hash table for all string replacements is filled on-the-fly.
// Try to fabricate an uneven number.
- rTblSize = (( pUpdtFlds->GetSortLst()->size() / 7 ) + 1 ) * 7;
+ rTblSize = (( mpUpdtFlds->GetSortLst()->size() / 7 ) + 1 ) * 7;
ppHashTbl = new SwHash*[ rTblSize ];
memset( ppHashTbl, 0, sizeof( _HashStr* ) * rTblSize );
_SetGetExpFlds::const_iterator const itLast = std::upper_bound(
- pUpdtFlds->GetSortLst()->begin(),
- pUpdtFlds->GetSortLst()->end(),
+ mpUpdtFlds->GetSortLst()->begin(),
+ mpUpdtFlds->GetSortLst()->end(),
const_cast<_SetGetExpFld*>(&rToThisFld));
- for( _SetGetExpFlds::const_iterator it = pUpdtFlds->GetSortLst()->begin(); it != itLast; ++it )
+ for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != itLast; ++it )
{
const SwTxtFld* pTxtFld = (*it)->GetFld();
if( !pTxtFld )
@@ -1218,19 +1218,19 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
if( IsExpFldsLocked() || IsInReading() )
return;
- bool bOldInUpdateFlds = pUpdtFlds->IsInUpdateFlds();
- pUpdtFlds->SetInUpdateFlds( true );
+ bool bOldInUpdateFlds = mpUpdtFlds->IsInUpdateFlds();
+ mpUpdtFlds->SetInUpdateFlds( true );
- pUpdtFlds->MakeFldList( *this, sal_True, GETFLD_ALL );
+ mpUpdtFlds->MakeFldList( *this, sal_True, GETFLD_ALL );
mbNewFldLst = sal_False;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list