[Libreoffice-commits] core.git: sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Wed May 20 10:03:32 PDT 2015
sw/source/core/doc/docnew.cxx | 34 ++++++++++++++--------------
sw/source/filter/ww8/rtfattributeoutput.cxx | 2 -
2 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit cc1554a47cf6058a56c49aecf2574f99258920b6
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed May 20 18:45:34 2015 +0200
sw: indentation fixes
Change-Id: I07311146c16ee273f094f74da1d095279d3b2cbf
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 3f60d4e..86e1d34 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -788,23 +788,23 @@ SwDoc::GetXmlIdRegistry()
void SwDoc::InitTOXTypes()
{
- ShellResource* pShellRes = SwViewShell::GetShellRes();
- SwTOXType * pNew = new SwTOXType(TOX_CONTENT, pShellRes->aTOXContentName );
- mpTOXTypes->push_back( pNew );
- pNew = new SwTOXType(TOX_INDEX, pShellRes->aTOXIndexName );
- mpTOXTypes->push_back( pNew );
- pNew = new SwTOXType(TOX_USER, pShellRes->aTOXUserName );
- mpTOXTypes->push_back( pNew );
- pNew = new SwTOXType(TOX_ILLUSTRATIONS, pShellRes->aTOXIllustrationsName );
- mpTOXTypes->push_back( pNew );
- pNew = new SwTOXType(TOX_OBJECTS, pShellRes->aTOXObjectsName );
- mpTOXTypes->push_back( pNew );
- pNew = new SwTOXType(TOX_TABLES, pShellRes->aTOXTablesName );
- mpTOXTypes->push_back( pNew );
- pNew = new SwTOXType(TOX_AUTHORITIES, pShellRes->aTOXAuthoritiesName );
- mpTOXTypes->push_back( pNew );
- pNew = new SwTOXType(TOX_CITATION, pShellRes->aTOXCitationName );
- mpTOXTypes->push_back( pNew );
+ ShellResource* pShellRes = SwViewShell::GetShellRes();
+ SwTOXType * pNew = new SwTOXType(TOX_CONTENT, pShellRes->aTOXContentName );
+ mpTOXTypes->push_back( pNew );
+ pNew = new SwTOXType(TOX_INDEX, pShellRes->aTOXIndexName );
+ mpTOXTypes->push_back( pNew );
+ pNew = new SwTOXType(TOX_USER, pShellRes->aTOXUserName );
+ mpTOXTypes->push_back( pNew );
+ pNew = new SwTOXType(TOX_ILLUSTRATIONS, pShellRes->aTOXIllustrationsName );
+ mpTOXTypes->push_back( pNew );
+ pNew = new SwTOXType(TOX_OBJECTS, pShellRes->aTOXObjectsName );
+ mpTOXTypes->push_back( pNew );
+ pNew = new SwTOXType(TOX_TABLES, pShellRes->aTOXTablesName );
+ mpTOXTypes->push_back( pNew );
+ pNew = new SwTOXType(TOX_AUTHORITIES, pShellRes->aTOXAuthoritiesName );
+ mpTOXTypes->push_back( pNew );
+ pNew = new SwTOXType(TOX_CITATION, pShellRes->aTOXCitationName );
+ mpTOXTypes->push_back( pNew );
}
void SwDoc::ReplaceDefaults(const SwDoc& rSource)
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index a3dab5c..df86d9a 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -593,7 +593,7 @@ void RtfAttributeOutput::TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t p
{
const SwNode* pNode = pTableTextNodeInfoInner->getNode();
const SwFrameFormat* pFrameFormat = GetExport().m_pParentFrame ? &GetExport().m_pParentFrame->GetFrameFormat() :
- GetExport().m_pDoc->GetPageDesc(0).GetPageFormatOfNode(*pNode, false);
+ GetExport().m_pDoc->GetPageDesc(0).GetPageFormatOfNode(*pNode, false);
const SvxLRSpaceItem& rLR = pFrameFormat->GetLRSpace();
nPageSize = pFrameFormat->GetFrmSize().GetWidth() -
More information about the Libreoffice-commits
mailing list