summaryrefslogtreecommitdiff
path: root/svx/source/table
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/table')
-rwxr-xr-xsvx/source/table/cell.cxx1
-rwxr-xr-xsvx/source/table/tablecontroller.cxx1
-rwxr-xr-xsvx/source/table/tablelayouter.cxx1
-rwxr-xr-xsvx/source/table/tablelayouter.hxx12
-rwxr-xr-xsvx/source/table/viewcontactoftableobj.cxx1
5 files changed, 11 insertions, 5 deletions
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 4f52cc7c3f7b..4d26e69e2396 100755
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -65,6 +65,7 @@
// -----------------------------------------------------------------------------
+using ::editeng::SvxBorderLine;
using ::rtl::OUString;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 824a585264e5..41725d5e8470 100755
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -73,6 +73,7 @@
#include "tableundo.hxx"
#include "tablelayouter.hxx"
+using ::editeng::SvxBorderLine;
using ::rtl::OUString;
using namespace ::sdr::table;
using namespace ::com::sun::star;
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index c8f0b4fc263c..a2548b626247 100755
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -48,6 +48,7 @@
#include "svx/svdstr.hrc"
#include "svx/svdglob.hxx"
+using ::editeng::SvxBorderLine;
using ::rtl::OUString;
using ::com::sun::star::awt::XLayoutConstrains;
using namespace ::com::sun::star::uno;
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index d191d4b2dff8..edbacb83651c 100755
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -43,7 +43,9 @@
// -----------------------------------------------------------------------------
-class SvxBorderLine;
+namespace editeng {
+ class SvxBorderLine;
+}
namespace sdr { namespace table {
@@ -52,7 +54,7 @@ namespace sdr { namespace table {
*/
bool findMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedCol, sal_Int32 nMergedRow, sal_Int32& rOriginCol, sal_Int32& rOriginRow );
-typedef std::vector< SvxBorderLine* > BorderLineVector;
+typedef std::vector< editeng::SvxBorderLine* > BorderLineVector;
typedef std::vector< BorderLineVector > BorderLineMap;
// -----------------------------------------------------------------------------
@@ -116,7 +118,7 @@ public:
bool isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal ) const;
/** returns the requested borderline in rpBorderLine or a null pointer if there is no border at this edge */
- SvxBorderLine* getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal )const;
+ editeng::SvxBorderLine* getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal )const;
void updateCells( ::Rectangle& rRectangle );
@@ -144,9 +146,9 @@ private:
void ResizeBorderLayout();
void ResizeBorderLayout( BorderLineMap& rMap );
- void SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, const SvxBorderLine* pLine );
+ void SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, const editeng::SvxBorderLine* pLine );
- static bool HasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther );
+ static bool HasPriority( const editeng::SvxBorderLine* pThis, const editeng::SvxBorderLine* pOther );
struct Layout
{
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index 6b900dd8f131..158eae13c732 100755
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -55,6 +55,7 @@
//////////////////////////////////////////////////////////////////////////////
+using editeng::SvxBorderLine;
using namespace com::sun::star;
//////////////////////////////////////////////////////////////////////////////