sw/inc/swmodule.hxx | 70 +++++++++---------
sw/source/uibase/app/apphdl.cxx | 120 +++++++++++++++----------------
sw/source/uibase/app/appopt.cxx | 4 -
sw/source/uibase/app/swmodul1.cxx | 134 +++++++++++++++++------------------
sw/source/uibase/app/swmodule.cxx | 68 ++++++++---------
sw/source/uibase/dochdl/swdtflvr.cxx | 32 ++++----
sw/source/uibase/docvw/edtdd.cxx | 8 +-
7 files changed, 218 insertions(+), 218 deletions(-)
New commits:
commit d214f1cb437ad1733cbebc95586d58f0ec19c16e
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Sep 22 08:46:08 2015 +0200
sw: prefix members of SwModule
Change-Id: I5647e60dfbe5af460a077e1c2adf036fc2bb8037
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 35d58c6..b2d01cd 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -65,47 +65,47 @@ namespace com{ namespace sun{ namespace star{ namespace
scanner{
class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener, public
utl::ConfigurationListener
{
- OUString sActAuthor;
+ OUString m_sActAuthor;
// ConfigItems
- SwModuleOptions* pModuleConfig;
- SwMasterUsrPref* pUsrPref;
- SwMasterUsrPref* pWebUsrPref;
- SwPrintOptions* pPrtOpt;
- SwPrintOptions* pWebPrtOpt;
- SwChapterNumRules* pChapterNumRules;
- SwStdFontConfig* pStdFontConfig;
- SwNavigationConfig* pNavigationConfig;
- SwToolbarConfigItem*pToolbarConfig; //For stacked toolbars. Which one
was visible?
- SwToolbarConfigItem*pWebToolbarConfig;
- SwDBConfig* pDBConfig;
- svtools::ColorConfig* pColorConfig;
- SvtAccessibilityOptions* pAccessibilityOptions;
- SvtCTLOptions* pCTLOptions;
- SvtUserOptions* pUserOptions;
-
- SfxErrorHandler* pErrorHdl;
-
- SwAttrPool *pAttrPool;
+ SwModuleOptions* m_pModuleConfig;
+ SwMasterUsrPref* m_pUsrPref;
+ SwMasterUsrPref* m_pWebUsrPref;
+ SwPrintOptions* m_pPrintOptions;
+ SwPrintOptions* m_pWebPrintOptions;
+ SwChapterNumRules* m_pChapterNumRules;
+ SwStdFontConfig* m_pStdFontConfig;
+ SwNavigationConfig* m_pNavigationConfig;
+ SwToolbarConfigItem*m_pToolbarConfig; //For stacked toolbars. Which
one was visible?
+ SwToolbarConfigItem*m_pWebToolbarConfig;
+ SwDBConfig* m_pDBConfig;
+ svtools::ColorConfig* m_pColorConfig;
+ SvtAccessibilityOptions* m_pAccessibilityOptions;
+ SvtCTLOptions* m_pCTLOptions;
+ SvtUserOptions* m_pUserOptions;
+
+ SfxErrorHandler* m_pErrorHandler;
+
+ SwAttrPool *m_pAttrPool;
// Current view is held here in order to avoid one's being forced
// to work via GetActiveView.
// View is valid until destroyed in Activate or exchanged.
- SwView* pView;
+ SwView* m_pView;
// List of all Redline-authors.
- std::vector<OUString>* pAuthorNames;
+ std::vector<OUString>* m_pAuthorNames;
// DictionaryList listener to trigger spellchecking or hyphenation
::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XLinguServiceEventListener >
xLngSvcEvtListener;
+ ::com::sun::star::linguistic2::XLinguServiceEventListener >
m_xLinguServiceEventListener;
::com::sun::star::uno::Reference<
::com::sun::star::scanner::XScannerManager2 > m_xScannerManager;
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLanguageGuessing > m_xLanguageGuesser;
- bool bAuthorInitialised : 1;
- bool bEmbeddedLoadSave : 1;
+ bool m_bAuthorInitialised : 1;
+ bool m_bEmbeddedLoadSave : 1;
// Catch hint for DocInfo.
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
SAL_OVERRIDE;
@@ -119,7 +119,7 @@ protected:
public:
// public Data - used for internal Clipboard / Drag & Drop / XSelection
- SwTransferable *pDragDrop, *pXSelection;
+ SwTransferable *m_pDragDrop, *m_pXSelection;
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SW_INTERFACE_MODULE)
@@ -137,8 +137,8 @@ public:
virtual ~SwModule();
// Set view for internal use only. It is public only for technical reasons.
- inline void SetView(SwView* pVw) { pView = pVw; }
- inline SwView* GetView() { return pView; }
+ inline void SetView(SwView* pVw) { m_pView = pVw; }
+ inline SwView* GetView() { return m_pView; }
// Handler for slots.
void StateOther(SfxItemSet &);
@@ -161,13 +161,13 @@ public:
void ApplyUserCharUnit(bool bApplyChar, bool bWeb); // apply_char_unit
// Create ConfigItems.
- SwModuleOptions* GetModuleConfig() { return pModuleConfig;}
+ SwModuleOptions* GetModuleConfig() { return m_pModuleConfig;}
SwPrintOptions* GetPrtOptions(bool bWeb);
SwChapterNumRules* GetChapterNumRules();
- SwStdFontConfig* GetStdFontConfig() { return pStdFontConfig; }
+ SwStdFontConfig* GetStdFontConfig() { return m_pStdFontConfig; }
SwNavigationConfig* GetNavigationConfig();
- SwToolbarConfigItem*GetToolbarConfig() { return pToolbarConfig; }
- SwToolbarConfigItem*GetWebToolbarConfig() { return pWebToolbarConfig; }
+ SwToolbarConfigItem*GetToolbarConfig() { return m_pToolbarConfig; }
+ SwToolbarConfigItem*GetWebToolbarConfig() { return m_pWebToolbarConfig; }
SwDBConfig* GetDBConfig();
svtools::ColorConfig& GetColorConfig();
SvtAccessibilityOptions& GetAccessibilityOptions();
@@ -178,8 +178,8 @@ public:
static SwView* GetFirstView();
static SwView* GetNextView(SwView*);
- bool IsEmbeddedLoadSave() const { return bEmbeddedLoadSave; }
- void SetEmbeddedLoadSave( bool bFlag ) { bEmbeddedLoadSave = bFlag; }
+ bool IsEmbeddedLoadSave() const { return m_bEmbeddedLoadSave; }
+ void SetEmbeddedLoadSave( bool bFlag ) { m_bEmbeddedLoadSave = bFlag; }
static void ShowDBObj( SwView& rView, const SwDBData& rData, bool
bOnlyIfAvailable = false);
@@ -248,7 +248,7 @@ inline ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguServiceEventListener >
SwModule::GetLngSvcEvtListener()
{
- return xLngSvcEvtListener;
+ return m_xLinguServiceEventListener;
}
// Access to SwModule, the View and the shell.
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 3caad9d..1156673 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -197,7 +197,7 @@ void SwModule::StateOther(SfxItemSet &rSet)
rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, static_cast<
sal_uInt16 >(::GetDfltMetric(bWebView))));
break;
case FN_SET_MODOPT_TBLNUMFMT:
- rSet.Put( SfxBoolItem( nWhich, pModuleConfig->
+ rSet.Put( SfxBoolItem( nWhich, m_pModuleConfig->
IsInsTableFormatNum( bWebView )));
break;
default:
@@ -670,9 +670,9 @@ void SwModule::ExecOther(SfxRequest& rReq)
nWhich, false, &pItem ))
bSet = static_cast<const SfxBoolItem*>(pItem)->GetValue();
else
- bSet = !pModuleConfig->IsInsTableFormatNum( bWebView );
+ bSet = !m_pModuleConfig->IsInsTableFormatNum( bWebView );
- pModuleConfig->SetInsTableFormatNum( bWebView, bSet );
+ m_pModuleConfig->SetInsTableFormatNum( bWebView, bSet );
}
break;
#if HAVE_FEATURE_DBCONNECTIVITY
@@ -757,37 +757,37 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const
SfxHint& rHint )
sal_uInt16 nHintId = static_cast<const SfxSimpleHint&>(rHint).GetId();
if(SFX_HINT_DEINITIALIZING == nHintId)
{
- DELETEZ(pWebUsrPref);
- DELETEZ(pUsrPref) ;
- DELETEZ(pModuleConfig);
- DELETEZ(pPrtOpt) ;
- DELETEZ(pWebPrtOpt) ;
- DELETEZ(pChapterNumRules);
- DELETEZ(pStdFontConfig) ;
- DELETEZ(pNavigationConfig) ;
- DELETEZ(pToolbarConfig) ;
- DELETEZ(pWebToolbarConfig) ;
- DELETEZ(pAuthorNames) ;
- DELETEZ(pDBConfig);
- if( pColorConfig )
+ DELETEZ(m_pWebUsrPref);
+ DELETEZ(m_pUsrPref) ;
+ DELETEZ(m_pModuleConfig);
+ DELETEZ(m_pPrintOptions) ;
+ DELETEZ(m_pWebPrintOptions) ;
+ DELETEZ(m_pChapterNumRules);
+ DELETEZ(m_pStdFontConfig) ;
+ DELETEZ(m_pNavigationConfig) ;
+ DELETEZ(m_pToolbarConfig) ;
+ DELETEZ(m_pWebToolbarConfig) ;
+ DELETEZ(m_pAuthorNames) ;
+ DELETEZ(m_pDBConfig);
+ if( m_pColorConfig )
{
- pColorConfig->RemoveListener(this);
- DELETEZ(pColorConfig);
+ m_pColorConfig->RemoveListener(this);
+ DELETEZ(m_pColorConfig);
}
- if( pAccessibilityOptions )
+ if( m_pAccessibilityOptions )
{
- pAccessibilityOptions->RemoveListener(this);
- DELETEZ(pAccessibilityOptions);
+ m_pAccessibilityOptions->RemoveListener(this);
+ DELETEZ(m_pAccessibilityOptions);
}
- if( pCTLOptions )
+ if( m_pCTLOptions )
{
- pCTLOptions->RemoveListener(this);
- DELETEZ(pCTLOptions);
+ m_pCTLOptions->RemoveListener(this);
+ DELETEZ(m_pCTLOptions);
}
- if( pUserOptions )
+ if( m_pUserOptions )
{
- pUserOptions->RemoveListener(this);
- DELETEZ(pUserOptions);
+ m_pUserOptions->RemoveListener(this);
+ DELETEZ(m_pUserOptions);
}
}
}
@@ -795,15 +795,15 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const
SfxHint& rHint )
void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst,
sal_uInt32 )
{
- if( pBrdCst == pUserOptions )
+ if( pBrdCst == m_pUserOptions )
{
- bAuthorInitialised = false;
+ m_bAuthorInitialised = false;
}
- else if ( pBrdCst == pColorConfig || pBrdCst == pAccessibilityOptions )
+ else if ( pBrdCst == m_pColorConfig || pBrdCst == m_pAccessibilityOptions )
{
bool bAccessibility = false;
- if( pBrdCst == pColorConfig )
- SwViewOption::ApplyColorConfigValues(*pColorConfig);
+ if( pBrdCst == m_pColorConfig )
+ SwViewOption::ApplyColorConfigValues(*m_pColorConfig);
else
bAccessibility = true;
@@ -823,9 +823,9 @@ void SwModule::ConfigurationChanged(
utl::ConfigurationBroadcaster* pBrdCst, sal
if(bAccessibility)
{
if(pViewShell->IsA(aSwViewTypeId))
-
static_cast<SwView*>(pViewShell)->ApplyAccessiblityOptions(*pAccessibilityOptions);
+
static_cast<SwView*>(pViewShell)->ApplyAccessiblityOptions(*m_pAccessibilityOptions);
else if(pViewShell->IsA(aSwPreviewTypeId))
-
static_cast<SwPagePreview*>(pViewShell)->ApplyAccessiblityOptions(*pAccessibilityOptions);
+
static_cast<SwPagePreview*>(pViewShell)->ApplyAccessiblityOptions(*m_pAccessibilityOptions);
}
pViewShell->GetWindow()->Invalidate();
}
@@ -833,7 +833,7 @@ void SwModule::ConfigurationChanged(
utl::ConfigurationBroadcaster* pBrdCst, sal
pViewShell = SfxViewShell::GetNext( *pViewShell );
}
}
- else if( pBrdCst == pCTLOptions )
+ else if( pBrdCst == m_pCTLOptions )
{
const SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
while( pObjSh )
@@ -853,66 +853,66 @@ void SwModule::ConfigurationChanged(
utl::ConfigurationBroadcaster* pBrdCst, sal
SwDBConfig* SwModule::GetDBConfig()
{
- if(!pDBConfig)
- pDBConfig = new SwDBConfig;
- return pDBConfig;
+ if(!m_pDBConfig)
+ m_pDBConfig = new SwDBConfig;
+ return m_pDBConfig;
}
svtools::ColorConfig& SwModule::GetColorConfig()
{
- if(!pColorConfig)
+ if(!m_pColorConfig)
{
- pColorConfig = new svtools::ColorConfig;
- SwViewOption::ApplyColorConfigValues(*pColorConfig);
- pColorConfig->AddListener(this);
+ m_pColorConfig = new svtools::ColorConfig;
+ SwViewOption::ApplyColorConfigValues(*m_pColorConfig);
+ m_pColorConfig->AddListener(this);
}
- return *pColorConfig;
+ return *m_pColorConfig;
}
SvtAccessibilityOptions& SwModule::GetAccessibilityOptions()
{
- if(!pAccessibilityOptions)
+ if(!m_pAccessibilityOptions)
{
- pAccessibilityOptions = new SvtAccessibilityOptions;
- pAccessibilityOptions->AddListener(this);
+ m_pAccessibilityOptions = new SvtAccessibilityOptions;
+ m_pAccessibilityOptions->AddListener(this);
}
- return *pAccessibilityOptions;
+ return *m_pAccessibilityOptions;
}
SvtCTLOptions& SwModule::GetCTLOptions()
{
- if(!pCTLOptions)
+ if(!m_pCTLOptions)
{
- pCTLOptions = new SvtCTLOptions;
- pCTLOptions->AddListener(this);
+ m_pCTLOptions = new SvtCTLOptions;
+ m_pCTLOptions->AddListener(this);
}
- return *pCTLOptions;
+ return *m_pCTLOptions;
}
SvtUserOptions& SwModule::GetUserOptions()
{
- if(!pUserOptions)
+ if(!m_pUserOptions)
{
- pUserOptions = new SvtUserOptions;
- pUserOptions->AddListener(this);
+ m_pUserOptions = new SvtUserOptions;
+ m_pUserOptions->AddListener(this);
}
- return *pUserOptions;
+ return *m_pUserOptions;
}
const SwMasterUsrPref *SwModule::GetUsrPref(bool bWeb) const
{
SwModule* pNonConstModule = const_cast<SwModule*>(this);
- if(bWeb && !pWebUsrPref)
+ if(bWeb && !m_pWebUsrPref)
{
// The SpellChecker is needed in SwMasterUsrPref's Load, but it must
not
// be created there #58256#
- pNonConstModule->pWebUsrPref = new SwMasterUsrPref(true);
+ pNonConstModule->m_pWebUsrPref = new SwMasterUsrPref(true);
}
- else if(!bWeb && !pUsrPref)
+ else if(!bWeb && !m_pUsrPref)
{
- pNonConstModule->pUsrPref = new SwMasterUsrPref(false);
+ pNonConstModule->m_pUsrPref = new SwMasterUsrPref(false);
}
- return bWeb ? pWebUsrPref : pUsrPref;
+ return bWeb ? m_pWebUsrPref : m_pUsrPref;
}
void NewXForms( SfxRequest& rReq )
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index d0453e4..d660c89 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -77,7 +77,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
// the options for the Web- and Textdialog are put together here
SwViewOption aViewOpt = *GetUsrPref(!bTextDialog);
- SwMasterUsrPref* pPref = bTextDialog ? pUsrPref : pWebUsrPref;
+ SwMasterUsrPref* pPref = bTextDialog ? m_pUsrPref : m_pWebUsrPref;
// no MakeUsrPref, because only options from textdoks can be used here
SwView* pAppView = GetView();
if(pAppView && pAppView->GetViewFrame() != SfxViewFrame::Current())
@@ -253,7 +253,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const
SfxItemSet& rSet )
}
SwViewOption aViewOpt = *GetUsrPref(!bTextDialog);
- SwMasterUsrPref* pPref = bTextDialog ? pUsrPref : pWebUsrPref;
+ SwMasterUsrPref* pPref = bTextDialog ? m_pUsrPref : m_pWebUsrPref;
const SfxPoolItem* pItem;
SfxBindings *pBindings = pAppView ?
&pAppView->GetViewFrame()->GetBindings()
diff --git a/sw/source/uibase/app/swmodul1.cxx
b/sw/source/uibase/app/swmodul1.cxx
index 3bfdfa3..0dd1acc1 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -210,15 +210,15 @@ void SwModule::ApplyUserMetric( FieldUnit eMetric, bool
bWeb )
SwMasterUsrPref* pPref;
if(bWeb)
{
- if(!pWebUsrPref)
+ if(!m_pWebUsrPref)
GetUsrPref(true);
- pPref = pWebUsrPref;
+ pPref = m_pWebUsrPref;
}
else
{
- if(!pUsrPref)
+ if(!m_pUsrPref)
GetUsrPref(false);
- pPref = pUsrPref;
+ pPref = m_pUsrPref;
}
FieldUnit eOldMetric = pPref->GetMetric();
if(eOldMetric != eMetric)
@@ -246,15 +246,15 @@ void SwModule::ApplyRulerMetric( FieldUnit eMetric, bool
bHorizontal, bool bWeb
SwMasterUsrPref* pPref;
if(bWeb)
{
- if(!pWebUsrPref)
+ if(!m_pWebUsrPref)
GetUsrPref(true);
- pPref = pWebUsrPref;
+ pPref = m_pWebUsrPref;
}
else
{
- if(!pUsrPref)
+ if(!m_pUsrPref)
GetUsrPref(false);
- pPref = pUsrPref;
+ pPref = m_pUsrPref;
}
if( bHorizontal )
pPref->SetHScrollMetric(eMetric);
@@ -282,15 +282,15 @@ void SwModule::ApplyUserCharUnit(bool bApplyChar, bool
bWeb)
SwMasterUsrPref* pPref;
if(bWeb)
{
- if(!pWebUsrPref)
+ if(!m_pWebUsrPref)
GetUsrPref(true);
- pPref = pWebUsrPref;
+ pPref = m_pWebUsrPref;
}
else
{
- if(!pUsrPref)
+ if(!m_pUsrPref)
GetUsrPref(false);
- pPref = pUsrPref;
+ pPref = m_pUsrPref;
}
bool bOldApplyCharUnit = pPref->IsApplyCharUnit();
bool bHasChanged = false;
@@ -338,32 +338,32 @@ void SwModule::ApplyUserCharUnit(bool bApplyChar, bool
bWeb)
SwNavigationConfig* SwModule::GetNavigationConfig()
{
- if(!pNavigationConfig)
+ if(!m_pNavigationConfig)
{
- pNavigationConfig = new SwNavigationConfig;
+ m_pNavigationConfig = new SwNavigationConfig;
}
- return pNavigationConfig;
+ return m_pNavigationConfig;
}
SwPrintOptions* SwModule::GetPrtOptions(bool bWeb)
{
- if(bWeb && !pWebPrtOpt)
+ if(bWeb && !m_pWebPrintOptions)
{
- pWebPrtOpt = new SwPrintOptions(true);
+ m_pWebPrintOptions = new SwPrintOptions(true);
}
- else if(!bWeb && !pPrtOpt)
+ else if(!bWeb && !m_pPrintOptions)
{
- pPrtOpt = new SwPrintOptions(false);
+ m_pPrintOptions = new SwPrintOptions(false);
}
- return bWeb ? pWebPrtOpt : pPrtOpt;
+ return bWeb ? m_pWebPrintOptions : m_pPrintOptions;
}
SwChapterNumRules* SwModule::GetChapterNumRules()
{
- if(!pChapterNumRules)
- pChapterNumRules = new SwChapterNumRules;
- return pChapterNumRules;
+ if(!m_pChapterNumRules)
+ m_pChapterNumRules = new SwChapterNumRules;
+ return m_pChapterNumRules;
}
void SwModule::ShowDBObj(SwView& rView, const SwDBData& rData, bool
/*bOnlyIfAvailable*/)
@@ -393,47 +393,47 @@ void SwModule::ShowDBObj(SwView& rView, const SwDBData&
rData, bool /*bOnlyIfAva
sal_uInt16 SwModule::GetRedlineAuthor()
{
- if (!bAuthorInitialised)
+ if (!m_bAuthorInitialised)
{
const SvtUserOptions& rOpt = GetUserOptions();
- sActAuthor = rOpt.GetFullName();
- if (sActAuthor.isEmpty())
+ m_sActAuthor = rOpt.GetFullName();
+ if (m_sActAuthor.isEmpty())
{
- sActAuthor = rOpt.GetID();
- if (sActAuthor.isEmpty())
- sActAuthor = SW_RESSTR( STR_REDLINE_UNKNOWN_AUTHOR );
+ m_sActAuthor = rOpt.GetID();
+ if (m_sActAuthor.isEmpty())
+ m_sActAuthor = SW_RESSTR( STR_REDLINE_UNKNOWN_AUTHOR );
}
- bAuthorInitialised = true;
+ m_bAuthorInitialised = true;
}
- return InsertRedlineAuthor( sActAuthor );
+ return InsertRedlineAuthor( m_sActAuthor );
}
void SwModule::SetRedlineAuthor(const OUString &rAuthor)
{
- bAuthorInitialised = true;
- sActAuthor = rAuthor;
- InsertRedlineAuthor( sActAuthor );
+ m_bAuthorInitialised = true;
+ m_sActAuthor = rAuthor;
+ InsertRedlineAuthor( m_sActAuthor );
}
OUString SwModule::GetRedlineAuthor(sal_uInt16 nPos)
{
- OSL_ENSURE(nPos < pAuthorNames->size(), "author not found!"); //#i45342#
RTF doc with no author table caused reader to crash
- while(!(nPos < pAuthorNames->size()))
+ OSL_ENSURE(nPos < m_pAuthorNames->size(), "author not found!"); //#i45342#
RTF doc with no author table caused reader to crash
+ while(!(nPos < m_pAuthorNames->size()))
{
InsertRedlineAuthor("nn");
}
- return (*pAuthorNames)[nPos];
+ return (*m_pAuthorNames)[nPos];
}
sal_uInt16 SwModule::InsertRedlineAuthor(const OUString& rAuthor)
{
sal_uInt16 nPos = 0;
- while(nPos < pAuthorNames->size() && (*pAuthorNames)[nPos] != rAuthor)
+ while(nPos < m_pAuthorNames->size() && (*m_pAuthorNames)[nPos] != rAuthor)
++nPos;
- if (nPos == pAuthorNames->size())
- pAuthorNames->push_back(rAuthor);
+ if (nPos == m_pAuthorNames->size())
+ m_pAuthorNames->push_back(rAuthor);
return nPos;
}
@@ -507,43 +507,43 @@ static void lcl_FillAuthorAttr( sal_uInt16 nAuthor,
SfxItemSet &rSet,
void SwModule::GetInsertAuthorAttr(sal_uInt16 nAuthor, SfxItemSet &rSet)
{
- lcl_FillAuthorAttr(nAuthor, rSet, pModuleConfig->GetInsertAuthorAttr());
+ lcl_FillAuthorAttr(nAuthor, rSet, m_pModuleConfig->GetInsertAuthorAttr());
}
void SwModule::GetDeletedAuthorAttr(sal_uInt16 nAuthor, SfxItemSet &rSet)
{
- lcl_FillAuthorAttr(nAuthor, rSet, pModuleConfig->GetDeletedAuthorAttr());
+ lcl_FillAuthorAttr(nAuthor, rSet, m_pModuleConfig->GetDeletedAuthorAttr());
}
// For future extension:
void SwModule::GetFormatAuthorAttr( sal_uInt16 nAuthor, SfxItemSet &rSet )
{
- lcl_FillAuthorAttr( nAuthor, rSet, pModuleConfig->GetFormatAuthorAttr() );
+ lcl_FillAuthorAttr( nAuthor, rSet, m_pModuleConfig->GetFormatAuthorAttr()
);
}
sal_uInt16 SwModule::GetRedlineMarkPos()
{
- return pModuleConfig->GetMarkAlignMode();
+ return m_pModuleConfig->GetMarkAlignMode();
}
bool SwModule::IsInsTableFormatNum(bool bHTML) const
{
- return pModuleConfig->IsInsTableFormatNum(bHTML);
+ return m_pModuleConfig->IsInsTableFormatNum(bHTML);
}
bool SwModule::IsInsTableChangeNumFormat(bool bHTML) const
{
- return pModuleConfig->IsInsTableChangeNumFormat(bHTML);
+ return m_pModuleConfig->IsInsTableChangeNumFormat(bHTML);
}
bool SwModule::IsInsTableAlignNum(bool bHTML) const
{
- return pModuleConfig->IsInsTableAlignNum(bHTML);
+ return m_pModuleConfig->IsInsTableAlignNum(bHTML);
}
const Color &SwModule::GetRedlineMarkColor()
{
- return pModuleConfig->GetMarkAlignColor();
+ return m_pModuleConfig->GetMarkAlignColor();
}
const SwViewOption* SwModule::GetViewOption(bool bWeb)
@@ -553,7 +553,7 @@ const SwViewOption* SwModule::GetViewOption(bool bWeb)
OUString SwModule::GetDocStatWordDelim() const
{
- return pModuleConfig->GetWordDelimiter();
+ return m_pModuleConfig->GetWordDelimiter();
}
// Passing-through of the ModuleConfig's Metric (for HTML-Export)
@@ -562,15 +562,15 @@ FieldUnit SwModule::GetMetric( bool bWeb ) const
SwMasterUsrPref* pPref;
if(bWeb)
{
- if(!pWebUsrPref)
+ if(!m_pWebUsrPref)
GetUsrPref(true);
- pPref = pWebUsrPref;
+ pPref = m_pWebUsrPref;
}
else
{
- if(!pUsrPref)
+ if(!m_pUsrPref)
GetUsrPref(false);
- pPref = pUsrPref;
+ pPref = m_pUsrPref;
}
return pPref->GetMetric();
}
@@ -578,30 +578,30 @@ FieldUnit SwModule::GetMetric( bool bWeb ) const
// Pass-through Update-Status
sal_uInt16 SwModule::GetLinkUpdMode( bool ) const
{
- if(!pUsrPref)
+ if(!m_pUsrPref)
GetUsrPref(false);
- return (sal_uInt16)pUsrPref->GetUpdateLinkMode();
+ return (sal_uInt16)m_pUsrPref->GetUpdateLinkMode();
}
SwFieldUpdateFlags SwModule::GetFieldUpdateFlags( bool ) const
{
- if(!pUsrPref)
+ if(!m_pUsrPref)
GetUsrPref(false);
- return pUsrPref->GetFieldUpdateFlags();
+ return m_pUsrPref->GetFieldUpdateFlags();
}
void SwModule::ApplyFieldUpdateFlags(SwFieldUpdateFlags eFieldFlags)
{
- if(!pUsrPref)
+ if(!m_pUsrPref)
GetUsrPref(false);
- pUsrPref->SetFieldUpdateFlags(eFieldFlags);
+ m_pUsrPref->SetFieldUpdateFlags(eFieldFlags);
}
void SwModule::ApplyLinkMode(sal_Int32 nNewLinkMode)
{
- if(!pUsrPref)
+ if(!m_pUsrPref)
GetUsrPref(false);
- pUsrPref->SetUpdateLinkMode(nNewLinkMode);
+ m_pUsrPref->SetUpdateLinkMode(nNewLinkMode);
}
void SwModule::CheckSpellChanges( bool bOnlineSpelling,
@@ -630,29 +630,29 @@ void SwModule::CheckSpellChanges( bool bOnlineSpelling,
void SwModule::ApplyDefaultPageMode(bool bIsSquaredPageMode)
{
- if(!pUsrPref)
+ if(!m_pUsrPref)
GetUsrPref(false);
- pUsrPref->SetDefaultPageMode(bIsSquaredPageMode);
+ m_pUsrPref->SetDefaultPageMode(bIsSquaredPageMode);
}
SvxCompareMode SwModule::GetCompareMode() const
{
- return pModuleConfig->GetCompareMode();
+ return m_pModuleConfig->GetCompareMode();
}
bool SwModule::IsUseRsid() const
{
- return pModuleConfig->IsUseRsid();
+ return m_pModuleConfig->IsUseRsid();
}
bool SwModule::IsIgnorePieces() const
{
- return pModuleConfig->IsIgnorePieces();
+ return m_pModuleConfig->IsIgnorePieces();
}
sal_uInt16 SwModule::GetPieceLen() const
{
- return pModuleConfig->GetPieceLen();
+ return m_pModuleConfig->GetPieceLen();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/app/swmodule.cxx
b/sw/source/uibase/app/swmodule.cxx
index b43373a..31b39c5 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -147,45 +147,45 @@ SwModule::SwModule( SfxObjectFactory* pWebFact,
SfxObjectFactory* pGlobalFact )
: SfxModule( ResMgr::CreateResMgr( "sw" ), false, pWebFact,
pFact, pGlobalFact, NULL ),
- pModuleConfig(0),
- pUsrPref(0),
- pWebUsrPref(0),
- pPrtOpt(0),
- pWebPrtOpt(0),
- pChapterNumRules(0),
- pStdFontConfig(0),
- pNavigationConfig(0),
- pToolbarConfig(0),
- pWebToolbarConfig(0),
- pDBConfig(0),
- pColorConfig(0),
- pAccessibilityOptions(0),
- pCTLOptions(0),
- pUserOptions(0),
- pAttrPool(0),
- pView(0),
- bAuthorInitialised(false),
- bEmbeddedLoadSave( false ),
- pDragDrop( 0 ),
- pXSelection( 0 )
+ m_pModuleConfig(0),
+ m_pUsrPref(0),
+ m_pWebUsrPref(0),
+ m_pPrintOptions(0),
+ m_pWebPrintOptions(0),
+ m_pChapterNumRules(0),
+ m_pStdFontConfig(0),
+ m_pNavigationConfig(0),
+ m_pToolbarConfig(0),
+ m_pWebToolbarConfig(0),
+ m_pDBConfig(0),
+ m_pColorConfig(0),
+ m_pAccessibilityOptions(0),
+ m_pCTLOptions(0),
+ m_pUserOptions(0),
+ m_pAttrPool(0),
+ m_pView(0),
+ m_bAuthorInitialised(false),
+ m_bEmbeddedLoadSave( false ),
+ m_pDragDrop( 0 ),
+ m_pXSelection( 0 )
{
SetName( OUString("StarWriter") );
pSwResMgr = GetResMgr();
SvxErrorHandler::ensure();
- pErrorHdl = new SfxErrorHandler( RID_SW_ERRHDL,
+ m_pErrorHandler = new SfxErrorHandler( RID_SW_ERRHDL,
ERRCODE_AREA_SW,
ERRCODE_AREA_SW_END,
pSwResMgr );
- pModuleConfig = new SwModuleOptions;
+ m_pModuleConfig = new SwModuleOptions;
// We need them anyways
- pToolbarConfig = new SwToolbarConfigItem( false );
- pWebToolbarConfig = new SwToolbarConfigItem( true );
+ m_pToolbarConfig = new SwToolbarConfigItem( false );
+ m_pWebToolbarConfig = new SwToolbarConfigItem( true );
- pStdFontConfig = new SwStdFontConfig;
+ m_pStdFontConfig = new SwStdFontConfig;
- pAuthorNames = new std::vector<OUString>; // All Redlining-Authors
+ m_pAuthorNames = new std::vector<OUString>; // All Redlining-Authors
StartListening( *SfxGetpApp() );
@@ -218,14 +218,14 @@ uno::Reference< linguistic2::XLanguageGuessing >
SwModule::GetLanguageGuesser()
SwModule::~SwModule()
{
- delete pErrorHdl;
+ delete m_pErrorHandler;
EndListening( *SfxGetpApp() );
}
void SwModule::CreateLngSvcEvtListener()
{
- if (!xLngSvcEvtListener.is())
- xLngSvcEvtListener = new SwLinguServiceEventListener;
+ if (!m_xLinguServiceEventListener.is())
+ m_xLinguServiceEventListener = new SwLinguServiceEventListener;
}
void SwDLL::RegisterFactories()
@@ -387,15 +387,15 @@ void SwDLL::RegisterControls()
// Load Module (only dummy for linking of the DLL)
void SwModule::InitAttrPool()
{
- OSL_ENSURE(!pAttrPool, "Pool already exists!");
- pAttrPool = new SwAttrPool(0);
- SetPool(pAttrPool);
+ OSL_ENSURE(!m_pAttrPool, "Pool already exists!");
+ m_pAttrPool = new SwAttrPool(0);
+ SetPool(m_pAttrPool);
}
void SwModule::RemoveAttrPool()
{
SetPool(0);
- SfxItemPool::Free(pAttrPool);
+ SfxItemPool::Free(m_pAttrPool);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index 142b02e..31a5c47 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -264,10 +264,10 @@ SwTransferable::~SwTransferable()
SwModule* pMod = SW_MOD();
if(pMod)
{
- if ( pMod->pDragDrop == this )
- pMod->pDragDrop = 0;
- else if ( pMod->pXSelection == this )
- pMod->pXSelection = 0;
+ if ( pMod->m_pDragDrop == this )
+ pMod->m_pDragDrop = 0;
+ else if ( pMod->m_pXSelection == this )
+ pMod->m_pXSelection = 0;
}
delete m_pClpGraphic;
@@ -295,17 +295,17 @@ static SwDoc * lcl_GetDoc(SwDocFac & rDocFac)
void SwTransferable::ObjectReleased()
{
SwModule *pMod = SW_MOD();
- if( this == pMod->pDragDrop )
- pMod->pDragDrop = 0;
- else if( this == pMod->pXSelection )
- pMod->pXSelection = 0;
+ if( this == pMod->m_pDragDrop )
+ pMod->m_pDragDrop = 0;
+ else if( this == pMod->m_pXSelection )
+ pMod->m_pXSelection = 0;
}
void SwTransferable::AddSupportedFormats()
{
// only need if we are the current XSelection Object
SwModule *pMod = SW_MOD();
- if( this == pMod->pXSelection || comphelper::LibreOfficeKit::isActive())
+ if( this == pMod->m_pXSelection || comphelper::LibreOfficeKit::isActive())
{
SetDataForDragAndDrop( Point( 0,0) );
}
@@ -1194,7 +1194,7 @@ bool SwTransferable::PasteData( TransferableDataHelper&
rData,
if( pPt )
{
// external Drop
- if( bPasteSelection ? !pMod->pXSelection : !pMod->pDragDrop )
+ if( bPasteSelection ? !pMod->m_pXSelection : !pMod->m_pDragDrop )
{
switch( nDestination )
{
@@ -1248,7 +1248,7 @@ bool SwTransferable::PasteData( TransferableDataHelper&
rData,
SwTransferable *pTrans=0, *pTunneledTrans=GetSwTransferable( rData );
// check for private drop
- bool bPrivateDrop(pPt && (bPasteSelection ? 0 != (pTrans =
pMod->pXSelection) : 0 != (pTrans = pMod->pDragDrop)));
+ bool bPrivateDrop(pPt && (bPasteSelection ? 0 != (pTrans =
pMod->m_pXSelection) : 0 != (pTrans = pMod->m_pDragDrop)));
bool bNeedToSelectBeforePaste(false);
if(bPrivateDrop && DND_ACTION_LINK == nDropAction)
@@ -3168,7 +3168,7 @@ void SwTransferable::StartDrag( vcl::Window* pWin, const
Point& rPos )
if( m_pWrtShell->IsSelFrmMode() )
m_pWrtShell->ShowCrsr();
- SW_MOD()->pDragDrop = this;
+ SW_MOD()->m_pDragDrop = this;
SetDataForDragAndDrop( rPos );
@@ -3564,7 +3564,7 @@ void SwTransferable::CreateSelection( SwWrtShell& rSh,
pNew->m_pCreatorView = _pCreatorView;
uno::Reference< XTransferable > xRef( pNew );
- pMod->pXSelection = pNew;
+ pMod->m_pXSelection = pNew;
pNew->CopyToSelection( rSh.GetWin() );
}
@@ -3572,9 +3572,9 @@ void SwTransferable::ClearSelection( SwWrtShell& rSh,
const SwFrameShell * _pCreatorView)
{
SwModule *pMod = SW_MOD();
- if( pMod->pXSelection &&
- ((!pMod->pXSelection->m_pWrtShell) || (pMod->pXSelection->m_pWrtShell
== &rSh)) &&
- (!_pCreatorView || (pMod->pXSelection->m_pCreatorView ==
_pCreatorView)) )
+ if( pMod->m_pXSelection &&
+ ((!pMod->m_pXSelection->m_pWrtShell) ||
(pMod->m_pXSelection->m_pWrtShell == &rSh)) &&
+ (!_pCreatorView || (pMod->m_pXSelection->m_pCreatorView ==
_pCreatorView)) )
{
TransferableHelper::ClearSelection( rSh.GetWin() );
}
diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx
index 460a603..4ac525c 100644
--- a/sw/source/uibase/docvw/edtdd.cxx
+++ b/sw/source/uibase/docvw/edtdd.cxx
@@ -235,9 +235,9 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent&
rEvt )
if( !SwTransferable::PasteData( aData, rSh, m_nDropAction, m_nDropFormat,
m_nDropDestination, false, rEvt.mbDefault,
&aDocPt, nRet))
nRet = DND_ACTION_NONE;
- else if ( SW_MOD()->pDragDrop )
+ else if ( SW_MOD()->m_pDragDrop )
//Don't clean up anymore at internal D&D!
- SW_MOD()->pDragDrop->SetCleanUp( false );
+ SW_MOD()->m_pDragDrop->SetCleanUp( false );
return nRet;
}
@@ -390,12 +390,12 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent&
rEvt )
//With the default action we still want to have a say.
SwModule *pMod = SW_MOD();
- if( pMod->pDragDrop )
+ if( pMod->m_pDragDrop )
{
bool bCleanup = false;
//Drawing objects in Headers/Footers are not allowed
- SwWrtShell *pSrcSh = pMod->pDragDrop->GetShell();
+ SwWrtShell *pSrcSh = pMod->m_pDragDrop->GetShell();
if( (pSrcSh->GetSelFrmType() == FrmTypeFlags::DRAWOBJ) &&
pSrcSh->IsSelContainsControl() &&
(rSh.GetFrmType( &aDocPt, false ) &
(FrmTypeFlags::HEADER|FrmTypeFlags::FOOTER)) )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
