diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-17 17:40:11 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-19 15:33:13 +0100 |
| commit | 157c996a329d8c8989ea43284ba0cca727cf0dde (patch) | |
| tree | d37553af466fc47c212a720e76ce8ebc8884bfda /sw/inc | |
| parent | 481e04cd43701e6f760715e1c22000707f63ce32 (diff) | |
i#12441: Fixed line style in footnote format GUI and saved it to ODF
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/pagedesc.hxx | 18 | ||||
| -rw-r--r-- | sw/inc/unomid.h | 1 | ||||
| -rw-r--r-- | sw/inc/unoprnms.hxx | 3 |
3 files changed, 14 insertions, 8 deletions
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index 0690a3d1b7ed..156d5b2e1fc2 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -35,6 +35,7 @@ #include <swtypes.hxx> // For SwTwips. #include <frmfmt.hxx> #include <editeng/numitem.hxx> +#include <editeng/borderline.hxx> class SfxPoolItem; class SwTxtFmtColl; @@ -51,18 +52,20 @@ enum SwFtnAdj // Footnote information. class SW_DLLPUBLIC SwPageFtnInfo { - SwTwips nMaxHeight; // Maximum height of the footnote area. - sal_uLong nLineWidth; // Width of separator line. - Color aLineColor; // Color of the separator line. - Fraction aWidth; // Percentage width of the separator line. - SwFtnAdj eAdj; // Line adjustment. - SwTwips nTopDist; // Distance between body and separator. - SwTwips nBottomDist; // Distance between separator and first footnote. + SwTwips nMaxHeight; //maximum height of the footnote area. + sal_uLong nLineWidth; //width of separator line + 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. + SwTwips nTopDist; //distance between body and separator. + SwTwips nBottomDist; //distance between separator and first footnote public: SwTwips GetHeight() const { return nMaxHeight; } sal_uLong GetLineWidth() const { return nLineWidth; } const Color& GetLineColor() const { return aLineColor;} + SvxBorderStyle GetLineStyle() const { return eLineStyle; } const Fraction& GetWidth() const { return aWidth; } SwFtnAdj GetAdj() const { return eAdj; } SwTwips GetTopDist()const { return nTopDist; } @@ -70,6 +73,7 @@ public: void SetHeight( SwTwips nNew ) { nMaxHeight = nNew; } void SetLineWidth(sal_uLong nSet ) { nLineWidth = nSet; } + void SetLineStyle( SvxBorderStyle eSet ) { eLineStyle = eSet; } void SetLineColor(const Color& rCol ) { aLineColor = rCol;} void SetWidth( const Fraction &rNew){ aWidth = rNew; } void SetAdj ( SwFtnAdj eNew ) { eAdj = eNew; } diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h index d32ab9d329b7..92b132e480ab 100644 --- a/sw/inc/unomid.h +++ b/sw/inc/unomid.h @@ -118,6 +118,7 @@ #define MID_LINE_ADJUST 4 #define MID_LINE_TEXT_DIST 5 #define MID_LINE_FOOTNOTE_DIST 6 +#define MID_FTN_LINE_STYLE 7 //SwFmtRuby #define MID_RUBY_TEXT 0 diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 3462d6c1e182..7c7c7f30f9f8 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -808,7 +808,8 @@ enum SwPropNameIds /* 0740 */ UNO_NAME_VBA_DOCOBJ, /* 0741 */ UNO_NAME_NESTED_TEXT_CONTENT, /* 0742 */ UNO_NAME_SEPARATOR_LINE_STYLE, -/* 0743 */ SW_PROPNAME_END +/* 0743 */ UNO_NAME_FOOTNOTE_LINE_STYLE, +/* 0744 */ SW_PROPNAME_END }; struct SwPropNameLen |