sw, writerfilter: these 'using namespace' statements can be avoided easily

Especially the 'using namespace std' is scary, now that we have
std::shared_ptr and boost::shared_ptr, too.

Change-Id: Ibb584281f1b9d56103ab5984473eb484157c12d5

9 files changed, 37 insertions, 51 deletions

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 182fb8bf74e6..ac8382ee8e17 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -35,7 +35,6 @@
 
 using namespace com::sun::star;
 using namespace oox;
-using namespace sax_fastparser;
 
 namespace
 {
@@ -358,7 +357,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
 
     if (isAnchor)
     {
-        sax_fastparser::FastAttributeList* attrList = FastSerializerHelper::createAttrList();
+        sax_fastparser::FastAttributeList* attrList = sax_fastparser::FastSerializerHelper::createAttrList();
         bool bOpaque = pFrmFmt->GetOpaque().GetValue();
         awt::Point aPos(pFrmFmt->GetHoriOrient().GetPos(), pFrmFmt->GetVertOrient().GetPos());
         const SdrObject* pObj = pFrmFmt->FindRealSdrObject();
@@ -547,7 +546,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
     }
     else
     {
-        sax_fastparser::FastAttributeList* aAttrList = FastSerializerHelper::createAttrList();
+        sax_fastparser::FastAttributeList* aAttrList = sax_fastparser::FastSerializerHelper::createAttrList();
         aAttrList->add(XML_distT, OString::number(TwipsToEMU(pULSpaceItem.GetUpper())).getStr());
         aAttrList->add(XML_distB, OString::number(TwipsToEMU(pULSpaceItem.GetLower())).getStr());
         aAttrList->add(XML_distL, OString::number(TwipsToEMU(pLRSpaceItem.GetLeft())).getStr());
@@ -808,7 +807,7 @@ void DocxSdrExport::writeDMLDrawing(const SdrObject* pSdrObject, const SwFrmFmt*
     Size aSize(pSdrObject->GetLogicRect().GetWidth(), pSdrObject->GetLogicRect().GetHeight());
     startDMLAnchorInline(pFrmFmt, aSize);
 
-    sax_fastparser::FastAttributeList* pDocPrAttrList = FastSerializerHelper::createAttrList();
+    sax_fastparser::FastAttributeList* pDocPrAttrList = sax_fastparser::FastSerializerHelper::createAttrList();
     pDocPrAttrList->add(XML_id, OString::number(nAnchorId).getStr());
     pDocPrAttrList->add(XML_name, OUStringToOString(pSdrObject->GetName(), RTL_TEXTENCODING_UTF8).getStr());
     if (!pSdrObject->GetTitle().isEmpty())
@@ -1145,7 +1144,7 @@ void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrmFmt& rFr
     startDMLAnchorInline(&rFrmFmt, aSize);
 
     // generate an unique id
-    sax_fastparser::FastAttributeList* pDocPrAttrList = FastSerializerHelper::createAttrList();
+    sax_fastparser::FastAttributeList* pDocPrAttrList = sax_fastparser::FastSerializerHelper::createAttrList();
     pDocPrAttrList->add(XML_id, OString::number(nAnchorId).getStr());
     OUString sName = "Diagram" + OUString::number(nAnchorId);
     pDocPrAttrList->add(XML_name, OUStringToOString(sName, RTL_TEXTENCODING_UTF8).getStr());
@@ -1296,7 +1295,7 @@ void DocxSdrExport::writeOnlyTextOfFrame(sw::Frame* pParentFrame)
     //Save data here and restore when out of scope
     ExportDataSaveRestore aDataGuard(m_pImpl->m_rExport, nStt, nEnd, pParentFrame);
 
-    m_pImpl->m_pBodyPrAttrList = FastSerializerHelper::createAttrList();
+    m_pImpl->m_pBodyPrAttrList = sax_fastparser::FastSerializerHelper::createAttrList();
     m_pImpl->m_bFrameBtLr = checkFrameBtlr(m_pImpl->m_rExport.pDoc->GetNodes()[nStt], 0);
     m_pImpl->m_bFlyFrameGraphic = true;
     m_pImpl->m_rExport.WriteText();
@@ -1355,7 +1354,7 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId, bo
     if (xPropertySet.is())
         xPropSetInfo = xPropertySet->getPropertySetInfo();
 
-    m_pImpl->m_pBodyPrAttrList = FastSerializerHelper::createAttrList();
+    m_pImpl->m_pBodyPrAttrList = sax_fastparser::FastSerializerHelper::createAttrList();
     {
         drawing::TextVerticalAdjust eAdjust = drawing::TextVerticalAdjust_TOP;
         if (xPropSetInfo.is() && xPropSetInfo->hasPropertyByName("TextVerticalAdjust"))
@@ -1367,7 +1366,7 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId, bo
     {
         startDMLAnchorInline(&rFrmFmt, aSize);
 
-        sax_fastparser::FastAttributeList* pDocPrAttrList = FastSerializerHelper::createAttrList();
+        sax_fastparser::FastAttributeList* pDocPrAttrList = sax_fastparser::FastSerializerHelper::createAttrList();
         pDocPrAttrList->add(XML_id, OString::number(nAnchorId).getStr());
         pDocPrAttrList->add(XML_name, OUStringToOString(rFrmFmt.GetName(), RTL_TEXTENCODING_UTF8).getStr());
         sax_fastparser::XFastAttributeListRef xDocPrAttrListRef(pDocPrAttrList);
@@ -1584,8 +1583,8 @@ void DocxSdrExport::writeVMLTextFrame(sw::Frame* pParentFrame, bool bTextBoxOnly
     m_pImpl->m_pFlyFrameSize = &aSize;
 
     m_pImpl->m_bTextFrameSyntax = true;
-    m_pImpl->m_pFlyAttrList.reset(FastSerializerHelper::createAttrList());
-    m_pImpl->m_pTextboxAttrList = FastSerializerHelper::createAttrList();
+    m_pImpl->m_pFlyAttrList.reset(sax_fastparser::FastSerializerHelper::createAttrList());
+    m_pImpl->m_pTextboxAttrList = sax_fastparser::FastSerializerHelper::createAttrList();
     m_pImpl->m_aTextFrameStyle = "position:absolute";
     if (!bTextBoxOnly)
     {
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 9641a5e72c42..985d3c223bce 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -16,7 +16,6 @@
 
 using namespace com::sun::star;
 using namespace oox;
-using namespace sax_fastparser;
 
 /// Methods in this class handle values in a table style.
 struct DocxTableStyleExport::Impl
@@ -68,7 +67,7 @@ void DocxTableStyleExport::CharFormat(css::uno::Sequence<css::beans::PropertyVal
 
 void DocxTableStyleExport::CnfStyle(uno::Sequence<beans::PropertyValue>& rAttributeList)
 {
-    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = sax_fastparser::FastSerializerHelper::createAttrList();
 
     for (sal_Int32 j = 0; j < rAttributeList.getLength(); ++j)
     {
@@ -178,7 +177,7 @@ void DocxTableStyleExport::Impl::tableStyleTcBorder(sal_Int32 nToken, const uno:
     if (!rTcBorder.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = sax_fastparser::FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rTcBorder.getLength(); ++i)
         if (sal_Int32 nAttrToken = DocxStringGetToken(aTcBorderTokens, rTcBorder[i].Name))
             pAttributeList->add(FSNS(XML_w, nAttrToken), rTcBorder[i].Value.get<OUString>().toUtf8());
@@ -219,7 +218,7 @@ void DocxTableStyleExport::Impl::tableStyleShd(uno::Sequence<beans::PropertyValu
     if (!rShd.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = sax_fastparser::FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rShd.getLength(); ++i)
     {
         if (rShd[i].Name == "val")
@@ -244,7 +243,7 @@ void DocxTableStyleExport::Impl::tableStyleRColor(uno::Sequence<beans::PropertyV
     if (!rColor.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = sax_fastparser::FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rColor.getLength(); ++i)
     {
         if (rColor[i].Name == "val")
@@ -265,7 +264,7 @@ void DocxTableStyleExport::Impl::tableStyleRLang(uno::Sequence<beans::PropertyVa
     if (!rLang.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = sax_fastparser::FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rLang.getLength(); ++i)
     {
         if (rLang[i].Name == "eastAsia")
@@ -284,7 +283,7 @@ void DocxTableStyleExport::Impl::tableStyleRRFonts(uno::Sequence<beans::Property
     if (!rRFonts.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = sax_fastparser::FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rRFonts.getLength(); ++i)
     {
         if (rRFonts[i].Name == "eastAsiaTheme")
@@ -305,7 +304,7 @@ void DocxTableStyleExport::Impl::tableStylePSpacing(uno::Sequence<beans::Propert
     if (!rSpacing.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = sax_fastparser::FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rSpacing.getLength(); ++i)
     {
         if (rSpacing[i].Name == "after")
@@ -336,7 +335,7 @@ void DocxTableStyleExport::Impl::tableStylePInd(uno::Sequence<beans::PropertyVal
     if (!rInd.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = sax_fastparser::FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rInd.getLength(); ++i)
     {
         if (rInd[i].Name == "rightChars")
@@ -353,7 +352,7 @@ void DocxTableStyleExport::Impl::tableStyleTblInd(uno::Sequence<beans::PropertyV
     if (!rTblInd.hasElements())
         return;
 
-    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = sax_fastparser::FastSerializerHelper::createAttrList();
     for (sal_Int32 i = 0; i < rTblInd.getLength(); ++i)
     {
         if (rTblInd[i].Name == "w")
@@ -369,7 +368,7 @@ void DocxTableStyleExport::Impl::handleBoolean(const OUString& aValue, sal_Int32
 {
     if (aValue.isEmpty())
         return;
-    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = sax_fastparser::FastSerializerHelper::createAttrList();
     if (aValue != "1")
         pAttributeList->add(FSNS(XML_w, XML_val), aValue.toUtf8());
     sax_fastparser::XFastAttributeListRef xAttributeList(pAttributeList);
@@ -634,7 +633,7 @@ void DocxTableStyleExport::Impl::TableStyle(uno::Sequence<beans::PropertyValue>&
             aTblStylePrs.push_back(rStyle[i].Value.get< uno::Sequence<beans::PropertyValue> >());
     }
 
-    sax_fastparser::FastAttributeList* pAttributeList = FastSerializerHelper::createAttrList();
+    sax_fastparser::FastAttributeList* pAttributeList = sax_fastparser::FastSerializerHelper::createAttrList();
     pAttributeList->add(FSNS(XML_w, XML_type), "table");
     if (bDefault)
         pAttributeList->add(FSNS(XML_w, XML_default), "1");
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 96c1b2c917d7..54ab98449ca0 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -79,13 +79,9 @@
 #include <oox/mathml/export.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
 
-using ::editeng::SvxBorderLine;
-using namespace nsSwDocInfoSubType;
-using namespace nsFieldFlags;
-using namespace sw::util;
 using namespace ::com::sun::star;
 
-static OString OutTBLBorderLine(RtfExport& rExport, const SvxBorderLine* pLine, const sal_Char* pStr)
+static OString OutTBLBorderLine(RtfExport& rExport, const editeng::SvxBorderLine* pLine, const sal_Char* pStr)
 {
     OStringBuffer aRet;
     if (!pLine->isEmpty())
@@ -165,7 +161,7 @@ static OString OutTBLBorderLine(RtfExport& rExport, const SvxBorderLine* pLine,
     return aRet.makeStringAndClear();
 }
 
-static OString OutBorderLine(RtfExport& rExport, const SvxBorderLine* pLine,
+static OString OutBorderLine(RtfExport& rExport, const editeng::SvxBorderLine* pLine,
                              const sal_Char* pStr, sal_uInt16 nDist, SvxShadowLocation eShadowLocation = SVX_SHADOW_NONE)
 {
     OStringBuffer aRet;
@@ -660,7 +656,7 @@ void RtfAttributeOutput::TableDefaultBorders(ww8::WW8TableNodeInfoInner::Pointer
         };
         for (int i = 0; i < 4; ++i)
         {
-            if (const SvxBorderLine* pLn = rBox.GetLine(aBorders[i]))
+            if (const editeng::SvxBorderLine* pLn = rBox.GetLine(aBorders[i]))
                 m_aRowDefs.append(OutTBLBorderLine(m_rExport, pLn, aBorderNames[i]));
             if (rDefault.GetDistance(aBorders[i]) !=
                     rBox.GetDistance(aBorders[i]))
@@ -1141,7 +1137,7 @@ void RtfAttributeOutput::SectionTitlePage()
 void RtfAttributeOutput::SectionPageBorders(const SwFrmFmt* pFmt, const SwFrmFmt* /*pFirstPageFmt*/)
 {
     const SvxBoxItem& rBox = pFmt->GetBox();
-    const SvxBorderLine* pLine = rBox.GetTop();
+    const editeng::SvxBorderLine* pLine = rBox.GetTop();
     if (pLine)
         m_aSectionBreaks.append(OutBorderLine(m_rExport, pLine,
                                               OOO_STRING_SVTOOLS_RTF_PGBRDRT,
@@ -2142,7 +2138,7 @@ void RtfAttributeOutput::CharFont(const SvxFontItem& rFont)
     m_aStylesEnd.append((sal_Int32)m_rExport.maFontHelper.GetId(rFont));
     // FIXME: this may be a tad expensive... but the charset needs to be
     // consistent with what wwFont::WriteRtf() does
-    FontMapExport aTmp(rFont.GetFamilyName());
+    sw::util::FontMapExport aTmp(rFont.GetFamilyName());
     sal_uInt8 nWindowsCharset = sw::ms::rtl_TextEncodingToWinCharsetRTF(aTmp.msPrimary, aTmp.msSecondary, rFont.GetCharSet());
     m_rExport.eCurrentEncoding = rtl_getTextEncodingFromWindowsCharset(nWindowsCharset);
     if (m_rExport.eCurrentEncoding == RTL_TEXTENCODING_DONTKNOW)
@@ -2467,7 +2463,7 @@ void RtfAttributeOutput::CharHidden(const SvxCharHiddenItem& rHidden)
         m_aStyles.append((sal_Int32)0);
 }
 
-void RtfAttributeOutput::CharBorder(const SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow)
+void RtfAttributeOutput::CharBorder(const editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow)
 {
     m_aStyles.append(OutBorderLine(m_rExport, pAllBorder, OOO_STRING_SVTOOLS_RTF_CHBRDR, nDist, bShadow ? SVX_SHADOW_BOTTOMRIGHT : SVX_SHADOW_NONE));
 }
@@ -2855,7 +2851,7 @@ void RtfAttributeOutput::FormatULSpace(const SvxULSpaceItem& rULSpace)
             if (!m_rExport.GetCurItemSet())
                 return;
 
-            HdFtDistanceGlue aDistances(*m_rExport.GetCurItemSet());
+            sw::util::HdFtDistanceGlue aDistances(*m_rExport.GetCurItemSet());
 
             if (aDistances.dyaTop)
             {
@@ -3127,10 +3123,10 @@ void RtfAttributeOutput::FormatBox(const SvxBoxItem& rBox)
         m_aFlyProperties.push_back(std::make_pair<OString, OString>("dxTextRight", OString::number(rBox.GetDistance(SvxBoxItemLine::RIGHT) * 635)));
         m_aFlyProperties.push_back(std::make_pair<OString, OString>("dyTextBottom", OString::number(rBox.GetDistance(SvxBoxItemLine::BOTTOM) * 635)));
 
-        const SvxBorderLine* pLeft = rBox.GetLine(SvxBoxItemLine::LEFT);
-        const SvxBorderLine* pRight = rBox.GetLine(SvxBoxItemLine::RIGHT);
-        const SvxBorderLine* pTop = rBox.GetLine(SvxBoxItemLine::TOP);
-        const SvxBorderLine* pBottom = rBox.GetLine(SvxBoxItemLine::BOTTOM);
+        const editeng::SvxBorderLine* pLeft = rBox.GetLine(SvxBoxItemLine::LEFT);
+        const editeng::SvxBorderLine* pRight = rBox.GetLine(SvxBoxItemLine::RIGHT);
+        const editeng::SvxBorderLine* pTop = rBox.GetLine(SvxBoxItemLine::TOP);
+        const editeng::SvxBorderLine* pBottom = rBox.GetLine(SvxBoxItemLine::BOTTOM);
         if (pLeft && pRight && pTop && pBottom && *pLeft == *pRight && *pLeft == *pTop && *pLeft == *pBottom)
         {
             const Color& rColor = pTop->GetColor();
@@ -3171,7 +3167,7 @@ void RtfAttributeOutput::FormatBox(const SvxBoxItem& rBox)
         const sal_Char** pBrdNms = (const sal_Char**)aBorderNames;
         for (int i = 0; i < 4; ++i, ++pBrd, ++pBrdNms)
         {
-            if (const SvxBorderLine* pLn = rBox.GetLine(*pBrd))
+            if (const editeng::SvxBorderLine* pLn = rBox.GetLine(*pBrd))
             {
                 m_aSectionBreaks.append(OutBorderLine(m_rExport, pLn, *pBrdNms,
                                                       rBox.GetDistance(*pBrd), eShadowLocation));
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index 31db3412d6d8..f2088ba0b598 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -29,7 +29,6 @@
 #include <dcontact.hxx>
 #include <algorithm>
 
-using namespace sw::util;
 using namespace css;
 
 RtfSdrExport::RtfSdrExport(RtfExport& rExport)
diff --git a/writerfilter/qa/cppunittests/misc/misc.cxx b/writerfilter/qa/cppunittests/misc/misc.cxx
index baffe64bf34c..4f985610ee66 100644
--- a/writerfilter/qa/cppunittests/misc/misc.cxx
+++ b/writerfilter/qa/cppunittests/misc/misc.cxx
@@ -23,8 +23,6 @@
 #include <dmapper/ConversionHelper.hxx>
 #include <dmapper/DomainMapper_Impl.hxx>
 
-using namespace std;
-
 namespace {
 
 class WriterfilterMiscTest
@@ -74,7 +72,7 @@ void WriterfilterMiscTest::testTwipConversions()
 void WriterfilterMiscTest::testFieldParameters()
 {
     using writerfilter::dmapper::lcl_SplitFieldCommand;
-    boost::tuple<OUString, vector<OUString>, vector<OUString> > result;
+    boost::tuple<OUString, std::vector<OUString>, std::vector<OUString> > result;
 
     result = lcl_SplitFieldCommand("PAGEREF last_page");
     CPPUNIT_ASSERT_EQUAL(OUString("PAGEREF"), boost::get<0>(result));
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index f0bf7b282785..7287bbf04e82 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -32,7 +32,6 @@
 #include <oox/drawingml/drawingmltypes.hxx>
 
 #include <iostream>
-using namespace std;
 
 namespace writerfilter {
 namespace dmapper {
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 7f4f0cba3eef..7d31cd217b1b 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -69,7 +69,6 @@ namespace writerfilter {
 
 namespace dmapper
 {
-using namespace std;
 using namespace css;
 
 class XInputStreamHelper : public cppu::WeakImplHelper<io::XInputStream>
@@ -1431,7 +1430,7 @@ void GraphicImport::lcl_substream(Id /*name*/, ::writerfilter::Reference<Stream>
 }
 
 
-void GraphicImport::lcl_info(const string & /*info*/)
+void GraphicImport::lcl_info(const std::string& /*info*/)
 {
 }
 
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index 90971f61dc2a..23484c767533 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -23,8 +23,6 @@ namespace writerfilter {
 namespace dmapper
 {
 
-using namespace std;
-using namespace oox;
 using namespace com::sun::star;
 
 namespace
@@ -487,7 +485,7 @@ TextEffectsHandler::TextEffectsHandler(sal_uInt32 aElementId) :
     mpGrabBagStack(nullptr)
 {
     convertElementIdToPropertyId(aElementId);
-    mpGrabBagStack.reset(new GrabBagStack(maElementName));
+    mpGrabBagStack.reset(new oox::GrabBagStack(maElementName));
 }
 
 TextEffectsHandler::~TextEffectsHandler()
diff --git a/writerfilter/source/dmapper/util.cxx b/writerfilter/source/dmapper/util.cxx
index 6d9fbf33b760..9145b3de9509 100644
--- a/writerfilter/source/dmapper/util.cxx
+++ b/writerfilter/source/dmapper/util.cxx
@@ -27,11 +27,10 @@ namespace writerfilter
 namespace dmapper
 {
 using namespace com::sun::star;
-using namespace std;
 
-string XTextRangeToString(uno::Reference< text::XTextRange > textRange)
+std::string XTextRangeToString(uno::Reference< text::XTextRange > textRange)
 {
-    string result;
+    std::string result;
 
     (void) textRange;
 #ifdef DEBUG_WRITERFILTER