[Libreoffice-commits] core.git: 2 commits - filter/source include/filter sw/source
Tor Lillqvist
tml at collabora.com
Fri Aug 22 04:52:23 PDT 2014
filter/source/msfilter/msdffimp.cxx | 19 -------------------
include/filter/msfilter/msdffimp.hxx | 5 -----
sw/source/filter/ww8/ww8par.cxx | 2 --
3 files changed, 26 deletions(-)
New commits:
commit e6fdd7ad0a4c548467157fa6791389e19f08993c
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Aug 22 14:42:58 2014 +0300
The bLastBoxInChain fields are unused
Change-Id: I741733a053c8b0123be8efbcb9fde39f53f6d83c
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 7d08824..bf13fe7 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5111,7 +5111,6 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
{
SvxMSDffShapeInfo& rInfo = **it;
pTextImpRec->bReplaceByFly = rInfo.bReplaceByFly;
- pTextImpRec->bLastBoxInChain = rInfo.bLastBoxInChain;
}
}
@@ -5661,7 +5660,6 @@ void SvxMSDffManager::CheckTxBxStoryChain()
boost::shared_ptr<SvxMSDffShapeInfo> const pObj = *iter;
if( pObj->nTxBxComp )
{
- pObj->bLastBoxInChain = false;
// group change?
// #156763#
// the text id also contains an internal drawing container id
@@ -5669,13 +5667,6 @@ void SvxMSDffManager::CheckTxBxStoryChain()
// drawing containers.
if( nChain != pObj->nTxBxComp )
{
- // previous was last of its group
- if (iter != m_pShapeInfosByTxBxComp->begin())
- {
- SvxMSDffShapeInfos_ByTxBxComp::iterator prev(iter);
- --prev;
- (*prev)->bLastBoxInChain = true;
- }
// reset mark and helper flag
mark = iter;
nChain = pObj->nTxBxComp;
@@ -5702,11 +5693,6 @@ void SvxMSDffManager::CheckTxBxStoryChain()
pObj->nTxBxComp = pObj->nTxBxComp & 0xFFFF0000;
m_pShapeInfosById->insert( pObj );
}
- // last one was last of its group
- if (!m_pShapeInfosByTxBxComp->empty())
- {
- (*m_pShapeInfosByTxBxComp->rbegin())->bLastBoxInChain = true;
- }
// free original array but don't free its elements
m_pShapeInfosByTxBxComp.reset();
}
@@ -7242,7 +7228,6 @@ SvxMSDffImportRec::SvxMSDffImportRec()
bHidden = false;
bReplaceByFly = false;
- bLastBoxInChain = true;
bVFlip = false;
bHFlip = false;
bAutoWidth = false;
@@ -7292,7 +7277,6 @@ SvxMSDffImportRec::SvxMSDffImportRec(const SvxMSDffImportRec& rCopy)
bHidden = rCopy.bHidden;
bReplaceByFly = rCopy.bReplaceByFly;
bAutoWidth = rCopy.bAutoWidth;
- bLastBoxInChain = rCopy.bLastBoxInChain;
bVFlip = rCopy.bVFlip;
bHFlip = rCopy.bHFlip;
nClientAnchorLen = rCopy.nClientAnchorLen;
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 6eb9a4f..5f2d1c9 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -259,7 +259,6 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec
bool bDrawHell :1;
bool bHidden :1;
bool bReplaceByFly :1;
- bool bLastBoxInChain :1;
bool bVFlip :1;
bool bHFlip :1;
bool bAutoWidth :1;
@@ -762,7 +761,6 @@ struct SvxMSDffShapeInfo
sal_uInt32 nTxBxComp;
bool bReplaceByFly :1; ///< shape can be replaced by a frame in Writer
- bool bLastBoxInChain:1;
explicit SvxMSDffShapeInfo(sal_uLong nFPos, sal_uInt32 nId=0, // sal_uLong nBIdx=0,
sal_uInt16 nSeqId=0, sal_uInt16 nBoxId=0):
@@ -771,7 +769,6 @@ struct SvxMSDffShapeInfo
nTxBxComp( (nSeqId << 16) + nBoxId )
{
bReplaceByFly = false;
- bLastBoxInChain = true;
}
SvxMSDffShapeInfo(SvxMSDffShapeInfo& rInfo):
nShapeId( rInfo.nShapeId ),
@@ -779,7 +776,6 @@ struct SvxMSDffShapeInfo
nTxBxComp( rInfo.nTxBxComp )
{
bReplaceByFly = rInfo.bReplaceByFly;
- bLastBoxInChain = rInfo.bLastBoxInChain;
}
};
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 557d7e5..26b867d 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -830,7 +830,6 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
{
SvxMSDffShapeInfo& rInfo = **it;
pImpRec->bReplaceByFly = rInfo.bReplaceByFly;
- pImpRec->bLastBoxInChain = rInfo.bLastBoxInChain;
}
}
commit db12d9042c71b872efe0ed2d94cf00852c57abb5
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Aug 22 14:25:56 2014 +0300
bHasUDefProp is unused
Change-Id: I8eae6f1ed791ba92c3b4679d1b9f8041f16678d1
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 9f01e10..7d08824 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4968,7 +4968,6 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
}
if ( rSt.GetError() != 0 )
break;
- pImpRec->bHasUDefProp = true;
nBytesLeft -= 6;
}
}
@@ -7244,7 +7243,6 @@ SvxMSDffImportRec::SvxMSDffImportRec()
bReplaceByFly = false;
bLastBoxInChain = true;
- bHasUDefProp = false; // was the DFF_msofbtUDefProp record set?
bVFlip = false;
bHFlip = false;
bAutoWidth = false;
@@ -7295,7 +7293,6 @@ SvxMSDffImportRec::SvxMSDffImportRec(const SvxMSDffImportRec& rCopy)
bReplaceByFly = rCopy.bReplaceByFly;
bAutoWidth = rCopy.bAutoWidth;
bLastBoxInChain = rCopy.bLastBoxInChain;
- bHasUDefProp = rCopy.bHasUDefProp;
bVFlip = rCopy.bVFlip;
bHFlip = rCopy.bHFlip;
nClientAnchorLen = rCopy.nClientAnchorLen;
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index adba4b7..6eb9a4f 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -260,7 +260,6 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec
bool bHidden :1;
bool bReplaceByFly :1;
bool bLastBoxInChain :1;
- bool bHasUDefProp :1;
bool bVFlip :1;
bool bHFlip :1;
bool bAutoWidth :1;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index c065d8f..557d7e5 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -701,7 +701,6 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
}
if ( rSt.GetError() != 0 )
break;
- pImpRec->bHasUDefProp = true;
nBytesLeft -= 6;
}
}
More information about the Libreoffice-commits
mailing list