summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-03-30 23:04:01 +0200
committerMichael Stahl <mstahl@redhat.com>2015-03-31 20:08:37 +0200
commitb9301e9dc93f5961bd83a76410f91174316c99b3 (patch)
tree6360b5ae6fdba3721923fb7504f2fa8e6f5a1e4e /sw/inc
parent56c003b4f3b3ed77dc6608584fd50fbda901d1b4 (diff)
sw: prefix members of SwDocShell
Change-Id: I9a9797c96dfdbf5ca464f863517abd9001845015
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/docsh.hxx46
1 files changed, 24 insertions, 22 deletions
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 52db8674484b..d3da31f3864d 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -58,29 +58,31 @@ class SwDrawModel;
// as needed, one or both parameters may be zero
void SAL_DLLPRIVATE InitDrawModelAndDocShell(SwDocShell* pSwDocShell, SwDrawModel* pSwDrawModel);
-class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
+class SW_DLLPUBLIC SwDocShell
+ : public SfxObjectShell
+ , public SfxListener
{
- SwDoc* mpDoc; ///< Document.
- rtl::Reference< SfxStyleSheetBasePool > mxBasePool; ///< Passing through for formats.
- FontList* mpFontList; ///< Current Fontlist.
- bool mbInUpdateFontList; ///< prevent nested calls of UpdateFontList
+ SwDoc* m_pDoc; ///< Document.
+ rtl::Reference< SfxStyleSheetBasePool > m_xBasePool; ///< Passing through for formats.
+ FontList* m_pFontList; ///< Current Fontlist.
+ bool m_IsInUpdateFontList; ///< prevent nested calls of UpdateFontList
/** For "historical reasons" nothing can be done without the WrtShell.
Back-pointer on View (again "for historical reasons").
Back-pointer is valid until in Activate a new one is set
or until it is deleted in the View's Dtor. */
- SwView* mpView;
- SwWrtShell* mpWrtShell;
+ SwView* m_pView;
+ SwWrtShell* m_pWrtShell;
- Timer aFinishedTimer; /**< Timer for checking graphics-links.
- If all are present, the doc is loaded completely. */
+ Timer m_FinishedTimer; /**< Timer for checking graphics-links.
+ If all are present, the doc is loaded completely. */
- comphelper::EmbeddedObjectContainer* mpOLEChildList;
- sal_Int16 mnUpdateDocMode; ///< contains the com::sun::star::document::UpdateDocMode
- bool bIsATemplate; ///< prevent nested calls of UpdateFontList
+ comphelper::EmbeddedObjectContainer* m_pOLEChildList;
+ sal_Int16 m_nUpdateDocMode; ///< contains the com::sun::star::document::UpdateDocMode
+ bool m_IsATemplate; ///< prevent nested calls of UpdateFontList
- bool mbRemovedInvisibleContent;
+ bool m_IsRemovedInvisibleContent;
///< whether SID_MAIL_PREPAREEXPORT removed content that
///< SID_MAIL_EXPORT_FINISHED needs to restore
@@ -199,8 +201,8 @@ public:
void StateStyleSheet(SfxItemSet&, SwWrtShell* pSh = 0 );
/// returns Doc. But be careful!
- inline SwDoc* GetDoc() { return mpDoc; }
- inline const SwDoc* GetDoc() const { return mpDoc; }
+ inline SwDoc* GetDoc() { return m_pDoc; }
+ inline const SwDoc* GetDoc() const { return m_pDoc; }
IDocumentDeviceAccess* getIDocumentDeviceAccess();
const IDocumentSettingAccess* getIDocumentSettingAccess() const;
IDocumentChartDataProviderAccess* getIDocumentChartDataProviderAccess();
@@ -216,12 +218,12 @@ public:
/// Set View for actions via Shell.
void SetView(SwView* pVw);
- const SwView *GetView() const { return mpView; }
- SwView *GetView() { return mpView; }
+ const SwView *GetView() const { return m_pView; }
+ SwView *GetView() { return m_pView; }
/// Accress to the SwWrtShell belonging to SwView.
- SwWrtShell *GetWrtShell() { return mpWrtShell; }
- const SwWrtShell *GetWrtShell() const { return mpWrtShell; }
+ SwWrtShell *GetWrtShell() { return m_pWrtShell; }
+ const SwWrtShell *GetWrtShell() const { return m_pWrtShell; }
// Same as GetWrtShell, but return pointer to SwEditShell base of
// (potentially incomplete) SwWrtShell:
SwEditShell * GetEditShell();
@@ -279,7 +281,7 @@ public:
/// Re-read Doc from Html-source.
void ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcView );
- sal_Int16 GetUpdateDocMode() const {return mnUpdateDocMode;}
+ sal_Int16 GetUpdateDocMode() const { return m_nUpdateDocMode; }
void ToggleBrowserMode(bool bOn, SwView* pView);
@@ -302,8 +304,8 @@ public:
GetController();
SfxInPlaceClient* GetIPClient( const ::svt::EmbeddedObjectRef& xObjRef );
- SAL_DLLPRIVATE bool IsTemplate() { return bIsATemplate; }
- SAL_DLLPRIVATE void SetIsTemplate( bool bValue ) { bIsATemplate = bValue; }
+ SAL_DLLPRIVATE bool IsTemplate() { return m_IsATemplate; }
+ SAL_DLLPRIVATE void SetIsTemplate( bool bValue ) { m_IsATemplate = bValue; }
virtual const ::sfx2::IXmlIdRegistry* GetXmlIdRegistry() const SAL_OVERRIDE;