summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc/viewfunc.hxx
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-25 15:51:46 +0100
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-28 11:19:00 +0200
commit7d34d4b5d23d7c29a22c9e79322dea0dad36096a (patch)
tree8a00958458b29a11aedb73b144dec26de2486697 /sc/source/ui/inc/viewfunc.hxx
parent4618dd39832253ae27d1f94534a9ae7928870129 (diff)
Moved SvxBorder* into editeng namespace to avoid duplicate DOUBLE on windows
Diffstat (limited to 'sc/source/ui/inc/viewfunc.hxx')
-rw-r--r--sc/source/ui/inc/viewfunc.hxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 9306cb8c3ad3..785b730d6945 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -46,7 +46,6 @@ class ScPatternAttr;
class ScAutoFormatData;
class SvxSearchItem;
class SfxItemSet;
-class SvxBorderLine;
class SvxBoxItem;
class SvxBoxInfoItem;
class SfxStyleSheetBase;
@@ -67,6 +66,8 @@ class SvxHyperlinkItem;
class ScTransferObj;
class ScTableProtection;
+namespace editeng { class SvxBorderLine; }
+
namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable; } } } }
//==================================================================
@@ -298,7 +299,7 @@ public:
void InsertDraw();
- void SetSelectionFrameLines( const SvxBorderLine* pLine,
+ void SetSelectionFrameLines( const ::editeng::SvxBorderLine* pLine,
sal_Bool bColorOnly );
void SetNoteText( const ScAddress& rPos, const String& rNoteText );
@@ -345,9 +346,9 @@ public:
// interne Hilfsfunktionen
protected:
- void UpdateLineAttrs( SvxBorderLine& rLine,
- const SvxBorderLine* pDestLine,
- const SvxBorderLine* pSrcLine,
+ void UpdateLineAttrs( ::editeng::SvxBorderLine& rLine,
+ const ::editeng::SvxBorderLine* pDestLine,
+ const ::editeng::SvxBorderLine* pSrcLine,
sal_Bool bColor );