summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/ww8')
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx16
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx13
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx6
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx12
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx13
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx20
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx8
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx13
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx8
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx8
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx24
15 files changed, 64 insertions, 85 deletions
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index b68f321d35b6..b125a214ef23 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -190,7 +190,7 @@ namespace sw
meWriterType(eTxtBox),
mpStartFrameContent(0),
// --> OD 2007-04-19 #i43447# - move to initialization list
- mbIsInline( (rFmt.GetAnchor().GetAnchorId() == FLY_IN_CNTNT) )
+ mbIsInline( (rFmt.GetAnchor().GetAnchorId() == FLY_AS_CHAR) )
// <--
{
switch (rFmt.Which())
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 33c6725e1221..0117b7150a95 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -588,7 +588,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
//fHdr/bx/by/wr/wrk/fRcaSimple/fBelowText/fAnchorLock
USHORT nFlags=0;
//If nFlags isn't 0x14 its overridden by the escher properties
- if( FLY_PAGE == rFmt.GetAnchor().GetAnchorId())
+ if (FLY_AT_PAGE == rFmt.GetAnchor().GetAnchorId())
nFlags = 0x0000;
else
nFlags = 0x0014; // x-rel to text, y-rel to text
@@ -2118,7 +2118,7 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
{
const RndStdIds eAnchor = _rFrmFmt.GetAnchor().GetAnchorId();
- if ( FLY_IN_CNTNT == eAnchor || FLY_AT_FLY == eAnchor )
+ if ( (FLY_AS_CHAR == eAnchor) || (FLY_AT_FLY == eAnchor) )
{
// no conversion for as-character or at frame anchored objects
return false;
@@ -2167,7 +2167,7 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
// the fact, that the object is anchored at a paragraph, which has a "column
// break before" attribute
bool bConvDueToAnchoredAtColBreakPara( false );
- if ( ( eAnchor == FLY_AT_CNTNT || eAnchor == FLY_AUTO_CNTNT ) &&
+ if ( ( (eAnchor == FLY_AT_PARA) || (eAnchor == FLY_AT_CHAR) ) &&
_rFrmFmt.GetAnchor().GetCntntAnchor() &&
_rFrmFmt.GetAnchor().GetCntntAnchor()->nNode.GetNode().IsTxtNode() )
{
@@ -2404,7 +2404,7 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
void WinwordAnchoring::SetAnchoring(const SwFrmFmt& rFmt)
{
const RndStdIds eAnchor = rFmt.GetAnchor().GetAnchorId();
- mbInline = (eAnchor == FLY_IN_CNTNT);
+ mbInline = (eAnchor == FLY_AS_CHAR);
SwFmtHoriOrient rHoriOri = rFmt.GetHoriOrient();
SwFmtVertOrient rVertOri = rFmt.GetVertOrient();
@@ -2488,13 +2488,13 @@ void WinwordAnchoring::SetAnchoring(const SwFrmFmt& rFmt)
case text::RelOrientation::FRAME:
case text::RelOrientation::FRAME_LEFT: //:-(
case text::RelOrientation::FRAME_RIGHT: //:-(
- if (eAnchor == FLY_PAGE)
+ if (eAnchor == FLY_AT_PAGE)
mnXRelTo = 1;
else
mnXRelTo = 2;
break;
case text::RelOrientation::PRINT_AREA:
- if (eAnchor == FLY_PAGE)
+ if (eAnchor == FLY_AT_PAGE)
mnXRelTo = 0;
else
mnXRelTo = 2;
@@ -2516,13 +2516,13 @@ void WinwordAnchoring::SetAnchoring(const SwFrmFmt& rFmt)
mnYRelTo = 1;
break;
case text::RelOrientation::PRINT_AREA:
- if (eAnchor == FLY_PAGE)
+ if (eAnchor == FLY_AT_PAGE)
mnYRelTo = 0;
else
mnYRelTo = 2;
break;
case text::RelOrientation::FRAME:
- if (eAnchor == FLY_PAGE)
+ if (eAnchor == FLY_AT_PAGE)
mnYRelTo = 1;
else
mnYRelTo = 2;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 554f128b361e..89f2aa54f3f9 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -376,7 +376,7 @@ xub_StrLen SwAttrIter::SearchNext( xub_StrLen nStartPos )
if (nPos >= nStartPos && nPos <= nMinPos)
nMinPos = nPos;
- if (maFlyIter->GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AUTO_CNTNT)
+ if (maFlyIter->GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AT_CHAR)
{
++nPos;
if (nPos >= nStartPos && nPos <= nMinPos)
@@ -1301,7 +1301,7 @@ short MSWordExportBase::TrueFrameDirection( const SwFrmFmt &rFlyFmt ) const
{
pItem = 0;
const SwFmtAnchor* pAnchor = &pFlyFmt->GetAnchor();
- if ( FLY_PAGE != pAnchor->GetAnchorId() &&
+ if ((FLY_AT_PAGE != pAnchor->GetAnchorId()) &&
pAnchor->GetCntntAnchor() )
{
pFlyFmt = pAnchor->GetCntntAnchor()->nNode.GetNode().GetFlyFmt();
@@ -1359,7 +1359,7 @@ SvxBrushItem WW8Export::TrueFrameBgBrush(const SwFrmFmt &rFlyFmt) const
{
pRet = 0;
const SwFmtAnchor* pAnchor = &pFlyFmt->GetAnchor();
- if (FLY_PAGE != pAnchor->GetAnchorId() &&
+ if ((FLY_AT_PAGE != pAnchor->GetAnchorId()) &&
pAnchor->GetCntntAnchor())
{
pFlyFmt =
@@ -2497,12 +2497,13 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point
aOffset -= aPageRect.Pos();
m_rWW8Export.pFlyOffset = &aOffset;
- m_rWW8Export.eNewAnchorType = FLY_PAGE;
+ m_rWW8Export.eNewAnchorType = FLY_AT_PAGE;
}
m_rWW8Export.mpParentFrame = &rFmt;
if (
- m_rWW8Export.bIsInTable && (FLY_PAGE != rAnch.GetAnchorId()) &&
+ m_rWW8Export.bIsInTable &&
+ (FLY_AT_PAGE != rAnch.GetAnchorId()) &&
!m_rWW8Export.pDoc->GetNodes()[ nStt ]->IsNoTxtNode()
)
{
@@ -2534,7 +2535,7 @@ void AttributeOutputBase::OutputFlyFrame( const sw::Frame& rFmt )
Point* pLayPos;
bool bValidNdPos = false, bValidPgPos = false;
- if ( FLY_PAGE == rFmt.GetFrmFmt().GetAnchor().GetAnchorId() )
+ if (FLY_AT_PAGE == rFmt.GetFrmFmt().GetAnchor().GetAnchorId())
{
// get the Layout Node-Position.
if ( !bValidPgPos )
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index fb5ce68ec654..9eb8fec9de7c 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2897,7 +2897,7 @@ void MSWordExportBase::ExportDocument( bool bWriteAll )
mpParentFrame = 0;
pFlyOffset = 0;
- eNewAnchorType = FLY_PAGE;
+ eNewAnchorType = FLY_AT_PAGE;
nTxtTyp = TXT_MAINTEXT;
// --> OD 2007-04-19 #i43447# - removed
// nFlyWidth = nFlyHeight = 0;
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index c4ad0735d5d4..00c877eb8725 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -404,7 +404,7 @@ void WW8Export::OutGrf(const sw::Frame &rFrame)
const SwFrmFmt &rFlyFmt = rFrame.GetFrmFmt();
const RndStdIds eAn = rFlyFmt.GetAttrSet().GetAnchor(false).GetAnchorId();
- if( eAn == FLY_IN_CNTNT )
+ if (eAn == FLY_AS_CHAR)
{
sal_Int16 eVert = rFlyFmt.GetVertOrient().GetVertOrient();
if ((eVert == text::VertOrientation::CHAR_CENTER) || (eVert == text::VertOrientation::LINE_CENTER))
@@ -465,8 +465,8 @@ void WW8Export::OutGrf(const sw::Frame &rFrame)
// Otherwise, an additional paragraph is exported for a graphic, which is
// forced to be treated as inline, because it's anchored inside another frame.
if ( !rFrame.IsInline() &&
- ( ( eAn == FLY_AT_CNTNT && ( bWrtWW8 || !bIsInTable ) ) ||
- eAn == FLY_PAGE ) )
+ ( ((eAn == FLY_AT_PARA) && ( bWrtWW8 || !bIsInTable )) ||
+ (eAn == FLY_AT_PAGE)) )
// <--
{
WriteChar( (char)0x0d ); // umgebenden Rahmen mit CR abschliessen
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index b20df77e79a1..aef5b0e108e3 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -128,9 +128,7 @@
#include <writerfilter/doctok/sprmids.hxx>
-#if OSL_DEBUG_LEVEL > 1
-# include <fmtcntnt.hxx>
-#endif
+#include <fmtcntnt.hxx>
#include "writerhelper.hxx"
#include "writerwordglue.hxx"
#include "wrtww8.hxx"
@@ -4087,15 +4085,15 @@ void WW8AttributeOutput::FormatAnchor( const SwFmtAnchor& rAnchor )
BYTE nP = 0;
switch ( rAnchor.GetAnchorId() )
{
- case FLY_PAGE:
+ case FLY_AT_PAGE:
// Vert: Page | Horz: Page
nP |= (1 << 4) | (2 << 6);
break;
// Im Fall eine Flys als Zeichen: Absatz-gebunden setzen!!!
case FLY_AT_FLY:
- case FLY_AUTO_CNTNT:
- case FLY_AT_CNTNT:
- case FLY_IN_CNTNT:
+ case FLY_AT_CHAR:
+ case FLY_AT_PARA:
+ case FLY_AS_CHAR:
// Vert: Page | Horz: Page
nP |= (2 << 4) | (0 << 6);
break;
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index eca0e0d77c21..6720af641fe5 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -36,14 +36,10 @@
#include <svl/urihelper.hxx>
#include <rtl/tencinfo.h>
#include <swerror.h>
-#ifndef _NDTXT
#include <ndtxt.hxx>
-#endif
#include <pam.hxx>
#include <shellio.hxx>
-#ifndef _DOCSH_HXX
#include <docsh.hxx>
-#endif
#include <fmtanchr.hxx>
#include <frmfmt.hxx>
#include <doc.hxx>
@@ -51,6 +47,7 @@
#include "ww8glsy.hxx"
#include "ww8par.hxx"
+
WW8Glossary::WW8Glossary(SvStorageStreamRef &refStrm, BYTE nVersion,
SvStorage *pStg)
: pGlossary(0), rStrm(refStrm), xStg(pStg), nStrings(0)
@@ -82,10 +79,10 @@ bool WW8Glossary::HasBareGraphicEnd(SwDoc *pDoc,SwNodeIndex &rIdx)
RES_DRAWFRMFMT != pFrmFmt->Which() )
continue;
const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
- const SwPosition* pAPos;
- if( ( FLY_AT_CNTNT == rAnchor.GetAnchorId() ||
- FLY_AUTO_CNTNT == rAnchor.GetAnchorId() ) &&
- 0 != ( pAPos = rAnchor.GetCntntAnchor()) &&
+ SwPosition const*const pAPos = rAnchor.GetCntntAnchor();
+ if (pAPos &&
+ ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
+ (FLY_AT_CHAR == rAnchor.GetAnchorId())) &&
rIdx == pAPos->nNode.GetIndex() )
{
bRet=true;
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index e1c5b2509228..f8f6303e81e9 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -58,9 +58,7 @@
#include <svx/adjitem.hxx>
#include <svx/wghtitem.hxx>
#include <svx/crsditem.hxx>
-#ifndef _SVX_CNTRITEM_HXX
#include <svx/cntritem.hxx>
-#endif
#include <svx/shdditem.hxx>
#include <svx/fontitem.hxx>
#include <svx/ulspitem.hxx>
@@ -191,13 +189,13 @@ bool SwWW8ImplReader::ReadGrafStart(void* pData, short nDataSiz,
}
pStrm->Read(pData, nDataSiz);
- RndStdIds eAnchor = (SVBT8ToByte(pDo->by) < 2) ? FLY_PAGE : FLY_AT_CNTNT;
+ RndStdIds eAnchor = (SVBT8ToByte(pDo->by) < 2) ? FLY_AT_PAGE : FLY_AT_PARA;
rSet.Put(SwFmtAnchor(eAnchor));
nDrawXOfs2 = nDrawXOfs;
nDrawYOfs2 = nDrawYOfs;
- if( eAnchor == FLY_AT_CNTNT )
+ if (eAnchor == FLY_AT_PARA)
{
if( SVBT8ToByte( pDo->bx ) == 1 ) // Pos: echt links
nDrawXOfs2 = static_cast< short >(nDrawXOfs2 - maSectionManager.GetPageLeft());
@@ -2248,7 +2246,7 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
{
ASSERT(pRecord || pFSPA, "give me something! to work with for anchoring");
if (!pRecord && !pFSPA)
- return FLY_PAGE;
+ return FLY_AT_PAGE;
SvxMSDffImportRec aRecordFromFSPA;
if (!pRecord)
@@ -2299,7 +2297,7 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
UINT32 nYRelTo = nCntRelTo > pRecord->nYRelTo ? pRecord->nYRelTo : 1;
// --> OD 2005-03-03 #i43718#
- RndStdIds eAnchor = IsInlineEscherHack() ? FLY_IN_CNTNT : FLY_AUTO_CNTNT;
+ RndStdIds eAnchor = IsInlineEscherHack() ? FLY_AS_CHAR : FLY_AT_CHAR;
// <--
SwFmtAnchor aAnchor( eAnchor );
@@ -2463,7 +2461,7 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
if (
(pFSPA->nYaTop < 0) && (eVertOri == text::VertOrientation::NONE) &&
- ((eAnchor == FLY_AT_CNTNT) || (eAnchor == FLY_AUTO_CNTNT))
+ ((eAnchor == FLY_AT_PARA) || (eAnchor == FLY_AT_CHAR))
)
{
maTracer.Log(sw::log::eNegativeVertPlacement);
@@ -2846,7 +2844,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
SwFrmFmt *SwWW8ImplReader::AddAutoAnchor(SwFrmFmt *pFmt)
{
- if (pFmt && (pFmt->GetAnchor().GetAnchorId() != FLY_IN_CNTNT))
+ if (pFmt && (pFmt->GetAnchor().GetAnchorId() != FLY_AS_CHAR))
{
sal_uInt16 nTextAreaWidth = static_cast< sal_uInt16 >( maSectionManager.GetPageWidth() -
maSectionManager.GetPageRight() - maSectionManager.GetPageLeft());
@@ -2861,8 +2859,10 @@ SwFrmFmt *SwWW8ImplReader::AddAutoAnchor(SwFrmFmt *pFmt)
*
* Leave to later and set the correct location then.
*/
- if ((pFmt) && (pFmt->GetAnchor().GetAnchorId() != FLY_IN_CNTNT))
+ if ((pFmt) && (pFmt->GetAnchor().GetAnchorId() != FLY_AS_CHAR))
+ {
pAnchorStck->AddAnchor(*pPaM->GetPoint(), pFmt);
+ }
return pFmt;
}
@@ -3235,7 +3235,7 @@ void SwWW8ImplReader::GrafikDtor()
void SwWW8FltAnchorStack::AddAnchor(const SwPosition& rPos, SwFrmFmt *pFmt)
{
- ASSERT(pFmt->GetAnchor().GetAnchorId() != FLY_IN_CNTNT,
+ ASSERT(pFmt->GetAnchor().GetAnchorId() != FLY_AS_CHAR,
"Don't use fltanchors with inline frames, slap!");
NewAttr(rPos, SwFltAnchor(pFmt));
}
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 68d3e87c475c..54899f189f12 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -33,9 +33,7 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-#ifndef __SGI_STL_ITERATOR
#include <iterator>
-#endif
#include <hintids.hxx>
#include <svl/urihelper.hxx>
#include <svx/impgrf.hxx>
@@ -415,7 +413,7 @@ SwFlyFrmFmt* SwWW8ImplReader::MakeGrafNotInCntnt(const WW8PicDesc& rPD,
// Damit die Frames bei Einfuegen in existierendes Doc erzeugt werden:
if (rDoc.GetRootFrm() &&
- (FLY_AT_CNTNT == pFlyFmt->GetAnchor().GetAnchorId()))
+ (FLY_AT_PARA == pFlyFmt->GetAnchor().GetAnchorId()))
{
pFlyFmt->MakeFrms();
}
@@ -548,9 +546,11 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
// it is anchored in content; because this anchor add
// a character into the textnode.
// IussueZilla task 2806
- if( FLY_IN_CNTNT ==
+ if (FLY_AS_CHAR ==
pFlyFmtOfJustInsertedGraphic->GetAnchor().GetAnchorId() )
+ {
aFlySet.ClearItem( RES_ANCHOR );
+ }
pFlyFmtOfJustInsertedGraphic->SetFmtAttr( aFlySet );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 10aa3d36d6bb..8cb1f0b6d59b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1649,7 +1649,7 @@ void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(long nStart, long nLen,
pPaM->GetPoint()->nNode = pSttIdx->GetIndex() + 1;
pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(), 0);
- SwFlyFrmFmt *pFrame = rDoc.MakeFlySection(FLY_AT_CNTNT, pPaM->GetPoint());
+ SwFlyFrmFmt *pFrame = rDoc.MakeFlySection(FLY_AT_PARA, pPaM->GetPoint());
pFrame->SetFmtAttr(SwFmtFrmSize(ATT_MIN_SIZE, nPageWidth, MINLAY));
pFrame->SetFmtAttr(SwFmtSurround(SURROUND_THROUGHT));
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index afbf4b3593c1..053d6711158a 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3482,7 +3482,7 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
// --> OD 2005-03-21 #i45301# - anchor nested table inside Writer fly frame
// only at-character, if absolute position object attributes are available.
// Thus, default anchor type is as-character anchored.
- RndStdIds eAnchor( FLY_IN_CNTNT );
+ RndStdIds eAnchor( FLY_AS_CHAR );
// <--
if ( nInTable )
{
@@ -3514,7 +3514,7 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
// <--
// --> OD 2005-03-21 #i45301# - anchor nested table Writer fly
// frame at-character
- eAnchor = FLY_AUTO_CNTNT;
+ eAnchor = FLY_AT_CHAR;
// <--
}
}
@@ -3532,7 +3532,8 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
"how could we be in a local apo and have no apo");
}
- if ( eAnchor == FLY_AUTO_CNTNT && !maTableStack.empty() && !InEqualApo(nNewInTable) )
+ if ((eAnchor == FLY_AT_CHAR)
+ && !maTableStack.empty() && !InEqualApo(nNewInTable) )
{
pTableDesc->pParentPos = new SwPosition(*pPaM->GetPoint());
SfxItemSet aItemSet(rDoc.GetAttrPool(),
@@ -3560,7 +3561,7 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
if ( pTableWFlyPara && pTableSFlyPara )
{
WW8FlySet aFlySet( *this, pTableWFlyPara, pTableSFlyPara, false );
- SwFmtAnchor aAnchor( FLY_AUTO_CNTNT );
+ SwFmtAnchor aAnchor( FLY_AT_CHAR );
aAnchor.SetAnchor( pTableDesc->pParentPos );
aFlySet.Put( aAnchor );
pTableDesc->pFlyFmt->SetFmtAttr( aFlySet );
@@ -3615,8 +3616,8 @@ bool lcl_PamContainsFly(SwPaM & rPam)
switch (pAnchor->GetAnchorId())
{
- case FLY_AT_CNTNT:
- case FLY_AUTO_CNTNT:
+ case FLY_AT_PARA:
+ case FLY_AT_CHAR:
{
const SwPosition* pAPos = pAnchor->GetCntntAnchor();
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index b6b91459fc10..5925751f3c57 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -77,7 +77,7 @@
#include <svx/postitem.hxx>
#include <filter/msfilter/msocximex.hxx>
#include <errhdl.hxx>
-#include <unoobj.hxx>
+#include <unotextrange.hxx>
#include <doc.hxx>
#include <docary.hxx>
#include <docsh.hxx>
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index a0c70239c604..dcbbd4d3ddfe 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -35,12 +35,8 @@
#include "writerhelper.hxx"
#include <com/sun/star/embed/XClassifiedObject.hpp>
-#ifndef __SGI_STL_ALGORITHM
#include <algorithm>
-#endif
-#ifndef __SGI_STL_FUNCTIONAL
#include <functional>
-#endif
#include <osl/endian.h>
#include <sot/storage.hxx>
#include <com/sun/star/drawing/XShape.hpp>
@@ -59,9 +55,7 @@
#include <frmfmt.hxx>
#include <pam.hxx>
#include <ndgrf.hxx>
-#ifndef _DOCSH_HXX
#include <docsh.hxx> // fuer Ole-Node
-#endif
#include <mdiexp.hxx> // Progress
#include <redline.hxx>
#include <fltshell.hxx>
@@ -296,7 +290,7 @@ SwFrmFmt* SwWW8ImplReader::ImportOle(const Graphic* pGrf,
if (!mbNewDoc)
Reader::ResetFrmFmtAttrs( *pTempSet );
- SwFmtAnchor aAnchor( FLY_IN_CNTNT );
+ SwFmtAnchor aAnchor( FLY_AS_CHAR );
aAnchor.SetAnchor( pPaM->GetPoint() );
pTempSet->Put( aAnchor );
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 9f4cba28a4db..8b5984002ebb 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -45,17 +45,11 @@
#include <svl/zformat.hxx>
#include <sfx2/linkmgr.hxx>
-#ifndef _UCBHELPER_CONTENT_HXX_
#include <ucbhelper/content.hxx>
-#endif
-#ifndef _UCBHELPER_CONTENTBROKER_HXX_
#include <ucbhelper/contentbroker.hxx>
-#endif
#include <ucbhelper/commandenvironment.hxx>
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
#include <hintids.hxx>
#include <svx/fontitem.hxx>
#include <svx/fhgtitem.hxx>
@@ -2216,7 +2210,7 @@ eF_ResT SwWW8ImplReader::Read_F_IncludePicture( WW8FieldDesc*, String& rStr )
*/
SfxItemSet aFlySet( rDoc.GetAttrPool(), RES_FRMATR_BEGIN,
RES_FRMATR_END-1 );
- aFlySet.Put( SwFmtAnchor( FLY_IN_CNTNT ) );
+ aFlySet.Put( SwFmtAnchor( FLY_AS_CHAR ) );
aFlySet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
pFlyFmtOfJustInsertedGraphic = rDoc.Insert( *pPaM,
aGrfName,
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 82e2192b52ed..62cfd4cf4ded 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -44,9 +44,7 @@
#include <svx/langitem.hxx>
#include <svx/cmapitem.hxx>
#include <svx/shdditem.hxx>
-#ifndef _SVX_CNTRITEM_HXX //autogen
#include <svx/cntritem.hxx>
-#endif
#include <svx/crsditem.hxx>
#include <svx/postitem.hxx>
#include <svx/wghtitem.hxx>
@@ -65,19 +63,13 @@
#include <svx/boxitem.hxx>
#include <svx/ulspitem.hxx>
#include <svx/lrspitem.hxx>
-#ifndef _SVX_TSTPITEM_HXX //autogen
#include <svx/tstpitem.hxx>
-#endif
#include <svx/akrnitem.hxx>
#include <svx/paperinf.hxx>
-#ifndef _SVX_EMPHITEM_HXX //autogen
#include <svx/emphitem.hxx>
-#endif
#include <svx/forbiddenruleitem.hxx>
#include <svx/twolinesitem.hxx>
-#ifndef _SVX_SCRIPSPACEITEM_HXX
#include <svx/scriptspaceitem.hxx>
-#endif
#include <svx/hngpnctitem.hxx>
#include <svx/pbinitem.hxx>
#include <svx/charscaleitem.hxx>
@@ -1995,7 +1987,7 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM& rPaM,
nYBind = (( rWW.nSp29 & 0x30 ) >> 4);
// --> OD 2005-08-24 #i53725# - absolute positioned objects have to be
// anchored at-paragraph to assure its correct anchor position.
- eAnchor = FLY_AT_CNTNT;
+ eAnchor = FLY_AT_PARA;
// <--
switch (nYBind)
{
@@ -2287,7 +2279,7 @@ void WW8FlySet::Init(const SwWW8ImplReader& rReader, const SwPaM* pPaM)
Reader::ResetFrmFmtAttrs(*this); // Abstand/Umrandung raus
Put(SvxLRSpaceItem(RES_LR_SPACE)); //inline writer ole2 objects start with 0.2cm l/r
- SwFmtAnchor aAnchor(FLY_IN_CNTNT);
+ SwFmtAnchor aAnchor(FLY_AS_CHAR);
aAnchor.SetAnchor(pPaM->GetPoint());
Put(aAnchor);
@@ -2519,8 +2511,10 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
pWWZOrder->InsertTextLayerObject(pOurNewObject);
}
- if (FLY_IN_CNTNT != pSFlyPara->eAnchor)
+ if (FLY_AS_CHAR != pSFlyPara->eAnchor)
+ {
pAnchorStck->AddAnchor(*pPaM->GetPoint(),pSFlyPara->pFlyFmt);
+ }
// merke Pos im Haupttext
pSFlyPara->pMainTextPos = new SwPosition( *pPaM->GetPoint() );
@@ -3206,7 +3200,7 @@ SwFrmFmt *SwWW8ImplReader::ContainsSingleInlineGraphic(const SwPaM &rRegion)
subscripting to force the graphic into a centered position on the line, so
we must check when applying sub/super to see if it the subscript range
contains only a single graphic, and if that graphic is anchored as
- FLY_IN_CNTNT and then we can change its anchoring to centered in the line.
+ FLY_AS_CHAR and then we can change its anchoring to centered in the line.
*/
SwFrmFmt *pRet=0;
SwNodeIndex aBegin(rRegion.Start()->nNode);
@@ -3223,8 +3217,8 @@ SwFrmFmt *SwWW8ImplReader::ContainsSingleInlineGraphic(const SwPaM &rRegion)
{
const SwFmtFlyCnt& rFly = pTFlyAttr->GetFlyCnt();
SwFrmFmt *pFlyFmt = rFly.GetFrmFmt();
- if( pFlyFmt &&
- FLY_IN_CNTNT == pFlyFmt->GetAnchor().GetAnchorId() )
+ if (pFlyFmt &&
+ (FLY_AS_CHAR == pFlyFmt->GetAnchor().GetAnchorId()))
{
pRet = pFlyFmt;
}
@@ -3240,7 +3234,7 @@ bool SwWW8ImplReader::ConvertSubToGraphicPlacement()
subscripting to force the graphic into a centered position on the line, so
we must check when applying sub/super to see if it the subscript range
contains only a single graphic, and if that graphic is anchored as
- FLY_IN_CNTNT and then we can change its anchoring to centered in the line.
+ FLY_AS_CHAR and then we can change its anchoring to centered in the line.
*/
bool bIsGraphicPlacementHack = false;
USHORT nPos;
generated by cgit (git 2.34.1) at 2024-06-28 17:39:26 +0000