From 8b4593948582c3b5b3d013bd751bb19ffd37a31b Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Tue, 3 Jul 2012 21:26:13 +0200
Subject: replace enum SvxBorderStyle with css::table::BorderLineSyle

Change-Id: I1dadb53f46b23f92d34061ef78dda872bdbcda67
---
 editeng/qa/items/borderline_test.cxx | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'editeng/qa')

diff --git a/editeng/qa/items/borderline_test.cxx b/editeng/qa/items/borderline_test.cxx
index 96de7e7a55f1..f839103a7af1 100644
--- a/editeng/qa/items/borderline_test.cxx
+++ b/editeng/qa/items/borderline_test.cxx
@@ -34,6 +34,8 @@
 
 #include <editeng/borderline.hxx>
 
+using namespace ::com::sun::star::table::BorderLineStyle;
+
 #define TEST_WIDTH long( 40 )
 
 #define THINTHICKSG_IN_WIDTH long( 15 )
@@ -94,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.GetSvxBorderStyle() );
+    CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetBorderLineStyle() );
     CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() );
 }
 
@@ -103,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.GetSvxBorderStyle() );
+    CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetBorderLineStyle() );
     CPPUNIT_ASSERT_EQUAL( long( (3 * TEST_WIDTH) + 6 ), line.GetWidth() );
 }
 
@@ -114,7 +116,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() );
 }
 
@@ -125,26 +127,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() );
 }
 
-- 
cgit