diff options
author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-25 15:51:46 +0100 |
---|---|---|
committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-28 11:19:00 +0200 |
commit | 7d34d4b5d23d7c29a22c9e79322dea0dad36096a (patch) | |
tree | 8a00958458b29a11aedb73b144dec26de2486697 /sc/inc/cellsuno.hxx | |
parent | 4618dd39832253ae27d1f94534a9ae7928870129 (diff) |
Moved SvxBorder* into editeng namespace to avoid duplicate DOUBLE on windows
Diffstat (limited to 'sc/inc/cellsuno.hxx')
-rw-r--r-- | sc/inc/cellsuno.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index 01a2ff592d2e..b1f703f39b9f 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -108,11 +108,12 @@ class ScCellRangeObj; class SvxUnoText; class ScLinkListener; class ScPatternAttr; -class SvxBorderLine; class SvxBoxItem; class SvxBoxInfoItem; class SvxItemPropertySet; +namespace editeng { class SvxBorderLine; } + class ScLinkListener : public SvtListener { Link aLink; @@ -139,9 +140,9 @@ SV_DECL_PTRARR_DEL( ScNamedEntryArr_Impl, ScNamedEntryPtr, 4, 4 ) class ScHelperFunctions { public: - static const SvxBorderLine* GetBorderLine( SvxBorderLine& rLine, const com::sun::star::table::BorderLine& rStruct ); + static const ::editeng::SvxBorderLine* GetBorderLine( ::editeng::SvxBorderLine& rLine, const com::sun::star::table::BorderLine& rStruct ); static void FillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner, const com::sun::star::table::TableBorder& rBorder ); - static void FillBorderLine( com::sun::star::table::BorderLine& rStruct, const SvxBorderLine* pLine ); + static void FillBorderLine( com::sun::star::table::BorderLine& rStruct, const ::editeng::SvxBorderLine* pLine ); static void FillTableBorder( com::sun::star::table::TableBorder& rBorder, const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner ); static void ApplyBorder( ScDocShell* pDocShell, const ScRangeList& rRanges, |