summaryrefslogtreecommitdiffstats
path: root/sw/inc/pagedesc.hxx
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-25 15:51:54 +0100
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-28 11:15:52 +0200
commit1d21a4249661b1b55cf8fbea67ad47ffb4f813fa (patch)
treef5ffda4ae0fd6fd5d4f5f6c5b967b57c678b8371 /sw/inc/pagedesc.hxx
parentmigrate starmath subsequenttests to gbuild (diff)
downloadcore-1d21a4249661b1b55cf8fbea67ad47ffb4f813fa.tar.gz
core-1d21a4249661b1b55cf8fbea67ad47ffb4f813fa.zip
Moved SvxBorder* into editeng namespace to avoid duplicate DOUBLE on windows
Diffstat (limited to 'sw/inc/pagedesc.hxx')
-rw-r--r--sw/inc/pagedesc.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 876540626620..44367f590052 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -54,7 +54,7 @@ class SW_DLLPUBLIC SwPageFtnInfo
{
SwTwips nMaxHeight; //maximum height of the footnote area.
sal_uLong nLineWidth; //width of separator line
- SvxBorderStyle eLineStyle; // Style of the separator line
+ editeng::SvxBorderStyle eLineStyle; // Style of the separator line
Color aLineColor; //color of the separator line
Fraction aWidth; //percentage width of the separator line.
SwFtnAdj eAdj; //line adjustment.
@@ -65,7 +65,7 @@ public:
SwTwips GetHeight() const { return nMaxHeight; }
sal_uLong GetLineWidth() const { return nLineWidth; }
const Color& GetLineColor() const { return aLineColor;}
- SvxBorderStyle GetLineStyle() const { return eLineStyle; }
+ editeng::SvxBorderStyle GetLineStyle() const { return eLineStyle; }
const Fraction& GetWidth() const { return aWidth; }
SwFtnAdj GetAdj() const { return eAdj; }
SwTwips GetTopDist()const { return nTopDist; }
@@ -73,7 +73,7 @@ public:
void SetHeight( SwTwips nNew ) { nMaxHeight = nNew; }
void SetLineWidth(sal_uLong nSet ) { nLineWidth = nSet; }
- void SetLineStyle( SvxBorderStyle eSet ) { eLineStyle = eSet; }
+ void SetLineStyle( editeng::SvxBorderStyle eSet ) { eLineStyle = eSet; }
void SetLineColor(const Color& rCol ) { aLineColor = rCol;}
void SetWidth( const Fraction &rNew){ aWidth = rNew; }
void SetAdj ( SwFtnAdj eNew ) { eAdj = eNew; }