summaryrefslogtreecommitdiff
path: root/sw/source/uibase/uiview
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-04 10:29:18 +0200
committerNoel Grandin <noel@peralex.com>2015-05-05 09:30:41 +0200
commit259820af718fe15ea5080711f77918dad8f14fbb (patch)
treea80039fad41dfbfaeaa8fe0b7403c29336f37861 /sw/source/uibase/uiview
parent03e6cc9130864adcea5a1ae5440f24a9c128e8d6 (diff)
loplugin:staticmethods
Change-Id: I90dd921077bbfc57200e398e7959306f26c65cfe
Diffstat (limited to 'sw/source/uibase/uiview')
-rw-r--r--sw/source/uibase/uiview/formatclipboard.cxx2
-rw-r--r--sw/source/uibase/uiview/view.cxx2
-rw-r--r--sw/source/uibase/uiview/view0.cxx2
-rw-r--r--sw/source/uibase/uiview/view1.cxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx10
-rw-r--r--sw/source/uibase/uiview/viewling.cxx4
6 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx
index 801e757030a9..2aaa3346dc1c 100644
--- a/sw/source/uibase/uiview/formatclipboard.cxx
+++ b/sw/source/uibase/uiview/formatclipboard.cxx
@@ -260,7 +260,7 @@ bool SwFormatClipboard::HasContentForThisType( int nSelectionType ) const
return false;
}
-bool SwFormatClipboard::CanCopyThisType( int nSelectionType ) const
+bool SwFormatClipboard::CanCopyThisType( int nSelectionType )
{
if( nSelectionType & (nsSelectionType::SEL_FRM | nsSelectionType::SEL_OLE | nsSelectionType::SEL_GRF
| nsSelectionType::SEL_TXT | nsSelectionType::SEL_DRW | nsSelectionType::SEL_TBL | nsSelectionType::SEL_TBL_CELLS ) )
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index ab632ebf3d1d..085157fdf961 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -996,7 +996,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
if(xBeamerFrame.is())
{
SwDBData aData = m_pWrtShell->GetDBData();
- SW_MOD()->ShowDBObj( *this, aData );
+ SwModule::ShowDBObj( *this, aData );
}
// has anybody calls the attrchanged handler in the constructor?
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 7379cf3dd6d2..46f4e5aa6d1c 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -570,7 +570,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
// The UsrPref must be marked as modified.
// call for initialization
pModule->GetUsrPref(bWebView);
- pModule->CheckSpellChanges( pOpt->IsOnlineSpell(), false, false, false );
+ SwModule::CheckSpellChanges( pOpt->IsOnlineSpell(), false, false, false );
}
//OS: Set back modified again, because view/fields sets the Doc modified.
if( !bModified )
diff --git a/sw/source/uibase/uiview/view1.cxx b/sw/source/uibase/uiview/view1.cxx
index 9695e3690815..4081d58d0df4 100644
--- a/sw/source/uibase/uiview/view1.cxx
+++ b/sw/source/uibase/uiview/view1.cxx
@@ -176,7 +176,7 @@ void SwView::StateFormatPaintbrush(SfxItemSet &rSet)
rSet.Put(SfxBoolItem(SID_FORMATPAINTBRUSH, bHasContent));
if(!bHasContent)
{
- if( !m_pFormatClipboard->CanCopyThisType( GetWrtShell().GetSelectionType() ) )
+ if( !SwFormatClipboard::CanCopyThisType( GetWrtShell().GetSelectionType() ) )
rSet.DisableItem( SID_FORMATPAINTBRUSH );
}
}
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index ac264eca208d..efebf89a8534 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1104,7 +1104,7 @@ void SwView::Execute(SfxRequest &rReq)
if(pVFrame->HasChildWindow(SID_BROWSER))
{
const SwDBData& rData = GetWrtShell().GetDBDesc();
- SW_MOD()->ShowDBObj(*this, rData, false);
+ SwModule::ShowDBObj(*this, rData, false);
}
}
break;
@@ -1322,19 +1322,19 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
OUString sCurrentSectionName = CurrSect->GetSectionName();
if(sCurrentSectionName != m_sOldSectionName)
{
- rShell.FireSectionChangeEvent(2, 1);
+ SwCrsrShell::FireSectionChangeEvent(2, 1);
}
m_sOldSectionName = sCurrentSectionName;
}
else if (!m_sOldSectionName.isEmpty())
{
- rShell.FireSectionChangeEvent(2, 1);
+ SwCrsrShell::FireSectionChangeEvent(2, 1);
m_sOldSectionName= OUString();
}
//get column change event
if(rShell.bColumnChange())
{
- rShell.FireColumnChangeEvent(2, 1);
+ SwCrsrShell::FireColumnChangeEvent(2, 1);
}
while( nWhich )
@@ -1352,7 +1352,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
if (m_nOldPageNum != nLogPage )
{
if (m_nOldPageNum != 0)
- rShell.FirePageChangeEvent(m_nOldPageNum, nLogPage);
+ SwCrsrShell::FirePageChangeEvent(m_nOldPageNum, nLogPage);
m_nOldPageNum = nLogPage;
}
const sal_uInt16 nCnt = GetWrtShell().GetPageCnt();
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index a39bdd5b2128..7193b042f2f1 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -228,7 +228,7 @@ void SwView::StartTextConversion(
bool bIsInteractive )
{
// do not do text conversion if it is active elsewhere
- if (GetWrtShell().HasConvIter())
+ if (SwEditShell::HasConvIter())
{
return;
}
@@ -417,7 +417,7 @@ void SwView::HyphStart( SvxSpellArea eWhich )
void SwView::HyphenateDocument()
{
// do not hyphenate if interactive hyphenation is active elsewhere
- if (GetWrtShell().HasHyphIter())
+ if (SwEditShell::HasHyphIter())
{
MessBox( 0, WB_OK, OUString( SW_RES( STR_HYPH_TITLE ) ),
OUString( SW_RES( STR_MULT_INTERACT_HYPH_WARN ) ) ).Execute();