diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-01-28 14:57:53 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-01-28 15:13:02 +0100 |
| commit | cd527aae72a0b2030d00151e2137b37165c65b96 (patch) | |
| tree | f3f298d147ca4d9e9ace306943f5fab38a2380a9 /sw/source/filter/ww8/ww8graf2.cxx | |
| parent | 801eabf43635fd125038b2de40a1bafe16c70bd9 (diff) | |
sw: remove __WW8_NEEDS_COPY over-optimization
Since commit 166a79df88853847528d558ea98656ad358f4645 effectively increased
SAL_TYPES_ALIGNMENT4 it caused __WW8_NEEDS_COPY to be defined for MSVC too
so the !__WW8_NEEDS_COPY case is dead code now.
Change-Id: Ia5c20588a2efdd341f1406e091fecf16a12c3f2f
Diffstat (limited to 'sw/source/filter/ww8/ww8graf2.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8graf2.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index 18c290b372ff..d9f9b9758af8 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -236,9 +236,7 @@ bool wwZOrderer::InsertObject(SdrObject* pObject, sal_uLong nPos) return false; } -#ifdef __WW8_NEEDS_COPY extern void WW8PicShadowToReal( WW8_PIC_SHADOW* pPicS, WW8_PIC* pPic ); -#endif // defined __WW8_NEEDS_COPY bool SwWW8ImplReader::GetPictGrafFromStream(Graphic& rGraphic, SvStream& rSrc) { @@ -447,13 +445,9 @@ void SwWW8ImplReader::PicRead(SvStream *pDataStream, WW8_PIC *pPic, bool bVer67) { //Only the first 0x2e bytes are the same between version 6/7 and 8+ -#ifdef __WW8_NEEDS_COPY WW8_PIC_SHADOW aPicS; pDataStream->Read( &aPicS, sizeof( aPicS ) ); WW8PicShadowToReal( &aPicS, pPic ); -#else - pDataStream->Read( pPic, 0x2E); -#endif // defined __WW8_NEEDS_COPY for (int i=0;i<4;i++) pDataStream->Read( &pPic->rgbrc[i], bVer67 ? 2 : 4); *pDataStream >> pPic->dxaOrigin; @@ -726,8 +720,6 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, return AddAutoAnchor(pRet); } -#ifdef __WW8_NEEDS_COPY - void WW8PicShadowToReal( WW8_PIC_SHADOW * pPicS, WW8_PIC * pPic ) { pPic->lcb = SVBT32ToUInt32( pPicS->lcb ); @@ -774,6 +766,5 @@ void WW8FSPAShadowToReal( WW8_FSPA_SHADOW * pFSPAS, WW8_FSPA * pFSPA ) pFSPA->bAnchorLock = 0 != ( nBits & 0x8000 ); pFSPA->nTxbx = SVBT32ToUInt32( pFSPAS->nTxbx ); } -#endif // defined __WW8_NEEDS_COPY /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |