summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-06-22 23:44:56 +0200
committerMichael Stahl <mstahl@redhat.com>2012-07-04 18:06:10 +0200
commit786e9503d4d4e19769a5ba13ab6ea95dfca724ac (patch)
treed73c28797663f482c41f017f0534a4688bc7c7dd /sc/source/ui
parente0eeb13989d442b6b7cb07104ed9c883de725018 (diff)
rename SvxBorderLine::SetStyle to something unambiguous
Change-Id: Iec70985319a64cdc3630e15499ac304a7f1aabae (cherry picked from commit 463e59d680467a7b0d30ae956935a444c513de9e)
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/view/formatsh.cxx3
-rw-r--r--sc/source/ui/view/tabvwsh8.cxx2
-rw-r--r--sc/source/ui/view/viewfun2.cxx4
3 files changed, 5 insertions, 4 deletions
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 98ac6655ded8..c9ddb4e63bd2 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1511,7 +1511,8 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
if ( pDefLine )
{
- pDefLine->SetStyle( pLine->GetStyle( ) );
+ pDefLine->SetSvxBorderStyle(
+ pLine->GetSvxBorderStyle());
pDefLine->SetWidth( pLine->GetWidth( ) );
pTabViewShell->SetSelectionFrameLines( pDefLine, false );
}
diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx
index 64473783478a..eb502dded3e0 100644
--- a/sc/source/ui/view/tabvwsh8.cxx
+++ b/sc/source/ui/view/tabvwsh8.cxx
@@ -47,7 +47,7 @@ void ScTabViewShell::SetDefaultFrameLine( const ::editeng::SvxBorderLine* pLine
delete pCurFrameLine;
pCurFrameLine = new ::editeng::SvxBorderLine( &pLine->GetColor(),
pLine->GetWidth(),
- pLine->GetStyle() );
+ pLine->GetSvxBorderStyle() );
}
else if ( pCurFrameLine )
{
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index afba02f14d25..ac50009712a3 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2930,13 +2930,13 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine,
if ( bColor )
{
rLine.SetColor ( pSrcLine->GetColor() );
- rLine.SetStyle ( pDestLine->GetStyle() );
+ rLine.SetSvxBorderStyle(pDestLine->GetSvxBorderStyle());
rLine.SetWidth ( pDestLine->GetWidth() );
}
else
{
rLine.SetColor ( pDestLine->GetColor() );
- rLine.SetStyle ( pSrcLine->GetStyle() );
+ rLine.SetSvxBorderStyle(pSrcLine->GetSvxBorderStyle());
rLine.SetWidth ( pSrcLine->GetWidth() );
}
}