summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-14 14:00:46 +0200
committerNoel Grandin <noel@peralex.com>2015-04-23 13:08:48 +0200
commit79ed057b955a8d23e8289b9a5898c8bdaebabbfa (patch)
tree0b512b13f7b59e12a44395ea50814fda15902f04 /sd
parent12ba9e3cad05a665aee2150ef831f0dbc92d7e2d (diff)
loplugin:staticmethods
Change-Id: I6207b475127099872c6f3764331006688129b673
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/html/htmlex.cxx2
-rw-r--r--sd/source/ui/func/fuformatpaintbrush.cxx4
-rw-r--r--sd/source/ui/func/fupoor.cxx2
-rw-r--r--sd/source/ui/unoidl/DrawController.cxx2
-rw-r--r--sd/source/ui/view/sdview.cxx4
5 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index bd2757718b39..d743aeb854f2 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1267,7 +1267,7 @@ void HtmlExport::WriteTable(OUStringBuffer& aStr, SdrTableObj* pTableObject, Sdr
{
CellPos aStart, aEnd;
- aStart = pTableObject->getFirstCell();
+ aStart = SdrTableObj::getFirstCell();
aEnd = pTableObject->getLastCell();
sal_Int32 nColCount = pTableObject->getColumnCount();
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index cc25b13160c0..1f7966419bc7 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -235,7 +235,7 @@ bool FuFormatPaintBrush::HasContentForThisType( sal_uInt32 nObjectInventor, sal_
{
if( mxItemSet.get() == 0 )
return false;
- if( !mpView || (!mpView->SupportsFormatPaintbrush( nObjectInventor, nObjectIdentifier) ) )
+ if( !mpView || (!SdrObjEditView::SupportsFormatPaintbrush( nObjectInventor, nObjectIdentifier) ) )
return false;
return true;
}
@@ -276,7 +276,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma
if( rMarkList.GetMarkCount() == 1 )
{
SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
- if( pObj && rDrawViewShell.GetDrawView()->SupportsFormatPaintbrush(pObj->GetObjInventor(),pObj->GetObjIdentifier()) )
+ if( pObj && SdrObjEditView::SupportsFormatPaintbrush(pObj->GetObjInventor(),pObj->GetObjIdentifier()) )
return;
}
rSet.DisableItem( SID_FORMATPAINTBRUSH );
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index f1db1952db29..f522f6eba3f2 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -1031,7 +1031,7 @@ bool FuPoor::RequestHelp(const HelpEvent& rHEvt)
if (pPage)
{
- bReturn = pPage->RequestHelp(mpWindow, mpView, rHEvt);
+ bReturn = FmFormPage::RequestHelp(mpWindow, mpView, rHEvt);
}
}
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index f38f68e7ff48..e12a15bc75c6 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -712,7 +712,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFor
uno::Reference< form::runtime::XFormController > xController( NULL );
if ( pFormShell && pSdrView && pWindow )
- xController = pFormShell->GetFormController( Form, *pSdrView, *pWindow );
+ xController = FmFormShell::GetFormController( Form, *pSdrView, *pWindow );
return xController;
}
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 96d63bc6cb2a..35c8f3549358 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -1290,7 +1290,7 @@ bool View::ShouldToggleOn(
}
else
{
- aStart = pTableObj->getFirstCell();
+ aStart = SdrTableObj::getFirstCell();
aEnd = pTableObj->getLastCell();
}
sal_Int32 nColCount = pTableObj->getColumnCount();
@@ -1364,7 +1364,7 @@ void View::ChangeMarkedObjectsBulletsNumbering(
}
else
{
- aStart = pTableObj->getFirstCell();
+ aStart = SdrTableObj::getFirstCell();
aEnd = pTableObj->getLastCell();
}
sal_Int32 nColCount = pTableObj->getColumnCount();