diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-07-03 21:26:13 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-04 18:06:10 +0200 |
| commit | af24dfc60aae08fe49ac8544ddced6974c58f097 (patch) | |
| tree | b18ac766931d0d9e8db588437bea136535b0c6a4 | |
| parent | 786e9503d4d4e19769a5ba13ab6ea95dfca724ac (diff) | |
replace enum SvxBorderStyle with css::table::BorderLineSyle
Change-Id: I1dadb53f46b23f92d34061ef78dda872bdbcda67
(cherry picked from commit 8b4593948582c3b5b3d013bd751bb19ffd37a31b)
53 files changed, 441 insertions, 407 deletions
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index d6bf7a0be325..a75741d24b88 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -1030,6 +1030,8 @@ Color lcl_mediumColor( Color aMain, Color /*aDefault*/ ) void SvxBorderTabPage::FillLineListBox_Impl() { + using namespace ::com::sun::star::table::BorderLineStyle; + aLbLineStyle.SetSourceUnit( FUNIT_TWIP ); aLbLineStyle.SetNone( SVX_RESSTR( RID_SVXSTR_NONE ) ); diff --git a/editeng/inc/editeng/borderline.hxx b/editeng/inc/editeng/borderline.hxx index 0c3bdcbad6a3..e026fc208410 100644 --- a/editeng/inc/editeng/borderline.hxx +++ b/editeng/inc/editeng/borderline.hxx @@ -29,6 +29,8 @@ #ifndef SVX_BORDERLINE_HXX #define SVX_BORDERLINE_HXX +#include <com/sun/star/table/BorderLineStyle.hpp> + #include <tools/color.hxx> #include <svl/poolitem.hxx> #include <editeng/editengdllapi.h> @@ -47,24 +49,8 @@ namespace editeng { - enum SvxBorderStyle - { - SOLID, - DOTTED, - DASHED, - DOUBLE, - THINTHICK_SMALLGAP, - THINTHICK_MEDIUMGAP, - THINTHICK_LARGEGAP, - THICKTHIN_SMALLGAP, - THICKTHIN_MEDIUMGAP, - THICKTHIN_LARGEGAP, - EMBOSSED, - ENGRAVED, - OUTSET, - INSET, - NO_STYLE = -1 - }; + // values from ::com::sun::star::table::BorderLineStyle + typedef sal_Int16 SvxBorderStyle; class EDITENG_DLLPUBLIC SvxBorderLine { @@ -89,7 +75,8 @@ namespace editeng { public: SvxBorderLine( const Color *pCol = 0, - long nWidth = 0, SvxBorderStyle nStyle = SOLID, + long nWidth = 0, SvxBorderStyle nStyle = + ::com::sun::star::table::BorderLineStyle::SOLID, bool bUseLeftTop = false, Color (*pColorOutFn)( Color ) = &darkColor, Color (*pColorInFn)( Color ) = &darkColor, @@ -139,14 +126,14 @@ namespace editeng { sal_uInt16 GetInWidth() const; sal_uInt16 GetDistance() const; - SvxBorderStyle GetSvxBorderStyle() const { return m_nStyle; } + SvxBorderStyle GetBorderLineStyle() 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 SetSvxBorderStyle( SvxBorderStyle nNew ); + void SetBorderLineStyle( SvxBorderStyle nNew ); void ScaleMetrics( long nMult, long nDiv ); sal_Bool operator==( const SvxBorderLine &rCmp ) const; @@ -157,7 +144,11 @@ namespace editeng { bool HasPriority( const SvxBorderLine& rOtherLine ) const; - bool isEmpty() const { return m_aWidthImpl.IsEmpty( ) || m_nStyle == NO_STYLE || m_nWidth == 0; } + bool isEmpty() const { + return m_aWidthImpl.IsEmpty() + || m_nStyle == ::com::sun::star::table::BorderLineStyle::NONE + || m_nWidth == 0; + } bool isDouble() const { return m_aWidthImpl.IsDouble(); } sal_uInt16 GetScaledWidth() const { return GetOutWidth() + GetInWidth() + GetDistance(); } diff --git a/editeng/qa/items/borderline_test.cxx b/editeng/qa/items/borderline_test.cxx index 69adb1048162..8a1de32f3ed4 100644 --- a/editeng/qa/items/borderline_test.cxx +++ b/editeng/qa/items/borderline_test.cxx @@ -36,6 +36,8 @@ #include <editeng/borderline.hxx> +using namespace ::com::sun::star::table::BorderLineStyle; + #define TEST_WIDTH long( 40 ) #define THINTHICKSG_IN_WIDTH long( 15 ) @@ -96,7 +98,7 @@ void BorderLineTest::testGuessWidthDouble() // Normal double case SvxBorderLine line; line.GuessLinesWidths( DOUBLE, TEST_WIDTH, TEST_WIDTH, TEST_WIDTH ); - CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetSvxBorderStyle() ); + CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetBorderLineStyle() ); CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() ); } @@ -105,7 +107,7 @@ void BorderLineTest::testGuessWidthNoMatch() SvxBorderLine line; line.GuessLinesWidths( DOUBLE, TEST_WIDTH + 1, TEST_WIDTH + 2, TEST_WIDTH + 3 ); - CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetSvxBorderStyle() ); + CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetBorderLineStyle() ); CPPUNIT_ASSERT_EQUAL( long( (3 * TEST_WIDTH) + 6 ), line.GetWidth() ); } @@ -116,7 +118,7 @@ void BorderLineTest::testGuessWidthThinthickSmallgap() THINTHICKSG_OUT_WIDTH, THINTHICKSG_IN_WIDTH, THINTHICKSG_DIST_WIDTH ); - CPPUNIT_ASSERT_EQUAL( THINTHICK_SMALLGAP, line.GetSvxBorderStyle() ); + CPPUNIT_ASSERT_EQUAL( THINTHICK_SMALLGAP, line.GetBorderLineStyle() ); CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() ); } @@ -127,26 +129,26 @@ void BorderLineTest::testGuessWidthThinthickLargegap() THINTHICKLG_OUT_WIDTH, THINTHICKLG_IN_WIDTH, THINTHICKLG_DIST_WIDTH ); - CPPUNIT_ASSERT_EQUAL( THINTHICK_LARGEGAP, line.GetSvxBorderStyle() ); + CPPUNIT_ASSERT_EQUAL( THINTHICK_LARGEGAP, line.GetBorderLineStyle() ); CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() ); } void BorderLineTest::testGuessWidthNostyleDouble() { SvxBorderLine line; - line.GuessLinesWidths( NO_STYLE, + line.GuessLinesWidths( NONE, THINTHICKLG_OUT_WIDTH, THINTHICKLG_IN_WIDTH, THINTHICKLG_DIST_WIDTH ); - CPPUNIT_ASSERT_EQUAL( THINTHICK_LARGEGAP, line.GetSvxBorderStyle() ); + CPPUNIT_ASSERT_EQUAL( THINTHICK_LARGEGAP, line.GetBorderLineStyle() ); CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() ); } void BorderLineTest::testGuessWidthNostyleSingle() { SvxBorderLine line; - line.GuessLinesWidths( NO_STYLE, TEST_WIDTH ); - CPPUNIT_ASSERT_EQUAL( SOLID, line.GetSvxBorderStyle() ); + line.GuessLinesWidths( NONE, TEST_WIDTH ); + CPPUNIT_ASSERT_EQUAL( SOLID, line.GetBorderLineStyle() ); CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() ); } diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index b344ee120fcf..7470f5a9b0b6 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -35,6 +35,9 @@ #include <editeng/borderline.hxx> #include <editeng/itemtype.hxx> + +using namespace ::com::sun::star::table::BorderLineStyle; + // class SvxBorderLine -------------------------------------------------- namespace { @@ -128,7 +131,7 @@ BorderWidthImpl SvxBorderLine::getWidthImpl( SvxBorderStyle nStyle ) switch ( nStyle ) { // No line: no width - case NO_STYLE: + case NONE: aImpl = BorderWidthImpl( 0, 0.0 ); break; @@ -244,7 +247,8 @@ void SvxBorderLine::ScaleMetrics( long nMult, long nDiv ) void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sal_uInt16 nIn, sal_uInt16 nDist ) { - if ( nStyle == NO_STYLE ) { + if (NONE == nStyle) + { nStyle = SOLID; if ( nOut > 0 && nIn > 0 ) nStyle = DOUBLE; @@ -265,7 +269,7 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sa size_t const len = SAL_N_ELEMENTS(aDoubleStyles); long nWidth = 0; - SvxBorderStyle nTestStyle(NO_STYLE); + SvxBorderStyle nTestStyle(NONE); for (size_t i = 0; i < len && nWidth == 0; ++i) { nTestStyle = aDoubleStyles[i]; @@ -277,13 +281,13 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sa if ( nWidth > 0 ) { nStyle = nTestStyle; - SetSvxBorderStyle(nStyle); + SetBorderLineStyle(nStyle); m_nWidth = nWidth; } else { // fdo#38542: not a known double, default to something custom... - SetSvxBorderStyle(nStyle); + SetBorderLineStyle(nStyle); m_nWidth = nOut + nIn + nDist; if (nOut + nIn + nDist) { @@ -297,7 +301,7 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sa } else { - SetSvxBorderStyle(nStyle); + SetBorderLineStyle(nStyle); if (nOut == 0 && nIn > 0) { // If only inner width is given swap inner and outer widths for @@ -347,14 +351,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.GetSvxBorderStyle()) && + ( m_nStyle == rCmp.GetBorderLineStyle()) && ( m_bUseLeftTop == rCmp.m_bUseLeftTop ) && ( m_pColorOutFn == rCmp.m_pColorOutFn ) && ( m_pColorInFn == rCmp.m_pColorInFn ) && ( m_pColorGapFn == rCmp.m_pColorGapFn ) ); } -void SvxBorderLine::SetSvxBorderStyle( SvxBorderStyle nNew ) +void SvxBorderLine::SetBorderLineStyle( 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 6d087e2d5417..fb46de9f783d 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -94,6 +94,7 @@ using namespace ::editeng; using namespace ::rtl; using namespace ::com::sun::star; +using namespace ::com::sun::star::table::BorderLineStyle; // Conversion for UNO @@ -145,7 +146,7 @@ namespace << l.GetDistance(); if (version >= BORDER_LINE_WITH_STYLE_VERSION) - stream << static_cast<sal_uInt16>(l.GetSvxBorderStyle()); + stream << static_cast<sal_uInt16>(l.GetBorderLineStyle()); return stream; } @@ -153,7 +154,8 @@ namespace /// Creates a border line from a stream. SvxBorderLine CreateBorderLine(SvStream &stream, sal_uInt16 version) { - sal_uInt16 nOutline, nInline, nDistance, nStyle = NO_STYLE; + sal_uInt16 nOutline, nInline, nDistance; + sal_uInt16 nStyle = NONE; Color aColor; stream >> aColor >> nOutline >> nInline >> nDistance; @@ -161,7 +163,7 @@ namespace stream >> nStyle; SvxBorderLine border(&aColor); - border.GuessLinesWidths(static_cast<SvxBorderStyle>(nStyle), nOutline, nInline, nDistance); + border.GuessLinesWidths(nStyle, nOutline, nInline, nDistance); return border; } @@ -1696,7 +1698,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->GetSvxBorderStyle(); + aLine.LineStyle = pLine->GetBorderLineStyle(); aLine.LineWidth = sal_uInt32( bConvert ? TWIP_TO_MM100( pLine->GetWidth( ) ) : pLine->GetWidth( ) ); } else @@ -1784,14 +1786,14 @@ lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_B rSvxLine.SetColor( Color(rLine.Color)); if ( bGuessWidth ) { - rSvxLine.GuessLinesWidths( rSvxLine.GetSvxBorderStyle(), + rSvxLine.GuessLinesWidths( rSvxLine.GetBorderLineStyle(), 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.GetSvxBorderStyle()) + if (DOUBLE == rSvxLine.GetBorderLineStyle()) { // fdo#46112: divide width by 3 for outer line, gap, inner line rSvxLine.ScaleMetrics(1, 3); } @@ -1812,54 +1814,12 @@ sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rL sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert) { - SvxBorderStyle nStyle = NO_STYLE; - switch ( rLine.LineStyle ) - { - default: - case table::BorderLineStyle::SOLID: - nStyle = SOLID; - break; - case table::BorderLineStyle::DOTTED: - nStyle = DOTTED; - break; - case table::BorderLineStyle::DASHED: - nStyle = DASHED; - break; - case table::BorderLineStyle::DOUBLE: - nStyle = DOUBLE; - break; - case table::BorderLineStyle::THINTHICK_SMALLGAP: - nStyle = THINTHICK_SMALLGAP; - break; - case table::BorderLineStyle::THINTHICK_MEDIUMGAP: - nStyle = THINTHICK_MEDIUMGAP; - break; - case table::BorderLineStyle::THINTHICK_LARGEGAP: - nStyle = THINTHICK_LARGEGAP; - break; - case table::BorderLineStyle::THICKTHIN_SMALLGAP: - nStyle = THICKTHIN_SMALLGAP; - break; - case table::BorderLineStyle::THICKTHIN_MEDIUMGAP: - nStyle = THICKTHIN_MEDIUMGAP; - break; - case table::BorderLineStyle::THICKTHIN_LARGEGAP: - nStyle = THICKTHIN_LARGEGAP; - break; - case table::BorderLineStyle::EMBOSSED: - nStyle = EMBOSSED; - break; - case table::BorderLineStyle::ENGRAVED: - nStyle = ENGRAVED; - break; - case table::BorderLineStyle::OUTSET: - nStyle = OUTSET; - break; - case table::BorderLineStyle::INSET: - nStyle = INSET; - break; - } - rSvxLine.SetSvxBorderStyle( nStyle ); + SvxBorderStyle const nStyle = + (rLine.LineStyle < 0 || INSET < rLine.LineStyle) + ? SOLID // default + : rLine.LineStyle; + + rSvxLine.SetBorderLineStyle( nStyle ); sal_Bool bGuessWidth = sal_True; if ( rLine.LineWidth ) @@ -1989,18 +1949,17 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { drawing::LineStyle eDrawingStyle; rVal >>= eDrawingStyle; - editeng::SvxBorderStyle eBorderStyle = editeng::NO_STYLE; + editeng::SvxBorderStyle eBorderStyle = NONE; switch ( eDrawingStyle ) { default: case drawing::LineStyle_NONE: - eBorderStyle = editeng::NO_STYLE; break; case drawing::LineStyle_SOLID: - eBorderStyle = editeng::SOLID; + eBorderStyle = SOLID; break; case drawing::LineStyle_DASH: - eBorderStyle = editeng::DASHED; + eBorderStyle = DASHED; break; } @@ -2010,7 +1969,7 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { editeng::SvxBorderLine* pLine = const_cast< editeng::SvxBorderLine* >( GetLine( aBorders[n] ) ); if( pLine ) - pLine->SetSvxBorderStyle( eBorderStyle ); + pLine->SetBorderLineStyle( eBorderStyle ); } return sal_True; } @@ -2731,7 +2690,7 @@ SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const Color aColor; rStrm >> aColor >> nOutline >> nInline >> nDistance; SvxBorderLine aBorder( &aColor ); - aBorder.GuessLinesWidths( NO_STYLE, nOutline, nInline, nDistance ); + aBorder.GuessLinesWidths(NONE, nOutline, nInline, nDistance); switch( cLine ) { @@ -3276,7 +3235,7 @@ bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId ) { case MID_FG_COLOR: pLine->SetColor( Color(nVal) ); break; case MID_LINE_STYLE: - pLine->SetSvxBorderStyle(static_cast<SvxBorderStyle>(nVal)); + pLine->SetBorderLineStyle(static_cast<SvxBorderStyle>(nVal)); break; default: OSL_FAIL( "Wrong MemberId" ); @@ -3361,7 +3320,7 @@ SfxPoolItem* SvxLineItem::Create( SvStream& rStrm, sal_uInt16 ) const if( nOutline ) { SvxBorderLine aLine( &aColor ); - aLine.GuessLinesWidths( NO_STYLE, nOutline, nInline, nDistance ); + aLine.GuessLinesWidths(NONE, nOutline, nInline, nDistance); _pLine->SetLine( &aLine ); } return _pLine; diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index fc02868e764d..f99bfb59f447 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -93,6 +93,7 @@ #define BRACELEFT '{' #define BRACERIGHT '}' +using namespace ::com::sun::star; using namespace editeng; // Some helper functions @@ -1468,49 +1469,49 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet, } case RTF_BRDRDOT: // dotted border - aBrd.SetSvxBorderStyle( DOTTED ); + aBrd.SetBorderLineStyle(table::BorderLineStyle::DOTTED); break; case RTF_BRDRDASH: // dashed border - aBrd.SetSvxBorderStyle( DASHED ); + aBrd.SetBorderLineStyle(table::BorderLineStyle::DASHED); break; case RTF_BRDRHAIR: // hairline border { - aBrd.SetSvxBorderStyle( SOLID ); + aBrd.SetBorderLineStyle( table::BorderLineStyle::SOLID); aBrd.SetWidth( DEF_LINE_WIDTH_0 ); } break; case RTF_BRDRDB: // Double border - aBrd.SetSvxBorderStyle( DOUBLE ); + aBrd.SetBorderLineStyle(table::BorderLineStyle::DOUBLE); break; case RTF_BRDRINSET: // inset border - aBrd.SetSvxBorderStyle( INSET ); + aBrd.SetBorderLineStyle(table::BorderLineStyle::INSET); break; case RTF_BRDROUTSET: // outset border - aBrd.SetSvxBorderStyle( OUTSET ); + aBrd.SetBorderLineStyle(table::BorderLineStyle::OUTSET); break; case RTF_BRDRTNTHSG: // ThinThick Small gap - aBrd.SetSvxBorderStyle( THINTHICK_SMALLGAP ); + aBrd.SetBorderLineStyle(table::BorderLineStyle::THINTHICK_SMALLGAP); break; case RTF_BRDRTNTHMG: // ThinThick Medium gap - aBrd.SetSvxBorderStyle( THINTHICK_MEDIUMGAP ); + aBrd.SetBorderLineStyle(table::BorderLineStyle::THINTHICK_MEDIUMGAP); break; case RTF_BRDRTNTHLG: // ThinThick Large gap - aBrd.SetSvxBorderStyle( THINTHICK_LARGEGAP ); + aBrd.SetBorderLineStyle(table::BorderLineStyle::THINTHICK_LARGEGAP); break; case RTF_BRDRTHTNSG: // ThickThin Small gap - aBrd.SetSvxBorderStyle( THICKTHIN_SMALLGAP ); + aBrd.SetBorderLineStyle(table::BorderLineStyle::THICKTHIN_SMALLGAP); break; case RTF_BRDRTHTNMG: // ThickThin Medium gap - aBrd.SetSvxBorderStyle( THICKTHIN_MEDIUMGAP ); + aBrd.SetBorderLineStyle(table::BorderLineStyle::THICKTHIN_MEDIUMGAP); break; case RTF_BRDRTHTNLG: // ThickThin Large gap - aBrd.SetSvxBorderStyle( THICKTHIN_LARGEGAP ); + aBrd.SetBorderLineStyle(table::BorderLineStyle::THICKTHIN_LARGEGAP); break; case RTF_BRDREMBOSS: // Embossed border - aBrd.SetSvxBorderStyle( EMBOSSED ); + aBrd.SetBorderLineStyle(table::BorderLineStyle::EMBOSSED); break; case RTF_BRDRENGRAVE: // Engraved border - aBrd.SetSvxBorderStyle( ENGRAVED ); + aBrd.SetBorderLineStyle(table::BorderLineStyle::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 20d457acc592..0719d0f6359f 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -507,7 +507,8 @@ void ScFiltersTest::testBorderODS() CPPUNIT_ASSERT(!pTop); CPPUNIT_ASSERT(!pBottom); CPPUNIT_ASSERT(pRight); - CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID); + CPPUNIT_ASSERT_EQUAL(pRight->GetBorderLineStyle(), + table::BorderLineStyle::SOLID); pDoc->GetBorderLines( 2, 1, 0, &pLeft, &pTop, &pRight, &pBottom ); CPPUNIT_ASSERT(!pLeft); @@ -515,7 +516,8 @@ void ScFiltersTest::testBorderODS() CPPUNIT_ASSERT(!pBottom); CPPUNIT_ASSERT(pRight); - CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID); + CPPUNIT_ASSERT_EQUAL(pRight->GetBorderLineStyle(), + table::BorderLineStyle::SOLID); CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),20L); pDoc->GetBorderLines( 2, 8, 0, &pLeft, &pTop, &pRight, &pBottom ); @@ -524,7 +526,8 @@ void ScFiltersTest::testBorderODS() CPPUNIT_ASSERT(pTop); CPPUNIT_ASSERT(pBottom); CPPUNIT_ASSERT(pRight); - CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID); + CPPUNIT_ASSERT_EQUAL(pRight->GetBorderLineStyle(), + table::BorderLineStyle::SOLID); CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),5L); CPPUNIT_ASSERT(pRight->GetColor() == Color(COL_BLUE)); @@ -546,17 +549,20 @@ void ScFiltersTest::testBorderXLS() pDoc->GetBorderLines( 2, 3, 0, &pLeft, &pTop, &pRight, &pBottom ); CPPUNIT_ASSERT(pRight); - CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID); + CPPUNIT_ASSERT_EQUAL(pRight->GetBorderLineStyle(), + table::BorderLineStyle::SOLID); CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),6L); pDoc->GetBorderLines( 3, 5, 0, &pLeft, &pTop, &pRight, &pBottom ); CPPUNIT_ASSERT(pRight); - CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID); + CPPUNIT_ASSERT_EQUAL(pRight->GetBorderLineStyle(), + table::BorderLineStyle::SOLID); CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),18L); pDoc->GetBorderLines( 5, 7, 0, &pLeft, &pTop, &pRight, &pBottom ); CPPUNIT_ASSERT(pRight); - CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID); + CPPUNIT_ASSERT_EQUAL(pRight->GetBorderLineStyle(), + table::BorderLineStyle::SOLID); CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),24L); } diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 2cd2958648ac..8d9febe34f22 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -3097,7 +3097,7 @@ void Test::testDataArea() CPPUNIT_ASSERT_MESSAGE("Sheet is expected to be empty.", m_pDoc->IsBlockEmpty(0, 0, 0, 100, 100)); // Now, set borders in some cells.... - ::editeng::SvxBorderLine aLine(NULL, 50, ::editeng::SOLID); + ::editeng::SvxBorderLine aLine(NULL, 50, table::BorderLineStyle::SOLID); SvxBoxItem aBorderItem(ATTR_BORDER); aBorderItem.SetLine(&aLine, BOX_LINE_LEFT); aBorderItem.SetLine(&aLine, BOX_LINE_RIGHT); diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 1a54e6cab7c7..4d841d37cb58 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -573,7 +573,7 @@ void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* if ((dest)) \ { \ SvxBorderLine* pCast = (SvxBorderLine*)(dest); \ - pCast->SetSvxBorderStyle( (src)->GetSvxBorderStyle() ); \ + pCast->SetBorderLineStyle( (src)->GetBorderLineStyle() ); \ pCast->SetWidth( (src)->GetWidth( ) ); \ } diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 741ee2dc472b..34ae9d6ef462 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -329,7 +329,7 @@ void lcl_SetFrame( ScDocument* pDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nWidth ) { - ::editeng::SvxBorderLine aLine( NULL, nWidth, ::editeng::SOLID ); + ::editeng::SvxBorderLine aLine(0, nWidth, table::BorderLineStyle::SOLID); SvxBoxItem aBox( ATTR_BORDER ); aBox.SetLine(&aLine, BOX_LINE_LEFT); aBox.SetLine(&aLine, BOX_LINE_TOP); diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 881b2b25af3f..5e2e0117c00c 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -63,6 +63,7 @@ using ::rtl::OString; using ::rtl::OUString; +using namespace ::com::sun::star; using namespace oox; // PALETTE record - color information ========================================= @@ -1571,18 +1572,18 @@ void lclGetBorderLine( else if( nOuterWidth >= EXC_BORDER_MEDIUM ) { rnXclLine = EXC_LINE_MEDIUM; - if (pLine->GetSvxBorderStyle( ) == ::editeng::DASHED) + if (pLine->GetBorderLineStyle( ) == table::BorderLineStyle::DASHED) rnXclLine = EXC_LINE_MEDIUMDASHED; } else if( nOuterWidth >= EXC_BORDER_THIN ) { rnXclLine = EXC_LINE_THIN; - switch (pLine->GetSvxBorderStyle()) + switch (pLine->GetBorderLineStyle()) { - case ::editeng::DASHED: + case table::BorderLineStyle::DASHED: rnXclLine = EXC_LINE_DASHED; break; - case ::editeng::DOTTED: + case table::BorderLineStyle::DOTTED: rnXclLine = EXC_LINE_DOTTED; break; default: diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 7c146cbc088b..b6ecf6d1e873 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -896,20 +896,20 @@ bool lclConvertBorderLine( ::editeng::SvxBorderLine& rLine, const XclImpPalette& static const sal_uInt16 ppnLineParam[][ 4 ] = { // outer width, type - { 0, ::editeng::SOLID }, // 0 = none - { EXC_BORDER_THIN, ::editeng::SOLID }, // 1 = thin - { EXC_BORDER_MEDIUM, ::editeng::SOLID }, // 2 = medium - { EXC_BORDER_THIN, ::editeng::DASHED }, // 3 = dashed - { EXC_BORDER_THIN, ::editeng::DOTTED }, // 4 = dotted - { EXC_BORDER_THICK, ::editeng::SOLID }, // 5 = thick - { EXC_BORDER_THIN, ::editeng::DOUBLE }, // 6 = double - { EXC_BORDER_HAIR, ::editeng::SOLID }, // 7 = hair - { EXC_BORDER_MEDIUM, ::editeng::DASHED }, // 8 = med dash - { EXC_BORDER_THIN, ::editeng::SOLID }, // 9 = thin dashdot - { EXC_BORDER_MEDIUM, ::editeng::SOLID }, // A = med dashdot - { EXC_BORDER_THIN, ::editeng::SOLID }, // B = thin dashdotdot - { EXC_BORDER_MEDIUM, ::editeng::SOLID }, // C = med dashdotdot - { EXC_BORDER_MEDIUM, ::editeng::SOLID } // D = med slant dashdot + { 0, table::BorderLineStyle::SOLID }, // 0 = none + { EXC_BORDER_THIN, table::BorderLineStyle::SOLID }, // 1 = thin + { EXC_BORDER_MEDIUM, table::BorderLineStyle::SOLID }, // 2 = medium + { EXC_BORDER_THIN, table::BorderLineStyle::DASHED }, // 3 = dashed + { EXC_BORDER_THIN, table::BorderLineStyle::DOTTED }, // 4 = dotted + { EXC_BORDER_THICK, table::BorderLineStyle::SOLID }, // 5 = thick + { EXC_BORDER_THIN, table::BorderLineStyle::DOUBLE }, // 6 = double + { EXC_BORDER_HAIR, table::BorderLineStyle::SOLID }, // 7 = hair + { EXC_BORDER_MEDIUM, table::BorderLineStyle::DASHED }, // 8 = med dash + { EXC_BORDER_THIN, table::BorderLineStyle::SOLID }, // 9 = thin dashdot + { EXC_BORDER_MEDIUM, table::BorderLineStyle::SOLID }, // A = med dashdot + { EXC_BORDER_THIN, table::BorderLineStyle::SOLID }, // B = thin dashdotdot + { EXC_BORDER_MEDIUM, table::BorderLineStyle::SOLID }, // C = med dashdotdot + { EXC_BORDER_MEDIUM, table::BorderLineStyle::SOLID } // D = med slant dashdot }; if( nXclLine == EXC_LINE_NONE ) @@ -919,7 +919,7 @@ bool lclConvertBorderLine( ::editeng::SvxBorderLine& rLine, const XclImpPalette& rLine.SetColor( rPalette.GetColor( nXclColor ) ); rLine.SetWidth( ppnLineParam[ nXclLine ][ 0 ] ); - rLine.SetSvxBorderStyle( static_cast< ::editeng::SvxBorderStyle>( + rLine.SetBorderLineStyle( 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 e4bbe2581eeb..ed69e118c934 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -92,7 +92,9 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <rtl/strbuf.hxx> + using ::editeng::SvxBorderLine; +using namespace ::com::sun::star; //======================================================================== @@ -520,36 +522,36 @@ 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->GetSvxBorderStyle()) + switch (pLine->GetBorderLineStyle()) { - case ::editeng::SOLID: + case table::BorderLineStyle::SOLID: aOut.append(RTL_CONSTASCII_STRINGPARAM("solid")); break; - case ::editeng::DOTTED: + case table::BorderLineStyle::DOTTED: aOut.append(RTL_CONSTASCII_STRINGPARAM("dotted")); break; - case ::editeng::DASHED: + case table::BorderLineStyle::DASHED: aOut.append(RTL_CONSTASCII_STRINGPARAM("dashed")); break; - case ::editeng::DOUBLE: - case ::editeng::THINTHICK_SMALLGAP: - case ::editeng::THINTHICK_MEDIUMGAP: - case ::editeng::THINTHICK_LARGEGAP: - case ::editeng::THICKTHIN_SMALLGAP: - case ::editeng::THICKTHIN_MEDIUMGAP: - case ::editeng::THICKTHIN_LARGEGAP: + case table::BorderLineStyle::DOUBLE: + case table::BorderLineStyle::THINTHICK_SMALLGAP: + case table::BorderLineStyle::THINTHICK_MEDIUMGAP: + case table::BorderLineStyle::THINTHICK_LARGEGAP: + case table::BorderLineStyle::THICKTHIN_SMALLGAP: + case table::BorderLineStyle::THICKTHIN_MEDIUMGAP: + case table::BorderLineStyle::THICKTHIN_LARGEGAP: aOut.append(RTL_CONSTASCII_STRINGPARAM("double")); break; - case ::editeng::EMBOSSED: + case table::BorderLineStyle::EMBOSSED: aOut.append(RTL_CONSTASCII_STRINGPARAM("ridge")); break; - case ::editeng::ENGRAVED: + case table::BorderLineStyle::ENGRAVED: aOut.append(RTL_CONSTASCII_STRINGPARAM("groove")); break; - case ::editeng::OUTSET: + case table::BorderLineStyle::OUTSET: aOut.append(RTL_CONSTASCII_STRINGPARAM("outset")); break; - case ::editeng::INSET: + case table::BorderLineStyle::INSET: aOut.append(RTL_CONSTASCII_STRINGPARAM("inset")); break; default: diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 019d057448e5..6395fb68717a 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -2389,8 +2389,8 @@ void ScHTMLTable::ApplyCellBorders( ScDocument* pDoc, const ScAddress& rFirstPos const SCROW nLastRow = maSize.mnRows - 1; const long nOuterLine = DEF_LINE_WIDTH_2; const long nInnerLine = DEF_LINE_WIDTH_0; - SvxBorderLine aOuterLine( NULL, nOuterLine, ::editeng::SOLID ); - SvxBorderLine aInnerLine( NULL, nInnerLine, ::editeng::SOLID ); + SvxBorderLine aOuterLine(0, nOuterLine, table::BorderLineStyle::SOLID); + SvxBorderLine aInnerLine(0, nInnerLine, table::BorderLineStyle::SOLID); SvxBoxItem aBorderItem( ATTR_BORDER ); for( SCCOL nCol = 0; nCol <= nLastCol; ++nCol ) diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx index 2d53cd4bb481..e21e84778278 100644 --- a/sc/source/filter/lotus/lotattr.cxx +++ b/sc/source/filter/lotus/lotattr.cxx @@ -44,6 +44,10 @@ #include "root.hxx" #include "scitems.hxx" + +using namespace ::com::sun::star; + + LotAttrCache::ENTRY::ENTRY (ScPatternAttr* p) : pPattAttr(p) { @@ -168,12 +172,12 @@ void LotAttrCache::LotusToScBorderLine( sal_uInt8 nLine, ::editeng::SvxBorderLin switch ( nLine ) { default: - case 0: aBL.SetSvxBorderStyle( ::editeng::NO_STYLE ); break; + case 0: aBL.SetBorderLineStyle(table::BorderLineStyle::NONE); break; case 1: aBL.SetWidth( DEF_LINE_WIDTH_1 ); break; case 2: aBL.SetWidth( DEF_LINE_WIDTH_2 ); break; case 3: { - aBL.SetSvxBorderStyle( ::editeng::DOUBLE ); + aBL.SetBorderLineStyle(table::BorderLineStyle::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 c9ddb4e63bd2..9c453901fec9 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -108,6 +108,9 @@ #include "scabstdlg.hxx" + +using namespace ::com::sun::star; + namespace { SvxCellHorJustify lclConvertSlotToHAlign( sal_uInt16 nSlot ) @@ -1511,8 +1514,8 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) if ( pDefLine ) { - pDefLine->SetSvxBorderStyle( - pLine->GetSvxBorderStyle()); + pDefLine->SetBorderLineStyle( + pLine->GetBorderLineStyle()); pDefLine->SetWidth( pLine->GetWidth( ) ); pTabViewShell->SetSelectionFrameLines( pDefLine, false ); } @@ -1526,7 +1529,8 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) else { Color aColorBlack( COL_BLACK ); - ::editeng::SvxBorderLine aDefLine( &aColorBlack, 20, ::editeng::SOLID ); + ::editeng::SvxBorderLine aDefLine( &aColorBlack, 20, + table::BorderLineStyle::SOLID ); pTabViewShell->SetDefaultFrameLine( &aDefLine ); pTabViewShell->SetSelectionFrameLines( NULL, false ); } @@ -1548,7 +1552,8 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) } else { - ::editeng::SvxBorderLine aDefLine( &rColor, 20, ::editeng::SOLID ); + ::editeng::SvxBorderLine aDefLine( &rColor, 20, + table::BorderLineStyle::SOLID ); pTabViewShell->SetDefaultFrameLine( &aDefLine ); pTabViewShell->SetSelectionFrameLines( &aDefLine, false ); } diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 238d124c474e..203dffb9bd3f 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1514,7 +1514,8 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) SetPool( &SC_MOD()->GetPool() ); SetWindow( GetActiveWin() ); - pCurFrameLine = new ::editeng::SvxBorderLine( &aColBlack, 20, ::editeng::SOLID ); + pCurFrameLine = new ::editeng::SvxBorderLine(&aColBlack, 20, + table::BorderLineStyle::SOLID); pPivotSource = new ScArea; StartListening(*GetViewData()->GetDocShell(),sal_True); StartListening(*GetViewFrame(),sal_True); diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx index eb502dded3e0..fb339b62e020 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->GetSvxBorderStyle() ); + pLine->GetBorderLineStyle() ); } else if ( pCurFrameLine ) { diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index ac50009712a3..40f23dff47a8 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.SetSvxBorderStyle(pDestLine->GetSvxBorderStyle()); + rLine.SetBorderLineStyle(pDestLine->GetBorderLineStyle()); rLine.SetWidth ( pDestLine->GetWidth() ); } else { rLine.SetColor ( pDestLine->GetColor() ); - rLine.SetSvxBorderStyle(pSrcLine->GetSvxBorderStyle()); + rLine.SetBorderLineStyle(pSrcLine->GetBorderLineStyle()); rLine.SetWidth ( pSrcLine->GetWidth() ); } } diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 6fce9ca1a991..76fba5237380 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -616,7 +616,8 @@ void SdDrawDocument::CreateDefaultCellStyles() rISet.Put( SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_LEFT) ); Color aWhite( COL_WHITE ); - ::editeng::SvxBorderLine aBorderLine( &aWhite, 1, ::editeng::SOLID ); + ::editeng::SvxBorderLine aBorderLine( + &aWhite, 1, table::BorderLineStyle::SOLID); SvxBoxItem aBoxItem( SDRATTR_TABLE_BORDER ); aBoxItem.SetLine( &aBorderLine, BOX_LINE_TOP ); diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx index c2edbb428c14..3a9117252be3 100644 --- a/svx/inc/svx/framelink.hxx +++ b/svx/inc/svx/framelink.hxx @@ -116,7 +116,10 @@ class SVX_DLLPUBLIC Style { public: /** Constructs an invisible frame style. */ - inline explicit Style() : meRefMode( REFMODE_CENTERED ), mnType( editeng::SOLID ) { Clear(); } + inline explicit Style() + : meRefMode( REFMODE_CENTERED ) + , mnType( ::com::sun::star::table::BorderLineStyle::SOLID ) + { Clear(); } /** Constructs a frame style with passed line widths. */ inline explicit Style( double nP, double nD, double nS, editeng::SvxBorderStyle nType ) : meRefMode( REFMODE_CENTERED ), mnType( nType ) diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 8e38b611b19b..565b851db042 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -56,6 +56,8 @@ #include <drawinglayer/primitive2d/borderlineprimitive2d.hxx> #include <drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx> + +using namespace ::com::sun::star; using namespace editeng; namespace svx { @@ -1185,7 +1187,7 @@ void Style::Set( const SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWid sal_uInt16 nDist = rBorder.GetDistance(); sal_uInt16 nSecn = rBorder.GetInWidth(); - mnType = rBorder.GetSvxBorderStyle(); + mnType = rBorder.GetBorderLineStyle(); if( !nSecn ) // no or single frame border { Set( SCALEVALUE( nPrim ), 0, 0 ); @@ -1232,7 +1234,7 @@ void Style::Set( const SvxBorderLine* pBorder, double fScale, sal_uInt16 nMaxWid else { Clear(); - mnType = SOLID; + mnType = table::BorderLineStyle::SOLID; } } diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 9aace5087c58..75a7d7ebe830 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -39,6 +39,7 @@ #include <tools/rcid.h> +using namespace ::com::sun::star; using namespace ::editeng; namespace svx { @@ -160,7 +161,7 @@ void FrameBorder::SetState( FrameBorderState eState ) break; case FRAMESTATE_DONTCARE: maCoreStyle = SvxBorderLine(); - maUIStyle = frame::Style(3, 0, 0, SOLID); //OBJ_FRAMESTYLE_DONTCARE + maUIStyle = frame::Style(3, 0, 0, table::BorderLineStyle::SOLID); //OBJ_FRAMESTYLE_DONTCARE break; } } @@ -881,14 +882,14 @@ bool FrameSelector::GetVisibleWidth( long& rnWidth, SvxBorderStyle& rnStyle ) co { bFound = (rStyle.GetWidth() == (*aIt)->GetCoreStyle().GetWidth()) && - (rStyle.GetSvxBorderStyle() == - (*aIt)->GetCoreStyle().GetSvxBorderStyle()); + (rStyle.GetBorderLineStyle() == + (*aIt)->GetCoreStyle().GetBorderLineStyle()); } if( bFound ) { rnWidth = rStyle.GetWidth(); - rnStyle = rStyle.GetSvxBorderStyle(); + rnStyle = rStyle.GetBorderLineStyle(); } return bFound; } @@ -951,7 +952,7 @@ void FrameSelector::SelectAllVisibleBorders( bool bSelect ) void FrameSelector::SetStyleToSelection( long nWidth, SvxBorderStyle nStyle ) { - mxImpl->maCurrStyle.SetSvxBorderStyle( nStyle ); + mxImpl->maCurrStyle.SetBorderLineStyle( 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 f1494fef8548..c4b3e7b8169b 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().GetSvxBorderStyle())); + getLeftLine().GetBorderLineStyle())); } } @@ -362,7 +362,7 @@ namespace drawinglayer getBottomLine().GetColorIn(false).getBColor(), getBottomLine().GetColorGap().getBColor(), getBottomLine().HasGapColor(), - getBottomLine().GetSvxBorderStyle())); + getBottomLine().GetBorderLineStyle())); } } @@ -393,7 +393,7 @@ namespace drawinglayer getRightLine().GetColorIn(true).getBColor(), getRightLine().GetColorGap().getBColor(), getRightLine().HasGapColor(), - getRightLine().GetSvxBorderStyle())); + getRightLine().GetBorderLineStyle())); } } @@ -424,7 +424,7 @@ namespace drawinglayer getTopLine().GetColorIn(false).getBColor(), getTopLine().GetColorGap().getBColor(), getTopLine().HasGapColor(), - getTopLine().GetSvxBorderStyle())); + getTopLine().GetBorderLineStyle())); } } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 2eb7511df5e8..6ff2c513721c 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1153,7 +1153,7 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl) sal_uInt16 nModifier = aFrameSet.GetModifier(); sal_uInt8 nValidFlags = 0; - theDefLine.GuessLinesWidths(theDefLine.GetSvxBorderStyle(), + theDefLine.GuessLinesWidths(theDefLine.GetBorderLineStyle(), DEF_LINE_WIDTH_0); switch ( nSel ) { @@ -1344,6 +1344,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame m_aLineStyleLb.SetSourceUnit( FUNIT_TWIP ); m_aLineStyleLb.SetNone( SVX_RESSTR(STR_NONE) ); + using namespace table::BorderLineStyle; m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( SOLID ), SOLID ); m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( DOTTED ), DOTTED ); m_aLineStyleLb.InsertEntry( SvxBorderLine::getWidthImpl( DASHED ), DASHED ); @@ -1394,7 +1395,7 @@ IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl) if ( m_aLineStyleLb.GetSelectEntryPos( ) > 0 ) { SvxBorderLine aTmp; - aTmp.SetSvxBorderStyle( nStyle ); + aTmp.SetBorderLineStyle( nStyle ); aTmp.SetWidth( 20 ); // TODO Make it depend on a width field aLineItem.SetLine( &aTmp ); } diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index 467bb384f692..0280a4790f84 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -991,7 +991,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage ) { SvxBoxItem aBox( RES_BOX ); Color aColor( COL_GRAY ); - SvxBorderLine aNew( &aColor, 1, DOUBLE ); + SvxBorderLine aNew(&aColor, 1, table::BorderLineStyle::DOUBLE); aBox.SetLine( &aNew, BOX_LINE_BOTTOM ); aSet.Put( aBox ); diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 7065f941c37c..ea1f4e4c1542 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.SetSvxBorderStyle( editeng::DOUBLE ); + aLine.SetBorderLineStyle(table::BorderLineStyle::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 d4ab105b819a..54156cb7c6f6 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -592,28 +592,28 @@ sal_Bool SwAutoFormat::DoUnderline() editeng::SvxBorderLine aLine; switch( eState ) { - case 1: // einfach, 0,05 pt - aLine.SetSvxBorderStyle( editeng::SOLID ); + case 1: // single, 0,05 pt + aLine.SetBorderLineStyle(table::BorderLineStyle::SOLID); aLine.SetWidth( DEF_LINE_WIDTH_0 ); break; - case 2: // einfach, 1,0 pt - aLine.SetSvxBorderStyle( editeng::SOLID ); + case 2: // single, 1,0 pt + aLine.SetBorderLineStyle(table::BorderLineStyle::SOLID); aLine.SetWidth( DEF_LINE_WIDTH_1 ); break; - case 3: // doppelt, 1,1 pt - aLine.SetSvxBorderStyle( editeng::DOUBLE ); + case 3: // double, 1,1 pt + aLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE); aLine.SetWidth( DEF_LINE_WIDTH_0 ); break; - case 4: // doppelt, 4,5 pt - aLine.SetSvxBorderStyle( editeng::THICKTHIN_SMALLGAP ); + case 4: // double, 4,5 pt + aLine.SetBorderLineStyle(table::BorderLineStyle::THICKTHIN_SMALLGAP); aLine.SetWidth( DEF_LINE_WIDTH_1 ); break; - case 5: // doppelt, 6,0 pt - aLine.SetSvxBorderStyle( editeng::THINTHICK_SMALLGAP ); + case 5: // double, 6,0 pt + aLine.SetBorderLineStyle(table::BorderLineStyle::THINTHICK_SMALLGAP); aLine.SetWidth( DEF_LINE_WIDTH_2 ); break; - case 6: // doppelt, 9,0 pt - aLine.SetSvxBorderStyle( editeng::DOUBLE ); + case 6: // double, 9,0 pt + aLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE); aLine.SetWidth( DEF_LINE_WIDTH_2 ); break; } diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 544655a1a093..3812a298d2d7 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -500,7 +500,8 @@ public: const sal_Bool bLowerMode = sal_False, const sal_Bool bLowerBorder = sal_False ) const; void PaintBorderLine( const SwRect&, const SwRect&, const SwPageFrm*, - const Color *pColor, const editeng::SvxBorderStyle = editeng::SOLID ) const; + const Color *pColor, const editeng::SvxBorderStyle = + ::com::sun::star::table::BorderLineStyle::SOLID ) const; drawinglayer::processor2d::BaseProcessor2D * CreateProcessor2D( ) const; void ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DSequence& rSequence ) const; diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 51c1a822749a..bb4e44f80f07 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -855,8 +855,9 @@ SwFmtCol& SwFmtCol::operator=( const SwFmtCol& rCpy ) } SwFmtCol::SwFmtCol() - : SfxPoolItem( RES_COL ), - eLineStyle( editeng::NO_STYLE ), + : SfxPoolItem( RES_COL ) + , eLineStyle( table::BorderLineStyle::NONE) + , nLineWidth(0), nLineHeight( 100 ), eAdj( COLADJ_NONE ), @@ -1111,10 +1112,10 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) switch ( pSwColums->GetSepLineStyle() ) { default: - case 0: eLineStyle = editeng::NO_STYLE; break; - case 1: eLineStyle = editeng::SOLID; break; - case 2: eLineStyle = editeng::DOTTED; break; - case 3: eLineStyle = editeng::DASHED; break; + case 0: eLineStyle = table::BorderLineStyle::NONE; break; + case 1: eLineStyle = table::BorderLineStyle::SOLID; break; + case 2: eLineStyle = table::BorderLineStyle::DOTTED; break; + case 3: eLineStyle = table::BorderLineStyle::DASHED; break; } if(!pSwColums->GetSepLineIsOn()) eAdj = COLADJ_NONE; diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index ffe37a8d6945..2c98d803977f 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -51,6 +51,9 @@ #include <poolfmt.hxx> #include <switerator.hxx> + +using namespace ::com::sun::star; + /************************************************************************* |* |* SwPageDesc::SwPageDesc() @@ -359,7 +362,7 @@ SwPageFtnInfo::SwPageFtnInfo() : nMaxHeight( 0 ), // aPen( PEN_SOLID ), nLineWidth(10), - eLineStyle( editeng::SOLID ), + eLineStyle( table::BorderLineStyle::SOLID ), aWidth( 25, 100 ), nTopDist( 57 ), //1mm nBottomDist( 57 ) diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index cff8a264ce78..d26dca733edb 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -733,7 +733,8 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut ) aIns.Bottom( pLA->Bottom() ); if ( !rL1.IsInside( aIns ) ) continue; - this->push_back( SwLineRect( aIns, rL1.GetColor(), SOLID, + this->push_back( SwLineRect( aIns, rL1.GetColor(), + table::BorderLineStyle::SOLID, rL1.GetTab(), SUBCOL_TAB ) ); if ( isFull() ) { @@ -773,7 +774,8 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut ) aIns.Right( pLA->Right() ); if ( !rL1.IsInside( aIns ) ) continue; - this->push_back( SwLineRect( aIns, rL1.GetColor(), SOLID, + this->push_back( SwLineRect( aIns, rL1.GetColor(), + table::BorderLineStyle::SOLID, rL1.GetTab(), SUBCOL_TAB ) ); if ( isFull() ) { @@ -802,7 +804,10 @@ inline void SwSubsRects::Ins( const SwRect &rRect, const sal_uInt8 nSCol ) { // Lines that are shorted than the largest line width won't be inserted if ( rRect.Height() > DEF_LINE_WIDTH_4 || rRect.Width() > DEF_LINE_WIDTH_4 ) - this->push_back( SwLineRect( rRect, 0, SOLID, 0, nSCol ) ); + { + this->push_back( + SwLineRect(rRect, 0, table::BorderLineStyle::SOLID, 0, nSCol)); + } } void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects ) @@ -4638,7 +4643,7 @@ lcl_MakeBorderLine(SwRect const& rRect, nExtentRightStart, nExtentRightEnd, aLeftColor.getBColor(), aRightColor.getBColor(), rBorder.GetColorGap().getBColor(), rBorder.HasGapColor(), - rBorder.GetSvxBorderStyle() ); + rBorder.GetBorderLineStyle() ); g_pBorderLines->AddBorderLine(xLine); } @@ -6398,7 +6403,8 @@ void lcl_RefreshLine( const SwLayoutFrm *pLay, SwRect aRect( aP1, aP2 ); // OD 18.11.2002 #99672# - use parameter <_pSubsLines> instead of // global variable <pSubsLines>. - _pSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor ); + _pSubsLines->AddLineRect( aRect, 0, table::BorderLineStyle::SOLID, + 0, nSubColor ); } aP1 = aP2; aP1.*pDirPt += 1; @@ -6702,13 +6708,15 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage, if ( aOriginal.Left() == aOut.Left() ) { const SwRect aRect( aOut.Pos(), aLB ); - pUsedSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor ); + pUsedSubsLines->AddLineRect( aRect, 0, + table::BorderLineStyle::SOLID, 0, nSubColor ); } // OD 14.11.2002 #104821# - in vertical layout set page/column break at right if ( aOriginal.Right() == nRight ) { const SwRect aRect( aRT, aRB ); - pUsedSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor ); + pUsedSubsLines->AddLineRect( aRect, 0, + table::BorderLineStyle::SOLID, 0, nSubColor ); } } // OD 14.11.2002 #104822# - adjust control for drawing top and bottom lines @@ -6718,12 +6726,14 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage, { // OD 14.11.2002 #104821# - in horizontal layout set page/column break at top const SwRect aRect( aOut.Pos(), aRT ); - pUsedSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor ); + pUsedSubsLines->AddLineRect( aRect, 0, + table::BorderLineStyle::SOLID, 0, nSubColor ); } if ( aOriginal.Bottom() == nBottom ) { const SwRect aRect( aLB, aRB ); - pUsedSubsLines->AddLineRect( aRect, 0, SOLID, 0, nSubColor ); + pUsedSubsLines->AddLineRect( aRect, 0, + table::BorderLineStyle::SOLID, 0, nSubColor ); } } } diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 255121b8e68a..2b312a31b4f6 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -2438,9 +2438,9 @@ SwXTextColumns::SwXTextColumns(const SwFmtCol& rFmtCol) : sal_Int8 nStyle = API_COL_LINE_NONE; switch (rFmtCol.GetLineStyle()) { - case editeng::SOLID: nStyle = API_COL_LINE_SOLID; break; - case editeng::DOTTED: nStyle = API_COL_LINE_DOTTED; break; - case editeng::DASHED: nStyle = API_COL_LINE_DASHED; break; + case table::BorderLineStyle::SOLID: nStyle = API_COL_LINE_SOLID; break; + case table::BorderLineStyle::DOTTED: nStyle= API_COL_LINE_DOTTED; break; + case table::BorderLineStyle::DASHED: nStyle= API_COL_LINE_DASHED; break; default: break; } nSepLineStyle = nStyle; diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index ac17fd49d83f..c18ae1506d02 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -136,7 +136,7 @@ sal_Bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLi { rSvxLine.SetColor(Color(rLine.Color)); - rSvxLine.GuessLinesWidths( editeng::NO_STYLE, + rSvxLine.GuessLinesWidths( table::BorderLineStyle::NONE, MM100_TO_TWIP( rLine.OuterLineWidth ), MM100_TO_TWIP( rLine.InnerLineWidth ), MM100_TO_TWIP( rLine.LineDistance ) ); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 98727ad66a63..af2a3091cf11 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -101,6 +101,7 @@ #include <rtl/strbuf.hxx> +using namespace ::com::sun::star; using ::editeng::SvxBorderLine; /* @@ -3583,36 +3584,36 @@ static void OutCSS1_SvxBorderLine( SwHTMLWriter& rHTMLWrt, // Linien-Stil: solid oder double sOut.append(' '); - switch (pLine->GetSvxBorderStyle()) + switch (pLine->GetBorderLineStyle()) { - case ::editeng::SOLID: + case table::BorderLineStyle::SOLID: sOut.append(sCSS1_PV_solid); break; - case ::editeng::DOTTED: + case table::BorderLineStyle::DOTTED: sOut.append(sCSS1_PV_dotted); break; - case ::editeng::DASHED: + case table::BorderLineStyle::DASHED: sOut.append(sCSS1_PV_dashed); break; - case ::editeng::DOUBLE: - case ::editeng::THINTHICK_SMALLGAP: - case ::editeng::THINTHICK_MEDIUMGAP: - case ::editeng::THINTHICK_LARGEGAP: - case ::editeng::THICKTHIN_SMALLGAP: - case ::editeng::THICKTHIN_MEDIUMGAP: - case ::editeng::THICKTHIN_LARGEGAP: + case table::BorderLineStyle::DOUBLE: + case table::BorderLineStyle::THINTHICK_SMALLGAP: + case table::BorderLineStyle::THINTHICK_MEDIUMGAP: + case table::BorderLineStyle::THINTHICK_LARGEGAP: + case table::BorderLineStyle::THICKTHIN_SMALLGAP: + case table::BorderLineStyle::THICKTHIN_MEDIUMGAP: + case table::BorderLineStyle::THICKTHIN_LARGEGAP: sOut.append(sCSS1_PV_double); break; - case ::editeng::EMBOSSED: + case table::BorderLineStyle::EMBOSSED: sOut.append(sCSS1_PV_ridge); break; - case ::editeng::ENGRAVED: + case table::BorderLineStyle::ENGRAVED: sOut.append(sCSS1_PV_groove); break; - case ::editeng::INSET: + case table::BorderLineStyle::INSET: sOut.append(sCSS1_PV_inset); break; - case ::editeng::OUTSET: + case table::BorderLineStyle::OUTSET: sOut.append(sCSS1_PV_outset); break; default: diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 53529f67385c..bfde6230dda3 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -1025,7 +1025,9 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions ) } if ( pOptions->nCellSpacing != 0 ) - aTopBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE ); + { + aTopBorderLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE); + } aTopBorderLine.SetWidth( nPHeight ); aTopBorderLine.SetColor( rBorderColor ); aBottomBorderLine = aTopBorderLine; @@ -1037,7 +1039,9 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions ) else { if ( pOptions->nCellSpacing != 0 ) - aLeftBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE ); + { + aLeftBorderLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE); + } aLeftBorderLine.SetWidth( nPWidth ); aLeftBorderLine.SetColor( rBorderColor ); } @@ -1045,7 +1049,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions ) if( pOptions->nCellSpacing != 0 ) { - aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE ); + aBorderLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE); aBorderLine.SetWidth( DEF_LINE_WIDTH_0 ); } else @@ -1487,7 +1491,8 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox, sal_uInt16 nBorderWidth = aBorderLine.GetOutWidth(); nBorderWidth *= (nEmptyRows + 1); - aThickBorderLine.SetSvxBorderStyle( ::editeng::SOLID ); + aThickBorderLine.SetBorderLineStyle( + table::BorderLineStyle::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 90f66e795469..40f237848657 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -65,6 +65,9 @@ #include <memory> + +using namespace ::com::sun::star; + // die Funktionen zum Parsen einer CSS1-Property sind von folgendem Typ: typedef void (*FnParseCSS1Prop)( const CSS1Expression *pExpr, SfxItemSet& rItemSet, @@ -323,31 +326,31 @@ void SvxCSS1BorderInfo::SetBorderLine( sal_uInt16 nLine, SvxBoxItem &rBoxItem ) switch ( eStyle ) { case CSS1_BS_SINGLE: - aBorderLine.SetSvxBorderStyle( ::editeng::SOLID ); + aBorderLine.SetBorderLineStyle(table::BorderLineStyle::SOLID); break; case CSS1_BS_DOUBLE: - aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE ); + aBorderLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE); break; case CSS1_BS_DOTTED: - aBorderLine.SetSvxBorderStyle( ::editeng::DOTTED ); + aBorderLine.SetBorderLineStyle(table::BorderLineStyle::DOTTED); break; case CSS1_BS_DASHED: - aBorderLine.SetSvxBorderStyle( ::editeng::DASHED ); + aBorderLine.SetBorderLineStyle(table::BorderLineStyle::DASHED); break; case CSS1_BS_GROOVE: - aBorderLine.SetSvxBorderStyle( ::editeng::ENGRAVED ); + aBorderLine.SetBorderLineStyle(table::BorderLineStyle::ENGRAVED); break; case CSS1_BS_RIDGE: - aBorderLine.SetSvxBorderStyle( ::editeng::EMBOSSED ); + aBorderLine.SetBorderLineStyle(table::BorderLineStyle::EMBOSSED); break; case CSS1_BS_INSET: - aBorderLine.SetSvxBorderStyle( ::editeng::INSET ); + aBorderLine.SetBorderLineStyle(table::BorderLineStyle::INSET); break; case CSS1_BS_OUTSET: - aBorderLine.SetSvxBorderStyle( ::editeng::OUTSET ); + aBorderLine.SetBorderLineStyle(table::BorderLineStyle::OUTSET); break; default: - aBorderLine.SetSvxBorderStyle( ::editeng::NO_STYLE ); + aBorderLine.SetBorderLineStyle(table::BorderLineStyle::NONE); break; } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index a3d4ae502266..d64d14e3ae16 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -5246,7 +5246,7 @@ void SwHTMLParser::InsertHorzRule() SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); if ( !bNoShade ) { - aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE ); + aBorderLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE); } aBorderLine.SetWidth( nPHeight ); } @@ -5256,7 +5256,7 @@ void SwHTMLParser::InsertHorzRule() } else { - aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE ); + aBorderLine.SetBorderLineStyle(table::BorderLineStyle::DOUBLE); aBorderLine.SetWidth( DEF_LINE_WIDTH_0 ); } diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx index 6c7bd759ac0d..7cd9bb9426ba 100644 --- a/sw/source/filter/ww1/w1sprm.cxx +++ b/sw/source/filter/ww1/w1sprm.cxx @@ -206,7 +206,7 @@ STOP1(Ww1SingleSprmPPageBreakBefore, RES_BREAK) SvxBorderLine* Ww1SingleSprmPBrc::SetBorder(SvxBorderLine* pLine, W1_BRC10* pBrc) { sal_uInt16 nCode; - ::editeng::SvxBorderStyle eStyle = ::editeng::SOLID; + ::editeng::SvxBorderStyle eStyle = table::BorderLineStyle::SOLID; if(pBrc->dxpLine2WidthGet() == 0) { switch(pBrc->dxpLine1WidthGet()) @@ -220,21 +220,21 @@ SvxBorderLine* Ww1SingleSprmPBrc::SetBorder(SvxBorderLine* pLine, W1_BRC10* pBrc case 5: nCode = DEF_LINE_WIDTH_4; break; case 6: nCode = DEF_LINE_WIDTH_5; - eStyle = ::editeng::DOTTED; + eStyle = table::BorderLineStyle::DOTTED; break; case 7: nCode = DEF_LINE_WIDTH_5; - eStyle = ::editeng::DASHED; + eStyle = table::BorderLineStyle::DASHED; break; } pLine->SetWidth( nCode ); - pLine->SetSvxBorderStyle( eStyle ); + pLine->SetBorderLineStyle( eStyle ); } else { if ( pBrc->dxpLine1WidthGet() == 1 && pBrc->dxpLine2WidthGet() == 1 ) { - pLine->SetSvxBorderStyle( ::editeng::DOUBLE ); + pLine->SetBorderLineStyle( table::BorderLineStyle::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 fb347bb76be9..26c0bea2a5e1 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1412,51 +1412,51 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co const char* pVal = "none"; if ( !pBorderLine->isEmpty( ) ) { - switch (pBorderLine->GetSvxBorderStyle()) + switch (pBorderLine->GetBorderLineStyle()) { - case ::editeng::SOLID: + case table::BorderLineStyle::SOLID: pVal = ( sal_Char* )"single"; break; - case ::editeng::DOTTED: + case table::BorderLineStyle::DOTTED: pVal = ( sal_Char* )"dotted"; break; - case ::editeng::DASHED: + case table::BorderLineStyle::DASHED: pVal = ( sal_Char* )"dashed"; break; - case ::editeng::DOUBLE: + case table::BorderLineStyle::DOUBLE: pVal = ( sal_Char* )"double"; break; - case ::editeng::THINTHICK_SMALLGAP: + case table::BorderLineStyle::THINTHICK_SMALLGAP: pVal = ( sal_Char* )"thinThickSmallGap"; break; - case ::editeng::THINTHICK_MEDIUMGAP: + case table::BorderLineStyle::THINTHICK_MEDIUMGAP: pVal = ( sal_Char* )"thinThickMediumGap"; break; - case ::editeng::THINTHICK_LARGEGAP: + case table::BorderLineStyle::THINTHICK_LARGEGAP: pVal = ( sal_Char* )"thinThickLargeGap"; break; - case ::editeng::THICKTHIN_SMALLGAP: + case table::BorderLineStyle::THICKTHIN_SMALLGAP: pVal = ( sal_Char* )"thickThinSmallGap"; break; - case ::editeng::THICKTHIN_MEDIUMGAP: + case table::BorderLineStyle::THICKTHIN_MEDIUMGAP: pVal = ( sal_Char* )"thickThinMediumGap"; break; - case ::editeng::THICKTHIN_LARGEGAP: + case table::BorderLineStyle::THICKTHIN_LARGEGAP: pVal = ( sal_Char* )"thickThinLargeGap"; break; - case ::editeng::EMBOSSED: + case table::BorderLineStyle::EMBOSSED: pVal = ( sal_Char* )"threeDEmboss"; break; - case ::editeng::ENGRAVED: + case table::BorderLineStyle::ENGRAVED: pVal = ( sal_Char* )"threeDEngrave"; break; - case ::editeng::OUTSET: + case table::BorderLineStyle::OUTSET: pVal = ( sal_Char* )"outset"; break; - case ::editeng::INSET: + case table::BorderLineStyle::INSET: pVal = ( sal_Char* )"inset"; break; - case ::editeng::NO_STYLE: + case table::BorderLineStyle::NONE: default: break; } diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 94bfccb238d6..3ef3aff38a9c 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -124,9 +124,9 @@ static OString OutTBLBorderLine(RtfExport &rExport, const SvxBorderLine* pLine, { aRet.append(pStr); // single line - switch (pLine->GetSvxBorderStyle()) + switch (pLine->GetBorderLineStyle()) { - case ::editeng::SOLID: + case table::BorderLineStyle::SOLID: { if( DEF_LINE_WIDTH_0 == pLine->GetWidth() ) aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRHAIR); @@ -134,46 +134,46 @@ static OString OutTBLBorderLine(RtfExport &rExport, const SvxBorderLine* pLine, aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRS); } break; - case ::editeng::DOTTED: + case table::BorderLineStyle::DOTTED: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDOT); break; - case ::editeng::DASHED: + case table::BorderLineStyle::DASHED: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDASH); break; - case ::editeng::DOUBLE: + case table::BorderLineStyle::DOUBLE: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDB); break; - case ::editeng::THINTHICK_SMALLGAP: + case table::BorderLineStyle::THINTHICK_SMALLGAP: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTNTHSG); break; - case ::editeng::THINTHICK_MEDIUMGAP: + case table::BorderLineStyle::THINTHICK_MEDIUMGAP: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTNTHMG); break; - case ::editeng::THINTHICK_LARGEGAP: + case table::BorderLineStyle::THINTHICK_LARGEGAP: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTNTHLG); break; - case ::editeng::THICKTHIN_SMALLGAP: + case table::BorderLineStyle::THICKTHIN_SMALLGAP: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTHTNSG); break; - case ::editeng::THICKTHIN_MEDIUMGAP: + case table::BorderLineStyle::THICKTHIN_MEDIUMGAP: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTHTNMG); break; - case ::editeng::THICKTHIN_LARGEGAP: + case table::BorderLineStyle::THICKTHIN_LARGEGAP: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTHTNLG); break; - case ::editeng::EMBOSSED: + case table::BorderLineStyle::EMBOSSED: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDREMBOSS); break; - case ::editeng::ENGRAVED: + case table::BorderLineStyle::ENGRAVED: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRENGRAVE); break; - case ::editeng::OUTSET: + case table::BorderLineStyle::OUTSET: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDROUTSET); break; - case ::editeng::INSET: + case table::BorderLineStyle::INSET: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRINSET); break; - case ::editeng::NO_STYLE: + case table::BorderLineStyle::NONE: default: aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRNONE); break; diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index f74a3ea2539f..b951b32ddbd4 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1727,15 +1727,15 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt, DrawModelToEmu( nLineWidth )); MSO_LineDashing eDashing = mso_lineSolid; - switch (pLine->GetSvxBorderStyle()) + switch (pLine->GetBorderLineStyle()) { - case ::editeng::DASHED: + case table::BorderLineStyle::DASHED: eDashing = mso_lineDashGEL; break; - case ::editeng::DOTTED: + case table::BorderLineStyle::DOTTED: eDashing = mso_lineDotGEL; break; - case ::editeng::SOLID: + case table::BorderLineStyle::SOLID: default: break; } diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 52f761969ad1..3f2c0c02a641 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -4073,9 +4073,9 @@ 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.GetSvxBorderStyle()) + switch (rLine.GetBorderLineStyle()) { - case ::editeng::SOLID: + case table::BorderLineStyle::SOLID: { if ( rLine.GetWidth( ) == DEF_LINE_WIDTH_0 ) brcType = 5; @@ -4083,43 +4083,43 @@ WW8_BRC WW8Export::TranslateBorderLine(const SvxBorderLine& rLine, brcType = 1; } break; - case ::editeng::DOTTED: + case table::BorderLineStyle::DOTTED: brcType = 6; break; - case ::editeng::DASHED: + case table::BorderLineStyle::DASHED: brcType = 7; break; - case ::editeng::DOUBLE: + case table::BorderLineStyle::DOUBLE: brcType = 3; break; - case ::editeng::THINTHICK_SMALLGAP: + case table::BorderLineStyle::THINTHICK_SMALLGAP: brcType = 11; break; - case ::editeng::THINTHICK_MEDIUMGAP: + case table::BorderLineStyle::THINTHICK_MEDIUMGAP: brcType = 14; break; - case ::editeng::THINTHICK_LARGEGAP: + case table::BorderLineStyle::THINTHICK_LARGEGAP: brcType = 17; break; - case ::editeng::THICKTHIN_SMALLGAP: + case table::BorderLineStyle::THICKTHIN_SMALLGAP: brcType = 12; break; - case ::editeng::THICKTHIN_MEDIUMGAP: + case table::BorderLineStyle::THICKTHIN_MEDIUMGAP: brcType = 15; break; - case ::editeng::THICKTHIN_LARGEGAP: + case table::BorderLineStyle::THICKTHIN_LARGEGAP: brcType = 18; break; - case ::editeng::EMBOSSED: + case table::BorderLineStyle::EMBOSSED: brcType = 24; break; - case ::editeng::ENGRAVED: + case table::BorderLineStyle::ENGRAVED: brcType = 25; break; - case ::editeng::OUTSET: + case table::BorderLineStyle::OUTSET: brcType = 26; break; - case ::editeng::INSET: + case table::BorderLineStyle::INSET: brcType = 27; break; default: @@ -4145,9 +4145,10 @@ WW8_BRC WW8Export::TranslateBorderLine(const SvxBorderLine& rLine, nWidth = ( nWidth + 7 ) / 15; if( nWidth > 5 ) nWidth = 5; - if ( ::editeng::DOTTED == rLine.GetSvxBorderStyle() ) + ::editeng::SvxBorderStyle const eStyle(rLine.GetBorderLineStyle()); + if (table::BorderLineStyle::DOTTED == eStyle) nWidth = 6; - else if ( ::editeng::DASHED == rLine.GetSvxBorderStyle() ) + else if (table::BorderLineStyle::DASHED == eStyle) nWidth = 7; } diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 2f3c47fcf8b5..49fb0b216817 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -1505,7 +1505,7 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor, if( !rLineThick ) return nOutsideThick; - ::editeng::SvxBorderStyle nIdx = ::editeng::NO_STYLE; + ::editeng::SvxBorderStyle nIdx = table::BorderLineStyle::NONE; sal_Int32 nLineThick=rLineThick; nOutsideThick = SwMSDffManager::GetEscherLineMatch(eLineStyle, @@ -1526,21 +1526,21 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor, { // zuerst die Einzel-Linien case mso_lineSimple: - nIdx = ::editeng::SOLID; + nIdx = table::BorderLineStyle::SOLID; break; // dann die Doppel-Linien, fuer die wir feine Entsprechungen haben :-))) case mso_lineDouble: - nIdx = ::editeng::DOUBLE; + nIdx = table::BorderLineStyle::DOUBLE; break; case mso_lineThickThin: - nIdx = ::editeng::THICKTHIN_SMALLGAP; + nIdx = table::BorderLineStyle::THICKTHIN_SMALLGAP; break; case mso_lineThinThick: - nIdx = ::editeng::THINTHICK_SMALLGAP; + nIdx = table::BorderLineStyle::THINTHICK_SMALLGAP; break; // We have no triple border, use double instead. case mso_lineTriple: - nIdx = ::editeng::DOUBLE; + nIdx = table::BorderLineStyle::DOUBLE; break; // no line style is set case (MSO_LineStyle)USHRT_MAX: @@ -1554,23 +1554,23 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor, switch( eDashing ) { case mso_lineDashGEL: - nIdx = ::editeng::DASHED; + nIdx = table::BorderLineStyle::DASHED; break; case mso_lineDotGEL: - nIdx = ::editeng::DOTTED; + nIdx = table::BorderLineStyle::DOTTED; break; default: break; } - if (::editeng::NO_STYLE != nIdx) + if (table::BorderLineStyle::NONE != nIdx) { SvxBorderLine aLine; aLine.SetColor( rLineColor ); aLine.SetWidth( nLineThick ); // No conversion here, nLineThick is already in twips - aLine.SetSvxBorderStyle(nIdx); - if (editeng::DOUBLE == nIdx) + aLine.SetBorderLineStyle(nIdx); + if (table::BorderLineStyle::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 95138871f06c..1ed025035f0f 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -1279,7 +1279,7 @@ sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRC* brc, WW8PLCFx_Cp_FKP* pPap, void GetLineIndex(SvxBoxItem &rBox, short nLineThickness, short nSpace, sal_uInt8 nCol, short nIdx, sal_uInt16 nOOIndex, sal_uInt16 nWWIndex, short *pSize=0) { - ::editeng::SvxBorderStyle eStyle = ::editeng::SOLID; + ::editeng::SvxBorderStyle eStyle = table::BorderLineStyle::SOLID; switch (nIdx) { // First the single lines @@ -1290,70 +1290,70 @@ void GetLineIndex(SvxBoxItem &rBox, short nLineThickness, short nSpace, sal_uInt case 9: case 20: case 22: - eStyle = ::editeng::SOLID; + eStyle = table::BorderLineStyle::SOLID; break; case 2: { - eStyle = ::editeng::SOLID; + eStyle = table::BorderLineStyle::SOLID; nLineThickness *= 2; } break; case 6: - eStyle = ::editeng::DOTTED; + eStyle = table::BorderLineStyle::DOTTED; break; case 7: - eStyle = ::editeng::DASHED; + eStyle = table::BorderLineStyle::DASHED; break; // then the shading beams which we represent by a double line case 23: - eStyle = ::editeng::DOUBLE; + eStyle = table::BorderLineStyle::DOUBLE; break; // then the double lines, for which we have good matches case 3: case 10: //Don't have tripple so use double case 21: //Don't have double wave: use double instead - eStyle = ::editeng::DOUBLE; + eStyle = table::BorderLineStyle::DOUBLE; break; case 11: - eStyle = ::editeng::THINTHICK_SMALLGAP; + eStyle = table::BorderLineStyle::THINTHICK_SMALLGAP; break; case 12: case 13: //Don't have thin thick thin, so use thick thin - eStyle = ::editeng::THICKTHIN_SMALLGAP; + eStyle = table::BorderLineStyle::THICKTHIN_SMALLGAP; break; case 14: - eStyle = ::editeng::THINTHICK_MEDIUMGAP; + eStyle = table::BorderLineStyle::THINTHICK_MEDIUMGAP; break; case 15: case 16: //Don't have thin thick thin, so use thick thin - eStyle = ::editeng::THICKTHIN_MEDIUMGAP; + eStyle = table::BorderLineStyle::THICKTHIN_MEDIUMGAP; break; case 17: - eStyle = ::editeng::THINTHICK_LARGEGAP; + eStyle = table::BorderLineStyle::THINTHICK_LARGEGAP; break; case 18: case 19: //Don't have thin thick thin, so use thick thin - eStyle = ::editeng::THICKTHIN_LARGEGAP; + eStyle = table::BorderLineStyle::THICKTHIN_LARGEGAP; break; case 24: - eStyle = ::editeng::EMBOSSED; + eStyle = table::BorderLineStyle::EMBOSSED; break; case 25: - eStyle = ::editeng::ENGRAVED; + eStyle = table::BorderLineStyle::ENGRAVED; break; case 26: - eStyle = ::editeng::OUTSET; + eStyle = table::BorderLineStyle::OUTSET; break; case 27: - eStyle = ::editeng::INSET; + eStyle = table::BorderLineStyle::INSET; break; default: - eStyle = ::editeng::NO_STYLE; + eStyle = table::BorderLineStyle::NONE; break; } ::editeng::SvxBorderLine aLine; - aLine.SetSvxBorderStyle( eStyle ); + aLine.SetBorderLineStyle( 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 3114bd48f8bf..e4d04769e69f 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -365,15 +365,15 @@ void SvXMLExportItemMapper::handleElementItem( bool lcl_isOdfDoubleLine( const SvxBorderLine* pLine ) { bool bIsOdfDouble = false; - switch (pLine->GetSvxBorderStyle()) + switch (pLine->GetBorderLineStyle()) { - case ::editeng::DOUBLE: - case ::editeng::THINTHICK_SMALLGAP: - case ::editeng::THINTHICK_MEDIUMGAP: - case ::editeng::THINTHICK_LARGEGAP: - case ::editeng::THICKTHIN_SMALLGAP: - case ::editeng::THICKTHIN_MEDIUMGAP: - case ::editeng::THICKTHIN_LARGEGAP: + case table::BorderLineStyle::DOUBLE: + case table::BorderLineStyle::THINTHICK_SMALLGAP: + case table::BorderLineStyle::THINTHICK_MEDIUMGAP: + case table::BorderLineStyle::THINTHICK_LARGEGAP: + case table::BorderLineStyle::THICKTHIN_SMALLGAP: + case table::BorderLineStyle::THICKTHIN_MEDIUMGAP: + case table::BorderLineStyle::THICKTHIN_LARGEGAP: bIsOdfDouble = true; break; default: @@ -743,36 +743,36 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( enum XMLTokenEnum eStyle = XML_SOLID; bool bNoBorder = false; - switch (pLine->GetSvxBorderStyle()) + switch (pLine->GetBorderLineStyle()) { - case ::editeng::SOLID: + case table::BorderLineStyle::SOLID: eStyle = XML_SOLID; break; - case ::editeng::DOTTED: + case table::BorderLineStyle::DOTTED: eStyle = XML_DOTTED; break; - case ::editeng::DASHED: + case table::BorderLineStyle::DASHED: eStyle = XML_DASHED; break; - case ::editeng::DOUBLE: - case ::editeng::THINTHICK_SMALLGAP: - case ::editeng::THINTHICK_MEDIUMGAP: - case ::editeng::THINTHICK_LARGEGAP: - case ::editeng::THICKTHIN_SMALLGAP: - case ::editeng::THICKTHIN_MEDIUMGAP: - case ::editeng::THICKTHIN_LARGEGAP: + case table::BorderLineStyle::DOUBLE: + case table::BorderLineStyle::THINTHICK_SMALLGAP: + case table::BorderLineStyle::THINTHICK_MEDIUMGAP: + case table::BorderLineStyle::THINTHICK_LARGEGAP: + case table::BorderLineStyle::THICKTHIN_SMALLGAP: + case table::BorderLineStyle::THICKTHIN_MEDIUMGAP: + case table::BorderLineStyle::THICKTHIN_LARGEGAP: eStyle = XML_DOUBLE; break; - case ::editeng::EMBOSSED: + case table::BorderLineStyle::EMBOSSED: eStyle = XML_RIDGE; break; - case ::editeng::ENGRAVED: + case table::BorderLineStyle::ENGRAVED: eStyle = XML_GROOVE; break; - case ::editeng::INSET: + case table::BorderLineStyle::INSET: eStyle = XML_INSET; break; - case ::editeng::OUTSET: + case table::BorderLineStyle::OUTSET: eStyle = XML_OUTSET; break; default: diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index 4531995dd8ee..0902899899e6 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -154,10 +154,10 @@ sal_Bool lcl_frmitems_parseXMLBorder( const OUString& rValue, void lcl_frmitems_setXMLBorderStyle( SvxBorderLine& rLine, sal_uInt16 nStyle ) { - ::editeng::SvxBorderStyle eStyle = ::editeng::NO_STYLE; + ::editeng::SvxBorderStyle eStyle = table::BorderLineStyle::NONE; if ( nStyle != API_LINE_NONE ) eStyle = ::editeng::SvxBorderStyle( nStyle ); - rLine.SetSvxBorderStyle(eStyle); + rLine.SetBorderLineStyle(eStyle); } sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine, @@ -207,7 +207,7 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine, { if (bDouble) { - rpLine->SetSvxBorderStyle( ::editeng::DOUBLE ); + rpLine->SetBorderLineStyle( table::BorderLineStyle::DOUBLE ); } rpLine->SetWidth( aBorderWidths[nNamedWidth] ); } @@ -244,7 +244,8 @@ void lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine, if( nWidth > 0 ) rpLine->SetWidth( nWidth ); else - rpLine->GuessLinesWidths( ::editeng::DOUBLE, nOutWidth, nInWidth, nDistance ); + rpLine->GuessLinesWidths(table::BorderLineStyle::DOUBLE, + nOutWidth, nInWidth, nDistance); } const struct SvXMLEnumMapEntry psXML_BrushRepeat[] = diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 3d3431f2e599..039d2be03280 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -74,6 +74,9 @@ #include "access.hrc" + +using namespace ::com::sun::star; + #define FRAME_FORMAT_WIDTH 1000 /*-------------------------------------------------------------------- @@ -529,9 +532,15 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet) // Fill the line styles listbox aLineTypeDLB.SetNone( SVX_RESSTR( RID_SVXSTR_NONE ) ); - aLineTypeDLB.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::SOLID ), ::editeng::SOLID ); - aLineTypeDLB.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::DOTTED ), ::editeng::DOTTED ); - aLineTypeDLB.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::DASHED ), ::editeng::DASHED ); + aLineTypeDLB.InsertEntry( + ::editeng::SvxBorderLine::getWidthImpl(table::BorderLineStyle::SOLID), + table::BorderLineStyle::SOLID ); + aLineTypeDLB.InsertEntry( + ::editeng::SvxBorderLine::getWidthImpl(table::BorderLineStyle::DOTTED), + table::BorderLineStyle::DOTTED ); + aLineTypeDLB.InsertEntry( + ::editeng::SvxBorderLine::getWidthImpl(table::BorderLineStyle::DASHED), + table::BorderLineStyle::DASHED ); long nLineWidth = static_cast<long>(MetricField::ConvertDoubleValue( aLineWidthEdit.GetValue( ), diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index df6c470efbfd..f8d63a225471 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -58,6 +58,9 @@ #include <misc.hrc> #include <pgfnote.hrc> + +using namespace ::com::sun::star; + static sal_uInt16 aPageRg[] = { FN_PARAM_FTN_INFO, FN_PARAM_FTN_INFO, 0 @@ -220,9 +223,15 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet) aLineTypeBox.SetSourceUnit( FUNIT_TWIP ); aLineTypeBox.SetNone( String( SW_RES( STR_NONE ) ) ); - aLineTypeBox.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::SOLID ), ::editeng::SOLID ); - aLineTypeBox.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::DOTTED ), ::editeng::DOTTED ); - aLineTypeBox.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::DASHED ), ::editeng::DASHED ); + aLineTypeBox.InsertEntry( + ::editeng::SvxBorderLine::getWidthImpl(table::BorderLineStyle::SOLID), + table::BorderLineStyle::SOLID ); + aLineTypeBox.InsertEntry( + ::editeng::SvxBorderLine::getWidthImpl(table::BorderLineStyle::DOTTED), + table::BorderLineStyle::DOTTED ); + aLineTypeBox.InsertEntry( + ::editeng::SvxBorderLine::getWidthImpl(table::BorderLineStyle::DASHED), + table::BorderLineStyle::DASHED ); aLineTypeBox.SetWidth( pFtnInfo->GetLineWidth( ) ); aLineTypeBox.SelectEntry( pFtnInfo->GetLineStyle() ); diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 46b9738ff1e2..f2834b695c63 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -1095,7 +1095,8 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq) if(aBorderLine.GetOutWidth() == 0) { - aBorderLine.SetSvxBorderStyle( ::editeng::SOLID ); + aBorderLine.SetBorderLineStyle( + table::BorderLineStyle::SOLID); aBorderLine.SetWidth( DEF_LINE_WIDTH_0 ); } //Distance nur setzen, wenn der Request vom Controller kommt @@ -1229,7 +1230,7 @@ void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBo if(pBorderLine->GetWidth() > rBorderLine.GetWidth()) rBorderLine.SetWidth(pBorderLine->GetWidth()); - rBorderLine.SetSvxBorderStyle(pBorderLine->GetSvxBorderStyle()); + rBorderLine.SetBorderLineStyle(pBorderLine->GetBorderLineStyle()); rBorderLine.SetColor(pBorderLine->GetColor()); } diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index ccbe696dc5a0..ee388923e84a 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.SetSvxBorderStyle(pBorderLine->GetSvxBorderStyle()); + rBorderLine.SetBorderLineStyle(pBorderLine->GetBorderLineStyle()); rBorderLine.SetColor(pBorderLine->GetColor()); } @@ -541,7 +541,7 @@ void SwTableShell::Execute(SfxRequest &rReq) if(aBorderLine.GetOutWidth() == 0) { - aBorderLine.SetSvxBorderStyle( ::editeng::SOLID ); + aBorderLine.SetBorderLineStyle(table::BorderLineStyle::SOLID); aBorderLine.SetWidth( DEF_LINE_WIDTH_0 ); } diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx index 2503ca4850ea..3507b8b6ee2c 100644 --- a/sw/source/ui/utlui/uiitems.cxx +++ b/sw/source/ui/utlui/uiitems.cxx @@ -143,10 +143,10 @@ bool SwPageFtnInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const switch ( aFtnInfo.GetLineStyle( ) ) { default: - case ::editeng::NO_STYLE: rVal <<= sal_Int8( 0 ); break; - case ::editeng::SOLID: rVal <<= sal_Int8( 1 ); break; - case ::editeng::DOTTED: rVal <<= sal_Int8( 2 ); break; - case ::editeng::DASHED: rVal <<= sal_Int8( 3 ); break; + case table::BorderLineStyle::NONE : rVal <<= sal_Int8(0); break; + case table::BorderLineStyle::SOLID: rVal <<= sal_Int8(1); break; + case table::BorderLineStyle::DOTTED: rVal <<= sal_Int8(2); break; + case table::BorderLineStyle::DASHED: rVal <<= sal_Int8(3); break; } break; } @@ -214,14 +214,14 @@ bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId) } case MID_FTN_LINE_STYLE: { - ::editeng::SvxBorderStyle eStyle = ::editeng::NO_STYLE; + ::editeng::SvxBorderStyle eStyle = table::BorderLineStyle::NONE; sal_Int8 nSet = 0; rVal >>= nSet; switch ( nSet ) { - case 1: eStyle = ::editeng::SOLID; break; - case 2: eStyle = ::editeng::DOTTED; break; - case 3: eStyle = ::editeng::DASHED; break; + case 1: eStyle = table::BorderLineStyle::SOLID; break; + case 2: eStyle = table::BorderLineStyle::DOTTED; break; + case 3: eStyle = table::BorderLineStyle::DASHED; break; default: break; } aFtnInfo.SetLineStyle( eStyle ); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 9f45be37c8fa..0db4d72b59e7 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1691,32 +1691,35 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) } // Border types - switch (nKeyword) - { - // brdrhair and brdrs are the same, brdrw will make a difference - case RTF_BRDRHAIR: nParam = editeng::SOLID; break; - case RTF_BRDRS: nParam = editeng::SOLID; break; - case RTF_BRDRDOT: nParam = editeng::DOTTED; break; - case RTF_BRDRDASH: nParam = editeng::DASHED; break; - case RTF_BRDRDB: nParam = editeng::DOUBLE; break; - case RTF_BRDRTNTHSG: nParam = editeng::THINTHICK_SMALLGAP; break; - case RTF_BRDRTNTHMG: nParam = editeng::THINTHICK_MEDIUMGAP; break; - case RTF_BRDRTNTHLG: nParam = editeng::THINTHICK_LARGEGAP; break; - case RTF_BRDRTHTNSG: nParam = editeng::THICKTHIN_SMALLGAP; break; - case RTF_BRDRTHTNMG: nParam = editeng::THICKTHIN_MEDIUMGAP; break; - case RTF_BRDRTHTNLG: nParam = editeng::THICKTHIN_LARGEGAP; break; - case RTF_BRDREMBOSS: nParam = editeng::EMBOSSED; break; - case RTF_BRDRENGRAVE: nParam = editeng::ENGRAVED; break; - case RTF_BRDROUTSET: nParam = editeng::OUTSET; break; - case RTF_BRDRINSET: nParam = editeng::INSET; break; - case RTF_BRDRNONE: nParam = editeng::NO_STYLE; break; - default: break; - } - if (nParam >= 0) { - RTFValue::Pointer_t pValue(new RTFValue(nParam)); - lcl_putBorderProperty(m_aStates, NS_rtf::LN_BRCTYPE, pValue); - return 0; + using namespace ::com::sun::star::table::BorderLineStyle; + switch (nKeyword) + { + // brdrhair and brdrs are the same, brdrw will make a difference + case RTF_BRDRHAIR: nParam = SOLID; break; + case RTF_BRDRS: nParam = SOLID; break; + case RTF_BRDRDOT: nParam = DOTTED; break; + case RTF_BRDRDASH: nParam = DASHED; break; + case RTF_BRDRDB: nParam = DOUBLE; break; + case RTF_BRDRTNTHSG: nParam = THINTHICK_SMALLGAP; break; + case RTF_BRDRTNTHMG: nParam = THINTHICK_MEDIUMGAP; break; + case RTF_BRDRTNTHLG: nParam = THINTHICK_LARGEGAP; break; + case RTF_BRDRTHTNSG: nParam = THICKTHIN_SMALLGAP; break; + case RTF_BRDRTHTNMG: nParam = THICKTHIN_MEDIUMGAP; break; + case RTF_BRDRTHTNLG: nParam = THICKTHIN_LARGEGAP; break; + case RTF_BRDREMBOSS: nParam = EMBOSSED; break; + case RTF_BRDRENGRAVE: nParam = ENGRAVED; break; + case RTF_BRDROUTSET: nParam = OUTSET; break; + case RTF_BRDRINSET: nParam = INSET; break; + case RTF_BRDRNONE: nParam = NONE; break; + default: break; + } + if (nParam >= 0 && nParam != NONE) + { + RTFValue::Pointer_t pValue(new RTFValue(nParam)); + lcl_putBorderProperty(m_aStates, NS_rtf::LN_BRCTYPE, pValue); + return 0; + } } // Section breaks |