Commit 6875cc5a authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov

linux build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58592 954022d7-b5bf-4e40-9824-e11837661b57
parent 3f98a252
......@@ -9,7 +9,7 @@ QT -= core gui
TARGET = DocxFormatLib
TEMPLATE = lib
CONFIG += staticlib
QMAKE_CXXFLAGS += -std=c++11 -Wall
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _LINUX_QT _USE_XMLLITE_READER_
......
......@@ -36,7 +36,7 @@ namespace OOX
for (unsigned int nIndex = 0; nIndex < nCount; ++nIndex )
{
const smart_ptr<OOX::File>& pFile = OOX::Spreadsheet::CreateFile( oPath, oRels.m_arrRelations[nIndex] );
smart_ptr<OOX::File> pFile = OOX::Spreadsheet::CreateFile( oPath, oRels.m_arrRelations[nIndex] );
Add( oRels.m_arrRelations[nIndex]->rId(), pFile );
}
}
......@@ -224,7 +224,7 @@ namespace OOX
}
void IFileContainer::Add(const OOX::RId& rId, const smart_ptr<OOX::File>& pFile)
void IFileContainer::Add(const OOX::RId& rId, smart_ptr<OOX::File>& pFile)
{
bool bEnumerated = pFile->type().Enumerated();
bool bEnumeratedGlobal = pFile->type().EnumeratedGlobal();
......
......@@ -68,7 +68,7 @@ namespace OOX
smart_ptr<OOX::File> Get(const FileType& oType);
const RId Add(smart_ptr<OOX::File>& pFile);
void Add(const OOX::RId& rId, const smart_ptr<OOX::File>& pFile);
void Add(const OOX::RId& rId, smart_ptr<OOX::File>& pFile);
template<typename T>
T& Find();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment