[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source
Thorsten Behrens
Thorsten.Behrens at CIB.de
Tue Jul 7 01:43:07 PDT 2015
sw/source/filter/ww8/wrtww8.cxx | 2 ++
sw/source/filter/ww8/wrtww8.hxx | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 14b96e611d0618df6b8e85d394e8aa6350845cc4
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date: Tue Jul 7 10:29:37 2015 +0200
gcc4.6: remove c++11-isms on -5-0 branch
This is a fixup for 2a51dd6aca55a92d8751b67cdf7a5a6ab8c38237
Change-Id: I4fba62f944747cbb39013d4b0005a6b4a31f5222
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index bbf819a..611559e 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3529,6 +3529,8 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM
, m_pAtn(0)
, m_pTextBxs(0)
, m_pHFTextBxs(0)
+ , m_bLinkedTextboxesHelperInitialized(false)
+ , m_nLinkedTextboxesChainId(0)
, m_pParentFrame(0)
, m_pFlyOffset(0)
, m_eNewAnchorType(FLY_AS_CHAR)
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index d2cb89d..c0bddbb 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -506,8 +506,8 @@ public:
LinkedTextboxInfo(): nId(0), nSeq(0) {}
};
std::map<OUString,LinkedTextboxInfo> m_aLinkedTextboxesHelper;
- bool m_bLinkedTextboxesHelperInitialized = false;
- sal_Int32 m_nLinkedTextboxesChainId=0;
+ bool m_bLinkedTextboxesHelperInitialized;
+ sal_Int32 m_nLinkedTextboxesChainId;
const sw::Frame *m_pParentFrame; // If set we are exporting content inside
// a frame, e.g. a graphic node
More information about the Libreoffice-commits
mailing list