summaryrefslogtreecommitdiff
path: root/sw
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 /sw
parente0eeb13989d442b6b7cb07104ed9c883de725018 (diff)
rename SvxBorderLine::SetStyle to something unambiguous
Change-Id: Iec70985319a64cdc3630e15499ac304a7f1aabae (cherry picked from commit 463e59d680467a7b0d30ae956935a444c513de9e)
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/docnode/ndtbl.cxx2
-rw-r--r--sw/source/core/edit/autofmt.cxx12
-rw-r--r--sw/source/core/layout/paintfrm.cxx2
-rw-r--r--sw/source/filter/html/css1atr.cxx2
-rw-r--r--sw/source/filter/html/htmltab.cxx8
-rw-r--r--sw/source/filter/html/svxcss1.cxx18
-rw-r--r--sw/source/filter/html/swhtml.cxx6
-rw-r--r--sw/source/filter/ww1/w1sprm.cxx4
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx2
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx6
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx2
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx4
-rw-r--r--sw/source/filter/xml/xmlithlp.cxx6
-rw-r--r--sw/source/ui/shells/frmsh.cxx4
-rw-r--r--sw/source/ui/shells/tabsh.cxx4
18 files changed, 46 insertions, 42 deletions
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index a6efdba97ea6..7065f941c37c 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -127,7 +127,7 @@ void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
SvxBorderLine aLine( &aCol, DEF_LINE_WIDTH_0 );
if ( bHTML )
{
- aLine.SetStyle( editeng::DOUBLE );
+ aLine.SetSvxBorderStyle( editeng::DOUBLE );
aLine.SetWidth( DEF_LINE_WIDTH_0 );
}
SvxBoxItem aBox(RES_BOX); aBox.SetDistance( 55 );
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index e2c57c36b0b7..d4ab105b819a 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -593,27 +593,27 @@ sal_Bool SwAutoFormat::DoUnderline()
switch( eState )
{
case 1: // einfach, 0,05 pt
- aLine.SetStyle( editeng::SOLID );
+ aLine.SetSvxBorderStyle( editeng::SOLID );
aLine.SetWidth( DEF_LINE_WIDTH_0 );
break;
case 2: // einfach, 1,0 pt
- aLine.SetStyle( editeng::SOLID );
+ aLine.SetSvxBorderStyle( editeng::SOLID );
aLine.SetWidth( DEF_LINE_WIDTH_1 );
break;
case 3: // doppelt, 1,1 pt
- aLine.SetStyle( editeng::DOUBLE );
+ aLine.SetSvxBorderStyle( editeng::DOUBLE );
aLine.SetWidth( DEF_LINE_WIDTH_0 );
break;
case 4: // doppelt, 4,5 pt
- aLine.SetStyle( editeng::THICKTHIN_SMALLGAP );
+ aLine.SetSvxBorderStyle( editeng::THICKTHIN_SMALLGAP );
aLine.SetWidth( DEF_LINE_WIDTH_1 );
break;
case 5: // doppelt, 6,0 pt
- aLine.SetStyle( editeng::THINTHICK_SMALLGAP );
+ aLine.SetSvxBorderStyle( editeng::THINTHICK_SMALLGAP );
aLine.SetWidth( DEF_LINE_WIDTH_2 );
break;
case 6: // doppelt, 9,0 pt
- aLine.SetStyle( editeng::DOUBLE );
+ aLine.SetSvxBorderStyle( editeng::DOUBLE );
aLine.SetWidth( DEF_LINE_WIDTH_2 );
break;
}
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 15b6bf169577..cff8a264ce78 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4638,7 +4638,7 @@ lcl_MakeBorderLine(SwRect const& rRect,
nExtentRightStart, nExtentRightEnd,
aLeftColor.getBColor(), aRightColor.getBColor(),
rBorder.GetColorGap().getBColor(), rBorder.HasGapColor(),
- rBorder.GetStyle() );
+ rBorder.GetSvxBorderStyle() );
g_pBorderLines->AddBorderLine(xLine);
}
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 9e45ebfa40c0..98727ad66a63 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -3583,7 +3583,7 @@ static void OutCSS1_SvxBorderLine( SwHTMLWriter& rHTMLWrt,
// Linien-Stil: solid oder double
sOut.append(' ');
- switch ( pLine->GetStyle( ) )
+ switch (pLine->GetSvxBorderStyle())
{
case ::editeng::SOLID:
sOut.append(sCSS1_PV_solid);
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 583b167a05b2..53529f67385c 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1025,7 +1025,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
}
if ( pOptions->nCellSpacing != 0 )
- aTopBorderLine.SetStyle( ::editeng::DOUBLE );
+ aTopBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
aTopBorderLine.SetWidth( nPHeight );
aTopBorderLine.SetColor( rBorderColor );
aBottomBorderLine = aTopBorderLine;
@@ -1037,7 +1037,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
else
{
if ( pOptions->nCellSpacing != 0 )
- aLeftBorderLine.SetStyle( ::editeng::DOUBLE );
+ aLeftBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
aLeftBorderLine.SetWidth( nPWidth );
aLeftBorderLine.SetColor( rBorderColor );
}
@@ -1045,7 +1045,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
if( pOptions->nCellSpacing != 0 )
{
- aBorderLine.SetStyle( ::editeng::DOUBLE );
+ aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
}
else
@@ -1487,7 +1487,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
sal_uInt16 nBorderWidth = aBorderLine.GetOutWidth();
nBorderWidth *= (nEmptyRows + 1);
- aThickBorderLine.SetStyle( ::editeng::SOLID );
+ aThickBorderLine.SetSvxBorderStyle( ::editeng::SOLID );
aThickBorderLine.SetWidth( nBorderWidth );
aBoxItem.SetLine( &aThickBorderLine, BOX_LINE_BOTTOM );
}
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 22dcd941d71b..90f66e795469 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -323,31 +323,31 @@ void SvxCSS1BorderInfo::SetBorderLine( sal_uInt16 nLine, SvxBoxItem &rBoxItem )
switch ( eStyle )
{
case CSS1_BS_SINGLE:
- aBorderLine.SetStyle( ::editeng::SOLID );
+ aBorderLine.SetSvxBorderStyle( ::editeng::SOLID );
break;
case CSS1_BS_DOUBLE:
- aBorderLine.SetStyle( ::editeng::DOUBLE );
+ aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
break;
case CSS1_BS_DOTTED:
- aBorderLine.SetStyle( ::editeng::DOTTED );
+ aBorderLine.SetSvxBorderStyle( ::editeng::DOTTED );
break;
case CSS1_BS_DASHED:
- aBorderLine.SetStyle( ::editeng::DASHED );
+ aBorderLine.SetSvxBorderStyle( ::editeng::DASHED );
break;
case CSS1_BS_GROOVE:
- aBorderLine.SetStyle( ::editeng::ENGRAVED );
+ aBorderLine.SetSvxBorderStyle( ::editeng::ENGRAVED );
break;
case CSS1_BS_RIDGE:
- aBorderLine.SetStyle( ::editeng::EMBOSSED );
+ aBorderLine.SetSvxBorderStyle( ::editeng::EMBOSSED );
break;
case CSS1_BS_INSET:
- aBorderLine.SetStyle( ::editeng::INSET );
+ aBorderLine.SetSvxBorderStyle( ::editeng::INSET );
break;
case CSS1_BS_OUTSET:
- aBorderLine.SetStyle( ::editeng::OUTSET );
+ aBorderLine.SetSvxBorderStyle( ::editeng::OUTSET );
break;
default:
- aBorderLine.SetStyle( ::editeng::NO_STYLE );
+ aBorderLine.SetSvxBorderStyle( ::editeng::NO_STYLE );
break;
}
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 703cef0be78d..a3d4ae502266 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -5245,7 +5245,9 @@ void SwHTMLParser::InsertHorzRule()
long nPHeight = (long)nSize;
SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight );
if ( !bNoShade )
- aBorderLine.SetStyle( ::editeng::DOUBLE );
+ {
+ aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
+ }
aBorderLine.SetWidth( nPHeight );
}
else if( bNoShade )
@@ -5254,7 +5256,7 @@ void SwHTMLParser::InsertHorzRule()
}
else
{
- aBorderLine.SetStyle( ::editeng::DOUBLE );
+ aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
}
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index a2d451f91d5b..6c7bd759ac0d 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -228,13 +228,13 @@ SvxBorderLine* Ww1SingleSprmPBrc::SetBorder(SvxBorderLine* pLine, W1_BRC10* pBrc
break;
}
pLine->SetWidth( nCode );
- pLine->SetStyle( eStyle );
+ pLine->SetSvxBorderStyle( eStyle );
}
else
{
if ( pBrc->dxpLine1WidthGet() == 1 && pBrc->dxpLine2WidthGet() == 1 )
{
- pLine->SetStyle( ::editeng::DOUBLE );
+ pLine->SetSvxBorderStyle( ::editeng::DOUBLE );
pLine->SetWidth( DEF_LINE_WIDTH_0 );
}
else
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index e2406d1da6e3..fb347bb76be9 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1412,7 +1412,7 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co
const char* pVal = "none";
if ( !pBorderLine->isEmpty( ) )
{
- switch ( pBorderLine->GetStyle( ) )
+ switch (pBorderLine->GetSvxBorderStyle())
{
case ::editeng::SOLID:
pVal = ( sal_Char* )"single";
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 6e9c8b2e061f..94bfccb238d6 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -124,7 +124,7 @@ static OString OutTBLBorderLine(RtfExport &rExport, const SvxBorderLine* pLine,
{
aRet.append(pStr);
// single line
- switch ( pLine->GetStyle( ) )
+ switch (pLine->GetSvxBorderStyle())
{
case ::editeng::SOLID:
{
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index d4d78017ef51..f74a3ea2539f 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1727,7 +1727,7 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt,
DrawModelToEmu( nLineWidth ));
MSO_LineDashing eDashing = mso_lineSolid;
- switch ( pLine->GetStyle( ) )
+ switch (pLine->GetSvxBorderStyle())
{
case ::editeng::DASHED:
eDashing = mso_lineDashGEL;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 40e85b6751e9..52f761969ad1 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4073,7 +4073,7 @@ WW8_BRC WW8Export::TranslateBorderLine(const SvxBorderLine& rLine,
{
// All the border types values are available on
// http://msdn.microsoft.com/en-us/library/dd908142%28v=office.12%29.aspx
- switch ( rLine.GetStyle( ) )
+ switch (rLine.GetSvxBorderStyle())
{
case ::editeng::SOLID:
{
@@ -4145,9 +4145,9 @@ WW8_BRC WW8Export::TranslateBorderLine(const SvxBorderLine& rLine,
nWidth = ( nWidth + 7 ) / 15;
if( nWidth > 5 )
nWidth = 5;
- if ( ::editeng::DOTTED == rLine.GetStyle( ) )
+ if ( ::editeng::DOTTED == rLine.GetSvxBorderStyle() )
nWidth = 6;
- else if ( ::editeng::DASHED == rLine.GetStyle( ) )
+ else if ( ::editeng::DASHED == rLine.GetSvxBorderStyle() )
nWidth = 7;
}
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 084fc1519e63..2f3c47fcf8b5 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1569,7 +1569,7 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
aLine.SetColor( rLineColor );
aLine.SetWidth( nLineThick ); // No conversion here, nLineThick is already in twips
- aLine.SetStyle( nIdx );
+ aLine.SetSvxBorderStyle(nIdx);
if (editeng::DOUBLE == nIdx)
{ // fdo#43249: divide width by 3 for outer line, gap, inner line
aLine.ScaleMetrics(1, 3);
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 6d7954840303..95138871f06c 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1353,7 +1353,7 @@ void GetLineIndex(SvxBoxItem &rBox, short nLineThickness, short nSpace, sal_uInt
}
::editeng::SvxBorderLine aLine;
- aLine.SetStyle( eStyle );
+ aLine.SetSvxBorderStyle( eStyle );
aLine.SetWidth( nLineThickness );
//No AUTO for borders as yet, so if AUTO, use BLACK
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 72f711d03c69..3114bd48f8bf 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -365,7 +365,7 @@ void SvXMLExportItemMapper::handleElementItem(
bool lcl_isOdfDoubleLine( const SvxBorderLine* pLine )
{
bool bIsOdfDouble = false;
- switch ( pLine->GetStyle() )
+ switch (pLine->GetSvxBorderStyle())
{
case ::editeng::DOUBLE:
case ::editeng::THINTHICK_SMALLGAP:
@@ -743,7 +743,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue(
enum XMLTokenEnum eStyle = XML_SOLID;
bool bNoBorder = false;
- switch ( pLine->GetStyle( ) )
+ switch (pLine->GetSvxBorderStyle())
{
case ::editeng::SOLID:
eStyle = XML_SOLID;
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index 8de48aba9a11..4531995dd8ee 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -157,7 +157,7 @@ void lcl_frmitems_setXMLBorderStyle( SvxBorderLine& rLine, sal_uInt16 nStyle )
::editeng::SvxBorderStyle eStyle = ::editeng::NO_STYLE;
if ( nStyle != API_LINE_NONE )
eStyle = ::editeng::SvxBorderStyle( nStyle );
- rLine.SetStyle( eStyle );
+ rLine.SetSvxBorderStyle(eStyle);
}
sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
@@ -206,7 +206,9 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
if (bHasWidth && USHRT_MAX != nNamedWidth)
{
if (bDouble)
- rpLine->SetStyle( ::editeng::DOUBLE );
+ {
+ rpLine->SetSvxBorderStyle( ::editeng::DOUBLE );
+ }
rpLine->SetWidth( aBorderWidths[nNamedWidth] );
}
else
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 504efda20739..46b9738ff1e2 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -1095,7 +1095,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
if(aBorderLine.GetOutWidth() == 0)
{
- aBorderLine.SetStyle( ::editeng::SOLID );
+ aBorderLine.SetSvxBorderStyle( ::editeng::SOLID );
aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
}
//Distance nur setzen, wenn der Request vom Controller kommt
@@ -1229,7 +1229,7 @@ void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBo
if(pBorderLine->GetWidth() > rBorderLine.GetWidth())
rBorderLine.SetWidth(pBorderLine->GetWidth());
- rBorderLine.SetStyle(pBorderLine->GetStyle());
+ rBorderLine.SetSvxBorderStyle(pBorderLine->GetSvxBorderStyle());
rBorderLine.SetColor(pBorderLine->GetColor());
}
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 32eb4e01c2a1..ccbe696dc5a0 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -463,7 +463,7 @@ static void lcl_TabGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLi
if(pBorderLine->GetWidth() > rBorderLine.GetWidth())
rBorderLine.SetWidth(pBorderLine->GetWidth());
- rBorderLine.SetStyle(pBorderLine->GetStyle());
+ rBorderLine.SetSvxBorderStyle(pBorderLine->GetSvxBorderStyle());
rBorderLine.SetColor(pBorderLine->GetColor());
}
@@ -541,7 +541,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
if(aBorderLine.GetOutWidth() == 0)
{
- aBorderLine.SetStyle( ::editeng::SOLID );
+ aBorderLine.SetSvxBorderStyle( ::editeng::SOLID );
aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
}