[Libreoffice-commits] .: sw/inc sw/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Mon Mar 28 02:28:49 PDT 2011
sw/inc/doc.hxx | 5 +--
sw/inc/fesh.hxx | 4 +-
sw/inc/fmtclds.hxx | 6 +--
sw/inc/pagedesc.hxx | 6 +--
sw/source/core/doc/gctable.cxx | 1
sw/source/core/doc/poolfmt.cxx | 1
sw/source/core/doc/tblafmt.cxx | 2 +
sw/source/core/docnode/ndtbl.cxx | 3 +
sw/source/core/docnode/ndtbl1.cxx | 1
sw/source/core/edit/autofmt.cxx | 14 ++++----
sw/source/core/frmedt/fetab.cxx | 2 -
sw/source/core/inc/frame.hxx | 2 -
sw/source/core/inc/tblrwcl.hxx | 7 ++--
sw/source/core/layout/atrfrm.cxx | 10 +++---
sw/source/core/layout/frmtool.cxx | 2 -
sw/source/core/layout/pagedesc.cxx | 2 -
sw/source/core/layout/paintfrm.cxx | 1
sw/source/core/unocore/unosett.cxx | 6 +--
sw/source/core/unocore/unotbl.cxx | 5 +--
sw/source/filter/basflt/fltini.cxx | 2 -
sw/source/filter/html/css1atr.cxx | 30 ++++++++++--------
sw/source/filter/html/htmlatr.cxx | 2 -
sw/source/filter/html/htmlfly.cxx | 4 +-
sw/source/filter/html/htmlgrin.cxx | 4 +-
sw/source/filter/html/htmltab.cxx | 9 +++--
sw/source/filter/html/svxcss1.cxx | 20 ++++++------
sw/source/filter/html/svxcss1.hxx | 2 -
sw/source/filter/html/swhtml.cxx | 5 +--
sw/source/filter/inc/wrtswtbl.hxx | 5 +--
sw/source/filter/writer/wrtswtbl.cxx | 1
sw/source/filter/ww1/w1class.hxx | 5 +--
sw/source/filter/ww1/w1sprm.cxx | 9 +++--
sw/source/filter/ww8/docxattributeoutput.cxx | 31 ++++++++++---------
sw/source/filter/ww8/rtfattributeoutput.cxx | 31 ++++++++++---------
sw/source/filter/ww8/rtfexport.cxx | 1
sw/source/filter/ww8/wrtw8esh.cxx | 7 ++--
sw/source/filter/ww8/wrtww8.hxx | 7 ++--
sw/source/filter/ww8/wrtww8gr.cxx | 2 -
sw/source/filter/ww8/ww8atr.cxx | 33 ++++++++++----------
sw/source/filter/ww8/ww8graf.cxx | 19 ++++++-----
sw/source/filter/ww8/ww8par2.cxx | 4 +-
sw/source/filter/ww8/ww8par6.cxx | 38 +++++++++++------------
sw/source/filter/xml/xmlexpit.cxx | 43 +++++++++++++--------------
sw/source/filter/xml/xmlimpit.cxx | 1
sw/source/filter/xml/xmlithlp.cxx | 9 +++--
sw/source/filter/xml/xmlithlp.hxx | 11 +++---
sw/source/ui/frmdlg/colmgr.cxx | 2 -
sw/source/ui/frmdlg/column.cxx | 8 ++---
sw/source/ui/inc/colmgr.hxx | 6 +--
sw/source/ui/misc/pgfnote.cxx | 8 ++---
sw/source/ui/shells/frmsh.cxx | 3 +
sw/source/ui/shells/tabsh.cxx | 3 +
sw/source/ui/table/tautofmt.cxx | 2 -
sw/source/ui/utlui/uiitems.cxx | 16 +++++-----
54 files changed, 247 insertions(+), 216 deletions(-)
New commits:
commit 559cec04ecf8293497cee2cfa4c04b1cfd7faca3
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Fri Mar 25 15:51:54 2011 +0100
Moved SvxBorder* into editeng namespace to avoid duplicate DOUBLE on windows
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 9eaa132..19468b2 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -90,6 +90,8 @@ class SwList;
#include <boost/scoped_ptr.hpp>
+namespace editeng { class SvxBorderLine; }
+
class SvxForbiddenCharactersTable;
class SwExtTextInput;
class DateTime;
@@ -112,7 +114,6 @@ class SvUShorts;
class SvUShortsSort;
class SvxMacro;
class SvxMacroTableDtor;
-class SvxBorderLine;
class SwAutoCompleteWord;
class SwAutoCorrExceptWord;
class SwCalc;
@@ -1868,7 +1869,7 @@ public:
void SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet );
void SetTabLineStyle( const SwCursor& rCursor,
const Color* pColor, sal_Bool bSetLine,
- const SvxBorderLine* pBorderLine );
+ const editeng::SvxBorderLine* pBorderLine );
void GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const;
void SetBoxAttr( const SwCursor& rCursor, const SfxPoolItem &rNew );
sal_Bool GetBoxAttr( const SwCursor& rCursor, SfxPoolItem &rToFill ) const;
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index c6e6853..5cf3e9b 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -46,6 +46,7 @@
#define INCLUDED_VECTOR
#endif
+namespace editeng { class SvxBorderLine; }
class SwFlyFrm;
class SwTabCols;
@@ -55,7 +56,6 @@ class SwTableAutoFmt;
class SwFrm;
class SwFmtFrmSize;
class SwFmtRowSplit;
-class SvxBorderLine;
class SdrObject;
class Color;
class Outliner;
@@ -631,7 +631,7 @@ public:
void SetTabBorders( const SfxItemSet& rSet );
void GetTabBorders( SfxItemSet& rSet) const;
- void SetTabLineStyle(const Color* pColor, sal_Bool bSetLine = sal_False, const SvxBorderLine* pBorderLine = NULL);
+ void SetTabLineStyle(const Color* pColor, sal_Bool bSetLine = sal_False, const editeng::SvxBorderLine* pBorderLine = NULL);
void SetTabBackground( const SvxBrushItem &rNew );
void GetTabBackground( SvxBrushItem &rToFill ) const;
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index e54fcc3..5f62ae9 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -78,7 +78,7 @@ enum SwColLineAdj
class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem
{
- SvxBorderStyle eLineStyle; //style of the separator line
+ editeng::SvxBorderStyle eLineStyle; //style of the separator line
sal_uLong nLineWidth; // Width of the separator line.
Color aLineColor; // Color of the separator line.
@@ -121,7 +121,7 @@ public:
SwColumns &GetColumns() { return aColumns; }
sal_uInt16 GetNumCols() const { return aColumns.Count(); }
- SvxBorderStyle GetLineStyle() const { return eLineStyle;}
+ editeng::SvxBorderStyle GetLineStyle() const { return eLineStyle;}
sal_uLong GetLineWidth() const { return nLineWidth;}
const Color& GetLineColor() const { return aLineColor;}
@@ -135,7 +135,7 @@ public:
// Return smallest width if bMin is true.
sal_uInt16 GetGutterWidth( sal_Bool bMin = sal_False ) const;
- void SetLineStyle(SvxBorderStyle eStyle) { eLineStyle = eStyle;}
+ void SetLineStyle(editeng::SvxBorderStyle eStyle) { eLineStyle = eStyle;}
void SetLineWidth(sal_uLong nLWidth) { nLineWidth = nLWidth;}
void SetLineColor(const Color& rCol ) { aLineColor = rCol;}
void SetLineHeight( sal_uInt8 nNew ) { nLineHeight = nNew; }
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 4501c85..5423f93 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; }
diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx
index ce6d02b..1ad3692 100644
--- a/sw/source/core/doc/gctable.cxx
+++ b/sw/source/core/doc/gctable.cxx
@@ -35,6 +35,7 @@
#include <tblrwcl.hxx>
#include <swtblfmt.hxx>
+using namespace ::editeng;
inline const SvxBorderLine* GetLineTB( const SvxBoxItem* pBox, sal_Bool bTop )
{
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 2324261..f2834e3 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -75,6 +75,7 @@
#include <numrule.hxx>
+using namespace ::editeng;
using namespace ::com::sun::star;
const sal_uInt16 PT_3 = 3 * 20; // 3 pt
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 2fb3960..6db8386 100755
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -51,6 +51,8 @@
#include <cellatr.hxx>
#include <SwStyleNameMapper.hxx>
+using ::editeng::SvxBorderLine;
+
// bis SO5PF
const sal_uInt16 AUTOFORMAT_ID_X = 9501;
const sal_uInt16 AUTOFORMAT_ID_358 = 9601;
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index d21a1ac..2af5012 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -102,6 +102,7 @@
#define CHECK_TABLE(t)
#endif
+using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
const sal_Unicode T2T_PARA = 0x0a;
@@ -127,7 +128,7 @@ void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
SvxBorderLine aLine( &aCol, DEF_LINE_WIDTH_0 );
if ( bHTML )
{
- aLine.SetStyle( DOUBLE );
+ aLine.SetStyle( editeng::DOUBLE );
aLine.SetWidth( DEF_LINE_WIDTH_0 );
}
SvxBoxItem aBox(RES_BOX); aBox.SetDistance( 55 );
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 19b7753..35342a0 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -60,6 +60,7 @@
#include "switerator.hxx"
#include <UndoTable.hxx>
+using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index a28ca82..559fd69 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -595,31 +595,31 @@ sal_Bool SwAutoFormat::DoUnderline()
aDelPam.SetMark();
aDelPam.GetMark()->nContent = 0;
- SvxBorderLine aLine;
+ editeng::SvxBorderLine aLine;
switch( eState )
{
case 1: // einfach, 0,05 pt
- aLine.SetStyle( SOLID );
+ aLine.SetStyle( editeng::SOLID );
aLine.SetWidth( DEF_LINE_WIDTH_0 );
break;
case 2: // einfach, 1,0 pt
- aLine.SetStyle( SOLID );
+ aLine.SetStyle( editeng::SOLID );
aLine.SetWidth( DEF_LINE_WIDTH_1 );
break;
case 3: // doppelt, 1,1 pt
- aLine.SetStyle( DOUBLE );
+ aLine.SetStyle( editeng::DOUBLE );
aLine.SetWidth( DEF_LINE_WIDTH_0 );
break;
case 4: // doppelt, 4,5 pt
- aLine.SetStyle( THICKTHIN_SMALLGAP );
+ aLine.SetStyle( editeng::THICKTHIN_SMALLGAP );
aLine.SetWidth( DEF_LINE_WIDTH_1 );
break;
case 5: // doppelt, 6,0 pt
- aLine.SetStyle( THINTHICK_SMALLGAP );
+ aLine.SetStyle( editeng::THINTHICK_SMALLGAP );
aLine.SetWidth( DEF_LINE_WIDTH_2 );
break;
case 6: // doppelt, 9,0 pt
- aLine.SetStyle( DOUBLE );
+ aLine.SetStyle( editeng::DOUBLE );
aLine.SetWidth( DEF_LINE_WIDTH_2 );
break;
}
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index ca5c35f..df558c0 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -837,7 +837,7 @@ void SwFEShell::SetTabBorders( const SfxItemSet& rSet )
}
void SwFEShell::SetTabLineStyle( const Color* pColor, sal_Bool bSetLine,
- const SvxBorderLine* pBorderLine )
+ const editeng::SvxBorderLine* pBorderLine )
{
SET_CURR_SHELL( this );
StartAllAction();
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 9135ea7..ba148cc 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -570,7 +570,7 @@ public:
const sal_Bool bLowerMode = sal_False,
const sal_Bool bLowerBorder = sal_False ) const;
void PaintBorderLine( const SwRect&, const SwRect&, const SwPageFrm*,
- const Color *pColor, const SvxBorderStyle = SOLID ) const;
+ const Color *pColor, const editeng::SvxBorderStyle = editeng::SOLID ) const;
void ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DSequence& rSequence ) const;
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index 616bca7..d0757e8 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -36,7 +36,8 @@
#include <tblsel.hxx>
#include <swtable.hxx>
-class SvxBorderLine;
+namespace editeng { class SvxBorderLine; }
+
class SwDoc;
class SwTableNode;
class _FndLine;
@@ -154,12 +155,12 @@ struct _SwGCLineBorder
class _SwGCBorder_BoxBrd
{
- const SvxBorderLine* pBrdLn;
+ const editeng::SvxBorderLine* pBrdLn;
sal_Bool bAnyBorderFnd;
public:
_SwGCBorder_BoxBrd() : pBrdLn( 0 ), bAnyBorderFnd( sal_False ) {}
- void SetBorder( const SvxBorderLine& rBorderLine )
+ void SetBorder( const editeng::SvxBorderLine& rBorderLine )
{ pBrdLn = &rBorderLine; bAnyBorderFnd = sal_False; }
// checke, ob die linke Border dieselbe wie die gesetzte ist
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 4d4543c..a74ae8a 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -855,7 +855,7 @@ SwFmtCol& SwFmtCol::operator=( const SwFmtCol& rCpy )
SwFmtCol::SwFmtCol()
: SfxPoolItem( RES_COL ),
- eLineStyle( NO_STYLE ),
+ eLineStyle( editeng::NO_STYLE ),
nLineWidth(0),
nLineHeight( 100 ),
eAdj( COLADJ_NONE ),
@@ -1112,10 +1112,10 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
switch ( pSwColums->GetSepLineStyle() )
{
default:
- case 0: eLineStyle = NO_STYLE; break;
- case 1: eLineStyle = SOLID; break;
- case 2: eLineStyle = DOTTED; break;
- case 3: eLineStyle = DASHED; break;
+ case 0: eLineStyle = editeng::NO_STYLE; break;
+ case 1: eLineStyle = editeng::SOLID; break;
+ case 2: eLineStyle = editeng::DOTTED; break;
+ case 3: eLineStyle = editeng::DASHED; break;
}
if(!pSwColums->GetSepLineIsOn())
eAdj = COLADJ_NONE;
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 8929bd4..2bbdde1 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2052,7 +2052,7 @@ void SwBorderAttrs::_IsLine()
|* sind identisch.
|*
|*************************************************************************/
-inline int CmpLines( const SvxBorderLine *pL1, const SvxBorderLine *pL2 )
+inline int CmpLines( const editeng::SvxBorderLine *pL1, const editeng::SvxBorderLine *pL2 )
{
return ( ((pL1 && pL2) && (*pL1 == *pL2)) || (!pL1 && !pL2) );
}
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index c0d7785..6eda0e1 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -364,7 +364,7 @@ SwPageFtnInfo::SwPageFtnInfo() :
nMaxHeight( 0 ),
// aPen( PEN_SOLID ),
nLineWidth(10),
- eLineStyle( SOLID ),
+ eLineStyle( editeng::SOLID ),
aWidth( 25, 100 ),
nTopDist( 57 ), //1mm
nBottomDist( 57 )
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index de77109..f1b175b 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -106,6 +106,7 @@
#include <svx/unoapi.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
+using namespace ::editeng;
using namespace ::com::sun::star;
#define GETOBJSHELL() ((SfxObjectShell*)rSh.GetDoc()->GetDocShell())
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 2b9becd..4cdf7a3 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -2400,9 +2400,9 @@ SwXTextColumns::SwXTextColumns(const SwFmtCol& rFmtCol) :
sal_Int8 nStyle = API_COL_LINE_NONE;
switch (rFmtCol.GetLineStyle())
{
- case SOLID: nStyle = API_COL_LINE_SOLID; break;
- case DOTTED: nStyle = API_COL_LINE_DOTTED; break;
- case DASHED: nStyle = API_COL_LINE_DASHED; break;
+ case editeng::SOLID: nStyle = API_COL_LINE_SOLID; break;
+ case editeng::DOTTED: nStyle = API_COL_LINE_DOTTED; break;
+ case editeng::DASHED: nStyle = API_COL_LINE_DASHED; break;
default: break;
}
nSepLineStyle = nStyle;
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index a179ce7..64034bb 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -108,6 +108,7 @@
using namespace ::com::sun::star;
using ::rtl::OUString;
+using ::editeng::SvxBorderLine;
// from swtable.cxx
extern void lcl_GetTblBoxColStr( sal_uInt16 nCol, String& rNm );
@@ -139,11 +140,11 @@ sal_Bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLi
if ( rLine2.LineWidth > 0 )
{
- rSvxLine.SetStyle( SvxBorderStyle( rLine2.LineStyle ) );
+ rSvxLine.SetStyle( editeng::SvxBorderStyle( rLine2.LineStyle ) );
rSvxLine.SetWidth( MM100_TO_TWIP_UNSIGNED( rLine2.LineWidth ) );
}
else
- rSvxLine.GuessLinesWidths( SvxBorderStyle( rLine2.LineStyle ),
+ rSvxLine.GuessLinesWidths( editeng::SvxBorderStyle( rLine2.LineStyle ),
MM100_TO_TWIP( rLine.OuterLineWidth ),
MM100_TO_TWIP( rLine.InnerLineWidth ),
MM100_TO_TWIP( rLine.LineDistance ) );
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 7d0b8a8..f584b04 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -547,7 +547,7 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor,
sal_uInt16 nLine = BOX_LINE_LEFT;
for( int i = 0; i < 2; ++i )
{
- const SvxBorderLine* pLn = rBoxItem.GetLine( nLine );
+ const editeng::SvxBorderLine* pLn = rBoxItem.GetLine( nLine );
if( pLn )
{
sal_uInt16 nWidthTmp = pLn->GetOutWidth() + pLn->GetInWidth();
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 87e6ae4..aa209e2 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -101,6 +101,8 @@
#include <IDocumentStylePoolAccess.hxx>
#include <numrule.hxx>
+using ::editeng::SvxBorderLine;
+
/*
* um nicht immer wieder nach einem Update festzustellen, das irgendwelche
* Hint-Ids dazugekommen sind, wird hier definiert, die Groesse der Tabelle
@@ -3564,34 +3566,34 @@ static void OutCSS1_SvxBorderLine( SwHTMLWriter& rHTMLWrt,
sOut += ' ';
switch ( pLine->GetStyle( ) )
{
- case SOLID:
+ case ::editeng::SOLID:
sOut += sCSS1_PV_solid;
break;
- case DOTTED:
+ case ::editeng::DOTTED:
sOut += sCSS1_PV_dotted;
break;
- case DASHED:
+ case ::editeng::DASHED:
sOut += sCSS1_PV_dashed;
break;
- case DOUBLE:
- case THINTHICK_SMALLGAP:
- case THINTHICK_MEDIUMGAP:
- case THINTHICK_LARGEGAP:
- case THICKTHIN_SMALLGAP:
- case THICKTHIN_MEDIUMGAP:
- case THICKTHIN_LARGEGAP:
+ case ::editeng::DOUBLE:
+ case ::editeng::THINTHICK_SMALLGAP:
+ case ::editeng::THINTHICK_MEDIUMGAP:
+ case ::editeng::THINTHICK_LARGEGAP:
+ case ::editeng::THICKTHIN_SMALLGAP:
+ case ::editeng::THICKTHIN_MEDIUMGAP:
+ case ::editeng::THICKTHIN_LARGEGAP:
sOut += sCSS1_PV_double;
break;
- case EMBOSSED:
+ case ::editeng::EMBOSSED:
sOut += sCSS1_PV_ridge;
break;
- case ENGRAVED:
+ case ::editeng::ENGRAVED:
sOut += sCSS1_PV_groove;
break;
- case INSET:
+ case ::editeng::INSET:
sOut += sCSS1_PV_inset;
break;
- case OUTSET:
+ case ::editeng::OUTSET:
sOut += sCSS1_PV_outset;
break;
default:
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index e1855a5..4b1ce0e 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -2245,7 +2245,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
if( SFX_ITEM_SET == pItemSet->GetItemState( RES_BOX, sal_False, &pItem ))
{
const SvxBoxItem* pBoxItem = (const SvxBoxItem*)pItem;
- const SvxBorderLine* pBorderLine = pBoxItem->GetBottom();
+ const editeng::SvxBorderLine* pBorderLine = pBoxItem->GetBottom();
if( pBorderLine )
{
sal_uInt16 nWidth = pBorderLine->GetOutWidth() +
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 727993c..a6bd6c3 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -1073,8 +1073,8 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
Size aTwipBorder( 0, 0 );
const SvxBoxItem* pBoxItem = (const SvxBoxItem*)pItem;
- const SvxBorderLine *pColBorderLine = 0;
- const SvxBorderLine *pBorderLine = pBoxItem->GetLeft();
+ const ::editeng::SvxBorderLine *pColBorderLine = 0;
+ const ::editeng::SvxBorderLine *pBorderLine = pBoxItem->GetLeft();
if( pBorderLine )
{
pColBorderLine = pBorderLine;
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 9144443..10935a2 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -488,8 +488,8 @@ IMAGE_SETEVENT:
nVBorderWidth = (long)nBorder;
SvxCSS1Parser::PixelToTwip( nVBorderWidth, nHBorderWidth );
- SvxBorderLine aHBorderLine( NULL, nHBorderWidth );
- SvxBorderLine aVBorderLine( NULL, nVBorderWidth );
+ ::editeng::SvxBorderLine aHBorderLine( NULL, nHBorderWidth );
+ ::editeng::SvxBorderLine aVBorderLine( NULL, nVBorderWidth );
if( aAttrTab.pINetFmt )
{
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index d83c862..cffc633 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -74,6 +74,7 @@
//#define FIX56334
+using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
@@ -1052,7 +1053,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
}
if ( pOptions->nCellSpacing != 0 )
- aTopBorderLine.SetStyle( DOUBLE );
+ aTopBorderLine.SetStyle( ::editeng::DOUBLE );
aTopBorderLine.SetWidth( nPHeight );
aTopBorderLine.SetColor( rBorderColor );
aBottomBorderLine = aTopBorderLine;
@@ -1064,7 +1065,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
else
{
if ( pOptions->nCellSpacing != 0 )
- aLeftBorderLine.SetStyle( DOUBLE );
+ aLeftBorderLine.SetStyle( ::editeng::DOUBLE );
aLeftBorderLine.SetWidth( nPWidth );
aLeftBorderLine.SetColor( rBorderColor );
}
@@ -1072,7 +1073,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
if( pOptions->nCellSpacing != 0 )
{
- aBorderLine.SetStyle( DOUBLE );
+ aBorderLine.SetStyle( ::editeng::DOUBLE );
aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
}
else
@@ -1516,7 +1517,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
sal_uInt16 nBorderWidth = aBorderLine.GetOutWidth();
nBorderWidth *= (nEmptyRows + 1);
- aThickBorderLine.SetStyle( SOLID );
+ aThickBorderLine.SetStyle( ::editeng::SOLID );
aThickBorderLine.SetWidth( nBorderWidth );
aBoxItem.SetLine( &aThickBorderLine, BOX_LINE_BOTTOM );
}
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 6c097aa..e1c7567 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -325,37 +325,37 @@ void SvxCSS1BorderInfo::SetBorderLine( sal_uInt16 nLine, SvxBoxItem &rBoxItem )
return;
}
- SvxBorderLine aBorderLine( &aColor );
+ ::editeng::SvxBorderLine aBorderLine( &aColor );
// Linien-Stil doppelt oder einfach?
switch ( eStyle )
{
case CSS1_BS_SINGLE:
- aBorderLine.SetStyle( SOLID );
+ aBorderLine.SetStyle( ::editeng::SOLID );
break;
case CSS1_BS_DOUBLE:
- aBorderLine.SetStyle( DOUBLE );
+ aBorderLine.SetStyle( ::editeng::DOUBLE );
break;
case CSS1_BS_DOTTED:
- aBorderLine.SetStyle( DOTTED );
+ aBorderLine.SetStyle( ::editeng::DOTTED );
break;
case CSS1_BS_DASHED:
- aBorderLine.SetStyle( DASHED );
+ aBorderLine.SetStyle( ::editeng::DASHED );
break;
case CSS1_BS_GROOVE:
- aBorderLine.SetStyle( ENGRAVED );
+ aBorderLine.SetStyle( ::editeng::ENGRAVED );
break;
case CSS1_BS_RIDGE:
- aBorderLine.SetStyle( EMBOSSED );
+ aBorderLine.SetStyle( ::editeng::EMBOSSED );
break;
case CSS1_BS_INSET:
- aBorderLine.SetStyle( INSET );
+ aBorderLine.SetStyle( ::editeng::INSET );
break;
case CSS1_BS_OUTSET:
- aBorderLine.SetStyle( OUTSET );
+ aBorderLine.SetStyle( ::editeng::OUTSET );
break;
default:
- aBorderLine.SetStyle( NO_STYLE );
+ aBorderLine.SetStyle( ::editeng::NO_STYLE );
break;
}
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index c7559f4..95d682d 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -104,7 +104,7 @@ struct CSS1PropertyEnum
/* */
-class SvxBorderLine;
+namespace editeng { class SvxBorderLine; }
SV_DECL_PTRARR_DEL( CSS1Selectors, CSS1Selector*, 1, 1 )
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 7eb78ca..4f7f945 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -131,6 +131,7 @@
#define TOOLS_CONSTASCII_STRINGPARAM( constAsciiStr ) constAsciiStr, sizeof( constAsciiStr )-1
#endif
+using editeng::SvxBorderLine;
using namespace ::com::sun::star;
// <P ALIGN=xxx>, <Hn ALIGN=xxx>, <TD ALIGN=xxx> usw.
@@ -5247,7 +5248,7 @@ void SwHTMLParser::InsertHorzRule()
long nPHeight = (long)nSize;
SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight );
if ( !bNoShade )
- aBorderLine.SetStyle( DOUBLE );
+ aBorderLine.SetStyle( ::editeng::DOUBLE );
aBorderLine.SetWidth( nPHeight );
}
else if( bNoShade )
@@ -5256,7 +5257,7 @@ void SwHTMLParser::InsertHorzRule()
}
else
{
- aBorderLine.SetStyle( DOUBLE );
+ aBorderLine.SetStyle( ::editeng::DOUBLE );
aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
}
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 762e713..4d7eb4c 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -41,7 +41,8 @@ class SwTableLines;
class SwTable;
class SwHTMLTableLayout;
class SvxBrushItem;
-class SvxBorderLine;
+
+namespace editeng { class SvxBorderLine; }
//---------------------------------------------------------------------------
// Code aus dem HTML-Filter fuers schreiben von Tabellen
@@ -287,7 +288,7 @@ protected:
sal_uInt16 nDepth,
sal_uInt16 nNumOfHeaderRows );
- void MergeBorders( const SvxBorderLine* pBorderLine, sal_Bool bTable );
+ void MergeBorders( const editeng::SvxBorderLine* pBorderLine, sal_Bool bTable );
sal_uInt16 MergeBoxBorders( const SwTableBox *pBox, sal_uInt16 nRow, sal_uInt16 nCol,
sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index 7fb6010..6cdc136 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -41,6 +41,7 @@
#include <frmatr.hxx>
#include <htmltbl.hxx>
+using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
SV_IMPL_PTRARR( SwWriteTableCells, SwWriteTableCellPtr )
diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx
index 9a826e5..4bb72a6 100644
--- a/sw/source/filter/ww1/w1class.hxx
+++ b/sw/source/filter/ww1/w1class.hxx
@@ -39,8 +39,9 @@
using std::ostream;
+namespace editeng { class SvxBorderLine; }
+
class SvxFontItem;
-class SvxBorderLine;
class SvxBoxItem;
class SvStream;
class SwField;
@@ -534,7 +535,7 @@ public:
}
void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
// SetBorder() wird auch fuer Tabellen gebraucht, deshalb public
- static SvxBorderLine* SetBorder(SvxBorderLine*, W1_BRC10*);
+ static editeng::SvxBorderLine* SetBorder(editeng::SvxBorderLine*, W1_BRC10*);
};
#define BRC_TOP ((sal_uInt16)0)
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index 780b5bb..f367771 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -59,6 +59,7 @@
#include <swerror.h>
#include <statstr.hrc>
+using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
/////////////////////////////////////////////////////////////// Ww1Sprm
@@ -207,7 +208,7 @@ STOP1(Ww1SingleSprmPPageBreakBefore, RES_BREAK)
SvxBorderLine* Ww1SingleSprmPBrc::SetBorder(SvxBorderLine* pLine, W1_BRC10* pBrc)
{
sal_uInt16 nCode;
- SvxBorderStyle eStyle = SOLID;
+ ::editeng::SvxBorderStyle eStyle = ::editeng::SOLID;
if(pBrc->dxpLine2WidthGet() == 0)
{
switch(pBrc->dxpLine1WidthGet())
@@ -221,11 +222,11 @@ SvxBorderLine* Ww1SingleSprmPBrc::SetBorder(SvxBorderLine* pLine, W1_BRC10* pBrc
case 5: nCode = DEF_LINE_WIDTH_4; break;
case 6:
nCode = DEF_LINE_WIDTH_5;
- eStyle = DOTTED;
+ eStyle = ::editeng::DOTTED;
break;
case 7:
nCode = DEF_LINE_WIDTH_5;
- eStyle = DASHED;
+ eStyle = ::editeng::DASHED;
break;
}
pLine->SetWidth( nCode );
@@ -235,7 +236,7 @@ SvxBorderLine* Ww1SingleSprmPBrc::SetBorder(SvxBorderLine* pLine, W1_BRC10* pBrc
{
if ( pBrc->dxpLine1WidthGet() == 1 && pBrc->dxpLine2WidthGet() == 1 )
{
- pLine->SetStyle( DOUBLE );
+ pLine->SetStyle( ::editeng::DOUBLE );
pLine->SetWidth( DEF_LINE_WIDTH_0 );
}
else
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 671086c..5192c45 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -141,6 +141,7 @@
#include <stdio.h>
#endif
+using ::editeng::SvxBorderLine;
using rtl::OString;
using rtl::OStringBuffer;
using rtl::OUString;
@@ -1368,49 +1369,49 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co
{
switch ( pBorderLine->GetStyle( ) )
{
- case SOLID:
+ case ::editeng::SOLID:
pVal = ( sal_Char* )"single";
break;
- case DOTTED:
+ case ::editeng::DOTTED:
pVal = ( sal_Char* )"dotted";
break;
- case DASHED:
+ case ::editeng::DASHED:
pVal = ( sal_Char* )"dashed";
break;
- case DOUBLE:
+ case ::editeng::DOUBLE:
pVal = ( sal_Char* )"double";
break;
- case THINTHICK_SMALLGAP:
+ case ::editeng::THINTHICK_SMALLGAP:
pVal = ( sal_Char* )"thinThickSmallGap";
break;
- case THINTHICK_MEDIUMGAP:
+ case ::editeng::THINTHICK_MEDIUMGAP:
pVal = ( sal_Char* )"thinThickMediumGap";
break;
- case THINTHICK_LARGEGAP:
+ case ::editeng::THINTHICK_LARGEGAP:
pVal = ( sal_Char* )"thinThickLargeGap";
break;
- case THICKTHIN_SMALLGAP:
+ case ::editeng::THICKTHIN_SMALLGAP:
pVal = ( sal_Char* )"thickThinSmallGap";
break;
- case THICKTHIN_MEDIUMGAP:
+ case ::editeng::THICKTHIN_MEDIUMGAP:
pVal = ( sal_Char* )"thickThinMediumGap";
break;
- case THICKTHIN_LARGEGAP:
+ case ::editeng::THICKTHIN_LARGEGAP:
pVal = ( sal_Char* )"thickThinLargeGap";
break;
- case EMBOSSED:
+ case ::editeng::EMBOSSED:
pVal = ( sal_Char* )"threeDEmboss";
break;
- case ENGRAVED:
+ case ::editeng::ENGRAVED:
pVal = ( sal_Char* )"threeDEngrave";
break;
- case OUTSET:
+ case ::editeng::OUTSET:
pVal = ( sal_Char* )"outset";
break;
- case INSET:
+ case ::editeng::INSET:
pVal = ( sal_Char* )"inset";
break;
- case NO_STYLE:
+ case ::editeng::NO_STYLE:
default:
break;
}
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index c486ef8..c08c704 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -140,6 +140,7 @@
#include <osl/diagnose.h>
+using ::editeng::SvxBorderLine;
using rtl::OString;
using rtl::OStringBuffer;
using rtl::OUString;
@@ -160,7 +161,7 @@ static OString OutTBLBorderLine(RtfExport &rExport, const SvxBorderLine* pLine,
// single line
switch ( pLine->GetStyle( ) )
{
- case SOLID:
+ case ::editeng::SOLID:
{
if( DEF_LINE_WIDTH_0 == pLine->GetWidth() )
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRHAIR);
@@ -168,46 +169,46 @@ static OString OutTBLBorderLine(RtfExport &rExport, const SvxBorderLine* pLine,
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRS);
}
break;
- case DOTTED:
+ case ::editeng::DOTTED:
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDOT);
break;
- case DASHED:
+ case ::editeng::DASHED:
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDASH);
break;
- case DOUBLE:
+ case ::editeng::DOUBLE:
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDB);
break;
- case THINTHICK_SMALLGAP:
+ case ::editeng::THINTHICK_SMALLGAP:
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTNTHSG);
break;
- case THINTHICK_MEDIUMGAP:
+ case ::editeng::THINTHICK_MEDIUMGAP:
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTNTHMG);
break;
- case THINTHICK_LARGEGAP:
+ case ::editeng::THINTHICK_LARGEGAP:
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTNTHLG);
break;
- case THICKTHIN_SMALLGAP:
+ case ::editeng::THICKTHIN_SMALLGAP:
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTHTNSG);
break;
- case THICKTHIN_MEDIUMGAP:
+ case ::editeng::THICKTHIN_MEDIUMGAP:
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTHTNMG);
break;
- case THICKTHIN_LARGEGAP:
+ case ::editeng::THICKTHIN_LARGEGAP:
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRTHTNLG);
break;
- case EMBOSSED:
+ case ::editeng::EMBOSSED:
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDREMBOSS);
break;
- case ENGRAVED:
+ case ::editeng::ENGRAVED:
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRENGRAVE);
break;
- case OUTSET:
+ case ::editeng::OUTSET:
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDROUTSET);
break;
- case INSET:
+ case ::editeng::INSET:
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRINSET);
break;
- case NO_STYLE:
+ case ::editeng::NO_STYLE:
default:
aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRNONE);
break;
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 471316b..511b4b1 100755
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -85,6 +85,7 @@
#include <svtools/rtfkeywd.hxx>
#include <unotools/configmgr.hxx>
+using ::editeng::SvxBorderLine;
using namespace ::comphelper;
using namespace ::com::sun::star;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 3d5c710..7d1248a 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -102,6 +102,7 @@
#include <ndtxt.hxx>
#include "WW8FFData.hxx"
+using ::editeng::SvxBorderLine;
using namespace com::sun::star;
using namespace sw::util;
using namespace sw::types;
@@ -1682,13 +1683,13 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt,
MSO_LineDashing eDashing = mso_lineSolid;
switch ( pLine->GetStyle( ) )
{
- case DASHED:
+ case ::editeng::DASHED:
eDashing = mso_lineDashGEL;
break;
- case DOTTED:
+ case ::editeng::DOTTED:
eDashing = mso_lineDotGEL;
break;
- case SOLID:
+ case ::editeng::SOLID:
default:
break;
}
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 591906c..a6e8ae6 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -59,6 +59,8 @@ namespace msfilter
class MSCodec_Std97;
}
+namespace editeng { class SvxBorderLine; }
+
class AttributeOutputBase;
class DocxAttributeOutput;
class RtfAttributeOutput;
@@ -70,7 +72,6 @@ class MSWordExportBase;
class SdrObject;
class SfxItemSet;
class SvStream;
-class SvxBorderLine;
class SvxFontItem;
class SvxBoxItem;
class SwAttrSet;
@@ -958,7 +959,7 @@ private:
static void BuildAnlvBase( WW8_ANLV& rAnlv, sal_uInt8*& rpCh, sal_uInt16& rCharLen,
const SwNumRule& rRul, const SwNumFmt& rFmt, sal_uInt8 nSwLevel );
- void Out_BorderLine(WW8Bytes& rO, const SvxBorderLine* pLine,
+ void Out_BorderLine(WW8Bytes& rO, const ::editeng::SvxBorderLine* pLine,
sal_uInt16 nDist, sal_uInt16 nSprmNo, bool bShadow);
/// Output the numbering table.
@@ -1058,7 +1059,7 @@ public:
void Out_SwFmtTableBox( WW8Bytes& rO, const SvxBoxItem * rBox );
sal_uInt8 TransCol( const Color& rCol );
bool TransBrush(const Color& rCol, WW8_SHD& rShd);
- WW8_BRC TranslateBorderLine(const SvxBorderLine& pLine,
+ WW8_BRC TranslateBorderLine(const ::editeng::SvxBorderLine& pLine,
sal_uInt16 nDist, bool bShadow);
// #i77805# - new return value indicates, if an inherited outline numbering is suppressed
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index ec063e0..3f07ea8 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -587,7 +587,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const sw::Frame &rFly,
BOX_LINE_BOTTOM, BOX_LINE_RIGHT };
for( sal_uInt8 i = 0; i < 4; ++i )
{
- const SvxBorderLine* pLn = pBox->GetLine( aLnArr[ i ] );
+ const ::editeng::SvxBorderLine* pLn = pBox->GetLine( aLnArr[ i ] );
WW8_BRC aBrc;
if (pLn)
{
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 55808fe..9a51005 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -135,6 +135,7 @@
#include <vcl/outdev.hxx>
#include <i18npool/mslangid.hxx>
+using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
using namespace nsFieldFlags;
using namespace nsSwDocInfoSubType;
@@ -4048,7 +4049,7 @@ WW8_BRC WW8Export::TranslateBorderLine(const SvxBorderLine& rLine,
// http://msdn.microsoft.com/en-us/library/dd908142%28v=office.12%29.aspx
switch ( rLine.GetStyle( ) )
{
- case SOLID:
+ case ::editeng::SOLID:
{
if ( rLine.GetWidth( ) == DEF_LINE_WIDTH_0 )
brcType = 5;
@@ -4056,43 +4057,43 @@ WW8_BRC WW8Export::TranslateBorderLine(const SvxBorderLine& rLine,
brcType = 1;
}
break;
- case DOTTED:
+ case ::editeng::DOTTED:
brcType = 6;
break;
- case DASHED:
+ case ::editeng::DASHED:
brcType = 7;
break;
- case DOUBLE:
+ case ::editeng::DOUBLE:
brcType = 3;
break;
- case THINTHICK_SMALLGAP:
+ case ::editeng::THINTHICK_SMALLGAP:
brcType = 11;
break;
- case THINTHICK_MEDIUMGAP:
+ case ::editeng::THINTHICK_MEDIUMGAP:
brcType = 14;
break;
- case THINTHICK_LARGEGAP:
+ case ::editeng::THINTHICK_LARGEGAP:
brcType = 17;
break;
- case THICKTHIN_SMALLGAP:
+ case ::editeng::THICKTHIN_SMALLGAP:
brcType = 12;
break;
- case THICKTHIN_MEDIUMGAP:
+ case ::editeng::THICKTHIN_MEDIUMGAP:
brcType = 15;
break;
- case THICKTHIN_LARGEGAP:
+ case ::editeng::THICKTHIN_LARGEGAP:
brcType = 18;
break;
- case EMBOSSED:
+ case ::editeng::EMBOSSED:
brcType = 24;
break;
- case ENGRAVED:
+ case ::editeng::ENGRAVED:
brcType = 25;
break;
- case OUTSET:
+ case ::editeng::OUTSET:
brcType = 26;
break;
- case INSET:
+ case ::editeng::INSET:
brcType = 27;
break;
default:
@@ -4118,9 +4119,9 @@ WW8_BRC WW8Export::TranslateBorderLine(const SvxBorderLine& rLine,
nWidth = ( nWidth + 7 ) / 15;
if( nWidth > 5 )
nWidth = 5;
- if ( DOTTED == rLine.GetStyle( ) )
+ if ( ::editeng::DOTTED == rLine.GetStyle( ) )
nWidth = 6;
- else if ( DASHED == rLine.GetStyle( ) )
+ else if ( ::editeng::DASHED == rLine.GetStyle( ) )
nWidth = 7;
}
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index c791f0a..3ee02ae 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -101,6 +101,7 @@
#include <math.h>
+using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
using namespace sw::types;
using namespace sw::util;
@@ -1478,7 +1479,7 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
if( !rLineThick )
return nOutsideThick;
- SvxBorderStyle nIdx = SOLID;
+ ::editeng::SvxBorderStyle nIdx = ::editeng::SOLID;
sal_Int32 nLineThick=rLineThick;
nOutsideThick = SwMSDffManager::GetEscherLineMatch(eLineStyle,
@@ -1499,21 +1500,21 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
{
// zuerst die Einzel-Linien
case mso_lineSimple:
- nIdx = SOLID;
+ nIdx = ::editeng::SOLID;
break;
// dann die Doppel-Linien, fuer die wir feine Entsprechungen haben :-)))
case mso_lineDouble:
- nIdx = DOUBLE;
+ nIdx = ::editeng::DOUBLE;
break;
case mso_lineThickThin:
- nIdx = THICKTHIN_SMALLGAP;
+ nIdx = ::editeng::THICKTHIN_SMALLGAP;
break;
case mso_lineThinThick:
- nIdx = THINTHICK_SMALLGAP;
+ nIdx = ::editeng::THINTHICK_SMALLGAP;
break;
// We have no triple border, use double instead.
case mso_lineTriple:
- nIdx = DOUBLE;
+ nIdx = ::editeng::DOUBLE;
break;
// no line style is set
case (MSO_LineStyle)USHRT_MAX:
@@ -1527,16 +1528,16 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
switch( eDashing )
{
case mso_lineDashGEL:
- nIdx = DASHED;
+ nIdx = ::editeng::DASHED;
break;
case mso_lineDotGEL:
- nIdx = DOTTED;
+ nIdx = ::editeng::DOTTED;
break;
default:
break;
}
- if (NO_STYLE != nIdx)
+ if (::editeng::NO_STYLE != nIdx)
{
SvxBorderLine aLine;
aLine.SetColor( rLineColor );
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 1b4f69e..d4f7cb2 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3219,7 +3219,7 @@ void WW8TabDesc::AdjustNewBand()
// we have to mimick this in the filter by picking the larger of the
// sides and using that one on one side of the line (right)
SvxBoxItem aCurrentBox(sw::util::ItemGet<SvxBoxItem>(*(pBox->GetFrmFmt()), RES_BOX));
- const SvxBorderLine *pLeftLine = aCurrentBox.GetLine(BOX_LINE_LEFT);
+ const ::editeng::SvxBorderLine *pLeftLine = aCurrentBox.GetLine(BOX_LINE_LEFT);
int nCurrentRightLineWidth = 0;
if(pLeftLine)
nCurrentRightLineWidth = pLeftLine->GetScaledWidth();
@@ -3228,7 +3228,7 @@ void WW8TabDesc::AdjustNewBand()
{
SwTableBox* pBox2 = (*pTabBoxes)[i-1];
SvxBoxItem aOldBox(sw::util::ItemGet<SvxBoxItem>(*(pBox2->GetFrmFmt()), RES_BOX));
- const SvxBorderLine *pRightLine = aOldBox.GetLine(BOX_LINE_RIGHT);
+ const ::editeng::SvxBorderLine *pRightLine = aOldBox.GetLine(BOX_LINE_RIGHT);
int nOldBoxRightLineWidth = 0;
if(pRightLine)
nOldBoxRightLineWidth = pRightLine->GetScaledWidth();
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 4e1ab1f..756f757 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1276,7 +1276,7 @@ sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRC* brc, WW8PLCFx_Cp_FKP* pPap,
void GetLineIndex(SvxBoxItem &rBox, short nLineThickness, short nSpace, sal_uInt8 nCol, short nIdx,
sal_uInt16 nOOIndex, sal_uInt16 nWWIndex, short *pSize=0)
{
- SvxBorderStyle eStyle = SOLID;
+ ::editeng::SvxBorderStyle eStyle = ::editeng::SOLID;
switch (nIdx)
{
// First the single lines
@@ -1287,69 +1287,69 @@ void GetLineIndex(SvxBoxItem &rBox, short nLineThickness, short nSpace, sal_uInt
case 9:
case 20:
case 22:
- eStyle = SOLID;
+ eStyle = ::editeng::SOLID;
break;
case 2:
{
- eStyle = SOLID;
+ eStyle = ::editeng::SOLID;
nLineThickness *= 2;
}
break;
case 6:
- eStyle = DOTTED;
+ eStyle = ::editeng::DOTTED;
break;
case 7:
- eStyle = DASHED;
+ eStyle = ::editeng::DASHED;
break;
// then the shading beams which we represent by a double line
case 23:
- eStyle = DOUBLE;
+ eStyle = ::editeng::DOUBLE;
break;
// then the double lines, for which we have good matches
case 3:
case 10: //Don't have tripple so use double
case 21: //Don't have double wave: use double instead
- eStyle = DOUBLE;
+ eStyle = ::editeng::DOUBLE;
break;
case 11:
- eStyle = THINTHICK_SMALLGAP;
+ eStyle = ::editeng::THINTHICK_SMALLGAP;
break;
case 12:
case 13: //Don't have thin thick thin, so use thick thin
- eStyle = THICKTHIN_SMALLGAP;
+ eStyle = ::editeng::THICKTHIN_SMALLGAP;
break;
case 14:
- eStyle = THINTHICK_MEDIUMGAP;
+ eStyle = ::editeng::THINTHICK_MEDIUMGAP;
break;
case 15:
case 16: //Don't have thin thick thin, so use thick thin
- eStyle = THICKTHIN_MEDIUMGAP;
+ eStyle = ::editeng::THICKTHIN_MEDIUMGAP;
break;
case 17:
- eStyle = THINTHICK_LARGEGAP;
+ eStyle = ::editeng::THINTHICK_LARGEGAP;
break;
case 18:
case 19: //Don't have thin thick thin, so use thick thin
- eStyle = THICKTHIN_LARGEGAP;
+ eStyle = ::editeng::THICKTHIN_LARGEGAP;
break;
case 24:
- eStyle = EMBOSSED;
+ eStyle = ::editeng::EMBOSSED;
break;
case 25:
- eStyle = ENGRAVED;
+ eStyle = ::editeng::ENGRAVED;
break;
case 26:
- eStyle = OUTSET;
+ eStyle = ::editeng::OUTSET;
break;
case 27:
- eStyle = INSET;
+ eStyle = ::editeng::INSET;
break;
default:
- eStyle = SOLID;
+ eStyle = ::editeng::NO_STYLE;
break;
}
- SvxBorderLine aLine;
+ ::editeng::SvxBorderLine aLine;
aLine.SetStyle( eStyle );
aLine.SetWidth( nLineThickness );
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index d80e6d2..76fc0d4 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -68,6 +68,7 @@
#include "fmtrowsplt.hxx"
+using ::editeng::SvxBorderLine;
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
using namespace ::com::sun::star;
@@ -374,13 +375,13 @@ bool lcl_isOdfDoubleLine( const SvxBorderLine* pLine )
bool bIsOdfDouble = false;
switch ( pLine->GetStyle() )
{
- case DOUBLE:
- case THINTHICK_SMALLGAP:
- case THINTHICK_MEDIUMGAP:
- case THINTHICK_LARGEGAP:
- case THICKTHIN_SMALLGAP:
- case THICKTHIN_MEDIUMGAP:
- case THICKTHIN_LARGEGAP:
+ case ::editeng::DOUBLE:
+ case ::editeng::THINTHICK_SMALLGAP:
+ case ::editeng::THINTHICK_MEDIUMGAP:
+ case ::editeng::THINTHICK_LARGEGAP:
+ case ::editeng::THICKTHIN_SMALLGAP:
+ case ::editeng::THICKTHIN_MEDIUMGAP:
+ case ::editeng::THICKTHIN_LARGEGAP:
bIsOdfDouble = true;
break;
default:
@@ -720,34 +721,34 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue(
bool bNoBorder = false;
switch ( pLine->GetStyle( ) )
{
- case SOLID:
+ case ::editeng::SOLID:
eStyle = XML_SOLID;
break;
- case DOTTED:
+ case ::editeng::DOTTED:
eStyle = XML_DOTTED;
break;
- case DASHED:
+ case ::editeng::DASHED:
eStyle = XML_DASHED;
break;
- case DOUBLE:
- case THINTHICK_SMALLGAP:
- case THINTHICK_MEDIUMGAP:
- case THINTHICK_LARGEGAP:
- case THICKTHIN_SMALLGAP:
- case THICKTHIN_MEDIUMGAP:
- case THICKTHIN_LARGEGAP:
+ case ::editeng::DOUBLE:
+ case ::editeng::THINTHICK_SMALLGAP:
+ case ::editeng::THINTHICK_MEDIUMGAP:
+ case ::editeng::THINTHICK_LARGEGAP:
+ case ::editeng::THICKTHIN_SMALLGAP:
+ case ::editeng::THICKTHIN_MEDIUMGAP:
+ case ::editeng::THICKTHIN_LARGEGAP:
eStyle = XML_DOUBLE;
break;
- case EMBOSSED:
+ case ::editeng::EMBOSSED:
eStyle = XML_RIDGE;
break;
- case ENGRAVED:
+ case ::editeng::ENGRAVED:
eStyle = XML_GROOVE;
break;
- case INSET:
+ case ::editeng::INSET:
eStyle = XML_INSET;
break;
- case OUTSET:
+ case ::editeng::OUTSET:
eStyle = XML_OUTSET;
break;
default:
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index 72f2e8d..2c635c0 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -60,6 +60,7 @@
#include "xmlithlp.hxx"
#include <com/sun/star/uno/Any.hxx>
+using ::editeng::SvxBorderLine;
using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index f3795e9..6a50937 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -46,6 +46,7 @@
#include "fmtlsplt.hxx"
#include <xmloff/xmluconv.hxx>
+using ::editeng::SvxBorderLine;
using ::rtl::OUString;
using namespace ::xmloff::token;
using namespace ::com::sun::star;
@@ -153,9 +154,9 @@ sal_Bool lcl_frmitems_parseXMLBorder( const OUString& rValue,
void lcl_frmitems_setXMLBorderStyle( SvxBorderLine& rLine, sal_uInt16 nStyle )
{
- SvxBorderStyle eStyle = NO_STYLE;
+ ::editeng::SvxBorderStyle eStyle = ::editeng::NO_STYLE;
if ( nStyle != API_LINE_NONE )
- eStyle = SvxBorderStyle( nStyle );
+ eStyle = ::editeng::SvxBorderStyle( nStyle );
rLine.SetStyle( eStyle );
}
@@ -201,7 +202,7 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
if( bHasWidth && USHRT_MAX != nNamedWidth )
{
if ( bDouble )
- rpLine->SetStyle( DOUBLE );
+ rpLine->SetStyle( ::editeng::DOUBLE );
rpLine->SetWidth( aBorderWidths[nNamedWidth] );
}
else
@@ -232,7 +233,7 @@ void lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
if( nWidth > 0 )
rpLine->SetWidth( nWidth );
else
- rpLine->GuessLinesWidths( DOUBLE, nOutWidth, nInWidth, nDistance );
+ rpLine->GuessLinesWidths( ::editeng::DOUBLE, nOutWidth, nInWidth, nDistance );
}
const struct SvXMLEnumMapEntry psXML_BrushRepeat[] =
diff --git a/sw/source/filter/xml/xmlithlp.hxx b/sw/source/filter/xml/xmlithlp.hxx
index f897f99..30602c5 100644
--- a/sw/source/filter/xml/xmlithlp.hxx
+++ b/sw/source/filter/xml/xmlithlp.hxx
@@ -34,7 +34,8 @@
#include "hintids.hxx" // for following include
#include <editeng/brshitem.hxx> // for SvxGraphicsPosition
-class SvxBorderLine;
+namespace editeng { class SvxBorderLine; }
+
struct SvXMLEnumMapEntry;
class SvXMLUnitConverter;
class Color;
@@ -62,20 +63,20 @@ sal_Bool lcl_frmitems_parseXMLBorder( const ::rtl::OUString& rValue,
sal_uInt16& rNamedWidth,
sal_Bool& rHasColor, Color& rColor );
-void lcl_frmitems_setXMLBorderWidth( SvxBorderLine& rLine,
+void lcl_frmitems_setXMLBorderWidth( editeng::SvxBorderLine& rLine,
sal_uInt16 nOutWidth, sal_uInt16 nInWidth,
sal_uInt16 nDistance );
-void lcl_frmitems_setXMLBorderWidth( SvxBorderLine& rLine,
+void lcl_frmitems_setXMLBorderWidth( editeng::SvxBorderLine& rLine,
sal_uInt16 nWidth, sal_Bool bDouble );
-sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
+sal_Bool lcl_frmitems_setXMLBorder( editeng::SvxBorderLine*& rpLine,
sal_Bool bHasStyle, sal_uInt16 nStyle,
sal_Bool bHasWidth, sal_uInt16 nWidth,
sal_uInt16 nNamedWidth,
sal_Bool bHasColor, const Color& rColor );
-void lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
+void lcl_frmitems_setXMLBorder( editeng::SvxBorderLine*& rpLine,
sal_uInt16 nWidth, sal_uInt16 nOutWidth,
sal_uInt16 nInWidth, sal_uInt16 nDistance );
diff --git a/sw/source/ui/frmdlg/colmgr.cxx b/sw/source/ui/frmdlg/colmgr.cxx
index a0209ca..255ac45 100644
--- a/sw/source/ui/frmdlg/colmgr.cxx
+++ b/sw/source/ui/frmdlg/colmgr.cxx
@@ -155,7 +155,7 @@ SwColMgr::~SwColMgr()
{
}
-void SwColMgr::SetLineWidthAndColor(SvxBorderStyle eStyle, sal_uLong nLWidth, const Color& rCol)
+void SwColMgr::SetLineWidthAndColor(::editeng::SvxBorderStyle eStyle, sal_uLong nLWidth, const Color& rCol)
{
aFmtCol.SetLineStyle(eStyle);
aFmtCol.SetLineWidth(nLWidth);
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index a73e8e8..e48c0a3 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -536,9 +536,9 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
// Fill the line styles listbox
aLineTypeDLB.SetNone( SVX_RESSTR( RID_SVXSTR_NONE ) );
- aLineTypeDLB.InsertEntry( SvxBorderLine::getWidthImpl( SOLID ), SOLID );
- aLineTypeDLB.InsertEntry( SvxBorderLine::getWidthImpl( DOTTED ), DOTTED );
- aLineTypeDLB.InsertEntry( SvxBorderLine::getWidthImpl( DASHED ), DASHED );
+ aLineTypeDLB.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::SOLID ), ::editeng::SOLID );
+ aLineTypeDLB.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::DOTTED ), ::editeng::DOTTED );
+ aLineTypeDLB.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::DASHED ), ::editeng::DASHED );
long nLineWidth = MetricField::ConvertDoubleValue(
aLineWidthEdit.GetValue( ),
@@ -741,7 +741,7 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
else if( LISTBOX_ENTRY_NOTFOUND != nPos )
{
pColMgr->SetLineWidthAndColor(
- SvxBorderStyle( aLineTypeDLB.GetSelectEntryStyle( ) ),
+ ::editeng::SvxBorderStyle( aLineTypeDLB.GetSelectEntryStyle( ) ),
nLineWidth,
aLineColorDLB.GetSelectEntryColor() );
pColMgr->SetAdjust( SwColLineAdj(
diff --git a/sw/source/ui/inc/colmgr.hxx b/sw/source/ui/inc/colmgr.hxx
index bb1358c..3712aa1 100644
--- a/sw/source/ui/inc/colmgr.hxx
+++ b/sw/source/ui/inc/colmgr.hxx
@@ -56,8 +56,8 @@ public:
inline sal_Bool HasLine() const;
inline void SetNoLine();
- void SetLineWidthAndColor(SvxBorderStyle eStyle, sal_uLong nWidth, const Color& rCol);
- inline SvxBorderStyle GetLineStyle() const;
+ void SetLineWidthAndColor(::editeng::SvxBorderStyle eStyle, sal_uLong nWidth, const Color& rCol);
+ inline ::editeng::SvxBorderStyle GetLineStyle() const;
inline sal_uLong GetLineWidth() const;
inline const Color& GetLineColor() const;
@@ -88,7 +88,7 @@ inline sal_uInt16 SwColMgr::GetCount() const
return aFmtCol.GetNumCols();
}
-inline SvxBorderStyle SwColMgr::GetLineStyle() const
+inline ::editeng::SvxBorderStyle SwColMgr::GetLineStyle() const
{
return aFmtCol.GetLineStyle();
}
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 80163c6..5360988 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -225,9 +225,9 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet)
aLineTypeBox.SetSourceUnit( FUNIT_TWIP );
aLineTypeBox.SetNone( String( SW_RES( STR_NONE ) ) );
- aLineTypeBox.InsertEntry( SvxBorderLine::getWidthImpl( SOLID ), SOLID );
- aLineTypeBox.InsertEntry( SvxBorderLine::getWidthImpl( DOTTED ), DOTTED );
- aLineTypeBox.InsertEntry( SvxBorderLine::getWidthImpl( DASHED ), DASHED );
+ aLineTypeBox.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::SOLID ), ::editeng::SOLID );
+ aLineTypeBox.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::DOTTED ), ::editeng::DOTTED );
+ aLineTypeBox.InsertEntry( ::editeng::SvxBorderLine::getWidthImpl( ::editeng::DASHED ), ::editeng::DASHED );
aLineTypeBox.SetWidth( pFtnInfo->GetLineWidth( ) );
aLineTypeBox.SelectEntry( pFtnInfo->GetLineStyle() );
@@ -310,7 +310,7 @@ sal_Bool SwFootNotePage::FillItemSet(SfxItemSet &rSet)
aLineDistEdit.Denormalize(aLineDistEdit.GetValue(FUNIT_TWIP))));
// Separator style
- rFtnInfo.SetLineStyle( SvxBorderStyle( aLineTypeBox.GetSelectEntryStyle() ) );
+ rFtnInfo.SetLineStyle( ::editeng::SvxBorderStyle( aLineTypeBox.GetSelectEntryStyle() ) );
// Separator width
long nWidth = MetricField::ConvertDoubleValue(
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index a2b1f59..73ab13c 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -97,6 +97,7 @@
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/uno/Any.h>
+using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1105,7 +1106,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
if(aBorderLine.GetOutWidth() == 0)
{
- aBorderLine.SetStyle( SOLID );
+ aBorderLine.SetStyle( ::editeng::SOLID );
aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
}
//Distance nur setzen, wenn der Request vom Controller kommt
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 058c56a..8c0759a 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -109,6 +109,7 @@
#include "swabstdlg.hxx"
#include <table.hrc>
+using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
SFX_IMPL_INTERFACE(SwTableShell, SwBaseShell, SW_RES(STR_SHELLNAME_TABLE))
@@ -543,7 +544,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
if(aBorderLine.GetOutWidth() == 0)
{
- aBorderLine.SetStyle( SOLID );
+ aBorderLine.SetStyle( ::editeng::SOLID );
aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
}
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index bf7fb8d..96cc207 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -920,7 +920,7 @@ void AutoFmtPreview::CalcCellArray( sal_Bool _bFitWidth )
//------------------------------------------------------------------------
-inline void lclSetStyleFromBorder( svx::frame::Style& rStyle, const SvxBorderLine* pBorder )
+inline void lclSetStyleFromBorder( svx::frame::Style& rStyle, const ::editeng::SvxBorderLine* pBorder )
{
rStyle.Set( pBorder, 0.05, 5 );
}
diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx
index 3a1cd8f..51b698e 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 );
More information about the Libreoffice-commits
mailing list