summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/docxsdrexport.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-04-20 18:05:05 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-04-20 18:23:13 +0200
commit20a2d64bcee0a7c7719c893af90b473b68ecd4b4 (patch)
tree0b359e9a2c662f28bd9ddb27edfc72d70dae1d2e /sw/source/filter/ww8/docxsdrexport.cxx
parent4eff3e7c455e8db2c00b7ee5eb1d2296b45d2823 (diff)
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
Diffstat (limited to 'sw/source/filter/ww8/docxsdrexport.cxx')
-rw-r--r--sw/source/filter/ww8/docxsdrexport.cxx19
1 files changed, 9 insertions, 10 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)
{