From 4559e4b900724d2f47094e5a890b48b9eaad2f03 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 20 Oct 2015 09:23:12 +0200 Subject: [PATCH] sw: avoid 'using namespace' in headers Change-Id: I51fe244a7296feba7aad08a7bee9e7ec961bcadd --- sw/source/filter/ww8/attributeoutputbase.hxx | 4 +--- sw/source/filter/ww8/docxattributeoutput.hxx | 2 +- sw/source/filter/ww8/ww8attributeoutput.hxx | 2 +- sw/source/filter/ww8/ww8par.hxx | 6 ++---- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx index fd36534a9a80..506717dddc30 100644 --- a/sw/source/filter/ww8/attributeoutputbase.hxx +++ b/sw/source/filter/ww8/attributeoutputbase.hxx @@ -37,8 +37,6 @@ #include -using namespace ::com::sun::star; - class Point; class SvxCaseMapItem; class SvxColorItem; @@ -297,7 +295,7 @@ public: virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) = 0; // preserve page vertical alignment - virtual void TextVerticalAdjustment( const drawing::TextVerticalAdjust) {}; + virtual void TextVerticalAdjustment( const css::drawing::TextVerticalAdjust) {}; /// Start of the section properties. virtual void StartSection() = 0; diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index c2ed3795d4a2..fadc5124880c 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -291,7 +291,7 @@ public: virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) override; // preserve DOCX page vertical alignment - virtual void TextVerticalAdjustment( const drawing::TextVerticalAdjust ) SAL_OVERRIDE; + virtual void TextVerticalAdjustment( const css::drawing::TextVerticalAdjust ) SAL_OVERRIDE; /// Start of the section properties. virtual void StartSection() override; diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index 59f183f639a7..eae91c0bce11 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -148,7 +148,7 @@ public: virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) override; // preserve DOC page vertical alignment - virtual void TextVerticalAdjustment( const drawing::TextVerticalAdjust ) SAL_OVERRIDE; + virtual void TextVerticalAdjustment( const css::drawing::TextVerticalAdjust ) SAL_OVERRIDE; /// Start of the section properties. virtual void StartSection() override; diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 1f6933c1d555..3e855b96a394 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -56,8 +56,6 @@ #include -using namespace ::com::sun::star; - class SwDoc; class SwPaM; class SfxPoolItem; @@ -813,7 +811,7 @@ public: sal_uInt32 nPgLeft; sal_uInt32 nPgRight; - drawing::TextVerticalAdjust mnVerticalAdjustment; + css::drawing::TextVerticalAdjust mnVerticalAdjustment; sal_uInt8 mnBorders; bool mbHasFootnote; void SetDirection(); @@ -900,7 +898,7 @@ public: explicit wwSectionManager(SwWW8ImplReader &rReader) : mrReader(rReader), mnDesc(0) {} void SetCurrentSectionHasFootnote(); - void SetCurrentSectionVerticalAdjustment(const drawing::TextVerticalAdjust nVA); + void SetCurrentSectionVerticalAdjustment(const css::drawing::TextVerticalAdjust nVA); bool CurrentSectionIsVertical() const; bool CurrentSectionIsProtected() const; void PrependedInlineNode(const SwPosition &rPos, const SwNode &rNode);