summaryrefslogtreecommitdiff
path: root/svx/source/table/tablelayouter.hxx
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-25 15:51:50 +0100
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-28 11:20:08 +0200
commitfe551ada2d874b067cf57e80811d9b91e61b5457 (patch)
tree91929e0c884813e8d1b0039aa68050af7e0a021d /svx/source/table/tablelayouter.hxx
parentb4000b20f09b70b4792d050bc1804025b059bdef (diff)
Moved SvxBorder* into editeng namespace to avoid duplicate DOUBLE on windows
Diffstat (limited to 'svx/source/table/tablelayouter.hxx')
-rwxr-xr-xsvx/source/table/tablelayouter.hxx12
1 files changed, 7 insertions, 5 deletions
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
{