diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-25 15:51:54 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-28 11:15:52 +0200 |
| commit | 1d21a4249661b1b55cf8fbea67ad47ffb4f813fa (patch) | |
| tree | f5ffda4ae0fd6fd5d4f5f6c5b967b57c678b8371 /sw/source/ui/utlui | |
| parent | 969d60a477742d24afe370fae70db057d2db9341 (diff) | |
Moved SvxBorder* into editeng namespace to avoid duplicate DOUBLE on windows
Diffstat (limited to 'sw/source/ui/utlui')
| -rw-r--r-- | sw/source/ui/utlui/uiitems.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx index 3daa370dd147..132d8cf20a6c 100644 --- a/sw/source/ui/utlui/uiitems.cxx +++ b/sw/source/ui/utlui/uiitems.cxx @@ -145,10 +145,10 @@ bool SwPageFtnInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const switch ( aFtnInfo.GetLineStyle( ) ) { default: - case NO_STYLE: rVal <<= sal_Int8( 0 ); break; - case SOLID: rVal <<= sal_Int8( 1 ); break; - case DOTTED: rVal <<= sal_Int8( 2 ); break; - case DASHED: rVal <<= sal_Int8( 3 ); break; + case ::editeng::NO_STYLE: rVal <<= sal_Int8( 0 ); break; + case ::editeng::SOLID: rVal <<= sal_Int8( 1 ); break; + case ::editeng::DOTTED: rVal <<= sal_Int8( 2 ); break; + case ::editeng::DASHED: rVal <<= sal_Int8( 3 ); break; } break; } @@ -216,14 +216,14 @@ bool SwPageFtnInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId) } case MID_FTN_LINE_STYLE: { - SvxBorderStyle eStyle = NO_STYLE; + ::editeng::SvxBorderStyle eStyle = ::editeng::NO_STYLE; sal_Int8 nSet = 0; rVal >>= nSet; switch ( nSet ) { - case 1: eStyle = SOLID; break; - case 2: eStyle = DOTTED; break; - case 3: eStyle = DASHED; break; + case 1: eStyle = ::editeng::SOLID; break; + case 2: eStyle = ::editeng::DOTTED; break; + case 3: eStyle = ::editeng::DASHED; break; default: break; } aFtnInfo.SetLineStyle( eStyle ); |