diff options
36 files changed, 115 insertions, 103 deletions
diff --git a/editeng/inc/editeng/borderline.hxx b/editeng/inc/editeng/borderline.hxx index 92f9960ef79b..0c3bdcbad6a3 100644 --- a/editeng/inc/editeng/borderline.hxx +++ b/editeng/inc/editeng/borderline.hxx @@ -139,14 +139,14 @@ namespace editeng { sal_uInt16 GetInWidth() const; sal_uInt16 GetDistance() const; - SvxBorderStyle GetStyle() const { return m_nStyle; } + SvxBorderStyle GetSvxBorderStyle() const { return m_nStyle; } void SetColor( const Color &rColor ) { aColor = rColor; } void SetColorOutFn( Color (*pColorOutFn)( Color ) ) { m_pColorOutFn = pColorOutFn; } void SetColorInFn( Color (*pColorInFn)( Color ) ) { m_pColorInFn = pColorInFn; } void SetColorGapFn( Color (*pColorGapFn)( Color ) ) { m_pColorGapFn = pColorGapFn; } void SetUseLeftTop( bool bUseLeftTop ) { m_bUseLeftTop = bUseLeftTop; } - void SetStyle( SvxBorderStyle nNew ); + void SetSvxBorderStyle( SvxBorderStyle nNew ); void ScaleMetrics( long nMult, long nDiv ); sal_Bool operator==( const SvxBorderLine &rCmp ) const; diff --git a/editeng/qa/items/borderline_test.cxx b/editeng/qa/items/borderline_test.cxx index 4b32ec6f65b4..69adb1048162 100644 --- a/editeng/qa/items/borderline_test.cxx +++ b/editeng/qa/items/borderline_test.cxx @@ -96,7 +96,7 @@ void BorderLineTest::testGuessWidthDouble() // Normal double case SvxBorderLine line; line.GuessLinesWidths( DOUBLE, TEST_WIDTH, TEST_WIDTH, TEST_WIDTH ); - CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetStyle() ); + CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetSvxBorderStyle() ); CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() ); } @@ -105,7 +105,7 @@ void BorderLineTest::testGuessWidthNoMatch() SvxBorderLine line; line.GuessLinesWidths( DOUBLE, TEST_WIDTH + 1, TEST_WIDTH + 2, TEST_WIDTH + 3 ); - CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetStyle() ); + CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetSvxBorderStyle() ); CPPUNIT_ASSERT_EQUAL( long( (3 * TEST_WIDTH) + 6 ), line.GetWidth() ); } @@ -116,7 +116,7 @@ void BorderLineTest::testGuessWidthThinthickSmallgap() THINTHICKSG_OUT_WIDTH, THINTHICKSG_IN_WIDTH, THINTHICKSG_DIST_WIDTH ); - CPPUNIT_ASSERT_EQUAL( THINTHICK_SMALLGAP, line.GetStyle() ); + CPPUNIT_ASSERT_EQUAL( THINTHICK_SMALLGAP, line.GetSvxBorderStyle() ); CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() ); } @@ -127,7 +127,7 @@ void BorderLineTest::testGuessWidthThinthickLargegap() THINTHICKLG_OUT_WIDTH, THINTHICKLG_IN_WIDTH, THINTHICKLG_DIST_WIDTH ); - CPPUNIT_ASSERT_EQUAL( THINTHICK_LARGEGAP, line.GetStyle() ); + CPPUNIT_ASSERT_EQUAL( THINTHICK_LARGEGAP, line.GetSvxBorderStyle() ); CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() ); } @@ -138,7 +138,7 @@ void BorderLineTest::testGuessWidthNostyleDouble() THINTHICKLG_OUT_WIDTH, THINTHICKLG_IN_WIDTH, THINTHICKLG_DIST_WIDTH ); - CPPUNIT_ASSERT_EQUAL( THINTHICK_LARGEGAP, line.GetStyle() ); + CPPUNIT_ASSERT_EQUAL( THINTHICK_LARGEGAP, line.GetSvxBorderStyle() ); CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() ); } @@ -146,7 +146,7 @@ void BorderLineTest::testGuessWidthNostyleSingle() { SvxBorderLine line; line.GuessLinesWidths( NO_STYLE, TEST_WIDTH ); - CPPUNIT_ASSERT_EQUAL( SOLID, line.GetStyle() ); + CPPUNIT_ASSERT_EQUAL( SOLID, line.GetSvxBorderStyle() ); CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() ); } diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index fcfde00b902a..bd19eaed93b1 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -274,13 +274,13 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sa if ( nWidth > 0 ) { nStyle = nTestStyle; - SetStyle( nStyle ); + SetSvxBorderStyle(nStyle); m_nWidth = nWidth; } else { // fdo#38542: not a known double, default to something custom... - SetStyle( nStyle ); + SetSvxBorderStyle(nStyle); m_nWidth = nOut + nIn + nDist; if (nOut + nIn + nDist) { @@ -294,7 +294,7 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sa } else { - SetStyle( nStyle ); + SetSvxBorderStyle(nStyle); if (nOut == 0 && nIn > 0) { // If only inner width is given swap inner and outer widths for @@ -344,14 +344,14 @@ sal_Bool SvxBorderLine::operator==( const SvxBorderLine& rCmp ) const ( m_nWidth == rCmp.m_nWidth ) && ( m_bMirrorWidths == rCmp.m_bMirrorWidths ) && ( m_aWidthImpl == rCmp.m_aWidthImpl ) && - ( m_nStyle == rCmp.GetStyle() ) && + ( m_nStyle == rCmp.GetSvxBorderStyle()) && ( m_bUseLeftTop == rCmp.m_bUseLeftTop ) && ( m_pColorOutFn == rCmp.m_pColorOutFn ) && ( m_pColorInFn == rCmp.m_pColorInFn ) && ( m_pColorGapFn == rCmp.m_pColorGapFn ) ); } -void SvxBorderLine::SetStyle( SvxBorderStyle nNew ) +void SvxBorderLine::SetSvxBorderStyle( SvxBorderStyle nNew ) { m_nStyle = nNew; m_aWidthImpl = getWidthImpl( m_nStyle ); diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 1ceebf52e074..c080460ca9a1 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -143,7 +143,7 @@ namespace << l.GetDistance(); if (version >= BORDER_LINE_WITH_STYLE_VERSION) - stream << static_cast<sal_uInt16>(l.GetStyle()); + stream << static_cast<sal_uInt16>(l.GetSvxBorderStyle()); return stream; } @@ -1694,7 +1694,7 @@ table::BorderLine2 SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, sal_Boo aLine.InnerLineWidth = sal_uInt16( bConvert ? TWIP_TO_MM100_UNSIGNED(pLine->GetInWidth() ): pLine->GetInWidth() ); aLine.OuterLineWidth = sal_uInt16( bConvert ? TWIP_TO_MM100_UNSIGNED(pLine->GetOutWidth()): pLine->GetOutWidth() ); aLine.LineDistance = sal_uInt16( bConvert ? TWIP_TO_MM100_UNSIGNED(pLine->GetDistance()): pLine->GetDistance() ); - aLine.LineStyle = pLine->GetStyle( ); + aLine.LineStyle = pLine->GetSvxBorderStyle(); aLine.LineWidth = sal_uInt32( bConvert ? TWIP_TO_MM100( pLine->GetWidth( ) ) : pLine->GetWidth( ) ); } else @@ -1782,14 +1782,14 @@ lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_B rSvxLine.SetColor( Color(rLine.Color)); if ( bGuessWidth ) { - rSvxLine.GuessLinesWidths( rSvxLine.GetStyle(), + rSvxLine.GuessLinesWidths( rSvxLine.GetSvxBorderStyle(), sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.OuterLineWidth) : rLine.OuterLineWidth ), sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.InnerLineWidth) : rLine.InnerLineWidth ), sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.LineDistance ) : rLine.LineDistance )); } else { - if (DOUBLE == rSvxLine.GetStyle()) + if (DOUBLE == rSvxLine.GetSvxBorderStyle()) { // fdo#46112: divide width by 3 for outer line, gap, inner line rSvxLine.ScaleMetrics(1, 3); } @@ -1857,7 +1857,7 @@ SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, Svx nStyle = INSET; break; } - rSvxLine.SetStyle( nStyle ); + rSvxLine.SetSvxBorderStyle( nStyle ); sal_Bool bGuessWidth = sal_True; if ( rLine.LineWidth ) @@ -2008,7 +2008,7 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { editeng::SvxBorderLine* pLine = const_cast< editeng::SvxBorderLine* >( GetLine( aBorders[n] ) ); if( pLine ) - pLine->SetStyle( eBorderStyle ); + pLine->SetSvxBorderStyle( eBorderStyle ); } return sal_True; } @@ -3273,7 +3273,9 @@ bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId ) switch ( nMemId ) { case MID_FG_COLOR: pLine->SetColor( Color(nVal) ); break; - case MID_LINE_STYLE: pLine->SetStyle((SvxBorderStyle)nVal); break; + case MID_LINE_STYLE: + pLine->SetSvxBorderStyle(static_cast<SvxBorderStyle>(nVal)); + break; default: OSL_FAIL( "Wrong MemberId" ); return sal_False; diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index e63b5e2ff6f7..fc02868e764d 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -1468,49 +1468,49 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet, } case RTF_BRDRDOT: // dotted border - aBrd.SetStyle( DOTTED ); + aBrd.SetSvxBorderStyle( DOTTED ); break; case RTF_BRDRDASH: // dashed border - aBrd.SetStyle( DASHED ); + aBrd.SetSvxBorderStyle( DASHED ); break; case RTF_BRDRHAIR: // hairline border { - aBrd.SetStyle( SOLID ); + aBrd.SetSvxBorderStyle( SOLID ); aBrd.SetWidth( DEF_LINE_WIDTH_0 ); } break; case RTF_BRDRDB: // Double border - aBrd.SetStyle( DOUBLE ); + aBrd.SetSvxBorderStyle( DOUBLE ); break; case RTF_BRDRINSET: // inset border - aBrd.SetStyle( INSET ); + aBrd.SetSvxBorderStyle( INSET ); break; case RTF_BRDROUTSET: // outset border - aBrd.SetStyle( OUTSET ); + aBrd.SetSvxBorderStyle( OUTSET ); break; case RTF_BRDRTNTHSG: // ThinThick Small gap - aBrd.SetStyle( THINTHICK_SMALLGAP ); + aBrd.SetSvxBorderStyle( THINTHICK_SMALLGAP ); break; case RTF_BRDRTNTHMG: // ThinThick Medium gap - aBrd.SetStyle( THINTHICK_MEDIUMGAP ); + aBrd.SetSvxBorderStyle( THINTHICK_MEDIUMGAP ); break; case RTF_BRDRTNTHLG: // ThinThick Large gap - aBrd.SetStyle( THINTHICK_LARGEGAP ); + aBrd.SetSvxBorderStyle( THINTHICK_LARGEGAP ); break; case RTF_BRDRTHTNSG: // ThickThin Small gap - aBrd.SetStyle( THICKTHIN_SMALLGAP ); + aBrd.SetSvxBorderStyle( THICKTHIN_SMALLGAP ); break; case RTF_BRDRTHTNMG: // ThickThin Medium gap - aBrd.SetStyle( THICKTHIN_MEDIUMGAP ); + aBrd.SetSvxBorderStyle( THICKTHIN_MEDIUMGAP ); break; case RTF_BRDRTHTNLG: // ThickThin Large gap - aBrd.SetStyle( THICKTHIN_LARGEGAP ); + aBrd.SetSvxBorderStyle( THICKTHIN_LARGEGAP ); break; case RTF_BRDREMBOSS: // Embossed border - aBrd.SetStyle( EMBOSSED ); + aBrd.SetSvxBorderStyle( EMBOSSED ); break; case RTF_BRDRENGRAVE: // Engraved border - aBrd.SetStyle( ENGRAVED ); + aBrd.SetSvxBorderStyle( ENGRAVED ); break; case RTF_BRDRS: // single thickness border diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 7b6fd25dbcf1..f621c8322ca9 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -581,7 +581,7 @@ void ScFiltersTest::testBorderODS() CPPUNIT_ASSERT(!pTop); CPPUNIT_ASSERT(!pBottom); CPPUNIT_ASSERT(pRight); - CPPUNIT_ASSERT_EQUAL(pRight->GetStyle(),editeng::SOLID); + CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID); pDoc->GetBorderLines( 2, 1, 0, &pLeft, &pTop, &pRight, &pBottom ); CPPUNIT_ASSERT(!pLeft); @@ -589,7 +589,7 @@ void ScFiltersTest::testBorderODS() CPPUNIT_ASSERT(!pBottom); CPPUNIT_ASSERT(pRight); - CPPUNIT_ASSERT_EQUAL(pRight->GetStyle(),editeng::SOLID); + CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID); CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),20L); pDoc->GetBorderLines( 2, 8, 0, &pLeft, &pTop, &pRight, &pBottom ); @@ -598,7 +598,7 @@ void ScFiltersTest::testBorderODS() CPPUNIT_ASSERT(pTop); CPPUNIT_ASSERT(pBottom); CPPUNIT_ASSERT(pRight); - CPPUNIT_ASSERT_EQUAL(pRight->GetStyle(),editeng::SOLID); + CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID); CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),5L); CPPUNIT_ASSERT(pRight->GetColor() == Color(COL_BLUE)); @@ -620,17 +620,17 @@ void ScFiltersTest::testBorderXLS() pDoc->GetBorderLines( 2, 3, 0, &pLeft, &pTop, &pRight, &pBottom ); CPPUNIT_ASSERT(pRight); - CPPUNIT_ASSERT_EQUAL(pRight->GetStyle(),editeng::SOLID); + CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID); CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),6L); pDoc->GetBorderLines( 3, 5, 0, &pLeft, &pTop, &pRight, &pBottom ); CPPUNIT_ASSERT(pRight); - CPPUNIT_ASSERT_EQUAL(pRight->GetStyle(),editeng::SOLID); + CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID); CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),18L); pDoc->GetBorderLines( 5, 7, 0, &pLeft, &pTop, &pRight, &pBottom ); CPPUNIT_ASSERT(pRight); - CPPUNIT_ASSERT_EQUAL(pRight->GetStyle(),editeng::SOLID); + CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID); CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),24L); } diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 3c333f940721..6dd3547d2155 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -570,7 +570,7 @@ void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* if ((dest)) \ { \ SvxBorderLine* pCast = (SvxBorderLine*)(dest); \ - pCast->SetStyle( (src)->GetStyle( ) ); \ + pCast->SetSvxBorderStyle( (src)->GetSvxBorderStyle() ); \ pCast->SetWidth( (src)->GetWidth( ) ); \ } diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 74ba92ac8ede..881b2b25af3f 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -1571,13 +1571,13 @@ void lclGetBorderLine( else if( nOuterWidth >= EXC_BORDER_MEDIUM ) { rnXclLine = EXC_LINE_MEDIUM; - if ( pLine->GetStyle( ) == ::editeng::DASHED ) + if (pLine->GetSvxBorderStyle( ) == ::editeng::DASHED) rnXclLine = EXC_LINE_MEDIUMDASHED; } else if( nOuterWidth >= EXC_BORDER_THIN ) { rnXclLine = EXC_LINE_THIN; - switch ( pLine->GetStyle( ) ) + switch (pLine->GetSvxBorderStyle()) { case ::editeng::DASHED: rnXclLine = EXC_LINE_DASHED; diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 83b54c80b1d9..7c146cbc088b 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -919,7 +919,8 @@ bool lclConvertBorderLine( ::editeng::SvxBorderLine& rLine, const XclImpPalette& rLine.SetColor( rPalette.GetColor( nXclColor ) ); rLine.SetWidth( ppnLineParam[ nXclLine ][ 0 ] ); - rLine.SetStyle( (::editeng::SvxBorderStyle)ppnLineParam[ nXclLine ][ 1 ] ); + rLine.SetSvxBorderStyle( static_cast< ::editeng::SvxBorderStyle>( + ppnLineParam[ nXclLine ][ 1 ]) ); return true; } diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index d57a6d004076..e4bbe2581eeb 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -520,7 +520,7 @@ rtl::OString ScHTMLExport::BorderToStyle(const char* pBorderName, std::max(int(nWidth / TWIPS_PER_PIXEL), 1) : 0; aOut.append(static_cast<sal_Int32>(nPxWidth)). append(RTL_CONSTASCII_STRINGPARAM("px ")); - switch ( pLine->GetStyle() ) + switch (pLine->GetSvxBorderStyle()) { case ::editeng::SOLID: aOut.append(RTL_CONSTASCII_STRINGPARAM("solid")); diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx index eefad8a52640..2d53cd4bb481 100644 --- a/sc/source/filter/lotus/lotattr.cxx +++ b/sc/source/filter/lotus/lotattr.cxx @@ -168,12 +168,12 @@ void LotAttrCache::LotusToScBorderLine( sal_uInt8 nLine, ::editeng::SvxBorderLin switch ( nLine ) { default: - case 0: aBL.SetStyle( ::editeng::NO_STYLE ); break; + case 0: aBL.SetSvxBorderStyle( ::editeng::NO_STYLE ); break; case 1: aBL.SetWidth( DEF_LINE_WIDTH_1 ); break; case 2: aBL.SetWidth( DEF_LINE_WIDTH_2 ); break; case 3: { - aBL.SetStyle( ::editeng::DOUBLE ); + aBL.SetSvxBorderStyle( ::editeng::DOUBLE ); aBL.SetWidth( DEF_LINE_WIDTH_1 ); } break; diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index bcd140e1eddf..6d3e5ec79aae 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -1509,7 +1509,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 f5639a2f5b22..0015f9dfdd2a 100644 --- a/sc/source/ui/view/tabvwsh8.cxx +++ b/sc/source/ui/view/tabvwsh8.cxx @@ -42,7 +42,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 9b3efb6e8e08..f1c8f189067c 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2927,13 +2927,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() ); } } diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index cf43a4106a8b..8e38b611b19b 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -1185,7 +1185,7 @@ void Style::Set( const SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWid sal_uInt16 nDist = rBorder.GetDistance(); sal_uInt16 nSecn = rBorder.GetInWidth(); - mnType = rBorder.GetStyle(); + mnType = rBorder.GetSvxBorderStyle(); if( !nSecn ) // no or single frame border { Set( SCALEVALUE( nPrim ), 0, 0 ); diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 3a25bb1c2487..9aace5087c58 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -878,14 +878,17 @@ bool FrameSelector::GetVisibleWidth( long& rnWidth, SvxBorderStyle& rnStyle ) co const SvxBorderLine& rStyle = (*aIt)->GetCoreStyle(); bool bFound = true; for( ++aIt; bFound && aIt.Is(); ++aIt ) + { bFound = (rStyle.GetWidth() == (*aIt)->GetCoreStyle().GetWidth()) && - (rStyle.GetStyle() == (*aIt)->GetCoreStyle().GetStyle()); + (rStyle.GetSvxBorderStyle() == + (*aIt)->GetCoreStyle().GetSvxBorderStyle()); + } if( bFound ) { rnWidth = rStyle.GetWidth(); - rnStyle = rStyle.GetStyle(); + rnStyle = rStyle.GetSvxBorderStyle(); } return bFound; } @@ -948,7 +951,7 @@ void FrameSelector::SelectAllVisibleBorders( bool bSelect ) void FrameSelector::SetStyleToSelection( long nWidth, SvxBorderStyle nStyle ) { - mxImpl->maCurrStyle.SetStyle( nStyle ); + mxImpl->maCurrStyle.SetSvxBorderStyle( nStyle ); mxImpl->maCurrStyle.SetWidth( nWidth ); for( SelFrameBorderIter aIt( mxImpl->maEnabBorders ); aIt.Is(); ++aIt ) mxImpl->SetBorderState( **aIt, FRAMESTATE_SHOW ); diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index 7afd25eb236f..f1494fef8548 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -331,7 +331,7 @@ namespace drawinglayer getLeftLine().GetColorIn(true).getBColor(), getLeftLine().GetColorGap().getBColor(), getLeftLine().HasGapColor(), - getLeftLine().GetStyle())); + getLeftLine().GetSvxBorderStyle())); } } @@ -362,7 +362,7 @@ namespace drawinglayer getBottomLine().GetColorIn(false).getBColor(), getBottomLine().GetColorGap().getBColor(), getBottomLine().HasGapColor(), - getBottomLine().GetStyle())); + getBottomLine().GetSvxBorderStyle())); } } @@ -393,7 +393,7 @@ namespace drawinglayer getRightLine().GetColorIn(true).getBColor(), getRightLine().GetColorGap().getBColor(), getRightLine().HasGapColor(), - getRightLine().GetStyle())); + getRightLine().GetSvxBorderStyle())); } } @@ -424,7 +424,7 @@ namespace drawinglayer getTopLine().GetColorIn(false).getBColor(), getTopLine().GetColorGap().getBColor(), getTopLine().HasGapColor(), - getTopLine().GetStyle())); + getTopLine().GetSvxBorderStyle())); } } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index bd43e59f862d..4ad989c82ff1 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1149,7 +1149,8 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl) sal_uInt16 nModifier = aFrameSet.GetModifier(); sal_uInt8 nValidFlags = 0; - theDefLine.GuessLinesWidths( theDefLine.GetStyle(), DEF_LINE_WIDTH_0 ); + theDefLine.GuessLinesWidths(theDefLine.GetSvxBorderStyle(), + DEF_LINE_WIDTH_0); switch ( nSel ) { case 1: nValidFlags |= FRM_VALID_ALL; @@ -1389,7 +1390,7 @@ IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl) if ( m_aLineStyleLb.GetSelectEntryPos( ) > 0 ) { SvxBorderLine aTmp; - aTmp.SetStyle( nStyle ); + aTmp.SetSvxBorderStyle( nStyle ); aTmp.SetWidth( 20 ); // TODO Make it depend on a width field aLineItem.SetLine( &aTmp ); } diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index c5dacc13a38b..d4a1c1220377 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -128,7 +128,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 667fed3d21bd..7040153b38e1 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -592,27 +592,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 2520bc94b723..c6d4e62c5f6e 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -4623,7 +4623,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 bc8441701a76..e9a30e75be0c 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -3581,7 +3581,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 04ffd12434f9..2817f8132fcb 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 158483465f0b..d80b54b555d4 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -321,31 +321,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 a21d97616808..1f9774501a3a 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -5244,7 +5244,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 ) @@ -5253,7 +5255,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 ba345a2cc959..42b003705411 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1354,7 +1354,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 061449222226..5b6ea0612ff3 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 3631db88f57b..4638abae4f9a 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 bd24598b87f9..09c5592af9f8 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -4074,7 +4074,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: { @@ -4146,9 +4146,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 9df457c02b0d..656d4ae51c19 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -1354,7 +1354,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 909f17e43fb3..d4e7b1301466 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -942,7 +942,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 @@ -1076,7 +1076,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 947f9ea03cbf..2e14c57d991c 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -453,7 +453,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()); } @@ -531,7 +531,7 @@ void SwTableShell::Execute(SfxRequest &rReq) if(aBorderLine.GetOutWidth() == 0) { - aBorderLine.SetStyle( ::editeng::SOLID ); + aBorderLine.SetSvxBorderStyle( ::editeng::SOLID ); aBorderLine.SetWidth( DEF_LINE_WIDTH_0 ); } |